Improve source views

docs/source/others/changelog.rst

@@ -9,6 +9,8 @@ Changelog
 **Improvements:**
 
 - Add "In progress" status to source
+- Source list endpoint now also return ids of related layer
+- Add author to Source
 
 **Documentation:**
 

project/geosource/migrations/0012_source_author.py

@@ -0,0 +1,26 @@
+# Generated by Django 4.1.13 on 2023-12-05 08:26
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("geosource", "0011_sourcereporting_source_status_alter_source_report"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="source",
+            name="author",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="sources",
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+    ]

project/geosource/migrations/0013_merge_20240205_1233.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.9 on 2024-02-05 12:33
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "geosource",
+            "0012_alter_commandsource_options_alter_csvsource_options_and_more",
+        ),
+        ("geosource", "0012_alter_source_status"),
+        ("geosource", "0012_source_author"),
+    ]
+
+    operations = []

project/geosource/models.py

@@ -10,6 +10,7 @@
 from celery.result import AsyncResult
 from celery.utils.log import LoggingProxy
 from django.conf import settings
+from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group
 from django.contrib.gis.gdal.error import GDALException
 from django.contrib.gis.geos import GEOSGeometry
@@ -33,6 +34,8 @@
 from .mixins import CeleryCallMethodsMixin
 from .signals import refresh_data_done
 
+User = get_user_model()
+
 # Decimal fields must be returned as float
 DEC2FLOAT = psycopg2.extensions.new_type(
     psycopg2.extensions.DECIMAL.values,
@@ -126,6 +129,9 @@ class Status(models.IntegerChoices):
     status = models.PositiveSmallIntegerField(
         choices=Status.choices, default=Status.NEED_SYNC
     )
+    author = models.ForeignKey(
+        User, related_name="sources", blank=True, null=True, on_delete=models.SET_NULL
+    )
 
     SOURCE_GEOM_ATTRIBUTE = "_geom_"
     MAX_SAMPLE_DATA = 5

project/geosource/serializers.py

@@ -173,6 +173,7 @@ class Meta:
             "name",
             "geom_type",
             "report",
+            "layers",
         )
 
     def get__type(self, instance):

project/geosource/views.py

@@ -32,6 +32,9 @@ def get_serializer_class(self):
     def get_queryset(self):
         return Source.objects.all().order_by("-id")
 
+    def perform_create(self, serializers):
+        serializers.save(author=self.request.user)
+
     @action(detail=True, methods=["get"])
     def refresh(self, request, pk):
         """Schedule a refresh now"""