Merge branch 'master' of https://github.com/pennlabs/office-hours-queue into feature/office-hour-reservation

Author: dkwncho

backend/Dockerfile

@@ -1,22 +1,17 @@
-FROM pennlabs/django-base:b269ea1613686b1ac6370154debbb741b012de1a-3.11
-ARG DEPENDENCY_MANAGER="uv"
+FROM pennlabs/django-base:11d476546bd11c7a499e0e93be8db6af035d360f-3.11
 
 LABEL maintainer="Penn Labs"
 
 # Install uv
 COPY --from=ghcr.io/astral-sh/uv@sha256:2381d6aa60c326b71fd40023f921a0a3b8f91b14d5db6b90402e65a635053709 /uv /uvx /bin/
 
 # Copy project dependencies
-COPY Pipfile* pyproject.toml uv.lock /app/
-
-# Install dependencies using uv or pipenv depending on DEPENDENCY_MANAGER arg
-RUN if [ "$DEPENDENCY_MANAGER" = "uv" ]; then \
-    uv sync --frozen --no-dev --no-install-project --python $(which python); \
-    mv /app/.venv/bin/uwsgi /usr/local/bin/uwsgi; \
-    mv /app/.venv/bin/gunicorn /usr/local/bin/gunicorn; \
-else \
-    pipenv install --system; \
-fi
+COPY pyproject.toml uv.lock /app/
+
+# Install dependencies
+RUN uv sync --frozen --no-dev --no-install-project --python $(which python); \
+    ln -s /app/.venv/bin/uwsgi /usr/local/bin/uwsgi; \
+    ln -s /app/.venv/bin/gunicorn /usr/local/bin/gunicorn
 
 # Make installed binaries available for POSIX compliant scripts
 ENV PATH="/app/.venv/bin:$PATH"

backend/Pipfile

@@ -13,7 +13,6 @@
     Semester,
     Tag,
     UserStatistic,
-    Booking,
 )
 
 
@@ -29,4 +28,3 @@
 admin.site.register(Announcement)
 admin.site.register(Tag)
 admin.site.register(UserStatistic)
-admin.site.register(Booking)

backend/Pipfile.lock

@@ -1,6 +1,5 @@
 from django.conf import settings
 from django.core.validators import MaxValueValidator, MinValueValidator
-from django.core.exceptions import ValidationError
 from django.db import models
 from django.dispatch import receiver
 from email_tools.emails import send_email
@@ -503,6 +502,18 @@ def __str__(self):
         end_str = self.end.strftime("%Y-%m-%d %H:%M:%S")
         return f"{start_str} to {end_str}"
 
-OldEvent.add_to_class('location', models.CharField(max_length=255, blank=True))
-OldOccurrence.add_to_class('location', models.CharField(max_length=255, blank=True))
-OldOccurrence.add_to_class('interval', models.IntegerField(blank=True, null=True))
+Event.add_to_class('location', models.CharField(max_length=255, blank=True))
+Occurrence.add_to_class('location', models.CharField(max_length=255, blank=True))
+Occurrence.add_to_class('interval', models.IntegerField(blank=True, null=True))
+
+def new_occurrence_init(self, *args, **kwargs):
+    super(Occurrence, self).__init__(*args, **kwargs)
+    event = kwargs.get("event", None)
+    if not self.title and event:
+        self.title = event.title
+    if not self.description and event:
+        self.description = event.description
+    if not self.location and event:
+        self.location = event.location
+
+Occurrence.__init__ = new_occurrence_init

backend/ohq/admin.py

@@ -507,44 +507,3 @@ def has_permission(self, request, view):
             return True
 
         return True
-
-class BookingPermission(permissions.BasePermission):
-    @staticmethod
-    def get_membership_from_occurrence(request, occurrence):
-        event_course_relation = EventRelation.objects.filter(event=occurrence.event).first()
-        membership = Membership.objects.filter(
-            course_id=event_course_relation.object_id, user=request.user
-        ).first()
-        return membership
-    
-    def has_object_permission(self, request, view, obj):
-        if view.action in ["retrieve"]:
-            booking = Booking.objects.filter(pk=view.kwargs["pk"]).first()
-            membership = self.get_membership_from_occurrence(request=request, occurrence=booking.occurrence)
-            return membership is not None
-
-        if view.action in ["update", "partial_update", "destroy"]:
-            booking = Booking.objects.filter(pk=view.kwargs["pk"]).first()
-            membership = self.get_membership_from_occurrence(request=request, occurrence=booking.occurrence)
-
-            if membership is None:
-                return False
-            
-            if membership.is_ta:
-                return True
-
-            return booking.user == request.user
-
-        return False
-            
-    def has_permission(self, request, view):
-        if not request.user.is_authenticated:
-            return False
-    
-        if view.action in ["list", "create"]:
-            occurrence_id = view.kwargs.get("occurrence_pk")
-            occurrence = Occurrence.objects.filter(id=occurrence_id).first()
-            membership = self.get_membership_from_occurrence(request=request, occurrence=occurrence)
-            return membership is not None
-
-        return True

backend/ohq/models.py

@@ -21,7 +21,6 @@
     QueueStatistic,
     Semester,
     Tag,
-    Booking,
 )
 from ohq.sms import sendSMSVerification
 from ohq.tasks import sendUpNextNotificationTask
@@ -542,7 +541,7 @@ def update(self, instance, validated_data):
                 else:
                     rule, _ = Rule.objects.get_or_create(
                         frequency=validated_data["rule"]["frequency"],
-                        params=validated_data["rule"].get("params", ""),
+                        params=validated_data["rule"]["params"],
                     )
                 validated_data.pop("rule")
 
