Skip to content

Commit

Permalink
Merge pull request #45 from YAPP-Github/feat/ISSUE-44
Browse files Browse the repository at this point in the history
add: car and user information to get user API
  • Loading branch information
Seokyeong237 authored Feb 4, 2024
2 parents b05a9fb + fbb2200 commit 92cddcb
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.fullcar.carpool.domain.carpool.CarpoolState;
import com.fullcar.carpool.domain.carpool.MoodType;
import com.fullcar.carpool.domain.carpool.PeriodType;
import com.fullcar.member.domain.member.Gender;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
Expand Down Expand Up @@ -45,7 +46,7 @@ public class CarpoolResponseDto {
private String companyName;

@Schema(description = "성별")
private String gender;
private Gender gender;

@Schema(description = "생성 Timestamp")
private LocalDateTime createdAt;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ public MemberGetResponseDto toDto(Member member) {
return MemberGetResponseDto.builder()
.nickname(member.getNickname())
.companyName(member.getCompany().getCompanyName())
.email(member.getEmail())
.gender(member.getGender())
.carId(member.getCarId())
.build();
}
}
7 changes: 7 additions & 0 deletions src/main/java/com/fullcar/member/domain/member/Gender.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.fullcar.member.domain.member;

public enum Gender {
FEMALE,
MALE,
NONE
}
2 changes: 1 addition & 1 deletion src/main/java/com/fullcar/member/domain/member/Member.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public class Member {

private String email;

private String gender;
private Gender gender;

@Builder.Default
@Column(name = "onboarding_flag")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.fullcar.member.presentation.member.dto.response;

import com.fullcar.member.domain.car.CarId;
import com.fullcar.member.domain.member.Gender;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;

Expand All @@ -15,4 +17,14 @@ public class MemberGetResponseDto {

@Schema(description = "회사명", example = "현대 자동차")
private String companyName;

@Schema(description = "회사 이메일", example = "[email protected]")
private String email;

@Schema(description = "성별", example = "MALE")
private Gender gender;

@Schema(description = "차량 id")
private CarId carId;

}

0 comments on commit 92cddcb

Please sign in to comment.