[Merge] develop에 merge

linkmind/.gitignore

@@ -41,3 +41,6 @@ application-local.yml
 /src/test/resources/application-local.yml
 /src/main/resources/application-dev.yml
 /src/main/resources/application-local.yml
+/src/main/resources/toaster-firebase-admin-sdk.json
+/src/main/resources/toaster-firebase-admindk.json
+/src/main/resources/toaster-firebase-admin-sdk.json

linkmind/build.gradle

@@ -8,6 +8,7 @@ plugins {
 	id 'java'
 	id 'org.springframework.boot' version '3.2.0'
 	id 'io.spring.dependency-management' version '1.1.4'
+	id "io.sentry.jvm.gradle" version "4.1.1"
 }
 
 group = 'com.app'
@@ -44,8 +45,8 @@ dependencies {
 	implementation group: 'io.jsonwebtoken', name: 'jjwt-jackson', version: '0.11.2'
 
 
-	//FCM
-	implementation group: 'com.google.firebase', name: 'firebase-admin', version: '6.8.1'
+	// FCM
+	implementation 'com.google.firebase:firebase-admin:9.1.1'
 	implementation 'com.squareup.okhttp3:okhttp:4.10.0'  // Firebase 서버로 푸시 메시지 전송 시 필요
 
 	implementation 'org.springframework.boot:spring-boot-starter-actuator'
@@ -55,8 +56,34 @@ dependencies {
 	annotationProcessor "com.querydsl:querydsl-apt:${queryDslVersion}:jakarta"
 	annotationProcessor "jakarta.annotation:jakarta.annotation-api"
 	annotationProcessor "jakarta.persistence:jakarta.persistence-api"
+
+	// S3 AWS
+	implementation("software.amazon.awssdk:bom:2.21.0")
+	implementation("software.amazon.awssdk:s3:2.21.0")
+	implementation 'org.apache.httpcomponents:httpclient:4.5.9'
+
+	// JSoup
+	implementation 'org.jsoup:jsoup:1.15.3'
+
+	// slack
+	implementation 'com.slack.api:slack-api-client:1.28.0'
+	implementation 'com.google.code.gson:gson:2.10.1'
+	implementation 'com.slack.api:slack-app-backend:1.28.0'
+	implementation 'com.slack.api:slack-api-model:1.28.0'
+
 }
 
 tasks.named('test') {
 	useJUnitPlatform()
 }
+
+sentry {
+	// Generates a JVM (Java, Kotlin, etc.) source bundle and uploads your source code to Sentry.
+	// This enables source context, allowing you to see your source
+	// code as part of your stack traces in Sentry.
+	includeSourceContext = true
+
+	org = "linkmind"
+	projectName = "java-spring-boot"
+	authToken = System.getenv("SENTRY_TOKEN")
+}

linkmind/src/main/java/com/app/toaster/common/advice/ControllerExceptionAdvice.java

@@ -1,5 +1,10 @@
 package com.app.toaster.common.advice;
 
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
@@ -13,21 +18,28 @@
 import com.app.toaster.common.dto.ApiResponse;
 import com.app.toaster.exception.Error;
 import com.app.toaster.exception.model.CustomException;
+import com.app.toaster.external.client.slack.SlackApi;
 
+import io.sentry.Sentry;
+import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.ConstraintDefinitionException;
 import lombok.NoArgsConstructor;
+import lombok.RequiredArgsConstructor;
 
 @RestControllerAdvice
 @Component
-@NoArgsConstructor
+@RequiredArgsConstructor
 public class ControllerExceptionAdvice {
+	private final SlackApi slackApi;
+
 	/**
 	 * custom error
 	 */
 	@ExceptionHandler(CustomException.class)
 	protected ResponseEntity<ApiResponse> handleCustomException(CustomException e) {
+		Sentry.captureException(e);
 		return ResponseEntity.status(e.getHttpStatus())
-			.body(ApiResponse.error(e.getError(), e.getMessage()));
+				.body(ApiResponse.error(e.getError(), e.getMessage()));
 	}
 
 	// @ExceptionHandler(IllegalArgumentException.class)
@@ -38,7 +50,33 @@ protected ResponseEntity<ApiResponse> handleCustomException(CustomException e) {
 	@ExceptionHandler(MethodArgumentNotValidException.class)
 	protected ResponseEntity<ApiResponse> handleConstraintDefinitionException(final MethodArgumentNotValidException e) {
 		FieldError fieldError = e.getBindingResult().getFieldError();
+		Sentry.captureException(e);
 		return ResponseEntity.status(e.getStatusCode())
-			.body(ApiResponse.error(Error.BAD_REQUEST_VALIDATION, fieldError.getDefaultMessage()));
+				.body(ApiResponse.error(Error.BAD_REQUEST_VALIDATION, fieldError.getDefaultMessage()));
+	}
+
+	@ExceptionHandler(MalformedURLException.class)
+	protected ApiResponse handleConstraintDefinitionException(final MalformedURLException e) {
+		Sentry.captureException(e);
+		return ApiResponse.error(Error.MALFORMED_URL_EXEPTION, Error.MALFORMED_URL_EXEPTION.getMessage());
+	}
+
+	@ResponseStatus(HttpStatus.BAD_REQUEST)
+	@ExceptionHandler(DateTimeParseException.class)
+	protected ApiResponse handleDateTimeParseException(final DateTimeParseException e) {
+		return ApiResponse.error(Error.BAD_REQUEST_REMIND_TIME, Error.BAD_REQUEST_REMIND_TIME.getMessage());
 	}
+
+   /**
+	 * 500 Internal Server Error
+	 */
+	@ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+	@ExceptionHandler(Exception.class)
+	protected ApiResponse<Object> handleException(final Exception error, final HttpServletRequest request) throws
+		IOException {
+		slackApi.sendAlert(error, request);
+		Sentry.captureException(error);
+		return ApiResponse.error(Error.INTERNAL_SERVER_ERROR);
+	}
+
 }

linkmind/src/main/java/com/app/toaster/config/fcm/FCMConfig.java

@@ -0,0 +1,40 @@
+package com.app.toaster.config.fcm;
+
+import com.google.auth.oauth2.GoogleCredentials;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.FirebaseOptions;
+import com.google.firebase.messaging.*;
+import jakarta.annotation.PostConstruct;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.ClassPathResource;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+@Slf4j
+@Configuration
+public class FCMConfig {
+
+    @Value("${fcm.key.path}")
+    private String SERViCE_ACCOUNT_JSON;
+
+    @PostConstruct
+    public void init() {
+        try {
+            ClassPathResource resource = new ClassPathResource(SERViCE_ACCOUNT_JSON);
+            InputStream serviceAccount = resource.getInputStream();
+
+            FirebaseOptions options = FirebaseOptions.builder()
+                    .setCredentials(GoogleCredentials.fromStream(serviceAccount))
+                    .build();
+
+            FirebaseApp.initializeApp(options);
+            log.info("파이어베이스 서버와의 연결에 성공했습니다.");
+        } catch (IOException e) {
+            log.error("파이어베이스 서버와의 연결에 실패했습니다.");
+        }
+    }
+
+}

linkmind/src/main/java/com/app/toaster/controller/AuthController.java

@@ -1,5 +1,7 @@
 package com.app.toaster.controller;
 
+import java.io.IOException;
+
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -31,7 +33,7 @@ public class AuthController {
 	public ApiResponse<SignInResponseDto> signIn(
 		@RequestHeader("Authorization") String socialAccessToken,
 		@RequestBody SignInRequestDto requestDto
-	) {
+	) throws IOException {
 		return ApiResponse.success(Success.LOGIN_SUCCESS, authService.signIn(socialAccessToken, requestDto));
 	}
 
@@ -44,7 +46,6 @@ public ApiResponse<TokenResponseDto> reissueToken(@RequestHeader String refreshT
 	@PostMapping("/sign-out")
 	@ResponseStatus(HttpStatus.OK)
 	public ApiResponse signOut(@UserId Long userId) {
-		System.out.println(userId);
 		authService.signOut(userId);
 		return ApiResponse.success(Success.SIGNOUT_SUCCESS);
 	}

linkmind/src/main/java/com/app/toaster/controller/CategoryController.java

@@ -1,29 +1,82 @@
 package com.app.toaster.controller;
 
-import java.util.List;
-
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.app.toaster.common.dto.ApiResponse;
-import com.app.toaster.domain.Category;
-import com.app.toaster.infrastructure.CategoryRepository;
+import com.app.toaster.config.UserId;
+import com.app.toaster.controller.request.category.*;
+import com.app.toaster.controller.response.toast.ToastFilter;
+import com.app.toaster.controller.response.category.CategoriesReponse;
+import com.app.toaster.controller.response.category.GetCategoryResponseDto;
+import com.app.toaster.exception.Success;
+import com.app.toaster.service.category.CategoryService;
 import com.app.toaster.service.search.SearchService;
-
+import jakarta.validation.Valid;
+import jakarta.websocket.server.PathParam;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 @RestController
-@RequiredArgsConstructor
 @RequestMapping("/category")
+@RequiredArgsConstructor
+@Validated
 public class CategoryController {
-	private final SearchService searchService;
 
-	@GetMapping("/search")
-	public ApiResponse searchProducts(@RequestHeader Long userId ,@RequestParam("query") String query){
-		return searchService.searchCategoryTitle(userId,query);
-	}
+    private final CategoryService categoryService;
+    private final SearchService searchService;
+
+    @PostMapping
+    @ResponseStatus(HttpStatus.CREATED)
+    public ApiResponse createCateory(
+            @UserId Long userId,
+            @Valid @RequestBody CreateCategoryDto createCategoryDto
+    ){
+        categoryService.createCategory(userId, createCategoryDto);
+        return ApiResponse.success(Success.CREATE_CATEGORY_SUCCESS);
+    }
+
+    @DeleteMapping
+    @ResponseStatus(HttpStatus.OK)
+    public ApiResponse deleteCategory(
+            @UserId Long userId,
+            @RequestBody DeleteCategoryDto deleteCategoryDto
+    ){
+        categoryService.deleteCategory(userId, deleteCategoryDto);
+        return ApiResponse.success(Success.DELETE_CATEGORY_SUCCESS);
+    }
+
+    @GetMapping("/all")
+    @ResponseStatus(HttpStatus.OK)
+    public ApiResponse<List<CategoriesReponse>> getCategories(@UserId Long userId){
+        return ApiResponse.success(Success.GET_CATEORIES_SUCCESS, categoryService.getCategories(userId));
+    }
+
+    @PatchMapping("/edit")
+    @ResponseStatus(HttpStatus.OK)
+    public ApiResponse editCategories(
+            @UserId Long userId,
+            @RequestBody EditCategoryRequestDto editCategoryRequestDto
+    ){
+        categoryService.editCategories(userId, editCategoryRequestDto);
+        return ApiResponse.success(Success.UPDATE_CATEGORY_TITLE_SUCCESS);
+    }
+
+    @GetMapping("/{categoryId}")
+    @ResponseStatus(HttpStatus.OK)
+    public ApiResponse<GetCategoryResponseDto> getCategory(
+            @UserId Long userId,
+            @PathVariable Long categoryId,
+            @RequestParam("filter") ToastFilter filter
+    ){
+        return ApiResponse.success(Success.GET_CATEORY_SUCCESS,categoryService.getCategory(userId, categoryId, filter));
+    }
+
+
+    @GetMapping("/search")
+    public ApiResponse searchProducts(@UserId Long userId ,@RequestParam("query") String query){
+      return searchService.searchMain(userId,query);
+    }
+
 }

linkmind/src/main/java/com/app/toaster/controller/FCMController.java

@@ -0,0 +1,29 @@
+package com.app.toaster.controller;
+
+import com.app.toaster.controller.request.fcm.FCMPushRequestDto;
+import com.app.toaster.service.fcm.FCMService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+
+@RestController
+@RequestMapping("/alarm")
+@RequiredArgsConstructor
+public class FCMController {
+
+    private final FCMService fcmService;
+
+    /**
+     * 헤더와 바디를 직접 만들어 알림을 전송하는 테스트용 API (상대 답변 알람 전송에 사용)
+     */
+    @PostMapping
+    @ResponseStatus(HttpStatus.OK)
+    public ResponseEntity<String> sendNotificationByToken(@RequestBody FCMPushRequestDto request) throws IOException {
+
+        fcmService.pushAlarm(request);
+        return ResponseEntity.ok().body("푸시알림 전송에 성공했습니다!");
+    }
+}

linkmind/src/main/java/com/app/toaster/controller/MainController.java

@@ -1,13 +1,17 @@
 package com.app.toaster.controller;
 
+import com.app.toaster.config.UserId;
+import com.app.toaster.controller.response.main.MainPageResponseDto;
+import com.app.toaster.controller.response.timer.GetTimerResponseDto;
+import com.app.toaster.exception.Success;
+import com.app.toaster.service.main.MainService;
+import org.springframework.http.HttpStatus;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import com.app.toaster.common.dto.ApiResponse;
+import com.app.toaster.config.UserId;
+import com.app.toaster.service.UserService;
 import com.app.toaster.service.search.SearchService;
 import com.app.toaster.service.toast.ToastService;
 
@@ -18,9 +22,20 @@
 @RequestMapping("/main")
 public class MainController {
 	private final SearchService searchService;
+	private final MainService mainService;
+
+	private final UserService userService;
 
 	@GetMapping("/search")
-	public ApiResponse searchProducts(@RequestHeader Long userId ,@RequestParam("query") String query){
+	public ApiResponse searchProducts(@UserId Long userId ,@RequestParam("query") String query){
 		return searchService.searchMain(userId,query);
 	}
+
+	@GetMapping
+	@ResponseStatus(HttpStatus.OK)
+	public ApiResponse<MainPageResponseDto> getTimer(
+			@UserId Long userId) {
+
+		return ApiResponse.success(Success.GET_TIMER_SUCCESS,mainService.getMainPage(userId) );
+	}
 }