Skip to content

Commit b7d54b3

Browse files
authored
Merge pull request #229 from prgrms-web-devcourse-final-project/jsy/mainpage/fav-location_address
✨ feat: 마이페이지 - 즐겨찾기 장소 주소 데이터 추가
2 parents 8552e2a + 5049456 commit b7d54b3

File tree

8 files changed

+29
-6
lines changed

8 files changed

+29
-6
lines changed

src/main/java/com/grepp/spring/app/controller/api/mypage/payload/request/CreateFavoritePlaceRequest.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,12 @@
1313
@NoArgsConstructor
1414
public class CreateFavoritePlaceRequest {
1515
@NotNull
16-
@Schema(example = ".강남역 8번 출구")
16+
@Schema(example = "강남역 8번 출구")
1717
private String stationName; // 역이름으로 수정
1818
@NotNull
19+
@Schema(example = "서울특별시 강남구 강남대로 396")
20+
private String address; //
21+
@NotNull
1922
@Schema(example = "37.4979")
2023
private double latitude;
2124
@NotNull

src/main/java/com/grepp/spring/app/controller/api/mypage/payload/request/ModifyFavoritePlaceRequest.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.grepp.spring.app.controller.api.mypage.payload.request;
22

33
import io.swagger.v3.oas.annotations.media.Schema;
4+
import jakarta.validation.constraints.NotNull;
45
import lombok.AllArgsConstructor;
56
import lombok.Getter;
67
import lombok.NoArgsConstructor;
@@ -10,13 +11,19 @@
1011
@NoArgsConstructor
1112
public class ModifyFavoritePlaceRequest {
1213

14+
@NotNull
1315
@Schema(example = "10033")
1416
private Long favoritePlaceId;
17+
@NotNull
1518
@Schema(example = "합정역 8번 출구")
1619
private String stationName;
20+
@Schema(example = "서울특별시 마포구 양화로 72")
21+
@NotNull
22+
private String address;
1723
@Schema(example = "37.5492")
24+
@NotNull
1825
private double latitude;
1926
@Schema(example = "126.9135")
27+
@NotNull
2028
private double longitude;
21-
2229
}

src/main/java/com/grepp/spring/app/controller/api/mypage/payload/response/CreateFavoritePlaceResponse.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ public class CreateFavoritePlaceResponse {
2121
public static class FavoriteLocationList{
2222
private Long favoritePlaceId;
2323
private String stationName;
24+
private String address;
2425
private double latitude;
2526
private double longitude;
2627
private LocalDateTime createdAt;

src/main/java/com/grepp/spring/app/controller/api/mypage/payload/response/ModifyFavoritePlaceResponse.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ public class ModifyFavoritePlaceResponse {
2121
public static class ModifyFavLocationList{
2222
private Long favoritePlaceId;
2323
private String stationName;
24+
private String address;
2425
private double latitude;
2526
private double longitude;
2627
private LocalDateTime updatedAt;

src/main/java/com/grepp/spring/app/model/mypage/dto/FavoriteLocationDto.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ public class FavoriteLocationDto {
2222
private Long favoriteLocationId;
2323
private String memberId;
2424
private String stationName;
25+
private String address;
2526
private Double latitude;
2627
private Double longitude;
2728

@@ -31,6 +32,7 @@ public static FavoriteLocationDto fromEntity(FavoriteLocation entity) {
3132
.favoriteLocationId(entity.getId())
3233
.memberId(entity.getMember().getId())
3334
.stationName(entity.getName()) //Entity 내 name 필드 -> stationName 으로 쓰기
35+
.address(entity.getAddress())
3436
.latitude(entity.getLatitude())
3537
.longitude(entity.getLongitude())
3638
.build();
@@ -46,6 +48,7 @@ public static FavoriteLocation toEntity(FavoriteLocationDto dto) {
4648
.id(dto.getFavoriteLocationId())
4749
.member(member)
4850
.name(dto.getStationName())
51+
.address(dto.getAddress())
4952
.latitude(dto.getLatitude())
5053
.longitude(dto.getLongitude())
5154
.build();
@@ -56,6 +59,7 @@ public static CreateFavoritePlaceResponse fromDto(FavoriteLocationDto dto) {
5659
FavoriteLocationList item = FavoriteLocationList.builder()
5760
.favoritePlaceId(dto.getFavoriteLocationId())
5861
.stationName(dto.getStationName())
62+
.address(dto.getAddress())
5963
.latitude(dto.getLatitude())
6064
.longitude(dto.getLongitude())
6165
.build();
@@ -68,6 +72,7 @@ public static FavoriteLocationDto toDto(CreateFavoritePlaceRequest request, Memb
6872
return FavoriteLocationDto.builder()
6973
.memberId(member.getId())
7074
.stationName(request.getStationName())
75+
.address(request.getAddress())
7176
.latitude(request.getLatitude())
7277
.longitude(request.getLongitude())
7378
.build();
@@ -78,6 +83,7 @@ public static ModifyFavoritePlaceResponse toModifyResponse(FavoriteLocationDto d
7883
ModifyFavoritePlaceResponse.ModifyFavLocationList.builder()
7984
.favoritePlaceId(dto.getFavoriteLocationId())
8085
.stationName(dto.getStationName())
86+
.address(dto.getAddress())
8187
.latitude(dto.getLatitude())
8288
.longitude(dto.getLongitude())
8389
.build();

src/main/java/com/grepp/spring/app/model/mypage/entity/FavoriteLocation.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ public class FavoriteLocation extends BaseEntity {
5454
@Column(nullable = false)
5555
private String name;
5656

57+
@Column(nullable = false)
58+
private String address;
59+
5760
@OneToOne(fetch = FetchType.LAZY)
5861
@JoinColumn(name = "member_id", unique = true)
5962
private Member member;
@@ -65,13 +68,15 @@ public static FavoriteLocation create(Member member, CreateFavoritePlaceRequest
6568
.longitude(request.getLongitude())
6669
.latitude(request.getLatitude())
6770
.name(request.getStationName())
71+
.address(request.getAddress())
6872
.member(member)
6973
.build();
7074
}
7175

7276
// 위치 업데이트
7377
public void updateLocation(ModifyFavoritePlaceRequest request) {
7478
this.name = request.getStationName();
79+
this.address = request.getAddress();
7580
this.latitude = request.getLatitude();
7681
this.longitude = request.getLongitude();
7782
}

src/main/resources/indexing_mysql.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
CREATE INDEX idx_event_members_event_member
33
ON event_members(event_id, member_id);
44

5-
# CREATE INDEX idx_event_members_event_activated
6-
# ON event_members(event_id, confirmed);
5+
CREATE INDEX idx_event_members_event_activated
6+
ON event_members(event_id, activated);
77

88
-- 2. 인덱스 확인 (MySQL에서는 SHOW INDEX 사용)
99
SHOW INDEX FROM event_members;

src/main/resources/indexing_postgres.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
CREATE INDEX IF NOT EXISTS idx_event_members_event_member
33
ON event_members(event_id, member_id);
44

5-
-- CREATE INDEX IF NOT EXISTS idx_event_members_event_activated
6-
-- ON event_members(event_id, confirmed);
5+
CREATE INDEX IF NOT EXISTS idx_event_members_event_activated
6+
ON event_members(event_id, activated);
77

88
-- 2. 인덱스 확인 (스키마 명시)
99
SELECT *

0 commit comments

Comments
 (0)