Merge pull request #14 from SeongHunTed/backend

Backend - Cake 기능들 다수 추가

Author: SeongHunTed

.gitignore

@@ -11,6 +11,7 @@ db.sqlite3
 db.sqlite3-journal
 media
 secret.json
+.DS_Store
 
 # If your build process includes running collectstatic, then you probably don't need or want to include staticfiles/
 # in your Git repository. Update and uncomment the following line accordingly.

Backend/momment/cake/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from .models import *
+from .models import Cake, Price, Location, Flavor, CakeInfo
 
 class CakeAdmin(admin.ModelAdmin):
     # 관리자 화면에 보여질 칼럼 지정
@@ -12,4 +12,51 @@ class CakeAdmin(admin.ModelAdmin):
     fieldsets = ()
     ordering = ()
 
-admin.site.register(Cake, CakeAdmin)
+class CakePriceOption(admin.ModelAdmin):
+
+    list_display = ['price_range']
+    search_fields = ()
+    readonly_fields = ()
+ 
+    filter_horizontal = ()
+    list_filter = ()
+    fieldsets = ()
+    ordering = ()
+
+class CakeLocationOption(admin.ModelAdmin):
+
+    list_display = ['locate']
+    search_fields = ()
+    readonly_fields = ()
+ 
+    filter_horizontal = ()
+    list_filter = ()
+    fieldsets = ()
+    ordering = ()
+
+class CakeFlavorOption(admin.ModelAdmin):
+
+    list_display = ['flavor']
+    search_fields = ()
+    readonly_fields = ()
+ 
+    filter_horizontal = ()
+    list_filter = ()
+    fieldsets = ()
+    ordering = ()
+
+class CakeInfoAdmin(admin.ModelAdmin):
+    list_display = ['cake', 'price_range']
+    search_fields = ()
+    readonly_fields = ()
+ 
+    filter_horizontal = ()
+    list_filter = ()
+    fieldsets = ()
+    ordering = ()
+
+admin.site.register(Cake, CakeAdmin)
+admin.site.register(Price, CakePriceOption)
+admin.site.register(Location, CakeLocationOption)
+admin.site.register(Flavor, CakeFlavorOption)
+admin.site.register(CakeInfo, CakeInfoAdmin)

Backend/momment/cake/migrations/0002_cakeinfo_flavor_location_price.py

@@ -0,0 +1,43 @@
+# Generated by Django 3.2.13 on 2023-01-24 16:38
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cake', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Flavor',
+            fields=[
+                ('flavor', models.CharField(max_length=100, primary_key=True, serialize=False)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Location',
+            fields=[
+                ('locate', models.CharField(max_length=24, primary_key=True, serialize=False)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Price',
+            fields=[
+                ('price', models.CharField(max_length=100, primary_key=True, serialize=False)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='CakeInfo',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('info', models.TextField(max_length=1024)),
+                ('cake', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cake.cake')),
+                ('flavor', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cake.flavor')),
+                ('locate', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cake.location')),
+                ('price', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cake.price')),
+            ],
+        ),
+    ]

Backend/momment/cake/migrations/0003_auto_20230124_1758.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.13 on 2023-01-24 17:58
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cake', '0002_cakeinfo_flavor_location_price'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='cakeinfo',
+            old_name='price',
+            new_name='price_range',
+        ),
+        migrations.RenameField(
+            model_name='price',
+            old_name='price',
+            new_name='price_range',
+        ),
+    ]

Backend/momment/cake/migrations/0004_alter_cakesize_cake.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.2.13 on 2023-01-26 04:35
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cake', '0003_auto_20230124_1758'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='cakesize',
+            name='cake',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='cake_size', to='cake.cake'),
+        ),
+    ]

Backend/momment/cake/migrations/0005_alter_cakesize_cake.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.2.13 on 2023-01-26 04:37
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cake', '0004_alter_cakesize_cake'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='cakesize',
+            name='cake',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cake.cake'),
+        ),
+    ]

Backend/momment/cake/migrations/0006_alter_cakesize_cake.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.2.13 on 2023-01-26 04:40
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cake', '0005_alter_cakesize_cake'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='cakesize',
+            name='cake',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='size', to='cake.cake'),
+        ),
+    ]

Backend/momment/cake/migrations/0007_auto_20230126_0524.py

@@ -0,0 +1,70 @@
+# Generated by Django 3.2.13 on 2023-01-26 05:24
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('store', '0001_initial'),
+        ('cake', '0006_alter_cakesize_cake'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='cake',
+            name='store',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='cake', to='store.store'),
+        ),
+        migrations.AlterField(
+            model_name='cakecandle',
+            name='cake',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='candle', to='cake.cake'),
+        ),
+        migrations.AlterField(
+            model_name='cakecolor',
+            name='cake',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='color', to='cake.cake'),
+        ),
+        migrations.AlterField(
+            model_name='cakedeco',
+            name='cake',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='deco', to='cake.cake'),
+        ),
+        migrations.AlterField(
+            model_name='cakedesign',
+            name='cake',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='design', to='cake.cake'),
+        ),
+        migrations.AlterField(
+            model_name='cakeflavor',
+            name='cake',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='flavor', to='cake.cake'),
+        ),
+        migrations.AlterField(
+            model_name='cakefont',
+            name='cake',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='font', to='cake.cake'),
+        ),
+        migrations.AlterField(
+            model_name='cakelettering',
+            name='cake',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='lettering', to='cake.cake'),
+        ),
+        migrations.AlterField(
+            model_name='cakepackage',
+            name='cake',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='package', to='cake.cake'),
+        ),
+        migrations.AlterField(
+            model_name='cakepicture',
+            name='cake',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='picture', to='cake.cake'),
+        ),
+        migrations.AlterField(
+            model_name='cakesidedeco',
+            name='cake',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='side_deco', to='cake.cake'),
+        ),
+    ]

