Merge branch 'benni.new-project-types' of https://github.com/mapswipe/python-mapswipe-workers into benni.new-project-types

Author: maze2point0

tests/test_export_old_projects.py

@@ -0,0 +1,10 @@
+from mapswipe_workers.basic import BaseFunctions
+
+def test_export_old_projects():
+
+    project_ids = [3, 124, 5519, 13523]
+    BaseFunctions.run_export('production', project_ids)
+
+
+if __name__ == '__main__':
+    test_export_old_projects()

tests/test_mock_results.py

@@ -2,7 +2,8 @@
 import time
 import pickle
 from mapswipe_workers.basic import BaseFunctions
-
+import requests
+import json
 
 def create_build_area_result_in_firebase(
         project_id,
@@ -58,8 +59,10 @@ def simulate_user_contributions(
 
     # get groups from firebase for this project
     fb_db = firebase.database()
-    groups = fb_db.child("groups").child(project_id).order_by_child("completedCount").limit_to_first(5).get()
 
+    # temporary workaround because of faulty string encoding
+    '''
+    groups = fb_db.child("groups").child(project_id).order_by_child("completedCount").limit_to_first(5).get()
     for group in groups.each():
         group_id = group.key()
         val = group.val()
@@ -87,11 +90,53 @@ def simulate_user_contributions(
                         firebase,
                         )
             print("created footprint results in firebase")
-
+            
         # update groups completed count
         old_completed_count = fb_db.child("groups").child(project_id).child(group_id).child("completedCount").get().val()
         fb_db.child("groups").child(project_id).child(group_id).update({"completedCount":old_completed_count+1})
         print("updated completed count")
+    '''
+
+    firebase_instance = 'dev-mapswipe'
+    groups_url = 'https://{firebase_instance}.firebaseio.com/groups/{project_id}.json?orderBy=%22completedCount%22&limitToFirst=5'.format(
+        project_id=project_id,
+        firebase_instance=firebase_instance
+    )
+
+    groups = json.loads(requests.get(groups_url).text)
+    for group_id in groups.keys():
+
+        val = groups[group_id]
+        tasks = val['tasks']
+        task_ids = tasks.keys()
+
+        if project_type == 1:
+            count = val['count']
+            random_sample = random.sample(task_ids, int(count / 2))
+            for task_id in random_sample:
+                create_build_area_result_in_firebase(
+                    project_id,
+                    task_id,
+                    user_id,
+                    firebase,
+                )
+            print("created build area results in firebase")
+        elif project_type == 2:
+            for task_id in task_ids:
+                create_footprint_result_in_firebase(
+                    project_id,
+                    task_id,
+                    user_id,
+                    firebase,
+                )
+            print("created footprint results in firebase")
+
+        # update groups completed count
+        old_completed_count = fb_db.child("groups").child(project_id).child(group_id).child(
+            "completedCount").get().val()
+        fb_db.child("groups").child(project_id).child(group_id).update({"completedCount": old_completed_count + 1})
+        print("updated completed count")
+
 
 
 if __name__ == '__main__':
@@ -103,10 +148,5 @@ def simulate_user_contributions(
         imported_projects = pickle.load(f)
 
     # Generate mock results for first two of the imported projects
-    project_id = imported_projects[0][1]
-    project_type = imported_projects[0][1]
-    simulate_user_contributions(project_id, project_type, modus)
-
-    project_id = imported_projects[1][1]
-    project_type = imported_projects[1][1]
-    simulate_user_contributions(project_id, project_type, modus)
+    for import_key, project_id, project_type in imported_projects:
+        simulate_user_contributions(project_id, project_type, modus)

tests/test_update_old_projects.py

@@ -0,0 +1,10 @@
+from mapswipe_workers.basic import BaseFunctions
+
+def test_update_old_projects():
+
+    project_ids = [3, 124, 5519, 13523]
+    BaseFunctions.run_update('production', project_ids)
+
+
+if __name__ == '__main__':
+    test_update_old_projects()