Feature/measurement creation

.github/workflows/deploy.yml

@@ -4,6 +4,9 @@ on:
   push:
     branches:
       - master
+  pull_request:
+    branches:
+      - master
   release:
     types: [published]
   issue_comment:
@@ -50,6 +53,33 @@ jobs:
         if: always()
         run: docker compose -p "ci-${{ github.run_id }}" -f docker-compose.yml down -v
 
+  build-check:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request'
+    strategy:
+      matrix:
+        include:
+          - component: backend
+            dockerfile: backend.Dockerfile
+          - component: frontend
+            dockerfile: frontend.Dockerfile
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build Docker image (${{ matrix.component }})
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ${{ matrix.dockerfile }}
+          push: false
+          build-args: |
+            GIT_COMMIT=${{ github.sha }}
+            GIT_BRANCH=${{ github.head_ref }}
+
   # Determine deployment environment
   prepare:
     runs-on: ubuntu-latest

.gitignore

@@ -18,7 +18,7 @@ dist/
 downloads/
 eggs/
 .eggs/
-lib/
+/lib/
 lib64/
 parts/
 sdist/

.vscode/tasks.json

@@ -1,23 +1,64 @@
 {
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "label": "Test backend (all)",
-      "type": "shell",
-      "command": "docker",
-      "args": ["compose", "exec", "backend", "pytest", "DOSPORTAL/tests/"],
-      "group": "test",
-      "problemMatcher": []
-    },
-    {
-      "label": "Test backend (path)",
-      "type": "shell",
-      "command": "docker",
-      "args": ["compose", "exec", "backend", "pytest", "${input:testPath}"],
-      "group": "test",
-      "problemMatcher": []
-    }
-  ],
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"label": "Test backend",
+			"type": "shell",
+			"command": "docker compose exec backend pytest DOSPORTAL/tests/",
+			"problemMatcher": []
+		},
+		{
+			"label": "docker compose down",
+			"type": "shell",
+			"command": "docker compose down",
+			"problemMatcher": []
+		},
+		{
+			"label": "docker compose up build",
+			"type": "shell",
+			"command": "docker compose up -d --build",
+			"problemMatcher": []
+		},
+		{
+			"label": "rebuild project",
+			"dependsOn": [
+				"docker compose down",
+				"docker compose up build"
+			],
+			"dependsOrder": "sequence"
+		},
+		{
+			"label": "makemigrations & migrate",
+			"dependsOn": [
+				"docker compose makemigrations",
+				"docker compose migrate"
+			],
+			"dependsOrder": "sequence"
+		},
+		{
+			"label": "docker compose makemigrations",
+			"type": "shell",
+			"command": "docker compose exec backend python manage.py makemigrations"
+		},
+		{
+			"label": "docker compose migrate",
+			"type": "shell",
+			"command": "docker compose exec backend python manage.py migrate"
+		},
+		{
+			"label": "orval gen api",
+			"type": "shell",
+			"command": "docker compose exec frontend npm run generate-api"
+		},
+		{
+		"label": "Test backend (path)",
+		"type": "shell",
+		"command": "docker",
+		"args": ["compose", "exec", "backend", "pytest", "${input:testPath}"],
+		"group": "test",
+		"problemMatcher": []
+		}
+	],
   "inputs": [
     {
       "id": "testPath",

backend/DOSPORTAL/admin.py

@@ -14,6 +14,7 @@
     Flight,
     MeasurementDataFlight,
     MeasurementCampaign,
+    MeasurementSegment,
     Trajectory,
     TrajectoryPoint,
     SpectrumData,
@@ -95,6 +96,7 @@ class DetectorAdmin(admin.ModelAdmin):
 admin.site.register(Airports, AirportsAdmin)
 admin.site.register(Flight)
 admin.site.register(MeasurementDataFlight)
+admin.site.register(MeasurementSegment)
 admin.site.register(MeasurementCampaign)
 
 

backend/DOSPORTAL/migrations/0006_measurementsegment.py

@@ -0,0 +1,29 @@
+# Generated by Django 6.0.2 on 2026-02-20 14:30
+
+import django.db.models.deletion
+import uuid
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('DOSPORTAL', '0005_alter_spectralrecord_owner'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='MeasurementSegment',
+            fields=[
+                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
+                ('time_from', models.DateTimeField(blank=True, null=True, verbose_name='Segment start time')),
+                ('time_to', models.DateTimeField(blank=True, null=True, verbose_name='Segment end time')),
+                ('position', models.IntegerField(default=0, verbose_name='Position / order within measurement')),
+                ('measurement', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='segments', to='DOSPORTAL.measurement', verbose_name='Measurement')),
+                ('spectral_record', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='segments', to='DOSPORTAL.spectralrecord', verbose_name='Spectral record')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

backend/DOSPORTAL/migrations/0007_remove_measurement_records.py

@@ -0,0 +1,17 @@
+# Generated by Django 6.0.2 on 2026-02-20 14:49
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('DOSPORTAL', '0006_measurementsegment'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='measurement',
+            name='records',
+        ),
+    ]

backend/DOSPORTAL/migrations/0008_detector_deleted_at_detector_deleted_by_and_more.py

@@ -0,0 +1,106 @@
+# Generated by Django 6.0.2 on 2026-02-24 12:03
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('DOSPORTAL', '0007_remove_measurement_records'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='detector',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='detector',
+            name='deleted_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='detector',
+            name='is_deleted',
+            field=models.BooleanField(db_index=True, default=False),
+        ),
+        migrations.AddField(
+            model_name='detectorlogbook',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='detectorlogbook',
+            name='deleted_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='detectorlogbook',
+            name='is_deleted',
+            field=models.BooleanField(db_index=True, default=False),
+        ),
+        migrations.AddField(
+            model_name='file',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='file',
+            name='deleted_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='file',
+            name='is_deleted',
+            field=models.BooleanField(db_index=True, default=False),
+        ),
+        migrations.AddField(
+            model_name='measurement',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='measurement',
+            name='deleted_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='measurement',
+            name='is_deleted',
+            field=models.BooleanField(db_index=True, default=False),
+        ),
+        migrations.AddField(
+            model_name='organization',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='organization',
+            name='deleted_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='organization',
+            name='is_deleted',
+            field=models.BooleanField(db_index=True, default=False),
+        ),
+        migrations.AddField(
+            model_name='spectralrecord',
+            name='deleted_at',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='spectralrecord',
+            name='deleted_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='spectralrecord',
+            name='is_deleted',
+            field=models.BooleanField(db_index=True, default=False),
+        ),
+    ]

backend/DOSPORTAL/migrations/0009_detector_created.py

@@ -0,0 +1,18 @@
+# Generated by Django 6.0.2 on 2026-02-24 13:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('DOSPORTAL', '0008_detector_deleted_at_detector_deleted_by_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='detector',
+            name='created',
+            field=models.DateTimeField(auto_now_add=True, null=True),
+        ),
+    ]

