Skip to content

Commit

Permalink
refactor(#165): Usecase 및 메서드 이름 변경
Browse files Browse the repository at this point in the history
- 입학등록원 양식 다운로드 기능이기때문에 뒤에 format을 붙였습니다.
  • Loading branch information
jyj1289 committed Nov 15, 2024
1 parent 54aaec5 commit 38e5e32
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

@RequiredArgsConstructor
@UseCase
public class DownloadAdmissionAndPledgeUseCase {
public class DownloadAdmissionAndPledgeFormatUseCase {

private final MergePdfService mergePdfService;
private final FormFacade formFacade;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public class FormController {
private final UploadIdentificationPictureUseCase uploadIdentificationPictureUseCase;
private final UploadFormUseCase uploadFormUseCase;
private final ExportFormUseCase exportFormUseCase;
private final DownloadAdmissionAndPledgeUseCase downloadAdmissionAndPledgeUseCase;
private final DownloadAdmissionAndPledgeFormatUseCase downloadAdmissionAndPledgeFormatUseCase;
private final UploadAdmissionAndPledgeUseCase uploadAdmissionAndPledgeUseCase;
private final QueryAllFormUseCase queryAllFormUseCase;
private final QueryFirstFormResultUseCase queryFirstFormResultUseCase;
Expand Down Expand Up @@ -190,12 +190,12 @@ public ResponseEntity<Resource> exportForm(
}

@GetMapping(value = "/admission-and-pledge")
public ResponseEntity<Resource> downloadAdmissionAndPledge(
public ResponseEntity<Resource> downloadAdmissionAndPledgeFormat(
@AuthenticationPrincipal(authority = Authority.USER) User user
) {
return ResponseEntity.ok()
.contentType(MediaType.APPLICATION_PDF)
.body(downloadAdmissionAndPledgeUseCase.execute(user));
.body(downloadAdmissionAndPledgeFormatUseCase.execute(user));
}

@PostMapping(value = "/admission-and-pledge")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
import static org.mockito.Mockito.verify;

@ExtendWith(MockitoExtension.class)
public class DownloadAdmissionAndPledgeUseCaseTest {
public class DownloadAdmissionAndPledgeFormatUseCaseTest {

@InjectMocks
private DownloadAdmissionAndPledgeUseCase downloadAdmissionAndPledgeUseCase;
private DownloadAdmissionAndPledgeFormatUseCase downloadAdmissionAndPledgeFormatUseCase;

@Mock
private FormFacade formFacade;
Expand All @@ -54,7 +54,7 @@ public class DownloadAdmissionAndPledgeUseCaseTest {
willDoNothing().given(mergePdfService).execute(any(PdfMerger.class), any(ByteArrayOutputStream.class));

//when
downloadAdmissionAndPledgeUseCase.execute(user);
downloadAdmissionAndPledgeFormatUseCase.execute(user);

//then
verify(formFacade, times(1)).getForm(user);
Expand All @@ -71,7 +71,7 @@ public class DownloadAdmissionAndPledgeUseCaseTest {
given(formFacade.getForm(user)).willReturn(form);

//when and then
assertThrows(InvalidFormStatusException.class, () -> downloadAdmissionAndPledgeUseCase.execute(user));
assertThrows(InvalidFormStatusException.class, () -> downloadAdmissionAndPledgeFormatUseCase.execute(user));

//then
verify(formFacade, times(1)).getForm(user);
Expand All @@ -91,7 +91,7 @@ public class DownloadAdmissionAndPledgeUseCaseTest {
doThrow(FailedToExportPdfException.class).when(generatePdfService).execute(any(String.class));

//when and then
assertThrows(FailedToExportPdfException.class, () -> downloadAdmissionAndPledgeUseCase.execute(user));
assertThrows(FailedToExportPdfException.class, () -> downloadAdmissionAndPledgeFormatUseCase.execute(user));

//then
verify(formFacade, times(1)).getForm(user);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.BDDMockito.*;
import static org.mockito.Mockito.*;
import static org.springframework.restdocs.headers.HeaderDocumentation.headerWithName;
import static org.springframework.restdocs.headers.HeaderDocumentation.requestHeaders;
import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.*;
Expand Down Expand Up @@ -1135,7 +1134,7 @@ class FormControllerTest extends RestDocsTestSupport {

given(authenticationArgumentResolver.supportsParameter(any(MethodParameter.class))).willReturn(true);
given(authenticationArgumentResolver.resolveArgument(any(), any(), any(), any())).willReturn(user);
given(downloadAdmissionAndPledgeUseCase.execute(user)).willReturn(new ByteArrayResource(file.getBytes()));
given(downloadAdmissionAndPledgeFormatUseCase.execute(user)).willReturn(new ByteArrayResource(file.getBytes()));

mockMvc.perform(get("/form/admission-and-pledge")
.header(HttpHeaders.AUTHORIZATION, AuthFixture.createAuthHeader())
Expand All @@ -1150,7 +1149,7 @@ class FormControllerTest extends RestDocsTestSupport {
)
));

verify(downloadAdmissionAndPledgeUseCase, times(1)).execute(user);
verify(downloadAdmissionAndPledgeFormatUseCase, times(1)).execute(user);
}

@Test
Expand All @@ -1159,7 +1158,7 @@ class FormControllerTest extends RestDocsTestSupport {

given(authenticationArgumentResolver.supportsParameter(any(MethodParameter.class))).willReturn(true);
given(authenticationArgumentResolver.resolveArgument(any(), any(), any(), any())).willReturn(user);
doThrow(new InvalidFormStatusException()).when(downloadAdmissionAndPledgeUseCase).execute(user);
doThrow(new InvalidFormStatusException()).when(downloadAdmissionAndPledgeFormatUseCase).execute(user);

mockMvc.perform(get("/form/admission-and-pledge")
.header(HttpHeaders.AUTHORIZATION, AuthFixture.createAuthHeader())
Expand All @@ -1169,7 +1168,7 @@ class FormControllerTest extends RestDocsTestSupport {

.andDo(restDocs.document());

verify(downloadAdmissionAndPledgeUseCase, times(1)).execute(user);
verify(downloadAdmissionAndPledgeFormatUseCase, times(1)).execute(user);
}

@Test
Expand All @@ -1178,7 +1177,7 @@ class FormControllerTest extends RestDocsTestSupport {

given(authenticationArgumentResolver.supportsParameter(any(MethodParameter.class))).willReturn(true);
given(authenticationArgumentResolver.resolveArgument(any(), any(), any(), any())).willReturn(user);
doThrow(new FailedToExportPdfException()).when(downloadAdmissionAndPledgeUseCase).execute(user);
doThrow(new FailedToExportPdfException()).when(downloadAdmissionAndPledgeFormatUseCase).execute(user);

mockMvc.perform(get("/form/admission-and-pledge")
.header(HttpHeaders.AUTHORIZATION, AuthFixture.createAuthHeader())
Expand All @@ -1189,7 +1188,7 @@ class FormControllerTest extends RestDocsTestSupport {

.andDo(restDocs.document());

verify(downloadAdmissionAndPledgeUseCase, times(1)).execute(user);
verify(downloadAdmissionAndPledgeFormatUseCase, times(1)).execute(user);
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ public abstract class ControllerTest {
protected GenerateAllAdmissionTicketUseCase generateAllAdmissionTicketUseCase;

@MockBean
protected DownloadAdmissionAndPledgeUseCase downloadAdmissionAndPledgeUseCase;
protected DownloadAdmissionAndPledgeFormatUseCase downloadAdmissionAndPledgeFormatUseCase;

@MockBean
protected UploadAdmissionAndPledgeUseCase uploadAdmissionAndPledgeUseCase;
Expand Down

0 comments on commit 38e5e32

Please sign in to comment.