Showing
4 changed files
with
98 additions
and
13 deletions
api/migrations/0001_initial.py
0 → 100644
| 1 | +# Generated by Django 3.1.2 on 2020-11-04 11:24 | ||
| 2 | + | ||
| 3 | +from django.db import migrations, models | ||
| 4 | +import django.db.models.deletion | ||
| 5 | +import django.utils.timezone | ||
| 6 | + | ||
| 7 | + | ||
| 8 | +class Migration(migrations.Migration): | ||
| 9 | + | ||
| 10 | + initial = True | ||
| 11 | + | ||
| 12 | + dependencies = [ | ||
| 13 | + ] | ||
| 14 | + | ||
| 15 | + operations = [ | ||
| 16 | + migrations.CreateModel( | ||
| 17 | + name='Device', | ||
| 18 | + fields=[ | ||
| 19 | + ('rfid_id', models.CharField(max_length=255, primary_key=True, serialize=False)), | ||
| 20 | + ('created', models.DateTimeField(default=django.utils.timezone.now)), | ||
| 21 | + ], | ||
| 22 | + ), | ||
| 23 | + migrations.CreateModel( | ||
| 24 | + name='Door', | ||
| 25 | + fields=[ | ||
| 26 | + ('door_id', models.CharField(max_length=255, primary_key=True, serialize=False)), | ||
| 27 | + ], | ||
| 28 | + ), | ||
| 29 | + migrations.CreateModel( | ||
| 30 | + name='History', | ||
| 31 | + fields=[ | ||
| 32 | + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), | ||
| 33 | + ('device_name', models.CharField(max_length=255)), | ||
| 34 | + ('ctrtime', models.DateTimeField(default=django.utils.timezone.now)), | ||
| 35 | + ], | ||
| 36 | + ), | ||
| 37 | + migrations.CreateModel( | ||
| 38 | + name='Video', | ||
| 39 | + fields=[ | ||
| 40 | + ('vid_id', models.IntegerField(primary_key=True, serialize=False)), | ||
| 41 | + ('created', models.DateTimeField(default=django.utils.timezone.now)), | ||
| 42 | + ('s3_link', models.CharField(max_length=255)), | ||
| 43 | + ], | ||
| 44 | + ), | ||
| 45 | + migrations.CreateModel( | ||
| 46 | + name='Record', | ||
| 47 | + fields=[ | ||
| 48 | + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), | ||
| 49 | + ('recording', models.BooleanField(default=True)), | ||
| 50 | + ('door', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='api.door')), | ||
| 51 | + ], | ||
| 52 | + ), | ||
| 53 | + migrations.CreateModel( | ||
| 54 | + name='Lock', | ||
| 55 | + fields=[ | ||
| 56 | + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), | ||
| 57 | + ('state', models.BooleanField(default=True)), | ||
| 58 | + ('door', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='api.door')), | ||
| 59 | + ], | ||
| 60 | + ), | ||
| 61 | + ] |
api/migrations/0002_auto_20201110_1944.py
0 → 100644
| 1 | +# Generated by Django 3.1.2 on 2020-11-10 10:44 | ||
| 2 | + | ||
| 3 | +from django.db import migrations, models | ||
| 4 | + | ||
| 5 | + | ||
| 6 | +class Migration(migrations.Migration): | ||
| 7 | + | ||
| 8 | + dependencies = [ | ||
| 9 | + ('api', '0001_initial'), | ||
| 10 | + ] | ||
| 11 | + | ||
| 12 | + operations = [ | ||
| 13 | + migrations.RemoveField( | ||
| 14 | + model_name='lock', | ||
| 15 | + name='door', | ||
| 16 | + ), | ||
| 17 | + migrations.RemoveField( | ||
| 18 | + model_name='record', | ||
| 19 | + name='door', | ||
| 20 | + ), | ||
| 21 | + migrations.AlterField( | ||
| 22 | + model_name='lock', | ||
| 23 | + name='id', | ||
| 24 | + field=models.IntegerField(primary_key=True, serialize=False), | ||
| 25 | + ), | ||
| 26 | + migrations.AlterField( | ||
| 27 | + model_name='record', | ||
| 28 | + name='id', | ||
| 29 | + field=models.IntegerField(primary_key=True, serialize=False), | ||
| 30 | + ), | ||
| 31 | + ] |
| ... | @@ -16,7 +16,7 @@ class Video(models.Model) : | ... | @@ -16,7 +16,7 @@ class Video(models.Model) : |
| 16 | s3_link = models.CharField(max_length = 255) | 16 | s3_link = models.CharField(max_length = 255) |
| 17 | 17 | ||
| 18 | class Lock(models.Model) : | 18 | class Lock(models.Model) : |
| 19 | - door = models.ForeignKey(Door, on_delete=models.CASCADE) | 19 | + id = models.IntegerField(primary_key = True) |
| 20 | state = models.BooleanField(default = True) | 20 | state = models.BooleanField(default = True) |
| 21 | 21 | ||
| 22 | class History(models.Model) : | 22 | class History(models.Model) : |
| ... | @@ -24,5 +24,5 @@ class History(models.Model) : | ... | @@ -24,5 +24,5 @@ class History(models.Model) : |
| 24 | ctrtime = models.DateTimeField(default = timezone.now) | 24 | ctrtime = models.DateTimeField(default = timezone.now) |
| 25 | 25 | ||
| 26 | class Record(models.Model) : | 26 | class Record(models.Model) : |
| 27 | - door = models.ForeignKey(Door, on_delete=models.CASCADE) | 27 | + id = models.IntegerField(primary_key = True) |
| 28 | recording = models.BooleanField(default = True) | 28 | recording = models.BooleanField(default = True) |
| ... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
| ... | @@ -94,14 +94,10 @@ class CheckDate(APIView) : | ... | @@ -94,14 +94,10 @@ class CheckDate(APIView) : |
| 94 | class Recording(APIView) : | 94 | class Recording(APIView) : |
| 95 | def get(self, request, format = None) : | 95 | def get(self, request, format = None) : |
| 96 | try : | 96 | try : |
| 97 | - ''' | 97 | + target = Record.objects.get(id = 1) |
| 98 | - request_id = request.GET.get('door_id') | 98 | + serializer = RecordSerializer(target, many = False) |
| 99 | - target = Record.objects.filter(door_id = request_id) | ||
| 100 | - ''' | ||
| 101 | - target = Record.objects.all() | ||
| 102 | - serializer = RecordSerializer(target, many = True) | ||
| 103 | res = { | 99 | res = { |
| 104 | - 'recording' : serializer.data | 100 | + 'recording' : serializer.data['recording'] |
| 105 | } | 101 | } |
| 106 | return Response(res, status = status.HTTP_200_OK) | 102 | return Response(res, status = status.HTTP_200_OK) |
| 107 | except FieldDoesNotExist as error : | 103 | except FieldDoesNotExist as error : |
| ... | @@ -112,10 +108,7 @@ class Recording(APIView) : | ... | @@ -112,10 +108,7 @@ class Recording(APIView) : |
| 112 | 108 | ||
| 113 | def put(self, request, format = None) : | 109 | def put(self, request, format = None) : |
| 114 | try : | 110 | try : |
| 115 | - request_id = request.GET.get('door_id') | 111 | + target = Record.objects.filter(id = 1) |
| 116 | - if not request_id : | ||
| 117 | - raise FieldDoesNotExist | ||
| 118 | - target = Record.objects.filter(door_id = request_id) | ||
| 119 | target.update(recording = request.data['recording']) | 112 | target.update(recording = request.data['recording']) |
| 120 | return Response(status = status.HTTP_200_OK) | 113 | return Response(status = status.HTTP_200_OK) |
| 121 | except FieldDoesNotExist as error : | 114 | except FieldDoesNotExist as error : | ... | ... |
-
Please register or login to post a comment