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.

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

[Feat] 멤버 엔티티에 성별 필드 추가 & 여행 스타일 저장 시 입력받도록 구현 #73

Merged
merged 1 commit into from
Oct 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class TravelStyleController {
@PostMapping
public ResponseEntity<Void> saveTravelStyle(@Parameter(hidden = true) @LoggedInMemberId Long memberId,
@RequestBody PostTravelStyleRequest request) {
travelStyleService.saveTravelStyle(memberId, request.toEntity());
travelStyleService.saveTravelStyle(memberId, request.toEntity(), request.gender());
return ResponseEntity.ok().build();
}

Expand Down
8 changes: 8 additions & 0 deletions src/main/java/com/ku/covigator/domain/member/Gender.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package com.ku.covigator.domain.member;

import lombok.Getter;

@Getter
public enum Gender {
MALE, FEMALE
}
8 changes: 8 additions & 0 deletions src/main/java/com/ku/covigator/domain/member/Member.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ public class Member extends BaseTime {
@Column(name = "phone_number")
private String phoneNumber;

@Column(name = "gender")
@Enumerated(value = EnumType.STRING)
private Gender gender;

@Column(name = "password")
private String password;

Expand Down Expand Up @@ -88,4 +92,8 @@ public void updateNickname(String nickname) {
this.nickname = nickname;
}

public void updateGender(Gender gender) {
this.gender = gender;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@

import com.fasterxml.jackson.databind.PropertyNamingStrategies;
import com.fasterxml.jackson.databind.annotation.JsonNaming;
import com.ku.covigator.domain.member.Gender;
import com.ku.covigator.domain.travelstyle.*;
import lombok.Builder;

@Builder
@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
public record PostTravelStyleRequest(AreaType areaType, Familiarity familiarity, ActivityType activityType,
PlanningType planningType, PhotoPriority photoPriority, Popularity popularity) {
PlanningType planningType, PhotoPriority photoPriority, Popularity popularity, Gender gender) {

public TravelStyle toEntity() {
return TravelStyle.builder()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.ku.covigator.service;

import com.ku.covigator.domain.member.Gender;
import com.ku.covigator.domain.member.Member;
import com.ku.covigator.domain.travelstyle.TravelStyle;
import com.ku.covigator.exception.notfound.NotFoundMemberException;
Expand All @@ -17,17 +18,18 @@ public class TravelStyleService {
private final TravelStyleRepository travelStyleRepository;
private final MemberRepository memberRepository;

public void saveTravelStyle(Long memberId, TravelStyle travelStyle) {
public void saveTravelStyle(Long memberId, TravelStyle travelStyle, Gender gender) {
TravelStyle savedTravelStyle = travelStyleRepository.save(travelStyle);
Member savedMember = memberRepository.findById(memberId).orElseThrow(NotFoundMemberException::new);
savedMember.putTravelStyle(savedTravelStyle);
savedMember.updateGender(gender);
}

public void updateTravelStyle(Long memberId, TravelStyle travelStyle) {
Member savedMember = memberRepository.findById(memberId).orElseThrow(NotFoundMemberException::new);
// 여행 스타일 정보가 없으면 새로 저장한다.
if(savedMember.getTravelStyle() == null) {
saveTravelStyle(memberId, travelStyle);
saveTravelStyle(memberId, travelStyle, null);
}
// 여행 스타일 정보가 저장되어 있으면 수정한다.
savedMember.updateTravelStyle(travelStyle);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.ku.covigator.service;

import com.ku.covigator.domain.member.Gender;
import com.ku.covigator.domain.member.Member;
import com.ku.covigator.domain.member.Platform;
import com.ku.covigator.domain.travelstyle.*;
Expand Down Expand Up @@ -43,14 +44,15 @@ void saveTravelStyle() {
memberRepository.save(member);

//when
travelStyleService.saveTravelStyle(member.getId(), travelStyle);
travelStyleService.saveTravelStyle(member.getId(), travelStyle, Gender.MALE);
List<TravelStyle> travelStyles = travelStyleRepository.findAll();
TravelStyle savedTravelStyle = travelStyles.get(0);
Member savedMember = memberRepository.findById(member.getId()).get();

//then
assertAll(
() -> assertThat(savedTravelStyle.getId()).isEqualTo(travelStyle.getId()),
() -> assertThat(savedMember.getGender()).isEqualTo(Gender.MALE),
() -> assertThat(savedMember.getTravelStyle()).usingRecursiveComparison().isEqualTo(travelStyle)
);
}
Expand All @@ -62,7 +64,7 @@ void saveTravelStyleFailsWhenNoMemberExists() {
TravelStyle travelStyle = createTravelStyle();

//when //then
assertThatThrownBy(() -> travelStyleService.saveTravelStyle(1L, travelStyle))
assertThatThrownBy(() -> travelStyleService.saveTravelStyle(1L, travelStyle, null))
.isInstanceOf(NotFoundMemberException.class);
}

Expand Down
Loading