refactor: 스케줄러 패키징

depromeet · Sep 20, 2024 · 2c8446b · 2c8446b
1 parent 4773ca2
commit 2c8446b
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 13 deletions.
diff --git a/src/main/java/com/depromeet/stonebed/domain/fcm/api/FcmController.java b/src/main/java/com/depromeet/stonebed/domain/fcm/api/FcmController.java
@@ -33,7 +33,7 @@ public class FcmController {
     @PostMapping("/token")
     public ResponseEntity<Void> fcmTokenStore(
             @RequestBody @Validated FcmTokenRequest fcmTokenRequest) {
-        fcmTokenService.storeOrUpdateToken(fcmTokenRequest.token());
+        fcmTokenService.createFcmToken(fcmTokenRequest.token());
         return ResponseEntity.ok().build();
     }
 

diff --git a/src/main/java/com/depromeet/stonebed/domain/fcm/application/FcmTokenService.java b/src/main/java/com/depromeet/stonebed/domain/fcm/application/FcmTokenService.java
@@ -42,7 +42,7 @@ private void updateToken(FcmToken fcmToken, String token) {
     }
 
     @Transactional
-    public void storeOrUpdateToken(String token) {
+    public void createFcmToken(String token) {
         if (token == null || token.isEmpty()) {
             throw new CustomException(ErrorCode.INVALID_FCM_TOKEN);
         }

diff --git a/src/main/java/com/depromeet/stonebed/global/config/sqs/SqsConfig.java b/src/main/java/com/depromeet/stonebed/global/config/sqs/SqsConfig.java
@@ -17,12 +17,12 @@ public class SqsConfig {
 
     @Bean
     public SqsClient sqsClient() {
-        AwsBasicCredentials awsCreds =
+        AwsBasicCredentials awsBasicCredentials =
                 AwsBasicCredentials.create(sqsProperties.accessKey(), sqsProperties.secretKey());
 
         return SqsClient.builder()
                 .region(Region.of(sqsProperties.region()))
-                .credentialsProvider(StaticCredentialsProvider.create(awsCreds))
+                .credentialsProvider(StaticCredentialsProvider.create(awsBasicCredentials))
                 .build();
     }
 }
diff --git a/.../fcm/application/FcmScheduledService.java → .../stonebed/scheduler/fcm/FcmScheduler.java b/.../fcm/application/FcmScheduledService.java → .../stonebed/scheduler/fcm/FcmScheduler.java
@@ -1,5 +1,7 @@
-package com.depromeet.stonebed.domain.fcm.application;
+package com.depromeet.stonebed.scheduler.fcm;
 
+import com.depromeet.stonebed.domain.fcm.application.FcmNotificationService;
+import com.depromeet.stonebed.domain.fcm.application.FcmTokenService;
 import com.depromeet.stonebed.domain.fcm.dao.FcmRepository;
 import com.depromeet.stonebed.domain.fcm.domain.FcmToken;
 import com.depromeet.stonebed.domain.member.domain.MemberStatus;
@@ -18,7 +20,7 @@
 @Slf4j
 @Service
 @RequiredArgsConstructor
-public class FcmScheduledService {
+public class FcmScheduler {
     private final FcmTokenService fcmTokenService;
     private final FcmNotificationService fcmNotificationService;
     private final FcmRepository fcmRepository;

diff --git a/...cation/MissionRecordScheduledService.java → ...missionRecord/MissionRecordScheduler.java b/...cation/MissionRecordScheduledService.java → ...missionRecord/MissionRecordScheduler.java
@@ -1,12 +1,13 @@
-package com.depromeet.stonebed.domain.missionRecord.application;
+package com.depromeet.stonebed.scheduler.missionRecord;
 
+import com.depromeet.stonebed.domain.missionRecord.application.MissionRecordService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
 @Service
 @RequiredArgsConstructor
-public class MissionRecordScheduledService {
+public class MissionRecordScheduler {
     private final MissionRecordService missionRecordService;
 
     @Scheduled(cron = "0 0 0 * * ?")

diff --git a/.../application/FcmScheduledServiceTest.java → ...ain/fcm/application/FcmSchedulerTest.java b/.../application/FcmScheduledServiceTest.java → ...ain/fcm/application/FcmSchedulerTest.java
@@ -10,6 +10,7 @@
 import com.depromeet.stonebed.domain.missionRecord.dao.MissionRecordRepository;
 import com.depromeet.stonebed.domain.missionRecord.domain.MissionRecord;
 import com.depromeet.stonebed.domain.missionRecord.domain.MissionRecordStatus;
+import com.depromeet.stonebed.scheduler.fcm.FcmScheduler;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -24,13 +25,13 @@
 
 @ActiveProfiles("test")
 @ExtendWith(MockitoExtension.class)
-public class FcmScheduledServiceTest extends FixtureMonkeySetUp {
+public class FcmSchedulerTest extends FixtureMonkeySetUp {
     @Mock private FcmNotificationService fcmNotificationService;
     @Mock private FcmRepository fcmRepository;
     @Mock private FcmTokenService fcmTokenService;
     @Mock private MissionRecordRepository missionRecordRepository;
 
-    @InjectMocks private FcmScheduledService fcmScheduledService;
+    @InjectMocks private FcmScheduler fcmScheduler;
 
     @Test
     void 비활성화된_토큰을_삭제하면_정상적으로_삭제된다() {
@@ -39,7 +40,7 @@ public class FcmScheduledServiceTest extends FixtureMonkeySetUp {
         when(fcmRepository.findAllByUpdatedAtBefore(any(LocalDateTime.class))).thenReturn(tokens);
 
         // when
-        fcmScheduledService.removeInactiveTokens();
+        fcmScheduler.removeInactiveTokens();
 
         // then
         ArgumentCaptor<LocalDateTime> captor = ArgumentCaptor.forClass(LocalDateTime.class);
@@ -59,7 +60,7 @@ public class FcmScheduledServiceTest extends FixtureMonkeySetUp {
         when(fcmTokenService.getAllTokens()).thenReturn(tokens);
 
         // when
-        fcmScheduledService.sendDailyNotification();
+        fcmScheduler.sendDailyNotification();
 
         // then
         verify(fcmNotificationService, times(1))
@@ -99,7 +100,7 @@ public class FcmScheduledServiceTest extends FixtureMonkeySetUp {
                         .collect(Collectors.toList());
 
         // when
-        fcmScheduledService.sendReminderToIncompleteMissions();
+        fcmScheduler.sendReminderToIncompleteMissions();
 
         // then
         verify(fcmNotificationService, times(1))