chore:주석 제거

kakao-tech-campus-2nd-step3 · Nov 15, 2024 · 69d1c90 · 69d1c90
1 parent c5dcfba
commit 69d1c90
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 88 deletions.
diff --git a/src/main/java/jeje/work/aeatbe/repository/ProductRepository.java b/src/main/java/jeje/work/aeatbe/repository/ProductRepository.java
@@ -14,104 +14,26 @@
 
 @Repository
 public interface ProductRepository extends JpaRepository<Product, Long> {
-//    Page<Product> findByProductNameContaining(String q, Pageable pageable);
-//
-//    @Query("SELECT p FROM Product p WHERE NOT EXISTS (SELECT a FROM p.productAllergies a WHERE a.allergy IN :allergies)")
-//    Page<Product> findByAllergyNotIn(List<String> allergies, Pageable pageable);
-//
-//    @Query("SELECT p FROM Product p JOIN p.productFreeFroms f WHERE f.freeFromCategory IN :freeFroms")
-//    Page<Product> findByFreeFrom(List<String> freeFroms, Pageable pageable);
-//
-//    Page<Product> findByPriceBetween(int priceMin, int priceMax, Pageable pageable);
-//
+
     @Query("SELECT new map(p.id as id, p.productName as product_name) FROM Product p")
     List<Map<String, Object>> findByProductIdAndName();
-//
-//
-//    @Query("SELECT p FROM Product p WHERE p.price BETWEEN :priceMin AND :priceMax")
-//    Page<Product> findByPriceBetween(@Param("priceMin") int priceMin, @Param("priceMax") int priceMax, Pageable pageable);
-//
-//
-//    @Query("SELECT p FROM Product p WHERE p.price BETWEEN :priceMin AND :priceMax AND p.productName LIKE %:q%")
-//    Page<Product> findByProductName(@Param("q") String q, @Param("priceMin") int priceMin,
-//            @Param("priceMax") int priceMax, Pageable pageable);
-
-
-//    @Query("SELECT p FROM Product p WHERE p.price BETWEEN :priceMin AND :priceMax " +
-//            "AND NOT EXISTS (SELECT a FROM p.productAllergies a WHERE a.allergy IN :allergies)")
-//    @Query("SELECT p FROM Product p WHERE p.price BETWEEN :priceMin AND :priceMax " +
-//        "AND NOT EXISTS (SELECT pa FROM ProductAllergy pa WHERE pa.product = p AND pa.allergy.allergyType IN :allergies)")
-//    @Query("SELECT p FROM Product p WHERE p.price BETWEEN :priceMin AND :priceMax " +
-//            "AND p.id NOT IN (SELECT pa.product.id FROM ProductAllergy pa WHERE pa.allergy.allergyType IN :allergies)")
-//    @Query("SELECT p FROM Product p WHERE p.price BETWEEN :priceMin AND :priceMax AND NOT EXISTS (SELECT pa FROM ProductAllergy pa " +
-//        "WHERE pa.product = p AND pa.allergy.allergyType IN :allergies)")
-//    Page<Product> findByAllergy(@Param("allergies") List<String> allergies, @Param("priceMin") int priceMin,
-//            @Param("priceMax") int priceMax, Pageable pageable);
-//
-//
-//    @Query("SELECT p FROM Product p JOIN ProductFreeFrom pf ON p = pf.product " +
-//            "JOIN FreeFromCategory ff ON pf.freeFromCategory = ff WHERE p.price BETWEEN :priceMin AND :priceMax AND ff.freeFromType IN :freeFroms")
-//    Page<Product> findByFreeFrom(@Param("freeFroms") List<String> freeFroms, @Param("priceMin") int priceMin,
-//            @Param("priceMax") int priceMax, Pageable pageable);
-
-//    @Query("SELECT p FROM Product p WHERE p.price BETWEEN :priceMin AND :priceMax AND p.productName LIKE %:q% " +
-//            "AND NOT EXISTS (SELECT a FROM p.productAllergies a WHERE a.allergy IN :allergies)")
-//    @Query("SELECT p FROM Product p WHERE p.price BETWEEN :priceMin AND :priceMax AND p.productName LIKE %:q% " +
-//        "AND NOT EXISTS (SELECT pa FROM ProductAllergy pa WHERE pa.product = p AND pa.allergy.allergyType IN :allergies)")
-//    Page<Product> findByProductNameAndAllergy(@Param("q") String q, @Param("allergies") List<String> allergies,
-//            @Param("priceMin") int priceMin, @Param("priceMax") int priceMax, Pageable pageable);
-
-
-//    @Query("SELECT p FROM Product p JOIN p.productFreeFroms f WHERE p.price BETWEEN :priceMin AND :priceMax " +
-//            "AND p.productName LIKE %:q% AND f.freeFromCategory IN :freeFroms")
-//    @Query("SELECT DISTINCT p FROM Product p JOIN ProductFreeFrom pf ON p = pf.product JOIN FreeFromCategory ff ON pf.freeFromCategory = ff " +
-//        "WHERE p.price BETWEEN :priceMin AND :priceMax AND ff.freeFromType IN :freeFroms")
-//    @Query("SELECT DISTINCT p FROM Product p JOIN ProductFreeFrom pf ON p = pf.product " +
-//        "JOIN FreeFromCategory ff ON pf.freeFromCategory = ff WHERE p.price BETWEEN :priceMin AND :priceMax " +
-//        "AND p.productName LIKE %:q% AND ff.freeFromType IN :freeFroms")
-//    Page<Product> findByProductNameAndFreeFrom(@Param("q") String q, @Param("freeFroms") List<String> freeFroms,
-//            @Param("priceMin") int priceMin, @Param("priceMax") int priceMax, Pageable pageable);
-
-//    @Query("SELECT p FROM Product p JOIN p.productFreeFroms f WHERE p.price BETWEEN :priceMin AND :priceMax " +
-//            "AND NOT EXISTS (SELECT a FROM p.productAllergies a WHERE a.allergy IN :allergies) AND f.freeFromCategory IN :freeFroms")
-//    @Query("SELECT DISTINCT p FROM Product p JOIN ProductFreeFrom pf ON p = pf.product JOIN FreeFromCategory ff ON pf.freeFromCategory = ff " +
-//        "WHERE p.price BETWEEN :priceMin AND :priceMax AND NOT EXISTS (SELECT pa FROM ProductAllergy pa " +
-//        "WHERE pa.product = p AND pa.allergy.allergyType IN :allergies) AND ff.freeFromType IN :freeFroms")
-//    Page<Product> findByAllergyAndFreeFrom(@Param("allergies") List<String> allergies, @Param("freeFroms") List<String> freeFroms,
-//            @Param("priceMin") int priceMin, @Param("priceMax") int priceMax, Pageable pageable);
-
-
-
-//    @Query("SELECT p FROM Product p JOIN p.productFreeFroms f WHERE p.price BETWEEN :priceMin AND :priceMax AND p.productName LIKE %:q% " +
-//            "AND NOT EXISTS (SELECT a FROM p.productAllergies a WHERE a.allergy IN :allergies) AND f.freeFromCategory IN :freeFroms")
-//    @Query("SELECT p FROM Product p JOIN ProductFreeFrom pf ON p = pf.product JOIN FreeFromCategory ff ON pf.freeFromCategory = ff " +
-//        "WHERE p.price BETWEEN :priceMin AND :priceMax AND p.productName LIKE %:q% " +
-//        "AND NOT EXISTS (SELECT pa FROM ProductAllergy pa WHERE pa.product = p AND pa.allergy.allergyType IN :allergies) " +
-//        "AND ff.freeFromType IN :freeFroms")
-//    Page<Product> findByAll(
-//            @Param("q") String q, @Param("allergies") List<String> allergies, @Param("freeFroms") List<String> freeFroms,
-//            @Param("priceMin") int priceMin, @Param("priceMax") int priceMax, Pageable pageable);
 
-    // 기본 가격 범위 검색
     @Query("SELECT p FROM Product p WHERE p.price BETWEEN :priceMin AND :priceMax")
     Page<Product> findByPriceBetween(@Param("priceMin") int priceMin, @Param("priceMax") int priceMax, Pageable pageable);
 
-    // 상품명 검색
     @Query("SELECT DISTINCT p FROM Product p " +
             "WHERE p.price BETWEEN :priceMin AND :priceMax " +
             "AND p.productName LIKE %:q%")
     Page<Product> findByProductName(@Param("q") String q, @Param("priceMin") int priceMin,
                                     @Param("priceMax") int priceMax, Pageable pageable);
 
-    // 알레르기 제외 검색
     @Query("SELECT DISTINCT p FROM Product p " +
             "WHERE p.price BETWEEN :priceMin AND :priceMax " +
             "AND NOT EXISTS (SELECT pa FROM ProductAllergy pa " +
             "WHERE pa.product = p AND pa.allergy.allergyType IN :allergies)")
     Page<Product> findByAllergy(@Param("allergies") List<String> allergies, @Param("priceMin") int priceMin,
                                 @Param("priceMax") int priceMax, Pageable pageable);
 
-    // FreeFrom 포함 검색 (OR 조건)
     @Query("SELECT DISTINCT p FROM Product p " +
             "JOIN p.productFreeFroms pf " +
             "JOIN pf.freeFromCategory ff " +
@@ -122,7 +44,6 @@ Page<Product> findByFreeFrom(@Param("freeFroms") List<String> freeFroms,
                                  @Param("priceMax") int priceMax,
                                  Pageable pageable);
 
-    // 상품명 + 알레르기 제외 검색
     @Query("SELECT DISTINCT p FROM Product p " +
             "WHERE p.price BETWEEN :priceMin AND :priceMax " +
             "AND p.productName LIKE %:q% " +
@@ -131,7 +52,6 @@ Page<Product> findByFreeFrom(@Param("freeFroms") List<String> freeFroms,
     Page<Product> findByProductNameAndAllergy(@Param("q") String q, @Param("allergies") List<String> allergies,
                                               @Param("priceMin") int priceMin, @Param("priceMax") int priceMax, Pageable pageable);
 
-    // 상품명 + FreeFrom 검색 (OR 조건)
     @Query("SELECT DISTINCT p FROM Product p " +
             "JOIN p.productFreeFroms pf " +
             "JOIN pf.freeFromCategory ff " +
@@ -144,7 +64,6 @@ Page<Product> findByProductNameAndFreeFrom(@Param("q") String q,
                                                @Param("priceMax") int priceMax,
                                                Pageable pageable);
 
-    // 알레르기 제외 + FreeFrom 검색 (OR 조건)
     @Query("SELECT DISTINCT p FROM Product p " +
             "JOIN p.productFreeFroms pf " +
             "JOIN pf.freeFromCategory ff " +
@@ -159,7 +78,6 @@ Page<Product> findByAllergyAndFreeFrom(
             @Param("priceMax") int priceMax,
             Pageable pageable);
 
-    // 전체 조건 검색 (FreeFrom은 OR 조건)
     @Query("SELECT DISTINCT p FROM Product p " +
             "JOIN p.productFreeFroms pf " +
             "JOIN pf.freeFromCategory ff " +

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -17,9 +17,18 @@ spring:
     # username: ${DB_USERNAME}
     # password: ${DB_PASSWORD}
 
+  servlet:
+    multipart:
+      file-size-threshold: 1MB
+      location : .
+      max-file-size: 10MB
+      max-request-size : 50MB
+      enabled : true
+
   jpa:
     hibernate:
-      ddl-auto: ${SPRING_JPA_HIBERNATE_DDL_AUTO:create-drop}
+      #      ddl-auto: ${SPRING_JPA_HIBERNATE_DDL_AUTO:create-drop}
+      ddl-auto: ${SPRING_JPA_HIBERNATE_DDL_AUTO:update}
     show-sql: ${SPRING_JPA_SHOW_SQL:true}
     properties:
       hibernate:
@@ -29,7 +38,7 @@ spring:
 
   sql:
     init:
-      mode: always
+  #      mode: always
 
   docker:
     compose:
@@ -49,14 +58,23 @@ spring:
 
 kakao:
   client_id: ${KAKAO_CLIENT_ID}
-  redirect_url: http://localhost:8080/api/users/callback
+  redirect_url: https://${FRONTEND_DOMAIN}/login/redirect
   auth_url: https://kauth.kakao.com/oauth/authorize
   logout_url: https://kauth.kakao.com/oauth/logout
-  logout_redirect_url: http://localhost:8080/api/users/logoutWithKakao/callback
+  logout_redirect_url: https://${FRONTEND_DOMAIN}/logout/redirect
 
 haccp:
   service_key: ${SERVICE_KEY}
   base_url: https://apis.data.go.kr/B553748/CertImgListServiceV3
 
 default:
-  image: https://www.notion.so/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2Fbafebf27-4e21-4ed6-99e1-983eb90ad9c0%2F75c38d1f-215b-4536-a401-18cf179bf119%2Fimage.png?table=block&id=137a63f1-9420-8046-9cb6-d218151fd876&cache=v2
+  image: https://www.notion.so/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2Fbafebf27-4e21-4ed6-99e1-983eb90ad9c0%2F75c38d1f-215b-4536-a401-18cf179bf119%2Fimage.png?table=block&id=137a63f1-9420-8046-9cb6-d218151fd876&cache=v2
+
+shop:
+  client_id: ${SHOP_CLIENT_ID}
+  client_secret: ${SHOP_CLIENT_SECRET}
+  base_url : https://openapi.naver.com/v1/search/shop.json
+
+gpt:
+  secret_key: ${GPT_SECRET_KEY}
+  base_url : https://api.openai.com/v1/chat/completions