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),
+        ),
+    ]

-from django.db import models
-
-# Create your models here.
-class Item(models.Model):
-    item_id = models.AutoField(primary_key = True)
-    is_folder = models.BooleanField(default = False)
-    name = models.CharField(max_length = 50)
-    file_type = models.CharField(max_length=100, null=True) # signed_url 생성을 위해 file type 세팅
-    path = models.TextField()
-    #parent = models.ForeignKey('Item', on_delete=models.CASCADE, null=True) #related_name
-    parent = models.IntegerField()
-    user_id = models.IntegerField()
-    size = models.IntegerField()
-    is_deleted = models.BooleanField(default = False)
-    created_time = models.DateTimeField(auto_now=True)
-    updated_time = models.DateTimeField(null=True)
-    status = models.BooleanField()
-
-    #file = models.FileField(upload_to = \path)
-    
-    class Meta:
-        ordering = ['item_id']
-
-
-class SharedItem(models.Model):
-    item_id = models.IntegerField()
-    #file_id?
-    expires = models.DateTimeField()
-    password = models.CharField(max_length = 20)
-    created_time = models.DateTimeField(auto_now=True)
-    class Meta:
-        ordering = ['item_id']
-
-
-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()
-    created_time = models.DateTimeField(auto_now=True)
-    class Meta:
-        ordering = ['int_id']
+from django.db import models
+
+# Create your models here.
+class Item(models.Model):
+    item_id = models.AutoField(primary_key = True)
+    is_folder = models.BooleanField(default = False)
+    name = models.CharField(max_length = 50)
+    file_type = models.CharField(max_length=100, null=True) # signed_url 생성을 위해 file type 세팅
+    path = models.TextField()
+    #parent = models.ForeignKey('Item', on_delete=models.CASCADE, null=True) #related_name
+    parent = models.IntegerField()
+    user_id = models.IntegerField()
+    size = models.IntegerField()
+    is_deleted = models.BooleanField(default = False)
+    created_time = models.DateTimeField(auto_now=True)
+    updated_time = models.DateTimeField(null=True)
+    status = models.BooleanField()
+
+    #file = models.FileField(upload_to = \path)
+
+    class Meta:
+        ordering = ['item_id']
+
+
+class SharedItem(models.Model):
+    item_id = models.IntegerField()
+    #file_id?
+    expires = models.DateTimeField()
+    password = models.CharField(max_length = 20)
+    created_time = models.DateTimeField(auto_now=True)
+    class Meta:
+        ordering = ['item_id']
+
+
+class User(models.Model):
+    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)
+
+    class Meta:
+        ordering = ['int_id']

@@ -40,4 +40,4 @@ class SignUpSerializer(serializers.ModelSerializer):
 class UserInfoSerializer(serializers.ModelSerializer):
 class UserInfoSerializer(serializers.ModelSerializer):
     class Meta:
     class Meta:
         model = User
         model = User
-        fields = ['user_id', 'name', 'total_size', 'current_size', 'created_time']
\ No newline at end of file
+        fields = ['user_id', 'name', 'total_size', 'current_size', 'created_time']

@@ -30,4 +30,4 @@ def login_decorator(func):
 
 
         return func(self, request, *args, **kwargs)
         return func(self, request, *args, **kwargs)
 
 
-    return wrapper
\ No newline at end of file
+    return wrapper

@@ -37,7 +37,7 @@ class UserViewSet(viewsets.ModelViewSet):
                 'name': user.name,
                 'name': user.name,
                 'total_size': user.total_size,
                 'total_size': user.total_size,
                 'current_size': user.current_size,
                 'current_size': user.current_size,
-                'created_time': user.created_time 
+                'created_time': user.created_time
             },
             },
                 status=status.HTTP_200_OK,
                 status=status.HTTP_200_OK,
             )
             )
@@ -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")
-
-
-
-
-
-