Skip to content

Commit d40e491

Browse files
committed
refactor/367 관리자대시보드-전체 펀딩 목록보기 Resoponse간소화
1 parent c5d9b2a commit d40e491

File tree

5 files changed

+29
-67
lines changed

5 files changed

+29
-67
lines changed

src/main/java/com/back/domain/dashboard/admin/dto/response/AdminFundingApprovalResponse.java

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -25,36 +25,18 @@ public record AdminFundingApprovalResponse(
2525
) {
2626

2727
/**
28-
* 펀딩 승인 대기 정보
28+
* 펀딩 승인 대기 정보 (화면 표시 필드만)
2929
*/
3030
public record FundingApproval(
3131
/** 펀딩 ID */
3232
Long fundingId,
33-
/** 펀딩 제목 */
34-
String title,
35-
/** 작가 정보 */
36-
Artist artist,
37-
/** 목표 금액 */
38-
long targetAmount,
39-
/** 펀딩 시작일 */
40-
String startDate,
41-
/** 펀딩 종료일 */
42-
String endDate,
43-
/** 펀딩 신청일 */
44-
String registeredAt,
45-
/** 메인 이미지 */
46-
String mainImage
47-
) {}
48-
49-
/**
50-
* 작가 정보
51-
*/
52-
public record Artist(
5333
/** 작가 ID */
54-
Long id,
34+
Long artistId,
5535
/** 작가명 */
56-
String name,
57-
/** 이메일 */
58-
String email
36+
String artistName,
37+
/** 펀딩 제목 */
38+
String title,
39+
/** 신청일자 */
40+
String registeredAt
5941
) {}
6042
}

src/main/java/com/back/domain/dashboard/admin/dto/response/AdminFundingResponse.java

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,15 @@ public record AdminFundingResponse(
2424
) {
2525

2626
/**
27-
* 펀딩 정보
27+
* 펀딩 정보 (화면 표시 필드만, 평면 구조)
2828
*/
2929
public record Funding(
3030
/** 펀딩 ID (기본키) */
3131
Long fundingId,
32-
/** 작가 정보 */
33-
Artist artist,
32+
/** 작가 ID */
33+
Long artistId,
34+
/** 작가명 */
35+
String artistName,
3436
/** 펀딩 제목 */
3537
String title,
3638
/** 달성률 (%) */
@@ -40,14 +42,4 @@ public record Funding(
4042
/** 마감일 */
4143
String endDate
4244
) {}
43-
44-
/**
45-
* 작가 정보
46-
*/
47-
public record Artist(
48-
/** 작가 ID */
49-
Long id,
50-
/** 작가명 */
51-
String name
52-
) {}
5345
}

src/main/java/com/back/domain/dashboard/admin/service/AdminDashboardServiceImpl.java

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ public AdminFundingResponse getFundings(AdminFundingSearchRequest request) {
640640
}
641641

642642
/**
643-
* Funding Entity → DTO 변환 (화면 표시 필드만)
643+
* Funding Entity → DTO 변환 (화면 표시 필드만, 평면 구조)
644644
*/
645645
private AdminFundingResponse.Funding convertToFundingDto(Funding funding) {
646646
// 달성률 계산
@@ -652,10 +652,8 @@ private AdminFundingResponse.Funding convertToFundingDto(Funding funding) {
652652

653653
return new AdminFundingResponse.Funding(
654654
funding.getId(),
655-
new AdminFundingResponse.Artist(
656-
funding.getUser().getId(),
657-
funding.getUser().getName()
658-
),
655+
funding.getUser().getId(),
656+
funding.getUser().getName(),
659657
funding.getTitle(),
660658
achievementRate,
661659
funding.getStatus().name(),
@@ -998,27 +996,17 @@ public AdminFundingApprovalResponse getFundingApprovals(AdminFundingApprovalSear
998996
}
999997

1000998
/**
1001-
* Funding Entity → FundingApproval DTO 변환
999+
* Funding Entity → FundingApproval DTO 변환 (화면 표시 필드만)
10021000
*/
10031001
private AdminFundingApprovalResponse.FundingApproval convertToFundingApprovalDto(Funding funding) {
10041002
DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy. MM. dd");
10051003

1006-
// 작가 정보
1007-
AdminFundingApprovalResponse.Artist artist = new AdminFundingApprovalResponse.Artist(
1008-
funding.getUser().getId(),
1009-
funding.getUser().getName(),
1010-
funding.getUser().getEmail() != null ? funding.getUser().getEmail() : "N/A"
1011-
);
1012-
10131004
return new AdminFundingApprovalResponse.FundingApproval(
10141005
funding.getId(),
1006+
funding.getUser().getId(),
1007+
funding.getUser().getName(),
10151008
funding.getTitle(),
1016-
artist,
1017-
funding.getTargetAmount(),
1018-
funding.getStartDate().format(dateFormatter),
1019-
funding.getEndDate().format(dateFormatter),
1020-
funding.getCreateDate().format(dateFormatter),
1021-
funding.getImageUrl()
1009+
funding.getCreateDate().format(dateFormatter)
10221010
);
10231011
}
10241012

src/test/java/com/back/domain/dashboard/admin/controller/AdminDashboardControllerTest.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ void getProducts_Success_WithRealData() throws Exception {
164164
.andExpect(jsonPath("$.data.totalElements").isNumber())
165165
.andExpect(jsonPath("$.data.content[0].productId").exists())
166166
.andExpect(jsonPath("$.data.content[0].name").exists())
167-
.andExpect(jsonPath("$.data.content[0].artist.name").exists());
167+
.andExpect(jsonPath("$.data.content[0].artistName").exists());
168168
}
169169

170170
@Test
@@ -427,10 +427,10 @@ void rejectArtistApplication_Success() throws Exception {
427427

428428
String rejectionReason = "제출 서류가 불충분합니다.";
429429
String requestBody = String.format("""
430-
{
431-
"rejectionReason": "%s"
432-
}
433-
""", rejectionReason);
430+
{
431+
"rejectionReason": "%s"
432+
}
433+
""", rejectionReason);
434434

435435
// When & Then
436436
mockMvc.perform(post("/api/dashboard/admin/artist-applications/{applicationId}/reject", saved.getId())
@@ -461,10 +461,10 @@ void rejectArtistApplication_Fail_NoReason() throws Exception {
461461
ArtistApplication saved = artistApplicationRepository.save(application);
462462

463463
String requestBody = """
464-
{
465-
"rejectionReason": ""
466-
}
467-
""";
464+
{
465+
"rejectionReason": ""
466+
}
467+
""";
468468

469469
// When & Then
470470
mockMvc.perform(post("/api/dashboard/admin/artist-applications/{applicationId}/reject", saved.getId())

src/test/java/com/back/domain/dashboard/admin/service/AdminDashboardServiceImplTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ private void setupSecurityContext() {
554554

555555
// Then
556556
response.content().forEach(funding ->
557-
assertThat(funding.artist().id()).isEqualTo(artistUser.getId())
557+
assertThat(funding.artistId()).isEqualTo(artistUser.getId())
558558
);
559559
}
560560

0 commit comments

Comments
 (0)