Privacy policy changes (#1722)

* changed code for adding user consent details and get user details.

* changed code for adding user consent details and get user details.

* changed code for adding user consent details and get user details.

* change in cicd.yml.

.github/workflows/cicd.yml

@@ -19,7 +19,7 @@ jobs:
     - name: Set up Python 3.10
       uses: actions/setup-python@v1
       with:
-        python-version: "3.10.15"
+        python-version: "3.10.16"
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

kairon/shared/account/activity_log.py

@@ -62,7 +62,7 @@ def get_user_activity_log(email: str):
             user_activity_log = UserActivityLog.objects(
                 user=email, type=UserActivityType.user_consent.value
             ).order_by("-timestamp").first()
-            user_activity_log = user_activity_log.to_mongo().to_dict()
+            user_activity_log = user_activity_log.to_mongo().to_dict() if user_activity_log else None
 
         except Exception as e:
             raise AppException(str(e))

kairon/shared/account/processor.py

@@ -826,7 +826,6 @@ def get_user_details_and_filter_bot_info_for_integration_user(
         user_activity_log, show_updated_terms_and_policy = Utility.compare_terms_and_policy_version(user_activity_log)
         user_details["accepted_privacy_policy"] = user_activity_log["data"]["accepted_privacy_policy"]
         user_details["accepted_terms"] = user_activity_log["data"]["accepted_terms"]
-        user_details["accepted_datetime"] = user_activity_log["timestamp"]
         user_details["show_updated_terms_and_policy"] = show_updated_terms_and_policy
         return user_details
 

kairon/shared/utils.py

@@ -1871,12 +1871,17 @@ def compare_string_constant_time(val1: str, val2: str):
 
     @staticmethod
     def compare_terms_and_policy_version(user_activity_log):
-        terms_and_policy_version = float(user_activity_log.get("data", {}).get("terms_and_policy_version"))
-        latest_terms_and_policy_version = float(Utility.environment["app"]["terms_and_policy_version"])
-        show_updated_terms_and_policy = False
-        if latest_terms_and_policy_version > terms_and_policy_version:
-            user_activity_log["data"]["accepted_terms"] = False
-            user_activity_log["data"]["accepted_privacy_policy"] = False
+        if user_activity_log:
+            terms_and_policy_version = float(user_activity_log.get("data", {}).get("terms_and_policy_version"))
+            latest_terms_and_policy_version = float(Utility.environment["app"]["terms_and_policy_version"])
+            show_updated_terms_and_policy = True if latest_terms_and_policy_version > terms_and_policy_version else False
+        else:
+            user_activity_log = {
+                "data": {
+                    "accepted_terms": False,
+                    "accepted_privacy_policy": False,
+                }
+            }
             show_updated_terms_and_policy = True
         return user_activity_log, show_updated_terms_and_policy
 

tests/integration_test/services_test.py

@@ -971,7 +971,6 @@ def test_api_login(monkeypatch):
     assert response["data"]["user"]["last_name"] == "User"
     assert response["data"]["user"]["accepted_privacy_policy"] is True
     assert response["data"]["user"]["accepted_terms"] is True
-    assert response["data"]["user"]["accepted_datetime"]
     assert response["data"]["user"]["show_updated_terms_and_policy"] is False
 
     email = "integrationtest@demo.ai"
@@ -1077,9 +1076,8 @@ def test_get_user_details_with_latest_version(monkeypatch):
     assert response["data"]["user"]["account_name"] == "integration"
     assert response["data"]["user"]["first_name"] == "Demo"
     assert response["data"]["user"]["last_name"] == "User"
-    assert response["data"]["user"]["accepted_privacy_policy"] is False
-    assert response["data"]["user"]["accepted_terms"] is False
-    assert response["data"]["user"]["accepted_datetime"]
+    assert response["data"]["user"]["accepted_privacy_policy"] is True
+    assert response["data"]["user"]["accepted_terms"] is True
     assert response["data"]["user"]["show_updated_terms_and_policy"] is True