[feat] Memo 모델에 필드 timestamp필드 추가

* [fix] mirgate error 해결

* [feat] memo post 구현 완료

* [chore] post 응답으로 전체 메모 가져오기

* [feat] 모아보기 viewset으로 생성

* [chore] null로 반환되는 queryset 예외처리하기

* [refactor] JsonResponse로 변경

* [fix] 메모 뷰에 user 추가

* refactor/bookmark

* [refactor] 북마크뷰에 유저인증 추가

* [feat] Memo 모델에 필드 추가

Author: chaeri93

app/migrations/0019_auto_20220108_1638.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.8 on 2022-01-08 16:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('app', '0018_merge_20220107_1341'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='tag',
+            name='tag_color',
+            field=models.CharField(blank=True, choices=[('#5DA7EF', '#5DA7EF'), ('#9ECBFF', '#9ECBFF'), ('#C8D769', '#C8D769'), ('#50B093', '#50B093'), ('#81C7BA', '#81C7BA'), ('#B282CC', '#B282CC'), ('#F85C5D', '#F85C5D'), ('#FFAB41', '#FFAB41'), ('#FFBE6C', '#FFBE6C'), ('#FFD84E', '#FFD84E')], max_length=10, null=True),
+        ),
+    ]

app/migrations/0020_memo_timestamp.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.0.8 on 2022-01-08 16:41
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('app', '0019_auto_20220108_1638'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='memo',
+            name='timestamp',
+            field=models.CharField(default=django.utils.timezone.now, max_length=50),
+            preserve_default=False,
+        ),
+    ]

app/models.py

@@ -33,14 +33,20 @@ class Meta:
 
 class Tag(BaseModel):
     COLOR_IN_TAG_CHOICES = [
-        ('RD', 'red'),
-        ('GR', 'green'),
-        ('BL', 'blue'),
-        # 더 추가해야됨!
+        ('#5DA7EF', '#5DA7EF'),
+        ('#9ECBFF', '#9ECBFF'),
+        ('#C8D769', '#C8D769'),
+        ('#50B093', '#50B093'),
+        ('#81C7BA', '#81C7BA'),
+        ('#B282CC', '#B282CC'),
+        ('#F85C5D', '#F85C5D'),
+        ('#FFAB41', '#FFAB41'),
+        ('#FFBE6C', '#FFBE6C'),
+        ('#FFD84E', '#FFD84E'),
     ]
 
     tag_name = models.CharField(max_length=20, null=True, blank=True)
-    tag_color = models.CharField(max_length=2, choices=COLOR_IN_TAG_CHOICES, null=True, blank=True)
+    tag_color = models.CharField(max_length=10, choices=COLOR_IN_TAG_CHOICES, null=True, blank=True)
     user = models.ForeignKey('User', on_delete=models.CASCADE)
 
     class Meta:
@@ -52,9 +58,11 @@ class Memo(BaseModel):
     url = models.URLField(null=True, blank=True)
     is_marked = models.BooleanField(default=False)
     is_tag_new = models.BooleanField(default=False)
+    timestamp = models.CharField(max_length=50)
     tag = models.ForeignKey('Tag', on_delete=models.SET_NULL, null=True, blank=True, related_name='memo_tag')
     user = models.ForeignKey('User', on_delete=models.CASCADE,  null=True, related_name='memo_user')
 
+
     class Meta:
         db_table = 'memo'
 

app/serializers.py

@@ -62,7 +62,7 @@ def get_images(self, obj):
 
     class Meta:
         model = Memo
