Merge branch 'master' of https://github.com/serverdevcamp/camp4_ing

Author: ddud2n

laundry_guest/backend/src/project/config/settings.py

@@ -26,7 +26,6 @@ def get_secret(setting, secrets=secrets):
         raise ImproperlyConfigured(error_msg)
 
 
-# SECRET_KEY = 'y=k2hf*g*xdaa9*8b#*&(-$+i#(f2*0)_rp*@_che^iwyuoolj'
 SECRET_KEY = get_secret('SECRET_KEY')
 
 # SECURITY WARNING: don't run with debug turned on in production!
@@ -45,6 +44,8 @@ def get_secret(setting, secrets=secrets):
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'rest_framework',
+    'drf_yasg',
+    'corsheaders',
     'django_mysql',
     'myauth',
     'laundry',
@@ -54,6 +55,7 @@ def get_secret(setting, secrets=secrets):
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
+    'corsheaders.middleware.CorsMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
@@ -166,19 +168,18 @@ def get_secret(setting, secrets=secrets):
 # 이메일
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
 EMAIL_USE_TLS = True
-EMAIL_HOST = "smtp.gmail.com"
-EMAIL_HOST_USER = 'rkdalstjd9@gmail.com'
-EMAIL_HOST_PASSWORD = 'mskang0710@@'
-EMAIL_PORT = 587
+EMAIL_HOST = get_secret('EMAIL_HOST')
+EMAIL_HOST_USER = get_secret('EMAIL_HOST_USER')
+EMAIL_HOST_PASSWORD = get_secret('EMAIL_HOST_PASSWORD')
+EMAIL_PORT = get_secret('EMAIL_PORT')
 DEFAULT_FROM_EMAIL = EMAIL_HOST_USER
 
