Merge pull request #177 from mapswipe/dev

fix update when there are no project

Author: Hagellach37

mapswipe_workers/mapswipe_workers/firebase_to_postgres/update_data.py

@@ -115,17 +115,18 @@ def update_project_data(project_ids=None):
         projects_ref = fb_db.reference('v2/projects/')
         projects = projects_ref.get()
 
-    for project_id, project in projects.items():
-        query_update_project = '''
-            UPDATE projects
-            SET status=%s
-            WHERE project_id=%s;
-        '''
-        # TODO: Is there need for fallback to ''
-        # if project.status is not existent
-        data_update_project = [project.get('status', ''), project_id]
-        pg_db.query(query_update_project, data_update_project)
-        logger.info(f"updated status for project {project_id} in postgres")
+    if projects:
+        for project_id, project in projects.items():
+            query_update_project = '''
+                UPDATE projects
+                SET status=%s
+                WHERE project_id=%s;
+            '''
+            # TODO: Is there need for fallback to ''
+            # if project.status is not existent
+            data_update_project = [project.get('status', ''), project_id]
+            pg_db.query(query_update_project, data_update_project)
+            logger.info(f"updated status for project {project_id} in postgres")
 
     del(pg_db)
 

test_config.py

@@ -151,6 +151,13 @@ def test_nginx_config():
     assert 'SERVER_NAME' in env_variables, \
         f"you didn't set a SERVER_NAME in {file_path}"
 
+    for line in env_variables.split('\n'):
+        if len(line) > 0:
+            variable_name = line.split('=')[0]
+            variable_value = line.split('=')[1].strip('"')
+            if variable_name == 'SERVER_NAME':
+                server_name = variable_value
+
     file_path = 'nginx/nginx.conf'
     assert os.path.isfile(file_path), \
         f"you didn't set up config file: {file_path}"
@@ -161,9 +168,6 @@ def test_nginx_config():
     assert 'server_name' in nginx_config, \
         f"you didn't set server_name in: {file_path}"
 
-    # TODO: get server name from nginx config file or .env
-    server_name = 'dev.mapswipe.org'
-
     file_path = f'/etc/letsencrypt/live/{server_name}/fullchain.pem'
     assert os.path.isfile(file_path), \
         f"you didn't set up ssl certificate: {file_path}"