Merge branch 'dev' into code-style

Author: matthias_schaub

mapswipe_workers/.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 
 repos:
   - repo: https://github.com/psf/black
-    rev: stable
+    rev: 19.10b0
     hooks:
       - id: black
   - repo: https://gitlab.com/pycqa/flake8

mapswipe_workers/mapswipe_workers/mapswipe_workers.py

@@ -289,10 +289,7 @@ def run_create_tutorials() -> None:
 
 @cli.command("archive")
 @click.option(
-    "--project-id",
-    "-i",
-    help=("Archive project with giving project id"),
-    type=str,
+    "--project-id", "-i", help=("Archive project with giving project id"), type=str,
 )
 @click.option(
     "--project-ids",
@@ -320,10 +317,7 @@ def run_archive_project(project_id, project_ids):
 
 @cli.command("delete")
 @click.option(
-    "--project-id",
-    "-i",
-    help=("Delete project with giving project id"),
-    type=str,
+    "--project-id", "-i", help=("Delete project with giving project id"), type=str,
 )
 @click.option(
     "--project-ids",

mapswipe_workers/mapswipe_workers/project_types/base/project.py

@@ -127,9 +127,7 @@ def save_project(self):
         # Make sure projects get saved in Postgres and Firebase successful
         try:
             self.save_to_postgres(
-                project,
-                groups,
-                groupsOfTasks,
+                project, groups, groupsOfTasks,
             )
             logger.info(
                 f"{self.projectId}" f" - the project has been saved" f" to postgres"
@@ -161,9 +159,7 @@ def save_project(self):
 
         try:
             self.save_to_firebase(
-                project,
-                groups,
-                groupsOfTasks,
+                project, groups, groupsOfTasks,
             )
             logger.info(
                 f"{self.projectId}" f" - the project has been saved" f" to firebase"
@@ -452,10 +448,7 @@ def create_groups_txt_file(self, groups):
             "project_type_specifics",
         )
         w = csv.DictWriter(
-            groups_txt_file,
-            fieldnames=fieldnames,
-            delimiter="\t",
-            quotechar="'",
+            groups_txt_file, fieldnames=fieldnames, delimiter="\t", quotechar="'",
         )
 
         for groupId, group in groups.items():
@@ -525,10 +518,7 @@ def create_tasks_txt_file(self, groupsOfTasks):
             "project_type_specifics",
         )
         w = csv.DictWriter(
-            tasks_txt_file,
-            fieldnames=fieldnames,
-            delimiter="\t",
-            quotechar="'",
+            tasks_txt_file, fieldnames=fieldnames, delimiter="\t", quotechar="'",
         )
 
         for groupId, tasks in groupsOfTasks.items():

mapswipe_workers/mapswipe_workers/utils/geojson_functions.py

@@ -153,11 +153,7 @@ def create_geojson_file_from_dict(final_groups_dict, outfile):
 
     dataSource = driver.CreateDataSource(outfile_temp)
     # create layer
-    layer = dataSource.CreateLayer(
-        outfile_temp,
-        srs,
-        geom_type=ogr.wkbPolygon,
-    )
+    layer = dataSource.CreateLayer(outfile_temp, srs, geom_type=ogr.wkbPolygon,)
 
     # create fields
     field_id = ogr.FieldDefn("group_id", ogr.OFTInteger)
@@ -246,11 +242,7 @@ def create_geojson_file(geometries, outfile):
 
     dataSource = driver.CreateDataSource(outfile_temp)
     # create layer
-    layer = dataSource.CreateLayer(
-        outfile_temp,
-        srs,
-        geom_type=ogr.wkbPolygon,
-    )
+    layer = dataSource.CreateLayer(outfile_temp, srs, geom_type=ogr.wkbPolygon,)
 
     # create fields
     field_id = ogr.FieldDefn("id", ogr.OFTInteger)

mapswipe_workers/mapswipe_workers/utils/tile_functions.py

@@ -96,10 +96,7 @@ def tile_coords_zoom_and_tileserver_to_url(
         # https://www.maptiler.com/google-maps-coordinates-tile-bounds-projection/
         tile_y = int(math.pow(2, tile_z) - tile_y) - 1
         url = tile_server["url"].format(
-            key=tile_server["apiKey"],
-            x=tile_x,
-            y=tile_y,
-            z=tile_z,
+            key=tile_server["apiKey"], x=tile_x, y=tile_y, z=tile_z,
         )
     elif "{-y}" in tile_server["url"]:
         # this uses not the standard TMS tile y coordinate,
@@ -108,18 +105,10 @@ def tile_coords_zoom_and_tileserver_to_url(
         # https://www.maptiler.com/google-maps-coordinates-tile-bounds-projection/
         tile_y = int(math.pow(2, tile_z) - tile_y) - 1
         url = tile_server["url"].replace("{-y}", "{y}")
-        url = url.format(
-            key=tile_server["apiKey"],
-            x=tile_x,
-            y=tile_y,
-            z=tile_z,
-        )
+        url = url.format(key=tile_server["apiKey"], x=tile_x, y=tile_y, z=tile_z,)
     else:
         url = tile_server["url"].format(
-            key=tile_server["apiKey"],
-            x=tile_x,
-            y=tile_y,
-            z=tile_z,
+            key=tile_server["apiKey"], x=tile_x, y=tile_y, z=tile_z,
         )
 
     return url

mapswipe_workers/tests/integration/run_tests.sh

@@ -1,6 +1,7 @@
-# python -m unittest test_create_project.py
+python -m unittest test_create_project.py
 python -m unittest test_archive_project.py 
 python -m unittest test_delete_project.py
 python -m unittest test_update_user_data.py
 python -m unittest test_transfer_results.py
-python -m unittest test_gdal.py
+# python -m unittest test_gdal.py
+# python -m unittest test_team_management.py

mapswipe_workers/tests/integration/set_up.py

@@ -9,6 +9,7 @@
 
 import json
 import os
+import time
 
 from mapswipe_workers import auth
 
@@ -60,13 +61,15 @@ def create_test_project(
         set_firebase_test_data(project_type, "results", fixture_name, project_id)
         set_postgres_test_data(project_type, "results", fixture_name)
 
+    time.sleep(5)  # Wait for Firebase Functions to complete
     return project_id
 
 
 def create_test_results(project_type: str, fixture_name: str) -> str:
     """Create test results only in Firebase."""
     project_id = "test_{0}".format(project_type)
     set_firebase_test_data(project_type, "results", fixture_name, project_id)
+    time.sleep(5)  # Wait for Firebase Functions to complete
     return project_id
 
 

mapswipe_workers/tests/integration/test_delete_project.py

@@ -1,4 +1,3 @@
-import time
 import unittest
 
 import set_up
@@ -21,7 +20,6 @@ def tearDown(self):
     def test_deletion(self):
         """Test if tasks, groups, project and results are deleted."""
         delete_project.delete_project([self.project_id])
-        time.sleep(3)
 
         fb_db = auth.firebaseDB()
         ref = fb_db.reference("v2/results/{0}".format(self.project_id))

mapswipe_workers/tests/integration/test_transfer_results.py

@@ -26,9 +26,10 @@ def test_changes_given_project_id(self):
 
         pg_db = auth.postgresDB()
         sql_query = (
-            "SELECT * FROM results WHERE project_id = '{0}' AND user_id = '{0}'".format(
-                self.project_id
-            )
+            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)
@@ -43,9 +44,10 @@ def test_changes(self):
 
         pg_db = auth.postgresDB()
         sql_query = (
-            "SELECT * FROM results WHERE project_id = '{0}' and user_id = '{0}'".format(
-                self.project_id
-            )
+            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)
@@ -56,9 +58,9 @@ def test_user_not_in_postgres(self):
 
         # Make sure user and results are not yet in Postgres
         sql_query = (
-            "DELETE FROM results WHERE user_id = '{0}' and project_id = '{0}'".format(
-                self.project_id
-            )
+            f"DELETE FROM results "
+            f"WHERE user_id = '{self.project_id}' "
+            f"AND project_id = '{self.project_id}'"
         )
         pg_db.query(sql_query)
         sql_query = "DELETE FROM users WHERE user_id = '{0}'".format(self.project_id)
@@ -71,9 +73,10 @@ def test_user_not_in_postgres(self):
         self.assertIsNotNone(result)
 
         sql_query = (
-            "SELECT * FROM results WHERE project_id = '{0}' AND user_id = '{0}'".format(
-                self.project_id
-            )
+            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)

mapswipe_workers/tests/integration/test_update_user_data.py

@@ -1,4 +1,3 @@
-import time
 import unittest
 
 import set_up
@@ -19,7 +18,6 @@ def tearDown(self):
     def test_no_users_in_postgres(self):
         """Test update users when no users are in postgres yet."""
         update_data.update_user_data()
-        time.sleep(2)
         pg_db = auth.postgresDB()
         sql_query = "SELECT * FROM users WHERE user_id = '{0}'".format(self.user_id)
         result = pg_db.retr_query(sql_query)
@@ -28,7 +26,6 @@ def test_no_users_in_postgres(self):
     def test_last_updated_users(self):
         """Test update users when some users are in postgres."""
         update_data.update_user_data()
-        time.sleep(2)
         user_id = set_up.create_test_user("tile_map_service_grid", "test_user_2")
         self.user_ids.append(user_id)
         update_data.update_user_data()
@@ -40,7 +37,6 @@ def test_last_updated_users(self):
 
     def test_with_user_ids(self):
         update_data.update_user_data([self.user_id])
-        time.sleep(2)
         pg_db = auth.postgresDB()
         sql_query = "SELECT * FROM users WHERE user_id = '{0}'".format(self.user_id)
         result = pg_db.retr_query(sql_query)