Merge branch 'develop' into 'master'

Develop



See merge request !11

@@ -26,3 +26,5 @@ __pycache__
 npm-debug.log*
 npm-debug.log*
 yarn-debug.log*
 yarn-debug.log*
 yarn-error.log*
 yarn-error.log*
+.idea
+secrets.json

+from django.contrib import admin
+
+from .models import Item, SharedItem, User
+
+admin.site.register(Item)
+admin.site.register(SharedItem)
+admin.site.register(User)
\ No newline at end of file

+# Generated by Django 3.0.6 on 2020-06-11 14:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Item',
+            fields=[
+                ('item_id', models.AutoField(primary_key=True, serialize=False)),
+                ('is_folder', models.BooleanField(default=False)),
+                ('name', models.CharField(max_length=50)),
+                ('file_type', models.CharField(max_length=100, null=True)),
+                ('path', models.TextField()),
+                ('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()),
+            ],
+            options={
+                'ordering': ['item_id'],
+            },
+        ),
+        migrations.CreateModel(
+            name='SharedItem',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('item_id', models.IntegerField()),
+                ('expires', models.DateTimeField()),
+                ('password', models.CharField(max_length=20)),
+                ('created_time', models.DateTimeField(auto_now=True)),
+            ],
+            options={
+                'ordering': ['item_id'],
+            },
+        ),
+        migrations.CreateModel(
+            name='User',
+            fields=[
+                ('int_id', models.AutoField(primary_key=True, serialize=False)),
+                ('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)),
+            ],
+            options={
+                'ordering': ['int_id'],
+            },
+        ),
+    ]

+# Generated by Django 3.0.6 on 2020-06-11 15:29
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='root_folder',
+            field=models.IntegerField(null=True),
+        ),
+        migrations.AlterField(
+            model_name='item',
+            name='parent',
+            field=models.IntegerField(null=True),
+        ),
+    ]

+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(null=True) # root 폴더의 경우 null임
+    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(default=False)
+
+    #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)
+    root_folder = models.IntegerField(null=True)
+    total_size = models.IntegerField()
+    current_size = models.IntegerField()
+    created_time = models.DateTimeField(auto_now=True)
+    class Meta:
+        ordering = ['int_id']

+from django.contrib.auth.models import Group
+from rest_framework import serializers
+from .models import Item, SharedItem,User
+
+
+class UserSerializer(serializers.HyperlinkedModelSerializer):
+    class Meta:
+        model = User
+        fields = '__all__'
+
+class GroupSerializer(serializers.HyperlinkedModelSerializer):
+    class Meta:
+        model = Group
+        fields = ['url', 'name']
+
+class ItemSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Item
+        fields = '__all__'
+

-from django.contrib import admin
-
-# Register your models here.

-from django.db import models
-
-# Create your models here.

-from django.shortcuts import render
-
-# Create your views here.

 """
 """
 Django settings for khudrive project.
 Django settings for khudrive project.
 
 
-Generated by 'django-admin startproject' using Django 3.0.6.
+Generated by 'django-admin startproject' using Django 3.0.7.
 
 
 For more information on this file, see
 For more information on this file, see
 https://docs.djangoproject.com/en/3.0/topics/settings/
 https://docs.djangoproject.com/en/3.0/topics/settings/
@@ -11,16 +11,23 @@ https://docs.djangoproject.com/en/3.0/ref/settings/
 """
 """
 
 
 import os
 import os
+import sys
+import json
 
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 
+ROOT_DIR = os.path.dirname(BASE_DIR)
+# secrets.json의 경로
+SECRETS_PATH = os.path.join(ROOT_DIR, 'secrets.json')
+# json파일을 파이썬 객체로 변환
+secrets = json.loads(open(SECRETS_PATH).read())
 
 
 # Quick-start development settings - unsuitable for production
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/
 # See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/
 
 
 # SECURITY WARNING: keep the secret key used in production secret!
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = '3b=a99pdbz*48$9$kh@h3tkb*9w-m3vtf8ngyymdzwpl5$emwn'
+SECRET_KEY = ')i0_(*4t7k3=rcqp*_i0u((9zbk8q(2(3tk(%$woji-e-37=o*'
 
 
 # SECURITY WARNING: don't run with debug turned on in production!
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 DEBUG = True
@@ -38,6 +45,7 @@ INSTALLED_APPS = [
     'django.contrib.messages',
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'django.contrib.staticfiles',
     'rest_framework',
     'rest_framework',
+    'api.apps.ApiConfig',
 ]
 ]
 
 
 MIDDLEWARE = [
 MIDDLEWARE = [
@@ -73,11 +81,18 @@ WSGI_APPLICATION = 'khudrive.wsgi.application'
 
 
 # Database
 # Database
 # https://docs.djangoproject.com/en/3.0/ref/settings/#databases
 # https://docs.djangoproject.com/en/3.0/ref/settings/#databases
-
 DATABASES = {
 DATABASES = {
+    # 'default': {
+    #     'ENGINE': 'django.db.backends.sqlite3',
+    #     'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+    # }
     'default': {
     'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+        'ENGINE': 'django.db.backends.postgresql',
+        'NAME': 'khuDrive',
+        'USER': 'root',
+        'PASSWORD': '1234',
+        'HOST': 'localhost',
+        'PORT': '',
     }
     }
 }
 }
 
 
@@ -119,3 +134,11 @@ USE_TZ = True
 # https://docs.djangoproject.com/en/3.0/howto/static-files/
 # https://docs.djangoproject.com/en/3.0/howto/static-files/
 
 
 STATIC_URL = '/static/'
 STATIC_URL = '/static/'
+
+
+#S3
+DEFAULT_FILE_STORAGE = 'storages.backends.s3boto3.S3Boto3Storage'
+STATICFILES_STORAGE = 'storages.backends.s3boto3.S3Boto3Storage'
+
+for key, value in secrets.items():
+    setattr(sys.modules[__name__], key, value)
\ No newline at end of file

@@ -13,9 +13,29 @@ Including another URLconf
     1. Import the include() function: from django.urls import include, path
     1. Import the include() function: from django.urls import include, path
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
 """
+from django.urls import include, path
+from rest_framework import routers
 from django.contrib import admin
 from django.contrib import admin
-from django.urls import path
+from api import views
+from django.conf.urls import url
 
 
+router = routers.DefaultRouter()
+router.register(r'users', views.UserViewSet)
+router.register(r'items', views.ItemViewSet)
+router.register(r'items', views.SharedItemViewSet)
+
+# Wire up our API using automatic URL routing.
+# Additionally, we include login URLs for the browsable API.
 urlpatterns = [
 urlpatterns = [
     path('admin/', admin.site.urls),
     path('admin/', admin.site.urls),
+    path('', include(router.urls)),
+    url(r'^search/$', views.ItemViewSet.search, name='search'),
+    url(r'^<int:pk>/share/$', views.SharedItemViewSet.share, name='share'),
+    url(r'^<int:pk>/move/$', views.ItemViewSet.move, name='move'),
+    url(r'^<int:pk>/copy/$', views.ItemViewSet.copy, name='copy'),
+    url(r'^<int:pk>/children/$', views.ItemViewSet.children, name='children'),
+    url(r'^signup/$', views.UserViewSet.signup, name='signup'),
+    url(r'^login/$', views.UserViewSet.login, name='login'),
+    url(r'^upload/$', views.ItemViewSet.upload, name='upload'),
+    url(r'^status/$', views.ItemViewSet.status, name='status'),
 ]
 ]