Merge pull request #191 from mapswipe/dev

postgres setup and task upload

Author: Hagellach37

mapswipe_workers/mapswipe_workers/base/base_project.py

@@ -188,10 +188,12 @@ def save_to_firebase(self, fb_db, project, groups, groupsOfTasks):
         task_upload_dict = {}
 
         logger.info(f'there are {len(groupsOfTasks)} groups for this project')
+        c = 0
         for group_id, tasks_list in groupsOfTasks.items():
+            c += 1
             task_upload_dict[f'v2/tasks/{self.projectId}/{group_id}'] = tasks_list
 
-            if len(task_upload_dict) % 150 == 0:
+            if len(task_upload_dict) % 150 == 0 or c == len(groupsOfTasks):
                 ref.update(task_upload_dict)
                 logger.info(
                     f'{self.projectId} -'

postgres/initdb.sql

@@ -18,11 +18,11 @@ CREATE TABLE IF NOT EXISTS projects (
     project_details varchar,
     project_id varchar,
     project_type int,
-    project_type_specifics json,
     required_results int,
     result_count int,
     status varchar,
     verification_number int,
+    project_type_specifics json,
     PRIMARY KEY(project_id)
     );