Datasets:
Minata
/
src_fm_fc_ms_ff_method2testcases_v0

Dataset card Data Studio Files Community
1
src_fm_fc_ms_ff
stringlengths
43
86.8k
target
stringlengths
20
276k
ValidationHandlerMethodArgumentResolver implements HandlerMethodArgumentResolver { @Override public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception { ModelMap model = mavContainer.getModel(); if (!model.isEmpty()) { int lastIndex = model.size() - 1; String lastKey = new ArrayList<>(model.keySet()).get(lastIndex); if (lastKey.startsWith(BindingResult.MODEL_KEY_PREFIX)) { BindingResult bindingResult = (BindingResult) model.get(lastKey); ValidationHandler validationHandler = newBindingResultHandler(bindingResult); int secondToLastIndex = model.size() - 2; String secondToLastKey = new ArrayList<>(model.keySet()).get(secondToLastIndex); Object bindingResultTarget = model.get(secondToLastKey); if (bindingResultTarget instanceof BindingResultTarget) { validationHandler.setBindingResultTarget((BindingResultTarget) bindingResultTarget); } return validationHandler; } } throw new IllegalStateException( "A ValidationHandler argument is expected to be declared immediately after a BindingResult " + "for a model attribute to which they apply, or the model attribute itself: " + parameter.getMethod()); } @Override boolean supportsParameter(MethodParameter parameter); @Override Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory); }
@Test public void testCreateNewValidationHandler() throws Exception { ValidationHandlerMethodArgumentResolver resolver = new ValidationHandlerMethodArgumentResolver(); ModelAndViewContainer mavContainer = new ModelAndViewContainer(); mavContainer.addAttribute("some attribute", "Some value"); BeanPropertyBindingResult bindingResult = new BeanPropertyBindingResult("target", "name"); bindingResult.addError(new ObjectError("name", "An error message")); mavContainer.addAttribute(BindingResult.MODEL_KEY_PREFIX + "myBindingResult", bindingResult); ValidationHandler validationHandler = (ValidationHandler) resolver.resolveArgument(new MethodParameter(getClass().getMethod("aMethod"), -1), mavContainer, new ServletWebRequest(new MockHttpServletRequest()), null); assertTrue(validationHandler.hasErrors()); assertEquals("An error message", validationHandler.getAllErrors().get(0).getDefaultMessage()); assertNull(ReflectionTestUtils.getField(validationHandler, "bindingResultTarget")); } @Test public void testCreateNewValidationHandlerWithAutoAttachmentToBindingResultTarget() throws Exception { ValidationHandlerMethodArgumentResolver resolver = new ValidationHandlerMethodArgumentResolver(); ModelAndViewContainer mavContainer = new ModelAndViewContainer(); TestForm bindingResultForm = new TestForm(); mavContainer.addAttribute("bindingResultForm", bindingResultForm); BeanPropertyBindingResult bindingResult = new BeanPropertyBindingResult("target", "name"); bindingResult.addError(new ObjectError("name", "An error message")); mavContainer.addAttribute(BindingResult.MODEL_KEY_PREFIX + "myBindingResult", bindingResult); ValidationHandler validationHandler = (ValidationHandler) resolver.resolveArgument(new MethodParameter(getClass().getMethod("aMethod"), -1), mavContainer, new ServletWebRequest(new MockHttpServletRequest()), null); assertTrue(validationHandler.hasErrors()); assertEquals("An error message", validationHandler.getAllErrors().get(0).getDefaultMessage()); assertEquals(bindingResultForm, ReflectionTestUtils.getField(validationHandler, "bindingResultTarget")); } @Test(expected = IllegalStateException.class) public void testIllegalStateExceptionIfBindingResultNotPrecedingValidationHandler() throws Exception { ValidationHandlerMethodArgumentResolver resolver = new ValidationHandlerMethodArgumentResolver(); ModelAndViewContainer mavContainer = new ModelAndViewContainer(); mavContainer.addAttribute("some attribute", "Some value"); resolver.resolveArgument(new MethodParameter(getClass().getMethod("aMethod"), -1), mavContainer, new ServletWebRequest(new MockHttpServletRequest()), null); }
LoggedInUserMethodArgumentResolver implements HandlerMethodArgumentResolver { @Override public boolean supportsParameter(MethodParameter parameter) { if(parameter.hasParameterAnnotation(ModelAttribute.class)) { return false; } Class<?> paramType = parameter.getParameterType(); return UserResource.class.isAssignableFrom(paramType); } @Override boolean supportsParameter(MethodParameter parameter); @Override Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory); }
@Test public void supportsParameter_shouldSupportUserResource() { MethodParameter userResourceParameter = new MethodParameter(testMethod, 0); assertTrue(loggedInUserMethodArgumentResolver.supportsParameter(userResourceParameter)); } @Test public void supportsParameter_shouldNotSupportAnotherType() { MethodParameter notAUserResourceParameter = new MethodParameter(testMethod, 1); assertFalse(loggedInUserMethodArgumentResolver.supportsParameter(notAUserResourceParameter)); } @Test public void supportsParameter_shouldNotSupportModelAttributedUserResource() { MethodParameter modelAttributeResourceParameter = new MethodParameter(testMethod, 2); assertFalse(loggedInUserMethodArgumentResolver.supportsParameter(modelAttributeResourceParameter)); }
FormInputController { @GetMapping("/find-by-competition-id/{competitionId}/scope/{scope}") public RestResult<List<FormInputResource>> findByCompetitionIdAndScope(@PathVariable("competitionId") Long competitionId, @PathVariable("scope") FormInputScope scope) { return formInputService.findByCompetitionIdAndScope(competitionId, scope).toGetResponse(); } @GetMapping("/{id}") RestResult<FormInputResource> findOne(@PathVariable("id") Long id); @GetMapping("/find-by-question-id/{questionId}") RestResult<List<FormInputResource>> findByQuestionId(@PathVariable("questionId") Long questionId); @GetMapping("find-by-question-id/{questionId}/scope/{scope}") RestResult<List<FormInputResource>> findByQuestionIdAndScope(@PathVariable("questionId") Long questionId, @PathVariable("scope") FormInputScope scope); @GetMapping("/find-by-competition-id/{competitionId}") RestResult<List<FormInputResource>> findByCompetitionId(@PathVariable("competitionId") Long competitionId); @GetMapping("/find-by-competition-id/{competitionId}/scope/{scope}") RestResult<List<FormInputResource>> findByCompetitionIdAndScope(@PathVariable("competitionId") Long competitionId, @PathVariable("scope") FormInputScope scope); @DeleteMapping("/{id}") RestResult<Void> delete(@PathVariable("id") Long id); @GetMapping(value = "/file/{formInputId}", produces = "application/json") @ResponseBody ResponseEntity<Object> downloadFile(@PathVariable long formInputId); @GetMapping(value = "/file-details/{formInputId}", produces = "application/json") RestResult<FileEntryResource> findFile(@PathVariable long formInputId); }
@Test public void testFindByCompetitionIdAndScope() throws Exception { List<FormInputResource> expected = newFormInputResource() .build(2); Long competitionId = 1L; FormInputScope scope = APPLICATION; when(formInputServiceMock.findByCompetitionIdAndScope(competitionId, scope)).thenReturn(serviceSuccess(expected)); mockMvc.perform(get("/forminput/find-by-competition-id/{competitionId}/scope/{scope}", competitionId, scope)) .andExpect(status().isOk()) .andExpect(jsonPath("$", hasSize(2))) .andExpect(content().string(objectMapper.writeValueAsString(expected))); verify(formInputServiceMock, only()).findByCompetitionIdAndScope(competitionId, scope); }
LoggedInUserMethodArgumentResolver implements HandlerMethodArgumentResolver { @Override public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception { HttpServletRequest request = webRequest.getNativeRequest(HttpServletRequest.class); return userAuthenticationService.getAuthenticatedUser(request); } @Override boolean supportsParameter(MethodParameter parameter); @Override Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory); }
@Test public void resolveArgument_shouldReturnUserResource() throws Exception { MockHttpServletRequest mockRequest = new MockHttpServletRequest(); mockRequest.addParameter("uid", "123"); NativeWebRequest webRequest = new ServletWebRequest(mockRequest); MethodParameter userResourceParameter = new MethodParameter(testMethod, 0); UserResource userResource = newUserResource().withFirstName("Steve").build(); when(userAuthenticationService.getAuthenticatedUser(isA(HttpServletRequest.class))).thenReturn(userResource); UserResource loggedInUser = (UserResource) loggedInUserMethodArgumentResolver.resolveArgument(userResourceParameter, modelAndViewContainer, webRequest, webDataBinderFactory); verify(userAuthenticationService, times(1)).getAuthenticatedUser(isA(HttpServletRequest.class)); verifyNoMoreInteractions(userAuthenticationService); assertEquals("Steve", loggedInUser.getFirstName()); }
ThreadsafeModel implements Model { @Override public boolean containsAttribute(String attributeName) { return withReadLock(() -> model.containsAttribute(attributeName)); } ThreadsafeModel(Model model); @Override Model addAttribute(String attributeName, Object attributeValue); @Override Model addAttribute(Object attributeValue); @Override Model addAllAttributes(Collection<?> attributeValues); @Override Model addAllAttributes(Map<String, ?> attributes); @Override Model mergeAttributes(Map<String, ?> attributes); @Override boolean containsAttribute(String attributeName); @Override Map<String, Object> asMap(); }
@Test public void testCallsToContainsAttributeDoNotLockOtherReadOperations() throws ExecutionException, InterruptedException { assertFirstReadOperationDoesNotBlockSecondReadOperation( model -> model.containsAttribute("read1"), model -> model.containsAttribute("read2")); assertFirstReadOperationDoesNotBlockSecondReadOperation( model -> model.containsAttribute("read"), Model::asMap); } @Test public void testCallsToAsMapDoNotLockOtherReadOperations() throws ExecutionException, InterruptedException { assertFirstReadOperationDoesNotBlockSecondReadOperation( Model::asMap, model -> model.containsAttribute("read")); } @Test public void testThatTheTestMechanismWorks() throws ExecutionException, InterruptedException { try { assertFirstOperationBlocksSecondOperationUntilComplete( model -> model.containsAttribute("read1"), model -> model.containsAttribute("read2"), ReadWriteLockTestHelper::isReadLocked, ReadWriteLockTestHelper::isReadLocked); fail("2 read operations should not block each other and therefore there must be a problem with the test mechanism"); } catch (AssertionError e) { } }
ThreadsafeModel implements Model { @Override public Model addAllAttributes(Collection<?> attributeValues) { return withWriteLock(() -> model.addAllAttributes(attributeValues)); } ThreadsafeModel(Model model); @Override Model addAttribute(String attributeName, Object attributeValue); @Override Model addAttribute(Object attributeValue); @Override Model addAllAttributes(Collection<?> attributeValues); @Override Model addAllAttributes(Map<String, ?> attributes); @Override Model mergeAttributes(Map<String, ?> attributes); @Override boolean containsAttribute(String attributeName); @Override Map<String, Object> asMap(); }
@Test public void testCallsToAddAllAttributesLocksReadAccessUntilComplete() throws ExecutionException, InterruptedException { assertFirstOperationBlocksSecondOperationUntilComplete( model -> model.addAllAttributes(singletonList("write")), Model::asMap, ReadWriteLockTestHelper::isWriteLocked, ReadWriteLockTestHelper::isReadLocked); }
ThreadsafeModel implements Model { @Override public Model addAttribute(String attributeName, Object attributeValue) { return withWriteLock(() -> model.addAttribute(attributeName, attributeValue)); } ThreadsafeModel(Model model); @Override Model addAttribute(String attributeName, Object attributeValue); @Override Model addAttribute(Object attributeValue); @Override Model addAllAttributes(Collection<?> attributeValues); @Override Model addAllAttributes(Map<String, ?> attributes); @Override Model mergeAttributes(Map<String, ?> attributes); @Override boolean containsAttribute(String attributeName); @Override Map<String, Object> asMap(); }
@Test public void testCallsToAddAttributeLocksWriteAccessUntilComplete() throws ExecutionException, InterruptedException { assertFirstOperationBlocksSecondOperationUntilComplete( model -> model.addAttribute("write1"), model -> model.addAttribute("write2"), ReadWriteLockTestHelper::isWriteLocked, ReadWriteLockTestHelper::isWriteLocked); }
RestCacheMethodInterceptor implements MethodInterceptor { public RestCacheMethodInterceptor setUidSupplier(RestCacheUuidSupplier uidSupplier) { this.uidSupplier = uidSupplier; return this; } RestCacheUuidSupplier getUidSupplier(); RestCacheMethodInterceptor setUidSupplier(RestCacheUuidSupplier uidSupplier); void invalidate(); @Override Object invoke(MethodInvocation invocation); }
@Test public void testResultsCached() { final TestClassImpl base = new TestClassImpl(); final InvocationHandler handler = forBaseWithInterceptor(base, new RestCacheMethodInterceptor().setUidSupplier(() -> "1")); TestClass proxy = (TestClass) Proxy.newProxyInstance(TestClass.class.getClassLoader(), new Class[]{TestClass.class}, handler); proxy.method1(); proxy.method1(); proxy.method1(); Assert.assertEquals(1, base.numberTimesMethod1Called); proxy.method2(1); proxy.method2(1); proxy.method2(1); Assert.assertEquals(1, base.numberTimesMethod2Called); proxy.method2(2); Assert.assertEquals(2, base.numberTimesMethod2Called); proxy.method2(1); Assert.assertEquals(2, base.numberTimesMethod2Called); } @Test public void testResultsCachedPerUid() { final TestClassImpl base = new TestClassImpl(); final UidSupplierImpl uidSupplier = new UidSupplierImpl().setUid("a"); final InvocationHandler handler = forBaseWithInterceptor(base, new RestCacheMethodInterceptor().setUidSupplier(uidSupplier)); final TestClass proxy = (TestClass) Proxy.newProxyInstance(TestClass.class.getClassLoader(), new Class[]{TestClass.class}, handler); proxy.method1(); proxy.method1(); proxy.method1(); Assert.assertEquals(1, base.numberTimesMethod1Called); uidSupplier.setUid("b"); uidSupplier.setUid("b"); uidSupplier.setUid("b"); proxy.method1(); Assert.assertEquals(2, base.numberTimesMethod1Called); }
ValidAddressFormValidator implements ConstraintValidator<ValidAddressForm, AddressForm> { @Override public boolean isValid(AddressForm value, ConstraintValidatorContext context) { boolean valid; if (value.getAction().equals(AddressForm.Action.SAVE)) { if (value.isManualAddressEntry()) { valid = isAddressValid(value.getManualAddress(), context); } else if (value.isPostcodeAddressEntry()) { if (value.getSelectedPostcodeIndex() == null || value.getSelectedPostcodeIndex() < 0) { updateConstraintValidatorContext(context, "{validation.standard.address.select.required}", "selectedPostcodeIndex"); valid = false; } else { valid = true; } } else { updateConstraintValidatorContext(context, "{validation.standard.address.required}", "postcodeInput"); valid = false; } } else if (value.getAction().equals(AddressForm.Action.SEARCH_POSTCODE) && isNullOrEmpty(value.getPostcodeInput())) { updateConstraintValidatorContext(context, "{validation.standard.address.search.postcode.required}", "postcodeInput"); valid = false; } else { valid = true; } return valid; } @Override void initialize(ValidAddressForm constraintAnnotation); @Override boolean isValid(AddressForm value, ConstraintValidatorContext context); }
@Test public void isValid_ActionIsSaveIsManualAddressEntryValid() { addressForm.setAction(AddressForm.Action.SAVE); addressForm.setAddressType(AddressForm.AddressType.MANUAL_ENTRY); AddressResource address = new AddressResource("addressLine1", null, null, "town", null, "AD87 4OP"); addressForm.setManualAddress(address); assertTrue(validAddressFormValidator.isValid(addressForm, constraintValidatorContext)); } @Test public void isValid_ActionIsSaveIsManualAddressEntryInvalidNullPostcode() { addressForm.setAction(AddressForm.Action.SAVE); addressForm.setAddressType(AddressForm.AddressType.MANUAL_ENTRY); AddressResource address = new AddressResource(null, null, null, null, null, null); addressForm.setManualAddress(address); constraintValidatorContextMockSetup(); assertFalse(validAddressFormValidator.isValid(addressForm, constraintValidatorContext)); } @Test public void isValid_ActionIsSaveIsManualAddressEntryInvalidLongPostcode() { addressForm.setAction(AddressForm.Action.SAVE); addressForm.setAddressType(AddressForm.AddressType.MANUAL_ENTRY); AddressResource address = new AddressResource(null, null, null, null, null, "123456789"); addressForm.setManualAddress(address); constraintValidatorContextMockSetup(); assertFalse(validAddressFormValidator.isValid(addressForm, constraintValidatorContext)); } @Test public void isValid_ActionIsSaveIsNotManualAddressEntryIsPostcodeAddressEntrySelectedPostCodeIndexIsNullOrLessThanZero() { addressForm.setAction(AddressForm.Action.SAVE); addressForm.setAddressType(AddressForm.AddressType.POSTCODE_LOOKUP); addressForm.setSelectedPostcodeIndex(null); constraintValidatorContextMockSetup(); assertFalse(validAddressFormValidator.isValid(addressForm, constraintValidatorContext)); } @Test public void isValid_ActionIsSaveIsNotManualAddressEntryIsPostcodeAddressEntrySelectedPostCodeIndexIsNotNullOrLessThanZero() { addressForm.setAction(AddressForm.Action.SAVE); addressForm.setAddressType(AddressForm.AddressType.POSTCODE_LOOKUP); addressForm.setSelectedPostcodeIndex(2); constraintValidatorContextMockSetup(); assertTrue(validAddressFormValidator.isValid(addressForm, constraintValidatorContext)); } @Test public void isValid_ActionIsSaveIsNotManualAddressEntryIsNotPostcodeAddressEntry() { addressForm.setAction(AddressForm.Action.SAVE); addressForm.setAddressType(null); constraintValidatorContextMockSetup(); assertFalse(validAddressFormValidator.isValid(addressForm, constraintValidatorContext)); } @Test public void isValid_ActionIsSearchPostcodeAndPostCodeInputIsNullOrEmpty() { addressForm.setAction(AddressForm.Action.SEARCH_POSTCODE); addressForm.setPostcodeInput(null); constraintValidatorContextMockSetup(); assertFalse(validAddressFormValidator.isValid(addressForm, constraintValidatorContext)); } @Test public void isValid_ActionIsNotSaveIsNotSearchPostcode() { addressForm.setAction(AddressForm.Action.CHANGE_POSTCODE); assertTrue(validAddressFormValidator.isValid(addressForm, constraintValidatorContext)); }
FormInputController { @DeleteMapping("/{id}") public RestResult<Void> delete(@PathVariable("id") Long id) { return formInputService.delete(id).toDeleteResponse(); } @GetMapping("/{id}") RestResult<FormInputResource> findOne(@PathVariable("id") Long id); @GetMapping("/find-by-question-id/{questionId}") RestResult<List<FormInputResource>> findByQuestionId(@PathVariable("questionId") Long questionId); @GetMapping("find-by-question-id/{questionId}/scope/{scope}") RestResult<List<FormInputResource>> findByQuestionIdAndScope(@PathVariable("questionId") Long questionId, @PathVariable("scope") FormInputScope scope); @GetMapping("/find-by-competition-id/{competitionId}") RestResult<List<FormInputResource>> findByCompetitionId(@PathVariable("competitionId") Long competitionId); @GetMapping("/find-by-competition-id/{competitionId}/scope/{scope}") RestResult<List<FormInputResource>> findByCompetitionIdAndScope(@PathVariable("competitionId") Long competitionId, @PathVariable("scope") FormInputScope scope); @DeleteMapping("/{id}") RestResult<Void> delete(@PathVariable("id") Long id); @GetMapping(value = "/file/{formInputId}", produces = "application/json") @ResponseBody ResponseEntity<Object> downloadFile(@PathVariable long formInputId); @GetMapping(value = "/file-details/{formInputId}", produces = "application/json") RestResult<FileEntryResource> findFile(@PathVariable long formInputId); }
@Test public void testDelete() throws Exception { Long formInputId = 1L; when(formInputServiceMock.delete(formInputId)).thenReturn(serviceSuccess()); mockMvc.perform(RestDocumentationRequestBuilders.delete("/forminput/{id}", formInputId)) .andExpect(status().is2xxSuccessful()); }
AlertMessageHandlerInterceptor extends HandlerInterceptorAdapter { @Override public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) { if (modelAndView != null) { addAlertMessages(modelAndView); } } @Override void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView); }
@Test public void alertsPresent() { AlertResource alert = new AlertResource(); when(alertRestService.findAllVisible()).thenReturn(restSuccess(asList(alert))); ModelAndView mav = new ModelAndView(); interceptor.postHandle(null, null, null, mav); assertTrue(mav.getModelMap().containsKey("alertMessages")); assertEquals(1, ((List<AlertResource>)mav.getModelMap().get("alertMessages")).size()); assertEquals(alert, ((List<AlertResource>)mav.getModelMap().get("alertMessages")).get(0)); } @Test public void alertsNotPresent() { when(alertRestService.findAllVisible()).thenReturn(restSuccess(asList())); ModelAndView mav = new ModelAndView(); interceptor.postHandle(null, null, null, mav); assertFalse(mav.getModelMap().containsKey("alertMessages")); } @Test public void alertsServiceNotSuccessful() { when(alertRestService.findAllVisible()).thenReturn(restFailure(new Error("some.key", HttpStatus.NOT_FOUND))); ModelAndView mav = new ModelAndView(); interceptor.postHandle(null, null, null, mav); assertFalse(mav.getModelMap().containsKey("alertMessages")); }
MenuLinksHandlerInterceptor extends HandlerInterceptorAdapter { @Override public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) { if (modelAndView != null && !(modelAndView.getView() instanceof RedirectView || modelAndView.getViewName().startsWith("redirect:"))) { UserResource user = userAuthenticationService.getAuthenticatedUser(request); addUserDashboardLink(request, modelAndView); addUserProfileLink(request, modelAndView); addLogoutLink(modelAndView, logoutUrl); addShowManageUsersAttribute(user, modelAndView); addShowManageAssessorsAttribute(user, modelAndView); Optional.of(handler) .filter(HandlerMethod.class::isInstance) .map(HandlerMethod.class::cast) .ifPresent(handlerMethod -> pageHistoryService.recordPageHistory(request, response, modelAndView, handlerMethod)); } } @Override void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView); static void addLogoutLink(ModelAndView modelAndView, String logoutUrl); static final String USER_DASHBOARD_LINK; static final String USER_LOGOUT_LINK; static final String USER_PROFILE_LINK; static final String ASSESSOR_PROFILE_URL; static final String USER_PROFILE_URL; static final String SHOW_MANAGE_USERS_LINK_ATTR; static final String SHOW_MANAGE_ASSESSORS_LINK_ATTR; }
@Test public void assessorShouldGetAssessorProfileLink() { UserAuthentication authentication = new UserAuthentication(newUserResource().withRoleGlobal(ASSESSOR).build()); ModelMap modelMap = mav.getModelMap(); modelMap.addAttribute(USER_DASHBOARD_LINK, ASSESSOR_DIRECT_LANDING_PAGE_URL); modelMap.addAttribute(USER_PROFILE_LINK, ASSESSOR_PROFILE_URL); when(userAuthenticationService.getAuthentication(request)).thenReturn(authentication); when(navigationUtils.getDirectLandingPageUrl(request)).thenReturn(ASSESSOR_DIRECT_LANDING_PAGE_URL); menuLinksHandlerInterceptor.postHandle(request, response, handler, mav); assertEquals(ASSESSOR_DIRECT_LANDING_PAGE_URL, mav.getModelMap().get(USER_DASHBOARD_LINK)); assertEquals(ASSESSOR_PROFILE_URL, mav.getModelMap().get(USER_PROFILE_LINK)); verify(userAuthenticationService, times(1)).getAuthenticatedUser(request); verify(navigationUtils, times(1)).getDirectLandingPageUrl(request); } @Test public void applicantShouldGetApplicantProfileLink() { UserAuthentication authentication = new UserAuthentication(newUserResource().withRoleGlobal(APPLICANT).build()); ModelMap modelMap = mav.getModelMap(); modelMap.addAttribute(USER_DASHBOARD_LINK, APPLICANT_DIRECT_LANDING_PAGE_URL); modelMap.addAttribute(USER_PROFILE_LINK, USER_PROFILE_URL); when(userAuthenticationService.getAuthentication(request)).thenReturn(authentication); when(navigationUtils.getDirectLandingPageUrl(request)).thenReturn(APPLICANT_DIRECT_LANDING_PAGE_URL); menuLinksHandlerInterceptor.postHandle(request, response, handler, mav); assertEquals(APPLICANT_DIRECT_LANDING_PAGE_URL, mav.getModelMap().get(USER_DASHBOARD_LINK)); assertEquals(USER_PROFILE_URL, mav.getModelMap().get(USER_PROFILE_LINK)); verify(userAuthenticationService, times(1)).getAuthenticatedUser(request); verify(navigationUtils, times(1)).getDirectLandingPageUrl(request); } @Test public void multiRoleUserWithAssessorRoleShouldGetAssessorProfileLink() { UserAuthentication authentication = new UserAuthentication(newUserResource().withRolesGlobal(asList(ASSESSOR, APPLICANT)).build()); ModelMap modelMap = mav.getModelMap(); modelMap.addAttribute(USER_DASHBOARD_LINK, ASSESSOR_DIRECT_LANDING_PAGE_URL); modelMap.addAttribute(USER_PROFILE_LINK, ASSESSOR_PROFILE_URL); when(userAuthenticationService.getAuthentication(request)).thenReturn(authentication); when(navigationUtils.getDirectLandingPageUrl(request)).thenReturn(ASSESSOR_DIRECT_LANDING_PAGE_URL); menuLinksHandlerInterceptor.postHandle(request, response, handler, mav); assertEquals(ASSESSOR_DIRECT_LANDING_PAGE_URL, mav.getModelMap().get(USER_DASHBOARD_LINK)); assertEquals(ASSESSOR_PROFILE_URL, mav.getModelMap().get(USER_PROFILE_LINK)); verify(userAuthenticationService, times(1)).getAuthenticatedUser(request); verify(navigationUtils, times(1)).getDirectLandingPageUrl(request); }
QuestionController { @GetMapping("/get-next-question/{questionId}") public RestResult<QuestionResource> getNextQuestion(@PathVariable("questionId") final Long questionId) { return questionService.getNextQuestion(questionId).toGetResponse(); } @GetMapping("/id/{id}") RestResult<QuestionResource> getQuestionById(@PathVariable("id") final Long id); @GetMapping("/find-by-competition/{competitionId}") RestResult<List<QuestionResource>> findByCompetition(@PathVariable("competitionId") final Long competitionId); @GetMapping("/get-next-question/{questionId}") RestResult<QuestionResource> getNextQuestion(@PathVariable("questionId") final Long questionId); @GetMapping("/get-previous-question-by-section/{sectionId}") RestResult<QuestionResource> getPreviousQuestionBySection(@PathVariable("sectionId") final Long sectionId); @GetMapping("/get-next-question-by-section/{sectionId}") RestResult<QuestionResource> getNextQuestionBySection(@PathVariable("sectionId") final Long sectionId); @GetMapping("/get-previous-question/{questionId}") RestResult<QuestionResource> getPreviousQuestion(@PathVariable("questionId") final Long questionId); @GetMapping("/get-question-by-competition-id-and-form-input-type/{competitionId}/{formInputType}") RestResult<QuestionResource> getQuestionByFormInputType(@PathVariable("competitionId") final Long competitionId, @PathVariable("formInputType") final FormInputType formInputType); @GetMapping("/get-questions-by-section-id-and-type/{sectionId}/{type}") RestResult<List<QuestionResource>> getQuestionsBySectionIdAndType(@PathVariable("sectionId") final Long sectionId, @PathVariable("type") QuestionType type); @PutMapping("/") RestResult<QuestionResource> save(@RequestBody final QuestionResource questionResource); @GetMapping("/get-question-by-id-and-assessment-id/{questionId}/{assessmentId}") RestResult<QuestionResource> getQuestionByIdAndAssessmentId(@PathVariable("questionId") Long questionId, @PathVariable("assessmentId") Long assessmentId); @GetMapping("/get-questions-by-assessment/{assessmentId}") RestResult<List<QuestionResource>> getQuestionsByAssessmentId(@PathVariable("assessmentId") final Long assessmentId); @GetMapping("/get-question-by-competition-id-and-question-setup-type/{competitionId}/{type}") RestResult<QuestionResource> getQuestionByCompetitionIdQuestionSetupType( @PathVariable("competitionId") final long competitionId, @PathVariable("type") final QuestionSetupType questionSetupType); }
@Test public void getNextQuestionTest() throws Exception { CompetitionResource competition = newCompetitionResource().build(); SectionResource section = newSectionResource().build(); QuestionResource nextQuestion = newQuestionResource().withCompetitionAndSectionAndPriority(competition, section, 2).build(); when(questionService.getNextQuestion(anyLong())).thenReturn(serviceSuccess(nextQuestion)); mockMvc.perform(get("/question/get-next-question/" + 1L)) .andExpect(status().isOk()) .andExpect(content().string(objectMapper.writeValueAsString(nextQuestion))) .andReturn(); }
OrganisationJourneyEnd { public String completeProcess(HttpServletRequest request, HttpServletResponse response, UserResource user, long organisationId) { if (user != null) { return handleExistingUser(request, response, user, organisationId); } else { registrationCookieService.saveToOrganisationIdCookie(organisationId, response); return "redirect:/registration/register"; } } String completeProcess(HttpServletRequest request, HttpServletResponse response, UserResource user, long organisationId); }
@Test public void completeProcess_newUser() { UserResource user = null; long organisationId = 1L; String result = service.completeProcess(request, response, user, organisationId); assertEquals(result, "redirect:/registration/register"); verify(registrationCookieService).saveToOrganisationIdCookie(organisationId, response); } @Test public void completeProcess_existingLead_teamQuestion() { UserResource user = newUserResource().withRolesGlobal(singletonList(Role.APPLICANT)).build(); long organisationId = 1L; long competitionId = 2L; ApplicationResource application = newApplicationResource().withCompetition(competitionId).build(); when(registrationCookieService.isCollaboratorJourney(request)).thenReturn(false); when(registrationCookieService.isLeadJourney(request)).thenReturn(true); when(registrationCookieService.getCompetitionIdCookieValue(request)).thenReturn(Optional.of(competitionId)); when(applicationRestService.createApplication(competitionId, user.getId(), organisationId, "")) .thenReturn(restSuccess(application)); String result = service.completeProcess(request, response, user, organisationId); assertEquals(result, String.format("redirect:/application/%s", application.getId())); verify(applicationRestService).createApplication(competitionId, user.getId(), organisationId, ""); } @Test public void completeProcess_existingLead_noQuestion() { UserResource user = newUserResource().withRolesGlobal(singletonList(Role.APPLICANT)).build(); long organisationId = 1L; long competitionId = 2L; ApplicationResource application = newApplicationResource().withCompetition(competitionId).build(); when(registrationCookieService.isCollaboratorJourney(request)).thenReturn(false); when(registrationCookieService.isLeadJourney(request)).thenReturn(true); when(registrationCookieService.getCompetitionIdCookieValue(request)).thenReturn(Optional.of(competitionId)); when(applicationRestService.createApplication(competitionId, user.getId(), organisationId, "")) .thenReturn(restSuccess(application)); String result = service.completeProcess(request, response, user, organisationId); assertEquals(result, String.format("redirect:/application/%s", application.getId())); verify(applicationRestService).createApplication(competitionId, user.getId(), organisationId, ""); } @Test public void completeProcess_existingAssessor() { UserResource user = newUserResource().withRolesGlobal(singletonList(Role.ASSESSOR)).build(); long organisationId = 1L; long competitionId = 2L; ApplicationResource application = newApplicationResource().withCompetition(competitionId).build(); when(registrationCookieService.isCollaboratorJourney(request)).thenReturn(false); when(registrationCookieService.isLeadJourney(request)).thenReturn(true); when(userRestService.grantRole(user.getId(), Role.APPLICANT)).thenReturn(restSuccess()); when(registrationCookieService.getCompetitionIdCookieValue(request)).thenReturn(Optional.of(competitionId)); when(applicationRestService.createApplication(competitionId, user.getId(), organisationId, "")) .thenReturn(restSuccess(application)); String result = service.completeProcess(request, response, user, organisationId); assertEquals(result, String.format("redirect:/application/%s", application.getId())); verify(applicationRestService).createApplication(competitionId, user.getId(), organisationId, ""); verify(userRestService).grantRole(user.getId(), Role.APPLICANT); verify(cookieUtil).saveToCookie(response, "role", Role.APPLICANT.getName()); }
RegistrationCookieService { public void saveToOrganisationTypeCookie(OrganisationTypeForm organisationTypeForm, HttpServletResponse response) { cookieUtil.saveToCookie(response, ORGANISATION_TYPE, JsonUtil.getSerializedObject(organisationTypeForm)); } void saveToOrganisationTypeCookie(OrganisationTypeForm organisationTypeForm, HttpServletResponse response); void saveToOrganisationInternationalCookie(OrganisationInternationalForm organisationInternationalForm, HttpServletResponse response); void saveToOrganisationCreationCookie(OrganisationCreationForm organisationFormForCookie, HttpServletResponse response); void saveToOrganisationInternationalDetailsCookie(OrganisationInternationalDetailsForm organisationFormForCookie, HttpServletResponse response); void saveToKnowledgeBaseDetailsCookie(KnowledgeBaseCreateForm organisationFormForCookie, HttpServletResponse response); void saveToKnowledgeBaseAddressCookie(AddressResource addressResource, HttpServletResponse response); void saveToOrganisationIdCookie(Long id, HttpServletResponse response); void saveToCompetitionIdCookie(Long id, HttpServletResponse response); void saveToInviteHashCookie(String hash, HttpServletResponse response); void saveToProjectInviteHashCookie(InviteAndIdCookie inviteAndIdCookie, HttpServletResponse response); Optional<OrganisationTypeForm> getOrganisationTypeCookieValue(HttpServletRequest request); Optional<OrganisationInternationalForm> getOrganisationInternationalCookieValue(HttpServletRequest request); Optional<OrganisationCreationForm> getOrganisationCreationCookieValue(HttpServletRequest request); Optional<OrganisationInternationalDetailsForm> getOrganisationInternationalDetailsValue(HttpServletRequest request); Optional<KnowledgeBaseCreateForm> getKnowledgeBaseDetailsValue(HttpServletRequest request); Optional<AddressResource> getKnowledgeBaseAddressCookie(HttpServletRequest request); Optional<Long> getOrganisationIdCookieValue(HttpServletRequest request); Optional<Long> getCompetitionIdCookieValue(HttpServletRequest request); Optional<String> getInviteHashCookieValue(HttpServletRequest request); Optional<InviteAndIdCookie> getProjectInviteHashCookieValue(HttpServletRequest request); void deleteOrganisationTypeCookie(HttpServletResponse response); void deleteOrganisationInternationalCookie(HttpServletResponse response); void deleteOrganisationCreationCookie(HttpServletResponse response); void deleteKnowledgeBaseDetailsCookie(HttpServletResponse response); void deleteKnowledgeBaseAddressCookie(HttpServletResponse response); void deleteOrganisationInternationalDetailsCookie(HttpServletResponse response); void deleteOrganisationIdCookie(HttpServletResponse response); void deleteInviteHashCookie(HttpServletResponse response); void deleteCompetitionIdCookie(HttpServletResponse response); void deleteProjectInviteHashCookie(HttpServletResponse response); void deleteAllRegistrationJourneyCookies(HttpServletResponse response); boolean isCollaboratorJourney(HttpServletRequest request); boolean isLeadJourney(HttpServletRequest request); boolean isApplicantJourney(HttpServletRequest request); boolean isInternationalJourney(HttpServletRequest request); static final String ORGANISATION_TYPE; static final String ORGANISATION_INTERNATIONAL; static final String ORGANISATION_INTERNATIONAL_DETAILS; static final String KNOWLEDGE_BASE_DETAILS; static final String KNOWLEDGE_BASE_ADDRESS; static final String ORGANISATION_FORM; static final String ORGANISATION_ID; static final String INVITE_HASH; static final String PROJECT_INVITE_HASH; static final String COMPETITION_ID; }
@Test public void saveToOrganisationTypeCookie() throws Exception { OrganisationTypeForm organisationTypeForm = new OrganisationTypeForm(); service.saveToOrganisationTypeCookie(organisationTypeForm, response); verify(cookieUtil, times(1)).saveToCookie(response, ORGANISATION_TYPE, JsonUtil.getSerializedObject(organisationTypeForm)); }
RegistrationCookieService { public void saveToOrganisationCreationCookie(OrganisationCreationForm organisationFormForCookie, HttpServletResponse response) { cookieUtil.saveToCookie(response, ORGANISATION_FORM, JsonUtil.getSerializedObject(organisationFormForCookie)); } void saveToOrganisationTypeCookie(OrganisationTypeForm organisationTypeForm, HttpServletResponse response); void saveToOrganisationInternationalCookie(OrganisationInternationalForm organisationInternationalForm, HttpServletResponse response); void saveToOrganisationCreationCookie(OrganisationCreationForm organisationFormForCookie, HttpServletResponse response); void saveToOrganisationInternationalDetailsCookie(OrganisationInternationalDetailsForm organisationFormForCookie, HttpServletResponse response); void saveToKnowledgeBaseDetailsCookie(KnowledgeBaseCreateForm organisationFormForCookie, HttpServletResponse response); void saveToKnowledgeBaseAddressCookie(AddressResource addressResource, HttpServletResponse response); void saveToOrganisationIdCookie(Long id, HttpServletResponse response); void saveToCompetitionIdCookie(Long id, HttpServletResponse response); void saveToInviteHashCookie(String hash, HttpServletResponse response); void saveToProjectInviteHashCookie(InviteAndIdCookie inviteAndIdCookie, HttpServletResponse response); Optional<OrganisationTypeForm> getOrganisationTypeCookieValue(HttpServletRequest request); Optional<OrganisationInternationalForm> getOrganisationInternationalCookieValue(HttpServletRequest request); Optional<OrganisationCreationForm> getOrganisationCreationCookieValue(HttpServletRequest request); Optional<OrganisationInternationalDetailsForm> getOrganisationInternationalDetailsValue(HttpServletRequest request); Optional<KnowledgeBaseCreateForm> getKnowledgeBaseDetailsValue(HttpServletRequest request); Optional<AddressResource> getKnowledgeBaseAddressCookie(HttpServletRequest request); Optional<Long> getOrganisationIdCookieValue(HttpServletRequest request); Optional<Long> getCompetitionIdCookieValue(HttpServletRequest request); Optional<String> getInviteHashCookieValue(HttpServletRequest request); Optional<InviteAndIdCookie> getProjectInviteHashCookieValue(HttpServletRequest request); void deleteOrganisationTypeCookie(HttpServletResponse response); void deleteOrganisationInternationalCookie(HttpServletResponse response); void deleteOrganisationCreationCookie(HttpServletResponse response); void deleteKnowledgeBaseDetailsCookie(HttpServletResponse response); void deleteKnowledgeBaseAddressCookie(HttpServletResponse response); void deleteOrganisationInternationalDetailsCookie(HttpServletResponse response); void deleteOrganisationIdCookie(HttpServletResponse response); void deleteInviteHashCookie(HttpServletResponse response); void deleteCompetitionIdCookie(HttpServletResponse response); void deleteProjectInviteHashCookie(HttpServletResponse response); void deleteAllRegistrationJourneyCookies(HttpServletResponse response); boolean isCollaboratorJourney(HttpServletRequest request); boolean isLeadJourney(HttpServletRequest request); boolean isApplicantJourney(HttpServletRequest request); boolean isInternationalJourney(HttpServletRequest request); static final String ORGANISATION_TYPE; static final String ORGANISATION_INTERNATIONAL; static final String ORGANISATION_INTERNATIONAL_DETAILS; static final String KNOWLEDGE_BASE_DETAILS; static final String KNOWLEDGE_BASE_ADDRESS; static final String ORGANISATION_FORM; static final String ORGANISATION_ID; static final String INVITE_HASH; static final String PROJECT_INVITE_HASH; static final String COMPETITION_ID; }
@Test public void saveToOrganisationCreationCookie() throws Exception { OrganisationCreationForm organisationForm = new OrganisationCreationForm(); service.saveToOrganisationCreationCookie(organisationForm, response); verify(cookieUtil, times(1)).saveToCookie(response, ORGANISATION_FORM, JsonUtil.getSerializedObject(organisationForm)); }
RegistrationCookieService { public void saveToOrganisationIdCookie(Long id, HttpServletResponse response) { cookieUtil.saveToCookie(response, ORGANISATION_ID, String.valueOf(id)); } void saveToOrganisationTypeCookie(OrganisationTypeForm organisationTypeForm, HttpServletResponse response); void saveToOrganisationInternationalCookie(OrganisationInternationalForm organisationInternationalForm, HttpServletResponse response); void saveToOrganisationCreationCookie(OrganisationCreationForm organisationFormForCookie, HttpServletResponse response); void saveToOrganisationInternationalDetailsCookie(OrganisationInternationalDetailsForm organisationFormForCookie, HttpServletResponse response); void saveToKnowledgeBaseDetailsCookie(KnowledgeBaseCreateForm organisationFormForCookie, HttpServletResponse response); void saveToKnowledgeBaseAddressCookie(AddressResource addressResource, HttpServletResponse response); void saveToOrganisationIdCookie(Long id, HttpServletResponse response); void saveToCompetitionIdCookie(Long id, HttpServletResponse response); void saveToInviteHashCookie(String hash, HttpServletResponse response); void saveToProjectInviteHashCookie(InviteAndIdCookie inviteAndIdCookie, HttpServletResponse response); Optional<OrganisationTypeForm> getOrganisationTypeCookieValue(HttpServletRequest request); Optional<OrganisationInternationalForm> getOrganisationInternationalCookieValue(HttpServletRequest request); Optional<OrganisationCreationForm> getOrganisationCreationCookieValue(HttpServletRequest request); Optional<OrganisationInternationalDetailsForm> getOrganisationInternationalDetailsValue(HttpServletRequest request); Optional<KnowledgeBaseCreateForm> getKnowledgeBaseDetailsValue(HttpServletRequest request); Optional<AddressResource> getKnowledgeBaseAddressCookie(HttpServletRequest request); Optional<Long> getOrganisationIdCookieValue(HttpServletRequest request); Optional<Long> getCompetitionIdCookieValue(HttpServletRequest request); Optional<String> getInviteHashCookieValue(HttpServletRequest request); Optional<InviteAndIdCookie> getProjectInviteHashCookieValue(HttpServletRequest request); void deleteOrganisationTypeCookie(HttpServletResponse response); void deleteOrganisationInternationalCookie(HttpServletResponse response); void deleteOrganisationCreationCookie(HttpServletResponse response); void deleteKnowledgeBaseDetailsCookie(HttpServletResponse response); void deleteKnowledgeBaseAddressCookie(HttpServletResponse response); void deleteOrganisationInternationalDetailsCookie(HttpServletResponse response); void deleteOrganisationIdCookie(HttpServletResponse response); void deleteInviteHashCookie(HttpServletResponse response); void deleteCompetitionIdCookie(HttpServletResponse response); void deleteProjectInviteHashCookie(HttpServletResponse response); void deleteAllRegistrationJourneyCookies(HttpServletResponse response); boolean isCollaboratorJourney(HttpServletRequest request); boolean isLeadJourney(HttpServletRequest request); boolean isApplicantJourney(HttpServletRequest request); boolean isInternationalJourney(HttpServletRequest request); static final String ORGANISATION_TYPE; static final String ORGANISATION_INTERNATIONAL; static final String ORGANISATION_INTERNATIONAL_DETAILS; static final String KNOWLEDGE_BASE_DETAILS; static final String KNOWLEDGE_BASE_ADDRESS; static final String ORGANISATION_FORM; static final String ORGANISATION_ID; static final String INVITE_HASH; static final String PROJECT_INVITE_HASH; static final String COMPETITION_ID; }
@Test public void saveToOrganisationIdCookie() throws Exception { Long organisationId = 1L; service.saveToOrganisationIdCookie(organisationId, response); verify(cookieUtil, times(1)).saveToCookie(response, ORGANISATION_ID, String.valueOf(organisationId)); }
RegistrationCookieService { public void saveToCompetitionIdCookie(Long id, HttpServletResponse response) { cookieUtil.saveToCookie(response, COMPETITION_ID, String.valueOf(id)); } void saveToOrganisationTypeCookie(OrganisationTypeForm organisationTypeForm, HttpServletResponse response); void saveToOrganisationInternationalCookie(OrganisationInternationalForm organisationInternationalForm, HttpServletResponse response); void saveToOrganisationCreationCookie(OrganisationCreationForm organisationFormForCookie, HttpServletResponse response); void saveToOrganisationInternationalDetailsCookie(OrganisationInternationalDetailsForm organisationFormForCookie, HttpServletResponse response); void saveToKnowledgeBaseDetailsCookie(KnowledgeBaseCreateForm organisationFormForCookie, HttpServletResponse response); void saveToKnowledgeBaseAddressCookie(AddressResource addressResource, HttpServletResponse response); void saveToOrganisationIdCookie(Long id, HttpServletResponse response); void saveToCompetitionIdCookie(Long id, HttpServletResponse response); void saveToInviteHashCookie(String hash, HttpServletResponse response); void saveToProjectInviteHashCookie(InviteAndIdCookie inviteAndIdCookie, HttpServletResponse response); Optional<OrganisationTypeForm> getOrganisationTypeCookieValue(HttpServletRequest request); Optional<OrganisationInternationalForm> getOrganisationInternationalCookieValue(HttpServletRequest request); Optional<OrganisationCreationForm> getOrganisationCreationCookieValue(HttpServletRequest request); Optional<OrganisationInternationalDetailsForm> getOrganisationInternationalDetailsValue(HttpServletRequest request); Optional<KnowledgeBaseCreateForm> getKnowledgeBaseDetailsValue(HttpServletRequest request); Optional<AddressResource> getKnowledgeBaseAddressCookie(HttpServletRequest request); Optional<Long> getOrganisationIdCookieValue(HttpServletRequest request); Optional<Long> getCompetitionIdCookieValue(HttpServletRequest request); Optional<String> getInviteHashCookieValue(HttpServletRequest request); Optional<InviteAndIdCookie> getProjectInviteHashCookieValue(HttpServletRequest request); void deleteOrganisationTypeCookie(HttpServletResponse response); void deleteOrganisationInternationalCookie(HttpServletResponse response); void deleteOrganisationCreationCookie(HttpServletResponse response); void deleteKnowledgeBaseDetailsCookie(HttpServletResponse response); void deleteKnowledgeBaseAddressCookie(HttpServletResponse response); void deleteOrganisationInternationalDetailsCookie(HttpServletResponse response); void deleteOrganisationIdCookie(HttpServletResponse response); void deleteInviteHashCookie(HttpServletResponse response); void deleteCompetitionIdCookie(HttpServletResponse response); void deleteProjectInviteHashCookie(HttpServletResponse response); void deleteAllRegistrationJourneyCookies(HttpServletResponse response); boolean isCollaboratorJourney(HttpServletRequest request); boolean isLeadJourney(HttpServletRequest request); boolean isApplicantJourney(HttpServletRequest request); boolean isInternationalJourney(HttpServletRequest request); static final String ORGANISATION_TYPE; static final String ORGANISATION_INTERNATIONAL; static final String ORGANISATION_INTERNATIONAL_DETAILS; static final String KNOWLEDGE_BASE_DETAILS; static final String KNOWLEDGE_BASE_ADDRESS; static final String ORGANISATION_FORM; static final String ORGANISATION_ID; static final String INVITE_HASH; static final String PROJECT_INVITE_HASH; static final String COMPETITION_ID; }
@Test public void saveToCompetitionIdCookie() throws Exception { Long competitionId = 1L; service.saveToCompetitionIdCookie(competitionId, response); verify(cookieUtil, times(1)).saveToCookie(response, COMPETITION_ID, String.valueOf(competitionId)); }
QuestionController { @GetMapping("/get-previous-question/{questionId}") public RestResult<QuestionResource> getPreviousQuestion(@PathVariable("questionId") final Long questionId) { return questionService.getPreviousQuestion(questionId).toGetResponse(); } @GetMapping("/id/{id}") RestResult<QuestionResource> getQuestionById(@PathVariable("id") final Long id); @GetMapping("/find-by-competition/{competitionId}") RestResult<List<QuestionResource>> findByCompetition(@PathVariable("competitionId") final Long competitionId); @GetMapping("/get-next-question/{questionId}") RestResult<QuestionResource> getNextQuestion(@PathVariable("questionId") final Long questionId); @GetMapping("/get-previous-question-by-section/{sectionId}") RestResult<QuestionResource> getPreviousQuestionBySection(@PathVariable("sectionId") final Long sectionId); @GetMapping("/get-next-question-by-section/{sectionId}") RestResult<QuestionResource> getNextQuestionBySection(@PathVariable("sectionId") final Long sectionId); @GetMapping("/get-previous-question/{questionId}") RestResult<QuestionResource> getPreviousQuestion(@PathVariable("questionId") final Long questionId); @GetMapping("/get-question-by-competition-id-and-form-input-type/{competitionId}/{formInputType}") RestResult<QuestionResource> getQuestionByFormInputType(@PathVariable("competitionId") final Long competitionId, @PathVariable("formInputType") final FormInputType formInputType); @GetMapping("/get-questions-by-section-id-and-type/{sectionId}/{type}") RestResult<List<QuestionResource>> getQuestionsBySectionIdAndType(@PathVariable("sectionId") final Long sectionId, @PathVariable("type") QuestionType type); @PutMapping("/") RestResult<QuestionResource> save(@RequestBody final QuestionResource questionResource); @GetMapping("/get-question-by-id-and-assessment-id/{questionId}/{assessmentId}") RestResult<QuestionResource> getQuestionByIdAndAssessmentId(@PathVariable("questionId") Long questionId, @PathVariable("assessmentId") Long assessmentId); @GetMapping("/get-questions-by-assessment/{assessmentId}") RestResult<List<QuestionResource>> getQuestionsByAssessmentId(@PathVariable("assessmentId") final Long assessmentId); @GetMapping("/get-question-by-competition-id-and-question-setup-type/{competitionId}/{type}") RestResult<QuestionResource> getQuestionByCompetitionIdQuestionSetupType( @PathVariable("competitionId") final long competitionId, @PathVariable("type") final QuestionSetupType questionSetupType); }
@Test public void getPreviousQuestionTest() throws Exception { CompetitionResource competition = newCompetitionResource().build(); SectionResource section = newSectionResource().build(); QuestionResource previousQuestion = newQuestionResource().withCompetitionAndSectionAndPriority(competition, section, 2).build(); when(questionService.getPreviousQuestion(anyLong())).thenReturn(serviceSuccess(previousQuestion)); mockMvc.perform(get("/question/get-previous-question/" + previousQuestion.getId())) .andExpect(status().isOk()) .andExpect(content().string(objectMapper.writeValueAsString(previousQuestion))); } @Test public void getPreviousQuestionFromOtherSectionTest() throws Exception { CompetitionResource competition = newCompetitionResource().build(); SectionResource section = newSectionResource().build(); QuestionResource previousQuestion = newQuestionResource().withCompetitionAndSectionAndPriority(competition, section, 1).build(); when(questionService.getPreviousQuestion(anyLong())).thenReturn(serviceSuccess(previousQuestion)); mockMvc.perform(get("/question/get-previous-question/" + 1L)) .andExpect(content().string(objectMapper.writeValueAsString(previousQuestion))) .andExpect(status().isOk()); }
RegistrationCookieService { public void saveToInviteHashCookie(String hash, HttpServletResponse response) { cookieUtil.saveToCookie(response, INVITE_HASH, hash); } void saveToOrganisationTypeCookie(OrganisationTypeForm organisationTypeForm, HttpServletResponse response); void saveToOrganisationInternationalCookie(OrganisationInternationalForm organisationInternationalForm, HttpServletResponse response); void saveToOrganisationCreationCookie(OrganisationCreationForm organisationFormForCookie, HttpServletResponse response); void saveToOrganisationInternationalDetailsCookie(OrganisationInternationalDetailsForm organisationFormForCookie, HttpServletResponse response); void saveToKnowledgeBaseDetailsCookie(KnowledgeBaseCreateForm organisationFormForCookie, HttpServletResponse response); void saveToKnowledgeBaseAddressCookie(AddressResource addressResource, HttpServletResponse response); void saveToOrganisationIdCookie(Long id, HttpServletResponse response); void saveToCompetitionIdCookie(Long id, HttpServletResponse response); void saveToInviteHashCookie(String hash, HttpServletResponse response); void saveToProjectInviteHashCookie(InviteAndIdCookie inviteAndIdCookie, HttpServletResponse response); Optional<OrganisationTypeForm> getOrganisationTypeCookieValue(HttpServletRequest request); Optional<OrganisationInternationalForm> getOrganisationInternationalCookieValue(HttpServletRequest request); Optional<OrganisationCreationForm> getOrganisationCreationCookieValue(HttpServletRequest request); Optional<OrganisationInternationalDetailsForm> getOrganisationInternationalDetailsValue(HttpServletRequest request); Optional<KnowledgeBaseCreateForm> getKnowledgeBaseDetailsValue(HttpServletRequest request); Optional<AddressResource> getKnowledgeBaseAddressCookie(HttpServletRequest request); Optional<Long> getOrganisationIdCookieValue(HttpServletRequest request); Optional<Long> getCompetitionIdCookieValue(HttpServletRequest request); Optional<String> getInviteHashCookieValue(HttpServletRequest request); Optional<InviteAndIdCookie> getProjectInviteHashCookieValue(HttpServletRequest request); void deleteOrganisationTypeCookie(HttpServletResponse response); void deleteOrganisationInternationalCookie(HttpServletResponse response); void deleteOrganisationCreationCookie(HttpServletResponse response); void deleteKnowledgeBaseDetailsCookie(HttpServletResponse response); void deleteKnowledgeBaseAddressCookie(HttpServletResponse response); void deleteOrganisationInternationalDetailsCookie(HttpServletResponse response); void deleteOrganisationIdCookie(HttpServletResponse response); void deleteInviteHashCookie(HttpServletResponse response); void deleteCompetitionIdCookie(HttpServletResponse response); void deleteProjectInviteHashCookie(HttpServletResponse response); void deleteAllRegistrationJourneyCookies(HttpServletResponse response); boolean isCollaboratorJourney(HttpServletRequest request); boolean isLeadJourney(HttpServletRequest request); boolean isApplicantJourney(HttpServletRequest request); boolean isInternationalJourney(HttpServletRequest request); static final String ORGANISATION_TYPE; static final String ORGANISATION_INTERNATIONAL; static final String ORGANISATION_INTERNATIONAL_DETAILS; static final String KNOWLEDGE_BASE_DETAILS; static final String KNOWLEDGE_BASE_ADDRESS; static final String ORGANISATION_FORM; static final String ORGANISATION_ID; static final String INVITE_HASH; static final String PROJECT_INVITE_HASH; static final String COMPETITION_ID; }
@Test public void saveToInviteHashCookie() throws Exception { String inviteHash = "123abc"; service.saveToInviteHashCookie(inviteHash, response); verify(cookieUtil, times(1)).saveToCookie(response, INVITE_HASH, inviteHash); }
RegistrationCookieService { public Optional<OrganisationTypeForm> getOrganisationTypeCookieValue(HttpServletRequest request) { return Optional.ofNullable(getObjectFromJson(cookieUtil.getCookieValue(request, ORGANISATION_TYPE), OrganisationTypeForm.class)); } void saveToOrganisationTypeCookie(OrganisationTypeForm organisationTypeForm, HttpServletResponse response); void saveToOrganisationInternationalCookie(OrganisationInternationalForm organisationInternationalForm, HttpServletResponse response); void saveToOrganisationCreationCookie(OrganisationCreationForm organisationFormForCookie, HttpServletResponse response); void saveToOrganisationInternationalDetailsCookie(OrganisationInternationalDetailsForm organisationFormForCookie, HttpServletResponse response); void saveToKnowledgeBaseDetailsCookie(KnowledgeBaseCreateForm organisationFormForCookie, HttpServletResponse response); void saveToKnowledgeBaseAddressCookie(AddressResource addressResource, HttpServletResponse response); void saveToOrganisationIdCookie(Long id, HttpServletResponse response); void saveToCompetitionIdCookie(Long id, HttpServletResponse response); void saveToInviteHashCookie(String hash, HttpServletResponse response); void saveToProjectInviteHashCookie(InviteAndIdCookie inviteAndIdCookie, HttpServletResponse response); Optional<OrganisationTypeForm> getOrganisationTypeCookieValue(HttpServletRequest request); Optional<OrganisationInternationalForm> getOrganisationInternationalCookieValue(HttpServletRequest request); Optional<OrganisationCreationForm> getOrganisationCreationCookieValue(HttpServletRequest request); Optional<OrganisationInternationalDetailsForm> getOrganisationInternationalDetailsValue(HttpServletRequest request); Optional<KnowledgeBaseCreateForm> getKnowledgeBaseDetailsValue(HttpServletRequest request); Optional<AddressResource> getKnowledgeBaseAddressCookie(HttpServletRequest request); Optional<Long> getOrganisationIdCookieValue(HttpServletRequest request); Optional<Long> getCompetitionIdCookieValue(HttpServletRequest request); Optional<String> getInviteHashCookieValue(HttpServletRequest request); Optional<InviteAndIdCookie> getProjectInviteHashCookieValue(HttpServletRequest request); void deleteOrganisationTypeCookie(HttpServletResponse response); void deleteOrganisationInternationalCookie(HttpServletResponse response); void deleteOrganisationCreationCookie(HttpServletResponse response); void deleteKnowledgeBaseDetailsCookie(HttpServletResponse response); void deleteKnowledgeBaseAddressCookie(HttpServletResponse response); void deleteOrganisationInternationalDetailsCookie(HttpServletResponse response); void deleteOrganisationIdCookie(HttpServletResponse response); void deleteInviteHashCookie(HttpServletResponse response); void deleteCompetitionIdCookie(HttpServletResponse response); void deleteProjectInviteHashCookie(HttpServletResponse response); void deleteAllRegistrationJourneyCookies(HttpServletResponse response); boolean isCollaboratorJourney(HttpServletRequest request); boolean isLeadJourney(HttpServletRequest request); boolean isApplicantJourney(HttpServletRequest request); boolean isInternationalJourney(HttpServletRequest request); static final String ORGANISATION_TYPE; static final String ORGANISATION_INTERNATIONAL; static final String ORGANISATION_INTERNATIONAL_DETAILS; static final String KNOWLEDGE_BASE_DETAILS; static final String KNOWLEDGE_BASE_ADDRESS; static final String ORGANISATION_FORM; static final String ORGANISATION_ID; static final String INVITE_HASH; static final String PROJECT_INVITE_HASH; static final String COMPETITION_ID; }
@Test public void getOrganisationTypeCookieValue() throws Exception { OrganisationTypeForm organisationTypeForm = new OrganisationTypeForm(); when(cookieUtil.getCookieValue(request, ORGANISATION_TYPE)).thenReturn(JsonUtil.getSerializedObject(organisationTypeForm)); Optional<OrganisationTypeForm> result = service.getOrganisationTypeCookieValue(request); assertEquals(result.get(),organisationTypeForm); verify(cookieUtil, times(1)).getCookieValue(request, ORGANISATION_TYPE); } @Test public void getOrganisationTypeCookieValue_shouldReturnEmptyOptionalOnEmptyCookie() throws Exception { when(cookieUtil.getCookieValue(request, ORGANISATION_TYPE)).thenReturn(""); Optional<OrganisationTypeForm> result = service.getOrganisationTypeCookieValue(request); assertFalse(result.isPresent()); verify(cookieUtil, times(1)).getCookieValue(request, ORGANISATION_TYPE); }
RegistrationCookieService { public Optional<OrganisationCreationForm> getOrganisationCreationCookieValue(HttpServletRequest request) { return Optional.ofNullable(getObjectFromJson(cookieUtil.getCookieValue(request, ORGANISATION_FORM), OrganisationCreationForm.class)); } void saveToOrganisationTypeCookie(OrganisationTypeForm organisationTypeForm, HttpServletResponse response); void saveToOrganisationInternationalCookie(OrganisationInternationalForm organisationInternationalForm, HttpServletResponse response); void saveToOrganisationCreationCookie(OrganisationCreationForm organisationFormForCookie, HttpServletResponse response); void saveToOrganisationInternationalDetailsCookie(OrganisationInternationalDetailsForm organisationFormForCookie, HttpServletResponse response); void saveToKnowledgeBaseDetailsCookie(KnowledgeBaseCreateForm organisationFormForCookie, HttpServletResponse response); void saveToKnowledgeBaseAddressCookie(AddressResource addressResource, HttpServletResponse response); void saveToOrganisationIdCookie(Long id, HttpServletResponse response); void saveToCompetitionIdCookie(Long id, HttpServletResponse response); void saveToInviteHashCookie(String hash, HttpServletResponse response); void saveToProjectInviteHashCookie(InviteAndIdCookie inviteAndIdCookie, HttpServletResponse response); Optional<OrganisationTypeForm> getOrganisationTypeCookieValue(HttpServletRequest request); Optional<OrganisationInternationalForm> getOrganisationInternationalCookieValue(HttpServletRequest request); Optional<OrganisationCreationForm> getOrganisationCreationCookieValue(HttpServletRequest request); Optional<OrganisationInternationalDetailsForm> getOrganisationInternationalDetailsValue(HttpServletRequest request); Optional<KnowledgeBaseCreateForm> getKnowledgeBaseDetailsValue(HttpServletRequest request); Optional<AddressResource> getKnowledgeBaseAddressCookie(HttpServletRequest request); Optional<Long> getOrganisationIdCookieValue(HttpServletRequest request); Optional<Long> getCompetitionIdCookieValue(HttpServletRequest request); Optional<String> getInviteHashCookieValue(HttpServletRequest request); Optional<InviteAndIdCookie> getProjectInviteHashCookieValue(HttpServletRequest request); void deleteOrganisationTypeCookie(HttpServletResponse response); void deleteOrganisationInternationalCookie(HttpServletResponse response); void deleteOrganisationCreationCookie(HttpServletResponse response); void deleteKnowledgeBaseDetailsCookie(HttpServletResponse response); void deleteKnowledgeBaseAddressCookie(HttpServletResponse response); void deleteOrganisationInternationalDetailsCookie(HttpServletResponse response); void deleteOrganisationIdCookie(HttpServletResponse response); void deleteInviteHashCookie(HttpServletResponse response); void deleteCompetitionIdCookie(HttpServletResponse response); void deleteProjectInviteHashCookie(HttpServletResponse response); void deleteAllRegistrationJourneyCookies(HttpServletResponse response); boolean isCollaboratorJourney(HttpServletRequest request); boolean isLeadJourney(HttpServletRequest request); boolean isApplicantJourney(HttpServletRequest request); boolean isInternationalJourney(HttpServletRequest request); static final String ORGANISATION_TYPE; static final String ORGANISATION_INTERNATIONAL; static final String ORGANISATION_INTERNATIONAL_DETAILS; static final String KNOWLEDGE_BASE_DETAILS; static final String KNOWLEDGE_BASE_ADDRESS; static final String ORGANISATION_FORM; static final String ORGANISATION_ID; static final String INVITE_HASH; static final String PROJECT_INVITE_HASH; static final String COMPETITION_ID; }
@Test public void getOrganisationCreationCookieValue() throws Exception { OrganisationCreationForm organisationForm = new OrganisationCreationForm(); when(cookieUtil.getCookieValue(request, ORGANISATION_FORM)).thenReturn(JsonUtil.getSerializedObject(organisationForm)); Optional<OrganisationCreationForm> result = service.getOrganisationCreationCookieValue(request); assertEquals(result.get(),organisationForm); verify(cookieUtil, times(1)).getCookieValue(request, ORGANISATION_FORM); } @Test public void getOrganisationCreationCookieValue_shouldReturnEmptyOptionalOnEmptyCookie() { when(cookieUtil.getCookieValue(request, ORGANISATION_FORM)).thenReturn(""); Optional<OrganisationCreationForm> result = service.getOrganisationCreationCookieValue(request); assertFalse(result.isPresent()); verify(cookieUtil, times(1)).getCookieValue(request, ORGANISATION_FORM); }
RegistrationCookieService { public Optional<Long> getOrganisationIdCookieValue(HttpServletRequest request) { return Optional.ofNullable(getObjectFromJson(cookieUtil.getCookieValue(request, ORGANISATION_ID), Long.class)); } void saveToOrganisationTypeCookie(OrganisationTypeForm organisationTypeForm, HttpServletResponse response); void saveToOrganisationInternationalCookie(OrganisationInternationalForm organisationInternationalForm, HttpServletResponse response); void saveToOrganisationCreationCookie(OrganisationCreationForm organisationFormForCookie, HttpServletResponse response); void saveToOrganisationInternationalDetailsCookie(OrganisationInternationalDetailsForm organisationFormForCookie, HttpServletResponse response); void saveToKnowledgeBaseDetailsCookie(KnowledgeBaseCreateForm organisationFormForCookie, HttpServletResponse response); void saveToKnowledgeBaseAddressCookie(AddressResource addressResource, HttpServletResponse response); void saveToOrganisationIdCookie(Long id, HttpServletResponse response); void saveToCompetitionIdCookie(Long id, HttpServletResponse response); void saveToInviteHashCookie(String hash, HttpServletResponse response); void saveToProjectInviteHashCookie(InviteAndIdCookie inviteAndIdCookie, HttpServletResponse response); Optional<OrganisationTypeForm> getOrganisationTypeCookieValue(HttpServletRequest request); Optional<OrganisationInternationalForm> getOrganisationInternationalCookieValue(HttpServletRequest request); Optional<OrganisationCreationForm> getOrganisationCreationCookieValue(HttpServletRequest request); Optional<OrganisationInternationalDetailsForm> getOrganisationInternationalDetailsValue(HttpServletRequest request); Optional<KnowledgeBaseCreateForm> getKnowledgeBaseDetailsValue(HttpServletRequest request); Optional<AddressResource> getKnowledgeBaseAddressCookie(HttpServletRequest request); Optional<Long> getOrganisationIdCookieValue(HttpServletRequest request); Optional<Long> getCompetitionIdCookieValue(HttpServletRequest request); Optional<String> getInviteHashCookieValue(HttpServletRequest request); Optional<InviteAndIdCookie> getProjectInviteHashCookieValue(HttpServletRequest request); void deleteOrganisationTypeCookie(HttpServletResponse response); void deleteOrganisationInternationalCookie(HttpServletResponse response); void deleteOrganisationCreationCookie(HttpServletResponse response); void deleteKnowledgeBaseDetailsCookie(HttpServletResponse response); void deleteKnowledgeBaseAddressCookie(HttpServletResponse response); void deleteOrganisationInternationalDetailsCookie(HttpServletResponse response); void deleteOrganisationIdCookie(HttpServletResponse response); void deleteInviteHashCookie(HttpServletResponse response); void deleteCompetitionIdCookie(HttpServletResponse response); void deleteProjectInviteHashCookie(HttpServletResponse response); void deleteAllRegistrationJourneyCookies(HttpServletResponse response); boolean isCollaboratorJourney(HttpServletRequest request); boolean isLeadJourney(HttpServletRequest request); boolean isApplicantJourney(HttpServletRequest request); boolean isInternationalJourney(HttpServletRequest request); static final String ORGANISATION_TYPE; static final String ORGANISATION_INTERNATIONAL; static final String ORGANISATION_INTERNATIONAL_DETAILS; static final String KNOWLEDGE_BASE_DETAILS; static final String KNOWLEDGE_BASE_ADDRESS; static final String ORGANISATION_FORM; static final String ORGANISATION_ID; static final String INVITE_HASH; static final String PROJECT_INVITE_HASH; static final String COMPETITION_ID; }
@Test public void getOrganisationIdCookieValue() throws Exception { Long organisationId = 1L; when(cookieUtil.getCookieValue(request, ORGANISATION_ID)).thenReturn(String.valueOf(organisationId)); Optional<Long> result = service.getOrganisationIdCookieValue(request); assertEquals(result.get(),organisationId); verify(cookieUtil, times(1)).getCookieValue(request, ORGANISATION_ID); } @Test public void getOrganisationIdCookieValue_shouldReturnEmptyOptionalOnEmptyCookie() { when(cookieUtil.getCookieValue(request, ORGANISATION_ID)).thenReturn(""); Optional<Long> result = service.getOrganisationIdCookieValue(request); assertFalse(result.isPresent()); verify(cookieUtil, times(1)).getCookieValue(request, ORGANISATION_ID); }
RegistrationCookieService { public Optional<Long> getCompetitionIdCookieValue(HttpServletRequest request) { return Optional.ofNullable(getObjectFromJson(cookieUtil.getCookieValue(request, COMPETITION_ID), Long.class)); } void saveToOrganisationTypeCookie(OrganisationTypeForm organisationTypeForm, HttpServletResponse response); void saveToOrganisationInternationalCookie(OrganisationInternationalForm organisationInternationalForm, HttpServletResponse response); void saveToOrganisationCreationCookie(OrganisationCreationForm organisationFormForCookie, HttpServletResponse response); void saveToOrganisationInternationalDetailsCookie(OrganisationInternationalDetailsForm organisationFormForCookie, HttpServletResponse response); void saveToKnowledgeBaseDetailsCookie(KnowledgeBaseCreateForm organisationFormForCookie, HttpServletResponse response); void saveToKnowledgeBaseAddressCookie(AddressResource addressResource, HttpServletResponse response); void saveToOrganisationIdCookie(Long id, HttpServletResponse response); void saveToCompetitionIdCookie(Long id, HttpServletResponse response); void saveToInviteHashCookie(String hash, HttpServletResponse response); void saveToProjectInviteHashCookie(InviteAndIdCookie inviteAndIdCookie, HttpServletResponse response); Optional<OrganisationTypeForm> getOrganisationTypeCookieValue(HttpServletRequest request); Optional<OrganisationInternationalForm> getOrganisationInternationalCookieValue(HttpServletRequest request); Optional<OrganisationCreationForm> getOrganisationCreationCookieValue(HttpServletRequest request); Optional<OrganisationInternationalDetailsForm> getOrganisationInternationalDetailsValue(HttpServletRequest request); Optional<KnowledgeBaseCreateForm> getKnowledgeBaseDetailsValue(HttpServletRequest request); Optional<AddressResource> getKnowledgeBaseAddressCookie(HttpServletRequest request); Optional<Long> getOrganisationIdCookieValue(HttpServletRequest request); Optional<Long> getCompetitionIdCookieValue(HttpServletRequest request); Optional<String> getInviteHashCookieValue(HttpServletRequest request); Optional<InviteAndIdCookie> getProjectInviteHashCookieValue(HttpServletRequest request); void deleteOrganisationTypeCookie(HttpServletResponse response); void deleteOrganisationInternationalCookie(HttpServletResponse response); void deleteOrganisationCreationCookie(HttpServletResponse response); void deleteKnowledgeBaseDetailsCookie(HttpServletResponse response); void deleteKnowledgeBaseAddressCookie(HttpServletResponse response); void deleteOrganisationInternationalDetailsCookie(HttpServletResponse response); void deleteOrganisationIdCookie(HttpServletResponse response); void deleteInviteHashCookie(HttpServletResponse response); void deleteCompetitionIdCookie(HttpServletResponse response); void deleteProjectInviteHashCookie(HttpServletResponse response); void deleteAllRegistrationJourneyCookies(HttpServletResponse response); boolean isCollaboratorJourney(HttpServletRequest request); boolean isLeadJourney(HttpServletRequest request); boolean isApplicantJourney(HttpServletRequest request); boolean isInternationalJourney(HttpServletRequest request); static final String ORGANISATION_TYPE; static final String ORGANISATION_INTERNATIONAL; static final String ORGANISATION_INTERNATIONAL_DETAILS; static final String KNOWLEDGE_BASE_DETAILS; static final String KNOWLEDGE_BASE_ADDRESS; static final String ORGANISATION_FORM; static final String ORGANISATION_ID; static final String INVITE_HASH; static final String PROJECT_INVITE_HASH; static final String COMPETITION_ID; }
@Test public void getCompetitionIdCookieValue() throws Exception { Long competitionId = 1L; when(cookieUtil.getCookieValue(request, COMPETITION_ID)).thenReturn(String.valueOf(competitionId)); Optional<Long> result = service.getCompetitionIdCookieValue(request); assertEquals(result.get(),competitionId); verify(cookieUtil, times(1)).getCookieValue(request, COMPETITION_ID); } @Test public void getCompetitionIdCookieValue_shouldReturnEmptyOptionalOnEmptyCookie() { when(cookieUtil.getCookieValue(request, COMPETITION_ID)).thenReturn(""); Optional<Long> result = service.getCompetitionIdCookieValue(request); assertFalse(result.isPresent()); verify(cookieUtil, times(1)).getCookieValue(request, COMPETITION_ID); }
RegistrationCookieService { public Optional<String> getInviteHashCookieValue(HttpServletRequest request) { String inviteHash = cookieUtil.getCookieValue(request, INVITE_HASH); return Optional.ofNullable(inviteHash).filter(s -> !s.isEmpty()); } void saveToOrganisationTypeCookie(OrganisationTypeForm organisationTypeForm, HttpServletResponse response); void saveToOrganisationInternationalCookie(OrganisationInternationalForm organisationInternationalForm, HttpServletResponse response); void saveToOrganisationCreationCookie(OrganisationCreationForm organisationFormForCookie, HttpServletResponse response); void saveToOrganisationInternationalDetailsCookie(OrganisationInternationalDetailsForm organisationFormForCookie, HttpServletResponse response); void saveToKnowledgeBaseDetailsCookie(KnowledgeBaseCreateForm organisationFormForCookie, HttpServletResponse response); void saveToKnowledgeBaseAddressCookie(AddressResource addressResource, HttpServletResponse response); void saveToOrganisationIdCookie(Long id, HttpServletResponse response); void saveToCompetitionIdCookie(Long id, HttpServletResponse response); void saveToInviteHashCookie(String hash, HttpServletResponse response); void saveToProjectInviteHashCookie(InviteAndIdCookie inviteAndIdCookie, HttpServletResponse response); Optional<OrganisationTypeForm> getOrganisationTypeCookieValue(HttpServletRequest request); Optional<OrganisationInternationalForm> getOrganisationInternationalCookieValue(HttpServletRequest request); Optional<OrganisationCreationForm> getOrganisationCreationCookieValue(HttpServletRequest request); Optional<OrganisationInternationalDetailsForm> getOrganisationInternationalDetailsValue(HttpServletRequest request); Optional<KnowledgeBaseCreateForm> getKnowledgeBaseDetailsValue(HttpServletRequest request); Optional<AddressResource> getKnowledgeBaseAddressCookie(HttpServletRequest request); Optional<Long> getOrganisationIdCookieValue(HttpServletRequest request); Optional<Long> getCompetitionIdCookieValue(HttpServletRequest request); Optional<String> getInviteHashCookieValue(HttpServletRequest request); Optional<InviteAndIdCookie> getProjectInviteHashCookieValue(HttpServletRequest request); void deleteOrganisationTypeCookie(HttpServletResponse response); void deleteOrganisationInternationalCookie(HttpServletResponse response); void deleteOrganisationCreationCookie(HttpServletResponse response); void deleteKnowledgeBaseDetailsCookie(HttpServletResponse response); void deleteKnowledgeBaseAddressCookie(HttpServletResponse response); void deleteOrganisationInternationalDetailsCookie(HttpServletResponse response); void deleteOrganisationIdCookie(HttpServletResponse response); void deleteInviteHashCookie(HttpServletResponse response); void deleteCompetitionIdCookie(HttpServletResponse response); void deleteProjectInviteHashCookie(HttpServletResponse response); void deleteAllRegistrationJourneyCookies(HttpServletResponse response); boolean isCollaboratorJourney(HttpServletRequest request); boolean isLeadJourney(HttpServletRequest request); boolean isApplicantJourney(HttpServletRequest request); boolean isInternationalJourney(HttpServletRequest request); static final String ORGANISATION_TYPE; static final String ORGANISATION_INTERNATIONAL; static final String ORGANISATION_INTERNATIONAL_DETAILS; static final String KNOWLEDGE_BASE_DETAILS; static final String KNOWLEDGE_BASE_ADDRESS; static final String ORGANISATION_FORM; static final String ORGANISATION_ID; static final String INVITE_HASH; static final String PROJECT_INVITE_HASH; static final String COMPETITION_ID; }
@Test public void getInviteHashCookieValue() throws Exception { String inviteHash = "123abc"; when(cookieUtil.getCookieValue(request, INVITE_HASH)).thenReturn(inviteHash); Optional<String> result = service.getInviteHashCookieValue(request); assertEquals(result.get(),inviteHash); verify(cookieUtil, times(1)).getCookieValue(request, INVITE_HASH); } @Test public void getInviteHashCookieValue_shouldReturnEmptyOptionalOnEmptyCookie() { when(cookieUtil.getCookieValue(request, INVITE_HASH)).thenReturn(""); Optional<String> result = service.getInviteHashCookieValue(request); assertFalse(result.isPresent()); verify(cookieUtil, times(1)).getCookieValue(request, INVITE_HASH); }
RegistrationCookieService { public void deleteOrganisationTypeCookie(HttpServletResponse response) { cookieUtil.removeCookie(response, ORGANISATION_TYPE); } void saveToOrganisationTypeCookie(OrganisationTypeForm organisationTypeForm, HttpServletResponse response); void saveToOrganisationInternationalCookie(OrganisationInternationalForm organisationInternationalForm, HttpServletResponse response); void saveToOrganisationCreationCookie(OrganisationCreationForm organisationFormForCookie, HttpServletResponse response); void saveToOrganisationInternationalDetailsCookie(OrganisationInternationalDetailsForm organisationFormForCookie, HttpServletResponse response); void saveToKnowledgeBaseDetailsCookie(KnowledgeBaseCreateForm organisationFormForCookie, HttpServletResponse response); void saveToKnowledgeBaseAddressCookie(AddressResource addressResource, HttpServletResponse response); void saveToOrganisationIdCookie(Long id, HttpServletResponse response); void saveToCompetitionIdCookie(Long id, HttpServletResponse response); void saveToInviteHashCookie(String hash, HttpServletResponse response); void saveToProjectInviteHashCookie(InviteAndIdCookie inviteAndIdCookie, HttpServletResponse response); Optional<OrganisationTypeForm> getOrganisationTypeCookieValue(HttpServletRequest request); Optional<OrganisationInternationalForm> getOrganisationInternationalCookieValue(HttpServletRequest request); Optional<OrganisationCreationForm> getOrganisationCreationCookieValue(HttpServletRequest request); Optional<OrganisationInternationalDetailsForm> getOrganisationInternationalDetailsValue(HttpServletRequest request); Optional<KnowledgeBaseCreateForm> getKnowledgeBaseDetailsValue(HttpServletRequest request); Optional<AddressResource> getKnowledgeBaseAddressCookie(HttpServletRequest request); Optional<Long> getOrganisationIdCookieValue(HttpServletRequest request); Optional<Long> getCompetitionIdCookieValue(HttpServletRequest request); Optional<String> getInviteHashCookieValue(HttpServletRequest request); Optional<InviteAndIdCookie> getProjectInviteHashCookieValue(HttpServletRequest request); void deleteOrganisationTypeCookie(HttpServletResponse response); void deleteOrganisationInternationalCookie(HttpServletResponse response); void deleteOrganisationCreationCookie(HttpServletResponse response); void deleteKnowledgeBaseDetailsCookie(HttpServletResponse response); void deleteKnowledgeBaseAddressCookie(HttpServletResponse response); void deleteOrganisationInternationalDetailsCookie(HttpServletResponse response); void deleteOrganisationIdCookie(HttpServletResponse response); void deleteInviteHashCookie(HttpServletResponse response); void deleteCompetitionIdCookie(HttpServletResponse response); void deleteProjectInviteHashCookie(HttpServletResponse response); void deleteAllRegistrationJourneyCookies(HttpServletResponse response); boolean isCollaboratorJourney(HttpServletRequest request); boolean isLeadJourney(HttpServletRequest request); boolean isApplicantJourney(HttpServletRequest request); boolean isInternationalJourney(HttpServletRequest request); static final String ORGANISATION_TYPE; static final String ORGANISATION_INTERNATIONAL; static final String ORGANISATION_INTERNATIONAL_DETAILS; static final String KNOWLEDGE_BASE_DETAILS; static final String KNOWLEDGE_BASE_ADDRESS; static final String ORGANISATION_FORM; static final String ORGANISATION_ID; static final String INVITE_HASH; static final String PROJECT_INVITE_HASH; static final String COMPETITION_ID; }
@Test public void deleteOrganisationTypeCookie() throws Exception { service.deleteOrganisationTypeCookie(response); verify(cookieUtil, times(1)).removeCookie(response, ORGANISATION_TYPE); }
RegistrationCookieService { public void deleteOrganisationCreationCookie(HttpServletResponse response) { cookieUtil.removeCookie(response, ORGANISATION_FORM); } void saveToOrganisationTypeCookie(OrganisationTypeForm organisationTypeForm, HttpServletResponse response); void saveToOrganisationInternationalCookie(OrganisationInternationalForm organisationInternationalForm, HttpServletResponse response); void saveToOrganisationCreationCookie(OrganisationCreationForm organisationFormForCookie, HttpServletResponse response); void saveToOrganisationInternationalDetailsCookie(OrganisationInternationalDetailsForm organisationFormForCookie, HttpServletResponse response); void saveToKnowledgeBaseDetailsCookie(KnowledgeBaseCreateForm organisationFormForCookie, HttpServletResponse response); void saveToKnowledgeBaseAddressCookie(AddressResource addressResource, HttpServletResponse response); void saveToOrganisationIdCookie(Long id, HttpServletResponse response); void saveToCompetitionIdCookie(Long id, HttpServletResponse response); void saveToInviteHashCookie(String hash, HttpServletResponse response); void saveToProjectInviteHashCookie(InviteAndIdCookie inviteAndIdCookie, HttpServletResponse response); Optional<OrganisationTypeForm> getOrganisationTypeCookieValue(HttpServletRequest request); Optional<OrganisationInternationalForm> getOrganisationInternationalCookieValue(HttpServletRequest request); Optional<OrganisationCreationForm> getOrganisationCreationCookieValue(HttpServletRequest request); Optional<OrganisationInternationalDetailsForm> getOrganisationInternationalDetailsValue(HttpServletRequest request); Optional<KnowledgeBaseCreateForm> getKnowledgeBaseDetailsValue(HttpServletRequest request); Optional<AddressResource> getKnowledgeBaseAddressCookie(HttpServletRequest request); Optional<Long> getOrganisationIdCookieValue(HttpServletRequest request); Optional<Long> getCompetitionIdCookieValue(HttpServletRequest request); Optional<String> getInviteHashCookieValue(HttpServletRequest request); Optional<InviteAndIdCookie> getProjectInviteHashCookieValue(HttpServletRequest request); void deleteOrganisationTypeCookie(HttpServletResponse response); void deleteOrganisationInternationalCookie(HttpServletResponse response); void deleteOrganisationCreationCookie(HttpServletResponse response); void deleteKnowledgeBaseDetailsCookie(HttpServletResponse response); void deleteKnowledgeBaseAddressCookie(HttpServletResponse response); void deleteOrganisationInternationalDetailsCookie(HttpServletResponse response); void deleteOrganisationIdCookie(HttpServletResponse response); void deleteInviteHashCookie(HttpServletResponse response); void deleteCompetitionIdCookie(HttpServletResponse response); void deleteProjectInviteHashCookie(HttpServletResponse response); void deleteAllRegistrationJourneyCookies(HttpServletResponse response); boolean isCollaboratorJourney(HttpServletRequest request); boolean isLeadJourney(HttpServletRequest request); boolean isApplicantJourney(HttpServletRequest request); boolean isInternationalJourney(HttpServletRequest request); static final String ORGANISATION_TYPE; static final String ORGANISATION_INTERNATIONAL; static final String ORGANISATION_INTERNATIONAL_DETAILS; static final String KNOWLEDGE_BASE_DETAILS; static final String KNOWLEDGE_BASE_ADDRESS; static final String ORGANISATION_FORM; static final String ORGANISATION_ID; static final String INVITE_HASH; static final String PROJECT_INVITE_HASH; static final String COMPETITION_ID; }
@Test public void deleteOrganisationCreationCookie() throws Exception { service.deleteOrganisationCreationCookie(response); verify(cookieUtil, times(1)).removeCookie(response, ORGANISATION_FORM); }
RegistrationCookieService { public void deleteOrganisationIdCookie(HttpServletResponse response) { cookieUtil.removeCookie(response, ORGANISATION_ID); } void saveToOrganisationTypeCookie(OrganisationTypeForm organisationTypeForm, HttpServletResponse response); void saveToOrganisationInternationalCookie(OrganisationInternationalForm organisationInternationalForm, HttpServletResponse response); void saveToOrganisationCreationCookie(OrganisationCreationForm organisationFormForCookie, HttpServletResponse response); void saveToOrganisationInternationalDetailsCookie(OrganisationInternationalDetailsForm organisationFormForCookie, HttpServletResponse response); void saveToKnowledgeBaseDetailsCookie(KnowledgeBaseCreateForm organisationFormForCookie, HttpServletResponse response); void saveToKnowledgeBaseAddressCookie(AddressResource addressResource, HttpServletResponse response); void saveToOrganisationIdCookie(Long id, HttpServletResponse response); void saveToCompetitionIdCookie(Long id, HttpServletResponse response); void saveToInviteHashCookie(String hash, HttpServletResponse response); void saveToProjectInviteHashCookie(InviteAndIdCookie inviteAndIdCookie, HttpServletResponse response); Optional<OrganisationTypeForm> getOrganisationTypeCookieValue(HttpServletRequest request); Optional<OrganisationInternationalForm> getOrganisationInternationalCookieValue(HttpServletRequest request); Optional<OrganisationCreationForm> getOrganisationCreationCookieValue(HttpServletRequest request); Optional<OrganisationInternationalDetailsForm> getOrganisationInternationalDetailsValue(HttpServletRequest request); Optional<KnowledgeBaseCreateForm> getKnowledgeBaseDetailsValue(HttpServletRequest request); Optional<AddressResource> getKnowledgeBaseAddressCookie(HttpServletRequest request); Optional<Long> getOrganisationIdCookieValue(HttpServletRequest request); Optional<Long> getCompetitionIdCookieValue(HttpServletRequest request); Optional<String> getInviteHashCookieValue(HttpServletRequest request); Optional<InviteAndIdCookie> getProjectInviteHashCookieValue(HttpServletRequest request); void deleteOrganisationTypeCookie(HttpServletResponse response); void deleteOrganisationInternationalCookie(HttpServletResponse response); void deleteOrganisationCreationCookie(HttpServletResponse response); void deleteKnowledgeBaseDetailsCookie(HttpServletResponse response); void deleteKnowledgeBaseAddressCookie(HttpServletResponse response); void deleteOrganisationInternationalDetailsCookie(HttpServletResponse response); void deleteOrganisationIdCookie(HttpServletResponse response); void deleteInviteHashCookie(HttpServletResponse response); void deleteCompetitionIdCookie(HttpServletResponse response); void deleteProjectInviteHashCookie(HttpServletResponse response); void deleteAllRegistrationJourneyCookies(HttpServletResponse response); boolean isCollaboratorJourney(HttpServletRequest request); boolean isLeadJourney(HttpServletRequest request); boolean isApplicantJourney(HttpServletRequest request); boolean isInternationalJourney(HttpServletRequest request); static final String ORGANISATION_TYPE; static final String ORGANISATION_INTERNATIONAL; static final String ORGANISATION_INTERNATIONAL_DETAILS; static final String KNOWLEDGE_BASE_DETAILS; static final String KNOWLEDGE_BASE_ADDRESS; static final String ORGANISATION_FORM; static final String ORGANISATION_ID; static final String INVITE_HASH; static final String PROJECT_INVITE_HASH; static final String COMPETITION_ID; }
@Test public void deleteOrganisationIdCookie() throws Exception { service.deleteOrganisationIdCookie(response); verify(cookieUtil, times(1)).removeCookie(response, ORGANISATION_ID); }
RegistrationCookieService { public void deleteInviteHashCookie(HttpServletResponse response) { cookieUtil.removeCookie(response, INVITE_HASH); } void saveToOrganisationTypeCookie(OrganisationTypeForm organisationTypeForm, HttpServletResponse response); void saveToOrganisationInternationalCookie(OrganisationInternationalForm organisationInternationalForm, HttpServletResponse response); void saveToOrganisationCreationCookie(OrganisationCreationForm organisationFormForCookie, HttpServletResponse response); void saveToOrganisationInternationalDetailsCookie(OrganisationInternationalDetailsForm organisationFormForCookie, HttpServletResponse response); void saveToKnowledgeBaseDetailsCookie(KnowledgeBaseCreateForm organisationFormForCookie, HttpServletResponse response); void saveToKnowledgeBaseAddressCookie(AddressResource addressResource, HttpServletResponse response); void saveToOrganisationIdCookie(Long id, HttpServletResponse response); void saveToCompetitionIdCookie(Long id, HttpServletResponse response); void saveToInviteHashCookie(String hash, HttpServletResponse response); void saveToProjectInviteHashCookie(InviteAndIdCookie inviteAndIdCookie, HttpServletResponse response); Optional<OrganisationTypeForm> getOrganisationTypeCookieValue(HttpServletRequest request); Optional<OrganisationInternationalForm> getOrganisationInternationalCookieValue(HttpServletRequest request); Optional<OrganisationCreationForm> getOrganisationCreationCookieValue(HttpServletRequest request); Optional<OrganisationInternationalDetailsForm> getOrganisationInternationalDetailsValue(HttpServletRequest request); Optional<KnowledgeBaseCreateForm> getKnowledgeBaseDetailsValue(HttpServletRequest request); Optional<AddressResource> getKnowledgeBaseAddressCookie(HttpServletRequest request); Optional<Long> getOrganisationIdCookieValue(HttpServletRequest request); Optional<Long> getCompetitionIdCookieValue(HttpServletRequest request); Optional<String> getInviteHashCookieValue(HttpServletRequest request); Optional<InviteAndIdCookie> getProjectInviteHashCookieValue(HttpServletRequest request); void deleteOrganisationTypeCookie(HttpServletResponse response); void deleteOrganisationInternationalCookie(HttpServletResponse response); void deleteOrganisationCreationCookie(HttpServletResponse response); void deleteKnowledgeBaseDetailsCookie(HttpServletResponse response); void deleteKnowledgeBaseAddressCookie(HttpServletResponse response); void deleteOrganisationInternationalDetailsCookie(HttpServletResponse response); void deleteOrganisationIdCookie(HttpServletResponse response); void deleteInviteHashCookie(HttpServletResponse response); void deleteCompetitionIdCookie(HttpServletResponse response); void deleteProjectInviteHashCookie(HttpServletResponse response); void deleteAllRegistrationJourneyCookies(HttpServletResponse response); boolean isCollaboratorJourney(HttpServletRequest request); boolean isLeadJourney(HttpServletRequest request); boolean isApplicantJourney(HttpServletRequest request); boolean isInternationalJourney(HttpServletRequest request); static final String ORGANISATION_TYPE; static final String ORGANISATION_INTERNATIONAL; static final String ORGANISATION_INTERNATIONAL_DETAILS; static final String KNOWLEDGE_BASE_DETAILS; static final String KNOWLEDGE_BASE_ADDRESS; static final String ORGANISATION_FORM; static final String ORGANISATION_ID; static final String INVITE_HASH; static final String PROJECT_INVITE_HASH; static final String COMPETITION_ID; }
@Test public void deleteInviteHashCookie() throws Exception { service.deleteInviteHashCookie(response); verify(cookieUtil, times(1)).removeCookie(response, INVITE_HASH); }
RegistrationCookieService { public void deleteCompetitionIdCookie(HttpServletResponse response) { cookieUtil.removeCookie(response, COMPETITION_ID); } void saveToOrganisationTypeCookie(OrganisationTypeForm organisationTypeForm, HttpServletResponse response); void saveToOrganisationInternationalCookie(OrganisationInternationalForm organisationInternationalForm, HttpServletResponse response); void saveToOrganisationCreationCookie(OrganisationCreationForm organisationFormForCookie, HttpServletResponse response); void saveToOrganisationInternationalDetailsCookie(OrganisationInternationalDetailsForm organisationFormForCookie, HttpServletResponse response); void saveToKnowledgeBaseDetailsCookie(KnowledgeBaseCreateForm organisationFormForCookie, HttpServletResponse response); void saveToKnowledgeBaseAddressCookie(AddressResource addressResource, HttpServletResponse response); void saveToOrganisationIdCookie(Long id, HttpServletResponse response); void saveToCompetitionIdCookie(Long id, HttpServletResponse response); void saveToInviteHashCookie(String hash, HttpServletResponse response); void saveToProjectInviteHashCookie(InviteAndIdCookie inviteAndIdCookie, HttpServletResponse response); Optional<OrganisationTypeForm> getOrganisationTypeCookieValue(HttpServletRequest request); Optional<OrganisationInternationalForm> getOrganisationInternationalCookieValue(HttpServletRequest request); Optional<OrganisationCreationForm> getOrganisationCreationCookieValue(HttpServletRequest request); Optional<OrganisationInternationalDetailsForm> getOrganisationInternationalDetailsValue(HttpServletRequest request); Optional<KnowledgeBaseCreateForm> getKnowledgeBaseDetailsValue(HttpServletRequest request); Optional<AddressResource> getKnowledgeBaseAddressCookie(HttpServletRequest request); Optional<Long> getOrganisationIdCookieValue(HttpServletRequest request); Optional<Long> getCompetitionIdCookieValue(HttpServletRequest request); Optional<String> getInviteHashCookieValue(HttpServletRequest request); Optional<InviteAndIdCookie> getProjectInviteHashCookieValue(HttpServletRequest request); void deleteOrganisationTypeCookie(HttpServletResponse response); void deleteOrganisationInternationalCookie(HttpServletResponse response); void deleteOrganisationCreationCookie(HttpServletResponse response); void deleteKnowledgeBaseDetailsCookie(HttpServletResponse response); void deleteKnowledgeBaseAddressCookie(HttpServletResponse response); void deleteOrganisationInternationalDetailsCookie(HttpServletResponse response); void deleteOrganisationIdCookie(HttpServletResponse response); void deleteInviteHashCookie(HttpServletResponse response); void deleteCompetitionIdCookie(HttpServletResponse response); void deleteProjectInviteHashCookie(HttpServletResponse response); void deleteAllRegistrationJourneyCookies(HttpServletResponse response); boolean isCollaboratorJourney(HttpServletRequest request); boolean isLeadJourney(HttpServletRequest request); boolean isApplicantJourney(HttpServletRequest request); boolean isInternationalJourney(HttpServletRequest request); static final String ORGANISATION_TYPE; static final String ORGANISATION_INTERNATIONAL; static final String ORGANISATION_INTERNATIONAL_DETAILS; static final String KNOWLEDGE_BASE_DETAILS; static final String KNOWLEDGE_BASE_ADDRESS; static final String ORGANISATION_FORM; static final String ORGANISATION_ID; static final String INVITE_HASH; static final String PROJECT_INVITE_HASH; static final String COMPETITION_ID; }
@Test public void deleteCompetitionIdCookie() throws Exception { service.deleteCompetitionIdCookie(response); verify(cookieUtil, times(1)).removeCookie(response, COMPETITION_ID); }
RegistrationCookieService { public void deleteAllRegistrationJourneyCookies(HttpServletResponse response) { deleteOrganisationTypeCookie(response); deleteOrganisationCreationCookie(response); deleteOrganisationIdCookie(response); deleteInviteHashCookie(response); deleteCompetitionIdCookie(response); deleteProjectInviteHashCookie(response); deleteOrganisationInternationalCookie(response); deleteOrganisationInternationalDetailsCookie(response); deleteKnowledgeBaseDetailsCookie(response); deleteKnowledgeBaseAddressCookie(response); } void saveToOrganisationTypeCookie(OrganisationTypeForm organisationTypeForm, HttpServletResponse response); void saveToOrganisationInternationalCookie(OrganisationInternationalForm organisationInternationalForm, HttpServletResponse response); void saveToOrganisationCreationCookie(OrganisationCreationForm organisationFormForCookie, HttpServletResponse response); void saveToOrganisationInternationalDetailsCookie(OrganisationInternationalDetailsForm organisationFormForCookie, HttpServletResponse response); void saveToKnowledgeBaseDetailsCookie(KnowledgeBaseCreateForm organisationFormForCookie, HttpServletResponse response); void saveToKnowledgeBaseAddressCookie(AddressResource addressResource, HttpServletResponse response); void saveToOrganisationIdCookie(Long id, HttpServletResponse response); void saveToCompetitionIdCookie(Long id, HttpServletResponse response); void saveToInviteHashCookie(String hash, HttpServletResponse response); void saveToProjectInviteHashCookie(InviteAndIdCookie inviteAndIdCookie, HttpServletResponse response); Optional<OrganisationTypeForm> getOrganisationTypeCookieValue(HttpServletRequest request); Optional<OrganisationInternationalForm> getOrganisationInternationalCookieValue(HttpServletRequest request); Optional<OrganisationCreationForm> getOrganisationCreationCookieValue(HttpServletRequest request); Optional<OrganisationInternationalDetailsForm> getOrganisationInternationalDetailsValue(HttpServletRequest request); Optional<KnowledgeBaseCreateForm> getKnowledgeBaseDetailsValue(HttpServletRequest request); Optional<AddressResource> getKnowledgeBaseAddressCookie(HttpServletRequest request); Optional<Long> getOrganisationIdCookieValue(HttpServletRequest request); Optional<Long> getCompetitionIdCookieValue(HttpServletRequest request); Optional<String> getInviteHashCookieValue(HttpServletRequest request); Optional<InviteAndIdCookie> getProjectInviteHashCookieValue(HttpServletRequest request); void deleteOrganisationTypeCookie(HttpServletResponse response); void deleteOrganisationInternationalCookie(HttpServletResponse response); void deleteOrganisationCreationCookie(HttpServletResponse response); void deleteKnowledgeBaseDetailsCookie(HttpServletResponse response); void deleteKnowledgeBaseAddressCookie(HttpServletResponse response); void deleteOrganisationInternationalDetailsCookie(HttpServletResponse response); void deleteOrganisationIdCookie(HttpServletResponse response); void deleteInviteHashCookie(HttpServletResponse response); void deleteCompetitionIdCookie(HttpServletResponse response); void deleteProjectInviteHashCookie(HttpServletResponse response); void deleteAllRegistrationJourneyCookies(HttpServletResponse response); boolean isCollaboratorJourney(HttpServletRequest request); boolean isLeadJourney(HttpServletRequest request); boolean isApplicantJourney(HttpServletRequest request); boolean isInternationalJourney(HttpServletRequest request); static final String ORGANISATION_TYPE; static final String ORGANISATION_INTERNATIONAL; static final String ORGANISATION_INTERNATIONAL_DETAILS; static final String KNOWLEDGE_BASE_DETAILS; static final String KNOWLEDGE_BASE_ADDRESS; static final String ORGANISATION_FORM; static final String ORGANISATION_ID; static final String INVITE_HASH; static final String PROJECT_INVITE_HASH; static final String COMPETITION_ID; }
@Test public void deleteAllRegistrationJourneyCookies() throws Exception { service.deleteAllRegistrationJourneyCookies(response); verify(cookieUtil, times(1)).removeCookie(response, ORGANISATION_TYPE); verify(cookieUtil, times(1)).removeCookie(response, ORGANISATION_FORM); verify(cookieUtil, times(1)).removeCookie(response, ORGANISATION_ID); verify(cookieUtil, times(1)).removeCookie(response, COMPETITION_ID); verify(cookieUtil, times(1)).removeCookie(response, INVITE_HASH); }
FileDownloadControllerUtils { public static ResponseEntity<ByteArrayResource> getFileResponseEntity(ByteArrayResource resource, FileEntryResource fileEntry) { HttpHeaders httpHeaders = new HttpHeaders(); httpHeaders.setContentLength(resource.contentLength()); httpHeaders.setContentType(MediaType.parseMediaType(fileEntry.getMediaType())); if(StringUtils.hasText(fileEntry.getName())) { httpHeaders.add("Content-Disposition", "inline; filename=\"" + fileEntry.getName() + "\""); } return new ResponseEntity<>(resource, httpHeaders, HttpStatus.OK); } private FileDownloadControllerUtils(); static ResponseEntity<ByteArrayResource> getFileResponseEntity(ByteArrayResource resource, FileEntryResource fileEntry); }
@Test public void fileResponseEntity() { ByteArrayResource resource = new ByteArrayResource("somebytes".getBytes()); FileEntryResource fileEntry = new FileEntryResource(); fileEntry.setMediaType(MediaType.IMAGE_JPEG_VALUE); fileEntry.setName("name"); ResponseEntity<ByteArrayResource> result = FileDownloadControllerUtils.getFileResponseEntity(resource, fileEntry); assertEquals("inline; filename=\"name\"", result.getHeaders().get("Content-Disposition").get(0)); assertEquals("9", result.getHeaders().get("Content-Length").get(0)); assertEquals(MediaType.IMAGE_JPEG_VALUE, result.getHeaders().get("Content-Type").get(0)); assertArrayEquals("somebytes".getBytes(), result.getBody().getByteArray()); } @Test public void fileResponseEntityMissingName() { ByteArrayResource resource = new ByteArrayResource("somebytes".getBytes()); FileEntryResource fileEntry = new FileEntryResource(); fileEntry.setMediaType(MediaType.IMAGE_JPEG_VALUE); ResponseEntity<ByteArrayResource> result = FileDownloadControllerUtils.getFileResponseEntity(resource, fileEntry); assertNull(result.getHeaders().get("Content-Disposition")); assertEquals("9", result.getHeaders().get("Content-Length").get(0)); assertEquals(MediaType.IMAGE_JPEG_VALUE, result.getHeaders().get("Content-Type").get(0)); assertArrayEquals("somebytes".getBytes(), result.getBody().getByteArray()); }
RejectionReasonFormatter implements Formatter<RejectionReasonResource> { @Override public RejectionReasonResource parse(String text, Locale locale) throws ParseException { RejectionReasonResource rejectionReasonResource = new RejectionReasonResource(); rejectionReasonResource.setId(Long.valueOf(text)); return rejectionReasonResource; } @Override RejectionReasonResource parse(String text, Locale locale); @Override String print(RejectionReasonResource object, Locale locale); }
@Test public void parse() throws Exception { RejectionReasonFormatter formatter = new RejectionReasonFormatter(); String text = "1"; RejectionReasonResource expected = new RejectionReasonResource(); expected.setId(1L); assertEquals(expected, formatter.parse(text, Locale.UK)); }
QuestionController { @GetMapping("/get-previous-question-by-section/{sectionId}") public RestResult<QuestionResource> getPreviousQuestionBySection(@PathVariable("sectionId") final Long sectionId) { return questionService.getPreviousQuestionBySection(sectionId).toGetResponse(); } @GetMapping("/id/{id}") RestResult<QuestionResource> getQuestionById(@PathVariable("id") final Long id); @GetMapping("/find-by-competition/{competitionId}") RestResult<List<QuestionResource>> findByCompetition(@PathVariable("competitionId") final Long competitionId); @GetMapping("/get-next-question/{questionId}") RestResult<QuestionResource> getNextQuestion(@PathVariable("questionId") final Long questionId); @GetMapping("/get-previous-question-by-section/{sectionId}") RestResult<QuestionResource> getPreviousQuestionBySection(@PathVariable("sectionId") final Long sectionId); @GetMapping("/get-next-question-by-section/{sectionId}") RestResult<QuestionResource> getNextQuestionBySection(@PathVariable("sectionId") final Long sectionId); @GetMapping("/get-previous-question/{questionId}") RestResult<QuestionResource> getPreviousQuestion(@PathVariable("questionId") final Long questionId); @GetMapping("/get-question-by-competition-id-and-form-input-type/{competitionId}/{formInputType}") RestResult<QuestionResource> getQuestionByFormInputType(@PathVariable("competitionId") final Long competitionId, @PathVariable("formInputType") final FormInputType formInputType); @GetMapping("/get-questions-by-section-id-and-type/{sectionId}/{type}") RestResult<List<QuestionResource>> getQuestionsBySectionIdAndType(@PathVariable("sectionId") final Long sectionId, @PathVariable("type") QuestionType type); @PutMapping("/") RestResult<QuestionResource> save(@RequestBody final QuestionResource questionResource); @GetMapping("/get-question-by-id-and-assessment-id/{questionId}/{assessmentId}") RestResult<QuestionResource> getQuestionByIdAndAssessmentId(@PathVariable("questionId") Long questionId, @PathVariable("assessmentId") Long assessmentId); @GetMapping("/get-questions-by-assessment/{assessmentId}") RestResult<List<QuestionResource>> getQuestionsByAssessmentId(@PathVariable("assessmentId") final Long assessmentId); @GetMapping("/get-question-by-competition-id-and-question-setup-type/{competitionId}/{type}") RestResult<QuestionResource> getQuestionByCompetitionIdQuestionSetupType( @PathVariable("competitionId") final long competitionId, @PathVariable("type") final QuestionSetupType questionSetupType); }
@Test public void getPreviousQuestionBySectionTest() throws Exception { QuestionResource previousSectionQuestion = newQuestionResource().build(); when(questionService.getPreviousQuestionBySection(anyLong())).thenReturn(serviceSuccess(previousSectionQuestion)); mockMvc.perform(get("/question/get-previous-question-by-section/" + 1L)) .andExpect(content().string(objectMapper.writeValueAsString(previousSectionQuestion))) .andExpect(status().isOk()); }
RejectionReasonFormatter implements Formatter<RejectionReasonResource> { @Override public String print(RejectionReasonResource object, Locale locale) { return object != null ? object.getId().toString() : ""; } @Override RejectionReasonResource parse(String text, Locale locale); @Override String print(RejectionReasonResource object, Locale locale); }
@Test public void print() { RejectionReasonFormatter formatter = new RejectionReasonFormatter(); RejectionReasonResource reason = newRejectionReasonResource() .with(id(1L)) .withReason("Reason") .withActive(TRUE) .withPriority(1) .build(); assertEquals("1", formatter.print(reason, Locale.UK)); }
PageHistoryService { public void recordPageHistory(HttpServletRequest request, HttpServletResponse response, ModelAndView modelAndView, HandlerMethod handler) { Deque<PageHistory> history = getPageHistory(request).orElse(new LinkedList<>()); while (history.contains(new PageHistory(request.getRequestURI()))) { history.pop(); } if (handler.hasMethodAnnotation(NavigationRoot.class)) { history.clear(); } if (!history.isEmpty()) { modelAndView.getModel().put("cookieBackLinkUrl", history.peek().getUrl()); modelAndView.getModel().put("cookieBackLinkText", history.peek().getName()); } if (!ERROR.equals(request.getDispatcherType())) { history.push(new PageHistory(request.getRequestURI())); encodedCookieService.saveToCookie(response, PAGE_HISTORY_COOKIE_NAME, JsonUtil.getSerializedObject(history)); } } void recordPageHistory(HttpServletRequest request, HttpServletResponse response, ModelAndView modelAndView, HandlerMethod handler); Optional<PageHistory> getPreviousPage(HttpServletRequest request); }
@Test public void recordPageHistory() { Map<String, Object> model = new HashMap<>(); when(modelAndView.getModel()).thenReturn(model); when(request.getRequestURI()).thenReturn("/url/pageThree"); when(handler.hasMethodAnnotation(NavigationRoot.class)).thenReturn(false); pageHistoryService.recordPageHistory(request, response, modelAndView, handler); assertEquals(3, history.size()); assertEquals("/url/pageSecond", model.get("cookieBackLinkUrl")); assertEquals("pageSecond", model.get("cookieBackLinkText")); verify(encodedCookieService).saveToCookie(response, PAGE_HISTORY_COOKIE_NAME, JsonUtil.getSerializedObject(history)); } @Test public void recordPageHistory_navigationRoot() { when(request.getRequestURI()).thenReturn("/url/pageThree"); when(handler.hasMethodAnnotation(NavigationRoot.class)).thenReturn(true); pageHistoryService.recordPageHistory(request, response, modelAndView, handler); assertEquals(1, history.size()); verify(encodedCookieService).saveToCookie(response, PAGE_HISTORY_COOKIE_NAME, JsonUtil.getSerializedObject(history)); } @Test public void recordPageHistory_alreadyVisitedPage() { Map<String, Object> model = new HashMap<>(); when(modelAndView.getModel()).thenReturn(model); when(request.getRequestURI()).thenReturn("/url/pageSecond"); when(handler.hasMethodAnnotation(NavigationRoot.class)).thenReturn(false); pageHistoryService.recordPageHistory(request, response, modelAndView, handler); assertEquals(2, history.size()); assertEquals("/url/pageFirst", model.get("cookieBackLinkUrl")); assertEquals("pageFirst", model.get("cookieBackLinkText")); verify(encodedCookieService).saveToCookie(response, PAGE_HISTORY_COOKIE_NAME, JsonUtil.getSerializedObject(history)); } @Test public void recordPageHistory_errorPage() { Map<String, Object> model = new HashMap<>(); when(modelAndView.getModel()).thenReturn(model); when(request.getRequestURI()).thenReturn("/error"); when(request.getDispatcherType()).thenReturn(ERROR); when(handler.hasMethodAnnotation(NavigationRoot.class)).thenReturn(false); pageHistoryService.recordPageHistory(request, response, modelAndView, handler); assertEquals(2, history.size()); assertEquals("/url/pageSecond", model.get("cookieBackLinkUrl")); assertEquals("pageSecond", model.get("cookieBackLinkText")); verify(encodedCookieService, never()).saveToCookie(any(), any(), any()); }
OrganisationCreationKnowledgeBaseController extends AbstractOrganisationCreationController { @GetMapping public String selectKnowledgeBase(@ModelAttribute(name = "form", binding = false) KnowledgeBaseForm organisationForm, Model model, HttpServletRequest request, UserResource user) { addPageSubtitleToModel(request, user, model); model.addAttribute("knowledgeBases", knowledgeBaseRestService.getKnowledgeBases().getSuccess()); return "registration/organisation/knowledge-base"; } @GetMapping String selectKnowledgeBase(@ModelAttribute(name = "form", binding = false) KnowledgeBaseForm organisationForm, Model model, HttpServletRequest request, UserResource user); @GetMapping("/details") String knowledgeBaseDetails(@ModelAttribute(name = "form", binding = false) KnowledgeBaseCreateForm organisationForm, Model model, HttpServletRequest request, UserResource user); @PostMapping("/details") String saveKnowledgeBaseDetails(@ModelAttribute(name = "form") @Valid KnowledgeBaseCreateForm organisationForm, BindingResult bindingResult, ValidationHandler validationHandler, Model model, HttpServletRequest request, HttpServletResponse response, UserResource user); @PostMapping(value = "/details", params = FORM_ACTION_PARAMETER) String addressFormAction(Model model, @ModelAttribute(name = "form") KnowledgeBaseCreateForm organisationForm, BindingResult bindingResult, ValidationHandler validationHandler, HttpServletRequest request, UserResource user); @PostMapping String selectedKnowledgeBase(@Valid @ModelAttribute("form") KnowledgeBaseForm organisationForm, BindingResult bindingResult, ValidationHandler validationHandler, Model model, HttpServletRequest request, HttpServletResponse response, UserResource user); @GetMapping("/confirm") String confirmKnowledgeBaseDetails(Model model, UserResource user, HttpServletRequest request); @PostMapping("/save-organisation") String saveOrganisation(UserResource userResource, HttpServletRequest request, HttpServletResponse response); }
@Test public void selectKnowledgeBase() throws Exception { InviteAndIdCookie projectInviteCookie = new InviteAndIdCookie(1L, "hash"); when(registrationCookieService.getProjectInviteHashCookieValue(any(HttpServletRequest.class))).thenReturn(Optional.of(projectInviteCookie)); when(knowledgeBaseRestService.getKnowledgeBases()).thenReturn(restSuccess(singletonList("KnowledgeBase1"))); mockMvc.perform(get(BASE_URL + "/knowledge-base")) .andExpect(status().is2xxSuccessful()) .andExpect(view().name("registration/organisation/knowledge-base")); }
OrganisationCreationKnowledgeBaseController extends AbstractOrganisationCreationController { @PostMapping public String selectedKnowledgeBase(@Valid @ModelAttribute("form") KnowledgeBaseForm organisationForm, BindingResult bindingResult, ValidationHandler validationHandler, Model model, HttpServletRequest request, HttpServletResponse response, UserResource user) { Supplier<String> failureView = () -> selectKnowledgeBase(organisationForm, model, request, user); return validationHandler.failNowOrSucceedWith(failureView, () -> { KnowledgeBaseResource knowledgeBaseResource = knowledgeBaseRestService.getKnowledgeBaseByName(organisationForm.getKnowledgeBase()).getSuccess(); KnowledgeBaseCreateForm knowledgeBaseCreateForm = processCreationForm(knowledgeBaseResource); OrganisationTypeForm organisationTypeForm = new OrganisationTypeForm(); organisationTypeForm.setOrganisationType(OrganisationTypeEnum.KNOWLEDGE_BASE.getId()); registrationCookieService.saveToKnowledgeBaseDetailsCookie(knowledgeBaseCreateForm, response); registrationCookieService.saveToKnowledgeBaseAddressCookie(knowledgeBaseResource.getAddress(), response); registrationCookieService.saveToOrganisationTypeCookie(organisationTypeForm, response); return "redirect:" + AbstractOrganisationCreationController.BASE_URL + "/knowledge-base/confirm"; }); } @GetMapping String selectKnowledgeBase(@ModelAttribute(name = "form", binding = false) KnowledgeBaseForm organisationForm, Model model, HttpServletRequest request, UserResource user); @GetMapping("/details") String knowledgeBaseDetails(@ModelAttribute(name = "form", binding = false) KnowledgeBaseCreateForm organisationForm, Model model, HttpServletRequest request, UserResource user); @PostMapping("/details") String saveKnowledgeBaseDetails(@ModelAttribute(name = "form") @Valid KnowledgeBaseCreateForm organisationForm, BindingResult bindingResult, ValidationHandler validationHandler, Model model, HttpServletRequest request, HttpServletResponse response, UserResource user); @PostMapping(value = "/details", params = FORM_ACTION_PARAMETER) String addressFormAction(Model model, @ModelAttribute(name = "form") KnowledgeBaseCreateForm organisationForm, BindingResult bindingResult, ValidationHandler validationHandler, HttpServletRequest request, UserResource user); @PostMapping String selectedKnowledgeBase(@Valid @ModelAttribute("form") KnowledgeBaseForm organisationForm, BindingResult bindingResult, ValidationHandler validationHandler, Model model, HttpServletRequest request, HttpServletResponse response, UserResource user); @GetMapping("/confirm") String confirmKnowledgeBaseDetails(Model model, UserResource user, HttpServletRequest request); @PostMapping("/save-organisation") String saveOrganisation(UserResource userResource, HttpServletRequest request, HttpServletResponse response); }
@Test public void selectedKnowledgeBase() throws Exception { String name = "KnowledgeBase 1"; KnowledgeBaseResource knowledgeBaseResource = new KnowledgeBaseResource(); knowledgeBaseResource.setName(name); knowledgeBaseResource.setRegistrationNumber("123456789"); knowledgeBaseResource.setType(KnowledgeBaseType.CATAPULT); KnowledgeBaseForm knowledgeBaseForm = new KnowledgeBaseForm(); knowledgeBaseForm.setKnowledgeBase(name); OrganisationCreationForm organisationCreationForm = new OrganisationCreationForm(); organisationCreationForm.setOrganisationName(knowledgeBaseForm.getKnowledgeBase()); organisationCreationForm.setOrganisationSearchName(knowledgeBaseForm.getKnowledgeBase()); organisationCreationForm.setOrganisationTypeId(5L); when(registrationCookieService.getOrganisationCreationCookieValue(any(HttpServletRequest.class))).thenReturn(Optional.of(organisationCreationForm)); when(knowledgeBaseRestService.getKnowledgeBases()).thenReturn(restSuccess(singletonList(organisationCreationForm.getOrganisationName()))); when(knowledgeBaseRestService.getKnowledgeBaseByName(name)).thenReturn(restSuccess(knowledgeBaseResource)); mockMvc.perform(post(BASE_URL + "/knowledge-base") .param("knowledgeBase", name)) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(BASE_URL + "/knowledge-base/confirm")); }
OrganisationCreationKnowledgeBaseController extends AbstractOrganisationCreationController { @GetMapping("/details") public String knowledgeBaseDetails(@ModelAttribute(name = "form", binding = false) KnowledgeBaseCreateForm organisationForm, Model model, HttpServletRequest request, UserResource user) { addPageSubtitleToModel(request, user, model); return viewKnowledgeBaseDetails(organisationForm, model); } @GetMapping String selectKnowledgeBase(@ModelAttribute(name = "form", binding = false) KnowledgeBaseForm organisationForm, Model model, HttpServletRequest request, UserResource user); @GetMapping("/details") String knowledgeBaseDetails(@ModelAttribute(name = "form", binding = false) KnowledgeBaseCreateForm organisationForm, Model model, HttpServletRequest request, UserResource user); @PostMapping("/details") String saveKnowledgeBaseDetails(@ModelAttribute(name = "form") @Valid KnowledgeBaseCreateForm organisationForm, BindingResult bindingResult, ValidationHandler validationHandler, Model model, HttpServletRequest request, HttpServletResponse response, UserResource user); @PostMapping(value = "/details", params = FORM_ACTION_PARAMETER) String addressFormAction(Model model, @ModelAttribute(name = "form") KnowledgeBaseCreateForm organisationForm, BindingResult bindingResult, ValidationHandler validationHandler, HttpServletRequest request, UserResource user); @PostMapping String selectedKnowledgeBase(@Valid @ModelAttribute("form") KnowledgeBaseForm organisationForm, BindingResult bindingResult, ValidationHandler validationHandler, Model model, HttpServletRequest request, HttpServletResponse response, UserResource user); @GetMapping("/confirm") String confirmKnowledgeBaseDetails(Model model, UserResource user, HttpServletRequest request); @PostMapping("/save-organisation") String saveOrganisation(UserResource userResource, HttpServletRequest request, HttpServletResponse response); }
@Test public void knowledgeBaseDetails() throws Exception { List<OrganisationTypeResource> organisationTypes = newOrganisationTypeResource() .withId(4L, 5L) .withName("Catapult", "University") .withVisibleInSetup(Boolean.TRUE, Boolean.TRUE) .build(2); when(organisationTypeRestService.getAll()).thenReturn(restSuccess(organisationTypes)); mockMvc.perform(get(BASE_URL + "/knowledge-base/details")) .andExpect(status().is2xxSuccessful()) .andExpect(view().name("registration/organisation/knowledge-base-details")); }
OrganisationCreationKnowledgeBaseController extends AbstractOrganisationCreationController { @PostMapping("/details") public String saveKnowledgeBaseDetails(@ModelAttribute(name = "form") @Valid KnowledgeBaseCreateForm organisationForm, BindingResult bindingResult, ValidationHandler validationHandler, Model model, HttpServletRequest request, HttpServletResponse response, UserResource user) { Supplier<String> failureView = () -> knowledgeBaseDetails(organisationForm, model, request, user); return validationHandler.failNowOrSucceedWith(failureView, () -> { OrganisationTypeForm organisationTypeForm = new OrganisationTypeForm(); organisationTypeForm.setOrganisationType(OrganisationTypeEnum.KNOWLEDGE_BASE.getId()); registrationCookieService.saveToKnowledgeBaseDetailsCookie(organisationForm, response); registrationCookieService.saveToKnowledgeBaseAddressCookie(createAddressResource(organisationForm), response); registrationCookieService.saveToOrganisationTypeCookie(organisationTypeForm, response); return "redirect:" + AbstractOrganisationCreationController.BASE_URL + "/knowledge-base/confirm"; }); } @GetMapping String selectKnowledgeBase(@ModelAttribute(name = "form", binding = false) KnowledgeBaseForm organisationForm, Model model, HttpServletRequest request, UserResource user); @GetMapping("/details") String knowledgeBaseDetails(@ModelAttribute(name = "form", binding = false) KnowledgeBaseCreateForm organisationForm, Model model, HttpServletRequest request, UserResource user); @PostMapping("/details") String saveKnowledgeBaseDetails(@ModelAttribute(name = "form") @Valid KnowledgeBaseCreateForm organisationForm, BindingResult bindingResult, ValidationHandler validationHandler, Model model, HttpServletRequest request, HttpServletResponse response, UserResource user); @PostMapping(value = "/details", params = FORM_ACTION_PARAMETER) String addressFormAction(Model model, @ModelAttribute(name = "form") KnowledgeBaseCreateForm organisationForm, BindingResult bindingResult, ValidationHandler validationHandler, HttpServletRequest request, UserResource user); @PostMapping String selectedKnowledgeBase(@Valid @ModelAttribute("form") KnowledgeBaseForm organisationForm, BindingResult bindingResult, ValidationHandler validationHandler, Model model, HttpServletRequest request, HttpServletResponse response, UserResource user); @GetMapping("/confirm") String confirmKnowledgeBaseDetails(Model model, UserResource user, HttpServletRequest request); @PostMapping("/save-organisation") String saveOrganisation(UserResource userResource, HttpServletRequest request, HttpServletResponse response); }
@Test public void saveKnowledgeBaseDetails() throws Exception { List<OrganisationTypeResource> organisationTypes = newOrganisationTypeResource() .withId(4L, 5L) .withName("Catapult", "University") .withVisibleInSetup(Boolean.TRUE, Boolean.TRUE) .build(2); when(organisationTypeRestService.getAll()).thenReturn(restSuccess(organisationTypes)); mockMvc.perform(post(BASE_URL + "/knowledge-base/details") .param("name", "knowledgeBase") .param("type", "CATAPULT") .param("addressForm.addressType", AddressForm.AddressType.MANUAL_ENTRY.name()). param("addressForm.manualAddress.addressLine1", "Montrose House 1"). param("addressForm.manualAddress.addressLine2", "Clayhill Park"). param("addressForm.manualAddress.addressLine3", "Cheshire West and Chester"). param("addressForm.manualAddress.town", "Neston"). param("addressForm.manualAddress.county", "Cheshire"). param("addressForm.manualAddress.postcode", "CH64 3RU")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(BASE_URL + "/knowledge-base/confirm")); }
OrganisationCreationKnowledgeBaseController extends AbstractOrganisationCreationController { @PostMapping(value = "/details", params = FORM_ACTION_PARAMETER) public String addressFormAction(Model model, @ModelAttribute(name = "form") KnowledgeBaseCreateForm organisationForm, BindingResult bindingResult, ValidationHandler validationHandler, HttpServletRequest request, UserResource user) { organisationForm.getAddressForm().validateAction(bindingResult); if (validationHandler.hasErrors()) { return knowledgeBaseDetails(organisationForm, model, request, user); } AddressForm addressForm = organisationForm.getAddressForm(); addressForm.handleAction(this::searchPostcode); return viewKnowledgeBaseDetails(organisationForm, model); } @GetMapping String selectKnowledgeBase(@ModelAttribute(name = "form", binding = false) KnowledgeBaseForm organisationForm, Model model, HttpServletRequest request, UserResource user); @GetMapping("/details") String knowledgeBaseDetails(@ModelAttribute(name = "form", binding = false) KnowledgeBaseCreateForm organisationForm, Model model, HttpServletRequest request, UserResource user); @PostMapping("/details") String saveKnowledgeBaseDetails(@ModelAttribute(name = "form") @Valid KnowledgeBaseCreateForm organisationForm, BindingResult bindingResult, ValidationHandler validationHandler, Model model, HttpServletRequest request, HttpServletResponse response, UserResource user); @PostMapping(value = "/details", params = FORM_ACTION_PARAMETER) String addressFormAction(Model model, @ModelAttribute(name = "form") KnowledgeBaseCreateForm organisationForm, BindingResult bindingResult, ValidationHandler validationHandler, HttpServletRequest request, UserResource user); @PostMapping String selectedKnowledgeBase(@Valid @ModelAttribute("form") KnowledgeBaseForm organisationForm, BindingResult bindingResult, ValidationHandler validationHandler, Model model, HttpServletRequest request, HttpServletResponse response, UserResource user); @GetMapping("/confirm") String confirmKnowledgeBaseDetails(Model model, UserResource user, HttpServletRequest request); @PostMapping("/save-organisation") String saveOrganisation(UserResource userResource, HttpServletRequest request, HttpServletResponse response); }
@Test public void addressFormAction() throws Exception { List<OrganisationTypeResource> organisationTypes = newOrganisationTypeResource() .withId(4L, 5L) .withName("Catapult", "University") .withVisibleInSetup(Boolean.TRUE, Boolean.TRUE) .build(2); when(organisationTypeRestService.getAll()).thenReturn(restSuccess(organisationTypes)); mockMvc.perform(post(BASE_URL + "/knowledge-base/details") .param("addressForm.action", "true") .param("name", "knowledgeBase") .param("organisationType", "5") .param("addressForm.addressType", AddressForm.AddressType.MANUAL_ENTRY.name()). param("addressForm.manualAddress.addressLine1", "Montrose House 1"). param("addressForm.manualAddress.addressLine2", "Clayhill Park"). param("addressForm.manualAddress.addressLine3", "Cheshire West and Chester"). param("addressForm.manualAddress.town", "Neston"). param("addressForm.manualAddress.county", "Cheshire"). param("addressForm.manualAddress.postcode", "CH64 3RU")) .andExpect(status().is2xxSuccessful()) .andExpect(view().name("registration/organisation/knowledge-base-details")); }
QuestionController { @GetMapping("/get-questions-by-section-id-and-type/{sectionId}/{type}") public RestResult<List<QuestionResource>> getQuestionsBySectionIdAndType(@PathVariable("sectionId") final Long sectionId, @PathVariable("type") QuestionType type) { return questionService.getQuestionsBySectionIdAndType(sectionId, type).toGetResponse(); } @GetMapping("/id/{id}") RestResult<QuestionResource> getQuestionById(@PathVariable("id") final Long id); @GetMapping("/find-by-competition/{competitionId}") RestResult<List<QuestionResource>> findByCompetition(@PathVariable("competitionId") final Long competitionId); @GetMapping("/get-next-question/{questionId}") RestResult<QuestionResource> getNextQuestion(@PathVariable("questionId") final Long questionId); @GetMapping("/get-previous-question-by-section/{sectionId}") RestResult<QuestionResource> getPreviousQuestionBySection(@PathVariable("sectionId") final Long sectionId); @GetMapping("/get-next-question-by-section/{sectionId}") RestResult<QuestionResource> getNextQuestionBySection(@PathVariable("sectionId") final Long sectionId); @GetMapping("/get-previous-question/{questionId}") RestResult<QuestionResource> getPreviousQuestion(@PathVariable("questionId") final Long questionId); @GetMapping("/get-question-by-competition-id-and-form-input-type/{competitionId}/{formInputType}") RestResult<QuestionResource> getQuestionByFormInputType(@PathVariable("competitionId") final Long competitionId, @PathVariable("formInputType") final FormInputType formInputType); @GetMapping("/get-questions-by-section-id-and-type/{sectionId}/{type}") RestResult<List<QuestionResource>> getQuestionsBySectionIdAndType(@PathVariable("sectionId") final Long sectionId, @PathVariable("type") QuestionType type); @PutMapping("/") RestResult<QuestionResource> save(@RequestBody final QuestionResource questionResource); @GetMapping("/get-question-by-id-and-assessment-id/{questionId}/{assessmentId}") RestResult<QuestionResource> getQuestionByIdAndAssessmentId(@PathVariable("questionId") Long questionId, @PathVariable("assessmentId") Long assessmentId); @GetMapping("/get-questions-by-assessment/{assessmentId}") RestResult<List<QuestionResource>> getQuestionsByAssessmentId(@PathVariable("assessmentId") final Long assessmentId); @GetMapping("/get-question-by-competition-id-and-question-setup-type/{competitionId}/{type}") RestResult<QuestionResource> getQuestionByCompetitionIdQuestionSetupType( @PathVariable("competitionId") final long competitionId, @PathVariable("type") final QuestionSetupType questionSetupType); }
@Test public void getQuestionsBySectionIdAndTypeTest() throws Exception { List<QuestionResource> questions = newQuestionResource().build(2); when(questionService.getQuestionsBySectionIdAndType(1L, QuestionType.COST)).thenReturn(serviceSuccess(questions)); mockMvc.perform(get("/question/get-questions-by-section-id-and-type/1/COST")) .andExpect(content().string(objectMapper.writeValueAsString(questions))) .andExpect(status().isOk()); }
OrganisationCreationKnowledgeBaseController extends AbstractOrganisationCreationController { @GetMapping("/confirm") public String confirmKnowledgeBaseDetails(Model model, UserResource user, HttpServletRequest request) { Optional<OrganisationTypeForm> organisationTypeForm = registrationCookieService.getOrganisationTypeCookieValue(request); Optional<KnowledgeBaseCreateForm> knowledgeBaseCreateForm = registrationCookieService.getKnowledgeBaseDetailsValue(request); Optional<AddressResource> address = registrationCookieService.getKnowledgeBaseAddressCookie(request); model.addAttribute("type", knowledgeBaseCreateForm.isPresent() ? knowledgeBaseCreateForm.get().getType() : null); model.addAttribute("organisationName", knowledgeBaseCreateForm.isPresent() ? knowledgeBaseCreateForm.get().getName() : null); model.addAttribute("identification", knowledgeBaseCreateForm.isPresent() ? knowledgeBaseCreateForm.get().getIdentification() : null); model.addAttribute("address", address.orElse(null)); model.addAttribute("isLeadApplicant", registrationCookieService.isLeadJourney(request)); addPageSubtitleToModel(request, user, model); return TEMPLATE_PATH + "/" + KNOWLEDGE_BASE_CONFIRM_ORGANISATION; } @GetMapping String selectKnowledgeBase(@ModelAttribute(name = "form", binding = false) KnowledgeBaseForm organisationForm, Model model, HttpServletRequest request, UserResource user); @GetMapping("/details") String knowledgeBaseDetails(@ModelAttribute(name = "form", binding = false) KnowledgeBaseCreateForm organisationForm, Model model, HttpServletRequest request, UserResource user); @PostMapping("/details") String saveKnowledgeBaseDetails(@ModelAttribute(name = "form") @Valid KnowledgeBaseCreateForm organisationForm, BindingResult bindingResult, ValidationHandler validationHandler, Model model, HttpServletRequest request, HttpServletResponse response, UserResource user); @PostMapping(value = "/details", params = FORM_ACTION_PARAMETER) String addressFormAction(Model model, @ModelAttribute(name = "form") KnowledgeBaseCreateForm organisationForm, BindingResult bindingResult, ValidationHandler validationHandler, HttpServletRequest request, UserResource user); @PostMapping String selectedKnowledgeBase(@Valid @ModelAttribute("form") KnowledgeBaseForm organisationForm, BindingResult bindingResult, ValidationHandler validationHandler, Model model, HttpServletRequest request, HttpServletResponse response, UserResource user); @GetMapping("/confirm") String confirmKnowledgeBaseDetails(Model model, UserResource user, HttpServletRequest request); @PostMapping("/save-organisation") String saveOrganisation(UserResource userResource, HttpServletRequest request, HttpServletResponse response); }
@Test public void confirmKnowledgeBaseDetails() throws Exception { mockMvc.perform(get(BASE_URL + "/knowledge-base/confirm")) .andExpect(status().is2xxSuccessful()) .andExpect(view().name("registration/organisation/knowledge-base-confirm-organisation")); }
OrganisationCreationKnowledgeBaseController extends AbstractOrganisationCreationController { @PostMapping("/save-organisation") public String saveOrganisation(UserResource userResource, HttpServletRequest request, HttpServletResponse response) { Optional<OrganisationTypeForm> organisationTypeForm = registrationCookieService.getOrganisationTypeCookieValue(request); Optional<KnowledgeBaseCreateForm> knowledgeBaseCreateForm = registrationCookieService.getKnowledgeBaseDetailsValue(request); Optional<AddressResource> address = registrationCookieService.getKnowledgeBaseAddressCookie(request); OrganisationResource organisationResource = new OrganisationResource(); organisationResource.setName(knowledgeBaseCreateForm.get().getName()); organisationResource.setOrganisationType(organisationTypeForm.get().getOrganisationType()); organisationResource.setRegistrationNumber(knowledgeBaseCreateForm.get().getIdentification()); organisationResource.setAddresses(singletonList(createOrganisationAddressResource(organisationResource, address.orElse(null)))); organisationResource = organisationRestService.createOrMatch(organisationResource).getSuccess(); return organisationJourneyEnd.completeProcess(request, response, userResource, organisationResource.getId()); } @GetMapping String selectKnowledgeBase(@ModelAttribute(name = "form", binding = false) KnowledgeBaseForm organisationForm, Model model, HttpServletRequest request, UserResource user); @GetMapping("/details") String knowledgeBaseDetails(@ModelAttribute(name = "form", binding = false) KnowledgeBaseCreateForm organisationForm, Model model, HttpServletRequest request, UserResource user); @PostMapping("/details") String saveKnowledgeBaseDetails(@ModelAttribute(name = "form") @Valid KnowledgeBaseCreateForm organisationForm, BindingResult bindingResult, ValidationHandler validationHandler, Model model, HttpServletRequest request, HttpServletResponse response, UserResource user); @PostMapping(value = "/details", params = FORM_ACTION_PARAMETER) String addressFormAction(Model model, @ModelAttribute(name = "form") KnowledgeBaseCreateForm organisationForm, BindingResult bindingResult, ValidationHandler validationHandler, HttpServletRequest request, UserResource user); @PostMapping String selectedKnowledgeBase(@Valid @ModelAttribute("form") KnowledgeBaseForm organisationForm, BindingResult bindingResult, ValidationHandler validationHandler, Model model, HttpServletRequest request, HttpServletResponse response, UserResource user); @GetMapping("/confirm") String confirmKnowledgeBaseDetails(Model model, UserResource user, HttpServletRequest request); @PostMapping("/save-organisation") String saveOrganisation(UserResource userResource, HttpServletRequest request, HttpServletResponse response); }
@Test public void saveOrganisation() throws Exception { String view = "view"; OrganisationResource organisationResource = newOrganisationResource() .withId(1l) .build(); AddressForm addressForm = new AddressForm(); AddressResource address = new AddressResource(null, null, null, null, null, null); addressForm.setManualAddress(address); addressForm.setAddressType(AddressForm.AddressType.MANUAL_ENTRY); KnowledgeBaseCreateForm knowledgeBaseCreateForm = new KnowledgeBaseCreateForm(); knowledgeBaseCreateForm.setCatapultNumber("123456789"); knowledgeBaseCreateForm.setType(KnowledgeBaseType.CATAPULT); knowledgeBaseCreateForm.setName("knowledge"); knowledgeBaseCreateForm.setAddressForm(addressForm); OrganisationTypeForm organisationTypeForm = new OrganisationTypeForm(); organisationTypeForm.setOrganisationType(6l); when(organisationRestService.createOrMatch(any())).thenReturn(restSuccess(organisationResource)); when(organisationJourneyEnd.completeProcess(any(), any(), eq(loggedInUser), eq(organisationResource.getId()))).thenReturn(view); when(registrationCookieService.getKnowledgeBaseDetailsValue(any(HttpServletRequest.class))).thenReturn(Optional.of(knowledgeBaseCreateForm)); when(registrationCookieService.getOrganisationTypeCookieValue(any(HttpServletRequest.class))).thenReturn(Optional.of(organisationTypeForm)); mockMvc.perform(post(BASE_URL + "/knowledge-base/save-organisation") .param("addressForm.action", "true") .param("name", "knowledgeBase") .param("type", "CATAPULT")) .andExpect(status().isOk()) .andExpect(view().name(view)); }
ApplicationSummaryViewModel implements BaseAnalyticsViewModel { public boolean isKtpCompetition() { return ktpCompetition; } ApplicationSummaryViewModel(ApplicationReadOnlyViewModel applicationReadOnlyViewModel, ApplicationResource application, CompetitionResource competition, boolean projectWithdrawn, InterviewFeedbackViewModel interviewFeedbackViewModel); InterviewFeedbackViewModel getInterviewFeedbackViewModel(); @Override Long getApplicationId(); ApplicationReadOnlyViewModel getApplicationReadOnlyViewModel(); ApplicationResource getApplication(); CompetitionResource getCompetition(); boolean isProjectWithdrawn(); String getCompetitionName(); String getApplicationName(); LocalDate getStartDate(); Long getDuration(); Boolean getResubmission(); boolean isCanSelectInnovationArea(); String getInnovationAreaName(); String getPreviousApplicationNumber(); String getPreviousApplicationTitle(); boolean isKtpCompetition(); }
@Test public void testKtpCompetition() { CompetitionResource competitionResource = CompetitionResourceBuilder.newCompetitionResource() .withFundingType(FundingType.KTP) .withInnovationAreas(Collections.emptySet()).build(); InnovationAreaResource innovationAreaResource = InnovationAreaResourceBuilder.newInnovationAreaResource().build(); ApplicationResource applicationResource = ApplicationResourceBuilder.newApplicationResource() .withInnovationArea(innovationAreaResource).build(); ApplicationSummaryViewModel viewModel = new ApplicationSummaryViewModel(null, applicationResource, competitionResource, false, null); assertTrue(viewModel.isKtpCompetition()); }
AssignQuestionController { @PostMapping("/question/{questionId}/assign") public String assign(@Valid @ModelAttribute("form") AssignQuestionForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable("questionId") long questionId, @PathVariable("applicationId") long applicationId, HttpServletRequest request, HttpServletResponse response, Model model, UserResource loggedInUser) { Supplier<String> failureView = () -> doViewAssignPage(model, questionId, applicationId); ProcessRoleResource assignedBy = userRestService.findProcessRole(loggedInUser.getId(), applicationId).getSuccess(); return validationHandler.failNowOrSucceedWith(failureView, () -> { ServiceResult<Void> assignResult = questionService.assign(questionId, applicationId, form.getAssignee(), assignedBy.getId()); return validationHandler.addAnyErrors(assignResult) .failNowOrSucceedWith(failureView, () -> redirectToRelevantPage(applicationId, questionId, request, response)); }); } @GetMapping("/question/{questionId}/assign") String getAssignPage(@ModelAttribute(name = "form", binding = false) AssignQuestionForm form, @PathVariable("questionId") long questionId, @PathVariable("applicationId") long applicationId, Model model); @PostMapping("/question/{questionId}/assign") String assign(@Valid @ModelAttribute("form") AssignQuestionForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable("questionId") long questionId, @PathVariable("applicationId") long applicationId, HttpServletRequest request, HttpServletResponse response, Model model, UserResource loggedInUser); }
@Test public void assignQuestion() throws Exception { QuestionResource question = newQuestionResource().build(); ApplicationResource application = newApplicationResource().build(); ProcessRoleResource processRole = newProcessRoleResource().build(); UserResource user = newUserResource().build(); setLoggedInUser(user); long assigneeId = 123L; String redirect = "/blah/blah"; when(userRestServiceMock.findProcessRole(user.getId(), application.getId())).thenReturn(restSuccess(processRole)); when(questionServiceMock.assign(question.getId(), application.getId(), assigneeId, processRole.getId())).thenReturn(serviceSuccess()); when(pageHistoryService.getPreviousPage(any())).thenReturn(Optional.of(new PageHistory(redirect))); mockMvc.perform(post("/application/{applicationId}/form/question/{questionId}/assign", application.getId(), question.getId()) .param("assignee", valueOf(assigneeId))) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(redirect)); verify(userRestServiceMock).findProcessRole(user.getId(), application.getId()); verify(questionServiceMock).assign(question.getId(), application.getId(), assigneeId, processRole.getId()); verify(cookieFlashMessageFilterMock).setFlashMessage(isA(HttpServletResponse.class), eq("assignedQuestion")); }
AcademicCostSaver extends AbstractAcademicCostSaver { public ServiceResult<Void> save(AcademicCostForm form, long applicationId, long organisationId) { ApplicationFinanceResource finance = applicationFinanceRestService.getFinanceDetails(applicationId, organisationId).getSuccess(); return save(form, finance); } ServiceResult<Void> save(AcademicCostForm form, long applicationId, long organisationId); Optional<Long> autoSave(String field, String value, long applicationId, long organisationId); }
@Test public void save() { ApplicationFinanceResource finance = newApplicationFinanceResource() .withAcademicCosts() .build(); AcademicCostForm form = new AcademicCostForm(); BigDecimal cost = new BigDecimal("50"); form.setExceptionsOtherCosts(cost); form.setExceptionsStaff(cost); form.setIndirectCosts(cost); form.setAllocatedOtherCosts(cost); form.setAllocatedEstateCosts(cost); form.setAllocatedInvestigators(cost); form.setIncurredOtherCosts(cost); form.setIncurredTravel(cost); form.setIncurredStaff(cost); form.setTsbReference("NewRef"); when(financeRowRestService.update(argThat(hasNameAndItem("tsb_reference", "NewRef")))).thenReturn(restSuccess(new ValidationMessages())); when(financeRowRestService.update(argThat(hasNameAndCost("incurred_staff", cost)))).thenReturn(restSuccess(new ValidationMessages())); when(financeRowRestService.update(argThat(hasNameAndCost("incurred_travel_subsistence", cost)))).thenReturn(restSuccess(new ValidationMessages())); when(financeRowRestService.update(argThat(hasNameAndCost("incurred_other_costs", cost)))).thenReturn(restSuccess(new ValidationMessages())); when(financeRowRestService.update(argThat(hasNameAndCost("allocated_investigators", cost)))).thenReturn(restSuccess(new ValidationMessages())); when(financeRowRestService.update(argThat(hasNameAndCost("allocated_estates_costs", cost)))).thenReturn(restSuccess(new ValidationMessages())); when(financeRowRestService.update(argThat(hasNameAndCost("allocated_other_costs", cost)))).thenReturn(restSuccess(new ValidationMessages())); when(financeRowRestService.update(argThat(hasNameAndCost("indirect_costs", cost)))).thenReturn(restSuccess(new ValidationMessages())); when(financeRowRestService.update(argThat(hasNameAndCost("exceptions_staff", cost)))).thenReturn(restSuccess(new ValidationMessages())); when(financeRowRestService.update(argThat(hasNameAndCost("exceptions_other_costs", cost)))).thenReturn(restSuccess(new ValidationMessages())); when(applicationFinanceRestService.getFinanceDetails(APPLICATION_ID, ORGANISATION_ID)).thenReturn(RestResult.restSuccess(finance)); ServiceResult<Void> result = service.save(form, APPLICATION_ID, ORGANISATION_ID); assertTrue(result.isSuccess()); verify(financeRowRestService).update(argThat(hasNameAndItem("tsb_reference", "NewRef"))); verify(financeRowRestService).update(argThat(hasNameAndCost("incurred_staff", cost))); verify(financeRowRestService).update(argThat(hasNameAndCost("incurred_travel_subsistence", cost))); verify(financeRowRestService).update(argThat(hasNameAndCost("incurred_other_costs", cost))); verify(financeRowRestService).update(argThat(hasNameAndCost("allocated_investigators", cost))); verify(financeRowRestService).update(argThat(hasNameAndCost("allocated_estates_costs", cost))); verify(financeRowRestService).update(argThat(hasNameAndCost("allocated_other_costs", cost))); verify(financeRowRestService).update(argThat(hasNameAndCost("indirect_costs", cost))); verify(financeRowRestService).update(argThat(hasNameAndCost("exceptions_staff", cost))); verify(financeRowRestService).update(argThat(hasNameAndCost("exceptions_other_costs", cost))); verifyNoMoreInteractions(financeRowRestService); }
AcademicCostsController { @GetMapping @PreAuthorize("hasAnyAuthority('applicant', 'support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder')") @SecuredBySpring(value = "VIEW_ACADEMIC_COSTS", description = "Applicants and internal users can view the academic project costs page") public String viewAcademicCosts(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long organisationId, @PathVariable long sectionId, @ModelAttribute("form") AcademicCostForm form) { formPopulator.populate(form, applicationId, organisationId); model.addAttribute("model", viewModelPopulator.populate(organisationId, applicationId, sectionId, !user.isInternalUser())); return VIEW; } @GetMapping @PreAuthorize("hasAnyAuthority('applicant', 'support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder')") @SecuredBySpring(value = "VIEW_ACADEMIC_COSTS", description = "Applicants and internal users can view the academic project costs page") String viewAcademicCosts(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long organisationId, @PathVariable long sectionId, @ModelAttribute("form") AcademicCostForm form); @PostMapping @AsyncMethod String saveAcademicCosts(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long organisationId, @PathVariable long sectionId, @ModelAttribute("form") AcademicCostForm form); @PostMapping(params = "complete") @AsyncMethod String complete(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long organisationId, @PathVariable long sectionId, @Valid @ModelAttribute("form") AcademicCostForm 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") AcademicCostForm form); @PostMapping(params = "remove_jes") @AsyncMethod String removeJesFile(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long organisationId, @PathVariable long sectionId, @ModelAttribute("form") AcademicCostForm form); @PostMapping(params = "upload_jes") String uploadJesFile(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long organisationId, @PathVariable long sectionId, @ModelAttribute("form") AcademicCostForm form, BindingResult bindingResult); @PostMapping("auto-save") @ResponseBody JsonNode ajaxAutoSave(@PathVariable long applicationId, @PathVariable long organisationId, @RequestParam String field, @RequestParam String value); }
@Test public void viewAcademicCosts() throws Exception { AcademicCostViewModel viewModel = mockViewModel(); mockMvc.perform(get(APPLICATION_BASE_URL + "{applicationId}/form/academic-costs/organisation/{organisationId}/section/{sectionId}", APPLICATION_ID, ORGANISATION_ID, SECTION_ID)) .andExpect(model().attribute("model", viewModel)) .andExpect(view().name(VIEW)) .andExpect(status().isOk()); verify(formPopulator).populate(any(AcademicCostForm.class), eq(APPLICATION_ID), eq(ORGANISATION_ID)); }
AcademicCostsController { @PostMapping @AsyncMethod public String saveAcademicCosts(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long organisationId, @PathVariable long sectionId, @ModelAttribute("form") AcademicCostForm 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_ACADEMIC_COSTS", description = "Applicants and internal users can view the academic project costs page") String viewAcademicCosts(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long organisationId, @PathVariable long sectionId, @ModelAttribute("form") AcademicCostForm form); @PostMapping @AsyncMethod String saveAcademicCosts(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long organisationId, @PathVariable long sectionId, @ModelAttribute("form") AcademicCostForm form); @PostMapping(params = "complete") @AsyncMethod String complete(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long organisationId, @PathVariable long sectionId, @Valid @ModelAttribute("form") AcademicCostForm 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") AcademicCostForm form); @PostMapping(params = "remove_jes") @AsyncMethod String removeJesFile(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long organisationId, @PathVariable long sectionId, @ModelAttribute("form") AcademicCostForm form); @PostMapping(params = "upload_jes") String uploadJesFile(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long organisationId, @PathVariable long sectionId, @ModelAttribute("form") AcademicCostForm form, BindingResult bindingResult); @PostMapping("auto-save") @ResponseBody JsonNode ajaxAutoSave(@PathVariable long applicationId, @PathVariable long organisationId, @RequestParam String field, @RequestParam String value); }
@Test public void saveAcademicCosts() throws Exception { when(saver.save(any(AcademicCostForm.class), eq(APPLICATION_ID), eq(ORGANISATION_ID))).thenReturn(serviceSuccess()); mockMvc.perform(post(APPLICATION_BASE_URL + "{applicationId}/form/academic-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))); }
AcademicCostsController { @PostMapping(params = "edit") public String edit(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long organisationId, @PathVariable long sectionId, @ModelAttribute("form") AcademicCostForm form) { sectionStatusRestService.markAsInComplete(sectionId, applicationId, getProcessRoleId(applicationId, user.getId())).getSuccess(); return redirectToAcademicCosts(applicationId, organisationId, sectionId); } @GetMapping @PreAuthorize("hasAnyAuthority('applicant', 'support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder')") @SecuredBySpring(value = "VIEW_ACADEMIC_COSTS", description = "Applicants and internal users can view the academic project costs page") String viewAcademicCosts(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long organisationId, @PathVariable long sectionId, @ModelAttribute("form") AcademicCostForm form); @PostMapping @AsyncMethod String saveAcademicCosts(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long organisationId, @PathVariable long sectionId, @ModelAttribute("form") AcademicCostForm form); @PostMapping(params = "complete") @AsyncMethod String complete(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long organisationId, @PathVariable long sectionId, @Valid @ModelAttribute("form") AcademicCostForm 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") AcademicCostForm form); @PostMapping(params = "remove_jes") @AsyncMethod String removeJesFile(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long organisationId, @PathVariable long sectionId, @ModelAttribute("form") AcademicCostForm form); @PostMapping(params = "upload_jes") String uploadJesFile(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long organisationId, @PathVariable long sectionId, @ModelAttribute("form") AcademicCostForm form, BindingResult bindingResult); @PostMapping("auto-save") @ResponseBody JsonNode ajaxAutoSave(@PathVariable long applicationId, @PathVariable long organisationId, @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/academic-costs/organisation/{organisationId}/section/{sectionId}", APPLICATION_ID, ORGANISATION_ID, SECTION_ID) .param("edit", "true")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(String.format("%s%s/form/academic-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); }
AcademicCostsController { @PostMapping(params = "complete") @AsyncMethod public String complete(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long organisationId, @PathVariable long sectionId, @Valid @ModelAttribute("form") AcademicCostForm form, BindingResult bindingResult, ValidationHandler validationHandler) { Supplier<String> successView = () -> redirectToYourFinances(applicationId); Supplier<String> failureView = () -> viewAcademicCosts(model, user, applicationId, organisationId, sectionId, form); 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(), mappingErrorKeyToField("validation.application.jes.upload.required", "jesFile"), defaultConverters()); return validationHandler.failNowOrSucceedWith(failureView, successView); }); }); } @GetMapping @PreAuthorize("hasAnyAuthority('applicant', 'support', 'innovation_lead', 'ifs_administrator', 'comp_admin', 'project_finance', 'stakeholder')") @SecuredBySpring(value = "VIEW_ACADEMIC_COSTS", description = "Applicants and internal users can view the academic project costs page") String viewAcademicCosts(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long organisationId, @PathVariable long sectionId, @ModelAttribute("form") AcademicCostForm form); @PostMapping @AsyncMethod String saveAcademicCosts(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long organisationId, @PathVariable long sectionId, @ModelAttribute("form") AcademicCostForm form); @PostMapping(params = "complete") @AsyncMethod String complete(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long organisationId, @PathVariable long sectionId, @Valid @ModelAttribute("form") AcademicCostForm 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") AcademicCostForm form); @PostMapping(params = "remove_jes") @AsyncMethod String removeJesFile(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long organisationId, @PathVariable long sectionId, @ModelAttribute("form") AcademicCostForm form); @PostMapping(params = "upload_jes") String uploadJesFile(Model model, UserResource user, @PathVariable long applicationId, @PathVariable long organisationId, @PathVariable long sectionId, @ModelAttribute("form") AcademicCostForm form, BindingResult bindingResult); @PostMapping("auto-save") @ResponseBody JsonNode ajaxAutoSave(@PathVariable long applicationId, @PathVariable long organisationId, @RequestParam String field, @RequestParam String value); }
@Test public void complete() throws Exception { ProcessRoleResource processRole = newProcessRoleResource().withId(PROCESS_ROLE_ID).build(); when(saver.save(any(AcademicCostForm.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/academic-costs/organisation/{organisationId}/section/{sectionId}", APPLICATION_ID, ORGANISATION_ID, SECTION_ID) .param("complete", "true") .param("tsbReference", "TSB")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(String.format("/application/%s/form/%s", APPLICATION_ID, SectionType.FINANCE))); verify(saver).save(any(AcademicCostForm.class), eq(APPLICATION_ID), eq(ORGANISATION_ID)); verify(sectionStatusRestService).markAsComplete(SECTION_ID, APPLICATION_ID, processRole.getId()); }
ApplicationTeamViewModel implements BaseAnalyticsViewModel { public Long getKtaInvitePendingDays() { if (ktaInvite == null || InviteStatus.SENT != ktaInvite.getStatus()) { return null; } return Duration.between(ktaInvite.getSentOn().toInstant(), Instant.now()).toDays(); } ApplicationTeamViewModel(long applicationId, String applicationName, String competitionName, long questionId, List<ApplicationTeamOrganisationViewModel> organisations, long loggedInUserId, boolean leadApplicant, boolean collaborationLevelSingle, boolean open, boolean complete, boolean ktpCompetition, ApplicationKtaInviteResource ktaInvite, ProcessRoleResource ktaProcessRole ); @Override Long getApplicationId(); @Override String getCompetitionName(); String getApplicationName(); long getQuestionId(); List<ApplicationTeamOrganisationViewModel> getOrganisations(); long getLoggedInUserId(); boolean isLeadApplicant(); boolean isOpen(); boolean isComplete(); boolean isCollaborationLevelSingle(); ApplicationKtaInviteResource getKtaInvite(); ApplicationTeamViewModel openAddTeamMemberForm(long organisationId); boolean isReadOnly(); boolean isAnyPendingInvites(); boolean isKtpCompetition(); Long getKtaInvitePendingDays(); boolean hasAssignedKta(); boolean hasPendingKta(); boolean hasNoKta(); String getKtaEmail(); String getKtaName(); }
@Test public void pendingDays() { ZonedDateTime fiveDaysAgo = ZonedDateTime.now().minus(5, ChronoUnit.DAYS); ApplicationKtaInviteResource invite = newApplicationKtaInviteResource() .withStatus(InviteStatus.SENT) .withSentOn(fiveDaysAgo) .build(); model = new ApplicationTeamViewModel(1, null, null, 1, null, 1, false, false, false, false, true, invite, null); long pendingDays = model.getKtaInvitePendingDays(); assertEquals(5L, pendingDays); }
QuestionController { @PutMapping("/") public RestResult<QuestionResource> save(@RequestBody final QuestionResource questionResource) { return questionService.save(questionResource).toGetResponse(); } @GetMapping("/id/{id}") RestResult<QuestionResource> getQuestionById(@PathVariable("id") final Long id); @GetMapping("/find-by-competition/{competitionId}") RestResult<List<QuestionResource>> findByCompetition(@PathVariable("competitionId") final Long competitionId); @GetMapping("/get-next-question/{questionId}") RestResult<QuestionResource> getNextQuestion(@PathVariable("questionId") final Long questionId); @GetMapping("/get-previous-question-by-section/{sectionId}") RestResult<QuestionResource> getPreviousQuestionBySection(@PathVariable("sectionId") final Long sectionId); @GetMapping("/get-next-question-by-section/{sectionId}") RestResult<QuestionResource> getNextQuestionBySection(@PathVariable("sectionId") final Long sectionId); @GetMapping("/get-previous-question/{questionId}") RestResult<QuestionResource> getPreviousQuestion(@PathVariable("questionId") final Long questionId); @GetMapping("/get-question-by-competition-id-and-form-input-type/{competitionId}/{formInputType}") RestResult<QuestionResource> getQuestionByFormInputType(@PathVariable("competitionId") final Long competitionId, @PathVariable("formInputType") final FormInputType formInputType); @GetMapping("/get-questions-by-section-id-and-type/{sectionId}/{type}") RestResult<List<QuestionResource>> getQuestionsBySectionIdAndType(@PathVariable("sectionId") final Long sectionId, @PathVariable("type") QuestionType type); @PutMapping("/") RestResult<QuestionResource> save(@RequestBody final QuestionResource questionResource); @GetMapping("/get-question-by-id-and-assessment-id/{questionId}/{assessmentId}") RestResult<QuestionResource> getQuestionByIdAndAssessmentId(@PathVariable("questionId") Long questionId, @PathVariable("assessmentId") Long assessmentId); @GetMapping("/get-questions-by-assessment/{assessmentId}") RestResult<List<QuestionResource>> getQuestionsByAssessmentId(@PathVariable("assessmentId") final Long assessmentId); @GetMapping("/get-question-by-competition-id-and-question-setup-type/{competitionId}/{type}") RestResult<QuestionResource> getQuestionByCompetitionIdQuestionSetupType( @PathVariable("competitionId") final long competitionId, @PathVariable("type") final QuestionSetupType questionSetupType); }
@Test public void save() throws Exception { QuestionResource questionResource = newQuestionResource().build(); when(questionService.save(questionResource)).thenReturn(serviceSuccess(questionResource)); mockMvc.perform(put("/question/") .contentType(MediaType.APPLICATION_JSON) .content(objectMapper.writeValueAsString(questionResource))) .andExpect(content().string(objectMapper.writeValueAsString(questionResource))) .andExpect(status().isOk()); }
ApplicationTeamViewModel implements BaseAnalyticsViewModel { public String getKtaEmail() { if (ktaProcessRole != null) { return ktaProcessRole.getUserEmail(); } if (ktaInvite != null) { return ktaInvite.getEmail(); } return null; } ApplicationTeamViewModel(long applicationId, String applicationName, String competitionName, long questionId, List<ApplicationTeamOrganisationViewModel> organisations, long loggedInUserId, boolean leadApplicant, boolean collaborationLevelSingle, boolean open, boolean complete, boolean ktpCompetition, ApplicationKtaInviteResource ktaInvite, ProcessRoleResource ktaProcessRole ); @Override Long getApplicationId(); @Override String getCompetitionName(); String getApplicationName(); long getQuestionId(); List<ApplicationTeamOrganisationViewModel> getOrganisations(); long getLoggedInUserId(); boolean isLeadApplicant(); boolean isOpen(); boolean isComplete(); boolean isCollaborationLevelSingle(); ApplicationKtaInviteResource getKtaInvite(); ApplicationTeamViewModel openAddTeamMemberForm(long organisationId); boolean isReadOnly(); boolean isAnyPendingInvites(); boolean isKtpCompetition(); Long getKtaInvitePendingDays(); boolean hasAssignedKta(); boolean hasPendingKta(); boolean hasNoKta(); String getKtaEmail(); String getKtaName(); }
@Test public void emailShouldComeFromProcessRoleIfPresent() { ApplicationKtaInviteResource invite = newApplicationKtaInviteResource() .withEmail("[email protected]") .build(); ProcessRoleResource processRole = newProcessRoleResource().withUserEmail("[email protected]").build(); model = new ApplicationTeamViewModel(1, null, null, 1, null, 1, false, false, false, false, true, invite, processRole); String result = model.getKtaEmail(); assertEquals("[email protected]", result); } @Test public void emailShouldFallbackToInviteIfNoProcessRole() { ApplicationKtaInviteResource invite = newApplicationKtaInviteResource() .withEmail("[email protected]") .build(); model = new ApplicationTeamViewModel(1, null, null, 1, null, 1, false, false, false, false, true, invite, null); String result = model.getKtaEmail(); assertEquals("[email protected]", result); }
ApplicationTeamViewModel implements BaseAnalyticsViewModel { public String getKtaName() { if (ktaProcessRole != null) { return ktaProcessRole.getUserName(); } if (ktaInvite != null) { return ktaInvite.getName(); } return null; } ApplicationTeamViewModel(long applicationId, String applicationName, String competitionName, long questionId, List<ApplicationTeamOrganisationViewModel> organisations, long loggedInUserId, boolean leadApplicant, boolean collaborationLevelSingle, boolean open, boolean complete, boolean ktpCompetition, ApplicationKtaInviteResource ktaInvite, ProcessRoleResource ktaProcessRole ); @Override Long getApplicationId(); @Override String getCompetitionName(); String getApplicationName(); long getQuestionId(); List<ApplicationTeamOrganisationViewModel> getOrganisations(); long getLoggedInUserId(); boolean isLeadApplicant(); boolean isOpen(); boolean isComplete(); boolean isCollaborationLevelSingle(); ApplicationKtaInviteResource getKtaInvite(); ApplicationTeamViewModel openAddTeamMemberForm(long organisationId); boolean isReadOnly(); boolean isAnyPendingInvites(); boolean isKtpCompetition(); Long getKtaInvitePendingDays(); boolean hasAssignedKta(); boolean hasPendingKta(); boolean hasNoKta(); String getKtaEmail(); String getKtaName(); }
@Test public void nameShouldComeFromProcessRoleIfPresent() { ApplicationKtaInviteResource invite = newApplicationKtaInviteResource() .withName("Invited") .build(); ProcessRoleResource processRole = newProcessRoleResource().withUserName("ProcessRole").build(); model = new ApplicationTeamViewModel(1, null, null, 1, null, 1, false, false, false, false, true, invite, processRole); String result = model.getKtaName(); assertEquals("ProcessRole", result); } @Test public void nameShouldFallbackToInviteIfNoProcessRole() { ApplicationKtaInviteResource invite = newApplicationKtaInviteResource() .withName("Invited") .build(); model = new ApplicationTeamViewModel(1, null, null, 1, null, 1, false, false, false, false, true, invite, null); String result = model.getKtaName(); assertEquals("Invited", result); }
OrganisationPermissionRules extends BasePermissionRules { @PermissionRule(value = "VIEW_ADD_ORGANISATION_PAGE", description = "Allowed to view the add organisation page") public boolean viewAddOrganisationPage(ApplicationCompositeId applicationCompositeId, UserResource loggedInUser) { return isCollaborationAllowed(applicationCompositeId.id()) && isLeadApplicant(applicationCompositeId.id(), loggedInUser) && applicationNotYetSubmitted(applicationCompositeId.id()); } @PermissionRule(value = "VIEW_ADD_ORGANISATION_PAGE", description = "Allowed to view the add organisation page") boolean viewAddOrganisationPage(ApplicationCompositeId applicationCompositeId, UserResource loggedInUser); @PermissionRule(value = "ADD_NEW_ORGANISATION", description = "Allowed to add a new organisation") boolean addNewOrganisation(ApplicationCompositeId applicationCompositeId, UserResource loggedInUser); }
@Test public void viewAddOrganisationPageWhenNotLoggedInAsLeadAndApplicationNotSubmitted() { long loggedInUserId = 7L; long leadApplicantUserId = 2L; ApplicationCompositeId applicationId = ApplicationCompositeId.id(14L); UserResource loggedInUser = setUpMocking(loggedInUserId, leadApplicantUserId, applicationId.id(), OPENED, COLLABORATIVE); assertFalse(rules.viewAddOrganisationPage(applicationId, loggedInUser)); } @Test public void viewAddOrganisationPageWhenNotLoggedInAsLeadAndApplicationSubmitted() { long loggedInUserId = 7L; long leadApplicantUserId = 2L; ApplicationCompositeId applicationId = ApplicationCompositeId.id(14L); UserResource loggedInUser = setUpMocking(loggedInUserId, leadApplicantUserId, applicationId.id(), SUBMITTED, COLLABORATIVE); assertFalse(rules.viewAddOrganisationPage(applicationId, loggedInUser)); } @Test public void viewAddOrganisationPageWhenLoggedInAsLeadAndApplicationSubmitted() { long loggedInUserId = 2L; long leadApplicantUserId = 2L; ApplicationCompositeId applicationId = ApplicationCompositeId.id(14L); UserResource loggedInUser = setUpMocking(loggedInUserId, leadApplicantUserId, applicationId.id(), SUBMITTED, COLLABORATIVE); assertFalse(rules.viewAddOrganisationPage(applicationId, loggedInUser)); } @Test public void viewAddOrganisationPageWhenLoggedInAsLeadAndApplicationNotSubmitted() { long loggedInUserId = 2L; long leadApplicantUserId = 2L; ApplicationCompositeId applicationId = ApplicationCompositeId.id(14L); UserResource loggedInUser = setUpMocking(loggedInUserId, leadApplicantUserId, applicationId.id(), OPENED, COLLABORATIVE); assertTrue(rules.viewAddOrganisationPage(applicationId, loggedInUser)); } @Test public void viewAddOrganisationPageWhenCollaborationLevelIsSingle() { long loggedInUserId = 2L; long leadApplicantUserId = 2L; ApplicationCompositeId applicationId = ApplicationCompositeId.id(14L); UserResource loggedInUser = setUpMocking(loggedInUserId, leadApplicantUserId, applicationId.id(), OPENED, SINGLE); assertFalse(rules.viewAddOrganisationPage(applicationId, loggedInUser)); } @Test public void viewAddOrganisationPageWhenCollaborationLevelIsSingleOrCollaborative() { long loggedInUserId = 2L; long leadApplicantUserId = 2L; ApplicationCompositeId applicationId = ApplicationCompositeId.id(14L); UserResource loggedInUser = setUpMocking(loggedInUserId, leadApplicantUserId, applicationId.id(), OPENED, SINGLE_OR_COLLABORATIVE); assertTrue(rules.viewAddOrganisationPage(applicationId, loggedInUser)); } @Test public void viewAddOrganisationPageWhenCollaborationLevelIsCollaborative() { long loggedInUserId = 2L; long leadApplicantUserId = 2L; ApplicationCompositeId applicationId = ApplicationCompositeId.id(14L); UserResource loggedInUser = setUpMocking(loggedInUserId, leadApplicantUserId, applicationId.id(), OPENED, COLLABORATIVE); assertTrue(rules.viewAddOrganisationPage(applicationId, loggedInUser)); }
QuestionController { @GetMapping("/get-question-by-id-and-assessment-id/{questionId}/{assessmentId}") public RestResult<QuestionResource> getQuestionByIdAndAssessmentId(@PathVariable("questionId") Long questionId, @PathVariable("assessmentId") Long assessmentId) { return questionService.getQuestionByIdAndAssessmentId(questionId, assessmentId).toGetResponse(); } @GetMapping("/id/{id}") RestResult<QuestionResource> getQuestionById(@PathVariable("id") final Long id); @GetMapping("/find-by-competition/{competitionId}") RestResult<List<QuestionResource>> findByCompetition(@PathVariable("competitionId") final Long competitionId); @GetMapping("/get-next-question/{questionId}") RestResult<QuestionResource> getNextQuestion(@PathVariable("questionId") final Long questionId); @GetMapping("/get-previous-question-by-section/{sectionId}") RestResult<QuestionResource> getPreviousQuestionBySection(@PathVariable("sectionId") final Long sectionId); @GetMapping("/get-next-question-by-section/{sectionId}") RestResult<QuestionResource> getNextQuestionBySection(@PathVariable("sectionId") final Long sectionId); @GetMapping("/get-previous-question/{questionId}") RestResult<QuestionResource> getPreviousQuestion(@PathVariable("questionId") final Long questionId); @GetMapping("/get-question-by-competition-id-and-form-input-type/{competitionId}/{formInputType}") RestResult<QuestionResource> getQuestionByFormInputType(@PathVariable("competitionId") final Long competitionId, @PathVariable("formInputType") final FormInputType formInputType); @GetMapping("/get-questions-by-section-id-and-type/{sectionId}/{type}") RestResult<List<QuestionResource>> getQuestionsBySectionIdAndType(@PathVariable("sectionId") final Long sectionId, @PathVariable("type") QuestionType type); @PutMapping("/") RestResult<QuestionResource> save(@RequestBody final QuestionResource questionResource); @GetMapping("/get-question-by-id-and-assessment-id/{questionId}/{assessmentId}") RestResult<QuestionResource> getQuestionByIdAndAssessmentId(@PathVariable("questionId") Long questionId, @PathVariable("assessmentId") Long assessmentId); @GetMapping("/get-questions-by-assessment/{assessmentId}") RestResult<List<QuestionResource>> getQuestionsByAssessmentId(@PathVariable("assessmentId") final Long assessmentId); @GetMapping("/get-question-by-competition-id-and-question-setup-type/{competitionId}/{type}") RestResult<QuestionResource> getQuestionByCompetitionIdQuestionSetupType( @PathVariable("competitionId") final long competitionId, @PathVariable("type") final QuestionSetupType questionSetupType); }
@Test public void getQuestionByIdAndAssessmentId() throws Exception { Long questionId = 1L; Long assessmentId = 2L; QuestionResource questionResource = newQuestionResource().build(); when(questionService.getQuestionByIdAndAssessmentId(questionId, assessmentId)).thenReturn(serviceSuccess(questionResource)); mockMvc.perform(get("/question/get-question-by-id-and-assessment-id/{questionId}/{assessmentId}", questionId, assessmentId)) .andExpect(content().string(objectMapper.writeValueAsString(questionResource))) .andExpect(status().isOk()); verify(questionService, only()).getQuestionByIdAndAssessmentId(questionId, assessmentId); }
OrganisationPermissionRules extends BasePermissionRules { @PermissionRule(value = "ADD_NEW_ORGANISATION", description = "Allowed to add a new organisation") public boolean addNewOrganisation(ApplicationCompositeId applicationCompositeId, UserResource loggedInUser) { return isCollaborationAllowed(applicationCompositeId.id()) && isLeadApplicant(applicationCompositeId.id(), loggedInUser) && applicationNotYetSubmitted(applicationCompositeId.id()); } @PermissionRule(value = "VIEW_ADD_ORGANISATION_PAGE", description = "Allowed to view the add organisation page") boolean viewAddOrganisationPage(ApplicationCompositeId applicationCompositeId, UserResource loggedInUser); @PermissionRule(value = "ADD_NEW_ORGANISATION", description = "Allowed to add a new organisation") boolean addNewOrganisation(ApplicationCompositeId applicationCompositeId, UserResource loggedInUser); }
@Test public void addNewOrganisationWhenNotLoggedInAsLeadAndApplicationNotSubmitted() { long loggedInUserId = 7L; long leadApplicantUserId = 2L; ApplicationCompositeId applicationId = ApplicationCompositeId.id(14L); UserResource loggedInUser = setUpMocking(loggedInUserId, leadApplicantUserId, applicationId.id(), OPENED, COLLABORATIVE); assertFalse(rules.addNewOrganisation(applicationId, loggedInUser)); } @Test public void addNewOrganisationWhenNotLoggedInAsLeadAndApplicationSubmitted() { long loggedInUserId = 7L; long leadApplicantUserId = 2L; ApplicationCompositeId applicationId = ApplicationCompositeId.id(14L); UserResource loggedInUser = setUpMocking(loggedInUserId, leadApplicantUserId, applicationId.id(), SUBMITTED, COLLABORATIVE); assertFalse(rules.addNewOrganisation(applicationId, loggedInUser)); } @Test public void addNewOrganisationWhenLoggedInAsLeadAndApplicationSubmitted() { long loggedInUserId = 2L; long leadApplicantUserId = 2L; ApplicationCompositeId applicationId = ApplicationCompositeId.id(14L); UserResource loggedInUser = setUpMocking(loggedInUserId, leadApplicantUserId, applicationId.id(), SUBMITTED, COLLABORATIVE); assertFalse(rules.addNewOrganisation(applicationId, loggedInUser)); } @Test public void addNewOrganisationWhenLoggedInAsLeadAndApplicationNotSubmitted() { long loggedInUserId = 2L; long leadApplicantUserId = 2L; ApplicationCompositeId applicationId = ApplicationCompositeId.id(14L); UserResource loggedInUser = setUpMocking(loggedInUserId, leadApplicantUserId, applicationId.id(), OPENED, COLLABORATIVE); assertTrue(rules.addNewOrganisation(applicationId, loggedInUser)); }
ApplicationTeamController { @GetMapping public String viewTeam(@ModelAttribute(value = "form", binding = false) ApplicationTeamForm form, BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user) { model.addAttribute("model", applicationTeamPopulator.populate(applicationId, questionId, user)); return "application/questions/application-team"; } @GetMapping String viewTeam(@ModelAttribute(value = "form", binding = false) ApplicationTeamForm form, BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @GetMapping(params = "show-errors") String showErrors(@ModelAttribute(value = "form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "invite-kta") String addKta(@Valid @ModelAttribute(value = "form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "resend-kta") String resendKta(@PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = "remove-kta") String removeKta(@PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = "complete") String markAsComplete(@ModelAttribute(value = "form") ApplicationTeamForm 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(params = "remove-team-member") String removeUser(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("remove-team-member") final long inviteId); @PostMapping(params = "remove-invite") String removeInvite(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("remove-invite") final long inviteId); @PostMapping(params = "resend-invite") String resendInvite(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("resend-invite") final long inviteId); @PostMapping(params = "add-team-member") String openAddTeamMemberForm(@ModelAttribute(value = "form", binding = false) ApplicationTeamForm form, BindingResult bindingResult, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("add-team-member") final long organisationId, Model model, UserResource userResource); @PostMapping(params = "close-add-team-member-form") String closeAddTeamMemberForm(@PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = "invite-to-organisation") String inviteToOrganisation(@Valid @ModelAttribute("form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("invite-to-organisation") final long organisationId, Model model, UserResource user); @PostMapping(params = "invite-to-existing-organisation") String inviteToExistingOrganisation(@Valid @ModelAttribute("form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("invite-to-existing-organisation") final long organisationId, Model model, UserResource user); }
@Test public void viewTeam() throws Exception { long applicationId = 1L; long questionId = 2L; ApplicationTeamViewModel expected = mock(ApplicationTeamViewModel.class); when(populator.populate(applicationId, questionId, loggedInUser)).thenReturn(expected); MvcResult result = mockMvc.perform(get("/application/{applicationId}/form/question/{questionId}/team", applicationId, questionId)) .andExpect(status().isOk()) .andExpect(view().name("application/questions/application-team")) .andReturn(); ApplicationTeamViewModel actual = (ApplicationTeamViewModel) result.getModelAndView().getModel().get("model"); assertEquals(expected, actual); }
ApplicationTeamController { @PostMapping(params = "complete") public String markAsComplete(@ModelAttribute(value = "form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user) { List<ValidationMessages> validationMessages = questionStatusRestService.markAsComplete(questionId, applicationId, processRoleId(user.getId(), applicationId)).getSuccess(); validationMessages.forEach(messages -> validationHandler.addAnyErrors(messages, mapTeamCompletionError(), defaultConverters())); return validationHandler.failNowOrSucceedWith(() -> { questionStatusRestService.markAsInComplete(questionId, applicationId, processRoleId(user.getId(), applicationId)).getSuccess(); return viewTeam(form, bindingResult, model, applicationId, questionId, user); }, () -> redirectToApplicationTeam(applicationId, questionId)); } @GetMapping String viewTeam(@ModelAttribute(value = "form", binding = false) ApplicationTeamForm form, BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @GetMapping(params = "show-errors") String showErrors(@ModelAttribute(value = "form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "invite-kta") String addKta(@Valid @ModelAttribute(value = "form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "resend-kta") String resendKta(@PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = "remove-kta") String removeKta(@PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = "complete") String markAsComplete(@ModelAttribute(value = "form") ApplicationTeamForm 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(params = "remove-team-member") String removeUser(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("remove-team-member") final long inviteId); @PostMapping(params = "remove-invite") String removeInvite(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("remove-invite") final long inviteId); @PostMapping(params = "resend-invite") String resendInvite(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("resend-invite") final long inviteId); @PostMapping(params = "add-team-member") String openAddTeamMemberForm(@ModelAttribute(value = "form", binding = false) ApplicationTeamForm form, BindingResult bindingResult, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("add-team-member") final long organisationId, Model model, UserResource userResource); @PostMapping(params = "close-add-team-member-form") String closeAddTeamMemberForm(@PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = "invite-to-organisation") String inviteToOrganisation(@Valid @ModelAttribute("form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("invite-to-organisation") final long organisationId, Model model, UserResource user); @PostMapping(params = "invite-to-existing-organisation") String inviteToExistingOrganisation(@Valid @ModelAttribute("form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("invite-to-existing-organisation") final long organisationId, Model model, UserResource user); }
@Test public void markAsComplete() throws Exception { long applicationId = 1L; long questionId = 2L; ProcessRoleResource role = newProcessRoleResource().build(); when(userRestService.findProcessRole(applicationId, loggedInUser.getId())).thenReturn(restSuccess(role)); when(questionStatusRestService.markAsComplete(questionId, applicationId, role.getId())).thenReturn(restSuccess(emptyList())); MvcResult result = mockMvc.perform(post("/application/{applicationId}/form/question/{questionId}/team", applicationId, questionId) .param("complete", String.valueOf(true))) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(String.format("/application/%d/form/question/%d/team", applicationId, questionId))) .andReturn(); verify(questionStatusRestService).markAsComplete(questionId, applicationId, role.getId()); } @Test public void markAsComplete_Failure() throws Exception { long applicationId = 1L; long questionId = 2L; ProcessRoleResource role = newProcessRoleResource().build(); when(userRestService.findProcessRole(applicationId, loggedInUser.getId())).thenReturn(restSuccess(role)); when(questionStatusRestService.markAsComplete(questionId, applicationId, role.getId())).thenReturn(restSuccess(singletonList(new ValidationMessages(globalError("please.enter.some.text"))))); when(questionStatusRestService.markAsInComplete(questionId, applicationId, role.getId())).thenReturn(restSuccess()); MvcResult result = mockMvc.perform(post("/application/{applicationId}/form/question/{questionId}/team", applicationId, questionId) .param("complete", String.valueOf(true))) .andExpect(status().isOk()) .andExpect(view().name("application/questions/application-team")) .andExpect(model().hasErrors()) .andReturn(); verify(questionStatusRestService).markAsComplete(questionId, applicationId, role.getId()); verify(questionStatusRestService).markAsInComplete(questionId, applicationId, role.getId()); } @Test public void markAsCompleteFailDueToPendingKta() throws Exception { long applicationId = 1L; long questionId = 2L; ProcessRoleResource role = newProcessRoleResource().build(); when(userRestService.findProcessRole(applicationId, loggedInUser.getId())).thenReturn(restSuccess(role)); when(questionStatusRestService.markAsComplete(questionId, applicationId, role.getId())).thenReturn(restSuccess(singletonList(new ValidationMessages(globalError("validation.kta.pending.invite"))))); when(questionStatusRestService.markAsInComplete(questionId, applicationId, role.getId())).thenReturn(restSuccess()); MvcResult result = mockMvc.perform(post("/application/{applicationId}/form/question/{questionId}/team", applicationId, questionId) .param("complete", String.valueOf(true))) .andExpect(status().isOk()) .andExpect(view().name("application/questions/application-team")) .andExpect(model().hasErrors()) .andExpect(model().attributeHasFieldErrorCode("form", "ktaEmail", "validation.kta.pending.invite")) .andReturn(); verify(questionStatusRestService).markAsComplete(questionId, applicationId, role.getId()); verify(questionStatusRestService).markAsInComplete(questionId, applicationId, role.getId()); } @Test public void markAsCompleteFailDueToMissingKta() throws Exception { long applicationId = 1L; long questionId = 2L; ProcessRoleResource role = newProcessRoleResource().build(); when(userRestService.findProcessRole(applicationId, loggedInUser.getId())).thenReturn(restSuccess(role)); when(questionStatusRestService.markAsComplete(questionId, applicationId, role.getId())).thenReturn(restSuccess(singletonList(new ValidationMessages(globalError("validation.kta.missing.invite"))))); when(questionStatusRestService.markAsInComplete(questionId, applicationId, role.getId())).thenReturn(restSuccess()); MvcResult result = mockMvc.perform(post("/application/{applicationId}/form/question/{questionId}/team", applicationId, questionId) .param("complete", String.valueOf(true))) .andExpect(status().isOk()) .andExpect(view().name("application/questions/application-team")) .andExpect(model().hasErrors()) .andExpect(model().attributeHasFieldErrorCode("form", "ktaEmail", "validation.kta.missing.invite")) .andReturn(); verify(questionStatusRestService).markAsComplete(questionId, applicationId, role.getId()); verify(questionStatusRestService).markAsInComplete(questionId, applicationId, role.getId()); }
QuestionController { @GetMapping("/get-questions-by-assessment/{assessmentId}") public RestResult<List<QuestionResource>> getQuestionsByAssessmentId(@PathVariable("assessmentId") final Long assessmentId) { return questionService.getQuestionsByAssessmentId(assessmentId).toGetResponse(); } @GetMapping("/id/{id}") RestResult<QuestionResource> getQuestionById(@PathVariable("id") final Long id); @GetMapping("/find-by-competition/{competitionId}") RestResult<List<QuestionResource>> findByCompetition(@PathVariable("competitionId") final Long competitionId); @GetMapping("/get-next-question/{questionId}") RestResult<QuestionResource> getNextQuestion(@PathVariable("questionId") final Long questionId); @GetMapping("/get-previous-question-by-section/{sectionId}") RestResult<QuestionResource> getPreviousQuestionBySection(@PathVariable("sectionId") final Long sectionId); @GetMapping("/get-next-question-by-section/{sectionId}") RestResult<QuestionResource> getNextQuestionBySection(@PathVariable("sectionId") final Long sectionId); @GetMapping("/get-previous-question/{questionId}") RestResult<QuestionResource> getPreviousQuestion(@PathVariable("questionId") final Long questionId); @GetMapping("/get-question-by-competition-id-and-form-input-type/{competitionId}/{formInputType}") RestResult<QuestionResource> getQuestionByFormInputType(@PathVariable("competitionId") final Long competitionId, @PathVariable("formInputType") final FormInputType formInputType); @GetMapping("/get-questions-by-section-id-and-type/{sectionId}/{type}") RestResult<List<QuestionResource>> getQuestionsBySectionIdAndType(@PathVariable("sectionId") final Long sectionId, @PathVariable("type") QuestionType type); @PutMapping("/") RestResult<QuestionResource> save(@RequestBody final QuestionResource questionResource); @GetMapping("/get-question-by-id-and-assessment-id/{questionId}/{assessmentId}") RestResult<QuestionResource> getQuestionByIdAndAssessmentId(@PathVariable("questionId") Long questionId, @PathVariable("assessmentId") Long assessmentId); @GetMapping("/get-questions-by-assessment/{assessmentId}") RestResult<List<QuestionResource>> getQuestionsByAssessmentId(@PathVariable("assessmentId") final Long assessmentId); @GetMapping("/get-question-by-competition-id-and-question-setup-type/{competitionId}/{type}") RestResult<QuestionResource> getQuestionByCompetitionIdQuestionSetupType( @PathVariable("competitionId") final long competitionId, @PathVariable("type") final QuestionSetupType questionSetupType); }
@Test public void getQuestionsByAssessmentId() throws Exception { final Long assessmentId = 1L; List<QuestionResource> questions = newQuestionResource().build(2); when(questionService.getQuestionsByAssessmentId(assessmentId)).thenReturn(serviceSuccess(questions)); mockMvc.perform(get("/question/get-questions-by-assessment/{assessmentId}", assessmentId)) .andExpect(content().string(objectMapper.writeValueAsString(questions))) .andExpect(status().isOk()); }
ApplicationTeamController { @GetMapping(params = "show-errors") public String showErrors(@ModelAttribute(value = "form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user) { return markAsComplete(form, bindingResult, validationHandler, model, applicationId, questionId, user); } @GetMapping String viewTeam(@ModelAttribute(value = "form", binding = false) ApplicationTeamForm form, BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @GetMapping(params = "show-errors") String showErrors(@ModelAttribute(value = "form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "invite-kta") String addKta(@Valid @ModelAttribute(value = "form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "resend-kta") String resendKta(@PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = "remove-kta") String removeKta(@PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = "complete") String markAsComplete(@ModelAttribute(value = "form") ApplicationTeamForm 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(params = "remove-team-member") String removeUser(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("remove-team-member") final long inviteId); @PostMapping(params = "remove-invite") String removeInvite(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("remove-invite") final long inviteId); @PostMapping(params = "resend-invite") String resendInvite(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("resend-invite") final long inviteId); @PostMapping(params = "add-team-member") String openAddTeamMemberForm(@ModelAttribute(value = "form", binding = false) ApplicationTeamForm form, BindingResult bindingResult, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("add-team-member") final long organisationId, Model model, UserResource userResource); @PostMapping(params = "close-add-team-member-form") String closeAddTeamMemberForm(@PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = "invite-to-organisation") String inviteToOrganisation(@Valid @ModelAttribute("form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("invite-to-organisation") final long organisationId, Model model, UserResource user); @PostMapping(params = "invite-to-existing-organisation") String inviteToExistingOrganisation(@Valid @ModelAttribute("form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("invite-to-existing-organisation") final long organisationId, Model model, UserResource user); }
@Test public void showErrors() throws Exception { long applicationId = 1L; long questionId = 2L; ProcessRoleResource role = newProcessRoleResource().build(); when(userRestService.findProcessRole(applicationId, loggedInUser.getId())).thenReturn(restSuccess(role)); when(questionStatusRestService.markAsComplete(questionId, applicationId, role.getId())).thenReturn(restSuccess(emptyList())); MvcResult result = mockMvc.perform(get("/application/{applicationId}/form/question/{questionId}/team?show-errors=true", applicationId, questionId)) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(String.format("/application/%d/form/question/%d/team", applicationId, questionId))) .andReturn(); verify(questionStatusRestService).markAsComplete(questionId, applicationId, role.getId()); }
ApplicationTeamController { @PostMapping(params = "edit") public String edit(@PathVariable long applicationId, @PathVariable long questionId, UserResource user) { questionStatusRestService.markAsInComplete(questionId, applicationId, processRoleId(user.getId(), applicationId)).getSuccess(); return redirectToApplicationTeam(applicationId, questionId); } @GetMapping String viewTeam(@ModelAttribute(value = "form", binding = false) ApplicationTeamForm form, BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @GetMapping(params = "show-errors") String showErrors(@ModelAttribute(value = "form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "invite-kta") String addKta(@Valid @ModelAttribute(value = "form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "resend-kta") String resendKta(@PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = "remove-kta") String removeKta(@PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = "complete") String markAsComplete(@ModelAttribute(value = "form") ApplicationTeamForm 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(params = "remove-team-member") String removeUser(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("remove-team-member") final long inviteId); @PostMapping(params = "remove-invite") String removeInvite(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("remove-invite") final long inviteId); @PostMapping(params = "resend-invite") String resendInvite(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("resend-invite") final long inviteId); @PostMapping(params = "add-team-member") String openAddTeamMemberForm(@ModelAttribute(value = "form", binding = false) ApplicationTeamForm form, BindingResult bindingResult, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("add-team-member") final long organisationId, Model model, UserResource userResource); @PostMapping(params = "close-add-team-member-form") String closeAddTeamMemberForm(@PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = "invite-to-organisation") String inviteToOrganisation(@Valid @ModelAttribute("form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("invite-to-organisation") final long organisationId, Model model, UserResource user); @PostMapping(params = "invite-to-existing-organisation") String inviteToExistingOrganisation(@Valid @ModelAttribute("form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("invite-to-existing-organisation") final long organisationId, Model model, UserResource user); }
@Test public void edit() throws Exception { long applicationId = 1L; long questionId = 2L; ProcessRoleResource role = newProcessRoleResource().build(); when(userRestService.findProcessRole(applicationId, loggedInUser.getId())).thenReturn(restSuccess(role)); when(questionStatusRestService.markAsInComplete(questionId, applicationId, role.getId())).thenReturn(restSuccess()); MvcResult result = mockMvc.perform(post("/application/{applicationId}/form/question/{questionId}/team", applicationId, questionId) .param("edit", String.valueOf(true))) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(String.format("/application/%d/form/question/%d/team", applicationId, questionId))) .andReturn(); verify(questionStatusRestService).markAsInComplete(questionId, applicationId, role.getId()); }
ApplicationTeamController { @PostMapping(params = "add-team-member") public String openAddTeamMemberForm(@ModelAttribute(value = "form", binding = false) ApplicationTeamForm form, BindingResult bindingResult, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("add-team-member") final long organisationId, Model model, UserResource userResource) { model.addAttribute("model", applicationTeamPopulator.populate(applicationId, questionId, userResource) .openAddTeamMemberForm(organisationId)); return "application/questions/application-team"; } @GetMapping String viewTeam(@ModelAttribute(value = "form", binding = false) ApplicationTeamForm form, BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @GetMapping(params = "show-errors") String showErrors(@ModelAttribute(value = "form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "invite-kta") String addKta(@Valid @ModelAttribute(value = "form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "resend-kta") String resendKta(@PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = "remove-kta") String removeKta(@PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = "complete") String markAsComplete(@ModelAttribute(value = "form") ApplicationTeamForm 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(params = "remove-team-member") String removeUser(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("remove-team-member") final long inviteId); @PostMapping(params = "remove-invite") String removeInvite(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("remove-invite") final long inviteId); @PostMapping(params = "resend-invite") String resendInvite(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("resend-invite") final long inviteId); @PostMapping(params = "add-team-member") String openAddTeamMemberForm(@ModelAttribute(value = "form", binding = false) ApplicationTeamForm form, BindingResult bindingResult, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("add-team-member") final long organisationId, Model model, UserResource userResource); @PostMapping(params = "close-add-team-member-form") String closeAddTeamMemberForm(@PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = "invite-to-organisation") String inviteToOrganisation(@Valid @ModelAttribute("form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("invite-to-organisation") final long organisationId, Model model, UserResource user); @PostMapping(params = "invite-to-existing-organisation") String inviteToExistingOrganisation(@Valid @ModelAttribute("form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("invite-to-existing-organisation") final long organisationId, Model model, UserResource user); }
@Test public void openAddTeamMemberForm() throws Exception { long applicationId = 1L; long questionId = 2L; long organisationId = 3L; ApplicationTeamViewModel expected = mock(ApplicationTeamViewModel.class); when(populator.populate(applicationId, questionId, loggedInUser)).thenReturn(expected); when(expected.openAddTeamMemberForm(organisationId)).thenReturn(expected); MvcResult result = mockMvc.perform(post("/application/{applicationId}/form/question/{questionId}/team", applicationId, questionId) .param("add-team-member", String.valueOf(organisationId))) .andExpect(status().isOk()) .andExpect(view().name("application/questions/application-team")) .andReturn(); ApplicationTeamViewModel actual = (ApplicationTeamViewModel) result.getModelAndView().getModel().get("model"); assertEquals(expected, actual); verify(expected).openAddTeamMemberForm(organisationId); }
ApplicationTeamController { @PostMapping(params = "close-add-team-member-form") public String closeAddTeamMemberForm(@PathVariable long applicationId, @PathVariable long questionId) { return redirectToApplicationTeam(applicationId, questionId); } @GetMapping String viewTeam(@ModelAttribute(value = "form", binding = false) ApplicationTeamForm form, BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @GetMapping(params = "show-errors") String showErrors(@ModelAttribute(value = "form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "invite-kta") String addKta(@Valid @ModelAttribute(value = "form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "resend-kta") String resendKta(@PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = "remove-kta") String removeKta(@PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = "complete") String markAsComplete(@ModelAttribute(value = "form") ApplicationTeamForm 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(params = "remove-team-member") String removeUser(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("remove-team-member") final long inviteId); @PostMapping(params = "remove-invite") String removeInvite(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("remove-invite") final long inviteId); @PostMapping(params = "resend-invite") String resendInvite(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("resend-invite") final long inviteId); @PostMapping(params = "add-team-member") String openAddTeamMemberForm(@ModelAttribute(value = "form", binding = false) ApplicationTeamForm form, BindingResult bindingResult, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("add-team-member") final long organisationId, Model model, UserResource userResource); @PostMapping(params = "close-add-team-member-form") String closeAddTeamMemberForm(@PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = "invite-to-organisation") String inviteToOrganisation(@Valid @ModelAttribute("form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("invite-to-organisation") final long organisationId, Model model, UserResource user); @PostMapping(params = "invite-to-existing-organisation") String inviteToExistingOrganisation(@Valid @ModelAttribute("form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("invite-to-existing-organisation") final long organisationId, Model model, UserResource user); }
@Test public void closeAddTeamMemberForm() throws Exception { long applicationId = 1L; long questionId = 2L; mockMvc.perform(post("/application/{applicationId}/form/question/{questionId}/team", applicationId, questionId) .param("close-add-team-member-form", "")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(String.format("/application/%d/form/question/%d/team", applicationId, questionId))) .andReturn(); }
ApplicationTeamController { @PostMapping(params = "remove-team-member") public String removeUser(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("remove-team-member") final long inviteId) { inviteRestService.removeApplicationInvite(inviteId).getSuccess(); return redirectToApplicationTeam(applicationId, questionId); } @GetMapping String viewTeam(@ModelAttribute(value = "form", binding = false) ApplicationTeamForm form, BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @GetMapping(params = "show-errors") String showErrors(@ModelAttribute(value = "form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "invite-kta") String addKta(@Valid @ModelAttribute(value = "form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "resend-kta") String resendKta(@PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = "remove-kta") String removeKta(@PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = "complete") String markAsComplete(@ModelAttribute(value = "form") ApplicationTeamForm 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(params = "remove-team-member") String removeUser(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("remove-team-member") final long inviteId); @PostMapping(params = "remove-invite") String removeInvite(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("remove-invite") final long inviteId); @PostMapping(params = "resend-invite") String resendInvite(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("resend-invite") final long inviteId); @PostMapping(params = "add-team-member") String openAddTeamMemberForm(@ModelAttribute(value = "form", binding = false) ApplicationTeamForm form, BindingResult bindingResult, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("add-team-member") final long organisationId, Model model, UserResource userResource); @PostMapping(params = "close-add-team-member-form") String closeAddTeamMemberForm(@PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = "invite-to-organisation") String inviteToOrganisation(@Valid @ModelAttribute("form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("invite-to-organisation") final long organisationId, Model model, UserResource user); @PostMapping(params = "invite-to-existing-organisation") String inviteToExistingOrganisation(@Valid @ModelAttribute("form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("invite-to-existing-organisation") final long organisationId, Model model, UserResource user); }
@Test public void removeUser() throws Exception { long applicationId = 1L; long questionId = 2L; long inviteId = 3L; when(inviteRestService.removeApplicationInvite(inviteId)).thenReturn(restSuccess()); mockMvc.perform(post("/application/{applicationId}/form/question/{questionId}/team", applicationId, questionId) .param("remove-team-member", String.valueOf(inviteId))) .andExpect(status().is3xxRedirection()); verify(inviteRestService).removeApplicationInvite(inviteId); }
ApplicationTeamController { @PostMapping(params = "remove-invite") public String removeInvite(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("remove-invite") final long inviteId) { inviteRestService.removeApplicationInvite(inviteId).getSuccess(); return redirectToApplicationTeam(applicationId, questionId); } @GetMapping String viewTeam(@ModelAttribute(value = "form", binding = false) ApplicationTeamForm form, BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @GetMapping(params = "show-errors") String showErrors(@ModelAttribute(value = "form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "invite-kta") String addKta(@Valid @ModelAttribute(value = "form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "resend-kta") String resendKta(@PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = "remove-kta") String removeKta(@PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = "complete") String markAsComplete(@ModelAttribute(value = "form") ApplicationTeamForm 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(params = "remove-team-member") String removeUser(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("remove-team-member") final long inviteId); @PostMapping(params = "remove-invite") String removeInvite(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("remove-invite") final long inviteId); @PostMapping(params = "resend-invite") String resendInvite(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("resend-invite") final long inviteId); @PostMapping(params = "add-team-member") String openAddTeamMemberForm(@ModelAttribute(value = "form", binding = false) ApplicationTeamForm form, BindingResult bindingResult, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("add-team-member") final long organisationId, Model model, UserResource userResource); @PostMapping(params = "close-add-team-member-form") String closeAddTeamMemberForm(@PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = "invite-to-organisation") String inviteToOrganisation(@Valid @ModelAttribute("form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("invite-to-organisation") final long organisationId, Model model, UserResource user); @PostMapping(params = "invite-to-existing-organisation") String inviteToExistingOrganisation(@Valid @ModelAttribute("form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("invite-to-existing-organisation") final long organisationId, Model model, UserResource user); }
@Test public void removeInvite() throws Exception { long applicationId = 1L; long questionId = 2L; long inviteId = 3L; when(inviteRestService.removeApplicationInvite(inviteId)).thenReturn(restSuccess()); mockMvc.perform(post("/application/{applicationId}/form/question/{questionId}/team", applicationId, questionId) .param("remove-invite", String.valueOf(inviteId))) .andExpect(status().is3xxRedirection()); verify(inviteRestService).removeApplicationInvite(inviteId); }
ApplicationTeamController { @PostMapping(params = "resend-invite") public String resendInvite(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("resend-invite") final long inviteId) { resendApplicationInvite(inviteId, applicationId); return redirectToApplicationTeam(applicationId, questionId); } @GetMapping String viewTeam(@ModelAttribute(value = "form", binding = false) ApplicationTeamForm form, BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @GetMapping(params = "show-errors") String showErrors(@ModelAttribute(value = "form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "invite-kta") String addKta(@Valid @ModelAttribute(value = "form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "resend-kta") String resendKta(@PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = "remove-kta") String removeKta(@PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = "complete") String markAsComplete(@ModelAttribute(value = "form") ApplicationTeamForm 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(params = "remove-team-member") String removeUser(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("remove-team-member") final long inviteId); @PostMapping(params = "remove-invite") String removeInvite(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("remove-invite") final long inviteId); @PostMapping(params = "resend-invite") String resendInvite(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("resend-invite") final long inviteId); @PostMapping(params = "add-team-member") String openAddTeamMemberForm(@ModelAttribute(value = "form", binding = false) ApplicationTeamForm form, BindingResult bindingResult, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("add-team-member") final long organisationId, Model model, UserResource userResource); @PostMapping(params = "close-add-team-member-form") String closeAddTeamMemberForm(@PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = "invite-to-organisation") String inviteToOrganisation(@Valid @ModelAttribute("form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("invite-to-organisation") final long organisationId, Model model, UserResource user); @PostMapping(params = "invite-to-existing-organisation") String inviteToExistingOrganisation(@Valid @ModelAttribute("form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("invite-to-existing-organisation") final long organisationId, Model model, UserResource user); }
@Test public void resendInvite() throws Exception { long applicationId = 1L; long questionId = 2L; long inviteId = 3L; ApplicationInviteResource applicationInviteResource = newApplicationInviteResource() .withId(inviteId) .build(); List<InviteOrganisationResource> inviteOrganisationResource = newInviteOrganisationResource() .withInviteResources(singletonList(applicationInviteResource)) .build(1); when(inviteRestService.resendInvite(applicationInviteResource)).thenReturn(restSuccess()); when(inviteRestService.getInvitesByApplication(applicationId)).thenReturn(restSuccess(inviteOrganisationResource)); mockMvc.perform(post("/application/{applicationId}/form/question/{questionId}/team", applicationId, questionId) .param("resend-invite", String.valueOf(inviteId))) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl("/application/" + applicationId + "/form/question/" + questionId + "/team")); verify(inviteRestService).resendInvite(applicationInviteResource); }
ApplicationTeamController { @PostMapping(params = "invite-to-existing-organisation") public String inviteToExistingOrganisation(@Valid @ModelAttribute("form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("invite-to-existing-organisation") final long organisationId, Model model, UserResource user) { return inviteToOrganisation(form, validationHandler, applicationId, questionId, organisationId, model, user, invite -> inviteRestService.createInvitesByOrganisationForApplication(applicationId, organisationId, singletonList(invite)) ); } @GetMapping String viewTeam(@ModelAttribute(value = "form", binding = false) ApplicationTeamForm form, BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @GetMapping(params = "show-errors") String showErrors(@ModelAttribute(value = "form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "invite-kta") String addKta(@Valid @ModelAttribute(value = "form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "resend-kta") String resendKta(@PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = "remove-kta") String removeKta(@PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = "complete") String markAsComplete(@ModelAttribute(value = "form") ApplicationTeamForm 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(params = "remove-team-member") String removeUser(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("remove-team-member") final long inviteId); @PostMapping(params = "remove-invite") String removeInvite(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("remove-invite") final long inviteId); @PostMapping(params = "resend-invite") String resendInvite(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("resend-invite") final long inviteId); @PostMapping(params = "add-team-member") String openAddTeamMemberForm(@ModelAttribute(value = "form", binding = false) ApplicationTeamForm form, BindingResult bindingResult, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("add-team-member") final long organisationId, Model model, UserResource userResource); @PostMapping(params = "close-add-team-member-form") String closeAddTeamMemberForm(@PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = "invite-to-organisation") String inviteToOrganisation(@Valid @ModelAttribute("form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("invite-to-organisation") final long organisationId, Model model, UserResource user); @PostMapping(params = "invite-to-existing-organisation") String inviteToExistingOrganisation(@Valid @ModelAttribute("form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("invite-to-existing-organisation") final long organisationId, Model model, UserResource user); }
@Test public void inviteToExistingOrganisation() throws Exception { long applicationId = 1L; long questionId = 2L; long organisationId = 3L; String userName = "User"; String email = "[email protected]"; ApplicationInviteResource expectedInvite = newApplicationInviteResource() .withId((Long) null) .withApplication(applicationId) .withEmail(email) .withName(userName) .withInviteOrganisation(organisationId) .build(); when(inviteRestService.createInvitesByOrganisationForApplication(applicationId, organisationId, singletonList(expectedInvite))).thenReturn(restSuccess()); mockMvc.perform(post("/application/{applicationId}/form/question/{questionId}/team", applicationId, questionId) .param("invite-to-existing-organisation", String.valueOf(organisationId)) .param("name", userName) .param("email", email)) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(String.format("/application/%d/form/question/%d/team", applicationId, questionId))) .andReturn(); verify(inviteRestService).createInvitesByOrganisationForApplication(applicationId, organisationId, singletonList(expectedInvite)); }
ApplicationTeamController { @PostMapping(params = "invite-to-organisation") public String inviteToOrganisation(@Valid @ModelAttribute("form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("invite-to-organisation") final long organisationId, Model model, UserResource user) { return inviteToOrganisation(form, validationHandler, applicationId, questionId, organisationId, model, user, invite -> inviteRestService.saveInvites(singletonList(invite)) ); } @GetMapping String viewTeam(@ModelAttribute(value = "form", binding = false) ApplicationTeamForm form, BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @GetMapping(params = "show-errors") String showErrors(@ModelAttribute(value = "form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "invite-kta") String addKta(@Valid @ModelAttribute(value = "form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "resend-kta") String resendKta(@PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = "remove-kta") String removeKta(@PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = "complete") String markAsComplete(@ModelAttribute(value = "form") ApplicationTeamForm 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(params = "remove-team-member") String removeUser(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("remove-team-member") final long inviteId); @PostMapping(params = "remove-invite") String removeInvite(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("remove-invite") final long inviteId); @PostMapping(params = "resend-invite") String resendInvite(@PathVariable long applicationId, @PathVariable long questionId, @RequestParam("resend-invite") final long inviteId); @PostMapping(params = "add-team-member") String openAddTeamMemberForm(@ModelAttribute(value = "form", binding = false) ApplicationTeamForm form, BindingResult bindingResult, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("add-team-member") final long organisationId, Model model, UserResource userResource); @PostMapping(params = "close-add-team-member-form") String closeAddTeamMemberForm(@PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = "invite-to-organisation") String inviteToOrganisation(@Valid @ModelAttribute("form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("invite-to-organisation") final long organisationId, Model model, UserResource user); @PostMapping(params = "invite-to-existing-organisation") String inviteToExistingOrganisation(@Valid @ModelAttribute("form") ApplicationTeamForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable long applicationId, @PathVariable long questionId, @RequestParam("invite-to-existing-organisation") final long organisationId, Model model, UserResource user); }
@Test public void inviteToOrganisation() throws Exception { long applicationId = 1L; long questionId = 2L; long organisationId = 3L; String userName = "User"; String email = "[email protected]"; ApplicationInviteResource expectedInvite = newApplicationInviteResource() .withId((Long) null) .withApplication(applicationId) .withEmail(email) .withName(userName) .withInviteOrganisation(organisationId) .build(); when(inviteRestService.saveInvites(singletonList(expectedInvite))).thenReturn(restSuccess()); mockMvc.perform(post("/application/{applicationId}/form/question/{questionId}/team", applicationId, questionId) .param("invite-to-organisation", String.valueOf(organisationId)) .param("name", userName) .param("email", email)) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(String.format("/application/%d/form/question/%d/team", applicationId, questionId))) .andReturn(); verify(inviteRestService).saveInvites(singletonList(expectedInvite)); }
ApplicationTeamAddOrganisationController { @GetMapping @PreAuthorize("hasPermission(#applicationId, 'org.innovateuk.ifs.application.resource.ApplicationCompositeId', 'ADD_NEW_ORGANISATION')") public String addOrganisationForm(@ModelAttribute(value = "form", binding = false) ApplicationTeamOrganisationForm form, BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId) { ApplicationResource application = applicationRestService.getApplicationById(applicationId).getSuccess(); model.addAttribute("model", new ApplicationTeamAddOrganisationViewModel(application, questionId)); return "application/questions/application-team-organisation"; } @GetMapping @PreAuthorize("hasPermission(#applicationId, 'org.innovateuk.ifs.application.resource.ApplicationCompositeId', 'ADD_NEW_ORGANISATION')") String addOrganisationForm(@ModelAttribute(value = "form", binding = false) ApplicationTeamOrganisationForm form, BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId); @PostMapping @PreAuthorize("hasPermission(#applicationId, 'org.innovateuk.ifs.application.resource.ApplicationCompositeId', 'ADD_NEW_ORGANISATION')") String addOrganisation(@Valid @ModelAttribute(value = "form") ApplicationTeamOrganisationForm form, BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId); }
@Test public void addOrganisationForm() throws Exception { Long applicationId = 1L; long questionId = 2L; ApplicationResource application = newApplicationResource() .withId(applicationId) .withName("Name") .build(); when(applicationRestService.getApplicationById(applicationId)).thenReturn(restSuccess(application)); MvcResult result = mockMvc.perform(get("/application/{applicationId}/form/question/{questionId}/team/new-organisation", applicationId, questionId)) .andExpect(status().isOk()) .andExpect(view().name("application/questions/application-team-organisation")) .andReturn(); ApplicationTeamAddOrganisationViewModel actual = (ApplicationTeamAddOrganisationViewModel) result.getModelAndView().getModel().get("model"); assertEquals(applicationId, actual.getApplicationId()); assertEquals("Name", actual.getApplicationName()); assertEquals(questionId, actual.getQuestionId()); }
FormInputServiceImpl extends BaseTransactionalService implements FormInputService { @Override public ServiceResult<FileEntryResource> findFile(long formInputId) { return findFormInputEntity(formInputId).andOnSuccess(formInput -> ofNullable(formInput.getFile()) .map(FileEntry::getId) .map(fileEntryService::findOne) .orElse(serviceSuccess(null))); } @Override ServiceResult<FormInputResource> findFormInput(long id); @Override ServiceResult<List<FormInputResource>> findByQuestionId(long questionId); @Override @Cacheable(cacheNames="formInputByQuestionAndScope", key = "T(java.lang.String).format('formInputByQuestionAndScope:%d:%s', #questionId, #scope.name())", unless = "!T(org.innovateuk.ifs.cache.CacheHelper).cacheResultIfCompetitionIsOpen(#result)") ServiceResult<List<FormInputResource>> findByQuestionIdAndScope(long questionId, FormInputScope scope); @Override ServiceResult<List<FormInputResource>> findByCompetitionId(long competitionId); @Override ServiceResult<List<FormInputResource>> findByCompetitionIdAndScope(long competitionId, FormInputScope scope); @Override @Transactional ServiceResult<Void> delete(long id); @Override ServiceResult<FileAndContents> downloadFile(long formInputId); @Override ServiceResult<FileEntryResource> findFile(long formInputId); }
@Test public void findTemplateFile() throws Exception { long formInputId = 1L; FileEntry fileEntry = newFileEntry().build(); FormInput formInput = newFormInput() .withFile(fileEntry) .build(); FileEntryResource fileEntryResource = newFileEntryResource().build(); when(formInputRepository.findById(formInputId)).thenReturn(Optional.of(formInput)); when(fileEntryServiceMock.findOne(fileEntry.getId())).thenReturn(serviceSuccess(fileEntryResource)); FileEntryResource response = service.findFile(formInputId).getSuccess(); assertEquals(fileEntryResource, response); }
ApplicationTeamAddOrganisationController { @PostMapping @PreAuthorize("hasPermission(#applicationId, 'org.innovateuk.ifs.application.resource.ApplicationCompositeId', 'ADD_NEW_ORGANISATION')") public String addOrganisation(@Valid @ModelAttribute(value = "form") ApplicationTeamOrganisationForm form, BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId) { Supplier<String> failureView = () -> addOrganisationForm(form, bindingResult, model, applicationId, questionId); return validationHandler.failNowOrSucceedWith(failureView, () -> { validationHandler.addAnyErrors(inviteRestService.createInvitesByInviteOrganisation( form.getOrganisationName(), singletonList(new ApplicationInviteResource(form.getName(), form.getEmail(), applicationId))), mappingErrorKeyToField("email.already.in.invite", "email"), defaultConverters()); return validationHandler.failNowOrSucceedWith(failureView, () -> redirectToApplicationTeam(applicationId, questionId)); }); } @GetMapping @PreAuthorize("hasPermission(#applicationId, 'org.innovateuk.ifs.application.resource.ApplicationCompositeId', 'ADD_NEW_ORGANISATION')") String addOrganisationForm(@ModelAttribute(value = "form", binding = false) ApplicationTeamOrganisationForm form, BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId); @PostMapping @PreAuthorize("hasPermission(#applicationId, 'org.innovateuk.ifs.application.resource.ApplicationCompositeId', 'ADD_NEW_ORGANISATION')") String addOrganisation(@Valid @ModelAttribute(value = "form") ApplicationTeamOrganisationForm form, BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId); }
@Test public void addOrganisation() throws Exception { long applicationId = 1L; long questionId = 2L; when(inviteRestService.createInvitesByInviteOrganisation( "New organisation", singletonList(new ApplicationInviteResource("Someone", "[email protected]", applicationId)))) .thenReturn(restSuccess()); mockMvc.perform(post("/application/{applicationId}/form/question/{questionId}/team/new-organisation", applicationId, questionId) .param("organisationName", "New organisation") .param("name", "Someone") .param("email", "[email protected]")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(String.format("/application/%d/form/question/%d/team", applicationId, questionId))); verify(inviteRestService).createInvitesByInviteOrganisation( "New organisation", singletonList(new ApplicationInviteResource("Someone", "[email protected]", applicationId))); }
ApplicationTeamAddressController { @GetMapping public String getAddress(@ModelAttribute(value = "form", binding = false) ApplicationTeamAddressForm form, BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, @PathVariable long organisationId) { AddressResource address = applicationOrganisationAddressRestService.getAddress(applicationId, organisationId, INTERNATIONAL).getSuccess(); form.populate(address); return getAddressView(model, applicationId, organisationId, questionId); } @GetMapping String getAddress(@ModelAttribute(value = "form", binding = false) ApplicationTeamAddressForm form, BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, @PathVariable long organisationId); @PostMapping String updateAddress(@Valid @ModelAttribute(value = "form") ApplicationTeamAddressForm form, BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, @PathVariable long organisationId); }
@Test public void getAddress() throws Exception { AddressResource address = newAddressResource() .withAddressLine1("1 street lane") .withAddressLine2("somewhere") .withTown("some town") .withPostcode("zip") .withCountry("Swindonland") .build(); ApplicationResource application = newApplicationResource().build(); OrganisationResource organisation = newOrganisationResource().build(); long questionId = 40L; when(applicationOrganisationAddressRestService.getAddress(application.getId(), organisation.getId(), OrganisationAddressType.INTERNATIONAL)).thenReturn(restSuccess(address)); when(applicationRestService.getApplicationById(application.getId())).thenReturn(restSuccess(application)); when(organisationRestService.getOrganisationById(organisation.getId())).thenReturn(restSuccess(organisation)); MvcResult result = mockMvc.perform(get("/application/{applicationId}/form/question/{questionId}/team/organisation/{organisationId}/address", application.getId(), questionId, organisation.getId())) .andExpect(status().isOk()) .andExpect(view().name("application/questions/application-team-address")) .andReturn(); ApplicationTeamAddressViewModel actual = (ApplicationTeamAddressViewModel) result.getModelAndView().getModel().get("model"); assertEquals(application.getId(), actual.getApplicationId()); assertEquals(organisation.getName(), actual.getOrganisationName()); assertEquals(questionId, actual.getQuestionId()); assertEquals(COUNTRIES, actual.getCountries()); ApplicationTeamAddressForm form = (ApplicationTeamAddressForm) result.getModelAndView().getModel().get("form"); assertEquals(form.getAddressLine1(), address.getAddressLine1()); assertEquals(form.getAddressLine2(), address.getAddressLine2()); assertEquals(form.getTown(), address.getTown()); assertEquals(form.getZipCode(), address.getPostcode()); assertEquals(form.getCountry(), address.getCountry()); }
ApplicationTeamAddressController { @PostMapping public String updateAddress(@Valid @ModelAttribute(value = "form") ApplicationTeamAddressForm form, BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, @PathVariable long organisationId) { Supplier<String> failureView = () -> getAddressView(model, applicationId, organisationId, questionId); return validationHandler.failNowOrSucceedWith(failureView, () -> { validationHandler.addAnyErrors(applicationOrganisationAddressRestService.updateAddress(applicationId, organisationId, INTERNATIONAL, form.toAddress())); return validationHandler.failNowOrSucceedWith(failureView, () -> redirectToApplicationTeam(applicationId, questionId)); }); } @GetMapping String getAddress(@ModelAttribute(value = "form", binding = false) ApplicationTeamAddressForm form, BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, @PathVariable long organisationId); @PostMapping String updateAddress(@Valid @ModelAttribute(value = "form") ApplicationTeamAddressForm form, BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, @PathVariable long organisationId); }
@Test public void updateAddress() throws Exception { AddressResource address = newAddressResource() .withAddressLine1("1 street lane") .withAddressLine2("somewhere") .withTown("some town") .withPostcode("zip") .withCountry("Swindonland") .build(); long applicationId = 1L; long organisationId = 2L; long questionId = 40L; when(applicationOrganisationAddressRestService.updateAddress(anyLong(), anyLong(), any(), any())).thenReturn(restSuccess()); mockMvc.perform(post("/application/{applicationId}/form/question/{questionId}/team/organisation/{organisationId}/address", applicationId, questionId, organisationId) .param("addressLine1", address.getAddressLine1()) .param("addressLine2", address.getAddressLine2()) .param("town", address.getTown()) .param("zipCode", address.getPostcode()) .param("country", address.getCountry())) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(String.format("/application/%d/form/question/%d/team", applicationId, questionId))); verify(applicationOrganisationAddressRestService, never()).updateAddress(anyLong(), anyLong(), any(), eq(address)); }
ApplicationTeamPopulator { public ApplicationTeamViewModel populate(long applicationId, long questionId, UserResource user) { ApplicationResource application = applicationService.getById(applicationId); CompetitionResource competition = competitionRestService.getCompetitionById(application.getCompetition()).getSuccess(); List<ProcessRoleResource> processRoles = userRestService.findProcessRole(applicationId).getSuccess(); List<ProcessRoleResource> applicantProcessRoles = processRoles .stream() .filter(role -> applicantProcessRoles().contains(role.getRole())) .collect(toList()); List<InviteOrganisationResource> inviteOrganisationResources = inviteRestService.getInvitesByApplication(applicationId).getSuccess(); List<OrganisationResource> organisations = organisationRestService.getOrganisationsByApplicationId(applicationId).getSuccess(); List<QuestionStatusResource> questionStatuses = questionStatusRestService.findQuestionStatusesByQuestionAndApplicationId(questionId, applicationId).getSuccess(); boolean leadApplicant = applicantProcessRoles.stream() .anyMatch(pr -> pr.getUser().equals(user.getId()) && pr.getRole() == LEADAPPLICANT); Multimap<Long, ProcessRoleResource> organisationToProcessRole = index(applicantProcessRoles, ProcessRoleResource::getOrganisationId); Map<Long, InviteOrganisationResource> organisationToInvite = inviteOrganisationResources.stream() .filter(organisationInvite -> organisationInvite.getOrganisation() != null) .collect(toMap(InviteOrganisationResource::getOrganisation, Function.identity())); List<ApplicationTeamOrganisationViewModel> organisationViewModels = organisations.stream() .map(organisation -> toOrganisationTeamViewModel(applicationId, organisation, organisationToProcessRole.get(organisation.getId()), organisationToInvite.get(organisation.getId()), leadApplicant, user)) .collect(toList()); organisationViewModels.addAll(inviteOrganisationResources.stream() .filter(invite -> invite.getOrganisation() == null) .map(invite -> toInviteOrganisationTeamViewModel(invite, leadApplicant)) .collect(toList())); sort(organisationViewModels); ProcessRoleResource ktaProcessRole = null; ApplicationKtaInviteResource ktaInvite = null; Optional<ProcessRoleResource> kta = processRoles.stream() .filter(pr -> pr.getRole() == KNOWLEDGE_TRANSFER_ADVISER).findAny(); if (kta.isPresent()) { ktaProcessRole = kta.get(); } else { ktaInvite = applicationKtaInviteRestService.getKtaInviteByApplication(applicationId).getSuccess(); } return new ApplicationTeamViewModel(applicationId, application.getName(), application.getCompetitionName(), questionId, organisationViewModels, user.getId(), leadApplicant, competition.getCollaborationLevel() == CollaborationLevel.SINGLE, application.isOpen() && competition.isOpen(), questionStatuses.stream().anyMatch(QuestionStatusResource::getMarkedAsComplete), competition.isKtp(), ktaInvite, ktaProcessRole); } ApplicationTeamViewModel populate(long applicationId, long questionId, UserResource user); }
@Test public void populate() { long questionId = 3L; UserResource user = newUserResource().build(); UserResource collaborator = newUserResource().build(); OrganisationResource leadOrganisation = newOrganisationResource() .withName("Lead") .build(); OrganisationResource collboratorOrganisation = newOrganisationResource() .withName("Collaborator") .build(); ProcessRoleResource leadRole = newProcessRoleResource() .withRole(Role.LEADAPPLICANT) .withOrganisation(leadOrganisation.getId()) .withUser(user) .build(); ProcessRoleResource collaboratorRole = newProcessRoleResource() .withRole(Role.COLLABORATOR) .withOrganisation(collboratorOrganisation.getId()) .withUser(collaborator) .build(); ApplicationInviteResource collaboratorInvite = newApplicationInviteResource() .withName("Collaborator Invite") .withStatus(InviteStatus.OPENED) .withUsers(collaborator.getId()) .build(); ApplicationInviteResource newUserInvite = newApplicationInviteResource() .withName("New user") .withStatus(InviteStatus.SENT) .withSentOn(ZonedDateTime.now().minusDays(10).minusHours(1)) .build(); InviteOrganisationResource collaboratorOrganisationInvite = newInviteOrganisationResource() .withOrganisationNameConfirmed(collboratorOrganisation.getName()) .withOrganisation(collboratorOrganisation.getId()) .withInviteResources(singletonList(collaboratorInvite)) .build(); InviteOrganisationResource invitedOrganisation = newInviteOrganisationResource() .withOrganisationName("New organisation") .withInviteResources(singletonList(newUserInvite)) .build(); CompetitionResource competition = newCompetitionResource() .withCollaborationLevel(CollaborationLevel.SINGLE) .build(); ApplicationResource application = newApplicationResource() .withCompetition(competition.getId()) .build(); QuestionStatusResource status = newQuestionStatusResource() .withQuestion(questionId) .withMarkedAsComplete(true) .build(); when(applicationService.getById(application.getId())).thenReturn(application); when(competitionRestService.getCompetitionById(application.getCompetition())).thenReturn(restSuccess(competition)); when(userRestService.findProcessRole(application.getId())).thenReturn(restSuccess(asList(leadRole, collaboratorRole))); when(inviteRestService.getInvitesByApplication(application.getId())).thenReturn(restSuccess(asList(collaboratorOrganisationInvite, invitedOrganisation))); when(applicationKtaInviteRestService.getKtaInviteByApplication(application.getId())).thenReturn(restSuccess(null, HttpStatus.OK)); when(organisationRestService.getOrganisationsByApplicationId(application.getId())).thenReturn(restSuccess(asList(collboratorOrganisation, leadOrganisation))); when(questionStatusRestService.findQuestionStatusesByQuestionAndApplicationId(questionId, application.getId())).thenReturn(restSuccess(singletonList(status))); ApplicationTeamViewModel viewModel = populator.populate(application.getId(), questionId, user); assertEquals(application.getId(), viewModel.getApplicationId()); assertEquals(application.getName(), viewModel.getApplicationName()); assertEquals((long) user.getId(), viewModel.getLoggedInUserId()); assertEquals(questionId, viewModel.getQuestionId()); assertTrue(viewModel.isAnyPendingInvites()); assertTrue(viewModel.isReadOnly()); assertTrue(viewModel.isCollaborationLevelSingle()); assertTrue(viewModel.isComplete()); assertTrue(viewModel.isLeadApplicant()); assertEquals(3, viewModel.getOrganisations().size()); ApplicationTeamOrganisationViewModel leadOrganisationViewModel = viewModel.getOrganisations().get(0); assertEquals("Lead", leadOrganisationViewModel.getName()); assertEquals((long) leadOrganisation.getId(), leadOrganisationViewModel.getId()); assertEquals(1, leadOrganisationViewModel.getRows().size()); assertTrue(leadOrganisationViewModel.isLead()); assertTrue(leadOrganisationViewModel.isEditable()); assertTrue(leadOrganisationViewModel.isExisting()); ApplicationTeamRowViewModel leadUserViewModel = leadOrganisationViewModel.getRows().get(0); assertEquals(user.getId(), leadUserViewModel.getId()); assertTrue(leadUserViewModel.isLead()); assertFalse(leadUserViewModel.isInvite()); assertNull(leadUserViewModel.getInviteId()); ApplicationTeamOrganisationViewModel collaboratorOrganisationViewModel = viewModel.getOrganisations().get(1); assertEquals("Collaborator", collaboratorOrganisationViewModel.getName()); assertEquals((long) collboratorOrganisation.getId(), collaboratorOrganisationViewModel.getId()); assertEquals(1, collaboratorOrganisationViewModel.getRows().size()); assertFalse(collaboratorOrganisationViewModel.isLead()); assertTrue(collaboratorOrganisationViewModel.isEditable()); assertTrue(collaboratorOrganisationViewModel.isExisting()); ApplicationTeamRowViewModel collaboratorUserViewModel = collaboratorOrganisationViewModel.getRows().get(0); assertEquals(collaborator.getId(), collaboratorUserViewModel.getId()); assertFalse(collaboratorUserViewModel.isLead()); assertFalse(collaboratorUserViewModel.isInvite()); assertEquals(collaboratorInvite.getId(), collaboratorUserViewModel.getInviteId()); ApplicationTeamOrganisationViewModel inviteOrganisationViewModel = viewModel.getOrganisations().get(2); assertEquals("New organisation", inviteOrganisationViewModel.getName()); assertEquals((long) invitedOrganisation.getId(), inviteOrganisationViewModel.getId()); assertEquals(1, inviteOrganisationViewModel.getRows().size()); assertFalse(inviteOrganisationViewModel.isLead()); assertTrue(inviteOrganisationViewModel.isEditable()); assertFalse(inviteOrganisationViewModel.isExisting()); ApplicationTeamRowViewModel inviteViewModel = inviteOrganisationViewModel.getRows().get(0); assertEquals(newUserInvite.getId(), inviteViewModel.getId()); assertTrue(inviteViewModel.isInvite()); assertEquals(newUserInvite.getId(), inviteViewModel.getInviteId()); assertEquals("New user (pending for 10 days)", inviteViewModel.getName()); }
GrantTransferDetailsSaver { public RestResult<Void> save(GrantTransferDetailsForm grantTransferDetailsForm, long applicationId) { EuGrantTransferResource euGrantResource = euGrantTransferRestService.findDetailsByApplicationId(applicationId).getOptionalSuccessObject().orElse(new EuGrantTransferResource()); euGrantResource.setGrantAgreementNumber(grantTransferDetailsForm.getGrantAgreementNumber()); euGrantResource.setParticipantId(grantTransferDetailsForm.getParticipantId()); euGrantResource.setProjectName(grantTransferDetailsForm.getProjectName()); euGrantResource.setProjectStartDate(grantTransferDetailsForm.getStartDate()); euGrantResource.setProjectEndDate(grantTransferDetailsForm.getEndDate()); euGrantResource.setFundingContribution(grantTransferDetailsForm.getFundingContribution()); euGrantResource.setProjectCoordinator(grantTransferDetailsForm.getProjectCoordinator()); EuActionTypeResource euActionTypeResource = new EuActionTypeResource(); euActionTypeResource.setId(grantTransferDetailsForm.getActionType()); euGrantResource.setActionType(euActionTypeResource); return euGrantTransferRestService.updateGrantTransferDetails(euGrantResource, applicationId); } GrantTransferDetailsSaver(EuGrantTransferRestService euGrantTransferRestService); RestResult<Void> save(GrantTransferDetailsForm grantTransferDetailsForm, long applicationId); }
@Test public void save() { long applicationId = 3L; GrantTransferDetailsForm form = new GrantTransferDetailsForm(); form.setActionType(1L); form.setEndDateMonth(1); form.setEndDateYear(2019); form.setStartDateMonth(1); form.setStartDateYear(2019); form.setFundingContribution(BigDecimal.TEN); form.setGrantAgreementNumber("123456"); form.setParticipantId("987654321"); form.setProjectCoordinator(true); form.setProjectName("MyProject"); when(euGrantTransferRestService.findDetailsByApplicationId(applicationId)).thenReturn(restFailure(Collections.emptyList(), HttpStatus.NOT_FOUND)); when(euGrantTransferRestService.updateGrantTransferDetails(any(), eq(applicationId))).thenReturn(restSuccess()); RestResult<Void> result = saver.save(form, applicationId); assertTrue(result.isSuccess()); ArgumentCaptor<EuGrantTransferResource> argumentCaptor = ArgumentCaptor.forClass(EuGrantTransferResource.class); verify(euGrantTransferRestService).updateGrantTransferDetails(argumentCaptor.capture(), eq(applicationId)); EuGrantTransferResource grantTransferResource = argumentCaptor.getValue(); assertEquals(grantTransferResource.getGrantAgreementNumber(), form.getGrantAgreementNumber()); assertEquals(grantTransferResource.getActionType().getId(), form.getActionType()); assertEquals(grantTransferResource.getFundingContribution(), form.getFundingContribution()); assertEquals(grantTransferResource.getProjectCoordinator(), form.getProjectCoordinator()); assertEquals(grantTransferResource.getProjectStartDate().getMonth().getValue(), form.getStartDateMonth().intValue()); assertEquals(grantTransferResource.getProjectStartDate().getYear(), form.getStartDateYear().intValue()); assertEquals(grantTransferResource.getProjectEndDate().getMonth().getValue(), form.getEndDateMonth().intValue()); assertEquals(grantTransferResource.getProjectEndDate().getYear(), form.getEndDateYear().intValue()); assertEquals(grantTransferResource.getProjectName(), form.getProjectName()); assertEquals(grantTransferResource.getParticipantId(), form.getParticipantId()); }
GrantTransferDetailsController { @GetMapping public String viewGrantTransferDetails(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM, binding = false) GrantTransferDetailsForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource userResource) { grantTransferDetailsFormPopulator.populate(form, applicationId); return view(model, applicationId, questionId, userResource); } GrantTransferDetailsController(GrantTransferDetailsFormPopulator grantTransferDetailsFormPopulator, GrantTransferDetailsViewModelPopulator grantTransferDetailsViewModelPopulator, GrantTransferDetailsSaver grantTransferDetailsSaver, UserRestService userRestService, QuestionStatusRestService questionStatusRestService); @GetMapping String viewGrantTransferDetails(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM, binding = false) GrantTransferDetailsForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource userResource); @PostMapping String saveAndReturn(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) GrantTransferDetailsForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource userResource); @PostMapping(params = "complete") String markAsComplete(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) @Valid GrantTransferDetailsForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "edit") String edit(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM, binding = false) GrantTransferDetailsForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); }
@Test public void viewGrantTransferDetails() throws Exception { long questionId = 1L; long applicationId = 2L; GrantTransferDetailsViewModel viewModel = mock(GrantTransferDetailsViewModel.class); when(grantTransferDetailsViewModelPopulator.populate(applicationId, questionId, loggedInUser.getId())).thenReturn(viewModel); mockMvc.perform( get("/application/{applicationId}/form/question/{questionId}/grant-transfer-details", applicationId, questionId)) .andExpect(status().isOk()) .andExpect(view().name("application/questions/grant-transfer-details")) .andReturn(); verify(grantTransferDetailsFormPopulator).populate(any(), eq(applicationId)); }
GrantTransferDetailsController { @PostMapping public String saveAndReturn(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) GrantTransferDetailsForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource userResource) { grantTransferDetailsSaver.save(form, applicationId); return String.format("redirect:/application/%d", applicationId); } GrantTransferDetailsController(GrantTransferDetailsFormPopulator grantTransferDetailsFormPopulator, GrantTransferDetailsViewModelPopulator grantTransferDetailsViewModelPopulator, GrantTransferDetailsSaver grantTransferDetailsSaver, UserRestService userRestService, QuestionStatusRestService questionStatusRestService); @GetMapping String viewGrantTransferDetails(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM, binding = false) GrantTransferDetailsForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource userResource); @PostMapping String saveAndReturn(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) GrantTransferDetailsForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource userResource); @PostMapping(params = "complete") String markAsComplete(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) @Valid GrantTransferDetailsForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "edit") String edit(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM, binding = false) GrantTransferDetailsForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); }
@Test public void saveAndReturn() throws Exception { long questionId = 1L; long applicationId = 2L; mockMvc.perform( post("/application/{applicationId}/form/question/{questionId}/grant-transfer-details", applicationId, questionId)) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(String.format("/application/%d", applicationId))) .andReturn(); }
GrantTransferDetailsController { @PostMapping(params = "complete") public String markAsComplete(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) @Valid GrantTransferDetailsForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user) { Supplier<String> failureView = () -> view(model, applicationId, questionId, user); return validationHandler.failNowOrSucceedWith(failureView, () -> { validationHandler.addAnyErrors(grantTransferDetailsSaver.save(form, applicationId).getErrors()); return validationHandler.failNowOrSucceedWith(failureView, () -> { ProcessRoleResource role = userRestService.findProcessRole(user.getId(), applicationId).getSuccess(); questionStatusRestService.markAsComplete(questionId, applicationId, role.getId()).getSuccess(); return String.format("redirect:/application/%d/form/question/%d/grant-transfer-details", applicationId, questionId); }); }); } GrantTransferDetailsController(GrantTransferDetailsFormPopulator grantTransferDetailsFormPopulator, GrantTransferDetailsViewModelPopulator grantTransferDetailsViewModelPopulator, GrantTransferDetailsSaver grantTransferDetailsSaver, UserRestService userRestService, QuestionStatusRestService questionStatusRestService); @GetMapping String viewGrantTransferDetails(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM, binding = false) GrantTransferDetailsForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource userResource); @PostMapping String saveAndReturn(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) GrantTransferDetailsForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource userResource); @PostMapping(params = "complete") String markAsComplete(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) @Valid GrantTransferDetailsForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "edit") String edit(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM, binding = false) GrantTransferDetailsForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); }
@Test public void markAsComplete() throws Exception { long questionId = 1L; long applicationId = 2L; GrantTransferDetailsForm grantTransferDetailsForm = new GrantTransferDetailsForm(); grantTransferDetailsForm.setActionType(1L); grantTransferDetailsForm.setFundingContribution(BigDecimal.valueOf(100000L)); grantTransferDetailsForm.setGrantAgreementNumber("123456"); grantTransferDetailsForm.setProjectCoordinator(true); grantTransferDetailsForm.setStartDateMonth(10); grantTransferDetailsForm.setStartDateYear(2000); grantTransferDetailsForm.setEndDateMonth(10); grantTransferDetailsForm.setEndDateYear(now().getYear() + 1); grantTransferDetailsForm.setParticipantId("123456789"); grantTransferDetailsForm.setProjectName("Project Name"); ProcessRoleResource role = newProcessRoleResource().build(); when(grantTransferDetailsSaver.save(grantTransferDetailsForm, applicationId)).thenReturn(restSuccess()); when(userRestService.findProcessRole(loggedInUser.getId(), applicationId)).thenReturn(restSuccess(role)); when(questionStatusRestService.markAsComplete(questionId, applicationId, role.getId())).thenReturn(restSuccess(Collections.emptyList())); mockMvc.perform( post("/application/{applicationId}/form/question/{questionId}/grant-transfer-details", applicationId, questionId) .param("complete", "true") .param("grantAgreementNumber", grantTransferDetailsForm.getGrantAgreementNumber()) .param("participantId", grantTransferDetailsForm.getParticipantId()) .param("projectName", grantTransferDetailsForm.getProjectName()) .param("startDateMonth", String.valueOf(grantTransferDetailsForm.getStartDateMonth())) .param("startDateYear", String.valueOf(grantTransferDetailsForm.getStartDateYear())) .param("endDateMonth", String.valueOf(grantTransferDetailsForm.getEndDateMonth())) .param("endDateYear", String.valueOf(grantTransferDetailsForm.getEndDateYear())) .param("fundingContribution", String.valueOf(grantTransferDetailsForm.getFundingContribution())) .param("projectCoordinator", String.valueOf(grantTransferDetailsForm.getProjectCoordinator())) .param("actionType", String.valueOf(grantTransferDetailsForm.getActionType()))) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(String.format("/application/%d/form/question/%d/grant-transfer-details", applicationId, questionId))) .andReturn(); verify(grantTransferDetailsSaver).save(grantTransferDetailsForm, applicationId); verify(questionStatusRestService).markAsComplete(questionId, applicationId, role.getId()); }
GrantTransferDetailsController { @PostMapping(params = "edit") public String edit(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM, binding = false) GrantTransferDetailsForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user) { ProcessRoleResource role = userRestService.findProcessRole(user.getId(), applicationId).getSuccess(); questionStatusRestService.markAsInComplete(questionId, applicationId, role.getId()).getSuccess(); return viewGrantTransferDetails(form, bindingResult, model, applicationId, questionId, user); } GrantTransferDetailsController(GrantTransferDetailsFormPopulator grantTransferDetailsFormPopulator, GrantTransferDetailsViewModelPopulator grantTransferDetailsViewModelPopulator, GrantTransferDetailsSaver grantTransferDetailsSaver, UserRestService userRestService, QuestionStatusRestService questionStatusRestService); @GetMapping String viewGrantTransferDetails(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM, binding = false) GrantTransferDetailsForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource userResource); @PostMapping String saveAndReturn(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) GrantTransferDetailsForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource userResource); @PostMapping(params = "complete") String markAsComplete(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) @Valid GrantTransferDetailsForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "edit") String edit(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM, binding = false) GrantTransferDetailsForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); }
@Test public void edit() throws Exception { long questionId = 1L; long applicationId = 2L; ProcessRoleResource role = newProcessRoleResource().build(); when(userRestService.findProcessRole(loggedInUser.getId(), applicationId)).thenReturn(restSuccess(role)); when(questionStatusRestService.markAsInComplete(questionId, applicationId, role.getId())).thenReturn(restSuccess()); GrantTransferDetailsViewModel viewModel = mock(GrantTransferDetailsViewModel.class); when(grantTransferDetailsViewModelPopulator.populate(applicationId, questionId, loggedInUser.getId())).thenReturn(viewModel); mockMvc.perform( post("/application/{applicationId}/form/question/{questionId}/grant-transfer-details", applicationId, questionId) .param("edit", "true")) .andExpect(status().isOk()) .andExpect(view().name("application/questions/grant-transfer-details")) .andReturn(); verify(questionStatusRestService).markAsInComplete(questionId, applicationId, role.getId()); }
GrantTransferDetailsViewModelPopulator { public GrantTransferDetailsViewModel populate(long applicationId, long questionId, long userId) { ApplicationResource application = applicationRestService.getApplicationById(applicationId).getSuccess(); CompetitionResource competition = competitionRestService.getCompetitionById(application.getCompetition()).getSuccess(); OrganisationResource organisation = organisationRestService.getByUserAndApplicationId(userId, applicationId).getSuccess(); List<EuActionTypeResource> actionTypes = euActionTypeRestService.findAll().getSuccess(); boolean complete = isComplete(application, organisation, questionId); boolean open = application.isOpen() && competition.isOpen(); return new GrantTransferDetailsViewModel(application.getId(), application.getCompetitionName(), application.getName(), questionId, open, complete, actionTypes); } GrantTransferDetailsViewModelPopulator(ApplicationRestService applicationRestService, QuestionStatusRestService questionStatusRestService, OrganisationRestService organisationRestService, CompetitionRestService competitionRestService, ActionTypeRestService euActionTypeRestService); GrantTransferDetailsViewModel populate(long applicationId, long questionId, long userId); }
@Test public void populate() throws ExecutionException, InterruptedException { Long applicationId = 1L; long questionId = 2L; long userId = 3L; long competitionId = 4L; ApplicationResource application = newApplicationResource() .withId(applicationId) .withCompetition(competitionId) .withApplicationState(ApplicationState.OPENED) .build(); CompetitionResource competition = newCompetitionResource() .withCompetitionStatus(CompetitionStatus.OPEN) .build(); OrganisationResource organisation = newOrganisationResource().build(); Future<Set<Long>> future = mock(Future.class); List<EuActionTypeResource> actionTypeResources = asList(new EuActionTypeResource()); when(applicationRestService.getApplicationById(applicationId)).thenReturn(restSuccess(application)); when(competitionRestService.getCompetitionById(competitionId)).thenReturn(restSuccess(competition)); when(euActionTypeRestService.findAll()).thenReturn(restSuccess(actionTypeResources)); when(organisationRestService.getByUserAndApplicationId(userId, applicationId)).thenReturn(restSuccess(organisation)); when(questionStatusRestService.getMarkedAsComplete(applicationId, organisation.getId())).thenReturn(future); when(future.get()).thenReturn(asSet(questionId)); GrantTransferDetailsViewModel viewModel = populator.populate(applicationId, questionId, userId); assertEquals(viewModel.getApplicationId(), applicationId); assertEquals(viewModel.getQuestionId(), questionId); assertEquals(viewModel.isComplete(), true); assertEquals(viewModel.isOpen(), true); assertEquals(viewModel.isReadonly(), true); assertEquals(viewModel.getActionTypes(), actionTypeResources); }
FormInputServiceImpl extends BaseTransactionalService implements FormInputService { @Override public ServiceResult<FileAndContents> downloadFile(long formInputId) { return findFormInputEntity(formInputId).andOnSuccess(formInput -> fileEntryService.findOne(formInput.getFile().getId()) .andOnSuccess(this::getFileAndContents)); } @Override ServiceResult<FormInputResource> findFormInput(long id); @Override ServiceResult<List<FormInputResource>> findByQuestionId(long questionId); @Override @Cacheable(cacheNames="formInputByQuestionAndScope", key = "T(java.lang.String).format('formInputByQuestionAndScope:%d:%s', #questionId, #scope.name())", unless = "!T(org.innovateuk.ifs.cache.CacheHelper).cacheResultIfCompetitionIsOpen(#result)") ServiceResult<List<FormInputResource>> findByQuestionIdAndScope(long questionId, FormInputScope scope); @Override ServiceResult<List<FormInputResource>> findByCompetitionId(long competitionId); @Override ServiceResult<List<FormInputResource>> findByCompetitionIdAndScope(long competitionId, FormInputScope scope); @Override @Transactional ServiceResult<Void> delete(long id); @Override ServiceResult<FileAndContents> downloadFile(long formInputId); @Override ServiceResult<FileEntryResource> findFile(long formInputId); }
@Test public void downloadTemplateFile() throws Exception { final long formInputId = 1L; final long fileId = 2L; final FileEntry fileEntry = new FileEntry(fileId, "somefile.pdf", MediaType.APPLICATION_PDF, 1111L); FormInput formInput = newFormInput() .withFile(fileEntry) .build(); FileEntryResource fileEntryResource = new FileEntryResource(); fileEntryResource.setId(fileId); when(formInputRepository.findById(formInputId)).thenReturn(Optional.of(formInput)); when(fileEntryServiceMock.findOne(fileId)).thenReturn(serviceSuccess(fileEntryResource)); final Supplier<InputStream> contentSupplier = () -> null; when(fileServiceMock.getFileByFileEntryId(fileEntry.getId())).thenReturn(ServiceResult.serviceSuccess(contentSupplier)); FileAndContents fileAndContents = service.downloadFile(formInputId).getSuccess(); assertEquals(fileAndContents.getContentsSupplier(), contentSupplier); assertEquals(fileAndContents.getFileEntry(), fileEntryResource); }
GrantTransferDetailsFormPopulator { public GrantTransferDetailsForm populate(GrantTransferDetailsForm fundingForm, long applicationId) { Optional<EuGrantTransferResource> maybeEuGrantResource = euGrantTransferRestService.findDetailsByApplicationId(applicationId).getOptionalSuccessObject(); if (maybeEuGrantResource.isPresent()) { EuGrantTransferResource euGrantResource = maybeEuGrantResource.get(); fundingForm.setFundingContribution(euGrantResource.getFundingContribution()); fundingForm.setGrantAgreementNumber(euGrantResource.getGrantAgreementNumber()); fundingForm.setParticipantId(euGrantResource.getParticipantId()); fundingForm.setProjectCoordinator(euGrantResource.getProjectCoordinator()); fundingForm.setProjectName(euGrantResource.getProjectName()); if (euGrantResource.getProjectStartDate() != null) { fundingForm.setStartDateMonth(euGrantResource.getProjectStartDate().getMonthValue()); fundingForm.setStartDateYear(euGrantResource.getProjectStartDate().getYear()); } if (euGrantResource.getProjectEndDate() != null) { fundingForm.setEndDateMonth(euGrantResource.getProjectEndDate().getMonthValue()); fundingForm.setEndDateYear(euGrantResource.getProjectEndDate().getYear()); } if (euGrantResource.getActionType() != null) { fundingForm.setActionType(euGrantResource.getActionType().getId()); } } return fundingForm; } GrantTransferDetailsFormPopulator(EuGrantTransferRestService euGrantTransferRestService); GrantTransferDetailsForm populate(GrantTransferDetailsForm fundingForm, long applicationId); }
@Test public void populateFundingForm() { long applicationId = 1L; EuActionTypeResource euActionTypeResource = new EuActionTypeResource(); euActionTypeResource.setId(30L); EuGrantTransferResource euFundingResource = newEuGrantTransferResource() .withActionType(euActionTypeResource) .withFundingContribution(BigDecimal.valueOf(100000L)) .withGrantAgreementNumber("123456") .withProjectCoordinator(true) .withProjectStartDate(LocalDate.now()) .withProjectEndDate(LocalDate.now().plusYears(1L)) .withProjectName("Project Name") .withParticipantId("123456789") .build(); GrantTransferDetailsForm grantTransferDetailsForm = new GrantTransferDetailsForm(); when(euGrantTransferRestService.findDetailsByApplicationId(applicationId)).thenReturn(restSuccess(euFundingResource)); populator.populate(grantTransferDetailsForm, applicationId); assertEquals(euFundingResource.getGrantAgreementNumber(), grantTransferDetailsForm.getGrantAgreementNumber()); assertEquals(euFundingResource.getActionType().getId(), grantTransferDetailsForm.getActionType()); assertEquals(euFundingResource.getFundingContribution(), grantTransferDetailsForm.getFundingContribution()); assertEquals(euFundingResource.getProjectCoordinator(), grantTransferDetailsForm.getProjectCoordinator()); assertEquals(euFundingResource.getProjectStartDate().getMonth().getValue(), grantTransferDetailsForm.getStartDateMonth().intValue()); assertEquals(euFundingResource.getProjectStartDate().getYear(), grantTransferDetailsForm.getStartDateYear().intValue()); assertEquals(euFundingResource.getProjectEndDate().getMonth().getValue(), grantTransferDetailsForm.getEndDateMonth().intValue()); assertEquals(euFundingResource.getProjectEndDate().getYear(), grantTransferDetailsForm.getEndDateYear().intValue()); assertEquals(euFundingResource.getProjectName(), grantTransferDetailsForm.getProjectName()); assertEquals(euFundingResource.getParticipantId(), grantTransferDetailsForm.getParticipantId()); }
ResearchCategoryController { @GetMapping public String getResearchCategories(Model model, UserResource loggedInUser, @ModelAttribute(FORM_ATTR_NAME) ResearchCategoryForm researchCategoryForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable long applicationId, @PathVariable long questionId) { ApplicationResource applicationResource = applicationService.getById(applicationId); model.addAttribute("model", researchCategoryModelPopulator.populate( applicationResource, loggedInUser.getId(), questionId)); researchCategoryFormPopulator.populate(applicationResource, researchCategoryForm); return "application/questions/research-categories"; } @GetMapping String getResearchCategories(Model model, UserResource loggedInUser, @ModelAttribute(FORM_ATTR_NAME) ResearchCategoryForm researchCategoryForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable long applicationId, @PathVariable long questionId); @GetMapping(params = "show-errors") String showErrors(Model model, UserResource loggedInUser, @ModelAttribute(FORM_ATTR_NAME) ResearchCategoryForm researchCategoryForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = {"mark_as_incomplete"}) String markAsIncomplete(Model model, UserResource loggedInUser, @ModelAttribute(FORM_ATTR_NAME) ResearchCategoryForm researchCategoryForm, @PathVariable long applicationId, @PathVariable long questionId); @PostMapping String submitResearchCategoryChoice(@ModelAttribute(FORM_ATTR_NAME) ResearchCategoryForm researchCategoryForm, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response, Model model, UserResource loggedInUser, @PathVariable long applicationId, @PathVariable long questionId); }
@Test public void getResearchCategories() throws Exception { long questionId = 1L; ApplicationResource applicationResource = newApplicationResource().build(); ResearchCategoryViewModel researchCategoryViewModel = new ResearchCategoryViewModel( "test competition", applicationResource.getId(), "comp name", questionId, newResearchCategoryResource().build(2), false, "Industrial research", false, false, false, false, false, "Steve Smith"); when(applicationService.getById(applicationResource.getId())).thenReturn(applicationResource); when(researchCategoryModelPopulator.populate(applicationResource, questionId, loggedInUser.getId())) .thenReturn(researchCategoryViewModel); mockMvc.perform(get(APPLICATION_BASE_URL + "{applicationId}/form/question/{questionId}/research-category", applicationResource.getId(), questionId)) .andExpect(model().attribute("model", researchCategoryViewModel)) .andExpect(view().name("application/questions/research-categories")) .andExpect(status().isOk()); InOrder inOrder = inOrder(applicationService, researchCategoryModelPopulator, researchCategoryFormPopulator, applicationResearchCategoryRestService); inOrder.verify(applicationService).getById(applicationResource.getId()); inOrder.verify(researchCategoryModelPopulator).populate(applicationResource, loggedInUser.getId(), questionId); inOrder.verify(researchCategoryFormPopulator).populate(applicationResource, new ResearchCategoryForm()); inOrder.verifyNoMoreInteractions(); }
ResearchCategoryController { @PostMapping(params = {"mark_as_incomplete"}) public String markAsIncomplete(Model model, UserResource loggedInUser, @ModelAttribute(FORM_ATTR_NAME) ResearchCategoryForm researchCategoryForm, @PathVariable long applicationId, @PathVariable long questionId) { questionService.markAsIncomplete(questionId, applicationId, getProcessRoleId(loggedInUser.getId(), applicationId)); return getResearchCategories(model, loggedInUser, researchCategoryForm, null, applicationId, questionId); } @GetMapping String getResearchCategories(Model model, UserResource loggedInUser, @ModelAttribute(FORM_ATTR_NAME) ResearchCategoryForm researchCategoryForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable long applicationId, @PathVariable long questionId); @GetMapping(params = "show-errors") String showErrors(Model model, UserResource loggedInUser, @ModelAttribute(FORM_ATTR_NAME) ResearchCategoryForm researchCategoryForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable long applicationId, @PathVariable long questionId); @PostMapping(params = {"mark_as_incomplete"}) String markAsIncomplete(Model model, UserResource loggedInUser, @ModelAttribute(FORM_ATTR_NAME) ResearchCategoryForm researchCategoryForm, @PathVariable long applicationId, @PathVariable long questionId); @PostMapping String submitResearchCategoryChoice(@ModelAttribute(FORM_ATTR_NAME) ResearchCategoryForm researchCategoryForm, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response, Model model, UserResource loggedInUser, @PathVariable long applicationId, @PathVariable long questionId); }
@Test public void markAsIncomplete() throws Exception { long questionId = 1L; ApplicationResource applicationResource = newApplicationResource().build(); ProcessRoleResource processRole = newProcessRoleResource().build(); ResearchCategoryViewModel researchCategoryViewModel = new ResearchCategoryViewModel( "test competition", applicationResource.getId(), "comp name", questionId, newResearchCategoryResource().build(2), false, "Industrial research", false, false, false, false, false, "Steve Smith"); when(userRestService.findProcessRole(loggedInUser.getId(), applicationResource.getId())).thenReturn(restSuccess(processRole)); when(applicationService.getById(applicationResource.getId())).thenReturn(applicationResource); when(researchCategoryModelPopulator.populate(applicationResource, questionId, loggedInUser.getId())) .thenReturn(researchCategoryViewModel); mockMvc.perform(post(APPLICATION_BASE_URL + "{applicationId}/form/question/{questionId}/research-category", applicationResource.getId(), questionId) .param("mark_as_incomplete", "")) .andExpect(model().attribute("model", researchCategoryViewModel)) .andExpect(view().name("application/questions/research-categories")) .andExpect(status().isOk()); InOrder inOrder = inOrder(userRestService, questionService, applicationService, researchCategoryModelPopulator, researchCategoryFormPopulator, applicationResearchCategoryRestService); inOrder.verify(userRestService).findProcessRole(loggedInUser.getId(), applicationResource.getId()); inOrder.verify(questionService).markAsIncomplete(questionId, applicationResource.getId(), processRole.getId()); inOrder.verify(applicationService).getById(applicationResource.getId()); inOrder.verify(researchCategoryModelPopulator).populate(applicationResource, loggedInUser.getId(), questionId); inOrder.verify(researchCategoryFormPopulator).populate(applicationResource, new ResearchCategoryForm()); inOrder.verifyNoMoreInteractions(); }
ApplicationResearchCategoryModelPopulator extends AbstractLeadOnlyModelPopulator { public ResearchCategoryViewModel populate(ApplicationResource applicationResource, long loggedInUserId, Long questionId) { boolean hasApplicationFinances = hasApplicationFinances(applicationResource); boolean userIsLeadApplicant = userService.isLeadApplicant(loggedInUserId, applicationResource); boolean complete = isComplete(applicationResource, loggedInUserId, QuestionSetupType.RESEARCH_CATEGORY); boolean allReadonly = !userIsLeadApplicant || complete; String researchCategoryName = Optional.of(applicationResource.getResearchCategory()) .map(ResearchCategoryResource::getName).orElse(null); return new ResearchCategoryViewModel(applicationResource.getName(), applicationResource.getId(), applicationResource.getCompetitionName(), questionId, getResearchCategories(applicationResource.getCompetition()), hasApplicationFinances, researchCategoryName, isApplicationSubmitted(applicationResource) || !isCompetitionOpen(applicationResource), complete, userIsLeadApplicant, allReadonly, userIsLeadApplicant, getLeadApplicantName(applicationResource.getId())); } ApplicationResearchCategoryModelPopulator(final ApplicantRestService applicantRestService, final CompetitionResearchCategoryRestService competitionResearchCategoryRestService, final FinanceService financeService, final QuestionRestService questionRestService, final UserService userService, final UserRestService userRestService); ResearchCategoryViewModel populate(ApplicationResource applicationResource, long loggedInUserId, Long questionId); }
@Test public void populateWithTwoResearchCategoriesSet() { Long loggedInUserId = 1L; String researchCategoryNameOne = "researchCategoryOne"; String researchCategoryNameTwo = "researchCategoryTwo"; ResearchCategoryResource researchCategoryOne = newResearchCategoryResource().withName(researchCategoryNameOne).build(); ResearchCategoryResource researchCategoryTwo = newResearchCategoryResource().withName(researchCategoryNameTwo).build(); CompetitionResource competitionResource = newCompetitionResource() .withResearchCategories(asSet(researchCategoryOne.getId(), researchCategoryTwo.getId())).build(); ApplicantResource applicantResource = newApplicantResource() .withOrganisation(newOrganisationResource().build()).build(); UserResource leadApplicant = newUserResource() .withFirstName("Steve") .withLastName("Smith") .build(); ProcessRoleResource leadApplicantProcessRoleResource = newProcessRoleResource().withUser(leadApplicant).build(); ApplicationResource applicationResource = newApplicationResource() .withCompetition(competitionResource.getId()) .withCompetitionName(competitionResource.getName()) .withResearchCategory(researchCategoryOne).build(); QuestionResource questionResource = newQuestionResource().build(); CompetitionResearchCategoryLinkResource competitionResearchCategoryOne = newCompetitionResearchCategoryLinkResource() .withCategory(researchCategoryOne) .withCompetition(competitionResource) .build(); CompetitionResearchCategoryLinkResource competitionResearchCategoryTwo = newCompetitionResearchCategoryLinkResource() .withCategory(researchCategoryTwo) .withCompetition(competitionResource) .build(); when(competitionResearchCategoryRestService.findByCompetition(applicationResource.getCompetition())) .thenReturn(restSuccess(asList(competitionResearchCategoryOne, competitionResearchCategoryTwo))); when(questionRestService.getQuestionByCompetitionIdAndQuestionSetupType(applicationResource.getCompetition(), RESEARCH_CATEGORY)).thenReturn(restSuccess(questionResource)); when(applicantRestService.getQuestion(loggedInUserId, applicationResource.getId(), questionResource.getId())) .thenReturn(newApplicantQuestionResource() .withCurrentApplicant(applicantResource) .withQuestion(questionResource) .withApplicantQuestionStatuses(newApplicantQuestionStatusResource() .withStatus(newQuestionStatusResource().withMarkedAsComplete(true).build()) .build(1)) .build()); when(userService.isLeadApplicant(loggedInUserId, applicationResource)).thenReturn(true); when(userService.getLeadApplicantProcessRole(applicationResource.getId())).thenReturn (leadApplicantProcessRoleResource); when(userRestService.retrieveUserById(leadApplicantProcessRoleResource.getUser())).thenReturn(restSuccess(leadApplicant)); ResearchCategoryViewModel researchCategoryViewModel = populator.populate(applicationResource, loggedInUserId, questionResource.getId()); assertEquals(asList(researchCategoryOne, researchCategoryTwo), researchCategoryViewModel.getAvailableResearchCategories()); assertEquals(researchCategoryNameOne, researchCategoryViewModel.getAvailableResearchCategories().get(0).getName()); assertEquals(researchCategoryNameTwo, researchCategoryViewModel.getAvailableResearchCategories().get(1).getName()); }
GrantAgreementController { @GetMapping public String viewGrantAgreement(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM, binding = false) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource userResource) { model.addAttribute("model", grantAgreementViewModelPopulator.populate(applicationId, questionId, userResource.getId())); return "application/questions/grant-agreement"; } GrantAgreementController(GrantAgreementViewModelPopulator grantAgreementViewModelPopulator, EuGrantTransferRestService euGrantTransferRestService, QuestionStatusRestService questionStatusRestService, UserRestService userRestService); @GetMapping String viewGrantAgreement(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM, binding = false) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource userResource); @PostMapping String saveAndReturn(@PathVariable long applicationId); @PostMapping(params = "complete") String markAsComplete(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "edit") String edit(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "uploadGrantAgreement") String uploadGrantAgreement(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "removeGrantAgreement") String removeGrantAgreement(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @GetMapping("/download") @ResponseBody ResponseEntity<ByteArrayResource> downloadGrantAgreement(@PathVariable long applicationId); }
@Test public void viewGrantAgreement() throws Exception { long questionId = 1L; long applicationId = 2L; GrantAgreementViewModel viewModel = mock(GrantAgreementViewModel.class); when(grantAgreementViewModelPopulator.populate(applicationId, questionId, loggedInUser.getId())).thenReturn(viewModel); mockMvc.perform( get("/application/{applicationId}/form/question/{questionId}/grant-agreement", applicationId, questionId)) .andExpect(status().isOk()) .andExpect(view().name("application/questions/grant-agreement")) .andReturn(); }
GrantAgreementController { @PostMapping public String saveAndReturn(@PathVariable long applicationId) { return String.format("redirect:/application/%d", applicationId); } GrantAgreementController(GrantAgreementViewModelPopulator grantAgreementViewModelPopulator, EuGrantTransferRestService euGrantTransferRestService, QuestionStatusRestService questionStatusRestService, UserRestService userRestService); @GetMapping String viewGrantAgreement(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM, binding = false) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource userResource); @PostMapping String saveAndReturn(@PathVariable long applicationId); @PostMapping(params = "complete") String markAsComplete(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "edit") String edit(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "uploadGrantAgreement") String uploadGrantAgreement(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "removeGrantAgreement") String removeGrantAgreement(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @GetMapping("/download") @ResponseBody ResponseEntity<ByteArrayResource> downloadGrantAgreement(@PathVariable long applicationId); }
@Test public void saveAndReturn() throws Exception { long questionId = 1L; long applicationId = 2L; GrantAgreementViewModel viewModel = mock(GrantAgreementViewModel.class); when(grantAgreementViewModelPopulator.populate(applicationId, questionId, loggedInUser.getId())).thenReturn(viewModel); mockMvc.perform( post("/application/{applicationId}/form/question/{questionId}/grant-agreement", applicationId, questionId)) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(String.format("/application/%d", applicationId))) .andReturn(); }
GrantAgreementController { @PostMapping(params = "complete") public String markAsComplete(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user) { if (euGrantTransferRestService.findGrantAgreement(applicationId).isFailure()) { bindingResult.rejectValue("grantAgreement", "validation.field.must.not.be.blank"); return viewGrantAgreement(form, bindingResult, model, applicationId, questionId, user); } ProcessRoleResource role = userRestService.findProcessRole(user.getId(), applicationId).getSuccess(); questionStatusRestService.markAsComplete(questionId, applicationId, role.getId()).getSuccess(); return String.format("redirect:/application/%d/form/question/%d/grant-agreement", applicationId, questionId); } GrantAgreementController(GrantAgreementViewModelPopulator grantAgreementViewModelPopulator, EuGrantTransferRestService euGrantTransferRestService, QuestionStatusRestService questionStatusRestService, UserRestService userRestService); @GetMapping String viewGrantAgreement(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM, binding = false) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource userResource); @PostMapping String saveAndReturn(@PathVariable long applicationId); @PostMapping(params = "complete") String markAsComplete(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "edit") String edit(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "uploadGrantAgreement") String uploadGrantAgreement(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "removeGrantAgreement") String removeGrantAgreement(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @GetMapping("/download") @ResponseBody ResponseEntity<ByteArrayResource> downloadGrantAgreement(@PathVariable long applicationId); }
@Test public void markAsComplete() throws Exception { long questionId = 1L; long applicationId = 2L; ProcessRoleResource role = newProcessRoleResource().build(); when(euGrantTransferRestService.findGrantAgreement(applicationId)).thenReturn(restSuccess(newFileEntryResource().build())); when(userRestService.findProcessRole(loggedInUser.getId(), applicationId)).thenReturn(restSuccess(role)); when(questionStatusRestService.markAsComplete(questionId, applicationId, role.getId())).thenReturn(restSuccess(Collections.emptyList())); mockMvc.perform( post("/application/{applicationId}/form/question/{questionId}/grant-agreement", applicationId, questionId) .param("complete", "true")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(String.format("/application/%d/form/question/%d/grant-agreement", applicationId, questionId))) .andReturn(); verify(questionStatusRestService).markAsComplete(questionId, applicationId, role.getId()); }
GrantAgreementController { @PostMapping(params = "edit") public String edit(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user) { ProcessRoleResource role = userRestService.findProcessRole(user.getId(), applicationId).getSuccess(); questionStatusRestService.markAsInComplete(questionId, applicationId, role.getId()).getSuccess(); return viewGrantAgreement(form, bindingResult, model, applicationId, questionId, user); } GrantAgreementController(GrantAgreementViewModelPopulator grantAgreementViewModelPopulator, EuGrantTransferRestService euGrantTransferRestService, QuestionStatusRestService questionStatusRestService, UserRestService userRestService); @GetMapping String viewGrantAgreement(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM, binding = false) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource userResource); @PostMapping String saveAndReturn(@PathVariable long applicationId); @PostMapping(params = "complete") String markAsComplete(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "edit") String edit(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "uploadGrantAgreement") String uploadGrantAgreement(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "removeGrantAgreement") String removeGrantAgreement(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @GetMapping("/download") @ResponseBody ResponseEntity<ByteArrayResource> downloadGrantAgreement(@PathVariable long applicationId); }
@Test public void edit() throws Exception { long questionId = 1L; long applicationId = 2L; ProcessRoleResource role = newProcessRoleResource().build(); GrantAgreementViewModel viewModel = mock(GrantAgreementViewModel.class); when(grantAgreementViewModelPopulator.populate(applicationId, questionId, loggedInUser.getId())).thenReturn(viewModel); when(userRestService.findProcessRole(loggedInUser.getId(), applicationId)).thenReturn(restSuccess(role)); when(questionStatusRestService.markAsInComplete(questionId, applicationId, role.getId())).thenReturn(restSuccess()); mockMvc.perform( post("/application/{applicationId}/form/question/{questionId}/grant-agreement", applicationId, questionId) .param("edit", "true")) .andExpect(status().isOk()) .andExpect(view().name("application/questions/grant-agreement")) .andReturn(); verify(questionStatusRestService).markAsInComplete(questionId, applicationId, role.getId()); }
GrantAgreementController { @PostMapping(params = "uploadGrantAgreement") public String uploadGrantAgreement(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user) { Supplier<String> failureAndSuccessView = () -> viewGrantAgreement(form, bindingResult, model, applicationId, questionId, user); MultipartFile file = form.getGrantAgreement(); return validationHandler.performFileUpload("grantAgreement", failureAndSuccessView, () -> euGrantTransferRestService .uploadGrantAgreement(applicationId, file.getContentType(), file.getSize(), file.getOriginalFilename(), getMultipartFileBytes(file))); } GrantAgreementController(GrantAgreementViewModelPopulator grantAgreementViewModelPopulator, EuGrantTransferRestService euGrantTransferRestService, QuestionStatusRestService questionStatusRestService, UserRestService userRestService); @GetMapping String viewGrantAgreement(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM, binding = false) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource userResource); @PostMapping String saveAndReturn(@PathVariable long applicationId); @PostMapping(params = "complete") String markAsComplete(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "edit") String edit(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "uploadGrantAgreement") String uploadGrantAgreement(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "removeGrantAgreement") String removeGrantAgreement(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @GetMapping("/download") @ResponseBody ResponseEntity<ByteArrayResource> downloadGrantAgreement(@PathVariable long applicationId); }
@Test public void uploadFeedback() throws Exception { long questionId = 1L; long applicationId = 2L; when(euGrantTransferRestService.uploadGrantAgreement(applicationId, "application/pdf", 11, "testFile.pdf", "My content!".getBytes())) .thenReturn(restFailure(CommonErrors.payloadTooLargeError(1))); MockMultipartFile file = new MockMultipartFile("grantAgreement", "testFile.pdf", "application/pdf", "My content!".getBytes()); mockMvc.perform( multipart("/application/{applicationId}/form/question/{questionId}/grant-agreement", applicationId, questionId) .file(file) .param("uploadGrantAgreement", "true")) .andExpect(status().isOk()) .andExpect(view().name("application/questions/grant-agreement")) .andReturn(); verify(euGrantTransferRestService).uploadGrantAgreement(applicationId, "application/pdf", 11, "testFile.pdf", "My content!".getBytes()); }
GrantAgreementController { @PostMapping(params = "removeGrantAgreement") public String removeGrantAgreement(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user) { RestResult<Void> sendResult = euGrantTransferRestService .deleteGrantAgreement(applicationId); Supplier<String> failureAndSuccesView = () -> viewGrantAgreement(form, bindingResult, model, applicationId, questionId, user); return validationHandler.addAnyErrors(sendResult.getErrors()) .failNowOrSucceedWith(failureAndSuccesView, failureAndSuccesView); } GrantAgreementController(GrantAgreementViewModelPopulator grantAgreementViewModelPopulator, EuGrantTransferRestService euGrantTransferRestService, QuestionStatusRestService questionStatusRestService, UserRestService userRestService); @GetMapping String viewGrantAgreement(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM, binding = false) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource userResource); @PostMapping String saveAndReturn(@PathVariable long applicationId); @PostMapping(params = "complete") String markAsComplete(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "edit") String edit(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "uploadGrantAgreement") String uploadGrantAgreement(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @PostMapping(params = "removeGrantAgreement") String removeGrantAgreement(@ModelAttribute(name = MODEL_ATTRIBUTE_FORM) GrantAgreementForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user); @GetMapping("/download") @ResponseBody ResponseEntity<ByteArrayResource> downloadGrantAgreement(@PathVariable long applicationId); }
@Test public void removeGrantAgreement() throws Exception { long questionId = 1L; long applicationId = 2L; GrantAgreementViewModel viewModel = mock(GrantAgreementViewModel.class); when(grantAgreementViewModelPopulator.populate(applicationId, questionId, loggedInUser.getId())).thenReturn(viewModel); when(euGrantTransferRestService.deleteGrantAgreement(applicationId)).thenReturn(restSuccess()); mockMvc.perform( post("/application/{applicationId}/form/question/{questionId}/grant-agreement", applicationId, questionId) .param("removeGrantAgreement", "true")) .andExpect(status().isOk()) .andExpect(view().name("application/questions/grant-agreement")) .andReturn(); verify(euGrantTransferRestService).deleteGrantAgreement(applicationId); }
QuestionServiceImpl extends BaseTransactionalService implements QuestionService { @Override public ServiceResult<QuestionResource> getNextQuestion(final Long questionId) { return find(getQuestionSupplier(questionId)).andOnSuccess(question -> { Question nextQuestion = null; if (question != null) { nextQuestion = questionRepository.findFirstByCompetitionIdAndSectionIdAndPriorityGreaterThanOrderByPriorityAsc( question.getCompetition().getId(), question.getSection().getId(), question.getPriority()); if (nextQuestion == null) { nextQuestion = getNextQuestionBySection(question.getSection().getId(), question.getCompetition().getId()); } } if (nextQuestion == null) { return serviceFailure(notFoundError(QuestionResource.class, "getNextQuestion", questionId)); } else { return serviceSuccess(questionMapper.mapToResource(nextQuestion)); } }); } @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 getNextQuestionTest() throws Exception { Question question = newQuestion().withCompetitionAndSectionAndPriority(newCompetition().build(), newSection().build(), 1).build(); Question nextQuestion = newQuestion().withCompetitionAndSectionAndPriority(newCompetition().build(), newSection().build(), 2).build(); QuestionResource nextQuestionResource = newQuestionResource().withCompetitionAndSectionAndPriority(newCompetitionResource().build(), newSectionResource().build(), 2).build(); when(questionRepositoryMock.findById(question.getId())).thenReturn(Optional.of(question)); when(questionRepositoryMock.findFirstByCompetitionIdAndSectionIdAndPriorityGreaterThanOrderByPriorityAsc( question.getCompetition().getId(), question.getSection().getId(), question.getPriority())) .thenReturn(nextQuestion); when(questionMapperMock.mapToResource(nextQuestion)).thenReturn(nextQuestionResource); assertEquals(nextQuestionResource, questionService.getNextQuestion(question.getId()).getSuccess()); } @Test public void getNextQuestionFromOtherSectionTest() throws Exception { Section nextSection = newSection().build(); SectionResource nextSectionResource = newSectionResource().build(); Question question = newQuestion().withCompetitionAndSectionAndPriority(newCompetition().build(), newSection().build(), 1).build(); Question nextQuestion = newQuestion().withCompetitionAndSectionAndPriority(newCompetition().build(), nextSection, 2).build(); QuestionResource nextQuestionResource = newQuestionResource().withCompetitionAndSectionAndPriority(newCompetitionResource().build(), nextSectionResource, 2).build(); when(questionRepositoryMock.findById(question.getId())).thenReturn(Optional.of(question)); when(sectionService.getNextSection(any(SectionResource.class))).thenReturn(serviceSuccess(nextSectionResource)); when(questionRepositoryMock.findFirstByCompetitionIdAndSectionIdAndPriorityGreaterThanOrderByPriorityAsc( question.getCompetition().getId(), question.getSection().getId(), question.getPriority())).thenReturn(nextQuestion); when(questionMapperMock.mapToResource(nextQuestion)).thenReturn(nextQuestionResource); assertEquals(nextQuestionResource, questionService.getNextQuestion(question.getId()).getSuccess()); }
GrantAgreementViewModelPopulator { public GrantAgreementViewModel populate(long applicationId, long questionId, long userId) { ApplicationResource application = applicationRestService.getApplicationById(applicationId).getSuccess(); CompetitionResource competition = competitionRestService.getCompetitionById(application.getCompetition()).getSuccess(); Optional<FileEntryResource> file = euGrantTransferRestService.findGrantAgreement(applicationId).getOptionalSuccessObject(); OrganisationResource organisation = organisationRestService.getByUserAndApplicationId(userId, applicationId).getSuccess(); boolean complete = isComplete(application, organisation, questionId); boolean open = application.isOpen() && competition.isOpen(); return new GrantAgreementViewModel(application.getId(), competition.getName(), application.getName(), questionId, file.map(FileEntryResource::getName).orElse(null), open, complete); } GrantAgreementViewModelPopulator(ApplicationRestService applicationRestService, EuGrantTransferRestService euGrantTransferRestService, QuestionStatusRestService questionStatusRestService, OrganisationRestService organisationRestService, CompetitionRestService competitionRestService); GrantAgreementViewModel populate(long applicationId, long questionId, long userId); }
@Test public void populate() throws ExecutionException, InterruptedException { Long applicationId = 1L; long questionId = 2L; long userId = 3L; long competitionId = 4L; ApplicationResource application = newApplicationResource() .withId(applicationId) .withCompetition(competitionId) .withApplicationState(ApplicationState.OPENED) .build(); CompetitionResource competition = newCompetitionResource() .withCompetitionStatus(CompetitionStatus.OPEN) .build(); OrganisationResource organisation = newOrganisationResource().build(); Future<Set<Long>> future = mock(Future.class); when(applicationRestService.getApplicationById(applicationId)).thenReturn(restSuccess(application)); when(competitionRestService.getCompetitionById(competitionId)).thenReturn(restSuccess(competition)); when(euGrantTransferRestService.findGrantAgreement(applicationId)).thenReturn(restFailure(Collections.emptyList(), HttpStatus.NOT_FOUND)); when(organisationRestService.getByUserAndApplicationId(userId, applicationId)).thenReturn(restSuccess(organisation)); when(questionStatusRestService.getMarkedAsComplete(applicationId, organisation.getId())).thenReturn(future); when(future.get()).thenReturn(asSet(questionId)); GrantAgreementViewModel viewModel = populator.populate(1L, 2L, 3L); assertEquals(viewModel.getApplicationId(), applicationId); assertEquals(viewModel.getQuestionId(), questionId); assertEquals(viewModel.isComplete(), true); assertEquals(viewModel.isOpen(), true); assertEquals(viewModel.isReadonly(), true); }
ApplicationTermsController { @GetMapping public String getTerms(@PathVariable long applicationId, @PathVariable long questionId, UserResource user, Model model, @ModelAttribute(name = "form", binding = false) ApplicationTermsForm form, @RequestParam(value = "readonly", defaultValue = "false") Boolean readOnly) { ApplicationTermsViewModel viewModel = applicationTermsModelPopulator.populate(user, applicationId, questionId, readOnly); model.addAttribute("model", viewModel); return "application/sections/terms-and-conditions/terms-and-conditions"; } ApplicationTermsController(UserRestService userRestService, QuestionStatusRestService questionStatusRestService, ApplicationRestService applicationRestService, ApplicationTermsPartnerModelPopulator applicationTermsPartnerModelPopulator, ApplicationTermsModelPopulator applicationTermsModelPopulator); @GetMapping String getTerms(@PathVariable long applicationId, @PathVariable long questionId, UserResource user, Model model, @ModelAttribute(name = "form", binding = false) ApplicationTermsForm form, @RequestParam(value = "readonly", defaultValue = "false") Boolean readOnly); @PostMapping String acceptTerms(@PathVariable long applicationId, @PathVariable long questionId, UserResource user, Model model, @ModelAttribute(name = "form", binding = false) ApplicationTermsForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler); @GetMapping("/partner-status") String getPartnerStatus(@PathVariable long applicationId, @PathVariable long questionId, Model model); }
@Test public void getTerms() throws Exception { long applicationId = 3L; long compeitionId = 5L; long questionId = 7L; String competitionTermsTemplate = "terms-template"; boolean collaborativeApplication = false; boolean termsAccepted = false; boolean additionalTerms = true; UserResource loggedInUser = newUserResource() .withFirstName("Tom") .withLastName("Baldwin") .build(); ZonedDateTime termsAcceptedOn = now(); ApplicationTermsViewModel viewModel = new ApplicationTermsViewModel(applicationId, "compName", compeitionId, questionId, competitionTermsTemplate, collaborativeApplication, termsAccepted, loggedInUser.getName(), termsAcceptedOn, true, additionalTerms); when(applicationTermsModelPopulatorMock.populate(loggedInUser, applicationId, questionId, false)).thenReturn(viewModel); setLoggedInUser(loggedInUser); mockMvc.perform(get("/application/{applicationId}/form/question/{questionId}/terms-and-conditions", applicationId, questionId)) .andExpect(status().isOk()) .andExpect(model().attribute("model", viewModel)) .andExpect(view().name("application/sections/terms-and-conditions/terms-and-conditions")); verify(applicationTermsModelPopulatorMock, only()).populate(loggedInUser, applicationId, questionId, false); }
ApplicationTermsController { @PostMapping public String acceptTerms(@PathVariable long applicationId, @PathVariable long questionId, UserResource user, Model model, @ModelAttribute(name = "form", binding = false) ApplicationTermsForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler) { Supplier<String> failureView = () -> getTerms(applicationId, questionId, user, model, form, false); return validationHandler.failNowOrSucceedWith(failureView, () -> { ProcessRoleResource processRole = userRestService.findProcessRole(user.getId(), applicationId).getSuccess(); RestResult<List<ValidationMessages>> result = questionStatusRestService.markAsComplete(questionId, applicationId, processRole.getId()); return validationHandler.addAnyErrors(result, fieldErrorsToFieldErrors(), asGlobalErrors()) .failNowOrSucceedWith( failureView, () -> format("redirect:%s%d/form/question/%d/terms-and-conditions#terms-accepted", APPLICATION_BASE_URL, applicationId, questionId)); }); } ApplicationTermsController(UserRestService userRestService, QuestionStatusRestService questionStatusRestService, ApplicationRestService applicationRestService, ApplicationTermsPartnerModelPopulator applicationTermsPartnerModelPopulator, ApplicationTermsModelPopulator applicationTermsModelPopulator); @GetMapping String getTerms(@PathVariable long applicationId, @PathVariable long questionId, UserResource user, Model model, @ModelAttribute(name = "form", binding = false) ApplicationTermsForm form, @RequestParam(value = "readonly", defaultValue = "false") Boolean readOnly); @PostMapping String acceptTerms(@PathVariable long applicationId, @PathVariable long questionId, UserResource user, Model model, @ModelAttribute(name = "form", binding = false) ApplicationTermsForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler); @GetMapping("/partner-status") String getPartnerStatus(@PathVariable long applicationId, @PathVariable long questionId, Model model); }
@Test public void acceptTerms() throws Exception { long questionId = 7L; CompetitionResource competition = newCompetitionResource() .build(); ApplicationResource application = newApplicationResource() .withId(3L) .withCompetition(competition.getId()) .build(); SectionResource termsAndConditionsSection = newSectionResource().build(); ProcessRoleResource processRole = newProcessRoleResource() .withUser(getLoggedInUser()) .withApplication(application.getId()) .build(); when(userRestServiceMock.findProcessRole(processRole.getUser(), processRole.getApplicationId())).thenReturn(restSuccess(processRole)); when(questionStatusRestServiceMock.markAsComplete(questionId, application.getId(), processRole.getId())).thenReturn(restSuccess(emptyList())); ApplicationTermsForm form = new ApplicationTermsForm(); mockMvc.perform(post("/application/{applicationId}/form/question/{questionId}/terms-and-conditions", application.getId(), questionId) .param("agreed", "true")) .andExpect(status().is3xxRedirection()) .andExpect(model().attribute("form", form)) .andExpect(model().hasNoErrors()) .andExpect(redirectedUrlTemplate("/application/{applicationId}/form/question/{questionId}/terms-and-conditions#terms-accepted", application.getId(), questionId)); InOrder inOrder = inOrder(userRestServiceMock, questionStatusRestServiceMock); inOrder.verify(userRestServiceMock).findProcessRole(processRole.getUser(), processRole.getApplicationId()); inOrder.verify(questionStatusRestServiceMock).markAsComplete(questionId, application.getId(), processRole.getId()); inOrder.verifyNoMoreInteractions(); }
ApplicationTermsController { @GetMapping("/partner-status") public String getPartnerStatus(@PathVariable long applicationId, @PathVariable long questionId, Model model) { ApplicationResource application = applicationRestService.getApplicationById(applicationId).getSuccess(); if (!application.isOpen()) { throw new ForbiddenActionException("Cannot view partners on a non-open application"); } if (!application.isCollaborativeProject()) { throw new ForbiddenActionException("Cannot view partners on a non-collaborative application"); } model.addAttribute("model", applicationTermsPartnerModelPopulator.populate(application, questionId)); return "application/sections/terms-and-conditions/terms-and-conditions-partner-status"; } ApplicationTermsController(UserRestService userRestService, QuestionStatusRestService questionStatusRestService, ApplicationRestService applicationRestService, ApplicationTermsPartnerModelPopulator applicationTermsPartnerModelPopulator, ApplicationTermsModelPopulator applicationTermsModelPopulator); @GetMapping String getTerms(@PathVariable long applicationId, @PathVariable long questionId, UserResource user, Model model, @ModelAttribute(name = "form", binding = false) ApplicationTermsForm form, @RequestParam(value = "readonly", defaultValue = "false") Boolean readOnly); @PostMapping String acceptTerms(@PathVariable long applicationId, @PathVariable long questionId, UserResource user, Model model, @ModelAttribute(name = "form", binding = false) ApplicationTermsForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler); @GetMapping("/partner-status") String getPartnerStatus(@PathVariable long applicationId, @PathVariable long questionId, Model model); }
@Test public void getPartnerStatus() throws Exception { long questionId = 7L; CompetitionResource competition = newCompetitionResource() .build(); ApplicationResource application = newApplicationResource() .withId(3L) .withCompetition(competition.getId()) .withCollaborativeProject(true) .withApplicationState(OPENED) .build(); ApplicationTermsPartnerViewModel viewModel = new ApplicationTermsPartnerViewModel(application.getId(), "compName", questionId, emptyList()); when(applicationRestServiceMock.getApplicationById(application.getId())).thenReturn(restSuccess(application)); when(applicationTermsPartnerModelPopulatorMock.populate(application, questionId)).thenReturn(viewModel); mockMvc.perform(get("/application/{applicationId}/form/question/{questionId}/terms-and-conditions/partner-status", application.getId(), questionId)) .andExpect(status().isOk()) .andExpect(model().attribute("model", viewModel)) .andExpect(view().name("application/sections/terms-and-conditions/terms-and-conditions-partner-status")); InOrder inOrder = inOrder(applicationRestServiceMock, applicationTermsPartnerModelPopulatorMock); inOrder.verify(applicationRestServiceMock).getApplicationById(application.getId()); inOrder.verify(applicationTermsPartnerModelPopulatorMock).populate(application, questionId); inOrder.verifyNoMoreInteractions(); }
GenericQuestionApplicationController { @GetMapping public String view(@ModelAttribute(name = "form", binding = false) GenericQuestionApplicationForm form, @SuppressWarnings("unused") BindingResult bindingResult, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user) { ApplicantQuestionResource question = applicantRestService.getQuestion(user.getId(), applicationId, questionId); formPopulator.populate(form, question); return getView(model, question); } @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 viewPage() 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); mockMvc.perform(get("/application/{applicationId}/form/question/{questionId}/generic", applicationId, questionId)) .andExpect(view().name("application/questions/generic")) .andExpect(model().attribute("model", viewModel)); verify(formPopulator).populate(any(), eq(applicantQuestion)); }
GenericQuestionApplicationController { @PostMapping(params = "assign") public String assignToLeadForReview(@ModelAttribute(value = "form") GenericQuestionApplicationForm form, BindingResult bindingResult, ValidationHandler validationHandler, Model model, @PathVariable long applicationId, @PathVariable long questionId, UserResource user, HttpServletResponse response) { cookieFlashMessageFilter.setFlashMessage(response, "assignedQuestion"); questionStatusRestService.assign(questionId, applicationId, getLeadProcessRole(applicationId).getId(), 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 assignToLeadForReview() throws Exception { ProcessRoleResource userProcessRole = newProcessRoleResource() .withRole(COLLABORATOR) .withUser(loggedInUser) .build(); ProcessRoleResource leadProcessRole = newProcessRoleResource() .withRole(LEADAPPLICANT) .build(); when(userRestService.findProcessRole(applicationId)).thenReturn(restSuccess(asList(leadProcessRole, userProcessRole))); when(userRestService.findProcessRole(loggedInUser.getId(), applicationId)).thenReturn(restSuccess(userProcessRole)); when(questionStatusRestService.assign(questionId, applicationId, leadProcessRole.getId(), userProcessRole.getId())).thenReturn(restSuccess()); mockMvc.perform(post("/application/{applicationId}/form/question/{questionId}/generic", applicationId, questionId) .param("assign", "true")) .andExpect(redirectedUrl(String.format("/application/%d/form/question/%d/generic", applicationId, questionId))); verify(questionStatusRestService).assign(questionId, applicationId, leadProcessRole.getId(), userProcessRole.getId()); verify(cookieFlashMessageFilter).setFlashMessage(any(HttpServletResponse.class), eq("assignedQuestion")); verifyNoMoreInteractions(questionStatusRestService); }