From d086eb39b61966ac96311237fbc564b4d7b04789 Mon Sep 17 00:00:00 2001 From: sm4640 Date: Fri, 2 May 2025 22:14:50 +0900 Subject: [PATCH] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Fix:=20[#41]=20notificatio?= =?UTF-8?q?n=20=EA=B4=80=EB=A0=A8=20=EC=BD=94=EB=93=9C=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- users/models.py | 5 ----- users/serializers.py | 5 ----- users/urls.py | 7 +------ users/views.py | 18 ------------------ 4 files changed, 1 insertion(+), 34 deletions(-) diff --git a/users/models.py b/users/models.py index ac5c4ab..9f62dcd 100644 --- a/users/models.py +++ b/users/models.py @@ -63,8 +63,3 @@ class User(BaseModel, AbstractBaseUser, PermissionsMixin): return self.nickname -class Notification(BaseModel): - user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='notifications') - content = models.TextField() - is_read = models.BooleanField(default=False) - note_type = models.CharField(max_length=10, choices=NotificationType.choices) diff --git a/users/serializers.py b/users/serializers.py index 05f9dc5..817c753 100644 --- a/users/serializers.py +++ b/users/serializers.py @@ -62,8 +62,3 @@ class UserMemberInfoSerializer(serializers.ModelSerializer): 'custom_url', 'job_and_interests' ] - -class NotificationSerializer(serializers.ModelSerializer): - class Meta: - model = Notification - fields = ['id', 'content', 'note_type', 'is_read'] \ No newline at end of file diff --git a/users/urls.py b/users/urls.py index a73f9a1..f7c8f47 100644 --- a/users/urls.py +++ b/users/urls.py @@ -1,14 +1,10 @@ -from django.urls import path, include +from django.urls import path from .views import * -from rest_framework.routers import DefaultRouter app_name = 'users' -router = DefaultRouter() -router.register(r'notifications', NotificationReadViewSet, basename='notification') - urlpatterns = [ path('refresh-token/', RefreshAPIView.as_view()), path('join/', JoinAPIView.as_view()), @@ -20,5 +16,4 @@ urlpatterns = [ path('mypage/profile//', MyPageProfileAPIView.as_view()), path('mypage/works//', MyPageWorkListAPIView.as_view()), path('mypage/my-info/', MyPageMemberInfoAPIView.as_view()), - path('', include(router.urls)), ] \ No newline at end of file diff --git a/users/views.py b/users/views.py index 5713225..3c10136 100644 --- a/users/views.py +++ b/users/views.py @@ -249,21 +249,3 @@ class MyPageMemberInfoAPIView(APIView): return Response(serializer.data, status=status.HTTP_200_OK) return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) -class NotificationReadViewSet(ReadOnlyModelViewSet): - serializer_class = NotificationSerializer - - # 30일 이전 알림만 가져옴 - def get_queryset(self): - return UserToNotificationService.get_all_notification(self.request.user) - - def list(self, request, *args, **kwargs): - queryset = self.get_queryset() - serializer = self.get_serializer(queryset, many=True) - return Response(serializer.data, status=status.HTTP_200_OK) - - def retrieve(self, request, *args, **kwargs): - instance = self.get_object() - instance.is_read = True - instance.save() - serializer = self.get_serializer(instance) - return Response(serializer.data, status=status.HTTP_200_OK) \ No newline at end of file