some logic is changed for integration

Author: bu2000

src/main/java/com/webservice/algorithmchef/config/GeminiConfig.java

@@ -1,10 +1,12 @@
 package com.webservice.algorithmchef.config;
 
-import com.google.genai.Client;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import com.google.genai.Client;
+
+
 @Configuration
 public class GeminiConfig {
 

src/main/java/com/webservice/algorithmchef/config/JwtAuthenticationFilter.java

@@ -47,7 +47,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 
         // 1. JWT 헤더가 없거나 'Bearer'가 아닌 경우
         if (authHeader == null || !authHeader.startsWith("Bearer ")) {
-            log.warn("Authorization 헤더가 없거나 Bearer 타입이 아님");
+        	log.debug("헤더에 토큰이 없어 비로그인 상태로 다음 필터 진행: {}", request.getRequestURI());
             filterChain.doFilter(request, response);
             return;
         }

src/main/java/com/webservice/algorithmchef/config/SecurityConfig.java

@@ -1,15 +1,19 @@
 package com.webservice.algorithmchef.config;
 
+import java.util.List;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpMethod;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
 import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
-
-
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.CorsConfigurationSource;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 
 import lombok.RequiredArgsConstructor;
 
@@ -24,6 +28,7 @@ public class SecurityConfig {
     @Bean
     public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
         http
+        		.cors(org.springframework.security.config.Customizer.withDefaults())
                 .csrf(AbstractHttpConfigurer::disable)
                 .httpBasic(AbstractHttpConfigurer::disable)
                 .formLogin(AbstractHttpConfigurer::disable);
@@ -36,12 +41,30 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                 .authorizeHttpRequests(authorize -> authorize
                         .requestMatchers("/auth/login", "/auth/signUp",
                                 "/auth/findPassword", "/auth/findUserId").permitAll()
+                        //.requestMatchers(HttpMethod.OPTIONS, "/**").permitAll()
                         .anyRequest().authenticated());
 
         http
                 .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
 
         return http.build();
     }
+    
+//    @Bean
+//    public CorsConfigurationSource corsConfigurationSource() {
+//        CorsConfiguration configuration = new CorsConfiguration();
+//        
+//        // 1. 프론트엔드 포트 확인! (5173인지 3000인지 본인 환경에 맞춰주세요)
+//        // 둘 다 넣어두면 안전합니다.
+//        configuration.setAllowedOrigins(List.of("http://localhost:5173"));
+//        
+//        configuration.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"));
+//        configuration.setAllowedHeaders(List.of("*"));
+//        configuration.setAllowCredentials(true);
+//
+//        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+//        source.registerCorsConfiguration("/**", configuration);
+//        return source;
+//    }
 
 }

src/main/java/com/webservice/algorithmchef/config/WebConfig.java

@@ -0,0 +1,18 @@
+package com.webservice.algorithmchef.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class WebConfig implements WebMvcConfigurer {
+
+	@Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**")
+                .allowedOrigins("http://localhost:5173")
+                .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH");
+                //.allowCredentials(true);
+    }
+	
+}

src/main/java/com/webservice/algorithmchef/controller/AuthController.java

@@ -53,7 +53,6 @@ public ResponseEntity<?> signUp(@RequestBody UserSignUpRequest userSignUpRequest
 		}
 	}
 
