Merge pull request #53 from DostEducation/develop

Release 28 May 2024

api/helpers/common_helper.py

@@ -1,18 +1,17 @@
 from datetime import datetime, timezone
-from typing import Any
 
 
 def get_current_utc_timestamp() -> datetime:
     return datetime.now(timezone.utc)
 
 
 def check_activity_key(
-    activity_key: str, activity_value: dict[str, Any], keyword: str, status: str
+    activity_key: str, activity_value: str, keyword: str, status: str
 ):
     return (
         True
         if activity_key.startswith(keyword)
         and activity_key.endswith(status)
-        and activity_value["value"] == "yes"
+        and activity_value == "yes"
         else False
     )

api/services/user_activities_service.py

@@ -16,9 +16,8 @@ def __init__(self, user, user_flow):
     def handle_user_activities(self, json_data: dict[str, Any]):
         try:
             current_time = common_helper.get_current_utc_timestamp()
-            contact_activities = json_data.get("contact", {}).get("fields", {})
 
-            for activity_key, activity_value in contact_activities.items():
+            for activity_key, activity_value in json_data.items():
                 user_activity = self.create_or_update_user_activity(
                     activity_key, activity_value, current_time
                 )
@@ -34,7 +33,7 @@ def handle_user_activities(self, json_data: dict[str, Any]):
             )
 
     def create_or_update_user_activity(
-        self, activity_key: str, activity_value: dict[str, Any], current_time: datetime
+        self, activity_key: str, activity_value: str, current_time: datetime
     ) -> Optional[models.UserActivities]:
         is_started = common_helper.check_activity_key(
             activity_key, activity_value, "activity_", "_started"
@@ -65,6 +64,7 @@ def create_activity(
             activity=activity_key.strip(),
             is_started=True,
             started_on=current_time,
+            is_succeeded=False,
         )
 
     def update_succeeded_activity(