Showing
1 changed file
with
4 additions
and
4 deletions
... | @@ -195,7 +195,7 @@ class ItemViewSet(viewsets.ViewSet): | ... | @@ -195,7 +195,7 @@ class ItemViewSet(viewsets.ViewSet): |
195 | s3_bucket = AWS_STORAGE_BUCKET_NAME | 195 | s3_bucket = AWS_STORAGE_BUCKET_NAME |
196 | 196 | ||
197 | item = Item.objects.filter(item_id=pk) | 197 | item = Item.objects.filter(item_id=pk) |
198 | - object_name = item.get().name | 198 | + object_name = str(item.get().item_id) |
199 | data = serializers.serialize("json", item) | 199 | data = serializers.serialize("json", item) |
200 | json_data = json.loads(data) | 200 | json_data = json.loads(data) |
201 | 201 | ||
... | @@ -399,12 +399,13 @@ class ItemViewSet(viewsets.ViewSet): | ... | @@ -399,12 +399,13 @@ class ItemViewSet(viewsets.ViewSet): |
399 | # 파일 객체 생성 | 399 | # 파일 객체 생성 |
400 | file_name = request.POST.get('name', '') | 400 | file_name = request.POST.get('name', '') |
401 | file_size = request.POST.get('size', '') | 401 | file_size = request.POST.get('size', '') |
402 | - file_id = request.POST.get('item_id', '') | ||
403 | file_parent = pk | 402 | file_parent = pk |
404 | file_type = mimetypes.guess_type(file_name)[0] | 403 | file_type = mimetypes.guess_type(file_name)[0] |
405 | upload_item = Item(name=file_name, size=file_size, user_id=1, file_type=file_type, parent=file_parent) | 404 | upload_item = Item(name=file_name, size=file_size, user_id=1, file_type=file_type, parent=file_parent) |
406 | upload_item.save() | 405 | upload_item.save() |
407 | 406 | ||
407 | + file_id = str(upload_item.item_id) | ||
408 | + | ||
408 | date_long = datetime.utcnow().strftime('%Y%m%dT000000Z') | 409 | date_long = datetime.utcnow().strftime('%Y%m%dT000000Z') |
409 | 410 | ||
410 | presigned_post = s3.generate_presigned_post( | 411 | presigned_post = s3.generate_presigned_post( |
... | @@ -478,7 +479,6 @@ class SharedItemViewSet(viewsets.ModelViewSet): | ... | @@ -478,7 +479,6 @@ class SharedItemViewSet(viewsets.ModelViewSet): |
478 | return Response({'message': 'This file is already shared'}, status=status.HTTP_200_OK) | 479 | return Response({'message': 'This file is already shared'}, status=status.HTTP_200_OK) |
479 | sharedfile = SharedItem(item_id=pk, password=password, expires=expires) | 480 | sharedfile = SharedItem(item_id=pk, password=password, expires=expires) |
480 | sharedfile.save() | 481 | sharedfile.save() |
481 | - sharedfile = SharedItem.objects.get(item_id=pk) | ||
482 | 482 | ||
483 | # sf = serializers.serialize("json", sharedfile) | 483 | # sf = serializers.serialize("json", sharedfile) |
484 | item = Item.objects.filter(item_id=pk) | 484 | item = Item.objects.filter(item_id=pk) |
... | @@ -488,7 +488,7 @@ class SharedItemViewSet(viewsets.ModelViewSet): | ... | @@ -488,7 +488,7 @@ class SharedItemViewSet(viewsets.ModelViewSet): |
488 | print(json_data) | 488 | print(json_data) |
489 | res = json_data[0]['fields'] | 489 | res = json_data[0]['fields'] |
490 | res['id'] = json_data[0]['pk'] | 490 | res['id'] = json_data[0]['pk'] |
491 | - return Response({"shared": sharedfile.created_time, 'data': res}, status=status.HTTP_200_OK) | 491 | + return Response({"shared": sharedfile.pk, 'data': res}, status=status.HTTP_200_OK) |
492 | 492 | ||
493 | 493 | ||
494 | item = ItemViewSet.as_view({ | 494 | item = ItemViewSet.as_view({ | ... | ... |
-
Please register or login to post a comment