backend/DOSPORTAL/migrations/0010_measurementartifact.py

@@ -0,0 +1,27 @@
+# Generated by Django 6.0.2 on 2026-02-27 08:40
+
+import django.db.models.deletion
+import uuid
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('DOSPORTAL', '0009_detector_created'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='MeasurementArtifact',
+            fields=[
+                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
+                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Creation time')),
+                ('artifact', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='measurement_artifacts', to='DOSPORTAL.file', verbose_name='Artifact file')),
+                ('measurement', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='artifacts', to='DOSPORTAL.measurement', verbose_name='Measurement')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

backend/DOSPORTAL/migrations/0011_measurementartifact_artifact_type.py

@@ -0,0 +1,18 @@
+# Generated by Django 6.0.2 on 2026-02-27 10:29
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('DOSPORTAL', '0010_measurementartifact'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='measurementartifact',
+            name='artifact_type',
+            field=models.CharField(choices=[('spectral', 'Processed log file into spectral file (Parquet)')], default='spectral', max_length=50, verbose_name='Artifact type'),
+        ),
+    ]

backend/DOSPORTAL/migrations/0012_alter_measurementartifact_artifact_type.py

@@ -0,0 +1,18 @@
+# Generated by Django 6.0.2 on 2026-02-27 10:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('DOSPORTAL', '0011_measurementartifact_artifact_type'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='measurementartifact',
+            name='artifact_type',
+            field=models.CharField(choices=[('spectral', 'Processed log file into spectral file (Parquet)'), ('measurement_file', 'Combined measurement parquet file')], default='spectral', max_length=50, verbose_name='Artifact type'),
+        ),
+    ]