Merge branch 'main' into main-test

Author: ZinYan

.github/workflows/deploy.yml

@@ -55,10 +55,14 @@ jobs:
             sudo chown -R ubuntu:ubuntu /home/ubuntu/Moodico 
             sudo git config --system --add safe.directory /home/ubuntu/Moodico
 
+            sudo chown -R ubuntu:ubuntu /home/ubuntu/Moodico 
+            sudo git config --system --add safe.directory /home/ubuntu/Moodico
+
             cd /home/ubuntu/Moodico
             git fetch origin main
             git reset --hard origin/main
             
+            
             source venv/bin/activate
             pip install --upgrade pip
             pip install -r requirements.txt

clustering/generate_clusters.py

@@ -57,8 +57,11 @@ def calculate_coordinates(h, s, l):
 
     return round(final_warm, 2), round(final_deep, 2)
 
+from django.conf import settings
+import os, json
 # 데이터 로드
-with open("static/data/test_products.json", "r", encoding="utf-8") as f:
+file_path = os.path.join(settings.STATIC_ROOT, "data", "test_products.json")
+with open(file_path, "r", encoding="utf-8") as f:
     products = json.load(f)
 
 coordinates = []
@@ -96,11 +99,25 @@ def calculate_coordinates(h, s, l):
     valid_products[i]["cluster"] = int(label)
 
 # 클러스터링 결과를 JSON 파일로 저장
-with open("static/data/products_clustered.json", "w", encoding="utf-8") as f:
+# with open("static/data/products_clustered.json", "w", encoding="utf-8") as f:
+#     json.dump(valid_products, f, ensure_ascii=False, indent=2)
+
+# Create a data directory in MEDIA_ROOT
+data_dir = os.path.join(settings.MEDIA_ROOT, "data")
+os.makedirs(data_dir, exist_ok=True)
+file_path = os.path.join(data_dir, "products_clustered.json")
+with open(file_path, "w", encoding="utf-8") as f:
     json.dump(valid_products, f, ensure_ascii=False, indent=2)
 
 # 클러스터 중심 좌표 저장
-with open("static/data/cluster_centers.json", "w", encoding="utf-8") as f:
+# with open("static/data/cluster_centers.json", "w", encoding="utf-8") as f:
+#     json.dump(kmeans.cluster_centers_.tolist(), f, ensure_ascii=False, indent=2)
+data_dir = os.path.join(settings.MEDIA_ROOT, "data")
+os.makedirs(data_dir, exist_ok=True)
+
+file_path = os.path.join(data_dir, "cluster_centers.json")
+
+with open(file_path, "w", encoding="utf-8") as f:
     json.dump(kmeans.cluster_centers_.tolist(), f, ensure_ascii=False, indent=2)
 
 print(" Clustering complete. Files saved.")

crawler/scraper.py

@@ -11,14 +11,18 @@
 from selenium.webdriver.chrome.service import Service
 from selenium.webdriver.common.by import By
 from webdriver_manager.chrome import ChromeDriverManager
+import os
+from django.conf import settings
 
 TARGETS = [
     {"brand": "romand", "url": "https://romand.co.kr/product/maincatedetail.html?cate_code=289"},
     {"brand": "3ce", "url": "https://www.3cecosmetics.com/all-products/lips"}
 ]
 
 SCROLL_COUNT = 4
-SAVE_PATH = 'static/data/test_products.json'
+# SAVE_PATH = 'static/data/test_products.json'
+SAVE_PATH = os.path.join(settings.MEDIA_ROOT, 'data', 'test_products.json')
+os.makedirs(os.path.dirname(SAVE_PATH), exist_ok=True)
 
 # Selenium Chrome Driver 설정
 options = webdriver.ChromeOptions()

moodico/products/views.py

@@ -23,6 +23,7 @@ def color_matrix_explore(request):
 
     return render(request, 'recommendation/color_matrix.html', {'makeupProducts': products})
 
+from django.templatetags.static import static
 def product_detail(request, product_id):
     """제품 상세 페이지 뷰"""
     # 제품 상세 정보 (백엔드에서 받아올 예정)
@@ -31,7 +32,7 @@ def product_detail(request, product_id):
         'name': f'제품 {product_id}',
         'description': '이 제품은 아주 좋은 제품입니다.',
         'price': '30,000원',
-        'image': '/static/images/test.jpg', # 임시 이미지
+        'image': static('images/test.jpg')
     }
     return render(request, 'products/detail.html', {'product': product})
 

