Merge remote-tracking branch 'origin/develop' into feature/frontend

@@ -26,3 +26,4 @@ __pycache__
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+.idea

+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()
+
+    #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__'
+

+import mimetypes
+import json
+import os
+from datetime import datetime, timedelta
+
+import boto3
+
+from django.core import serializers
+from django.views.decorators.csrf import csrf_exempt
+from rest_framework import viewsets
+from rest_framework import permissions
+from rest_framework.response import Response
+from rest_framework.decorators import action
+from rest_framework.permissions import IsAuthenticated, AllowAny
+
+from .models import Item, SharedItem, User
+from .serializers import UserSerializer,GroupSerializer,ItemSerializer
+from rest_framework import status
+from annoying.functions import get_object_or_None
+from django.conf import settings
+import jwt
+from django.http import HttpResponse, JsonResponse
+
+
+class UserViewSet(viewsets.ModelViewSet):
+    """
+    API endpoint that allows users to be viewed or edited.
+    """
+    queryset = User.objects.all().order_by('-date_joined')
+    serializer_class = UserSerializer
+    permission_classes = [permissions.IsAuthenticatedOrReadOnly, permissions.AllowAny,
+                          # IsOwnerOrReadOnly
+                          ]
+    permission_classes_by_action = {'get': [permissions.AllowAny],
+                                    'destroy': [permissions.AllowAny]}
+    @csrf_exempt
+    @action(detail=False, methods=['POST'], permission_classes=[permissions.AllowAny], url_path='signup', url_name='singup')
+    def signup(self, request):
+        user_id = request.POST.get('user_id', '')
+        name = request.POST.get('name', '')
+        password = request.POST.get('password', '')
+        user = get_object_or_None(User, user_id=user_id)
+        if user == None:
+            user = User(user_id = user_id, name = name, password = password, total_size=100000, current_size = 0)
+            user.save()
+            root = Item(is_folder=True, name="root", file_type="folder", path="", user_id=user.int_id, size=0,
+                        status=True)
+            root.save()
+            return Response({
+                'message': 'user created',
+                'int_id': user.int_id,
+                'user_id': user.user_id,
+                'name': user.name,
+                'root_folder':root.item_id,
+                'total_size': user.total_size,
+                'current_size': user.current_size,
+                'created_time': user.created_time
+            },
+                status=status.HTTP_200_OK,
+            )
+        else:
+            return Response({'message': 'user is already exist.'}, status=status.HTTP_204_NO_CONTENT)
+
+    @csrf_exempt
+    @action(methods=['post'], detail=False, permission_classes=[permissions.AllowAny],
+            url_path='login', url_name='login')
+    def login(self, request):
+        if not request.data:
+            return Response({'Error': "Please provide user_id/password"}, status=status.HTTP_400_BAD_REQUEST)
+        user_id = request.POST['user_id']
+        password = request.POST['password']
+        try:
+            user = User.objects.get(user_id=user_id, password=password)
+        except User.DoesNotExist:
+            return Response({'Error': "Invalid user_id/password"}, status=status.HTTP_400_BAD_REQUEST)
+        if user:
+            payload1 = {
+                'int_id': user.int_id,
+                'user_id': user.user_id,
+                'exp': datetime.utcnow() + timedelta(seconds=300)
+            }
+            payload2 = {
+                'int_id': user.int_id,
+                'user_id': user.user_id,
+                'exp': datetime.utcnow() + timedelta(days=5)
+            }
+            access = jwt.encode(payload1, settings.SECRET_KEY, algorithm='HS256').decode('utf-8')
+            refresh = jwt.encode(payload2, settings.SECRET_KEY, algorithm='HS256').decode('utf-8')
+            exp = jwt.decode(access, settings.SECRET_KEY, algorithm='HS256')['exp']
+            token = {'access': access,
+                     'refresh': refresh,
+                     'exp': exp}
+            return JsonResponse(
+                token,
+                status=status.HTTP_200_OK,
+            )
+        else:
+            return JsonResponse(
+                {'Error': "Invalid credentials"},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+        return JsonResponse(status=status.HTTP_405_METHOD_NOT_ALLOWED)
+
+    def get(self, request, pk):
+        user = User.objects.filter(int_id=pk)
+        data = serializers.serialize("json", user)
+        json_data = json.loads(data)
+        res = json_data[0]['fields']
+        res['id']=json_data[0]['pk']
+        return Response({'data': res}, status=status.HTTP_200_OK)
+
+    def get_permissions(self):
+        try:
+            # return permission_classes depending on `action`
+            return [permission() for permission in self.permission_classes_by_action[self.action]]
+        except KeyError:
+            # action is not set return default permission_classes
+            return [permission() for permission in self.permission_classes]
+
+
+class ItemViewSet(viewsets.ViewSet):
+
+    queryset = Item.objects.all()
+    serializer_class = ItemSerializer
+    permission_classes = [permissions.IsAuthenticatedOrReadOnly, permissions.AllowAny,
+                          #IsOwnerOrReadOnly
+                          ]
+    permission_classes_by_action = {'get': [permissions.AllowAny],
+                                    'destroy': [permissions.AllowAny]}
+
+    # url: items/search
+    @action(methods=['GET'], detail=False, permission_classes=[AllowAny], url_path='search', url_name='search')
+    def search(self, request):
+        if request.method == 'GET':
+            keyword = request.GET.get('keyword', '')
+            user_id = request.GET.get('user_id', '')
+            item_list = Item.objects.filter(name__icontains = keyword, user_id = user_id )
+
+            data = serializers.serialize("json", item_list)
+            json_data = json.loads(data)
+            res = []
+            for i in json_data:
+                t = i['fields']
+                t['id'] = i['pk']
+                res.append(t)
+            return Response({'data': {'list' : res}}, status=status.HTTP_200_OK)
+
+    # url: items/11/
+    # 마지막 slash도 써주어야함
+    def get(self, request, pk):
+        item = Item.objects.filter(item_id=pk)
+        data = serializers.serialize("json", item)
+        json_data = json.loads(data)
+        res = json_data[0]['fields']
+        res['id']=json_data[0]['pk']
+        return Response({'data': res}, status=status.HTTP_200_OK)
+
+    # url: items/11/
+    # 마지막 slash도 써주어야함
+    def destroy(self, request, pk):
+        if request.method == 'DELETE':
+            print(pk)
+            item = get_object_or_None(Item, item_id=pk)
+            if item != None:
+                if item.is_folder == True: # 폴더는 삭제 안되도록 처리
+                    return Response({'message': 'This item is folder.'}, status=status.HTTP_200_OK)
+                item.is_deleted = True
+                item.save()
+                # item.delete() 이거 하면 완전 삭제되어버림 is deleted True 면 휴지통에서 리스트 조회할 수 있도록!
+                return Response({'message': 'delete complete'},status=status.HTTP_200_OK)
+            return Response({'message': 'item is not existed.'}, status=status.HTTP_204_NO_CONTENT)
+
+    # url: items/11/move
+    # 마지막 slash도 써주어야함
+    @action(methods=['POST'], detail=True, permission_classes=[AllowAny], url_path='move', url_name='move')
+    def move(self, request, pk):
+        if request.method == 'POST':
+            parent_id = request.POST.get('parent', '')
+            name = request.POST.get('name','')
+            parent = get_object_or_None(Item, item_id=parent_id)
+            if parent != None and parent.is_folder == True:
+                child = get_object_or_None(Item, item_id=pk)
+                if child == None:
+                    return Response({'message': 'item is not existed.'}, status=status.HTTP_204_NO_CONTENT)
+                child.parent = parent_id
+                child.save()
+                child = Item.objects.filter(item_id = pk)
+                child_data = serializers.serialize("json", child)
+                json_child = json.loads(child_data)
+                res = json_child[0]['fields']
+                res['id'] = pk
+                parent = Item.objects.filter(item_id = parent_id)
+                parent_data = serializers.serialize("json", parent)
+                json_parent = json.loads(parent_data)[0]['fields']
+                res['parentInfo'] = json_parent
+                return Response({'data': res}, status=status.HTTP_200_OK)
+            if parent == None:
+                return Response({'message': 'parent is not existed.'}, status=status.HTTP_200_OK)
+            if parent.is_folder == False:
+                return Response({'message': 'parent is not folder.'}, status=status.HTTP_200_OK)
+            return Response({'message': 'item is not existed.'}, status=status.HTTP_204_NO_CONTENT)
+
+    @action(methods=['POST'], detail=True, permission_classes=[AllowAny], url_path='copy', url_name='copy')
+    def copy(self, request, pk):
+        if request.method == 'POST':
+            parent_id = request.POST.get('parent', '')
+            parent = get_object_or_None(Item, item_id=parent_id)
+            if parent != None and parent.is_folder == True:
+                child = get_object_or_None(Item, item_id=pk)
+                if child == None:
+                    return Response({'message': 'item is not existed.'}, status=status.HTTP_204_NO_CONTENT)
+                if child.is_folder == True:
+                    return Response({'message': 'item is folder'}, status=status.HTTP_204_NO_CONTENT)
+                copiedName = child.name + "_복사본_" + str(datetime.now().strftime('%Y-%m-%d %H:%M'))
+                copiedItem = Item(is_folder = False, name = copiedName, path =child.path, parent = parent_id, user_id= child.user_id, size=child.size, status=child.status)
+                copiedItem.save()
+
+                copiedItem = Item.objects.filter(name = copiedName)
+                copied_data = serializers.serialize("json", copiedItem)
+                json_data = json.loads(copied_data)
+                res = json_data[0]['fields']
+                res['id'] = json_data[0]['pk']
+                parent = Item.objects.filter(item_id = parent_id)
+                parent_data = serializers.serialize("json", parent)
+                json_parent = json.loads(parent_data)[0]['fields']
+                res['parentInfo'] = json_parent
+                return Response({'data': res}, status=status.HTTP_200_OK)
+            if parent == None:
+                return Response({'message': 'parent is not existed.'}, status=status.HTTP_200_OK)
+            if parent.is_folder == False:
+                return Response({'message': 'parent is not folder.'}, status=status.HTTP_200_OK)
+            return Response({'message': 'item is not existed.'}, status=status.HTTP_204_NO_CONTENT)
+
+    def get_permissions(self):
+        try:
+            # return permission_classes depending on `action`
+            return [permission() for permission in self.permission_classes_by_action[self.action]]
+        except KeyError:
+            # action is not set return default permission_classes
+            return [permission() for permission in self.permission_classes]
+
+    # url: items/{key}/children/
+    @action(methods=['GET', 'POST'], detail=True, permission_classes=[AllowAny],
+            url_path='children', url_name='children')
+    def children(self, request, pk):
+        if request.method == 'GET':
+            children = Item.objects.filter(parent = pk, is_deleted=False)
+            children_data = serializers.serialize("json", children)
+            json_children = json.loads(children_data)
+            parent = Item.objects.filter(item_id=pk) #item
+            parent_data = serializers.serialize("json", parent)
+            json_parent = json.loads(parent_data)[0]['fields']
+            res = json_parent
+            res['id'] = pk
+            children_list = []
+            for i in json_children:
+                t = i['fields']
+                t['id'] = i['pk']
+                children_list.append(t)
+            res['list'] = children_list
+            return Response({'data': res}, status=status.HTTP_200_OK)
+        if request.method == 'POST':
+            name = request.POST.get('name', '')
+            user_id = request.GET.get('user_id', '')
+            item = Item(is_folder=True, name=name, file_type="folder", path="", parent=pk, user_id=user_id, size=0, status=True)
+            item.save()
+            item = Item.objects.filter(item_id = item.item_id)
+            item_data = serializers.serialize("json", item)
+            json_item = json.loads(item_data)
+            res = json_item[0]['fields']
+            res['id']=json_item[0]['pk']
+            res['inside_folder_list'] = []
+            res['inside_file_list'] = []
+            return Response({'data': res}, status=status.HTTP_200_OK)
+
+
+class SharedItemViewSet(viewsets.ModelViewSet):
+
+    queryset = SharedItem.objects.all()
+    # serializer_class = SharedItemSerializer
+    permission_classes = [permissions.IsAuthenticatedOrReadOnly, permissions.AllowAny,
+                          # IsOwnerOrReadOnly
+                          ]
+    # url: http://localhost:8000/items/1/share/
+    # 마지막 slash도 써주어야함
+    @csrf_exempt
+    @action(methods=['POST'], detail=True, permission_classes=[AllowAny], url_path='share', url_name='share')
+    def share(self, request, pk):
+        if request.method == 'POST':
+            password = request.POST.get('password', '')
+            expires = request.POST.get('expires', '')
+
+            sharedfile = get_object_or_None(SharedItem, item_id=pk)
+            if sharedfile != None:
+                # 서버는 정상이나 이미 공유객체로 등록된 파일임
+                return Response({'message': 'This file is already shared'}, status=status.HTTP_200_OK)
+            sharedfile = SharedItem(item_id =pk, password=password, expires = expires)
+            sharedfile.save()
+            sharedfile = SharedItem.objects.get(item_id = pk)
+
+            # sf = serializers.serialize("json", sharedfile)
+            item = Item.objects.filter(item_id = pk)
+            item_json = serializers.serialize("json", item)
+
+            json_data = json.loads(item_json)
+            print(json_data)
+            res = json_data[0]['fields']
+            res['id'] = json_data[0]['pk']
+            return Response({"shared": sharedfile.created_time , 'data': res}, status=status.HTTP_200_OK)
+
+item = ItemViewSet.as_view({
+    'delete': 'destroy',
+})

-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.
 
-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
 https://docs.djangoproject.com/en/3.0/topics/settings/
@@ -20,7 +20,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 # See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/
 
 # 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!
 DEBUG = True
@@ -38,6 +38,7 @@ INSTALLED_APPS = [
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'rest_framework',
+    'api.apps.ApiConfig',
 ]
 
 MIDDLEWARE = [
@@ -73,11 +74,18 @@ WSGI_APPLICATION = 'khudrive.wsgi.application'
 
 # Database
 # https://docs.djangoproject.com/en/3.0/ref/settings/#databases
-
 DATABASES = {
+    # 'default': {
+    #     'ENGINE': 'django.db.backends.sqlite3',
+    #     'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+    # }
     'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+        'ENGINE': 'django.db.backends.postgresql',
+        'NAME': 'khuDrive',
+        'USER': 'jooheekwon',
+        'PASSWORD': '',
+        'HOST': 'localhost',
+        'PORT': '',
     }
 }
 

@@ -13,9 +13,28 @@ Including another URLconf
     1. Import the include() function: from django.urls import include, path
     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.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 = [
     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='copy'),
+    url(r'^signup/$', views.UserViewSet.signup, name='signup'),
+    url(r'^login/$', views.UserViewSet.login, name='login'),
+
 ]