Swipeables and Swipes

config/settings.py

@@ -45,7 +45,7 @@
     'groups',
     'restaurants',
     'recipes',
-
+    'swipables'
 ]
 
 MIDDLEWARE = [

config/urls.py

@@ -25,6 +25,7 @@
     path('api/groups/', include('groups.urls')),
     path('api/restaurants/', include('restaurants.urls')),
     path('api/recipes/', include('recipes.urls')),
+    path('api/swipables/', include('swipables.urls')),
 ]
 
 if settings.DEBUG:

conftest.py

@@ -5,6 +5,8 @@
 
 from groups.models import Group, SendGroupInvite
 from recipes.models import Ingredient, Recipe
+from restaurants.models import Restaurant
+from swipables.models import Swipable, Swipe
 
 
 @pytest.fixture
@@ -137,8 +139,25 @@ def recipe(user, ingredients):
         step_number=2, description="Drain and serve.", recipe=recipe)
     recipe.save()
 
+    Swipable.objects.create(recipe=recipe)
+
     return recipe
 
+
+@pytest.fixture
+def restaurant(db):
+    """
+    Fixture to create a restaurant for testing purposes.
+    """
+    restaurant = Restaurant.objects.create(
+        name="Dairy Queen",
+        category="Fast Food"
+    )
+    Swipable.objects.create(restaurant=restaurant)
+
+    return restaurant
+
+
 @pytest.fixture
 def admin_user(create_user):
     """
@@ -152,6 +171,7 @@ def admin_user(create_user):
         is_superuser=True,
     )
 
+
 @pytest.fixture
 def admin_user_tokens(admin_user):
     """
@@ -169,4 +189,4 @@ def admin_user_tokens(admin_user):
     if response.status_code == 200:
         return response.data
     else:
-        raise Exception("Failed to obtain tokens")
+        raise Exception("Failed to obtain tokens")

groups/migrations/0003_group_num_sessions.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.7 on 2025-04-07 02:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('groups', '0002_group_capacity'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='group',
+            name='num_sessions',
+            field=models.IntegerField(default=0),
+        ),
+    ]

groups/migrations/0004_groupfoodscore.py

@@ -0,0 +1,31 @@
+# Generated by Django 5.1.7 on 2025-05-04 02:55
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('groups', '0003_group_num_sessions'),
+        ('swipables', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='GroupFoodScore',
+            fields=[
+                ('created', models.DateTimeField(auto_now_add=True)),
+                ('modified', models.DateTimeField(auto_now=True)),
+                ('id', models.AutoField(primary_key=True, serialize=False)),
+                ('score', models.IntegerField()),
+                ('session', models.IntegerField()),
+                ('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='group_food_scores', to='groups.group')),
+                ('swipable', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='group_food_scores', to='swipables.swipable')),
+            ],
+            options={
+                'ordering': ['created'],
+                'unique_together': {('swipable', 'group', 'session')},
+            },
+        ),
+    ]

groups/migrations/0005_alter_groupfoodscore_options.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.1.7 on 2025-05-04 03:35
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('groups', '0004_groupfoodscore'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='groupfoodscore',
+            options={'ordering': ['-score', '-session']},
+        ),
+    ]

groups/models.py

@@ -12,13 +12,17 @@ class Group(TimeStampedModel):
     members = models.ManyToManyField(
         'users.User', related_name='group_members', blank=True)
     capacity = models.IntegerField(default=10)
+    num_sessions = models.IntegerField(default=0)
 
     @property
     def member_count(self):
         return self.members.count()
 
     def save(self, *args, **kwargs):
-        self.composite_key = f'{self.owner_username.username}_{self.name}'
+        if self.name != self.owner_username.username:
+            self.composite_key = f'{self.owner_username.username}_{self.name}'
+        else:
+            self.composite_key = self.name
         super(Group, self).save(*args, **kwargs)
 
     def __str__(self):
