Merge branch 'feature/auth' of ssh://khuhub.khu.ac.kr:12959/2020-1-CloudComputin…

…g/C_Team_KhuDrive into feature/auth

+# Generated by Django 3.0.7 on 2020-06-10 17:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0008_item_file_type'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='user',
+            name='id',
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='int_id',
+            field=models.AutoField(primary_key=True, serialize=False),
+        ),
+    ]

+# Generated by Django 3.0.7 on 2020-06-10 17:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0009_auto_20200611_0240'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='current_size',
+            field=models.BigIntegerField(blank=True, default=0),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='total_size',
+            field=models.BigIntegerField(blank=True, default=1099511627776),
+        ),
+    ]

@@ -33,12 +33,13 @@ class SharedItem(models.Model):
 
 
 
 
 class User(models.Model):
 class User(models.Model):
-    int_id = models.IntegerField()
-    user_id = models.CharField(max_length = 50)
-    name = models.CharField(max_length = 50)
-    password = models.CharField(max_length = 20)
-    total_size = models.IntegerField()
-    current_size = models.IntegerField()
+    int_id = models.AutoField(primary_key=True)
+    user_id = models.CharField(max_length=50)
+    name = models.CharField(max_length=50)
+    password = models.CharField(max_length=20)
+    total_size = models.BigIntegerField(blank=True, default=1099511627776)
+    current_size = models.BigIntegerField(blank=True, default=0)
     created_time = models.DateTimeField(auto_now=True)
     created_time = models.DateTimeField(auto_now=True)
+
     class Meta:
     class Meta:
         ordering = ['int_id']
         ordering = ['int_id']

@@ -135,9 +135,3 @@ class UserViewSet(viewsets.ModelViewSet):
             {'Error': 'The Method is not allowed.'},
             {'Error': 'The Method is not allowed.'},
             status=status.HTTP_405_METHOD_NOT_ALLOWED,
             status=status.HTTP_405_METHOD_NOT_ALLOWED,
             content_type="application/json")
             content_type="application/json")
-
-
-
-
-
-