diff --git a/src/main/java/com/bamdoliro/maru/application/form/DownloadAdmissionAndPledgeUseCase.java b/src/main/java/com/bamdoliro/maru/application/form/DownloadAdmissionAndPledgeFormatUseCase.java similarity index 97% rename from src/main/java/com/bamdoliro/maru/application/form/DownloadAdmissionAndPledgeUseCase.java rename to src/main/java/com/bamdoliro/maru/application/form/DownloadAdmissionAndPledgeFormatUseCase.java index 4eda034..823e610 100644 --- a/src/main/java/com/bamdoliro/maru/application/form/DownloadAdmissionAndPledgeUseCase.java +++ b/src/main/java/com/bamdoliro/maru/application/form/DownloadAdmissionAndPledgeFormatUseCase.java @@ -21,7 +21,7 @@ @RequiredArgsConstructor @UseCase -public class DownloadAdmissionAndPledgeUseCase { +public class DownloadAdmissionAndPledgeFormatUseCase { private final MergePdfService mergePdfService; private final FormFacade formFacade; diff --git a/src/main/java/com/bamdoliro/maru/presentation/form/FormController.java b/src/main/java/com/bamdoliro/maru/presentation/form/FormController.java index 338b223..1fda739 100644 --- a/src/main/java/com/bamdoliro/maru/presentation/form/FormController.java +++ b/src/main/java/com/bamdoliro/maru/presentation/form/FormController.java @@ -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; @@ -190,12 +190,12 @@ public ResponseEntity exportForm( } @GetMapping(value = "/admission-and-pledge") - public ResponseEntity downloadAdmissionAndPledge( + public ResponseEntity 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") diff --git a/src/test/java/com/bamdoliro/maru/application/form/DownloadAdmissionAndPledgeUseCaseTest.java b/src/test/java/com/bamdoliro/maru/application/form/DownloadAdmissionAndPledgeFormatUseCaseTest.java similarity index 92% rename from src/test/java/com/bamdoliro/maru/application/form/DownloadAdmissionAndPledgeUseCaseTest.java rename to src/test/java/com/bamdoliro/maru/application/form/DownloadAdmissionAndPledgeFormatUseCaseTest.java index 1e99c7d..2cadc6f 100644 --- a/src/test/java/com/bamdoliro/maru/application/form/DownloadAdmissionAndPledgeUseCaseTest.java +++ b/src/test/java/com/bamdoliro/maru/application/form/DownloadAdmissionAndPledgeFormatUseCaseTest.java @@ -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; @@ -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); @@ -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); @@ -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); diff --git a/src/test/java/com/bamdoliro/maru/presentation/form/FormControllerTest.java b/src/test/java/com/bamdoliro/maru/presentation/form/FormControllerTest.java index ca60447..dde4143 100644 --- a/src/test/java/com/bamdoliro/maru/presentation/form/FormControllerTest.java +++ b/src/test/java/com/bamdoliro/maru/presentation/form/FormControllerTest.java @@ -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.*; @@ -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()) @@ -1150,7 +1149,7 @@ class FormControllerTest extends RestDocsTestSupport { ) )); - verify(downloadAdmissionAndPledgeUseCase, times(1)).execute(user); + verify(downloadAdmissionAndPledgeFormatUseCase, times(1)).execute(user); } @Test @@ -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()) @@ -1169,7 +1168,7 @@ class FormControllerTest extends RestDocsTestSupport { .andDo(restDocs.document()); - verify(downloadAdmissionAndPledgeUseCase, times(1)).execute(user); + verify(downloadAdmissionAndPledgeFormatUseCase, times(1)).execute(user); } @Test @@ -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()) @@ -1189,7 +1188,7 @@ class FormControllerTest extends RestDocsTestSupport { .andDo(restDocs.document()); - verify(downloadAdmissionAndPledgeUseCase, times(1)).execute(user); + verify(downloadAdmissionAndPledgeFormatUseCase, times(1)).execute(user); } @Test diff --git a/src/test/java/com/bamdoliro/maru/shared/util/ControllerTest.java b/src/test/java/com/bamdoliro/maru/shared/util/ControllerTest.java index 215205c..9eac4e3 100644 --- a/src/test/java/com/bamdoliro/maru/shared/util/ControllerTest.java +++ b/src/test/java/com/bamdoliro/maru/shared/util/ControllerTest.java @@ -261,7 +261,7 @@ public abstract class ControllerTest { protected GenerateAllAdmissionTicketUseCase generateAllAdmissionTicketUseCase; @MockBean - protected DownloadAdmissionAndPledgeUseCase downloadAdmissionAndPledgeUseCase; + protected DownloadAdmissionAndPledgeFormatUseCase downloadAdmissionAndPledgeFormatUseCase; @MockBean protected UploadAdmissionAndPledgeUseCase uploadAdmissionAndPledgeUseCase;