@@ -52,3 +56,26 @@ def __str__(self):
     class Meta:
         ordering = ['created']
         unique_together = ['sending_username', 'group', 'receiving_username']
+
+
+class GroupFoodScore(TimeStampedModel):
+    id = models.AutoField(primary_key=True)
+    swipable = models.ForeignKey(
+        'swipables.Swipable',
+        on_delete=models.CASCADE,
+        related_name='group_food_scores'
+    )
+    group = models.ForeignKey(
+        'groups.Group',
+        on_delete=models.CASCADE,
+        related_name='group_food_scores'
+    )
+    score = models.IntegerField()
+    session = models.IntegerField()
+
+    def __str__(self):
+        return f"{self.swipable} - {self.group} - {self.session}"
+
+    class Meta:
+        ordering = ['-score', '-session']
+        unique_together = ['swipable', 'group', 'session']

groups/serializers.py

@@ -1,8 +1,9 @@
 from rest_framework import serializers
 
+from swipables.serializers import SwipableListSerializer
 from users.serializers import UserListSerializer
 
-from .models import Group, SendGroupInvite
+from .models import Group, GroupFoodScore, SendGroupInvite
 
 
 class GroupListSerializer(serializers.ModelSerializer):
@@ -16,6 +17,7 @@ class GroupSerializer(serializers.ModelSerializer):
     member_count = serializers.IntegerField(read_only=True)
     owner_username = serializers.PrimaryKeyRelatedField(read_only=True)
     capacity = serializers.IntegerField(read_only=True)
+    num_sessions = serializers.IntegerField(read_only=True)
 
     class Meta:
         model = Group
@@ -26,6 +28,11 @@ def validate_name(self, value):
         if Group.objects.filter(owner_username=request_user, name=value).exists():
             raise serializers.ValidationError(
                 "A group with this name already exists.")
+
+        if value == request_user.username:
+            raise serializers.ValidationError(
+                "You cannot name a group the same as your username.")
+
         return value
 
 
@@ -54,6 +61,10 @@ def validate(self, data):
         receiving_username = data.get("receiving_username")
         group = data.get('group')
 
+        if group.name == request_user.username:
+            raise serializers.ValidationError(
+                "You cannot invite users to your base group.")
+
         if request_user == receiving_username:
             raise serializers.ValidationError(
                 "You cannot send an invite to yourself.")
@@ -86,3 +97,11 @@ def validate(self, data):
             raise serializers.ValidationError(
                 "This invite has already been accepted or declined or is invalid.")
         return data
+
+
+class GroupFoodScoreListSerializer(serializers.ModelSerializer):
+    swipable = SwipableListSerializer(read_only=True)
+
+    class Meta:
+        model = GroupFoodScore
+        fields = ['id', 'score', 'session', 'swipable']

groups/views.py

@@ -5,12 +5,13 @@
                                    UpdateModelMixin)
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
+from rest_framework.views import PermissionDenied
 
 from common.permissions import IsOwnerOrAdmin
 
