[BE] 운영서버 배포

.github/workflows/be_cd-test.yml

@@ -75,13 +75,13 @@ jobs:
           DOCKER_REPO_NAME=${{ secrets.DOCKER_REPO_NAME }}
 
           # DB Configuration secrets info from Github Secrets
-          MASTER_DB_URL=${{ secrets.MASTER_DB_URL }}
-          MASTER_DB_USERNAME=${{ secrets.MASTER_DB_USERNAME }}
-          MASTER_DB_PASSWORD=${{ secrets.MASTER_DB_PASSWORD }}
+          MASTER_DB_URL=${{ secrets.TEST_SERVER_DB_URL }}
+          MASTER_DB_USERNAME=${{ secrets.TEST_SERVER_DB_USERNAME }}
+          MASTER_DB_PASSWORD=${{ secrets.TEST_SERVER_DB_PASSWORD }}
 
-          SLAVE_DB_URL=${{ secrets.SLAVE_DB_URL }}
-          SLAVE_DB_USERNAME=${{ secrets.SLAVE_DB_USERNAME }}
-          SLAVE_DB_PASSWORD=${{ secrets.SLAVE_DB_PASSWORD }}
+          SLAVE_DB_URL=${{ secrets.TEST_SERVER_DB_URL }}
+          SLAVE_DB_USERNAME=${{ secrets.TEST_SERVER_DB_USERNAME }}
+          SLAVE_DB_PASSWORD=${{ secrets.TEST_SERVER_DB_PASSWORD }}
           DDL_AUTO=${{ secrets.DDL_AUTO }}
 
           # OAUTH & JWT

backend/src/main/java/site/coduo/member/controller/AuthController.java

