refactor code

onaio · Sep 17, 2024 · 4649839 · 4649839
1 parent c04f990
commit 4649839
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/onadata/apps/viewer/parsed_instance_tools.py b/onadata/apps/viewer/parsed_instance_tools.py
@@ -11,7 +11,7 @@
 
 from onadata.libs.utils.common_tags import DATE_FORMAT, MONGO_STRFTIME
 
-KNOWN_DATES = ["_submission_time", "_last_edited", "_date_modified"]
+KNOWN_DATES = ["_submission_time"]
 NONE_JSON_FIELDS = {
     "_submission_time": "date_created",
     "_date_modified": "date_modified",

diff --git a/onadata/apps/viewer/tests/test_parsed_instance.py b/onadata/apps/viewer/tests/test_parsed_instance.py
@@ -93,8 +93,10 @@ def test_get_where_clause_with_integer(self):
     def test_get_where_clause_w_metadata(self):
         """get_where_clause with meta data fields"""
         query = (
-            '{"$or": [{"_submission_time":{"$gte": "2024-09-17", "$lte": "2024-09-17"}}, '
-            '{"_last_edited":{"$gte": "2024-04-01", "$lte": "2024-04-01"}}]}'
+            '{"$or": [{"_submission_time":{"$gte": "2024-09-17T10:32:52", '
+            '"$lte": "2024-09-17T10:32:52"}}, '
+            '{"_last_edited":{"$gte": "2024-04-01T10:32:52", '
+            '"$lte": "2024-04-01T10:32:52"}}]}'
         )
         where, where_params = get_where_clause(query)
         self.assertEqual(
@@ -109,26 +111,29 @@ def test_get_where_clause_w_metadata(self):
         self.assertEqual(
             where_params,
             [
-                "2024-09-17 00:00:00",
-                "2024-09-17 00:00:00",
-                "2024-04-01 00:00:00",
-                "2024-04-01 00:00:00",
+                "2024-09-17 10:32:52",
+                "2024-09-17 10:32:52",
+                "2024-04-01T10:32:52",
+                "2024-04-01T10:32:52",
             ],
         )
         query = (
-            '{"$or": [{"_submission_time": "2024-09-17"}, '
-            '{"_last_edited": "2024-04-01"}]}'
+            '{"$or": [{"_submission_time": "2024-09-17T10:32:52"}, '
+            '{"_last_edited": "2024-04-01T10:32:52"}]}'
         )
         where, where_params = get_where_clause(query)
         self.assertEqual(where, ["((date_created = %s) OR (last_edited = %s))"])
-        self.assertEqual(where_params, ["2024-09-17", "2024-04-01"])
+        self.assertEqual(
+            where_params,
+            ["2024-09-17T10:32:52", "2024-04-01T10:32:52"],
+        )
         query = (
-            '{"$or": [{"_submission_time":{"$lte": "2024-09-17"}}, '
-            '{"_last_edited":{"$gte": "2024-04-01"}}]}'
+            '{"$or": [{"_submission_time":{"$lte": "2024-09-17T10:32:52"}}, '
+            '{"_last_edited":{"$gte": "2024-04-01T10:32:52"}}]}'
         )
         where, where_params = get_where_clause(query)
         self.assertEqual(where, ["((date_created <= %s) OR (last_edited >= %s))"])
-        self.assertEqual(where_params, ["2024-09-17 00:00:00", "2024-04-01 00:00:00"])
+        self.assertEqual(where_params, ["2024-09-17 10:32:52", "2024-04-01T10:32:52"])
 
     def test_retrieve_records_based_on_form_verion(self):
         self._create_user_and_login()