fixed tests

Author: rabbit0021

db/sqlite.py

@@ -201,7 +201,16 @@ def add_subscription(self, conn, email, topic, publisher_id, joined_time=None, o
             logger.info(f"Subscription for {email} already exists")
             return sub['id']
 
-           
+    def update_subscription_last_notified(self, conn, email):
+        logger.info(f"Updating subscription: {email}")
+        c = conn.cursor()
+        c.execute("""
+                UPDATE subscriptions
+                SET last_notified_at = CURRENT_TIMESTAMP
+                WHERE email = ?
+            """, (email, ))
+        
+        logger.info(f"Subscription's {email} last notified updated to current time")
 
     def remove_subscription(self, conn, id):
         c = conn.cursor()
@@ -233,10 +242,11 @@ def get_notifications_by_email(self, conn, email):
 
     def get_notifications_by_email_and_url(self, conn, email, url):
         c = conn.cursor()
+        
         c.execute("""
             SELECT *
             FROM notifications
-            WHERE email = ? and post_url = ? and deleted=0
+            WHERE email = ? and post_url = ?
         """, (email,url))
         row = c.fetchone()
         return dict(row) if row else None

scrape_pubs.py

@@ -1,4 +1,4 @@
-from datetime import datetime, timedelta
+from datetime import datetime, timezone
 from db import enums
 from handlers import ScraperFactory  # maps company -> handler class
 from db import get_database
@@ -68,7 +68,7 @@ def scrape_pubs(db, conn):
 
                     db.add_post(conn, post['url'], post['title'], publisher['id'], tags, post['published'], category)                    
 
-                publisher["last_scraped_at"] = datetime.now().isoformat()
+                publisher["last_scraped_at"] = datetime.now(timezone.utc).isoformat()
                 db.update_publisher(conn, publisher["id"], publisher["last_scraped_at"])
                 conn.commit()
             except Exception as e:

send_notifications.py

@@ -92,8 +92,14 @@ def leave_unmature_notifications(notifications):
     """Remove duplicates based on (email, heading, post_url)."""
     matured = []
     for row in notifications:
-        if datetime.fromisoformat(row['maturity_date']) <= datetime.now():
+        maturity_dt = datetime.fromisoformat(row['maturity_date'])        
+
+        if maturity_dt.tzinfo is None:
+            maturity_dt = maturity_dt.replace(tzinfo=timezone.utc)        
+
+        if maturity_dt <= datetime.now(timezone.utc):
             matured.append(row)
+            
     return matured
 
 def process_notifications(db, conn):
@@ -175,10 +181,12 @@ def process_notifications(db, conn):
 
         for notification in notifications_for_email:   
             logger.info(f"Deleting notification for email: {email} and post url: {notification['post_url']}")
-            
+        
         for notification in notifications_for_email:             
             db.delete_notification(conn, email, notification['post_url'])
             conn.commit()
+        
+        db.update_subscription_last_notified(conn, email)
 
 if __name__ == "__main__":
     db = get_database()

tests/e2e/test_e2e.py

@@ -1,7 +1,7 @@
 import pytest
 from db import enums
-import os
-from datetime import datetime
+import time
+from datetime import datetime, timezone
 from scrape_pubs import scrape_pubs
 from notify import notify
 from send_notifications import process_notifications
@@ -59,7 +59,47 @@ def test_scrape_pubs_techteams(db, dummy_smtp):
     assert notification['post_title'] == post['title']
     assert notification['deleted'] == 0
 
+    beforeprocesstime = datetime.now(timezone.utc)
+    
+    time.sleep(1)
+
     process_notifications(db, conn)
+        
+    notifications = db.get_notifications_by_email(conn, "newemail2@gmail.com")
+    
+    assert len(notifications) == 1
+    notification = notifications[0]
+    assert notification['email'] == "newemail2@gmail.com"
+    assert notification['post_url'] == post['url']
+    assert notification['post_title'] == post['title']
+    assert notification['deleted'] == 1
+    
+    assert len(dummy_smtp.sent) == 1
+    
+    subcriptions = db.get_subscriptions_by_email(conn, "newemail2@gmail.com")
+    subs = subcriptions[0] # in this case only one sub is expected
+    last_notify =  subs['last_notified_at']
+    
+    assert last_notify
+    
+    last_notify_at = datetime.fromisoformat(last_notify) 
+
+    if last_notify_at.tzinfo is None:
+        last_notify_at = last_notify_at.replace(tzinfo=timezone.utc)        
+
+    assert last_notify_at and  last_notify_at > beforeprocesstime
+    
+    notify(db, conn)
+    
+    notifications = db.get_notifications_by_email(conn, "newemail2@gmail.com")
+    
+    assert len(notifications) == 1
+    notification = notifications[0]
+    assert notification['email'] == "newemail2@gmail.com"
+    assert notification['post_url'] == post['url']
+    assert notification['post_title'] == post['title']
+    assert notification['deleted'] == 1
+    
     assert len(dummy_smtp.sent) == 1
 
     conn.close()

tests/e2e/test_notify.py

@@ -1,7 +1,7 @@
 import pytest
 from db import enums
 import os
-from datetime import datetime
+from datetime import datetime, timezone
 from notify import notify
 
 @pytest.mark.notifications
@@ -10,7 +10,7 @@ def test_notify(db):
 
     db.add_publisher(conn, "google", "techteam")
     db.add_subscription(conn, "xyz2@gmail.com", enums.PublisherCategory.SOFTWARE_ENGINEERING.value, 1)
-    postid = db.add_post(conn, "url1", "How to scale your database", 1, "infrastructure", datetime.now().isoformat(), enums.PublisherCategory.SOFTWARE_ENGINEERING.value)
+    postid = db.add_post(conn, "url1", "How to scale your database", 1, "infrastructure", datetime.now(timezone.utc).isoformat(), enums.PublisherCategory.SOFTWARE_ENGINEERING.value)
 
     conn.commit()
 

tests/e2e/test_send_email_e2e.py

@@ -1,7 +1,7 @@
 from email import message_from_string
 import pytest
 from send_notifications import process_notifications
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 
 
 @pytest.mark.notifications
@@ -27,8 +27,8 @@ def test_send_email_e2e(db, dummy_smtp):
     email2 = "manavoriginal@gmail.com"
     email3 = "xyz@gmail.com"
 
-    maturity_date = datetime.now().isoformat()
-    maturity_date2 = datetime.now() + timedelta(days=1)
+    maturity_date = datetime.now(timezone.utc).isoformat()
+    maturity_date2 = datetime.now(timezone.utc) + timedelta(days=1)
     maturity_date2 = maturity_date2.isoformat()
 
     # Insert a notification into DB