From 1ff38d163453303cdbfafcefd629fef9cb351782 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Tue, 12 Aug 2025 21:10:37 +0900 Subject: [PATCH 1/2] =?UTF-8?q?test(Reservation):=20import=EB=AC=B8=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../applicationadmin/reservation/ReservationServiceTest.java | 1 + .../reservation/WaitingRedisRepositoryTest.java | 3 +++ .../reservation/service/ReservationServiceTest.java | 1 + .../reservation/service/WaitingPermitLuaRepositoryTest.java | 1 + 4 files changed, 6 insertions(+) diff --git a/nowait-app-admin-api/src/test/java/com/nowait/applicationadmin/reservation/ReservationServiceTest.java b/nowait-app-admin-api/src/test/java/com/nowait/applicationadmin/reservation/ReservationServiceTest.java index 2290d86c..3c191177 100644 --- a/nowait-app-admin-api/src/test/java/com/nowait/applicationadmin/reservation/ReservationServiceTest.java +++ b/nowait-app-admin-api/src/test/java/com/nowait/applicationadmin/reservation/ReservationServiceTest.java @@ -37,6 +37,7 @@ import com.nowait.domaincorerdb.user.entity.MemberDetails; import com.nowait.domaincorerdb.user.entity.User; import com.nowait.domaincorerdb.user.repository.UserRepository; +import com.nowait.domaincoreredis.reservation.repository.WaitingRedisRepository; public class ReservationServiceTest { diff --git a/nowait-app-admin-api/src/test/java/com/nowait/applicationadmin/reservation/WaitingRedisRepositoryTest.java b/nowait-app-admin-api/src/test/java/com/nowait/applicationadmin/reservation/WaitingRedisRepositoryTest.java index 0b63cad2..3b399325 100644 --- a/nowait-app-admin-api/src/test/java/com/nowait/applicationadmin/reservation/WaitingRedisRepositoryTest.java +++ b/nowait-app-admin-api/src/test/java/com/nowait/applicationadmin/reservation/WaitingRedisRepositoryTest.java @@ -1,5 +1,6 @@ package com.nowait.applicationadmin.reservation; +import static org.assertj.core.api.Assertions.*; import static org.mockito.BDDMockito.*; import org.junit.jupiter.api.BeforeEach; @@ -12,6 +13,8 @@ import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.ZSetOperations; +import com.nowait.domaincoreredis.reservation.repository.WaitingRedisRepository; + public class WaitingRedisRepositoryTest { @Mock private StringRedisTemplate template; diff --git a/nowait-app-user-api/src/test/java/com/nowait/applicationuser/reservation/service/ReservationServiceTest.java b/nowait-app-user-api/src/test/java/com/nowait/applicationuser/reservation/service/ReservationServiceTest.java index 35342205..39697323 100644 --- a/nowait-app-user-api/src/test/java/com/nowait/applicationuser/reservation/service/ReservationServiceTest.java +++ b/nowait-app-user-api/src/test/java/com/nowait/applicationuser/reservation/service/ReservationServiceTest.java @@ -38,6 +38,7 @@ import com.nowait.domaincorerdb.user.entity.User; import com.nowait.domaincorerdb.user.exception.UserNotFoundException; import com.nowait.domaincorerdb.user.repository.UserRepository; +import com.nowait.domaincoreredis.reservation.repository.WaitingPermitLuaRepository; import com.nowait.domainuserrdb.oauth.dto.CustomOAuth2User; @ExtendWith(MockitoExtension.class) diff --git a/nowait-app-user-api/src/test/java/com/nowait/applicationuser/reservation/service/WaitingPermitLuaRepositoryTest.java b/nowait-app-user-api/src/test/java/com/nowait/applicationuser/reservation/service/WaitingPermitLuaRepositoryTest.java index a9ca63ab..ae32ab4b 100644 --- a/nowait-app-user-api/src/test/java/com/nowait/applicationuser/reservation/service/WaitingPermitLuaRepositoryTest.java +++ b/nowait-app-user-api/src/test/java/com/nowait/applicationuser/reservation/service/WaitingPermitLuaRepositoryTest.java @@ -15,6 +15,7 @@ import org.testcontainers.junit.jupiter.Testcontainers; import com.nowait.domaincoreredis.common.util.RedisKeyUtils; +import com.nowait.domaincoreredis.reservation.repository.WaitingPermitLuaRepository; @Testcontainers public class WaitingPermitLuaRepositoryTest { From e90146a3797035606aece20634f3fb85c0cf2270 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Tue, 12 Aug 2025 21:12:00 +0900 Subject: [PATCH 2/2] =?UTF-8?q?refactor(Reservation):=20=EB=B0=B0=ED=8F=AC?= =?UTF-8?q?=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/deploy-admin-docker.sh | 4 ++-- scripts/deploy-user-docker.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/deploy-admin-docker.sh b/scripts/deploy-admin-docker.sh index 93297fbb..1a19c8fa 100644 --- a/scripts/deploy-admin-docker.sh +++ b/scripts/deploy-admin-docker.sh @@ -22,8 +22,8 @@ echo "Cleaning up old containers…" docker-compose -f docker-compose.admin.yml -f docker-compose.admin-monitoring.yml -p nowait_dev_admin down echo "3. start container" -sudo docker-compose -f docker-compose.admin.yml -f docker-compose.admin-monitoring.yml -p nowait_dev_admin pull nowait-app-admin-api prometheus-admin grafana-admin -sudo docker-compose -f docker-compose.admin.yml -f docker-compose.admin-monitoring.yml -p nowait_dev_admin up -d nowait-app-admin-api prometheus-admin grafana-admin +sudo docker-compose -f docker-compose.admin.yml -f docker-compose.admin-monitoring.yml -p nowait_dev_admin pull nowait-app-admin-api +sudo docker-compose -f docker-compose.admin.yml -f docker-compose.admin-monitoring.yml -p nowait_dev_admin up -d nowait-app-admin-api echo "4. check container status" NEW_CONTAINER_ID=$(docker ps -q --filter "name=nowait-app-admin-api") diff --git a/scripts/deploy-user-docker.sh b/scripts/deploy-user-docker.sh index 46c78a4f..3bf2d6cf 100644 --- a/scripts/deploy-user-docker.sh +++ b/scripts/deploy-user-docker.sh @@ -22,8 +22,8 @@ echo "Cleaning up old containers…" docker-compose -f docker-compose.user.yml -f docker-compose.user-monitoring.yml -p nowait_dev_user down echo "3. start container" -sudo docker-compose -f docker-compose.user.yml -f docker-compose.user-monitoring.yml -p nowait_dev_user pull nowait-app-user-api prometheus-user grafana-user -sudo docker-compose -f docker-compose.user.yml -f docker-compose.user-monitoring.yml -p nowait_dev_user up -d nowait-app-user-api prometheus-user grafana-user +sudo docker-compose -f docker-compose.user.yml -f docker-compose.user-monitoring.yml -p nowait_dev_user pull nowait-app-user-api +sudo docker-compose -f docker-compose.user.yml -f docker-compose.user-monitoring.yml -p nowait_dev_user up -d nowait-app-user-api echo "4. check container status" NEW_CONTAINER_ID=$(docker ps -q --filter "name=nowait-app-user-api")