src_fm_fc_ms_ff
stringlengths 43
86.8k
| target
stringlengths 20
276k
|
|---|---|
GenericQuestionApplicationController { @PostMapping(params = "edit") public String edit(@PathVariable long applicationId, @PathVariable long questionId, UserResource user) { questionStatusRestService.markAsInComplete(questionId, applicationId, getUsersProcessRole(applicationId, user).getId()).getSuccess(); return redirectToQuestion(applicationId, questionId); } @GetMapping String view(@ModelAttribute(name = "form", binding = false) GenericQuestionApplicationForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @GetMapping(params = "show-errors") String completeFromReviewPage(@ModelAttribute(value = "form") GenericQuestionApplicationForm form,
BindingResult bindingResult,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping String saveAndReturn(@ModelAttribute(value = "form") GenericQuestionApplicationForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping(params = "assign") String assignToLeadForReview(@ModelAttribute(value = "form") GenericQuestionApplicationForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user,
HttpServletResponse response); @PostMapping(params = "complete") String markAsComplete(@ModelAttribute(value = "form") GenericQuestionApplicationForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping(params = "edit") String edit(@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping("/auto-save") @ResponseBody JsonNode autosave(@ModelAttribute(name = "form") GenericQuestionApplicationForm form,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping(params = "uploadTemplateDocument") String uploadTemplateDocument(@ModelAttribute(name = "form") GenericQuestionApplicationForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
ValidationHandler validationHandler,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping(params = "removeTemplateDocument") String removeTemplateDocument(@ModelAttribute(name = "form") GenericQuestionApplicationForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
ValidationHandler validationHandler,
@RequestParam("removeTemplateDocument") long fileEntryId,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping(params = "uploadAppendix") String uploadAppendix(@ModelAttribute(name = "form") GenericQuestionApplicationForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
ValidationHandler validationHandler,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping(params = "removeAppendix") String removeAppendix(@ModelAttribute(name = "form") GenericQuestionApplicationForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
ValidationHandler validationHandler,
@RequestParam("removeAppendix") long fileEntryId,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @GetMapping("/form-input/{formInputId}/download-template-file") @ResponseBody ResponseEntity<ByteArrayResource> downloadFile(Model model,
@PathVariable long formInputId); } | @Test public void edit() throws Exception { ProcessRoleResource userProcessRole = newProcessRoleResource() .withRole(COLLABORATOR) .withUser(loggedInUser) .build(); when(userRestService.findProcessRole(loggedInUser.getId(), applicationId)).thenReturn(restSuccess(userProcessRole)); when(questionStatusRestService.markAsInComplete(questionId, applicationId, userProcessRole.getId())).thenReturn(restSuccess()); mockMvc.perform(post("/application/{applicationId}/form/question/{questionId}/generic", applicationId, questionId) .param("edit", "true")) .andExpect(redirectedUrl(String.format("/application/%d/form/question/%d/generic", applicationId, questionId))); verify(questionStatusRestService).markAsInComplete(questionId, applicationId, userProcessRole.getId()); verifyNoMoreInteractions(questionStatusRestService); } |
GenericQuestionApplicationController { @PostMapping(params = "uploadTemplateDocument") public String uploadTemplateDocument(@ModelAttribute(name = "form") GenericQuestionApplicationForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user) { return handleFileUpload("templateDocument", FormInputType.TEMPLATE_DOCUMENT, form.getTemplateDocument(), questionId, applicationId, user, validationHandler, model); } @GetMapping String view(@ModelAttribute(name = "form", binding = false) GenericQuestionApplicationForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @GetMapping(params = "show-errors") String completeFromReviewPage(@ModelAttribute(value = "form") GenericQuestionApplicationForm form,
BindingResult bindingResult,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping String saveAndReturn(@ModelAttribute(value = "form") GenericQuestionApplicationForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping(params = "assign") String assignToLeadForReview(@ModelAttribute(value = "form") GenericQuestionApplicationForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user,
HttpServletResponse response); @PostMapping(params = "complete") String markAsComplete(@ModelAttribute(value = "form") GenericQuestionApplicationForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping(params = "edit") String edit(@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping("/auto-save") @ResponseBody JsonNode autosave(@ModelAttribute(name = "form") GenericQuestionApplicationForm form,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping(params = "uploadTemplateDocument") String uploadTemplateDocument(@ModelAttribute(name = "form") GenericQuestionApplicationForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
ValidationHandler validationHandler,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping(params = "removeTemplateDocument") String removeTemplateDocument(@ModelAttribute(name = "form") GenericQuestionApplicationForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
ValidationHandler validationHandler,
@RequestParam("removeTemplateDocument") long fileEntryId,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping(params = "uploadAppendix") String uploadAppendix(@ModelAttribute(name = "form") GenericQuestionApplicationForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
ValidationHandler validationHandler,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping(params = "removeAppendix") String removeAppendix(@ModelAttribute(name = "form") GenericQuestionApplicationForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
ValidationHandler validationHandler,
@RequestParam("removeAppendix") long fileEntryId,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @GetMapping("/form-input/{formInputId}/download-template-file") @ResponseBody ResponseEntity<ByteArrayResource> downloadFile(Model model,
@PathVariable long formInputId); } | @Test public void uploadTemplateDocument() throws Exception { GenericQuestionApplicationViewModel viewModel = mock(GenericQuestionApplicationViewModel.class); ApplicantQuestionResource applicantQuestion = mock(ApplicantQuestionResource.class); when(applicantRestService.getQuestion(loggedInUser.getId(), applicationId, questionId)).thenReturn(applicantQuestion); when(modelPopulator.populate(applicantQuestion)).thenReturn(viewModel); ProcessRoleResource userProcessRole = newProcessRoleResource() .withRole(COLLABORATOR) .withUser(loggedInUser) .build(); FormInputResource formInput = newFormInputResource() .withType(TEMPLATE_DOCUMENT) .build(); when(formInputRestService.getByQuestionIdAndScope(questionId, APPLICATION)).thenReturn(restSuccess(singletonList(formInput))); when(userRestService.findProcessRole(loggedInUser.getId(), applicationId)).thenReturn(restSuccess(userProcessRole)); MockMultipartFile file = new MockMultipartFile("templateDocument", "testFile.pdf", "application/pdf", "My content!".getBytes()); when(formInputResponseRestService.createFileEntry(formInput.getId(), applicationId, userProcessRole.getId(), "application/pdf",11, "testFile.pdf", "My content!".getBytes())) .thenReturn(restSuccess(mock(FileEntryResource.class))); mockMvc.perform(multipart("/application/{applicationId}/form/question/{questionId}/generic", applicationId, questionId) .file(file) .param("uploadTemplateDocument", "true")) .andExpect(view().name("application/questions/generic")); verify(formInputResponseRestService).createFileEntry(formInput.getId(), applicationId, userProcessRole.getId(), "application/pdf",11, "testFile.pdf", "My content!".getBytes()); verifyNoMoreInteractions(formInputResponseRestService); } |
GenericQuestionApplicationController { @PostMapping(params = "removeTemplateDocument") public String removeTemplateDocument(@ModelAttribute(name = "form") GenericQuestionApplicationForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, @RequestParam("removeTemplateDocument") long fileEntryId, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user) { return handleRemoveFile("templateDocument", FormInputType.TEMPLATE_DOCUMENT, questionId, applicationId, fileEntryId, user, validationHandler, model); } @GetMapping String view(@ModelAttribute(name = "form", binding = false) GenericQuestionApplicationForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @GetMapping(params = "show-errors") String completeFromReviewPage(@ModelAttribute(value = "form") GenericQuestionApplicationForm form,
BindingResult bindingResult,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping String saveAndReturn(@ModelAttribute(value = "form") GenericQuestionApplicationForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping(params = "assign") String assignToLeadForReview(@ModelAttribute(value = "form") GenericQuestionApplicationForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user,
HttpServletResponse response); @PostMapping(params = "complete") String markAsComplete(@ModelAttribute(value = "form") GenericQuestionApplicationForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping(params = "edit") String edit(@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping("/auto-save") @ResponseBody JsonNode autosave(@ModelAttribute(name = "form") GenericQuestionApplicationForm form,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping(params = "uploadTemplateDocument") String uploadTemplateDocument(@ModelAttribute(name = "form") GenericQuestionApplicationForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
ValidationHandler validationHandler,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping(params = "removeTemplateDocument") String removeTemplateDocument(@ModelAttribute(name = "form") GenericQuestionApplicationForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
ValidationHandler validationHandler,
@RequestParam("removeTemplateDocument") long fileEntryId,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping(params = "uploadAppendix") String uploadAppendix(@ModelAttribute(name = "form") GenericQuestionApplicationForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
ValidationHandler validationHandler,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping(params = "removeAppendix") String removeAppendix(@ModelAttribute(name = "form") GenericQuestionApplicationForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
ValidationHandler validationHandler,
@RequestParam("removeAppendix") long fileEntryId,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @GetMapping("/form-input/{formInputId}/download-template-file") @ResponseBody ResponseEntity<ByteArrayResource> downloadFile(Model model,
@PathVariable long formInputId); } | @Test public void removeTemplateDocument() throws Exception { long fileEntryId = 10L; GenericQuestionApplicationViewModel viewModel = mock(GenericQuestionApplicationViewModel.class); ApplicantQuestionResource applicantQuestion = mock(ApplicantQuestionResource.class); when(applicantRestService.getQuestion(loggedInUser.getId(), applicationId, questionId)).thenReturn(applicantQuestion); when(modelPopulator.populate(applicantQuestion)).thenReturn(viewModel); ProcessRoleResource userProcessRole = newProcessRoleResource() .withRole(COLLABORATOR) .withUser(loggedInUser) .build(); FormInputResource formInput = newFormInputResource() .withType(TEMPLATE_DOCUMENT) .build(); when(formInputRestService.getByQuestionIdAndScope(questionId, APPLICATION)).thenReturn(restSuccess(singletonList(formInput))); when(userRestService.findProcessRole(loggedInUser.getId(), applicationId)).thenReturn(restSuccess(userProcessRole)); when(formInputResponseRestService.removeFileEntry(formInput.getId(), applicationId, userProcessRole.getId(), fileEntryId)).thenReturn(restSuccess()); mockMvc.perform(post("/application/{applicationId}/form/question/{questionId}/generic", applicationId, questionId) .param("removeTemplateDocument", String.valueOf(fileEntryId))) .andExpect(view().name("application/questions/generic")); verify(formInputResponseRestService).removeFileEntry(formInput.getId(), applicationId, userProcessRole.getId(), fileEntryId); verifyNoMoreInteractions(formInputResponseRestService); } |
GenericQuestionApplicationController { @PostMapping(params = "uploadAppendix") public String uploadAppendix(@ModelAttribute(name = "form") GenericQuestionApplicationForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user) { return handleFileUpload("appendix", FormInputType.FILEUPLOAD, form.getAppendix(), questionId, applicationId, user, validationHandler, model); } @GetMapping String view(@ModelAttribute(name = "form", binding = false) GenericQuestionApplicationForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @GetMapping(params = "show-errors") String completeFromReviewPage(@ModelAttribute(value = "form") GenericQuestionApplicationForm form,
BindingResult bindingResult,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping String saveAndReturn(@ModelAttribute(value = "form") GenericQuestionApplicationForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping(params = "assign") String assignToLeadForReview(@ModelAttribute(value = "form") GenericQuestionApplicationForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user,
HttpServletResponse response); @PostMapping(params = "complete") String markAsComplete(@ModelAttribute(value = "form") GenericQuestionApplicationForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping(params = "edit") String edit(@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping("/auto-save") @ResponseBody JsonNode autosave(@ModelAttribute(name = "form") GenericQuestionApplicationForm form,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping(params = "uploadTemplateDocument") String uploadTemplateDocument(@ModelAttribute(name = "form") GenericQuestionApplicationForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
ValidationHandler validationHandler,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping(params = "removeTemplateDocument") String removeTemplateDocument(@ModelAttribute(name = "form") GenericQuestionApplicationForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
ValidationHandler validationHandler,
@RequestParam("removeTemplateDocument") long fileEntryId,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping(params = "uploadAppendix") String uploadAppendix(@ModelAttribute(name = "form") GenericQuestionApplicationForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
ValidationHandler validationHandler,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping(params = "removeAppendix") String removeAppendix(@ModelAttribute(name = "form") GenericQuestionApplicationForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
ValidationHandler validationHandler,
@RequestParam("removeAppendix") long fileEntryId,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @GetMapping("/form-input/{formInputId}/download-template-file") @ResponseBody ResponseEntity<ByteArrayResource> downloadFile(Model model,
@PathVariable long formInputId); } | @Test public void uploadAppendix() throws Exception { GenericQuestionApplicationViewModel viewModel = mock(GenericQuestionApplicationViewModel.class); ApplicantQuestionResource applicantQuestion = mock(ApplicantQuestionResource.class); when(applicantRestService.getQuestion(loggedInUser.getId(), applicationId, questionId)).thenReturn(applicantQuestion); when(modelPopulator.populate(applicantQuestion)).thenReturn(viewModel); ProcessRoleResource userProcessRole = newProcessRoleResource() .withRole(COLLABORATOR) .withUser(loggedInUser) .build(); FormInputResource formInput = newFormInputResource() .withType(FILEUPLOAD) .build(); when(formInputRestService.getByQuestionIdAndScope(questionId, APPLICATION)).thenReturn(restSuccess(singletonList(formInput))); when(userRestService.findProcessRole(loggedInUser.getId(), applicationId)).thenReturn(restSuccess(userProcessRole)); MockMultipartFile file = new MockMultipartFile("appendix", "testFile.pdf", "application/pdf", "My content!".getBytes()); when(formInputResponseRestService.createFileEntry(formInput.getId(), applicationId, userProcessRole.getId(), "application/pdf",11, "testFile.pdf", "My content!".getBytes())) .thenReturn(restSuccess(mock(FileEntryResource.class))); mockMvc.perform(multipart("/application/{applicationId}/form/question/{questionId}/generic", applicationId, questionId) .file(file) .param("uploadAppendix", "true")) .andExpect(view().name("application/questions/generic")); verify(formInputResponseRestService).createFileEntry(formInput.getId(), applicationId, userProcessRole.getId(), "application/pdf",11, "testFile.pdf", "My content!".getBytes()); verifyNoMoreInteractions(formInputResponseRestService); } |
QuestionServiceImpl extends BaseTransactionalService implements QuestionService { @Override public ServiceResult<QuestionResource> getPreviousQuestion(final Long questionId) { return find(getQuestionSupplier(questionId)).andOnSuccess(question -> { Question previousQuestion = null; if (question != null) { previousQuestion = questionRepository.findFirstByCompetitionIdAndSectionIdAndPriorityLessThanOrderByPriorityDesc( question.getCompetition().getId(), question.getSection().getId(), question.getPriority()); if (previousQuestion == null) { previousQuestion = getPreviousQuestionBySection(question.getSection().getId(), question.getCompetition().getId()); } } if (previousQuestion == null) { return serviceFailure(notFoundError(QuestionResource.class, "getPreviousQuestion", questionId)); } else { return serviceSuccess(questionMapper.mapToResource(previousQuestion)); } }); } @Override ServiceResult<QuestionResource> getQuestionById(final Long id); @Override @Cacheable(cacheNames="questionsByCompetition", key = "T(java.lang.String).format('questionsByCompetition:%d', #competitionId)", unless = "!T(org.innovateuk.ifs.cache.CacheHelper).cacheResultIfCompetitionIsOpen(#result)") ServiceResult<List<QuestionResource>> findByCompetition(final Long competitionId); @Override ServiceResult<QuestionResource> getNextQuestion(final Long questionId); @Override ServiceResult<QuestionResource> getPreviousQuestionBySection(final Long sectionId); @Override ServiceResult<QuestionResource> getNextQuestionBySection(final Long sectionId); @Override ServiceResult<QuestionResource> getPreviousQuestion(final Long questionId); @Override ServiceResult<Question> getQuestionByCompetitionIdAndFormInputType(Long competitionId, FormInputType formInputType); @Override ServiceResult<QuestionResource> getQuestionByCompetitionIdAndQuestionSetupType(final long competitionId,
final QuestionSetupType questionSetupType); @Override ServiceResult<QuestionResource> getQuestionResourceByCompetitionIdAndFormInputType(Long competitionId, FormInputType formInpuType); @Override ServiceResult<List<QuestionResource>> getQuestionsBySectionIdAndType(
Long sectionId, QuestionType type); @Override @Transactional ServiceResult<QuestionResource> save(QuestionResource questionResource); @Override ServiceResult<List<QuestionResource>> getQuestionsByAssessmentId(Long assessmentId); @Override ServiceResult<QuestionResource> getQuestionByIdAndAssessmentId(Long questionId, Long assessmentId); } | @Test public void getPreviousQuestionTest() throws Exception { Question question = newQuestion().withCompetitionAndSectionAndPriority(newCompetition().build(), newSection().build(), 2).build(); Question previousQuestion = newQuestion().withCompetitionAndSectionAndPriority(newCompetition().build(), newSection().build(), 1).build(); QuestionResource previousQuestionResource = newQuestionResource().withCompetitionAndSectionAndPriority(newCompetitionResource().build(), newSectionResource().build(), 1).build(); when(questionRepositoryMock.findById(question.getId())).thenReturn(Optional.of(question)); when(questionRepositoryMock.findFirstByCompetitionIdAndSectionIdAndPriorityLessThanOrderByPriorityDesc( question.getCompetition().getId(), question.getSection().getId(), question.getPriority())) .thenReturn(previousQuestion); when(questionMapperMock.mapToResource(previousQuestion)).thenReturn(previousQuestionResource); assertEquals(previousQuestionResource, questionService.getPreviousQuestion(question.getId()).getSuccess()); }
@Test public void getPreviousQuestionFromOtherSectionTest() throws Exception { Section previousSection = newSection().build(); SectionResource previousSectionResource = newSectionResource().build(); Competition competition = newCompetition().build(); CompetitionResource competitionResource = newCompetitionResource().build(); Question question = newQuestion().withCompetitionAndSectionAndPriority(competition, newSection().build(), 2).build(); Question previousQuestion = newQuestion().withCompetitionAndSectionAndPriority(competition, previousSection, 1).build(); QuestionResource previousQuestionResource = newQuestionResource().withCompetitionAndSectionAndPriority(competitionResource, previousSectionResource, 1).build(); when(questionRepositoryMock.findById(question.getId())).thenReturn(Optional.of(question)); when(sectionService.getPreviousSection(any(SectionResource.class))) .thenReturn(serviceSuccess(previousSectionResource)); when(questionRepositoryMock.findFirstByCompetitionIdAndSectionIdOrderByPriorityDesc( question.getCompetition().getId(), previousQuestion.getSection().getId())) .thenReturn(previousQuestion); when(questionRepositoryMock.findFirstByCompetitionIdAndSectionIdAndPriorityLessThanOrderByPriorityDesc( question.getCompetition().getId(), question.getSection().getId(), question.getPriority())) .thenReturn(previousQuestion); when(questionMapperMock.mapToResource(previousQuestion)).thenReturn(previousQuestionResource); assertEquals(previousQuestionResource, questionService.getPreviousQuestion(question.getId()).getSuccess()); } |
GenericQuestionApplicationController { @PostMapping(params = "removeAppendix") public String removeAppendix(@ModelAttribute(name = "form") GenericQuestionApplicationForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, @RequestParam("removeAppendix") long fileEntryId, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user) { return handleRemoveFile("appendix", FormInputType.FILEUPLOAD, questionId, applicationId, fileEntryId, user, validationHandler, model); } @GetMapping String view(@ModelAttribute(name = "form", binding = false) GenericQuestionApplicationForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @GetMapping(params = "show-errors") String completeFromReviewPage(@ModelAttribute(value = "form") GenericQuestionApplicationForm form,
BindingResult bindingResult,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping String saveAndReturn(@ModelAttribute(value = "form") GenericQuestionApplicationForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping(params = "assign") String assignToLeadForReview(@ModelAttribute(value = "form") GenericQuestionApplicationForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user,
HttpServletResponse response); @PostMapping(params = "complete") String markAsComplete(@ModelAttribute(value = "form") GenericQuestionApplicationForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping(params = "edit") String edit(@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping("/auto-save") @ResponseBody JsonNode autosave(@ModelAttribute(name = "form") GenericQuestionApplicationForm form,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping(params = "uploadTemplateDocument") String uploadTemplateDocument(@ModelAttribute(name = "form") GenericQuestionApplicationForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
ValidationHandler validationHandler,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping(params = "removeTemplateDocument") String removeTemplateDocument(@ModelAttribute(name = "form") GenericQuestionApplicationForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
ValidationHandler validationHandler,
@RequestParam("removeTemplateDocument") long fileEntryId,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping(params = "uploadAppendix") String uploadAppendix(@ModelAttribute(name = "form") GenericQuestionApplicationForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
ValidationHandler validationHandler,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @PostMapping(params = "removeAppendix") String removeAppendix(@ModelAttribute(name = "form") GenericQuestionApplicationForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
ValidationHandler validationHandler,
@RequestParam("removeAppendix") long fileEntryId,
Model model,
@PathVariable long applicationId,
@PathVariable long questionId,
UserResource user); @GetMapping("/form-input/{formInputId}/download-template-file") @ResponseBody ResponseEntity<ByteArrayResource> downloadFile(Model model,
@PathVariable long formInputId); } | @Test public void removeAppendix() throws Exception { long fileEntryId = 10L; GenericQuestionApplicationViewModel viewModel = mock(GenericQuestionApplicationViewModel.class); ApplicantQuestionResource applicantQuestion = mock(ApplicantQuestionResource.class); when(applicantRestService.getQuestion(loggedInUser.getId(), applicationId, questionId)).thenReturn(applicantQuestion); when(modelPopulator.populate(applicantQuestion)).thenReturn(viewModel); ProcessRoleResource userProcessRole = newProcessRoleResource() .withRole(COLLABORATOR) .withUser(loggedInUser) .build(); FormInputResource formInput = newFormInputResource() .withType(FILEUPLOAD) .build(); when(formInputRestService.getByQuestionIdAndScope(questionId, APPLICATION)).thenReturn(restSuccess(singletonList(formInput))); when(userRestService.findProcessRole(loggedInUser.getId(), applicationId)).thenReturn(restSuccess(userProcessRole)); when(formInputResponseRestService.removeFileEntry(formInput.getId(), applicationId, userProcessRole.getId(), fileEntryId)).thenReturn(restSuccess()); mockMvc.perform(post("/application/{applicationId}/form/question/{questionId}/generic", applicationId, questionId) .param("removeAppendix", String.valueOf(fileEntryId))) .andExpect(view().name("application/questions/generic")); verify(formInputResponseRestService).removeFileEntry(formInput.getId(), applicationId, userProcessRole.getId(), fileEntryId); verifyNoMoreInteractions(formInputResponseRestService); } |
GenericQuestionApplicationModelPopulator { public GenericQuestionApplicationViewModel populate(ApplicantQuestionResource applicantQuestion) { Map<FormInputType, ApplicantFormInputResource> formInputs = applicantQuestion.getApplicantFormInputs() .stream() .collect(toMap(input -> input.getFormInput().getType(), Function.identity())); QuestionResource question = applicantQuestion.getQuestion(); ApplicationResource application = applicantQuestion.getApplication(); CompetitionResource competition = applicantQuestion.getCompetition(); GenericQuestionApplicationViewModelBuilder viewModelBuilder = aGenericQuestionApplicationViewModel(); ofNullable(formInputs.get(FormInputType.TEXTAREA)).ifPresent(input -> buildTextAreaViewModel(viewModelBuilder, input)); ofNullable(formInputs.get(FormInputType.MULTIPLE_CHOICE)).ifPresent(input -> buildMultipleChoiceOptionsViewModel(viewModelBuilder, input)); ofNullable(formInputs.get(FormInputType.FILEUPLOAD)).ifPresent(input -> buildAppendixViewModel(viewModelBuilder, input)); ofNullable(formInputs.get(FormInputType.TEMPLATE_DOCUMENT)).ifPresent(input -> buildTemplateDocumentViewModel(viewModelBuilder, input)); applicantQuestion.getApplicantFormInputs() .stream() .flatMap(input -> input.getApplicantResponses().stream()) .map(ApplicantFormInputResponseResource::getResponse) .max(Comparator.comparing(FormInputResponseResource::getUpdateDate)) .ifPresent(response -> viewModelBuilder.withLastUpdated(toUkTimeZone(response.getUpdateDate())) .withLastUpdatedBy(response.getUpdatedByUser()) .withLastUpdatedByName(response.getUpdatedByUserName())); return viewModelBuilder.withApplicationId(application.getId()) .withCompetitionName(competition.getName()) .withApplicationName(application.getName()) .withCurrentUser(applicantQuestion.getCurrentUser().getId()) .withQuestionId(question.getId()) .withQuestionName(question.getShortName()) .withQuestionSubtitle(question.getName()) .withQuestionDescription(question.getDescription()) .withQuestionNumber(question.getQuestionNumber()) .withQuestionType(question.getQuestionSetupType()) .withComplete(applicantQuestion.isCompleteByApplicant(applicantQuestion.getCurrentApplicant())) .withOpen(application.isOpen() && competition.isOpen()) .withLeadApplicant(applicantQuestion.getCurrentApplicant().isLead()) .withAssignButtonsViewModel(assignButtonsPopulator.populate(applicantQuestion, applicantQuestion, false)) .build(); } GenericQuestionApplicationViewModel populate(ApplicantQuestionResource applicantQuestion); } | @Test public void populate() { ZonedDateTime now = ZonedDateTime.now(); ApplicantQuestionResource applicantQuestion = newApplicantQuestionResource() .withQuestion( newQuestionResource() .withQuestionNumber("1") .withDescription("desc") .withShortName("short") .withName("name") .withQuestionSetupType(QuestionSetupType.ASSESSED_QUESTION) .build() ) .withApplication( newApplicationResource() .withName("Application") .build() ) .withCompetition( newCompetitionResource().build() ) .withCurrentApplicant( newApplicantResource() .withProcessRole(newProcessRoleResource().withRole(Role.LEADAPPLICANT).build()) .build() ) .withCurrentUser( newUserResource().build() ) .withApplicantQuestionStatuses( newApplicantQuestionStatusResource() .withStatus(newQuestionStatusResource().build()) .build(1) ) .withApplicantFormInputs(asList( newApplicantFormInputResource() .withFormInput(newFormInputResource() .withType(FormInputType.TEXTAREA) .withGuidanceAnswer("Guidance") .withGuidanceTitle("Title") .withWordCount(500) .build()) .withApplicantResponses(newApplicantFormInputResponseResource() .withResponse(newFormInputResponseResource().withValue("Two words") .withFormInputMaxWordCount(500) .withUpdateDate(now) .withUpdatedByUser(2L) .withUpdatedByUserName("Bob") .build()) .build(1)) .build(), newApplicantFormInputResource() .withFormInput(newFormInputResource() .withType(FormInputType.FILEUPLOAD) .withGuidanceAnswer("Appendix guidance") .withAllowedFileTypes(singleton(FileTypeCategory.PDF)).build()) .withApplicantResponses(newApplicantFormInputResponseResource() .withResponse(newFormInputResponseResource() .withFileEntries(newFileEntryResource() .withName("Appendix1.pdf", "Appendix2.pdf") .build(2)) .withUpdateDate(now.minusDays(2)) .build()) .build(1)) .build(), newApplicantFormInputResource() .withFormInput(newFormInputResource().withType(FormInputType.TEMPLATE_DOCUMENT) .withDescription("Template") .withFile(newFileEntryResource().withName("template.odt").build()) .build()) .withApplicantResponses(newApplicantFormInputResponseResource() .withResponse(newFormInputResponseResource() .withFileEntries(newFileEntryResource() .withId(999L) .withName("templateresponse.pdf") .build(1)) .withUpdateDate(now.minusDays(2)) .build()) .build(1)) .build() )) .build(); AssignButtonsViewModel assignButtonsViewModel = mock(AssignButtonsViewModel.class); when(assignButtonsPopulator.populate(applicantQuestion, applicantQuestion, false)).thenReturn(assignButtonsViewModel); when(assignButtonsViewModel.getAssignableApplicants()).thenReturn(newProcessRoleResource().build(1)); GenericQuestionApplicationViewModel viewModel = populator.populate(applicantQuestion); assertEquals((Long) applicantQuestion.getApplication().getId(), viewModel.getApplicationId()); assertEquals((long) applicantQuestion.getQuestion().getId(), viewModel.getQuestionId()); assertEquals((long) applicantQuestion.getCurrentUser().getId(), viewModel.getCurrentUser()); assertEquals("Application", viewModel.getApplicationName()); assertEquals("short", viewModel.getQuestionName()); assertEquals("1", viewModel.getQuestionNumber()); assertEquals("name", viewModel.getQuestionSubtitle()); assertEquals("desc", viewModel.getQuestionDescription()); assertEquals("Title", viewModel.getQuestionGuidanceTitle()); assertEquals("Guidance", viewModel.getQuestionGuidance()); assertEquals(QuestionSetupType.ASSESSED_QUESTION, viewModel.getQuestionType()); assertEquals(applicantQuestion.getApplicantFormInputs().get(0).getFormInput().getId(), viewModel.getTextAreaFormInputId()); assertEquals((Integer) 500, viewModel.getWordCount()); assertEquals((Integer) 498, viewModel.getWordsLeft()); assertEquals(applicantQuestion.getApplicantFormInputs().get(1).getFormInput().getId(), viewModel.getAppendixFormInputId()); assertEquals("Appendix guidance", viewModel.getAppendixGuidance()); assertEquals(singleton(FileTypeCategory.PDF), viewModel.getAppendixAllowedFileTypes()); assertEquals("Appendix1.pdf", viewModel.getAppendices().get(0).getFilename()); assertEquals("Appendix2.pdf", viewModel.getAppendices().get(1).getFilename()); assertEquals(applicantQuestion.getApplicantFormInputs().get(2).getFormInput().getId(), viewModel.getTemplateDocumentFormInputId()); assertEquals("Template", viewModel.getTemplateDocumentTitle()); assertEquals("template.odt", viewModel.getTemplateDocumentFilename()); assertEquals("templateresponse.pdf", viewModel.getTemplateDocumentResponseFilename()); assertEquals((Long) 999L, viewModel.getTemplateDocumentResponseFileEntryId()); assertEquals(toUkTimeZone(now), viewModel.getLastUpdated()); assertEquals("Bob", viewModel.getLastUpdatedByName()); assertEquals((Long) 2L, viewModel.getLastUpdatedBy()); assertEquals(false, viewModel.isOpen()); assertEquals(false, viewModel.isComplete()); assertEquals(true, viewModel.isLeadApplicant()); assertEquals(assignButtonsViewModel, viewModel.getAssignButtonsViewModel()); assertTrue(viewModel.isReadOnly()); assertTrue(viewModel.shouldDisplayQuestionNumber()); assertTrue(viewModel.hasResponse()); assertFalse(viewModel.isRespondedByCurrentUser()); assertEquals(" by Bob", viewModel.getLastUpdatedText()); assertTrue(viewModel.isReadOnly()); assertTrue(viewModel.isSingleApplicant()); assertTrue(viewModel.isTextAreaActive()); assertTrue(viewModel.isAppendixActive()); assertTrue(viewModel.isTemplateDocumentActive()); }
@Test public void populateForMultipleChoiceOptions() { ZonedDateTime now = ZonedDateTime.now(); Long multipleChoiceOptionId = 1L; String multipleChoiceOptionText = "Yes"; MultipleChoiceOptionResource multipleChoiceOption = new MultipleChoiceOptionResource(multipleChoiceOptionId, multipleChoiceOptionText); ApplicantQuestionResource applicantQuestion = newApplicantQuestionResource() .withQuestion( newQuestionResource() .withQuestionNumber("1") .withDescription("desc") .withShortName("short") .withName("name") .withQuestionSetupType(QuestionSetupType.ASSESSED_QUESTION) .build() ) .withApplication( newApplicationResource() .withName("Application") .build() ) .withCompetition( newCompetitionResource().build() ) .withCurrentApplicant( newApplicantResource() .withProcessRole(newProcessRoleResource().withRole(Role.LEADAPPLICANT).build()) .build() ) .withCurrentUser( newUserResource().build() ) .withApplicantQuestionStatuses( newApplicantQuestionStatusResource() .withStatus(newQuestionStatusResource().build()) .build(1) ) .withApplicantFormInputs(asList( newApplicantFormInputResource() .withFormInput(newFormInputResource() .withType(FormInputType.MULTIPLE_CHOICE) .withMultipleChoiceOptions(Collections.singletonList(multipleChoiceOption)) .withGuidanceAnswer("Guidance") .withGuidanceTitle("Title") .withWordCount(500) .build()) .withApplicantResponses(newApplicantFormInputResponseResource() .withResponse(newFormInputResponseResource().withValue(multipleChoiceOptionText) .withMultipleChoiceOptionId(multipleChoiceOptionId) .withMultipleChoiceOptionText(multipleChoiceOptionText) .withUpdateDate(now) .withUpdatedByUser(2L) .withUpdatedByUserName("Bob") .build()) .build(1)) .build() )) .build(); AssignButtonsViewModel assignButtonsViewModel = mock(AssignButtonsViewModel.class); when(assignButtonsPopulator.populate(applicantQuestion, applicantQuestion, false)).thenReturn(assignButtonsViewModel); when(assignButtonsViewModel.getAssignableApplicants()).thenReturn(newProcessRoleResource().build(1)); GenericQuestionApplicationViewModel viewModel = populator.populate(applicantQuestion); assertEquals((Long) applicantQuestion.getApplication().getId(), viewModel.getApplicationId()); assertEquals((long) applicantQuestion.getQuestion().getId(), viewModel.getQuestionId()); assertEquals((long) applicantQuestion.getCurrentUser().getId(), viewModel.getCurrentUser()); assertEquals(applicantQuestion.getApplicantFormInputs().get(0).getFormInput().getId(), viewModel.getMultipleChoiceFormInputId()); assertEquals(multipleChoiceOptionId, viewModel.getSelectedMultipleChoiceOption().getId()); assertEquals(multipleChoiceOptionText, viewModel.getSelectedMultipleChoiceOption().getText()); assertEquals(toUkTimeZone(now), viewModel.getLastUpdated()); assertEquals("Bob", viewModel.getLastUpdatedByName()); assertEquals((Long) 2L, viewModel.getLastUpdatedBy()); assertEquals(false, viewModel.isOpen()); assertEquals(false, viewModel.isComplete()); assertEquals(true, viewModel.isLeadApplicant()); assertEquals(assignButtonsViewModel, viewModel.getAssignButtonsViewModel()); assertTrue(viewModel.isReadOnly()); assertTrue(viewModel.shouldDisplayQuestionNumber()); assertTrue(viewModel.hasResponse()); assertFalse(viewModel.isRespondedByCurrentUser()); assertEquals(" by Bob", viewModel.getLastUpdatedText()); assertTrue(viewModel.isReadOnly()); assertTrue(viewModel.isSingleApplicant()); assertFalse(viewModel.isTextAreaActive()); assertTrue(viewModel.isMultipleChoiceOptionsActive()); } |
GenericQuestionApplicationFormPopulator { public GenericQuestionApplicationForm populate(GenericQuestionApplicationForm form, ApplicantQuestionResource applicantQuestion) { Optional<ApplicantFormInputResource> applicantFormInput = applicantQuestion.getApplicantFormInputs().stream() .filter(input -> input.getFormInput().getType().equals(FormInputType.TEXTAREA) || input.getFormInput().getType().equals(FormInputType.MULTIPLE_CHOICE)) .findFirst(); String value = applicantFormInput .filter(input -> input.getFormInput().getType().equals(FormInputType.TEXTAREA)) .map(input -> input.getApplicantResponses().stream().findAny() .map(response -> { form.setTextAreaActive(true); return response.getResponse().getValue(); }).orElse(null)) .orElse(null); form.setAnswer(value); Long multipleChoiceOptionId = applicantFormInput .filter(input -> input.getFormInput().getType().equals(FormInputType.MULTIPLE_CHOICE)) .map(input -> input.getApplicantResponses().stream().findAny() .map((response) -> { form.setMultipleChoiceOptionsActive(true); return response.getResponse().getMultipleChoiceOptionId(); }).orElse(null)) .orElse(null); form.setMultipleChoiceOptionId(multipleChoiceOptionId); return form; } GenericQuestionApplicationForm populate(GenericQuestionApplicationForm form, ApplicantQuestionResource applicantQuestion); } | @Test public void populate() { String value = "Two words"; ApplicantQuestionResource applicantQuestion = newApplicantQuestionResource() .withApplicantFormInputs(asList( newApplicantFormInputResource() .withFormInput(newFormInputResource() .withType(FormInputType.TEXTAREA) .withGuidanceAnswer("Guidance") .withGuidanceTitle("Title") .withWordCount(500) .build()) .withApplicantResponses(newApplicantFormInputResponseResource() .withResponse(newFormInputResponseResource().withValue(value) .withFormInputMaxWordCount(500) .withUpdateDate(ZonedDateTime.now()) .withUpdatedByUser(2L) .withUpdatedByUserName("Bob") .build()) .build(1)) .build())) .build(); genericQuestionApplicationFormPopulator.populate(genericQuestionApplicationForm, applicantQuestion); assertTrue(genericQuestionApplicationForm.isTextAreaActive()); assertEquals(value, genericQuestionApplicationForm.getAnswer()); }
@Test public void populateMultipleChoiceOptions() { Long multipleChoiceOptionId = 1L; String multipleChoiceOptionText = "Option 1"; MultipleChoiceOptionResource multipleChoiceOption = new MultipleChoiceOptionResource(multipleChoiceOptionId, multipleChoiceOptionText); ApplicantQuestionResource applicantQuestion = newApplicantQuestionResource() .withApplicantFormInputs(asList( newApplicantFormInputResource() .withFormInput(newFormInputResource() .withType(FormInputType.MULTIPLE_CHOICE) .withMultipleChoiceOptions(Collections.singletonList(multipleChoiceOption)) .build()) .withApplicantResponses(newApplicantFormInputResponseResource() .withResponse(newFormInputResponseResource() .withMultipleChoiceOptionId(multipleChoiceOptionId) .withMultipleChoiceOptionText(multipleChoiceOptionText) .build()) .build(1)) .build())) .build(); genericQuestionApplicationFormPopulator.populate(genericQuestionApplicationForm, applicantQuestion); assertTrue(genericQuestionApplicationForm.isMultipleChoiceOptionsActive()); assertEquals(multipleChoiceOptionId, genericQuestionApplicationForm.getMultipleChoiceOptionId()); } |
GenericQuestionApplicationFormValidator { private void validateTextArea(GenericQuestionApplicationForm form, BindingResult bindingResult) { if (form.isTextAreaActive() && form.getAnswer().trim().length() <= 0) { bindingResult.rejectValue("answer", "validation.field.please.enter.some.text"); } } void validate(GenericQuestionApplicationForm form, BindingResult bindingResult); } | @Test public void validateTextArea() { GenericQuestionApplicationForm form = new GenericQuestionApplicationForm(); form.setAnswer(""); form.setTextAreaActive(true); form.setMultipleChoiceOptionsActive(false); validator.validate(form, bindingResult); assertTrue(bindingResult.hasErrors()); Assert.assertEquals(1, bindingResult.getErrorCount()); FieldError actualError = (FieldError) bindingResult.getAllErrors().get(0); assertEquals("validation.field.please.enter.some.text", actualError.getCode()); assertEquals("answer", actualError.getField()); } |
GenericQuestionApplicationFormValidator { private void validateMultipleChoiceOptions(GenericQuestionApplicationForm form, BindingResult bindingResult) { if (form.isMultipleChoiceOptionsActive() && form.getMultipleChoiceOptionId() == null) { bindingResult.rejectValue("multipleChoiceOptionId", "validation.multiple.choice.required"); } } void validate(GenericQuestionApplicationForm form, BindingResult bindingResult); } | @Test public void validateMultipleChoiceOptions() { GenericQuestionApplicationForm form = new GenericQuestionApplicationForm(); form.setAnswer(""); form.setTextAreaActive(false); form.setMultipleChoiceOptionsActive(true); validator.validate(form, bindingResult); assertTrue(bindingResult.hasErrors()); Assert.assertEquals(1, bindingResult.getErrorCount()); FieldError actualError = (FieldError) bindingResult.getAllErrors().get(0); assertEquals("validation.multiple.choice.required", actualError.getCode()); assertEquals("multipleChoiceOptionId", actualError.getField()); } |
ApplicationAjaxController { @PostMapping("/{competitionId}/saveFormElement") @ResponseBody public JsonNode saveFormElement(@RequestParam("formInputId") String inputIdentifier, @RequestParam("value") String value, @RequestParam("multipleChoiceOptionId") Long multipleChoiceOptionId, @PathVariable(APPLICATION_ID) Long applicationId, @PathVariable("competitionId") Long competitionId, UserResource user, HttpServletRequest request) { List<String> errors = new ArrayList<>(); Long fieldId = null; try { String fieldName = request.getParameter("fieldName"); LOG.info(String.format("saveFormElement: %s / %s", fieldName, value)); StoreFieldResult storeFieldResult = storeField(applicationId, user.getId(), competitionId, fieldName, inputIdentifier, value, multipleChoiceOptionId); fieldId = storeFieldResult.getFieldId(); return createJsonObjectNode(true, fieldId); } catch (Exception e) { AutoSaveElementException ex = new AutoSaveElementException(inputIdentifier, value, applicationId, e); handleAutoSaveException(errors, e, ex); return createJsonObjectNode(false, fieldId); } } @PostMapping("/{competitionId}/saveFormElement") @ResponseBody JsonNode saveFormElement(@RequestParam("formInputId") String inputIdentifier,
@RequestParam("value") String value,
@RequestParam("multipleChoiceOptionId") Long multipleChoiceOptionId,
@PathVariable(APPLICATION_ID) Long applicationId,
@PathVariable("competitionId") Long competitionId,
UserResource user,
HttpServletRequest request); @GetMapping(value = "/update_time_details") String updateTimeDetails(Model model, @PathVariable Long applicationId); } | @Test public void testSaveFormElement() throws Exception { String value = "Form Input " + formInputId + " Response"; mockMvc.perform( post("/application/" + application.getId().toString() + "/form/123/saveFormElement") .param("formInputId", formInputId.toString()) .param("fieldName", "formInput[" + formInputId + "]") .param("value", value) .param("multipleChoiceOptionId", "") ).andExpect(status().isOk()); Mockito.inOrder(formInputResponseRestService).verify(formInputResponseRestService, calls(1)).saveQuestionResponse(loggedInUser.getId(), application.getId(), formInputId, value, null, false); } |
ApplicationSectionController { @SecuredBySpring(value = "TODO", description = "TODO") @PreAuthorize("hasAnyAuthority('applicant', 'support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder', 'external_finance', 'knowledge_transfer_adviser')") @GetMapping("/{sectionType}/{organisationId}") public String redirectToSectionManagement(@PathVariable SectionType sectionType, @PathVariable long applicationId, @PathVariable long organisationId) { ApplicationResource application = applicationRestService.getApplicationById(applicationId).getSuccess(); List<SectionResource> sections = sectionRestService.getSectionsByCompetitionIdAndType(application.getCompetition(), sectionType).getSuccess(); if (sections.size() == 1) { return redirect(applicationId, sections.get(0), organisationId); } return "redirect:/application/" + applicationId; } @SecuredBySpring(value = "TODO", description = "TODO") @PreAuthorize("hasAnyAuthority('applicant', 'support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder', 'external_finance', 'knowledge_transfer_adviser')") @GetMapping("/{sectionType}/{organisationId}") String redirectToSectionManagement(@PathVariable SectionType sectionType,
@PathVariable long applicationId,
@PathVariable long organisationId); @SecuredBySpring(value = "TODO", description = "TODO") @PreAuthorize("hasAuthority('applicant')") @GetMapping("/{sectionType}") String redirectToSection(@PathVariable SectionType sectionType,
@PathVariable long applicationId,
UserResource user); @SecuredBySpring(value = "TODO", description = "TODO") @PreAuthorize("hasAuthority('applicant')") @GetMapping(SECTION_URL + "{sectionId}") String getSectionApplicant(@PathVariable long applicationId,
@PathVariable long sectionId,
UserResource user); @SecuredBySpring(value = "ApplicationSectionController", description = "Internal users can access the sections in the 'Your project Finances'") @PreAuthorize("hasAnyAuthority('support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder')") @GetMapping(SECTION_URL + "{sectionId}/{organisationId}") String getSectionInternalUser(@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId); } | @Test public void redirectToSectionManagement() throws Exception { when(applicationRestService.getApplicationById(APPLICATION_ID)).thenReturn(restSuccess(APPLICATION)); when(sectionRestService.getSectionsByCompetitionIdAndType(COMPETITION_ID, SECTION_TYPE)).thenReturn(restSuccess(singletonList(SECTION))); when(applicationUrlHelper.getSectionUrl(SECTION_TYPE, SECTION_ID, APPLICATION_ID, ORGANISATION_ID, COMPETITION_ID)).thenReturn(Optional.of("redirectUrl")); mockMvc.perform(get("/application/{applicationId}/form/{sectionType}/{organisationId}", APPLICATION_ID, SECTION_TYPE.name(), ORGANISATION_ID)) .andExpect(redirectedUrl("redirectUrl")); } |
ApplicationSectionController { @SecuredBySpring(value = "TODO", description = "TODO") @PreAuthorize("hasAuthority('applicant')") @GetMapping("/{sectionType}") public String redirectToSection(@PathVariable SectionType sectionType, @PathVariable long applicationId, UserResource user) { ApplicationResource application = applicationRestService.getApplicationById(applicationId).getSuccess(); List<SectionResource> sections = sectionRestService.getSectionsByCompetitionIdAndType(application.getCompetition(), sectionType).getSuccess(); if (sections.size() == 1) { return redirect(applicationId, sections.get(0), user); } return "redirect:/application/" + applicationId; } @SecuredBySpring(value = "TODO", description = "TODO") @PreAuthorize("hasAnyAuthority('applicant', 'support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder', 'external_finance', 'knowledge_transfer_adviser')") @GetMapping("/{sectionType}/{organisationId}") String redirectToSectionManagement(@PathVariable SectionType sectionType,
@PathVariable long applicationId,
@PathVariable long organisationId); @SecuredBySpring(value = "TODO", description = "TODO") @PreAuthorize("hasAuthority('applicant')") @GetMapping("/{sectionType}") String redirectToSection(@PathVariable SectionType sectionType,
@PathVariable long applicationId,
UserResource user); @SecuredBySpring(value = "TODO", description = "TODO") @PreAuthorize("hasAuthority('applicant')") @GetMapping(SECTION_URL + "{sectionId}") String getSectionApplicant(@PathVariable long applicationId,
@PathVariable long sectionId,
UserResource user); @SecuredBySpring(value = "ApplicationSectionController", description = "Internal users can access the sections in the 'Your project Finances'") @PreAuthorize("hasAnyAuthority('support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder')") @GetMapping(SECTION_URL + "{sectionId}/{organisationId}") String getSectionInternalUser(@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId); } | @Test public void redirectToSection() throws Exception { when(applicationRestService.getApplicationById(APPLICATION_ID)).thenReturn(restSuccess(APPLICATION)); when(sectionRestService.getSectionsByCompetitionIdAndType(COMPETITION_ID, SECTION_TYPE)).thenReturn(restSuccess(singletonList(SECTION))); when(userRestService.findProcessRole(loggedInUser.getId(), APPLICATION_ID)).thenReturn(restSuccess(PROCESS_ROLE)); when(applicationUrlHelper.getSectionUrl(SECTION_TYPE, SECTION_ID, APPLICATION_ID, ORGANISATION_ID, COMPETITION_ID)).thenReturn(Optional.of("redirectUrl")); mockMvc.perform(get("/application/{applicationId}/form/{sectionType}", APPLICATION_ID, PROJECT_LOCATION.name())) .andExpect(redirectedUrl("redirectUrl")); } |
ApplicationSectionController { @SecuredBySpring(value = "TODO", description = "TODO") @PreAuthorize("hasAuthority('applicant')") @GetMapping(SECTION_URL + "{sectionId}") public String getSectionApplicant(@PathVariable long applicationId, @PathVariable long sectionId, UserResource user) { SectionResource section = sectionRestService.getById(sectionId).getSuccess(); return redirect(applicationId, section, user); } @SecuredBySpring(value = "TODO", description = "TODO") @PreAuthorize("hasAnyAuthority('applicant', 'support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder', 'external_finance', 'knowledge_transfer_adviser')") @GetMapping("/{sectionType}/{organisationId}") String redirectToSectionManagement(@PathVariable SectionType sectionType,
@PathVariable long applicationId,
@PathVariable long organisationId); @SecuredBySpring(value = "TODO", description = "TODO") @PreAuthorize("hasAuthority('applicant')") @GetMapping("/{sectionType}") String redirectToSection(@PathVariable SectionType sectionType,
@PathVariable long applicationId,
UserResource user); @SecuredBySpring(value = "TODO", description = "TODO") @PreAuthorize("hasAuthority('applicant')") @GetMapping(SECTION_URL + "{sectionId}") String getSectionApplicant(@PathVariable long applicationId,
@PathVariable long sectionId,
UserResource user); @SecuredBySpring(value = "ApplicationSectionController", description = "Internal users can access the sections in the 'Your project Finances'") @PreAuthorize("hasAnyAuthority('support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder')") @GetMapping(SECTION_URL + "{sectionId}/{organisationId}") String getSectionInternalUser(@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId); } | @Test public void getSectionApplicant() throws Exception { when(applicationRestService.getApplicationById(APPLICATION_ID)).thenReturn(restSuccess(APPLICATION)); when(sectionRestService.getById(SECTION_ID)).thenReturn(restSuccess(SECTION)); when(userRestService.findProcessRole(loggedInUser.getId(), APPLICATION_ID)).thenReturn(restSuccess(PROCESS_ROLE)); when(applicationUrlHelper.getSectionUrl(SECTION_TYPE, SECTION_ID, APPLICATION_ID, ORGANISATION_ID, COMPETITION_ID)).thenReturn(Optional.of("redirectUrl")); mockMvc.perform(get("/application/{applicationId}/form/section/{sectionId}", APPLICATION_ID, SECTION_ID)) .andExpect(redirectedUrl("redirectUrl")); } |
ApplicationSectionController { @SecuredBySpring(value = "ApplicationSectionController", description = "Internal users can access the sections in the 'Your project Finances'") @PreAuthorize("hasAnyAuthority('support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder')") @GetMapping(SECTION_URL + "{sectionId}/{organisationId}") public String getSectionInternalUser(@PathVariable long applicationId, @PathVariable long sectionId, @PathVariable long organisationId) { SectionResource section = sectionRestService.getById(sectionId).getSuccess(); return redirect(applicationId, section, organisationId); } @SecuredBySpring(value = "TODO", description = "TODO") @PreAuthorize("hasAnyAuthority('applicant', 'support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder', 'external_finance', 'knowledge_transfer_adviser')") @GetMapping("/{sectionType}/{organisationId}") String redirectToSectionManagement(@PathVariable SectionType sectionType,
@PathVariable long applicationId,
@PathVariable long organisationId); @SecuredBySpring(value = "TODO", description = "TODO") @PreAuthorize("hasAuthority('applicant')") @GetMapping("/{sectionType}") String redirectToSection(@PathVariable SectionType sectionType,
@PathVariable long applicationId,
UserResource user); @SecuredBySpring(value = "TODO", description = "TODO") @PreAuthorize("hasAuthority('applicant')") @GetMapping(SECTION_URL + "{sectionId}") String getSectionApplicant(@PathVariable long applicationId,
@PathVariable long sectionId,
UserResource user); @SecuredBySpring(value = "ApplicationSectionController", description = "Internal users can access the sections in the 'Your project Finances'") @PreAuthorize("hasAnyAuthority('support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder')") @GetMapping(SECTION_URL + "{sectionId}/{organisationId}") String getSectionInternalUser(@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId); } | @Test public void getSectionInternalUser() throws Exception { when(applicationRestService.getApplicationById(APPLICATION_ID)).thenReturn(restSuccess(APPLICATION)); when(sectionRestService.getById(SECTION_ID)).thenReturn(restSuccess(SECTION)); when(userRestService.findProcessRole(loggedInUser.getId(), APPLICATION_ID)).thenReturn(restSuccess(PROCESS_ROLE)); when(applicationUrlHelper.getSectionUrl(SECTION_TYPE, SECTION_ID, APPLICATION_ID, ORGANISATION_ID, COMPETITION_ID)).thenReturn(Optional.of("redirectUrl")); mockMvc.perform(get("/application/{applicationId}/form/section/{sectionId}/{organisationId}", APPLICATION_ID, SECTION_ID, ORGANISATION_ID)) .andExpect(redirectedUrl("redirectUrl")); } |
YourProjectLocationFormPopulator { public YourProjectLocationForm populate(long applicationId, long organisationId) { ApplicationFinanceResource applicationFinance = applicationFinanceRestService.getApplicationFinance(applicationId, organisationId).getSuccess(); String postcode = applicationFinance.getWorkPostcode(); String town = applicationFinance.getInternationalLocation(); return new YourProjectLocationForm(postcode, town); } @Autowired YourProjectLocationFormPopulator(ApplicationFinanceRestService applicationFinanceRestService); YourProjectLocationForm populate(long applicationId, long organisationId); } | @Test public void populate() { long applicationId = 123L; long organisationId = 456L; String postcode = "S2 5AB"; when(applicationFinanceRestServiceMock.getApplicationFinance(applicationId, organisationId)). thenReturn(restSuccess(newApplicationFinanceResource().withWorkPostcode(postcode).build())); YourProjectLocationForm form = populator.populate(applicationId, organisationId); assertThat(form.getPostcode()).isEqualTo(postcode); verify(applicationFinanceRestServiceMock, times(1)).getApplicationFinance(applicationId, organisationId); } |
YourProjectLocationController extends AsyncAdaptor { @GetMapping @AsyncMethod @PreAuthorize("hasAnyAuthority('applicant', 'support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder', 'external_finance', 'knowledge_transfer_adviser')") @SecuredBySpring(value = "VIEW_PROJECT_LOCATION", description = "Applicants, stakeholders, internal users and kta can view the Your project location page") public String viewPage( @PathVariable("applicationId") long applicationId, @PathVariable("organisationId") long organisationId, @PathVariable("sectionId") long sectionId, UserResource loggedInUser, Model model) { Future<CommonYourProjectFinancesViewModel> commonViewModelRequest = async(() -> getViewModel(applicationId, sectionId, organisationId, loggedInUser)); Future<YourProjectLocationForm> formRequest = async(() -> formPopulator.populate(applicationId, organisationId)); model.addAttribute("model", commonViewModelRequest); model.addAttribute("form", formRequest); return VIEW_PAGE; } YourProjectLocationController(); @Autowired YourProjectLocationController(
CommonYourFinancesViewModelPopulator commonViewModelPopulator,
YourProjectLocationFormPopulator formPopulator,
ApplicationFinanceRestService applicationFinanceRestService,
SectionService sectionService,
UserRestService userRestService,
OrganisationRestService organisationRestService); @GetMapping @AsyncMethod @PreAuthorize("hasAnyAuthority('applicant', 'support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder', 'external_finance', 'knowledge_transfer_adviser')") @SecuredBySpring(value = "VIEW_PROJECT_LOCATION", description = "Applicants, stakeholders, internal users and kta can view the Your project location page") String viewPage(
@PathVariable("applicationId") long applicationId,
@PathVariable("organisationId") long organisationId,
@PathVariable("sectionId") long sectionId,
UserResource loggedInUser,
Model model); @PostMapping @PreAuthorize("hasAuthority('applicant')") @SecuredBySpring(value = "UPDATE_PROJECT_LOCATION", description = "Applicants can update their project location") String update(
@PathVariable("applicationId") long applicationId,
@PathVariable("organisationId") long organisationId,
@ModelAttribute YourProjectLocationForm form); @PostMapping("/auto-save") @PreAuthorize("hasAuthority('applicant')") @SecuredBySpring(value = "UPDATE_PROJECT_LOCATION", description = "Applicants can update their project location") @ResponseBody JsonNode autosave(
@PathVariable("applicationId") long applicationId,
@PathVariable("organisationId") long organisationId,
@ModelAttribute YourProjectLocationForm form); @PostMapping(params = "mark-as-complete") @PreAuthorize("hasAuthority('applicant')") @SecuredBySpring(value = "MARK_PROJECT_LOCATION_AS_COMPLETE", description = "Applicants can mark their project location as complete") String markAsComplete(
@PathVariable("applicationId") long applicationId,
@PathVariable("organisationId") long organisationId,
@PathVariable("sectionId") long sectionId,
UserResource loggedInUser,
@Valid @ModelAttribute("form") YourProjectLocationForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
ValidationHandler validationHandler,
Model model); @PostMapping(params = "mark-as-incomplete") @PreAuthorize("hasAuthority('applicant')") @SecuredBySpring(value = "MARK_PROJECT_LOCATION_AS_INCOMPLETE", description = "Applicants can mark their project location as incomplete") String markAsIncomplete(
@PathVariable("applicationId") long applicationId,
@PathVariable("organisationId") long organisationId,
@PathVariable("sectionId") long sectionId,
UserResource loggedInUser); } | @Test public void viewPage() throws Exception { assertViewPageSuccessful(false); } |
YourProjectLocationController extends AsyncAdaptor { @PostMapping("/auto-save") @PreAuthorize("hasAuthority('applicant')") @SecuredBySpring(value = "UPDATE_PROJECT_LOCATION", description = "Applicants can update their project location") public @ResponseBody JsonNode autosave( @PathVariable("applicationId") long applicationId, @PathVariable("organisationId") long organisationId, @ModelAttribute YourProjectLocationForm form) { update(applicationId, organisationId, form); return new ObjectMapper().createObjectNode(); } YourProjectLocationController(); @Autowired YourProjectLocationController(
CommonYourFinancesViewModelPopulator commonViewModelPopulator,
YourProjectLocationFormPopulator formPopulator,
ApplicationFinanceRestService applicationFinanceRestService,
SectionService sectionService,
UserRestService userRestService,
OrganisationRestService organisationRestService); @GetMapping @AsyncMethod @PreAuthorize("hasAnyAuthority('applicant', 'support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder', 'external_finance', 'knowledge_transfer_adviser')") @SecuredBySpring(value = "VIEW_PROJECT_LOCATION", description = "Applicants, stakeholders, internal users and kta can view the Your project location page") String viewPage(
@PathVariable("applicationId") long applicationId,
@PathVariable("organisationId") long organisationId,
@PathVariable("sectionId") long sectionId,
UserResource loggedInUser,
Model model); @PostMapping @PreAuthorize("hasAuthority('applicant')") @SecuredBySpring(value = "UPDATE_PROJECT_LOCATION", description = "Applicants can update their project location") String update(
@PathVariable("applicationId") long applicationId,
@PathVariable("organisationId") long organisationId,
@ModelAttribute YourProjectLocationForm form); @PostMapping("/auto-save") @PreAuthorize("hasAuthority('applicant')") @SecuredBySpring(value = "UPDATE_PROJECT_LOCATION", description = "Applicants can update their project location") @ResponseBody JsonNode autosave(
@PathVariable("applicationId") long applicationId,
@PathVariable("organisationId") long organisationId,
@ModelAttribute YourProjectLocationForm form); @PostMapping(params = "mark-as-complete") @PreAuthorize("hasAuthority('applicant')") @SecuredBySpring(value = "MARK_PROJECT_LOCATION_AS_COMPLETE", description = "Applicants can mark their project location as complete") String markAsComplete(
@PathVariable("applicationId") long applicationId,
@PathVariable("organisationId") long organisationId,
@PathVariable("sectionId") long sectionId,
UserResource loggedInUser,
@Valid @ModelAttribute("form") YourProjectLocationForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
ValidationHandler validationHandler,
Model model); @PostMapping(params = "mark-as-incomplete") @PreAuthorize("hasAuthority('applicant')") @SecuredBySpring(value = "MARK_PROJECT_LOCATION_AS_INCOMPLETE", description = "Applicants can mark their project location as incomplete") String markAsIncomplete(
@PathVariable("applicationId") long applicationId,
@PathVariable("organisationId") long organisationId,
@PathVariable("sectionId") long sectionId,
UserResource loggedInUser); } | @Test public void autosave() throws Exception { assertAutosavePostcodeSuccessful(postcode); } |
YourProjectLocationController extends AsyncAdaptor { @PostMapping(params = "mark-as-complete") @PreAuthorize("hasAuthority('applicant')") @SecuredBySpring(value = "MARK_PROJECT_LOCATION_AS_COMPLETE", description = "Applicants can mark their project location as complete") public String markAsComplete( @PathVariable("applicationId") long applicationId, @PathVariable("organisationId") long organisationId, @PathVariable("sectionId") long sectionId, UserResource loggedInUser, @Valid @ModelAttribute("form") YourProjectLocationForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, Model model) { formatLocationInForm(form); Supplier<String> failureHandler = () -> { CommonYourProjectFinancesViewModel viewModel = getViewModel(applicationId, sectionId, organisationId, loggedInUser); model.addAttribute("model", viewModel); model.addAttribute("form", form); return VIEW_PAGE; }; Supplier<String> successHandler = () -> { updateLocation(applicationId, organisationId, form); ProcessRoleResource processRole = userRestService.findProcessRole(loggedInUser.getId(), applicationId).getSuccess(); ValidationMessages validationMessages = sectionService.markAsComplete(sectionId, applicationId, processRole.getId()); validationHandler.addAnyErrors(validationMessages); return validationHandler.failNowOrSucceedWith(failureHandler, () -> redirectToYourFinances(applicationId)); }; return validationHandler. addAnyErrors(validateProjectLocation(organisationId, form)). failNowOrSucceedWith(failureHandler, successHandler); } YourProjectLocationController(); @Autowired YourProjectLocationController(
CommonYourFinancesViewModelPopulator commonViewModelPopulator,
YourProjectLocationFormPopulator formPopulator,
ApplicationFinanceRestService applicationFinanceRestService,
SectionService sectionService,
UserRestService userRestService,
OrganisationRestService organisationRestService); @GetMapping @AsyncMethod @PreAuthorize("hasAnyAuthority('applicant', 'support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder', 'external_finance', 'knowledge_transfer_adviser')") @SecuredBySpring(value = "VIEW_PROJECT_LOCATION", description = "Applicants, stakeholders, internal users and kta can view the Your project location page") String viewPage(
@PathVariable("applicationId") long applicationId,
@PathVariable("organisationId") long organisationId,
@PathVariable("sectionId") long sectionId,
UserResource loggedInUser,
Model model); @PostMapping @PreAuthorize("hasAuthority('applicant')") @SecuredBySpring(value = "UPDATE_PROJECT_LOCATION", description = "Applicants can update their project location") String update(
@PathVariable("applicationId") long applicationId,
@PathVariable("organisationId") long organisationId,
@ModelAttribute YourProjectLocationForm form); @PostMapping("/auto-save") @PreAuthorize("hasAuthority('applicant')") @SecuredBySpring(value = "UPDATE_PROJECT_LOCATION", description = "Applicants can update their project location") @ResponseBody JsonNode autosave(
@PathVariable("applicationId") long applicationId,
@PathVariable("organisationId") long organisationId,
@ModelAttribute YourProjectLocationForm form); @PostMapping(params = "mark-as-complete") @PreAuthorize("hasAuthority('applicant')") @SecuredBySpring(value = "MARK_PROJECT_LOCATION_AS_COMPLETE", description = "Applicants can mark their project location as complete") String markAsComplete(
@PathVariable("applicationId") long applicationId,
@PathVariable("organisationId") long organisationId,
@PathVariable("sectionId") long sectionId,
UserResource loggedInUser,
@Valid @ModelAttribute("form") YourProjectLocationForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
ValidationHandler validationHandler,
Model model); @PostMapping(params = "mark-as-incomplete") @PreAuthorize("hasAuthority('applicant')") @SecuredBySpring(value = "MARK_PROJECT_LOCATION_AS_INCOMPLETE", description = "Applicants can mark their project location as incomplete") String markAsIncomplete(
@PathVariable("applicationId") long applicationId,
@PathVariable("organisationId") long organisationId,
@PathVariable("sectionId") long sectionId,
UserResource loggedInUser); } | @Test public void markAsComplete() throws Exception { assertMarkAsCompleteSuccessful(postcode); } |
YourProjectLocationController extends AsyncAdaptor { @PostMapping(params = "mark-as-incomplete") @PreAuthorize("hasAuthority('applicant')") @SecuredBySpring(value = "MARK_PROJECT_LOCATION_AS_INCOMPLETE", description = "Applicants can mark their project location as incomplete") public String markAsIncomplete( @PathVariable("applicationId") long applicationId, @PathVariable("organisationId") long organisationId, @PathVariable("sectionId") long sectionId, UserResource loggedInUser) { ProcessRoleResource processRole = userRestService.findProcessRole(loggedInUser.getId(), applicationId).getSuccess(); sectionService.markAsInComplete(sectionId, applicationId, processRole.getId()); return redirectToViewPage(applicationId, organisationId, sectionId); } YourProjectLocationController(); @Autowired YourProjectLocationController(
CommonYourFinancesViewModelPopulator commonViewModelPopulator,
YourProjectLocationFormPopulator formPopulator,
ApplicationFinanceRestService applicationFinanceRestService,
SectionService sectionService,
UserRestService userRestService,
OrganisationRestService organisationRestService); @GetMapping @AsyncMethod @PreAuthorize("hasAnyAuthority('applicant', 'support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder', 'external_finance', 'knowledge_transfer_adviser')") @SecuredBySpring(value = "VIEW_PROJECT_LOCATION", description = "Applicants, stakeholders, internal users and kta can view the Your project location page") String viewPage(
@PathVariable("applicationId") long applicationId,
@PathVariable("organisationId") long organisationId,
@PathVariable("sectionId") long sectionId,
UserResource loggedInUser,
Model model); @PostMapping @PreAuthorize("hasAuthority('applicant')") @SecuredBySpring(value = "UPDATE_PROJECT_LOCATION", description = "Applicants can update their project location") String update(
@PathVariable("applicationId") long applicationId,
@PathVariable("organisationId") long organisationId,
@ModelAttribute YourProjectLocationForm form); @PostMapping("/auto-save") @PreAuthorize("hasAuthority('applicant')") @SecuredBySpring(value = "UPDATE_PROJECT_LOCATION", description = "Applicants can update their project location") @ResponseBody JsonNode autosave(
@PathVariable("applicationId") long applicationId,
@PathVariable("organisationId") long organisationId,
@ModelAttribute YourProjectLocationForm form); @PostMapping(params = "mark-as-complete") @PreAuthorize("hasAuthority('applicant')") @SecuredBySpring(value = "MARK_PROJECT_LOCATION_AS_COMPLETE", description = "Applicants can mark their project location as complete") String markAsComplete(
@PathVariable("applicationId") long applicationId,
@PathVariable("organisationId") long organisationId,
@PathVariable("sectionId") long sectionId,
UserResource loggedInUser,
@Valid @ModelAttribute("form") YourProjectLocationForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
ValidationHandler validationHandler,
Model model); @PostMapping(params = "mark-as-incomplete") @PreAuthorize("hasAuthority('applicant')") @SecuredBySpring(value = "MARK_PROJECT_LOCATION_AS_INCOMPLETE", description = "Applicants can mark their project location as incomplete") String markAsIncomplete(
@PathVariable("applicationId") long applicationId,
@PathVariable("organisationId") long organisationId,
@PathVariable("sectionId") long sectionId,
UserResource loggedInUser); } | @Test public void markAsIncomplete() throws Exception { ProcessRoleResource processRole = newProcessRoleResource().build(); when(userRestServiceMock.findProcessRole(loggedInUser.getId(), applicationId)).thenReturn(restSuccess(processRole)); String viewUrl = String.format("redirect:/application/%d/form/your-project-location/" + "organisation/%d/section/%d", applicationId, organisationId, sectionId); mockMvc.perform(post("/application/{applicationId}/form/your-project-location/" + "organisation/{organisationId}/section/{sectionId}", applicationId, organisationId, sectionId) .param("mark-as-incomplete", "")) .andExpect(status().is3xxRedirection()) .andExpect(view().name(viewUrl)) .andReturn(); verify(userRestServiceMock, times(1)).findProcessRole(loggedInUser.getId(), applicationId); verify(sectionServiceMock, times(1)).markAsInComplete(sectionId, applicationId, processRole.getId()); verifyNoMoreInteractionsWithMocks(); } |
Horizon2020CostsSaver { public ServiceResult<Void> save(Horizon2020CostsForm form, long applicationId, long organisationId) { ApplicationFinanceResource applicationFinance = applicationFinanceRestService.getFinanceDetails(applicationId, organisationId).getSuccess(); saveLabour(form, applicationFinance); saveOverhead(form, applicationFinance); saveMaterial(form, applicationFinance); saveCapital(form, applicationFinance); saveSubcontracting(form, applicationFinance); saveTravel(form, applicationFinance); saveOther(form, applicationFinance); return ServiceResult.serviceSuccess(); } Horizon2020CostsSaver(ApplicationFinanceRestService applicationFinanceRestService, ApplicationFinanceRowRestService financeRowRestService); ServiceResult<Void> save(Horizon2020CostsForm form, long applicationId, long organisationId); } | @Test public void save() { LabourCost workingDays = newLabourCost() .withGrossEmployeeCost(BigDecimal.ZERO) .withDescription(WORKING_DAYS_PER_YEAR) .withLabourDays(1) .build(); Overhead overhead = newOverhead() .withRateType(OverheadRateType.NONE) .build(); ApplicationFinanceResource finance = newApplicationFinanceResource().withFinanceOrganisationDetails(asMap( FinanceRowType.LABOUR, newLabourCostCategory().withCosts(singletonList(workingDays)).build(), FinanceRowType.OVERHEADS, newOverheadCostCategory().withCosts(singletonList(overhead)).build(), FinanceRowType.MATERIALS, newDefaultCostCategory().withCosts(emptyList()).build(), FinanceRowType.CAPITAL_USAGE, newDefaultCostCategory().withCosts(emptyList()).build(), FinanceRowType.SUBCONTRACTING_COSTS, newDefaultCostCategory().withCosts(emptyList()).build(), FinanceRowType.TRAVEL, newDefaultCostCategory().withCosts(emptyList()).build(), FinanceRowType.OTHER_COSTS, newDefaultCostCategory().withCosts(emptyList()).build() )).build(); LabourCost newLabourCost = newLabourCost().build(); Materials newMaterial = newMaterials().build(); CapitalUsage newCapital = newCapitalUsage().build(); SubContractingCost newSubcontracting = newSubContractingCost().build(); TravelCost newTravel = newTravelCost().build(); OtherCost newOther = newOtherCost().build(); when(financeRowRestService.create(any(LabourCost.class))).thenReturn(restSuccess(newLabourCost)); when(financeRowRestService.create(any(Materials.class))).thenReturn(restSuccess(newMaterial)); when(financeRowRestService.create(any(CapitalUsage.class))).thenReturn(restSuccess(newCapital)); when(financeRowRestService.create(any(SubContractingCost.class))).thenReturn(restSuccess(newSubcontracting)); when(financeRowRestService.create(any(TravelCost.class))).thenReturn(restSuccess(newTravel)); when(financeRowRestService.create(any(OtherCost.class))).thenReturn(restSuccess(newOther)); when(applicationFinanceRestService.getFinanceDetails(APPLICATION_ID, ORGANISATION_ID)).thenReturn(restSuccess(finance)); Horizon2020CostsForm form = new Horizon2020CostsForm(); form.setLabour(BigInteger.valueOf(1L)); form.setOverhead(BigInteger.valueOf(2L)); form.setMaterial(BigInteger.valueOf(3L)); form.setCapital(BigInteger.valueOf(4L)); form.setSubcontracting(BigInteger.valueOf(5L)); form.setTravel(BigInteger.valueOf(6L)); form.setOther(BigInteger.valueOf(7L)); saver.save(form, APPLICATION_ID, ORGANISATION_ID); verify(financeRowRestService).update(workingDays); verify(financeRowRestService).update(overhead); verify(financeRowRestService).create(any(LabourCost.class)); verify(financeRowRestService).create(any(Materials.class)); verify(financeRowRestService).create(any(CapitalUsage.class)); verify(financeRowRestService).create(any(SubContractingCost.class)); verify(financeRowRestService).create(any(TravelCost.class)); verify(financeRowRestService).create(any(OtherCost.class)); verify(financeRowRestService).update(newLabourCost); verify(financeRowRestService).update(newMaterial); verify(financeRowRestService).update(newCapital); verify(financeRowRestService).update(newSubcontracting); verify(financeRowRestService).update(newTravel); verify(financeRowRestService).update(newOther); verifyNoMoreInteractions(financeRowRestService); assertEquals(newLabourCost.getTotal(workingDays.getLabourDays()).toBigInteger().longValue(), 1L); assertEquals(overhead.getRateType(), OverheadRateType.HORIZON_2020_TOTAL); assertEquals(overhead.getRate(), (Integer) 2); assertEquals(newMaterial.getTotal().toBigInteger().longValue(), 3L); assertEquals(newCapital.getTotal().toBigInteger().longValue(), 4L); assertEquals(newSubcontracting.getTotal().toBigInteger().longValue(), 5L); assertEquals(newTravel.getTotal().toBigInteger().longValue(), 6L); assertEquals(newOther.getTotal().toBigInteger().longValue(), 7L); assertEquals(workingDays.getLabourDays(), (Integer) 1); }
@Test public void save_zeros() { LabourCost workingDays = newLabourCost() .withGrossEmployeeCost(BigDecimal.ZERO) .withDescription(WORKING_DAYS_PER_YEAR) .withLabourDays(1) .build(); Overhead overhead = newOverhead() .withRateType(OverheadRateType.HORIZON_2020_TOTAL) .build(); ApplicationFinanceResource finance = newApplicationFinanceResource().withFinanceOrganisationDetails(asMap( FinanceRowType.LABOUR, newLabourCostCategory().withCosts(asList(workingDays, newLabourCost().build())).build(), FinanceRowType.OVERHEADS, newOverheadCostCategory().withCosts(singletonList(overhead)).build(), FinanceRowType.MATERIALS, newDefaultCostCategory().withCosts(newMaterials().build(1)).build(), FinanceRowType.CAPITAL_USAGE, newDefaultCostCategory().withCosts(newCapitalUsage().build(1)).build(), FinanceRowType.SUBCONTRACTING_COSTS, newDefaultCostCategory().withCosts(newSubContractingCost().build(1)).build(), FinanceRowType.TRAVEL, newDefaultCostCategory().withCosts(newTravelCost().build(1)).build(), FinanceRowType.OTHER_COSTS, newDefaultCostCategory().withCosts(newOtherCost().build(1)).build() )).build(); when(applicationFinanceRestService.getFinanceDetails(APPLICATION_ID, ORGANISATION_ID)).thenReturn(restSuccess(finance)); Horizon2020CostsForm form = new Horizon2020CostsForm(); form.setLabour(BigInteger.valueOf(0L)); form.setOverhead(BigInteger.valueOf(0L)); form.setMaterial(BigInteger.valueOf(0L)); form.setCapital(BigInteger.valueOf(0L)); form.setSubcontracting(BigInteger.valueOf(0L)); form.setTravel(BigInteger.valueOf(0L)); form.setOther(BigInteger.valueOf(0L)); saver.save(form, APPLICATION_ID, ORGANISATION_ID); verify(financeRowRestService).update(workingDays); verify(financeRowRestService).update(overhead); verify(financeRowRestService, times(6)).delete(anyLong()); verifyNoMoreInteractions(financeRowRestService); assertEquals(workingDays.getLabourDays(), (Integer) 1); } |
Horizon2020CostsController extends AsyncAdaptor { @PostMapping @AsyncMethod public String saveYourProjectCosts(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long organisationId, @PathVariable long sectionId, @ModelAttribute("form") Horizon2020CostsForm form) { saver.save(form, applicationId, organisationId); return redirectToYourFinances(applicationId); } @GetMapping @PreAuthorize("hasAnyAuthority('applicant', 'support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder')") @SecuredBySpring(value = "VIEW_H2020_COSTS", description = "Applicants and internal users can view the Your project costs page") String viewHorizon2020Costs(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId); @PostMapping @AsyncMethod String saveYourProjectCosts(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@ModelAttribute("form") Horizon2020CostsForm form); @PostMapping(params = "complete") @AsyncMethod String complete(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@Valid @ModelAttribute("form") Horizon2020CostsForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = "edit") String edit(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId); } | @Test public void saveYourProjectCosts() throws Exception { when(saver.save(any(Horizon2020CostsForm.class), eq(APPLICATION_ID), eq(ORGANISATION_ID))).thenReturn(serviceSuccess()); mockMvc.perform(post(APPLICATION_BASE_URL + "{applicationId}/form/horizon-2020-costs/organisation/{organisationId}/section/{sectionId}", APPLICATION_ID, ORGANISATION_ID, SECTION_ID) .param("eligibleAgreement", "true")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(String.format("/application/%s/form/%s", APPLICATION_ID, SectionType.FINANCE))); } |
Horizon2020CostsController extends AsyncAdaptor { @PostMapping(params = "edit") public String edit(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long organisationId, @PathVariable long sectionId) { sectionStatusRestService.markAsInComplete(sectionId, applicationId, getProcessRoleId(applicationId, user.getId())).getSuccess(); return String.format("redirect:/application/%d/form/horizon-2020-costs/organisation/%d/section/%d", applicationId, organisationId, sectionId); } @GetMapping @PreAuthorize("hasAnyAuthority('applicant', 'support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder')") @SecuredBySpring(value = "VIEW_H2020_COSTS", description = "Applicants and internal users can view the Your project costs page") String viewHorizon2020Costs(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId); @PostMapping @AsyncMethod String saveYourProjectCosts(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@ModelAttribute("form") Horizon2020CostsForm form); @PostMapping(params = "complete") @AsyncMethod String complete(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@Valid @ModelAttribute("form") Horizon2020CostsForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = "edit") String edit(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId); } | @Test public void edit() throws Exception { when(userRestService.findProcessRole(APPLICATION_ID, getLoggedInUser().getId())) .thenReturn(restSuccess(newProcessRoleResource().withId(PROCESS_ROLE_ID).build())); when(sectionStatusRestService.markAsInComplete(SECTION_ID, APPLICATION_ID, PROCESS_ROLE_ID)).thenReturn(restSuccess()); mockMvc.perform(post(APPLICATION_BASE_URL + "{applicationId}/form/horizon-2020-costs/organisation/{organisationId}/section/{sectionId}", APPLICATION_ID, ORGANISATION_ID, SECTION_ID) .param("edit", "true")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(String.format("%s%s/form/horizon-2020-costs/organisation/%s/section/%s", APPLICATION_BASE_URL, APPLICATION_ID, ORGANISATION_ID, SECTION_ID))); verifyZeroInteractions(saver); verify(sectionStatusRestService).markAsInComplete(SECTION_ID, APPLICATION_ID, PROCESS_ROLE_ID); } |
Horizon2020CostsController extends AsyncAdaptor { @PostMapping(params = "complete") @AsyncMethod public String complete(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long organisationId, @PathVariable long sectionId, @Valid @ModelAttribute("form") Horizon2020CostsForm form, BindingResult bindingResult, ValidationHandler validationHandler) { Supplier<String> successView = () -> redirectToYourFinances(applicationId); Supplier<String> failureView = () -> viewHorizon2020Costs(user, model, applicationId, sectionId, organisationId); return validationHandler.failNowOrSucceedWith(failureView, () -> { validationHandler.addAnyErrors(saver.save(form, applicationId, organisationId)); return validationHandler.failNowOrSucceedWith(failureView, () -> { validationHandler.addAnyErrors( sectionStatusRestService.markAsComplete(sectionId, applicationId, getProcessRole(applicationId, user.getId()).getId()).getSuccess()); return validationHandler.failNowOrSucceedWith(failureView, successView); }); }); } @GetMapping @PreAuthorize("hasAnyAuthority('applicant', 'support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder')") @SecuredBySpring(value = "VIEW_H2020_COSTS", description = "Applicants and internal users can view the Your project costs page") String viewHorizon2020Costs(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId); @PostMapping @AsyncMethod String saveYourProjectCosts(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@ModelAttribute("form") Horizon2020CostsForm form); @PostMapping(params = "complete") @AsyncMethod String complete(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@Valid @ModelAttribute("form") Horizon2020CostsForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = "edit") String edit(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId); } | @Test public void complete() throws Exception { ProcessRoleResource processRole = newProcessRoleResource().withId(PROCESS_ROLE_ID).build(); when(saver.save(any(Horizon2020CostsForm.class), eq(APPLICATION_ID), eq(ORGANISATION_ID))).thenReturn(serviceSuccess()); when(userRestService.findProcessRole(APPLICATION_ID, getLoggedInUser().getId())) .thenReturn(restSuccess(processRole)); when(sectionStatusRestService.markAsComplete(SECTION_ID, APPLICATION_ID, processRole.getId())).thenReturn(restSuccess(new ValidationMessages())); mockMvc.perform(post(APPLICATION_BASE_URL + "{applicationId}/form/horizon-2020-costs/organisation/{organisationId}/section/{sectionId}", APPLICATION_ID, ORGANISATION_ID, SECTION_ID) .param("complete", "true")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(String.format("/application/%s/form/%s", APPLICATION_ID, SectionType.FINANCE))); verify(saver).save(any(Horizon2020CostsForm.class), eq(APPLICATION_ID), eq(ORGANISATION_ID)); } |
Horizon2020CostsFormPopulator { public Horizon2020CostsForm populate(long applicationId, long organisationId) { ApplicationFinanceResource applicationFinance = applicationFinanceRestService.getFinanceDetails(applicationId, organisationId).getSuccess(); Horizon2020CostsForm form = new Horizon2020CostsForm(); form.setLabour(applicationFinance.getFinanceOrganisationDetails().get(FinanceRowType.LABOUR).getTotal().toBigInteger()); form.setOverhead(applicationFinance.getFinanceOrganisationDetails().get(FinanceRowType.OVERHEADS).getTotal().toBigInteger()); form.setMaterial(applicationFinance.getFinanceOrganisationDetails().get(FinanceRowType.MATERIALS).getTotal().toBigInteger()); form.setCapital(applicationFinance.getFinanceOrganisationDetails().get(FinanceRowType.CAPITAL_USAGE).getTotal().toBigInteger()); form.setSubcontracting(applicationFinance.getFinanceOrganisationDetails().get(FinanceRowType.SUBCONTRACTING_COSTS).getTotal().toBigInteger()); form.setTravel(applicationFinance.getFinanceOrganisationDetails().get(FinanceRowType.TRAVEL).getTotal().toBigInteger()); form.setOther(applicationFinance.getFinanceOrganisationDetails().get(FinanceRowType.OTHER_COSTS).getTotal().toBigInteger()); return form; } Horizon2020CostsFormPopulator(ApplicationFinanceRestService applicationFinanceRestService); Horizon2020CostsForm populate(long applicationId, long organisationId); } | @Test public void populate() { ApplicationFinanceResource finance = newApplicationFinanceResource().withIndustrialCosts().build(); when(applicationFinanceRestService.getFinanceDetails(APPLICATION_ID, ORGANISATION_ID)).thenReturn(restSuccess(finance)); Horizon2020CostsForm form = populator.populate(APPLICATION_ID, ORGANISATION_ID); assertEquals(form.getLabour(), finance.getFinanceOrganisationDetails().get(FinanceRowType.LABOUR).getTotal().toBigInteger()); assertEquals(form.getOverhead(), finance.getFinanceOrganisationDetails().get(FinanceRowType.OVERHEADS).getTotal().toBigInteger()); assertEquals(form.getMaterial(), finance.getFinanceOrganisationDetails().get(FinanceRowType.MATERIALS).getTotal().toBigInteger()); assertEquals(form.getCapital(), finance.getFinanceOrganisationDetails().get(FinanceRowType.CAPITAL_USAGE).getTotal().toBigInteger()); assertEquals(form.getSubcontracting(), finance.getFinanceOrganisationDetails().get(FinanceRowType.SUBCONTRACTING_COSTS).getTotal().toBigInteger()); assertEquals(form.getTravel(), finance.getFinanceOrganisationDetails().get(FinanceRowType.TRAVEL).getTotal().toBigInteger()); assertEquals(form.getOther(), finance.getFinanceOrganisationDetails().get(FinanceRowType.OTHER_COSTS).getTotal().toBigInteger()); } |
CommonYourFinancesViewModelPopulator { public CommonYourProjectFinancesViewModel populate(long organisationId, long applicationId, long sectionId, UserResource user) { ApplicationResource application = applicationRestService.getApplicationById(applicationId).getSuccess(); CompetitionResource competition = competitionRestService.getCompetitionById(application.getCompetition()).getSuccess(); OrganisationResource organisation = organisationRestService.getOrganisationById(organisationId).getSuccess(); List<Long> completedSectionIds = sectionService.getCompleted(applicationId, organisationId); boolean sectionMarkedAsComplete = completedSectionIds.contains(sectionId); boolean userCanEdit = !(user.isInternalUser() || user.hasRole(Role.EXTERNAL_FINANCE)) && userRestService.findProcessRole(user.getId(), applicationId).getOptionalSuccessObject() .map(role -> role.getOrganisationId() != null && role.getOrganisationId().equals(organisationId)) .orElse(false); boolean open = userCanEdit && application.isOpen() && competition.isOpen(); return new CommonYourProjectFinancesViewModel( getYourFinancesUrl(applicationId, organisationId), application.getCompetitionName(), application.getName(), applicationId, sectionId, open, competition.isH2020(), sectionMarkedAsComplete, competition.isProcurement(), organisation.isInternational()); } CommonYourProjectFinancesViewModel populate(long organisationId, long applicationId, long sectionId, UserResource user); } | @Test public void populate() { boolean internalUser = false; List<Long> sectionsMarkedAsComplete = asList(111L, 333L); ApplicationState applicationState = ApplicationState.OPENED; CompetitionStatus competitionState = CompetitionStatus.OPEN; assertViewModelPopulatedOk( internalUser, sectionsMarkedAsComplete, applicationState, competitionState, expectViewModelIsIncomplete, expectViewModelIsOpen, expectViewModelIsEditable, expectedExternalUserFinanceUrl); } |
YourFundingSaver extends AbstractYourFundingSaver { public ServiceResult<Void> save(long applicationId, long organisationId, AbstractYourFundingAmountForm<? extends BaseOtherFundingRowForm> form) { ApplicationFinanceResource finance = applicationFinanceRestService.getFinanceDetails(applicationId, organisationId).getSuccess(); return super.save(finance, form); } ServiceResult<Void> save(long applicationId, long organisationId, AbstractYourFundingAmountForm<? extends BaseOtherFundingRowForm> form); ServiceResult<Void> save(long applicationId, long organisationId, AbstractYourFundingPercentageForm<? extends BaseOtherFundingRowForm> form); Optional<Long> autoSave(String field, String value, long applicationId, UserResource user); } | @Test public void save() { OtherFunding otherFunding = newOtherFunding() .withFundingSource(OtherFundingCostCategory.OTHER_FUNDING) .withOtherPublicFunding("No") .build(); ApplicationFinanceResource finance = newApplicationFinanceResource() .withFinanceOrganisationDetails(asMap( FinanceRowType.FINANCE, newExcludedCostCategory() .withCosts(newGrantClaimPercentage().build(1)) .build(), FinanceRowType.OTHER_FUNDING, newOtherFundingCostCategory() .withCosts(singletonList(otherFunding)) .build() )).build(); when(financeRowRestService.update(any())).thenReturn(restSuccess(new ValidationMessages())); when(financeRowRestService.create(any())).thenReturn(restSuccess(mock(FinanceRowItem.class))); when(applicationFinanceRestService.getFinanceDetails(APPLICATION_ID, ORGANISATION_ID)).thenReturn(restSuccess(finance)); YourFundingPercentageForm form = new YourFundingPercentageForm(); form.setRequestingFunding(true); form.setGrantClaimPercentage(BigDecimal.valueOf(100)); form.setOtherFunding(true); OtherFundingRowForm emptyRow = new OtherFundingRowForm(new OtherFunding(null, null, "emptySource", "emptyDate", new BigDecimal(123), finance.getId())); OtherFundingRowForm existingRow = new OtherFundingRowForm(new OtherFunding(20L, null, "existingSource", "existingDate", new BigDecimal(321), finance.getId())); form.setOtherFundingRows(asMap( generateUnsavedRowId(), emptyRow, "20", existingRow )); service.save(APPLICATION_ID, ORGANISATION_ID, form); verify(financeRowRestService).update(finance.getGrantClaim()); OtherFunding expectedOtherFundingSet = new OtherFunding(finance.getId()); expectedOtherFundingSet.setId(otherFunding.getId()); expectedOtherFundingSet.setOtherPublicFunding("Yes"); expectedOtherFundingSet.setFundingSource(OtherFundingCostCategory.OTHER_FUNDING); verify(financeRowRestService).update(expectedOtherFundingSet); OtherFunding expectedEmptyRow = new OtherFunding(null, null, "emptySource", "emptyDate", new BigDecimal(123), finance.getId()); verify(financeRowRestService).create(expectedEmptyRow); OtherFunding updatedEmptyRow = new OtherFunding(20L, null, "existingSource", "existingDate", new BigDecimal(321), finance.getId()); verify(financeRowRestService).update(updatedEmptyRow); } |
YourFundingController { @GetMapping @SecuredBySpring(value = "VIEW_YOUR_FUNDING_SECTION", description = "Internal users and kta can access the sections in the 'Your project finances'") @PreAuthorize("hasAnyAuthority('applicant', 'support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder', 'external_finance', 'knowledge_transfer_adviser')") public String viewYourFunding(@ModelAttribute("form") YourFundingPercentageForm bindingForm, Model model, UserResource user, @PathVariable long applicationId, @PathVariable long sectionId, @PathVariable long organisationId) { YourFundingViewModel viewModel = viewModelPopulator.populate(applicationId, sectionId, organisationId, user); model.addAttribute("model", viewModel); if (viewModel.isFundingSectionLocked()) { return VIEW; } AbstractYourFundingForm form = formPopulator.populateForm(applicationId, organisationId); model.addAttribute("form", form); return VIEW; } @GetMapping @SecuredBySpring(value = "VIEW_YOUR_FUNDING_SECTION", description = "Internal users and kta can access the sections in the 'Your project finances'") @PreAuthorize("hasAnyAuthority('applicant', 'support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder', 'external_finance', 'knowledge_transfer_adviser')") String viewYourFunding(@ModelAttribute("form") YourFundingPercentageForm bindingForm,
Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId); @PostMapping(params = "grantClaimPercentage") String saveYourFunding(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingPercentageForm form); @PostMapping(params = {"grantClaimPercentage", "previous"}) String saveYourPreviousFunding(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingPercentageForm form); @PostMapping(params = "amount") String saveYourFunding(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingAmountForm form); @PostMapping(params = {"amount", "previous"}) String saveYourPreviousFunding(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingAmountForm form); @PostMapping(params = {"complete", "grantClaimPercentage"}) String complete(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingPercentageForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = {"complete", "grantClaimPercentage", "previous"}) String completePrevious(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingPercentageForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = {"complete", "amount"}) String complete(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingAmountForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = {"complete", "amount", "previous"}) String completePrevious(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingAmountForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = "edit") String edit(UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId); @PostMapping(params = {"add_cost", "grantClaimPercentage"}) String addFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingPercentageForm form); @PostMapping(params = {"add_cost", "grantClaimPercentage", "previous"}) String addPreviousFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingPercentageForm form); @PostMapping(params = {"add_cost", "amount"}) String addFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingAmountForm form); @PostMapping(params = {"add_cost", "amount", "previous"}) String addPreviousFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingAmountForm form); @PostMapping(params = {"remove_cost", "grantClaimPercentage"}) String removeFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingPercentageForm form,
@RequestParam("remove_cost") String costId); @PostMapping(params = {"remove_cost", "grantClaimPercentage", "previous"}) String removePreviousFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingPercentageForm form,
@RequestParam("remove_cost") String costId); @PostMapping(params = {"remove_cost", "amount"}) String removeFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingAmountForm form,
@RequestParam("remove_cost") String costId); @PostMapping(params = {"remove_cost", "amount", "previous"}) String removePreviousFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingAmountForm form,
@RequestParam("remove_cost") String costId); @PostMapping("auto-save") @ResponseBody JsonNode ajaxAutoSave(UserResource user,
@PathVariable long applicationId,
@RequestParam String field,
@RequestParam String value); @PostMapping("remove-row/{rowId}") @ResponseBody JsonNode ajaxRemoveRow(@PathVariable String rowId); @PostMapping("add-row") String ajaxAddRow(Model model,
@PathVariable long applicationId); } | @Test public void viewYourFunding() throws Exception { YourFundingViewModel viewModel = mockUnlockedViewModel(); mockMvc.perform(get(APPLICATION_BASE_URL + "{applicationId}/form/your-funding/organisation/{organisationId}/section/{sectionId}", APPLICATION_ID, ORGANISATION_ID, SECTION_ID)) .andExpect(model().attribute("model", viewModel)) .andExpect(view().name(VIEW)) .andExpect(status().isOk()); verify(formPopulator).populateForm(eq(APPLICATION_ID), eq(ORGANISATION_ID)); } |
YourFundingController { @PostMapping(params = "grantClaimPercentage") public String saveYourFunding(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long sectionId, @PathVariable long organisationId, @ModelAttribute("form") YourFundingPercentageForm form) { saver.save(applicationId, organisationId, form); return redirectToYourFinances(applicationId); } @GetMapping @SecuredBySpring(value = "VIEW_YOUR_FUNDING_SECTION", description = "Internal users and kta can access the sections in the 'Your project finances'") @PreAuthorize("hasAnyAuthority('applicant', 'support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder', 'external_finance', 'knowledge_transfer_adviser')") String viewYourFunding(@ModelAttribute("form") YourFundingPercentageForm bindingForm,
Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId); @PostMapping(params = "grantClaimPercentage") String saveYourFunding(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingPercentageForm form); @PostMapping(params = {"grantClaimPercentage", "previous"}) String saveYourPreviousFunding(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingPercentageForm form); @PostMapping(params = "amount") String saveYourFunding(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingAmountForm form); @PostMapping(params = {"amount", "previous"}) String saveYourPreviousFunding(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingAmountForm form); @PostMapping(params = {"complete", "grantClaimPercentage"}) String complete(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingPercentageForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = {"complete", "grantClaimPercentage", "previous"}) String completePrevious(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingPercentageForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = {"complete", "amount"}) String complete(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingAmountForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = {"complete", "amount", "previous"}) String completePrevious(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingAmountForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = "edit") String edit(UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId); @PostMapping(params = {"add_cost", "grantClaimPercentage"}) String addFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingPercentageForm form); @PostMapping(params = {"add_cost", "grantClaimPercentage", "previous"}) String addPreviousFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingPercentageForm form); @PostMapping(params = {"add_cost", "amount"}) String addFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingAmountForm form); @PostMapping(params = {"add_cost", "amount", "previous"}) String addPreviousFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingAmountForm form); @PostMapping(params = {"remove_cost", "grantClaimPercentage"}) String removeFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingPercentageForm form,
@RequestParam("remove_cost") String costId); @PostMapping(params = {"remove_cost", "grantClaimPercentage", "previous"}) String removePreviousFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingPercentageForm form,
@RequestParam("remove_cost") String costId); @PostMapping(params = {"remove_cost", "amount"}) String removeFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingAmountForm form,
@RequestParam("remove_cost") String costId); @PostMapping(params = {"remove_cost", "amount", "previous"}) String removePreviousFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingAmountForm form,
@RequestParam("remove_cost") String costId); @PostMapping("auto-save") @ResponseBody JsonNode ajaxAutoSave(UserResource user,
@PathVariable long applicationId,
@RequestParam String field,
@RequestParam String value); @PostMapping("remove-row/{rowId}") @ResponseBody JsonNode ajaxRemoveRow(@PathVariable String rowId); @PostMapping("add-row") String ajaxAddRow(Model model,
@PathVariable long applicationId); } | @Test public void saveYourFunding() throws Exception { when(saver.save(eq(APPLICATION_ID), eq(ORGANISATION_ID), any(YourFundingPercentageForm.class))).thenReturn(serviceSuccess()); mockMvc.perform(post(APPLICATION_BASE_URL + "{applicationId}/form/your-funding/organisation/{organisationId}/section/{sectionId}", APPLICATION_ID, ORGANISATION_ID, SECTION_ID) .param("requestingFunding", "true") .param("grantClaimPercentage", "100") .param("otherFunding", "false")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(String.format("/application/%s/form/%s", APPLICATION_ID, SectionType.FINANCE))); } |
YourFundingController { @PostMapping(params = "edit") public String edit(UserResource user, @PathVariable long applicationId, @PathVariable long sectionId, @PathVariable long organisationId) { sectionStatusRestService.markAsInComplete(sectionId, applicationId, getProcessRoleId(applicationId, user.getId())).getSuccess(); return format("redirect:/application/%d/form/your-funding/organisation/%d/section/%d", applicationId, organisationId, sectionId); } @GetMapping @SecuredBySpring(value = "VIEW_YOUR_FUNDING_SECTION", description = "Internal users and kta can access the sections in the 'Your project finances'") @PreAuthorize("hasAnyAuthority('applicant', 'support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder', 'external_finance', 'knowledge_transfer_adviser')") String viewYourFunding(@ModelAttribute("form") YourFundingPercentageForm bindingForm,
Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId); @PostMapping(params = "grantClaimPercentage") String saveYourFunding(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingPercentageForm form); @PostMapping(params = {"grantClaimPercentage", "previous"}) String saveYourPreviousFunding(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingPercentageForm form); @PostMapping(params = "amount") String saveYourFunding(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingAmountForm form); @PostMapping(params = {"amount", "previous"}) String saveYourPreviousFunding(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingAmountForm form); @PostMapping(params = {"complete", "grantClaimPercentage"}) String complete(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingPercentageForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = {"complete", "grantClaimPercentage", "previous"}) String completePrevious(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingPercentageForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = {"complete", "amount"}) String complete(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingAmountForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = {"complete", "amount", "previous"}) String completePrevious(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingAmountForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = "edit") String edit(UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId); @PostMapping(params = {"add_cost", "grantClaimPercentage"}) String addFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingPercentageForm form); @PostMapping(params = {"add_cost", "grantClaimPercentage", "previous"}) String addPreviousFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingPercentageForm form); @PostMapping(params = {"add_cost", "amount"}) String addFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingAmountForm form); @PostMapping(params = {"add_cost", "amount", "previous"}) String addPreviousFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingAmountForm form); @PostMapping(params = {"remove_cost", "grantClaimPercentage"}) String removeFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingPercentageForm form,
@RequestParam("remove_cost") String costId); @PostMapping(params = {"remove_cost", "grantClaimPercentage", "previous"}) String removePreviousFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingPercentageForm form,
@RequestParam("remove_cost") String costId); @PostMapping(params = {"remove_cost", "amount"}) String removeFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingAmountForm form,
@RequestParam("remove_cost") String costId); @PostMapping(params = {"remove_cost", "amount", "previous"}) String removePreviousFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingAmountForm form,
@RequestParam("remove_cost") String costId); @PostMapping("auto-save") @ResponseBody JsonNode ajaxAutoSave(UserResource user,
@PathVariable long applicationId,
@RequestParam String field,
@RequestParam String value); @PostMapping("remove-row/{rowId}") @ResponseBody JsonNode ajaxRemoveRow(@PathVariable String rowId); @PostMapping("add-row") String ajaxAddRow(Model model,
@PathVariable long applicationId); } | @Test public void edit() throws Exception { YourFundingViewModel viewModel = mockUnlockedViewModel(); when(userRestService.findProcessRole(APPLICATION_ID, getLoggedInUser().getId())) .thenReturn(restSuccess(newProcessRoleResource().withId(PROCESS_ROLE_ID).build())); when(sectionStatusRestService.markAsInComplete(SECTION_ID, APPLICATION_ID, PROCESS_ROLE_ID)).thenReturn(restSuccess()); mockMvc.perform(post(APPLICATION_BASE_URL + "{applicationId}/form/your-funding/organisation/{organisationId}/section/{sectionId}", APPLICATION_ID, ORGANISATION_ID, SECTION_ID) .param("edit", "true")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(String.format("%s%d/form/your-funding/organisation/%d/section/%d", APPLICATION_BASE_URL, APPLICATION_ID, ORGANISATION_ID, SECTION_ID))); verifyZeroInteractions(saver); verify(sectionStatusRestService).markAsInComplete(SECTION_ID, APPLICATION_ID, PROCESS_ROLE_ID); } |
YourFundingController { @PostMapping(params = {"complete", "grantClaimPercentage"}) public String complete(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long sectionId, @PathVariable long organisationId, @ModelAttribute("form") YourFundingPercentageForm form, BindingResult bindingResult, ValidationHandler validationHandler) { return complete(model, user, applicationId, sectionId, organisationId, form, bindingResult, validationHandler, f -> saver.save(applicationId, organisationId, f)); } @GetMapping @SecuredBySpring(value = "VIEW_YOUR_FUNDING_SECTION", description = "Internal users and kta can access the sections in the 'Your project finances'") @PreAuthorize("hasAnyAuthority('applicant', 'support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder', 'external_finance', 'knowledge_transfer_adviser')") String viewYourFunding(@ModelAttribute("form") YourFundingPercentageForm bindingForm,
Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId); @PostMapping(params = "grantClaimPercentage") String saveYourFunding(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingPercentageForm form); @PostMapping(params = {"grantClaimPercentage", "previous"}) String saveYourPreviousFunding(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingPercentageForm form); @PostMapping(params = "amount") String saveYourFunding(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingAmountForm form); @PostMapping(params = {"amount", "previous"}) String saveYourPreviousFunding(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingAmountForm form); @PostMapping(params = {"complete", "grantClaimPercentage"}) String complete(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingPercentageForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = {"complete", "grantClaimPercentage", "previous"}) String completePrevious(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingPercentageForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = {"complete", "amount"}) String complete(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingAmountForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = {"complete", "amount", "previous"}) String completePrevious(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingAmountForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = "edit") String edit(UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId); @PostMapping(params = {"add_cost", "grantClaimPercentage"}) String addFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingPercentageForm form); @PostMapping(params = {"add_cost", "grantClaimPercentage", "previous"}) String addPreviousFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingPercentageForm form); @PostMapping(params = {"add_cost", "amount"}) String addFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingAmountForm form); @PostMapping(params = {"add_cost", "amount", "previous"}) String addPreviousFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingAmountForm form); @PostMapping(params = {"remove_cost", "grantClaimPercentage"}) String removeFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingPercentageForm form,
@RequestParam("remove_cost") String costId); @PostMapping(params = {"remove_cost", "grantClaimPercentage", "previous"}) String removePreviousFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingPercentageForm form,
@RequestParam("remove_cost") String costId); @PostMapping(params = {"remove_cost", "amount"}) String removeFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingAmountForm form,
@RequestParam("remove_cost") String costId); @PostMapping(params = {"remove_cost", "amount", "previous"}) String removePreviousFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingAmountForm form,
@RequestParam("remove_cost") String costId); @PostMapping("auto-save") @ResponseBody JsonNode ajaxAutoSave(UserResource user,
@PathVariable long applicationId,
@RequestParam String field,
@RequestParam String value); @PostMapping("remove-row/{rowId}") @ResponseBody JsonNode ajaxRemoveRow(@PathVariable String rowId); @PostMapping("add-row") String ajaxAddRow(Model model,
@PathVariable long applicationId); } | @Test public void complete() throws Exception { long competitionId = 1l; ApplicationResource applicationResource = newApplicationResource() .withCompetition(competitionId) .build(); CompetitionApplicationConfigResource competitionApplicationConfigResource = newCompetitionApplicationConfigResource().build(); when(saver.save(eq(APPLICATION_ID), eq(ORGANISATION_ID), any(YourFundingPercentageForm.class))).thenReturn(serviceSuccess()); when(userRestService.findProcessRole(APPLICATION_ID, getLoggedInUser().getId())) .thenReturn(restSuccess(newProcessRoleResource().withId(PROCESS_ROLE_ID).build())); when(sectionStatusRestService.markAsComplete(SECTION_ID, APPLICATION_ID, PROCESS_ROLE_ID)).thenReturn(restSuccess(noErrors())); mockMvc.perform(post(APPLICATION_BASE_URL + "{applicationId}/form/your-funding/organisation/{organisationId}/section/{sectionId}", APPLICATION_ID, ORGANISATION_ID, SECTION_ID) .param("complete", "true") .param("grantClaimPercentage", "100")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(String.format("/application/%s/form/%s", APPLICATION_ID, SectionType.FINANCE))); verify(saver).save(eq(APPLICATION_ID), eq(ORGANISATION_ID), any(YourFundingPercentageForm.class)); verify(sectionStatusRestService).markAsComplete(SECTION_ID, APPLICATION_ID, PROCESS_ROLE_ID); } |
YourFundingController { @PostMapping(params = {"add_cost", "grantClaimPercentage"}) public String addFundingRowFormPost(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long sectionId, @PathVariable long organisationId, @ModelAttribute("form") YourFundingPercentageForm form) { saver.addOtherFundingRow(form); return viewYourFunding(model, applicationId, sectionId, organisationId, user); } @GetMapping @SecuredBySpring(value = "VIEW_YOUR_FUNDING_SECTION", description = "Internal users and kta can access the sections in the 'Your project finances'") @PreAuthorize("hasAnyAuthority('applicant', 'support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder', 'external_finance', 'knowledge_transfer_adviser')") String viewYourFunding(@ModelAttribute("form") YourFundingPercentageForm bindingForm,
Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId); @PostMapping(params = "grantClaimPercentage") String saveYourFunding(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingPercentageForm form); @PostMapping(params = {"grantClaimPercentage", "previous"}) String saveYourPreviousFunding(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingPercentageForm form); @PostMapping(params = "amount") String saveYourFunding(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingAmountForm form); @PostMapping(params = {"amount", "previous"}) String saveYourPreviousFunding(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingAmountForm form); @PostMapping(params = {"complete", "grantClaimPercentage"}) String complete(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingPercentageForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = {"complete", "grantClaimPercentage", "previous"}) String completePrevious(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingPercentageForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = {"complete", "amount"}) String complete(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingAmountForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = {"complete", "amount", "previous"}) String completePrevious(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingAmountForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = "edit") String edit(UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId); @PostMapping(params = {"add_cost", "grantClaimPercentage"}) String addFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingPercentageForm form); @PostMapping(params = {"add_cost", "grantClaimPercentage", "previous"}) String addPreviousFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingPercentageForm form); @PostMapping(params = {"add_cost", "amount"}) String addFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingAmountForm form); @PostMapping(params = {"add_cost", "amount", "previous"}) String addPreviousFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingAmountForm form); @PostMapping(params = {"remove_cost", "grantClaimPercentage"}) String removeFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingPercentageForm form,
@RequestParam("remove_cost") String costId); @PostMapping(params = {"remove_cost", "grantClaimPercentage", "previous"}) String removePreviousFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingPercentageForm form,
@RequestParam("remove_cost") String costId); @PostMapping(params = {"remove_cost", "amount"}) String removeFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingAmountForm form,
@RequestParam("remove_cost") String costId); @PostMapping(params = {"remove_cost", "amount", "previous"}) String removePreviousFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingAmountForm form,
@RequestParam("remove_cost") String costId); @PostMapping("auto-save") @ResponseBody JsonNode ajaxAutoSave(UserResource user,
@PathVariable long applicationId,
@RequestParam String field,
@RequestParam String value); @PostMapping("remove-row/{rowId}") @ResponseBody JsonNode ajaxRemoveRow(@PathVariable String rowId); @PostMapping("add-row") String ajaxAddRow(Model model,
@PathVariable long applicationId); } | @Test public void addFundingRowFormPost() throws Exception { YourFundingViewModel viewModel = mockUnlockedViewModel(); mockMvc.perform(post(APPLICATION_BASE_URL + "{applicationId}/form/your-funding/organisation/{organisationId}/section/{sectionId}", APPLICATION_ID, ORGANISATION_ID, SECTION_ID) .param("add_cost", "true") .param("grantClaimPercentage", "100")) .andExpect(model().attribute("model", viewModel)) .andExpect(view().name(VIEW)) .andExpect(status().isOk()); verify(saver).addOtherFundingRow(any()); } |
QuestionServiceImpl extends BaseTransactionalService implements QuestionService { @Override public ServiceResult<QuestionResource> getPreviousQuestionBySection(final Long sectionId) { return sectionService.getById(sectionId).andOnSuccess(section -> { if (section.getParentSection() != null) { Optional<SectionResource> previousSection = sectionService.getPreviousSection(section).getOptionalSuccessObject(); if (previousSection.isPresent()) { Optional<Question> lastQuestionInSection = previousSection.get().getQuestions() .stream() .map(questionRepository::findById) .map(Optional::get) .max(comparing(Question::getPriority)); if(lastQuestionInSection.isPresent()){ return serviceSuccess(questionMapper.mapToResource(lastQuestionInSection.get())); } } } return serviceFailure(notFoundError(QuestionResource.class, "getPreviousQuestionBySection", sectionId)); }); } @Override ServiceResult<QuestionResource> getQuestionById(final Long id); @Override @Cacheable(cacheNames="questionsByCompetition", key = "T(java.lang.String).format('questionsByCompetition:%d', #competitionId)", unless = "!T(org.innovateuk.ifs.cache.CacheHelper).cacheResultIfCompetitionIsOpen(#result)") ServiceResult<List<QuestionResource>> findByCompetition(final Long competitionId); @Override ServiceResult<QuestionResource> getNextQuestion(final Long questionId); @Override ServiceResult<QuestionResource> getPreviousQuestionBySection(final Long sectionId); @Override ServiceResult<QuestionResource> getNextQuestionBySection(final Long sectionId); @Override ServiceResult<QuestionResource> getPreviousQuestion(final Long questionId); @Override ServiceResult<Question> getQuestionByCompetitionIdAndFormInputType(Long competitionId, FormInputType formInputType); @Override ServiceResult<QuestionResource> getQuestionByCompetitionIdAndQuestionSetupType(final long competitionId,
final QuestionSetupType questionSetupType); @Override ServiceResult<QuestionResource> getQuestionResourceByCompetitionIdAndFormInputType(Long competitionId, FormInputType formInpuType); @Override ServiceResult<List<QuestionResource>> getQuestionsBySectionIdAndType(
Long sectionId, QuestionType type); @Override @Transactional ServiceResult<QuestionResource> save(QuestionResource questionResource); @Override ServiceResult<List<QuestionResource>> getQuestionsByAssessmentId(Long assessmentId); @Override ServiceResult<QuestionResource> getQuestionByIdAndAssessmentId(Long questionId, Long assessmentId); } | @Test public void getPreviousQuestionBySectionTest() throws Exception { Section currentSection = newSection().withCompetitionAndPriorityAndParent(newCompetition().build(), 1, newSection().build()).build(); SectionResource currentSectionResource = newSectionResource().withCompetitionAndPriorityAndParent(newCompetition().build().getId(), 1, newSection().build().getId()).build(); Question previousSectionQuestion = newQuestion().build(); QuestionResource previousSectionQuestionResource = newQuestionResource().build(); SectionResource previousSectionResource = newSectionResource().withQuestions(Arrays.asList(previousSectionQuestion.getId())).build(); when(sectionService.getById(currentSection.getId())).thenReturn(serviceSuccess(currentSectionResource)); when(sectionService.getPreviousSection(currentSectionResource)).thenReturn(serviceSuccess(previousSectionResource)); when(questionRepositoryMock.findById(anyLong())).thenReturn(Optional.of(previousSectionQuestion)); when(questionMapperMock.mapToResource(previousSectionQuestion)).thenReturn(previousSectionQuestionResource); assertEquals(previousSectionQuestionResource, questionService.getPreviousQuestionBySection(currentSection.getId()).getSuccess()); } |
YourFundingController { @PostMapping(params = {"remove_cost", "grantClaimPercentage"}) public String removeFundingRowFormPost(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long sectionId, @PathVariable long organisationId, @ModelAttribute("form") YourFundingPercentageForm form, @RequestParam("remove_cost") String costId) { saver.removeOtherFundingRowForm(form, costId); return viewYourFunding(model, applicationId, sectionId, organisationId, user); } @GetMapping @SecuredBySpring(value = "VIEW_YOUR_FUNDING_SECTION", description = "Internal users and kta can access the sections in the 'Your project finances'") @PreAuthorize("hasAnyAuthority('applicant', 'support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder', 'external_finance', 'knowledge_transfer_adviser')") String viewYourFunding(@ModelAttribute("form") YourFundingPercentageForm bindingForm,
Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId); @PostMapping(params = "grantClaimPercentage") String saveYourFunding(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingPercentageForm form); @PostMapping(params = {"grantClaimPercentage", "previous"}) String saveYourPreviousFunding(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingPercentageForm form); @PostMapping(params = "amount") String saveYourFunding(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingAmountForm form); @PostMapping(params = {"amount", "previous"}) String saveYourPreviousFunding(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingAmountForm form); @PostMapping(params = {"complete", "grantClaimPercentage"}) String complete(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingPercentageForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = {"complete", "grantClaimPercentage", "previous"}) String completePrevious(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingPercentageForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = {"complete", "amount"}) String complete(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingAmountForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = {"complete", "amount", "previous"}) String completePrevious(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingAmountForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = "edit") String edit(UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId); @PostMapping(params = {"add_cost", "grantClaimPercentage"}) String addFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingPercentageForm form); @PostMapping(params = {"add_cost", "grantClaimPercentage", "previous"}) String addPreviousFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingPercentageForm form); @PostMapping(params = {"add_cost", "amount"}) String addFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingAmountForm form); @PostMapping(params = {"add_cost", "amount", "previous"}) String addPreviousFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingAmountForm form); @PostMapping(params = {"remove_cost", "grantClaimPercentage"}) String removeFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingPercentageForm form,
@RequestParam("remove_cost") String costId); @PostMapping(params = {"remove_cost", "grantClaimPercentage", "previous"}) String removePreviousFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingPercentageForm form,
@RequestParam("remove_cost") String costId); @PostMapping(params = {"remove_cost", "amount"}) String removeFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingAmountForm form,
@RequestParam("remove_cost") String costId); @PostMapping(params = {"remove_cost", "amount", "previous"}) String removePreviousFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingAmountForm form,
@RequestParam("remove_cost") String costId); @PostMapping("auto-save") @ResponseBody JsonNode ajaxAutoSave(UserResource user,
@PathVariable long applicationId,
@RequestParam String field,
@RequestParam String value); @PostMapping("remove-row/{rowId}") @ResponseBody JsonNode ajaxRemoveRow(@PathVariable String rowId); @PostMapping("add-row") String ajaxAddRow(Model model,
@PathVariable long applicationId); } | @Test public void removeFundingRowFormPost() throws Exception { YourFundingViewModel viewModel = mockUnlockedViewModel(); String rowToRemove = "5"; mockMvc.perform(post(APPLICATION_BASE_URL + "{applicationId}/form/your-funding/organisation/{organisationId}/section/{sectionId}", APPLICATION_ID, ORGANISATION_ID, SECTION_ID) .param("remove_cost", rowToRemove) .param("grantClaimPercentage", "100")) .andExpect(model().attribute("model", viewModel)) .andExpect(view().name(VIEW)) .andExpect(status().isOk()); verify(saver).removeOtherFundingRowForm(any(), eq(rowToRemove)); } |
YourFundingController { @PostMapping("remove-row/{rowId}") public @ResponseBody JsonNode ajaxRemoveRow(@PathVariable String rowId) { saver.removeOtherFundingRow(rowId); return new ObjectMapper().createObjectNode(); } @GetMapping @SecuredBySpring(value = "VIEW_YOUR_FUNDING_SECTION", description = "Internal users and kta can access the sections in the 'Your project finances'") @PreAuthorize("hasAnyAuthority('applicant', 'support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder', 'external_finance', 'knowledge_transfer_adviser')") String viewYourFunding(@ModelAttribute("form") YourFundingPercentageForm bindingForm,
Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId); @PostMapping(params = "grantClaimPercentage") String saveYourFunding(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingPercentageForm form); @PostMapping(params = {"grantClaimPercentage", "previous"}) String saveYourPreviousFunding(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingPercentageForm form); @PostMapping(params = "amount") String saveYourFunding(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingAmountForm form); @PostMapping(params = {"amount", "previous"}) String saveYourPreviousFunding(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingAmountForm form); @PostMapping(params = {"complete", "grantClaimPercentage"}) String complete(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingPercentageForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = {"complete", "grantClaimPercentage", "previous"}) String completePrevious(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingPercentageForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = {"complete", "amount"}) String complete(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingAmountForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = {"complete", "amount", "previous"}) String completePrevious(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingAmountForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = "edit") String edit(UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId); @PostMapping(params = {"add_cost", "grantClaimPercentage"}) String addFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingPercentageForm form); @PostMapping(params = {"add_cost", "grantClaimPercentage", "previous"}) String addPreviousFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingPercentageForm form); @PostMapping(params = {"add_cost", "amount"}) String addFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingAmountForm form); @PostMapping(params = {"add_cost", "amount", "previous"}) String addPreviousFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingAmountForm form); @PostMapping(params = {"remove_cost", "grantClaimPercentage"}) String removeFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingPercentageForm form,
@RequestParam("remove_cost") String costId); @PostMapping(params = {"remove_cost", "grantClaimPercentage", "previous"}) String removePreviousFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingPercentageForm form,
@RequestParam("remove_cost") String costId); @PostMapping(params = {"remove_cost", "amount"}) String removeFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingAmountForm form,
@RequestParam("remove_cost") String costId); @PostMapping(params = {"remove_cost", "amount", "previous"}) String removePreviousFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingAmountForm form,
@RequestParam("remove_cost") String costId); @PostMapping("auto-save") @ResponseBody JsonNode ajaxAutoSave(UserResource user,
@PathVariable long applicationId,
@RequestParam String field,
@RequestParam String value); @PostMapping("remove-row/{rowId}") @ResponseBody JsonNode ajaxRemoveRow(@PathVariable String rowId); @PostMapping("add-row") String ajaxAddRow(Model model,
@PathVariable long applicationId); } | @Test public void ajaxRemoveRow() throws Exception { String costId = "123"; mockMvc.perform(post(APPLICATION_BASE_URL + "{applicationId}/form/your-funding/organisation/{organisationId}/section/{sectionId}/remove-row/{rowId}", APPLICATION_ID, ORGANISATION_ID, SECTION_ID, costId)) .andExpect(status().isOk()); verify(saver).removeOtherFundingRow(costId); } |
YourFundingController { @PostMapping("add-row") public String ajaxAddRow(Model model, @PathVariable long applicationId) { ApplicationResource applicationResource = applicationRestService.getApplicationById(applicationId).getSuccess(); CompetitionResource competitionResource = competitionRestService.getCompetitionById(applicationResource.getCompetition()).getSuccess(); AbstractYourFundingPercentageForm form; if (competitionResource.isKtp()) { form = new YourPreviousFundingPercentageForm(); } else { form = new YourFundingPercentageForm(); } form.setOtherFundingRows(new LinkedHashMap<>()); saver.addOtherFundingRow(form); Map.Entry row = (Map.Entry) form.getOtherFundingRows().entrySet().iterator().next(); model.addAttribute("form", form); model.addAttribute("id", row.getKey()); model.addAttribute("row", row.getValue()); return "application/your-funding-fragments :: ajax_other_funding_row"; } @GetMapping @SecuredBySpring(value = "VIEW_YOUR_FUNDING_SECTION", description = "Internal users and kta can access the sections in the 'Your project finances'") @PreAuthorize("hasAnyAuthority('applicant', 'support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder', 'external_finance', 'knowledge_transfer_adviser')") String viewYourFunding(@ModelAttribute("form") YourFundingPercentageForm bindingForm,
Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId); @PostMapping(params = "grantClaimPercentage") String saveYourFunding(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingPercentageForm form); @PostMapping(params = {"grantClaimPercentage", "previous"}) String saveYourPreviousFunding(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingPercentageForm form); @PostMapping(params = "amount") String saveYourFunding(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingAmountForm form); @PostMapping(params = {"amount", "previous"}) String saveYourPreviousFunding(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingAmountForm form); @PostMapping(params = {"complete", "grantClaimPercentage"}) String complete(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingPercentageForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = {"complete", "grantClaimPercentage", "previous"}) String completePrevious(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingPercentageForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = {"complete", "amount"}) String complete(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingAmountForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = {"complete", "amount", "previous"}) String completePrevious(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingAmountForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = "edit") String edit(UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId); @PostMapping(params = {"add_cost", "grantClaimPercentage"}) String addFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingPercentageForm form); @PostMapping(params = {"add_cost", "grantClaimPercentage", "previous"}) String addPreviousFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingPercentageForm form); @PostMapping(params = {"add_cost", "amount"}) String addFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingAmountForm form); @PostMapping(params = {"add_cost", "amount", "previous"}) String addPreviousFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingAmountForm form); @PostMapping(params = {"remove_cost", "grantClaimPercentage"}) String removeFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingPercentageForm form,
@RequestParam("remove_cost") String costId); @PostMapping(params = {"remove_cost", "grantClaimPercentage", "previous"}) String removePreviousFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingPercentageForm form,
@RequestParam("remove_cost") String costId); @PostMapping(params = {"remove_cost", "amount"}) String removeFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourFundingAmountForm form,
@RequestParam("remove_cost") String costId); @PostMapping(params = {"remove_cost", "amount", "previous"}) String removePreviousFundingRowFormPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@PathVariable long organisationId,
@ModelAttribute("form") YourPreviousFundingAmountForm form,
@RequestParam("remove_cost") String costId); @PostMapping("auto-save") @ResponseBody JsonNode ajaxAutoSave(UserResource user,
@PathVariable long applicationId,
@RequestParam String field,
@RequestParam String value); @PostMapping("remove-row/{rowId}") @ResponseBody JsonNode ajaxRemoveRow(@PathVariable String rowId); @PostMapping("add-row") String ajaxAddRow(Model model,
@PathVariable long applicationId); } | @Test public void ajaxAddRow() throws Exception { String rowId = "123"; OtherFundingRowForm row = new OtherFundingRowForm(); row.setCostId(Long.valueOf(rowId)); Long competitionId = 4L; ApplicationResource application = newApplicationResource().withCompetition(competitionId).build(); when(applicationRestService.getApplicationById(APPLICATION_ID)).thenReturn(restSuccess(application)); CompetitionResource competition = newCompetitionResource().build(); when(competitionRestService.getCompetitionById(competitionId)).thenReturn(restSuccess(competition)); doAnswer((invocation) -> { YourFundingPercentageForm form = (YourFundingPercentageForm) invocation.getArguments()[0]; form.getOtherFundingRows().put(rowId, row); return null; }).when(saver).addOtherFundingRow(any()); mockMvc.perform(post(APPLICATION_BASE_URL + "{applicationId}/form/your-funding/organisation/{organisationId}/section/{sectionId}/add-row", APPLICATION_ID, ORGANISATION_ID, SECTION_ID)) .andExpect(view().name("application/your-funding-fragments :: ajax_other_funding_row")) .andExpect(model().attribute("row", row)) .andExpect(model().attribute("id", rowId)) .andExpect(status().isOk()); verify(saver).addOtherFundingRow(any()); } |
YourFundingFormPopulator extends AbstractYourFundingFormPopulator { public AbstractYourFundingForm populateForm(long applicationId, long organisationId) { CompetitionResource competitionResource = competitionRestService.getCompetitionForApplication(applicationId).getSuccess(); ApplicationFinanceResource finance = applicationFinanceRestService.getFinanceDetails(applicationId, organisationId).getSuccess(); return super.populateForm(finance, competitionResource); } AbstractYourFundingForm populateForm(long applicationId, long organisationId); } | @Test public void populate() { YourFundingPercentageForm form = (YourFundingPercentageForm) service.populateForm(APPLICATION_ID, organisation.getId()); assertEquals(form.getRequestingFunding(), true); assertEquals(form.getGrantClaimPercentage(), BigDecimal.valueOf(100)); assertEquals(form.getOtherFunding(), true); assertEquals(form.getOtherFundingRows().size(), 2); long costId = otherFundingRows.get(0).getId(); BaseOtherFundingRowForm row = form.getOtherFundingRows().get(String.valueOf(costId)); assertEquals(row.getFundingAmount(), new BigDecimal(123)); assertEquals(row.getCostId(), (Long) costId); assertEquals(row.getDate(), "12-MMM"); assertEquals(row.getSource(), "someSource"); String unsavedRowId = form.getOtherFundingRows().keySet().stream().filter(id -> id.startsWith(AbstractCostRowForm.UNSAVED_ROW_PREFIX)).findFirst().get(); BaseOtherFundingRowForm emptyRow = form.getOtherFundingRows().get(unsavedRowId); assertNull(emptyRow.getFundingAmount()); assertNull(emptyRow.getCostId()); assertNull(emptyRow.getDate()); assertNull(emptyRow.getSource()); }
@Test public void populate_defaultValues() { grantClaim.setPercentage(null); otherFunding.setOtherPublicFunding(null); YourFundingPercentageForm form = (YourFundingPercentageForm) service.populateForm(APPLICATION_ID, organisation.getId()); assertNull(form.getRequestingFunding()); assertNull(form.getOtherFunding()); }
@Test public void populate_withOrgId() { grantClaim.setPercentage(null); otherFunding.setOtherPublicFunding(null); YourFundingPercentageForm form = (YourFundingPercentageForm) service.populateForm(APPLICATION_ID, organisation.getId()); assertNull(form.getRequestingFunding()); assertNull(form.getOtherFunding()); } |
YourFundingViewModelPopulator { public YourFundingViewModel populate(long applicationId, long sectionId, long organisationId, UserResource user) { if (user.isInternalUser() || user.hasRole(Role.EXTERNAL_FINANCE) || user.hasRole(Role.KNOWLEDGE_TRANSFER_ADVISER)) { return populateManagement(applicationId, sectionId, organisationId, user); } return populateApplicant(applicationId, sectionId, organisationId, user); } YourFundingViewModel populate(long applicationId, long sectionId, long organisationId, UserResource user); } | @Test public void populate() { CompetitionResource competition = newCompetitionResource().build(); SectionResource sectionResource = newSectionResource() .withId(SECTION_ID) .withChildSections(Collections.emptyList()) .withCompetition(competition.getId()) .withType(SectionType.FUNDING_FINANCES).build(); UserResource user = newUserResource().build(); OrganisationResource organisation = newOrganisationResource() .withOrganisationType(OrganisationTypeEnum.BUSINESS.getId()) .build(); ApplicantResource applicant = newApplicantResource() .withProcessRole(newProcessRoleResource() .withUser(user) .withRoleName("leadapplicant") .build()) .withOrganisation(organisation) .build(); ApplicationResource application = newApplicationResource() .withId(APPLICATION_ID) .withName("Name") .build(); ApplicantSectionResource section = newApplicantSectionResource() .withApplication(application) .withCompetition(competition) .withCurrentApplicant(applicant) .withApplicants(asList(applicant)) .withSection(sectionResource) .withCurrentUser(user) .build(); ApplicationFinanceResource finance = newApplicationFinanceResource() .withMaximumFundingLevel(60) .build(); QuestionResource researchCategoryQuestion = newQuestionResource().build(); when(questionRestService.getQuestionByCompetitionIdAndQuestionSetupType(section.getCompetition().getId(), RESEARCH_CATEGORY)) .thenReturn(restSuccess(researchCategoryQuestion)); when(questionService .getQuestionStatusesForApplicationAndOrganisation(APPLICATION_ID, section.getCurrentApplicant().getOrganisation().getId())) .thenReturn(asMap(researchCategoryQuestion.getId(), newQuestionStatusResource().withMarkedAsComplete(true).build())); SectionResource yourOrgSection = newSectionResource().build(); when(sectionService.getOrganisationFinanceSection(section.getCompetition().getId())).thenReturn(yourOrgSection); when(applicantRestService.getSection(user.getId(), APPLICATION_ID, SECTION_ID)).thenReturn(section); when(sectionService.getCompleted(section.getApplication().getId(), section.getCurrentApplicant().getOrganisation().getId())).thenReturn(asList(yourOrgSection.getId())); when(applicationFinanceRestService.getApplicationFinance(APPLICATION_ID, section.getCurrentApplicant().getOrganisation().getId())).thenReturn(restSuccess(finance)); when(grantClaimMaximumRestService.isMaximumFundingLevelOverridden(section.getCompetition().getId())).thenReturn(restSuccess(true)); YourFundingViewModel viewModel = service.populate(APPLICATION_ID, SECTION_ID, applicant.getOrganisation().getId(), user); assertEquals(APPLICATION_ID, viewModel.getApplicationId()); assertEquals("Name", viewModel.getApplicationName()); assertEquals(competition.getId().longValue(), viewModel.getCompetitionId()); assertEquals(60, viewModel.getMaximumFundingLevel().intValue()); assertEquals(yourOrgSection.getId().longValue(), viewModel.getYourOrganisationSectionId()); assertEquals(researchCategoryQuestion.getId(), viewModel.getResearchCategoryQuestionId()); assertFalse(viewModel.isFundingSectionLocked()); assertEquals(format("/application/%d/form/FINANCE/%d", APPLICATION_ID, organisation.getId()), viewModel.getFinancesUrl()); assertTrue(viewModel.isOverridingFundingRules()); } |
YourFundingViewModelPopulator { private ManagementYourFundingViewModel populateManagement(long applicationId, long sectionId, long organisationId, UserResource user) { ApplicationResource application = applicationRestService.getApplicationById(applicationId).getSuccess(); CompetitionResource competition = competitionRestService.getCompetitionById(application.getCompetition()).getSuccess(); OrganisationResource organisation = organisationRestService.getOrganisationById(organisationId).getSuccess(); return new ManagementYourFundingViewModel(applicationId, application.getCompetitionName(), sectionId, organisationId, application.getCompetition(), application.getName(), format("/application/%d/form/FINANCE/%d", applicationId, organisationId), competition.getFundingType(), organisation.getOrganisationTypeEnum()); } YourFundingViewModel populate(long applicationId, long sectionId, long organisationId, UserResource user); } | @Test public void populateManagement() { long organisationId = 3L; long competitionId = 4L; CompetitionResource competition = newCompetitionResource().build(); OrganisationResource organisation = newOrganisationResource().withOrganisationType(OrganisationTypeEnum.BUSINESS.getId()).build(); when(applicationRestService.getApplicationById(APPLICATION_ID)).thenReturn(restSuccess(newApplicationResource() .withId(APPLICATION_ID) .withName("name") .withCompetition(competitionId) .build())); when(competitionRestService.getCompetitionById(competitionId)).thenReturn(restSuccess(competition)); when(organisationRestService.getOrganisationById(organisationId)).thenReturn(restSuccess(organisation)); YourFundingViewModel viewModel = service.populate(APPLICATION_ID, SECTION_ID, organisationId, newUserResource().withRoleGlobal(Role.COMP_ADMIN).build()); assertEquals(APPLICATION_ID, viewModel.getApplicationId()); assertEquals(competitionId, viewModel.getCompetitionId()); assertEquals("name", viewModel.getApplicationName()); assertEquals(OrganisationTypeEnum.BUSINESS, viewModel.getOrganisationType()); assertFalse(viewModel.isFundingSectionLocked()); assertFalse(viewModel.isFundingSectionLocked()); assertEquals(format("/application/%d/form/FINANCE/%d", APPLICATION_ID, organisationId), viewModel.getFinancesUrl()); } |
YourFundingFormValidator extends AbstractYourFundingFormValidator { public void validate(AbstractYourFundingForm form, Errors errors, UserResource user, long applicationId) { ApplicationResource applicationResource = applicationRestService.getApplicationById(applicationId).getSuccess(); CompetitionApplicationConfigResource competitionApplicationConfigResource = competitionApplicationConfigRestService.findOneByCompetitionId(applicationResource.getCompetition()).getSuccess(); Supplier<BaseFinanceResource> financeSupplier = () -> { OrganisationResource organisation = organisationRestService.getByUserAndApplicationId(user.getId(), applicationId).getSuccess(); return applicationFinanceRestService.getFinanceDetails(applicationId, organisation.getId()).getSuccess(); }; validate(form, errors, financeSupplier, competitionApplicationConfigResource.getMaximumFundingSought()); if (form instanceof YourFundingAmountForm ) { validateLessThanCosts((YourFundingAmountForm) form, errors, financeSupplier); } } void validate(AbstractYourFundingForm form, Errors errors, UserResource user, long applicationId); } | @Test public void validate() { String unsavedId = generateUnsavedRowId(); YourFundingPercentageForm form = new YourFundingPercentageForm(); form.setRequestingFunding(true); form.setGrantClaimPercentage(BigDecimal.valueOf(0)); long competitionId = 1l; ApplicationResource applicationResource = newApplicationResource() .withCompetition(competitionId) .build(); CompetitionApplicationConfigResource competitionApplicationConfigResource = newCompetitionApplicationConfigResource().build(); when(applicationRestService.getApplicationById(anyLong())).thenReturn(restSuccess(applicationResource)); when(competitionApplicationConfigRestService.findOneByCompetitionId(competitionId)).thenReturn(restSuccess(competitionApplicationConfigResource)); form.setOtherFunding(true); OtherFundingRowForm emptyRow = new OtherFundingRowForm(new OtherFunding(null, null, "Valid", "01-2019", new BigDecimal(123), 1L)); OtherFundingRowForm existingRow = new OtherFundingRowForm(new OtherFunding(20L, null, null, "InvalidPattern", new BigDecimal("012345678901234567890"), 1L)); form.setOtherFundingRows(asMap( unsavedId, emptyRow, "20", existingRow )); BindingResult bindingResult = new DataBinder(form).getBindingResult(); UserResource user = newUserResource().build(); long applicationId = 2L; service.validate(form, bindingResult, user, applicationId); assertFalse(bindingResult.hasFieldErrors("requestingFunding")); assertTrue(bindingResult.hasFieldErrors("grantClaimPercentage")); assertFalse(bindingResult.hasFieldErrors("otherFunding")); assertFalse(bindingResult.hasFieldErrors(String.format("otherFundingRows[%s].source", unsavedId))); assertFalse(bindingResult.hasFieldErrors(String.format("otherFundingRows[%s].date", unsavedId))); assertFalse(bindingResult.hasFieldErrors(String.format("otherFundingRows[%s].fundingAmount", unsavedId))); assertTrue(bindingResult.hasFieldErrors("otherFundingRows[20].source")); assertTrue(bindingResult.hasFieldErrors("otherFundingRows[20].date")); assertTrue(bindingResult.hasFieldErrors("otherFundingRows[20].fundingAmount")); }
@Test public void validateYourFundingAmountForm() { long competitionId = 1l; ApplicationResource applicationResource = newApplicationResource() .withCompetition(competitionId) .build(); CompetitionApplicationConfigResource competitionApplicationConfigResource = newCompetitionApplicationConfigResource().build(); YourFundingAmountForm form = new YourFundingAmountForm(); form.setAmount(new BigDecimal("100")); form.setOtherFunding(false); BindingResult bindingResult = new DataBinder(form).getBindingResult(); UserResource user = newUserResource().build(); long applicationId = 2L; OrganisationResource organisation = OrganisationResourceBuilder.newOrganisationResource().build(); ApplicationFinanceResource baseFinanceResource = mock(ApplicationFinanceResource.class); when(organisationRestService.getByUserAndApplicationId(user.getId(), applicationId)).thenReturn(restSuccess(organisation)); when(applicationFinanceRestService.getFinanceDetails(applicationId, organisation.getId())).thenReturn(restSuccess(baseFinanceResource)); when(applicationRestService.getApplicationById(applicationId)).thenReturn(restSuccess(applicationResource)); when(competitionApplicationConfigRestService.findOneByCompetitionId(competitionId)).thenReturn(restSuccess(competitionApplicationConfigResource)); when(baseFinanceResource.getTotal()).thenReturn(new BigDecimal("99.9")); service.validate(form, bindingResult, user, applicationId); assertFalse(bindingResult.hasErrors()); when(baseFinanceResource.getTotal()).thenReturn(new BigDecimal("50")); service.validate(form, bindingResult, user, applicationId); assertTrue(bindingResult.hasErrors()); assertTrue(bindingResult.hasFieldErrors("amount")); } |
QuestionServiceImpl extends BaseTransactionalService implements QuestionService { @Override public ServiceResult<List<QuestionResource>> getQuestionsBySectionIdAndType( Long sectionId, QuestionType type) { return getSection(sectionId).andOnSuccessReturn(section -> questionsOfType(section, type)); } @Override ServiceResult<QuestionResource> getQuestionById(final Long id); @Override @Cacheable(cacheNames="questionsByCompetition", key = "T(java.lang.String).format('questionsByCompetition:%d', #competitionId)", unless = "!T(org.innovateuk.ifs.cache.CacheHelper).cacheResultIfCompetitionIsOpen(#result)") ServiceResult<List<QuestionResource>> findByCompetition(final Long competitionId); @Override ServiceResult<QuestionResource> getNextQuestion(final Long questionId); @Override ServiceResult<QuestionResource> getPreviousQuestionBySection(final Long sectionId); @Override ServiceResult<QuestionResource> getNextQuestionBySection(final Long sectionId); @Override ServiceResult<QuestionResource> getPreviousQuestion(final Long questionId); @Override ServiceResult<Question> getQuestionByCompetitionIdAndFormInputType(Long competitionId, FormInputType formInputType); @Override ServiceResult<QuestionResource> getQuestionByCompetitionIdAndQuestionSetupType(final long competitionId,
final QuestionSetupType questionSetupType); @Override ServiceResult<QuestionResource> getQuestionResourceByCompetitionIdAndFormInputType(Long competitionId, FormInputType formInpuType); @Override ServiceResult<List<QuestionResource>> getQuestionsBySectionIdAndType(
Long sectionId, QuestionType type); @Override @Transactional ServiceResult<QuestionResource> save(QuestionResource questionResource); @Override ServiceResult<List<QuestionResource>> getQuestionsByAssessmentId(Long assessmentId); @Override ServiceResult<QuestionResource> getQuestionByIdAndAssessmentId(Long questionId, Long assessmentId); } | @Test public void getQuestionsBySectionIdAndTypeTest() { Question child1CostQuestion = newQuestion().withQuestionType(QuestionType.COST).build(); Question child1OtherQuestion = newQuestion().withQuestionType(QuestionType.GENERAL).build(); Section childSection1 = newSection().withQuestions(asList(child1CostQuestion, child1OtherQuestion)).build(); Question child2CostQuestion = newQuestion().withQuestionType(QuestionType.COST).build(); Question child2OtherQuestion = newQuestion().withQuestionType(QuestionType.GENERAL).build(); Section childSection2 = newSection().withQuestions(asList(child2CostQuestion, child2OtherQuestion)).build(); Question parentCostQuestion = newQuestion().withQuestionType(QuestionType.COST).build(); Question parentOtherQuestion = newQuestion().withQuestionType(QuestionType.GENERAL).build(); Section parentSection = newSection() .withQuestions(asList(parentCostQuestion, parentOtherQuestion)) .withChildSections(asList(childSection1, childSection2)) .build(); when(sectionRepositoryMock.findById(1L)).thenReturn(Optional.of(parentSection)); QuestionResource questionResource1 = newQuestionResource().build(); QuestionResource questionResource2 = newQuestionResource().build(); QuestionResource questionResource3 = newQuestionResource().build(); when(questionMapperMock.mapToResource(child1CostQuestion)).thenReturn(questionResource1); when(questionMapperMock.mapToResource(child2CostQuestion)).thenReturn(questionResource2); when(questionMapperMock.mapToResource(parentCostQuestion)).thenReturn(questionResource3); ServiceResult<List<QuestionResource>> result = questionService.getQuestionsBySectionIdAndType(1L, QuestionType.COST); assertTrue(result.isSuccess()); assertEquals(3, result.getSuccess().size()); assertTrue(result.getSuccess().contains(questionResource1)); assertTrue(result.getSuccess().contains(questionResource2)); assertTrue(result.getSuccess().contains(questionResource3)); } |
YourProjectCostsController extends AsyncAdaptor { @GetMapping @PreAuthorize("hasAnyAuthority('applicant', 'support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder', 'external_finance', 'knowledge_transfer_adviser')") @SecuredBySpring(value = "VIEW_PROJECT_COSTS", description = "Applicants, internal users and kta can view the Your project costs page") public String viewYourProjectCosts(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long organisationId, @PathVariable long sectionId) { YourProjectCostsForm form = formPopulator.populateForm(applicationId, organisationId); model.addAttribute("form", form); return viewYourProjectCosts(form, user, model, applicationId, sectionId, organisationId); } @GetMapping @PreAuthorize("hasAnyAuthority('applicant', 'support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder', 'external_finance', 'knowledge_transfer_adviser')") @SecuredBySpring(value = "VIEW_PROJECT_COSTS", description = "Applicants, internal users and kta can view the Your project costs page") String viewYourProjectCosts(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId); @PostMapping @AsyncMethod String saveYourProjectCosts(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form,
BindingResult bindingResult); @PostMapping(params = "complete") @AsyncMethod String complete(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@Valid @ModelAttribute("form") YourProjectCostsForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = "edit") String edit(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form); @PostMapping(params = "remove_cost") String removeRowPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form,
@RequestParam("remove_cost") String removeId); @PostMapping(params = "add_cost") String addRowPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form,
@RequestParam("add_cost") FinanceRowType rowType); @PostMapping(params = "uploadOverheadFile") String uploadOverheadSpreadsheet(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = "removeOverheadFile") String removeOverheadSpreadsheet(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form); @PostMapping("remove-row/{rowId}") @ResponseBody JsonNode ajaxRemoveRow(UserResource user,
@PathVariable long applicationId,
@PathVariable String rowId); @PostMapping("add-row/{rowType}") String ajaxAddRow(Model model,
@PathVariable FinanceRowType rowType); @PostMapping("auto-save") @ResponseBody JsonNode ajaxAutoSave(UserResource user,
@PathVariable long applicationId,
@RequestParam String field,
@RequestParam String value); } | @Test public void viewYourProjectCosts() throws Exception { YourProjectCostsViewModel viewModel = mockViewModel(); OrganisationResource organisationResource = newOrganisationResource() .withId(ORGANISATION_ID) .build(); when(formPopulator.populateForm(APPLICATION_ID, ORGANISATION_ID)).thenReturn(new YourProjectCostsForm()); mockMvc.perform(get(APPLICATION_BASE_URL + "{applicationId}/form/your-project-costs/organisation/{organisationId}/section/{sectionId}", APPLICATION_ID, ORGANISATION_ID, SECTION_ID)) .andExpect(model().attribute("model", viewModel)) .andExpect(view().name(VIEW)) .andExpect(status().isOk()); } |
YourProjectCostsController extends AsyncAdaptor { @PostMapping @AsyncMethod public String saveYourProjectCosts(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long sectionId, @ModelAttribute("form") YourProjectCostsForm form, BindingResult bindingResult) { saver.save(form, applicationId, user); return redirectToYourFinances(applicationId); } @GetMapping @PreAuthorize("hasAnyAuthority('applicant', 'support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder', 'external_finance', 'knowledge_transfer_adviser')") @SecuredBySpring(value = "VIEW_PROJECT_COSTS", description = "Applicants, internal users and kta can view the Your project costs page") String viewYourProjectCosts(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId); @PostMapping @AsyncMethod String saveYourProjectCosts(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form,
BindingResult bindingResult); @PostMapping(params = "complete") @AsyncMethod String complete(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@Valid @ModelAttribute("form") YourProjectCostsForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = "edit") String edit(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form); @PostMapping(params = "remove_cost") String removeRowPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form,
@RequestParam("remove_cost") String removeId); @PostMapping(params = "add_cost") String addRowPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form,
@RequestParam("add_cost") FinanceRowType rowType); @PostMapping(params = "uploadOverheadFile") String uploadOverheadSpreadsheet(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = "removeOverheadFile") String removeOverheadSpreadsheet(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form); @PostMapping("remove-row/{rowId}") @ResponseBody JsonNode ajaxRemoveRow(UserResource user,
@PathVariable long applicationId,
@PathVariable String rowId); @PostMapping("add-row/{rowType}") String ajaxAddRow(Model model,
@PathVariable FinanceRowType rowType); @PostMapping("auto-save") @ResponseBody JsonNode ajaxAutoSave(UserResource user,
@PathVariable long applicationId,
@RequestParam String field,
@RequestParam String value); } | @Test public void saveYourProjectCosts() throws Exception { when(saver.save(any(YourProjectCostsForm.class), eq(APPLICATION_ID), eq(getLoggedInUser()))).thenReturn(serviceSuccess()); mockMvc.perform(post(APPLICATION_BASE_URL + "{applicationId}/form/your-project-costs/organisation/{organisationId}/section/{sectionId}", APPLICATION_ID, ORGANISATION_ID, SECTION_ID) .param("eligibleAgreement", "true")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(String.format("/application/%s/form/%s", APPLICATION_ID, SectionType.FINANCE))); } |
YourProjectCostsController extends AsyncAdaptor { @PostMapping(params = "edit") public String edit(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long organisationId, @PathVariable long sectionId, @ModelAttribute("form") YourProjectCostsForm form) { sectionStatusRestService.markAsInComplete(sectionId, applicationId, getProcessRoleId(applicationId, user.getId())).getSuccess(); return String.format("redirect:/application/%d/form/your-project-costs/organisation/%d/section/%d", applicationId, organisationId, sectionId); } @GetMapping @PreAuthorize("hasAnyAuthority('applicant', 'support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder', 'external_finance', 'knowledge_transfer_adviser')") @SecuredBySpring(value = "VIEW_PROJECT_COSTS", description = "Applicants, internal users and kta can view the Your project costs page") String viewYourProjectCosts(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId); @PostMapping @AsyncMethod String saveYourProjectCosts(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form,
BindingResult bindingResult); @PostMapping(params = "complete") @AsyncMethod String complete(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@Valid @ModelAttribute("form") YourProjectCostsForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = "edit") String edit(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form); @PostMapping(params = "remove_cost") String removeRowPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form,
@RequestParam("remove_cost") String removeId); @PostMapping(params = "add_cost") String addRowPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form,
@RequestParam("add_cost") FinanceRowType rowType); @PostMapping(params = "uploadOverheadFile") String uploadOverheadSpreadsheet(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = "removeOverheadFile") String removeOverheadSpreadsheet(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form); @PostMapping("remove-row/{rowId}") @ResponseBody JsonNode ajaxRemoveRow(UserResource user,
@PathVariable long applicationId,
@PathVariable String rowId); @PostMapping("add-row/{rowType}") String ajaxAddRow(Model model,
@PathVariable FinanceRowType rowType); @PostMapping("auto-save") @ResponseBody JsonNode ajaxAutoSave(UserResource user,
@PathVariable long applicationId,
@RequestParam String field,
@RequestParam String value); } | @Test public void edit() throws Exception { when(userRestService.findProcessRole(APPLICATION_ID, getLoggedInUser().getId())) .thenReturn(restSuccess(newProcessRoleResource().withId(PROCESS_ROLE_ID).build())); when(sectionStatusRestService.markAsInComplete(SECTION_ID, APPLICATION_ID, PROCESS_ROLE_ID)).thenReturn(restSuccess()); mockMvc.perform(post(APPLICATION_BASE_URL + "{applicationId}/form/your-project-costs/organisation/{organisationId}/section/{sectionId}", APPLICATION_ID, ORGANISATION_ID, SECTION_ID) .param("edit", "true")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(String.format("%s%s/form/your-project-costs/organisation/%s/section/%s", APPLICATION_BASE_URL, APPLICATION_ID, ORGANISATION_ID, SECTION_ID))); verifyZeroInteractions(saver); verify(sectionStatusRestService).markAsInComplete(SECTION_ID, APPLICATION_ID, PROCESS_ROLE_ID); } |
YourProjectCostsController extends AsyncAdaptor { @PostMapping(params = "complete") @AsyncMethod public String complete(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long organisationId, @PathVariable long sectionId, @Valid @ModelAttribute("form") YourProjectCostsForm form, BindingResult bindingResult, ValidationHandler validationHandler) { Supplier<String> successView = () -> redirectToYourFinances(applicationId); Supplier<String> failureView = () -> viewYourProjectCosts(form, user, model, applicationId, sectionId, organisationId); validator.validate(applicationId, form, validationHandler); return validationHandler.failNowOrSucceedWith(failureView, () -> { validationHandler.addAnyErrors(saver.save(form, applicationId, user)); return validationHandler.failNowOrSucceedWith(failureView, () -> { validationHandler.addAnyErrors( sectionStatusRestService.markAsComplete(sectionId, applicationId, getProcessRole(applicationId, user.getId()).getId()).getSuccess()); return validationHandler.failNowOrSucceedWith(failureView, successView); }); }); } @GetMapping @PreAuthorize("hasAnyAuthority('applicant', 'support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder', 'external_finance', 'knowledge_transfer_adviser')") @SecuredBySpring(value = "VIEW_PROJECT_COSTS", description = "Applicants, internal users and kta can view the Your project costs page") String viewYourProjectCosts(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId); @PostMapping @AsyncMethod String saveYourProjectCosts(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form,
BindingResult bindingResult); @PostMapping(params = "complete") @AsyncMethod String complete(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@Valid @ModelAttribute("form") YourProjectCostsForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = "edit") String edit(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form); @PostMapping(params = "remove_cost") String removeRowPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form,
@RequestParam("remove_cost") String removeId); @PostMapping(params = "add_cost") String addRowPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form,
@RequestParam("add_cost") FinanceRowType rowType); @PostMapping(params = "uploadOverheadFile") String uploadOverheadSpreadsheet(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = "removeOverheadFile") String removeOverheadSpreadsheet(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form); @PostMapping("remove-row/{rowId}") @ResponseBody JsonNode ajaxRemoveRow(UserResource user,
@PathVariable long applicationId,
@PathVariable String rowId); @PostMapping("add-row/{rowType}") String ajaxAddRow(Model model,
@PathVariable FinanceRowType rowType); @PostMapping("auto-save") @ResponseBody JsonNode ajaxAutoSave(UserResource user,
@PathVariable long applicationId,
@RequestParam String field,
@RequestParam String value); } | @Test public void complete() throws Exception { ProcessRoleResource processRole = newProcessRoleResource().withId(PROCESS_ROLE_ID).build(); when(saver.save(any(YourProjectCostsForm.class), eq(APPLICATION_ID), eq(getLoggedInUser()))).thenReturn(serviceSuccess()); when(userRestService.findProcessRole(APPLICATION_ID, getLoggedInUser().getId())) .thenReturn(restSuccess(processRole)); when(sectionStatusRestService.markAsComplete(SECTION_ID, APPLICATION_ID, processRole.getId())).thenReturn(restSuccess(new ValidationMessages())); mockMvc.perform(post(APPLICATION_BASE_URL + "{applicationId}/form/your-project-costs/organisation/{organisationId}/section/{sectionId}", APPLICATION_ID, ORGANISATION_ID, SECTION_ID) .param("complete", "true")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(String.format("/application/%s/form/%s", APPLICATION_ID, SectionType.FINANCE))); verify(saver).save(any(YourProjectCostsForm.class), eq(APPLICATION_ID), eq(getLoggedInUser())); verify(sectionStatusRestService).markAsComplete(SECTION_ID, APPLICATION_ID, processRole.getId()); } |
YourProjectCostsController extends AsyncAdaptor { @PostMapping("remove-row/{rowId}") public @ResponseBody JsonNode ajaxRemoveRow(UserResource user, @PathVariable long applicationId, @PathVariable String rowId) { saver.removeFinanceRow(rowId); return new ObjectMapper().createObjectNode(); } @GetMapping @PreAuthorize("hasAnyAuthority('applicant', 'support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder', 'external_finance', 'knowledge_transfer_adviser')") @SecuredBySpring(value = "VIEW_PROJECT_COSTS", description = "Applicants, internal users and kta can view the Your project costs page") String viewYourProjectCosts(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId); @PostMapping @AsyncMethod String saveYourProjectCosts(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form,
BindingResult bindingResult); @PostMapping(params = "complete") @AsyncMethod String complete(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@Valid @ModelAttribute("form") YourProjectCostsForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = "edit") String edit(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form); @PostMapping(params = "remove_cost") String removeRowPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form,
@RequestParam("remove_cost") String removeId); @PostMapping(params = "add_cost") String addRowPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form,
@RequestParam("add_cost") FinanceRowType rowType); @PostMapping(params = "uploadOverheadFile") String uploadOverheadSpreadsheet(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = "removeOverheadFile") String removeOverheadSpreadsheet(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form); @PostMapping("remove-row/{rowId}") @ResponseBody JsonNode ajaxRemoveRow(UserResource user,
@PathVariable long applicationId,
@PathVariable String rowId); @PostMapping("add-row/{rowType}") String ajaxAddRow(Model model,
@PathVariable FinanceRowType rowType); @PostMapping("auto-save") @ResponseBody JsonNode ajaxAutoSave(UserResource user,
@PathVariable long applicationId,
@RequestParam String field,
@RequestParam String value); } | @Test public void ajaxRemoveRow() throws Exception { String costId = "123"; mockMvc.perform(post(APPLICATION_BASE_URL + "{applicationId}/form/your-project-costs/organisation/{organisationId}/section/{sectionId}/remove-row/{rowId}", APPLICATION_ID, ORGANISATION_ID, SECTION_ID, costId)) .andExpect(status().isOk()); verify(saver).removeFinanceRow(costId); } |
YourProjectCostsController extends AsyncAdaptor { @PostMapping("add-row/{rowType}") public String ajaxAddRow(Model model, @PathVariable FinanceRowType rowType) throws InstantiationException, IllegalAccessException { YourProjectCostsForm form = new YourProjectCostsForm(); form.setLabour(new LabourForm()); Map.Entry<String, AbstractCostRowForm> map = saver.addRowForm(form, rowType); model.addAttribute("form", form); model.addAttribute("id", map.getKey()); model.addAttribute("row", map.getValue()); return String.format("application/your-project-costs-fragments :: ajax_%s_row", rowType.name().toLowerCase()); } @GetMapping @PreAuthorize("hasAnyAuthority('applicant', 'support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder', 'external_finance', 'knowledge_transfer_adviser')") @SecuredBySpring(value = "VIEW_PROJECT_COSTS", description = "Applicants, internal users and kta can view the Your project costs page") String viewYourProjectCosts(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId); @PostMapping @AsyncMethod String saveYourProjectCosts(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form,
BindingResult bindingResult); @PostMapping(params = "complete") @AsyncMethod String complete(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@Valid @ModelAttribute("form") YourProjectCostsForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = "edit") String edit(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form); @PostMapping(params = "remove_cost") String removeRowPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form,
@RequestParam("remove_cost") String removeId); @PostMapping(params = "add_cost") String addRowPost(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form,
@RequestParam("add_cost") FinanceRowType rowType); @PostMapping(params = "uploadOverheadFile") String uploadOverheadSpreadsheet(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(params = "removeOverheadFile") String removeOverheadSpreadsheet(Model model,
UserResource user,
@PathVariable long applicationId,
@PathVariable long organisationId,
@PathVariable long sectionId,
@ModelAttribute("form") YourProjectCostsForm form); @PostMapping("remove-row/{rowId}") @ResponseBody JsonNode ajaxRemoveRow(UserResource user,
@PathVariable long applicationId,
@PathVariable String rowId); @PostMapping("add-row/{rowType}") String ajaxAddRow(Model model,
@PathVariable FinanceRowType rowType); @PostMapping("auto-save") @ResponseBody JsonNode ajaxAutoSave(UserResource user,
@PathVariable long applicationId,
@RequestParam String field,
@RequestParam String value); } | @Test public void ajaxAddRow() throws Exception { String rowId = "123"; LabourRowForm row = new LabourRowForm(); row.setCostId(Long.valueOf(rowId)); FinanceRowType type = FinanceRowType.LABOUR; doAnswer((invocation) -> { YourProjectCostsForm form = (YourProjectCostsForm) invocation.getArguments()[0]; form.getLabour().getRows().put(rowId, row); return form.getLabour().getRows().entrySet().iterator().next(); }).when(saver).addRowForm(any(YourProjectCostsForm.class), eq(type)); mockMvc.perform(post(APPLICATION_BASE_URL + "{applicationId}/form/your-project-costs/organisation/{organisationId}/section/{sectionId}/add-row/{type}", APPLICATION_ID, ORGANISATION_ID, SECTION_ID, type)) .andExpect(view().name("application/your-project-costs-fragments :: ajax_labour_row")) .andExpect(model().attribute("row", row)) .andExpect(model().attribute("id", rowId)) .andExpect(status().isOk()); verify(saver).addRowForm(any(YourProjectCostsForm.class), eq(type)); } |
ApplicationUrlHelper { public static Optional<String> getQuestionUrl(QuestionSetupType questionType, long questionId, long applicationId) { if (questionType != null) { switch (questionType) { case APPLICATION_DETAILS: return Optional.of(format("/application/%d/form/question/%d/application-details", applicationId, questionId)); case GRANT_AGREEMENT: return Optional.of(format("/application/%d/form/question/%d/grant-agreement", applicationId, questionId)); case GRANT_TRANSFER_DETAILS: return Optional.of(format("/application/%d/form/question/%d/grant-transfer-details", applicationId, questionId)); case APPLICATION_TEAM: return Optional.of(format("/application/%d/form/question/%d/team", applicationId, questionId)); case TERMS_AND_CONDITIONS: return Optional.of(format("/application/%d/form/question/%d/terms-and-conditions", applicationId, questionId)); case RESEARCH_CATEGORY: return Optional.of(format("/application/%d/form/question/%d/research-category", applicationId, questionId)); } if (questionType.hasFormInputResponses()) { return Optional.of(format("/application/%d/form/question/%d/generic", applicationId, questionId)); } } return Optional.empty(); } static Optional<String> getQuestionUrl(QuestionSetupType questionType, long questionId, long applicationId); Optional<String> getSectionUrl(SectionType sectionType, long sectionId, long applicationId, long organisationId, long competitionId); } | @Test public void questionUrlForNoQuestionType() { QuestionSetupType questionSetupType = null; Optional<String> result = ApplicationUrlHelper.getQuestionUrl(questionSetupType, QUESTION_ID, APPLICATION_ID); assertEquals(Optional.empty(), result); }
@Test public void questionUrlForApplicationDetails() { QuestionSetupType questionSetupType = QuestionSetupType.APPLICATION_DETAILS; Optional<String> result = ApplicationUrlHelper.getQuestionUrl(questionSetupType, QUESTION_ID, APPLICATION_ID); assertEquals(Optional.of("/application/2/form/question/1/application-details"), result); }
@Test public void questionUrlForGrantAgreement() { QuestionSetupType questionSetupType = QuestionSetupType.GRANT_AGREEMENT; Optional<String> result = ApplicationUrlHelper.getQuestionUrl(questionSetupType, QUESTION_ID, APPLICATION_ID); assertEquals(Optional.of("/application/2/form/question/1/grant-agreement"), result); }
@Test public void questionUrlForGrantTransferDetails() { QuestionSetupType questionSetupType = QuestionSetupType.GRANT_TRANSFER_DETAILS; Optional<String> result = ApplicationUrlHelper.getQuestionUrl(questionSetupType, QUESTION_ID, APPLICATION_ID); assertEquals(Optional.of("/application/2/form/question/1/grant-transfer-details"), result); }
@Test public void questionUrlForApplicationTeam() { QuestionSetupType questionSetupType = QuestionSetupType.APPLICATION_TEAM; Optional<String> result = ApplicationUrlHelper.getQuestionUrl(questionSetupType, QUESTION_ID, APPLICATION_ID); assertEquals(Optional.of("/application/2/form/question/1/team"), result); }
@Test public void questionUrlForTermsAndConditions() { QuestionSetupType questionSetupType = QuestionSetupType.TERMS_AND_CONDITIONS; Optional<String> result = ApplicationUrlHelper.getQuestionUrl(questionSetupType, QUESTION_ID, APPLICATION_ID); assertEquals(Optional.of("/application/2/form/question/1/terms-and-conditions"), result); }
@Test public void questionUrlForResearchCategory() { QuestionSetupType questionSetupType = QuestionSetupType.RESEARCH_CATEGORY; Optional<String> result = ApplicationUrlHelper.getQuestionUrl(questionSetupType, QUESTION_ID, APPLICATION_ID); assertEquals(Optional.of("/application/2/form/question/1/research-category"), result); }
@Test public void questionUrlForEqualityDiversityInclusion() { QuestionSetupType questionSetupType = QuestionSetupType.EQUALITY_DIVERSITY_INCLUSION; Optional<String> result = ApplicationUrlHelper.getQuestionUrl(questionSetupType, QUESTION_ID, APPLICATION_ID); assertEquals(Optional.of("/application/2/form/question/1/generic"), result); } |
QuestionServiceImpl extends BaseTransactionalService implements QuestionService { @Override @Transactional public ServiceResult<QuestionResource> save(QuestionResource questionResource) { Question questionUpdated = questionRepository.save(questionMapper.mapToDomain(questionResource)); return serviceSuccess(questionMapper.mapToResource(questionUpdated)); } @Override ServiceResult<QuestionResource> getQuestionById(final Long id); @Override @Cacheable(cacheNames="questionsByCompetition", key = "T(java.lang.String).format('questionsByCompetition:%d', #competitionId)", unless = "!T(org.innovateuk.ifs.cache.CacheHelper).cacheResultIfCompetitionIsOpen(#result)") ServiceResult<List<QuestionResource>> findByCompetition(final Long competitionId); @Override ServiceResult<QuestionResource> getNextQuestion(final Long questionId); @Override ServiceResult<QuestionResource> getPreviousQuestionBySection(final Long sectionId); @Override ServiceResult<QuestionResource> getNextQuestionBySection(final Long sectionId); @Override ServiceResult<QuestionResource> getPreviousQuestion(final Long questionId); @Override ServiceResult<Question> getQuestionByCompetitionIdAndFormInputType(Long competitionId, FormInputType formInputType); @Override ServiceResult<QuestionResource> getQuestionByCompetitionIdAndQuestionSetupType(final long competitionId,
final QuestionSetupType questionSetupType); @Override ServiceResult<QuestionResource> getQuestionResourceByCompetitionIdAndFormInputType(Long competitionId, FormInputType formInpuType); @Override ServiceResult<List<QuestionResource>> getQuestionsBySectionIdAndType(
Long sectionId, QuestionType type); @Override @Transactional ServiceResult<QuestionResource> save(QuestionResource questionResource); @Override ServiceResult<List<QuestionResource>> getQuestionsByAssessmentId(Long assessmentId); @Override ServiceResult<QuestionResource> getQuestionByIdAndAssessmentId(Long questionId, Long assessmentId); } | @Test public void saveQuestionResource() throws Exception { QuestionResource questionResource = newQuestionResource().build(); Question question = newQuestion().build(); when(questionMapperMock.mapToDomain(questionResource)).thenReturn(question); when(questionMapperMock.mapToResource(question)).thenReturn(questionResource); when(questionRepositoryMock.save(question)).thenReturn(question); ServiceResult<QuestionResource> result = questionService.save(questionResource); assertTrue(result.isSuccess()); assertEquals(questionResource, result.getSuccess()); } |
ApplicationInnovationAreaPopulator { public InnovationAreaViewModel populate(ApplicationResource applicationResource, Long questionId) { InnovationAreaViewModel innovationAreaViewModel = new InnovationAreaViewModel(); innovationAreaViewModel.setAvailableInnovationAreas(applicationInnovationAreaRestService.getAvailableInnovationAreasForApplication(applicationResource.getId()).getSuccess()); innovationAreaViewModel.setQuestionId(questionId); innovationAreaViewModel.setApplicationId(applicationResource.getId()); innovationAreaViewModel.setCompetitionName(applicationResource.getCompetitionName()); innovationAreaViewModel.setApplicationName(applicationResource.getName()); setInnovationAreaChoice(applicationResource, innovationAreaViewModel); return innovationAreaViewModel; } InnovationAreaViewModel populate(ApplicationResource applicationResource, Long questionId); } | @Test public void populate() throws Exception { Long questionId = 1L; Long applicationId = 2L; String applicationName = "APP_NAME"; ApplicationResource applicationResource = newApplicationResource() .withId(applicationId) .withName(applicationName) .build(); when(applicationInnovationAreaRestService.getAvailableInnovationAreasForApplication(applicationId)).thenReturn(restSuccess(newInnovationAreaResource().build(5))); InnovationAreaViewModel innovationAreaViewModel = populator.populate(applicationResource, questionId); assertEquals(questionId, innovationAreaViewModel.getQuestionId()); assertEquals(applicationId, innovationAreaViewModel.getApplicationId()); assertEquals(applicationName, innovationAreaViewModel.getApplicationName()); assertEquals(5L, innovationAreaViewModel.getAvailableInnovationAreas().size()); }
@Test public void populate_noInnovationAreaApplicableShouldBeSetWhenAppropriate() throws Exception { Long questionId = 1L; Long applicationId = 2L; Long innovationAreaId = 3L; String competitionName = "COMP_NAME"; ApplicationResource applicationResource = newApplicationResource() .withId(applicationId) .withCompetitionName(competitionName) .withInnovationArea(newInnovationAreaResource().withId(innovationAreaId).build()).build(); InnovationAreaResource innovationAreaResource = newInnovationAreaResource().withId(innovationAreaId).withName("Innovation Area").build(); ApplicationResource applicationWithInnovationArea = newApplicationResource().withInnovationArea(innovationAreaResource).withCompetitionName(competitionName).build(); when(applicationRestService.getApplicationById(applicationId)).thenReturn(restSuccess(applicationWithInnovationArea)); when(applicationInnovationAreaRestService.getAvailableInnovationAreasForApplication(applicationId)).thenReturn(restSuccess(newInnovationAreaResource().build(5))); InnovationAreaViewModel innovationAreaViewModel = populator.populate(applicationResource, questionId); assertEquals(innovationAreaId, innovationAreaViewModel.getSelectedInnovationAreaId()); assertEquals(false, innovationAreaViewModel.isNoInnovationAreaApplicable()); }
@Test public void populate_innovationAreaShouldBeSetWhenInnovationAreaIsApplicableForApplication() throws Exception { Long questionId = 1L; Long applicationId = 2L; String competitionName = "COMP_NAME"; ApplicationResource applicationWithInnovationArea = newApplicationResource() .withId(applicationId) .withNoInnovationAreaApplicable(true) .withCompetitionName(competitionName).build(); when(applicationInnovationAreaRestService.getAvailableInnovationAreasForApplication(applicationId)).thenReturn(restSuccess(newInnovationAreaResource().build(5))); InnovationAreaViewModel innovationAreaViewModel = populator.populate(applicationWithInnovationArea, questionId); assertEquals(null, innovationAreaViewModel.getSelectedInnovationAreaId()); assertEquals(true, innovationAreaViewModel.isNoInnovationAreaApplicable()); } |
ApplicationCreationAuthenticatedController { @GetMapping("/{competitionId}") public String view(Model model, @PathVariable(COMPETITION_ID) long competitionId, UserResource user, HttpServletResponse response) { Boolean userHasApplication = userService.userHasApplicationForCompetition(user.getId(), competitionId); if (Boolean.TRUE.equals(userHasApplication)) { model.addAttribute(COMPETITION_ID, competitionId); model.addAttribute(FORM_NAME, new ApplicationCreationAuthenticatedForm()); return "create-application/confirm-new-application"; } else { return redirectToOrganisationCreation(competitionId, response); } } @GetMapping("/{competitionId}") String view(Model model,
@PathVariable(COMPETITION_ID) long competitionId,
UserResource user,
HttpServletResponse response); @PostMapping("/{competitionId}") String post(@PathVariable(COMPETITION_ID) long competitionId,
@Valid @ModelAttribute(FORM_NAME) ApplicationCreationAuthenticatedForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
HttpServletResponse response); } | @Test public void getRequestWithExistingApplication() throws Exception { when(userService.userHasApplicationForCompetition(loggedInUser.getId(), 1L)).thenReturn(true); mockMvc.perform(get("/application/create-authenticated/{competitionId}", 1L)) .andExpect(status().is2xxSuccessful()) .andExpect(view().name("create-application/confirm-new-application")); verify(userService).userHasApplicationForCompetition(loggedInUser.getId(), 1L); } |
ApplicationCreationAuthenticatedController { @PostMapping("/{competitionId}") public String post(@PathVariable(COMPETITION_ID) long competitionId, @Valid @ModelAttribute(FORM_NAME) ApplicationCreationAuthenticatedForm form, BindingResult bindingResult, ValidationHandler validationHandler, HttpServletResponse response) { Supplier<String> failureView = () -> "create-application/confirm-new-application"; Supplier<String> successView = () -> { if (form.getCreateNewApplication()) { return redirectToOrganisationCreation(competitionId, response); } return "redirect:/"; }; return validationHandler.failNowOrSucceedWith(failureView, successView); } @GetMapping("/{competitionId}") String view(Model model,
@PathVariable(COMPETITION_ID) long competitionId,
UserResource user,
HttpServletResponse response); @PostMapping("/{competitionId}") String post(@PathVariable(COMPETITION_ID) long competitionId,
@Valid @ModelAttribute(FORM_NAME) ApplicationCreationAuthenticatedForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
HttpServletResponse response); } | @Test public void postEmptyFormShouldThrowError() throws Exception { when(competitionOrganisationConfigRestService.findByCompetitionId(1L)).thenReturn(RestResult.restSuccess(new CompetitionOrganisationConfigResource(false, false))); mockMvc.perform(post("/application/create-authenticated/1")) .andExpect(status().isOk()) .andExpect(model().hasErrors()) .andExpect(model().attributeHasFieldErrors("form", "createNewApplication")) .andReturn(); }
@Test public void postCreateNewApplication() throws Exception { when(competitionOrganisationConfigRestService.findByCompetitionId(1L)).thenReturn(RestResult.restSuccess(new CompetitionOrganisationConfigResource(false, false))); long competitionId = 1L; mockMvc.perform(post("/application/create-authenticated/{competitionId}", competitionId) .param("createNewApplication", "1")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl("/organisation/select")); verify(registrationCookieService).deleteAllRegistrationJourneyCookies(any()); verify(registrationCookieService).saveToCompetitionIdCookie(eq(1L), any()); }
@Test public void postNoNewApplication() throws Exception { when(competitionOrganisationConfigRestService.findByCompetitionId(1L)).thenReturn(RestResult.restSuccess(new CompetitionOrganisationConfigResource(false, false))); mockMvc.perform(post("/application/create-authenticated/1").param("createNewApplication", "0")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl("/")); }
@Test public void postInternationalOrganisationApplication() throws Exception { when(competitionOrganisationConfigRestService.findByCompetitionId(1L)).thenReturn(RestResult.restSuccess(new CompetitionOrganisationConfigResource(true, true))); long competitionId = 1L; mockMvc.perform(post("/application/create-authenticated/{competitionId}", competitionId) .param("createNewApplication", "1")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl("/organisation/create/international-organisation")); } |
QuestionServiceImpl extends BaseTransactionalService implements QuestionService { @Override public ServiceResult<QuestionResource> getQuestionByIdAndAssessmentId(Long questionId, Long assessmentId) { return find(getAssessment(assessmentId), getQuestionSupplier(questionId)).andOnSuccess((assessment, question) -> { if (question.getCompetition().getId().equals(assessment.getTarget().getCompetition().getId())) { return serviceSuccess(questionMapper.mapToResource(question)); } return serviceFailure(notFoundError(Question.class, questionId, assessmentId)); }); } @Override ServiceResult<QuestionResource> getQuestionById(final Long id); @Override @Cacheable(cacheNames="questionsByCompetition", key = "T(java.lang.String).format('questionsByCompetition:%d', #competitionId)", unless = "!T(org.innovateuk.ifs.cache.CacheHelper).cacheResultIfCompetitionIsOpen(#result)") ServiceResult<List<QuestionResource>> findByCompetition(final Long competitionId); @Override ServiceResult<QuestionResource> getNextQuestion(final Long questionId); @Override ServiceResult<QuestionResource> getPreviousQuestionBySection(final Long sectionId); @Override ServiceResult<QuestionResource> getNextQuestionBySection(final Long sectionId); @Override ServiceResult<QuestionResource> getPreviousQuestion(final Long questionId); @Override ServiceResult<Question> getQuestionByCompetitionIdAndFormInputType(Long competitionId, FormInputType formInputType); @Override ServiceResult<QuestionResource> getQuestionByCompetitionIdAndQuestionSetupType(final long competitionId,
final QuestionSetupType questionSetupType); @Override ServiceResult<QuestionResource> getQuestionResourceByCompetitionIdAndFormInputType(Long competitionId, FormInputType formInpuType); @Override ServiceResult<List<QuestionResource>> getQuestionsBySectionIdAndType(
Long sectionId, QuestionType type); @Override @Transactional ServiceResult<QuestionResource> save(QuestionResource questionResource); @Override ServiceResult<List<QuestionResource>> getQuestionsByAssessmentId(Long assessmentId); @Override ServiceResult<QuestionResource> getQuestionByIdAndAssessmentId(Long questionId, Long assessmentId); } | @Test public void getQuestionByIdAndAssessmentId() throws Exception { Long questionId = 1L; Long assessmentId = 2L; Competition competition = newCompetition() .build(); Application application = newApplication() .withCompetition(competition) .build(); Assessment assessment = newAssessment() .withApplication(application) .build(); Question question = newQuestion() .withCompetition(competition) .build(); QuestionResource questionResource = newQuestionResource().build(); when(questionRepositoryMock.findById(questionId)).thenReturn(Optional.of(question)); when(assessmentRepositoryMock.findById(assessmentId)).thenReturn(Optional.of(assessment)); when(questionMapperMock.mapToResource(question)).thenReturn(questionResource); ServiceResult<QuestionResource> result = questionService.getQuestionByIdAndAssessmentId(questionId, assessmentId); assertTrue(result.isSuccess()); assertEquals(questionResource, result.getSuccess()); InOrder inOrder = inOrder(assessmentRepositoryMock, questionRepositoryMock, questionMapperMock); inOrder.verify(assessmentRepositoryMock).findById(assessmentId); inOrder.verify(questionRepositoryMock).findById(questionId); inOrder.verify(questionMapperMock).mapToResource(question); inOrder.verifyNoMoreInteractions(); }
@Test public void getQuestionByIdAndAssessmentId_assessmentNotFound() throws Exception { Long questionId = 1L; Long assessmentId = 2L; ServiceResult<QuestionResource> result = questionService.getQuestionByIdAndAssessmentId(questionId, assessmentId); assertTrue(result.getFailure().is(notFoundError(Assessment.class, assessmentId))); InOrder inOrder = inOrder(assessmentRepositoryMock); inOrder.verify(assessmentRepositoryMock).findById(assessmentId); inOrder.verifyNoMoreInteractions(); verifyZeroInteractions(questionRepositoryMock); verifyZeroInteractions(questionMapperMock); }
@Test public void getQuestionByIdAndAssessmentId_questionNotFound() throws Exception { Long questionId = 1L; Long assessmentId = 2L; Competition competition = newCompetition() .build(); Application application = newApplication() .withCompetition(competition) .build(); Assessment assessment = newAssessment() .withApplication(application) .build(); when(assessmentRepositoryMock.findById(assessmentId)).thenReturn(Optional.of(assessment)); ServiceResult<QuestionResource> result = questionService.getQuestionByIdAndAssessmentId(questionId, assessmentId); assertTrue(result.getFailure().is(notFoundError(Question.class, questionId))); InOrder inOrder = inOrder(assessmentRepositoryMock, questionRepositoryMock); inOrder.verify(assessmentRepositoryMock).findById(assessmentId); inOrder.verify(questionRepositoryMock).findById(questionId); inOrder.verifyNoMoreInteractions(); verifyZeroInteractions(questionMapperMock); }
@Test public void getQuestionByIdAndAssessmentId_questionNotInTargetOfAssessment() throws Exception { Long questionId = 1L; Long assessmentId = 2L; Competition competition = newCompetition() .build(); Competition otherCompetition = newCompetition() .build(); Application application = newApplication() .withCompetition(competition) .build(); Assessment assessment = newAssessment() .withApplication(application) .build(); Question question = newQuestion() .withCompetition(otherCompetition) .build(); when(questionRepositoryMock.findById(questionId)).thenReturn(Optional.of(question)); when(assessmentRepositoryMock.findById(assessmentId)).thenReturn(Optional.of(assessment)); ServiceResult<QuestionResource> result = questionService.getQuestionByIdAndAssessmentId(questionId, assessmentId); assertTrue(result.getFailure().is(notFoundError(Question.class, questionId, assessmentId))); InOrder inOrder = inOrder(assessmentRepositoryMock, questionRepositoryMock); inOrder.verify(assessmentRepositoryMock).findById(assessmentId); inOrder.verify(questionRepositoryMock).findById(questionId); inOrder.verifyNoMoreInteractions(); verifyZeroInteractions(questionMapperMock); } |
ApplicationCreationController { @GetMapping("/start-application/{competitionId}") public String checkEligibility(Model model, @PathVariable(COMPETITION_ID) Long competitionId, HttpServletResponse response) { PublicContentItemResource publicContentItem = publicContentItemRestService.getItemByCompetitionId(competitionId).getSuccess(); if (!isCompetitionReady(publicContentItem)) { return "redirect:/competition/search"; } model.addAttribute(COMPETITION_ID, competitionId); registrationCookieService.deleteAllRegistrationJourneyCookies(response); registrationCookieService.saveToCompetitionIdCookie(competitionId, response); return "create-application/start-application"; } @GetMapping("/start-application/{competitionId}") String checkEligibility(Model model,
@PathVariable(COMPETITION_ID) Long competitionId,
HttpServletResponse response); static final String COMPETITION_ID; } | @Test public void checkEligibility() throws Exception { long competitionId = 1L; PublicContentItemResource publicContentItem = newPublicContentItemResource() .withCompetitionOpenDate(ZonedDateTime.now().minusDays(1)) .withCompetitionCloseDate(ZonedDateTime.now().plusDays(1)) .withNonIfs(false) .build(); when(publicContentItemRestService.getItemByCompetitionId(competitionId)).thenReturn(restSuccess(publicContentItem)); MvcResult result = mockMvc.perform(get("/application/create/start-application/{competitionId}", competitionId)) .andExpect(status().is2xxSuccessful()) .andExpect(view().name("create-application/start-application")) .andReturn(); verify(registrationCookieService, times(1)).deleteAllRegistrationJourneyCookies(any(HttpServletResponse.class)); verify(registrationCookieService, times(1)).saveToCompetitionIdCookie(anyLong(), any(HttpServletResponse.class)); } |
ReviewAndSubmitController { @SecuredBySpring(value = "APPLICANT_CONFIRM_SUBMIT", description = "Applicants can confirm they wish to submit their applications") @PreAuthorize("hasAuthority('applicant')") @GetMapping("/{applicationId}/confirm-submit") public String applicationConfirmSubmit(@PathVariable long applicationId, @ModelAttribute("termsAgreed") Boolean termsAgreed, @ModelAttribute(FORM_ATTR_NAME) ApplicationSubmitForm form, Model model) { if (!TRUE.equals(termsAgreed)) { return format("redirect:/application/%d/summary", applicationId); } model.addAttribute("applicationId", applicationId); return "application-confirm-submit"; } @SecuredBySpring(value = "READ", description = "Applicants can review and submit their applications") @PreAuthorize("hasAnyAuthority('applicant')") @GetMapping("/{applicationId}/review-and-submit") @AsyncMethod String reviewAndSubmit(@ModelAttribute(value = FORM_ATTR_NAME, binding = false) ApplicationSubmitForm form,
BindingResult bindingResult,
@PathVariable long applicationId,
Model model,
UserResource user); @SecuredBySpring(value = "APPLICATION_SUBMIT", description = "Applicants can submit their applications.") @PreAuthorize("hasAuthority('applicant')") @PostMapping("/{applicationId}/review-and-submit") String submitApplication(@PathVariable long applicationId,
@ModelAttribute(FORM_ATTR_NAME) ApplicationSubmitForm form,
BindingResult bindingResult,
RedirectAttributes redirectAttributes,
UserResource user,
HttpServletResponse response); @SecuredBySpring(value = "APPLICATION_REVIEW_AND_SUBMIT_RETURN_AND_EDIT", description = "Applicants can return to edit questions from the review and submit page") @PreAuthorize("hasAuthority('applicant')") @PostMapping(value = "/{applicationId}/review-and-submit", params = "edit") String editQuestion(@PathVariable long applicationId,
@RequestParam("edit") long questionId); @SecuredBySpring(value = "APPLICATION_REVIEW_AND_SUBMIT_MARK_AS_COMPLETE", description = "Applicants can mark questions as complete from the review and submit page") @PreAuthorize("hasAuthority('applicant')") @PostMapping(value = "/{applicationId}/review-and-submit", params = "complete") String completeQuestion(@PathVariable long applicationId,
@RequestParam("complete") long questionId,
UserResource user); @SecuredBySpring(value = "APPLICATION_REVIEW_AND_SUBMIT_ASSIGN", description = "Applicants can assign questions from the review and submit page") @PreAuthorize("hasAuthority('applicant')") @PostMapping(value = "/{applicationId}/review-and-submit", params = "assign") String assignQuestionToLead(@PathVariable long applicationId,
@RequestParam("assign") long questionId,
UserResource user); @SecuredBySpring(value = "APPLICATION_REVIEW_AND_SUBMIT_MARK_AS_INCOMPLETE", description = "Applicants can mark questions as incomplete from the review and submit page") @PreAuthorize("hasAuthority('applicant')") @PostMapping(value = "/{applicationId}/review-and-submit", params = "incomplete") String incompleteQuestion(@PathVariable long applicationId,
@RequestParam("incomplete") long questionId,
UserResource user); @SecuredBySpring(value = "APPLICANT_CONFIRM_SUBMIT", description = "Applicants can confirm they wish to submit their applications") @PreAuthorize("hasAuthority('applicant')") @GetMapping("/{applicationId}/confirm-submit") String applicationConfirmSubmit(@PathVariable long applicationId,
@ModelAttribute("termsAgreed") Boolean termsAgreed,
@ModelAttribute(FORM_ATTR_NAME) ApplicationSubmitForm form,
Model model); @SecuredBySpring(value = "APPLICANT_CONFIRM_SUBMIT", description = "Applicants can confirm they wish to submit their applications") @PreAuthorize("hasAuthority('applicant')") @PostMapping("/{applicationId}/confirm-submit") String applicationSubmit(Model model,
@ModelAttribute(FORM_ATTR_NAME) ApplicationSubmitForm form,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable("applicationId") long applicationId,
UserResource user,
HttpServletResponse response); @SecuredBySpring(value = "APPLICANT_REOPEN", description = "Applicants can confirm they wish to reopen their applications") @PreAuthorize("hasAuthority('applicant')") @GetMapping("/{applicationId}/confirm-reopen") String applicationConfirmReopen(@PathVariable long applicationId,
@ModelAttribute(FORM_ATTR_NAME) ApplicationReopenForm form,
Model model,
UserResource userResource); @SecuredBySpring(value = "APPLICANT_REOPEN", description = "Applicants can reopen their applications") @PreAuthorize("hasAuthority('applicant')") @PostMapping("/{applicationId}/confirm-reopen") String applicationReopen(Model model,
@ModelAttribute(FORM_ATTR_NAME) ApplicationReopenForm form,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable("applicationId") long applicationId); @SecuredBySpring(value = "APPLICANT_TRACK", description = "Applicants and kta can track their application after submitting.") @PreAuthorize("hasAnyAuthority('applicant', 'knowledge_transfer_adviser')") @GetMapping("/{applicationId}/track") String applicationTrack(Model model,
@PathVariable long applicationId,
UserResource user); static final String FORM_ATTR_NAME; } | @Test public void applicationConfirmSubmit() throws Exception { long applicationId = 2L; mockMvc.perform(get("/application/" + applicationId + "/confirm-submit") .flashAttr("termsAgreed", true)) .andExpect(view().name("application-confirm-submit")) .andExpect(model().attribute("applicationId", applicationId)); } |
ReviewAndSubmitController { @SecuredBySpring(value = "APPLICANT_CONFIRM_SUBMIT", description = "Applicants can confirm they wish to submit their applications") @PreAuthorize("hasAuthority('applicant')") @PostMapping("/{applicationId}/confirm-submit") public String applicationSubmit(Model model, @ModelAttribute(FORM_ATTR_NAME) ApplicationSubmitForm form, @SuppressWarnings("UnusedParameters") BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable("applicationId") long applicationId, UserResource user, HttpServletResponse response) { ApplicationResource application = applicationRestService.getApplicationById(applicationId).getSuccess(); if (!ableToSubmitApplication(user, application)) { cookieFlashMessageFilter.setFlashMessage(response, "cannotSubmit"); return format("redirect:/application/%d", applicationId); } RestResult<Void> updateResult = applicationRestService.updateApplicationState(applicationId, SUBMITTED); Supplier<String> failureView = () -> applicationConfirmSubmit(applicationId, true, form, model); return validationHandler.addAnyErrors(updateResult) .failNowOrSucceedWith(failureView, () -> format("redirect:/application/%d/track", applicationId)); } @SecuredBySpring(value = "READ", description = "Applicants can review and submit their applications") @PreAuthorize("hasAnyAuthority('applicant')") @GetMapping("/{applicationId}/review-and-submit") @AsyncMethod String reviewAndSubmit(@ModelAttribute(value = FORM_ATTR_NAME, binding = false) ApplicationSubmitForm form,
BindingResult bindingResult,
@PathVariable long applicationId,
Model model,
UserResource user); @SecuredBySpring(value = "APPLICATION_SUBMIT", description = "Applicants can submit their applications.") @PreAuthorize("hasAuthority('applicant')") @PostMapping("/{applicationId}/review-and-submit") String submitApplication(@PathVariable long applicationId,
@ModelAttribute(FORM_ATTR_NAME) ApplicationSubmitForm form,
BindingResult bindingResult,
RedirectAttributes redirectAttributes,
UserResource user,
HttpServletResponse response); @SecuredBySpring(value = "APPLICATION_REVIEW_AND_SUBMIT_RETURN_AND_EDIT", description = "Applicants can return to edit questions from the review and submit page") @PreAuthorize("hasAuthority('applicant')") @PostMapping(value = "/{applicationId}/review-and-submit", params = "edit") String editQuestion(@PathVariable long applicationId,
@RequestParam("edit") long questionId); @SecuredBySpring(value = "APPLICATION_REVIEW_AND_SUBMIT_MARK_AS_COMPLETE", description = "Applicants can mark questions as complete from the review and submit page") @PreAuthorize("hasAuthority('applicant')") @PostMapping(value = "/{applicationId}/review-and-submit", params = "complete") String completeQuestion(@PathVariable long applicationId,
@RequestParam("complete") long questionId,
UserResource user); @SecuredBySpring(value = "APPLICATION_REVIEW_AND_SUBMIT_ASSIGN", description = "Applicants can assign questions from the review and submit page") @PreAuthorize("hasAuthority('applicant')") @PostMapping(value = "/{applicationId}/review-and-submit", params = "assign") String assignQuestionToLead(@PathVariable long applicationId,
@RequestParam("assign") long questionId,
UserResource user); @SecuredBySpring(value = "APPLICATION_REVIEW_AND_SUBMIT_MARK_AS_INCOMPLETE", description = "Applicants can mark questions as incomplete from the review and submit page") @PreAuthorize("hasAuthority('applicant')") @PostMapping(value = "/{applicationId}/review-and-submit", params = "incomplete") String incompleteQuestion(@PathVariable long applicationId,
@RequestParam("incomplete") long questionId,
UserResource user); @SecuredBySpring(value = "APPLICANT_CONFIRM_SUBMIT", description = "Applicants can confirm they wish to submit their applications") @PreAuthorize("hasAuthority('applicant')") @GetMapping("/{applicationId}/confirm-submit") String applicationConfirmSubmit(@PathVariable long applicationId,
@ModelAttribute("termsAgreed") Boolean termsAgreed,
@ModelAttribute(FORM_ATTR_NAME) ApplicationSubmitForm form,
Model model); @SecuredBySpring(value = "APPLICANT_CONFIRM_SUBMIT", description = "Applicants can confirm they wish to submit their applications") @PreAuthorize("hasAuthority('applicant')") @PostMapping("/{applicationId}/confirm-submit") String applicationSubmit(Model model,
@ModelAttribute(FORM_ATTR_NAME) ApplicationSubmitForm form,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable("applicationId") long applicationId,
UserResource user,
HttpServletResponse response); @SecuredBySpring(value = "APPLICANT_REOPEN", description = "Applicants can confirm they wish to reopen their applications") @PreAuthorize("hasAuthority('applicant')") @GetMapping("/{applicationId}/confirm-reopen") String applicationConfirmReopen(@PathVariable long applicationId,
@ModelAttribute(FORM_ATTR_NAME) ApplicationReopenForm form,
Model model,
UserResource userResource); @SecuredBySpring(value = "APPLICANT_REOPEN", description = "Applicants can reopen their applications") @PreAuthorize("hasAuthority('applicant')") @PostMapping("/{applicationId}/confirm-reopen") String applicationReopen(Model model,
@ModelAttribute(FORM_ATTR_NAME) ApplicationReopenForm form,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable("applicationId") long applicationId); @SecuredBySpring(value = "APPLICANT_TRACK", description = "Applicants and kta can track their application after submitting.") @PreAuthorize("hasAnyAuthority('applicant', 'knowledge_transfer_adviser')") @GetMapping("/{applicationId}/track") String applicationTrack(Model model,
@PathVariable long applicationId,
UserResource user); static final String FORM_ATTR_NAME; } | @Test public void applicationSubmit() throws Exception { ApplicationResource application = newApplicationResource() .withCompetitionStatus(CompetitionStatus.OPEN) .withApplicationState(ApplicationState.OPENED) .build(); when(applicationRestService.getApplicationById(application.getId())).thenReturn(restSuccess(application)); when(userService.isLeadApplicant( loggedInUser.getId(), application)).thenReturn(true); when(applicationRestService.updateApplicationState(application.getId(), SUBMITTED)).thenReturn(restSuccess()); mockMvc.perform(post("/application/" + application.getId() + "/confirm-submit")) .andExpect(redirectedUrl("/application/" + application.getId() + "/track")); verify(applicationRestService).updateApplicationState(application.getId(), SUBMITTED); } |
ReviewAndSubmitController { @SecuredBySpring(value = "APPLICANT_TRACK", description = "Applicants and kta can track their application after submitting.") @PreAuthorize("hasAnyAuthority('applicant', 'knowledge_transfer_adviser')") @GetMapping("/{applicationId}/track") public String applicationTrack(Model model, @PathVariable long applicationId, UserResource user) { ApplicationResource application = applicationRestService.getApplicationById(applicationId).getSuccess(); if (!application.isSubmitted()) { return "redirect:/application/" + applicationId; } CompetitionResource competition = competitionRestService.getCompetitionById(application.getCompetition()).getSuccess(); model.addAttribute("model", new TrackViewModel(competition, application, earlyMetricsUrl, application.getCompletion(), canReopenApplication(application, user))); return getTrackingPage(competition); } @SecuredBySpring(value = "READ", description = "Applicants can review and submit their applications") @PreAuthorize("hasAnyAuthority('applicant')") @GetMapping("/{applicationId}/review-and-submit") @AsyncMethod String reviewAndSubmit(@ModelAttribute(value = FORM_ATTR_NAME, binding = false) ApplicationSubmitForm form,
BindingResult bindingResult,
@PathVariable long applicationId,
Model model,
UserResource user); @SecuredBySpring(value = "APPLICATION_SUBMIT", description = "Applicants can submit their applications.") @PreAuthorize("hasAuthority('applicant')") @PostMapping("/{applicationId}/review-and-submit") String submitApplication(@PathVariable long applicationId,
@ModelAttribute(FORM_ATTR_NAME) ApplicationSubmitForm form,
BindingResult bindingResult,
RedirectAttributes redirectAttributes,
UserResource user,
HttpServletResponse response); @SecuredBySpring(value = "APPLICATION_REVIEW_AND_SUBMIT_RETURN_AND_EDIT", description = "Applicants can return to edit questions from the review and submit page") @PreAuthorize("hasAuthority('applicant')") @PostMapping(value = "/{applicationId}/review-and-submit", params = "edit") String editQuestion(@PathVariable long applicationId,
@RequestParam("edit") long questionId); @SecuredBySpring(value = "APPLICATION_REVIEW_AND_SUBMIT_MARK_AS_COMPLETE", description = "Applicants can mark questions as complete from the review and submit page") @PreAuthorize("hasAuthority('applicant')") @PostMapping(value = "/{applicationId}/review-and-submit", params = "complete") String completeQuestion(@PathVariable long applicationId,
@RequestParam("complete") long questionId,
UserResource user); @SecuredBySpring(value = "APPLICATION_REVIEW_AND_SUBMIT_ASSIGN", description = "Applicants can assign questions from the review and submit page") @PreAuthorize("hasAuthority('applicant')") @PostMapping(value = "/{applicationId}/review-and-submit", params = "assign") String assignQuestionToLead(@PathVariable long applicationId,
@RequestParam("assign") long questionId,
UserResource user); @SecuredBySpring(value = "APPLICATION_REVIEW_AND_SUBMIT_MARK_AS_INCOMPLETE", description = "Applicants can mark questions as incomplete from the review and submit page") @PreAuthorize("hasAuthority('applicant')") @PostMapping(value = "/{applicationId}/review-and-submit", params = "incomplete") String incompleteQuestion(@PathVariable long applicationId,
@RequestParam("incomplete") long questionId,
UserResource user); @SecuredBySpring(value = "APPLICANT_CONFIRM_SUBMIT", description = "Applicants can confirm they wish to submit their applications") @PreAuthorize("hasAuthority('applicant')") @GetMapping("/{applicationId}/confirm-submit") String applicationConfirmSubmit(@PathVariable long applicationId,
@ModelAttribute("termsAgreed") Boolean termsAgreed,
@ModelAttribute(FORM_ATTR_NAME) ApplicationSubmitForm form,
Model model); @SecuredBySpring(value = "APPLICANT_CONFIRM_SUBMIT", description = "Applicants can confirm they wish to submit their applications") @PreAuthorize("hasAuthority('applicant')") @PostMapping("/{applicationId}/confirm-submit") String applicationSubmit(Model model,
@ModelAttribute(FORM_ATTR_NAME) ApplicationSubmitForm form,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable("applicationId") long applicationId,
UserResource user,
HttpServletResponse response); @SecuredBySpring(value = "APPLICANT_REOPEN", description = "Applicants can confirm they wish to reopen their applications") @PreAuthorize("hasAuthority('applicant')") @GetMapping("/{applicationId}/confirm-reopen") String applicationConfirmReopen(@PathVariable long applicationId,
@ModelAttribute(FORM_ATTR_NAME) ApplicationReopenForm form,
Model model,
UserResource userResource); @SecuredBySpring(value = "APPLICANT_REOPEN", description = "Applicants can reopen their applications") @PreAuthorize("hasAuthority('applicant')") @PostMapping("/{applicationId}/confirm-reopen") String applicationReopen(Model model,
@ModelAttribute(FORM_ATTR_NAME) ApplicationReopenForm form,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable("applicationId") long applicationId); @SecuredBySpring(value = "APPLICANT_TRACK", description = "Applicants and kta can track their application after submitting.") @PreAuthorize("hasAnyAuthority('applicant', 'knowledge_transfer_adviser')") @GetMapping("/{applicationId}/track") String applicationTrack(Model model,
@PathVariable long applicationId,
UserResource user); static final String FORM_ATTR_NAME; } | @Test public void applicationTrack() throws Exception { CompetitionResource competition = newCompetitionResource() .build(); ApplicationResource application = newApplicationResource() .withApplicationState(SUBMITTED) .withCompetition(competition.getId()) .build(); when(applicationRestService.getApplicationById(application.getId())).thenReturn(restSuccess(application)); when(competitionRestService.getCompetitionById(competition.getId())).thenReturn(restSuccess(competition)); mockMvc.perform(get("/application/" + application.getId() + "/track")) .andExpect(view().name("application-track")); } |
OverheadFileSaver { public ValidationMessages handleOverheadFileRequest(HttpServletRequest request) { if(isOverheadFileUploadRequest(request)) { return uploadOverheadFile(request); } else if (isOverheadFileDeleteRequest(request)) { return deleteOverheadFile(request); } else { return new ValidationMessages(); } } ValidationMessages handleOverheadFileRequest(HttpServletRequest request); boolean isOverheadFileRequest(HttpServletRequest request); static final String OVERHEAD_FILE_SUBMIT; static final String OVERHEAD_FILE_DELETE; static final String OVERHEAD_FILE_ID; static final String OVERHEAD_FILE; } | @Test public void uploadOverheadFileTestWrongInput() { StandardMultipartHttpServletRequest request = (StandardMultipartHttpServletRequest)setupUploadRequest(); when(request.getFileMap()).thenReturn(asMap("overheadfile", null)); when(request.getParameter("fileoverheadid")).thenReturn("ash!@#!@tasa"); ValidationMessages result = saver.handleOverheadFileRequest(request); assertEquals(0, result.getErrors().size()); verify(overheadFileRestService, never()).updateOverheadCalculationFile(anyLong(), anyString(), anyLong(), anyString(), any(byte[].class)); }
@Test public void uploadOverheadFileTestSuccess() throws IOException { StandardMultipartHttpServletRequest request = (StandardMultipartHttpServletRequest)setupUploadRequest(); MultipartFile file = new MockMultipartFile("overheadfile.xlsx", new byte[]{}); when(request.getFileMap()).thenReturn(asMap("overheadfile", file)); when(request.getParameter("fileoverheadid")).thenReturn("343"); FileEntryResource fileEntryResource = newFileEntryResource().withId(343L).withFilesizeBytes(file.getSize()).build(); when(overheadFileRestService.updateOverheadCalculationFile(343L, file.getContentType(), file.getSize(), file.getOriginalFilename(), file.getBytes())) .thenReturn(RestResult.restSuccess(fileEntryResource)); ValidationMessages result = saver.handleOverheadFileRequest(request); assertEquals(0, result.getErrors().size()); verify(overheadFileRestService, times(1)).updateOverheadCalculationFile(anyLong(), nullable(String.class), anyLong(), anyString(), any(byte[].class)); }
@Test public void uploadOverheadFileTestFailure() throws IOException { StandardMultipartHttpServletRequest request = (StandardMultipartHttpServletRequest)setupUploadRequest(); MultipartFile file = new MockMultipartFile("overheadfile.xlsx", new byte[]{}); when(request.getFileMap()).thenReturn(asMap("overheadfile", file)); when(request.getParameter("fileoverheadid")).thenReturn("343"); when(overheadFileRestService.updateOverheadCalculationFile(343L, file.getContentType(), file.getSize(), file.getOriginalFilename(), file.getBytes())) .thenReturn(RestResult.restFailure(new Error("GENERAL_NOT_FOUND", BAD_REQUEST))); ValidationMessages result = saver.handleOverheadFileRequest(request); assertEquals(1, result.getErrors().size()); assertEquals("GENERAL_NOT_FOUND", result.getErrors().get(0).getErrorKey()); assertEquals(NOT_ACCEPTABLE, result.getErrors().get(0).getStatusCode()); verify(overheadFileRestService, times(1)).updateOverheadCalculationFile(anyLong(), nullable(String.class), anyLong(), anyString(), any(byte[].class)); }
@Test public void uploadOverheadFileTestFailureReplaceMessage() throws IOException { StandardMultipartHttpServletRequest request = (StandardMultipartHttpServletRequest)setupUploadRequest(); MultipartFile file = new MockMultipartFile("overheadfile.xlsx", new byte[]{}); when(request.getFileMap()).thenReturn(asMap("overheadfile", file)); when(request.getParameter("fileoverheadid")).thenReturn("343"); when(overheadFileRestService.updateOverheadCalculationFile(343L, file.getContentType(), file.getSize(), file.getOriginalFilename(), file.getBytes())) .thenReturn(RestResult.restFailure(new Error("UNSUPPORTED_MEDIA_TYPE", UNSUPPORTED_MEDIA_TYPE))); ValidationMessages result = saver.handleOverheadFileRequest(request); assertEquals(1, result.getErrors().size()); assertEquals("validation.finance.overhead.file.type", result.getErrors().get(0).getErrorKey()); verify(overheadFileRestService, times(1)).updateOverheadCalculationFile(anyLong(), nullable(String.class), anyLong(), anyString(), any(byte[].class)); }
@Test public void deleteOverheadFileWrongInput() { HttpServletRequest request = setupDeleteRequest(); when(request.getParameter("fileoverheadid")).thenReturn("askjdjbkr@#!"); ValidationMessages result = saver.handleOverheadFileRequest(request); assertEquals(0, result.getErrors().size()); verify(overheadFileRestService, never()).removeOverheadCalculationFile(anyLong()); }
@Test public void deleteOverheadFileSuccess() { HttpServletRequest request = setupDeleteRequest(); when(request.getParameter("fileoverheadid")).thenReturn("343"); when(overheadFileRestService.removeOverheadCalculationFile(343L)).thenReturn(RestResult.restSuccess()); ValidationMessages result = saver.handleOverheadFileRequest(request); assertEquals(0, result.getErrors().size()); verify(overheadFileRestService, times(1)).removeOverheadCalculationFile(anyLong()); }
@Test public void deleteOverheadFileFailure() { HttpServletRequest request = setupDeleteRequest(); when(request.getParameter("fileoverheadid")).thenReturn("343"); when(overheadFileRestService.removeOverheadCalculationFile(343L)).thenReturn(RestResult.restFailure(new Error("GENERAL_NOT_FOUND", BAD_REQUEST))); ValidationMessages result = saver.handleOverheadFileRequest(request); assertEquals(1, result.getErrors().size()); assertEquals("GENERAL_NOT_FOUND", result.getErrors().get(0).getErrorKey()); assertEquals(NOT_ACCEPTABLE, result.getErrors().get(0).getStatusCode()); verify(overheadFileRestService, times(1)).removeOverheadCalculationFile(anyLong()); } |
ApplicationOverviewViewModel implements BaseAnalyticsViewModel { public String getTermsAndConditionsTerminology() { if (FundingType.INVESTOR_PARTNERSHIPS == competition.getFundingType()) { return TERMS_AND_CONDITIONS_INVESTOR_PARTNERSHIPS; } return TERMS_AND_CONDITIONS_OTHER; } ApplicationOverviewViewModel(ProcessRoleResource processRole, CompetitionResource competition, ApplicationResource application, Set<ApplicationOverviewSectionViewModel> sections, Boolean reopened, ZonedDateTime reopenedDate); @Override Long getApplicationId(); @Override String getCompetitionName(); ProcessRoleResource getProcessRole(); CompetitionResource getCompetition(); ApplicationResource getApplication(); Set<ApplicationOverviewSectionViewModel> getSections(); boolean isLead(); String getTermsAndConditionsTerminology(); Boolean getReopened(); ZonedDateTime getReopenedDate(); } | @Test public void termsAndConditionsTerminologyGivenInvestorPartnershipCompetition() { CompetitionResourceBuilder.newCompetitionResource().withFundingType(FundingType.INVESTOR_PARTNERSHIPS).build(); ApplicationOverviewViewModel viewModel = new ApplicationOverviewViewModel(null, CompetitionResourceBuilder.newCompetitionResource().withFundingType(FundingType.INVESTOR_PARTNERSHIPS).build(), null, null, null, null); String result = viewModel.getTermsAndConditionsTerminology(); assertThat(result).isEqualTo(TermsAndConditionsUtil.TERMS_AND_CONDITIONS_INVESTOR_PARTNERSHIPS); }
@Test public void termsAndConditionsTerminologyGivenNotInvestorPartnershipCompetition() { CompetitionResourceBuilder.newCompetitionResource().withFundingType(FundingType.GRANT).build(); ApplicationOverviewViewModel viewModel = new ApplicationOverviewViewModel(null, CompetitionResourceBuilder.newCompetitionResource().withFundingType(FundingType.GRANT).build(), null, null, null, null); String result = viewModel.getTermsAndConditionsTerminology(); assertThat(result).isEqualTo(TermsAndConditionsUtil.TERMS_AND_CONDITIONS_OTHER); } |
ApplicationOverviewController { @GetMapping("/{applicationId}") @AsyncMethod public String applicationOverview(Model model, @PathVariable("applicationId") long applicationId, UserResource user) { ApplicationResource application = applicationRestService.getApplicationById(applicationId) .getSuccess(); if (application.getCompetitionStatus() != CompetitionStatus.OPEN || userIsKta(user.getId(), application.getId())) { return format("redirect:/application/%s/summary", application.getId()); } if (application.isSubmitted()) { return format("redirect:/application/%s/track", application.getId()); } changeApplicationStatusToOpen(application, user); model.addAttribute("model", applicationOverviewModelPopulator.populateModel(application, user)); return "application-overview"; } ApplicationOverviewController(); @Autowired ApplicationOverviewController(ApplicationOverviewModelPopulator applicationOverviewModelPopulator,
UserRestService userRestService,
ApplicationRestService applicationRestService); @GetMapping("/{applicationId}") @AsyncMethod String applicationOverview(Model model,
@PathVariable("applicationId") long applicationId,
UserResource user); @GetMapping("/terms-and-conditions") String termsAndConditions(); } | @Test public void applicationOverview() throws Exception { ApplicationResource application = newApplicationResource() .withCompetitionStatus(CompetitionStatus.OPEN) .withApplicationState(ApplicationState.CREATED) .build(); when(applicationRestService.getApplicationById(application.getId())).thenReturn(restSuccess(application)); ApplicationOverviewViewModel expectedModel = mock(ApplicationOverviewViewModel.class); when(applicationOverviewModelPopulator.populateModel(application, loggedInUser)).thenReturn(expectedModel); when(userRestService.findProcessRole(loggedInUser.getId(), application.getId())).thenReturn( restSuccess(newProcessRoleResource() .withUser(loggedInUser) .withRole(LEADAPPLICANT).build())); when(userRestService.findProcessRole(application.getId())).thenReturn( restSuccess(Collections.singletonList(newProcessRoleResource() .withUser(loggedInUser) .withRole(LEADAPPLICANT).build()))); when(applicationRestService.updateApplicationState(application.getId(), ApplicationState.OPENED)).thenReturn(restSuccess()); MvcResult result = mockMvc.perform(get("/application/" + application.getId())) .andExpect(status().isOk()) .andExpect(view().name("application-overview")) .andReturn(); ApplicationOverviewViewModel viewModel = (ApplicationOverviewViewModel) result.getModelAndView().getModel().get("model"); assertSame(expectedModel, viewModel); verify(applicationRestService).updateApplicationState(application.getId(), ApplicationState.OPENED); } |
ApplicationOverviewModelPopulator extends AsyncAdaptor { public ApplicationOverviewViewModel populateModel(ApplicationResource application, UserResource user) { Future<OrganisationResource> organisation = async(() -> organisationRestService.getByUserAndApplicationId(user.getId(), application.getId()).getSuccess()); Future<CompetitionResource> competition = async(() -> competitionRestService.getCompetitionById(application.getCompetition()).getSuccess()); Future<List<SectionResource>> sections = async(() -> sectionRestService.getByCompetition(application.getCompetition()).getSuccess()); Future<List<QuestionResource>> questions = async(() -> questionRestService.findByCompetition(application.getCompetition()).getSuccess()); Future<List<ProcessRoleResource>> processRoles = async(() -> userRestService.findProcessRole(application.getId()).getSuccess()); Future<List<QuestionStatusResource>> statuses = async(() -> questionStatusRestService.findByApplicationAndOrganisation(application.getId(), resolve(organisation).getId()).getSuccess()); Future<List<Long>> completedSectionIds = async(() -> sectionStatusRestService.getCompletedSectionIds(application.getId(), resolve(organisation).getId()).getSuccess()); Future<Map<Long, Set<Long>>> completedSectionsByOrganisation = async(() -> sectionStatusRestService.getCompletedSectionsByOrganisation(application.getId()).getSuccess()); async(() -> { List<QuestionStatusResource> notifications = questionService.getNotificationsForUser(resolve(statuses), user.getId()); questionService.removeNotifications(notifications); }); ApplicationOverviewData data = new ApplicationOverviewData(resolve(competition), application, resolve(sections), resolve(questions), resolve(processRoles), resolve(organisation), resolve(statuses), resolve(completedSectionIds), resolve(completedSectionsByOrganisation), user); Set<ApplicationOverviewSectionViewModel> sectionViewModels = data.getSections() .values() .stream() .sorted(comparing(SectionResource::getPriority)) .filter(section -> section.getParentSection() == null) .map(section -> sectionViewModel(section, data)) .collect(toCollection(LinkedHashSet::new)); return new ApplicationOverviewViewModel(data.getUserProcessRole(), data.getCompetition(), application, sectionViewModels, application.hasBeenReopened(), application.getLastStateChangeDate()); } ApplicationOverviewModelPopulator(AsyncFuturesGenerator asyncFuturesGenerator, CompetitionRestService competitionRestService,
SectionRestService sectionRestService, QuestionRestService questionRestService,
UserRestService userRestService, MessageSource messageSource,
OrganisationRestService organisationRestService, QuestionStatusRestService questionStatusRestService,
SectionStatusRestService sectionStatusRestService,
QuestionService questionService); ApplicationOverviewViewModel populateModel(ApplicationResource application, UserResource user); } | @Test public void populateModel() { CompetitionResource competition = newCompetitionResource() .withCollaborationLevel(SINGLE) .build(); ApplicationResource application = newApplicationResource() .withCompetition(competition.getId()) .build(); List<QuestionResource> questions = newQuestionResource() .withShortName("A question") .withQuestionSetupType(ASSESSED_QUESTION) .withQuestionNumber("4") .build(1); UserResource user = newUserResource().build(); List<ProcessRoleResource> processRoles = newProcessRoleResource() .withUser(user, newUserResource().build()) .withRole(Role.LEADAPPLICANT, Role.COLLABORATOR) .build(2); List<QuestionStatusResource> questionStatuses = newQuestionStatusResource() .withQuestion(questions.get(0).getId()) .withMarkedAsComplete(false) .withAssignee(processRoles.get(1).getId()) .build(1); OrganisationResource organisation = newOrganisationResource().build(); SectionResource childSection = newSectionResource() .withName("Child finance") .withPriority(3) .build(); List<SectionResource> sections = newSectionResource() .withPriority(1, 2, 3, 4) .withName("Section with questions", "Finances", "Project details", "Terms and conditions") .withChildSections(emptyList(), Collections.singletonList(childSection.getId()), emptyList(), emptyList()) .withQuestions(questions.stream().map(QuestionResource::getId).collect(Collectors.toList()), emptyList(), emptyList(), emptyList()) .build(4); sections.add(childSection); childSection.setParentSection(sections.get(1).getId()); Map<Long, Set<Long>> completedSectionsByOrganisation = emptyMap(); when(organisationRestService.getByUserAndApplicationId(user.getId(), application.getId())).thenReturn(restSuccess(organisation)); when(competitionRestService.getCompetitionById(application.getCompetition())).thenReturn(restSuccess(competition)); when(sectionRestService.getByCompetition(application.getCompetition())).thenReturn(restSuccess(sections)); when(questionRestService.findByCompetition(application.getCompetition())).thenReturn(restSuccess(questions)); when(userRestService.findProcessRole(application.getId())).thenReturn(restSuccess(processRoles)); when(questionStatusRestService.findByApplicationAndOrganisation(application.getId(), organisation.getId())).thenReturn(restSuccess(questionStatuses)); when(sectionStatusRestService.getCompletedSectionIds(application.getId(), organisation.getId())).thenReturn(restSuccess(asList(sections.get(1).getId(), childSection.getId()))); when(questionService.getNotificationsForUser(questionStatuses, user.getId())).thenReturn(questionStatuses); when(messageSource.getMessage("ifs.section.finances.description", null, Locale.getDefault())).thenReturn("Finance description"); when(messageSource.getMessage("ifs.section.projectDetails.description", null, Locale.getDefault())).thenReturn("Project details description"); when(messageSource.getMessage("ifs.section.termsAndConditions.description", null, Locale.getDefault())).thenReturn("T&Cs description"); when(sectionStatusRestService.getCompletedSectionsByOrganisation(application.getId())).thenReturn(restSuccess(completedSectionsByOrganisation)); ApplicationOverviewViewModel viewModel = populator.populateModel(application, user); assertEquals(application, viewModel.getApplication()); assertEquals(competition, viewModel.getCompetition()); assertEquals(processRoles.get(0), viewModel.getProcessRole()); assertTrue(viewModel.isLead()); assertEquals(4, viewModel.getSections().size()); Iterator<ApplicationOverviewSectionViewModel> sectionIterator = viewModel.getSections() .stream() .sorted(comparing(ApplicationOverviewSectionViewModel::getId)) .iterator(); ApplicationOverviewSectionViewModel sectionWithQuestions = sectionIterator.next(); assertEquals("Section with questions", sectionWithQuestions.getTitle()); assertNull(sectionWithQuestions.getSubTitle()); assertEquals((long) sections.get(0).getId(), sectionWithQuestions.getId()); assertEquals(1, sectionWithQuestions.getRows().size()); ApplicationOverviewRowViewModel questionRow = sectionWithQuestions.getRows().iterator().next(); assertEquals("4. A question", questionRow.getTitle()); assertEquals(String.format("/application/%d/form/question/%d/generic", application.getId(), questions.get(0).getId()), questionRow.getUrl()); assertEquals(false, questionRow.isComplete()); assertEquals(processRoles.get(1), questionRow.getAssignButtonsViewModel().get().getAssignee()); assertEquals(processRoles, questionRow.getAssignButtonsViewModel().get().getAssignableApplicants()); ApplicationOverviewSectionViewModel sectionWithChildSections = sectionIterator.next(); assertEquals("Finances", sectionWithChildSections.getTitle()); assertEquals("Finance description", sectionWithChildSections.getSubTitle()); assertEquals((long) sections.get(1).getId(), sectionWithChildSections.getId()); ApplicationOverviewRowViewModel childSectionRow = sectionWithChildSections.getRows().iterator().next(); assertEquals("Child finance", childSectionRow.getTitle()); assertEquals(String.format("/application/%d/form/section/%d", application.getId(), childSection.getId()), childSectionRow.getUrl()); assertEquals(true, childSectionRow.isComplete()); assertFalse(childSectionRow.getAssignButtonsViewModel().isPresent()); ApplicationOverviewSectionViewModel projectDetailsSection = sectionIterator.next(); assertEquals("Project details", projectDetailsSection.getTitle()); assertEquals("Project details description", projectDetailsSection.getSubTitle()); assertEquals((long) sections.get(2).getId(), projectDetailsSection.getId()); ApplicationOverviewSectionViewModel termsAndConditionsSection = sectionIterator.next(); assertEquals("Terms and conditions", termsAndConditionsSection.getTitle()); assertEquals("T&Cs description", termsAndConditionsSection.getSubTitle()); assertEquals((long) sections.get(3).getId(), termsAndConditionsSection.getId()); verify(questionService).removeNotifications(questionStatuses); } |
LoginController { @GetMapping("/" + LOGIN_BASE + "/" + RESET_PASSWORD) public String requestPasswordReset(ResetPasswordRequestForm resetPasswordRequestForm, Model model) { model.addAttribute("resetPasswordRequestForm", resetPasswordRequestForm); return LOGIN_BASE + "/" + RESET_PASSWORD; } LoginController(UserService userService,
UserRestService userRestService); @GetMapping("/" + LOGIN_BASE + "/" + RESET_PASSWORD) String requestPasswordReset(ResetPasswordRequestForm resetPasswordRequestForm, Model model); @PostMapping("/" + LOGIN_BASE + "/" + RESET_PASSWORD) String requestPasswordResetPost(@ModelAttribute @Valid ResetPasswordRequestForm resetPasswordRequestForm, BindingResult bindingResult, Model model); @GetMapping("/" + LOGIN_BASE + "/" + RESET_PASSWORD + "/hash/{hash}") String resetPassword(@PathVariable("hash") String hash, @ModelAttribute(binding = false) ResetPasswordForm resetPasswordForm, Model model, HttpServletRequest request); @PostMapping("/" + LOGIN_BASE + "/" + RESET_PASSWORD + "/hash/{hash}") String resetPasswordPost(@PathVariable("hash") String hash, @Valid @ModelAttribute ResetPasswordForm resetPasswordForm, BindingResult bindingResult); static final String LOGIN_BASE; static final String RESET_PASSWORD; static final String RESET_PASSWORD_FORM; static final String RESET_PASSWORD_NOTIFICATION_SEND; static final String PASSWORD_CHANGED; } | @Test public void testRequestPasswordReset() throws Exception { mockMvc.perform(get("/" + LoginController.LOGIN_BASE + "/" + LoginController.RESET_PASSWORD)) .andExpect(status().isOk()) .andExpect(view().name(LoginController.LOGIN_BASE + "/" + LoginController.RESET_PASSWORD)); } |
LoginController { @PostMapping("/" + LOGIN_BASE + "/" + RESET_PASSWORD) public String requestPasswordResetPost(@ModelAttribute @Valid ResetPasswordRequestForm resetPasswordRequestForm, BindingResult bindingResult, Model model) { if (bindingResult.hasErrors()) { model.addAttribute("resetPasswordRequestForm", resetPasswordRequestForm); return LOGIN_BASE + "/" + RESET_PASSWORD; } else { LOG.warn("Reset password for: " + resetPasswordRequestForm.getEmail()); userService.sendPasswordResetNotification(resetPasswordRequestForm.getEmail()); return LOGIN_BASE + "/" + RESET_PASSWORD_NOTIFICATION_SEND; } } LoginController(UserService userService,
UserRestService userRestService); @GetMapping("/" + LOGIN_BASE + "/" + RESET_PASSWORD) String requestPasswordReset(ResetPasswordRequestForm resetPasswordRequestForm, Model model); @PostMapping("/" + LOGIN_BASE + "/" + RESET_PASSWORD) String requestPasswordResetPost(@ModelAttribute @Valid ResetPasswordRequestForm resetPasswordRequestForm, BindingResult bindingResult, Model model); @GetMapping("/" + LOGIN_BASE + "/" + RESET_PASSWORD + "/hash/{hash}") String resetPassword(@PathVariable("hash") String hash, @ModelAttribute(binding = false) ResetPasswordForm resetPasswordForm, Model model, HttpServletRequest request); @PostMapping("/" + LOGIN_BASE + "/" + RESET_PASSWORD + "/hash/{hash}") String resetPasswordPost(@PathVariable("hash") String hash, @Valid @ModelAttribute ResetPasswordForm resetPasswordForm, BindingResult bindingResult); static final String LOGIN_BASE; static final String RESET_PASSWORD; static final String RESET_PASSWORD_FORM; static final String RESET_PASSWORD_NOTIFICATION_SEND; static final String PASSWORD_CHANGED; } | @Test public void testRequestPasswordResetPost() throws Exception { setLoggedInUser(null); String email = "[email protected]"; when(userRestServiceMock.sendPasswordResetNotification(eq(email))).thenReturn(completedFuture(restSuccess())); mockMvc.perform( post("/" + LoginController.LOGIN_BASE + "/" + LoginController.RESET_PASSWORD) .param("email", email) ) .andExpect(status().isOk()) .andExpect(view().name(LoginController.LOGIN_BASE + "/" + LoginController.RESET_PASSWORD_NOTIFICATION_SEND)); } |
LoginController { @GetMapping("/" + LOGIN_BASE + "/" + RESET_PASSWORD + "/hash/{hash}") public String resetPassword(@PathVariable("hash") String hash, @ModelAttribute(binding = false) ResetPasswordForm resetPasswordForm, Model model, HttpServletRequest request) { userRestService.checkPasswordResetHash(hash).getSuccess(); return LOGIN_BASE + "/" + RESET_PASSWORD_FORM; } LoginController(UserService userService,
UserRestService userRestService); @GetMapping("/" + LOGIN_BASE + "/" + RESET_PASSWORD) String requestPasswordReset(ResetPasswordRequestForm resetPasswordRequestForm, Model model); @PostMapping("/" + LOGIN_BASE + "/" + RESET_PASSWORD) String requestPasswordResetPost(@ModelAttribute @Valid ResetPasswordRequestForm resetPasswordRequestForm, BindingResult bindingResult, Model model); @GetMapping("/" + LOGIN_BASE + "/" + RESET_PASSWORD + "/hash/{hash}") String resetPassword(@PathVariable("hash") String hash, @ModelAttribute(binding = false) ResetPasswordForm resetPasswordForm, Model model, HttpServletRequest request); @PostMapping("/" + LOGIN_BASE + "/" + RESET_PASSWORD + "/hash/{hash}") String resetPasswordPost(@PathVariable("hash") String hash, @Valid @ModelAttribute ResetPasswordForm resetPasswordForm, BindingResult bindingResult); static final String LOGIN_BASE; static final String RESET_PASSWORD; static final String RESET_PASSWORD_FORM; static final String RESET_PASSWORD_NOTIFICATION_SEND; static final String PASSWORD_CHANGED; } | @Test public void testResetPassword() throws Exception { String hash = UUID.randomUUID().toString(); when(userRestServiceMock.checkPasswordResetHash(hash)).thenReturn(restSuccess()); mockMvc.perform(get("/" + LoginController.LOGIN_BASE + "/" + LoginController.RESET_PASSWORD + "/hash/" + hash)) .andExpect(status().isOk()) .andExpect(view().name(LoginController.LOGIN_BASE + "/" + LoginController.RESET_PASSWORD_FORM)); verify(userRestServiceMock).checkPasswordResetHash(hash); }
@Test public void testResetPasswordPostShibErrors() throws Exception { String hash = UUID.randomUUID().toString(); String password = "Passw0rd123"; when(userRestServiceMock.checkPasswordResetHash(eq(hash))).thenReturn(restSuccess()); List<Error> errors = new ArrayList<>(); errors.add(new Error("INVALID_PASSWORD", HttpStatus.CONFLICT)); when(userRestServiceMock.resetPassword(eq(hash), eq(password))).thenReturn(restFailure(errors)); mockMvc.perform( post("/" + LoginController.LOGIN_BASE + "/" + LoginController.RESET_PASSWORD + "/hash/" + hash) .param("password", password) ) .andExpect(status().isOk()) .andExpect(model().attributeHasFieldErrorCode("resetPasswordForm", "password", "registration.INVALID_PASSWORD")) .andExpect(view().name(LoginController.LOGIN_BASE + "/" + LoginController.RESET_PASSWORD_FORM)); }
@Test public void testResetPasswordPostPasswordTooShort() throws Exception { String hash = UUID.randomUUID().toString(); String password = "letm3In"; when(userRestServiceMock.checkPasswordResetHash(hash)).thenReturn(restSuccess()); when(userRestServiceMock.resetPassword(eq(hash), eq(password))).thenReturn(restSuccess()); mockMvc.perform( post("/" + LoginController.LOGIN_BASE + "/" + LoginController.RESET_PASSWORD + "/hash/" + hash) .param("password", password) ) .andExpect(status().isOk()) .andExpect(view().name(LoginController.LOGIN_BASE + "/" + LoginController.RESET_PASSWORD_FORM)); verify(userRestServiceMock).checkPasswordResetHash(hash); } |
LoginController { @PostMapping("/" + LOGIN_BASE + "/" + RESET_PASSWORD + "/hash/{hash}") public String resetPasswordPost(@PathVariable("hash") String hash, @Valid @ModelAttribute ResetPasswordForm resetPasswordForm, BindingResult bindingResult) { userRestService.checkPasswordResetHash(hash).getSuccess(); if (bindingResult.hasErrors()) { return LOGIN_BASE + "/" + RESET_PASSWORD + "-form"; } else { RestResult<Void> result = userRestService.resetPassword(hash, resetPasswordForm.getPassword()); if(result.isFailure()){ List<Error> errors = result.getFailure().getErrors(); for (Error error : errors) { bindingResult.rejectValue("password", "registration."+error.getErrorKey()); } return LOGIN_BASE + "/" + RESET_PASSWORD + "-form"; }else{ return LOGIN_BASE + "/" + PASSWORD_CHANGED; } } } LoginController(UserService userService,
UserRestService userRestService); @GetMapping("/" + LOGIN_BASE + "/" + RESET_PASSWORD) String requestPasswordReset(ResetPasswordRequestForm resetPasswordRequestForm, Model model); @PostMapping("/" + LOGIN_BASE + "/" + RESET_PASSWORD) String requestPasswordResetPost(@ModelAttribute @Valid ResetPasswordRequestForm resetPasswordRequestForm, BindingResult bindingResult, Model model); @GetMapping("/" + LOGIN_BASE + "/" + RESET_PASSWORD + "/hash/{hash}") String resetPassword(@PathVariable("hash") String hash, @ModelAttribute(binding = false) ResetPasswordForm resetPasswordForm, Model model, HttpServletRequest request); @PostMapping("/" + LOGIN_BASE + "/" + RESET_PASSWORD + "/hash/{hash}") String resetPasswordPost(@PathVariable("hash") String hash, @Valid @ModelAttribute ResetPasswordForm resetPasswordForm, BindingResult bindingResult); static final String LOGIN_BASE; static final String RESET_PASSWORD; static final String RESET_PASSWORD_FORM; static final String RESET_PASSWORD_NOTIFICATION_SEND; static final String PASSWORD_CHANGED; } | @Test public void testResetPasswordPost() throws Exception { String hash = UUID.randomUUID().toString(); String password = "Passw0rd12"; when(userRestServiceMock.checkPasswordResetHash(hash)).thenReturn(restSuccess()); when(userRestServiceMock.resetPassword(eq(hash), eq(password))).thenReturn(restSuccess()); mockMvc.perform( post("/" + LoginController.LOGIN_BASE + "/" + LoginController.RESET_PASSWORD + "/hash/" + hash) .param("password", password) ) .andExpect(status().isOk()) .andExpect(view().name(LoginController.LOGIN_BASE + "/" + LoginController.PASSWORD_CHANGED)); verify(userRestServiceMock).checkPasswordResetHash(hash); verify(userRestServiceMock).resetPassword(hash, password); } |
UserProfilePopulator { public UserProfileViewModel populate(UserResource user) { List<OrganisationResource> organisations = organisationRestService.getAllByUserId(user.getId()).getSuccess(); Set<OrganisationProfileViewModel> organisationViewModels = simpleMapSet(organisations, this::toOrganisationViewModel); String name; if (user.getTitle() != null) { name = user.getTitle() + " " + user.getName().trim(); } else { name = user.getName(); } return new UserProfileViewModel(name, user.getPhoneNumber(), user.getEmail(), user.getAllowMarketingEmails(), organisationViewModels, user.hasAnyRoles(MONITORING_OFFICER)); } UserProfileViewModel populate(UserResource user); } | @Test public void populate() { UserResource user = newUserResource() .withFirstName("Steve") .withLastName("Smith") .withEmail("[email protected]") .build(); List<OrganisationResource> organisations = newOrganisationResource() .withName("organisation") .withOrganisationTypeName("Type") .withCompaniesHouseNumber("123") .build(1); when(organisationRestService.getAllByUserId(user.getId())).thenReturn(restSuccess(organisations)); UserProfileViewModel actual = target.populate(user); assertEquals(actual.getName(), user.getName()); assertEquals(actual.getEmailAddress(), user.getEmail()); assertEquals(actual.getPhoneNumber(), user.getPhoneNumber()); assertEquals(actual.getOrganisations().iterator().next().getName(), organisations.get(0).getName()); assertEquals(actual.getOrganisations().iterator().next().getRegistrationNumber(), organisations.get(0).getCompaniesHouseNumber()); assertEquals(actual.getOrganisations().iterator().next().getType(), organisations.get(0).getOrganisationTypeName()); } |
ApplicantDashboardController { @SecuredBySpring(value = "ApplicantDashboardController", description = "applicant and kta has permission to view their own dashboard") @PreAuthorize("hasAnyAuthority('applicant', 'knowledge_transfer_adviser')") @GetMapping @NavigationRoot public String dashboard(Model model, UserResource user) { model.addAttribute("model", applicantDashboardPopulator.populate(user.getId())); return "applicant-dashboard"; } @SecuredBySpring(value = "ApplicantDashboardController", description = "applicant and kta has permission to view their own dashboard") @PreAuthorize("hasAnyAuthority('applicant', 'knowledge_transfer_adviser')") @GetMapping @NavigationRoot String dashboard(Model model,
UserResource user); @PostMapping(params = "hide-application") String hideApplication(@RequestParam("hide-application") long applicationId,
UserResource user); @PostMapping(params = "delete-application") String deleteApplication(@RequestParam("delete-application") long applicationId); } | @Test public void dashboard() throws Exception { ApplicantDashboardViewModel viewModel = mock(ApplicantDashboardViewModel.class); when(populator.populate(loggedInUser.getId())).thenReturn(viewModel); mockMvc.perform(get("/applicant/dashboard")) .andExpect(status().isOk()) .andExpect(view().name("applicant-dashboard")) .andExpect(model().attribute("model", viewModel)); } |
ApplicantDashboardController { @PostMapping(params = "hide-application") public String hideApplication(@RequestParam("hide-application") long applicationId, UserResource user) { applicationRestService.hideApplication(applicationId, user.getId()); return format("redirect:/applicant/dashboard"); } @SecuredBySpring(value = "ApplicantDashboardController", description = "applicant and kta has permission to view their own dashboard") @PreAuthorize("hasAnyAuthority('applicant', 'knowledge_transfer_adviser')") @GetMapping @NavigationRoot String dashboard(Model model,
UserResource user); @PostMapping(params = "hide-application") String hideApplication(@RequestParam("hide-application") long applicationId,
UserResource user); @PostMapping(params = "delete-application") String deleteApplication(@RequestParam("delete-application") long applicationId); } | @Test public void hideApplication() throws Exception { UserResource collaborator = this.collaborator; setLoggedInUser(collaborator); long applicationId = 1L; long userId = 1L; when(applicationRestService.hideApplication(applicationId, userId)).thenReturn(RestResult.restSuccess()); mockMvc.perform(post("/applicant/dashboard") .param("hide-application", valueOf(applicationId))) .andExpect(status().is3xxRedirection()); } |
ApplicantDashboardController { @PostMapping(params = "delete-application") public String deleteApplication(@RequestParam("delete-application") long applicationId) { applicationRestService.deleteApplication(applicationId); return format("redirect:/applicant/dashboard"); } @SecuredBySpring(value = "ApplicantDashboardController", description = "applicant and kta has permission to view their own dashboard") @PreAuthorize("hasAnyAuthority('applicant', 'knowledge_transfer_adviser')") @GetMapping @NavigationRoot String dashboard(Model model,
UserResource user); @PostMapping(params = "hide-application") String hideApplication(@RequestParam("hide-application") long applicationId,
UserResource user); @PostMapping(params = "delete-application") String deleteApplication(@RequestParam("delete-application") long applicationId); } | @Test public void deleteApplication() throws Exception { setLoggedInUser(applicant); long applicationId = 1L; when(applicationRestService.deleteApplication(applicationId)).thenReturn(RestResult.restSuccess()); mockMvc.perform(post("/applicant/dashboard").param("delete-application", valueOf(applicationId))) .andExpect(status().is3xxRedirection()); } |
ApplicantDashboardPopulator { public ApplicantDashboardViewModel populate(Long userId) { ApplicantDashboardResource applicantDashboardResource = applicantRestService.getApplicantDashboard(userId); return getApplicantDashboardViewModel(applicantDashboardResource); } ApplicantDashboardViewModel populate(Long userId); } | @Test public void testPopulateInSetupProjects() { DashboardInSetupRowResource inSetup = aDashboardInSetupRowResource() .withCompetitionTitle("Competition Title") .withProjectId(3L) .withProjectTitle("Project Title") .build(); List<DashboardInSetupRowResource> inSetUp = singletonList(inSetup); setupDashboard(inSetUp, emptyList(), emptyList(), emptyList()); ApplicantDashboardViewModel viewModel = populator.populate(USER_ID); assertEquals(1, viewModel.getProjects().size()); InSetupDashboardRowViewModel inSetupViewModel = viewModel.getProjects().get(0); assertEquals("Project Title", inSetupViewModel.getTitle()); assertEquals(3L, inSetupViewModel.getProjectId()); assertEquals(format("/project-setup/project/%d", 3L), inSetupViewModel.getLinkUrl()); assertEquals("Project Title", inSetupViewModel.getProjectTitle()); }
@Test public void testSortForInSetupProjects() { DashboardInSetupRowResource startsYesterday = aDashboardInSetupRowResource() .withTargetStartDate(YESTERDAY.toLocalDate()) .withProjectTitle("starts in past") .build(); DashboardInSetupRowResource startsToday = aDashboardInSetupRowResource() .withTargetStartDate(TODAY.toLocalDate()) .withProjectTitle("starts today") .build(); DashboardInSetupRowResource startsTomorrow = aDashboardInSetupRowResource() .withTargetStartDate(TOMORROW.toLocalDate()) .withProjectTitle("starts in future") .build(); List<DashboardInSetupRowResource> inSetUp = asList(startsYesterday, startsToday, startsTomorrow); setupDashboard(inSetUp, emptyList(), emptyList(), emptyList()); ApplicantDashboardViewModel viewModel = populator.populate(USER_ID); List<InSetupDashboardRowViewModel> result = viewModel.getProjects(); assertEquals(3, result.size()); assertEquals("starts in future", result.get(0).getTitle()); assertEquals("starts today", result.get(1).getTitle()); assertEquals("starts in past", result.get(2).getTitle()); }
@Test public void populateEuGrantTransfers() { DashboardEuGrantTransferRowResource euGrantTransfer = new DashboardApplicationForEuGrantTransferResourceBuilder() .withTitle("Title") .withApplicationProgress(1) .withApplicationState(APPROVED) .withCompetitionTitle("Competition Title") .withProjectId(5L) .build(); List<DashboardEuGrantTransferRowResource> euGrantTransfers = singletonList(euGrantTransfer); setupDashboard(emptyList(), euGrantTransfers, emptyList(), emptyList()); ApplicantDashboardViewModel viewModel = populator.populate(USER_ID); assertFalse(viewModel.getEuGrantTransfers().isEmpty()); EuGrantTransferDashboardRowViewModel euGrantViewModel = viewModel.getEuGrantTransfers().get(0); assertEquals(format("/project-setup/project/%d", 5L), euGrantViewModel.getLinkUrl()); assertEquals("Title", euGrantViewModel.getTitle()); assertEquals(1, euGrantViewModel.getApplicationProgress()); assertEquals(FALSE, euGrantViewModel.isIneligible()); assertEquals(FALSE, euGrantViewModel.isInProgress()); assertEquals(FALSE, euGrantViewModel.isSubmitted()); assertEquals(TRUE, euGrantViewModel.isSuccessful()); }
@Test public void testSortForEuGrantTransfers() { DashboardEuGrantTransferRowResource approvedOne = new DashboardApplicationForEuGrantTransferResourceBuilder() .withApplicationId(1L) .withApplicationState(APPROVED) .withTitle("approved application 1") .build(); DashboardEuGrantTransferRowResource openOne = new DashboardApplicationForEuGrantTransferResourceBuilder() .withApplicationId(2L) .withApplicationState(OPENED) .withTitle("open application 1") .build(); DashboardEuGrantTransferRowResource openTwo = new DashboardApplicationForEuGrantTransferResourceBuilder() .withApplicationId(3L) .withApplicationState(OPENED) .withTitle("open application 2") .build(); DashboardEuGrantTransferRowResource approvedTwo = new DashboardApplicationForEuGrantTransferResourceBuilder() .withApplicationId(4L) .withApplicationState(APPROVED) .withTitle("approved application 2") .build(); List<DashboardEuGrantTransferRowResource> euGrantTransfers = asList(approvedOne, openOne, openTwo, approvedTwo); setupDashboard(emptyList(), euGrantTransfers, emptyList(), emptyList()); ApplicantDashboardViewModel viewModel = populator.populate(USER_ID); List<EuGrantTransferDashboardRowViewModel> result = viewModel.getEuGrantTransfers(); assertEquals(4, result.size()); assertEquals("approved application 1", result.get(0).getTitle()); assertEquals("approved application 2", result.get(1).getTitle()); assertEquals("open application 1", result.get(2).getTitle()); assertEquals("open application 2", result.get(3).getTitle()); }
@Test public void populateInProgress() { DashboardInProgressRowResource inProgress = new DashboardApplicationInProgressResourceBuilder() .withTitle("Title") .withEndDate(TOMORROW) .withDaysLeft(1) .withApplicationProgress(99) .withAssignedToInterview(FALSE) .withApplicationId(6L) .withLeadApplicant(TRUE) .withApplicationState(APPROVED) .build(); List<DashboardInProgressRowResource> dashboardApplicationInProgressResources = singletonList(inProgress); setupDashboard(emptyList(), emptyList(), dashboardApplicationInProgressResources, emptyList()); ApplicantDashboardViewModel viewModel = populator.populate(USER_ID); assertEquals(1, viewModel.getInProgress().size()); InProgressDashboardRowViewModel inProgressViewModel = viewModel.getInProgress().get(0); assertEquals(format("/application/%d", 6L), inProgressViewModel.getLinkUrl()); assertEquals(format("%d%% complete", 99), inProgressViewModel.getProgressMessage()); assertEquals("Title", inProgressViewModel.getTitle()); assertEquals(99, inProgressViewModel.getApplicationProgress()); assertEquals(1, inProgressViewModel.getDaysLeft()); assertEquals(23, inProgressViewModel.getHoursLeftBeforeSubmit()); assertEquals(FALSE, inProgressViewModel.isApplicationComplete()); assertEquals(FALSE, inProgressViewModel.isAssignedToInterview()); assertEquals(FALSE, inProgressViewModel.isClosingToday()); assertEquals(TRUE, inProgressViewModel.isLeadApplicant()); assertEquals(FALSE, inProgressViewModel.isSubmitted()); assertEquals(TRUE, inProgressViewModel.isWithin24Hours()); }
@Test public void testSortForInProgress() { DashboardInProgressRowResource endsYesterday = new DashboardApplicationInProgressResourceBuilder() .withEndDate(YESTERDAY) .withTitle("ends in past") .build(); DashboardInProgressRowResource startedOneMonthAgoAndEndsToday = new DashboardApplicationInProgressResourceBuilder() .withStartDate(ONE_MONTH_AGO.toLocalDate()) .withEndDate(TODAY) .withTitle("ends today + started 1 year ago") .build(); DashboardInProgressRowResource startedOneWeekAgoAndEndsToday = new DashboardApplicationInProgressResourceBuilder() .withStartDate(ONE_WEEK_AGO.toLocalDate()) .withEndDate(TODAY) .withTitle("ends today + started 1 week ago") .build(); DashboardInProgressRowResource startedTodayAndEndsToday = new DashboardApplicationInProgressResourceBuilder() .withStartDate(TODAY.toLocalDate()) .withEndDate(TODAY) .withTitle("ends today + started today") .build(); DashboardInProgressRowResource endsTomorrow = new DashboardApplicationInProgressResourceBuilder() .withEndDate(TOMORROW) .withTitle("ends in future") .build(); List<DashboardInProgressRowResource> inProgress = asList(endsYesterday, startedOneMonthAgoAndEndsToday, startedOneWeekAgoAndEndsToday, startedTodayAndEndsToday, endsTomorrow); setupDashboard(emptyList(), emptyList(), inProgress, emptyList()); ApplicantDashboardViewModel viewModel = populator.populate(USER_ID); List<InProgressDashboardRowViewModel> result = viewModel.getInProgress(); assertEquals(5, result.size()); assertEquals("ends in past", result.get(0).getTitle()); assertEquals("ends today + started today", result.get(1).getTitle()); assertEquals("ends today + started 1 week ago", result.get(2).getTitle()); assertEquals("ends today + started 1 year ago", result.get(3).getTitle()); assertEquals("ends in future", result.get(4).getTitle()); }
@Test public void populatePrevious() { DashboardPreviousRowResource previous = new DashboardPreviousApplicationResourceBuilder() .withTitle("Title") .withApplicationId(7L) .withApplicationProgress(50) .withApplicationState(OPENED) .withAssignedToInterview(TRUE) .withAssignedToMe(TRUE) .withDaysLeft(0) .withEndDate(YESTERDAY) .withLeadApplicant(FALSE) .build(); List<DashboardPreviousRowResource> dashboardPreviousApplicationResources = singletonList(previous); setupDashboard(emptyList(), emptyList(), emptyList(), dashboardPreviousApplicationResources); ApplicantDashboardViewModel viewModel = populator.populate(USER_ID); assertEquals(1, viewModel.getPrevious().size()); PreviousDashboardRowViewModel previousViewModel = viewModel.getPrevious().get(0); assertEquals(format("/application/%d/summary", 7L), previousViewModel.getLinkUrl()); assertEquals("Title", previousViewModel.getTitle()); assertEquals(FALSE, previousViewModel.isApproved()); assertEquals(TRUE, previousViewModel.isCreatedOrOpen()); assertEquals(FALSE, previousViewModel.isInformedIneligible()); assertEquals(FALSE, previousViewModel.isRejected()); }
@Test public void testSortForPrevious() { DashboardPreviousRowResource startsYesterday = new DashboardPreviousApplicationResourceBuilder() .withStartDate(YESTERDAY.toLocalDate()) .withTitle("starts in past") .build(); DashboardPreviousRowResource startsToday = new DashboardPreviousApplicationResourceBuilder() .withStartDate(TODAY.toLocalDate()) .withTitle("starts today") .build(); DashboardPreviousRowResource startsTomorrow = new DashboardPreviousApplicationResourceBuilder() .withStartDate(TOMORROW.toLocalDate()) .withTitle("starts in future") .build(); List<DashboardPreviousRowResource> previous = asList(startsYesterday, startsToday, startsTomorrow); setupDashboard(emptyList(), emptyList(), emptyList(), previous); ApplicantDashboardViewModel viewModel = populator.populate(USER_ID); List<PreviousDashboardRowViewModel> result = viewModel.getPrevious(); assertEquals(3, result.size()); assertEquals("starts in future", result.get(0).getTitle()); assertEquals("starts today", result.get(1).getTitle()); assertEquals("starts in past", result.get(2).getTitle()); } |
SiteTermsController { @PreAuthorize("permitAll") @GetMapping("terms-and-conditions") public String termsAndConditions() { SiteTermsAndConditionsResource siteTermsAndConditions = termsAndConditionsRestService .getLatestSiteTermsAndConditions().getSuccess(); return format("content/%s", siteTermsAndConditions.getTemplate()); } @PreAuthorize("permitAll") @GetMapping("terms-and-conditions") String termsAndConditions(); @GetMapping("new-terms-and-conditions") String newTermsAndConditions(@ModelAttribute(name = "form") NewSiteTermsAndConditionsForm form); @PostMapping("new-terms-and-conditions") String agreeNewTermsAndConditions(HttpServletRequest request,
HttpServletResponse response,
UserResource loggedInUser,
@Valid @ModelAttribute(name = "form") NewSiteTermsAndConditionsForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
ValidationHandler validationHandler); } | @Test public void termsAndConditions() throws Exception { SiteTermsAndConditionsResource siteTermsAndConditionsResource = newSiteTermsAndConditionsResource() .withTemplate("test-terms-and-conditions") .build(); when(termsAndConditionsRestService.getLatestSiteTermsAndConditions()).thenReturn( restSuccess(siteTermsAndConditionsResource)); mockMvc.perform(get("/info/terms-and-conditions")) .andExpect(status().isOk()) .andExpect(view().name("content/test-terms-and-conditions")); } |
SiteTermsController { @GetMapping("new-terms-and-conditions") public String newTermsAndConditions(@ModelAttribute(name = "form") NewSiteTermsAndConditionsForm form) { return "content/new-terms-and-conditions"; } @PreAuthorize("permitAll") @GetMapping("terms-and-conditions") String termsAndConditions(); @GetMapping("new-terms-and-conditions") String newTermsAndConditions(@ModelAttribute(name = "form") NewSiteTermsAndConditionsForm form); @PostMapping("new-terms-and-conditions") String agreeNewTermsAndConditions(HttpServletRequest request,
HttpServletResponse response,
UserResource loggedInUser,
@Valid @ModelAttribute(name = "form") NewSiteTermsAndConditionsForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
ValidationHandler validationHandler); } | @Test public void newTermsAndConditions() throws Exception { NewSiteTermsAndConditionsForm expectedForm = new NewSiteTermsAndConditionsForm(); mockMvc.perform(get("/info/new-terms-and-conditions")) .andExpect(status().isOk()) .andExpect(model().attribute("form", expectedForm)) .andExpect(view().name("content/new-terms-and-conditions")); } |
SiteTermsController { @PostMapping("new-terms-and-conditions") public String agreeNewTermsAndConditions(HttpServletRequest request, HttpServletResponse response, UserResource loggedInUser, @Valid @ModelAttribute(name = "form") NewSiteTermsAndConditionsForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler) { Supplier<String> failureView = () -> newTermsAndConditions(form); return validationHandler.failNowOrSucceedWith(failureView, () -> { RestResult<Void> updateResult = userRestService.agreeNewSiteTermsAndConditions(loggedInUser.getId()); return validationHandler.addAnyErrors(updateResult, fieldErrorsToFieldErrors(), asGlobalErrors()) .failNowOrSucceedWith(failureView, redirectHandler(request, response)); }); } @PreAuthorize("permitAll") @GetMapping("terms-and-conditions") String termsAndConditions(); @GetMapping("new-terms-and-conditions") String newTermsAndConditions(@ModelAttribute(name = "form") NewSiteTermsAndConditionsForm form); @PostMapping("new-terms-and-conditions") String agreeNewTermsAndConditions(HttpServletRequest request,
HttpServletResponse response,
UserResource loggedInUser,
@Valid @ModelAttribute(name = "form") NewSiteTermsAndConditionsForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
ValidationHandler validationHandler); } | @Test public void agreeNewTermsAndConditions() throws Exception { long userId = 1L; String expectedRedirectUrl = "/application/99/summary"; when(userRestService.agreeNewSiteTermsAndConditions(userId)).thenReturn(restSuccess()); when(cookieUtil.getCookieValue(isA(HttpServletRequest.class), eq("savedRequestUrl"))) .thenReturn(expectedRedirectUrl); mockMvc.perform(post("/info/new-terms-and-conditions") .param("agree", "true")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl("/application/99/summary")); InOrder inOrder = inOrder(cookieUtil, userRestService); inOrder.verify(userRestService).agreeNewSiteTermsAndConditions(userId); inOrder.verify(cookieUtil).getCookieValue(isA(HttpServletRequest.class), eq("savedRequestUrl")); inOrder.verify(cookieUtil).removeCookie(isA(HttpServletResponse.class), eq("savedRequestUrl")); inOrder.verifyNoMoreInteractions(); } |
StaticContentController { @GetMapping("contact") public String contact() { return "content/contact"; } @GetMapping("contact") String contact(); @GetMapping("cookies") String cookies(); @GetMapping("accessibility") String accessibility(); } | @Test public void contact() throws Exception { mockMvc.perform(get("/info/contact")) .andExpect(status().isOk()) .andExpect(view().name("content/contact")); } |
StaticContentController { @GetMapping("cookies") public String cookies() { return "content/cookies"; } @GetMapping("contact") String contact(); @GetMapping("cookies") String cookies(); @GetMapping("accessibility") String accessibility(); } | @Test public void cookies() throws Exception { mockMvc.perform(get("/info/cookies")) .andExpect(status().isOk()) .andExpect(view().name("content/cookies")); } |
QuestionServiceImpl extends BaseTransactionalService implements QuestionService { @Override public ServiceResult<List<QuestionResource>> getQuestionsByAssessmentId(Long assessmentId) { return find(getAssessment(assessmentId)).andOnSuccess(assessment -> sectionService.getByCompetitionIdVisibleForAssessment( applicationRepository.findById(assessment.getParticipant().getApplicationId()).get().getCompetition().getId()) .andOnSuccessReturn(sections -> sections.stream().map(sectionMapper::mapToDomain) .flatMap(section -> section.getQuestions().stream()).map(questionMapper::mapToResource) .collect(toList()))); } @Override ServiceResult<QuestionResource> getQuestionById(final Long id); @Override @Cacheable(cacheNames="questionsByCompetition", key = "T(java.lang.String).format('questionsByCompetition:%d', #competitionId)", unless = "!T(org.innovateuk.ifs.cache.CacheHelper).cacheResultIfCompetitionIsOpen(#result)") ServiceResult<List<QuestionResource>> findByCompetition(final Long competitionId); @Override ServiceResult<QuestionResource> getNextQuestion(final Long questionId); @Override ServiceResult<QuestionResource> getPreviousQuestionBySection(final Long sectionId); @Override ServiceResult<QuestionResource> getNextQuestionBySection(final Long sectionId); @Override ServiceResult<QuestionResource> getPreviousQuestion(final Long questionId); @Override ServiceResult<Question> getQuestionByCompetitionIdAndFormInputType(Long competitionId, FormInputType formInputType); @Override ServiceResult<QuestionResource> getQuestionByCompetitionIdAndQuestionSetupType(final long competitionId,
final QuestionSetupType questionSetupType); @Override ServiceResult<QuestionResource> getQuestionResourceByCompetitionIdAndFormInputType(Long competitionId, FormInputType formInpuType); @Override ServiceResult<List<QuestionResource>> getQuestionsBySectionIdAndType(
Long sectionId, QuestionType type); @Override @Transactional ServiceResult<QuestionResource> save(QuestionResource questionResource); @Override ServiceResult<List<QuestionResource>> getQuestionsByAssessmentId(Long assessmentId); @Override ServiceResult<QuestionResource> getQuestionByIdAndAssessmentId(Long questionId, Long assessmentId); } | @Test public void getQuestionsByAssessmentId() { Long assessmentId = 1L; Long competitionId = 2L; Competition competition = newCompetition() .with(id(competitionId)) .build(); Application application = newApplication() .withCompetition(competition) .build(); ProcessRole processRole = newProcessRole() .withApplication(application) .build(); Assessment assessment = newAssessment() .with(id(assessmentId)) .withParticipant(processRole) .build(); List<Question> questionsForSection1 = newQuestion().build(2); List<QuestionResource> questionResourcesForSection1 = newQuestionResource().build(2); List<Question> questionsForSection2 = newQuestion().build(2); List<QuestionResource> questionResourcesForSection2 = newQuestionResource().build(2); List<Section> sections = newSection() .withQuestions(questionsForSection1, questionsForSection2) .withDisplayInAssessmentApplicationSummary(true) .build(2); List<SectionResource> sectionsResources = newSectionResource().build(2); when(applicationRepositoryMock.findById(application.getId())).thenReturn(Optional.of(application)); when(assessmentRepositoryMock.findById(assessmentId)).thenReturn(Optional.of(assessment)); when(sectionService.getByCompetitionIdVisibleForAssessment(competitionId)).thenReturn(serviceSuccess(sectionsResources)); when(sectionMapperMock.mapToDomain(same(sectionsResources.get(0)))).thenReturn(sections.get(0)); when(sectionMapperMock.mapToDomain(same(sectionsResources.get(1)))).thenReturn(sections.get(1)); when(questionMapperMock.mapToResource(same(questionsForSection1.get(0)))).thenReturn(questionResourcesForSection1.get(0)); when(questionMapperMock.mapToResource(same(questionsForSection1.get(1)))).thenReturn(questionResourcesForSection1.get(1)); when(questionMapperMock.mapToResource(same(questionsForSection2.get(0)))).thenReturn(questionResourcesForSection2.get(0)); when(questionMapperMock.mapToResource(same(questionsForSection2.get(1)))).thenReturn(questionResourcesForSection2.get(1)); ServiceResult<List<QuestionResource>> result = questionService.getQuestionsByAssessmentId(assessmentId); List<QuestionResource> expectedQuestions = concat(questionResourcesForSection1.stream(), questionResourcesForSection2.stream()).collect(toList()); assertTrue(result.isSuccess()); assertEquals(expectedQuestions, result.getSuccess()); } |
StaticContentController { @GetMapping("accessibility") public String accessibility() { return "content/accessibility"; } @GetMapping("contact") String contact(); @GetMapping("cookies") String cookies(); @GetMapping("accessibility") String accessibility(); } | @Test public void accessibility() throws Exception { mockMvc.perform(get("/info/accessibility")) .andExpect(status().isOk()) .andExpect(view().name("content/accessibility")); } |
ExternalUserRegistrationController { @GetMapping("/{inviteHash}/register") public String yourDetails(Model model, @PathVariable("inviteHash") String inviteHash, @ModelAttribute(name = FORM_ATTR_NAME, binding = false) RegistrationForm form, UserResource loggedInUser) { RoleInviteResource invite = inviteUserRestService.getInvite(inviteHash).getSuccess(); form.setEmail(invite.getEmail()); return doViewYourDetails(model, invite, loggedInUser); } @GetMapping("/{inviteHash}/register") String yourDetails(Model model,
@PathVariable("inviteHash") String inviteHash,
@ModelAttribute(name = FORM_ATTR_NAME, binding = false) RegistrationForm form,
UserResource loggedInUser); @PostMapping("/{inviteHash}/register") String submitYourDetails(Model model,
@PathVariable("inviteHash") String inviteHash,
@Validated({Default.class, PhoneNumberValidationGroup.class, TermsValidationGroup.class}) @ModelAttribute("form") RegistrationForm registrationForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
UserResource loggedInUser); @GetMapping(value = "/{inviteHash}/register/account-created") String accountCreated(@PathVariable("inviteHash") String inviteHash, UserResource loggedInUser); @PostMapping(value = "/{inviteHash}/register", params = FORM_ACTION_PARAMETER) String addressFormAction(Model model,
@ModelAttribute(FORM_ATTR_NAME) RegistrationForm registrationForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable("inviteHash") String inviteHash,
UserResource user); } | @Test public void testYourDetails() throws Exception { setLoggedInUser(null); when(inviteUserRestService.getInvite("hash")).thenReturn(restSuccess(newRoleInviteResource() .withRole(Role.KNOWLEDGE_TRANSFER_ADVISER) .withEmail("[email protected]") .build())); MvcResult result = mockMvc.perform(get(URL_PREFIX + "/hash/register")) .andExpect(status().isOk()) .andExpect(view().name("registration/register")) .andReturn(); RegistrationForm form = (RegistrationForm) result.getModelAndView().getModel().get("form"); assertEquals(form.getEmail(), "[email protected]"); RegistrationViewModel viewModel = (RegistrationViewModel) result.getModelAndView().getModel().get("model"); assertTrue(viewModel.isPhoneRequired()); assertTrue(viewModel.isTermsRequired()); assertTrue(viewModel.isAddressRequired()); } |
ExternalUserRegistrationController { @PostMapping("/{inviteHash}/register") public String submitYourDetails(Model model, @PathVariable("inviteHash") String inviteHash, @Validated({Default.class, PhoneNumberValidationGroup.class, TermsValidationGroup.class}) @ModelAttribute("form") RegistrationForm registrationForm, BindingResult bindingResult, ValidationHandler validationHandler, UserResource loggedInUser) { RoleInviteResource invite = inviteUserRestService.getInvite(inviteHash).getSuccess(); Supplier<String> failureView = () -> doViewYourDetails(model, invite, loggedInUser); if(loggedInUser != null){ return failureView.get(); } else { return validationHandler.failNowOrSucceedWith(failureView, () -> { RestResult<UserResource> result = userRestService.createUser(registrationForm.constructUserCreationResource() .withInviteHash(inviteHash) .withRole(invite.getRole()) .build()); result.getErrors().forEach(error -> { if (StringUtils.hasText(error.getFieldName())) { bindingResult.rejectValue(error.getFieldName(), "registration." + error.getErrorKey()); } else { bindingResult.reject("registration." + error.getErrorKey()); } }); return validationHandler. failNowOrSucceedWith(failureView, () -> format("redirect:/registration/%s/register/account-created", inviteHash)); }); } } @GetMapping("/{inviteHash}/register") String yourDetails(Model model,
@PathVariable("inviteHash") String inviteHash,
@ModelAttribute(name = FORM_ATTR_NAME, binding = false) RegistrationForm form,
UserResource loggedInUser); @PostMapping("/{inviteHash}/register") String submitYourDetails(Model model,
@PathVariable("inviteHash") String inviteHash,
@Validated({Default.class, PhoneNumberValidationGroup.class, TermsValidationGroup.class}) @ModelAttribute("form") RegistrationForm registrationForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
UserResource loggedInUser); @GetMapping(value = "/{inviteHash}/register/account-created") String accountCreated(@PathVariable("inviteHash") String inviteHash, UserResource loggedInUser); @PostMapping(value = "/{inviteHash}/register", params = FORM_ACTION_PARAMETER) String addressFormAction(Model model,
@ModelAttribute(FORM_ATTR_NAME) RegistrationForm registrationForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable("inviteHash") String inviteHash,
UserResource user); } | @Test public void testSubmitYourDetails() throws Exception { setLoggedInUser(null); when(inviteUserRestService.getInvite("hash")).thenReturn(restSuccess(newRoleInviteResource() .withRole(Role.KNOWLEDGE_TRANSFER_ADVISER) .withEmail("[email protected]") .build())); RegistrationForm registrationForm = new RegistrationForm(); registrationForm.setEmail("[email protected]"); registrationForm.setFirstName("Bob"); registrationForm.setLastName("Person"); registrationForm.setPassword("password"); registrationForm.setPhoneNumber("123123123123"); registrationForm.setTermsAndConditions("1"); when(userRestService.createUser(refEq(registrationForm.constructUserCreationResource() .withInviteHash("hash") .withRole(Role.KNOWLEDGE_TRANSFER_ADVISER) .build()))) .thenReturn(restSuccess(new UserResource())); mockMvc.perform(post(URL_PREFIX + "/hash/register") .contentType(MediaType.APPLICATION_FORM_URLENCODED) .param("firstName", registrationForm.getFirstName()) .param("lastName", registrationForm.getLastName()) .param("password", registrationForm.getPassword()) .param("email", registrationForm.getEmail()) .param("phoneNumber", registrationForm.getPhoneNumber()) .param("termsAndConditions", registrationForm.getTermsAndConditions())) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl("/registration/hash/register/account-created")); } |
ExternalUserRegistrationController { @GetMapping(value = "/{inviteHash}/register/account-created") public String accountCreated(@PathVariable("inviteHash") String inviteHash, UserResource loggedInUser) { boolean userIsLoggedIn = loggedInUser != null; if (userIsLoggedIn) { return "redirect:/"; } return inviteUserRestService.checkExistingUser(inviteHash).andOnSuccessReturn(userExists -> { if (!userExists) { return format("redirect:/registration/%s/register", inviteHash); } else { return "registration/external-account-created"; } }).getSuccess(); } @GetMapping("/{inviteHash}/register") String yourDetails(Model model,
@PathVariable("inviteHash") String inviteHash,
@ModelAttribute(name = FORM_ATTR_NAME, binding = false) RegistrationForm form,
UserResource loggedInUser); @PostMapping("/{inviteHash}/register") String submitYourDetails(Model model,
@PathVariable("inviteHash") String inviteHash,
@Validated({Default.class, PhoneNumberValidationGroup.class, TermsValidationGroup.class}) @ModelAttribute("form") RegistrationForm registrationForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
UserResource loggedInUser); @GetMapping(value = "/{inviteHash}/register/account-created") String accountCreated(@PathVariable("inviteHash") String inviteHash, UserResource loggedInUser); @PostMapping(value = "/{inviteHash}/register", params = FORM_ACTION_PARAMETER) String addressFormAction(Model model,
@ModelAttribute(FORM_ATTR_NAME) RegistrationForm registrationForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable("inviteHash") String inviteHash,
UserResource user); } | @Test public void testAccountCreated() throws Exception { setLoggedInUser(null); when(inviteUserRestService.checkExistingUser("hash")).thenReturn(RestResult.restSuccess(true)); mockMvc.perform(get(URL_PREFIX + "/hash/register/account-created")) .andExpect(status().isOk()) .andExpect(view().name("registration/external-account-created")); } |
RegistrationController { private ServiceResult<UserResource> createUser(RegistrationForm registrationForm, Long organisationId, Long competitionId) { return userRestService.createUser( registrationForm.constructUserCreationResource() .withOrganisationId(organisationId) .withCompetitionId(competitionId) .withRole(Role.APPLICANT) .build()) .toServiceResult(); } void setValidator(Validator validator); @GetMapping("/success") String registrationSuccessful(Model model,
@RequestHeader(value = "referer", required = false) final String referer,
final HttpServletRequest request, HttpServletResponse response); @GetMapping("/verified") String verificationSuccessful(final HttpServletRequest request, final HttpServletResponse response); @GetMapping("/verify-email/{hash}") String verifyEmailAddress(@PathVariable("hash") final String hash, final HttpServletResponse response); @GetMapping("/register") String registerForm(@ModelAttribute("form") RegistrationForm registrationForm,
Model model,
UserResource user,
HttpServletRequest request,
HttpServletResponse response); @PostMapping("/register") String registerFormSubmit(@Validated({Default.class, PhoneNumberValidationGroup.class, TermsValidationGroup.class}) @ModelAttribute("form") RegistrationForm registrationForm,
BindingResult bindingResult,
HttpServletResponse response,
UserResource user,
HttpServletRequest request,
Model model); @GetMapping("/duplicate-project-organisation") String displayErrorPage(HttpServletRequest request, Model model); @GetMapping("/resend-email-verification") String resendEmailVerification(final ResendEmailVerificationForm resendEmailVerificationForm, final Model model); @PostMapping("/resend-email-verification") String resendEmailVerification(@Valid final ResendEmailVerificationForm resendEmailVerificationForm, final BindingResult bindingResult, final Model model); static final String BASE_URL; } | @Test public void tooWeakPasswordSizeShouldReturnError() throws Exception { logoutCurrentUser(); OrganisationResource organisation = newOrganisationResource().withId(1L).withName("Organisation 1").build(); when(organisationRestService.getOrganisationByIdForAnonymousUserFlow(1L)).thenReturn(restSuccess(organisation)); String testEmailAddress = "[email protected]"; when(userService.findUserByEmail(anyString())).thenReturn(Optional.empty()); Error error = Error.fieldError("password", "INVALID_PASSWORD", BAD_REQUEST.getReasonPhrase()); when(userRestService.createUser(any(UserCreationResource.class))).thenReturn(restFailure(error)); mockMvc.perform(post("/registration/register") .contentType(MediaType.APPLICATION_FORM_URLENCODED) .cookie(organisationCookie) .param("email", testEmailAddress) .param("title", "Mr") .param("firstName", "Adam") .param("lastName", "Taylor") .param("phoneNumber", "012345678") .param("termsAndConditions", "1") .param("password", "Password123") ) .andExpect(status().is2xxSuccessful()) .andExpect(view().name("registration/register")) .andExpect(model().attributeHasFieldErrors("form", "password")); }
@Test public void validRegisterPost() throws Exception { OrganisationResource organisation = newOrganisationResource().withId(1L).withName("Organisation 1").build(); when(registrationCookieService.getInviteHashCookieValue(any(HttpServletRequest.class))).thenReturn(Optional.empty()); UserCreationResource userResource = anUserCreationResource() .withPassword("password123") .withFirstName("firstName") .withLastName("lastName") .withPhoneNumber("0123456789") .withEmail("[email protected]") .withRole(Role.APPLICANT) .withOrganisationId(1L) .withCompetitionId(1L) .withAgreedTerms(true) .build(); when(organisationRestService.getOrganisationByIdForAnonymousUserFlow(1L)).thenReturn(restSuccess(organisation)); when(userRestService.createUser(refEq(userResource))).thenReturn(restSuccess(new UserResource())); when(userService.findUserByEmail("[email protected]")).thenReturn(Optional.empty()); mockMvc.perform(post("/registration/register") .contentType(MediaType.APPLICATION_FORM_URLENCODED) .cookie(organisationCookie) .param("email", userResource.getEmail()) .param("password", userResource.getPassword()) .param("firstName", userResource.getFirstName()) .param("lastName", userResource.getLastName()) .param("phoneNumber", userResource.getPhoneNumber()) .param("termsAndConditions", "1") ) .andExpect(status().is3xxRedirection()) .andExpect(view().name("redirect:/registration/success")); }
@Test public void errorsReturnedInEnvelopeAreAddedToTheModel() throws Exception { OrganisationResource organisation = newOrganisationResource().withId(1L).withName("Organisation 1").build(); UserCreationResource userResource = anUserCreationResource() .withPassword("password") .withFirstName("firstName") .withLastName("lastName") .withPhoneNumber("0123456789") .withEmail("[email protected]") .withAllowMarketingEmails(true) .build(); Error error = new Error("errorname", BAD_REQUEST); when(organisationRestService.getOrganisationByIdForAnonymousUserFlow(1L)).thenReturn(restSuccess(organisation)); when(userRestService.createUser(refEq(userResource))).thenReturn(restSuccess(new UserResource())); mockMvc.perform(post("/registration/register") .contentType(MediaType.APPLICATION_FORM_URLENCODED) .cookie(organisationCookie) .param("email", userResource.getEmail()) .param("password", userResource.getPassword()) .param("firstName", userResource.getFirstName()) .param("lastName", userResource.getLastName()) .param("phoneNumber", userResource.getPhoneNumber()) .param("termsAndConditions", "1") ) .andExpect(model().hasErrors()); } |
RegistrationController { @GetMapping("/resend-email-verification") public String resendEmailVerification(final ResendEmailVerificationForm resendEmailVerificationForm, final Model model) { model.addAttribute("resendEmailVerificationForm", resendEmailVerificationForm); return "registration/resend-email-verification"; } void setValidator(Validator validator); @GetMapping("/success") String registrationSuccessful(Model model,
@RequestHeader(value = "referer", required = false) final String referer,
final HttpServletRequest request, HttpServletResponse response); @GetMapping("/verified") String verificationSuccessful(final HttpServletRequest request, final HttpServletResponse response); @GetMapping("/verify-email/{hash}") String verifyEmailAddress(@PathVariable("hash") final String hash, final HttpServletResponse response); @GetMapping("/register") String registerForm(@ModelAttribute("form") RegistrationForm registrationForm,
Model model,
UserResource user,
HttpServletRequest request,
HttpServletResponse response); @PostMapping("/register") String registerFormSubmit(@Validated({Default.class, PhoneNumberValidationGroup.class, TermsValidationGroup.class}) @ModelAttribute("form") RegistrationForm registrationForm,
BindingResult bindingResult,
HttpServletResponse response,
UserResource user,
HttpServletRequest request,
Model model); @GetMapping("/duplicate-project-organisation") String displayErrorPage(HttpServletRequest request, Model model); @GetMapping("/resend-email-verification") String resendEmailVerification(final ResendEmailVerificationForm resendEmailVerificationForm, final Model model); @PostMapping("/resend-email-verification") String resendEmailVerification(@Valid final ResendEmailVerificationForm resendEmailVerificationForm, final BindingResult bindingResult, final Model model); static final String BASE_URL; } | @Test public void resendEmailVerification() throws Exception { mockMvc.perform(get("/registration/resend-email-verification")) .andExpect(status().isOk()) .andExpect(view().name("registration/resend-email-verification")); } |
AcceptApplicationKtaInviteController extends AbstractAcceptInviteController { @GetMapping("/kta/accept-invite/{hash}") @SecuredBySpring(value = "READ", description = "All users can view the invite to join an application.") @PreAuthorize("permitAll") public String inviteEntryPage( @PathVariable("hash") final String hash, UserResource loggedInUser, HttpServletResponse response, Model model) { RestResult<ApplicationKtaInviteResource> invite = ktaInviteRestService.getKtaInviteByHash(hash); if (invite.isSuccess()) { if (!InviteStatus.SENT.equals(invite.getSuccess().getStatus())) { return alreadyAcceptedView(response); } if (loggedInAsNonKtaInviteUser(invite.getSuccess(), loggedInUser)) { return LOGGED_IN_WITH_ANOTHER_USER_VIEW; } model.addAttribute("model", acceptRejectApplicationKtaInviteModelPopulator.populateModel(invite.getSuccess())); return "registration/accept-invite-kta-user"; } else { return URL_HASH_INVALID_TEMPLATE; } } @GetMapping("/kta/accept-invite/{hash}") @SecuredBySpring(value = "READ", description = "All users can view the invite to join an application.") @PreAuthorize("permitAll") String inviteEntryPage(
@PathVariable("hash") final String hash,
UserResource loggedInUser,
HttpServletResponse response,
Model model); @GetMapping("/kta/accept-invite/{hash}/accept") @PreAuthorize("hasAuthority('knowledge_transfer_adviser')") @SecuredBySpring(value = "ACCEPT", description = "KTA users can accept invite to join an application.") String acceptKtaPage(
@PathVariable("hash") final String hash,
UserResource loggedInUser,
HttpServletResponse response); } | @Test public void inviteEntryPage() throws Exception { String email = "[email protected]"; String hash = "hash123"; UserResource ktaUser = newUserResource().withRoleGlobal(KNOWLEDGE_TRANSFER_ADVISER).withEmail(email).build(); ApplicationKtaInviteResource applicationKtaInviteResource = newApplicationKtaInviteResource().withEmail(email).withStatus(SENT).build(); setLoggedInUser(ktaUser); when(ktaInviteRestService.getKtaInviteByHash(hash)).thenReturn(restSuccess(applicationKtaInviteResource)); mockMvc.perform(get("/kta/accept-invite/{hash}", hash)) .andExpect(status().isOk()) .andExpect(view().name("registration/accept-invite-kta-user")) .andReturn(); } |
AcceptApplicationKtaInviteController extends AbstractAcceptInviteController { @GetMapping("/kta/accept-invite/{hash}/accept") @PreAuthorize("hasAuthority('knowledge_transfer_adviser')") @SecuredBySpring(value = "ACCEPT", description = "KTA users can accept invite to join an application.") public String acceptKtaPage( @PathVariable("hash") final String hash, UserResource loggedInUser, HttpServletResponse response) { RestResult<ApplicationKtaInviteResource> invite = ktaInviteRestService.getKtaInviteByHash(hash); if (invite.isSuccess()) { if (!InviteStatus.SENT.equals(invite.getSuccess().getStatus())) { return alreadyAcceptedView(response); } if (loggedInAsNonKtaInviteUser(invite.getSuccess(), loggedInUser)) { return LOGGED_IN_WITH_ANOTHER_USER_VIEW; } ktaInviteRestService.acceptInvite(hash).getSuccess(); return "redirect:/"; } else { return URL_HASH_INVALID_TEMPLATE; } } @GetMapping("/kta/accept-invite/{hash}") @SecuredBySpring(value = "READ", description = "All users can view the invite to join an application.") @PreAuthorize("permitAll") String inviteEntryPage(
@PathVariable("hash") final String hash,
UserResource loggedInUser,
HttpServletResponse response,
Model model); @GetMapping("/kta/accept-invite/{hash}/accept") @PreAuthorize("hasAuthority('knowledge_transfer_adviser')") @SecuredBySpring(value = "ACCEPT", description = "KTA users can accept invite to join an application.") String acceptKtaPage(
@PathVariable("hash") final String hash,
UserResource loggedInUser,
HttpServletResponse response); } | @Test public void acceptKtaPage() throws Exception { String email = "[email protected]"; String hash = "hash123"; UserResource ktaUser = newUserResource().withRoleGlobal(KNOWLEDGE_TRANSFER_ADVISER).withEmail(email).build(); ApplicationKtaInviteResource applicationKtaInviteResource = newApplicationKtaInviteResource().withEmail(email).withStatus(SENT).build(); setLoggedInUser(ktaUser); when(ktaInviteRestService.getKtaInviteByHash(hash)).thenReturn(restSuccess(applicationKtaInviteResource)); when(ktaInviteRestService.acceptInvite(hash)).thenReturn(restSuccess()); mockMvc.perform(get("/kta/accept-invite/{hash}/accept", hash)) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl("/")); } |
QuestionServiceImpl extends BaseTransactionalService implements QuestionService { @Override public ServiceResult<Question> getQuestionByCompetitionIdAndFormInputType(Long competitionId, FormInputType formInputType) { List<FormInput> formInputs = formInputRepository.findByCompetitionIdAndTypeIn(competitionId, singletonList(formInputType)); if (!formInputs.isEmpty()) { return serviceSuccess(formInputs.get(0).getQuestion()); } else { return serviceFailure(notFoundError(Question.class, competitionId, formInputType)); } } @Override ServiceResult<QuestionResource> getQuestionById(final Long id); @Override @Cacheable(cacheNames="questionsByCompetition", key = "T(java.lang.String).format('questionsByCompetition:%d', #competitionId)", unless = "!T(org.innovateuk.ifs.cache.CacheHelper).cacheResultIfCompetitionIsOpen(#result)") ServiceResult<List<QuestionResource>> findByCompetition(final Long competitionId); @Override ServiceResult<QuestionResource> getNextQuestion(final Long questionId); @Override ServiceResult<QuestionResource> getPreviousQuestionBySection(final Long sectionId); @Override ServiceResult<QuestionResource> getNextQuestionBySection(final Long sectionId); @Override ServiceResult<QuestionResource> getPreviousQuestion(final Long questionId); @Override ServiceResult<Question> getQuestionByCompetitionIdAndFormInputType(Long competitionId, FormInputType formInputType); @Override ServiceResult<QuestionResource> getQuestionByCompetitionIdAndQuestionSetupType(final long competitionId,
final QuestionSetupType questionSetupType); @Override ServiceResult<QuestionResource> getQuestionResourceByCompetitionIdAndFormInputType(Long competitionId, FormInputType formInpuType); @Override ServiceResult<List<QuestionResource>> getQuestionsBySectionIdAndType(
Long sectionId, QuestionType type); @Override @Transactional ServiceResult<QuestionResource> save(QuestionResource questionResource); @Override ServiceResult<List<QuestionResource>> getQuestionsByAssessmentId(Long assessmentId); @Override ServiceResult<QuestionResource> getQuestionByIdAndAssessmentId(Long questionId, Long assessmentId); } | @Test public void testGetQuestionByCompetitionIdAndFormInputTypeSuccess() { long competitionId = 1L; Question question = newQuestion().build(); FormInput formInput = newFormInput(). withType(FormInputType.TEXTAREA). withQuestion(question). build(); when(formInputRepositoryMock.findByCompetitionIdAndTypeIn(competitionId, singletonList(FormInputType.TEXTAREA))). thenReturn(singletonList(formInput)); ServiceResult<Question> result = questionService.getQuestionByCompetitionIdAndFormInputType(competitionId, FormInputType.TEXTAREA); assertThat(result.isSuccess(), equalTo(true)); assertThat(result.getSuccess(), equalTo(question)); } |
AcceptRejectApplicationKtaInviteModelPopulator { public AcceptRejectApplicationKtaInviteViewModel populateModel(ApplicationKtaInviteResource invite) { return new AcceptRejectApplicationKtaInviteViewModel(invite.getApplication(), invite.getApplicationName(), invite.getCompetitionName(), invite.getLeadOrganisationName(), invite.getLeadApplicant(), invite.getHash()); } AcceptRejectApplicationKtaInviteViewModel populateModel(ApplicationKtaInviteResource invite); } | @Test public void populateModel() { long applicationId= 123L; ApplicationKtaInviteResource invite = newApplicationKtaInviteResource() .withApplication(applicationId) .withApplicationName("KTP Application") .withCompetitionName("KTP Competition") .withLeadApplicant("Steve Smith") .withLeadOrganisationName("Empire Ltd") .withHash("hash123") .withStatus(InviteStatus.SENT) .build(); AcceptRejectApplicationKtaInviteViewModel model = new AcceptRejectApplicationKtaInviteModelPopulator().populateModel(invite); assertEquals(invite.getCompetitionName(), model.getCompetitionName()); assertEquals(invite.getLeadOrganisationName(), model.getLeadOrganisationName()); assertEquals(invite.getLeadApplicant(), model.getLeadApplicantName()); assertEquals(invite.getApplicationName(), model.getApplicationName()); assertEquals(invite.getApplication(), model.getApplicationId()); assertEquals(invite.getHash(), model.getHash()); } |
AssessmentSummaryController { @GetMapping("/{assessmentId}/summary") public String getSummary(Model model, @ModelAttribute(name = FORM_ATTR_NAME, binding = false) AssessmentSummaryForm form, BindingResult bindingResult, @PathVariable("assessmentId") long assessmentId) { AssessmentResource assessment = assessmentService.getById(assessmentId); if (!bindingResult.hasErrors()) { populateFormWithExistingValues(form, assessment); } model.addAttribute("model", assessmentSummaryModelPopulator.populateModel(assessment)); return "assessment/application-summary"; } @GetMapping("/{assessmentId}/summary") String getSummary(Model model,
@ModelAttribute(name = FORM_ATTR_NAME, binding = false) AssessmentSummaryForm form,
BindingResult bindingResult,
@PathVariable("assessmentId") long assessmentId); @PostMapping("/{assessmentId}/summary") String save(Model model,
@Valid @ModelAttribute(FORM_ATTR_NAME) AssessmentSummaryForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable("assessmentId") Long assessmentId); } | @Test public void getSummary() throws Exception { long applicationId = 1L; CompetitionResource competitionResource = setupCompetitionResource(); AssessmentResource assessmentResource = setupAssessment(applicationId, competitionResource.getId()); List<QuestionResource> questionResources = setupQuestions(competitionResource.getId(), assessmentResource.getId()); AssessmentSummaryQuestionViewModel expectedReviewQuestion0ViewModel = new AssessmentSummaryQuestionViewModel( questionResources.get(0), formInputsForQuestion1, question1AssessorResponse); AssessmentSummaryQuestionViewModel expectedReviewQuestion1ViewModel = new AssessmentSummaryQuestionViewModel( questionResources.get(1), formInputsForQuestion2, question2AssessorResponse); AssessmentSummaryQuestionViewModel expectedReviewQuestion2ViewModel = new AssessmentSummaryQuestionViewModel( questionResources.get(2), formInputsForQuestion3, question3AssessorResponse); AssessmentSummaryQuestionViewModel expectedReviewQuestion3ViewModel = new AssessmentSummaryQuestionViewModel( questionResources.get(3), formInputsForQuestion4, question4AssessorResponse); AssessmentSummaryForm expectedForm = new AssessmentSummaryForm(); AssessmentSummaryViewModel expectedViewModel = new AssessmentSummaryViewModel( assessmentResource, competitionResource, asList(expectedReviewQuestion0ViewModel, expectedReviewQuestion1ViewModel, expectedReviewQuestion2ViewModel, expectedReviewQuestion3ViewModel)); when(assessorFormInputResponseRestService.getAssessmentDetails(assessmentResource.getId())).thenReturn( restSuccess(new AssessmentDetailsResource(questionResources, assessmentFormInputs, assessorResponses))); mockMvc.perform(get("/{assessmentId}/summary", assessmentResource.getId())) .andExpect(status().isOk()) .andExpect(model().attribute("form", expectedForm)) .andExpect(model().attribute("model", expectedViewModel)) .andExpect(view().name("assessment/application-summary")).andDo(MockMvcResultHandlers.print()); } |
AssessmentSummaryController { @PostMapping("/{assessmentId}/summary") public String save(Model model, @Valid @ModelAttribute(FORM_ATTR_NAME) AssessmentSummaryForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable("assessmentId") Long assessmentId) { Supplier<String> failureView = () -> getSummary(model, form, bindingResult, assessmentId); return validationHandler.failNowOrSucceedWith(failureView, () -> { ServiceResult<Void> updateResult = assessmentService.recommend(assessmentId, form.getFundingConfirmation(), form.getFeedback(), form.getComment()); return validationHandler.addAnyErrors(updateResult, fieldErrorsToFieldErrors(), asGlobalErrors()) .failNowOrSucceedWith(failureView, () -> redirectToCompetitionOfAssessment(assessmentId)); }); } @GetMapping("/{assessmentId}/summary") String getSummary(Model model,
@ModelAttribute(name = FORM_ATTR_NAME, binding = false) AssessmentSummaryForm form,
BindingResult bindingResult,
@PathVariable("assessmentId") long assessmentId); @PostMapping("/{assessmentId}/summary") String save(Model model,
@Valid @ModelAttribute(FORM_ATTR_NAME) AssessmentSummaryForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable("assessmentId") Long assessmentId); } | @Test public void save() throws Exception { CompetitionResource competitionResource = setupCompetitionResource(); AssessmentResource assessmentResource = newAssessmentResource() .withCompetition(competitionResource.getId()) .build(); String feedback = String.join(" ", nCopies(100, "feedback")); String comment = String.join(" ", nCopies(100, "comment")); when(assessmentService.getById(assessmentResource.getId())).thenReturn(assessmentResource); when(assessmentService.recommend(assessmentResource.getId(), true, feedback, comment)) .thenReturn(serviceSuccess()); mockMvc.perform(post("/{assessmentId}/summary", assessmentResource.getId()) .contentType(APPLICATION_FORM_URLENCODED) .param("fundingConfirmation", "true") .param("feedback", feedback) .param("comment", comment)) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl("/assessor/dashboard/competition/" + competitionResource.getId())); verify(assessmentService).recommend(assessmentResource.getId(), true, feedback, comment); verify(assessmentService).getById(assessmentResource.getId()); } |
UpcomingCompetitionViewModel { public boolean isKtpCompetition() { return ktpCompetition; } UpcomingCompetitionViewModel(CompetitionResource competitionResource, CompetitionAssessmentConfigResource competitionAssessmentConfigResource); long getCompetitionId(); String getCompetitionName(); void setCompetitionName(String competitionName); ZonedDateTime getAssessmentPeriodDateFrom(); void setAssessmentPeriodDateFrom(ZonedDateTime assessmentPeriodDateFrom); ZonedDateTime getAssessmentPeriodDateTo(); void setAssessmentPeriodDateTo(ZonedDateTime assessmentPeriodDateTo); ZonedDateTime getAssessorBriefingDate(); void setAssessorBriefingDate(ZonedDateTime assessorBriefingDate); BigDecimal getAssessorPay(); void setAssessorPay(BigDecimal assessorPay); boolean isKtpCompetition(); @Override boolean equals(Object o); @Override int hashCode(); } | @Test public void testNonKtpCompetition() { CompetitionResource competitionResource = CompetitionResourceBuilder.newCompetitionResource() .withFundingType(FundingType.GRANT) .build(); CompetitionAssessmentConfigResource competitionAssessmentConfigResource = CompetitionAssessmentConfigResourceBuilder .newCompetitionAssessmentConfigResource().build(); UpcomingCompetitionViewModel viewModel = new UpcomingCompetitionViewModel(competitionResource, competitionAssessmentConfigResource); assertFalse(viewModel.isKtpCompetition()); }
@Test public void testKtpCompetition() { CompetitionResource competitionResource = CompetitionResourceBuilder.newCompetitionResource() .withFundingType(FundingType.KTP) .build(); CompetitionAssessmentConfigResource competitionAssessmentConfigResource = CompetitionAssessmentConfigResourceBuilder .newCompetitionAssessmentConfigResource().build(); UpcomingCompetitionViewModel viewModel = new UpcomingCompetitionViewModel(competitionResource, competitionAssessmentConfigResource); assertTrue(viewModel.isKtpCompetition()); } |
AssessorProfileStatusViewModel { public boolean isSkillsComplete() { return skillsComplete; } AssessorProfileStatusViewModel(UserProfileStatusResource userProfileStatusResource, RoleProfileState roleProfileState); boolean isSkillsComplete(); boolean isAffiliationsComplete(); boolean isAgreementComplete(); boolean isComplete(); boolean displayBannerMessage(); String getBannerMessage(); @Override boolean equals(Object o); @Override int hashCode(); } | @Test public void isSkillsComplete() { assertFalse(nothingCompleteProfileStatus.isSkillsComplete()); assertTrue(skillsCompleteProfileStatus.isSkillsComplete()); assertFalse(affiliationsCompleteProfileStatus.isSkillsComplete()); assertFalse(agreementCompleteProfileStatus.isSkillsComplete()); assertTrue(allCompleteProfileStatus.isSkillsComplete()); } |
AssessorProfileStatusViewModel { public boolean isAffiliationsComplete() { return affiliationsComplete; } AssessorProfileStatusViewModel(UserProfileStatusResource userProfileStatusResource, RoleProfileState roleProfileState); boolean isSkillsComplete(); boolean isAffiliationsComplete(); boolean isAgreementComplete(); boolean isComplete(); boolean displayBannerMessage(); String getBannerMessage(); @Override boolean equals(Object o); @Override int hashCode(); } | @Test public void isAffiliationsComplete() { assertFalse(nothingCompleteProfileStatus.isAffiliationsComplete()); assertFalse(skillsCompleteProfileStatus.isAffiliationsComplete()); assertTrue(affiliationsCompleteProfileStatus.isAffiliationsComplete()); assertFalse(agreementCompleteProfileStatus.isAffiliationsComplete()); assertTrue(allCompleteProfileStatus.isAffiliationsComplete()); } |
AssessorProfileStatusViewModel { public boolean isAgreementComplete() { return agreementComplete; } AssessorProfileStatusViewModel(UserProfileStatusResource userProfileStatusResource, RoleProfileState roleProfileState); boolean isSkillsComplete(); boolean isAffiliationsComplete(); boolean isAgreementComplete(); boolean isComplete(); boolean displayBannerMessage(); String getBannerMessage(); @Override boolean equals(Object o); @Override int hashCode(); } | @Test public void isAgreementComplete() { assertFalse(nothingCompleteProfileStatus.isAgreementComplete()); assertFalse(skillsCompleteProfileStatus.isAgreementComplete()); assertFalse(affiliationsCompleteProfileStatus.isAgreementComplete()); assertTrue(agreementCompleteProfileStatus.isAgreementComplete()); assertTrue(allCompleteProfileStatus.isAgreementComplete()); } |
AssessorProfileStatusViewModel { public boolean isComplete() { return skillsComplete && affiliationsComplete && agreementComplete; } AssessorProfileStatusViewModel(UserProfileStatusResource userProfileStatusResource, RoleProfileState roleProfileState); boolean isSkillsComplete(); boolean isAffiliationsComplete(); boolean isAgreementComplete(); boolean isComplete(); boolean displayBannerMessage(); String getBannerMessage(); @Override boolean equals(Object o); @Override int hashCode(); } | @Test public void isComplete() { assertFalse(nothingCompleteProfileStatus.isComplete()); assertFalse(skillsCompleteProfileStatus.isComplete()); assertFalse(affiliationsCompleteProfileStatus.isComplete()); assertFalse(agreementCompleteProfileStatus.isComplete()); assertTrue(allCompleteProfileStatus.isComplete()); } |
AssessorProfileTravelController { @GetMapping public String getTravelAndSubsistence() { return "profile/travel"; } @GetMapping String getTravelAndSubsistence(); } | @Test public void getTravelAndSubsistence() throws Exception { mockMvc.perform(get("/profile/travel")) .andExpect(status().isOk()) .andExpect(view().name("profile/travel")); } |
QuestionServiceImpl extends BaseTransactionalService implements QuestionService { @Override public ServiceResult<QuestionResource> getQuestionByCompetitionIdAndQuestionSetupType(final long competitionId, final QuestionSetupType questionSetupType) { return find(questionRepository.findFirstByCompetitionIdAndQuestionSetupType(competitionId, questionSetupType), notFoundError(Question.class, competitionId, questionSetupType)).andOnSuccessReturn(questionMapper::mapToResource); } @Override ServiceResult<QuestionResource> getQuestionById(final Long id); @Override @Cacheable(cacheNames="questionsByCompetition", key = "T(java.lang.String).format('questionsByCompetition:%d', #competitionId)", unless = "!T(org.innovateuk.ifs.cache.CacheHelper).cacheResultIfCompetitionIsOpen(#result)") ServiceResult<List<QuestionResource>> findByCompetition(final Long competitionId); @Override ServiceResult<QuestionResource> getNextQuestion(final Long questionId); @Override ServiceResult<QuestionResource> getPreviousQuestionBySection(final Long sectionId); @Override ServiceResult<QuestionResource> getNextQuestionBySection(final Long sectionId); @Override ServiceResult<QuestionResource> getPreviousQuestion(final Long questionId); @Override ServiceResult<Question> getQuestionByCompetitionIdAndFormInputType(Long competitionId, FormInputType formInputType); @Override ServiceResult<QuestionResource> getQuestionByCompetitionIdAndQuestionSetupType(final long competitionId,
final QuestionSetupType questionSetupType); @Override ServiceResult<QuestionResource> getQuestionResourceByCompetitionIdAndFormInputType(Long competitionId, FormInputType formInpuType); @Override ServiceResult<List<QuestionResource>> getQuestionsBySectionIdAndType(
Long sectionId, QuestionType type); @Override @Transactional ServiceResult<QuestionResource> save(QuestionResource questionResource); @Override ServiceResult<List<QuestionResource>> getQuestionsByAssessmentId(Long assessmentId); @Override ServiceResult<QuestionResource> getQuestionByIdAndAssessmentId(Long questionId, Long assessmentId); } | @Test public void getQuestionByCompetitionIdAndQuestionSetupType() { long competitionId = 1L; Question question = newQuestion().build(); QuestionResource questionResource = newQuestionResource() .build(); when(questionRepositoryMock.findFirstByCompetitionIdAndQuestionSetupType(competitionId, APPLICATION_DETAILS)).thenReturn(question); when(questionMapperMock.mapToResource(same(question))).thenReturn(questionResource); ServiceResult<QuestionResource> result = questionService .getQuestionByCompetitionIdAndQuestionSetupType(competitionId, APPLICATION_DETAILS); assertTrue(result.isSuccess()); assertEquals(questionResource, result.getSuccess()); verify(questionRepositoryMock).findFirstByCompetitionIdAndQuestionSetupType(competitionId, APPLICATION_DETAILS); verify(questionMapperMock, only()).mapToResource(question); } |
AssessorProfileSkillsEditController { @GetMapping("/edit") public String getSkills(Model model, UserResource loggedInUser, @ModelAttribute(name = FORM_ATTR_NAME, binding = false) AssessorProfileSkillsForm form, BindingResult bindingResult) { return doViewEditSkills(model, loggedInUser, form, bindingResult); } @GetMapping String getReadonlySkills(); @GetMapping("/edit") String getSkills(Model model,
UserResource loggedInUser,
@ModelAttribute(name = FORM_ATTR_NAME, binding = false) AssessorProfileSkillsForm form,
BindingResult bindingResult); @PostMapping("/edit") String submitSkills(Model model,
UserResource loggedInUser,
@Valid @ModelAttribute(FORM_ATTR_NAME) AssessorProfileSkillsForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); } | @Test public void getSkills() throws Exception { BusinessType businessType = BUSINESS; String skillAreas = "skill1 skill2 skill3"; List<InnovationAreaResource> innovationAreaResources = setUpInnovationAreasForSector("Emerging and enabling", "Data", "Cyber Security"); UserResource userResource = setUpProfileSkills(businessType, skillAreas, innovationAreaResources); Map<String, List<String>> expectedInnovationAreas = new LinkedHashMap<>(); expectedInnovationAreas.put("Emerging and enabling", asList("Data", "Cyber Security")); AssessorProfileEditSkillsViewModel expectedModel = new AssessorProfileEditSkillsViewModel(expectedInnovationAreas); AssessorProfileSkillsForm expectedForm = new AssessorProfileSkillsForm(); expectedForm.setAssessorType(businessType); expectedForm.setSkillAreas(skillAreas); mockMvc.perform(get("/profile/skills/edit")) .andExpect(status().isOk()) .andExpect(model().attribute("model", expectedModel)) .andExpect(model().attribute("form", expectedForm)) .andExpect(view().name("profile/skills-edit")); verify(profileRestService, only()).getProfileSkills(userResource.getId()); } |
AssessorProfileSkillsEditController { @PostMapping("/edit") public String submitSkills(Model model, UserResource loggedInUser, @Valid @ModelAttribute(FORM_ATTR_NAME) AssessorProfileSkillsForm form, BindingResult bindingResult, ValidationHandler validationHandler) { Supplier<String> failureView = () -> doViewEditSkills(model, loggedInUser, form, bindingResult); return validationHandler.failNowOrSucceedWith(failureView, () -> { ProfileSkillsEditResource profileSkillsEditResource = new ProfileSkillsEditResource(); profileSkillsEditResource.setBusinessType(form.getAssessorType()); profileSkillsEditResource.setSkillsAreas(form.getSkillAreas()); ServiceResult<Void> result = profileRestService.updateProfileSkills(loggedInUser.getId(), profileSkillsEditResource).toServiceResult(); return validationHandler.addAnyErrors(result, fieldErrorsToFieldErrors(), asGlobalErrors()) .failNowOrSucceedWith(failureView, () -> "redirect:/profile/skills"); }); } @GetMapping String getReadonlySkills(); @GetMapping("/edit") String getSkills(Model model,
UserResource loggedInUser,
@ModelAttribute(name = FORM_ATTR_NAME, binding = false) AssessorProfileSkillsForm form,
BindingResult bindingResult); @PostMapping("/edit") String submitSkills(Model model,
UserResource loggedInUser,
@Valid @ModelAttribute(FORM_ATTR_NAME) AssessorProfileSkillsForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); } | @Test public void submitSkills() throws Exception { BusinessType businessType = BUSINESS; String skillAreas = String.join(" ", nCopies(100, "skill")); ProfileSkillsEditResource profileSkillsEditResource = newProfileSkillsEditResource() .withBusinessType(businessType) .withSkillsAreas(skillAreas) .build(); when(profileRestService.updateProfileSkills(1L, profileSkillsEditResource)).thenReturn(restSuccess()); mockMvc.perform(post("/profile/skills/edit") .contentType(APPLICATION_FORM_URLENCODED) .param("assessorType", businessType.name()) .param("skillAreas", skillAreas)) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl("/profile/skills")); verify(profileRestService, only()).updateProfileSkills(1L, profileSkillsEditResource); } |
AssessorProfileDeclarationEditController { @GetMapping(path = "/edit") public String getEditDeclaration(UserResource loggedInUser, @ModelAttribute(name = FORM_ATTR_NAME, binding = false) AssessorProfileDeclarationForm form, BindingResult bindingResult) { if (!bindingResult.hasErrors()) { assessorProfileDeclarationFormPopulator.populateForm(form, loggedInUser); } return doEditDeclaration(); } @GetMapping String getDeclaration(); @GetMapping(path = "/edit") String getEditDeclaration(UserResource loggedInUser,
@ModelAttribute(name = FORM_ATTR_NAME, binding = false) AssessorProfileDeclarationForm form,
BindingResult bindingResult); @PostMapping(path = "/edit") String submitDeclaration(UserResource loggedInUser,
@Valid @ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(path = "/edit", params = {"addAppointment"}) String addAppointment(@ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form); @PostMapping(path = "/edit", params = {"removeAppointment"}) String removeAppointment(@ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form,
@RequestParam(name = "removeAppointment") Integer position); @PostMapping(path = "/edit", params = {"addFamilyMemberAffiliation"}) String addFamilyMemberAffiliation(@ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form); @PostMapping(path = "/edit", params = {"removeFamilyMemberAffiliation"}) String removeFamilyMemberAffiliation(@ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form,
@RequestParam(name = "removeFamilyMemberAffiliation") Integer position); } | @Test public void getEditDeclaration() throws Exception { UserResource user = newUserResource().build(); setLoggedInUser(user); String expectedPrincipalEmployer = "Big Name Corporation"; String expectedRole = "Financial Accountant"; String expectedProfessionalAffiliations = "Professional affiliations..."; List<AssessorProfileAppointmentForm> expectedAppointments = asList( new AssessorProfileAppointmentForm("Org 1", "Pos 1"), new AssessorProfileAppointmentForm("Org 2", "Pos 2") ); String expectedFinancialInterests = "Other financial interests..."; List<AssessorProfileFamilyAffiliationForm> expectedFamilyAffiliations = asList( new AssessorProfileFamilyAffiliationForm("Relation 1", "Org 1", "Pos 1"), new AssessorProfileFamilyAffiliationForm("Relation 2", "Org 2", "Pos 2") ); String expectedFamilyFinancialInterests = "Other family financial interests..."; AffiliationResource principalEmployer = newAffiliationResource() .withAffiliationType(EMPLOYER) .withExists(TRUE) .withOrganisation(expectedPrincipalEmployer) .withPosition(expectedRole) .build(); AffiliationResource professionalAffiliations = newAffiliationResource() .withAffiliationType(PROFESSIONAL) .withExists(TRUE) .withDescription(expectedProfessionalAffiliations) .build(); List<AffiliationResource> appointments = newAffiliationResource() .withAffiliationType(PERSONAL) .withExists(TRUE) .withOrganisation("Org 1", "Org 2") .withPosition("Pos 1", "Pos 2") .build(2); AffiliationResource financialInterests = newAffiliationResource() .withAffiliationType(PERSONAL_FINANCIAL) .withExists(TRUE) .withDescription(expectedFinancialInterests) .build(); List<AffiliationResource> familyAffiliations = newAffiliationResource() .withAffiliationType(FAMILY) .withExists(TRUE) .withRelation("Relation 1", "Relation 2") .withOrganisation("Org 1", "Org 2") .withPosition("Pos 1", "Pos 2") .build(2); AffiliationResource familyFinancialInterests = newAffiliationResource() .withAffiliationType(FAMILY_FINANCIAL) .withExists(TRUE) .withDescription(expectedFamilyFinancialInterests) .build(); when(affiliationRestService.getUserAffiliations(user.getId())) .thenReturn(restSuccess(new AffiliationListResource(combineLists( combineLists( appointments, familyAffiliations ), principalEmployer, professionalAffiliations, financialInterests, familyFinancialInterests ) ))); AssessorProfileDeclarationForm expectedForm = new AssessorProfileDeclarationForm(); expectedForm.setPrincipalEmployer(expectedPrincipalEmployer); expectedForm.setRole(expectedRole); expectedForm.setProfessionalAffiliations(expectedProfessionalAffiliations); expectedForm.setHasAppointments(TRUE); expectedForm.setAppointments(expectedAppointments); expectedForm.setHasFinancialInterests(TRUE); expectedForm.setFinancialInterests(expectedFinancialInterests); expectedForm.setHasFamilyAffiliations(TRUE); expectedForm.setFamilyAffiliations(expectedFamilyAffiliations); expectedForm.setHasFamilyFinancialInterests(TRUE); expectedForm.setFamilyFinancialInterests(expectedFamilyFinancialInterests); mockMvc.perform(get("/profile/declaration/edit")) .andExpect(status().isOk()) .andExpect(model().attribute("form", expectedForm)) .andExpect(view().name("profile/declaration-of-interest-edit")); verify(affiliationRestService).getUserAffiliations(user.getId()); } |
AssessorProfileDeclarationEditController { @PostMapping(path = "/edit") public String submitDeclaration(UserResource loggedInUser, @Valid @ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form, BindingResult bindingResult, ValidationHandler validationHandler) { Supplier<String> failureView = () -> getEditDeclaration(loggedInUser, form, bindingResult); validateLists(form, bindingResult); return validationHandler.failNowOrSucceedWith(failureView, () -> { ServiceResult<Void> updateResult = affiliationRestService.updateUserAffiliations(loggedInUser.getId(), populateAffiliationsFromForm(form)).toServiceResult(); return validationHandler.addAnyErrors(updateResult, fieldErrorsToFieldErrors(), asGlobalErrors()) .failNowOrSucceedWith(failureView, () -> "redirect:/profile/declaration"); }); } @GetMapping String getDeclaration(); @GetMapping(path = "/edit") String getEditDeclaration(UserResource loggedInUser,
@ModelAttribute(name = FORM_ATTR_NAME, binding = false) AssessorProfileDeclarationForm form,
BindingResult bindingResult); @PostMapping(path = "/edit") String submitDeclaration(UserResource loggedInUser,
@Valid @ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(path = "/edit", params = {"addAppointment"}) String addAppointment(@ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form); @PostMapping(path = "/edit", params = {"removeAppointment"}) String removeAppointment(@ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form,
@RequestParam(name = "removeAppointment") Integer position); @PostMapping(path = "/edit", params = {"addFamilyMemberAffiliation"}) String addFamilyMemberAffiliation(@ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form); @PostMapping(path = "/edit", params = {"removeFamilyMemberAffiliation"}) String removeFamilyMemberAffiliation(@ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form,
@RequestParam(name = "removeFamilyMemberAffiliation") Integer position); } | @Test public void submitDeclaration() throws Exception { UserResource user = newUserResource().build(); setLoggedInUser(user); String principalEmployer = "Big Name Corporation"; String role = "Financial Accountant"; String professionalAffiliations = "Professional affiliations..."; String hasAppointments = "true"; List<String[]> appointments = asList(new String[]{"Org 1", "Pos 1"}, new String[]{"Org 2", "Pos 2"}); String hasFinancialInterests = "true"; String financialInterests = "Other financial interests..."; String hasFamilyAffiliations = "true"; List<String[]> familyAffiliations = asList(new String[]{"Relation 1", "Org 1", "Pos 1"}, new String[]{"Relation 2", "Org 2", "Pos 2"}); String hasFamilyFinancialInterests = "true"; String familyFinancialInterests = "Other family financial interests..."; String accurateAccount = "true"; AffiliationResource expectedPrincipalEmployer = newAffiliationResource() .with(id(null)) .withAffiliationType(EMPLOYER) .withExists(TRUE) .withOrganisation(principalEmployer) .withPosition(role) .build(); AffiliationResource expectedProfessionalAffiliations = newAffiliationResource() .with(id(null)) .withAffiliationType(PROFESSIONAL) .withExists(TRUE) .withDescription(professionalAffiliations) .build(); List<AffiliationResource> expectedAppointments = appointments.stream().map(appointment -> newAffiliationResource() .with(id(null)) .withAffiliationType(PERSONAL) .withExists(TRUE) .withOrganisation(appointment[0]) .withPosition(appointment[1]) .build()).collect(toList()); AffiliationResource expectedFinancialInterests = newAffiliationResource() .with(id(null)) .withAffiliationType(PERSONAL_FINANCIAL) .withExists(TRUE) .withDescription(financialInterests) .build(); List<AffiliationResource> expectedFamilyAffiliations = familyAffiliations.stream().map(familyAffiliation -> newAffiliationResource() .with(id(null)) .withAffiliationType(FAMILY) .withExists(TRUE) .withRelation(familyAffiliation[0]) .withOrganisation(familyAffiliation[1]) .withPosition(familyAffiliation[2]) .build()).collect(toList()); AffiliationResource expectedFamilyFinancialInterests = newAffiliationResource() .with(id(null)) .withAffiliationType(FAMILY_FINANCIAL) .withExists(TRUE) .withDescription(familyFinancialInterests) .build(); when(affiliationRestService.updateUserAffiliations(user.getId(), new AffiliationListResource(combineLists( combineLists(expectedAppointments, expectedFamilyAffiliations ), expectedPrincipalEmployer, expectedProfessionalAffiliations, expectedFinancialInterests, expectedFamilyFinancialInterests)))).thenReturn(restSuccess()); mockMvc.perform(post("/profile/declaration/edit") .contentType(APPLICATION_FORM_URLENCODED) .param("principalEmployer", principalEmployer) .param("role", role) .param("professionalAffiliations", professionalAffiliations) .param("hasAppointments", hasAppointments) .param("appointments[0].organisation", appointments.get(0)[0]) .param("appointments[0].position", appointments.get(0)[1]) .param("appointments[1].organisation", appointments.get(1)[0]) .param("appointments[1].position", appointments.get(1)[1]) .param("hasFinancialInterests", hasFinancialInterests) .param("financialInterests", financialInterests) .param("hasFamilyAffiliations", hasFamilyAffiliations) .param("familyAffiliations[0].relation", familyAffiliations.get(0)[0]) .param("familyAffiliations[0].organisation", familyAffiliations.get(0)[1]) .param("familyAffiliations[0].position", familyAffiliations.get(0)[2]) .param("familyAffiliations[1].relation", familyAffiliations.get(1)[0]) .param("familyAffiliations[1].organisation", familyAffiliations.get(1)[1]) .param("familyAffiliations[1].position", familyAffiliations.get(1)[2]) .param("hasFamilyFinancialInterests", hasFamilyFinancialInterests) .param("familyFinancialInterests", familyFinancialInterests) .param("accurateAccount", accurateAccount)) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl("/profile/declaration")); } |
AssessorProfileDeclarationEditController { @PostMapping(path = "/edit", params = {"addAppointment"}) public String addAppointment(@ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form) { form.getAppointments().add(new AssessorProfileAppointmentForm()); return doEditDeclaration(); } @GetMapping String getDeclaration(); @GetMapping(path = "/edit") String getEditDeclaration(UserResource loggedInUser,
@ModelAttribute(name = FORM_ATTR_NAME, binding = false) AssessorProfileDeclarationForm form,
BindingResult bindingResult); @PostMapping(path = "/edit") String submitDeclaration(UserResource loggedInUser,
@Valid @ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(path = "/edit", params = {"addAppointment"}) String addAppointment(@ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form); @PostMapping(path = "/edit", params = {"removeAppointment"}) String removeAppointment(@ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form,
@RequestParam(name = "removeAppointment") Integer position); @PostMapping(path = "/edit", params = {"addFamilyMemberAffiliation"}) String addFamilyMemberAffiliation(@ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form); @PostMapping(path = "/edit", params = {"removeFamilyMemberAffiliation"}) String removeFamilyMemberAffiliation(@ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form,
@RequestParam(name = "removeFamilyMemberAffiliation") Integer position); } | @Test public void addAppointment() throws Exception { UserResource user = newUserResource().build(); setLoggedInUser(user); String principalEmployer = "Big Name Corporation"; String role = "Financial Accountant"; String professionalAffiliations = "Professional affiliations..."; String hasAppointments = "true"; String hasFinancialInterests = "true"; String financialInterests = "Other financial interests..."; String hasFamilyAffiliations = "false"; String hasFamilyFinancialInterests = "true"; String familyFinancialInterests = "Other family financial interests..."; MvcResult result = mockMvc.perform(post("/profile/declaration/edit") .contentType(APPLICATION_FORM_URLENCODED) .param("addAppointment", "") .param("principalEmployer", principalEmployer) .param("role", role) .param("professionalAffiliations", professionalAffiliations) .param("hasAppointments", hasAppointments) .param("appointments[0].organisation", "Org") .param("appointments[0].position", "Pos") .param("hasFinancialInterests", hasFinancialInterests) .param("financialInterests", financialInterests) .param("hasFamilyAffiliations", hasFamilyAffiliations) .param("hasFamilyFinancialInterests", hasFamilyFinancialInterests) .param("familyFinancialInterests", familyFinancialInterests)) .andExpect(status().isOk()) .andExpect(model().hasNoErrors()) .andExpect(model().attributeExists("form")) .andExpect(view().name("profile/declaration-of-interest-edit")) .andReturn(); AssessorProfileDeclarationForm form = (AssessorProfileDeclarationForm) result.getModelAndView().getModel().get("form"); assertEquals(principalEmployer, form.getPrincipalEmployer()); assertEquals(role, form.getRole()); assertEquals(professionalAffiliations, form.getProfessionalAffiliations()); assertTrue(form.getHasAppointments()); assertEquals("The appointment rows should contain the existing appointment as well as a blank one", asList(new AssessorProfileAppointmentForm("Org", "Pos"), new AssessorProfileAppointmentForm()), form.getAppointments()); assertTrue(form.getHasFinancialInterests()); assertEquals(financialInterests, form.getFinancialInterests()); assertFalse(form.getHasFamilyAffiliations()); assertTrue(form.getFamilyAffiliations().isEmpty()); assertTrue(form.getHasFamilyFinancialInterests()); assertEquals(familyFinancialInterests, form.getFamilyFinancialInterests()); verifyZeroInteractions(userService); } |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.