video delete 안 되는 오류 수정

@@ -268,59 +268,62 @@ class VideoList(APIView) :
                 'date' : datetime.now()
                 'date' : datetime.now()
             }, status = status.HTTP_400_BAD_REQUEST)      
             }, status = status.HTTP_400_BAD_REQUEST)      
 
 
-# 비디오 수동 삭제
-    def delete(self, request, vid_name, format = None) :  # request URI에 vid_name가 포함되어있음 : api/video/{vid_name}
+# 비디오 확인
+class VideoDetail(APIView) :
+    def get(self, request, vid_name, format = None) : # 요청한 URI에 vid_name가 포함되어있음
         try :
         try :
             if request.auth == None :
             if request.auth == None :
                 raise PermissionDenied   
                 raise PermissionDenied   
             request_id = vid_name
             request_id = vid_name
             if request_id == 'None' :
             if request_id == 'None' :
                 raise FieldDoesNotExist   
                 raise FieldDoesNotExist   
-            session = boto3.session.Session(aws_access_key_id = S3_ACCESS_KEY_ID, aws_secret_access_key = S3_SECRET_ACCESS_KEY, region_name = AWS_REGION)
-            s3 = session.client('s3')
-            
-            target = Video.objects.get(vid_name = request_id)
-            s3.delete_object(Bucket = S3_STORAGE_BUCKET_NAME, Key = str(target.vid_name) + '.mp4')
-            s3.delete_object(Bucket = S3_STORAGE_BUCKET_NAME, Key = str(target.vid_name) + '_thumb.jpg')
-            target.delete()
-            return Response(status = status.HTTP_200_OK)
+            queryset = Video.objects.filter(vid_name = request_id) # door_id 유효성 검색
+            if not queryset.exists():
+                raise FieldDoesNotExist   
+            download_url = S3_ACCESS_URL + str(request_id) + '.mp4'  # S3 다운로드 링크 변환
+            if not download_url :
+                raise ObjectDoesNotExist   
+            res = {
+                's3link' : download_url
+            }   # 응답 코드에 보낼 데이터
+            return Response(res, status = status.HTTP_200_OK)
         except FieldDoesNotExist as error :
         except FieldDoesNotExist as error :
             return Response({
             return Response({
                 'error' : "FieldDoesNotExist ",
                 'error' : "FieldDoesNotExist ",
                 'date' : datetime.now()
                 'date' : datetime.now()
             }, status = status.HTTP_400_BAD_REQUEST)
             }, status = status.HTTP_400_BAD_REQUEST)
+        except ObjectDoesNotExist as error :
+            return Response({
+                'error' : "ObjectDoesNotExist",
+                'date' : datetime.now()
+            }, status = status.HTTP_404_NOT_FOUND)
         except PermissionDenied as error :
         except PermissionDenied as error :
             return Response({
             return Response({
                 'error' : "PermissionDenied",
                 'error' : "PermissionDenied",
                 'date' : datetime.now()
                 'date' : datetime.now()
             }, status = status.HTTP_400_BAD_REQUEST) 
             }, status = status.HTTP_400_BAD_REQUEST) 
 
 
-# 비디오 확인(다운로드)
-class VideoDownload(APIView) :
-    def get(self, request, vid_name, format = None) : # 요청한 URI에 vid_name가 포함되어있음
+# 비디오 수동 삭제
+    def delete(self, request, vid_name, format = None) :  # request URI에 vid_name가 포함되어있음 : api/video/{vid_name}
         try : 
         try : 
             if request.auth == None :
             if request.auth == None :
                 raise PermissionDenied             
                 raise PermissionDenied             
             request_id = vid_name
             request_id = vid_name
             if request_id == 'None' :
             if request_id == 'None' :
                 raise FieldDoesNotExist
                 raise FieldDoesNotExist
-            download_url = S3_ACCESS_URL + str(request_id) + '.mp4'  # S3 다운로드 링크 변환
-            if not download_url :
-                raise ObjectDoesNotExist   
-            res = {
-                's3link' : download_url
-            }   # 응답 코드에 보낼 데이터
-            return Response(res, status = status.HTTP_200_OK)
+            session = boto3.session.Session(aws_access_key_id = S3_ACCESS_KEY_ID, aws_secret_access_key = S3_SECRET_ACCESS_KEY, region_name = AWS_REGION)
+            s3 = session.client('s3')
+            
+            target = Video.objects.get(vid_name = request_id)
+            s3.delete_object(Bucket = S3_STORAGE_BUCKET_NAME, Key = str(target.vid_name) + '.mp4')
+            s3.delete_object(Bucket = S3_STORAGE_BUCKET_NAME, Key = str(target.vid_name) + '_thumb.jpg')
+            target.delete()
+            return Response(status = status.HTTP_200_OK)
         except FieldDoesNotExist as error :
         except FieldDoesNotExist as error :
             return Response({
             return Response({
                 'error' : "FieldDoesNotExist ",
                 'error' : "FieldDoesNotExist ",
                 'date' : datetime.now()
                 'date' : datetime.now()
             }, status = status.HTTP_400_BAD_REQUEST)
             }, status = status.HTTP_400_BAD_REQUEST)
-        except ObjectDoesNotExist as error :
-            return Response({
-                'error' : "ObjectDoesNotExist",
-                'date' : datetime.now()
-            }, status = status.HTTP_404_NOT_FOUND)
         except PermissionDenied as error :
         except PermissionDenied as error :
             return Response({
             return Response({
                 'error' : "PermissionDenied",
                 'error' : "PermissionDenied",

@@ -21,7 +21,7 @@ from api import views
 urlpatterns = [
 urlpatterns = [
     path('admin/', admin.site.urls),
     path('admin/', admin.site.urls),
     path('api/video', views.VideoList.as_view()),
     path('api/video', views.VideoList.as_view()),
-    path('api/video/<str:vid_name>', views.VideoDownload.as_view()),
+    path('api/video/<str:vid_name>', views.VideoDetail.as_view()),
     path('auto/checkDate', views.CheckDate.as_view()),
     path('auto/checkDate', views.CheckDate.as_view()),
     path('api/setting', views.Recording.as_view()),
     path('api/setting', views.Recording.as_view()),
     path('api/auth', views.Login.as_view()),
     path('api/auth', views.Login.as_view()),