Feature/diagnostics list

.github/workflows/test_evagram_api.yaml

@@ -36,4 +36,5 @@ jobs:
       - name: Run Django API Tests
         run: python src/evagram/website/backend/manage.py test api
         env:
+          DB_HOST: 127.0.0.1
           DB_PASSWORD: ${{secrets.DB_PASSWORD}}

.github/workflows/test_evagram_input.yaml

@@ -34,11 +34,17 @@ jobs:
       - name: Install Evagram Input Module
         run: |
           python -m pip install --upgrade pip
-          pip install evagram_input@git+https://github.com/GEOS-ESM/evagram_input@feature/input_tool --upgrade
+          pip install evagram_input@git+https://github.com/GEOS-ESM/evagram_input --upgrade
 
       - name: Install Dependencies
         run: pip install . -r requirements.txt
 
+      - name: Create PGPASS File
+        run: |
+          echo 127.0.0.1:5432:test_evagram:postgres:${{secrets.DB_PASSWORD}} >> ~/.pgpass
+          chmod 600 ~/.pgpass
+          export PGPASSFILE='/home/runner/.pgpass'
+
       - name: Run Evagram Input Tests
         run: python src/evagram/website/backend/manage.py test input_app.test_input_tool
         env:

.gitignore

@@ -6,6 +6,8 @@ __pycache__/
 # C extensions
 *.so
 
+.prettierrc
+
 # Distribution / packaging
 .Python
 build/

docker-compose.yml

@@ -0,0 +1,37 @@
+version: "3.8"
+services:
+  database:
+    platform: 'linux/amd64'
+    image: postgres:latest
+    ports:
+      - 5432:5432
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: $DB_PASSWORD
+      POSTGRES_DB: evagram
+    volumes:
+      - evagram:/var/lib/postgresql/data/
+
+  backend:
+    restart: always
+    platform: 'linux/amd64'
+    build: src/evagram/website/backend
+    command: >
+      sh -c "python manage.py migrate &&
+             python manage.py loaddata api/fixtures/test_data.json
+             python manage.py runserver 0.0.0.0:8000"
+    ports:
+      - 8000:8000
+    environment:
+      DB_HOST: database
+      DB_PASSWORD: $DB_PASSWORD
+    depends_on:
+      - database
+
+  frontend:
+    build: src/evagram/website/frontend
+    ports:
+      - 3000:3000
+
+volumes:
+  evagram:

pycodestyle.cfg

@@ -9,4 +9,4 @@ max-line-length = 100
 indent-size = 4
 statistics = True
 ignore = W503, W504
-exclude = __pycache__, src/evagram/website/backend/api/migrations
+exclude = __pycache__, src/evagram/website/backend/api/migrations, src/evagram/website/frontend/node_modules

src/evagram/website/backend/.dockerignore

@@ -0,0 +1 @@
+.env

src/evagram/website/backend/Dockerfile

@@ -0,0 +1,12 @@
+FROM python:latest
+
+WORKDIR /backend
+
+COPY requirements.txt .
+COPY loaddata.py .
+
+RUN pip install --upgrade pip
+RUN pip install -r requirements.txt
+
+COPY . .
+EXPOSE 8000

src/evagram/website/backend/api/migrations/0001_initial.py

@@ -1,5 +1,3 @@
-# Generated by Django 4.2.10 on 2024-03-24 02:17
-
 from django.db import migrations, models
 import django.db.models.deletion
 

src/evagram/website/backend/api/serializers.py

@@ -1,35 +1,62 @@
 from rest_framework import serializers
 from api.models import *
+from django.db import models
 
 
 class OwnerSerializer(serializers.ModelSerializer):
+    key = serializers.ModelField(model_field=Owners()._meta.get_field('owner_id'))
+    value = serializers.ModelField(model_field=Owners()._meta.get_field('owner_id'))
+    content = serializers.ModelField(model_field=Owners()._meta.get_field('username'))
+    type = models.CharField(default='owner')
+
     class Meta:
         model = Owners
-        fields = ['owner_id', 'first_name', 'last_name', 'username']
+        # fields = ['owner_id', 'first_name', 'last_name', 'username']
+        fields = ['key', 'value', 'content', 'owner_id', 'username']
 
 
 class ExperimentSerializer(serializers.ModelSerializer):
+    key = serializers.ModelField(model_field=Experiments()._meta.get_field('experiment_id'))
+    value = serializers.ModelField(model_field=Experiments()._meta.get_field('experiment_id'))
+    content = serializers.ModelField(model_field=Experiments()._meta.get_field('experiment_name'))
+    type = models.CharField(default='experiment')
+
     class Meta:
         model = Experiments
-        fields = ['experiment_id', 'experiment_name']
+        fields = ['key', 'value', 'content', 'experiment_id', 'experiment_name']
 
 
 class ObservationSerializer(serializers.ModelSerializer):
+    key = serializers.ModelField(model_field=Observations()._meta.get_field('observation_id'))
+    value = serializers.ModelField(model_field=Observations()._meta.get_field('observation_id'))
+    content = serializers.ModelField(model_field=Observations()._meta.get_field('observation_name'))
+    type = models.CharField(default='observation')
+
     class Meta:
         model = Observations
-        fields = ['observation_id', 'observation_name']
+        fields = ['key', 'value', 'content', 'observation_id', 'observation_name']
 
 
 class VariableSerializer(serializers.ModelSerializer):
+    key = serializers.ModelField(model_field=Variables()._meta.get_field('variable_id'))
+    value = serializers.ModelField(model_field=Variables()._meta.get_field('variable_id'))
+    content = serializers.ModelField(model_field=Variables()._meta.get_field('variable_name'))
+    type = models.CharField(default='variable')
+
     class Meta:
         model = Variables
-        fields = ['variable_id', 'variable_name', 'channel']
+        fields = ['key', 'value', 'content', 'variable_id', 'variable_name', 'channel']
 
 
 class GroupSerializer(serializers.ModelSerializer):
+    key = serializers.ModelField(model_field=Groups()._meta.get_field('group_id'))
+    value = serializers.ModelField(model_field=Groups()._meta.get_field('group_id'))
+    content = serializers.ModelField(model_field=Groups()._meta.get_field('group_name'))
+    type = models.CharField(default='group')
+
     class Meta:
         model = Groups
-        fields = ['group_id', 'group_name']
+        fields = ['key', 'value', 'content', 'group_id', 'group_name']
 
 
 class PlotSerializer(serializers.ModelSerializer):