alex/OneTrip
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Account Management mostly implemented

Browse Source
This commit is contained in:
Alexander Laevens
2022-11-25 18:50:30 -07:00
parent 35fc396050
commit 839147e0b0
175 changed files with 7508 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
django_backend/api/admin.py
View File

@@ -22,6 +22,10 @@ class UserInline(nested_admin.NestedTabularInline):
def has_delete_permission(self, request, obj=None):
return False
class HomegroupInviteInline(nested_admin.NestedTabularInline):
model = HomegroupInvite
extra = 0
class RecipeInline(nested_admin.NestedTabularInline):
model = Recipe
inlines = (IngredientInline,)
@@ -35,9 +39,9 @@ class RecipeAdmin(nested_admin.NestedModelAdmin):
@admin.register(Homegroup)
class HomegroupAdmin(nested_admin.NestedModelAdmin):
list_display = ("id", "name")
inlines = (UserInline, RecipeInline, IngredientInline)
inlines = (UserInline, HomegroupInviteInline, RecipeInline, IngredientInline)
@admin.register(List)
class ListAdmin(nested_admin.NestedModelAdmin):
list_display = ("id",)
list_display = ("homegroup",)
inlines = (RecipeInline, IngredientInline)

13
django_backend/api/migrations/0001_initial.py
View File

@@ -1,4 +1,4 @@
# Generated by Django 4.1.3 on 2022-11-22 20:42
# Generated by Django 4.1.3 on 2022-11-25 09:10
from django.db import migrations, models
import django.db.models.deletion
@@ -17,12 +17,13 @@ class Migration(migrations.Migration):
name='Homegroup',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=50)),
],
),
migrations.CreateModel(
name='List',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('homegroup', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='api.homegroup')),
],
),
migrations.CreateModel(
@@ -31,7 +32,6 @@ class Migration(migrations.Migration):
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=50)),
('homegroup', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='recipes', to='api.homegroup')),
('list', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='recipes', to='api.list')),
],
),
migrations.CreateModel(
@@ -44,4 +44,11 @@ class Migration(migrations.Migration):
('content_type', models.ForeignKey(limit_choices_to=models.Q(models.Q(('app_label', 'api'), ('model', 'recipe')), models.Q(('app_label', 'api'), ('model', 'list')), _connector='OR'), on_delete=django.db.models.deletion.CASCADE, to='contenttypes.contenttype')),
],
),
migrations.CreateModel(
name='HomegroupInvite',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('homegroup', models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, related_name='invites', to='api.homegroup')),
],
),
]

19
django_backend/api/migrations/0002_homegroup_name.py
View File

@@ -1,19 +0,0 @@
# Generated by Django 4.1.3 on 2022-11-22 21:43
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('api', '0001_initial'),
]
operations = [
migrations.AddField(
model_name='homegroup',
name='name',
field=models.CharField(default="Alex's Kitchen", max_length=50),
preserve_default=False,
),
]

37
django_backend/api/migrations/0002_initial.py Normal file
View File

@@ -0,0 +1,37 @@
# Generated by Django 4.1.3 on 2022-11-25 09:10
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
initial = True
dependencies = [
('api', '0001_initial'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
operations = [
migrations.AddField(
model_name='homegroupinvite',
name='user',
field=models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, related_name='invites', to=settings.AUTH_USER_MODEL),
),
migrations.AddField(
model_name='homegroup',
name='invited_users',
field=models.ManyToManyField(related_name='homegroup_invites', through='api.HomegroupInvite', to=settings.AUTH_USER_MODEL),
),
migrations.AddField(
model_name='recipe',
name='list',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='recipes', to='api.list'),
),
migrations.AlterUniqueTogether(
name='homegroupinvite',
unique_together={('homegroup', 'user')},
),
]

20
django_backend/api/models.py
View File

