Merge pull request #147 from TUK-DP/develop

deploy 1.1.2

.github/workflows/deploy.yml

@@ -29,5 +29,6 @@ jobs:
             sudo echo "${{ secrets.DOT_ENT_MYSQL }}" > .env-mysql
             sudo echo "${{ secrets.DOT_ENT_NEO4J }}" > .env-neo4j
             sudo echo "${{ secrets.DOT_ENT_S3 }}" > .env-s3
+            sudo echo "${{ secrets.DOT_ENT_DEEPL }}" > .env-s3
             sudo docker rm -f ${{ secrets.REPOSITORY_NAME }} || true
             sudo docker-compose -f docker-compose.yml -f docker-compose-prod.yml -p dp up -d --build

.github/workflows/hotfix.yml

@@ -28,5 +28,6 @@ jobs:
             sudo echo "${{ secrets.DOT_ENT_MYSQL }}" > .env-mysql
             sudo echo "${{ secrets.DOT_ENT_NEO4J }}" > .env-neo4j
             sudo echo "${{ secrets.DOT_ENT_S3 }}" > .env-s3
+            sudo echo "${{ secrets.DOT_ENT_DEEPL }}" > .env-s3
             sudo docker rm -f ${{ secrets.REPOSITORY_NAME }} || true
             sudo docker-compose -f docker-compose.yml -f docker-compose-prod.yml -p dp up -d --build

config/urls.py

@@ -17,9 +17,9 @@
 )
 urlpatterns = [
     path('api/admin/', admin.site.urls),
-    path('api/diary', include('diary.urls')),
-    path('api/keyword', include('diary.keyword_urls')),
-    path('api/quiz', include('diary.quiz_urls')),
+    path('api/diary', include('diary.urls.diary_urls')),
+    path('api/keyword', include('diary.urls.keyword_urls')),
+    path('api/quiz', include('diary.urls.quiz_urls')),
     path('api/users', include('users.urls')),
     path('api/image', include('image.urls')),
     path('api/center', include('center.urls')),

diary/models.py

@@ -1,8 +1,8 @@
 from django.db import models
 
 from config.basemodel import BaseModel
-from diary.graph import GraphDB
-from diary.text_rank_modules.textrank import TextRank, make_quiz
+from diary.utils.graph.graph import GraphDB
+from diary.utils.text_rank.textrank import TextRank, make_quiz
 
 
 class Diary(BaseModel):

diary/serialziers/diary_response_serializers.py

@@ -0,0 +1,70 @@
+from django.db.models import QuerySet
+
+from diary.serialziers.keyword_serializers import KeywordResponse
+from diary.validator import *
+from users.models import User
+from users.serializers import UserSafeSerializer
+
+
+class DiarySerializer(serializers.ModelSerializer):
+    user = UserSafeSerializer(read_only=True)
+
+    class Meta:
+        model = Diary
+        fields = '__all__'
+
+
+class DiaryResultResponse(serializers.ModelSerializer):
+    diaryId = serializers.IntegerField(source="id")
+
+    class Meta:
+        model = Diary
+        fields = ['diaryId', 'title', 'createDate', 'content', 'imgUrl']
+
+
+class GetDiaryByIdResponse(serializers.Serializer):
+    diaryId = serializers.IntegerField(source='id')
+    title = serializers.CharField()
+    createDate = serializers.DateField()
+    content = serializers.CharField()
+    keywords = KeywordResponse(many=True)
+    imgUrl = serializers.CharField()
+
+    @staticmethod
+    def to_json(diary: Diary):
+        return {
+            'diaryId': diary.id,
+            'title': diary.title,
+            'createDate': diary.createDate,
+            'content': diary.content,
+            'keywords': [KeywordResponse.to_json(keyword) for keyword in diary.keywords.all()],
+            'imgUrl': diary.imgUrl
+        }
+
+
+class GetDiaryPreviewResponse(serializers.Serializer):
+    diaryId = serializers.IntegerField(source='id')
+    title = serializers.CharField()
+    createDate = serializers.DateField()
+    content = serializers.CharField()
+
+    @staticmethod
+    def to_json(diary: Diary):
+        return {
+            'diaryId': diary.id,
+            'title': diary.title,
+            'createDate': diary.createDate,
+            'content': diary.content
+        }
+
+
+class GetDiariesByUserAndDateResponse(serializers.Serializer):
+    user = UserSafeSerializer()
+    diaries = GetDiaryByIdResponse(many=True)
+
+    @staticmethod
+    def to_json(user: User, diaries: QuerySet):
+        return {
+            'user': UserSafeSerializer(user).data,
+            'diaries': [GetDiaryPreviewResponse.to_json(diary) for diary in diaries]
+        }

diary/serialziers/diray_request_serializers.py

@@ -0,0 +1,78 @@
+from config.sort_options import *
+from diary.validator import *
+from users.models import User
+from users.validator import exist_user_id
+
+
+class GetDiaryByIdRequest(serializers.Serializer):
+    diaryId = serializers.IntegerField(validators=[exist_diary_id])
+
+
+class GetDiaryByDateRequest(serializers.Serializer):
+    date = serializers.DateField(required=False, help_text='YYYY-MM-DD 형식으로 입력해주세요.')
+
+
+class CheckDiaryEntriesRequest(serializers.Serializer):
+    userId = serializers.IntegerField(validators=[exist_user_id])
+    year = serializers.IntegerField(validators=[positive_year])
+    month = serializers.IntegerField(validators=[positive_month])
+
+
+class GetDiaryByUserAndDateRequest(serializers.Serializer):
+    userId = serializers.IntegerField(validators=[exist_user_id])
+    startDate = serializers.DateField()
+    finishDate = serializers.DateField()
+
+    sortBy = serializers.ChoiceField(
+        choices=[key for key in DATE_SORT_MAPPER.keys()],
+        required=False,
+        default=DES_CREATEDATE,
+        validators=[positive_sort_by]
+    )
+
+
+class DiaryCreateRequest(serializers.Serializer):
+    userId = serializers.IntegerField(validators=[exist_user_id])
+    title = serializers.CharField(max_length=100)
+    content = serializers.CharField()
+    date = serializers.DateField()
+
+    def validate(self, attrs):
+        not_exist_diary_date(attrs['userId'], attrs['date'])
+        return attrs
+
+    def create(self, validated_data):
+        return Diary.objects.create(
+            user_id=validated_data['userId'],
+            title=validated_data['title'],
+            content=validated_data['content'],
+            createDate=validated_data['date']
+        )
+
+
+class DiaryUpdateRequest(serializers.Serializer):
+    userId = serializers.IntegerField(validators=[exist_user_id])
+    title = serializers.CharField(max_length=100, required=False)
+    content = serializers.CharField(required=False)
+    date = serializers.DateField(required=False)
+
+    def validate(self, attrs):
+        if 'date' in attrs:
+            not_exist_diary_date(attrs['userId'], attrs['date'])
+        return attrs
+
+    def update(self, instance, validated_data):
+        title = validated_data.get('title', instance.title)
+        content = validated_data.get('content', instance.content)
+        createDate = validated_data.get('date', instance.createDate)
+        userId = validated_data.get('userId', instance.user_id)
+
+        instance.delete()
+        Diary.objects.filter(id=instance.id).delete()
+
+        return Diary.create(
+            user=User.objects.get(id=userId),
+            title=title,
+            content=content,
+            createDate=createDate
+        )

diary/graph_serializer.py → diary/serialziers/graph_serializers.py

@@ -1,4 +1,4 @@
-from rest_framework import serializers
+from diary.validator import *
 
 
 class UserNode(serializers.Serializer):