Merge pull request #252 from hydroserver2/330-permissions-and-app-enhancements

330 permissions and app enhancements

Author: kjlippold

api/__init__.py domains/__init__.pyapi/__init__.py renamed to domains/__init__.py

@@ -1,6 +1,6 @@
 from django.urls import path
 from django.contrib import admin
-from etl.models import OrchestrationSystem, DataConnection, Task, TaskMapping, TaskMappingPath, TaskRun
+from domains.etl.models import OrchestrationSystem, DataConnection, Task, TaskMapping, TaskMappingPath, TaskRun
 from hydroserver.admin import VocabularyAdmin
 
 

api/management/__init__.py domains/etl/__init__.pyapi/management/__init__.py renamed to domains/etl/__init__.py

@@ -0,0 +1,8 @@
+from django.apps import AppConfig
+
+
+class EtlConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "domains.etl"
+    label = "etl"
+    verbose_name = "Extract Transform Load"

etl/admin.py domains/etl/admin.pyetl/admin.py renamed to domains/etl/admin.py

@@ -7,10 +7,10 @@
 from datetime import datetime
 from django.db.models import Min, Value
 from django.db.models.functions import Coalesce
-from etl.models import Task
-from sta.services import ObservationService
-from sta.models import Datastream
-from sta.schemas.observation import ObservationBulkPostBody
+from domains.etl.models import Task
+from domains.sta.services import ObservationService
+from domains.sta.models import Datastream
+from interfaces.api.schemas.observation import ObservationBulkPostBody
 
 observation_service = ObservationService()
 

domains/etl/apps.py

@@ -1,6 +1,6 @@
 # Generated by Django 5.2b1 on 2025-04-15 21:58
 
-import iam.models.utils
+import domains.iam.models.utils
 import uuid6
 from django.db import migrations, models
 
@@ -43,7 +43,7 @@ class Migration(migrations.Migration):
             options={
                 "abstract": False,
             },
-            bases=(models.Model, iam.models.utils.PermissionChecker),
+            bases=(models.Model, domains.iam.models.utils.PermissionChecker),
         ),
         migrations.CreateModel(
             name="DataSource",
@@ -76,7 +76,7 @@ class Migration(migrations.Migration):
             options={
                 "abstract": False,
             },
-            bases=(models.Model, iam.models.utils.PermissionChecker),
+            bases=(models.Model, domains.iam.models.utils.PermissionChecker),
         ),
         migrations.CreateModel(
             name="OrchestrationSystem",
@@ -93,6 +93,6 @@ class Migration(migrations.Migration):
                 ("name", models.CharField(max_length=255)),
                 ("orchestration_system_type", models.CharField(max_length=255)),
             ],
-            bases=(models.Model, iam.models.utils.PermissionChecker),
+            bases=(models.Model, domains.iam.models.utils.PermissionChecker),
         ),
     ]

…tures/default_orchestration_systems.yaml …tures/default_orchestration_systems.yamletl/fixtures/default_orchestration_systems.yaml renamed to domains/etl/fixtures/default_orchestration_systems.yaml etl/fixtures/default_orchestration_systems.yaml renamed to domains/etl/fixtures/default_orchestration_systems.yaml

@@ -1,7 +1,7 @@
 # Generated by Django 5.2.5 on 2025-11-25 16:26
 
 import django.db.models.deletion
-import iam.models.utils
+import domains.iam.models.utils
 import uuid6
 from django.db import migrations, models
 from django.utils import timezone
@@ -282,7 +282,7 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            bases=(models.Model, iam.models.utils.PermissionChecker),
+            bases=(models.Model, domains.iam.models.utils.PermissionChecker),
         ),
         migrations.CreateModel(
             name="Task",
@@ -337,7 +337,7 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            bases=(models.Model, iam.models.utils.PermissionChecker),
+            bases=(models.Model, domains.iam.models.utils.PermissionChecker),
         ),
         migrations.CreateModel(
             name="TaskMapping",