Model redesign

.gitignore

@@ -1,4 +1,7 @@
 .terraform/
+postgres/*
+minio/*
+rabbitmq/*
 .vscode/
 staticfiles/
 sample_data/**/*

docker-compose.yml

@@ -8,15 +8,15 @@ services:
     ports:
       - ${DOCKER_POSTGRES_PORT-5432}:5432
     volumes:
-      - postgres:/var/lib/postgresql/data
+      - ./postgres:/var/lib/postgresql/data
 
   rabbitmq:
     image: rabbitmq:management
     ports:
       - ${DOCKER_RABBITMQ_PORT-5672}:5672
       - ${DOCKER_RABBITMQ_CONSOLE_PORT-15672}:15672
     volumes:
-      - rabbitmq:/var/lib/rabbitmq/mnesia
+      - ./rabbitmq:/var/lib/rabbitmq/mnesia
     logging:
       driver: none
 
@@ -38,7 +38,7 @@ services:
       - ${DOCKER_MINIO_PORT-9000}:9000
       - ${DOCKER_MINIO_CONSOLE_PORT-9001}:9001
     volumes:
-      - minio:/data
+      - ./minio:/data
     logging:
       driver: none
 

tox.ini

@@ -1,7 +1,7 @@
 [tox]
 envlist =
     lint,
-    # test,
+    test,
     check-migrations,
 
 [testenv:lint]
@@ -16,7 +16,7 @@ deps =
     flake8-quotes
     pep8-naming
 commands =
-    flake8 {posargs:.}
+    flake8 {posargs:uvdat}
 
 [testenv:type]
 skipsdist = true
@@ -26,7 +26,7 @@ deps =
     django-stubs
     djangorestframework-stubs
 commands =
-    mypy {posargs:.}
+    mypy {posargs:uvdat}
 
 [testenv:format]
 skipsdist = true
@@ -35,8 +35,8 @@ deps =
     black
     isort
 commands =
-    isort {posargs:.}
-    black {posargs:.}
+    isort {posargs:uvdat}
+    black {posargs:uvdat}
 
 [testenv:test]
 passenv =

uvdat/core/admin.py

@@ -1,38 +1,126 @@
 from django.contrib import admin
 
-from uvdat.core.models import Chart, City, Dataset, NetworkNode, Region, SimulationResult
+from uvdat.core.models import (
+    ChartDataSource,
+    City,
+    DataCollection,
+    Dataset,
+    DerivedRegion,
+    FileItem,
+    NetworkEdge,
+    NetworkNode,
+    OriginalRegion,
+    RasterDataSource,
+    SimulationResult,
+    VectorDataSource,
+    VectorTile,
+)
 
 
 class CityAdmin(admin.ModelAdmin):
     list_display = ['id', 'name']
 
 
+class DataCollectionAdmin(admin.ModelAdmin):
+    list_display = ['id', 'name']
+
+
 class DatasetAdmin(admin.ModelAdmin):
-    list_display = ['id', 'name', 'category']
+    list_display = ['id', 'name', 'dataset_type', 'category', 'get_city_name']
 
+    def get_city_name(self, obj):
+        return obj.city.name
 
-class NetworkNodeAdmin(admin.ModelAdmin):
-    list_display = ['name', 'dataset', 'get_adjacent']
 
-    def get_adjacent(self, obj):
-        return ', '.join(n.name for n in obj.adjacent_nodes.all())
+class FileItemAdmin(admin.ModelAdmin):
+    list_display = ['id', 'get_dataset_name']
 
+    def get_dataset_name(self, obj):
+        return obj.dataset.name
 
-class RegionAdmin(admin.ModelAdmin):
-    list_display = ['id', 'name']
 
+class ChartDataSourceAdmin(admin.ModelAdmin):
+    list_display = ['id', 'get_dataset_name', 'editable', 'index']
 
-class ChartAdmin(admin.ModelAdmin):
-    list_display = ['id', 'name']
+    def get_dataset_name(self, obj):
+        return obj.dataset.name
+
+
+class RasterDataSourceAdmin(admin.ModelAdmin):
+    list_display = ['id', 'get_dataset_name', 'index']
+
+    def get_dataset_name(self, obj):
+        return obj.dataset.name
+
+
+class VectorDataSourceAdmin(admin.ModelAdmin):
+    list_display = ['id', 'get_dataset_name', 'index']
+
+    def get_dataset_name(self, obj):
+        return obj.dataset.name
+
+
+class VectorTileAdmin(admin.ModelAdmin):
+    list_display = ['id', 'get_dataset_name', 'get_data_source_index', 'x', 'y', 'z']
+
+    def get_dataset_name(self, obj):
+        return obj.data_source.dataset.name
+
+    def get_data_source_index(self, obj):
+        return obj.data_source.index
+
+
+class OriginalRegionAdmin(admin.ModelAdmin):
+    list_display = ['id', 'name', 'get_city_name']
+
+    def get_city_name(self, obj):
+        return obj.city.name
+
+
+class DerivedRegionAdmin(admin.ModelAdmin):
+    list_display = ['id', 'name', 'get_city_name', 'operation', 'get_original_region_names']
+
+    def get_city_name(self, obj):
+        return obj.city.name
+
+    def get_original_region_names(self, obj):
+        return ', '.join(r.name for r in obj.original_regions.all())
+
+
+class NetworkEdgeAdmin(admin.ModelAdmin):
+    list_display = ['id', 'name', 'get_dataset_name', 'get_connected_node_names']
+
+    def get_dataset_name(self, obj):
+        return obj.dataset.name
+
+    def get_connected_node_names(self, obj):
+        return ', '.join(n.name for n in obj.connected_nodes.all())
+
+
+class NetworkNodeAdmin(admin.ModelAdmin):
+    list_display = ['id', 'name', 'get_dataset_name', 'get_adjacent_node_names']
+
+    def get_dataset_name(self, obj):
+        return obj.dataset.name
+
+    def get_adjacent_node_names(self, obj):
+        return ', '.join(n.name for n in obj.get_adjacent_nodes())
 
 
 class SimulationResultAdmin(admin.ModelAdmin):
-    list_display = ['id', 'simulation_id', 'input_args']
+    list_display = ['id', 'simulation_type', 'input_args']
 
 
 admin.site.register(City, CityAdmin)
+admin.site.register(DataCollection, DataCollectionAdmin)
 admin.site.register(Dataset, DatasetAdmin)
+admin.site.register(FileItem, FileItemAdmin)
+admin.site.register(ChartDataSource, ChartDataSourceAdmin)
+admin.site.register(RasterDataSource, RasterDataSourceAdmin)
+admin.site.register(VectorDataSource, VectorDataSourceAdmin)
+admin.site.register(VectorTile, VectorTileAdmin)
+admin.site.register(OriginalRegion, OriginalRegionAdmin)
+admin.site.register(DerivedRegion, DerivedRegionAdmin)
 admin.site.register(NetworkNode, NetworkNodeAdmin)
-admin.site.register(Region, RegionAdmin)
-admin.site.register(Chart, ChartAdmin)
+admin.site.register(NetworkEdge, NetworkEdgeAdmin)
 admin.site.register(SimulationResult, SimulationResultAdmin)