-	@Transactional
 	@PatchMapping("/findPassword")
 	public ResponseEntity<?> findPassword(@RequestBody FindPasswordRequest fPasswordRequest){
 		try {

src/main/java/com/webservice/algorithmchef/controller/GeminiRecipeController.java

@@ -43,6 +43,7 @@ public ResponseEntity<List<GeminiRecipeResponse>> recommendCondition(@RequestBod
     @PostMapping("/expir")
     public ResponseEntity<List<GeminiRecipeResponse>> recommendExpir(@RequestBody ExpirRequest request) {
         log.info("재료 추천 요청 - userId: {}", request.userId());
+        log.info("요청한 재료",request);
         return ResponseEntity.ok(
                 recipeService.recommendExpir(request.userId(), request.ingredients(), request.excludedTitles())
         );

src/main/java/com/webservice/algorithmchef/controller/RecipeSearchController.java

@@ -10,7 +10,7 @@
 
 @RestController
 @RequestMapping("/api/recipes")
-@CrossOrigin(origins = "http://localhost:3000")
+//@CrossOrigin(origins = "http://localhost:3000")
 public class RecipeSearchController {
 
     private final RecipeService recipeService;
@@ -20,7 +20,7 @@ public RecipeSearchController(RecipeService recipeService) {
     }
 
     @GetMapping("/search")
-    public ResponseEntity<?> getRandomRecipe(@RequestParam String ingredient) {
+    public ResponseEntity<?> getRandomRecipe(@RequestParam("ingredient") String ingredient) {
 
         Recipe recipe = recipeService.getRandomRecipeByIngredient(ingredient);
 
@@ -32,7 +32,7 @@ public ResponseEntity<?> getRandomRecipe(@RequestParam String ingredient) {
     }
 
     @GetMapping("/search-multi")
-    public ResponseEntity<?> getRandomRecipeMultiple(@RequestParam String ingredients) {
+    public ResponseEntity<?> getRandomRecipeMultiple(@RequestParam("ingredients") String ingredients) {
 
         List<String> ingList =
                 Arrays.stream(ingredients.split(","))

src/main/java/com/webservice/algorithmchef/controller/SttController.java

@@ -16,7 +16,7 @@
 @Slf4j
 @RestController
 @RequestMapping("/api")
-@CrossOrigin(origins = "http://localhost:3000")
+//@CrossOrigin(origins = "http://localhost:3000")
 @RequiredArgsConstructor
 public class SttController {
 

src/main/java/com/webservice/algorithmchef/controller/UserFridgeController.java

@@ -17,7 +17,6 @@
 import com.webservice.algorithmchef.dto.fridgeingredient.ChangeFridgeIngredientRequest;
 import com.webservice.algorithmchef.dto.fridgeingredient.ChangeFridgeIngredientResponse;
 import com.webservice.algorithmchef.dto.userfridge.FridgeBatchUpdateRequest;
-import com.webservice.algorithmchef.dto.userfridge.PageUserFridgeResponse;
 import com.webservice.algorithmchef.dto.userfridge.UserFridgeRequest;
 import com.webservice.algorithmchef.dto.userfridge.UserFridgeResponse;
 import com.webservice.algorithmchef.service.UserFridgeService;
@@ -44,28 +43,22 @@ public ResponseEntity<?> registerIngredients(@RequestBody UserFridgeRequest frid
 	}
 
 	@GetMapping("/ingredients")
-	public ResponseEntity<?> retrieve(
-			@RequestParam(value="category",required = false)String category,
-			@RequestParam(value="name",required = false)String name,
-			@RequestParam(value="page", defaultValue = "0")int page,
-			@RequestParam(value="size", defaultValue = "10")int size,
-			@AuthenticationPrincipal UserDetails userDetails){
-		try {
-			String userId = userDetails.getUsername();
-			PageUserFridgeResponse response = null;
-			if(category != null) {
-				response = userFridgeService.filteredByCategory(userId, category, size, page);
-			}else if(name != null) {
-				response = userFridgeService.filteredByName(userId, name, size, page);
-			}else {
-				response = userFridgeService.retrieveAll(userId, size, page);				
-			}
-			return ResponseEntity.ok(response);
-		}catch(IllegalArgumentException e) {
-			return ResponseEntity.badRequest().body(e.getMessage());
-		}
-		
-	}
+    public ResponseEntity<?> retrieve(
+            @RequestParam(value = "category", required = false) String category,
+            @AuthenticationPrincipal UserDetails userDetails) {
+        try {
+            String userId = userDetails.getUsername();
+            UserFridgeResponse response;
+            if (category != null) {
+                response = userFridgeService.filteredByCategory(userId, category);
+            } else {
+                response = userFridgeService.retrieveAll(userId);                
+            }
+            return ResponseEntity.ok(response);
+        } catch (IllegalArgumentException e) {
+            return ResponseEntity.badRequest().body(e.getMessage());
+        }
+    }
 
 	@PatchMapping("/ingredient/update")
 	public ResponseEntity<?> updatePurchasedDate(@RequestBody ChangeFridgeIngredientRequest request,

src/main/java/com/webservice/algorithmchef/dto/fridgeingredient/ChangeFridgeIngredientRequest.java

@@ -11,4 +11,5 @@ public class ChangeFridgeIngredientRequest {
 
 	private Long ingredientId;
 	private LocalDateTime purchasedDate;
+	private LocalDateTime expiredDate;
 }