Merge main to social

.gitignore

@@ -36,4 +36,5 @@ out/
 ### VS Code ###
 .vscode/
 application.properties
-application-*.yml
+application*.yml
+application.yml

build.gradle

@@ -49,6 +49,9 @@ dependencies {
     // AWS S3
     implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
 
+    implementation group: 'ch.simas.qlrm', name: 'qlrm', version: '1.7.1'
+
+    implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
 }
 
 tasks.named('test') {

src/main/java/com/example/blendish/controller/CommentController.java

@@ -0,0 +1,40 @@
+package com.example.blendish.controller;
+
+import com.example.blendish.domain.comments.dto.CommentAllDTO;
+import com.example.blendish.domain.comments.dto.CommentDTO;
+import com.example.blendish.domain.comments.service.CommentService;
+import com.example.blendish.global.dto.ApiResponseTemplate;
+import com.example.blendish.global.response.SuccessCode;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.AllArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Tag(name = "Comment Controller", description = "댓글 API")
+@RestController
+@RequestMapping("/api/Comment")
+@AllArgsConstructor
+public class CommentController {
+    private final CommentService commentService;
+
+    //부모댓글 전체 띄우기
+    @GetMapping("/ParentsComment")
+    public ResponseEntity<ApiResponseTemplate<List<CommentDTO>>> getParentsComment(@RequestParam(name = "recipeId") Long recipeId) {
+
+        List<CommentDTO> commentDTOList = commentService.getParentCommnet(recipeId);
+        return ResponseEntity.ok(ApiResponseTemplate.success(SuccessCode.OK, commentDTOList));
+    }
+
+    // 전체 댓글 띄우기
+    @GetMapping("/AllComment")
+    public ResponseEntity<ApiResponseTemplate<List<CommentAllDTO>>> getAllComment(@RequestParam(name = "recipeId") Long recipeId) {
+
+        List<CommentAllDTO> commentAllDTOList = commentService.getAllComment(recipeId);
+        return ResponseEntity.ok(ApiResponseTemplate.success(SuccessCode.OK, commentAllDTOList));
+    }
+}

src/main/java/com/example/blendish/controller/CommunityController.java

@@ -0,0 +1,89 @@
+package com.example.blendish.controller;
+
+import com.example.blendish.domain.recipe.dto.CommunityDetailDTO;
+import com.example.blendish.domain.recipe.dto.CommunityHotRecipeDTO;
+import com.example.blendish.domain.recipe.dto.CommunityTodayRecipeDTO;
+import com.example.blendish.domain.recipe.dto.RecipeDetailDTO;
+import com.example.blendish.domain.recipe.service.CommunityService;
+import com.example.blendish.global.dto.ApiResponseTemplate;
+import com.example.blendish.global.response.SuccessCode;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.AllArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Tag(name = "Community Controller", description = "커뮤니티 관련 API")
+@RestController
+@RequestMapping("/api/community")
+@AllArgsConstructor
+public class CommunityController {
+
+    private final CommunityService communityService;
+
+    //hot 레시피
+    @GetMapping("/HotRecipe")
+    public ResponseEntity<ApiResponseTemplate<List<CommunityHotRecipeDTO>>> getHot() {
+
+        List<CommunityHotRecipeDTO> hotRecipyDTOS = communityService.getTopLikedRecipes();
+
+        return ResponseEntity.ok(ApiResponseTemplate.success(SuccessCode.OK, hotRecipyDTOS));
+    }
+    //오늘의 레시피
+    @GetMapping("/TodayRecipe")
+    public ResponseEntity<ApiResponseTemplate<List<CommunityTodayRecipeDTO>>> getToday() {
+
+        List<CommunityTodayRecipeDTO> todayRecipe = communityService.getTodayRecipe();
+
+        return ResponseEntity.ok(ApiResponseTemplate.success(SuccessCode.OK, todayRecipe));
+    }
+    //레시피 디테일
+    @GetMapping("/DetailRecipe")
+    public ResponseEntity<ApiResponseTemplate<CommunityDetailDTO>> getDetail(@RequestParam(name = "recipeId") Long recipeId) {
+
+        CommunityDetailDTO detailDTOS = communityService.getDetail(recipeId);
+
+        return ResponseEntity.ok(ApiResponseTemplate.success(SuccessCode.OK, detailDTOS));
+    }
+
+    // 좋아요 클릭시
+//    @PostMapping("/updateLike")
+//    public ResponseEntity<ApiResponseTemplate<?>> updateLike(@RequestBody Long recipeId) {
+//
+//        communityService.insertLike(recipeId);
+//
+//        return ResponseEntity.ok(ApiResponseTemplate.success(SuccessCode.OK, null ));
+//    }
+//
+//    // 좋아요 삭제시
+//    @PostMapping("/deleteLike")
+//    public ResponseEntity<ApiResponseTemplate<?>> deleteLike(@RequestBody Long recipeId) {
+//
+//        communityService.removeLike(recipeId);
+//
+//        return ResponseEntity.ok(ApiResponseTemplate.success(SuccessCode.OK, null ));
+//    }
+//
+//    // 스크랩 클릭시
+//    @PostMapping("/updateScrap")
+//    public ResponseEntity<ApiResponseTemplate<?>> updatScrap(@RequestBody Long recipeId) {
+//
+//        communityService.insertScrap(recipeId);
+//
+//        return ResponseEntity.ok(ApiResponseTemplate.success(SuccessCode.OK, null ));
+//    }
+
+    //레시피 전체 디테일
+    @GetMapping("/AllDetailRecipe")
+    public ResponseEntity<ApiResponseTemplate<RecipeDetailDTO>> getAllDetail(@RequestParam(name = "recipeId") Long recipeId) {
+
+        RecipeDetailDTO recipeDetailDTO = communityService.getAllDetail(recipeId);
+
+        return ResponseEntity.ok(ApiResponseTemplate.success(SuccessCode.OK, recipeDetailDTO));
+    }
+
+
+
+
+}

src/main/java/com/example/blendish/controller/GPTController.java

@@ -0,0 +1,49 @@
+package com.example.blendish.controller;
+
+import com.example.blendish.domain.gpt.dto.CustomRecipeReqDTO;
+import com.example.blendish.domain.gpt.service.GPTRecipeService;
+import com.example.blendish.domain.gpt.service.OpenAIService;
+import com.example.blendish.domain.recipe.dto.AddRecipeDTO;
+import com.example.blendish.domain.recipe.service.RecipeService;
+import com.example.blendish.global.dto.ApiResponseTemplate;
+import com.example.blendish.global.response.SuccessCode;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.web.bind.annotation.*;
+
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/gpt")
+public class GPTController implements GPTSwagger{
+
+    private final OpenAIService openAIService;
+    private final GPTRecipeService gptRecipeService;
+    private final RecipeService recipeService;
+
+    @GetMapping("/chat")
+    public ResponseEntity<ApiResponseTemplate> chatWithGpt(@RequestParam String message) {
+        return ResponseEntity.ok(ApiResponseTemplate.success(SuccessCode.OK, openAIService.getGptResponse(message)));
+
+    }
+
+    @PostMapping("/recipe")
+    public ResponseEntity<ApiResponseTemplate<String>> generateCustomRecipe(
+            @RequestBody CustomRecipeReqDTO request,
+            @AuthenticationPrincipal UserDetails userDetails) {
+
+        String result = gptRecipeService.getAiGeneratedRecipe(request, userDetails);
+
+        return ResponseEntity.ok(ApiResponseTemplate.success(SuccessCode.CREATED, result));
+    }
+
+    @PostMapping("/recipe/save")
+    public ResponseEntity<ApiResponseTemplate<String>> saveRecipe(AddRecipeDTO addRecipeDTO, UserDetails userDetails) {
+        recipeService.createAiRecipe(addRecipeDTO, userDetails.getUsername());
+
+        return ResponseEntity.ok(ApiResponseTemplate.success(SuccessCode.CREATED, "레시피가 등록되었습니다."));
+    }
+
+}

src/main/java/com/example/blendish/controller/GPTSwagger.java

@@ -0,0 +1,30 @@
+package com.example.blendish.controller;
+
+import com.example.blendish.domain.gpt.dto.CustomRecipeReqDTO;
+import com.example.blendish.domain.recipe.dto.AddRecipeDTO;
+import com.example.blendish.global.dto.ApiResponseTemplate;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@Tag(name = "GPT API", description = "GPT 관련 API")
+public interface GPTSwagger {
+
+    @Operation(summary = "GPT 채팅", description = "GPT에게 메시지를 보내고 응답을 받습니다.")
+    ResponseEntity<ApiResponseTemplate> chatWithGpt(@RequestParam String message);
+
+    @Operation(summary = "사용자 맞춤 GPT 레시피 생성", description = "사용자 입력을 기반으로 GPT가 맞춤형 레시피를 생성합니다.")
+    ResponseEntity<ApiResponseTemplate<String>> generateCustomRecipe(
+            @RequestBody CustomRecipeReqDTO request,
+            UserDetails userDetails
+    );
+
+    @Operation(summary = "AI 레시피 저장", description = "AI가 생성한 레시피를 데이터베이스에 저장합니다.")
+    ResponseEntity<ApiResponseTemplate<String>> saveRecipe(
+            @RequestBody AddRecipeDTO addRecipeDTO,
+            UserDetails userDetails
+    );
+}

src/main/java/com/example/blendish/controller/RecipeController.java

@@ -1,27 +1,32 @@
 package com.example.blendish.controller;
 
 import com.example.blendish.domain.recipe.dto.AddRecipeDTO;
-import com.example.blendish.domain.recipe.entity.Recipe;
 import com.example.blendish.domain.recipe.service.RecipeService;
 import com.example.blendish.global.dto.ApiResponseTemplate;
 import com.example.blendish.global.response.SuccessCode;
+import com.example.blendish.global.s3.S3UploadService;
+import java.io.IOException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/recipe")
 public class RecipeController implements RecipeSwagger{
 
     private final RecipeService recipeService;
+    private final S3UploadService s3UploadService;
 
-    @PostMapping
+    @PostMapping(consumes = {"multipart/form-data"})
     public ResponseEntity<ApiResponseTemplate<String>> addRecipe(@RequestBody AddRecipeDTO addRecipeDTO,
-                                                                 @AuthenticationPrincipal UserDetails userDetails) {
-        recipeService.createRecipe(addRecipeDTO, userDetails.getUsername());
+                                                                 @RequestPart(value = "image", required = false) MultipartFile image,
+                                                                 @AuthenticationPrincipal UserDetails userDetails) throws IOException {
+        String imageUrl = (image != null && !image.isEmpty()) ? s3UploadService.saveFile(image) : null;
+        recipeService.createUserRecipe(addRecipeDTO, userDetails.getUsername(), imageUrl);
         return ResponseEntity.ok(ApiResponseTemplate.success(SuccessCode.OK, "레시피가 등록되었습니다."));
     }
 }

src/main/java/com/example/blendish/controller/RecipeSwagger.java

@@ -2,17 +2,19 @@
 
 import com.example.blendish.domain.recipe.dto.AddRecipeDTO;
 import com.example.blendish.global.dto.ApiResponseTemplate;
-import com.example.blendish.global.response.SuccessCode;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import java.io.IOException;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
 
 public interface RecipeSwagger {
 
@@ -29,5 +31,6 @@ public interface RecipeSwagger {
     )
     @PostMapping("/api/recipe")
     ResponseEntity<ApiResponseTemplate<String>> addRecipe(@RequestBody AddRecipeDTO addRecipeDTO,
-                                                          @AuthenticationPrincipal UserDetails userDetails);
+                                                          @RequestPart(value = "image", required = false) MultipartFile image,
+                                                          @AuthenticationPrincipal UserDetails userDetails) throws IOException;
 }

