Skip to content
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
@@ -1,6 +1,7 @@
package org.tuna.zoopzoop.backend.domain.member.controller;

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
Expand All @@ -9,6 +10,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.tuna.zoopzoop.backend.domain.member.dto.res.ResBodyForSearchMember;
import org.tuna.zoopzoop.backend.domain.member.entity.Member;
import org.tuna.zoopzoop.backend.domain.member.entity.MemberDocument;
import org.tuna.zoopzoop.backend.domain.member.service.MemberSearchService;
import org.tuna.zoopzoop.backend.domain.member.service.MemberService;
Expand All @@ -19,6 +21,7 @@
@RestController
@RequiredArgsConstructor
@RequestMapping("api/v1/member")
@Tag(name = "ApiV1MemberSearchController", description = "사용자 검색 REST API 컨트롤러")
public class ApiV1MemberSearchController {
private final MemberSearchService memberSearchService;
private final MemberService memberService;
Expand All @@ -30,7 +33,12 @@ public ResponseEntity<RsData<List<ResBodyForSearchMember>>> searchMembers(
) {
List<MemberDocument> memberDocuments = memberSearchService.searchByName(keyword);
List<ResBodyForSearchMember> memberDtos = memberDocuments.stream()
.map(ResBodyForSearchMember::new)
.map(doc -> {
int id = doc.getId();
Member member = memberService.findById(id);
return new ResBodyForSearchMember(doc, member.getProfileImageUrl());
}
)
.toList();
return ResponseEntity
.status(HttpStatus.OK)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@

public record ResBodyForSearchMember(
int id,
String name
String name,
String profileImageUrl
) {
public ResBodyForSearchMember(int id, String name) {
public ResBodyForSearchMember(int id, String name, String profileImageUrl) {
this.id = id;
this.name = name;
this.profileImageUrl = profileImageUrl;
}
public ResBodyForSearchMember(MemberDocument memberDocument){
this(memberDocument.getId(), memberDocument.getName());
public ResBodyForSearchMember(MemberDocument memberDocument, String profileImageUrl){
this(memberDocument.getId(), memberDocument.getName(), profileImageUrl);
}
}
3 changes: 0 additions & 3 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,6 @@ spring:
#S3 설정
cloud:
aws:
credentials:
access-key: ${AWS_ACCESS_KEY_ID}
secret-key: ${AWS_SECRET_ACCESS_KEY}
region:
static: ap-northeast-2
s3:
Expand Down