Getting release up to date with master

.github/workflows/deploy-dev.yml

@@ -42,4 +42,4 @@ jobs:
             docker stack rm thestack
             sleep 20s
             docker stack deploy -c docker-compose.yml thestack
-            docker system prune -a
+            yes | docker system prune -a

.github/workflows/deploy-prod.yml

@@ -42,4 +42,4 @@ jobs:
             docker stack rm thestack
             sleep 20s
             docker stack deploy -c docker-compose.yml thestack
-            docker system prune -a
+            yes | docker system prune -a

.gitignore

@@ -4,6 +4,7 @@
 .envrc
 .envlocal
 .envremote
+secrets/eatery-blue-f810e-firebase-adminsdk-ds3co-7902015462.json
 
 # Hardcoded stuff
 db_snapshots/
@@ -13,6 +14,7 @@ static_sources/data.log
 __pycache__/ 
 *.py[cod]
 *$py.class
+.ruff_cache
 
 # More Python stuff
 .DS_Store
@@ -42,3 +44,4 @@ MANIFEST
 local_settings.py
 db.sqlite3
 db.sqlite3-journal
+src/static_sources/external_eateries.json

.pre-commit-config.yaml

@@ -0,0 +1,25 @@
+repos:
+  # Updates all subsequent hooks
+  - repo: https://gitlab.com/vojko.pribudic.foss/pre-commit-update
+    rev: v0.5.1
+    hooks:
+      - id: pre-commit-update
+
+    # Linter hook
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.6.7
+    hooks:
+      - id: ruff
+        args: [--fix]
+
+    # Formatter hook
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 24.8.0
+    hooks:
+      - id: black
+
+    # Static code analysis hook
+  - repo: https://github.com/PyCQA/bandit
+    rev: 1.7.10
+    hooks:
+      - id: bandit

README.md

@@ -1,12 +1,12 @@
 # eatery-blue-backend
 
-This is the backend for eatery-blue-backend.
+This is the backend for Eatery Blue.
 
 # Postgres Setup
 
 ---
 
-- Install PostgresSQL here at https://www.postgresql.org/download/
+- Install PostgreSQL here at https://www.postgresql.org/download/
 - Login to postgres via command line by entering `psql postgres`
 - Create the eatery database via `create database "eatery-dev";`
 - Quit psql via `\q`
@@ -17,6 +17,16 @@ This is the backend for eatery-blue-backend.
 - To set up the tables and data (or if reseting the database), make sure current working directory is the `src` folder and run `python3 manage.py makemigrations; python3 manage.py migrate; python3 manage.py populate_models`
 - To run the backend, run `python3 manage.py runserver 0.0.0.0:8000` (Ensuring the env variables are loaded and all dependencies are installed)
 
+# Documentation
+
+- Full Swagger Docs API Specs can be found at /docs when running the server
+
+## FA24 Members
+
+- Thomas Vignos
+- Skye Slattery
+- Cassidy Xu
+
 ## SP24 Members
 
 - Thomas Vignos

requirements.txt

@@ -1,35 +1,55 @@
 asgiref==3.4.1
-black==21.12b0
 cachetools==4.2.4
 certifi==2021.10.8
+cfgv==3.4.0
 charset-normalizer==2.0.9
 click==8.0.3
+coreapi==2.3.3
+coreschema==0.0.4
+distlib==0.3.8
 Django==4.0
+django-rest-swagger==2.2.0
 djangorestframework==3.13.1
+drf-yasg==1.21.7
+filelock==3.15.4
 google-api-core==2.3.2
 google-api-python-client==2.33.0
 google-auth==2.3.3
 google-auth-httplib2==0.1.0
 google-auth-oauthlib==0.4.6
 googleapis-common-protos==1.54.0
 httplib2==0.20.2
+identify==2.6.0
 idna==3.3
+inflection==0.5.1
+itypes==1.2.0
+Jinja2==3.1.4
+MarkupSafe==2.1.5
 mypy-extensions==0.4.3
+nodeenv==1.9.1
 oauthlib==3.1.1
+openapi-codec==1.3.2
+packaging==24.1
 pathspec==0.9.0
-platformdirs==2.4.0
+platformdirs==4.2.2
+pre-commit==3.8.0
 protobuf==3.19.1
 psycopg2-binary==2.9.3
 pyasn1==0.4.8
 pyasn1-modules==0.2.8
 pyparsing==3.0.6
 pytz==2021.3
+PyYAML==6.0.2
 requests==2.26.0
 requests-oauthlib==1.3.0
 rsa==4.8
+sentry-sdk==2.14.0
+simplejson==3.19.3
 six==1.16.0
 sqlparse==0.4.2
 tomli==1.2.3
 typing_extensions==4.0.1
 uritemplate==4.1.1
-urllib3==1.26.7
+urllib3
+virtualenv==20.26.3
+google-auth

.envrctemplate → secrets/.envrctemplate

@@ -6,6 +6,10 @@ export POSTGRES_PASSWORD=
 export POSTGRES_HOST=
 export POSTGRES_PORT=
 export DJANGO_SECRET_KEY=
+export GOOGLE_APPLICATION_CREDENTIALS=
+export GOOGLE_SHEETS_API_KEY=
+export FREEDGE_SHEET_ID=
+export FREEDGE_APPROVED_EMAILS=
 
 # Not used
 export CORNELL_VENDOR_TOKEN=

src/category/apps.py

@@ -2,5 +2,5 @@
 
 
 class CategoryConfig(AppConfig):
-    default_auto_field = 'django.db.models.BigAutoField'
-    name = 'category'
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "category"

src/category/controllers/populate_category.py

@@ -1,6 +1,4 @@
-from category.models import Category
 from category.serializers import CategorySerializer