src/main/java/com/example/blendish/controller/UserController.java

@@ -1,17 +1,22 @@
 package com.example.blendish.controller;
 
 import com.example.blendish.domain.user.dto.UserDTO;
+import com.example.blendish.domain.user.dto.check.CheckUserPwDTO;
 import com.example.blendish.domain.user.service.UserService;
 import com.example.blendish.global.dto.ApiResponseTemplate;
 import com.example.blendish.global.response.SuccessCode;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
 import java.util.List;
+
 @Tag(name = "User Controller", description = "사용자 관리 관련 API")
 @Controller
 @RequestMapping("/api/user")
@@ -32,4 +37,46 @@ public ResponseEntity<ApiResponseTemplate<List<UserDTO>>> getAllUsers() {
         List<UserDTO> users = userService.getAllUsers();
         return ResponseEntity.ok(ApiResponseTemplate.success(SuccessCode.OK, users));
     }
+
+    @Operation(
+            summary = "사용자 정보 업데이트",
+            description = "전체 사용자 정보를 전달받아 유저 정보를 업데이트 한다."
+    )
+    @PutMapping(value = "/update", consumes = {"multipart/form-data"})
+    public ResponseEntity<ApiResponseTemplate<UserDTO>> updateUser(
+            @RequestPart("user") UserDTO userDTO,
+            @RequestPart(value = "profilePic", required = false) MultipartFile profilePic
+    ) throws IOException {
+        UserDTO updatedUser = userService.updateUser(userDTO, profilePic);
+        return ResponseEntity.ok(ApiResponseTemplate.success(SuccessCode.OK, updatedUser));
+    }
+
+    @Operation(
+            summary = "비밀번호 확인",
+            description = "입력받은 비밀번호가 저장된 비밀번호와 동일한지 확인한다."
+    )
+    @PostMapping("/check")
+    public ResponseEntity<ApiResponseTemplate<Boolean>> checkPassword(@RequestBody CheckUserPwDTO dto) {
+
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        String userId = authentication.getName();
+        System.out.println(userId);
+
+        boolean result = userService.checkPassword(userId, dto.getPassword());
+        return ResponseEntity.ok(ApiResponseTemplate.success(SuccessCode.OK, result));
+    }
+
+    @Operation(
+            summary = "현재 로그인된 사용자 조회",
+            description = "토큰에 포함된 사용자 ID를 기반으로 전체 사용자 데이터를 반환한다."
+    )
+    @GetMapping("/me")
+    public ResponseEntity<ApiResponseTemplate<UserDTO>> getUserById() {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        String userId = authentication.getName();
+        System.out.println(userId);
+        UserDTO userDTO = userService.getUserById(userId);
+        return ResponseEntity.ok(ApiResponseTemplate.success(SuccessCode.OK, userDTO));
+    }
+
 }

src/main/java/com/example/blendish/domain/comments/dto/CommentAllDTO.java

@@ -0,0 +1,20 @@
+package com.example.blendish.domain.comments.dto;
+
+import lombok.*;
+
+import java.util.Date;
+import java.util.List;
+
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class CommentAllDTO {
+    private Long commentId;
+    private String userId;
+    private String profilePic;
+    private String content;
+    private Date createdAt;
+    private List<CommentDTO> ReplyList;
+}