fix NoneType in delete results

Author: Herfort

mapswipe_workers/basic/BaseProject.py

@@ -187,7 +187,10 @@ def set_groups_progress_postgres(self, postgres, groups_progress_list):
                     {} as b
                 WHERE 
                     groups.group_id = b.group_id
-                    and groups.project_id = b.project_id;
+                    and
+                    groups.project_id = b.project_id
+                    and
+                    groups.completedcount =! b.completedcount;
                 DROP TABLE IF EXISTS {};
                         '''
         sql_insert = sql.SQL(sql_insert).format(sql.Identifier(groups_progress_tablename),

tests/test_terminate.py

@@ -22,19 +22,23 @@ def delete_sample_data_from_firebase(firebase, project_id, import_key):
     # get all results from firebase
     all_results = fb_db.child("results").get().val()
 
-    data = {}
-    for task_id, results in all_results.items():
-        for child_id, result in results.items():
-
-            if result['data']['projectId'] == project_id:
-                key = 'results/{task_id}/{child_id}'.format(
-                    task_id=task_id,
-                    child_id=child_id)
-
-                data[key] = None
-
-    fb_db.update(data)
-    print('deleted all results for project %s' % project_id)
+    if not all_results:
+        print('there are no results in firebase')
+        pass
+    else:
+        data = {}
+        for task_id, results in all_results.items():
+            for child_id, result in results.items():
+
+                if result['data']['projectId'] == project_id:
+                    key = 'results/{task_id}/{child_id}'.format(
+                        task_id=task_id,
+                        child_id=child_id)
+
+                    data[key] = None
+
+        fb_db.update(data)
+        print('deleted all results for project %s' % project_id)