@@ -564,7 +563,7 @@ def create(self, validated_data):
         course = Course.objects.get(pk=validated_data["course_id"])
         rule = None
         if "rule" in validated_data and validated_data["rule"] is not None:
-            rule, _ = Rule.objects.get_or_create(frequency=validated_data["rule"]["frequency"], params = validated_data["rule"].get("params", ""))
+            rule, _ = Rule.objects.get_or_create(frequency=validated_data["rule"]["frequency"], params = validated_data["rule"]["params"])
             validated_data.pop("rule")
 
         validated_data.pop("course_id")
@@ -592,16 +591,4 @@ class OccurrenceSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Occurrence
-        fields = ("id", "title", "description", "location", "start", "end", "cancelled", "event", "interval")
-
-class BookingSerializer(serializers.ModelSerializer):
-    """
-    Serializer for booking
-    """
-
-    occurrence = OccurrenceSerializer(read_only=True)
-
-    class Meta:
-        model = Booking
-        fields = ("id", "occurrence", "user", "start", "end")  
-
+        fields = ("id", "title", "description", "location", "start", "end", "cancelled", "event")

backend/ohq/permissions.py

@@ -19,8 +19,6 @@
     SemesterViewSet,
     TagViewSet,
     UserView,
-    BookingDetailViewSet,
-    BookingListCreateViewSet,
     HealthView,
 )
 
@@ -32,10 +30,6 @@
 router.register("courses", CourseViewSet, basename="course")
 router.register("events", EventViewSet, basename="event")
 router.register("occurrences", OccurrenceViewSet, basename="occurrence")
-router.register("bookings", BookingDetailViewSet, basename="booking")
-
-occurrence_router = routers.NestedSimpleRouter(router, "occurrences", lookup="occurrence")
-occurrence_router.register("bookings", BookingListCreateViewSet, basename="booking-create")
 
 course_router = routers.NestedSimpleRouter(router, "courses", lookup="course")
 course_router.register("queues", QueueViewSet, basename="queue")
@@ -71,4 +65,4 @@
     ),
 ]
 
-urlpatterns = router.urls + occurrence_router.urls + course_router.urls + queue_router.urls + additional_urls
+urlpatterns = router.urls + course_router.urls + queue_router.urls + additional_urls

backend/ohq/serializers.py

@@ -48,7 +48,6 @@
     QueueStatistic,
     Semester,
     Tag,
-    Booking,
 )
 from ohq.pagination import QuestionSearchPagination
 from ohq.permissions import (
@@ -66,7 +65,6 @@
     QueuePermission,
     QueueStatisticPermission,
     TagPermission,
-    BookingPermission,
 )
 from ohq.schemas import EventSchema, MassInviteSchema, OccurrenceSchema
 from ohq.serializers import (
@@ -85,7 +83,6 @@
     SemesterSerializer,
     TagSerializer,
     UserPrivateSerializer,
-    BookingSerializer,
 )
 from ohq.sms import sendSMSVerification
 
@@ -746,15 +743,15 @@ class OccurrenceViewSet(
     You must specify all of the fields or use a patch request.
 
     partial_update:
-    Update certain fields in the Occurrence.
+    Update certain fields in the Occurrece.
     """
 
     serializer_class = OccurrenceSerializer
     permission_classes = [OccurrencePermission | IsSuperuser]
     schema = OccurrenceSchema()
 
     def list(self, request, *args, **kwargs):
-        # ensure timezone consistency
+        # ensure timezone consitency
         course_ids = request.GET.getlist("course")
         filter_start = datetime.strptime(
             request.GET.get("filter_start"), "%Y-%m-%dT%H:%M:%SZ"
@@ -780,60 +777,6 @@ def list(self, request, *args, **kwargs):
 
     def get_queryset(self):
         return Occurrence.objects.filter(pk=self.kwargs["pk"])
-
-class BookingDetailViewSet(
-    mixins.RetrieveModelMixin,
-    mixins.UpdateModelMixin,
-    mixins.DestroyModelMixin,
-    viewsets.GenericViewSet,
-):
-    """
-    retrieve:
-    Return a single booking.
-
-    update:
-    Update all fields in the booking.
-    You must specify all of the fields or use a patch request.
-
-    partial_update:
-    Update certain fields in the booking.
-    Only specify the fields that you want to change.
-
-    destroy:
-    Delete a booking.
-    """
-
-    serializer_class = BookingSerializer
-    permission_classes = [BookingPermission | IsSuperuser]
-
-    def get_queryset(self):
-        return Booking.objects.filter(pk=self.kwargs["pk"])
-
-class BookingListCreateViewSet(
-    mixins.ListModelMixin,
-    mixins.CreateModelMixin,
-    viewsets.GenericViewSet,
-):
-    """
-    list:
-    Return a list of bookings for a specific occurrence.
-
-    create:
-    Create a booking for a specific occurrence.
-    """
-
-    serializer_class = BookingSerializer
-    permission_classes = [BookingPermission | IsSuperuser]
-
-    def get_queryset(self):
-        occurrence_id = self.kwargs.get("occurrence_pk")
-        return Booking.objects.filter(occurrence=occurrence_id).order_by("start")    
-    
-    def perform_create(self, serializer):
-        occurrence_id = self.kwargs.get("occurrence_pk")
-        occurrence = Occurrence.objects.get(pk=occurrence_id)
-        serializer.save(occurrence=occurrence, user=self.request.user)
-        
 class HealthView(View):
     def get(self, request):
         """
@@ -852,4 +795,4 @@ def get(self, request):
                                     enum: ["OK"]
         ---
         """
-        return JsonResponse({"message": "OK"}, status=HTTPStatus.OK) 
+        return JsonResponse({"message": "OK"}, status=HTTPStatus.OK)