diff --git a/src/main/java/com/first/flash/account/member/application/MemberService.java b/src/main/java/com/first/flash/account/member/application/MemberService.java index fc5cb681..a312ec38 100644 --- a/src/main/java/com/first/flash/account/member/application/MemberService.java +++ b/src/main/java/com/first/flash/account/member/application/MemberService.java @@ -49,7 +49,8 @@ public MemberCompleteRegistrationResponse completeMemberRegistration( request.gender(), request.reach(), request.profileImageUrl()); Events.raise(MemberInfoUpdatedEvent.of(member.getId(), member.getNickName(), - member.getInstagramId(), member.getProfileImageUrl())); + member.getInstagramId(), member.getProfileImageUrl(), member.getHeight(), + member.getReach(), member.getGender())); return MemberCompleteRegistrationResponse.toDto(member); } diff --git a/src/main/java/com/first/flash/account/member/domain/MemberInfoUpdatedEvent.java b/src/main/java/com/first/flash/account/member/domain/MemberInfoUpdatedEvent.java index 7195d9c9..05627eb5 100644 --- a/src/main/java/com/first/flash/account/member/domain/MemberInfoUpdatedEvent.java +++ b/src/main/java/com/first/flash/account/member/domain/MemberInfoUpdatedEvent.java @@ -13,9 +13,14 @@ public class MemberInfoUpdatedEvent extends Event { private final String nickName; private final String instagramId; private final String profileImageUrl; + private final Double height; + private final Double reach; + private final Gender gender; public static MemberInfoUpdatedEvent of(final UUID memberId, final String nickName, - final String instagramId, final String profileImageUrl) { - return new MemberInfoUpdatedEvent(memberId, nickName, instagramId, profileImageUrl); + final String instagramId, final String profileImageUrl, final Double height, + final Double reach, final Gender gender) { + return new MemberInfoUpdatedEvent(memberId, nickName, instagramId, profileImageUrl, height, + reach, gender); } } diff --git a/src/main/java/com/first/flash/climbing/gym/application/ClimbingGymService.java b/src/main/java/com/first/flash/climbing/gym/application/ClimbingGymService.java index e8fb4a13..35ef6600 100644 --- a/src/main/java/com/first/flash/climbing/gym/application/ClimbingGymService.java +++ b/src/main/java/com/first/flash/climbing/gym/application/ClimbingGymService.java @@ -42,7 +42,7 @@ public ClimbingGymDetailResponseDto findClimbingGymDetail(final Long id) { List sectorNames = findSectorNamesById(id); List difficultyNames = getDifficultyNames(climbingGym); return new ClimbingGymDetailResponseDto(climbingGym.getGymName(), - climbingGym.getMapImageUrl(), + climbingGym.getMapImageUrl(), climbingGym.getCalendarImageUrl(), difficultyNames, sectorNames); } diff --git a/src/main/java/com/first/flash/climbing/gym/application/dto/ClimbingGymCreateRequestDto.java b/src/main/java/com/first/flash/climbing/gym/application/dto/ClimbingGymCreateRequestDto.java index e11f5b99..832890eb 100644 --- a/src/main/java/com/first/flash/climbing/gym/application/dto/ClimbingGymCreateRequestDto.java +++ b/src/main/java/com/first/flash/climbing/gym/application/dto/ClimbingGymCreateRequestDto.java @@ -10,11 +10,12 @@ public record ClimbingGymCreateRequestDto( @NotEmpty(message = "클라이밍장 이름은 필수입니다.") String gymName, @NotEmpty(message = "썸네일 URL은 필수입니다.") String thumbnailUrl, - @NotEmpty(message = "지도 이미지 URL은 필수입니다.") String mapImageUrl, + String mapImageUrl, + @NotEmpty(message = "일정 이미지 URL은 필수입니다.") String calendarImageUrl, @NotEmpty(message = "난이도 정보는 최소 하나 이상이어야 합니다.") List<@Valid @NotNull(message = "난이도 정보는 비어있을 수 없습니다.") Difficulty> difficulties) { public ClimbingGym toEntity() { - return new ClimbingGym(gymName, thumbnailUrl, mapImageUrl, difficulties); + return new ClimbingGym(gymName, thumbnailUrl, mapImageUrl, calendarImageUrl, difficulties); } } diff --git a/src/main/java/com/first/flash/climbing/gym/application/dto/ClimbingGymCreateResponseDto.java b/src/main/java/com/first/flash/climbing/gym/application/dto/ClimbingGymCreateResponseDto.java index 0b5885d1..db360e4d 100644 --- a/src/main/java/com/first/flash/climbing/gym/application/dto/ClimbingGymCreateResponseDto.java +++ b/src/main/java/com/first/flash/climbing/gym/application/dto/ClimbingGymCreateResponseDto.java @@ -5,10 +5,10 @@ import java.util.List; public record ClimbingGymCreateResponseDto(Long id, String gymName, String thumbnailUrl, - String mapImageUrl, List difficulties) { + String mapImageUrl, String calendarImageUrl, List difficulties) { public static ClimbingGymCreateResponseDto toDto(final ClimbingGym gym) { return new ClimbingGymCreateResponseDto(gym.getId(), gym.getGymName(), - gym.getThumbnailUrl(), gym.getMapImageUrl(), gym.getDifficulties()); + gym.getThumbnailUrl(), gym.getMapImageUrl(), gym.getCalendarImageUrl(), gym.getDifficulties()); } } diff --git a/src/main/java/com/first/flash/climbing/gym/application/dto/ClimbingGymDetailResponseDto.java b/src/main/java/com/first/flash/climbing/gym/application/dto/ClimbingGymDetailResponseDto.java index 625de764..f2f1f822 100644 --- a/src/main/java/com/first/flash/climbing/gym/application/dto/ClimbingGymDetailResponseDto.java +++ b/src/main/java/com/first/flash/climbing/gym/application/dto/ClimbingGymDetailResponseDto.java @@ -3,6 +3,7 @@ import java.util.List; public record ClimbingGymDetailResponseDto(String gymName, String mapImageUrl, + String calendarImageUrl, List difficulties, List sectors) { diff --git a/src/main/java/com/first/flash/climbing/gym/domian/ClimbingGym.java b/src/main/java/com/first/flash/climbing/gym/domian/ClimbingGym.java index 8161d331..f97e8df7 100644 --- a/src/main/java/com/first/flash/climbing/gym/domian/ClimbingGym.java +++ b/src/main/java/com/first/flash/climbing/gym/domian/ClimbingGym.java @@ -30,6 +30,7 @@ public class ClimbingGym { private String gymName; private String thumbnailUrl; private String mapImageUrl; + private String calendarImageUrl; @ElementCollection(fetch = FetchType.EAGER) @CollectionTable(name = "DIFFICULTY", @@ -39,17 +40,18 @@ public class ClimbingGym { private List difficulties; public ClimbingGym(final String gymName, final String thumbnailUrl, final String mapImageUrl, - final List difficulties) { + final String calendarImageUrl, final List difficulties) { this.gymName = gymName; this.thumbnailUrl = thumbnailUrl; this.mapImageUrl = mapImageUrl; this.difficulties = difficulties; + this.calendarImageUrl = calendarImageUrl; } public Difficulty getDifficultyByName(final String difficultyName) { return difficulties.stream() - .filter(difficulty -> difficulty.hasSameName(difficultyName)) - .findAny() - .orElseThrow(() -> new DifficultyNotFoundException(difficultyName)); + .filter(difficulty -> difficulty.hasSameName(difficultyName)) + .findAny() + .orElseThrow(() -> new DifficultyNotFoundException(difficultyName)); } } diff --git a/src/main/java/com/first/flash/climbing/problem/application/dto/ProblemResponseDto.java b/src/main/java/com/first/flash/climbing/problem/application/dto/ProblemResponseDto.java index 84193b17..fa0659ae 100644 --- a/src/main/java/com/first/flash/climbing/problem/application/dto/ProblemResponseDto.java +++ b/src/main/java/com/first/flash/climbing/problem/application/dto/ProblemResponseDto.java @@ -5,12 +5,13 @@ import java.util.UUID; public record ProblemResponseDto(UUID id, String sector, String difficulty, LocalDate settingDate, - LocalDate removalDate, boolean hasSolution, String imageUrl, Boolean isHoney) { + LocalDate removalDate, boolean hasSolution, String imageUrl, + Boolean isHoney, Integer solutionCount) { public static ProblemResponseDto toDto(QueryProblem queryProblem) { return new ProblemResponseDto(queryProblem.getId(), queryProblem.getSectorName(), queryProblem.getDifficultyName(), queryProblem.getSettingDate(), queryProblem.getRemovalDate(), queryProblem.getHasSolution(), - queryProblem.getImageUrl(), queryProblem.isHoney()); + queryProblem.getImageUrl(), queryProblem.isHoney(), queryProblem.getSolutionCount()); } } diff --git a/src/main/java/com/first/flash/climbing/solution/application/SolutionEventHandler.java b/src/main/java/com/first/flash/climbing/solution/application/SolutionEventHandler.java index 15a5175f..ae0f77ff 100644 --- a/src/main/java/com/first/flash/climbing/solution/application/SolutionEventHandler.java +++ b/src/main/java/com/first/flash/climbing/solution/application/SolutionEventHandler.java @@ -19,7 +19,8 @@ public class SolutionEventHandler { @Transactional public void updateSolutionInfo(final MemberInfoUpdatedEvent event) { solutionSaveService.updateUploaderInfo(event.getMemberId(), event.getNickName(), - event.getInstagramId(), event.getProfileImageUrl()); + event.getInstagramId(), event.getProfileImageUrl(), event.getHeight(), event.getReach(), + event.getGender()); solutionCommentService.updateCommenterInfo(event.getMemberId(), event.getNickName(), event.getProfileImageUrl()); diff --git a/src/main/java/com/first/flash/climbing/solution/application/SolutionSaveService.java b/src/main/java/com/first/flash/climbing/solution/application/SolutionSaveService.java index a3eeb401..3d3e89ce 100644 --- a/src/main/java/com/first/flash/climbing/solution/application/SolutionSaveService.java +++ b/src/main/java/com/first/flash/climbing/solution/application/SolutionSaveService.java @@ -1,6 +1,7 @@ package com.first.flash.climbing.solution.application; import com.first.flash.account.member.application.MemberService; +import com.first.flash.account.member.domain.Gender; import com.first.flash.account.member.domain.Member; import com.first.flash.climbing.solution.application.dto.SolutionWriteResponseDto; import com.first.flash.climbing.solution.application.dto.UnregisteredMemberSolutionCreateRequest; @@ -34,8 +35,10 @@ public SolutionWriteResponseDto saveSolution(final UUID problemId, PerceivedDifficulty perceivedDifficulty = createRequestDto.perceivedDifficulty(); Solution solution = Solution.of(member.getNickName(), createRequestDto.review(), member.getInstagramId(), createRequestDto.videoUrl(), problemId, member.getId(), - member.getProfileImageUrl(), perceivedDifficulty); - Events.raise(PerceivedDifficultySetEvent.of(solution.getProblemId(), perceivedDifficulty.getValue())); + member.getProfileImageUrl(), perceivedDifficulty, member.getHeight(), member.getReach(), + member.getGender()); + Events.raise(PerceivedDifficultySetEvent.of(solution.getProblemId(), + perceivedDifficulty.getValue())); Solution savedSolution = solutionRepository.save(solution); Events.raise(SolutionSavedEvent.of(savedSolution.getProblemId())); @@ -44,8 +47,10 @@ public SolutionWriteResponseDto saveSolution(final UUID problemId, @Transactional public void updateUploaderInfo(final UUID uploaderId, final String nickName, - final String instagramId, final String profileImageUrl) { - solutionRepository.updateUploaderInfo(uploaderId, nickName, instagramId, profileImageUrl); + final String instagramId, final String profileImageUrl, final Double uploaderHeight, + final Double uploaderReach, final Gender uploaderGender) { + solutionRepository.updateUploaderInfo(uploaderId, nickName, instagramId, profileImageUrl, + uploaderHeight, uploaderReach, uploaderGender); } @Transactional @@ -57,10 +62,12 @@ public SolutionWriteResponseDto saveUnregisteredMemberSolution(final UUID proble PerceivedDifficulty perceivedDifficulty = requestDto.perceivedDifficulty(); Solution solution = Solution.of(requestDto.nickName(), requestDto.review(), requestDto.instagramId(), requestDto.videoUrl(), problemId, member.getId(), - requestDto.profileImageUrl(), perceivedDifficulty); + requestDto.profileImageUrl(), perceivedDifficulty, member.getHeight(), + member.getReach(), member.getGender()); Solution savedSolution = solutionRepository.save(solution); - Events.raise(PerceivedDifficultySetEvent.of(solution.getProblemId(), perceivedDifficulty.getValue())); + Events.raise(PerceivedDifficultySetEvent.of(solution.getProblemId(), + perceivedDifficulty.getValue())); Events.raise(SolutionSavedEvent.of(savedSolution.getProblemId())); return SolutionWriteResponseDto.toDto(savedSolution); } diff --git a/src/main/java/com/first/flash/climbing/solution/domain/Solution.java b/src/main/java/com/first/flash/climbing/solution/domain/Solution.java index bf0e43ce..0049a0f8 100644 --- a/src/main/java/com/first/flash/climbing/solution/domain/Solution.java +++ b/src/main/java/com/first/flash/climbing/solution/domain/Solution.java @@ -1,5 +1,6 @@ package com.first.flash.climbing.solution.domain; +import com.first.flash.account.member.domain.Gender; import com.first.flash.climbing.solution.domain.vo.SolutionDetail; import com.first.flash.climbing.solution.domain.vo.UploaderDetail; import com.first.flash.global.domain.BaseEntity; @@ -41,30 +42,28 @@ public class Solution extends BaseEntity { protected Solution(final String uploader, final String review, final String instagramId, final String videoUrl, final UUID problemId, final UUID uploaderId, - final String profileImageUrl, final PerceivedDifficulty perceivedDifficulty) { + final String profileImageUrl, final PerceivedDifficulty perceivedDifficulty, + final Double uploaderHeight, + final Double uploaderReach, final Gender uploaderGender) { this.solutionDetail = SolutionDetail.of(review, videoUrl, perceivedDifficulty); - this.uploaderDetail = UploaderDetail.of(uploaderId, uploader, instagramId, profileImageUrl); + this.uploaderDetail = UploaderDetail.of(uploaderId, uploader, instagramId, profileImageUrl, + uploaderHeight, uploaderReach, uploaderGender); this.optionalWeight = DEFAULT_OPTIONAL_WEIGHT; this.problemId = problemId; } public static Solution of(final String uploader, final String review, final String instagramId, final String videoUrl, final UUID problemId, final UUID uploaderId, - final String profileImageUrl, final PerceivedDifficulty perceivedDifficulty) { + final String profileImageUrl, final PerceivedDifficulty perceivedDifficulty, + final Double uploaderHeight, final Double uploaderReach, final Gender uploaderGender) { return new Solution(uploader, review, instagramId, videoUrl, problemId, uploaderId, - profileImageUrl, perceivedDifficulty); + profileImageUrl, perceivedDifficulty, uploaderHeight, uploaderReach, uploaderGender); } - public void updateUploaderInfo(final String uploader, final String instagramId, - final String profileImageUrl) { - UUID uploaderId = this.uploaderDetail.getUploaderId(); - - this.uploaderDetail = UploaderDetail.of(uploaderId, uploader, instagramId, profileImageUrl); - } - - public void updateContentInfo(final String review, final String videoUrl, final PerceivedDifficulty perceivedDifficulty) { + public void updateContentInfo(final String review, final String videoUrl, + final PerceivedDifficulty perceivedDifficulty) { this.solutionDetail = SolutionDetail.of(review, videoUrl, perceivedDifficulty); } } diff --git a/src/main/java/com/first/flash/climbing/solution/domain/SolutionRepository.java b/src/main/java/com/first/flash/climbing/solution/domain/SolutionRepository.java index 9c2611af..0d4b4cff 100644 --- a/src/main/java/com/first/flash/climbing/solution/domain/SolutionRepository.java +++ b/src/main/java/com/first/flash/climbing/solution/domain/SolutionRepository.java @@ -1,5 +1,6 @@ package com.first.flash.climbing.solution.domain; +import com.first.flash.account.member.domain.Gender; import com.first.flash.climbing.solution.infrastructure.dto.DetailSolutionDto; import com.first.flash.climbing.solution.infrastructure.dto.MySolutionDto; import com.first.flash.climbing.solution.infrastructure.dto.SolutionRepositoryResponseDto; @@ -20,7 +21,8 @@ List findAllByProblemId(final UUID problemId, void deleteById(final Long id); void updateUploaderInfo(final UUID uploaderId, final String nickName, final String instagramId, - final String profileImageUrl); + final String profileImageUrl, final Double uploaderHeight, + final Double uploaderReach, final Gender uploaderGender); DetailSolutionDto findDetailSolutionById(final Long solutionId); diff --git a/src/main/java/com/first/flash/climbing/solution/domain/dto/SolutionResponseDto.java b/src/main/java/com/first/flash/climbing/solution/domain/dto/SolutionResponseDto.java index 2e9c3b8e..200c5c49 100644 --- a/src/main/java/com/first/flash/climbing/solution/domain/dto/SolutionResponseDto.java +++ b/src/main/java/com/first/flash/climbing/solution/domain/dto/SolutionResponseDto.java @@ -1,11 +1,13 @@ package com.first.flash.climbing.solution.domain.dto; +import com.first.flash.account.member.domain.Gender; import com.first.flash.climbing.solution.infrastructure.dto.SolutionRepositoryResponseDto; import com.first.flash.global.util.AuthUtil; import java.util.UUID; public record SolutionResponseDto(Long id, String uploader, String review, String instagramId, - String videoUrl, UUID uploaderId, Boolean isUploader, + String videoUrl, UUID uploaderId, Double uploaderHeight, + Double uploaderReach, Gender uploaderGender, Boolean isUploader, String profileImageUrl, Long commentCount) { public static SolutionResponseDto from( @@ -13,6 +15,8 @@ public static SolutionResponseDto from( return new SolutionResponseDto(repositoryResponseDto.id(), repositoryResponseDto.uploader(), repositoryResponseDto.review(), repositoryResponseDto.instagramId(), repositoryResponseDto.videoUrl(), repositoryResponseDto.uploaderId(), + repositoryResponseDto.uploaderHeight(), repositoryResponseDto.uploaderReach(), + repositoryResponseDto.uploaderGender(), AuthUtil.isSameId(repositoryResponseDto.uploaderId()), repositoryResponseDto.profileImageUrl(), repositoryResponseDto.commentCount()); } diff --git a/src/main/java/com/first/flash/climbing/solution/domain/vo/UploaderDetail.java b/src/main/java/com/first/flash/climbing/solution/domain/vo/UploaderDetail.java index 08ab88c6..3c8b0ce8 100644 --- a/src/main/java/com/first/flash/climbing/solution/domain/vo/UploaderDetail.java +++ b/src/main/java/com/first/flash/climbing/solution/domain/vo/UploaderDetail.java @@ -1,7 +1,10 @@ package com.first.flash.climbing.solution.domain.vo; +import com.first.flash.account.member.domain.Gender; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; import java.util.UUID; import lombok.EqualsAndHashCode; import lombok.Getter; @@ -20,17 +23,28 @@ public class UploaderDetail { private String uploader; private String instagramId; private String profileImageUrl; + private Double uploaderHeight; + private Double uploaderReach; + @Enumerated(EnumType.STRING) + private Gender uploaderGender; protected UploaderDetail(final UUID uploaderId, final String uploader, - final String instagramId, final String profileImageUrl) { + final String instagramId, final String profileImageUrl, final Double uploaderHeight, + final Double uploaderReach, + final Gender uploaderGender) { this.uploaderId = uploaderId; this.uploader = uploader; this.instagramId = instagramId; this.profileImageUrl = profileImageUrl; + this.uploaderHeight = uploaderHeight; + this.uploaderReach = uploaderReach; + this.uploaderGender = uploaderGender; } public static UploaderDetail of(final UUID uploaderId, final String uploader, - final String instagramId, final String profileImageUrl) { - return new UploaderDetail(uploaderId, uploader, instagramId, profileImageUrl); + final String instagramId, final String profileImageUrl, final Double height, + final Double reach, final Gender gender) { + return new UploaderDetail(uploaderId, uploader, instagramId, profileImageUrl, height, reach, + gender); } } diff --git a/src/main/java/com/first/flash/climbing/solution/infrastructure/SolutionQueryDslRepository.java b/src/main/java/com/first/flash/climbing/solution/infrastructure/SolutionQueryDslRepository.java index 151c819d..620b6e28 100644 --- a/src/main/java/com/first/flash/climbing/solution/infrastructure/SolutionQueryDslRepository.java +++ b/src/main/java/com/first/flash/climbing/solution/infrastructure/SolutionQueryDslRepository.java @@ -4,6 +4,7 @@ import static com.first.flash.climbing.solution.domain.QSolution.solution; import static com.first.flash.climbing.solution.domain.QSolutionComment.solutionComment; +import com.first.flash.account.member.domain.Gender; import com.first.flash.climbing.solution.infrastructure.dto.DetailSolutionDto; import com.first.flash.climbing.solution.infrastructure.dto.MySolutionDto; import com.first.flash.climbing.solution.infrastructure.dto.SolutionRepositoryResponseDto; @@ -29,8 +30,9 @@ public List findAllExcludedBlockedMembers(final U return jpaQueryFactory.select(Projections.constructor(SolutionRepositoryResponseDto.class, solution.id, solution.uploaderDetail.uploader, solution.solutionDetail.review, solution.uploaderDetail.instagramId, solution.solutionDetail.videoUrl, - solution.uploaderDetail.uploaderId, solution.uploaderDetail.profileImageUrl, - solutionComment.count() + solution.uploaderDetail.uploaderId, solution.uploaderDetail.uploaderHeight, + solution.uploaderDetail.uploaderReach, solution.uploaderDetail.uploaderGender, + solution.uploaderDetail.profileImageUrl, solutionComment.count() )) .from(solution) .leftJoin(solutionComment) @@ -64,11 +66,15 @@ public List findByUploaderId(final UUID uploaderId, } public void updateUploaderInfo(final UUID uploaderId, final String nickName, - final String instagramId, final String profileImageUrl) { + final String instagramId, final String profileImageUrl, final Double uploaderHeight, + final Double uploaderReach, final Gender uploaderGender) { jpaQueryFactory.update(solution) .set(solution.uploaderDetail.uploader, nickName) .set(solution.uploaderDetail.instagramId, instagramId) .set(solution.uploaderDetail.profileImageUrl, profileImageUrl) + .set(solution.uploaderDetail.uploaderHeight, uploaderHeight) + .set(solution.uploaderDetail.uploaderReach, uploaderReach) + .set(solution.uploaderDetail.uploaderGender, uploaderGender) .where(solution.uploaderDetail.uploaderId.eq(uploaderId)) .execute(); } @@ -77,7 +83,8 @@ public DetailSolutionDto findDetailSolutionById(final Long solutionId) { return jpaQueryFactory.select(Projections.constructor(DetailSolutionDto.class, solution.id, solution.solutionDetail.videoUrl, queryProblem.gymName, queryProblem.sectorName, solution.solutionDetail.review, - queryProblem.difficultyName, solutionComment.count(), solution.solutionDetail.perceivedDifficulty, + queryProblem.difficultyName, solutionComment.count(), + solution.solutionDetail.perceivedDifficulty, queryProblem.removalDate, queryProblem.settingDate, solution.createdAt )) .from(solution) diff --git a/src/main/java/com/first/flash/climbing/solution/infrastructure/SolutionRepositoryImpl.java b/src/main/java/com/first/flash/climbing/solution/infrastructure/SolutionRepositoryImpl.java index 551c12c4..0eb02cfb 100644 --- a/src/main/java/com/first/flash/climbing/solution/infrastructure/SolutionRepositoryImpl.java +++ b/src/main/java/com/first/flash/climbing/solution/infrastructure/SolutionRepositoryImpl.java @@ -1,5 +1,6 @@ package com.first.flash.climbing.solution.infrastructure; +import com.first.flash.account.member.domain.Gender; import com.first.flash.climbing.solution.domain.Solution; import com.first.flash.climbing.solution.domain.SolutionRepository; import com.first.flash.climbing.solution.infrastructure.dto.DetailSolutionDto; @@ -43,9 +44,10 @@ public void deleteById(final Long id) { @Override public void updateUploaderInfo(final UUID uploaderId, final String nickName, - final String instagramId, final String profileImageUrl) { + final String instagramId, final String profileImageUrl, final Double uploaderHeight, + final Double uploaderReach, final Gender uploaderGender) { solutionQueryDslRepository.updateUploaderInfo(uploaderId, nickName, instagramId, - profileImageUrl); + profileImageUrl, uploaderHeight, uploaderReach, uploaderGender); } @Override diff --git a/src/main/java/com/first/flash/climbing/solution/infrastructure/dto/SolutionRepositoryResponseDto.java b/src/main/java/com/first/flash/climbing/solution/infrastructure/dto/SolutionRepositoryResponseDto.java index 4ac9c745..58a4605c 100644 --- a/src/main/java/com/first/flash/climbing/solution/infrastructure/dto/SolutionRepositoryResponseDto.java +++ b/src/main/java/com/first/flash/climbing/solution/infrastructure/dto/SolutionRepositoryResponseDto.java @@ -1,9 +1,12 @@ package com.first.flash.climbing.solution.infrastructure.dto; +import com.first.flash.account.member.domain.Gender; import java.util.UUID; public record SolutionRepositoryResponseDto(Long id, String uploader, String review, String instagramId, String videoUrl, UUID uploaderId, - String profileImageUrl, Long commentCount) { + Double uploaderHeight, Double uploaderReach, + Gender uploaderGender, String profileImageUrl, + Long commentCount) { } diff --git a/src/test/java/com/first/flash/climbing/gym/fixture/ClimbingGymFixture.java b/src/test/java/com/first/flash/climbing/gym/fixture/ClimbingGymFixture.java index e7fcb545..328cfbd0 100644 --- a/src/test/java/com/first/flash/climbing/gym/fixture/ClimbingGymFixture.java +++ b/src/test/java/com/first/flash/climbing/gym/fixture/ClimbingGymFixture.java @@ -8,12 +8,12 @@ public class ClimbingGymFixture { public static ClimbingGym createDefaultGym() { - return new ClimbingGym("test gym", "example.com", "example.com", + return new ClimbingGym("test gym", "example.com", "example.com", "example.com", List.of(new Difficulty("빨강", 1))); } public static ClimbingGymCreateRequestDto createDefaultGymCreateRequestDto() { return new ClimbingGymCreateRequestDto("test gym", "example.com", "example.com", - List.of(new Difficulty("빨강", 1))); + "example.com", List.of(new Difficulty("빨강", 1))); } } diff --git a/src/test/java/com/first/flash/climbing/gym/infrastructure/FakeClimbingGymRepository.java b/src/test/java/com/first/flash/climbing/gym/infrastructure/FakeClimbingGymRepository.java index ccdcdf1c..02121f7b 100644 --- a/src/test/java/com/first/flash/climbing/gym/infrastructure/FakeClimbingGymRepository.java +++ b/src/test/java/com/first/flash/climbing/gym/infrastructure/FakeClimbingGymRepository.java @@ -16,7 +16,7 @@ public class FakeClimbingGymRepository implements ClimbingGymRepository { @Override public ClimbingGym save(final ClimbingGym gym) { ClimbingGym savedGym = new ClimbingGym(id++, gym.getGymName(), gym.getThumbnailUrl(), - gym.getMapImageUrl(), gym.getDifficulties()); + gym.getMapImageUrl(), "example image", gym.getDifficulties()); db.put(savedGym.getId(), savedGym); return savedGym;