Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix1: 그룹 참여 API 응답에 종료일 추가 #62

Merged
merged 1 commit into from
Feb 20, 2025
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
Expand Up @@ -68,6 +68,7 @@ public ResponseEntity<ApiResponse<JoinChallengeGroupResponse>> joinChallengeGrou
joinChallengeGroupDto.name(),
joinChallengeGroupDto.maximumMemberCount(),
joinChallengeGroupDto.startAt(),
joinChallengeGroupDto.endAt(),
joinChallengeGroupDto.durationOption())
));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ public record JoinChallengeGroupResponse(
String name,
int maximumMemberCount,
String startAt,
String endAt,
int durationOption
) {
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package site.dogether.challengegroup.service;

import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.util.List;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
Expand All @@ -23,11 +27,6 @@
import site.dogether.member.service.MemberService;
import site.dogether.notification.service.NotificationService;

import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.util.List;

@Slf4j
@RequiredArgsConstructor
@Transactional(readOnly = true)
Expand Down Expand Up @@ -109,11 +108,13 @@ public JoinChallengeGroupDto joinChallengeGroup(final String joinCode, final Str

final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd");
final String startAtFormatted = challengeGroupJpaEntity.getStartAt().format(formatter);
final String endAtFormatted = challengeGroupJpaEntity.getEndAt().format(formatter);

return new JoinChallengeGroupDto(
joiningGroup.getName(),
joiningGroup.getMaximumMemberCount(),
startAtFormatted,
endAtFormatted,
joiningGroup.getDurationOption().getValue()
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ public record JoinChallengeGroupDto(
String name,
int maximumMemberCount,
String startAt,
String endAt,
int durationOption
) {
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
package site.dogether.docs.challengegroup;

import static org.mockito.ArgumentMatchers.any;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields;
import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import static site.dogether.docs.util.DocumentLinkGenerator.DocUrl.CHALLENGE_GROUP_DURATION_OPTION;
import static site.dogether.docs.util.DocumentLinkGenerator.DocUrl.CHALLENGE_GROUP_START_AT_OPTION;
import static site.dogether.docs.util.DocumentLinkGenerator.generateLink;

import java.util.List;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.springframework.http.MediaType;
Expand All @@ -15,18 +30,6 @@
import site.dogether.dailytodo.domain.Rank;
import site.dogether.docs.util.RestDocsSupport;

import java.util.List;

import static org.mockito.ArgumentMatchers.any;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
import static org.springframework.restdocs.payload.PayloadDocumentation.*;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import static site.dogether.docs.util.DocumentLinkGenerator.DocUrl.CHALLENGE_GROUP_DURATION_OPTION;
import static site.dogether.docs.util.DocumentLinkGenerator.DocUrl.CHALLENGE_GROUP_START_AT_OPTION;
import static site.dogether.docs.util.DocumentLinkGenerator.generateLink;

@DisplayName("챌린지 그룹 API 문서화 테스트")
public class ChallengeGroupControllerDocsTest extends RestDocsSupport {

Expand Down Expand Up @@ -98,7 +101,7 @@ void joinChallengeGroup() throws Exception {
final JoinChallengeGroupRequest request = new JoinChallengeGroupRequest("kelly-join-code");

given(challengeGroupService.joinChallengeGroup(any(), any()))
.willReturn(new JoinChallengeGroupDto("성욱이와 친구들", 7, "2025.02.25", 7));
.willReturn(new JoinChallengeGroupDto("성욱이와 친구들", 7, "2025.02.17", "2025.02.23", 7));

mockMvc.perform(
post("/api/groups/join")
Expand Down Expand Up @@ -128,6 +131,9 @@ void joinChallengeGroup() throws Exception {
fieldWithPath("data.startAt")
.description("챌린지 시작일")
.type(JsonFieldType.STRING),
fieldWithPath("data.endAt")
.description("챌린지 종료일")
.type(JsonFieldType.STRING),
fieldWithPath("data.durationOption")
.description("챌린지 기간")
.type(JsonFieldType.NUMBER))));
Expand Down