fix: 팀 존재 여부 확인 쿼리 수정

depromeet · Jul 17, 2024 · a173f5c · a173f5c
1 parent 83855f7
commit a173f5c
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 15 deletions.
diff --git a/common/src/main/java/org/depromeet/spot/common/exception/team/TeamException.java b/common/src/main/java/org/depromeet/spot/common/exception/team/TeamException.java
@@ -12,6 +12,10 @@ public static class BaseballTeamNotFoundException extends TeamException {
         public BaseballTeamNotFoundException() {
             super(TeamErrorCode.BASEBALL_TEAM_NOT_FOUND);
         }
+
+        public BaseballTeamNotFoundException(Long id) {
+            super(TeamErrorCode.BASEBALL_TEAM_NOT_FOUND.appended(" : " + id));
+        }
     }
 
     public static class InvalidBaseballTeamNameException extends TeamException {

diff --git a/...e/jpa/src/main/java/org/depromeet/spot/jpa/team/repository/BaseballTeamJpaRepository.java b/...e/jpa/src/main/java/org/depromeet/spot/jpa/team/repository/BaseballTeamJpaRepository.java
@@ -1,13 +1,12 @@
 package org.depromeet.spot.jpa.team.repository;
 
 import java.util.List;
-import java.util.Set;
 
 import org.depromeet.spot.jpa.team.entity.BaseballTeamEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface BaseballTeamJpaRepository extends JpaRepository<BaseballTeamEntity, Long> {
     boolean existsByNameIn(List<String> names);
 
-    boolean existsByIdIn(Set<Long> ids);
+    boolean existsById(Long teamId);
 }
diff --git a/.../jpa/src/main/java/org/depromeet/spot/jpa/team/repository/BaseballTeamRepositoryImpl.java b/.../jpa/src/main/java/org/depromeet/spot/jpa/team/repository/BaseballTeamRepositoryImpl.java
@@ -1,7 +1,6 @@
 package org.depromeet.spot.jpa.team.repository;
 
 import java.util.List;
-import java.util.Set;
 
 import org.depromeet.spot.common.exception.team.TeamException.BaseballTeamNotFoundException;
 import org.depromeet.spot.domain.team.BaseballTeam;
@@ -44,7 +43,7 @@ public boolean existsByNameIn(List<String> names) {
     }
 
     @Override
-    public boolean existsByIdIn(Set<Long> ids) {
-        return baseballTeamJpaRepository.existsByIdIn(ids);
+    public boolean existsById(Long id) {
+        return baseballTeamJpaRepository.existsById(id);
     }
 }
diff --git a/usecase/src/main/java/org/depromeet/spot/usecase/port/in/team/ReadBaseballTeamUsecase.java b/usecase/src/main/java/org/depromeet/spot/usecase/port/in/team/ReadBaseballTeamUsecase.java
@@ -11,5 +11,5 @@ public interface ReadBaseballTeamUsecase {
 
     List<BaseballTeam> findAll();
 
-    void checkExistsBy(Set<Long> teamIds);
+    void areAllTeamIdsExist(Set<Long> teamIds);
 }
diff --git a/usecase/src/main/java/org/depromeet/spot/usecase/port/out/team/BaseballTeamRepository.java b/usecase/src/main/java/org/depromeet/spot/usecase/port/out/team/BaseballTeamRepository.java
@@ -1,7 +1,6 @@
 package org.depromeet.spot.usecase.port.out.team;
 
 import java.util.List;
-import java.util.Set;
 
 import org.depromeet.spot.domain.team.BaseballTeam;
 
@@ -14,5 +13,5 @@ public interface BaseballTeamRepository {
 
     boolean existsByNameIn(List<String> names);
 
-    boolean existsByIdIn(Set<Long> ids);
+    boolean existsById(Long id);
 }
diff --git a/usecase/src/main/java/org/depromeet/spot/usecase/service/team/CreateHomeTeamService.java b/usecase/src/main/java/org/depromeet/spot/usecase/service/team/CreateHomeTeamService.java
@@ -24,7 +24,7 @@ public class CreateHomeTeamService implements CreateHomeTeamUsecase {
     @Override
     public void createHomeTeams(final Long stadiumId, Set<Long> teamIds) {
         stadiumReadUsecase.checkIsExistsBy(stadiumId);
-        readBaseballTeamUsecase.checkExistsBy(teamIds);
+        readBaseballTeamUsecase.areAllTeamIdsExist(teamIds);
         List<StadiumHomeTeam> homeTeams = new ArrayList<>();
         teamIds.forEach(
                 teamId ->

diff --git a/usecase/src/main/java/org/depromeet/spot/usecase/service/team/ReadBaseballTeamService.java b/usecase/src/main/java/org/depromeet/spot/usecase/service/team/ReadBaseballTeamService.java
@@ -30,9 +30,11 @@ public List<BaseballTeam> findAll() {
     }
 
     @Override
-    public void checkExistsBy(Set<Long> teamIds) {
-        if (!baseballTeamRepository.existsByIdIn(teamIds)) {
-            throw new BaseballTeamNotFoundException();
+    public void areAllTeamIdsExist(Set<Long> teamIds) {
+        for (Long teamId : teamIds) {
+            if (!baseballTeamRepository.existsById(teamId)) {
+                throw new BaseballTeamNotFoundException(teamId);
+            }
         }
     }
 }
diff --git a/...ase/src/test/java/org/depromeet/spot/usecase/service/fake/FakeBaseballTeamRepository.java b/...ase/src/test/java/org/depromeet/spot/usecase/service/fake/FakeBaseballTeamRepository.java
@@ -5,7 +5,6 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.Set;
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.depromeet.spot.common.exception.team.TeamException.BaseballTeamNotFoundException;
@@ -61,7 +60,7 @@ public boolean existsByNameIn(List<String> names) {
     }
 
     @Override
-    public boolean existsByIdIn(Set<Long> ids) {
-        return data.stream().map(BaseballTeam::getId).anyMatch(ids::contains);
+    public boolean existsById(Long id) {
+        return data.stream().anyMatch(team -> team.getId().equals(id));
     }
 }