Merge branch 'develop' of https://github.com/pirogramming/Moodico into main-test

Author: ZinYan

moodico/main/views.py

@@ -1,5 +1,7 @@
 from django.shortcuts import render
 from moodico.products.views import get_top_liked_products
+from moodico.products.models import ProductLike
+import random
 
 # Create your views here.
 
@@ -8,8 +10,47 @@ def main(request):
     # 상위 3개의 인기 제품만 메인페이지에 표시
     top_liked_products = get_top_liked_products(3)
 
+    # 오늘의 추천 제품 선택
+    recommended_product = None
+    
+    if request.user.is_authenticated:
+        # 로그인한 사용자의 경우: 찜한 제품 중 랜덤 선택
+        user_liked_products = ProductLike.objects.filter(user=request.user)
+        if user_liked_products.exists():
+            # 찜한 제품이 있으면 랜덤으로 하나 선택
+            random_like = random.choice(user_liked_products)
+            recommended_product = {
+                'product_name': random_like.product_name,
+                'product_brand': random_like.product_brand,
+                'product_image': random_like.product_image,
+                'like_count': 1,  # 사용자가 찜한 제품이므로 1
+                'is_user_liked': True
+            }
+    
+    if not recommended_product:
+        # 사용자가 찜한 제품이 없거나 비로그인인 경우: 인기 제품 중 랜덤 선택
+        if top_liked_products:
+            random_product = random.choice(top_liked_products)
+            recommended_product = {
+                'product_name': random_product['product_name'],
+                'product_brand': random_product['product_brand'],
+                'product_image': random_product['product_image'],
+                'like_count': random_product['like_count'],
+                'is_user_liked': False
+            }
+        else:
+            # 아무 제품도 없는 경우 기본값
+            recommended_product = {
+                'product_name': '추천 제품 준비 중',
+                'product_brand': '',
+                'product_image': '/static/images/test.jpg',
+                'like_count': 0,
+                'is_user_liked': False
+            }
+    
     return render(request, 'main/main.html', {
-        'top_liked_products': top_liked_products
+        'top_liked_products': top_liked_products,
+        'recommended_product': recommended_product
     })
 
 

moodico/products/migrations/0010_productvote.py

@@ -0,0 +1,33 @@
+# Generated by Django 5.2.4 on 2025-08-16 14:31
+
+import django.db.models.deletion
+import uuid
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('products', '0009_productratingimage'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ProductVote',
+            fields=[
+                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, verbose_name='투표 식별자')),
+                ('session_nickname', models.CharField(blank=True, max_length=100, null=True, verbose_name='세션 닉네임')),
+                ('product_id', models.CharField(max_length=255, verbose_name='제품 ID')),
+                ('product_name', models.CharField(max_length=255, verbose_name='제품명')),
+                ('product_brand', models.CharField(max_length=255, verbose_name='브랜드')),
+                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='투표 날짜')),
+                ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='사용자')),
+            ],
+            options={
+                'ordering': ['-created_at'],
+                'unique_together': {('user', 'product_id')},
+            },
+        ),
+    ]

moodico/products/views.py

@@ -17,6 +17,11 @@
 # Create your views here.
 def color_matrix_explore(request):
     """색상 매트릭스 페이지 뷰"""
+    # 로그인이 되어있다면, 찜한 제품 정보 불러오기
+    liked_product_ids = set()
+    if request.user.is_authenticated:
+        liked_product_ids = set(ProductLike.objects.filter(user=request.user).values_list('product_id', flat=True))
+
     static_cluster = os.path.join(settings.BASE_DIR, 'static','data', 'products_clustered.json')
     static_all = os.path.join(settings.BASE_DIR, 'static', 'data', 'all_products.json')
 
@@ -29,6 +34,10 @@ def color_matrix_explore(request):
     with open(product_path, 'r', encoding='utf-8') as f:
         products = json.load(f)
 
+    # 찜 여부 추가
+    for product in products:
+        product['is_liked'] = product.get('id') in liked_product_ids
+
     return render(request, 'recommendation/color_matrix.html', {'makeupProducts': products})
 from django.templatetags.static import static
 def product_detail(request, product_id):