Merge pull request #265 from mapswipe/scheduling

Rewrite of the cli mapswipe_workers.py.

Author: Matthias-Schaub

docker-compose.yaml

@@ -53,7 +53,7 @@ services:
             context: mapswipe_workers/
         depends_on:
             - postgres
-        command: mapswipe_workers --verbose run --schedule m
+        command: mapswipe_workers --verbose run --schedule
         volumes:
             - ./api-data:/var/lib/mapswipe_workers/api-data/:rw
             - ./api-data/agg_results:/var/lib/mapswipe_workers/api-data/agg_results:rw

mapswipe_workers/mapswipe_workers/base/base_project.py

@@ -79,7 +79,7 @@ def __init__(self, project_draft):
     # def resultRequiredCounter(self):
     #     return self.resultRequiredCounter
 
-    def save_project(self, fb_db):
+    def save_project(self):
         """
         Creates a projects with groups and tasks
         and saves it in firebase and postgres
@@ -131,7 +131,6 @@ def save_project(self, fb_db):
                     )
             try:
                 self.save_to_firebase(
-                        fb_db,
                         project,
                         groups,
                         groupsOfTasks,
@@ -161,7 +160,7 @@ def save_project(self, fb_db):
                     )
             raise CustomError(e)
 
-    def save_to_firebase(self, fb_db, project, groups, groupsOfTasks):
+    def save_to_firebase(self, project, groups, groupsOfTasks):
 
         # remove wkt geometry attribute of projects and tasks
         project.pop('geometry', None)
@@ -170,6 +169,7 @@ def save_to_firebase(self, fb_db, project, groups, groupsOfTasks):
                 groupsOfTasks[group_id][i].pop('geometry', None)
 
 
+        fb_db = auth.firebaseDB()
         ref = fb_db.reference('')
         # save project
         ref.update({