Skip to content

Commit 5e6d6f3

Browse files
essaysiressaysir
authored
Merge pull request #458 from Juinjang/dev
Mock Controller 구현 완료
2 parents eba55b1 + d500380 commit 5e6d6f3

9 files changed

Lines changed: 320 additions & 57 deletions

File tree

‎Dockerfile-dev‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM openjdk:17-jdk
1+
FROM eclipse-temurin:17-jdk
22

33
ARG JAR_FILE=./build/libs/juinjang-0.0.1-SNAPSHOT.jar
44
ENV GOOGLE_APPLICATION_CREDENTIALS=/app/config/service-account-key.json

‎src/main/java/umc/th/juinjang/api/checklist/service/response/ReportGetResponse.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,17 @@ public static ReportGetResponse of(Report report) {
2424
report.getTotalRate()
2525
);
2626
}
27+
28+
public static ReportGetResponse mock() {
29+
return new ReportGetResponse(
30+
1L,
31+
"상당히 쾌적한 실내",
32+
"훌륭한 공용 공간",
33+
"좋은 편인 입지 조건",
34+
4.6f,
35+
4.3f,
36+
4.7f,
37+
4.5f
38+
);
39+
}
2740
}

‎src/main/java/umc/th/juinjang/api/limjang/service/response/LimjangDetailGetResponse.java‎

Lines changed: 47 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,60 @@
11
package umc.th.juinjang.api.limjang.service.response;
22

3-
import static umc.th.juinjang.api.limjang.service.LimjangPriceBridge.makePriceListVersion2;
3+
import static umc.th.juinjang.api.limjang.service.LimjangPriceBridge.*;
44

55
import java.time.LocalDateTime;
66
import java.util.List;
7+
78
import lombok.Builder;
8-
import umc.th.juinjang.domain.image.model.Image;
9+
import umc.th.juinjang.common.constant.MockConstant;
910
import umc.th.juinjang.domain.checklist.model.LimjangCheckListVersion;
11+
import umc.th.juinjang.domain.image.model.Image;
1012
import umc.th.juinjang.domain.limjang.model.Limjang;
1113

1214
@Builder
1315
public record LimjangDetailGetResponse(
14-
long limjangId,
15-
LimjangCheckListVersion checkListVersion,
16-
List<String> images,
17-
int purposeCode,
18-
String nickname,
19-
int priceType,
20-
List<String> priceList,
21-
String address,
22-
String addressDetail,
23-
LocalDateTime createdAt,
24-
LocalDateTime updatedAt
16+
long limjangId,
17+
LimjangCheckListVersion checkListVersion,
18+
List<String> images,
19+
int purposeCode,
20+
String nickname,
21+
int priceType,
22+
List<String> priceList,
23+
String address,
24+
String addressDetail,
25+
LocalDateTime createdAt,
26+
LocalDateTime updatedAt
2527
) {
26-
public static LimjangDetailGetResponse of(Limjang limjang){
27-
return LimjangDetailGetResponse.builder()
28-
.limjangId(limjang.getLimjangId())
29-
.checkListVersion(LimjangCheckListVersion.getByLimjangType(limjang))
30-
.images(limjang.getImageList().stream().map(Image::getImageUrl).toList())
31-
.purposeCode(limjang.getPurpose().getValue())
32-
.nickname(limjang.getNickname())
33-
.priceType(limjang.getPriceType().getValue())
34-
.priceList(makePriceListVersion2(limjang.getPriceType(), limjang.getPurpose(), limjang.getLimjangPrice()))
35-
.address(limjang.getAddress())
36-
.addressDetail(limjang.getAddressDetail())
37-
.createdAt(limjang.getCreatedAt())
38-
.updatedAt(limjang.getUpdatedAt())
39-
.build();
40-
}
28+
public static LimjangDetailGetResponse of(Limjang limjang) {
29+
return LimjangDetailGetResponse.builder()
30+
.limjangId(limjang.getLimjangId())
31+
.checkListVersion(LimjangCheckListVersion.getByLimjangType(limjang))
32+
.images(limjang.getImageList().stream().map(Image::getImageUrl).toList())
33+
.purposeCode(limjang.getPurpose().getValue())
34+
.nickname(limjang.getNickname())
35+
.priceType(limjang.getPriceType().getValue())
36+
.priceList(makePriceListVersion2(limjang.getPriceType(), limjang.getPurpose(), limjang.getLimjangPrice()))
37+
.address(limjang.getAddress())
38+
.addressDetail(limjang.getAddressDetail())
39+
.createdAt(limjang.getCreatedAt())
40+
.updatedAt(limjang.getUpdatedAt())
41+
.build();
42+
}
43+
44+
public static LimjangDetailGetResponse mock() {
45+
return LimjangDetailGetResponse.builder()
46+
.limjangId(1L)
47+
.checkListVersion(LimjangCheckListVersion.LIMJANG)
48+
.images(List.of(MockConstant.Image.IMAGE_1, MockConstant.Image.IMAGE_2,
49+
MockConstant.Image.IMAGE_3, MockConstant.Image.IMAGE_4))
50+
.purposeCode(1)
51+
.nickname("우성 아파트")
52+
.priceType(0)
53+
.priceList(List.of("500000000"))
54+
.address("서울특별시 강남구 테헤란로 123")
55+
.addressDetail("101동 1001호")
56+
.createdAt(LocalDateTime.of(2024, 11, 15, 10, 30))
57+
.updatedAt(LocalDateTime.of(2024, 11, 20, 14, 20))
58+
.build();
59+
}
4160
}

