Add check for initdb.sql and set_up_db.sql assert.

- Update testcase related to usergroup mapping table changes.
- Change Result to mapping session in test cases.

Author: thenav56

.github/workflows/actions.yml

@@ -27,6 +27,13 @@ jobs:
         black --check mapswipe_workers ../django
         flake8 --count --config setup.cfg mapswipe_workers/ ../django/
         isort --check --settings-file setup.cfg mapswipe_workers/ ../django/
+    - name: Assert check
+      run: |
+          cmp --silent ./postgres/initdb.sql ./mapswipe_workers/tests/integration/set_up_db.sql || {
+            echo 'The set_up_db.sql is not same as initdb.sql. Please do `cp ./postgres/initdb.sql ./mapswipe_workers/tests/integration/set_up_db.sql` and push';
+            diff ./postgres/initdb.sql ./mapswipe_workers/tests/integration/set_up_db.sql;
+            exit 1;
+          }
     - name:  Setup Postgres Database Container
       env:
         POSTGRES_PASSWORD: postgres

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

@@ -6,7 +6,7 @@
     AggregatedUserGroupStatData,
     AggregatedUserStatData,
 )
-from apps.existing_database.models import Result
+from apps.existing_database.models import MappingSession
 from django.core.management.base import BaseCommand
 from django.db import connection, models, transaction
 from django.utils import timezone
@@ -59,7 +59,7 @@
                 INNER JOIN mapping_sessions MS USING (mapping_session_id)
                 INNER JOIN task_data T USING (project_id, group_id, task_id)
             WHERE
-                R.timestamp >= %(from_date)s and R.timestamp < %(until_date)s
+                MS.start_time >= %(from_date)s and MS.start_time < %(until_date)s
             GROUP BY MS.project_id, MS.group_id, MS.user_id
         ),
         -- Aggregate group data
@@ -114,7 +114,7 @@
                 INNER JOIN mapping_sessions_results MSR USING (mapping_session_id)
                 INNER JOIN tasks T USING (project_id, group_id, task_id)
             WHERE
-                R.timestamp >= %(from_date)s and R.timestamp < %(until_date)s
+                MS.start_time >= %(from_date)s and MS.start_time < %(until_date)s
             GROUP BY project_id, group_id, task_id
         ),
         -- Calculated task area.
@@ -144,8 +144,8 @@
                 INNER JOIN mapping_sessions_results MSR USING (mapping_session_id)
                 INNER JOIN task_data T USING (task_id)
             WHERE
-                R.timestamp >= %(from_date)s and R.timestamp < %(until_date)s
-            GROUP BY ug.project_id, ug.group_id, ug.user_id, ug.user_group_id
+                MS.start_time >= %(from_date)s and MS.start_time < %(until_date)s
+            GROUP BY MS.project_id, MS.group_id, MS.user_id, MSUR.user_group_id
         ),
         -- Aggregate group data
         user_group_agg_data as (
@@ -193,8 +193,8 @@ def _track(self, tracker_type, label, sql):
             from_date = datetime.datetime.strptime(tracker.value, "%Y-%m-%d").date()
         else:
             self.stdout.write(f"{label.title()} Last tracker data not found.")
-            timestamp_min = Result.objects.aggregate(
-                timestamp_min=models.Min("timestamp")
+            timestamp_min = MappingSession.objects.aggregate(
+                timestamp_min=models.Min("start_time")
             )["timestamp_min"]
             if timestamp_min:
                 self.stdout.write(f"Using min timestamp from database {timestamp_min}")

django/apps/existing_database/factories.py

@@ -1,15 +1,17 @@
 import factory
 import factory.fuzzy
 from factory.django import DjangoModelFactory
+from mapswipe.utils import raise_if_field_not_found
 
 from .models import (
     Group,
+    MappingSession,
+    MappingSessionResult,
+    MappingSessionUserGroup,
     Project,
-    Result,
     Task,
     User,
     UserGroup,
-    UserGroupResult,
     UserGroupUserMembership,
 )
 
@@ -44,40 +46,29 @@ class Meta:
 
     @classmethod
     def _create(cls, model_class, *args, **kwargs):
-        if "group" not in kwargs:
-            raise Exception("Please define group")
+        raise_if_field_not_found(kwargs, ["group"])
         group = kwargs.pop("group")
         kwargs["project"] = group.project
         kwargs["group_id"] = group.group_id
         return super()._create(model_class, *args, **kwargs)
 
 
-class ResultFactory(DjangoModelFactory):
+class MappingSessionFactory(DjangoModelFactory):
     class Meta:
-        model = Result
+        model = MappingSession
 
-    @classmethod
-    def _create(cls, model_class, *args, **kwargs):
-        if "task" not in kwargs:
-            raise Exception("Please define task")
-        task = kwargs.pop("task")
-        kwargs["project"] = task.project
-        kwargs["group_id"] = task.group_id
-        kwargs["task_id"] = task.task_id
-        return super()._create(model_class, *args, **kwargs)
+
+class MappingSessionResultFactory(DjangoModelFactory):
+    class Meta:
+        model = MappingSessionResult
 
 
-class UserGroupResultFactory(DjangoModelFactory):
+class MappingSessionUserGroupFactory(DjangoModelFactory):
     class Meta:
-        model = UserGroupResult
+        model = MappingSessionUserGroup
 
     @classmethod
     def _create(cls, model_class, *args, **kwargs):
-        if "group" not in kwargs:
-            raise Exception("Please define group")
-        group = kwargs.pop("group")
-        kwargs["project"] = group.project
-        kwargs["group_id"] = group.group_id
         return super()._create(model_class, *args, **kwargs)
 
 

django/apps/existing_database/management/commands/create_dummy_existing_database_content.py

@@ -0,0 +1,63 @@
+# Generated by Django 4.1.1 on 2022-12-02 10:49
+
+import django.db.models.manager
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("existing_database", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="MappingSession",
+            fields=[
+                ("mapping_session_id", models.BigAutoField(primary_key=True)),
+                ("project_id", models.CharField(max_length=999)),
+                ("group_id", models.CharField(max_length=999)),
+                ("user_id", models.CharField(max_length=999)),
+                ("start_time", models.DateTimeField(blank=True, null=True)),
+                ("end_time", models.DateTimeField(blank=True, null=True)),
+                ("items_count", models.SmallIntegerField(default=0)),
+            ],
+            options={
+                "db_table": "mapping_sessions",
+                "managed": settings.TESTING,
+            },
+            managers=[
+                ("cte_objects", django.db.models.manager.Manager()),
+            ],
+        ),
+        migrations.CreateModel(
+            name="MappingSessionResult",
+            fields=[
+                ("mapping_session_id", models.BigIntegerField()),
+                ("task_id", models.CharField(max_length=999)),
+                ("result", models.IntegerField(blank=True, null=True)),
+            ],
+            options={
+                "db_table": "mapping_sessions_results",
+                "managed": settings.TESTING,
+            },
+            managers=[
+                ("cte_objects", django.db.models.manager.Manager()),
+            ],
+        ),
+        migrations.CreateModel(
+            name="MappingSessionUserGroup",
+            fields=[
+                ("mapping_session_id", models.BigIntegerField()),
+                ("user_group_id", models.CharField(max_length=999)),
+            ],
+            options={
+                "db_table": "mapping_sessions_user_groups",
+                "managed": settings.TESTING,
+            },
+            managers=[
+                ("cte_objects", django.db.models.manager.Manager()),
+            ],
+        ),
+    ]