Merge pull request #606 from mapswipe/dev

Dev - fix missing username for users with osm account

Author: Hagellach37

mapswipe_workers/mapswipe_workers/generate_stats/project_stats.py

@@ -112,7 +112,14 @@ def get_results(filename: str, project_id: str) -> pd.DataFrame:
                 ms.start_time,
                 ms.end_time,
                 msr.result,
-                U.username
+                -- the username for users which login to MapSwipe with their
+                -- OSM account is not defined or ''.
+                -- We capture this here as it will cause problems
+                -- for the user stats generation.
+                CASE
+                    WHEN U.username IS NULL or U.username = '' THEN 'unknown'
+                    ELSE U.username
+                END as username
             FROM mapping_sessions_results msr
             LEFT JOIN mapping_sessions ms ON
                 ms.mapping_session_id = msr.mapping_session_id
@@ -185,6 +192,14 @@ def get_tasks(filename: str, project_id: str) -> pd.DataFrame:
         write_sql_to_gzipped_csv(filename, sql_query)
 
     df = load_df_from_csv(filename)
+
+    # Tasks for the "footprint" project type can contain a "username" attribute.
+    # We rename this attribute into "osm_username" to be able to distinguish it
+    # later from the username of the MapSwipe user.
+    # The optional OSM username in the tasks of the "footprint" project type refers
+    # to the OSM user who has last edited the OSM object.
+    if "username" in df.columns:
+        df.rename(columns={"username": "osm_username"}, inplace=True)
     return df