Skip to content

Commit 132cc93

Browse files
authored
[fix/OPS-394] 문서화 및 오류 수정 3 (#148)
* fix/OPS-394: API 문서화 및 s3 오류 수정 #3 * fix/OPS-394: API 문서화 및 s3 오류 수정 #4
1 parent 8c70681 commit 132cc93

File tree

3 files changed

+15
-8
lines changed

3 files changed

+15
-8
lines changed

src/main/java/org/tuna/zoopzoop/backend/domain/member/controller/ApiV1MemberSearchController.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.tuna.zoopzoop.backend.domain.member.controller;
22

33
import io.swagger.v3.oas.annotations.Operation;
4+
import io.swagger.v3.oas.annotations.tags.Tag;
45
import lombok.RequiredArgsConstructor;
56
import org.springframework.http.HttpStatus;
67
import org.springframework.http.ResponseEntity;
@@ -9,6 +10,7 @@
910
import org.springframework.web.bind.annotation.RequestParam;
1011
import org.springframework.web.bind.annotation.RestController;
1112
import org.tuna.zoopzoop.backend.domain.member.dto.res.ResBodyForSearchMember;
13+
import org.tuna.zoopzoop.backend.domain.member.entity.Member;
1214
import org.tuna.zoopzoop.backend.domain.member.entity.MemberDocument;
1315
import org.tuna.zoopzoop.backend.domain.member.service.MemberSearchService;
1416
import org.tuna.zoopzoop.backend.domain.member.service.MemberService;
@@ -19,6 +21,7 @@
1921
@RestController
2022
@RequiredArgsConstructor
2123
@RequestMapping("api/v1/member")
24+
@Tag(name = "ApiV1MemberSearchController", description = "사용자 검색 REST API 컨트롤러")
2225
public class ApiV1MemberSearchController {
2326
private final MemberSearchService memberSearchService;
2427
private final MemberService memberService;
@@ -30,7 +33,12 @@ public ResponseEntity<RsData<List<ResBodyForSearchMember>>> searchMembers(
3033
) {
3134
List<MemberDocument> memberDocuments = memberSearchService.searchByName(keyword);
3235
List<ResBodyForSearchMember> memberDtos = memberDocuments.stream()
33-
.map(ResBodyForSearchMember::new)
36+
.map(doc -> {
37+
int id = doc.getId();
38+
Member member = memberService.findById(id);
39+
return new ResBodyForSearchMember(doc, member.getProfileImageUrl());
40+
}
41+
)
3442
.toList();
3543
return ResponseEntity
3644
.status(HttpStatus.OK)

src/main/java/org/tuna/zoopzoop/backend/domain/member/dto/res/ResBodyForSearchMember.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@
44

55
public record ResBodyForSearchMember(
66
int id,
7-
String name
7+
String name,
8+
String profileImageUrl
89
) {
9-
public ResBodyForSearchMember(int id, String name) {
10+
public ResBodyForSearchMember(int id, String name, String profileImageUrl) {
1011
this.id = id;
1112
this.name = name;
13+
this.profileImageUrl = profileImageUrl;
1214
}
13-
public ResBodyForSearchMember(MemberDocument memberDocument){
14-
this(memberDocument.getId(), memberDocument.getName());
15+
public ResBodyForSearchMember(MemberDocument memberDocument, String profileImageUrl){
16+
this(memberDocument.getId(), memberDocument.getName(), profileImageUrl);
1517
}
1618
}

src/main/resources/application.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,6 @@ spring:
104104
#S3 설정
105105
cloud:
106106
aws:
107-
credentials:
108-
access-key: ${AWS_ACCESS_KEY_ID}
109-
secret-key: ${AWS_SECRET_ACCESS_KEY}
110107
region:
111108
static: ap-northeast-2
112109
s3:

0 commit comments

Comments
 (0)