Merge pull request #40 from TUK-DP/refactor/19

[refactor] Quizs 테이블을 Questions과 Keywords로 분리

Author: Leewonchan14

diary/migrations/0004_keywords_questions_delete_quizs.py

@@ -0,0 +1,43 @@
+# Generated by Django 5.0.2 on 2024-03-06 08:50
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('diary', '0003_remove_diary_content_alter_sentences_diary_quizs_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Keywords',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('keyword', models.CharField(max_length=100)),
+                ('sentence', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='keywords', to='diary.sentences')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='Questions',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('question', models.TextField()),
+                ('keyword', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='questions', to='diary.keywords')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.DeleteModel(
+            name='Quizs',
+        ),
+    ]

diary/models.py

@@ -20,8 +20,12 @@ class Sentences(BaseModel):
 
     diary = models.ForeignKey('diary.Diary', related_name='sentences', on_delete=models.CASCADE)
 
-class Quizs(BaseModel):
+class Keywords(BaseModel):
+    keyword = models.CharField(max_length=100)
+
+    sentence = models.ForeignKey('diary.Sentences', related_name='keywords', on_delete=models.CASCADE)
+
+class Questions(BaseModel):
     question = models.TextField()
-    answer = models.CharField(max_length=50)
 
-    sentence = models.ForeignKey('diary.Sentences', related_name='quizs', on_delete=models.CASCADE)
+    keyword = models.ForeignKey('diary.Keywords', related_name='questions', on_delete=models.CASCADE)

diary/serializers.py

@@ -2,7 +2,7 @@
 
 from users.models import User
 from users.serializers import UserSafeSerializer
-from .models import Diary, Sentences, Quizs
+from .models import Diary, Sentences, Keywords, Questions
 
 
 class DiarySerializer(serializers.ModelSerializer):
@@ -33,11 +33,18 @@ class Meta:
         model = Sentences
         fields = ['id', 'diary', 'sentence']
 
-class QuizSerializer(serializers.ModelSerializer):
-    sentences = SentenceSerializer(read_only=True)
+class KeywordSerializer(serializers.ModelSerializer):
+    sentence = SentenceSerializer(read_only=True)
 
     class Meta:
-        model = Quizs
+        model = Keywords
+        fields = '__all__'
+
+class QuestionSerializer(serializers.ModelSerializer):
+    keyword = KeywordSerializer(read_only=True)
+
+    class Meta:
+        model = Questions
         fields = '__all__'
 
 class DiaryCreateRequest(serializers.ModelSerializer):

diary/views.py

@@ -6,7 +6,7 @@
 from rest_framework.response import Response
 from rest_framework import status
 
-from diary.models import Diary, Sentences, Quizs
+from diary.models import Diary, Sentences, Keywords, Questions
 from diary.serializers import *
 from users.models import User
 
@@ -54,9 +54,10 @@ def post(self, request):
             sentence = Sentences.objects.create(sentence=content, diary=diary)
 
             memory = TextRank(content=content)
-            question, answer = make_quiz(memory, keyword_size=5)
+            question, keyword = make_quiz(memory, keyword_size=5)
 
-            Quizs.objects.bulk_create([Quizs(question=q, answer=a, sentence=sentence) for q, a in zip(question, answer)])
+            keywords = Keywords.objects.bulk_create([Keywords(keyword=k, sentence=sentence) for k in keyword])
+            Questions.objects.bulk_create([Questions(question=q, keyword=k) for q, k in zip(question, keywords)])
 
             return JsonResponse({'isSuccess': True, 'result': SentenceSimpleSerializer(sentence).data}, status=status.HTTP_201_CREATED)
 
@@ -87,9 +88,10 @@ def post(self, request):
                 sentence = Sentences.objects.create(sentence=content, diary=diary)
 
                 memory = TextRank(content=content)
-                question, answer = make_quiz(memory, keyword_size=5)
+                question, keyword = make_quiz(memory, keyword_size=5)
 
-                Quizs.objects.bulk_create([Quizs(question=q, answer=a, sentence=sentence) for q, a in zip(question, answer)])
+                keywords = Keywords.objects.bulk_create([Keywords(keyword=k, sentence=sentence) for k in keyword])
+                Questions.objects.bulk_create([Questions(question=q, keyword=k) for q, k in zip(question, keywords)])
 
                 return JsonResponse({'isSuccess': True, 'result': SentenceSimpleSerializer(sentence).data}, status=status.HTTP_201_CREATED)
             except Diary.DoesNotExist:
@@ -127,13 +129,21 @@ def get(self, request):
                 return JsonResponse({'isSuccess': False, 'message': '해당 일기를 찾을 수 없습니다.'}, status=status.HTTP_404_NOT_FOUND)
 
             sentences = diary.sentences.all()
-            quizs = []
+
+            q = []
+            a = []
 
             for sentence in sentences:
-                quizs.extend(sentence.quizs.all())
-            
-            serializer = QuizSerializer(quizs, many=True)
+                keywords = sentence.keywords.all()
+                a.extend(keywords)
+                for keyword in keywords:
+                    questions = keyword.questions.all()
+                    q.extend(questions)
+
+            result = []
+            for question_obj, keyword_obj in zip(q, a):
+                result.append({"Q": question_obj.question, "A": keyword_obj.keyword})
 
-            return JsonResponse(serializer.data, safe=False, status=status.HTTP_200_OK)
+            return JsonResponse({'result': result}, status=status.HTTP_200_OK)
 
         return JsonResponse(serializer.errors, status=status.HTTP_400_BAD_REQUEST)