Merge pull request #972 from mapswipe/fix/urlB-issue

Fix/url b issue

Author: frozenhelium

django/apps/existing_database/migrations/0002_mappingsession_mappingsessionresult.py

@@ -22,6 +22,8 @@ class Migration(migrations.Migration):
                 ("start_time", models.DateTimeField(blank=True, null=True)),
                 ("end_time", models.DateTimeField(blank=True, null=True)),
                 ("items_count", models.SmallIntegerField(default=0)),
+                ("app_version", models.CharField(max_length=999)),
+                ("client_type", models.CharField(max_length=999)),
             ],
             options={
                 "db_table": "mapping_sessions",

django/apps/existing_database/models.py

@@ -233,6 +233,8 @@ class MappingSession(Model):
     start_time = models.DateTimeField(blank=True, null=True)
     end_time = models.DateTimeField(blank=True, null=True)
     items_count = models.SmallIntegerField(null=False, default=0)
+    app_version = models.CharField(max_length=999)
+    client_type = models.CharField(max_length=999)
 
     class Meta:
         managed = False

mapswipe_workers/mapswipe_workers/firebase_to_postgres/transfer_results.py

@@ -264,6 +264,8 @@ def results_to_file(
             start_time = dateutil.parser.parse(result_data["startTime"])
             end_time = dateutil.parser.parse(result_data["endTime"])
             timestamp = end_time
+            app_version = result_data.get("appVersion", "")
+            client_type = result_data.get("clientType", "")
 
             if type(result_data["results"]) is dict:
                 for taskId, result in result_data["results"].items():
@@ -279,6 +281,8 @@ def results_to_file(
                             start_time,
                             end_time,
                             result,
+                            app_version,
+                            client_type,
                         ]
                     )
             elif type(result_data["results"]) is list:
@@ -303,6 +307,8 @@ def results_to_file(
                                 start_time,
                                 end_time,
                                 result,
+                                app_version,
+                                client_type,
                             ]
                         )
             else:
@@ -361,6 +367,8 @@ def save_results_to_postgres(
         "start_time",
         "end_time",
         "result",
+        "app_version",
+        "client_type",
     ]
     p_con.copy_from(results_file, result_temp_table, columns)
     results_file.close()