@@ -13,15 +13,29 @@ class Ingredient(models.Model):
name = models.CharField(max_length=50)
in_stock = models.BooleanField(default=False)
class List(models.Model):
# Foreign Key Recipe -> List [as recipes]
extra_ingredients = GenericRelation(Ingredient, related_query_name="extra_ingredients")
class HomegroupInvite(models.Model):
homegroup = models.ForeignKey("api.Homegroup", on_delete=models.CASCADE, related_name="invites", blank=True)
user = models.ForeignKey("users.User", on_delete=models.CASCADE, related_name="invites", blank=True)
class Meta:
unique_together = ("homegroup", "user")
class Homegroup(models.Model):
# Foreign Key Recipe -> Homegroup [as recipes]
# Foreign Key User -> Homegroup [as users]
name = models.CharField(max_length=50)
invited_users = models.ManyToManyField("users.User", related_name="homegroup_invites", through=HomegroupInvite)
def __repr__(self):
return f"{self.id}: {self.name}"
def __str__(self):
return f"{self.id}: {self.name}"
class List(models.Model):
# Foreign Key Recipe -> List [as recipes]
extra_ingredients = GenericRelation(Ingredient, related_query_name="extra_ingredients")
homegroup = models.OneToOneField(Homegroup, on_delete=models.CASCADE, primary_key=True)
class Recipe(models.Model):

32
django_backend/api/serializers.py
View File

@@ -1,24 +1,42 @@
from rest_framework import serializers
from api.models import *
from users.serializers import UserSerializer
class IngredientSerializer(serializers.ModelSerializer):
class Meta:
model = Ingredient
fields = ["id", "name", "in_stock", "content_type", "object_id"]
read_only_fields = ["id"]
class RecipeSerializer(serializers.ModelSerializer):
ingredients = serializers.PrimaryKeyRelatedField(many=True, read_only=True)
# ingredients = serializers.PrimaryKeyRelatedField(many=True, read_only=True)
# ingredients = IngredientSerializer(many=True, read_only=True)
ingredients = serializers.SerializerMethodField()
class Meta:
model = Recipe
fields = ["id", "name", "ingredients"]
read_only_fields = ["id"]
class IngredientSerializer(serializers.ModelSerializer):
class Meta:
model = Ingredient
fields = ["id", "name", "in_stock"]
read_only_fields = ["id"]
def get_ingredients(self, instance):
ingredients = instance.ingredients.all().order_by("name")
return IngredientSerializer(ingredients, many=True).data
class HomegroupSerializer(serializers.ModelSerializer):
users = serializers.PrimaryKeyRelatedField(many=True, read_only=True)
recipes = serializers.PrimaryKeyRelatedField(many=True, read_only=True)
def create(self, validated_data):
homegroup = super().create(validated_data)
List.objects.get_or_create(homegroup=homegroup)
return homegroup
class Meta:
model = Homegroup
fields = ["id", "recipes", "users"]
fields = ["id", "name", "recipes", "users", "invites"]
read_only_fields = ["recipes", "users", "invites"]
class InviteSerializer(serializers.ModelSerializer):
class Meta:
model = HomegroupInvite
fields = ["id", "homegroup", "user"]

1
django_backend/api/urls.py
View File

@@ -6,6 +6,7 @@ router = routers.DefaultRouter()
router.register(r'recipes', views.RecipeView)
router.register(r'ingredients', views.IngredientView)
router.register(r'homegroups', views.HomegroupView)
router.register(r'groupinvites', views.HomegroupInviteView)
urlpatterns = [
path('', include(router.urls))

4
django_backend/api/views.py
View File

@@ -14,3 +14,7 @@ class IngredientView(viewsets.ModelViewSet):
class HomegroupView(viewsets.ModelViewSet):
serializer_class = HomegroupSerializer
queryset = Homegroup.objects.all()
class HomegroupInviteView(viewsets.ModelViewSet):
serializer_class = InviteSerializer
queryset = HomegroupInvite.objects.all()