better test for results that have been submitted when tranfer results is running already

Author: Hagellach37

…sults/build_area_additional_results.json …_additional_results_different_group.jsonmapswipe_workers/tests/integration/fixtures/tile_map_service_grid/results/build_area_additional_results.json renamed to mapswipe_workers/tests/integration/fixtures/tile_map_service_grid/results/build_area_additional_results_different_group.json mapswipe_workers/tests/integration/fixtures/tile_map_service_grid/results/build_area_additional_results.json renamed to mapswipe_workers/tests/integration/fixtures/tile_map_service_grid/results/build_area_additional_results_different_group.json

@@ -258,4 +258,4 @@
     "startTime" : "2020-02-03T15:36:29.286Z",
     "timestamp" : "2020-02-03T15:39:39.332Z"
   }
-}
+}

mapswipe_workers/tests/integration/fixtures/tile_map_service_grid/results/build_area_additional_results_same_group.json

@@ -0,0 +1,259 @@
+{
+  "endTime" : "2020-02-03T15:39:39.332Z",
+  "results" : {
+    "18-156540-142783" : 1,
+    "18-156540-142784" : 1,
+    "18-156540-142785" : 1,
+    "18-156541-142783" : 1,
+    "18-156541-142784" : 1,
+    "18-156541-142785" : 1,
+    "18-156542-142783" : 1,
+    "18-156542-142784" : 0,
+    "18-156542-142785" : 1,
+    "18-156543-142783" : 1,
+    "18-156543-142784" : 1,
+    "18-156543-142785" : 1,
+    "18-156544-142783" : 0,
+    "18-156544-142784" : 1,
+    "18-156544-142785" : 0,
+    "18-156545-142783" : 1,
+    "18-156545-142784" : 1,
+    "18-156545-142785" : 0,
+    "18-156546-142783" : 0,
+    "18-156546-142784" : 0,
+    "18-156546-142785" : 0,
+    "18-156547-142783" : 0,
+    "18-156547-142784" : 0,
+    "18-156547-142785" : 0,
+    "18-156548-142783" : 1,
+    "18-156548-142784" : 1,
+    "18-156548-142785" : 1,
+    "18-156549-142783" : 1,
+    "18-156549-142784" : 1,
+    "18-156549-142785" : 0,
+    "18-156550-142783" : 1,
+    "18-156550-142784" : 1,
+    "18-156550-142785" : 1,
+    "18-156551-142783" : 1,
+    "18-156551-142784" : 1,
+    "18-156551-142785" : 0,
+    "18-156552-142783" : 1,
+    "18-156552-142784" : 0,
+    "18-156552-142785" : 0,
+    "18-156553-142783" : 1,
+    "18-156553-142784" : 1,
+    "18-156553-142785" : 0,
+    "18-156554-142783" : 1,
+    "18-156554-142784" : 1,
+    "18-156554-142785" : 1,
+    "18-156555-142783" : 1,
+    "18-156555-142784" : 1,
+    "18-156555-142785" : 1,
+    "18-156556-142783" : 1,
+    "18-156556-142784" : 0,
+    "18-156556-142785" : 0,
+    "18-156557-142783" : 1,
+    "18-156557-142784" : 0,
+    "18-156557-142785" : 0,
+    "18-156558-142783" : 1,
+    "18-156558-142784" : 1,
+    "18-156558-142785" : 0,
+    "18-156559-142783" : 1,
+    "18-156559-142784" : 0,
+    "18-156559-142785" : 0,
+    "18-156560-142783" : 1,
+    "18-156560-142784" : 0,
+    "18-156560-142785" : 0,
+    "18-156561-142783" : 0,
+    "18-156561-142784" : 1,
+    "18-156561-142785" : 1,
+    "18-156562-142783" : 1,
+    "18-156562-142784" : 1,
+    "18-156562-142785" : 1,
+    "18-156563-142783" : 0,
+    "18-156563-142784" : 0,
+    "18-156563-142785" : 0,
+    "18-156564-142783" : 0,
+    "18-156564-142784" : 0,
+    "18-156564-142785" : 0,
+    "18-156565-142783" : 0,
+    "18-156565-142784" : 0,
+    "18-156565-142785" : 0,
+    "18-156566-142783" : 1,
+    "18-156566-142784" : 1,
+    "18-156566-142785" : 0,
+    "18-156567-142783" : 1,
+    "18-156567-142784" : 1,
+    "18-156567-142785" : 1,
+    "18-156568-142783" : 0,
+    "18-156568-142784" : 0,
+    "18-156568-142785" : 1,
+    "18-156569-142783" : 1,
+    "18-156569-142784" : 1,
+    "18-156569-142785" : 0,
+    "18-156570-142783" : 1,
+    "18-156570-142784" : 1,
+    "18-156570-142785" : 1,
+    "18-156571-142783" : 1,
+    "18-156571-142784" : 1,
+    "18-156571-142785" : 0,
+    "18-156572-142783" : 1,
+    "18-156572-142784" : 1,
+    "18-156572-142785" : 1,
+    "18-156573-142783" : 0,
+    "18-156573-142784" : 1,
+    "18-156573-142785" : 0,
+    "18-156574-142783" : 1,
+    "18-156574-142784" : 1,
+    "18-156574-142785" : 1,
+    "18-156575-142783" : 0,
+    "18-156575-142784" : 1,
+    "18-156575-142785" : 1,
+    "18-156576-142783" : 0,
+    "18-156576-142784" : 1,
+    "18-156576-142785" : 1,
+    "18-156577-142783" : 0,
+    "18-156577-142784" : 0,
+    "18-156577-142785" : 0,
+    "18-156578-142783" : 0,
+    "18-156578-142784" : 0,
+    "18-156578-142785" : 1,
+    "18-156579-142783" : 0,
+    "18-156579-142784" : 0,
+    "18-156579-142785" : 0,
+    "18-156580-142783" : 1,
+    "18-156580-142784" : 0,
+    "18-156580-142785" : 0,
+    "18-156581-142783" : 0,
+    "18-156581-142784" : 0,
+    "18-156581-142785" : 0,
+    "18-156582-142783" : 0,
+    "18-156582-142784" : 0,
+    "18-156582-142785" : 0,
+    "18-156583-142783" : 0,
+    "18-156583-142784" : 0,
+    "18-156583-142785" : 0,
+    "18-156584-142783" : 0,
+    "18-156584-142784" : 0,
+    "18-156584-142785" : 0,
+    "18-156585-142783" : 0,
+    "18-156585-142784" : 0,
+    "18-156585-142785" : 0,
+    "18-156586-142783" : 0,
+    "18-156586-142784" : 0,
+    "18-156586-142785" : 0,
+    "18-156587-142783" : 0,
+    "18-156587-142784" : 0,
+    "18-156587-142785" : 0,
+    "18-156588-142783" : 0,
+    "18-156588-142784" : 0,
+    "18-156588-142785" : 0,
+    "18-156589-142783" : 0,
+    "18-156589-142784" : 0,
+    "18-156589-142785" : 0,
+    "18-156590-142783" : 0,
+    "18-156590-142784" : 0,
+    "18-156590-142785" : 0,
+    "18-156591-142783" : 0,
+    "18-156591-142784" : 2,
+    "18-156591-142785" : 0,
+    "18-156592-142783" : 0,
+    "18-156592-142784" : 2,
+    "18-156592-142785" : 0,
+    "18-156593-142783" : 2,
+    "18-156593-142784" : 2,
+    "18-156593-142785" : 0,
+    "18-156594-142783" : 1,
+    "18-156594-142784" : 2,
+    "18-156594-142785" : 0,
+    "18-156595-142783" : 0,
+    "18-156595-142784" : 0,
+    "18-156595-142785" : 0,
+    "18-156596-142783" : 1,
+    "18-156596-142784" : 1,
+    "18-156596-142785" : 0,
+    "18-156597-142783" : 1,
+    "18-156597-142784" : 1,
+    "18-156597-142785" : 0,
+    "18-156598-142783" : 1,
+    "18-156598-142784" : 0,
+    "18-156598-142785" : 0,
+    "18-156599-142783" : 1,
+    "18-156599-142784" : 1,
+    "18-156599-142785" : 1,
+    "18-156600-142783" : 1,
+    "18-156600-142784" : 1,
+    "18-156600-142785" : 1,
+    "18-156601-142783" : 1,
+    "18-156601-142784" : 1,
+    "18-156601-142785" : 1,
+    "18-156602-142783" : 1,
+    "18-156602-142784" : 1,
+    "18-156602-142785" : 1,
+    "18-156603-142783" : 1,
+    "18-156603-142784" : 1,
+    "18-156603-142785" : 1,
+    "18-156604-142783" : 1,
+    "18-156604-142784" : 1,
+    "18-156604-142785" : 1,
+    "18-156605-142783" : 1,
+    "18-156605-142784" : 1,
+    "18-156605-142785" : 0,
+    "18-156606-142783" : 0,
+    "18-156606-142784" : 1,
+    "18-156606-142785" : 1,
+    "18-156607-142783" : 1,
+    "18-156607-142784" : 1,
+    "18-156607-142785" : 1,
+    "18-156608-142783" : 0,
+    "18-156608-142784" : 1,
+    "18-156608-142785" : 1,
+    "18-156609-142783" : 1,
+    "18-156609-142784" : 1,
+    "18-156609-142785" : 1,
+    "18-156610-142783" : 1,
+    "18-156610-142784" : 1,
+    "18-156610-142785" : 1,
+    "18-156611-142783" : 1,
+    "18-156611-142784" : 1,
+    "18-156611-142785" : 1,
+    "18-156612-142783" : 0,
+    "18-156612-142784" : 0,
+    "18-156612-142785" : 1,
+    "18-156613-142783" : 1,
+    "18-156613-142784" : 1,
+    "18-156613-142785" : 1,
+    "18-156614-142783" : 1,
+    "18-156614-142784" : 1,
+    "18-156614-142785" : 1,
+    "18-156615-142783" : 0,
+    "18-156615-142784" : 1,
+    "18-156615-142785" : 1,
+    "18-156616-142783" : 0,
+    "18-156616-142784" : 0,
+    "18-156616-142785" : 0,
+    "18-156617-142783" : 1,
+    "18-156617-142784" : 1,
+    "18-156617-142785" : 1,
+    "18-156618-142783" : 1,
+    "18-156618-142784" : 1,
+    "18-156618-142785" : 1,
+    "18-156619-142783" : 0,
+    "18-156619-142784" : 1,
+    "18-156619-142785" : 1,
+    "18-156620-142783" : 1,
+    "18-156620-142784" : 1,
+    "18-156620-142785" : 1,
+    "18-156621-142783" : 1,
+    "18-156621-142784" : 1,
+    "18-156621-142785" : 3,
+    "18-156622-142783" : 0,
+    "18-156622-142784" : 1,
+    "18-156622-142785" : 0,
+    "18-156623-142783" : 0,
+    "18-156623-142784" : 0,
+    "18-156623-142785" : 0
+  },
+  "startTime" : "2020-02-03T15:36:29.286Z",
+  "timestamp" : "2020-02-03T15:39:39.332Z"
+}

