diff --git a/media/smugimages/20140224-_JMR3402.jpg-911eccdc-8a7e-48b0-a1a3-1519633d1e83.jpeg b/media/smugimages/20140224-_JMR3402.jpg-911eccdc-8a7e-48b0-a1a3-1519633d1e83.jpeg new file mode 100644 index 0000000..50619a8 Binary files /dev/null and b/media/smugimages/20140224-_JMR3402.jpg-911eccdc-8a7e-48b0-a1a3-1519633d1e83.jpeg differ diff --git a/media/smugimages/20140224-_JMR3412.jpg-042b01a8-694e-4606-92a4-3002dd4a8ab9.jpeg b/media/smugimages/20140224-_JMR3412.jpg-042b01a8-694e-4606-92a4-3002dd4a8ab9.jpeg new file mode 100644 index 0000000..3a7d679 Binary files /dev/null and b/media/smugimages/20140224-_JMR3412.jpg-042b01a8-694e-4606-92a4-3002dd4a8ab9.jpeg differ diff --git a/media/smugimages/20140410-_JMR4555.jpg-7841d469-bc72-4a2d-9407-98ce436231e8.jpeg b/media/smugimages/20140410-_JMR4555.jpg-7841d469-bc72-4a2d-9407-98ce436231e8.jpeg new file mode 100644 index 0000000..2b37b2c Binary files /dev/null and b/media/smugimages/20140410-_JMR4555.jpg-7841d469-bc72-4a2d-9407-98ce436231e8.jpeg differ diff --git a/media/smugimages/20140410-_JMR4712.jpg-512ad565-c9ef-4340-ab6e-550b63db0147.jpeg b/media/smugimages/20140410-_JMR4712.jpg-512ad565-c9ef-4340-ab6e-550b63db0147.jpeg new file mode 100644 index 0000000..976ed03 Binary files /dev/null and b/media/smugimages/20140410-_JMR4712.jpg-512ad565-c9ef-4340-ab6e-550b63db0147.jpeg differ diff --git a/media/smugimages/20140427-_JMR5644.jpg-c9203c00-f178-4072-a465-51cc7a701a58.jpeg b/media/smugimages/20140427-_JMR5644.jpg-c9203c00-f178-4072-a465-51cc7a701a58.jpeg new file mode 100644 index 0000000..7102d58 Binary files /dev/null and b/media/smugimages/20140427-_JMR5644.jpg-c9203c00-f178-4072-a465-51cc7a701a58.jpeg differ diff --git a/media/smugimages/20140528-_JMR0053.jpg-f1e84927-227f-461c-a4c6-897d87e3085c.jpeg b/media/smugimages/20140528-_JMR0053.jpg-f1e84927-227f-461c-a4c6-897d87e3085c.jpeg new file mode 100644 index 0000000..5a3d04b Binary files /dev/null and b/media/smugimages/20140528-_JMR0053.jpg-f1e84927-227f-461c-a4c6-897d87e3085c.jpeg differ diff --git a/media/smugimages/20140528-_JMR0107.jpg-6fc0513e-9972-4f38-ac4e-86d31e5aab27.jpeg b/media/smugimages/20140528-_JMR0107.jpg-6fc0513e-9972-4f38-ac4e-86d31e5aab27.jpeg new file mode 100644 index 0000000..2feb7ec Binary files /dev/null and b/media/smugimages/20140528-_JMR0107.jpg-6fc0513e-9972-4f38-ac4e-86d31e5aab27.jpeg differ diff --git a/media/smugimages/20140528-_JMR0156.jpg-e75a99fd-2de3-48eb-be00-50665e935ccb.jpeg b/media/smugimages/20140528-_JMR0156.jpg-e75a99fd-2de3-48eb-be00-50665e935ccb.jpeg new file mode 100644 index 0000000..8aeae4c Binary files /dev/null and b/media/smugimages/20140528-_JMR0156.jpg-e75a99fd-2de3-48eb-be00-50665e935ccb.jpeg differ diff --git a/media/smugimages/20140529-_JMR0924.jpg-d27780f6-4be7-4e07-b09b-e0ca1bec15a2.jpeg b/media/smugimages/20140529-_JMR0924.jpg-d27780f6-4be7-4e07-b09b-e0ca1bec15a2.jpeg new file mode 100644 index 0000000..ed18fad Binary files /dev/null and b/media/smugimages/20140529-_JMR0924.jpg-d27780f6-4be7-4e07-b09b-e0ca1bec15a2.jpeg differ diff --git a/media/smugimages/20140609-_JMR1159.jpg-fbcfa699-9136-4cb0-8e0a-a36694554af7.jpeg b/media/smugimages/20140609-_JMR1159.jpg-fbcfa699-9136-4cb0-8e0a-a36694554af7.jpeg new file mode 100644 index 0000000..ff72f02 Binary files /dev/null and b/media/smugimages/20140609-_JMR1159.jpg-fbcfa699-9136-4cb0-8e0a-a36694554af7.jpeg differ diff --git a/media/smugimages/20140612-_JMR1361.jpg-5bbe21e5-19b0-4aae-b238-5c8791bc0b96.jpeg b/media/smugimages/20140612-_JMR1361.jpg-5bbe21e5-19b0-4aae-b238-5c8791bc0b96.jpeg new file mode 100644 index 0000000..d82bafd Binary files /dev/null and b/media/smugimages/20140612-_JMR1361.jpg-5bbe21e5-19b0-4aae-b238-5c8791bc0b96.jpeg differ diff --git a/media/smugimages/20140704-_JMR2114_B-bea81661-38f1-4ee0-b6dd-584c12fb6721.jpeg b/media/smugimages/20140704-_JMR2114_B-bea81661-38f1-4ee0-b6dd-584c12fb6721.jpeg new file mode 100644 index 0000000..838c5e8 Binary files /dev/null and b/media/smugimages/20140704-_JMR2114_B-bea81661-38f1-4ee0-b6dd-584c12fb6721.jpeg differ diff --git a/media/smugimages/20140709-_JMR2467.jpg-3704db77-5f93-428c-816d-cf497633359c.jpeg b/media/smugimages/20140709-_JMR2467.jpg-3704db77-5f93-428c-816d-cf497633359c.jpeg new file mode 100644 index 0000000..a7d92ff Binary files /dev/null and b/media/smugimages/20140709-_JMR2467.jpg-3704db77-5f93-428c-816d-cf497633359c.jpeg differ diff --git a/media/smugimages/20140727-_JMR2648.jpg-23c6f961-cd45-4e5d-b90e-60f8a68c2784.jpeg b/media/smugimages/20140727-_JMR2648.jpg-23c6f961-cd45-4e5d-b90e-60f8a68c2784.jpeg new file mode 100644 index 0000000..0362995 Binary files /dev/null and b/media/smugimages/20140727-_JMR2648.jpg-23c6f961-cd45-4e5d-b90e-60f8a68c2784.jpeg differ diff --git a/media/smugimages/20140913-20140913_Shadowed_Scenes_0031.jpg-693a25be-c963-4c7f-a9cf-531e43a7efbf.jpeg b/media/smugimages/20140913-20140913_Shadowed_Scenes_0031.jpg-693a25be-c963-4c7f-a9cf-531e43a7efbf.jpeg new file mode 100644 index 0000000..7abee2a Binary files /dev/null and b/media/smugimages/20140913-20140913_Shadowed_Scenes_0031.jpg-693a25be-c963-4c7f-a9cf-531e43a7efbf.jpeg differ diff --git a/media/smugimages/20140921-_JMR3208.jpg-c22c3ebf-3710-4fda-919e-98746f0bfa0a.jpeg b/media/smugimages/20140921-_JMR3208.jpg-c22c3ebf-3710-4fda-919e-98746f0bfa0a.jpeg new file mode 100644 index 0000000..a1a7f5b Binary files /dev/null and b/media/smugimages/20140921-_JMR3208.jpg-c22c3ebf-3710-4fda-919e-98746f0bfa0a.jpeg differ diff --git a/media/smugimages/20140921-_JMR3319.jpg-9545782c-054b-4307-acbe-5cb71f808a0a.jpeg b/media/smugimages/20140921-_JMR3319.jpg-9545782c-054b-4307-acbe-5cb71f808a0a.jpeg new file mode 100644 index 0000000..c057a19 Binary files /dev/null and b/media/smugimages/20140921-_JMR3319.jpg-9545782c-054b-4307-acbe-5cb71f808a0a.jpeg differ diff --git a/media/smugimages/20141224-_JMR5400.jpg-b7c8b0a6-33dc-4cd3-902b-a18538eb2283.jpeg b/media/smugimages/20141224-_JMR5400.jpg-b7c8b0a6-33dc-4cd3-902b-a18538eb2283.jpeg new file mode 100644 index 0000000..79a0df4 Binary files /dev/null and b/media/smugimages/20141224-_JMR5400.jpg-b7c8b0a6-33dc-4cd3-902b-a18538eb2283.jpeg differ diff --git a/media/smugimages/20220209-_JMR8864.jpg-ff16f1c3-9a2e-4823-8dd4-72e069e146e8.jpeg b/media/smugimages/20220209-_JMR8864.jpg-ff16f1c3-9a2e-4823-8dd4-72e069e146e8.jpeg new file mode 100644 index 0000000..9f64a62 Binary files /dev/null and b/media/smugimages/20220209-_JMR8864.jpg-ff16f1c3-9a2e-4823-8dd4-72e069e146e8.jpeg differ diff --git a/media/smugimages/20220209-_JMR8938.jpg-eb84edd1-dc00-49ef-a685-d12409ae9e5e.jpeg b/media/smugimages/20220209-_JMR8938.jpg-eb84edd1-dc00-49ef-a685-d12409ae9e5e.jpeg new file mode 100644 index 0000000..35bb4bc Binary files /dev/null and b/media/smugimages/20220209-_JMR8938.jpg-eb84edd1-dc00-49ef-a685-d12409ae9e5e.jpeg differ diff --git a/media/smugimages/20220209-_JMR8953.jpg-fa1dc195-ba49-4a74-ad2d-de4844ee6b28.jpeg b/media/smugimages/20220209-_JMR8953.jpg-fa1dc195-ba49-4a74-ad2d-de4844ee6b28.jpeg new file mode 100644 index 0000000..6666c48 Binary files /dev/null and b/media/smugimages/20220209-_JMR8953.jpg-fa1dc195-ba49-4a74-ad2d-de4844ee6b28.jpeg differ diff --git a/media/smugimages/20220214-_JMR8964-2.jpg-b2498832-2df8-4408-8452-10fd3b21fc05.jpeg b/media/smugimages/20220214-_JMR8964-2.jpg-b2498832-2df8-4408-8452-10fd3b21fc05.jpeg new file mode 100644 index 0000000..537badc Binary files /dev/null and b/media/smugimages/20220214-_JMR8964-2.jpg-b2498832-2df8-4408-8452-10fd3b21fc05.jpeg differ diff --git a/media/smugimages/20220214-_JMR8980.jpg-f1643038-3d43-4f32-abbe-8433c6f84f86.jpeg b/media/smugimages/20220214-_JMR8980.jpg-f1643038-3d43-4f32-abbe-8433c6f84f86.jpeg new file mode 100644 index 0000000..b9916ba Binary files /dev/null and b/media/smugimages/20220214-_JMR8980.jpg-f1643038-3d43-4f32-abbe-8433c6f84f86.jpeg differ diff --git a/media/smugimages/20220214-_JMR9015.jpg-50b0d525-9d39-4136-9544-597a80fdb8ad.jpeg b/media/smugimages/20220214-_JMR9015.jpg-50b0d525-9d39-4136-9544-597a80fdb8ad.jpeg new file mode 100644 index 0000000..e36cb6b Binary files /dev/null and b/media/smugimages/20220214-_JMR9015.jpg-50b0d525-9d39-4136-9544-597a80fdb8ad.jpeg differ diff --git a/media/smugimages/thisfilename.jpg-07b135a0-fc9f-4b0b-948e-511988e61539.jpeg b/media/smugimages/thisfilename.jpg-07b135a0-fc9f-4b0b-948e-511988e61539.jpeg new file mode 100644 index 0000000..50619a8 Binary files /dev/null and b/media/smugimages/thisfilename.jpg-07b135a0-fc9f-4b0b-948e-511988e61539.jpeg differ diff --git a/media/smugimages/thisfilename.jpg-3718036d-7fbc-4eb0-9aaa-7195a714b7bb.jpeg b/media/smugimages/thisfilename.jpg-3718036d-7fbc-4eb0-9aaa-7195a714b7bb.jpeg new file mode 100644 index 0000000..50619a8 Binary files /dev/null and b/media/smugimages/thisfilename.jpg-3718036d-7fbc-4eb0-9aaa-7195a714b7bb.jpeg differ diff --git a/media/smugimages/thisfilename.jpg-995ce7c2-729e-4c67-816e-9de6fbb5cab1.jpeg b/media/smugimages/thisfilename.jpg-995ce7c2-729e-4c67-816e-9de6fbb5cab1.jpeg new file mode 100644 index 0000000..50619a8 Binary files /dev/null and b/media/smugimages/thisfilename.jpg-995ce7c2-729e-4c67-816e-9de6fbb5cab1.jpeg differ diff --git a/media/smugimages/thisfilename.jpg-c5c7abb8-3ba3-4af8-ac39-087e390298b1.jpeg b/media/smugimages/thisfilename.jpg-c5c7abb8-3ba3-4af8-ac39-087e390298b1.jpeg new file mode 100644 index 0000000..50619a8 Binary files /dev/null and b/media/smugimages/thisfilename.jpg-c5c7abb8-3ba3-4af8-ac39-087e390298b1.jpeg differ diff --git a/smugfolioapi/migrations/0004_alter_smug_users_business_name.py b/smugfolioapi/migrations/0004_alter_smug_users_business_name.py new file mode 100644 index 0000000..91ec0f0 --- /dev/null +++ b/smugfolioapi/migrations/0004_alter_smug_users_business_name.py @@ -0,0 +1,18 @@ +# Generated by Django 4.0.3 on 2022-03-18 18:49 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('smugfolioapi', '0003_remove_images_file_name_remove_images_file_path'), + ] + + operations = [ + migrations.AlterField( + model_name='smug_users', + name='business_name', + field=models.CharField(default='Going-To-The-Sun-Photography', max_length=256), + ), + ] diff --git a/smugfolioapi/models/images.py b/smugfolioapi/models/images.py index 64f5abd..6153aad 100644 --- a/smugfolioapi/models/images.py +++ b/smugfolioapi/models/images.py @@ -4,6 +4,7 @@ class Images(models.Model): album_id = models.IntegerField(default=0) smug_user = models.ForeignKey("Smug_Users", on_delete=models.CASCADE) upload_date = models.DateTimeField(auto_now_add=True) + file_name = models picture = models.ImageField( upload_to='smugimages', height_field=None, width_field=None, max_length=None, null=True diff --git a/smugfolioapi/views/auth.py b/smugfolioapi/views/auth.py index 896bd69..f98ce63 100644 --- a/smugfolioapi/views/auth.py +++ b/smugfolioapi/views/auth.py @@ -43,7 +43,6 @@ def register_user(request): Method arguments: request -- The full HTTP request object ''' - # Create a new user by invoking the `create_user` helper method # on Django's built-in User model new_user = User.objects.create_user( diff --git a/smugfolioapi/views/images.py b/smugfolioapi/views/images.py index 930db10..d0c9fbc 100644 --- a/smugfolioapi/views/images.py +++ b/smugfolioapi/views/images.py @@ -3,7 +3,6 @@ from rest_framework.viewsets import ViewSet from rest_framework.response import Response from rest_framework import serializers, status from smugfolioapi.models import Images, Smug_Users -from PIL import Image import uuid import base64 from django.core.files.base import ContentFile @@ -49,17 +48,15 @@ class ImageView(ViewSet): Response -- JSON serialized images instance """ # object must be retrived when using a foreign key - format, imgstr = request.data["picture"].split(';base64,') + file_name = request.query_params.get('file_name', None) + format, imgstr = request.data['picture'].split(';base64,') ext = format.split('/')[-1] - data = ContentFile(base64.b64decode(imgstr), name=f'{request.data["picture"]}-{uuid.uuid4()}.{ext}') + data = ContentFile(base64.b64decode(imgstr), name=f'{file_name}-{uuid.uuid4()}.{ext}') smug_user = Smug_Users.objects.get(user=request.auth.user) images = Images.objects.create( - file_name=request.data["file_name"], - file_path=request.data["file_path"], album_id=request.data["album_id"], picture= data, smug_user= smug_user, - upload_date = request.data["upload_date"] ) serializer = ImagesSerializer(images) return Response(serializer.data, status=201) @@ -72,8 +69,6 @@ class ImageView(ViewSet): """ # Refactor keys to match ERD images = Images.objects.get(pk=pk) - images.file_name = request.data["file_name"] - images.file_path = request.data["file_path"] images.album_id = request.data["album_id"] images.smug_user_id = request.data["smug_user_id"] images.upload_date = request.data["upload_date"] @@ -100,7 +95,7 @@ class ImagesSerializer(serializers.ModelSerializer): """ class Meta: model = Images - fields = ('id', 'file_name', 'file_path', 'album_id', 'smug_user_id', 'upload_date', 'picture', 'imagecount') + fields = ('id', 'album_id', 'smug_user_id', 'upload_date', 'picture') depth = 2 diff --git a/smugfolioserver/urls.py b/smugfolioserver/urls.py index 2675cba..96cf187 100644 --- a/smugfolioserver/urls.py +++ b/smugfolioserver/urls.py @@ -23,7 +23,7 @@ from django.urls import path from django.conf.urls.static import static from smugfolioapi.views.image_tags import ImageTagsView from smugfolioapi.views.images import ImageView -from smugfolioserver import settings, MEDIA_ROOT, MEDIA_URL +from django.conf import settings router = routers.DefaultRouter(trailing_slash=False) router.register(r'images', ImageView, 'image')