최지우

edit api restful and add database

...@@ -12,3 +12,10 @@ class Video(models.Model) : ...@@ -12,3 +12,10 @@ class Video(models.Model) :
12 vidname = models.CharField(max_length = 255, primary_key = True) 12 vidname = models.CharField(max_length = 255, primary_key = True)
13 created = models.DateTimeField(default = timezone.now) 13 created = models.DateTimeField(default = timezone.now)
14 s3_link = models.CharField(max_length = 255) 14 s3_link = models.CharField(max_length = 255)
15 +
16 +class Lock(models.Model) :
17 + state = models.BooleanField(default = True)
18 +
19 +class History(models.Model) :
20 + device = ForeignKey(Device, on_delete=models.CASCADE)
21 + ctrtime = created = models.DateTimeField(default = timezone.now)
...\ No newline at end of file ...\ No newline at end of file
......
1 -from api.models import Phone, Video 1 +from api.models import Device, Video, History
2 from rest_framework import serializers 2 from rest_framework import serializers
3 3
4 4
5 -class PhoneSerializer(serializers.ModelSerializer) : 5 +class DeviceSerializer(serializers.ModelSerializer) :
6 class Meta : 6 class Meta :
7 model = Device 7 model = Device
8 fields = '__all__' 8 fields = '__all__'
...@@ -11,3 +11,8 @@ class VideoSerializer(serializers.ModelSerializer) : ...@@ -11,3 +11,8 @@ class VideoSerializer(serializers.ModelSerializer) :
11 class Meta : 11 class Meta :
12 model = Video 12 model = Video
13 fields = '__all__' 13 fields = '__all__'
14 +
15 +class HistorySerializer(serializers.ModelSerializer) :
16 + class Meta :
17 + model = History
18 + fields = '__all__'
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -44,7 +44,7 @@ class Video(APIView) : ...@@ -44,7 +44,7 @@ class Video(APIView) :
44 'date' : datetime.now() 44 'date' : datetime.now()
45 }, status = status.HTTP_404_NOT_FOUND) 45 }, status = status.HTTP_404_NOT_FOUND)
46 46
47 - def post(self, request, format = None) : 47 + def delete(self, request, format = None) :
48 try : 48 try :
49 request_id = request.GET.get('vidname') 49 request_id = request.GET.get('vidname')
50 if request_id == 'None' : 50 if request_id == 'None' :
...@@ -63,7 +63,7 @@ class Video(APIView) : ...@@ -63,7 +63,7 @@ class Video(APIView) :
63 }, status = status.HTTP_400_BAD_REQUEST) 63 }, status = status.HTTP_400_BAD_REQUEST)
64 64
65 class CheckDate(APIView) : 65 class CheckDate(APIView) :
66 - def post(self, request, format = None) : 66 + def delete(self, request, format = None) :
67 checkdate = datetime.now() + timedelta(days = -7) 67 checkdate = datetime.now() + timedelta(days = -7)
68 quaryset = Video.objects.filter(created__lt = checkdate) 68 quaryset = Video.objects.filter(created__lt = checkdate)
69 session = boto3.session.Session(aws_access_key_id = S3_ACCESS_KEY_ID, aws_secret_access_key = S3_SECRET_ACCESS_KEY, region_name = AWS_REGION) 69 session = boto3.session.Session(aws_access_key_id = S3_ACCESS_KEY_ID, aws_secret_access_key = S3_SECRET_ACCESS_KEY, region_name = AWS_REGION)
......
...@@ -20,6 +20,6 @@ from api import views ...@@ -20,6 +20,6 @@ from api import views
20 20
21 urlpatterns = [ 21 urlpatterns = [
22 path('admin/', admin.site.urls), 22 path('admin/', admin.site.urls),
23 - path('api/video/', views.Video.as_view()), 23 + path('api/video/<str:vidname>/', views.Video.as_view()),
24 - path('api/videoAutoDelete/', views.CheckDate.as_view()), 24 + path('api/checkDate/', views.CheckDate.as_view()),
25 ] 25 ]
......