Merge pull request #129 from Link-MIND/test

[Merge] 회원탈퇴, 푸시알림 붙이기

linkmind/build.gradle

@@ -71,8 +71,12 @@ dependencies {
 
 	implementation 'io.sentry:sentry-spring-boot-starter:5.7.0'
 
+	//sqs
+	implementation platform("io.awspring.cloud:spring-cloud-aws-dependencies:3.0.1")
+	implementation 'io.awspring.cloud:spring-cloud-aws-starter-sqs'
 }
 
+
 tasks.named('test') {
 	useJUnitPlatform()
 }

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

@@ -52,8 +52,8 @@ public ApiResponse signOut(@UserId Long userId) {
 
 	@DeleteMapping("/withdraw")
 	@ResponseStatus(HttpStatus.OK)
-	public ApiResponse withdraw(@UserId Long userId) {
-		authService.withdraw(userId);
+	public ApiResponse withdraw(@UserId Long userId, @RequestHeader("Authorization") String socialAccessToken) {
+		authService.withdraw(userId,socialAccessToken);
 		return ApiResponse.success(Success.DELETE_USER_SUCCESS);
 	}
 }

linkmind/src/main/java/com/app/toaster/controller/response/timer/GetTimerResponseDto.java

@@ -12,6 +12,8 @@ public record GetTimerResponseDto (String categoryName,
                                        String remindTime,
                                        ArrayList<Integer> remindDates) {
     public static GetTimerResponseDto of(Reminder reminder){
+        if(reminder.getCategory() == null)
+            return new GetTimerResponseDto("전체", reminder.getRemindTime().toString(), reminder.getRemindDates());
         return new GetTimerResponseDto(reminder.getCategory().getTitle(), reminder.getRemindTime().toString(), reminder.getRemindDates());
     }
 }

linkmind/src/main/java/com/app/toaster/domain/User.java

@@ -74,4 +74,5 @@ public String getFcmToken() {
 	public void updateProfile(String profile){
 		this.profile = profile;
 	}
+
 }

linkmind/src/main/java/com/app/toaster/exception/Error.java

@@ -56,6 +56,7 @@ public enum Error {
 	UNPROCESSABLE_CREATE_TIMER_EXCEPTION(HttpStatus.UNPROCESSABLE_ENTITY, "이미 타이머가 존재하는 클립입니다."),
 	UNPROCESSABLE_ENTITY_CREATE_CLIP_EXCEPTION(HttpStatus.UNPROCESSABLE_ENTITY, "클립은 최대 50개까지만 등록가능합니다."),
 	UNPROCESSABLE_PRESIGNEDURL_EXCEPTION(HttpStatus.UNPROCESSABLE_ENTITY, "presignedUrl 발급 중 에러가 발생했습니다."),
+	UNPROCESSABLE_KAKAO_SERVER_EXCEPTION(HttpStatus.UNPROCESSABLE_ENTITY, "카카오서버와 통신 중 오류가 발생했습니다."),
 
 
 	/**
@@ -65,7 +66,7 @@ public enum Error {
 	INVALID_ENCRYPT_COMMUNICATION(HttpStatus.INTERNAL_SERVER_ERROR, "ios 통신 증명 과정 중 문제가 발생했습니다."),
 	CREATE_PUBLIC_KEY_EXCEPTION(HttpStatus.INTERNAL_SERVER_ERROR, "publickey 생성 과정 중 문제가 발생했습니다."),
 	FAIL_TO_SEND_PUSH_ALARM(HttpStatus.INTERNAL_SERVER_ERROR, "다수기기 푸시메시지 전송 실패"),
-
+	FAIL_TO_SEND_SQS(HttpStatus.INTERNAL_SERVER_ERROR, "sqs 전송 실패"),
 
 	CREATE_TOAST_PROCCESS_EXCEPTION(HttpStatus.INTERNAL_SERVER_ERROR, "토스트 저장 중 문제가 발생했습니다. 카테고리 또는 s3 관련 문제로 예상됩니다.")
 	;

linkmind/src/main/java/com/app/toaster/exception/Success.java

@@ -47,6 +47,8 @@ public enum Success {
 	UPDATE_TIMER_DATETIME_SUCCESS(HttpStatus.OK, "타이머 시간/날짜 수정 완료"),
 	UPDATE_TIMER_COMMENT_SUCCESS(HttpStatus.OK, "타이머 코멘트 수정 완료"),
 	CHANGE_TIMER_ALARM_SUCCESS(HttpStatus.OK, "타이머 알람여부 수정 완료"),
+	PUSH_ALARM_PERIODIC_SUCCESS(HttpStatus.OK, "푸시알림 활성에 성공했습니다."),
+	PUSH_ALARM_SUCCESS(HttpStatus.OK, "푸시알림 전송에 성공했습니다."),
 
 
 	/**

linkmind/src/main/java/com/app/toaster/external/client/fcm/FCMConfig.java

@@ -0,0 +1,100 @@
+package com.app.toaster.external.client.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.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.ClassPathResource;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+
+@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("파이어베이스 서버와의 연결에 실패했습니다.");
+        }
+    }
+
+    // 여러 개의 파이어베이스 앱을 사용하는 경우
+    @Bean
+    FirebaseMessaging firebaseMessaging() throws IOException {
+
+        ClassPathResource resource = new ClassPathResource(SERVICE_ACCOUNT_JSON);
+        InputStream refreshToken = resource.getInputStream();
+
+        FirebaseApp firebaseApp = null;
+        List<FirebaseApp> firebaseAppList = FirebaseApp.getApps();
+
+        if (!firebaseAppList.isEmpty() && firebaseAppList != null) {
+            for (FirebaseApp app : firebaseAppList) {
+                if (app.getName().equals(FirebaseApp.DEFAULT_APP_NAME)) {
+                    firebaseApp = app;
+                }
+            }
+        } else {
+            FirebaseOptions options = FirebaseOptions.builder()
+                    .setCredentials(GoogleCredentials.fromStream(refreshToken))
+                    .build();
+
+            firebaseApp = FirebaseApp.initializeApp(options);
+        }
+
+        return FirebaseMessaging.getInstance(firebaseApp);
+
+
+    }
+
+    // TODO 플랫폼마다 별도의 설정이 필요한 경우 사용
+
+    // Android
+    public AndroidConfig TokenAndroidConfig(FCMPushRequestDto request) {
+        return AndroidConfig.builder()
+//                .setCollapseKey(request.getCollapseKey())
+                .setNotification(AndroidNotification.builder()
+                        .setTitle(request.getTitle())
+                        .setBody(request.getBody())
+                        .build())
+                .build();
+    }
+
+    // Apple
+    public ApnsConfig TokenApnsConfig(FCMPushRequestDto request) {
+        return ApnsConfig.builder()
+                .setAps(Aps.builder()
+                        .setAlert(
+                                ApsAlert.builder()
+                                        .setTitle(request.getTitle())
+                                        .setBody(request.getBody())
+//                                        .setLaunchImage(request.getImgUrl())
+                                        .build()
+                        )
+//                        .setCategory(request.getCollapseKey())
+                        .setSound("default")
+                        .build())
+                .build();
+    }
+}

linkmind/src/main/java/com/app/toaster/external/client/fcm/FCMController.java

@@ -0,0 +1,45 @@
+package com.app.toaster.external.client.fcm;
+
+import com.app.toaster.common.dto.ApiResponse;
+import com.app.toaster.external.client.sqs.SqsProducer;
+import com.app.toaster.external.client.fcm.FCMPushRequestDto;
+import com.app.toaster.exception.Success;
+import com.app.toaster.external.client.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;
+//    private final FCMScheduler fcmScheduler;
+    private final SqsProducer sqsProducer;
+
+    /**
+     * 헤더와 바디를 직접 만들어 알림을 전송하는 테스트용 API
+     */
+    @PostMapping
+    @ResponseStatus(HttpStatus.OK)
+    public ResponseEntity<String> sendNotificationByToken(
+            @RequestBody FCMPushRequestDto request) throws IOException {
+
+        fcmService.pushAlarm(request);
+        return ResponseEntity.ok().body("푸시알림 전송에 성공했습니다!");
+    }
+
+    /**
+     * 새로운 질문이 도착했음을 알리는 푸시 알림 활성화 API
+     */
+    @PostMapping("/qna")
+    @ResponseStatus(HttpStatus.OK)
+    public ApiResponse sendTopicScheduledTest(@RequestBody FCMPushRequestDto request) {
+        sqsProducer.sendMessage(request);
+        return ApiResponse.success(Success.PUSH_ALARM_PERIODIC_SUCCESS);
+    }
+}

linkmind/src/main/java/com/app/toaster/domain/FCMMessage.java → linkmind/src/main/java/com/app/toaster/external/client/fcm/FCMMessage.java

@@ -1,4 +1,4 @@
-package com.app.toaster.domain;
+package com.app.toaster.external.client.fcm;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;

linkmind/src/main/java/com/app/toaster/controller/request/fcm/FCMPushRequestDto.java → linkmind/src/main/java/com/app/toaster/external/client/fcm/FCMPushRequestDto.java

@@ -1,10 +1,14 @@
-package com.app.toaster.controller.request.fcm;
+package com.app.toaster.external.client.fcm;
 
+import com.app.toaster.domain.Reminder;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.*;
 import lombok.extern.slf4j.Slf4j;
 
-import java.awt.*;
+import java.time.LocalDateTime;
+import java.time.format.TextStyle;
+import java.util.Locale;
+import java.util.Random;
 
 @Slf4j
 @Getter
@@ -13,6 +17,7 @@
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class FCMPushRequestDto {
 
+
     private String targetToken;
 
     @JsonInclude(JsonInclude.Include.NON_NULL)
@@ -23,12 +28,14 @@ public class FCMPushRequestDto {
 
     private String image;
 
-    public static FCMPushRequestDto sendTestPush(String targetToken) {
+    public static FCMPushRequestDto sendTestPush(String targetToken, String comment) {
 
         return FCMPushRequestDto.builder()
                 .targetToken(targetToken)
-                .title("🍞" + PushMessage.TODAY_QNA.getTitle())
-                .body(PushMessage.TODAY_QNA.getBody())
+                .title("🍞 토스트 ")
+                .body(comment)
                 .build();
+
     }
+
 }