-from .models import Group, SendGroupInvite
-from .serializers import (GroupListSerializer, GroupSerializer,
-                          SendGroupInviteCreateSerializer,
+from .models import Group, GroupFoodScore, SendGroupInvite
+from .serializers import (GroupFoodScoreListSerializer, GroupListSerializer,
+                          GroupSerializer, SendGroupInviteCreateSerializer,
                           SendGroupInviteListSerializer,
                           SendGroupInviteUpdateSerializer)
 
@@ -38,15 +39,50 @@ def perform_create(self, serializer):
 
     @action(detail=True, methods=["delete"])
     def leave(self, request, pk=None):
+        group_instance = get_object_or_404(Group, composite_key=pk)
+
         if not Group.objects.filter(composite_key=pk, members=request.user).exists():
             return Response({"detail": "You are not a member of this group."}, status=400)
 
-        group_instance = Group.objects.get(composite_key=pk)
+        if group_instance.owner_username == request.user:
+            return Response({"detail": "You cannot leave your own group."}, status=400)
+
         group_instance.members.remove(request.user)
         group_instance.save()
 
         return Response(status=204)
 
+    @action(detail=True, methods=["get"])
+    def start_session(self, request, pk=None):
+        group = get_object_or_404(Group, composite_key=pk)
+
+        if group.owner_username != request.user:
+            return Response({"detail": "You do not have permission to perform this action."}, status=403)
+
+        if group.name == request.user.username:
+            return Response({"detail": "You cannot start a session for yourself."}, status=400)
+
+        group.num_sessions += 1
+        group.save()
+
+        return Response({"detail": f"Session {group.num_sessions} started."}, status=200)
+
+    @action(detail=True, methods=["get"])
+    def scores(self, request, pk=None):
+        session = request.query_params.get("session")
+        group = get_object_or_404(Group, composite_key=pk)
+        session = session or group.num_sessions
+
+        if request.user not in group.members.all():
+            return PermissionDenied({"detail": "You are not a member of this group."})
+
+        queryset = GroupFoodScore.objects.filter(group=group, session=session)
+        paginated_queryset = self.paginate_queryset(queryset)
+        serializer = GroupFoodScoreListSerializer(
+            paginated_queryset, many=True)
+
+        return self.get_paginated_response(serializer.data)
+
 
 class SendGroupInviteViewset(CreateModelMixin, ListModelMixin, UpdateModelMixin, viewsets.GenericViewSet):
     def get_queryset(self):

recipes/views.py

@@ -8,6 +8,7 @@
 from recipes.serializers import (IngredientSerializer, RecipeListSerializer,
                                  RecipeSerializer, RecipeUpdateSerializer,
                                  StepCreateSerializer, StepUpdateSerializer)
+from swipables.models import Swipable
 
 
 class IngredientViewSet(CreateModelMixin, ListModelMixin, viewsets.GenericViewSet):
@@ -57,4 +58,5 @@ def get_serializer_class(self):
         return RecipeSerializer
 
     def perform_create(self, serializer):
-        serializer.save(owner_username=self.request.user)
+        instance = serializer.save(owner_username=self.request.user)
+        Swipable.objects.create(recipe=instance)

restaurants/migrations/0002_alter_restaurant_options.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.1.7 on 2025-04-06 02:21
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('restaurants', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='restaurant',
+            options={'ordering': ['name']},
+        ),
+    ]

restaurants/models.py

@@ -1,9 +1,16 @@
 from django.db import models
+
 from common.models import TimeStampedModel
 
-# Create your models here.
+
 class Restaurant(TimeStampedModel):
     id = models.AutoField(primary_key=True)
-    name = models.CharField(max_length = 50)
-    category = models.CharField(max_length = 50)
-    image = models.ImageField(upload_to='restaurants/', null=True, blank = True)
+    name = models.CharField(max_length=50)
+    category = models.CharField(max_length=50)
+    image = models.ImageField(upload_to='restaurants/', null=True, blank=True)
+
+    def __str__(self):
+        return self.name
+
+    class Meta:
+        ordering = ["name"]

restaurants/views.py

@@ -1,13 +1,17 @@
 from rest_framework import viewsets
+
 from common.permissions import AdminWriteElseAuthenticated
+from swipables.models import Swipable
+
 from .models import Restaurant
 from .serializers import RestaurantSerializer
-# Create your views here.
 
 
 class RestaurantView(viewsets.ModelViewSet):
     queryset = Restaurant.objects.all()
     serializer_class = RestaurantSerializer
     permission_classes = [AdminWriteElseAuthenticated]
 
-
+    def perform_create(self, serializer):
+        instance = serializer.save()
+        Swipable.objects.create(restaurant=instance)

swipables/admin.py

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

swipables/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class SwipablesConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'swipables'