Merge pull request #176 from mapswipe/dev

deployment

Author: Hagellach37

deploy.sh

@@ -1,11 +1,88 @@
 git pull
+if [[ $? = 0 ]]; then
+    echo "success"
+else
+    echo "failure: $?"
+    exit
+fi
+
 python3 test_config.py
+if [[ $? = 0 ]]; then
+    echo "success"
+else
+    echo "failure: $?"
+    exit
+fi
+
 docker-compose build --no-cache postgres
+if [[ $? = 0 ]]; then
+    echo "success"
+else
+    echo "failure: $?"
+    exit
+fi
+
 docker-compose build --no-cache firebase_deploy
+if [[ $? = 0 ]]; then
+    echo "success"
+else
+    echo "failure: $?"
+    exit
+fi
+
 docker-compose build --no-cache mapswipe_workers
+if [[ $? = 0 ]]; then
+    echo "success"
+else
+    echo "failure: $?"
+    exit
+fi
+
 docker-compose build --no-cache manager_dashboard
+if [[ $? = 0 ]]; then
+    echo "success"
+else
+    echo "failure: $?"
+    exit
+fi
+
 docker-compose build --no-cache nginx
+if [[ $? = 0 ]]; then
+    echo "success"
+else
+    echo "failure: $?"
+    exit
+fi
+
 docker-compose build --no-cache api
+if [[ $? = 0 ]]; then
+    echo "success"
+else
+    echo "failure: $?"
+    exit
+fi
+
 docker-compose up -d --force-recreate postgres firebase_deploy mapswipe_workers manager_dashboard nginx api
+if [[ $? = 0 ]]; then
+    echo "success"
+else
+    echo "failure: $?"
+    exit
+fi
+
 docker logs firebase_deploy
+if [[ $? = 0 ]]; then
+    echo "success"
+else
+    echo "failure: $?"
+    exit
+fi
+
 docker ps -a
+if [[ $? = 0 ]]; then
+    echo "success"
+else
+    echo "failure: $?"
+    exit
+fi
+

mapswipe_workers/mapswipe_workers/firebase_to_postgres/update_data.py

@@ -47,40 +47,41 @@ def update_user_data(user_ids=None):
             users[user_id] = user
             logger.info(f"added user {user_id}")
 
-    for user_id, user in users.items():
-        # Convert timestamp (ISO 8601) from string to a datetime object.
-        try:
-            created = dt.datetime.strptime(
-                    user['created'].replace('Z', ''),
-                    '%Y-%m-%dT%H:%M:%S.%f'
-                    )
-        except KeyError:
-            # if user has no "created" attribute, we set it to current time
-            created = dt.datetime.utcnow().isoformat()[0:-3]+'Z'
-            logger.info(f"user {user_id} didn't have a created attribute set it to {created}")
-
-        try:
-            username = user['username']
-        except KeyError:
-            # if user has no "username" attribute, we set it to None
-            username = None
-            logger.info(f"user {user_id} didn't have a created attribute set it to {username}")
-
-        query_update_user = '''
-            INSERT INTO users (user_id, username, created)
-            VALUES(%s, %s, %s)
-            ON CONFLICT (user_id) DO UPDATE
-            SET username=%s,
-            created=%s;
-        '''
-        data_update_user = [
-                user_id,
-                username,
-                created,
-                username,
-                created,
-                ]
-        pg_db.query(query_update_user, data_update_user)
+    if users:
+        for user_id, user in users.items():
+            # Convert timestamp (ISO 8601) from string to a datetime object.
+            try:
+                created = dt.datetime.strptime(
+                        user['created'].replace('Z', ''),
+                        '%Y-%m-%dT%H:%M:%S.%f'
+                        )
+            except KeyError:
+                # if user has no "created" attribute, we set it to current time
+                created = dt.datetime.utcnow().isoformat()[0:-3]+'Z'
+                logger.info(f"user {user_id} didn't have a created attribute set it to {created}")
+
+            try:
+                username = user['username']
+            except KeyError:
+                # if user has no "username" attribute, we set it to None
+                username = None
+                logger.info(f"user {user_id} didn't have a created attribute set it to {username}")
+
+            query_update_user = '''
+                INSERT INTO users (user_id, username, created)
+                VALUES(%s, %s, %s)
+                ON CONFLICT (user_id) DO UPDATE
+                SET username=%s,
+                created=%s;
+            '''
+            data_update_user = [
+                    user_id,
+                    username,
+                    created,
+                    username,
+                    created,
+                    ]
+            pg_db.query(query_update_user, data_update_user)
 
     del(pg_db)
 

test_config.py

@@ -143,6 +143,14 @@ def test_manager_dashboard_config():
 
 
 def test_nginx_config():
+    file_path = '.env'
+
+    with open(file_path, 'r') as f:
+        env_variables = f.read()
+
+    assert 'SERVER_NAME' in env_variables, \
+        f"you didn't set a SERVER_NAME in {file_path}"
+
     file_path = 'nginx/nginx.conf'
     assert os.path.isfile(file_path), \
         f"you didn't set up config file: {file_path}"
@@ -153,7 +161,7 @@ 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
+    # 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'