Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/config/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"http://127.0.0.1:5173",
# "http://localhost:8000",
)

CORS_ALLOW_ALL_ORIGINS = True
ROOT_URLCONF = 'config.urls'

TEMPLATES = [
Expand Down
6 changes: 3 additions & 3 deletions backend/diary/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
from django.db import models
from users.models import User

from apps.models import ChatRoom


class Diary(models.Model):
JOY = 'joy'
Expand All @@ -17,13 +19,11 @@ class Diary(models.Model):

id = models.AutoField(primary_key=True)
user = models.ForeignKey(User, on_delete=models.CASCADE)
chat_room = models.ForeignKey(ChatRoom, on_delete=models.CASCADE, null=True)
content = models.TextField() # 일기 내용 = 요약 내용
img_url = models.CharField(max_length=500, null=True)
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True, null=True)
deleted_at = models.DateTimeField(null=True)
mood = models.CharField(max_length=10, choices=MOOD_CHOICES)
capture_url = models.CharField(max_length=500, null=True, blank=True)



21 changes: 13 additions & 8 deletions backend/diary/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ def post(self, request, format=None):

diary = Diary.objects.create(
user=request.user,
chat_room=chat_room,
mood=mood,
content=summary,
img_url=img_url,
Expand All @@ -66,15 +67,17 @@ def post(self, request, format=None):


class DiaryView(APIView):
def get_object(self, pk):
try:
return Diary.objects.get(pk=pk)
except Diary.DoesNotExist:
raise Http404

@swagger_auto_schema(operation_id="일기 조회")
def get(self, request, pk, format=None):
diary = self.get_object(pk)
try:
diary = Diary.objects.get(pk=pk)
chat_room_id = diary.chat_room.id if diary.chat_room else None
except Diary.DoesNotExist:
# 일기가 아직 준비되지 않았음을 나타내는 응답
return Response({
"status": "200",
"message": "일기가 생성 중 입니다."
})

diary_data = {
"status": "200",
Expand All @@ -84,9 +87,11 @@ def get(self, request, pk, format=None):
"imageURL": diary.img_url,
"username": diary.user.username,
"captureURL": diary.capture_url,
"mood": diary.mood
"mood": diary.mood,
"chat_room_id": chat_room_id
}
return Response(diary_data)

class DiaryListView(APIView):
@swagger_auto_schema(
operation_id="일기 일정 조회"
Expand Down