fixed bug for when sql statements for projects gets generated

Author: Matthias-Schaub

postgres/scripts/v1_to_v2/copy_from_csv.sh

@@ -2,11 +2,13 @@
 
 USER="mapswipe_workers"
 NAME="mapswipe"
-#tasks users results
-for entity in users results
+
+for entity in projects groups tasks users results
 do
     psql -h localhost -p 5432 -U ${USER} -d ${NAME} -a -f copy_${entity}_from_csv.sql
 done
+
+# Commands if docker postgres port is not exposed:
 # docker cp ${entity}.csv mapswipe_postgres:${entity}.csv
 # docker cp copy_${entity}_from_csv.sql mapswipe_postgres:copy_${entity}_from_csv.sql
 # docker exec -t mapswipe_postgres psql -U ${USER} -d ${NAME} -a -f copy_${entity}_from_csv.sql

postgres/scripts/v1_to_v2/copy_results_to_csv.sql

@@ -1,4 +1,4 @@
 -- Export v1 MapSwipe data to csv.
 -- Rename attributes to conform to v2.
 \copy (SELECT user_id, username FROM users) TO users.csv WITH (FORMAT CSV, DELIMITER ",", HEADER TRUE);
-\copy (SELECT project_id, task_id, user_id, timestamp as "timeint", info FROM results WHERE project_id = 5519) TO results.csv WITH (FORMAT CSV, DELIMITER ",", HEADER TRUE);
+\copy (SELECT project_id, task_id, user_id, timestamp as "timeint", info FROM results WHERE project_id = 5549) TO results.csv WITH (FORMAT CSV, DELIMITER ",", HEADER TRUE);

postgres/scripts/v1_to_v2/copy_to_csv.sql

@@ -1,6 +1,6 @@
 -- Export v1 MapSwipe data to csv.
 -- Rename attributes to conform to v2.
-\copy (SELECT archive, image, importkey as "import_id", isfeatured AS "is_featured", lookfor AS "look_for", name, progress, projectdetails AS "project_details", project_id, project_type, state AS "status", info AS "project_type_specifics" FROM projects WHERE project_id = 5519) TO projects.csv WITH (FORMAT CSV, DELIMITER ",", HEADER TRUE);
-\copy (SELECT i.import_id, i.info FROM imports i, projects p WHERE p.project_id = 5519 AND p.importkey = i.import_id) TO imports.csv WITH (FORMAT CSV, DELIMITER ",", HEADER TRUE);
-\copy (SELECT project_id, group_id, count as "number_of_tasks", completedcount as "finished_count", verificationcount as "required_count", info as "project_type_specifics" FROM groups WHERE project_id = 5519 ) TO groups.csv WITH (FORMAT CSV, DELIMITER ",", HEADER TRUE);
-\copy (SELECT project_id, group_id, task_id, info as "project_type_specifics" FROM tasks WHERE project_id = 5519) TO tasks.csv WITH (FORMAT CSV, DELIMITER ",", HEADER TRUE);
+\copy (SELECT archive, image, importkey as "import_id", isfeatured AS "is_featured", lookfor AS "look_for", name, progress, projectdetails AS "project_details", project_id, project_type, state AS "status", info AS "project_type_specifics" FROM projects WHERE project_id in (select project_id from results group by project_id) AND project_id = 5549) TO projects.csv WITH (FORMAT CSV, DELIMITER ",", HEADER TRUE);
+\copy (SELECT i.import_id, i.info FROM imports i, projects p WHERE import_id in (select importkey as import_id from projects) AND p.project_id = 5549 AND p.importkey = i.import_id) TO imports.csv WITH (FORMAT CSV, DELIMITER ",", HEADER TRUE);
+\copy (SELECT project_id, group_id, count as "number_of_tasks", completedcount as "finished_count", verificationcount as "required_count", info as "project_type_specifics" FROM groups WHERE project_id in (select project_id from results group by project_id) AND project_id = 5549 ) TO groups.csv WITH (FORMAT CSV, DELIMITER ",", HEADER TRUE);
+\copy (SELECT project_id, group_id, task_id, info as "project_type_specifics" FROM tasks WHERE project_id in (select project_id from results group by project_id) AND project_id = 5549) TO tasks.csv WITH (FORMAT CSV, DELIMITER ",", HEADER TRUE);

postgres/scripts/v1_to_v2/generate_copy_to_csv.py

@@ -2,23 +2,24 @@
 
 
 def get_query(project_ids):
+    clause = 'WHERE project_id in (select project_id from results group by project_id)'
+    clause_import = 'WHERE import_id in (select importkey as import_id from projects)'
     if project_ids is None:
-        clause = ''
-        clause_import = ''
+        pass
     elif len(project_ids) == 1:
-        clause = f'WHERE project_id = {project_ids[0]}'
-        clause_import = f'WHERE p.project_id = {project_ids[0]} AND p.importkey = i.import_id'
+        clause = f'{clause} AND project_id = {project_ids[0]}'
+        clause_import = f', projects p {clause_import} AND p.project_id = {project_ids[0]} AND p.importkey = i.import_id'
     else:
-        clause = f'WHERE project_id = {project_ids[0]}'
-        clause_import = f'WHERE p.project_id = {project_ids[0]} AND p.importkey = i.import_id'
+        clause = f'{clause} AND project_id = {project_ids[0]}'
+        clause_import = f', projects p {clause_import} AND p.project_id = {project_ids[0]} AND p.importkey = i.import_id'
         for project_id in project_ids[1:]:
             clause = clause + f' OR project_id = {project_id}'
             clause_import = clause + f' OR p.project_id = {project_id} AND p.importkey = i.import_id'
 
     query = f'-- Export v1 MapSwipe data to csv.\n' \
             f'-- Rename attributes to conform to v2.\n' \
             f'\copy (SELECT archive, image, importkey as "import_id", isfeatured AS "is_featured", lookfor AS "look_for", name, progress, projectdetails AS "project_details", project_id, project_type, state AS "status", info AS "project_type_specifics" FROM projects {clause}) TO projects.csv WITH (FORMAT CSV, DELIMITER ",", HEADER TRUE);\n' \
-            f'\copy (SELECT i.import_id, i.info FROM imports i, projects p {clause_import}) TO imports.csv WITH (FORMAT CSV, DELIMITER ",", HEADER TRUE);\n' \
+            f'\copy (SELECT i.import_id, i.info FROM imports i {clause_import}) TO imports.csv WITH (FORMAT CSV, DELIMITER ",", HEADER TRUE);\n' \
             f'\copy (SELECT project_id, group_id, count as "number_of_tasks", completedcount as "finished_count", verificationcount as "required_count", info as "project_type_specifics" FROM groups {clause} ) TO groups.csv WITH (FORMAT CSV, DELIMITER ",", HEADER TRUE);\n' \
             f'\copy (SELECT project_id, group_id, task_id, info as "project_type_specifics" FROM tasks {clause}) TO tasks.csv WITH (FORMAT CSV, DELIMITER ",", HEADER TRUE);\n'
     return query