[REFACTOR] round의 정적 팩토리 메서드를 오버로딩하도록 변경 #217

hufscheer · Sep 20, 2024 · 2a32272 · 2a32272
1 parent d0f03f2
commit 2a32272
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/main/java/com/sports/server/command/league/domain/Round.java b/src/main/java/com/sports/server/command/league/domain/Round.java
@@ -27,6 +27,17 @@ public static Round from(final String value) {
                 });
     }
 
+<<<<<<< Updated upstream
+=======
+    public static Round from(final int number) {
+        return Stream.of(Round.values())
+                .filter(round -> round.number == number)
+                .findAny()
+                .orElseThrow(() -> new CustomException(HttpStatus.BAD_REQUEST, LeagueErrorMessages.ROUND_NOT_FOUND_EXCEPTION));
+    }
+
+
+>>>>>>> Stashed changes
     public static boolean isValidDescription(final String value) {
         return Stream.of(Round.values())
                 .anyMatch(round -> round.getDescription().equals(value));

diff --git a/src/main/java/com/sports/server/command/league/dto/LeagueRequestDto.java b/src/main/java/com/sports/server/command/league/dto/LeagueRequestDto.java
@@ -15,8 +15,13 @@ public record Register(
 		LocalDateTime startAt,
 		LocalDateTime endAt
 	) {
+<<<<<<< Updated upstream
 		public League toEntity(final Member manager, final Organization organization) {
 			return new League(manager, organization, name, startAt, endAt, Round.from(maxRound));
+=======
+		public League toEntity(final Member manager) {
+			return new League(manager, manager.getOrganization(), name, startAt, endAt, Round.from(maxRound));
+>>>>>>> Stashed changes
 		}
 	}