Merge pull request #610 from mapswipe/feature/skip-footprint-area

Skip footprint mission area swiped.

Author: thenav56

django/apps/aggregated/management/commands/update_aggregated_data.py

@@ -25,14 +25,17 @@
         -- Retrieve used task groups
         WITH used_task_groups as (
             SELECT
-              MS.project_id, MS.group_id
+              MS.project_id,
+              MS.group_id
             FROM mapping_sessions MS
+                INNER JOIN projects P USING (project_id)
             WHERE
                 MS.start_time >= %(from_date)s and MS.start_time < %(until_date)s
+                AND P.project_type != 2 -- Skip for footprint type missions
             GROUP BY project_id, group_id -- To get unique
         ),
         -- Calculated area by task_groups
-        task_group_data as (
+        task_group_area_data as (
           SELECT
               project_id,
               group_id,
@@ -53,9 +56,9 @@
               MS.start_time,
               MS.end_time,
               MS.items_count as task_count,
-              TG.total_task_group_area as area_swiped
+              Coalesce(TG.total_task_group_area, 0) as area_swiped
             FROM mapping_sessions MS
-                INNER JOIN task_group_data TG USING (project_id, group_id)
+                LEFT JOIN task_group_area_data TG USING (project_id, group_id)
             WHERE
                 MS.start_time >= %(from_date)s and MS.start_time < %(until_date)s
         ),
@@ -105,15 +108,18 @@
         -- Retrieve used task groups
         WITH used_task_groups as (
             SELECT
-              MS.project_id, MS.group_id
+              MS.project_id,
+              MS.group_id
             From mapping_sessions_user_groups MSUR
                 INNER JOIN mapping_sessions MS USING (mapping_session_id)
+                INNER JOIN projects P USING (project_id)
             WHERE
                 MS.start_time >= %(from_date)s and MS.start_time < %(until_date)s
+                AND P.project_type != 2 -- Skip for footprint type missions
             GROUP BY project_id, group_id -- To get unique
         ),
         -- Calculated area by task_groups
-        task_group_data as (
+        task_group_area_data as (
           SELECT
               project_id,
               group_id,
@@ -135,10 +141,10 @@
                 MS.start_time as start_time,
                 MS.end_time as end_time,
                 MS.items_count as task_count,
-                TG.total_task_group_area as area_swiped
+                Coalesce(TG.total_task_group_area, 0) as area_swiped
             From mapping_sessions_user_groups MSUR
                 INNER JOIN mapping_sessions MS USING (mapping_session_id)
-                INNER JOIN task_group_data TG USING (project_id, group_id)
+                LEFT JOIN task_group_area_data TG USING (project_id, group_id)
             WHERE
                 MS.start_time >= %(from_date)s and MS.start_time < %(until_date)s
         ),

mapswipe_workers/mapswipe_workers/firebase_to_postgres/transfer_results.py

@@ -88,8 +88,8 @@ def transfer_results_for_project(project_id, results, filter_mode: bool = False)
                 [
                     user_group_id
                     for _, users in results.items()
-                    for _, results in users.items()
-                    for user_group_id, is_selected in results.get(
+                    for _, _results in users.items()
+                    for user_group_id, is_selected in _results.get(
                         "userGroups", {}
                     ).items()
                     if is_selected

nginx/nginx.conf.template

@@ -51,6 +51,7 @@ server {
 
     location / {
         proxy_pass http://django:80/;
+        proxy_cache_valid 502 503 0;  # Don't cache this error code.
         proxy_set_header Connection "upgrade";
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Host $host;