Merge pull request #367 from Team-Sopetit/refactor/#366/chan

[REFACTOR] 메이커 루틴 제거
Team-Sopetit · Dec 19, 2024 · 62ed503 · 62ed503
2 parents ae5a488 + c202029
commit 62ed503
Show file tree

Hide file tree

Showing 20 changed files with 5 additions and 368 deletions.
diff --git a/src/main/java/com/soptie/server/api/controller/MakerApi.java b/src/main/java/com/soptie/server/api/controller/MakerApi.java
diff --git a/src/main/java/com/soptie/server/api/controller/docs/MakerApiDocs.java b/src/main/java/com/soptie/server/api/controller/docs/MakerApiDocs.java
diff --git a/src/main/java/com/soptie/server/api/controller/dto/response/maker/GetMakerListResponse.java b/src/main/java/com/soptie/server/api/controller/dto/response/maker/GetMakerListResponse.java
diff --git a/src/main/java/com/soptie/server/api/controller/dto/response/maker/MakerThemeResponse.java b/src/main/java/com/soptie/server/api/controller/dto/response/maker/MakerThemeResponse.java
diff --git a/src/main/java/com/soptie/server/api/controller/generic/SuccessMessage.java b/src/main/java/com/soptie/server/api/controller/generic/SuccessMessage.java
@@ -30,9 +30,6 @@ public enum SuccessMessage {
 	/* challenge */
 	GET_CHALLENGE("도전루틴 조회 성공"),
 
-	/* maker */
-	SUCCESS_GET_MAKER_THEME("메이커 테마 조회 성공"),
-
 	/* memo */
 	CREATE_MEMO("메모 생성 성공"),
 	UPDATE_MEMO("메모 수정 성공"),

diff --git a/src/main/java/com/soptie/server/domain/maker/Maker.java b/src/main/java/com/soptie/server/domain/maker/Maker.java
diff --git a/src/main/java/com/soptie/server/domain/maker/MakerService.java b/src/main/java/com/soptie/server/domain/maker/MakerService.java
diff --git a/src/main/java/com/soptie/server/domain/maker/Tags.java b/src/main/java/com/soptie/server/domain/maker/Tags.java
diff --git a/src/main/java/com/soptie/server/domain/theme/Theme.java b/src/main/java/com/soptie/server/domain/theme/Theme.java
@@ -17,7 +17,6 @@ public class Theme {
 	@NotNull
 	private String description;
 	private int sequence;
-	private Long makerId;
 
 	@Override
 	public boolean equals(Object obj) {
@@ -30,11 +29,11 @@ public boolean equals(Object obj) {
 		Theme theme = (Theme)obj;
 		return sequence == theme.sequence && Objects.equals(id, theme.id) && Objects.equals(name,
 			theme.name) && Objects.equals(comment, theme.comment) && Objects.equals(description,
-			theme.description) && Objects.equals(makerId, theme.makerId);
+			theme.description);
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(id, name, comment, description, sequence, makerId);
+		return Objects.hash(id, name, comment, description, sequence);
 	}
 }
diff --git a/src/main/java/com/soptie/server/domain/theme/ThemeService.java b/src/main/java/com/soptie/server/domain/theme/ThemeService.java
@@ -19,8 +19,4 @@ public GetThemesResponse getBasicThemes() {
 		val themes = themeAdapter.findByBasic();
 		return GetThemesResponse.of(themes);
 	}
-
-	public Theme acquireById(long themeId) {
-		return themeAdapter.findById(themeId);
-	}
 }
diff --git a/src/main/java/com/soptie/server/persistence/adapter/MakerAdapter.java b/src/main/java/com/soptie/server/persistence/adapter/MakerAdapter.java
diff --git a/src/main/java/com/soptie/server/persistence/adapter/ThemeAdapter.java b/src/main/java/com/soptie/server/persistence/adapter/ThemeAdapter.java
@@ -2,7 +2,6 @@
 
 import java.util.List;
 
-import com.soptie.server.api.controller.dto.response.maker.MakerThemeResponse;
 import com.soptie.server.common.exception.ExceptionCode;
 import com.soptie.server.common.exception.SoftieException;
 import com.soptie.server.common.support.RepositoryAdapter;
@@ -19,15 +18,11 @@ public class ThemeAdapter {
 	private final ThemeRepository themeRepository;
 
 	public List<Theme> findByBasic() {
-		return themeRepository.findByMakerIdIsNullOrderBySequenceAsc()
+		return themeRepository.findByOrderBySequenceAsc()
 			.stream().map(ThemeEntity::toDomain)
 			.toList();
 	}
 
-	public List<MakerThemeResponse> findAllWithMaker() {
-		return themeRepository.findAllWithMaker();
-	}
-
 	public Theme findById(long id) {
 		return find(id).toDomain();
 	}

diff --git a/src/main/java/com/soptie/server/persistence/entity/MakerEntity.java b/src/main/java/com/soptie/server/persistence/entity/MakerEntity.java
diff --git a/src/main/java/com/soptie/server/persistence/entity/ThemeEntity.java b/src/main/java/com/soptie/server/persistence/entity/ThemeEntity.java
@@ -17,7 +17,6 @@ public class ThemeEntity extends BaseEntity {
 	private String description;
 	@Column(nullable = false)
 	private int sequence;
-	private Long makerId;
 
 	public Theme toDomain() {
 		return Theme.builder()
@@ -26,7 +25,6 @@ public Theme toDomain() {
 			.comment(this.comment)
 			.description(this.description)
 			.sequence(this.sequence)
-			.makerId(this.makerId)
 			.build();
 	}
 }
diff --git a/src/main/java/com/soptie/server/persistence/repository/MakerCustomRepository.java b/src/main/java/com/soptie/server/persistence/repository/MakerCustomRepository.java
diff --git a/src/main/java/com/soptie/server/persistence/repository/MakerRepository.java b/src/main/java/com/soptie/server/persistence/repository/MakerRepository.java
diff --git a/src/main/java/com/soptie/server/persistence/repository/ThemeCustomRepository.java b/src/main/java/com/soptie/server/persistence/repository/ThemeCustomRepository.java
diff --git a/src/main/java/com/soptie/server/persistence/repository/ThemeRepository.java b/src/main/java/com/soptie/server/persistence/repository/ThemeRepository.java
@@ -6,8 +6,8 @@
 
 import com.soptie.server.persistence.entity.ThemeEntity;
 
-public interface ThemeRepository extends JpaRepository<ThemeEntity, Long>, ThemeCustomRepository {
-	List<ThemeEntity> findByMakerIdIsNullOrderBySequenceAsc();
+public interface ThemeRepository extends JpaRepository<ThemeEntity, Long> {
+	List<ThemeEntity> findByOrderBySequenceAsc();
 
 	List<ThemeEntity> findByIdIn(List<Long> ids);
 }