Merge pull request #790 from mapswipe/revert-789-refactor-python-workers

Revert "Refactor python workers"

Author: Hagellach37

mapswipe_workers/mapswipe_workers/project_types/base/project.py

@@ -91,13 +91,6 @@ def __init__(self, project_draft):
 
         self.tutorialId = project_draft.get("tutorialId", None)
 
-        # currently crowdmap specific attributes todo: discuss in group if empty attributes in mapswipe postgres are ok
-        self.language = "en-us" if "language" not in project_draft.keys() else project_draft["language"]
-        self.appId = None if "appId" not in project_draft.keys() else project_draft["appId"]
-        self.manualUrl = None if "manualUrl" not in project_draft.keys() else project_draft["manualUrl"]
-
-
-
     # TODO: Implement resultRequiredCounter as property.
     # Does not work because for some reason project['group'] = vars()
     # and then del project['group'] will delete also project.group.
@@ -179,11 +172,15 @@ def save_project(self):
             raise CustomError(e)
 
         try:
-            self.save_to_firebase(
+            self.save_project_to_firebase(project)
+            self.save_groups_to_firebase(project["projectId"], groups)
+            self.save_tasks_to_firebase(project["projectId"], groupsOfTasks)
+
+            """self.save_to_firebase(
                 project,
                 groups,
                 groupsOfTasks,
-            )
+            )"""
             logger.info(
                 f"{self.projectId}" f" - the project has been saved" f" to firebase"
             )

mapswipe_workers/mapswipe_workers/project_types/tile_classification/project.py

@@ -19,19 +19,13 @@ def __init__(self, project_draft: dict):
         self.zoomLevel = int(project_draft.get("zoomLevel", 18))
         self.tileServer = vars(BaseTileServer(project_draft["tileServer"]))
 
-
     def validate_geometries(self):
         # TODO rename attribute validInputGeometries, it is a path to a geojson.
         self.validInputGeometries = save_geojson_to_file(self.projectId, self.geometry)
         wkt_geometry = validate_geometries(
             self.projectId, self.zoomLevel, self.validInputGeometries
         )
         return wkt_geometry
-      
-    def save_to_firebase(self, project, groups, groupsOfTasks):
-        self.save_project_to_firebase(project)
-        self.save_groups_to_firebase(project["projectId"], groups)
-        self.save_tasks_to_firebase(project["projectId"], groupsOfTasks)
 
     def save_project_to_firebase(self, project):
         firebase = Firebase()