Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FIX] Bakery 엔티티에 instagram url 필드 추가해라 #137

Merged
merged 7 commits into from
Aug 13, 2023
Merged

[FIX] Bakery 엔티티에 instagram url 필드 추가해라 #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9b763cc
[FIX] Bakery 엔티티에 instagram url 추가해라
sung-silver Aug 13, 2023
ecac252
[FIX] BakeryService, BakeryDetailResponseDTO에 instagramUrl을 추가하고 관련 로…
sung-silver Aug 13, 2023
0aec72f
[FIX] Bakery 엔티티 수정에 따라 h2 database init schema.sql을 수정해라
sung-silver Aug 13, 2023
2939511
[FIX] Bakery 엔티티 수정에 따른 H2 데이터베이스 더미 데이터에 instagram url을 추가해라
sung-silver Aug 13, 2023
44e2608
Merge branch 'dev' into fix/#136
sung-silver Aug 13, 2023
3194380
[FIX] dev와의 conflict 해결
sung-silver Aug 13, 2023
a334855
Merge branch 'fix/#136' of https://github.com/GEON-PPANG/GEON-PPANG-S…
sung-silver Aug 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion api/src/main/java/com/org/gunbbang/controller/DTO/response/BakeryDetailResponseDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ public class BakeryDetailResponseDTO extends BaseBakeryResponseDTO {
private Long reviewCount;
private BreadTypeResponseDTO breadType;
private String mapUrl;
private String homepage;
private String homepageUrl;
private String instagramUrl;
private String address;
private String openingTime;
private String closedDay;
Expand Down
3 changes: 2 additions & 1 deletion api/src/main/java/com/org/gunbbang/service/BakeryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,8 @@ public BakeryDetailResponseDTO getBakeryDetail(Long memberId, Long bakeryId) {
.bookMarkCount(bakery.getBookMarkCount())
.reviewCount(bakery.getReviewCount())
.mapUrl(bakery.getMapUrl())
.homepage(bakery.getHomepage())
.homepageUrl(bakery.getHomepageUrl())
.instagramUrl(bakery.getInstagramUrl())
.address(
bakery.getState()
+ " "
Expand Down
4 changes: 3 additions & 1 deletion storage/db-core/src/main/java/com/org/gunbbang/entity/Bakery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ public class Bakery {

@NotNull private String mapUrl;

private String homepage;
private String homepageUrl;

private String instagramUrl;

private String firstNearStation;

Expand Down
Loading