-from item.models import Item
 import json
 from util.constants import eatery_is_cafe
 
@@ -21,10 +19,20 @@ def generate_dining_hall_categories(self, json_event, event):
         """
         category_items = {}
 
-        category_order = ["Chef's Table", "Chef's Table - Sides", "Grill", "Wok", 
-         "Wok/Asian Station", "Iron Grill", "Mexican Station", "Global",
-         "Halal", "Kosher Station", "Flat Top Grill"]
-
+        category_order = [
+            "Chef's Table",
+            "Chef's Table - Sides",
+            "Grill",
+            "Wok",
+            "Wok/Asian Station",
+            "Iron Grill",
+            "Mexican Station",
+            "Global",
+            "Halal",
+            "Kosher Station",
+            "Flat Top Grill",
+        ]
+
         def sort_menu(menu):
             try:
                 return category_order.index(menu["category"].strip())
@@ -79,7 +87,9 @@ def process(self, events_dict, json_eateries):
 
         categories_dict = {}
 
-        with open("./static_sources/external_eateries.json", "r") as external_eateries_file:
+        with open(
+            "./static_sources/external_eateries.json", "r"
+        ) as external_eateries_file:
             external_eateries_json = json.load(external_eateries_file)
             json_eateries.extend(external_eateries_json["eateries"])
 
@@ -94,7 +104,7 @@ def process(self, events_dict, json_eateries):
                 continue
 
             is_cafe = eatery_is_cafe(json_eatery)
-            
+
             """
             For every event in an eatery --> for every menu in an eatery --> get categories
             """

src/category/migrations/0001_initial.py

@@ -5,20 +5,26 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [
-        ('event', '0001_initial'),
+        ("event", "0001_initial"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='Category',
+            name="Category",
             fields=[
-                ('id', models.AutoField(primary_key=True, serialize=False)),
-                ('category', models.CharField(default='General', max_length=40)),
-                ('event', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='menu', to='event.event')),
+                ("id", models.AutoField(primary_key=True, serialize=False)),
+                ("category", models.CharField(default="General", max_length=40)),
+                (
+                    "event",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.DO_NOTHING,
+                        related_name="menu",
+                        to="event.event",
+                    ),
+                ),
             ],
         ),
     ]

src/category/migrations/0002_alter_category_id.py

@@ -4,15 +4,16 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('category', '0001_initial'),
+        ("category", "0001_initial"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='category',
-            name='id',
-            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+            model_name="category",
+            name="id",
+            field=models.BigAutoField(
+                auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+            ),
         ),
     ]

src/category/models.py

@@ -5,6 +5,6 @@
 class Category(models.Model):
     event = models.ForeignKey(Event, related_name="menu", on_delete=models.DO_NOTHING)
     category = models.CharField(max_length=40, default="General")
-    
+
     def __str__(self):
         return self.category

src/category/serializers.py

@@ -16,6 +16,7 @@ class Meta:
         model = Category
         fields = ["id", "category", "event", "items"]
 
+
 class CategorySerializerOptimized(serializers.ModelSerializer):
     items = ItemSerializerOptimized(many=True, read_only=True)
 

src/category/urls.py

@@ -7,4 +7,4 @@
 
 urlpatterns = [
     path("", include(router.urls)),
-]
+]

src/category/views.py

@@ -2,6 +2,7 @@
 from category.models import Category
 from category.serializers import CategorySerializer
 
+
 class CategoryViewSet(viewsets.ModelViewSet):
     queryset = Category.objects.all()
-    serializer_class = CategorySerializer
+    serializer_class = CategorySerializer

src/device_token/admin.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

src/person/apps.py → src/device_token/apps.py

@@ -1,6 +1,5 @@
 from django.apps import AppConfig
 
-
-class PersonConfig(AppConfig):
+class DeviceTokenConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
-    name = 'person'
+    name = 'device_token'

src/device_token/migrations/0001_initial.py

@@ -0,0 +1,22 @@
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('user', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='DeviceToken',
+            fields=[
+                ('id', models.AutoField(primary_key=True, serialize=False)),
+                ('device_token', models.CharField(max_length=40)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='device_tokens', to='user.user')),
+            ],
+        ),
+    ]

src/device_token/models.py

@@ -0,0 +1,12 @@
+from django.db import models
+from user.models import User
+
+class DeviceToken(models.Model):
+    id = models.AutoField(primary_key=True)
+    user = models.ForeignKey(
+        User, related_name="device_tokens", on_delete=models.CASCADE
+    )
+    device_token = models.CharField(max_length=40)
+
+    def __str__(self):
+        return f'{self.user.netid} - {self.device_token}'

src/device_token/serializers.py

@@ -0,0 +1,7 @@
+from rest_framework import serializers
+from device_token.models import DeviceToken
+
+class DeviceTokenSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = DeviceToken
+        fields = ['id', 'user', 'device_token']

src/device_token/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

src/person/urls.py → src/device_token/urls.py

@@ -1,10 +1,10 @@
 from django.urls import path, include
-from person.views import StudentViewSet, ChefViewSet
+from device_token.views import DeviceTokenViewSet
+
 from rest_framework.routers import DefaultRouter
 
 router = DefaultRouter()
-router.register("student", StudentViewSet)
-router.register("chef", ChefViewSet)
+router.register("", DeviceTokenViewSet)
 
 urlpatterns = [
     path("", include(router.urls)),

src/device_token/views.py

@@ -0,0 +1,8 @@
+from rest_framework import viewsets
+from device_token.models import DeviceToken
+from device_token.serializers import DeviceTokenSerializer
+
+
+class DeviceTokenViewSet(viewsets.ModelViewSet):
+    queryset = DeviceToken.objects.all()
+    serializer_class = DeviceTokenSerializer