Merge branch 'master' into dev

Author: Hagellach37

README.md

@@ -10,7 +10,7 @@ The MapSwipe Back-End consists of a number of components:
 3. Manager Dashboard
 5. API
 
-Please refer to the documentation for more information: https://mapswipe-workers.readthedocs.io/en/
+Please refer to the documentation for more information: https://mapswipe-workers.readthedocs.io/
 
 
 ## Ressources

postgres/scripts/v1_to_v2/copy_results.sh

@@ -10,7 +10,7 @@ do
     python3 generate_copy_to_csv.py $project_id
 
     echo "Run copy_to_csv.sql using copy_restuls_to_csv.sh (Get all results of this projects from old production database)"
-    ./copy_results_to_csv.sh
+    ./copy_to_csv.sh
 
     echo "Run copy_from_csv.sh to insert all results of this project into new production database"
     ./copy_from_csv.sh

postgres/scripts/v1_to_v2/copy_results_from_csv.sql

@@ -5,6 +5,27 @@
 /* Goal: assign results based on tasks to a group */
 /* Problem: there are tasks belonging to 2 different groups */
 
+/* Make sure to find out all duplicated tasks beforehand:
+/* Create duplicated flag for tasks*/
+/* ALTER TABLE*/
+/*     tasks*/
+/* ADD COLUMN*/
+/*     duplicated boolean DEFAULT false;*/
+
+/* Set duplicated tasks */
+/* (tasks with same ID and geometry occurring in two different groups) */
+/* UPDATE*/
+/*     tasks t1*/
+/* SET*/
+/*     duplicated = true*/
+/* FROM*/
+/*     tasks t2*/
+/* WHERE*/
+/*     t1.task_id = t2.task_id*/
+/*     AND t1.project_id = t2.project_id*/
+/*     AND t1.group_id != t2.group_id;*/
+
+
 CREATE TEMP TABLE v1_results(
     project_id varchar,
     group_id varchar DEFAULT NULL,
@@ -33,25 +54,6 @@ WHERE result IS NULL;
 UPDATE v1_results
 SET timestamp = TO_TIMESTAMP(timeint/1000);
 
-/* Create duplicated flag for tasks*/
-ALTER TABLE
-    tasks
-ADD COLUMN
-    duplicated boolean DEFAULT false;
-
-/* Set duplicated tasks */
-/* (tasks with same ID and geometry occurring in two different groups) */
-UPDATE
-    tasks t1
-SET
-    duplicated = true
-FROM
-    tasks t2
-WHERE
-    t1.task_id = t2.task_id
-    AND t1.project_id = t2.project_id
-    AND t1.group_id != t2.group_id;
-
 /* Set group_id of v1_results for non-duplicated tasks */
 UPDATE
     v1_results r
@@ -139,9 +141,3 @@ SELECT
 FROM
     user_results
 ON CONFLICT (project_id, group_id, task_id, user_id) DO NOTHING;
-
-
-ALTER TABLE
-    tasks
-DROP COLUMN
-    duplicated;

postgres/scripts/v1_to_v2/copy_to_csv.sh

@@ -4,12 +4,13 @@
 USER=mapswipe-workers
 NAME=mapswipe
 [email protected]
+PGPASSWORD=yourpass
 
 # Create a ssh tunnel in the background and save PID
 ssh -Cfo ExitOnForwardFailure=yes -NL 1111:localhost:5432 ${SSH_REMOTE_HOST}
 PID=$(pgrep -f 'NL 1111:')
 
-psql -p 1111 -h localhost -U ${USER} -d ${NAME} -a -f copy_to_csv.sql
-psql -p 1111 -h localhost -U ${USER} -d ${NAME} -a -f copy_results_to_csv.sql
+PGPASSWORD=$PGPASSWORD psql -p 1111 -h localhost -U ${USER} -d ${NAME} -a -f copy_to_csv.sql
+PGPASSWORD=$PGPASSWORD psql -p 1111 -h localhost -U ${USER} -d ${NAME} -a -f copy_results_to_csv.sql
 
 kill ${PID}