From 1df48147159562cf8934ad2f941b784b58c23d5f Mon Sep 17 00:00:00 2001 From: Chan531 Date: Thu, 19 Dec 2024 17:17:22 +0900 Subject: [PATCH 01/13] delete: maker domain --- .../com/soptie/server/domain/maker/Maker.java | 17 ----------- .../com/soptie/server/domain/maker/Tags.java | 30 ------------------- 2 files changed, 47 deletions(-) delete mode 100644 src/main/java/com/soptie/server/domain/maker/Maker.java delete mode 100644 src/main/java/com/soptie/server/domain/maker/Tags.java diff --git a/src/main/java/com/soptie/server/domain/maker/Maker.java b/src/main/java/com/soptie/server/domain/maker/Maker.java deleted file mode 100644 index f1638edd..00000000 --- a/src/main/java/com/soptie/server/domain/maker/Maker.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.soptie.server.domain.maker; - -import jakarta.validation.constraints.NotNull; -import lombok.Builder; -import lombok.Getter; - -@Builder -@Getter -public class Maker { - private Long id; - @NotNull - private String name; - private String introductionUrl; - private String profileImageUrl; - @NotNull - private Tags tags; -} diff --git a/src/main/java/com/soptie/server/domain/maker/Tags.java b/src/main/java/com/soptie/server/domain/maker/Tags.java deleted file mode 100644 index 9fc457fb..00000000 --- a/src/main/java/com/soptie/server/domain/maker/Tags.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.soptie.server.domain.maker; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import lombok.Getter; - -@Getter -public class Tags { - private final String contents; - - private static final String TAG_SEPARATE = ","; - - public Tags(String tags) { - this.contents = tags; - } - - public Tags(List tags) { - this.contents = String.join(TAG_SEPARATE, tags); - } - - public List toTagList() { - return hasContents() ? Arrays.stream(contents.split(TAG_SEPARATE)).toList() : new ArrayList<>(); - } - - private boolean hasContents() { - return contents != null && !contents.isEmpty(); - } -} From c61b523bb5d8483159765dc5c5bdf01b2b89de6e Mon Sep 17 00:00:00 2001 From: Chan531 Date: Thu, 19 Dec 2024 17:17:37 +0900 Subject: [PATCH 02/13] delete: maker repository --- .../persistence/repository/MakerCustomRepository.java | 9 --------- .../server/persistence/repository/MakerRepository.java | 8 -------- 2 files changed, 17 deletions(-) delete mode 100644 src/main/java/com/soptie/server/persistence/repository/MakerCustomRepository.java delete mode 100644 src/main/java/com/soptie/server/persistence/repository/MakerRepository.java diff --git a/src/main/java/com/soptie/server/persistence/repository/MakerCustomRepository.java b/src/main/java/com/soptie/server/persistence/repository/MakerCustomRepository.java deleted file mode 100644 index 310a876a..00000000 --- a/src/main/java/com/soptie/server/persistence/repository/MakerCustomRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.soptie.server.persistence.repository; - -import java.util.List; - -import com.soptie.server.api.controller.dto.response.maker.MakerThemeResponse; - -public interface MakerCustomRepository { - List findAllWithTheme(); -} diff --git a/src/main/java/com/soptie/server/persistence/repository/MakerRepository.java b/src/main/java/com/soptie/server/persistence/repository/MakerRepository.java deleted file mode 100644 index 97b65c03..00000000 --- a/src/main/java/com/soptie/server/persistence/repository/MakerRepository.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.soptie.server.persistence.repository; - -import org.springframework.data.jpa.repository.JpaRepository; - -import com.soptie.server.persistence.entity.MakerEntity; - -public interface MakerRepository extends JpaRepository { -} From 42ba82febbcda7a6e3392cd2a1a01741bc676b38 Mon Sep 17 00:00:00 2001 From: Chan531 Date: Thu, 19 Dec 2024 17:18:00 +0900 Subject: [PATCH 03/13] delete: maker theme --- .../persistence/adapter/ThemeAdapter.java | 5 ---- .../repository/ThemeCustomRepository.java | 9 ------ .../repository/ThemeRepository.java | 2 +- .../repository/ThemeRepositoryImpl.java | 30 ------------------- 4 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 src/main/java/com/soptie/server/persistence/repository/ThemeCustomRepository.java delete mode 100644 src/main/java/com/soptie/server/persistence/repository/ThemeRepositoryImpl.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 index c4c9a1bd..4c36f587 100644 --- 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; @@ -24,10 +23,6 @@ public List findByBasic() { .toList(); } - public List findAllWithMaker() { - return themeRepository.findAllWithMaker(); - } - public Theme findById(long id) { return find(id).toDomain(); } diff --git a/src/main/java/com/soptie/server/persistence/repository/ThemeCustomRepository.java b/src/main/java/com/soptie/server/persistence/repository/ThemeCustomRepository.java deleted file mode 100644 index 0a370cfc..00000000 --- a/src/main/java/com/soptie/server/persistence/repository/ThemeCustomRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.soptie.server.persistence.repository; - -import java.util.List; - -import com.soptie.server.api.controller.dto.response.maker.MakerThemeResponse; - -public interface ThemeCustomRepository { - List findAllWithMaker(); -} diff --git a/src/main/java/com/soptie/server/persistence/repository/ThemeRepository.java b/src/main/java/com/soptie/server/persistence/repository/ThemeRepository.java index 54afbdd3..a6464075 100644 --- a/src/main/java/com/soptie/server/persistence/repository/ThemeRepository.java +++ b/src/main/java/com/soptie/server/persistence/repository/ThemeRepository.java @@ -6,7 +6,7 @@ import com.soptie.server.persistence.entity.ThemeEntity; -public interface ThemeRepository extends JpaRepository, ThemeCustomRepository { +public interface ThemeRepository extends JpaRepository { List findByMakerIdIsNullOrderBySequenceAsc(); List findByIdIn(List ids); diff --git a/src/main/java/com/soptie/server/persistence/repository/ThemeRepositoryImpl.java b/src/main/java/com/soptie/server/persistence/repository/ThemeRepositoryImpl.java deleted file mode 100644 index fcd060c3..00000000 --- a/src/main/java/com/soptie/server/persistence/repository/ThemeRepositoryImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.soptie.server.persistence.repository; - -import static com.soptie.server.persistence.entity.QMakerEntity.makerEntity; -import static com.soptie.server.persistence.entity.QThemeEntity.themeEntity; - -import java.util.List; - -import org.springframework.stereotype.Repository; - -import com.querydsl.jpa.impl.JPAQueryFactory; -import com.soptie.server.api.controller.dto.response.maker.MakerThemeResponse; -import com.soptie.server.api.controller.dto.response.maker.QMakerThemeResponse; - -import lombok.RequiredArgsConstructor; - -@Repository -@RequiredArgsConstructor -public class ThemeRepositoryImpl implements ThemeCustomRepository { - - private final JPAQueryFactory queryFactory; - - @Override - public List findAllWithMaker() { - return queryFactory.select(new QMakerThemeResponse(themeEntity, makerEntity)) - .from(themeEntity) - .innerJoin(makerEntity).on(themeEntity.makerId.eq(makerEntity.id)) - .fetchJoin() - .fetch(); - } -} From 942367cc4e3edd81918208c50aef4d5f47abba42 Mon Sep 17 00:00:00 2001 From: Chan531 Date: Thu, 19 Dec 2024 17:18:24 +0900 Subject: [PATCH 04/13] delete: maker success message --- .../soptie/server/api/controller/generic/SuccessMessage.java | 3 --- 1 file changed, 3 deletions(-) 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 index 3f007671..e7d4333b 100644 --- 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("메모 수정 성공"), From e273624cb06aad71a6640ac91b17f6fab66d6e0c Mon Sep 17 00:00:00 2001 From: Chan531 Date: Thu, 19 Dec 2024 17:18:41 +0900 Subject: [PATCH 05/13] delete: maker api dto --- .../response/maker/GetMakerListResponse.java | 59 ------------------- .../response/maker/MakerThemeResponse.java | 23 -------- 2 files changed, 82 deletions(-) delete mode 100644 src/main/java/com/soptie/server/api/controller/dto/response/maker/GetMakerListResponse.java delete mode 100644 src/main/java/com/soptie/server/api/controller/dto/response/maker/MakerThemeResponse.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 deleted file mode 100644 index 7f828e1f..00000000 --- a/src/main/java/com/soptie/server/api/controller/dto/response/maker/GetMakerListResponse.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.soptie.server.api.controller.dto.response.maker; - -import static lombok.AccessLevel.PRIVATE; - -import java.util.List; - -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import lombok.Builder; - -@Builder(access = PRIVATE) -public record GetMakerListResponse( - @Schema(description = "메아커 테마 정보 목록") - @NotNull List makers -) { - - public static GetMakerListResponse from(List response) { - return GetMakerListResponse.builder() - .makers(response.stream().map(GetMakerResponse::from).toList()) - .build(); - } - - @Builder(access = PRIVATE) - private record GetMakerResponse( - @Schema(description = "메이커 id", example = "1") - long makerId, - @Schema(description = "메이커 소개 페이지 url", example = "https://www.test") - @NotNull String introductionUrl, - @Schema(description = "메이커 이름", example = "소프티") - @NotNull String name, - @Schema(description = "메이커 프로필 이미지 url", example = "https://www.test") - @NotNull String profileImageUrl, - @Schema(description = "메이커 태그 목록", example = "[\"소프티한\", \"행복한\", \"유능한\"]") - @NotNull List tags, - @Schema(description = "테마 id", example = "1") - long themeId, - @Schema(description = "테마 설명", example = "소프티하려면 ...더보기") - @NotNull String description, - @Schema(description = "테마 이름", example = "소프티해지기") - @NotNull String themeName, - @Schema(description = "수식어", example = "200만 유튜버와 함께 하는") - @NotNull String comment - ) { - - public static GetMakerResponse from(MakerThemeResponse response) { - return GetMakerResponse.builder() - .makerId(response.maker().getId()) - .introductionUrl(response.maker().getIntroductionUrl()) - .name(response.maker().getName()) - .profileImageUrl(response.maker().getProfileImageUrl()) - .tags(response.maker().getTags().toTagList()) - .themeId(response.theme().getId()) - .description(response.theme().getDescription()) - .themeName(response.theme().getName()) - .comment(response.theme().getComment()) - .build(); - } - } -} 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 deleted file mode 100644 index 530ffd8f..00000000 --- a/src/main/java/com/soptie/server/api/controller/dto/response/maker/MakerThemeResponse.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.soptie.server.api.controller.dto.response.maker; - -import com.querydsl.core.annotations.QueryProjection; -import com.soptie.server.domain.maker.Maker; -import com.soptie.server.domain.theme.Theme; -import com.soptie.server.persistence.entity.MakerEntity; -import com.soptie.server.persistence.entity.ThemeEntity; - -import jakarta.validation.constraints.NotNull; - -public record MakerThemeResponse( - @NotNull Theme theme, - @NotNull Maker maker -) { - - @QueryProjection - public MakerThemeResponse(ThemeEntity themeEntity, MakerEntity makerEntity) { - this( - themeEntity.toDomain(), - makerEntity.toDomain() - ); - } -} From b6f155fcd787992ff99d6a238fb0505501a5ba20 Mon Sep 17 00:00:00 2001 From: Chan531 Date: Thu, 19 Dec 2024 17:19:05 +0900 Subject: [PATCH 06/13] delete: maker entity --- .../persistence/entity/MakerEntity.java | 38 ------------------- 1 file changed, 38 deletions(-) delete mode 100644 src/main/java/com/soptie/server/persistence/entity/MakerEntity.java diff --git a/src/main/java/com/soptie/server/persistence/entity/MakerEntity.java b/src/main/java/com/soptie/server/persistence/entity/MakerEntity.java deleted file mode 100644 index d51af0e7..00000000 --- a/src/main/java/com/soptie/server/persistence/entity/MakerEntity.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.soptie.server.persistence.entity; - -import com.soptie.server.domain.maker.Maker; -import com.soptie.server.domain.maker.Tags; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.Table; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; - -@Entity -@NoArgsConstructor(access = AccessLevel.PROTECTED) -@Table(name = "maker", schema = "softie") -public class MakerEntity extends BaseEntity { - @Column(nullable = false) - private String name; - private String introductionUrl; - private String profileImageUrl; - private String tags; - - public MakerEntity(Maker maker) { - this.name = maker.getName(); - this.introductionUrl = maker.getIntroductionUrl(); - this.profileImageUrl = maker.getProfileImageUrl(); - this.tags = maker.getTags().getContents(); - } - - public Maker toDomain() { - return Maker.builder() - .id(this.id) - .name(this.name) - .introductionUrl(this.introductionUrl) - .profileImageUrl(this.profileImageUrl) - .tags(new Tags(tags)) - .build(); - } -} From a8a99e55388eb879082799fc977975488bb51098 Mon Sep 17 00:00:00 2001 From: Chan531 Date: Thu, 19 Dec 2024 17:19:18 +0900 Subject: [PATCH 07/13] delete: maker service --- .../server/domain/maker/MakerService.java | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 src/main/java/com/soptie/server/domain/maker/MakerService.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 deleted file mode 100644 index 1dee2bd3..00000000 --- a/src/main/java/com/soptie/server/domain/maker/MakerService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.soptie.server.domain.maker; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.soptie.server.api.controller.dto.response.maker.GetMakerListResponse; -import com.soptie.server.persistence.adapter.ThemeAdapter; - -import lombok.RequiredArgsConstructor; -import lombok.val; - -@Service -@RequiredArgsConstructor -@Transactional(readOnly = true) -public class MakerService { - - private final ThemeAdapter themeAdapter; - - public GetMakerListResponse acquireAll() { - val themes = themeAdapter.findAllWithMaker(); - return GetMakerListResponse.from(themes); - } -} From bb6fcda4ef8b11b80b3540bb96989ddd82d8ec5a Mon Sep 17 00:00:00 2001 From: Chan531 Date: Thu, 19 Dec 2024 17:19:29 +0900 Subject: [PATCH 08/13] delete: maker adapter --- .../server/persistence/adapter/MakerAdapter.java | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 src/main/java/com/soptie/server/persistence/adapter/MakerAdapter.java diff --git a/src/main/java/com/soptie/server/persistence/adapter/MakerAdapter.java b/src/main/java/com/soptie/server/persistence/adapter/MakerAdapter.java deleted file mode 100644 index ba128d3b..00000000 --- a/src/main/java/com/soptie/server/persistence/adapter/MakerAdapter.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.soptie.server.persistence.adapter; - -import com.soptie.server.common.support.RepositoryAdapter; -import com.soptie.server.persistence.repository.MakerRepository; - -import lombok.RequiredArgsConstructor; - -@RepositoryAdapter -@RequiredArgsConstructor -public class MakerAdapter { - - private final MakerRepository makerRepository; - -} From 8ee5260e35ef719a8c55d1a55f62e095951e9ffc Mon Sep 17 00:00:00 2001 From: Chan531 Date: Thu, 19 Dec 2024 17:19:42 +0900 Subject: [PATCH 09/13] delete: maker api --- .../server/api/controller/MakerApi.java | 32 ------------------- .../api/controller/docs/MakerApiDocs.java | 31 ------------------ 2 files changed, 63 deletions(-) delete mode 100644 src/main/java/com/soptie/server/api/controller/MakerApi.java delete mode 100644 src/main/java/com/soptie/server/api/controller/docs/MakerApiDocs.java diff --git a/src/main/java/com/soptie/server/api/controller/MakerApi.java b/src/main/java/com/soptie/server/api/controller/MakerApi.java deleted file mode 100644 index 3cd8e7a9..00000000 --- a/src/main/java/com/soptie/server/api/controller/MakerApi.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.soptie.server.api.controller; - -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseStatus; -import org.springframework.web.bind.annotation.RestController; - -import com.soptie.server.api.controller.docs.MakerApiDocs; -import com.soptie.server.api.controller.dto.response.SuccessResponse; -import com.soptie.server.api.controller.dto.response.maker.GetMakerListResponse; -import com.soptie.server.api.controller.generic.SuccessMessage; -import com.soptie.server.domain.maker.MakerService; - -import lombok.RequiredArgsConstructor; -import lombok.val; - -@RestController -@RequiredArgsConstructor -@RequestMapping("/api/v2/makers") -public class MakerApi implements MakerApiDocs { - - private final MakerService makerService; - - @Override - @GetMapping - @ResponseStatus(HttpStatus.OK) - public SuccessResponse acquireAll() { - val response = makerService.acquireAll(); - return SuccessResponse.success(SuccessMessage.SUCCESS_GET_MAKER_THEME.getMessage(), response); - } -} 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 deleted file mode 100644 index 140dbf1b..00000000 --- a/src/main/java/com/soptie/server/api/controller/docs/MakerApiDocs.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.soptie.server.api.controller.docs; - -import com.soptie.server.api.controller.dto.response.ErrorResponse; -import com.soptie.server.api.controller.dto.response.SuccessResponse; -import com.soptie.server.api.controller.dto.response.maker.GetMakerListResponse; - -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.media.Content; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.responses.ApiResponse; -import io.swagger.v3.oas.annotations.tags.Tag; - -@Tag(name = "[Maker] 메이커 루틴 API", description = "메이커 루틴 API") -public interface MakerApiDocs { - - @Operation( - summary = "메이커 테마 리스트 조회", - description = "메이커 테마 리스트를 조회한다.", - responses = { - @ApiResponse(responseCode = "200", description = "성공"), - @ApiResponse( - responseCode = "4xx", - description = "클라이언트(요청) 오류", - content = @Content(schema = @Schema(implementation = ErrorResponse.class))), - @ApiResponse( - responseCode = "500", - description = "서버 내부 오류", - content = @Content(schema = @Schema(implementation = ErrorResponse.class)))} - ) - SuccessResponse acquireAll(); -} From cdbcf400ea311ba9db0630a25a21746dde680ce3 Mon Sep 17 00:00:00 2001 From: Chan531 Date: Thu, 19 Dec 2024 17:20:02 +0900 Subject: [PATCH 10/13] refactor: delete unused method --- .../java/com/soptie/server/domain/theme/ThemeService.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/com/soptie/server/domain/theme/ThemeService.java b/src/main/java/com/soptie/server/domain/theme/ThemeService.java index a278693d..6d761ff3 100644 --- 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); - } } From a25b425dabbfdff1530d44d55867990aff443a5e Mon Sep 17 00:00:00 2001 From: Chan531 Date: Thu, 19 Dec 2024 17:28:53 +0900 Subject: [PATCH 11/13] delete: maker test --- .../server/domain/maker/MakerServiceTest.java | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100644 src/test/java/com/soptie/server/domain/maker/MakerServiceTest.java diff --git a/src/test/java/com/soptie/server/domain/maker/MakerServiceTest.java b/src/test/java/com/soptie/server/domain/maker/MakerServiceTest.java deleted file mode 100644 index 63cbc00a..00000000 --- a/src/test/java/com/soptie/server/domain/maker/MakerServiceTest.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.soptie.server.domain.maker; - -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.InjectMocks; -import org.mockito.junit.jupiter.MockitoExtension; - -@ExtendWith(MockitoExtension.class) -public class MakerServiceTest { - - @InjectMocks - private MakerService makerService; - - @Test - @DisplayName("[성공] 메이커와 해당하는 테마 정보를 조회한다.") - void getMakersWithTheme() { //TODO: 테스트 - // given - - // when - - // then - } - -} From 062ed8a8c0406d47a354c547a469015f9f9fdd94 Mon Sep 17 00:00:00 2001 From: Chan531 Date: Thu, 19 Dec 2024 17:52:57 +0900 Subject: [PATCH 12/13] refactor: delete makerId in theme --- src/main/java/com/soptie/server/domain/theme/Theme.java | 5 ++--- .../com/soptie/server/persistence/entity/ThemeEntity.java | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/soptie/server/domain/theme/Theme.java b/src/main/java/com/soptie/server/domain/theme/Theme.java index 1e5b8c86..b9fb73c1 100644 --- 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/persistence/entity/ThemeEntity.java b/src/main/java/com/soptie/server/persistence/entity/ThemeEntity.java index 4353bc1f..db425a13 100644 --- 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(); } } From c202029563f0020dc9768e1885d3c59aef39faf8 Mon Sep 17 00:00:00 2001 From: Chan531 Date: Thu, 19 Dec 2024 17:53:41 +0900 Subject: [PATCH 13/13] refactor: delete checking makerId --- .../com/soptie/server/persistence/adapter/ThemeAdapter.java | 2 +- .../soptie/server/persistence/repository/ThemeRepository.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/soptie/server/persistence/adapter/ThemeAdapter.java b/src/main/java/com/soptie/server/persistence/adapter/ThemeAdapter.java index 4c36f587..c79b8590 100644 --- a/src/main/java/com/soptie/server/persistence/adapter/ThemeAdapter.java +++ b/src/main/java/com/soptie/server/persistence/adapter/ThemeAdapter.java @@ -18,7 +18,7 @@ public class ThemeAdapter { private final ThemeRepository themeRepository; public List findByBasic() { - return themeRepository.findByMakerIdIsNullOrderBySequenceAsc() + return themeRepository.findByOrderBySequenceAsc() .stream().map(ThemeEntity::toDomain) .toList(); } diff --git a/src/main/java/com/soptie/server/persistence/repository/ThemeRepository.java b/src/main/java/com/soptie/server/persistence/repository/ThemeRepository.java index a6464075..568af78a 100644 --- a/src/main/java/com/soptie/server/persistence/repository/ThemeRepository.java +++ b/src/main/java/com/soptie/server/persistence/repository/ThemeRepository.java @@ -7,7 +7,7 @@ import com.soptie.server.persistence.entity.ThemeEntity; public interface ThemeRepository extends JpaRepository { - List findByMakerIdIsNullOrderBySequenceAsc(); + List findByOrderBySequenceAsc(); List findByIdIn(List ids); }