-
 AUTH_USER_MODEL = "myauth.Profile"
 
 REST_FRAMEWORK = {
-    # 'DEFAULT_PERMISSION_CLASSES': (
-    #     'rest_framework.permissions.IsAuthenticated',
-    # ),
+    'DEFAULT_PERMISSION_CLASSES': (
+        'rest_framework.permissions.IsAuthenticated',
+    ),
     'DEFAULT_AUTHENTICATION_CLASSES': (
         # 'rest_framework_jwt.authentication.JSONWebTokenAuthentication',
         'rest_framework.authentication.SessionAuthentication',
@@ -194,3 +195,9 @@ def get_secret(setting, secrets=secrets):
 #     'JWT_REFRESH_EXPIRATION_DELTA': datetime.timedelta(seconds=400),
 #     'JWT_PAYLOAD_HANDLER': 'myauth.utils.jwt_payload_handler',
 # }
+
+CORS_ORIGIN_ALLOW_ALL = True
+CORS_ORIGIN_WHITELIST = (
+    'http://localhost:3000',
+    'http://127.0.0.1:3000'
+)

laundry_guest/backend/src/project/config/urls.py

@@ -1,14 +1,42 @@
 from django.contrib import admin
 from django.urls import path, include
-from rest_framework_jwt.views import obtain_jwt_token, verify_jwt_token, refresh_jwt_token
+from django.conf.urls import url
+#from rest_framework_jwt.views import obtain_jwt_token, verify_jwt_token, refresh_jwt_token
+
+from drf_yasg.views import get_schema_view
+from drf_yasg import openapi
+from rest_framework.permissions import AllowAny
 
 urlpatterns = [
     path('admin/', admin.site.urls),
     path('myauth/', include('myauth.urls')),
     path('laundry/', include('laundry.urls')),
     path('payment/', include('payment.urls')),
-    path('jwt/get/', obtain_jwt_token),
-    path('jwt/verify/', verify_jwt_token),
-    path('jwt/refresh/', refresh_jwt_token),
+    # path('jwt/get/', obtain_jwt_token),
+    # path('jwt/verify/', verify_jwt_token),
+    # path('jwt/refresh/', refresh_jwt_token),
     path('api-auth/', include('rest_framework.urls')),
 ]
+
+schema_view = get_schema_view(
+    openapi.Info(
+        title="Snippets API",
+        default_version='v1',
+        description="Test description",
+        terms_of_service="https://www.google.com/policies/terms/",
+        contact=openapi.Contact(email="contact@snippets.local"),
+        license=openapi.License(name="BSD License"),
+    ),
+    validators=['flex'],
+    public=True,
+    permission_classes=(AllowAny,),
+)
+
+urlpatterns += [
+    url(r'^swagger(?P<format>\.json|\.yaml)$',
+        schema_view.without_ui(cache_timeout=0), name='schema-json'),
+    url(r'^swagger/$', schema_view.with_ui('swagger',
+                                           cache_timeout=0), name='schema-swagger-ui'),
+    url(r'^redoc/$', schema_view.with_ui('redoc',
+                                         cache_timeout=0), name='schema-redoc'),
+]

laundry_guest/backend/src/project/laundry/models.py

@@ -44,6 +44,7 @@ class LaundryItem(models.Model):
     category = models.CharField(max_length=10)
     material = models.CharField(max_length=10)
     price = models.PositiveIntegerField()
+    information = models.CharField(max_length=100, blank=True)
 
     def __str__(self):
         return self.category

laundry_guest/backend/src/project/laundry/views.py

@@ -19,6 +19,11 @@
 
 class LaundryShopView(APIView):
     def get(self, request, *args, **kwargs):
+        '''
+        # 기능
+        전체 세탁소 조회
+
+        '''
         try:
             queryset = LaundryShop.objects.all()
         except:
@@ -32,14 +37,14 @@ def get(self, request, *args, **kwargs):
 
 class LaundryShopDetailView(APIView):
 
-    def get_object(self, request, id):
+    def get_object(self, id):
         try:
             return LaundryShop.objects.get(id=id)
         except ObjectDoesNotExist:
             return None
 
     def get(self, request, id, *args, **kwargs):
-        laundry_shop = self.get_object(request, id)
+        laundry_shop = self.get_object(id)
         if laundry_shop is None:
             return Response({
                 'response': 'error',
@@ -55,6 +60,11 @@ def get(self, request, id, *args, **kwargs):
 
 class ReviewView(APIView):
     def get(self, request, id, *args, **kwargs):
+        '''
+        # 기능
+        {id}세탁소의 전체 리뷰 조회
+
+        '''
         laundry_shop = LaundryShop.objects.get(id=id)
         queryset = Review.objects.filter(laundryshop=laundry_shop)
         serializer = ReviewSerializer(queryset, many=True)
@@ -65,6 +75,20 @@ def get(self, request, id, *args, **kwargs):
         })
 
     def post(self, request, id, *args, **kwargs):
+        '''
+        # 기능
+        {id}세탁소에 리뷰 생성
+        # example
+            {
+                "review": {
+                    "content": "{}세탁소 최고!",
+                    "grade": 3,
+                    "image": {
+                        "imageUrls": ["이미지주소1", "   "]
+                    }
+                }
+            }
+        '''
         try:
             data = request.data['review']
         except:
@@ -91,18 +115,23 @@ def post(self, request, id, *args, **kwargs):
 
 
 class ReviewDetailView(APIView):
-    def get_object(self, request, review_id):
+    def get_object(self, review_id):
         try:
             return Review.objects.get(id=review_id)
         except ObjectDoesNotExist:
             return None
 
     def get(self, request, id, review_id):
-        review = self.get_object(request, review_id)
+        '''
+        # 기능
+        {id}세탁소의 {review_id}리뷰 상세 조회
+
+        '''
+        review = self.get_object(review_id)
         if review is None:
             return Response({
                 'response': 'error',
-                'message': '{} review를 찾을 수 없습니다.'.format(id)
+                'message': '{} review를 찾을 수 없습니다.'.format(review_id)
             })
         serializer = ReviewSerializer(review)
         return Response({
@@ -112,11 +141,20 @@ def get(self, request, id, review_id):
         })
 
     def put(self, request, id, review_id):
-        review = self.get_object(request, review_id)
+        '''
+        # 기능
+        {id}세탁소의 {review_id}리뷰 수정
+        # example
+            {
+                "content": "스마일 세탁소 사랑해요!"
+            }
+
+        '''
+        review = self.get_object(review_id)
         if review is None:
             return Response({
                 'response': 'error',
-                'message': '{} review를 찾을 수 없습니다.'.format(id)
+                'message': '{} review를 찾을 수 없습니다.'.format(review_id)
             })
         serializer = ReviewSerializer(review, data=request.data, partial=True)
         if serializer.is_valid():
@@ -133,7 +171,13 @@ def put(self, request, id, review_id):
             })
 
     def delete(self, request, id, review_id):
