Merge pull request #361 from tutorcruncher/cost-to-msg-list

tomhamiltonstubber · web-flow · commit 877ff0d491aa · 2022-06-30T12:45:35.000+01:00
diff --git a/src/schemas/models.py b/src/schemas/models.py
@@ -40,7 +40,7 @@ class Message(BaseModel):
     subject: Optional[str] = ''
     body: Optional[str] = ''
     attachments: Optional[List[str]] = []
-    cost: float = 0
+    cost: Optional[float] = 0
     extra: Json
     vector: Optional[str] = ''
 
@@ -71,6 +71,7 @@ def parsed_details(self):
             'update_ts': self.update_ts,
             'status': self.get_status_display(),
             'method': self.method,
+            'cost': self.cost or 0,
         }
 
     def get_attachments(self):
diff --git a/src/views/messages.py b/src/views/messages.py
@@ -37,6 +37,7 @@
         V('status'),
         V('method'),
         V('attachments'),
+        V('cost'),
     ]
 )
 
diff --git a/tests/test_user_display.py b/tests/test_user_display.py
@@ -51,6 +51,7 @@ def test_user_list(cli, settings, send_email, sync_db: SyncDb):
         'status': 'Sent',
         'method': 'email-test',
         'subject': 'test message',
+        'cost': 0,
     }
 
 
@@ -79,6 +80,7 @@ def test_user_list_no_ext(cli, settings, send_email, sync_db: SyncDb):
         'status': 'Sent',
         'method': 'email-test',
         'subject': 'test message',
+        'cost': 0,
     }
 
 
@@ -293,6 +295,7 @@ def test_message_details(cli, settings, send_email, sync_db: SyncDb, worker, loo
         'body': '<body>\nthis is a test\n</body>',
         'events': [{'status': 'Opened', 'datetime': RegexStr(r'\d{4}-\d{2}-\d{2}.*')}],
         'attachments': [],
+        'cost': 0,
     }
 
 
@@ -336,6 +339,7 @@ def test_message_details_links(cli, settings, send_email, sync_db: SyncDb, worke
         'method': 'email-test',
         'events': [{'status': 'Opened', 'datetime': RegexStr(r'\d{4}-\d{2}-\d{2}.*')}],
         'attachments': [['/attachment-doc/123/', 'testing.pdf'], ['#', 'different.pdf']],
+        'cost': 0,
     }
 
 
@@ -422,6 +426,7 @@ def test_user_sms_list(cli, settings, send_sms, sync_db: SyncDb):
                 'update_ts': RegexStr(r'\d{4}-\d{2}-\d{2}.*'),
                 'status': 'Sent',
                 'method': 'sms-test',
+                'cost': 0.012,
             },
         ],
         'count': 1,

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@`
`37`	`37`	`V('status'),`
`38`	`38`	`V('method'),`
`39`	`39`	`V('attachments'),`
	`40`	`+ V('cost'),`
`40`	`41`	`]`
`41`	`42`	`)`
`42`	`43`