Backend/momment/cake/models.py

@@ -5,74 +5,79 @@
 class Cake(models.Model):
     name = models.CharField(max_length=40)
     price = models.IntegerField()
-    store = models.ForeignKey(Store, on_delete=models.CASCADE)
+    store = models.ForeignKey(Store, on_delete=models.CASCADE, related_name='cake')
 
 class CakeSize(models.Model):
     size = models.CharField(max_length=40)
     price = models.IntegerField()
-    cake = models.ForeignKey(Cake, on_delete=models.CASCADE)
+    cake = models.ForeignKey(Cake, on_delete=models.CASCADE, related_name='size')
 
 class CakeFlavor(models.Model):
     flavor = models.CharField(max_length=40)
     price = models.IntegerField()
-    cake = models.ForeignKey(Cake, on_delete=models.CASCADE)
+    cake = models.ForeignKey(Cake, on_delete=models.CASCADE, related_name='flavor')
 
 class CakeColor(models.Model):
     color = models.CharField(max_length=40)
     price = models.IntegerField()
-    cake = models.ForeignKey(Cake, on_delete=models.CASCADE)
+    cake = models.ForeignKey(Cake, on_delete=models.CASCADE, related_name='color')
 
 class CakeDesign(models.Model):
     design = models.CharField(max_length=40)
     price = models.IntegerField()
-    cake = models.ForeignKey(Cake, on_delete=models.CASCADE)
+    cake = models.ForeignKey(Cake, on_delete=models.CASCADE, related_name='design')
 
 class CakeSideDeco(models.Model):
     side_deco = models.CharField(max_length=40)
     price = models.IntegerField()
-    cake = models.ForeignKey(Cake, on_delete=models.CASCADE)
+    cake = models.ForeignKey(Cake, on_delete=models.CASCADE, related_name='side_deco')
 
 class CakeDeco(models.Model):
     deco = models.CharField(max_length=40)
     price = models.IntegerField()
-    cake = models.ForeignKey(Cake, on_delete=models.CASCADE)
+    cake = models.ForeignKey(Cake, on_delete=models.CASCADE, related_name='deco')
 
 class CakeLettering(models.Model):
     lettering = models.CharField(max_length=40)
     price = models.IntegerField()
-    cake = models.ForeignKey(Cake, on_delete=models.CASCADE)
+    cake = models.ForeignKey(Cake, on_delete=models.CASCADE, related_name='lettering')
 
 class CakeFont(models.Model):
     font = models.CharField(max_length=40)
     price = models.IntegerField()
-    cake = models.ForeignKey(Cake, on_delete=models.CASCADE)
+    cake = models.ForeignKey(Cake, on_delete=models.CASCADE, related_name='font')
 
 class CakePicture(models.Model):
     picture = models.CharField(max_length=40)
     price = models.IntegerField()
-    cake = models.ForeignKey(Cake, on_delete=models.CASCADE)
+    cake = models.ForeignKey(Cake, on_delete=models.CASCADE, related_name='picture')
 
 class CakePackage(models.Model):
     package = models.CharField(max_length=40)
     price = models.IntegerField()
-    cake = models.ForeignKey(Cake, on_delete=models.CASCADE)
+    cake = models.ForeignKey(Cake, on_delete=models.CASCADE, related_name='package')
 
 class CakeCandle(models.Model):
     candle = models.CharField(max_length=40)
     price = models.IntegerField()
+    cake = models.ForeignKey(Cake, on_delete=models.CASCADE, related_name='candle')
+
+
+
+
+# 상품 상세 페이지용
+class Location(models.Model):
+    locate = models.CharField(max_length=24, primary_key=True)
+
+class Flavor(models.Model):
+    flavor = models.CharField(max_length=100, primary_key=True)
+
+class Price(models.Model):
+    price_range = models.CharField(max_length=100, primary_key=True)
+
+class CakeInfo(models.Model):
+    info = models.TextField(max_length=1024)
+    locate = models.ForeignKey(Location, on_delete=models.CASCADE)
+    flavor = models.ForeignKey(Flavor, on_delete=models.CASCADE)
+    price_range = models.ForeignKey(Price, on_delete=models.CASCADE)
     cake = models.ForeignKey(Cake, on_delete=models.CASCADE)
-    
-
-# class Cake(models.Model):
-#     name = models.CharField(max_length=40, unique=True)
-#     size = models.ForeignKey(CakeSize, on_delete=models.CASCADE)
-#     flavor = models.ForeignKey(CakeFlavor, on_delete=models.CASCADE)
-#     color = models.ForeignKey(CakeColor, on_delete=models.CASCADE)
-#     design = models.ForeignKey(CakeDesign, on_delete=models.CASCADE)
-#     side_deco = models.ForeignKey(CakeSideDeco, on_delete=models.CASCADE, null=True, blank=True)
-#     deco = models.ForeignKey(CakeDeco, on_delete=models.CASCADE, null=True, blank=True)
-#     lettering = models.ForeignKey(CakeLettering, on_delete=models.CASCADE, null=True, blank=True)
-#     font = models.ForeignKey(CakeFont, on_delete=models.CASCADE, null=True, blank=True)
-#     picture = models.ForeignKey(CakePicture, on_delete=models.CASCADE, null=True, blank=True)
-#     package = models.ForeignKey(CakePackage, on_delete=models.CASCADE)
-#     candle = models.ForeignKey(CakeCandle, on_delete=models.CASCADE, null=True, blank=True)