LibrePages/librepages
4
0
Fork 0
Code Issues 6 Pull requests 10 Projects Releases Packages Wiki Activity

chore: refactor Event to be deserializ-able

Browse source
This commit is contained in:
Aravinth Manivannan 2022-11-27 22:01:36 +05:30
parent 8a25459985
commit 1015ccbf4d
Signed by: realaravinth
GPG key ID: AD9F0F08E855ED88
1 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/db.rs
View file

@ -16,6 +16,7 @@
*/ */
use std::str::FromStr; use std::str::FromStr;
use lazy_static::lazy_static;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use sqlx::postgres::PgPoolOptions; use sqlx::postgres::PgPoolOptions;
use sqlx::types::time::OffsetDateTime; use sqlx::types::time::OffsetDateTime;
@ -404,7 +405,7 @@ impl Database {
} }
async fn create_event_type(&self) -> ServiceResult<()> { async fn create_event_type(&self) -> ServiceResult<()> {
for e in EVENTS { for e in &*EVENTS {
if !self.event_type_exists(&e).await? { if !self.event_type_exists(&e).await? {
sqlx::query!( sqlx::query!(
"INSERT INTO librepages_deploy_event_type "INSERT INTO librepages_deploy_event_type
@ -587,23 +588,28 @@ pub struct NameHash {
#[derive(Deserialize, Serialize, Clone, Debug, Eq, PartialEq)] #[derive(Deserialize, Serialize, Clone, Debug, Eq, PartialEq)]
pub struct Event { pub struct Event {
pub name: &'static str, pub name: String,
} }
impl Event { impl Event {
const fn new(name: &'static str) -> Self { fn new(name: String) -> Self {
Self { name } Self { name }
} }
pub fn from_str(name: &str) -> Option<Event> { pub fn from_str(name: &str) -> Option<Event> {
EVENTS.into_iter().find(|e| e.name == name) (*EVENTS).into_iter().find(|e| e.name == name).cloned()
} }
} }
pub const EVENT_TYPE_CREATE: Event = Event::new("site.event.create"); lazy_static! {
pub const EVENT_TYPE_UPDATE: Event = Event::new("site.event.update"); pub static ref EVENT_TYPE_CREATE: Event = Event::new("site.event.create".into());
pub const EVENT_TYPE_DELETE: Event = Event::new("site.event.delete"); pub static ref EVENT_TYPE_UPDATE: Event = Event::new("site.event.update".into());
pub static ref EVENT_TYPE_DELETE: Event = Event::new("site.event.delete".into());
pub const EVENTS: [Event; 3] = [EVENT_TYPE_CREATE, EVENT_TYPE_DELETE, EVENT_TYPE_UPDATE]; pub static ref EVENTS: [&'static Event; 3] = [
&*EVENT_TYPE_CREATE,
&*EVENT_TYPE_DELETE,
&*EVENT_TYPE_UPDATE
];
}
struct InnerLibrepagesEvent { struct InnerLibrepagesEvent {
name: String, name: String,
@ -679,7 +685,7 @@ mod tests {
#[test] #[test]
fn event_names_are_unique() { fn event_names_are_unique() {
let mut uniq = HashSet::new(); let mut uniq = HashSet::new();
assert!(EVENTS.into_iter().all(move |x| uniq.insert(x.name))); assert!(EVENTS.into_iter().all(move |x| uniq.insert(x.name.clone())));
} }
#[actix_rt::test] #[actix_rt::test]
@ -815,7 +821,7 @@ mod tests {
db.migrate().await.unwrap(); db.migrate().await.unwrap();
// check if events are created // check if events are created
for e in EVENTS { for e in &*EVENTS {
println!("Testing event type exists {}", e.name); println!("Testing event type exists {}", e.name);
assert!(db.event_type_exists(&e).await.unwrap()); assert!(db.event_type_exists(&e).await.unwrap());
} }
@ -875,7 +881,7 @@ mod tests {
.unwrap(); .unwrap();
let event = db.get_event(&site.hostname, &event_id).await.unwrap(); let event = db.get_event(&site.hostname, &event_id).await.unwrap();
assert_eq!(event.id, event_id); assert_eq!(event.id, event_id);
assert_eq!(event.event_type, EVENT_TYPE_CREATE); assert_eq!(event.event_type, *EVENT_TYPE_CREATE);
assert_eq!(event.site, site.hostname); assert_eq!(event.site, site.hostname);
assert_eq!( assert_eq!(