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
1 change: 1 addition & 0 deletions authenticate/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ def create(self, request):
"profile_image_url": user.profile_image_url,
"age_range": user.age_range,
"gender": user.gender,
"privacy_policy_agree": user.privacy_policy_agree
},
"tokens": {
"access_token": accessToken,
Expand Down
2 changes: 1 addition & 1 deletion config/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@
}

# 앱 기본 로거 설정
APP_LOGGER='django_debug'
APP_LOGGER='django'



Expand Down
7 changes: 7 additions & 0 deletions usr/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ class User(AbstractUser):
profile_image_url = models.URLField() # 프로필 이미지 링크입니다.
username = models.CharField(max_length=100)

# 개인정보 취급 동의 시간
privacy_policy_agree_time = models.DateTimeField(null=True, blank=True)
# 개인정보 취급 동의 여부
privacy_policy_agree = models.BooleanField(default=False)
# 개인정보 취급 동의서 버전
privacy_policy_version = models.CharField(max_length=255, null=True, blank=True)

USERNAME_FIELD = 'sub'
REQUIRED_FIELDS = ['username']

Expand Down
5 changes: 4 additions & 1 deletion usr/urls.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django.urls import path

from .views import Who, UserListView, UploadFcmTokenView
from .views import Who, UserListView, UploadFcmTokenView, AgreePrivacyPolicyView

urlpatterns = [
path('', UserListView.as_view({
Expand All @@ -11,5 +11,8 @@
}), name='who'), # 토큰 이용한 내 정보 get 매핑
path('fcm/', UploadFcmTokenView.as_view({
'post' : 'create',
})),
path('privacy_policy/', AgreePrivacyPolicyView.as_view({
'post': 'create'
}))
]
25 changes: 25 additions & 0 deletions usr/views.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import pytz
from rest_framework import status, viewsets
from rest_framework.permissions import IsAuthenticated
from rest_framework.response import Response
Expand All @@ -6,6 +7,8 @@
from services.exception_handler import UnExpectedException, NoRequiredParameterException
from usr.models import User, FCMToken
from .serializers import UserSerializer, FCMTokenSerializer
from django.utils import timezone
import datetime


class Who(ViewSet):
Expand Down Expand Up @@ -68,3 +71,25 @@ def create(self, request):
fcm token은 매우 중요한 개인정보이기에 유저 정보 자체를 보내지 않습니다.
"""
return Response(status=status.HTTP_201_CREATED)

class AgreePrivacyPolicyView(ViewSet):
permission_classes = [IsAuthenticated]

def create(self, request):
privacy_policy_agree_time = timezone.now()
privacy_policy_agree = request.data.get('privacy_policy_agree')
privacy_policy_version = request.data.get('privacy_policy_version')
user = request.user

seoul_tz = pytz.timezone("Asia/Seoul")

user.privacy_policy_agree = privacy_policy_agree
user.privacy_policy_agree_time = privacy_policy_agree_time.astimezone(seoul_tz)
user.privacy_policy_version = privacy_policy_version
user.save()

return Response({
'privacy_policy_agree': user.privacy_policy_agree,
'privacy_policy_agree_time': user.privacy_policy_agree_time,
'privacy_policy_version': user.privacy_policy_version
},status=status.HTTP_201_CREATED)