-
Notifications
You must be signed in to change notification settings - Fork 2
School Meal API #587
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
School Meal API #587
Changes from 3 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| from .restaurant import Restaurant | ||
| from .course import Course | ||
| from .cafeteria_menu import CafeteriaMenu, MealType | ||
| from .course import Course, MealType | ||
| from .menu_allergy import MenuAllergy | ||
| from .menu import Menu | ||
| from .menu import Menu | ||
| from .menu_allergy import MenuAllergy |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| from django.db import models | ||
| from ara.db.models import MetaDataModel | ||
|
|
||
| class Restaurant(MetaDataModel): | ||
| restaurant_name = models.CharField( | ||
| verbose_name="식당 이름", | ||
| max_length=32, | ||
| unique=True, | ||
| ) | ||
|
|
||
| def __str__(self): | ||
| return self.restaurant_name |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| from rest_framework import serializers | ||
| from ..models import Course, Menu, CafeteriaMenu | ||
|
|
||
| class BaseMenuSerializer(serializers.ModelSerializer): | ||
| """알러지 코드 추출 및 경고 플래그 표시 여부 확인""" | ||
| allergy_codes = serializers.SerializerMethodField() | ||
| has_user_allergy = serializers.SerializerMethodField() | ||
|
|
||
| def get_allergy_codes(self, obj): | ||
| return list(obj.allergy_set.values_list('allergen_code', flat=True)) | ||
|
|
||
| def get_has_user_allergy(self, obj): | ||
| user_allergies = self.context.get('user_allergies', []) | ||
| if not user_allergies: | ||
| return False | ||
| menu_allergies = set(obj.allergy_set.values_list('allergen_code', flat=True)) | ||
| return bool(menu_allergies.intersection(set(user_allergies))) | ||
|
|
||
| class MenuSerializer(BaseMenuSerializer): | ||
| class Meta: | ||
| model = Menu | ||
| fields = ('menu_name', 'allergy_codes', 'has_user_allergy') | ||
|
|
||
| class CafeteriaMenuSerializer(BaseMenuSerializer): | ||
| class Meta: | ||
| model = CafeteriaMenu | ||
| fields = ('menu_name', 'price', 'allergy_codes', 'has_user_allergy') | ||
|
|
||
| class CourseSerializer(serializers.ModelSerializer): | ||
| menus = MenuSerializer(source='filtered_menus', many=True, read_only=True) | ||
|
|
||
| class Meta: | ||
| model = Course | ||
| fields = ('course_name', 'price', 'menus') | ||
|
|
||
| class DailyMealResponseSerializer(serializers.Serializer): | ||
| courses = CourseSerializer(many=True) | ||
| cafeteria_menus = CafeteriaMenuSerializer(many=True) |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| from django.urls import path, include | ||
| from .views.router import router | ||
|
|
||
| urlpatterns = [ | ||
| path("", include(router.urls)), | ||
| ] |
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 여기 이부분에서 잘못된 형식의 데이터에 대해서 에러 메서지를 조금 더 자세히 명시해 주세요 ex) 날짜가 틀린 경우 어떤 형식으로 와야 하는지 +) 테스트 케이스도 만들어 주세요!! |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| from rest_framework import viewsets, status | ||
| from rest_framework.response import Response | ||
| from django.db.models import Prefetch | ||
| from datetime import date as date_type | ||
| from ..models import Course, Menu, CafeteriaMenu | ||
| from ..serializers.meal_serializers import CourseSerializer, CafeteriaMenuSerializer | ||
|
|
||
| class MealViewSet(viewsets.ViewSet): | ||
|
|
||
| def list(self, request): | ||
| date_str = request.query_params.get('date') | ||
| restaurant_name = request.query_params.get('restaurant_name') | ||
| meal_time = request.query_params.get('meal_time') | ||
|
|
||
| if not all([date_str, restaurant_name, meal_time]): | ||
| return Response({'error': 'Missing parameters'}, status=status.HTTP_400_BAD_REQUEST) | ||
| try: | ||
| query_date = date_type(int(date_str[:4]), int(date_str[4:6]), int(date_str[6:])) | ||
| except (ValueError, TypeError): | ||
| return Response({'error': 'Invalid date'}, status=status.HTTP_400_BAD_REQUEST) | ||
|
|
||
| """알러지 필터 context 생성""" | ||
| raw_codes = request.query_params.get('allergy_codes', '') | ||
| user_allergies = [int(c.strip()) for c in raw_codes.split(',') if c.strip()] | ||
| context = {'user_allergies': user_allergies} | ||
|
|
||
| """일반 코스 메뉴 조회""" | ||
| all_menus_qs = Menu.objects.all().prefetch_related('allergy_set') | ||
|
|
||
| course_queryset = Course.objects.filter( | ||
| restaurant_id__restaurant_name=restaurant_name, | ||
| date=query_date, | ||
| meal_time=meal_time | ||
| ).prefetch_related( | ||
| Prefetch('menu_set', queryset=all_menus_qs, to_attr='filtered_menus') | ||
| ) | ||
|
|
||
| course_serializer = CourseSerializer(course_queryset, many=True, context=context) | ||
|
|
||
| """카페테리아 메뉴 조회""" | ||
| cafeteria_queryset = CafeteriaMenu.objects.filter( | ||
| restaurant_id__restaurant_name=restaurant_name, | ||
| date=query_date, | ||
| meal_time=meal_time, | ||
| ).prefetch_related('allergy_set') | ||
|
|
||
| cafeteria_serializer = CafeteriaMenuSerializer(cafeteria_queryset, many=True, context=context) | ||
|
|
||
|
|
||
| return Response({ | ||
| 'restaurant': restaurant_name, | ||
| 'courses': course_serializer.data, | ||
| 'cafeteria_menus': cafeteria_serializer.data, | ||
| }, status=status.HTTP_200_OK) |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| from rest_framework import routers | ||
| from apps.meal.views import meal_viewset | ||
|
|
||
| router = routers.DefaultRouter() | ||
|
|
||
| router.register( | ||
| prefix=r"", | ||
| viewset=meal_viewset.MealViewSet, | ||
| basename="meal", | ||
| ) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
migration 파일은 날리면 안됩니다... 수정 사항이 있으면 migration 파일을 고치지 않고 새로 만들어야 합니다. 즉 0001과 0002가 있는 상황에서 수정 사항이 생기면, 그 수정사항은 0003 파일로 만들어야 합니다.
해결을 위해서 아래와 같이 작업해서 다시 커밋해주시면 되요!