Skip to content

Commit 7d7b843

Browse files
authored
Merge pull request #109 from JA-yeong-eop-JA-moeu-JA/feat/#105-profile
🐛 fix: 데이터 반환 시 저장된 keyName으로부터 URL을 생성하도록 수정
2 parents cce6b39 + 5cf337a commit 7d7b843

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

src/main/java/com/jajaja/domain/team/dto/response/TeamProductItemResponseDto.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.jajaja.domain.team.dto.response;
22

3-
import com.jajaja.domain.member.entity.Member;
43
import com.jajaja.domain.product.entity.Product;
54
import com.jajaja.domain.team.entity.Team;
65
import lombok.Builder;
@@ -16,14 +15,13 @@ public record TeamProductItemResponseDto(
1615
Integer discountRate,
1716
String thumbnailUrl
1817
) {
19-
public static TeamProductItemResponseDto from(Team team) {
18+
public static TeamProductItemResponseDto of(Team team, String profileUrl) {
2019
Product product = team.getProduct();
21-
Member leader = team.getLeader();
2220

2321
return TeamProductItemResponseDto.builder()
2422
.teamId(team.getId())
2523
.nickname(team.getLeader().getName())
26-
.leaderProfileImageUrl(leader.getProfileUrl())
24+
.leaderProfileImageUrl(profileUrl)
2725
.productId(product.getId())
2826
.productName(product.getName())
2927
.price(product.getPrice())

src/main/java/com/jajaja/domain/team/service/TeamQueryServiceImpl.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.jajaja.domain.team.dto.response.TeamProductListResponseDto;
55
import com.jajaja.domain.team.entity.Team;
66
import com.jajaja.domain.team.repository.TeamRepository;
7+
import com.jajaja.global.S3.service.S3Service;
78
import com.jajaja.global.apiPayload.PageResponse;
89
import com.jajaja.global.apiPayload.code.status.ErrorStatus;
910
import com.jajaja.global.apiPayload.exception.custom.BadRequestException;
@@ -23,6 +24,7 @@
2324
public class TeamQueryServiceImpl implements TeamQueryService {
2425

2526
private final TeamRepository teamRepository;
27+
private final S3Service s3Service;
2628

2729
@Override
2830
public TeamProductListResponseDto getMatchingTeamProducts(int page, int size) {
@@ -34,7 +36,10 @@ public TeamProductListResponseDto getMatchingTeamProducts(int page, int size) {
3436
}
3537

3638
List<TeamProductItemResponseDto> teamDtos = teamPage.getContent().stream()
37-
.map(TeamProductItemResponseDto::from)
39+
.map(team -> {
40+
String profileUrl = s3Service.generateStaticUrl(team.getLeader().getProfileKeyName());
41+
return TeamProductItemResponseDto.of(team, profileUrl);
42+
})
3843
.toList();
3944

4045
Page<TeamProductItemResponseDto> mappedPage = new PageImpl<>(teamDtos, pageable, teamPage.getTotalElements());

0 commit comments

Comments
 (0)