mapswipe_workers/tests/integration/test_transfer_results.py

@@ -86,7 +86,7 @@ def test_user_not_in_postgres(self):
         result = pg_db.retr_query(sql_query)
         self.assertIsNotNone(result)
 
-    def test_additional_results_are_not_deleted(self):
+    def test_additional_results_for_different_group_are_not_deleted(self):
         """Test if new results are not deleted when workflow has already started.
 
         Here we check what happens to results that are submitted,
@@ -100,10 +100,13 @@ def test_additional_results_are_not_deleted(self):
         results_ref = fb_db.reference(f"v2/results/{self.project_id}")
         results = results_ref.get()
 
-        # add additional results in Firebase for group with key 'g120'
-        # These results should not get deleted by the function below
+        # Add additional results in Firebase for group with key 'g115'.
+        # This is the same group for which results already exist.
+        # So here we simulate another user mapping a group
+        # that has been mapped before already.
+        # These results should not get deleted by the function below.
         test_dir = os.path.dirname(__file__)
-        fixture_name = "build_area_additional_results.json"
+        fixture_name = "build_area_additional_results_different_group.json"
         file_path = os.path.join(
             test_dir, "fixtures", "tile_map_service_grid", "results", fixture_name
         )
@@ -129,8 +132,59 @@ def test_additional_results_are_not_deleted(self):
         self.assertIsNotNone(result)
 
         # check if new results for the group 'g120' are still in Firebase
-        ref = fb_db.reference("v2/results/{0}".format(self.project_id))
-        self.assertDictEqual(ref.get(shallow=True), {"g120": True})
+        ref = fb_db.reference(
+            f"v2/results/{self.project_id}/g120/test_build_area/results"
+        )
+        self.assertEqual(len(ref.get(shallow=True)), 252)
+
+    def test_additional_results_for_same_group_are_not_deleted(self):
+        """Test if new results are not deleted when workflow has already started.
+
+        Here we check what happens to results that are submitted,
+        when the transfer of results workflow is already running.
+        We expect that these new results should remain in Firebase
+        until the next run of transfer results.
+        """
+
+        fb_db = auth.firebaseDB()
+
+        results_ref = fb_db.reference(f"v2/results/{self.project_id}")
+        results = results_ref.get()
+
+        # Add additional results in Firebase for group with key 'g115'.
+        # This is the same group for which results already exist.
+        # So here we simulate another user mapping a group
+        # that has been mapped before already.
+        # These results should not get deleted by the function below.
+        test_dir = os.path.dirname(__file__)
+        fixture_name = "build_area_additional_results_same_group.json"
+        file_path = os.path.join(
+            test_dir, "fixtures", "tile_map_service_grid", "results", fixture_name
+        )
+
+        with open(file_path) as test_file:
+            new_results = json.load(test_file)
+
+        results_ref = fb_db.reference(f"v2/results/{self.project_id}/g115/new_user/")
+        results_ref.set(new_results)
+
+        # run transfer results function
+        transfer_results_for_project(self.project_id, results)
+
+        # Check if results have been transferred
+        pg_db = auth.postgresDB()
+        sql_query = (
+            f"SELECT * "
+            f"FROM results "
+            f"WHERE project_id = '{self.project_id}' "
+            f"AND user_id = '{self.project_id}'"
+        )
+        result = pg_db.retr_query(sql_query)
+        self.assertIsNotNone(result)
+
+        # check if new results for the group 'g115' are still in Firebase
+        ref = fb_db.reference(f"v2/results/{self.project_id}/g115/new_user/results")
+        self.assertEqual(len(ref.get(shallow=True)), 252)
 
 
 if __name__ == "__main__":