From c649ce2db378694aff935c2871baee3388e5efd5 Mon Sep 17 00:00:00 2001 From: seungtaekhong Date: Wed, 4 Sep 2024 11:50:21 +0900 Subject: [PATCH] refactor: systemCheck --- .../application/SystemCheckService.java | 4 ++- .../systemcheck/domain/SystemCheck.java | 3 --- .../systemcheck/dto/HealthCheckDto.java | 3 +-- .../application/SystemCheckServiceTest.java | 26 +++++++++---------- 4 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/playkuround/playkuroundserver/domain/systemcheck/application/SystemCheckService.java b/src/main/java/com/playkuround/playkuroundserver/domain/systemcheck/application/SystemCheckService.java index d0ec393..cddd6c7 100644 --- a/src/main/java/com/playkuround/playkuroundserver/domain/systemcheck/application/SystemCheckService.java +++ b/src/main/java/com/playkuround/playkuroundserver/domain/systemcheck/application/SystemCheckService.java @@ -20,6 +20,7 @@ public class SystemCheckService { private final AppVersionRepository appVersionRepository; private final SystemCheckRepository systemCheckRepository; + @Transactional(readOnly = true) public boolean isSystemAvailable() { Optional optionalSystemCheck = systemCheckRepository.findTopByOrderByUpdatedAtDesc(); return optionalSystemCheck.map(SystemCheck::isAvailable) @@ -33,10 +34,11 @@ public void changeSystemAvailable(boolean available) { systemCheckRepository.save(systemCheck); } + @Transactional(readOnly = true) public HealthCheckDto healthCheck() { boolean systemAvailable = isSystemAvailable(); - List supportAppVersionList = appVersionRepository.findAll(); + List supportAppVersionList = appVersionRepository.findAll(); List list = supportAppVersionList.stream() .map(appVersion -> new OSAndVersion(appVersion.getOs(), appVersion.getVersion())) .distinct() diff --git a/src/main/java/com/playkuround/playkuroundserver/domain/systemcheck/domain/SystemCheck.java b/src/main/java/com/playkuround/playkuroundserver/domain/systemcheck/domain/SystemCheck.java index d0f528e..b014d77 100644 --- a/src/main/java/com/playkuround/playkuroundserver/domain/systemcheck/domain/SystemCheck.java +++ b/src/main/java/com/playkuround/playkuroundserver/domain/systemcheck/domain/SystemCheck.java @@ -24,7 +24,4 @@ public SystemCheck(boolean available) { this.available = available; } - public void updateAvailable(boolean available) { - this.available = available; - } } diff --git a/src/main/java/com/playkuround/playkuroundserver/domain/systemcheck/dto/HealthCheckDto.java b/src/main/java/com/playkuround/playkuroundserver/domain/systemcheck/dto/HealthCheckDto.java index ba5bdc9..f0c86bb 100644 --- a/src/main/java/com/playkuround/playkuroundserver/domain/systemcheck/dto/HealthCheckDto.java +++ b/src/main/java/com/playkuround/playkuroundserver/domain/systemcheck/dto/HealthCheckDto.java @@ -4,6 +4,5 @@ import java.util.List; -public record HealthCheckDto(boolean systemAvailable, - List supportAppVersionList) { +public record HealthCheckDto(boolean systemAvailable, List supportAppVersionList) { } diff --git a/src/test/java/com/playkuround/playkuroundserver/domain/systemcheck/application/SystemCheckServiceTest.java b/src/test/java/com/playkuround/playkuroundserver/domain/systemcheck/application/SystemCheckServiceTest.java index ab37e2c..40a28e8 100644 --- a/src/test/java/com/playkuround/playkuroundserver/domain/systemcheck/application/SystemCheckServiceTest.java +++ b/src/test/java/com/playkuround/playkuroundserver/domain/systemcheck/application/SystemCheckServiceTest.java @@ -100,26 +100,26 @@ void success_1() { // given when(systemCheckRepository.findTopByOrderByUpdatedAtDesc()) .thenReturn(Optional.of(new SystemCheck(true))); + + List supportedAppVersion = List.of( + new AppVersion(OperationSystem.ANDROID, "1.0.0"), + new AppVersion(OperationSystem.ANDROID, "1.0.1"), + new AppVersion(OperationSystem.IOS, "1.0.3") + ); when(appVersionRepository.findAll()) - .thenReturn( - List.of( - new AppVersion(OperationSystem.ANDROID, "1.0.0"), - new AppVersion(OperationSystem.ANDROID, "1.0.1"), - new AppVersion(OperationSystem.IOS, "1.0.3") - ) - ); + .thenReturn(supportedAppVersion); // when HealthCheckDto healthCheckDto = systemCheckService.healthCheck(); // then assertThat(healthCheckDto.systemAvailable()).isTrue(); - assertThat(healthCheckDto.supportAppVersionList()) - .containsExactlyInAnyOrder( - new OSAndVersion(OperationSystem.ANDROID, "1.0.0"), - new OSAndVersion(OperationSystem.ANDROID, "1.0.1"), - new OSAndVersion(OperationSystem.IOS, "1.0.3") - ); + + List expected = supportedAppVersion.stream() + .map(appVersion -> new OSAndVersion(appVersion.getOs(), appVersion.getVersion())) + .toList(); + assertThat(healthCheckDto.supportAppVersionList()).hasSize(3) + .containsExactlyInAnyOrderElementsOf(expected); } }