Merge pull request #184 from pirogramming/develop

[DB] 가격이랑 제조사 모델 수정

Author: mnjese

foods/admin.py

@@ -4,8 +4,8 @@
 
 @admin.register(Food)
 class FoodAdmin(admin.ModelAdmin):
-    list_display = ['food_id', 'food_name', 'company_name', 'food_category', 'shop_name', 'price']
-    list_filter = ['food_category', 'company_name', 'shop_name']
+    list_display = ['food_id', 'food_name', 'company_name', 'food_category', 'mallName', 'lprice']
+    list_filter = ['food_category', 'company_name', 'mallName']
     search_fields = ['food_name', 'company_name', 'representative_food']
     readonly_fields = ['food_id']
 
@@ -29,7 +29,7 @@ class FoodAdmin(admin.ModelAdmin):
             'classes': ('collapse',)
         }),
         ('가격 정보', {
-            'fields': ('shop_name', 'price', 'discount_price', 'shop_url', 'image_url'),
+            'fields': ('mallName', 'lprice', 'discount_price', 'shop_url', 'image_url'),
             'classes': ('collapse',)
         }),
         ('기타 정보', {

foods/migrations/0008_rename_price_food_lprice.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.4 on 2025-08-17 22:12
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('foods', '0007_food_nrf_index_food_nutri_score_grade_and_more'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='food',
+            old_name='price',
+            new_name='lprice',
+        ),
+    ]

foods/migrations/0009_food_mallname.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.4 on 2025-08-17 22:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('foods', '0008_rename_price_food_lprice'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='food',
+            name='mallName',
+            field=models.CharField(blank=True, max_length=100, null=True),
+        ),
+    ]

foods/migrations/0010_remove_food_shop_name.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.2.4 on 2025-08-17 22:14
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('foods', '0009_food_mallname'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='food',
+            name='shop_name',
+        ),
+    ]

foods/models.py

@@ -51,9 +51,9 @@ class Food(models.Model):
     nrf_index = models.FloatField(null=True, blank=True)
 
     # 가격 정보 (CSV 칼럼에 맞춰 추가)
-    shop_name = models.CharField(max_length=100, null=True, blank=True)
-    price = models.BigIntegerField(null=True, blank=True)
+    lprice = models.BigIntegerField(null=True, blank=True)  # 네이버 쇼핑 최저가
     discount_price = models.BigIntegerField(null=True, blank=True)
+    mallName = models.CharField(max_length=100, null=True, blank=True)  # 쇼핑몰 이름
     shop_url = models.URLField(null=True, blank=True)
     image_url = models.URLField(null=True, blank=True)
 

products/views.py

@@ -35,11 +35,11 @@ def _product_dict(food, is_favorite: bool):
         "trans_fatty_acids": food.trans_fatty_acids,
         "nutritional_value_standard_amount": food.nutritional_value_standard_amount,
         "weight": food.weight,
-        "company_name": food.shop_name or food.company_name,
+        "company_name": food.mallName or food.company_name,
         "nutrition_score": food.nutrition_score,
         "nutri_score_grade": food.nutri_score_grade,
-        "price": food.price,
-        "shop_name": food.shop_name,
+        "lprice": food.lprice,
+        "shop_name": food.mallName,
         "shop_url": food.shop_url,
         "sugar_level": None,
         "saturated_fatty_acids_level": None,

scripts/insert_food_postgresql.py

@@ -149,7 +149,7 @@ def main():
     csv_to_db = {
         'food_id': 'food_id',
         'mallName': 'shop_name',
-        'lprice': 'price',
+        'lprice': 'lprice',
         'hprice': 'discount_price',
         'shop_url': 'shop_url',
         'image_url': 'image_url',
@@ -215,7 +215,7 @@ def main():
     for c in float_cols:
         out[c] = out[c].apply(to_float)
 
-    bigint_cols = ['nutritional_value_standard_amount', 'price', 'discount_price']
+    bigint_cols = ['nutritional_value_standard_amount', 'lprice', 'discount_price']
     for c in bigint_cols:
         out[c] = out[c].apply(to_bigint)
 

scripts/rebuild_clean_database.py

@@ -213,9 +213,9 @@ def validate_and_clean_row(args):
             cleaned_row[field] = value if pd.notna(value) else None
 
     # 정수 필드 정리
-    int_fields = ['nutritional_value_standard_amount', 'price', 'discount_price']
+    int_fields = ['nutritional_value_standard_amount', 'lprice', 'discount_price']
     for field in int_fields:
-        value = pd.to_numeric(row.get(field if field != 'price' else 'lprice', None), errors='coerce')
+        value = pd.to_numeric(row.get(field if field != 'lprice' else 'lprice', None), errors='coerce')
         if field == 'discount_price':
             value = pd.to_numeric(row.get('hprice', None), errors='coerce')
         if field == 'nutritional_value_standard_amount':
@@ -419,7 +419,7 @@ def update_progress():
         'potassium','salt','"VitaminA"','"VitaminB"','"VitaminC"','"VitaminD"','"VitaminE"',
         'cholesterol','saturated_fatty_acids','trans_fatty_acids','serving_size',
         'weight','company_name','nutrition_score','nutri_score_grade','nrf_index',
-        'shop_name','price','discount_price','shop_url','image_url'
+        'shop_name','lprice','discount_price','shop_url','image_url'
     ]
 
     placeholders = ",".join(["%s"] * len(cols))

templates/products/products_detail.html

@@ -69,8 +69,8 @@ <h3>공유하기</h3>
     <div class="product-title-section">
       <h1 class="product-name">{{ product.food_name }}</h1>
       <div class="product-price">
-        {% if product.price %}
-          {{ product.price }}<span class="currency">원</span>
+        {% if product.lprice %}
+          {{ product.lprice }}<span class="currency">원</span>
         {% else %}
           가격 정보 없음
         {% endif %}