Merge pull request #5 from Likelion-at-SMWU-10th/dev/#4

[유서작성]이미지 저장 구현

myvenv/bin/activate

@@ -38,7 +38,7 @@ deactivate () {
 # unset irrelevant variables
 deactivate nondestructive
 
-VIRTUAL_ENV="/Users/ahyeonlim/YUSEO-Server/myvenv"
+VIRTUAL_ENV="/Users/ahyeonlim/Otr-Server/myvenv"
 export VIRTUAL_ENV
 
 _OLD_VIRTUAL_PATH="$PATH"

myvenv/bin/activate.csh

@@ -8,7 +8,7 @@ alias deactivate 'test $?_OLD_VIRTUAL_PATH != 0 && setenv PATH "$_OLD_VIRTUAL_PA
 # Unset irrelevant variables.
 deactivate nondestructive
 
-setenv VIRTUAL_ENV "/Users/ahyeonlim/YUSEO-Server/myvenv"
+setenv VIRTUAL_ENV "/Users/ahyeonlim/Otr-Server/myvenv"
 
 set _OLD_VIRTUAL_PATH="$PATH"
 setenv PATH "$VIRTUAL_ENV/bin:$PATH"

myvenv/bin/activate.fish

@@ -30,7 +30,7 @@ end
 # Unset irrelevant variables.
 deactivate nondestructive
 
-set -gx VIRTUAL_ENV "/Users/ahyeonlim/YUSEO-Server/myvenv"
+set -gx VIRTUAL_ENV "/Users/ahyeonlim/Otr-Server/myvenv"
 
 set -gx _OLD_VIRTUAL_PATH $PATH
 set -gx PATH "$VIRTUAL_ENV/bin" $PATH

myvenv/bin/django-admin

@@ -1,4 +1,4 @@
-#!/Users/ahyeonlim/YUSEO-Server/myvenv/bin/python3
+#!/Users/ahyeonlim/Otr-Server/myvenv/bin/python3
 # -*- coding: utf-8 -*-
 import re
 import sys

myvenv/bin/pip

@@ -1,4 +1,4 @@
-#!/Users/ahyeonlim/YUSEO-Server/myvenv/bin/python3
+#!/Users/ahyeonlim/Otr-Server/myvenv/bin/python3
 # -*- coding: utf-8 -*-
 import re
 import sys

myvenv/bin/pip3

@@ -1,4 +1,4 @@
-#!/Users/ahyeonlim/YUSEO-Server/myvenv/bin/python3
+#!/Users/ahyeonlim/Otr-Server/myvenv/bin/python3
 # -*- coding: utf-8 -*-
 import re
 import sys

myvenv/bin/pip3.10

@@ -1,4 +1,4 @@
-#!/Users/ahyeonlim/YUSEO-Server/myvenv/bin/python3
+#!/Users/ahyeonlim/Otr-Server/myvenv/bin/python3
 # -*- coding: utf-8 -*-
 import re
 import sys

myvenv/bin/sqlformat

@@ -1,4 +1,4 @@
-#!/Users/ahyeonlim/YUSEO-Server/myvenv/bin/python3
+#!/Users/ahyeonlim/Otr-Server/myvenv/bin/python3
 # -*- coding: utf-8 -*-
 import re
 import sys

yuseo/yuseo/settings.py

@@ -10,6 +10,7 @@
 https://docs.djangoproject.com/en/4.0/ref/settings/
 """
 
+import os
 from pathlib import Path
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
@@ -124,3 +125,7 @@
 # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field
 
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+
+
+MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
+MEDIA_URL = '/media/'

yuseo/yuseo/urls.py

@@ -15,8 +15,10 @@
 """
 from django.contrib import admin
 from django.urls import path, include
+from django.conf import settings
+from django.conf.urls.static import static
 
 urlpatterns = [
     path('admin/', admin.site.urls),
     path('', include('yuseoapp.urls'))
-]
+]+ static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

yuseo/yuseoapp/migrations/0001_initial.py

@@ -18,6 +18,7 @@ class Migration(migrations.Migration):
                 ('title', models.CharField(max_length=100)),
                 ('date', models.DateTimeField(auto_now_add=True)),
                 ('body', models.TextField()),
+                ('image', models.ImageField(upload_to="%Y/%m/%d")),
             ],
         ),
     ]

yuseo/yuseoapp/migrations/0002_alter_yuseo_image.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.0.6 on 2022-08-03 14:59
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('yuseoapp', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='yuseo',
+            name='image',
+            field=models.ImageField(null=True, upload_to='%Y/%m/%d'),
+        ),
+    ]

yuseo/yuseoapp/models.py

@@ -7,11 +7,13 @@ class Yuseo(models.Model):
     title = models.CharField(max_length=100)
     date = models.DateTimeField(auto_now_add=True)
     body = models.TextField()
+    image = models.ImageField(upload_to='%Y/%m/%d', null=True)
+
 
     def __Str__(self):
         return self.title
 
     def summary(self):
         return self.body [:30]
-    
-    
+
+

yuseo/yuseoapp/serializers.py

@@ -1,15 +1,45 @@
-from dataclasses import field
+from asyncio import Task
+from dataclasses import field, fields
 from rest_framework import serializers
-from .models import Yuseo
+from .models import Yuseo 
+
+
+
+
 
 class YuseoSerializer(serializers.ModelSerializer):
+    image = serializers.ImageField(use_url=True)
+
     class Meta:
         model = Yuseo
-        fields = ('id', 'title', 'date', 'body')
+        fields = ('id', 'title', 'date', 'body', 'image')
 
 class YuseoListSerializer(serializers.ModelSerializer):
     class Meta:
         model = Yuseo
         fields = ('id', 'title', 'date', 'summary')
 
-
+
+
+
+"""class TaskImageSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = TaskImage
+        fields = ('image',)
+
+
+class TaskSerializer(serializers.HyperlinkedModelSerializer):
+    user = serializers.ReadOnlyField(source='user.username')
+    images = TaskImageSerializer(source='taskimage_set', many=True, read_only=True)
+
+    class Meta:
+        model = Task
+        fields = ('id', 'title', 'date', 'body', 'images')
+
+    def create(self, validated_data):
+        images_data = self.context.get('view').request.FILES
+        task = Task.objects.create(title=validated_data.get('title', 'no-title'),
+                                   user_id=1)
+        for image_data in images_data.values():
+            TaskImage.objects.create(task=task, image=image_data)
+        return task"""