Model redesign

.github/workflows/ci.yml

@@ -4,42 +4,56 @@ on:
   push:
     branches:
       - master
+
 jobs:
-  test:
+
+  lint:
     runs-on: ubuntu-latest
-    services:
-      postgres:
-        image: postgres:latest
-        env:
-          POSTGRES_DB: django
-          POSTGRES_PASSWORD: postgres
-        ports:
-          - 5432:5432
-      rabbitmq:
-        image: rabbitmq:management
-        ports:
-          - 5672:5672
-      minio:
-        # This image does not require any command arguments (which GitHub Actions don't support)
-        image: bitnami/minio:latest
-        env:
-          MINIO_ROOT_USER: minioAccessKey
-          MINIO_ROOT_PASSWORD: minioSecretKey
-        ports:
-          - 9000:9000
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python
-        uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - run: pip install tox
+      - name: Lint
+        run: tox -e lint
+
+  lint-client:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+      - run: cd web && npm i && npm run lint
+
+  pytest:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: adambirds/[email protected]
+        with:
+          compose-file: |
+            docker-compose.yml
+            docker-compose.override.yml
+          services: |
+            django
+            celery
+            postgres
+            minio
+            rabbitmq
+          test-container: django
+          test-command: "tox -e test"
+
+  check-migrations:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: adambirds/[email protected]
         with:
-          python-version: "3.10"
-      - name: Build docker image
-        run: docker build -t test -f dev/django.Dockerfile .
-      - name: Run tests
-        run: |
-          docker run test tox
-        env:
-          DJANGO_DATABASE_URL: postgres://postgres:postgres@localhost:5432/django
-          DJANGO_MINIO_STORAGE_ENDPOINT: localhost:9000
-          DJANGO_MINIO_STORAGE_ACCESS_KEY: minioAccessKey
-          DJANGO_MINIO_STORAGE_SECRET_KEY: minioSecretKey
+          compose-file: |
+            docker-compose.yml
+            docker-compose.override.yml
+          services: |
+            django
+            celery
+            postgres
+            minio
+            rabbitmq
+          test-container: django
+          test-command: "tox -e check-migrations"

.gitignore

@@ -1,7 +1,10 @@
 .terraform/
+postgres/*
+minio/*
+rabbitmq/*
 .vscode/
 staticfiles/
-sample_data/**/*
+sample_data/*/*
 
 # Created by https://www.gitignore.io/api/django
 # Edit at https://www.gitignore.io/?templates=django

dev/django.Dockerfile

@@ -3,7 +3,7 @@ FROM python:3.10-slim
 # * psycopg2
 RUN apt-get update && \
     apt-get install --no-install-recommends --yes \
-    libpq-dev libvips-dev gcc libc6-dev gdal-bin && \
+    libpq-dev libvips-dev gcc libc6-dev gdal-bin git && \
     rm -rf /var/lib/apt/lists/*
 
 ENV PYTHONDONTWRITEBYTECODE 1

sample_data/charts.json

@@ -2,11 +2,14 @@
     {
         "name": "Boston Harbor Daily Tide Levels",
         "description": "Raw data was obtained using the NOAA CO-OPS API for Data Retrieval and reformatted in tabular form",
-        "category": "ocean",
-        "city": "Boston, MA",
-        "raw_data_type": "csv",
-        "url": "https://data.kitware.com/api/v1/item/64beb508b4d956782eee8cb1/download",
-        "path": "boston/tide_level_data.csv",
+        "context": "Boston Transportation",
+        "files": [
+            {
+                "url": "https://data.kitware.com/api/v1/item/64beb508b4d956782eee8cb1/download",
+                "path": "boston/tide_level_data.csv"
+            }
+        ],
+        "editable": false,
         "metadata": {
             "columns": {
                 "Date": "YYYY-MM-DD",
@@ -36,23 +39,19 @@
             "x_title": "Date Recorded",
             "y_title": "Distance from Sensor (m)"
         },
-        "style": {
-            "options": {
-                "chart": {
-                    "labels": "Date",
-                    "datasets": [
-                        "HH",
-                        "H",
-                        "L",
-                        "LL"
-                    ]
-                },
-                "palette": {
-                    "HH": "red",
-                    "H": "pink",
-                    "L": "lightblue",
-                    "LL": "blue"
-                }
+        "conversion_options": {
+            "labels": "Date",
+            "datasets": [
+                "HH",
+                "H",
+                "L",
+                "LL"
+            ],
+            "palette": {
+                "HH": "red",
+                "H": "pink",
+                "L": "lightblue",
+                "LL": "blue"
             }
         }
     }

sample_data/contexts.json

@@ -0,0 +1,56 @@
+[
+    {
+        "name": "Boston Transportation",
+        "default_map_center": [
+            42.4,
+            -71.1
+        ],
+        "default_map_zoom": 11,
+        "datasets": [
+            "MBTA Rapid Transit",
+            "MBTA Commuter Rail",
+            "Massachusetts Elevation Data",
+            "Boston Hurricane Surge Inundation Zones",
+            "Bsoton FEMA National Flood Hazard",
+            "Boston Neighborhoods",
+            "Boston Census 2020 Block Groups",
+            "Boston Zip Codes",
+            "Boston Sea Level Rises",
+            "Boston 10-Year Flood Events",
+            "Boston 100-Year Flood Events"
+        ]
+    },
+    {
+        "name": "DC Transportation",
+        "default_map_center": [
+            38.9,
+            -77.1
+        ],
+        "default_map_zoom": 11,
+        "datasets": [
+            "DC Metro"
+        ]
+    },
+    {
+        "name": "Boston-Washington Transportation",
+        "default_map_center": [
+            40.5,
+            -74.5
+        ],
+        "default_map_zoom": 8,
+        "datasets": [
+            "MBTA Rapid Transit",
+            "MBTA Commuter Rail",
+            "Massachusetts Elevation Data",
+            "Boston Hurricane Surge Inundation Zones",
+            "Bsoton FEMA National Flood Hazard",
+            "Boston Neighborhoods",
+            "Boston Census 2020 Block Groups",
+            "Boston Zip Codes",
+            "Boston Sea Level Rises",
+            "Boston 10-Year Flood Events",
+            "Boston 100-Year Flood Events",
+            "DC Metro"
+        ]
+    }
+]