@@ -71,7 +71,7 @@ public ResponseEntity<SignInWebResponse> signInCallback(
 
     @GetMapping("/sign-in/check")
     public ResponseEntity<SignInCheckResponse> signInCheck(
-            @CookieValue(name = SIGN_IN_COOKIE_NAME) final String signInToken
+            @CookieValue(name = SIGN_IN_COOKIE_NAME, required = false) final String signInToken
     ) {
         final boolean signedIn = authService.isSignedIn(signInToken);
         final SignInCheckResponse response = new SignInCheckResponse(signedIn);

backend/src/main/java/site/coduo/member/service/AuthService.java

@@ -33,6 +33,9 @@ public SignInServiceResponse createSignInToken(final String accessToken) {
     }
 
     public boolean isSignedIn(final String signInToken) {
+        if (signInToken == null) {
+            return false;
+        }
         return jwtProvider.isValid(signInToken);
     }
 }

backend/src/main/java/site/coduo/pairroom/service/PairRoomService.java

@@ -43,9 +43,6 @@ public class PairRoomService {
     @Transactional
     public String savePairRoom(final PairRoomCreateRequest request, @Nullable final String token) {
         final PairRoom pairRoom = createPairRoom(request);
-        final PairRoomEntity entity = PairRoomEntity.from(pairRoom);
-        log.info("Pair ROom entity : {}", entity);
-
         final PairRoomEntity pairRoomEntity = pairRoomRepository.save(PairRoomEntity.from(pairRoom));
 
         final Timer timer = new Timer(pairRoom.getAccessCode(), request.timerDuration(), request.timerRemainingTime());
@@ -67,7 +64,6 @@ private PairRoom createPairRoom(final PairRoomCreateRequest request) {
 
     private AccessCode generateAccessCode() {
         final String generatedAccessCode = uuidAccessCodeGenerator.generate();
-        log.info("ACCESS CODE : {}", generatedAccessCode);
         if (pairRoomRepository.existsByAccessCode(generatedAccessCode)) {
             return generateAccessCode();
         }
@@ -89,7 +85,7 @@ public void updatePairRoomStatus(final String accessCode, final String statusNam
 
     public PairRoomReadResponse findPairRoomAndTimer(final String accessCode) {
         final PairRoomEntity pairRoomEntity = pairRoomRepository.fetchByAccessCode(accessCode);
-        final TimerEntity timerEntity = timerRepository.fetchTimerByPairRoomId(pairRoomEntity.getId());
+        final TimerEntity timerEntity = timerRepository.fetchTimerByPairRoomEntity(pairRoomEntity);
         return PairRoomReadResponse.of(pairRoomEntity.toDomain(), timerEntity.toDomain());
     }
 

backend/src/main/java/site/coduo/referencelink/controller/ReferenceLinkController.java

@@ -44,10 +44,8 @@ public ResponseEntity<ReferenceLinkResponse> createReferenceLink(
     public ResponseEntity<List<ReferenceLinkResponse>> getReferenceLinks(
             @PathVariable("accessCode") final String accessCodeText
     ) {
-        log.info("[Reference Link] 1. 링크 조회 API 호출 시작!");
         final List<ReferenceLinkResponse> responses = referenceLinkService.readAllReferenceLink(accessCodeText);
 
-        log.info("[Reference Link] 5. 끝!! 응답!");
         return ResponseEntity.ok(responses);
     }
 

backend/src/main/java/site/coduo/referencelink/service/ReferenceLinkService.java

@@ -68,13 +68,10 @@ private ReferenceLinkEntity saveReferenceLink(final ReferenceLinkCreateRequest r
 
     @Transactional(readOnly = true)
     public List<ReferenceLinkResponse> readAllReferenceLink(final String accessCodeText) {
-        log.info("[Reference Link] 2. readAllReferenceLink 메서드 호출 시작!");
-        log.info("[Reference Link] 3. referenceLinkRepository.findAll() 호출 시작!");
         final PairRoomEntity pairRoom = pairRoomRepository.fetchByAccessCode(accessCodeText);
 
         final List<ReferenceLinkEntity> referenceLinkEntities = referenceLinkRepository.findByPairRoomEntity(pairRoom);
 
-        log.info("[Reference Link] 4. referenceLinkRepository.findAll() 반환 데이터 필터링 시작!!");
         return referenceLinkEntities.stream()
                 .map(this::makeReferenceLinkResponse)
                 .toList();

backend/src/main/java/site/coduo/sync/service/SchedulerService.java

@@ -29,6 +29,9 @@ public class SchedulerService {
     private final SseService sseService;
 
     public void start(final String key) {
+        if (schedulerRegistry.isActive(key)) {
+            return;
+        }
         sseService.broadcast(key, "timer", "start");
         if (isInitial(key)) {
             final Timer timer = timerRepository.fetchTimerByAccessCode(key)
@@ -52,27 +55,29 @@ private void scheduling(final String key, final Timer timer) {
     }
 
     private void runTimer(final String key, final Timer timer) {
-        if (timer.isTimeUp()) {
-            stop(key);
-            final Timer initalTimer = new Timer(timer.getAccessCode(), timer.getDuration(), timer.getDuration());
-            timestampRegistry.register(key, initalTimer);
+        if (timer.isTimeUp() && schedulerRegistry.has(key)) {
+            stop(key, timer);
             return;
         }
         if (sseService.hasNoConnections(key) && schedulerRegistry.has(key)) {
-            stop(key);
+            pause(key);
             return;
         }
         timer.decreaseRemainingTime(DELAY_SECOND.toMillis());
         sseService.broadcast(key, "remaining-time", String.valueOf(timer.getRemainingTime()));
     }
 
     public void pause(final String key) {
-        sseService.broadcast(key, "timer", "pause");
-        schedulerRegistry.release(key);
+        if (schedulerRegistry.isActive(key)) {
+            sseService.broadcast(key, "timer", "pause");
+            schedulerRegistry.release(key);
+        }
     }
 
-    public void stop(final String key) {
+    private void stop(final String key, final Timer timer) {
         sseService.broadcast(key, "timer", "stop");
         schedulerRegistry.release(key);
+        final Timer initalTimer = new Timer(timer.getAccessCode(), timer.getDuration(), timer.getDuration());
+        timestampRegistry.register(key, initalTimer);
     }
 }

backend/src/main/java/site/coduo/timer/repository/TimerRepository.java

@@ -4,16 +4,17 @@
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import site.coduo.pairroom.repository.PairRoomEntity;
 import site.coduo.timer.exception.TimerNotFoundException;
 
 public interface TimerRepository extends JpaRepository<TimerEntity, Long> {
 
-    default TimerEntity fetchTimerByPairRoomId(final long pairRoomId) {
-        return findByPairRoomEntityId(pairRoomId)
+    default TimerEntity fetchTimerByPairRoomEntity(final PairRoomEntity pairRoomEntity) {
+        return findByPairRoomEntity(pairRoomEntity)
                 .orElseThrow(() -> new TimerNotFoundException("해당 페어룸의 타이머가 존재하지 않습니다."));
     }
 
-    Optional<TimerEntity> findByPairRoomEntityId(long pairRoomId);
+    Optional<TimerEntity> findByPairRoomEntity(PairRoomEntity pairRoomEntity);
 
     default TimerEntity fetchTimerByAccessCode(final String accessCode) {
         return findByPairRoomEntityAccessCode(accessCode)

backend/src/main/java/site/coduo/timer/service/TimerService.java

@@ -24,7 +24,7 @@ public class TimerService {
 
     public TimerReadResponse readTimer(final String accessCode) {
         final PairRoomEntity pairRoomEntity = pairRoomRepository.fetchByAccessCode(accessCode);
-        final TimerEntity timerEntity = timerRepository.fetchTimerByPairRoomId(pairRoomEntity.getId());
+        final TimerEntity timerEntity = timerRepository.fetchTimerByPairRoomEntity(pairRoomEntity);
         return TimerReadResponse.of(timerEntity.getId(), timerEntity.toDomain());
     }
 
@@ -41,7 +41,7 @@ public long readTimerRemainingTime(final String accessCode) {
     @Transactional
     public void updateTimer(final String accessCode, final TimerUpdateRequest updateRequest) {
         final PairRoomEntity pairRoomEntity = pairRoomRepository.fetchByAccessCode(accessCode);
-        final TimerEntity timerEntity = timerRepository.fetchTimerByPairRoomId(pairRoomEntity.getId());
+        final TimerEntity timerEntity = timerRepository.fetchTimerByPairRoomEntity(pairRoomEntity);
         final Timer newTimer = new Timer(
                 new AccessCode(pairRoomEntity.getAccessCode()),
                 updateRequest.duration(),

backend/src/test/java/site/coduo/timer/repository/TimerRepositoryTest.java

@@ -51,7 +51,7 @@ void inquiry_timer() {
 
         // when
         final TimerEntity actual = timerRepository
-                .fetchTimerByPairRoomId(entity.getId());
+                .fetchTimerByPairRoomEntity(entity);
 
         // then
         assertThat(actual)