‎src/main/java/umc/th/juinjang/api/limjang/service/response/LimjangsMainGetVersion2Response.java‎

Lines changed: 43 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,52 @@
11
package umc.th.juinjang.api.limjang.service.response;
22

3-
import static umc.th.juinjang.api.limjang.service.LimjangPriceBridge.getPriceToString;
3+
import static umc.th.juinjang.api.limjang.service.LimjangPriceBridge.*;
44

55
import java.util.List;
6+
67
import lombok.Builder;
8+
import umc.th.juinjang.common.constant.MockConstant;
79
import umc.th.juinjang.domain.limjang.model.Limjang;
810

911
public record LimjangsMainGetVersion2Response(List<LimjangMainVersion2Response> recentUpdatedList) {
10-
@Builder
11-
record LimjangMainVersion2Response(
12-
long limjangId,
13-
int priceType,
14-
String image,
15-
String nickname,
16-
String price,
17-
String totalAverage,
18-
String address) {
19-
20-
static LimjangMainVersion2Response of(Limjang limjang) {
21-
return LimjangMainVersion2Response.builder()
22-
.limjangId(limjang.getLimjangId())
23-
.priceType(limjang.getPriceType().getValue())
24-
.image(limjang.getDefaultImage())
25-
.nickname(limjang.getNickname())
26-
.price(getPriceToString(limjang))
27-
.totalAverage(limjang.getReport() == null ? null : limjang.getReport().getTotalRate().toString())
28-
.address(limjang.getAddress())
29-
.build();
30-
}
31-
}
32-
33-
public static LimjangsMainGetVersion2Response of(List<Limjang> limjangList) {
34-
return new LimjangsMainGetVersion2Response(limjangList.stream().map(LimjangMainVersion2Response::of).toList());
35-
}
12+
@Builder
13+
record LimjangMainVersion2Response(
14+
long limjangId,
15+
int priceType,
16+
String image,
17+
String nickname,
18+
String price,
19+
String totalAverage,
20+
String address) {
21+
22+
static LimjangMainVersion2Response of(Limjang limjang) {
23+
return LimjangMainVersion2Response.builder()
24+
.limjangId(limjang.getLimjangId())
25+
.priceType(limjang.getPriceType().getValue())
26+
.image(limjang.getDefaultImage())
27+
.nickname(limjang.getNickname())
28+
.price(getPriceToString(limjang))
29+
.totalAverage(limjang.getReport() == null ? null : limjang.getReport().getTotalRate().toString())
30+
.address(limjang.getAddress())
31+
.build();
32+
}
33+
}
34+
35+
public static LimjangsMainGetVersion2Response of(List<Limjang> limjangList) {
36+
return new LimjangsMainGetVersion2Response(limjangList.stream().map(LimjangMainVersion2Response::of).toList());
37+
}
38+
39+
public static LimjangsMainGetVersion2Response mock() {
40+
LimjangMainVersion2Response mockNote = LimjangMainVersion2Response.builder()
41+
.limjangId(1L)
42+
.priceType(0)
43+
.image(MockConstant.Image.IMAGE_1)
44+
.nickname("우성 아파트")
45+
.price("3010000000")
46+
.totalAverage("3.63")
47+
.address("")
48+
.build();
49+
50+
return new LimjangsMainGetVersion2Response(List.of(mockNote));
51+
}
3652
}

