Add urlB to dataclass to pass data to firebase

NOTE: dataclasses.asdict is used to convert dataclass to dict to json for firebase

Author: thenav56

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