[REMOVE] 푸시 알림 기능 주석 제거

ChaeAg · ChaeAg · commit 1a0b1ac4ceef · 2024-09-30T16:00:39.000+09:00
diff --git a/src/main/java/org/routineade/RoutineAdeServer/config/firebase/FCMConfig.java b/src/main/java/org/routineade/RoutineAdeServer/config/firebase/FCMConfig.java
@@ -1,45 +1,45 @@
-//package org.routineade.RoutineAdeServer.config.firebase;
-//
-//import com.google.auth.oauth2.GoogleCredentials;
-//import com.google.firebase.FirebaseApp;
-//import com.google.firebase.FirebaseOptions;
-//import com.google.firebase.messaging.FirebaseMessaging;
-//import java.io.IOException;
-//import java.io.InputStream;
-//import java.util.List;
-//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;
-//
-//@Configuration
-//public class FCMConfig {
-//
-//    @Value("${firebase.url}")
-//    String FIRE_BASE_FILE_URL;
-//
-//    @Bean
-//    FirebaseMessaging firebaseMessaging() throws IOException {
-//        ClassPathResource resource = new ClassPathResource(FIRE_BASE_FILE_URL);
-//
-//        InputStream refreshToken = resource.getInputStream();
-//
-//        FirebaseApp firebaseApp = null;
-//        List<FirebaseApp> firebaseAppList = FirebaseApp.getApps();
-//
-//        if (firebaseAppList != null && !firebaseAppList.isEmpty()) {
-//            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);
-//    }
-//}
+package org.routineade.RoutineAdeServer.config.firebase;
+
+import com.google.auth.oauth2.GoogleCredentials;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.FirebaseOptions;
+import com.google.firebase.messaging.FirebaseMessaging;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+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;
+
+@Configuration
+public class FCMConfig {
+
+    @Value("${firebase.url}")
+    String FIRE_BASE_FILE_URL;
+
+    @Bean
+    FirebaseMessaging firebaseMessaging() throws IOException {
+        ClassPathResource resource = new ClassPathResource(FIRE_BASE_FILE_URL);
+
+        InputStream refreshToken = resource.getInputStream();
+
+        FirebaseApp firebaseApp = null;
+        List<FirebaseApp> firebaseAppList = FirebaseApp.getApps();
+
+        if (firebaseAppList != null && !firebaseAppList.isEmpty()) {
+            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);
+    }
+}
diff --git a/src/main/java/org/routineade/RoutineAdeServer/controller/UserController.java b/src/main/java/org/routineade/RoutineAdeServer/controller/UserController.java
@@ -68,7 +68,7 @@ public ResponseEntity<Map<String, String>> login(@RequestBody String userId) {
 
     @Operation(summary = "카카오 로그인", description = "카카오 로그인 API", hidden = true)
     @GetMapping("/login/kakao")
-    public ResponseEntity<String> kakaoLogin(@RequestParam("code") String code) throws URISyntaxException {
+    public ResponseEntity<Void> kakaoLogin(@RequestParam("code") String code) throws URISyntaxException {
         HttpHeaders httpHeaders = new HttpHeaders();
         String token = kakaoService.login(code);
         httpHeaders.setLocation(
@@ -77,7 +77,7 @@ public ResponseEntity<String> kakaoLogin(@RequestParam("code") String code) thro
         return ResponseEntity
                 .status(FOUND)
                 .headers(httpHeaders)
-                .body(token);
+                .build();
     }
 
     @Operation(summary = "유저 기본 정보 등록", description = "사용자가 첫 가입 시 기본 정보를 등록하는 API")
diff --git a/src/main/java/org/routineade/RoutineAdeServer/service/FCMNotificationService.java b/src/main/java/org/routineade/RoutineAdeServer/service/FCMNotificationService.java
@@ -1,42 +1,42 @@
-//package org.routineade.RoutineAdeServer.service;
-//
-//import com.google.firebase.messaging.FirebaseMessaging;
-//import com.google.firebase.messaging.FirebaseMessagingException;
-//import com.google.firebase.messaging.Message;
-//import com.google.firebase.messaging.Notification;
-//import lombok.RequiredArgsConstructor;
-//import org.routineade.RoutineAdeServer.domain.User;
-//import org.routineade.RoutineAdeServer.dto.firebase.FCMNotificationRequest;
-//import org.springframework.stereotype.Service;
-//
-//@RequiredArgsConstructor
-//@Service
-//public class FCMNotificationService {
-//
-//    private final FirebaseMessaging firebaseMessaging;
-//
-//    public void sendNotificationByToken(FCMNotificationRequest request) {
-//        User user = request.user();
-//
-//        if (user.getFirebaseToken() != null) {
-//            Notification notification = Notification.builder()
-//                    .setTitle(request.title())
-//                    .setBody(request.body())
-//                    .build();
-//
-//            Message message = Message.builder()
-//                    .setToken(user.getFirebaseToken())
-//                    .setNotification(notification)
-//                    .build();
-//
-//            try {
-//                firebaseMessaging.send(message);
-//            } catch (FirebaseMessagingException e) {
-//                throw new IllegalArgumentException("푸시 알림 보내기를 실패했습니다.");
-//            }
-//        } else {
-//            throw new IllegalArgumentException("서버에 저장된 해당 유저의 Firebase Token이 존재하지 않습니다.");
-//        }
-//    }
-//
-//}
+package org.routineade.RoutineAdeServer.service;
+
+import com.google.firebase.messaging.FirebaseMessaging;
+import com.google.firebase.messaging.FirebaseMessagingException;
+import com.google.firebase.messaging.Message;
+import com.google.firebase.messaging.Notification;
+import lombok.RequiredArgsConstructor;
+import org.routineade.RoutineAdeServer.domain.User;
+import org.routineade.RoutineAdeServer.dto.firebase.FCMNotificationRequest;
+import org.springframework.stereotype.Service;
+
+@RequiredArgsConstructor
+@Service
+public class FCMNotificationService {
+
+    private final FirebaseMessaging firebaseMessaging;
+
+    public void sendNotificationByToken(FCMNotificationRequest request) {
+        User user = request.user();
+
+        if (user.getFirebaseToken() != null) {
+            Notification notification = Notification.builder()
+                    .setTitle(request.title())
+                    .setBody(request.body())
+                    .build();
+
+            Message message = Message.builder()
+                    .setToken(user.getFirebaseToken())
+                    .setNotification(notification)
+                    .build();
+
+            try {
+                firebaseMessaging.send(message);
+            } catch (FirebaseMessagingException e) {
+                throw new IllegalArgumentException("푸시 알림 보내기를 실패했습니다.");
+            }
+        } else {
+            throw new IllegalArgumentException("서버에 저장된 해당 유저의 Firebase Token이 존재하지 않습니다.");
+        }
+    }
+
+}
diff --git a/src/main/java/org/routineade/RoutineAdeServer/service/UserService.java b/src/main/java/org/routineade/RoutineAdeServer/service/UserService.java
@@ -1,5 +1,6 @@
 package org.routineade.RoutineAdeServer.service;
 
+import java.time.LocalDate;
 import java.time.YearMonth;
 import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
@@ -15,16 +16,23 @@
 import org.routineade.RoutineAdeServer.domain.Routine;
 import org.routineade.RoutineAdeServer.domain.User;
 import org.routineade.RoutineAdeServer.domain.common.Category;
+import org.routineade.RoutineAdeServer.dto.firebase.FCMNotificationRequest;
 import org.routineade.RoutineAdeServer.dto.firebase.UserFirebeseTokenSaveRequest;
+import org.routineade.RoutineAdeServer.dto.routine.GroupRoutineInfo;
+import org.routineade.RoutineAdeServer.dto.routine.GroupRoutinesGetResponse;
+import org.routineade.RoutineAdeServer.dto.routine.PersonalRoutineInfo;
 import org.routineade.RoutineAdeServer.dto.routine.RoutineCategoryStatisticsInfo;
 import org.routineade.RoutineAdeServer.dto.routine.RoutinesByUserProfileGetResponse;
+import org.routineade.RoutineAdeServer.dto.routine.RoutinesGetResponse;
 import org.routineade.RoutineAdeServer.dto.user.UserInfosGetResponse;
 import org.routineade.RoutineAdeServer.dto.user.UserRoutineCalenderStatisticsGetResponse;
 import org.routineade.RoutineAdeServer.dto.user.UserRoutineCategoryStatisticsGetResponse;
 import org.routineade.RoutineAdeServer.dto.user.UserRoutineCompletionStatistics;
+import org.routineade.RoutineAdeServer.repository.GroupMemberRepository;
 import org.routineade.RoutineAdeServer.repository.GroupRepository;
 import org.routineade.RoutineAdeServer.repository.GroupRoutineRepository;
 import org.routineade.RoutineAdeServer.repository.UserRepository;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -40,6 +48,8 @@ public class UserService {
     private final S3Service s3Service;
     private final GroupRepository groupRepository;
     private final GroupRoutineRepository groupRoutineRepository;
+    private final FCMNotificationService fcmNotificationService;
+    private final GroupMemberRepository groupMemberRepository;
     private static final String BASIC_PROFILE_IMAGE = "https://routineade-ducket.s3.ap-northeast-2.amazonaws.com/BasicProfile.png";
 
     @Transactional(readOnly = true)
@@ -168,52 +178,44 @@ private String saveAndGetImage(MultipartFile image) {
         return s3Service.getFileURLFromS3(uploadName).toString();
     }
 
-//    @Scheduled(cron = "0 0 10 * * *")
-//    private void sendRoutineAlarm() {
-//        List<User> users = userRepository.findAll();
-//
-//        for (User user : users) {
-//            RoutinesGetResponse routines = routineService.getRoutines(user,
-//                    LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy.MM.dd")));
-//
-//            if (routines.personalRoutines().isEmpty() && routines.groupRoutines().isEmpty()) {
-//                continue;
-//            }
-//
-//            List<PersonalRoutineInfo> personalRoutineInfos = routines.personalRoutines().stream()
-//                    .flatMap(personalRoutine -> personalRoutine.routines().stream())
-//                    .toList();
-//
-//            for (PersonalRoutineInfo pRoutine : personalRoutineInfos) {
-//                String routineTitle = pRoutine.routineTitle();
-//
-//                // 내용 수정
-//                FCMNotificationRequest request = FCMNotificationRequest.of(user, "", "");
-//
-//                fcmNotificationService.sendNotificationByToken(request);
-//            }
-//
-//            for (GroupRoutinesGetResponse groupRoutine : routines.groupRoutines()) {
-//                Group group = groupRepository.findById(groupRoutine.groupId())
-//                        .orElseThrow(() -> new IllegalArgumentException("해당 ID의 그룹이 존재하지 않습니다."));
-//                if (groupMemberRepository.findByGroupAndUser(group, user)
-//                        .orElseThrow(() -> new IllegalArgumentException("해당 유저가 해당 그룹의 멤버가 아닙니다!"))
-//                        .getIsGroupAlarmEnabled()) {
-//                    List<GroupRoutineInfo> gRoutines = groupRoutine.groupRoutines().stream()
-//                            .flatMap(gr -> gr.routines().stream())
-//                            .toList();
-//
-//                    for (GroupRoutineInfo gRoutine : gRoutines) {
-//                        String routineTitle = gRoutine.routineTitle();
-//
-//                        // 내용 수정
-//                        FCMNotificationRequest request = FCMNotificationRequest.of(user, "", "");
-//
-//                        fcmNotificationService.sendNotificationByToken(request);
-//                    }
-//                }
-//            }
-//        }
-//    }
+    @Scheduled(cron = "0 0 10 * * *")
+    public void sendRoutineAlarm() {
+        List<User> users = userRepository.findAll();
+
+        for (User user : users) {
+            RoutinesGetResponse routines = routineService.getRoutines(user,
+                    LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy.MM.dd")));
+            if (routines.personalRoutines().isEmpty() && routines.groupRoutines().isEmpty()) {
+                continue;
+            }
+            List<PersonalRoutineInfo> personalRoutineInfos = routines.personalRoutines().stream()
+                    .flatMap(personalRoutine -> personalRoutine.routines().stream())
+                    .filter(PersonalRoutineInfo::isAlarmEnabled)
+                    .toList();
+
+            for (PersonalRoutineInfo pRoutine : personalRoutineInfos) {
+                fcmNotificationService.sendNotificationByToken(
+                        FCMNotificationRequest.of(user, "루틴에이드", pRoutine.routineTitle() + " 할 시간이에요!"));
+            }
+
+            for (GroupRoutinesGetResponse groupRoutine : routines.groupRoutines()) {
+                Group group = groupRepository.findById(groupRoutine.groupId())
+                        .orElseThrow(() -> new IllegalArgumentException("해당 ID의 그룹이 존재하지 않습니다."));
+
+                if (groupMemberRepository.findByGroupAndUser(group, user)
+                        .orElseThrow(() -> new IllegalArgumentException("해당 유저가 해당 그룹의 멤버가 아닙니다!"))
+                        .getIsGroupAlarmEnabled()) {
+                    List<GroupRoutineInfo> gRoutines = groupRoutine.groupRoutines().stream()
+                            .flatMap(gr -> gr.routines().stream())
+                            .toList();
+
+                    for (GroupRoutineInfo gRoutine : gRoutines) {
+                        fcmNotificationService.sendNotificationByToken(FCMNotificationRequest.of(user, "루틴에이드",
+                                gRoutine.routineTitle() + " 할 시간이에요!"));
+                    }
+                }
+            }
+        }
+    }
 
 }