‎src/main/java/umc/th/juinjang/api/limjang/service/response/UserNoteGetResponse.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.time.format.DateTimeFormatter;
44
import java.util.List;
55

6+
import umc.th.juinjang.common.constant.MockConstant;
67
import umc.th.juinjang.domain.image.model.Image;
78
import umc.th.juinjang.domain.limjang.model.Address;
89
import umc.th.juinjang.domain.limjang.model.Limjang;
@@ -52,4 +53,28 @@ public static UserNoteGetResponse of(boolean isShared, Limjang note, Address add
5253
address != null ? address.getBname2() : null
5354
);
5455
}
56+
57+
public static UserNoteGetResponse mock() {
58+
return new UserNoteGetResponse(
59+
true,
60+
LimjangPurpose.RESIDENTIAL_PURPOSE,
61+
LimjangPropertyType.APARTMENT,
62+
LimjangPriceType.SALE,
63+
"우성 아파트",
64+
List.of(MockConstant.Image.IMAGE_1, MockConstant.Image.IMAGE_2,
65+
MockConstant.Image.IMAGE_3, MockConstant.Image.IMAGE_4),
66+
"서울 송파구 잠실동",
67+
"101-1",
68+
"3010000000",
69+
null,
70+
"23.12.01",
71+
"10",
72+
28,
73+
"1168010100",
74+
"서울특별시",
75+
"송파구",
76+
"잠실동",
77+
""
78+
);
79+
}
5580
}

‎src/main/java/umc/th/juinjang/api/limjang/service/response/UserNotesGetResponse.java‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.util.List;
44
import java.util.Map;
55

6+
import umc.th.juinjang.common.constant.MockConstant;
67
import umc.th.juinjang.domain.image.model.Image;
78
import umc.th.juinjang.domain.limjang.model.Limjang;
89
import umc.th.juinjang.domain.limjang.model.LimjangPriceType;
@@ -53,4 +54,26 @@ public static UserNotesGetResponse of(List<Limjang> limjangs, Map<Long, Boolean>
5354
return new UserNotesGetResponse(
5455
limjangs.stream().map(it -> UserNoteResponse.of(it, isScraped.get(it.getLimjangId()))).toList());
5556
}
57+
58+
public static UserNotesGetResponse mock() {
59+
UserNoteResponse mockNote1 = new UserNoteResponse(
60+
1L,
61+
LimjangPurpose.RESIDENTIAL_PURPOSE,
62+
LimjangPropertyType.APARTMENT,
63+
LimjangPriceType.SALE,
64+
"우성 아파트",
65+
List.of(MockConstant.Image.IMAGE_1, MockConstant.Image.IMAGE_2,
66+
MockConstant.Image.IMAGE_3, MockConstant.Image.IMAGE_4),
67+
true,
68+
"3.63",
69+
"3010000000",
70+
null,
71+
28,
72+
"10",
73+
"서울 송파구 잠실동 101-1",
74+
"서울시"
75+
);
76+
77+
return new UserNotesGetResponse(List.of(mockNote1));
78+
}
5679
}

0 commit comments

Comments
 (0)