Skip to content
Draft
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 @@ -9,6 +9,7 @@
import org.patinanetwork.patchats.api.member.dto.UpdateMemberRequest;
import org.patinanetwork.patchats.common.dto.ApiResponder;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PatchMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
Expand Down Expand Up @@ -37,11 +38,11 @@ public ResponseEntity<ApiResponder<MemberDto>> updateMember(
return ResponseEntity.ok(ApiResponder.success("Member updated successfully", response));
}

// @GetMapping("/{id}")
// public ResponseEntity<ApiResponder<MemberDto>> getMember(@PathVariable final UUID id) {
// final MemberDto response = memberService.getMemberById(id);
// return ResponseEntity.ok(ApiResponder.success("Member retrieved successfully", response));
// }
@GetMapping("/{id}")
public ResponseEntity<ApiResponder<MemberDto>> getMemberById(@PathVariable final UUID id) {
final MemberDto response = memberService.getMemberById(id);
return ResponseEntity.ok(ApiResponder.success("Member retrieved successfully", response));
}

// @DeleteMapping("/{id}")
// public ResponseEntity<ApiResponder<MemberDto>> deactivateMember(@PathVariable final UUID id) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ public MemberDto updateMember(UpdateMemberRequest request, UUID id) {
return MemberDto.from(updatedMember);
}

// Helper methods for updateMember
private void validateAndUpdateRequired(Member member, UpdateMemberRequest request) {
validateAndUpdate(request.firstName(), member::setFirstName, "firstName");
validateAndUpdate(request.lastName(), member::setLastName, "lastName");
Expand Down Expand Up @@ -98,13 +99,10 @@ private void updateOptional(Member member, UpdateMemberRequest request) {
request.extraNotes().ifPresent(member::setExtraNotes);
}

// TODO: Implement these methods after createMember and updateMember is fully functional and tested
// public MemberDto getMemberById(UUID id) {
// return memberRepo
// .getMemberById(id)
// .map(MemberDto::from)
// .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "Member not found"));
// }
public MemberDto getMemberById(UUID id) {
Member member = memberRepo.getMemberById(id).orElseThrow(() -> new MemberNotFoundException(id));
return MemberDto.from(member);
}

// public MemberDto deactivateMember(UUID id) {
// return memberRepo
Expand Down