@@ -420,9 +428,11 @@ def save_results_to_postgres(
                 nextval('mapping_sessions_mapping_session_id_seq'),
                 min(start_time),
                 max(end_time),
-                count(*)
+                count(*),
+                app_version,
+                client_type
             FROM {result_temp_table}
-            GROUP BY project_id, group_id, user_id
+            GROUP BY project_id, group_id, user_id, app_version, client_type
         ON CONFLICT (project_id,group_id,user_id)
         DO NOTHING;
         INSERT INTO {result_table}

mapswipe_workers/mapswipe_workers/generate_stats/project_stats.py

@@ -121,6 +121,8 @@ def get_results(
                 ms.start_time as timestamp,
                 ms.start_time,
                 ms.end_time,
+                ms.app_version,
+                ms.client_type,
                 {result_sql},
                 -- the username for users which login to MapSwipe with their
                 -- OSM account is not defined or ''.

mapswipe_workers/mapswipe_workers/project_types/tile_map_service/change_detection/tutorial.py

@@ -1,11 +1,19 @@
+from dataclasses import asdict, dataclass
+
 from mapswipe_workers.definitions import logger
 from mapswipe_workers.project_types.tile_map_service.tutorial import (
     TileMapServiceBaseTutorial,
+    TileMapServiceBaseTutorialTask,
 )
 from mapswipe_workers.project_types.tile_server import BaseTileServer
 from mapswipe_workers.utils import tile_functions
 
 
+@dataclass
+class ChangeDetectionTutorialTask(TileMapServiceBaseTutorialTask):
+    urlB: str
+
+
 class ChangeDetectionTutorial(TileMapServiceBaseTutorial):
     """The subclass for an TMS Grid based Tutorial."""
 
@@ -36,11 +44,16 @@ def create_tutorial_tasks(self):
 
         super().create_tutorial_tasks()
 
+        modified_tasks = []
         for task in self.tasks[101]:
             _, tile_x, tile_y = task.taskId_real.split("-")
-            task.urlB = tile_functions.tile_coords_zoom_and_tileserver_to_url(
+            urlB = tile_functions.tile_coords_zoom_and_tileserver_to_url(
                 int(tile_x), int(tile_y), self.zoomLevel, self.tileServerB
             )
+            modified_tasks.append(
+                ChangeDetectionTutorialTask(**asdict(task), urlB=urlB)
+            )
+        self.tasks[101] = modified_tasks
 
         logger.info(
             f"{self.projectId}"

mapswipe_workers/mapswipe_workers/project_types/tile_map_service/completeness/tutorial.py

@@ -1,11 +1,19 @@
+from dataclasses import asdict, dataclass
+
 from mapswipe_workers.definitions import logger
 from mapswipe_workers.project_types.tile_map_service.tutorial import (
     TileMapServiceBaseTutorial,
+    TileMapServiceBaseTutorialTask,
 )
 from mapswipe_workers.project_types.tile_server import BaseTileServer
 from mapswipe_workers.utils import tile_functions
 
 
+@dataclass
+class CompletenessTutorialTask(TileMapServiceBaseTutorialTask):
+    urlB: str
+
+
 class CompletenessTutorial(TileMapServiceBaseTutorial):
     """The subclass for an TMS Grid based Tutorial."""
 
@@ -36,11 +44,14 @@ def create_tutorial_tasks(self):
 
         super().create_tutorial_tasks()
 
+        modified_tasks = []
         for task in self.tasks[101]:
             _, tile_x, tile_y = task.taskId_real.split("-")
-            task.urlB = tile_functions.tile_coords_zoom_and_tileserver_to_url(
+            urlB = tile_functions.tile_coords_zoom_and_tileserver_to_url(
                 int(tile_x), int(tile_y), self.zoomLevel, self.tileServerB
             )
+            modified_tasks.append(CompletenessTutorialTask(**asdict(task), urlB=urlB))
+        self.tasks[101] = modified_tasks
 
         logger.info(
             f"{self.projectId}"

mapswipe_workers/mapswipe_workers/project_types/tile_map_service/tutorial.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import Dict, List
+from typing import Dict, List, Union
 
 from mapswipe_workers.definitions import logger
 from mapswipe_workers.firebase.firebase import Firebase
@@ -25,8 +25,8 @@ class TileMapServiceBaseTutorial(BaseTutorial):
     def __init__(self, tutorial_draft):
         super().__init__(tutorial_draft)
 
-        self.groups: Dict[str, TileMapServiceBaseGroup] = {}
-        self.tasks: Dict[str, List[TileMapServiceBaseTutorialTask]] = (
+        self.groups: Dict[Union[str, int], TileMapServiceBaseGroup] = {}
+        self.tasks: Dict[Union[str, int], List[TileMapServiceBaseTutorialTask]] = (
             {}
         )  # dict keys are group ids
 

mapswipe_workers/mapswipe_workers/utils/api_calls.py

@@ -149,7 +149,7 @@ def remove_noise_and_add_user_info(json: dict) -> dict:
     for i, subset in enumerate(chunk_list):
         changeset_results = query_osmcha(subset, changeset_results)
         progress = round(100 * ((i + 1) / len(chunk_list)), 1)
-        logger.info(f"finished query {i+1}/{len(chunk_list)}, {progress}")
+        logger.info(f"finished query {i + 1}/{len(chunk_list)}, {progress}")
 
     missing_ids = [i for i, v in changeset_results.items() if v is None]
     chunk_list = chunks(missing_ids, batch_size)
@@ -160,7 +160,7 @@ def remove_noise_and_add_user_info(json: dict) -> dict:
     for i, subset in enumerate(chunk_list):
         changeset_results = query_osm(subset, changeset_results)
         progress = round(100 * ((i + 1) / len(chunk_list)), 1)
-        logger.info(f"finished query {i+1}/{len(chunk_list)}, {progress}")
+        logger.info(f"finished query {i + 1}/{len(chunk_list)}, {progress}")
 
     for feature in json["features"]:
         changeset = changeset_results[int(feature["properties"]["changesetId"])]

mapswipe_workers/tests/integration/set_up.py

@@ -85,7 +85,15 @@ def create_test_project(
         set_postgres_test_data(project_type, "users", "user")
         set_firebase_test_data(project_type, "user_groups", "user_group", "")
         set_firebase_test_data(project_type, "results", fixture_name, project_id)
-        set_postgres_test_data(project_type, "mapping_sessions", fixture_name)
+        set_postgres_test_data(project_type, "mapping_sessions", fixture_name, columns=[
+            "project_id",
+            "group_id",
+            "user_id",
+            "mapping_session_id",
+            "start_time",
+            "end_time",
+            "items_count",
+        ])
         set_postgres_test_data(project_type, mapping_sessions_results, fixture_name)
         if create_user_group_session_data:
             set_postgres_test_data(

mapswipe_workers/tests/integration/set_up_db.sql

@@ -91,7 +91,9 @@ CREATE TABLE IF NOT EXISTS results_temp (
     "timestamp" timestamp,
     start_time timestamp,
     end_time timestamp,
-    result int
+    result int,
+    app_version varchar,
+    client_type varchar
 );
 
 -- create table for results import through csv
@@ -103,7 +105,9 @@ CREATE TABLE IF NOT EXISTS results_geometry_temp (
     "timestamp" timestamp,
     start_time timestamp,
     end_time timestamp,
-    result varchar
+    result varchar,
+    app_version varchar,
+    client_type varchar
 );
 
 
@@ -175,6 +179,8 @@ CREATE TABLE IF NOT EXISTS mapping_sessions (
     start_time timestamp DEFAULT NULL,
     end_time timestamp DEFAULT NULL,
     items_count int2 not null,
+    app_version varchar,
+    client_type varchar,
     PRIMARY KEY (project_id, group_id, user_id),
     FOREIGN KEY (project_id, group_id)
     REFERENCES groups (project_id, group_id),