-        fields = ['id', 'memo_text', 'url', 'tag', 'tag_name', 'tag_color', 'images', 'is_marked',
+        fields = ['id', 'memo_text', 'url', 'tag', 'tag_name', 'tag_color', 'images', 'is_marked', 'timestamp',
                   'created_at', 'updated_at']
 
     def get_tag_name(self, obj):

app/urls.py

@@ -5,7 +5,7 @@
 from app.views import HelloView, KakaoLoginView, ImagesView, UserView, BookmarkView, MemoFilterViewSet, TagList, TagDetail
 
 
-from app.views import MemoList, MemoDetial
+from app.views import MemoList, MemoDetail
 from server.settings import base
 
 router = routers.DefaultRouter()
@@ -17,7 +17,7 @@
     path('hello', HelloView.as_view()),
     path('auth/kakao', KakaoLoginView.as_view()),
     path('memos', MemoList.as_view()),
-    path('memos/<int:pk>', MemoDetial.as_view()),
+    path('memos/<int:pk>', MemoDetail.as_view()),
     path('memos/bookmark', BookmarkView.as_view()),
     path('images', ImagesView.as_view()),
     path('users', UserView.as_view()),

app/views.py

@@ -199,8 +199,10 @@ def delete(self, request):
             return JsonResponse({"message": "권한이 없습니다."}, status=400)
 
 
-class BookmarkView(APIView, PaginationHandlerMixin):
-    pagination_class = PageNumberPagination
+
+
+class BookmarkView(APIView):
+    # pagination_class = PageNumberPagination
 
     def get_memos(self, pk):
         return get_object_or_404(Memo, pk=pk)
@@ -217,26 +219,28 @@ def post(self, request):
             memo.is_marked = False
         memo.save()
         memos = Memo.objects.filter(user=user).order_by('-created_at')
-        page = self.paginate_queryset(memos)
-        if page is not None:
-            serializer = self.get_paginated_response(MemoSerializer(page, many=True).data)
-        else:
-            serializer = MemoSerializer(memos, many=True)
+        # page = self.paginate_queryset(memos)
+        # if page is not None:
+        #     serializer = self.get_paginated_response(MemoSerializer(page, many=True).data)
+        # else:
+        serializer = MemoSerializer(memos, many=True)
+
         return JsonResponse(serializer.data, status=status.HTTP_201_CREATED)
 
 
 class MemoList(APIView, PaginationHandlerMixin):
-    pagination_class = PageNumberPagination
+    # pagination_class = PageNumberPagination
 
     def get(self, request, *args, **kwargs):
         try:
             user_authenticate(request)
             memos = Memo.objects.filter(user=request.user).order_by('-created_at')
-            page = self.paginate_queryset(memos)
-            if page is not None:
-                serializer = self.get_paginated_response(MemoSerializer(page, many=True).data)
-            else:
-                serializer = MemoSerializer(memos, many=True)
+
+            # page = self.paginate_queryset(memos)
+            # if page is not None:
+            #     serializer = self.get_paginated_response(MemoSerializer(page, many=True).data)
+            # else:
+            serializer = MemoSerializer(memos, many=True)
             return JsonResponse(serializer.data, status=status.HTTP_200_OK, safe=False)
         except UserIsAnonymous:
             return JsonResponse({"message": "알 수 없는 유저입니다."}, status=404)
@@ -251,33 +255,33 @@ def post(self, request, *args, **kwargs):
                 try:  # DB에 중복값이 있다면 저장안함
                     tag = Tag.objects.get(tag_name=request.data['tag_name'])
                 except Tag.DoesNotExist:
-                    tag = Tag.objects.create(tag_name=request.data['tag_name'], tag_color=request.data['tag_color'],
-                                             user=user)
-                Memo.objects.create(memo_text=request.data['memo_text'], url=request.data['url'], tag=tag, user=user)
+                    tag = Tag.objects.create(tag_name=request.data['tag_name'], tag_color=request.data['tag_color'], user=user)
+                Memo.objects.create(memo_text=request.data['memo_text'], url=request.data['url'],
+                                    timestamp=request.data['timestamp'], tag=tag, user=user)
                 memos = Memo.objects.filter(user=user).order_by('-created_at')
-                page = self.paginate_queryset(memos)
-                if page is not None:
-                    serializer = self.get_paginated_response(MemoSerializer(page, many=True).data)
-                else:
-                    serializer = MemoSerializer(memos, many=True)
-                return JsonResponse(serializer.data, status=status.HTTP_201_CREATED)
+                # page = self.paginate_queryset(memos)
+                # if page is not None:
+                #     serializer = self.get_paginated_response(MemoSerializer(page, many=True).data)
+                # else:
+                serializer = MemoSerializer(memos, many=True)
+                return JsonResponse(serializer.data, status=status.HTTP_201_CREATED, safe=False)
             else:
                 try:
                     tag = Tag.objects.get(id=request.data['tag'])
                 except Tag.DoesNotExist:
                     tag = None
                 Memo.objects.create(memo_text=request.data['memo_text'], url=request.data['url'], tag=tag, user=user)
                 memos = Memo.objects.filter(user=user).order_by('-created_at')
-                page = self.paginate_queryset(memos)
-                if page is not None:
-                    serializer = self.get_paginated_response(MemoSerializer(page, many=True).data)
-                else:
-                    serializer = MemoSerializer(memos, many=True)
-                return JsonResponse(serializer.data, status=status.HTTP_201_CREATED)
+                # page = self.paginate_queryset(memos)
+                # if page is not None:
+                #     serializer = self.get_paginated_response(MemoSerializer(page, many=True).data)
+                # else:
+                serializer = MemoSerializer(memos, many=True)
+                return JsonResponse(serializer.data, status=status.HTTP_201_CREATED, safe=False)
         return JsonResponse(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
 
-class MemoDetial(APIView):
+class MemoDetail(APIView):
     def get_memos(self, pk):
         return get_object_or_404(Memo, pk=pk)
 
@@ -312,19 +316,19 @@ def delete(self, request, pk):
 class MemoFilterViewSet(ModelViewSet):
     queryset = Memo.objects.all()
     serializer_class = MemoSerializer
-    pagination_class = PageNumberPagination
+    # pagination_class = PageNumberPagination
 
     @action(detail=False)
     def texts(self, request, *args, **kwargs):
         user = request.user
         if request.user.is_anonymous:
             return JsonResponse({'message': '알 수 없는 유저입니다.'}, status=404)
         queryset = Memo.objects.filter(memo_text__isnull=False, user=user).order_by('-created_at')
-        self.paginator.page_size_query_param = "page_size"
-        page = self.paginate_queryset(queryset)
-        if page is not None:
-            serializer = self.get_serializer(page, many=True)
-            return self.get_paginated_response(serializer.data)
+        # self.paginator.page_size_query_param = "page_size"
+        # page = self.paginate_queryset(queryset)
+        # if page is not None:
+        #     serializer = self.get_serializer(page, many=True)
+        #     return self.get_paginated_response(serializer.data)
         serializer = self.get_serializer(queryset, many=True)
         return JsonResponse(serializer.data, status=status.HTTP_200_OK, safe=False)
 
@@ -334,11 +338,11 @@ def links(self, request, *args, **kwargs):
         if request.user.is_anonymous:
             return JsonResponse({'message': '알 수 없는 유저입니다.'}, status=404)
         queryset = Memo.objects.filter(url__isnull=False, user=user).order_by('-created_at')
-        self.paginator.page_size_query_param = "page_size"
-        page = self.paginate_queryset(queryset)
-        if page is not None:
-            serializer = self.get_serializer(page, many=True)
-            return self.get_paginated_response(serializer.data)
+        # self.paginator.page_size_query_param = "page_size"
+        # page = self.paginate_queryset(queryset)
+        # if page is not None:
+        #     serializer = self.get_serializer(page, many=True)
+        #     return self.get_paginated_response(serializer.data)
         serializer = self.get_serializer(queryset, many=True)
         return JsonResponse(serializer.data, status=status.HTTP_200_OK, safe=False)
 
@@ -348,11 +352,11 @@ def tags(self, request, pk):
         if request.user.is_anonymous:
             return JsonResponse({'message': '알 수 없는 유저입니다.'}, status=404)
         queryset = Memo.objects.filter(tag_id=pk, user=user).order_by('-created_at')
-        self.paginator.page_size_query_param = "page_size"
-        page = self.paginate_queryset(queryset)
-        if page is not None:
-            serializer = self.get_serializer(page, many=True)
-            return self.get_paginated_response(serializer.data)
+        # self.paginator.page_size_query_param = "page_size"
+        # page = self.paginate_queryset(queryset)
+        # if page is not None:
+        #     serializer = self.get_serializer(page, many=True)
+        #     return self.get_paginated_response(serializer.data)
         serializer = self.get_serializer(queryset, many=True)
         return JsonResponse(serializer.data, status=status.HTTP_200_OK, safe=False)
 
@@ -397,6 +401,7 @@ def post(self, request):
         return JsonResponse(serializer.data, status=status.HTTP_201_CREATED, safe=False)
 
 
+
 class TagDetail(APIView):
     def get_tag(self, pk):
         return get_object_or_404(Tag, pk=pk)

server/settings/dev.py

@@ -1,9 +1,11 @@
 from .base import *
 
 DEBUG = True
+
 # ALLOWED_HOSTS = env.list('DJANGO_ALLOWED_HOSTS')
 ALLOWED_HOSTS = [ '*' ]
 
+
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.mysql',