-        review = self.get_object(request, review_id)
+        '''
+        # 기능
+        {id}세탁소의 {review_id}리뷰 삭제
+
+        '''
+
+        review = self.get_object(review_id)
         if review is None:
             return Response({
                 'response': 'error',
@@ -155,6 +199,11 @@ def delete(self, request, id, review_id):
 
 class LaundryShopLikeView(APIView):
     def post(self, request, id, *args, **kwargs):
+        '''
+        # 기능
+        {id}세탁소의 좋아요 토글
+
+        '''
         profile = request.user
         try:
             laundryshop = LaundryShop.objects.get(id=id)
@@ -164,32 +213,36 @@ def post(self, request, id, *args, **kwargs):
                 'message': '{} laundry shop을 찾을 수 없습니다.'.format(id)
             })
 
-        like = Like(
-            profile=profile,
-            laundryshop=laundryshop
-        )
+        is_liked = False
+
         try:
+            like = Like.objects.get(profile=profile, laundryshop=laundryshop)
+        except ObjectDoesNotExist:
+            like = Like(
+                profile=profile,
+                laundryshop=laundryshop
+            )
             like.save()
-        except:
-            return Response({
-                'response': 'error',
-                'message': 'db에서 생성에 실패했습니다.'
-            })
+            is_liked = True
+
+        if not is_liked:
+            like.delete()
+
         try:
-            laundryshop.like_num += 1
+            laundryshop.like_num += -1 if is_liked else 1
             laundryshop.save()
         except:
             return Response({
                 'response': 'error',
-                'message': 'db에서 좋아요 수 증가에 실패했습니다.'
+                'message': 'db에서 좋아요 수 변화에 실패했습니다.'
             })
 
         return Response({
             'response': 'success',
-            'message': 'like가 성공적으로 생성되었습니다.'
+            'message': 'like가 성공적으로 변화되었습니다.'
         })
 
-    def delete(self, request, id, *args, **kwargs):
+    # def delete(self, request, id, *args, **kwargs):
         profile = request.user
         try:
             laundryshop = LaundryShop.objects.get(id=id)
@@ -232,6 +285,16 @@ def delete(self, request, id, *args, **kwargs):
 
 class OrderForReviewView(APIView):
     def get(self, request, is_reviewd, *args, **kwargs):
+        '''
+        # 기능
+        사용자가 한 주문
+        # parameter
+        is_reviewd : True / False
+        * True일 경우 : 리뷰가 있는 order
+        * False일 경우 : 리뷰가 없는 order
+
+        '''
+
         profile = request.user
         orders = ""
         # 사용자가 한 주문 중에 review 를 남긴 주문
@@ -264,13 +327,13 @@ def get_object(self, order_id):
             return Order.objects.get(id=order_id)
         except ObjectDoesNotExist:
             return None
-        except:
-            return Response({
-                'response': 'error',
-                'message': 'DB 문제'
-            })
 
     def get(self, request, order_id, *args, **kwargs):
+        '''
+        # 기능
+        주문에 해당되는 리뷰 상세 조회
+
+        '''
         order = self.get_object(order_id)
         if order is None:
             return Response({
@@ -285,6 +348,21 @@ def get(self, request, order_id, *args, **kwargs):
         })
 
     def post(self, request, order_id, *args, **kwargs):
+        '''
+        # 기능
+        주문에 해당되는 리뷰 생성
+        # example
+            {
+                "review": {
+                    "content": "스마일세탁소가 제일 깨끗해요!!",
+                    "grade": 3,
+                    "image": {
+                        "imageUrls": ["이미지주소1", "   "]
+                    }
+                }
+            }
+
+        '''
         try:
             data = request.data['review']
         except:

laundry_guest/backend/src/project/myauth/urls.py

@@ -4,7 +4,6 @@
 app_name = 'myauth'
 
 urlpatterns = [
-    path('', views.main, name="main"),
     path('sign_up/', views.CreateProfileView.as_view(), name="sign_up"),
     path('login/', views.UserLoginView.as_view(), name="login"),
     path('logout/', views.logout, name="logout"),