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

Author: ZinYan

moodico/moodtest/color_analyzer.py

@@ -0,0 +1,76 @@
+import json
+import random
+import math
+import logging
+logger = logging.getLogger(__name__)
+
+def product_result_by_mood(mood):
+    try:
+        mood_zones_path = 'static/data/mood_zones.json'
+        products_path = 'static/data/all_products_hex_update_tempk=4_2_1_1.json'
+
+        with open(mood_zones_path, 'r', encoding='utf-8') as f:
+            mood_zones = json.load(f)
+        
+        with open(products_path, 'r', encoding='utf-8') as f:
+            all_products = json.load(f)
+        
+        zone = mood_zones[mood]['area']
+        zone_left = zone['left']
+        zone_top = zone['top']
+        zone_right = zone_left + zone['width']
+        zone_bottom = zone_top + zone['height']
+
+        filtered_results = []
+        for product in all_products:
+            # LAB -> coords 변환 로직
+            coords = calculate_coordinates_from_lab(product['lab_l'], product['lab_a'], product['lab_b'])
+
+            if (zone_left <= coords['warmCool'] <= zone_right and
+                zone_top <= coords['lightDeep'] <= zone_bottom):
+                filtered_results.append(product)
+            
+        return filtered_results
+    
+    except Exception as e:
+        logger.error(f"제품 필터링 중 에러 발생: {e}")
+        return []
+
+# 무드필터링 된 제품을 받아서 랜덤으로 최대 3개 반환하는 함수
+# 우선은 랜덤으로 구현하였으나, 로직 수정 가능
+def get_random_products(filtered_products):
+    product_count = len(filtered_products)
+    if product_count > 3:
+        return random.sample(filtered_products, 3)
+    else:
+        return filtered_products
+
+# color_analyzer.js의 calculateCoordinatesFromLAB(l, a, b)와 동일한 역할의 함수
+def sigmoid(x):
+    return 1 / (1 + math.exp(-x))
+def enhance_contrast(value):
+    return (1 - math.cos(value * math.pi)) / 2
+def calculate_coordinates_from_lab(l, a, b):
+    l_star = l
+    a_star = a
+    b_star = b
+
+    warm_cool_score = (a_star * 0.5) + (b_star * 1.0)
+
+    # sigmoid를 활용한 비선형 매핑 - warmCool
+    spread_wc_factor = 35
+    scaled_wc_score = (warm_cool_score - 35) / spread_wc_factor
+    sigmoid_wc_middle_value = sigmoid(scaled_wc_score)
+    sigmoid_wc_value = enhance_contrast(sigmoid_wc_middle_value) + 0.03
+
+    # 선형 매핑 간격 조정 - lightDeep
+    scale = 1.1
+    offset = -7
+    light_score = (l_star * scale) + offset
+
+    light_score = max(0, min(100, light_score))
+
+    warm_cool = sigmoid_wc_value * 100
+    light_deep = 100 - light_score
+
+    return {'warmCool': warm_cool, 'lightDeep': light_deep}

moodico/moodtest/views.py

@@ -8,7 +8,6 @@
 from django.views.decorators.http import require_http_methods
 from django.views.decorators.csrf import csrf_exempt
 
-from moodico.products.models import ProductLike
 from moodico.products.models import ProductLike, ProductRating, ProductRatingImage
 from django.db import models
 import logging
@@ -104,7 +103,42 @@ def crawled_product_detail(request, crawled_id):
             </html>
             """)
 
-        return render(request, 'products/crawled_detail.html', {'product': product})
+        # 해당 제품의 리뷰 정보 가져오기
+        from moodico.users.utils import get_user_from_request
+        user = get_user_from_request(request)
+        
+        # 제품 ID로 리뷰 찾기 (crawled_id 사용)
+        user_review = None
+        if user:
+            try:
+                user_review = ProductRating.objects.get(
+                    user=user,
+                    product_id=crawled_id
+                )
+            except ProductRating.DoesNotExist:
+                pass
+        
+        # 제품의 모든 리뷰 가져오기
+        all_reviews = ProductRating.objects.filter(product_id=crawled_id).order_by('-created_at')
+        
+        # 평균 별점과 평가 개수 계산
+        total_ratings = all_reviews.count()
+        if total_ratings > 0:
+            total_score = sum(review.rating for review in all_reviews)
+            average_rating = round(total_score / total_ratings, 1)
+        else:
+            average_rating = 0.0
+        
+        context = {
+            'product': product,
+            'user_review': user_review,
+            'all_reviews': all_reviews,
+            'user': user,
+            'total_ratings': total_ratings,
+            'average_rating': average_rating,
+        }
+        
+        return render(request, 'products/crawled_detail.html', context)
 
     except Exception as e:
         logger.error(f"크롤링된 제품 상세 정보 로드 실패: {e}")

moodico/products/views.py

@@ -1,10 +1,20 @@
 from django.shortcuts import redirect
 from functools import wraps
+from django.contrib.auth.models import User
 
 def login_or_kakao_required(view_func):
     @wraps(view_func)
     def _wrapped_view(request, *args, **kwargs):
         if request.user.is_authenticated or request.session.get("nickname"):
             return view_func(request, *args, **kwargs)
         return redirect('login')
-    return _wrapped_view
+    return _wrapped_view
+
+def get_user_from_request(request):
+    """요청에서 사용자 정보를 가져오는 함수"""
+    if request.user.is_authenticated:
+        return request.user
+    elif request.session.get("nickname"):
+        # 카카오 로그인 사용자의 경우 User 객체가 없을 수 있음
+        return None
+    return None

moodico/users/utils.py

@@ -5,7 +5,7 @@
 from django.http import HttpRequest
 from django.conf import settings
 from django.views.decorators.http import require_http_methods
-from moodico.products.models import ProductLike
+from moodico.products.models import ProductLike, ProductRating
 from .utils import login_or_kakao_required
 from moodico.users.models import UserProfile
 from moodico.products.views import get_liked_products_color_info
@@ -145,7 +145,11 @@ def profile(request):
         user_mood = user_profile.mood_result if user_profile.mood_result else "정보 없음"
     except UserProfile.DoesNotExist:
         user_mood = "정보 없음"
+    
     liked_products = ProductLike.objects.filter(user=request.user).order_by('-created_at')
+    
+    # 사용자가 작성한 리뷰들 가져오기
+    user_reviews = ProductRating.objects.filter(user=request.user).order_by('-created_at')
 
     # 찜한 제품들의 색상 및 URL 정보 가져오기
     liked_products_colors = get_liked_products_color_info(liked_products)
@@ -155,6 +159,7 @@ def profile(request):
         'user_mood': user_mood,
         'liked_products': liked_products,
         'liked_products_colors': liked_products_colors,
+        'user_reviews': user_reviews,
     }
 
     return render(request, 'users/profile.html', context)

moodico/users/views.py

@@ -327,6 +327,7 @@
 }
 
 .product-card {
+    position: relative;
     background: white;
     border-radius: 15px;
     padding: 16px;
@@ -347,7 +348,6 @@
 
 .product-image {
     width: 100%;
-    height: 120px;
     object-fit: cover;
     border-radius: 10px;
     margin-bottom: 12px;
@@ -379,16 +379,20 @@
 }
 
 .purchase-btn {
+    display: block;
+    width: 100%;
     padding: 8px 12px;
     background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    color: white;
     border: none;
     border-radius: 8px;
-    font-size: 13px;
-    font-weight: 600;
     cursor: pointer;
     transition: all 0.3s;
-    width: 100%;
+    color: white;
+    font-size: 13px;
+    font-weight: 600;
+    text-align: center;
+    text-decoration: none;
+    box-sizing: border-box;
 }
 
 .purchase-btn:hover {