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

[Fix] 멤버 coffee chat 관련 필드 반영 #540

Merged
merged 2 commits into from
Nov 9, 2024
Merged

[Fix] 멤버 coffee chat 관련 필드 반영 #540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a7dbf0
fix: 멤버 coffee chat 관련 필드 반영
jun02160 Nov 8, 2024
beabac3
Merge branch 'develop' into fix/member_profile_coffeechat
jun02160 Nov 9, 2024
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
2 changes: 0 additions & 2 deletions src/main/java/org/sopt/makers/internal/dto/member/MemberProfileSpecificResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ public record MemberProfileSpecificResponse(
List<MemberCareerResponse> careers,
Boolean allowOfficial,
Boolean isCoffeeChatActivate,
String coffeeChatBio,
@Schema(required = true)
Boolean isMine
) {
Expand Down Expand Up @@ -116,7 +115,6 @@ public static MemberProfileSpecificResponse checkIsBlindPhone(MemberProfileSpeci
response.careers(),
response.allowOfficial(),
response.isCoffeeChatActivate(),
response.coffeeChatBio(),
isMine
);
}
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/org/sopt/makers/internal/mapper/MemberMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,17 @@ MemberProfileSpecificResponse toProfileSpecificResponse (
boolean isMine,
List<MemberProfileProjectDao> projects,
List<MemberProfileSpecificResponse.MemberActivityResponse> activities,
List<MemberProfileProjectVo> soptActivities
List<MemberProfileProjectVo> soptActivities,
Boolean isCoffeeChatActivate
);

@Mapping(target = "activities", source = "activities")
MemberProfileSpecificResponse toProfileSpecificResponse (
Member member,
boolean isMine,
List<MemberProfileProjectDao> projects,
List<MemberProfileSpecificResponse.MemberActivityResponse> activities
List<MemberProfileSpecificResponse.MemberActivityResponse> activities,
Boolean isCoffeeChatActivate
);

@Mapping(target = "activities", source = "activities")
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/org/sopt/makers/internal/member/controller/MemberController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,10 @@ public ResponseEntity<MemberProfileSpecificResponse> getUserProfile (
new MemberProfileSpecificResponse.MemberActivityResponse(entry.getKey(), entry.getValue())
).collect(Collectors.toList());
val isMine = Objects.equals(member.getId(), memberDetails.getId());
val isCoffeeChatActivate = coffeeChatService.getCoffeeChatActivate(member.getId());
val response = MemberProfileSpecificResponse.checkIsBlindPhone(
memberMapper.toProfileSpecificResponse(
member, true, memberProfileProjects, activityResponses, soptActivityResponse
member, true, memberProfileProjects, activityResponses, soptActivityResponse, isCoffeeChatActivate
),
isMine);
sortProfileCareer(response);
Expand All @@ -197,8 +198,9 @@ public ResponseEntity<MemberProfileSpecificResponse> getMyProfile (
memberProfileProjects
);
val isMine = Objects.equals(member.getId(), memberDetails.getId());
val isCoffeeChatActivate = coffeeChatService.getCoffeeChatActivate(member.getId());
val response = memberMapper.toProfileSpecificResponse(
member, isMine, memberProfileProjects, activityResponses, soptActivityResponse
member, isMine, memberProfileProjects, activityResponses, soptActivityResponse, isCoffeeChatActivate
);
sortProfileCareer(response);
return ResponseEntity.status(HttpStatus.OK).body(response);
Expand Down
Loading