moodico/recommendation/views.py

@@ -34,10 +34,17 @@ def recommend_by_color(request):
 
         coord = np.array([warm, deep, lab_l, lab_a, lab_b])
         logger.info(f"Received coordinates: warmCool={warm}, lightDeep={deep}, lab_l={lab_l}, lab_a={lab_a}, lab_b={lab_b}")
-
-        with open("static/data/cluster_centers.json", "r") as f:
+        import os
+        from django.conf import settings
+        # with open("static/data/cluster_centers.json", "r") as f:
+        #     centers = json.load(f)
+        path = os.path.join(settings.MEDIA_ROOT, 'data', 'cluster_centers.json')
+        with open(path, "r", encoding="utf-8") as f:
             centers = json.load(f)
-        with open("static/data/products_clustered.json", "r", encoding="utf-8") as f:
+        # with open("static/data/products_clustered.json", "r", encoding="utf-8") as f:
+        #     products = json.load(f)
+        path = os.path.join(settings.MEDIA_ROOT, 'data', 'products_clustered.json')
+        with open(path, "r", encoding="utf-8") as f:
             products = json.load(f)
 
         # Step 1: Find closest cluster

moodico_project/settings.py

@@ -94,7 +94,7 @@
 if config('DATABASE_URL', default=''):
     import dj_database_url
     DATABASES = {
-        'default': dj_database_url.parse(config('DATABASE_URL'), conn_max_age=600, ssl_require=True)
+        'default': dj_database_url.parse(config('DATABASE_URL'), conn_max_age=600)
     }
 else:
     DATABASES = {
@@ -206,15 +206,4 @@
 
 # 로그인 로그아웃 후 리다이렉트 URL 설정
 LOGIN_REDIRECT_URL = "/"
-LOGOUT_REDIRECT_URL = "/login/"
-
-# security toggles for production
-if not DEBUG:
-    SECURE_SSL_REDIRECT = config('SECURE_SSL_REDIRECT', cast=bool, default=True)
-    SESSION_COOKIE_SECURE = True
-    CSRF_COOKIE_SECURE = True
-    SECURE_HSTS_SECONDS = config('SECURE_HSTS_SECONDS', cast=int, default=31536000)
-    SECURE_HSTS_INCLUDE_SUBDOMAINS = True
-    SECURE_HSTS_PRELOAD = True
-    SECURE_REFERRER_POLICY = "strict-origin-when-cross-origin"
-    SECURE_PROXY_SSL_HEADER = ("HTTP_X_FORWARDED_PROTO", "https")
+LOGOUT_REDIRECT_URL = "/login/"

templates/products/liked_products.html

@@ -18,10 +18,15 @@ <h1>💖 찜한 아이템</h1>
       data-product-id="{{ liked_product.product_id }}"
     >
       <button class="like-button liked" title="좋아요 취소"></button>
-      <img
+      {% comment %} <img
         src="{{ liked_product.product_image|default:'/static/images/test.jpg' }}"
         alt="{{ liked_product.product_name }}"
         onerror="this.src='/static/images/test.jpg'"
+      /> {% endcomment %}
+      <img
+        src="{{ liked_product.product_image.url|default:static('images/test.jpg') }}"
+        alt="{{ liked_product.product_name }}"
+        onerror="this.src='{% static 'images/test.jpg' %}'"
       />
       <div class="product-info">
         <div class="like-date">

templates/users/profile.html

@@ -101,8 +101,11 @@ <h2><span style="color: mediumpurple;">{{ user_name }}</span>님의 프로필</h
         {% for liked_product in liked_products %}
         <div class="liked-product-card" data-product-id="{{ liked_product.product_id }}">
             <button class="like-button liked" title="좋아요 취소"></button>
-            <img src="{{ liked_product.product_image|default:'/static/images/test.jpg' }}"
-                alt="{{ liked_product.product_name }}" onerror="this.src='/static/images/test.jpg'" />
+            {% comment %} <img src="{{ liked_product.product_image|default:'/static/images/test.jpg' }}"
+                alt="{{ liked_product.product_name }}" onerror="this.src='/static/images/test.jpg'" /> {% endcomment %}
+            <img src="{{ liked_product.product_image|default:static('images/test.jpg') }}"
+                alt="{{ liked_product.product_name }}"
+                onerror="this.src='{% static 'images/test.jpg' %}'" />
             <div class="product-info">
                 <div class="like-date">
                     찜한 날짜: {{ liked_product.created_at|date:"Y년 m월 d일" }}