Merge branch 'dev' of github.com:mapswipe/python-mapswipe-workers into dev

Author: Hagellach37

mapswipe_workers/mapswipe_workers/base/base_project.py

@@ -65,7 +65,7 @@ def __init__(self, project_draft):
         self.projectId = project_draft['projectDraftId']
         self.projectType = int(project_draft['projectType'])
         self.verificationNumber = project_draft['verificationNumber']
-        self.status = 'inactive'
+        self.status = 'new'
 
     # TODO: Implement resultRequiredCounter as property.
     # Does not work because for some reason project['group'] = vars()

mapswipe_workers/mapswipe_workers/mapswipe_workers.py

@@ -314,26 +314,29 @@ def _run_create_projects(project_draft_ids=None):
                 project.calc_required_results()
                 if project.save_project(fb_db):
                     created_project_ids.append(project.projectId)
-                    newline = '\n'
+                    newline = '\nnewline'
                     message = (
                             f'### PROJECT CREATION SUCCESSFUL ###{newline}'
                             f'Project Name: {project.name}{newline}'
                             f'Project Id: {project.projectId}{newline}'
                             f'Project Type: {project_type_names[project_type]}'
                             f'{newline}'
-                            f'Make sure to activate the project in firebase.'
+                            f'Make sure to activate the project using the manager dashboard.'
                             f'{newline}'
                             f'Happy Swiping. :)'
                             )
                     slack.send_slack_message(message)
                     logger.info(message)
             except CustomError:
+                ref = fb_db.reference(f'v2/projectDrafts/{project_draft_id}')
+                ref.set({})
                 newline = '\n'
                 message = (
                     f'### PROJECT CREATION FAILED ###{newline}'
                     f'Project Name: {project_draft["name"]}{newline}'
                     f'Project Id: {project_draft_id}{newline}'
                     f'{newline}'
+                    f'Project draft is deleted.{newline}'
                     f'Please check what went wrong.'
                 )
                 slack.send_slack_message(message)

postgres/scripts/v1_to_v2/generate_copy_to_csv.py

@@ -26,7 +26,7 @@ def get_query(project_ids):
 
 def get_result_query(project_ids):
     if project_ids is None:
-         clause = {}
+         clause = ''
     elif len(project_ids) == 1:
         clause = f'WHERE project_id = {project_ids[0]}'
     else: