dahee kim

Change model configuration

1 from django.contrib import admin 1 from django.contrib import admin
2 -from .models import Video, Device, History, Lock, Record, Door 2 +from .models import Video, Device, RemoteHistory, Lock, Record, Door
3 # Register your models here. 3 # Register your models here.
4 admin.site.register(Door) 4 admin.site.register(Door)
5 admin.site.register(Video) 5 admin.site.register(Video)
6 admin.site.register(Device) 6 admin.site.register(Device)
7 -admin.site.register(History) 7 +admin.site.register(RemoteHistory)
8 admin.site.register(Lock) 8 admin.site.register(Lock)
9 admin.site.register(Record) 9 admin.site.register(Record)
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -15,7 +15,8 @@ class Migration(migrations.Migration): ...@@ -15,7 +15,8 @@ class Migration(migrations.Migration):
15 migrations.CreateModel( 15 migrations.CreateModel(
16 name='Device', 16 name='Device',
17 fields=[ 17 fields=[
18 - ('rfid_id', models.CharField(max_length=255, primary_key=True, serialize=False)), 18 + ('device_id', models.AutoField(auto_created=True, primary_key=True, serialize=False))
19 + ('rfid_id', models.CharField(max_length=255)),
19 ('created', models.DateTimeField(default=django.utils.timezone.now)), 20 ('created', models.DateTimeField(default=django.utils.timezone.now)),
20 ], 21 ],
21 ), 22 ),
...@@ -26,7 +27,7 @@ class Migration(migrations.Migration): ...@@ -26,7 +27,7 @@ class Migration(migrations.Migration):
26 ], 27 ],
27 ), 28 ),
28 migrations.CreateModel( 29 migrations.CreateModel(
29 - name='History', 30 + name='RemoteHistory',
30 fields=[ 31 fields=[
31 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), 32 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
32 ('device_name', models.CharField(max_length=255)), 33 ('device_name', models.CharField(max_length=255)),
......
...@@ -7,7 +7,8 @@ class Door(models.Model) : ...@@ -7,7 +7,8 @@ class Door(models.Model) :
7 door_id = models.CharField(max_length = 255, primary_key = True) 7 door_id = models.CharField(max_length = 255, primary_key = True)
8 8
9 class Device(models.Model) : 9 class Device(models.Model) :
10 - device_id = models.CharField(max_length = 255, primary_key = True) 10 + device_id = models.AutoField(primary_key=True)
11 + rfid_id = models.CharField(max_length = 255)
11 created = models.DateTimeField(default = timezone.now) 12 created = models.DateTimeField(default = timezone.now)
12 13
13 class Video(models.Model) : 14 class Video(models.Model) :
...@@ -18,7 +19,7 @@ class Lock(models.Model) : ...@@ -18,7 +19,7 @@ class Lock(models.Model) :
18 id = models.IntegerField(primary_key = True) 19 id = models.IntegerField(primary_key = True)
19 state = models.BooleanField(default = True) 20 state = models.BooleanField(default = True)
20 21
21 -class History(models.Model) : 22 +class RemoteHistory(models.Model) :
22 device_name = models.CharField(max_length = 255) 23 device_name = models.CharField(max_length = 255)
23 ctrtime = models.DateTimeField(default = timezone.now) 24 ctrtime = models.DateTimeField(default = timezone.now)
24 25
......
1 -from api.models import Device, Video, Lock, History, Record, Door 1 +from api.models import Device, Video, Lock, RemoteHistory, Record, Door
2 from rest_framework import serializers 2 from rest_framework import serializers
3 3
4 4
...@@ -12,9 +12,9 @@ class VideoSerializer(serializers.ModelSerializer) : ...@@ -12,9 +12,9 @@ class VideoSerializer(serializers.ModelSerializer) :
12 model = Video 12 model = Video
13 fields = '__all__' 13 fields = '__all__'
14 14
15 -class HistorySerializer(serializers.ModelSerializer) : 15 +class RemoteHistorySerializer(serializers.ModelSerializer) :
16 class Meta : 16 class Meta :
17 - model = History 17 + model = RemoteHistory
18 fields = '__all__' 18 fields = '__all__'
19 19
20 class RecordSerializer(serializers.ModelSerializer) : 20 class RecordSerializer(serializers.ModelSerializer) :
......