Merge pull request #898 from golemfactory/event-api/pay-invoice-event…

…s-fix [pay] use backward compatible event types against DB
golemfactory · Dec 22, 2020 · 899776b · 899776b
2 parents 75cb9a3 + fabbcf3
commit 899776b
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 22 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/payment/src/dao/debit_note_event.rs b/core/payment/src/dao/debit_note_event.rs
@@ -37,19 +37,15 @@ impl<'c> AsDao<'c> for DebitNoteEventDao<'c> {
 }
 
 impl<'c> DebitNoteEventDao<'c> {
-    pub async fn create<T: Serialize>(
+    pub async fn create<T: Serialize + Send + 'static>(
         &self,
         debit_note_id: String,
         owner_id: NodeId,
         event_type: DebitNoteEventType,
         details: Option<T>,
     ) -> DbResult<()> {
-        let event = WriteObj::new(debit_note_id, owner_id, event_type, details)?;
         do_with_transaction(self.pool, move |conn| {
-            diesel::insert_into(write_dsl::pay_debit_note_event)
-                .values(event)
-                .execute(conn)?;
-            Ok(())
+            create(debit_note_id, owner_id, event_type, details, conn)
         })
         .await
     }

diff --git a/core/payment/src/dao/invoice_event.rs b/core/payment/src/dao/invoice_event.rs
@@ -37,19 +37,15 @@ impl<'c> AsDao<'c> for InvoiceEventDao<'c> {
 }
 
 impl<'c> InvoiceEventDao<'c> {
-    pub async fn create<T: Serialize>(
+    pub async fn create<T: Serialize + Send + 'static>(
         &self,
         invoice_id: String,
         owner_id: NodeId,
         event_type: InvoiceEventType,
         details: Option<T>,
     ) -> DbResult<()> {
-        let event = WriteObj::new(invoice_id, owner_id, event_type, details)?;
         do_with_transaction(self.pool, move |conn| {
-            diesel::insert_into(write_dsl::pay_invoice_event)
-                .values(event)
-                .execute(conn)?;
-            Ok(())
+            create(invoice_id, owner_id, event_type, details, conn)
         })
         .await
     }

diff --git a/core/payment/src/models/debit_note_event.rs b/core/payment/src/models/debit_note_event.rs
@@ -31,7 +31,7 @@ impl WriteObj {
         Ok(Self {
             debit_note_id,
             owner_id,
-            event_type: serde_json::to_string(&event_type)?,
+            event_type: event_type.to_string(),
             details,
         })
     }
@@ -53,6 +53,12 @@ impl TryFrom<ReadObj> for DebitNoteEvent {
     type Error = DbError;
 
     fn try_from(event: ReadObj) -> DbResult<Self> {
+        let event_type = event.event_type.parse().map_err(|e| {
+            DbError::Integrity(format!(
+                "DebitNoteEvent type `{}` parsing failed: {}",
+                &event.event_type, e
+            ))
+        })?;
         // TODO Attach details when event_type=REJECTED
         let _details = match event.details {
             Some(s) => Some(json_from_str(&s)?),
@@ -61,7 +67,7 @@ impl TryFrom<ReadObj> for DebitNoteEvent {
         Ok(Self {
             debit_note_id: event.debit_note_id,
             event_date: Utc.from_utc_datetime(&event.timestamp),
-            event_type: serde_json::from_str(&event.event_type)?,
+            event_type,
         })
     }
 }
diff --git a/core/payment/src/models/invoice_event.rs b/core/payment/src/models/invoice_event.rs
@@ -31,7 +31,7 @@ impl WriteObj {
         Ok(Self {
             invoice_id,
             owner_id,
-            event_type: serde_json::to_string(&event_type)?,
+            event_type: event_type.to_string(),
             details,
         })
     }
@@ -53,12 +53,19 @@ impl TryFrom<ReadObj> for InvoiceEvent {
     type Error = DbError;
 
     fn try_from(event: ReadObj) -> DbResult<Self> {
+        let event_type = event.event_type.parse().map_err(|e| {
+            DbError::Integrity(format!(
+                "InvoiceEvent type `{}` parsing failed: {}",
+                event.event_type, e
+            ))
+        })?;
+
         // TODO Attach details when event_type=REJECTED
         let _details = match event.details {
             Some(s) => Some(json_from_str(&s)?),
             None => None,
         };
-        let event_type = serde_json::from_str(&event.event_type)?;
+
         Ok(Self {
             invoice_id: event.invoice_id,
             event_date: Utc.from_utc_datetime(&event.timestamp),