src_fm_fc_ms_ff
stringlengths 43
86.8k
| target
stringlengths 20
276k
|
|---|---|
InviteAssessorsOverviewController extends CompetitionManagementCookieController<OverviewSelectionForm> { @GetMapping("/pending-and-declined") public String overview(Model model, @Valid @ModelAttribute(FILTER_FORM_ATTR_NAME) OverviewAssessorsFilterForm filterForm, @ModelAttribute(name = SELECTION_FORM, binding = false) OverviewSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam(value = "filterChanged", required = false) boolean filterChanged, HttpServletRequest request, HttpServletResponse response) { updateOverviewSelectionForm(request, response, competitionId, selectionForm, filterForm, filterChanged); model.addAttribute("model", inviteAssessorsOverviewModelPopulator.populateModel( competitionId, page, filterForm.getStatus(), filterForm.getCompliant(), filterForm.getAssessorName() )); return "assessors/overview"; } @GetMapping("/pending-and-declined") String overview(Model model,
@Valid @ModelAttribute(FILTER_FORM_ATTR_NAME) OverviewAssessorsFilterForm filterForm,
@ModelAttribute(name = SELECTION_FORM, binding = false) OverviewSelectionForm selectionForm,
@SuppressWarnings("unused") BindingResult bindingResult,
@PathVariable("competitionId") long competitionId,
@RequestParam(defaultValue = "0") int page,
@RequestParam(value = "filterChanged", required = false) boolean filterChanged,
HttpServletRequest request,
HttpServletResponse response); @PostMapping(value = "/pending-and-declined", params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForResendList(
@PathVariable("competitionId") long competitionId,
@RequestParam("selectionId") long assessorId,
@RequestParam("isSelected") boolean isSelected,
@RequestParam Optional<ParticipantStatusResource> status,
@RequestParam Optional<Boolean> compliant,
@RequestParam Optional<String> assessorName,
HttpServletRequest request,
HttpServletResponse response); @PostMapping(value = "/pending-and-declined", params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToResendList(Model model,
@PathVariable("competitionId") long competitionId,
@RequestParam("addAll") boolean addAll,
@RequestParam(defaultValue = "0") int page,
@RequestParam Optional<ParticipantStatusResource> status,
@RequestParam Optional<Boolean> compliant,
@RequestParam Optional<String> assessorName,
HttpServletRequest request,
HttpServletResponse response); } | @Test public void overview() throws Exception { int page = 1; Optional<String> assessorName = of(""); Optional<Boolean> compliant = of(TRUE); List<Long> inviteIds = asList(1L, 2L); List<ParticipantStatusResource> status = singletonList(PENDING); List<AssessorInviteOverviewResource> assessorInviteOverviewResources = setUpAssessorInviteOverviewResources(); AssessorInviteOverviewPageResource pageResource = newAssessorInviteOverviewPageResource() .withContent(assessorInviteOverviewResources) .build(); when(categoryRestServiceMock.getInnovationAreas()).thenReturn(restSuccess(newInnovationAreaResource().build(4))); when(competitionInviteRestService.getInvitationOverview(competition.getId(), page, status, compliant, assessorName)) .thenReturn(restSuccess(pageResource)); when(competitionInviteRestService.getAssessorsNotAcceptedInviteIds(competition.getId(), status, compliant, assessorName)).thenReturn(restSuccess(inviteIds)); MvcResult result = mockMvc.perform(get("/competition/{competitionId}/assessors/pending-and-declined", competition.getId()) .param("page", "1") .param("status", "PENDING") .param("assessorName", assessorName.get()) .param("compliant", "TRUE")) .andExpect(status().isOk()) .andExpect(model().attributeExists("model")) .andExpect(view().name("assessors/overview")) .andReturn(); OverviewAssessorsFilterForm filterForm = (OverviewAssessorsFilterForm) result.getModelAndView().getModel().get("filterForm"); assertEquals(of(PENDING), filterForm.getStatus()); assertEquals(of(TRUE), filterForm.getCompliant()); assertCompetitionDetails(competition, result); assertInviteOverviews(assessorInviteOverviewResources, result); InOrder inOrder = inOrder(competitionRestService, categoryRestServiceMock, competitionInviteRestService); inOrder.verify(competitionInviteRestService).getAssessorsNotAcceptedInviteIds(competition.getId(), status, compliant, assessorName); inOrder.verify(competitionRestService).getCompetitionById(competition.getId()); inOrder.verify(categoryRestServiceMock).getInnovationAreas(); inOrder.verify(competitionInviteRestService).getInvitationOverview(competition.getId(), page, status, compliant, assessorName); inOrder.verifyNoMoreInteractions(); } |
CompetitionManagementDashboardController { @SecuredBySpring(value = "READ", description = "The competition admin, project finance," + " support, innovation lead and stakeholder roles are allowed to view the list of live competitions") @PreAuthorize("hasAnyAuthority('comp_admin', 'project_finance', 'support', 'innovation_lead', 'stakeholder')") @GetMapping("/dashboard/live") @NavigationRoot public String live(Model model, UserResource user) { Map<CompetitionStatus, List<CompetitionSearchResultItem>> liveCompetitions = competitionDashboardSearchService.getLiveCompetitions(); model.addAttribute(MODEL_ATTR, new LiveDashboardViewModel( liveCompetitions, competitionDashboardSearchService.getCompetitionCounts(), new DashboardTabsViewModel(user))); return TEMPLATE_PATH + "live"; } CompetitionManagementDashboardController(CompetitionDashboardSearchService competitionDashboardSearchService,
CompetitionSetupRestService competitionSetupRestService,
BankDetailsRestService bankDetailsRestService,
CompetitionSetupStakeholderRestService competitionSetupStakeholderRestService); @SecuredBySpring(value = "READ", description = "The competition admin, project finance," + " support, innovation lead and stakeholder roles are allowed to view the competition management dashboard") @PreAuthorize("hasAnyAuthority('comp_admin', 'project_finance', 'support', 'innovation_lead', 'stakeholder', 'external_finance')") @GetMapping("/dashboard") String dashboard(UserResource user); @SecuredBySpring(value = "READ", description = "The competition admin, project finance," + " support, innovation lead and stakeholder roles are allowed to view the list of live competitions") @PreAuthorize("hasAnyAuthority('comp_admin', 'project_finance', 'support', 'innovation_lead', 'stakeholder')") @GetMapping("/dashboard/live") @NavigationRoot String live(Model model, UserResource user); @SecuredBySpring(value = "READ", description = "The competition admin, project finance," + " support, innovation lead and stakeholder roles are allowed to view the list of competitions in project setup") @PreAuthorize("hasAnyAuthority('comp_admin', 'project_finance', 'support', 'innovation_lead', 'stakeholder', 'external_finance')") @GetMapping("/dashboard/project-setup") @NavigationRoot String projectSetup(@RequestParam(defaultValue = DEFAULT_PAGE) int page, Model model, UserResource user); @SecuredBySpring(value = "READ", description = "The competition admin, project finance, and support roles are allowed to view the list of upcoming competitions") @PreAuthorize("hasAnyAuthority('comp_admin', 'project_finance', 'support')") @GetMapping("/dashboard/upcoming") @NavigationRoot String upcoming(Model model, UserResource user); @SecuredBySpring(value = "READ", description = "The competition admin, project finance," + " support, innovation lead and stakeholder roles are allowed to view the list of previous competitions") @PreAuthorize("hasAnyAuthority('comp_admin', 'project_finance', 'support', 'innovation_lead', 'stakeholder')") @GetMapping("/dashboard/previous") @NavigationRoot String previous(@RequestParam(defaultValue = DEFAULT_PAGE) int page, Model model, UserResource user); @SecuredBySpring(value = "READ", description = "The competition admin, project finance, and support roles are allowed to view the list of non-IFS competitions") @PreAuthorize("hasAnyAuthority('comp_admin', 'project_finance', 'support')") @GetMapping("/dashboard/non-ifs") @NavigationRoot String nonIfs(@RequestParam(defaultValue = DEFAULT_PAGE) int page,
Model model, UserResource user); @SecuredBySpring(value = "READ", description = "The competition admin, project finance, " + "innovation lead, stakeholder, ifs admin and support users are allowed to view the application and competition search pages") @PreAuthorize("hasAnyAuthority('comp_admin', 'project_finance', 'support', 'innovation_lead', 'stakeholder', 'ifs_administrator')") @GetMapping("/dashboard/internal/search") String internalSearch(@RequestParam(name = "searchQuery", defaultValue = "") String searchQuery,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE) int page,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize,
Model model,
HttpServletRequest request,
UserResource user); @SecuredBySpring(value = "READ", description = "The competition admin and project finance roles are allowed to view the page for setting up new competitions") @PreAuthorize("hasAnyAuthority('comp_admin', 'project_finance')") @GetMapping("/competition/create") String create(); } | @Test public void liveDashboard() throws Exception { setLoggedInUser(newUserResource().withRolesGlobal(singletonList(Role.COMP_ADMIN)).build()); when(competitionDashboardSearchService.getLiveCompetitions()).thenReturn(competitions); MvcResult result = mockMvc.perform(MockMvcRequestBuilders.get("/dashboard/live")) .andExpect(status().isOk()) .andExpect(view().name("dashboard/live")) .andReturn(); Object model = result.getModelAndView().getModelMap().get("model"); assertTrue(model.getClass().equals(LiveDashboardViewModel.class)); LiveDashboardViewModel viewModel = (LiveDashboardViewModel) model; assertEquals(competitions, viewModel.getCompetitions()); assertEquals(counts, viewModel.getCounts()); assertTrue(viewModel.getTabs().live()); } |
CompetitionManagementDashboardController { private boolean isProjectFinanceUser(UserResource user) { return SecurityRuleUtil.isProjectFinanceUser(user); } CompetitionManagementDashboardController(CompetitionDashboardSearchService competitionDashboardSearchService,
CompetitionSetupRestService competitionSetupRestService,
BankDetailsRestService bankDetailsRestService,
CompetitionSetupStakeholderRestService competitionSetupStakeholderRestService); @SecuredBySpring(value = "READ", description = "The competition admin, project finance," + " support, innovation lead and stakeholder roles are allowed to view the competition management dashboard") @PreAuthorize("hasAnyAuthority('comp_admin', 'project_finance', 'support', 'innovation_lead', 'stakeholder', 'external_finance')") @GetMapping("/dashboard") String dashboard(UserResource user); @SecuredBySpring(value = "READ", description = "The competition admin, project finance," + " support, innovation lead and stakeholder roles are allowed to view the list of live competitions") @PreAuthorize("hasAnyAuthority('comp_admin', 'project_finance', 'support', 'innovation_lead', 'stakeholder')") @GetMapping("/dashboard/live") @NavigationRoot String live(Model model, UserResource user); @SecuredBySpring(value = "READ", description = "The competition admin, project finance," + " support, innovation lead and stakeholder roles are allowed to view the list of competitions in project setup") @PreAuthorize("hasAnyAuthority('comp_admin', 'project_finance', 'support', 'innovation_lead', 'stakeholder', 'external_finance')") @GetMapping("/dashboard/project-setup") @NavigationRoot String projectSetup(@RequestParam(defaultValue = DEFAULT_PAGE) int page, Model model, UserResource user); @SecuredBySpring(value = "READ", description = "The competition admin, project finance, and support roles are allowed to view the list of upcoming competitions") @PreAuthorize("hasAnyAuthority('comp_admin', 'project_finance', 'support')") @GetMapping("/dashboard/upcoming") @NavigationRoot String upcoming(Model model, UserResource user); @SecuredBySpring(value = "READ", description = "The competition admin, project finance," + " support, innovation lead and stakeholder roles are allowed to view the list of previous competitions") @PreAuthorize("hasAnyAuthority('comp_admin', 'project_finance', 'support', 'innovation_lead', 'stakeholder')") @GetMapping("/dashboard/previous") @NavigationRoot String previous(@RequestParam(defaultValue = DEFAULT_PAGE) int page, Model model, UserResource user); @SecuredBySpring(value = "READ", description = "The competition admin, project finance, and support roles are allowed to view the list of non-IFS competitions") @PreAuthorize("hasAnyAuthority('comp_admin', 'project_finance', 'support')") @GetMapping("/dashboard/non-ifs") @NavigationRoot String nonIfs(@RequestParam(defaultValue = DEFAULT_PAGE) int page,
Model model, UserResource user); @SecuredBySpring(value = "READ", description = "The competition admin, project finance, " + "innovation lead, stakeholder, ifs admin and support users are allowed to view the application and competition search pages") @PreAuthorize("hasAnyAuthority('comp_admin', 'project_finance', 'support', 'innovation_lead', 'stakeholder', 'ifs_administrator')") @GetMapping("/dashboard/internal/search") String internalSearch(@RequestParam(name = "searchQuery", defaultValue = "") String searchQuery,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE) int page,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize,
Model model,
HttpServletRequest request,
UserResource user); @SecuredBySpring(value = "READ", description = "The competition admin and project finance roles are allowed to view the page for setting up new competitions") @PreAuthorize("hasAnyAuthority('comp_admin', 'project_finance')") @GetMapping("/competition/create") String create(); } | @Test public void projectSetupDashboardWithNonProjectFinanceUser() throws Exception { int page = 1; Long countBankDetails = 0L; setLoggedInUser(newUserResource().withRolesGlobal(singletonList(Role.COMP_ADMIN)).build()); List<UpcomingCompetitionSearchResultItem> competitions = newUpcomingCompetitionSearchResultItem() .withCompetitionStatus(OPEN) .build(1); CompetitionSearchResult searchResult = new CompetitionSearchResult(); searchResult.setContent(new ArrayList<>(competitions)); when(competitionDashboardSearchService.getProjectSetupCompetitions(page)).thenReturn(searchResult); MvcResult result = mockMvc.perform(MockMvcRequestBuilders.get("/dashboard/project-setup") .param("page", String.valueOf(page))) .andExpect(status().isOk()) .andExpect(view().name("dashboard/projectSetup")) .andReturn(); Object model = result.getModelAndView().getModelMap().get("model"); assertTrue(model.getClass().equals(ProjectSetupDashboardViewModel.class)); ProjectSetupDashboardViewModel viewModel = (ProjectSetupDashboardViewModel) model; assertEquals(searchResult, viewModel.getResult()); assertEquals(counts, viewModel.getCounts()); assertEquals(countBankDetails, viewModel.getCountBankDetails()); assertFalse(viewModel.isProjectFinanceUser()); verify(bankDetailsRestService, never()).countPendingBankDetailsApprovals(); }
@Test public void projectSetupDashboardWithProjectFinanceUser() throws Exception { int page = 1; Long countBankDetails = 8L; setLoggedInUser(newUserResource().withRolesGlobal(singletonList(Role.PROJECT_FINANCE)).build()); List<UpcomingCompetitionSearchResultItem> competitions = newUpcomingCompetitionSearchResultItem() .withCompetitionStatus(PROJECT_SETUP) .build(1); CompetitionSearchResult searchResult = new CompetitionSearchResult(); searchResult.setContent(new ArrayList<>(competitions)); when(competitionDashboardSearchService.getProjectSetupCompetitions(page)).thenReturn(searchResult); when(bankDetailsRestService.countPendingBankDetailsApprovals()).thenReturn(restSuccess(countBankDetails)); MvcResult result = mockMvc.perform(MockMvcRequestBuilders.get("/dashboard/project-setup") .param("page", String.valueOf(page))) .andExpect(status().isOk()) .andExpect(view().name("dashboard/projectSetup")) .andReturn(); Object model = result.getModelAndView().getModelMap().get("model"); assertTrue(model.getClass().equals(ProjectSetupDashboardViewModel.class)); ProjectSetupDashboardViewModel viewModel = (ProjectSetupDashboardViewModel) model; assertEquals(searchResult, viewModel.getResult()); assertEquals(counts, viewModel.getCounts()); assertEquals(countBankDetails, viewModel.getCountBankDetails()); assertTrue(viewModel.isProjectFinanceUser()); verify(bankDetailsRestService, only()).countPendingBankDetailsApprovals(); } |
CompetitionManagementDashboardController { @SecuredBySpring(value = "READ", description = "The competition admin and project finance roles are allowed to view the page for setting up new competitions") @PreAuthorize("hasAnyAuthority('comp_admin', 'project_finance')") @GetMapping("/competition/create") public String create() { CompetitionResource competition = competitionSetupRestService.create().getSuccess(); return String.format("redirect:/competition/setup/%s", competition.getId()); } CompetitionManagementDashboardController(CompetitionDashboardSearchService competitionDashboardSearchService,
CompetitionSetupRestService competitionSetupRestService,
BankDetailsRestService bankDetailsRestService,
CompetitionSetupStakeholderRestService competitionSetupStakeholderRestService); @SecuredBySpring(value = "READ", description = "The competition admin, project finance," + " support, innovation lead and stakeholder roles are allowed to view the competition management dashboard") @PreAuthorize("hasAnyAuthority('comp_admin', 'project_finance', 'support', 'innovation_lead', 'stakeholder', 'external_finance')") @GetMapping("/dashboard") String dashboard(UserResource user); @SecuredBySpring(value = "READ", description = "The competition admin, project finance," + " support, innovation lead and stakeholder roles are allowed to view the list of live competitions") @PreAuthorize("hasAnyAuthority('comp_admin', 'project_finance', 'support', 'innovation_lead', 'stakeholder')") @GetMapping("/dashboard/live") @NavigationRoot String live(Model model, UserResource user); @SecuredBySpring(value = "READ", description = "The competition admin, project finance," + " support, innovation lead and stakeholder roles are allowed to view the list of competitions in project setup") @PreAuthorize("hasAnyAuthority('comp_admin', 'project_finance', 'support', 'innovation_lead', 'stakeholder', 'external_finance')") @GetMapping("/dashboard/project-setup") @NavigationRoot String projectSetup(@RequestParam(defaultValue = DEFAULT_PAGE) int page, Model model, UserResource user); @SecuredBySpring(value = "READ", description = "The competition admin, project finance, and support roles are allowed to view the list of upcoming competitions") @PreAuthorize("hasAnyAuthority('comp_admin', 'project_finance', 'support')") @GetMapping("/dashboard/upcoming") @NavigationRoot String upcoming(Model model, UserResource user); @SecuredBySpring(value = "READ", description = "The competition admin, project finance," + " support, innovation lead and stakeholder roles are allowed to view the list of previous competitions") @PreAuthorize("hasAnyAuthority('comp_admin', 'project_finance', 'support', 'innovation_lead', 'stakeholder')") @GetMapping("/dashboard/previous") @NavigationRoot String previous(@RequestParam(defaultValue = DEFAULT_PAGE) int page, Model model, UserResource user); @SecuredBySpring(value = "READ", description = "The competition admin, project finance, and support roles are allowed to view the list of non-IFS competitions") @PreAuthorize("hasAnyAuthority('comp_admin', 'project_finance', 'support')") @GetMapping("/dashboard/non-ifs") @NavigationRoot String nonIfs(@RequestParam(defaultValue = DEFAULT_PAGE) int page,
Model model, UserResource user); @SecuredBySpring(value = "READ", description = "The competition admin, project finance, " + "innovation lead, stakeholder, ifs admin and support users are allowed to view the application and competition search pages") @PreAuthorize("hasAnyAuthority('comp_admin', 'project_finance', 'support', 'innovation_lead', 'stakeholder', 'ifs_administrator')") @GetMapping("/dashboard/internal/search") String internalSearch(@RequestParam(name = "searchQuery", defaultValue = "") String searchQuery,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE) int page,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize,
Model model,
HttpServletRequest request,
UserResource user); @SecuredBySpring(value = "READ", description = "The competition admin and project finance roles are allowed to view the page for setting up new competitions") @PreAuthorize("hasAnyAuthority('comp_admin', 'project_finance')") @GetMapping("/competition/create") String create(); } | @Test public void createCompetition() throws Exception { Long competitionId = 1L; when(competitionSetupRestService.create()).thenReturn(restSuccess(newCompetitionResource().withId(competitionId).build())); mockMvc.perform(get("/competition/create")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl("/competition/setup/" + competitionId)); } |
CompetitionManagementCompetitionController { @PostMapping("/{competitionId}/close-assessment") public String closeAssessment(@PathVariable("competitionId") Long competitionId) { competitionPostSubmissionRestService.closeAssessment(competitionId).getSuccess(); return "redirect:/competition/" + competitionId; } @GetMapping("/{competitionId}") String competition(Model model,
@PathVariable("competitionId") Long competitionId,
UserResource user,
HttpServletRequest request); @PostMapping("/{competitionId}/close-assessment") String closeAssessment(@PathVariable("competitionId") Long competitionId); @PostMapping("/{competitionId}/notify-assessors") String notifyAssessors(@PathVariable("competitionId") Long competitionId); @PostMapping("/{competitionId}/release-feedback") String releaseFeedback(@PathVariable("competitionId") Long competitionId); } | @Test public void closeAssessment() throws Exception { long competitionId = 1L; when(competitionPostSubmissionRestService.closeAssessment(competitionId)).thenReturn(restSuccess()); mockMvc.perform(post("/competition/{competitionId}/close-assessment", competitionId)) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(format("/competition/%s", competitionId))); verify(competitionPostSubmissionRestService).closeAssessment(competitionId); verifyNoMoreInteractions(competitionRestService); } |
CompetitionManagementCompetitionController { @PostMapping("/{competitionId}/notify-assessors") public String notifyAssessors(@PathVariable("competitionId") Long competitionId) { assessorRestService.notifyAssessors(competitionId).getSuccess(); return "redirect:/competition/" + competitionId; } @GetMapping("/{competitionId}") String competition(Model model,
@PathVariable("competitionId") Long competitionId,
UserResource user,
HttpServletRequest request); @PostMapping("/{competitionId}/close-assessment") String closeAssessment(@PathVariable("competitionId") Long competitionId); @PostMapping("/{competitionId}/notify-assessors") String notifyAssessors(@PathVariable("competitionId") Long competitionId); @PostMapping("/{competitionId}/release-feedback") String releaseFeedback(@PathVariable("competitionId") Long competitionId); } | @Test public void notifyAssessors() throws Exception { long competitionId = 1L; when(assessorRestService.notifyAssessors(competitionId)).thenReturn(restSuccess()); mockMvc.perform(post("/competition/{competitionId}/notify-assessors", competitionId)) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(format("/competition/%s", competitionId))); verify(assessorRestService).notifyAssessors(competitionId); verifyNoMoreInteractions(competitionRestService); } |
CompetitionManagementCompetitionController { @PostMapping("/{competitionId}/release-feedback") public String releaseFeedback(@PathVariable("competitionId") Long competitionId) { competitionPostSubmissionRestService.releaseFeedback(competitionId); if (isReleaseFeedbackCompletionStage(competitionId)) { return "redirect:/dashboard/previous"; } else { return "redirect:/dashboard/project-setup"; } } @GetMapping("/{competitionId}") String competition(Model model,
@PathVariable("competitionId") Long competitionId,
UserResource user,
HttpServletRequest request); @PostMapping("/{competitionId}/close-assessment") String closeAssessment(@PathVariable("competitionId") Long competitionId); @PostMapping("/{competitionId}/notify-assessors") String notifyAssessors(@PathVariable("competitionId") Long competitionId); @PostMapping("/{competitionId}/release-feedback") String releaseFeedback(@PathVariable("competitionId") Long competitionId); } | @Test public void releaseFeedback() throws Exception { long competitionId = 1L; CompetitionResource competition = newCompetitionResource() .withCompletionStage(CompetitionCompletionStage.PROJECT_SETUP) .build(); when(competitionPostSubmissionRestService.releaseFeedback(competitionId)).thenReturn(restSuccess()); when(competitionRestService.getCompetitionById(competitionId)).thenReturn(restSuccess(competition)); mockMvc.perform(post("/competition/{competitionId}/release-feedback", competitionId)) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl("/dashboard/project-setup")); InOrder inOrder = inOrder(competitionPostSubmissionRestService, competitionRestService); inOrder.verify(competitionPostSubmissionRestService).releaseFeedback(competitionId); inOrder.verify(competitionRestService).getCompetitionById(competitionId); inOrder.verifyNoMoreInteractions(); }
@Test public void releaseFeedbackWithReleaseFeedbackCompletionStage() throws Exception { long competitionId = 1L; CompetitionResource competition = newCompetitionResource() .withCompletionStage(CompetitionCompletionStage.RELEASE_FEEDBACK) .build(); when(competitionPostSubmissionRestService.releaseFeedback(competitionId)).thenReturn(restSuccess()); when(competitionRestService.getCompetitionById(competitionId)).thenReturn(restSuccess(competition)); mockMvc.perform(post("/competition/{competitionId}/release-feedback", competitionId)) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl("/dashboard/previous")); InOrder inOrder = inOrder(competitionPostSubmissionRestService, competitionRestService); inOrder.verify(competitionPostSubmissionRestService).releaseFeedback(competitionId); inOrder.verify(competitionRestService).getCompetitionById(competitionId); inOrder.verifyNoMoreInteractions(); } |
GrantProcess { public ZonedDateTime getLastProcessed() { return lastProcessed; } GrantProcess(); GrantProcess(long applicationId); GrantProcess(long applicationId, boolean pending); long getApplicationId(); ZonedDateTime getSentRequested(); ZonedDateTime getSentSucceeded(); boolean isPending(); String getMessage(); ZonedDateTime getLastProcessed(); GrantProcess requestSend(ZonedDateTime now); GrantProcess sendSucceeded(ZonedDateTime now); GrantProcess sendFailed(ZonedDateTime now, String message); @Override boolean equals(Object o); @Override int hashCode(); } | @Test public void getLastProcessed() { assertNull(grantProcess.getLastProcessed()); assertNull(sendRequestedGrantProcess.getLastProcessed()); assertNull(sendSucceededGrantProcess.getLastProcessed()); assertEquals(SEND_FAILED_DATE, sendFailedGrantProcess.getLastProcessed()); } |
CompetitionSetupInnovationLeadController { @PreAuthorize("hasPermission(#competitionId, 'org.innovateuk.ifs.competition.resource.CompetitionCompositeId', 'MANAGE_INNOVATION_LEAD')") @GetMapping("/{competitionId}/manage-innovation-leads/find") public String manageInnovationLead(@PathVariable(COMPETITION_ID_KEY) long competitionId, Model model) { CompetitionResource competition = competitionRestService.getCompetitionById(competitionId).getSuccess(); if (!competitionSetupService.hasInitialDetailsBeenPreviouslySubmitted(competitionId)) { return "redirect:/competition/setup/" + competitionId; } model.addAttribute(MODEL, manageInnovationLeadsModelPopulator.populateModel(competition)); return "competition/manage-innovation-leads-find"; } @PreAuthorize("hasPermission(#competitionId, 'org.innovateuk.ifs.competition.resource.CompetitionCompositeId', 'MANAGE_INNOVATION_LEAD')") @GetMapping("/{competitionId}/manage-innovation-leads/find") String manageInnovationLead(@PathVariable(COMPETITION_ID_KEY) long competitionId,
Model model); @PreAuthorize("hasPermission(#competitionId,'org.innovateuk.ifs.competition.resource.CompetitionCompositeId', 'MANAGE_INNOVATION_LEAD')") @GetMapping("/{competitionId}/manage-innovation-leads/overview") String manageInnovationLeadOverview(@PathVariable(COMPETITION_ID_KEY) long competitionId,
Model model); @PreAuthorize("hasPermission(#competitionId, 'org.innovateuk.ifs.competition.resource.CompetitionCompositeId', 'MANAGE_INNOVATION_LEAD')") @PostMapping("/{competitionId}/add-innovation-lead/{innovationLeadUserId}") String addInnovationLead(@PathVariable(COMPETITION_ID_KEY) long competitionId,
@PathVariable("innovationLeadUserId") long innovationLeadUserId,
Model model); @PreAuthorize("hasPermission(#competitionId, 'org.innovateuk.ifs.competition.resource.CompetitionCompositeId', 'MANAGE_INNOVATION_LEAD')") @PostMapping("/{competitionId}/remove-innovation-lead/{innovationLeadUserId}") String removeInnovationLead(@PathVariable(COMPETITION_ID_KEY) long competitionId,
@PathVariable("innovationLeadUserId") long innovationLeadUserId,
Model model); } | @Test public void manageInnovationLead() throws Exception { CompetitionResource competitionResource = newCompetitionResource() .build(); when(competitionRestService.getCompetitionById(COMPETITION_ID)).thenReturn(restSuccess(competitionResource)); when(competitionSetupService.hasInitialDetailsBeenPreviouslySubmitted(COMPETITION_ID)).thenReturn(TRUE); mockMvc.perform(get(URL_PREFIX + "/" + COMPETITION_ID + "/manage-innovation-leads/find")) .andExpect(status().isOk()) .andExpect(view().name("competition/manage-innovation-leads-find")); verify(manageInnovationLeadsModelPopulator).populateModel(any()); } |
CompetitionSetupInnovationLeadController { @PreAuthorize("hasPermission(#competitionId,'org.innovateuk.ifs.competition.resource.CompetitionCompositeId', 'MANAGE_INNOVATION_LEAD')") @GetMapping("/{competitionId}/manage-innovation-leads/overview") public String manageInnovationLeadOverview(@PathVariable(COMPETITION_ID_KEY) long competitionId, Model model) { CompetitionResource competition = competitionRestService.getCompetitionById(competitionId).getSuccess(); if (!competitionSetupService.hasInitialDetailsBeenPreviouslySubmitted(competitionId)) { return "redirect:/competition/setup/" + competitionId; } model.addAttribute(MODEL, manageInnovationLeadsModelPopulator.populateModel(competition)); return "competition/manage-innovation-leads-overview"; } @PreAuthorize("hasPermission(#competitionId, 'org.innovateuk.ifs.competition.resource.CompetitionCompositeId', 'MANAGE_INNOVATION_LEAD')") @GetMapping("/{competitionId}/manage-innovation-leads/find") String manageInnovationLead(@PathVariable(COMPETITION_ID_KEY) long competitionId,
Model model); @PreAuthorize("hasPermission(#competitionId,'org.innovateuk.ifs.competition.resource.CompetitionCompositeId', 'MANAGE_INNOVATION_LEAD')") @GetMapping("/{competitionId}/manage-innovation-leads/overview") String manageInnovationLeadOverview(@PathVariable(COMPETITION_ID_KEY) long competitionId,
Model model); @PreAuthorize("hasPermission(#competitionId, 'org.innovateuk.ifs.competition.resource.CompetitionCompositeId', 'MANAGE_INNOVATION_LEAD')") @PostMapping("/{competitionId}/add-innovation-lead/{innovationLeadUserId}") String addInnovationLead(@PathVariable(COMPETITION_ID_KEY) long competitionId,
@PathVariable("innovationLeadUserId") long innovationLeadUserId,
Model model); @PreAuthorize("hasPermission(#competitionId, 'org.innovateuk.ifs.competition.resource.CompetitionCompositeId', 'MANAGE_INNOVATION_LEAD')") @PostMapping("/{competitionId}/remove-innovation-lead/{innovationLeadUserId}") String removeInnovationLead(@PathVariable(COMPETITION_ID_KEY) long competitionId,
@PathVariable("innovationLeadUserId") long innovationLeadUserId,
Model model); } | @Test public void manageInnovationLeadOverview() throws Exception { CompetitionResource competitionResource = newCompetitionResource() .build(); when(competitionRestService.getCompetitionById(COMPETITION_ID)).thenReturn(restSuccess(competitionResource)); when(competitionSetupService.hasInitialDetailsBeenPreviouslySubmitted(COMPETITION_ID)).thenReturn(TRUE); mockMvc.perform(get(URL_PREFIX + "/" + COMPETITION_ID + "/manage-innovation-leads/overview")) .andExpect(status().isOk()) .andExpect(view().name("competition/manage-innovation-leads-overview")); verify(manageInnovationLeadsModelPopulator).populateModel(any()); } |
CompetitionSetupInnovationLeadController { @PreAuthorize("hasPermission(#competitionId, 'org.innovateuk.ifs.competition.resource.CompetitionCompositeId', 'MANAGE_INNOVATION_LEAD')") @PostMapping("/{competitionId}/add-innovation-lead/{innovationLeadUserId}") public String addInnovationLead(@PathVariable(COMPETITION_ID_KEY) long competitionId, @PathVariable("innovationLeadUserId") long innovationLeadUserId, Model model) { CompetitionResource competition = competitionRestService.getCompetitionById(competitionId).getSuccess(); if (!competitionSetupService.hasInitialDetailsBeenPreviouslySubmitted(competitionId)) { return "redirect:/competition/setup/" + competitionId; } return competitionSetupInnovationLeadService.addInnovationLead(competitionId, innovationLeadUserId).handleSuccessOrFailure( failure -> "redirect:/competition/manage-innovation-leads/find", success -> { model.addAttribute(MODEL, manageInnovationLeadsModelPopulator.populateModel(competition)); return "competition/manage-innovation-leads-find"; } ); } @PreAuthorize("hasPermission(#competitionId, 'org.innovateuk.ifs.competition.resource.CompetitionCompositeId', 'MANAGE_INNOVATION_LEAD')") @GetMapping("/{competitionId}/manage-innovation-leads/find") String manageInnovationLead(@PathVariable(COMPETITION_ID_KEY) long competitionId,
Model model); @PreAuthorize("hasPermission(#competitionId,'org.innovateuk.ifs.competition.resource.CompetitionCompositeId', 'MANAGE_INNOVATION_LEAD')") @GetMapping("/{competitionId}/manage-innovation-leads/overview") String manageInnovationLeadOverview(@PathVariable(COMPETITION_ID_KEY) long competitionId,
Model model); @PreAuthorize("hasPermission(#competitionId, 'org.innovateuk.ifs.competition.resource.CompetitionCompositeId', 'MANAGE_INNOVATION_LEAD')") @PostMapping("/{competitionId}/add-innovation-lead/{innovationLeadUserId}") String addInnovationLead(@PathVariable(COMPETITION_ID_KEY) long competitionId,
@PathVariable("innovationLeadUserId") long innovationLeadUserId,
Model model); @PreAuthorize("hasPermission(#competitionId, 'org.innovateuk.ifs.competition.resource.CompetitionCompositeId', 'MANAGE_INNOVATION_LEAD')") @PostMapping("/{competitionId}/remove-innovation-lead/{innovationLeadUserId}") String removeInnovationLead(@PathVariable(COMPETITION_ID_KEY) long competitionId,
@PathVariable("innovationLeadUserId") long innovationLeadUserId,
Model model); } | @Test public void addInnovationLeadWhenInitialDetailsNotComplete() throws Exception { Long innovationLeadUserId = 2L; CompetitionResource competitionResource = newCompetitionResource().build(); when(competitionRestService.getCompetitionById(COMPETITION_ID)).thenReturn(restSuccess(competitionResource)); when(competitionSetupService.hasInitialDetailsBeenPreviouslySubmitted(COMPETITION_ID)).thenReturn(FALSE); mockMvc.perform(post(URL_PREFIX + "/" + COMPETITION_ID + "/add-innovation-lead/" + innovationLeadUserId)) .andExpect(status().is3xxRedirection()) .andExpect(view().name("redirect:/competition/setup/" + COMPETITION_ID)); verify(competitionSetupInnovationLeadService, never()).addInnovationLead(COMPETITION_ID, innovationLeadUserId); verify(manageInnovationLeadsModelPopulator, never()).populateModel(any()); }
@Test public void addInnovationLead() throws Exception { Long innovationLeadUserId = 2L; CompetitionResource competitionResource = newCompetitionResource() .build(); when(competitionRestService.getCompetitionById(COMPETITION_ID)).thenReturn(restSuccess(competitionResource)); when(competitionSetupInnovationLeadService.addInnovationLead(COMPETITION_ID, innovationLeadUserId)).thenReturn(serviceSuccess()); when(competitionSetupService.hasInitialDetailsBeenPreviouslySubmitted(COMPETITION_ID)).thenReturn(TRUE); mockMvc.perform(post(URL_PREFIX + "/" + COMPETITION_ID + "/add-innovation-lead/" + innovationLeadUserId)) .andExpect(status().isOk()) .andExpect(view().name("competition/manage-innovation-leads-find")); verify(competitionSetupInnovationLeadService).addInnovationLead(COMPETITION_ID, innovationLeadUserId); verify(manageInnovationLeadsModelPopulator).populateModel(any()); } |
CompetitionSetupInnovationLeadController { @PreAuthorize("hasPermission(#competitionId, 'org.innovateuk.ifs.competition.resource.CompetitionCompositeId', 'MANAGE_INNOVATION_LEAD')") @PostMapping("/{competitionId}/remove-innovation-lead/{innovationLeadUserId}") public String removeInnovationLead(@PathVariable(COMPETITION_ID_KEY) long competitionId, @PathVariable("innovationLeadUserId") long innovationLeadUserId, Model model) { CompetitionResource competition = competitionRestService.getCompetitionById(competitionId).getSuccess(); if (!competitionSetupService.hasInitialDetailsBeenPreviouslySubmitted(competitionId)) { return "redirect:/competition/setup/" + competitionId; } return competitionSetupInnovationLeadService.removeInnovationLead(competitionId, innovationLeadUserId).handleSuccessOrFailure( failure -> "redirect:/competition/manage-innovation-leads/overview", success -> { model.addAttribute(MODEL, manageInnovationLeadsModelPopulator.populateModel(competition)); return "competition/manage-innovation-leads-overview"; } ); } @PreAuthorize("hasPermission(#competitionId, 'org.innovateuk.ifs.competition.resource.CompetitionCompositeId', 'MANAGE_INNOVATION_LEAD')") @GetMapping("/{competitionId}/manage-innovation-leads/find") String manageInnovationLead(@PathVariable(COMPETITION_ID_KEY) long competitionId,
Model model); @PreAuthorize("hasPermission(#competitionId,'org.innovateuk.ifs.competition.resource.CompetitionCompositeId', 'MANAGE_INNOVATION_LEAD')") @GetMapping("/{competitionId}/manage-innovation-leads/overview") String manageInnovationLeadOverview(@PathVariable(COMPETITION_ID_KEY) long competitionId,
Model model); @PreAuthorize("hasPermission(#competitionId, 'org.innovateuk.ifs.competition.resource.CompetitionCompositeId', 'MANAGE_INNOVATION_LEAD')") @PostMapping("/{competitionId}/add-innovation-lead/{innovationLeadUserId}") String addInnovationLead(@PathVariable(COMPETITION_ID_KEY) long competitionId,
@PathVariable("innovationLeadUserId") long innovationLeadUserId,
Model model); @PreAuthorize("hasPermission(#competitionId, 'org.innovateuk.ifs.competition.resource.CompetitionCompositeId', 'MANAGE_INNOVATION_LEAD')") @PostMapping("/{competitionId}/remove-innovation-lead/{innovationLeadUserId}") String removeInnovationLead(@PathVariable(COMPETITION_ID_KEY) long competitionId,
@PathVariable("innovationLeadUserId") long innovationLeadUserId,
Model model); } | @Test public void removeInnovationLeadWhenInitialDetailsNotComplete() throws Exception { CompetitionResource competitionResource = newCompetitionResource().build(); when(competitionSetupService.hasInitialDetailsBeenPreviouslySubmitted(COMPETITION_ID)).thenReturn(FALSE); when(competitionRestService.getCompetitionById(COMPETITION_ID)).thenReturn(restSuccess(competitionResource)); Long innovationLeadUserId = 2L; mockMvc.perform(post(URL_PREFIX + "/" + COMPETITION_ID + "/remove-innovation-lead/" + innovationLeadUserId)) .andExpect(status().is3xxRedirection()) .andExpect(view().name("redirect:/competition/setup/" + COMPETITION_ID)); verify(competitionSetupInnovationLeadService, never()).removeInnovationLead(COMPETITION_ID, innovationLeadUserId); verify(manageInnovationLeadsModelPopulator, never()).populateModel(any()); }
@Test public void removeInnovationLead() throws Exception { Long innovationLeadUserId = 2L; CompetitionResource competitionResource = newCompetitionResource() .build(); when(competitionRestService.getCompetitionById(COMPETITION_ID)).thenReturn(restSuccess(competitionResource)); when(competitionSetupInnovationLeadService.removeInnovationLead(COMPETITION_ID, innovationLeadUserId)).thenReturn(serviceSuccess()); when(competitionSetupService.hasInitialDetailsBeenPreviouslySubmitted(COMPETITION_ID)).thenReturn(TRUE); mockMvc.perform(post(URL_PREFIX + "/" + COMPETITION_ID + "/remove-innovation-lead/" + innovationLeadUserId)) .andExpect(status().isOk()) .andExpect(view().name("competition/manage-innovation-leads-overview")); verify(competitionSetupInnovationLeadService).removeInnovationLead(COMPETITION_ID, innovationLeadUserId); verify(manageInnovationLeadsModelPopulator).populateModel(any()); } |
CompetitionSetupOrganisationalEligibilityController { @GetMapping public String organisationalEligibilityPageDetails(Model model, @PathVariable long competitionId, UserResource loggedInUser) { CompetitionResource competition = competitionRestService.getCompetitionById(competitionId).getSuccess(); if (!competitionSetupService.hasInitialDetailsBeenPreviouslySubmitted(competitionId)) { return "redirect:/competition/setup/" + competition.getId(); } model.addAttribute(MODEL, competitionSetupService.populateCompetitionSectionModelAttributes(competition, loggedInUser, ORGANISATIONAL_ELIGIBILITY)); model.addAttribute(COMPETITION_SETUP_FORM_KEY, competitionSetupService.getSectionFormData(competition, ORGANISATIONAL_ELIGIBILITY)); return "competition/setup"; } @GetMapping String organisationalEligibilityPageDetails(Model model,
@PathVariable long competitionId,
UserResource loggedInUser); @PostMapping String submitOrganisationalEligibilitySectionDetails(@Valid @ModelAttribute("competitionSetupForm") OrganisationalEligibilityForm organisationalEligibilityForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable("competitionId") long competitionId,
UserResource loggedInUser,
Model model); @GetMapping("/lead-international-organisation") String viewLeadInternationalOrganisationDetails(@PathVariable("competitionId") long competitionId,
@ModelAttribute LeadInternationalOrganisationForm leadInternationalOrganisationForm,
Model model); @PostMapping("/lead-international-organisation") String submitLeadInternationalOrganisationDetails(@PathVariable("competitionId") long competitionId,
@Valid @ModelAttribute LeadInternationalOrganisationForm leadInternationalOrganisationForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
Model model); static final String ORGANISATIONAL_ELIGIBILITY_LANDING_REDIRECT; } | @Test public void organisationalEligibilityPageDetails() throws Exception { when(competitionSetupService.hasInitialDetailsBeenPreviouslySubmitted(competitionId)).thenReturn(true); mockMvc.perform(get(URL, competitionId)) .andExpect(status().isOk()) .andExpect(view().name("competition/setup")); } |
CompetitionSetupOrganisationalEligibilityController { @GetMapping("/lead-international-organisation") public String viewLeadInternationalOrganisationDetails(@PathVariable("competitionId") long competitionId, @ModelAttribute LeadInternationalOrganisationForm leadInternationalOrganisationForm, Model model) { RestResult<CompetitionOrganisationConfigResource> configResource = competitionOrganisationConfigRestService.findByCompetitionId(competitionId); model.addAttribute("model", leadInternationalOrganisationViewModelPopulator.populateModel(competitionId, configResource.getSuccess())); model.addAttribute("leadInternationalOrganisationForm", leadInternationalOrganisationFormPopulator.populateForm(configResource.getSuccess())); return "competition/setup/lead-international-organisation"; } @GetMapping String organisationalEligibilityPageDetails(Model model,
@PathVariable long competitionId,
UserResource loggedInUser); @PostMapping String submitOrganisationalEligibilitySectionDetails(@Valid @ModelAttribute("competitionSetupForm") OrganisationalEligibilityForm organisationalEligibilityForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable("competitionId") long competitionId,
UserResource loggedInUser,
Model model); @GetMapping("/lead-international-organisation") String viewLeadInternationalOrganisationDetails(@PathVariable("competitionId") long competitionId,
@ModelAttribute LeadInternationalOrganisationForm leadInternationalOrganisationForm,
Model model); @PostMapping("/lead-international-organisation") String submitLeadInternationalOrganisationDetails(@PathVariable("competitionId") long competitionId,
@Valid @ModelAttribute LeadInternationalOrganisationForm leadInternationalOrganisationForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
Model model); static final String ORGANISATIONAL_ELIGIBILITY_LANDING_REDIRECT; } | @Test public void viewLeadInternationalOrganisationDetails() throws Exception { CompetitionOrganisationConfigResource configResource = newCompetitionOrganisationConfigResource() .withInternationalOrganisationsAllowed(true) .build(); when(competitionOrganisationConfigRestService.findByCompetitionId(competitionId)).thenReturn(restSuccess(configResource)); mockMvc.perform(get(URL + "/lead-international-organisation", competitionId)) .andExpect(status().isOk()) .andExpect(view().name("competition/setup/lead-international-organisation")); } |
CompetitionSetupOrganisationalEligibilityController { @PostMapping("/lead-international-organisation") public String submitLeadInternationalOrganisationDetails(@PathVariable("competitionId") long competitionId, @Valid @ModelAttribute LeadInternationalOrganisationForm leadInternationalOrganisationForm, BindingResult bindingResult, ValidationHandler validationHandler, Model model) { CompetitionResource competition = competitionRestService.getCompetitionById(competitionId).getSuccess(); CompetitionOrganisationConfigResource configResource = competitionOrganisationConfigRestService.findByCompetitionId(competitionId).getSuccess(); Supplier<String> failureView = () -> { model.addAttribute("model", leadInternationalOrganisationViewModelPopulator.populateModel(competition.getId(), configResource)); return "competition/setup/lead-international-organisation"; }; Supplier<String> successView = () -> { return validationHandler.addAnyErrors(saveOrganisationConfig(competition, leadInternationalOrganisationForm), fieldErrorsToFieldErrors(), asGlobalErrors()) .failNowOrSucceedWith(failureView, () -> format("redirect:/competition/setup/%d/section/%s", competition.getId(), ORGANISATIONAL_ELIGIBILITY.getPostMarkCompletePath())); }; return validationHandler.failNowOrSucceedWith(failureView, successView); } @GetMapping String organisationalEligibilityPageDetails(Model model,
@PathVariable long competitionId,
UserResource loggedInUser); @PostMapping String submitOrganisationalEligibilitySectionDetails(@Valid @ModelAttribute("competitionSetupForm") OrganisationalEligibilityForm organisationalEligibilityForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable("competitionId") long competitionId,
UserResource loggedInUser,
Model model); @GetMapping("/lead-international-organisation") String viewLeadInternationalOrganisationDetails(@PathVariable("competitionId") long competitionId,
@ModelAttribute LeadInternationalOrganisationForm leadInternationalOrganisationForm,
Model model); @PostMapping("/lead-international-organisation") String submitLeadInternationalOrganisationDetails(@PathVariable("competitionId") long competitionId,
@Valid @ModelAttribute LeadInternationalOrganisationForm leadInternationalOrganisationForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
Model model); static final String ORGANISATIONAL_ELIGIBILITY_LANDING_REDIRECT; } | @Test public void submitLeadInternationalOrganisationDetails() throws Exception { LeadInternationalOrganisationForm leadInternationalOrganisationForm = new LeadInternationalOrganisationForm(); leadInternationalOrganisationForm.setLeadInternationalOrganisationsApplicable(true); OrganisationalEligibilityForm organisationalEligibilityForm = new OrganisationalEligibilityForm(); organisationalEligibilityForm.setInternationalOrganisationsApplicable(true); organisationalEligibilityForm.setLeadInternationalOrganisationsApplicable(true); CompetitionOrganisationConfigResource configResource = newCompetitionOrganisationConfigResource() .withInternationalOrganisationsAllowed(organisationalEligibilityForm.getInternationalOrganisationsApplicable()) .withInternationalLeadOrganisationAllowed(organisationalEligibilityForm.getLeadInternationalOrganisationsApplicable()) .build(); when(competitionOrganisationConfigRestService.findByCompetitionId(competitionId)).thenReturn(restSuccess(configResource)); when(competitionSetupService.saveCompetitionSetupSection(isA(CompetitionSetupForm.class), eq(competition), eq(ORGANISATIONAL_ELIGIBILITY))).thenReturn(serviceSuccess()); mockMvc.perform(post(URL + "/lead-international-organisation", competitionId) .param("leadInternationalOrganisationsApplicable", "true")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(format("/competition/setup/%d/section/%s", competition.getId(), ORGANISATIONAL_ELIGIBILITY.getPostMarkCompletePath()))); } |
RestIdentityProviderService implements IdentityProviderService, ApplicationEventPublisherAware { @Override public ServiceResult<String> createUserRecordWithUid(String emailAddress, String password) { return handlingErrors(() -> { CreateUserResource createUserRequest = new CreateUserResource(emailAddress, password); Either<ResponseEntity<IdentityProviderError[]>, CreateUserResponse> response = restPost(idpBaseURL + idpUserPath, createUserRequest, CreateUserResponse.class, IdentityProviderError[].class, CREATED); return response.mapLeftOrRight( failure -> serviceFailure(errors(failure.getStatusCode(), failure.getBody())), success -> { applicationEventPublisher.publishEvent(new UserCreationEvent(this, success.getUuid(), emailAddress)); return serviceSuccess(success.getUuid()); } ); }); } @Override ServiceResult<String> createUserRecordWithUid(String emailAddress, String password); @Override ServiceResult<String> updateUserPassword(String uid, String password); @Override ServiceResult<String> updateUserEmail(String uid, String email); @Override ServiceResult<String> activateUser(String uid); @Override ServiceResult<String> deactivateUser(String uid); @Override @NotSecured(value = "Does not need securing", mustBeSecuredByOtherServices = false) void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher); } | @Test public void createUserRecordWithUid() throws JsonProcessingException { CreateUserResource createRequest = new CreateUserResource("[email protected]", "thepassword"); CreateUserResponse successResponse = new CreateUserResponse("new-uid", "[email protected]", null, null); ResponseEntity<String> successResponseEntity = new ResponseEntity<>(asJson(successResponse), CREATED); when(mockRestTemplate.postForEntity("http: ServiceResult<String> result = service.createUserRecordWithUid("[email protected]", "thepassword"); verify(applicationEventPublisher).publishEvent(any(UserCreationEvent.class)); assertTrue(result.isSuccess()); assertEquals("new-uid", result.getSuccess()); }
@Test public void createUserRecordWithUidButDuplicateEmailFailureResponseReturned() throws JsonProcessingException { CreateUserResource createRequest = new CreateUserResource("[email protected]", "thepassword"); IdentityProviderError[] errorResponse = new IdentityProviderError[]{new IdentityProviderError(DUPLICATE_EMAIL_ADDRESS.name(), emptyList())}; ResponseEntity<String> errorResponseEntity = new ResponseEntity<>(asJson(errorResponse), CONFLICT); when(mockRestTemplate.postForEntity("http: ServiceResult<String> result = service.createUserRecordWithUid("[email protected]", "thepassword"); assertTrue(result.isFailure()); assertTrue(result.getFailure().is(new Error(DUPLICATE_EMAIL_ADDRESS, CONFLICT))); }
@Test public void createUserRecordWithUidButOtherFailureResponseReturned() throws JsonProcessingException { CreateUserResource createRequest = new CreateUserResource("[email protected]", "thepassword"); IdentityProviderError[] errorResponse = new IdentityProviderError[]{new IdentityProviderError(UNABLE_TO_CREATE_USER.name(), emptyList())}; ResponseEntity<String> errorResponseEntity = new ResponseEntity<>(asJson(errorResponse), CONFLICT); when(mockRestTemplate.postForEntity("http: ServiceResult<String> result = service.createUserRecordWithUid("[email protected]", "thepassword"); assertTrue(result.isFailure()); assertTrue(result.getFailure().is(new Error(UNABLE_TO_CREATE_USER, CONFLICT))); }
@Test public void weakPasswordError() throws JsonProcessingException { CreateUserResource createRequest = new CreateUserResource("[email protected]", "Password123"); IdentityProviderError[] errorResponse = new IdentityProviderError[]{new IdentityProviderError(RestIdentityProviderService.INVALID_PASSWORD_KEY, Arrays.asList(new String[]{"blacklisted"}))}; ResponseEntity<String> errorResponseEntity = new ResponseEntity<>(asJson(errorResponse), BAD_REQUEST); when(mockRestTemplate.postForEntity("http: ServiceResult<String> result = service.createUserRecordWithUid("[email protected]", "Password123"); assertTrue(result.isFailure()); assertEquals(result.getFailure().getErrors().size(), 1); Error expectedError = result.getFailure().getErrors().get(0); assertEquals(expectedError.getFieldName(), "password"); } |
OrganisationalEligibilityViewModelPopulator implements CompetitionSetupSectionModelPopulator { @Override public CompetitionSetupViewModel populateModel(GeneralSetupViewModel generalViewModel, CompetitionResource competitionResource) { return new OrganisationalEligibilityViewModel(generalViewModel); } @Override CompetitionSetupSection sectionToPopulateModel(); @Override CompetitionSetupViewModel populateModel(GeneralSetupViewModel generalViewModel, CompetitionResource competitionResource); } | @Test public void populateModel() { CompetitionResource competition = newCompetitionResource().build(); GeneralSetupViewModel generalSetupViewModel = new GeneralSetupViewModel(true, competition, ORGANISATIONAL_ELIGIBILITY, CompetitionSetupSection.values(), true, false); OrganisationalEligibilityViewModel viewModel = new OrganisationalEligibilityViewModel(generalSetupViewModel); assertEquals(ORGANISATIONAL_ELIGIBILITY, viewModel.getGeneral().getCurrentSection()); assertTrue(viewModel.getGeneral().isInitialComplete()); } |
OrganisationalEligibilityFormPopulator implements CompetitionSetupFormPopulator { @Override public CompetitionSetupSection sectionToFill() { return CompetitionSetupSection.ORGANISATIONAL_ELIGIBILITY; } @Override CompetitionSetupSection sectionToFill(); @Override CompetitionSetupForm populateForm(CompetitionResource competitionResource); } | @Test public void sectionToFill() { assertEquals(service.sectionToFill(), ORGANISATIONAL_ELIGIBILITY); } |
OrganisationalEligibilityFormPopulator implements CompetitionSetupFormPopulator { @Override public CompetitionSetupForm populateForm(CompetitionResource competitionResource) { CompetitionOrganisationConfigResource competitionOrganisationConfigResource = competitionOrganisationConfigRestService.findByCompetitionId(competitionResource.getId()).getSuccess(); OrganisationalEligibilityForm organisationalEligibilityForm = new OrganisationalEligibilityForm(); organisationalEligibilityForm.setInternationalOrganisationsApplicable(competitionOrganisationConfigResource.getInternationalOrganisationsAllowed()); organisationalEligibilityForm.setLeadInternationalOrganisationsApplicable(competitionOrganisationConfigResource.getInternationalLeadOrganisationAllowed()); return organisationalEligibilityForm; } @Override CompetitionSetupSection sectionToFill(); @Override CompetitionSetupForm populateForm(CompetitionResource competitionResource); } | @Test public void populateForm() { long competitionId=100L; CompetitionResource competitionResource = newCompetitionResource().withId(competitionId).build(); CompetitionOrganisationConfigResource configResource = newCompetitionOrganisationConfigResource() .withInternationalOrganisationsAllowed(true) .withInternationalLeadOrganisationAllowed(true) .build(); when(competitionOrganisationConfigRestService.findByCompetitionId(competitionResource.getId())).thenReturn(restSuccess(configResource)); OrganisationalEligibilityForm result = (OrganisationalEligibilityForm) service.populateForm(competitionResource); assertTrue(result.getInternationalOrganisationsApplicable()); } |
LeadInternationalOrganisationViewModelPopulator { public LeadInternationalOrganisationViewModel populateModel(long competitionId, CompetitionOrganisationConfigResource competitionOrganisationConfigResource) { CompetitionResource competition = competitionRestService.getCompetitionById(competitionId).getSuccess(); return new LeadInternationalOrganisationViewModel(competition, competitionOrganisationConfigResource.getInternationalLeadOrganisationAllowed()); } LeadInternationalOrganisationViewModel populateModel(long competitionId, CompetitionOrganisationConfigResource competitionOrganisationConfigResource); } | @Test public void populateModel() { long competitionId = 100L; CompetitionResource competition = newCompetitionResource().withId(competitionId).build(); CompetitionOrganisationConfigResource configResource = newCompetitionOrganisationConfigResource().withInternationalLeadOrganisationAllowed(true).build(); when(competitionRestService.getCompetitionById(competitionId)).thenReturn(restSuccess(competition)); LeadInternationalOrganisationViewModel result = populator.populateModel(competitionId, configResource); assertTrue(result.isLeadInternationalOrganisationsApplicable()); } |
LeadInternationalOrganisationFormPopulator { public LeadInternationalOrganisationForm populateForm(CompetitionOrganisationConfigResource configResource) { LeadInternationalOrganisationForm leadInternationalOrganisationForm = new LeadInternationalOrganisationForm(); leadInternationalOrganisationForm.setLeadInternationalOrganisationsApplicable(configResource.getInternationalLeadOrganisationAllowed()); return leadInternationalOrganisationForm; } LeadInternationalOrganisationForm populateForm(CompetitionOrganisationConfigResource configResource); } | @Test public void populateForm() { long competitionId=100L; CompetitionResource competitionResource = newCompetitionResource().withId(competitionId).build(); CompetitionOrganisationConfigResource configResource = newCompetitionOrganisationConfigResource().withInternationalLeadOrganisationAllowed(true).build(); LeadInternationalOrganisationForm leadInternationalOrganisationForm = new LeadInternationalOrganisationForm(); leadInternationalOrganisationForm.setLeadInternationalOrganisationsApplicable(configResource.getInternationalLeadOrganisationAllowed()); when(competitionOrganisationConfigRestService.findByCompetitionId(competitionResource.getId())).thenReturn(restSuccess(configResource)); LeadInternationalOrganisationForm result = service.populateForm(configResource); assertTrue(result.getLeadInternationalOrganisationsApplicable()); } |
OrganisationalEligibilitySectionUpdater extends AbstractSectionUpdater implements CompetitionSetupSectionUpdater { @Override protected ServiceResult<Void> doSaveSection(CompetitionResource competition, CompetitionSetupForm competitionSetupForm) { OrganisationalEligibilityForm organisationalEligibilityForm = (OrganisationalEligibilityForm) competitionSetupForm; CompetitionOrganisationConfigResource competitionOrganisationConfigResource = competitionOrganisationConfigRestService.findByCompetitionId(competition.getId()).getSuccess(); competitionOrganisationConfigResource.setInternationalOrganisationsAllowed(organisationalEligibilityForm.getInternationalOrganisationsApplicable()); return competitionOrganisationConfigRestService.update(competition.getId(), competitionOrganisationConfigResource).toServiceResult().andOnSuccessReturnVoid(); } @Override CompetitionSetupSection sectionToSave(); @Override boolean supportsForm(Class<? extends CompetitionSetupForm> clazz); } | @Test public void doSaveSection() { long competitionId = 100L; CompetitionResource competition = newCompetitionResource().withId(competitionId).build(); OrganisationalEligibilityForm form = new OrganisationalEligibilityForm(); form.setInternationalOrganisationsApplicable(true); CompetitionOrganisationConfigResource configResource = newCompetitionOrganisationConfigResource() .withInternationalOrganisationsAllowed(form.getInternationalOrganisationsApplicable()) .build(); when(competitionOrganisationConfigRestService.findByCompetitionId(competitionId)).thenReturn(restSuccess(configResource)); when(competitionOrganisationConfigRestService.update(competitionId,configResource)).thenReturn(restSuccess(configResource)); ServiceResult<Void> updateResult = updater.doSaveSection(competition, form); assertTrue(updateResult.isSuccess()); verify(competitionOrganisationConfigRestService).findByCompetitionId(competitionId); verify(competitionOrganisationConfigRestService).update(competitionId,configResource); } |
OrganisationalEligibilitySectionUpdater extends AbstractSectionUpdater implements CompetitionSetupSectionUpdater { @Override public boolean supportsForm(Class<? extends CompetitionSetupForm> clazz) { return OrganisationalEligibilityForm.class.equals(clazz); } @Override CompetitionSetupSection sectionToSave(); @Override boolean supportsForm(Class<? extends CompetitionSetupForm> clazz); } | @Test public void supportsForm() { assertTrue(updater.supportsForm(OrganisationalEligibilityForm.class)); assertFalse(updater.supportsForm(CompetitionSetupForm.class)); } |
CompetitionSetupController { @GetMapping("/{competitionId}") public String initCompetitionSetupSection(Model model, @PathVariable(COMPETITION_ID_KEY) Long competitionId, @ModelAttribute(COMPETITION_SETUP_FORM_KEY) CompetitionSetupSummaryForm competitionSetupSummaryForm, @SuppressWarnings("UnusedParameters") BindingResult bindingResult, UserResource loggedInUser) { CompetitionResource competition = competitionRestService.getCompetitionById(competitionId).getSuccess(); if (competition.isNonIfs()) { return "redirect:/non-ifs-competition/setup/" + competitionId; } CompetitionSetupSection section = CompetitionSetupSection.fromPath("home"); boolean canAssignFinanceUsers = competition.getCovidType() != null; model.addAttribute("canAssignFinanceUsers", canAssignFinanceUsers); model.addAttribute(MODEL, competitionSetupService.populateCompetitionSectionModelAttributes(competition, loggedInUser, section)); model.addAttribute(SETUP_READY_KEY, competitionSetupService.isCompetitionReadyToOpen(competition)); model.addAttribute(READY_TO_OPEN_KEY, competition.getCompetitionStatus().equals(CompetitionStatus.READY_TO_OPEN)); return "competition/setup"; } @GetMapping("/{competitionId}") String initCompetitionSetupSection(Model model,
@PathVariable(COMPETITION_ID_KEY) Long competitionId,
@ModelAttribute(COMPETITION_SETUP_FORM_KEY) CompetitionSetupSummaryForm competitionSetupSummaryForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
UserResource loggedInUser); @PostMapping("/{competitionId}/section/{sectionPath}/edit") String setSectionAsIncomplete(@PathVariable(COMPETITION_ID_KEY) long competitionId,
@PathVariable(SECTION_PATH_KEY) String sectionPath); @GetMapping("/{competitionId}/section/{sectionPath}") String editCompetitionSetupSection(@PathVariable(COMPETITION_ID_KEY) long competitionId,
@PathVariable(SECTION_PATH_KEY) String sectionPath,
Model model,
UserResource loggedInUser); @PostMapping(value = "/{competitionId}/section/initial", params = "unrestricted") String submitUnrestrictedInitialSectionDetails(
@Validated({Unrestricted.class, Default.class}) @Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) InitialDetailsForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/initial") String submitInitialSectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) InitialDetailsForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/additional") String submitAdditionalSectionDetails(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) AdditionalInfoForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model, HttpServletRequest request); @PostMapping("/{competitionId}/section/project-eligibility") String submitEligibilitySectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) ProjectEligibilityForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/completion-stage") String submitCompletionStageSectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) CompletionStageForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/milestones") String submitMilestonesSectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) MilestonesForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/application") String submitApplicationFormSectionDetails(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) LandingPageForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/assessors") String submitAssessorsSectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) AssessorsForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/terms-and-conditions") String submitTermsAndConditionsSectionDetails(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) TermsAndConditionsForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/ready-to-open") String setAsReadyToOpen(Model model,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) CompetitionSetupSummaryForm competitionSetupSummaryForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
UserResource loggedInUser); @PostMapping("/{competitionIdToDelete}/delete") String delete(Model model,
@PathVariable("competitionIdToDelete") long competitionId,
@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) CompetitionSetupSummaryForm competitionSetupSummaryForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
UserResource loggedInUser); @PostMapping(path="/{competitionId}/section/terms-and-conditions", params = "uploadTermsAndConditionsDoc") String uploadTermsAndConditions(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) TermsAndConditionsForm termsAndConditionsForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping(path="/{competitionId}/section/terms-and-conditions", params = "deleteTermsAndConditionsDoc") String deleteTermsAndConditions(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) TermsAndConditionsForm termsAndConditionsForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
Model model); @GetMapping("/{competitionId}/generateCompetitionCode") @ResponseBody JsonNode generateCompetitionCode(@PathVariable(COMPETITION_ID_KEY) long competitionId); static final String COMPETITION_ID_KEY; static final String COMPETITION_SETUP_FORM_KEY; static final String SETUP_READY_KEY; static final String READY_TO_OPEN_KEY; } | @Test public void initCompetitionSetupSection() throws Exception { CompetitionResource competition = newCompetitionResource().withCompetitionStatus(CompetitionStatus.COMPETITION_SETUP).build(); when(competitionSetupService.isCompetitionReadyToOpen(competition)).thenReturn(FALSE); when(competitionRestService.getCompetitionById(COMPETITION_ID)).thenReturn(restSuccess(competition)); mockMvc.perform(get(URL_PREFIX + "/" + COMPETITION_ID)) .andExpect(status().is2xxSuccessful()) .andExpect(view().name("competition/setup")) .andExpect(model().attribute(SETUP_READY_KEY, FALSE)) .andExpect(model().attribute(READY_TO_OPEN_KEY, FALSE)); } |
CompetitionSetupController { @PostMapping("/{competitionId}/section/{sectionPath}/edit") public String setSectionAsIncomplete(@PathVariable(COMPETITION_ID_KEY) long competitionId, @PathVariable(SECTION_PATH_KEY) String sectionPath) { CompetitionSetupSection section = CompetitionSetupSection.fromPath(sectionPath); if (section == null) { LOG.error("Invalid section path specified: " + sectionPath); return DASHBOARD_REDIRECT; } CompetitionResource competition = competitionRestService.getCompetitionById(competitionId).getSuccess(); if (section.preventEdit(competition)) { return DASHBOARD_REDIRECT; } if (!competitionSetupService.hasInitialDetailsBeenPreviouslySubmitted(competitionId) && section != CompetitionSetupSection.INITIAL_DETAILS) { return "redirect:/competition/setup/" + competition.getId(); } return competitionSetupRestService.markSectionIncomplete(competitionId, section).handleSuccessOrFailure( failure -> "redirect:/competition/setup/" + competition.getId(), success -> { if (!competition.isSetupAndLive()) { competitionSetupService.setCompetitionAsCompetitionSetup(competitionId); } return "redirect:/competition/setup/" + competitionId + "/section/" + section.getPostMarkIncompletePath(); } ); } @GetMapping("/{competitionId}") String initCompetitionSetupSection(Model model,
@PathVariable(COMPETITION_ID_KEY) Long competitionId,
@ModelAttribute(COMPETITION_SETUP_FORM_KEY) CompetitionSetupSummaryForm competitionSetupSummaryForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
UserResource loggedInUser); @PostMapping("/{competitionId}/section/{sectionPath}/edit") String setSectionAsIncomplete(@PathVariable(COMPETITION_ID_KEY) long competitionId,
@PathVariable(SECTION_PATH_KEY) String sectionPath); @GetMapping("/{competitionId}/section/{sectionPath}") String editCompetitionSetupSection(@PathVariable(COMPETITION_ID_KEY) long competitionId,
@PathVariable(SECTION_PATH_KEY) String sectionPath,
Model model,
UserResource loggedInUser); @PostMapping(value = "/{competitionId}/section/initial", params = "unrestricted") String submitUnrestrictedInitialSectionDetails(
@Validated({Unrestricted.class, Default.class}) @Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) InitialDetailsForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/initial") String submitInitialSectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) InitialDetailsForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/additional") String submitAdditionalSectionDetails(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) AdditionalInfoForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model, HttpServletRequest request); @PostMapping("/{competitionId}/section/project-eligibility") String submitEligibilitySectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) ProjectEligibilityForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/completion-stage") String submitCompletionStageSectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) CompletionStageForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/milestones") String submitMilestonesSectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) MilestonesForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/application") String submitApplicationFormSectionDetails(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) LandingPageForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/assessors") String submitAssessorsSectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) AssessorsForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/terms-and-conditions") String submitTermsAndConditionsSectionDetails(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) TermsAndConditionsForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/ready-to-open") String setAsReadyToOpen(Model model,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) CompetitionSetupSummaryForm competitionSetupSummaryForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
UserResource loggedInUser); @PostMapping("/{competitionIdToDelete}/delete") String delete(Model model,
@PathVariable("competitionIdToDelete") long competitionId,
@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) CompetitionSetupSummaryForm competitionSetupSummaryForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
UserResource loggedInUser); @PostMapping(path="/{competitionId}/section/terms-and-conditions", params = "uploadTermsAndConditionsDoc") String uploadTermsAndConditions(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) TermsAndConditionsForm termsAndConditionsForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping(path="/{competitionId}/section/terms-and-conditions", params = "deleteTermsAndConditionsDoc") String deleteTermsAndConditions(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) TermsAndConditionsForm termsAndConditionsForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
Model model); @GetMapping("/{competitionId}/generateCompetitionCode") @ResponseBody JsonNode generateCompetitionCode(@PathVariable(COMPETITION_ID_KEY) long competitionId); static final String COMPETITION_ID_KEY; static final String COMPETITION_SETUP_FORM_KEY; static final String SETUP_READY_KEY; static final String READY_TO_OPEN_KEY; } | @Test public void setSectionAsIncomplete() throws Exception { CompetitionResource competition = newCompetitionResource().withCompetitionStatus(CompetitionStatus.COMPETITION_SETUP).withName( "Test competition").withCompetitionCode("Code").withCompetitionType(2L).build(); when(competitionRestService.getCompetitionById(COMPETITION_ID)).thenReturn(restSuccess(competition)); when(competitionSetupRestService.markSectionIncomplete(anyLong(), any(CompetitionSetupSection.class))).thenReturn(restSuccess()); mockMvc.perform(post(URL_PREFIX + "/" + COMPETITION_ID + "/section/initial/edit")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(URL_PREFIX + "/" + COMPETITION_ID + "/section/initial")); } |
CompetitionSetupController { @GetMapping("/{competitionId}/generateCompetitionCode") @ResponseBody public JsonNode generateCompetitionCode(@PathVariable(COMPETITION_ID_KEY) long competitionId) { CompetitionResource competition = competitionRestService.getCompetitionById(competitionId).getSuccess(); if (competition.getStartDate() != null) { return this.createJsonObjectNode(true, competitionSetupRestService.generateCompetitionCode(competitionId, competition.getStartDate()) .getSuccess()); } else { return this.createJsonObjectNode(false, "Please set a start date for your competition before generating the competition code, you can do this in the Initial Details section"); } } @GetMapping("/{competitionId}") String initCompetitionSetupSection(Model model,
@PathVariable(COMPETITION_ID_KEY) Long competitionId,
@ModelAttribute(COMPETITION_SETUP_FORM_KEY) CompetitionSetupSummaryForm competitionSetupSummaryForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
UserResource loggedInUser); @PostMapping("/{competitionId}/section/{sectionPath}/edit") String setSectionAsIncomplete(@PathVariable(COMPETITION_ID_KEY) long competitionId,
@PathVariable(SECTION_PATH_KEY) String sectionPath); @GetMapping("/{competitionId}/section/{sectionPath}") String editCompetitionSetupSection(@PathVariable(COMPETITION_ID_KEY) long competitionId,
@PathVariable(SECTION_PATH_KEY) String sectionPath,
Model model,
UserResource loggedInUser); @PostMapping(value = "/{competitionId}/section/initial", params = "unrestricted") String submitUnrestrictedInitialSectionDetails(
@Validated({Unrestricted.class, Default.class}) @Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) InitialDetailsForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/initial") String submitInitialSectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) InitialDetailsForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/additional") String submitAdditionalSectionDetails(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) AdditionalInfoForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model, HttpServletRequest request); @PostMapping("/{competitionId}/section/project-eligibility") String submitEligibilitySectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) ProjectEligibilityForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/completion-stage") String submitCompletionStageSectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) CompletionStageForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/milestones") String submitMilestonesSectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) MilestonesForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/application") String submitApplicationFormSectionDetails(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) LandingPageForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/assessors") String submitAssessorsSectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) AssessorsForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/terms-and-conditions") String submitTermsAndConditionsSectionDetails(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) TermsAndConditionsForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/ready-to-open") String setAsReadyToOpen(Model model,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) CompetitionSetupSummaryForm competitionSetupSummaryForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
UserResource loggedInUser); @PostMapping("/{competitionIdToDelete}/delete") String delete(Model model,
@PathVariable("competitionIdToDelete") long competitionId,
@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) CompetitionSetupSummaryForm competitionSetupSummaryForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
UserResource loggedInUser); @PostMapping(path="/{competitionId}/section/terms-and-conditions", params = "uploadTermsAndConditionsDoc") String uploadTermsAndConditions(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) TermsAndConditionsForm termsAndConditionsForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping(path="/{competitionId}/section/terms-and-conditions", params = "deleteTermsAndConditionsDoc") String deleteTermsAndConditions(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) TermsAndConditionsForm termsAndConditionsForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
Model model); @GetMapping("/{competitionId}/generateCompetitionCode") @ResponseBody JsonNode generateCompetitionCode(@PathVariable(COMPETITION_ID_KEY) long competitionId); static final String COMPETITION_ID_KEY; static final String COMPETITION_SETUP_FORM_KEY; static final String SETUP_READY_KEY; static final String READY_TO_OPEN_KEY; } | @Test public void generateCompetitionCode() throws Exception { ZonedDateTime time = ZonedDateTime.of(2016, 12, 1, 0, 0, 0, 0, ZoneId.systemDefault()); CompetitionResource competition = newCompetitionResource() .withCompetitionStatus(CompetitionStatus.COMPETITION_SETUP) .withName("Test competition") .withCompetitionCode("Code") .withCompetitionType(2L) .withStartDate(time) .build(); when(competitionRestService.getCompetitionById(COMPETITION_ID)).thenReturn(restSuccess(competition)); when(competitionSetupRestService.generateCompetitionCode(COMPETITION_ID, time)) .thenReturn(restSuccess("1612-1")); mockMvc.perform(get(URL_PREFIX + "/" + COMPETITION_ID + "/generateCompetitionCode?day=01&month=12&year=2016")) .andExpect(status().isOk()) .andExpect(jsonPath("message", is("1612-1"))); } |
CompetitionSetupController { @PostMapping("/{competitionId}/section/completion-stage") public String submitCompletionStageSectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) CompletionStageForm competitionSetupForm, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable(COMPETITION_ID_KEY) long competitionId, UserResource loggedInUser, Model model) { CompetitionResource competition = competitionRestService.getCompetitionById(competitionId).getSuccess(); return genericCompetitionSetupSection(competitionSetupForm, validationHandler, competition, CompetitionSetupSection.COMPLETION_STAGE, loggedInUser, model); } @GetMapping("/{competitionId}") String initCompetitionSetupSection(Model model,
@PathVariable(COMPETITION_ID_KEY) Long competitionId,
@ModelAttribute(COMPETITION_SETUP_FORM_KEY) CompetitionSetupSummaryForm competitionSetupSummaryForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
UserResource loggedInUser); @PostMapping("/{competitionId}/section/{sectionPath}/edit") String setSectionAsIncomplete(@PathVariable(COMPETITION_ID_KEY) long competitionId,
@PathVariable(SECTION_PATH_KEY) String sectionPath); @GetMapping("/{competitionId}/section/{sectionPath}") String editCompetitionSetupSection(@PathVariable(COMPETITION_ID_KEY) long competitionId,
@PathVariable(SECTION_PATH_KEY) String sectionPath,
Model model,
UserResource loggedInUser); @PostMapping(value = "/{competitionId}/section/initial", params = "unrestricted") String submitUnrestrictedInitialSectionDetails(
@Validated({Unrestricted.class, Default.class}) @Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) InitialDetailsForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/initial") String submitInitialSectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) InitialDetailsForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/additional") String submitAdditionalSectionDetails(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) AdditionalInfoForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model, HttpServletRequest request); @PostMapping("/{competitionId}/section/project-eligibility") String submitEligibilitySectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) ProjectEligibilityForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/completion-stage") String submitCompletionStageSectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) CompletionStageForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/milestones") String submitMilestonesSectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) MilestonesForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/application") String submitApplicationFormSectionDetails(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) LandingPageForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/assessors") String submitAssessorsSectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) AssessorsForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/terms-and-conditions") String submitTermsAndConditionsSectionDetails(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) TermsAndConditionsForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/ready-to-open") String setAsReadyToOpen(Model model,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) CompetitionSetupSummaryForm competitionSetupSummaryForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
UserResource loggedInUser); @PostMapping("/{competitionIdToDelete}/delete") String delete(Model model,
@PathVariable("competitionIdToDelete") long competitionId,
@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) CompetitionSetupSummaryForm competitionSetupSummaryForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
UserResource loggedInUser); @PostMapping(path="/{competitionId}/section/terms-and-conditions", params = "uploadTermsAndConditionsDoc") String uploadTermsAndConditions(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) TermsAndConditionsForm termsAndConditionsForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping(path="/{competitionId}/section/terms-and-conditions", params = "deleteTermsAndConditionsDoc") String deleteTermsAndConditions(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) TermsAndConditionsForm termsAndConditionsForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
Model model); @GetMapping("/{competitionId}/generateCompetitionCode") @ResponseBody JsonNode generateCompetitionCode(@PathVariable(COMPETITION_ID_KEY) long competitionId); static final String COMPETITION_ID_KEY; static final String COMPETITION_SETUP_FORM_KEY; static final String SETUP_READY_KEY; static final String READY_TO_OPEN_KEY; } | @Test public void submitCompletionStageSectionDetails() throws Exception { CompetitionResource competition = newCompetitionResource() .withId(COMPETITION_ID) .build(); when(competitionRestService.getCompetitionById(COMPETITION_ID)).thenReturn(restSuccess(competition)); when(competitionSetupService.saveCompetitionSetupSection( any(CompletionStageForm.class), eq(competition), eq(CompetitionSetupSection.COMPLETION_STAGE))).thenReturn(serviceSuccess()); mockMvc.perform(post(URL_PREFIX + "/" + COMPETITION_ID + "/section/completion-stage") .param("selectedCompletionStage", CompetitionCompletionStage.PROJECT_SETUP.name())) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(URL_PREFIX + "/" + COMPETITION_ID + "/section/milestones")); verify(competitionSetupService, times(1)).saveCompetitionSetupSection( createLambdaMatcher(form -> { assertThat(((CompletionStageForm) form).getSelectedCompletionStage()).isEqualTo(CompetitionCompletionStage.PROJECT_SETUP); }), eq(competition), eq(CompetitionSetupSection.COMPLETION_STAGE)); } |
CompetitionSetupController { @PostMapping("/{competitionId}/section/milestones") public String submitMilestonesSectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) MilestonesForm competitionSetupForm, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable(COMPETITION_ID_KEY) long competitionId, UserResource loggedInUser, Model model) { CompetitionResource competition = competitionRestService.getCompetitionById(competitionId).getSuccess(); if (bindingResult.hasErrors()) { competitionSetupMilestoneService.sortMilestones(competitionSetupForm); } return genericCompetitionSetupSection(competitionSetupForm, validationHandler, competition, CompetitionSetupSection.MILESTONES, loggedInUser, model); } @GetMapping("/{competitionId}") String initCompetitionSetupSection(Model model,
@PathVariable(COMPETITION_ID_KEY) Long competitionId,
@ModelAttribute(COMPETITION_SETUP_FORM_KEY) CompetitionSetupSummaryForm competitionSetupSummaryForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
UserResource loggedInUser); @PostMapping("/{competitionId}/section/{sectionPath}/edit") String setSectionAsIncomplete(@PathVariable(COMPETITION_ID_KEY) long competitionId,
@PathVariable(SECTION_PATH_KEY) String sectionPath); @GetMapping("/{competitionId}/section/{sectionPath}") String editCompetitionSetupSection(@PathVariable(COMPETITION_ID_KEY) long competitionId,
@PathVariable(SECTION_PATH_KEY) String sectionPath,
Model model,
UserResource loggedInUser); @PostMapping(value = "/{competitionId}/section/initial", params = "unrestricted") String submitUnrestrictedInitialSectionDetails(
@Validated({Unrestricted.class, Default.class}) @Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) InitialDetailsForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/initial") String submitInitialSectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) InitialDetailsForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/additional") String submitAdditionalSectionDetails(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) AdditionalInfoForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model, HttpServletRequest request); @PostMapping("/{competitionId}/section/project-eligibility") String submitEligibilitySectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) ProjectEligibilityForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/completion-stage") String submitCompletionStageSectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) CompletionStageForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/milestones") String submitMilestonesSectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) MilestonesForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/application") String submitApplicationFormSectionDetails(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) LandingPageForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/assessors") String submitAssessorsSectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) AssessorsForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/terms-and-conditions") String submitTermsAndConditionsSectionDetails(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) TermsAndConditionsForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/ready-to-open") String setAsReadyToOpen(Model model,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) CompetitionSetupSummaryForm competitionSetupSummaryForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
UserResource loggedInUser); @PostMapping("/{competitionIdToDelete}/delete") String delete(Model model,
@PathVariable("competitionIdToDelete") long competitionId,
@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) CompetitionSetupSummaryForm competitionSetupSummaryForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
UserResource loggedInUser); @PostMapping(path="/{competitionId}/section/terms-and-conditions", params = "uploadTermsAndConditionsDoc") String uploadTermsAndConditions(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) TermsAndConditionsForm termsAndConditionsForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping(path="/{competitionId}/section/terms-and-conditions", params = "deleteTermsAndConditionsDoc") String deleteTermsAndConditions(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) TermsAndConditionsForm termsAndConditionsForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
Model model); @GetMapping("/{competitionId}/generateCompetitionCode") @ResponseBody JsonNode generateCompetitionCode(@PathVariable(COMPETITION_ID_KEY) long competitionId); static final String COMPETITION_ID_KEY; static final String COMPETITION_SETUP_FORM_KEY; static final String SETUP_READY_KEY; static final String READY_TO_OPEN_KEY; } | @Test public void submitMilestonesSectionDetails() throws Exception { CompetitionResource competition = newCompetitionResource() .withId(COMPETITION_ID) .build(); when(competitionRestService.getCompetitionById(COMPETITION_ID)).thenReturn(restSuccess(competition)); when(competitionSetupService.saveCompetitionSetupSection( any(MilestonesForm.class), eq(competition), eq(CompetitionSetupSection.MILESTONES))).thenReturn(serviceSuccess()); mockMvc.perform(post(URL_PREFIX + "/" + COMPETITION_ID + "/section/milestones")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(URL_PREFIX + "/" + COMPETITION_ID + "/section/milestones")); verify(competitionSetupService, times(1)).saveCompetitionSetupSection( any(MilestonesForm.class), eq(competition), eq(CompetitionSetupSection.MILESTONES)); } |
CompetitionSetupController { @PostMapping(path="/{competitionId}/section/terms-and-conditions", params = "uploadTermsAndConditionsDoc") public String uploadTermsAndConditions(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) TermsAndConditionsForm termsAndConditionsForm, @SuppressWarnings("UnusedParameters") BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable(COMPETITION_ID_KEY) long competitionId, UserResource loggedInUser, Model model) { CompetitionResource competition = competitionRestService.getCompetitionById(competitionId).getSuccess(); Supplier<String> success = () -> format("redirect:/competition/setup/%d/section/terms-and-conditions", + competition.getId()); Supplier<String> failure = () -> genericCompetitionSetupSection(termsAndConditionsForm, validationHandler, competition, CompetitionSetupSection.TERMS_AND_CONDITIONS, loggedInUser, model); MultipartFile file = termsAndConditionsForm.getTermsAndConditionsDoc(); RestResult<FileEntryResource> uploadResult = competitionSetupRestService.uploadCompetitionTerms(competitionId, file.getContentType(), file.getSize(), file.getOriginalFilename(), getMultipartFileBytes(file)); termsAndConditionsForm.setMarkAsCompleteAction(false); competitionSetupService.saveCompetitionSetupSection(termsAndConditionsForm, competition, CompetitionSetupSection.TERMS_AND_CONDITIONS); return validationHandler.addAnyErrors(error(uploadResult.getErrors()), fileUploadField("termsAndConditionsDoc"), defaultConverters()) .failNowOrSucceedWith(failure, success); } @GetMapping("/{competitionId}") String initCompetitionSetupSection(Model model,
@PathVariable(COMPETITION_ID_KEY) Long competitionId,
@ModelAttribute(COMPETITION_SETUP_FORM_KEY) CompetitionSetupSummaryForm competitionSetupSummaryForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
UserResource loggedInUser); @PostMapping("/{competitionId}/section/{sectionPath}/edit") String setSectionAsIncomplete(@PathVariable(COMPETITION_ID_KEY) long competitionId,
@PathVariable(SECTION_PATH_KEY) String sectionPath); @GetMapping("/{competitionId}/section/{sectionPath}") String editCompetitionSetupSection(@PathVariable(COMPETITION_ID_KEY) long competitionId,
@PathVariable(SECTION_PATH_KEY) String sectionPath,
Model model,
UserResource loggedInUser); @PostMapping(value = "/{competitionId}/section/initial", params = "unrestricted") String submitUnrestrictedInitialSectionDetails(
@Validated({Unrestricted.class, Default.class}) @Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) InitialDetailsForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/initial") String submitInitialSectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) InitialDetailsForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/additional") String submitAdditionalSectionDetails(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) AdditionalInfoForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model, HttpServletRequest request); @PostMapping("/{competitionId}/section/project-eligibility") String submitEligibilitySectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) ProjectEligibilityForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/completion-stage") String submitCompletionStageSectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) CompletionStageForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/milestones") String submitMilestonesSectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) MilestonesForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/application") String submitApplicationFormSectionDetails(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) LandingPageForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/assessors") String submitAssessorsSectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) AssessorsForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/terms-and-conditions") String submitTermsAndConditionsSectionDetails(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) TermsAndConditionsForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/ready-to-open") String setAsReadyToOpen(Model model,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) CompetitionSetupSummaryForm competitionSetupSummaryForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
UserResource loggedInUser); @PostMapping("/{competitionIdToDelete}/delete") String delete(Model model,
@PathVariable("competitionIdToDelete") long competitionId,
@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) CompetitionSetupSummaryForm competitionSetupSummaryForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
UserResource loggedInUser); @PostMapping(path="/{competitionId}/section/terms-and-conditions", params = "uploadTermsAndConditionsDoc") String uploadTermsAndConditions(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) TermsAndConditionsForm termsAndConditionsForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping(path="/{competitionId}/section/terms-and-conditions", params = "deleteTermsAndConditionsDoc") String deleteTermsAndConditions(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) TermsAndConditionsForm termsAndConditionsForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
Model model); @GetMapping("/{competitionId}/generateCompetitionCode") @ResponseBody JsonNode generateCompetitionCode(@PathVariable(COMPETITION_ID_KEY) long competitionId); static final String COMPETITION_ID_KEY; static final String COMPETITION_SETUP_FORM_KEY; static final String SETUP_READY_KEY; static final String READY_TO_OPEN_KEY; } | @Test public void uploadTermsAndConditions() throws Exception { CompetitionResource competitionResource = newCompetitionResource() .withId(COMPETITION_ID) .build(); String fileName = "termsAndConditionsDoc"; String originalFileName = "original filename"; String contentType = "application/json"; String content = "content"; MockMultipartFile file = new MockMultipartFile(fileName, originalFileName, contentType, content.getBytes()); FileEntryResource fileEntryResource = newFileEntryResource().build(); TermsAndConditionsForm form = new TermsAndConditionsForm(); form.setTermsAndConditionsDoc(file); when(competitionRestService.getCompetitionById(COMPETITION_ID)).thenReturn(restSuccess(competitionResource)); when(competitionSetupRestService.uploadCompetitionTerms(COMPETITION_ID, file.getContentType(), file.getSize(), file.getOriginalFilename(), getMultipartFileBytes(file))).thenReturn(restSuccess(fileEntryResource)); mockMvc.perform(multipart(format("%s/%d/section/terms-and-conditions", URL_PREFIX, COMPETITION_ID)) .file(file) .param("uploadTermsAndConditionsDoc", "true")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(format("%s/%d/section/terms-and-conditions", URL_PREFIX, COMPETITION_ID))); InOrder inOrder = inOrder(competitionRestService, competitionSetupRestService, competitionSetupService); inOrder.verify(competitionRestService).getCompetitionById(COMPETITION_ID); inOrder.verify(competitionSetupRestService) .uploadCompetitionTerms(COMPETITION_ID, file.getContentType(), file.getSize(), file.getOriginalFilename(), getMultipartFileBytes(file)); inOrder.verify(competitionSetupService) .saveCompetitionSetupSection(form, competitionResource, CompetitionSetupSection.TERMS_AND_CONDITIONS); inOrder.verifyNoMoreInteractions(); } |
CompetitionSetupController { @PostMapping("/{competitionId}/section/terms-and-conditions") public String submitTermsAndConditionsSectionDetails(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) TermsAndConditionsForm competitionSetupForm, @SuppressWarnings("UnusedParameters") BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable(COMPETITION_ID_KEY) long competitionId, UserResource loggedInUser, Model model) { CompetitionResource competition = competitionRestService.getCompetitionById(competitionId).getSuccess(); if (isProcurement(competitionSetupForm.getTermsAndConditionsId())) { if (competition.getCompetitionTerms() == null) { bindingResult.addError(new FieldError(COMPETITION_SETUP_FORM_KEY, "termsAndConditionsDoc", "Upload a terms and conditions document.")); } } else { competitionSetupRestService.deleteCompetitionTerms(competitionId); } return genericCompetitionSetupSection(competitionSetupForm, validationHandler, competition, CompetitionSetupSection.TERMS_AND_CONDITIONS, loggedInUser, model); } @GetMapping("/{competitionId}") String initCompetitionSetupSection(Model model,
@PathVariable(COMPETITION_ID_KEY) Long competitionId,
@ModelAttribute(COMPETITION_SETUP_FORM_KEY) CompetitionSetupSummaryForm competitionSetupSummaryForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
UserResource loggedInUser); @PostMapping("/{competitionId}/section/{sectionPath}/edit") String setSectionAsIncomplete(@PathVariable(COMPETITION_ID_KEY) long competitionId,
@PathVariable(SECTION_PATH_KEY) String sectionPath); @GetMapping("/{competitionId}/section/{sectionPath}") String editCompetitionSetupSection(@PathVariable(COMPETITION_ID_KEY) long competitionId,
@PathVariable(SECTION_PATH_KEY) String sectionPath,
Model model,
UserResource loggedInUser); @PostMapping(value = "/{competitionId}/section/initial", params = "unrestricted") String submitUnrestrictedInitialSectionDetails(
@Validated({Unrestricted.class, Default.class}) @Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) InitialDetailsForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/initial") String submitInitialSectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) InitialDetailsForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/additional") String submitAdditionalSectionDetails(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) AdditionalInfoForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model, HttpServletRequest request); @PostMapping("/{competitionId}/section/project-eligibility") String submitEligibilitySectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) ProjectEligibilityForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/completion-stage") String submitCompletionStageSectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) CompletionStageForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/milestones") String submitMilestonesSectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) MilestonesForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/application") String submitApplicationFormSectionDetails(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) LandingPageForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/assessors") String submitAssessorsSectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) AssessorsForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/terms-and-conditions") String submitTermsAndConditionsSectionDetails(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) TermsAndConditionsForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/ready-to-open") String setAsReadyToOpen(Model model,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) CompetitionSetupSummaryForm competitionSetupSummaryForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
UserResource loggedInUser); @PostMapping("/{competitionIdToDelete}/delete") String delete(Model model,
@PathVariable("competitionIdToDelete") long competitionId,
@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) CompetitionSetupSummaryForm competitionSetupSummaryForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
UserResource loggedInUser); @PostMapping(path="/{competitionId}/section/terms-and-conditions", params = "uploadTermsAndConditionsDoc") String uploadTermsAndConditions(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) TermsAndConditionsForm termsAndConditionsForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping(path="/{competitionId}/section/terms-and-conditions", params = "deleteTermsAndConditionsDoc") String deleteTermsAndConditions(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) TermsAndConditionsForm termsAndConditionsForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
Model model); @GetMapping("/{competitionId}/generateCompetitionCode") @ResponseBody JsonNode generateCompetitionCode(@PathVariable(COMPETITION_ID_KEY) long competitionId); static final String COMPETITION_ID_KEY; static final String COMPETITION_SETUP_FORM_KEY; static final String SETUP_READY_KEY; static final String READY_TO_OPEN_KEY; } | @Test public void submitTermsAndConditionsSectionDetails() throws Exception { GrantTermsAndConditionsResource nonProcurementTerms = newGrantTermsAndConditionsResource() .withName("Non procurement terms") .build(); CompetitionResource competition = newCompetitionResource() .withId(COMPETITION_ID) .withCompetitionTerms(newFileEntryResource().build()) .build(); when(competitionRestService.getCompetitionById(COMPETITION_ID)).thenReturn(restSuccess(competition)); when(termsAndConditionsRestService.getById(nonProcurementTerms.getId())).thenReturn(restSuccess(nonProcurementTerms)); when(competitionSetupService.saveCompetitionSetupSection( any(TermsAndConditionsForm.class), eq(competition), eq(CompetitionSetupSection.TERMS_AND_CONDITIONS))).thenReturn(serviceSuccess()); mockMvc.perform(post(URL_PREFIX + "/" + COMPETITION_ID + "/section/terms-and-conditions") .param("termsAndConditionsId", String.valueOf(nonProcurementTerms.getId()))) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(URL_PREFIX + "/" + COMPETITION_ID + "/section/terms-and-conditions")); InOrder inOrder = inOrder(competitionSetupService, competitionSetupRestService, competitionRestService, termsAndConditionsRestService); inOrder.verify(competitionRestService).getCompetitionById(competition.getId()); inOrder.verify(termsAndConditionsRestService).getById(nonProcurementTerms.getId()); inOrder.verify(competitionSetupRestService).deleteCompetitionTerms(competition.getId()); inOrder.verify(competitionSetupService).saveCompetitionSetupSection( any(TermsAndConditionsForm.class), eq(competition), eq(CompetitionSetupSection.TERMS_AND_CONDITIONS)); inOrder.verifyNoMoreInteractions(); } |
CompetitionSetupController { @PostMapping(path="/{competitionId}/section/terms-and-conditions", params = "deleteTermsAndConditionsDoc") public String deleteTermsAndConditions(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) TermsAndConditionsForm termsAndConditionsForm, @SuppressWarnings("UnusedParameters") BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable(COMPETITION_ID_KEY) long competitionId, Model model) { CompetitionResource competition = competitionRestService.getCompetitionById(competitionId).getSuccess(); Supplier<String> failureAndSuccessView = () -> format("redirect:/competition/setup/%d/section/terms-and-conditions", + competition.getId()); RestResult<Void> deleteResult = competitionSetupRestService.deleteCompetitionTerms(competitionId); return validationHandler.addAnyErrors(error(deleteResult.getErrors()), fileUploadField("termsAndConditionsDoc"), defaultConverters()) .failNowOrSucceedWith(failureAndSuccessView, failureAndSuccessView); } @GetMapping("/{competitionId}") String initCompetitionSetupSection(Model model,
@PathVariable(COMPETITION_ID_KEY) Long competitionId,
@ModelAttribute(COMPETITION_SETUP_FORM_KEY) CompetitionSetupSummaryForm competitionSetupSummaryForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
UserResource loggedInUser); @PostMapping("/{competitionId}/section/{sectionPath}/edit") String setSectionAsIncomplete(@PathVariable(COMPETITION_ID_KEY) long competitionId,
@PathVariable(SECTION_PATH_KEY) String sectionPath); @GetMapping("/{competitionId}/section/{sectionPath}") String editCompetitionSetupSection(@PathVariable(COMPETITION_ID_KEY) long competitionId,
@PathVariable(SECTION_PATH_KEY) String sectionPath,
Model model,
UserResource loggedInUser); @PostMapping(value = "/{competitionId}/section/initial", params = "unrestricted") String submitUnrestrictedInitialSectionDetails(
@Validated({Unrestricted.class, Default.class}) @Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) InitialDetailsForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/initial") String submitInitialSectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) InitialDetailsForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/additional") String submitAdditionalSectionDetails(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) AdditionalInfoForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model, HttpServletRequest request); @PostMapping("/{competitionId}/section/project-eligibility") String submitEligibilitySectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) ProjectEligibilityForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/completion-stage") String submitCompletionStageSectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) CompletionStageForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/milestones") String submitMilestonesSectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) MilestonesForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/application") String submitApplicationFormSectionDetails(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) LandingPageForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/assessors") String submitAssessorsSectionDetails(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) AssessorsForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/section/terms-and-conditions") String submitTermsAndConditionsSectionDetails(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) TermsAndConditionsForm competitionSetupForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/{competitionId}/ready-to-open") String setAsReadyToOpen(Model model,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) CompetitionSetupSummaryForm competitionSetupSummaryForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
UserResource loggedInUser); @PostMapping("/{competitionIdToDelete}/delete") String delete(Model model,
@PathVariable("competitionIdToDelete") long competitionId,
@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) CompetitionSetupSummaryForm competitionSetupSummaryForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
UserResource loggedInUser); @PostMapping(path="/{competitionId}/section/terms-and-conditions", params = "uploadTermsAndConditionsDoc") String uploadTermsAndConditions(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) TermsAndConditionsForm termsAndConditionsForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
UserResource loggedInUser,
Model model); @PostMapping(path="/{competitionId}/section/terms-and-conditions", params = "deleteTermsAndConditionsDoc") String deleteTermsAndConditions(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) TermsAndConditionsForm termsAndConditionsForm,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable(COMPETITION_ID_KEY) long competitionId,
Model model); @GetMapping("/{competitionId}/generateCompetitionCode") @ResponseBody JsonNode generateCompetitionCode(@PathVariable(COMPETITION_ID_KEY) long competitionId); static final String COMPETITION_ID_KEY; static final String COMPETITION_SETUP_FORM_KEY; static final String SETUP_READY_KEY; static final String READY_TO_OPEN_KEY; } | @Test public void deleteTermsAndConditions() throws Exception { CompetitionResource competitionWithTermsDoc = newCompetitionResource() .withId(COMPETITION_ID) .withCompetitionTerms(newFileEntryResource().build()) .build(); when(competitionRestService.getCompetitionById(COMPETITION_ID)).thenReturn(restSuccess(competitionWithTermsDoc)); when(competitionSetupRestService.deleteCompetitionTerms(COMPETITION_ID)).thenReturn(restSuccess()); mockMvc.perform(multipart(format("%s/%d/section/terms-and-conditions", URL_PREFIX, COMPETITION_ID)) .param("deleteTermsAndConditionsDoc", "true")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(format("%s/%d/section/terms-and-conditions", URL_PREFIX, COMPETITION_ID))); verify(competitionRestService).getCompetitionById(COMPETITION_ID); verify(competitionSetupRestService).deleteCompetitionTerms(COMPETITION_ID); } |
AdditionalInfoFormPopulator implements CompetitionSetupFormPopulator { @Override public CompetitionSetupForm populateForm(CompetitionResource competitionResource) { AdditionalInfoForm competitionSetupForm = new AdditionalInfoForm(); competitionSetupForm.setActivityCode(competitionResource.getActivityCode()); competitionSetupForm.setCompetitionCode(competitionResource.getCode()); competitionSetupForm.setPafNumber(competitionResource.getPafCode()); competitionSetupForm.setBudgetCode(competitionResource.getBudgetCode()); competitionResource.getFunders().forEach(funderResource -> { FunderRowForm funder = new FunderRowForm(funderResource); competitionSetupForm.getFunders().add(funder); }); if(competitionResource.getFunders().isEmpty()) { CompetitionFunderResource competitionFunderResource = initFirstFunder(); competitionSetupForm.setFunders(asList(new FunderRowForm(competitionFunderResource))); competitionResource.setFunders(asList(competitionFunderResource)); competitionSetupRestService.update(competitionResource); } return competitionSetupForm; } @Override CompetitionSetupSection sectionToFill(); @Override CompetitionSetupForm populateForm(CompetitionResource competitionResource); CompetitionFunderResource initFirstFunder(); } | @Test public void testGetSectionFormDataAdditionalInfo() { CompetitionResource competition = newCompetitionResource() .withActivityCode("Activity Code") .withCompetitionCode("c123") .withPafCode("p123") .withBudgetCode("b123") .withFunders(CompetitionFundersFixture.getTestCoFunders()) .withId(8L).build(); CompetitionSetupForm result = service.populateForm(competition); assertTrue(result instanceof AdditionalInfoForm); AdditionalInfoForm form = (AdditionalInfoForm) result; assertEquals("Activity Code", form.getActivityCode()); assertEquals("c123", form.getCompetitionCode()); assertEquals("p123", form.getPafNumber()); assertEquals("b123", form.getBudgetCode()); assertEquals(CompetitionFundersFixture.getTestCoFunders().size(), form.getFundersCount()); assertEquals(Funder.ADVANCED_PROPULSION_CENTRE_APC, form.getFunders().get(0).getFunder()); } |
CompletionStageViewModelPopulator implements CompetitionSetupSectionModelPopulator { @Override public CompletionStageViewModel populateModel(GeneralSetupViewModel generalViewModel, CompetitionResource competitionResource) { return new CompletionStageViewModel(generalViewModel); } @Override CompetitionSetupSection sectionToPopulateModel(); @Override CompletionStageViewModel populateModel(GeneralSetupViewModel generalViewModel, CompetitionResource competitionResource); } | @Test public void populateModel() { CompetitionResource competition = newCompetitionResource(). withCompletionStage(CompetitionCompletionStage.RELEASE_FEEDBACK). build(); CompletionStageViewModel viewModel = new CompletionStageViewModelPopulator().populateModel(null, competition); assertThat(viewModel.getCompetitionCloseCompletionStage()).isEqualTo(CompetitionCompletionStage.COMPETITION_CLOSE); assertThat(viewModel.getReleaseFeedbackCompletionStage()).isEqualTo(CompetitionCompletionStage.RELEASE_FEEDBACK); assertThat(viewModel.getProjectSetupCompletionStage()).isEqualTo(CompetitionCompletionStage.PROJECT_SETUP); } |
CompletionStageViewModelPopulator implements CompetitionSetupSectionModelPopulator { @Override public CompetitionSetupSection sectionToPopulateModel() { return CompetitionSetupSection.COMPLETION_STAGE; } @Override CompetitionSetupSection sectionToPopulateModel(); @Override CompletionStageViewModel populateModel(GeneralSetupViewModel generalViewModel, CompetitionResource competitionResource); } | @Test public void sectionToPopulateModel() { assertThat(new CompletionStageViewModelPopulator().sectionToPopulateModel()). isEqualTo(CompetitionSetupSection.COMPLETION_STAGE); } |
CompletionStageFormPopulator implements CompetitionSetupFormPopulator { @Override public CompletionStageForm populateForm(CompetitionResource competitionResource) { return new CompletionStageForm(competitionResource.getCompletionStage()); } @Override CompetitionSetupSection sectionToFill(); @Override CompletionStageForm populateForm(CompetitionResource competitionResource); } | @Test public void populateForm() { CompetitionResource competition = newCompetitionResource(). withCompletionStage(CompetitionCompletionStage.RELEASE_FEEDBACK). build(); CompletionStageForm form = new CompletionStageFormPopulator().populateForm(competition); assertThat(form.getSelectedCompletionStage()).isEqualTo(CompetitionCompletionStage.RELEASE_FEEDBACK); assertThat(form.isMarkAsCompleteAction()).isTrue(); }
@Test public void populateFormWithCompletionStageNotYetSelected() { CompetitionResource competition = newCompetitionResource().build(); CompletionStageForm form = new CompletionStageFormPopulator().populateForm(competition); assertThat(form.getSelectedCompletionStage()).isNull(); } |
CompletionStageFormPopulator implements CompetitionSetupFormPopulator { @Override public CompetitionSetupSection sectionToFill() { return CompetitionSetupSection.COMPLETION_STAGE; } @Override CompetitionSetupSection sectionToFill(); @Override CompletionStageForm populateForm(CompetitionResource competitionResource); } | @Test public void sectionToFill() { assertThat(new CompletionStageFormPopulator().sectionToFill()).isEqualTo(CompetitionSetupSection.COMPLETION_STAGE); } |
CompletionStageSectionUpdater extends AbstractSectionUpdater implements CompetitionSetupSectionUpdater { @Override protected ServiceResult<Void> doSaveSection(CompetitionResource competition, CompetitionSetupForm competitionSetupForm) { return milestoneRestService.updateCompletionStage(competition.getId(), ((CompletionStageForm)competitionSetupForm).getSelectedCompletionStage()).toServiceResult(); } @Autowired CompletionStageSectionUpdater(MilestoneRestService milestoneRestService); @Override CompetitionSetupSection sectionToSave(); @Override boolean supportsForm(Class<? extends CompetitionSetupForm> clazz); } | @Test public void doSaveSection() { CompetitionResource competition = newCompetitionResource().build(); CompletionStageForm form = new CompletionStageForm(PROJECT_SETUP); when(milestoneRestServiceMock.updateCompletionStage(competition.getId(), PROJECT_SETUP)). thenReturn(restSuccess()); ServiceResult<Void> updateResult = updater.doSaveSection(competition, form); assertThat(updateResult.isSuccess()).isTrue(); verify(milestoneRestServiceMock, times(1)).updateCompletionStage(competition.getId(), PROJECT_SETUP); } |
CompletionStageSectionUpdater extends AbstractSectionUpdater implements CompetitionSetupSectionUpdater { @Override public boolean supportsForm(Class<? extends CompetitionSetupForm> clazz) { return CompletionStageForm.class.equals(clazz); } @Autowired CompletionStageSectionUpdater(MilestoneRestService milestoneRestService); @Override CompetitionSetupSection sectionToSave(); @Override boolean supportsForm(Class<? extends CompetitionSetupForm> clazz); } | @Test public void supportsFrom() { assertThat(updater.supportsForm(CompletionStageForm.class)).isTrue(); assertThat(updater.supportsForm(CompetitionSetupForm.class)).isFalse(); } |
CompetitionSetupApplicationController { @GetMapping("/landing-page") public String applicationProcessLandingPage(Model model, @PathVariable long competitionId, UserResource loggedInUser) { CompetitionResource competitionResource = competitionRestService.getCompetitionById(competitionId).getSuccess(); if (competitionResource.isNonIfs()) { return "redirect:/non-ifs-competition/setup/" + competitionId; } if (!competitionSetupService.hasInitialDetailsBeenPreviouslySubmitted(competitionId)) { return "redirect:/competition/setup/" + competitionResource.getId(); } model.addAttribute(MODEL, competitionSetupService.populateCompetitionSectionModelAttributes(competitionResource, loggedInUser, APPLICATION_FORM)); model.addAttribute(COMPETITION_SETUP_FORM_KEY, new LandingPageForm()); return "competition/setup"; } @PostMapping(value = "/landing-page", params = "createQuestion") String createQuestion(@PathVariable long competitionId); @PostMapping(value = "/landing-page", params = "deleteQuestion") String deleteQuestion(@ModelAttribute("deleteQuestion") DeleteQuestionForm deleteQuestionForm,
@PathVariable long competitionId); @GetMapping("/landing-page") String applicationProcessLandingPage(Model model, @PathVariable long competitionId, UserResource loggedInUser); @PostMapping("/landing-page") String setApplicationProcessAsComplete(Model model,
@PathVariable long competitionId,
@ModelAttribute(COMPETITION_SETUP_FORM_KEY) LandingPageForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
UserResource loggedInUser); @GetMapping("/question/finance") String seeApplicationFinances(@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @GetMapping("/question/finance/edit") String editApplicationFinances(@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/question/finance/edit") String submitApplicationFinances(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) FinanceForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @GetMapping("/question/{questionId}") String seeQuestionInCompSetup(@PathVariable long competitionId,
@PathVariable("questionId") Long questionId,
UserResource loggedInUser,
Model model); @GetMapping("/question/{questionId}/edit") String editQuestionInCompSetup(@PathVariable long competitionId,
@PathVariable long questionId,
UserResource loggedInUser,
Model model); @PostMapping(value = "/question/{questionId}/edit", params = "question.type=ASSESSED_QUESTION") String submitAssessedQuestion(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) QuestionForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
@PathVariable long questionId,
UserResource loggedInUser,
Model model); @PostMapping(value = "/question/{questionId}/edit", params = {"question.type=ASSESSED_QUESTION", "uploadTemplateDocumentFile"}) String uploadTemplateDocumentFile(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) QuestionForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
@PathVariable long questionId,
UserResource loggedInUser,
Model model); @PostMapping(value = "/question/{questionId}/edit", params = {"question.type=ASSESSED_QUESTION", "removeTemplateDocumentFile"}) String removeTemplateDocumentFile(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) QuestionForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
@PathVariable long questionId,
UserResource loggedInUser,
Model model,
RedirectAttributes redirectAttributes); @GetMapping("/question/{questionId}/download-template-file") @ResponseBody ResponseEntity<ByteArrayResource> downloadFile(Model model,
@PathVariable long questionId); @PostMapping("/question/{questionId}/edit") String submitProjectDetailsQuestion(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) ProjectForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @GetMapping(value = "/detail") String viewApplicationDetails(@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @GetMapping(value = "/detail/edit") String getEditApplicationDetails(@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/detail/edit") String submitApplicationDetails(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) DetailsForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
UserResource loggedInUser,
Model model); static final String APPLICATION_LANDING_REDIRECT; static final String QUESTION_REDIRECT; } | @Test public void applicationProcessLandingPage() throws Exception { CompetitionResource competition = newCompetitionResource() .withCompetitionStatus(CompetitionStatus.COMPETITION_SETUP) .build(); when(competitionRestService.getCompetitionById(COMPETITION_ID)).thenReturn(restSuccess(competition)); mockMvc.perform(get(URL_PREFIX + "/landing-page")) .andExpect(status().isOk()) .andExpect(view().name("competition/setup")); verify(competitionSetupService, atLeastOnce()).populateCompetitionSectionModelAttributes(any(), any(), any()); verify(competitionSetupRestService, never()).update(competition); } |
CompetitionSetupApplicationController { @PostMapping("/landing-page") public String setApplicationProcessAsComplete(Model model, @PathVariable long competitionId, @ModelAttribute(COMPETITION_SETUP_FORM_KEY) LandingPageForm form, BindingResult bindingResult, ValidationHandler validationHandler, UserResource loggedInUser) { CompetitionResource competitionResource = competitionRestService.getCompetitionById(competitionId).getSuccess(); if (!competitionSetupService.hasInitialDetailsBeenPreviouslySubmitted(competitionId)) { return "redirect:/competition/setup/" + competitionId; } Supplier<String> failureView = () -> { model.addAttribute(MODEL, competitionSetupService.populateCompetitionSectionModelAttributes(competitionResource, loggedInUser, APPLICATION_FORM)); model.addAttribute(COMPETITION_SETUP_FORM_KEY, form); return "competition/setup"; }; Supplier<String> successView = () -> String.format(APPLICATION_LANDING_REDIRECT, competitionId); return validationHandler.performActionOrBindErrorsToField("", failureView, successView, () -> competitionSetupQuestionService.validateApplicationQuestions(competitionResource, form, bindingResult)); } @PostMapping(value = "/landing-page", params = "createQuestion") String createQuestion(@PathVariable long competitionId); @PostMapping(value = "/landing-page", params = "deleteQuestion") String deleteQuestion(@ModelAttribute("deleteQuestion") DeleteQuestionForm deleteQuestionForm,
@PathVariable long competitionId); @GetMapping("/landing-page") String applicationProcessLandingPage(Model model, @PathVariable long competitionId, UserResource loggedInUser); @PostMapping("/landing-page") String setApplicationProcessAsComplete(Model model,
@PathVariable long competitionId,
@ModelAttribute(COMPETITION_SETUP_FORM_KEY) LandingPageForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
UserResource loggedInUser); @GetMapping("/question/finance") String seeApplicationFinances(@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @GetMapping("/question/finance/edit") String editApplicationFinances(@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/question/finance/edit") String submitApplicationFinances(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) FinanceForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @GetMapping("/question/{questionId}") String seeQuestionInCompSetup(@PathVariable long competitionId,
@PathVariable("questionId") Long questionId,
UserResource loggedInUser,
Model model); @GetMapping("/question/{questionId}/edit") String editQuestionInCompSetup(@PathVariable long competitionId,
@PathVariable long questionId,
UserResource loggedInUser,
Model model); @PostMapping(value = "/question/{questionId}/edit", params = "question.type=ASSESSED_QUESTION") String submitAssessedQuestion(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) QuestionForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
@PathVariable long questionId,
UserResource loggedInUser,
Model model); @PostMapping(value = "/question/{questionId}/edit", params = {"question.type=ASSESSED_QUESTION", "uploadTemplateDocumentFile"}) String uploadTemplateDocumentFile(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) QuestionForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
@PathVariable long questionId,
UserResource loggedInUser,
Model model); @PostMapping(value = "/question/{questionId}/edit", params = {"question.type=ASSESSED_QUESTION", "removeTemplateDocumentFile"}) String removeTemplateDocumentFile(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) QuestionForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
@PathVariable long questionId,
UserResource loggedInUser,
Model model,
RedirectAttributes redirectAttributes); @GetMapping("/question/{questionId}/download-template-file") @ResponseBody ResponseEntity<ByteArrayResource> downloadFile(Model model,
@PathVariable long questionId); @PostMapping("/question/{questionId}/edit") String submitProjectDetailsQuestion(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) ProjectForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @GetMapping(value = "/detail") String viewApplicationDetails(@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @GetMapping(value = "/detail/edit") String getEditApplicationDetails(@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/detail/edit") String submitApplicationDetails(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) DetailsForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
UserResource loggedInUser,
Model model); static final String APPLICATION_LANDING_REDIRECT; static final String QUESTION_REDIRECT; } | @Test public void setApplicationProcessAsComplete() throws Exception { CompetitionResource competition = newCompetitionResource() .withCompetitionStatus(CompetitionStatus.COMPETITION_SETUP) .build(); when(competitionRestService.getCompetitionById(COMPETITION_ID)).thenReturn(restSuccess(competition)); when(competitionSetupQuestionService.validateApplicationQuestions(eq(competition), any(), any())).thenReturn(serviceSuccess()); mockMvc.perform(post(URL_PREFIX + "/landing-page")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl("/competition/setup/" + COMPETITION_ID + "/section/application/landing-page")); verify(competitionSetupQuestionService).validateApplicationQuestions(eq(competition), any(), any()); } |
CompetitionSetupApplicationController { @PostMapping(value = "/landing-page", params = "createQuestion") public String createQuestion(@PathVariable long competitionId) { ServiceResult<CompetitionSetupQuestionResource> result = questionSetupCompetitionRestService .addDefaultToCompetition(competitionId).toServiceResult(); Function<CompetitionSetupQuestionResource, String> successViewFunction = (question) -> String.format("redirect:/competition/setup/%d/section/application/question/%d/edit", competitionId, question.getQuestionId()); return successViewFunction.apply(result.getSuccess()); } @PostMapping(value = "/landing-page", params = "createQuestion") String createQuestion(@PathVariable long competitionId); @PostMapping(value = "/landing-page", params = "deleteQuestion") String deleteQuestion(@ModelAttribute("deleteQuestion") DeleteQuestionForm deleteQuestionForm,
@PathVariable long competitionId); @GetMapping("/landing-page") String applicationProcessLandingPage(Model model, @PathVariable long competitionId, UserResource loggedInUser); @PostMapping("/landing-page") String setApplicationProcessAsComplete(Model model,
@PathVariable long competitionId,
@ModelAttribute(COMPETITION_SETUP_FORM_KEY) LandingPageForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
UserResource loggedInUser); @GetMapping("/question/finance") String seeApplicationFinances(@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @GetMapping("/question/finance/edit") String editApplicationFinances(@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/question/finance/edit") String submitApplicationFinances(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) FinanceForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @GetMapping("/question/{questionId}") String seeQuestionInCompSetup(@PathVariable long competitionId,
@PathVariable("questionId") Long questionId,
UserResource loggedInUser,
Model model); @GetMapping("/question/{questionId}/edit") String editQuestionInCompSetup(@PathVariable long competitionId,
@PathVariable long questionId,
UserResource loggedInUser,
Model model); @PostMapping(value = "/question/{questionId}/edit", params = "question.type=ASSESSED_QUESTION") String submitAssessedQuestion(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) QuestionForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
@PathVariable long questionId,
UserResource loggedInUser,
Model model); @PostMapping(value = "/question/{questionId}/edit", params = {"question.type=ASSESSED_QUESTION", "uploadTemplateDocumentFile"}) String uploadTemplateDocumentFile(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) QuestionForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
@PathVariable long questionId,
UserResource loggedInUser,
Model model); @PostMapping(value = "/question/{questionId}/edit", params = {"question.type=ASSESSED_QUESTION", "removeTemplateDocumentFile"}) String removeTemplateDocumentFile(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) QuestionForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
@PathVariable long questionId,
UserResource loggedInUser,
Model model,
RedirectAttributes redirectAttributes); @GetMapping("/question/{questionId}/download-template-file") @ResponseBody ResponseEntity<ByteArrayResource> downloadFile(Model model,
@PathVariable long questionId); @PostMapping("/question/{questionId}/edit") String submitProjectDetailsQuestion(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) ProjectForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @GetMapping(value = "/detail") String viewApplicationDetails(@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @GetMapping(value = "/detail/edit") String getEditApplicationDetails(@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/detail/edit") String submitApplicationDetails(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) DetailsForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
UserResource loggedInUser,
Model model); static final String APPLICATION_LANDING_REDIRECT; static final String QUESTION_REDIRECT; } | @Test public void createQuestion() throws Exception { CompetitionSetupQuestionResource competitionSetupQuestionResource = newCompetitionSetupQuestionResource().withQuestionId(10L).build(); when(questionSetupCompetitionRestService.addDefaultToCompetition(COMPETITION_ID)).thenReturn(restSuccess((competitionSetupQuestionResource))); mockMvc.perform(post(URL_PREFIX + "/landing-page") .param("createQuestion", "true")) .andExpect(status().is3xxRedirection()) .andExpect(view().name("redirect:" + URL_PREFIX + "/question/10/edit")); verify(questionSetupCompetitionRestService).addDefaultToCompetition(COMPETITION_ID); } |
CompetitionSetupApplicationController { @PostMapping(value = "/landing-page", params = "deleteQuestion") public String deleteQuestion(@ModelAttribute("deleteQuestion") DeleteQuestionForm deleteQuestionForm, @PathVariable long competitionId) { questionSetupCompetitionRestService.deleteById(deleteQuestionForm.getDeleteQuestion()); Supplier<String> view = () -> String.format(APPLICATION_LANDING_REDIRECT, competitionId); return view.get(); } @PostMapping(value = "/landing-page", params = "createQuestion") String createQuestion(@PathVariable long competitionId); @PostMapping(value = "/landing-page", params = "deleteQuestion") String deleteQuestion(@ModelAttribute("deleteQuestion") DeleteQuestionForm deleteQuestionForm,
@PathVariable long competitionId); @GetMapping("/landing-page") String applicationProcessLandingPage(Model model, @PathVariable long competitionId, UserResource loggedInUser); @PostMapping("/landing-page") String setApplicationProcessAsComplete(Model model,
@PathVariable long competitionId,
@ModelAttribute(COMPETITION_SETUP_FORM_KEY) LandingPageForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
UserResource loggedInUser); @GetMapping("/question/finance") String seeApplicationFinances(@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @GetMapping("/question/finance/edit") String editApplicationFinances(@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/question/finance/edit") String submitApplicationFinances(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) FinanceForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @GetMapping("/question/{questionId}") String seeQuestionInCompSetup(@PathVariable long competitionId,
@PathVariable("questionId") Long questionId,
UserResource loggedInUser,
Model model); @GetMapping("/question/{questionId}/edit") String editQuestionInCompSetup(@PathVariable long competitionId,
@PathVariable long questionId,
UserResource loggedInUser,
Model model); @PostMapping(value = "/question/{questionId}/edit", params = "question.type=ASSESSED_QUESTION") String submitAssessedQuestion(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) QuestionForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
@PathVariable long questionId,
UserResource loggedInUser,
Model model); @PostMapping(value = "/question/{questionId}/edit", params = {"question.type=ASSESSED_QUESTION", "uploadTemplateDocumentFile"}) String uploadTemplateDocumentFile(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) QuestionForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
@PathVariable long questionId,
UserResource loggedInUser,
Model model); @PostMapping(value = "/question/{questionId}/edit", params = {"question.type=ASSESSED_QUESTION", "removeTemplateDocumentFile"}) String removeTemplateDocumentFile(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) QuestionForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
@PathVariable long questionId,
UserResource loggedInUser,
Model model,
RedirectAttributes redirectAttributes); @GetMapping("/question/{questionId}/download-template-file") @ResponseBody ResponseEntity<ByteArrayResource> downloadFile(Model model,
@PathVariable long questionId); @PostMapping("/question/{questionId}/edit") String submitProjectDetailsQuestion(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) ProjectForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @GetMapping(value = "/detail") String viewApplicationDetails(@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @GetMapping(value = "/detail/edit") String getEditApplicationDetails(@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/detail/edit") String submitApplicationDetails(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) DetailsForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
UserResource loggedInUser,
Model model); static final String APPLICATION_LANDING_REDIRECT; static final String QUESTION_REDIRECT; } | @Test public void deleteQuestion() throws Exception { Long questionId = 1L; CompetitionResource competition = newCompetitionResource().build(); when(competitionRestService.getCompetitionById(COMPETITION_ID)).thenReturn(restSuccess(competition)); when(questionSetupCompetitionRestService.deleteById(questionId)).thenReturn(restSuccess()); mockMvc.perform(post(URL_PREFIX + "/landing-page") .param("deleteQuestion", questionId.toString())) .andExpect(status().is3xxRedirection()) .andExpect(model().hasNoErrors()) .andExpect(view().name("redirect:" + URL_PREFIX + "/landing-page")); verify(questionSetupCompetitionRestService).deleteById(questionId); } |
CompetitionSetupApplicationController { @PostMapping(value = "/question/{questionId}/edit", params = {"question.type=ASSESSED_QUESTION", "uploadTemplateDocumentFile"}) public String uploadTemplateDocumentFile(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) QuestionForm competitionSetupForm, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable long competitionId, @PathVariable long questionId, UserResource loggedInUser, Model model) { MultipartFile file = competitionSetupForm.getTemplateDocumentFile(); Supplier<String> view = () -> getQuestionPage(model, competitionRestService.getCompetitionById(competitionId).getSuccess(), loggedInUser, questionId, true, competitionSetupForm); return validationHandler.performActionOrBindErrorsToField("templateDocumentFile", view, view, () -> questionSetupCompetitionRestService.uploadTemplateDocument(questionId, file.getContentType(), file.getSize(), file.getOriginalFilename(), getMultipartFileBytes(file))); } @PostMapping(value = "/landing-page", params = "createQuestion") String createQuestion(@PathVariable long competitionId); @PostMapping(value = "/landing-page", params = "deleteQuestion") String deleteQuestion(@ModelAttribute("deleteQuestion") DeleteQuestionForm deleteQuestionForm,
@PathVariable long competitionId); @GetMapping("/landing-page") String applicationProcessLandingPage(Model model, @PathVariable long competitionId, UserResource loggedInUser); @PostMapping("/landing-page") String setApplicationProcessAsComplete(Model model,
@PathVariable long competitionId,
@ModelAttribute(COMPETITION_SETUP_FORM_KEY) LandingPageForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
UserResource loggedInUser); @GetMapping("/question/finance") String seeApplicationFinances(@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @GetMapping("/question/finance/edit") String editApplicationFinances(@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/question/finance/edit") String submitApplicationFinances(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) FinanceForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @GetMapping("/question/{questionId}") String seeQuestionInCompSetup(@PathVariable long competitionId,
@PathVariable("questionId") Long questionId,
UserResource loggedInUser,
Model model); @GetMapping("/question/{questionId}/edit") String editQuestionInCompSetup(@PathVariable long competitionId,
@PathVariable long questionId,
UserResource loggedInUser,
Model model); @PostMapping(value = "/question/{questionId}/edit", params = "question.type=ASSESSED_QUESTION") String submitAssessedQuestion(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) QuestionForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
@PathVariable long questionId,
UserResource loggedInUser,
Model model); @PostMapping(value = "/question/{questionId}/edit", params = {"question.type=ASSESSED_QUESTION", "uploadTemplateDocumentFile"}) String uploadTemplateDocumentFile(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) QuestionForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
@PathVariable long questionId,
UserResource loggedInUser,
Model model); @PostMapping(value = "/question/{questionId}/edit", params = {"question.type=ASSESSED_QUESTION", "removeTemplateDocumentFile"}) String removeTemplateDocumentFile(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) QuestionForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
@PathVariable long questionId,
UserResource loggedInUser,
Model model,
RedirectAttributes redirectAttributes); @GetMapping("/question/{questionId}/download-template-file") @ResponseBody ResponseEntity<ByteArrayResource> downloadFile(Model model,
@PathVariable long questionId); @PostMapping("/question/{questionId}/edit") String submitProjectDetailsQuestion(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) ProjectForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @GetMapping(value = "/detail") String viewApplicationDetails(@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @GetMapping(value = "/detail/edit") String getEditApplicationDetails(@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/detail/edit") String submitApplicationDetails(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) DetailsForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
UserResource loggedInUser,
Model model); static final String APPLICATION_LANDING_REDIRECT; static final String QUESTION_REDIRECT; } | @Test public void uploadTemplateDocumentFile() throws Exception { CompetitionResource competition = newCompetitionResource() .withCompetitionStatus(CompetitionStatus.COMPETITION_SETUP) .build(); CompetitionSetupQuestionResource question = newCompetitionSetupQuestionResource() .withQuestionId(QUESTION_ID) .withType(ASSESSED_QUESTION).build(); when(competitionRestService.getCompetitionById(COMPETITION_ID)).thenReturn(restSuccess(competition)); when(questionSetupCompetitionRestService.getByQuestionId(QUESTION_ID)).thenReturn(restSuccess(question)); MockMultipartFile uploadedFile = new MockMultipartFile("templateDocumentFile", "filename.txt", "text/plain", "My content!".getBytes()); when(questionSetupCompetitionRestService.uploadTemplateDocument(QUESTION_ID, "text/plain", 11, "filename.txt", "My content!".getBytes())).thenReturn(restSuccess()); mockMvc.perform(multipart(URL_PREFIX + "/question/" + QUESTION_ID + "/edit") .file(uploadedFile) .param("uploadTemplateDocumentFile","true") .param("question.type", "ASSESSED_QUESTION")) .andExpect(status().is2xxSuccessful()); verify(questionSetupCompetitionRestService).uploadTemplateDocument(QUESTION_ID, "text/plain", 11, "filename.txt", "My content!".getBytes()); } |
CompetitionSetupApplicationController { @PostMapping(value = "/question/{questionId}/edit", params = {"question.type=ASSESSED_QUESTION", "removeTemplateDocumentFile"}) public String removeTemplateDocumentFile(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) QuestionForm competitionSetupForm, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable long competitionId, @PathVariable long questionId, UserResource loggedInUser, Model model, RedirectAttributes redirectAttributes) { Supplier<String> view = () -> getQuestionPage(model, competitionRestService.getCompetitionById(competitionId).getSuccess(), loggedInUser, questionId, true, competitionSetupForm); return validationHandler.performActionOrBindErrorsToField("templateDocumentFile", view, view, () -> questionSetupCompetitionRestService.deleteTemplateDocument(questionId)); } @PostMapping(value = "/landing-page", params = "createQuestion") String createQuestion(@PathVariable long competitionId); @PostMapping(value = "/landing-page", params = "deleteQuestion") String deleteQuestion(@ModelAttribute("deleteQuestion") DeleteQuestionForm deleteQuestionForm,
@PathVariable long competitionId); @GetMapping("/landing-page") String applicationProcessLandingPage(Model model, @PathVariable long competitionId, UserResource loggedInUser); @PostMapping("/landing-page") String setApplicationProcessAsComplete(Model model,
@PathVariable long competitionId,
@ModelAttribute(COMPETITION_SETUP_FORM_KEY) LandingPageForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
UserResource loggedInUser); @GetMapping("/question/finance") String seeApplicationFinances(@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @GetMapping("/question/finance/edit") String editApplicationFinances(@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/question/finance/edit") String submitApplicationFinances(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) FinanceForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @GetMapping("/question/{questionId}") String seeQuestionInCompSetup(@PathVariable long competitionId,
@PathVariable("questionId") Long questionId,
UserResource loggedInUser,
Model model); @GetMapping("/question/{questionId}/edit") String editQuestionInCompSetup(@PathVariable long competitionId,
@PathVariable long questionId,
UserResource loggedInUser,
Model model); @PostMapping(value = "/question/{questionId}/edit", params = "question.type=ASSESSED_QUESTION") String submitAssessedQuestion(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) QuestionForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
@PathVariable long questionId,
UserResource loggedInUser,
Model model); @PostMapping(value = "/question/{questionId}/edit", params = {"question.type=ASSESSED_QUESTION", "uploadTemplateDocumentFile"}) String uploadTemplateDocumentFile(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) QuestionForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
@PathVariable long questionId,
UserResource loggedInUser,
Model model); @PostMapping(value = "/question/{questionId}/edit", params = {"question.type=ASSESSED_QUESTION", "removeTemplateDocumentFile"}) String removeTemplateDocumentFile(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) QuestionForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
@PathVariable long questionId,
UserResource loggedInUser,
Model model,
RedirectAttributes redirectAttributes); @GetMapping("/question/{questionId}/download-template-file") @ResponseBody ResponseEntity<ByteArrayResource> downloadFile(Model model,
@PathVariable long questionId); @PostMapping("/question/{questionId}/edit") String submitProjectDetailsQuestion(@Valid @ModelAttribute(COMPETITION_SETUP_FORM_KEY) ProjectForm competitionSetupForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @GetMapping(value = "/detail") String viewApplicationDetails(@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @GetMapping(value = "/detail/edit") String getEditApplicationDetails(@PathVariable long competitionId,
UserResource loggedInUser,
Model model); @PostMapping("/detail/edit") String submitApplicationDetails(@ModelAttribute(COMPETITION_SETUP_FORM_KEY) DetailsForm form,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable long competitionId,
UserResource loggedInUser,
Model model); static final String APPLICATION_LANDING_REDIRECT; static final String QUESTION_REDIRECT; } | @Test public void removeTemplateDocumentFile() throws Exception { CompetitionResource competition = newCompetitionResource() .withCompetitionStatus(CompetitionStatus.COMPETITION_SETUP) .build(); CompetitionSetupQuestionResource question = newCompetitionSetupQuestionResource() .withQuestionId(QUESTION_ID) .withType(ASSESSED_QUESTION).build(); when(competitionRestService.getCompetitionById(COMPETITION_ID)).thenReturn(restSuccess(competition)); when(questionSetupCompetitionRestService.getByQuestionId(QUESTION_ID)).thenReturn(restSuccess(question)); when(questionSetupCompetitionRestService.deleteTemplateDocument(QUESTION_ID)).thenReturn(restSuccess()); mockMvc.perform(post(URL_PREFIX + "/question/" + QUESTION_ID + "/edit") .param("removeTemplateDocumentFile","true") .param("question.type", "ASSESSED_QUESTION")) .andExpect(status().is2xxSuccessful()); verify(questionSetupCompetitionRestService).deleteTemplateDocument(QUESTION_ID); } |
FinanceFormPopulator implements CompetitionSetupSubsectionFormPopulator { @Override public CompetitionSetupSubsection sectionToFill() { return CompetitionSetupSubsection.FINANCES; } FinanceFormPopulator(CompetitionSetupFinanceRestService competitionSetupFinanceRestService,
SectionService sectionService,
QuestionRestService questionRestService); @Override CompetitionSetupSubsection sectionToFill(); @Override CompetitionSetupForm populateForm(CompetitionResource competitionResource, Optional<Long> objectId); } | @Test public void sectionToFill() { assertEquals(FINANCES, populator.sectionToFill()); } |
RestIdentityProviderService implements IdentityProviderService, ApplicationEventPublisherAware { @Override public ServiceResult<String> updateUserPassword(String uid, String password) { return handlingErrors(() -> { UpdateUserResource updateUserRequest = new UpdateUserResource(password); Either<ResponseEntity<IdentityProviderError[]>, Void> response = restPut(idpBaseURL + idpUserPath + "/" + uid + "/password", updateUserRequest, Void.class, IdentityProviderError[].class, OK); return response.mapLeftOrRight( failure -> serviceFailure(errors(failure.getStatusCode(), failure.getBody())), success -> serviceSuccess(uid) ); }); } @Override ServiceResult<String> createUserRecordWithUid(String emailAddress, String password); @Override ServiceResult<String> updateUserPassword(String uid, String password); @Override ServiceResult<String> updateUserEmail(String uid, String email); @Override ServiceResult<String> activateUser(String uid); @Override ServiceResult<String> deactivateUser(String uid); @Override @NotSecured(value = "Does not need securing", mustBeSecuredByOtherServices = false) void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher); } | @Test public void updateUserRecordWithUid() { UpdateUserResource updateRequest = new UpdateUserResource("newpassword"); ResponseEntity<String> successResponseEntity = new ResponseEntity<>(OK); when(mockRestTemplate.exchange("http: ServiceResult<String> result = service.updateUserPassword("existing-uid", "newpassword"); assertTrue(result.isSuccess()); assertEquals("existing-uid", result.getSuccess()); }
@Test public void updateUserRecordWithUidButFailureResponseReturned() throws JsonProcessingException { UpdateUserResource updateRequest = new UpdateUserResource("newpassword"); ResponseEntity<String> failureResponseEntity = new ResponseEntity<>(asJson(new IdentityProviderError("Error!", emptyList())), BAD_REQUEST); lenient().when(mockRestTemplate.exchange("http: ServiceResult<String> result = service.updateUserPassword("existing-uid", "newpassword"); assertTrue(result.isFailure()); assertTrue(result.getFailure().is(internalServerErrorError())); } |
FinanceFormPopulator implements CompetitionSetupSubsectionFormPopulator { @Override public CompetitionSetupForm populateForm(CompetitionResource competitionResource, Optional<Long> objectId) { FinanceForm competitionSetupForm = new FinanceForm(); CompetitionSetupFinanceResource competitionSetupFinanceResource = competitionSetupFinanceRestService .getByCompetitionId(competitionResource.getId()).getSuccess(); competitionSetupForm.setApplicationFinanceType(competitionSetupFinanceResource.getApplicationFinanceType()); competitionSetupForm.setIncludeGrowthTable(competitionResource.isKtp() ? Boolean.FALSE : competitionSetupFinanceResource.getIncludeGrowthTable()); competitionSetupForm.setIncludeYourOrganisationSection(competitionSetupFinanceResource.getIncludeYourOrganisationSection()); competitionSetupForm.setIncludeJesForm(competitionSetupFinanceResource.getIncludeJesForm()); if (competitionResource.isFinanceType()) { competitionSetupForm.setFundingRules(getFundingRulesWithoutHeading(competitionResource.getId())); } boolean financesRequired = !competitionResource.isNonFinanceType(); competitionSetupForm.setGrowthTableRequired(competitionResource.isKtp() ? false : financesRequired); competitionSetupForm.setFinancesRequired(financesRequired); return competitionSetupForm; } FinanceFormPopulator(CompetitionSetupFinanceRestService competitionSetupFinanceRestService,
SectionService sectionService,
QuestionRestService questionRestService); @Override CompetitionSetupSubsection sectionToFill(); @Override CompetitionSetupForm populateForm(CompetitionResource competitionResource, Optional<Long> objectId); } | @Test public void populateForm() { final String fundingRules = "Funding rules for competition are fun, right?"; SectionResource overviewFinanceSection = newSectionResource() .withType(SectionType.OVERVIEW_FINANCES) .build(); CompetitionSetupFinanceResource competitionSetupFinanceResource = newCompetitionSetupFinanceResource() .withIncludeGrowthTable(true) .withIncludeYourOrganisationSection(true) .withApplicationFinanceType(STANDARD) .withIncludeJesForm(true) .build(); CompetitionResource competition = newCompetitionResource() .withFundingType(FundingType.GRANT) .build(); assertTrue(competition.isFinanceType()); when(competitionSetupFinanceRestService.getByCompetitionId(competition.getId())) .thenReturn(restSuccess(competitionSetupFinanceResource)); when(sectionService.getSectionsForCompetitionByType(competition.getId(), SectionType.OVERVIEW_FINANCES)) .thenReturn(asList(overviewFinanceSection)); when(questionRestService.getQuestionsBySectionIdAndType(overviewFinanceSection.getId(), QuestionType.GENERAL)) .thenReturn(restSuccess(newQuestionResource() .withName("FINANCE_OVERVIEW", null) .withDescription("", fundingRules) .build(2))); CompetitionSetupForm result = populator.populateForm(competition, Optional.empty()); assertTrue(result instanceof FinanceForm); FinanceForm form = (FinanceForm) result; assertEquals(STANDARD, form.getApplicationFinanceType()); assertTrue(form.isGrowthTableRequired()); assertTrue(form.getIncludeGrowthTable()); assertTrue(form.getIncludeYourOrganisationSection()); assertTrue(form.getIncludeJesForm()); assertEquals(fundingRules, form.getFundingRules()); }
@Test public void populateForm_noFinances() { CompetitionResource competition = newCompetitionResource() .withFundingType(FundingType.GRANT) .withNonFinanceType(true) .build(); CompetitionSetupFinanceResource competitionSetupFinanceResource = newCompetitionSetupFinanceResource() .withIncludeGrowthTable(false) .withIncludeYourOrganisationSection(false) .withIncludeJesForm(false) .withApplicationFinanceType(NO_FINANCES) .build(); assertTrue(competition.isNonFinanceType()); when(competitionSetupFinanceRestService.getByCompetitionId(competition.getId())) .thenReturn(restSuccess(competitionSetupFinanceResource)); CompetitionSetupForm result = populator.populateForm(competition, Optional.empty()); assertTrue(result instanceof FinanceForm); FinanceForm form = (FinanceForm) result; assertEquals(NO_FINANCES, form.getApplicationFinanceType()); assertFalse(form.getIncludeGrowthTable()); assertFalse(form.isGrowthTableRequired()); assertFalse(form.getIncludeYourOrganisationSection()); assertFalse(form.getIncludeJesForm()); assertNull(form.getFundingRules()); }
@Test public void populateForm_Ktp() { CompetitionResource competition = newCompetitionResource() .withFundingType(FundingType.KTP) .withNonFinanceType(true) .build(); CompetitionSetupFinanceResource competitionSetupFinanceResource = newCompetitionSetupFinanceResource() .withIncludeGrowthTable(false) .withIncludeYourOrganisationSection(false) .withIncludeJesForm(false) .withApplicationFinanceType(NO_FINANCES) .build(); assertTrue(competition.isNonFinanceType()); when(competitionSetupFinanceRestService.getByCompetitionId(competition.getId())) .thenReturn(restSuccess(competitionSetupFinanceResource)); CompetitionSetupForm result = populator.populateForm(competition, Optional.empty()); assertTrue(result instanceof FinanceForm); FinanceForm form = (FinanceForm) result; assertEquals(NO_FINANCES, form.getApplicationFinanceType()); assertFalse(form.getIncludeGrowthTable()); assertFalse(form.isGrowthTableRequired()); assertFalse(form.getIncludeYourOrganisationSection()); assertFalse(form.getIncludeJesForm()); assertNull(form.getFundingRules()); } |
QuestionFormPopulator extends AbstractFormInputQuestionFormPopulator implements CompetitionSetupSubsectionFormPopulator { @Override public CompetitionSetupForm populateForm(CompetitionResource competitionResource, Optional<Long> objectId) { QuestionForm competitionSetupForm = new QuestionForm(); if (objectId.isPresent()) { CompetitionSetupQuestionResource questionResource = questionSetupCompetitionRestService.getByQuestionId( (objectId.get())).getSuccess(); competitionSetupForm.setQuestion(questionResource); if (sectionContainsMoreThanOneQuestion(objectId.get())) { competitionSetupForm.setRemovable(true); } if (questionResource.getNumberOfUploads() == 0) { competitionSetupForm.setNumberOfUploads(0); questionResource.setAppendix(false); } else { competitionSetupForm.setNumberOfUploads(questionResource.getNumberOfUploads()); questionResource.setAppendix(true); } competitionSetupForm.getQuestion().getGuidanceRows().forEach(guidanceRowResource -> { GuidanceRowForm grvm = new GuidanceRowForm(guidanceRowResource); competitionSetupForm.getGuidanceRows().add(grvm); }); populateCommon(questionResource, competitionSetupForm); } else { throw new ObjectNotFoundException(); } return competitionSetupForm; } @Override CompetitionSetupSubsection sectionToFill(); @Override CompetitionSetupForm populateForm(CompetitionResource competitionResource, Optional<Long> objectId); } | @Test public void populateForm_withoutErrors() { CompetitionSetupQuestionResource resource = newCompetitionSetupQuestionResource() .withNumberOfUploads(0) .withAppendix(false) .build(); SectionResource sectionResource = newSectionResource().withQuestions(Arrays.asList(1L, 2L)).build(); when(questionRestService.findById(questionId)).thenReturn(restSuccess(questionResource)); when(questionSetupCompetitionRestService.getByQuestionId(questionId)).thenReturn(restSuccess(resource)); when(sectionService.getSectionByQuestionId(questionId)).thenReturn(sectionResource); CompetitionSetupForm result = populator.populateForm(competitionResource, Optional.of(questionId)); assertTrue(result instanceof QuestionForm); QuestionForm form = (QuestionForm) result; assertEquals(form.getQuestion(), resource); }
@Test public void populateForm_questionShouldNotBeRemovableIfLastInSection() { CompetitionSetupQuestionResource resource = newCompetitionSetupQuestionResource() .withAppendix(false) .withNumberOfUploads(0) .build(); SectionResource sectionWithOneQuestion = newSectionResource().withQuestions(Arrays.asList(1L)).build(); when(questionRestService.findById(questionId)).thenReturn(restSuccess(questionResource)); when(questionSetupCompetitionRestService.getByQuestionId(questionId)).thenReturn(restSuccess(resource)); when(sectionService.getSectionByQuestionId(questionId)).thenReturn(sectionWithOneQuestion); QuestionForm result = (QuestionForm) populator.populateForm(competitionResource, Optional.of(questionId)); assertFalse(result.isRemovable()); }
@Test public void populateForm_questionShouldBeRemovableIfNotLastInSection() { CompetitionSetupQuestionResource resource = newCompetitionSetupQuestionResource() .withAppendix(false) .withNumberOfUploads(0) .build(); SectionResource sectionWithMultipleQuestions = newSectionResource().withQuestions(Arrays.asList(1L, 2L)).build(); when(questionRestService.findById(questionId)).thenReturn(restSuccess(questionResource)); when(questionSetupCompetitionRestService.getByQuestionId(questionId)).thenReturn(restSuccess(resource)); when(sectionService.getSectionByQuestionId(questionId)).thenReturn(sectionWithMultipleQuestions); QuestionForm result = (QuestionForm) populator.populateForm(competitionResource, Optional.of(questionId)); assertTrue(result.isRemovable()); }
@Test(expected = ObjectNotFoundException.class) public void populateForm_withErrors() { when(questionSetupCompetitionRestService.getByQuestionId(questionNotFoundId)).thenThrow( new ObjectNotFoundException()); CompetitionSetupForm result = populator.populateForm(competitionResource, Optional.of(questionNotFoundId)); assertEquals(null, result); }
@Test(expected = ObjectNotFoundException.class) public void populateForm_formWithNoObjectIdErrors() { assertNull(populator.populateForm(competitionResource, Optional.empty())); } |
DetailsFormPopulator implements CompetitionSetupSubsectionFormPopulator { @Override public CompetitionSetupSubsection sectionToFill() { return CompetitionSetupSubsection.APPLICATION_DETAILS; } @Override CompetitionSetupSubsection sectionToFill(); @Override CompetitionSetupForm populateForm(CompetitionResource competitionResource, Optional<Long> objectId); } | @Test public void testSectionToFill() { CompetitionSetupSubsection result = service.sectionToFill(); assertEquals(CompetitionSetupSubsection.APPLICATION_DETAILS, result); } |
DetailsFormPopulator implements CompetitionSetupSubsectionFormPopulator { @Override public CompetitionSetupForm populateForm(CompetitionResource competitionResource, Optional<Long> objectId) { DetailsForm competitionSetupForm = new DetailsForm(); competitionSetupForm.setMaxProjectDuration(convertIntegerToBigDecimal(competitionResource.getMaxProjectDuration())); competitionSetupForm.setMinProjectDuration(convertIntegerToBigDecimal(competitionResource.getMinProjectDuration())); competitionSetupForm.setUseResubmissionQuestion(competitionResource.getUseResubmissionQuestion()); return competitionSetupForm; } @Override CompetitionSetupSubsection sectionToFill(); @Override CompetitionSetupForm populateForm(CompetitionResource competitionResource, Optional<Long> objectId); } | @Test public void testPopulateFormDataApplicationDetails() { boolean isResubmissionQuestion = true; CompetitionResource competition = newCompetitionResource() .withUseResubmissionQuestion(isResubmissionQuestion) .build(); CompetitionSetupForm result = service.populateForm(competition, Optional.empty()); assertTrue(result instanceof DetailsForm); DetailsForm form = (DetailsForm) result; assertEquals(isResubmissionQuestion, form.getUseResubmissionQuestion()); } |
RestIdentityProviderService implements IdentityProviderService, ApplicationEventPublisherAware { @Override public ServiceResult<String> updateUserEmail(String uid, String email) { return handlingErrors(() -> { UpdateEmailResource updateEmailRequest = new UpdateEmailResource(email); Either<ResponseEntity<IdentityProviderError[]>, Void> response = restPut(idpBaseURL + idpUserPath + "/" + uid + "/email", updateEmailRequest, Void.class, IdentityProviderError[].class, OK); return response.mapLeftOrRight( failure -> serviceFailure(errors(failure.getStatusCode(), failure.getBody())), success -> serviceSuccess(uid) ); }); } @Override ServiceResult<String> createUserRecordWithUid(String emailAddress, String password); @Override ServiceResult<String> updateUserPassword(String uid, String password); @Override ServiceResult<String> updateUserEmail(String uid, String email); @Override ServiceResult<String> activateUser(String uid); @Override ServiceResult<String> deactivateUser(String uid); @Override @NotSecured(value = "Does not need securing", mustBeSecuredByOtherServices = false) void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher); } | @Test public void updateUserRecordWithEmail() { UpdateEmailResource updateRequest = new UpdateEmailResource("[email protected]"); ResponseEntity<String> successResponseEntity = new ResponseEntity<>(OK); when(mockRestTemplate.exchange("http: ServiceResult<String> result = service.updateUserEmail("existing-uid", "[email protected]"); assertTrue(result.isSuccess()); assertEquals("existing-uid", result.getSuccess()); } |
QuestionModelPopulator implements CompetitionSetupSubsectionModelPopulator { @Override public CompetitionSetupSubsection sectionToPopulateModel() { return CompetitionSetupSubsection.QUESTIONS; } @Override CompetitionSetupSubsection sectionToPopulateModel(); @Override CompetitionSetupSubsectionViewModel populateModel(CompetitionResource competitionResource, Optional<Long> objectId); } | @Test public void testSectionToPopulateModel() { CompetitionSetupSubsection result = populator.sectionToPopulateModel(); assertEquals(CompetitionSetupSubsection.QUESTIONS, result); } |
QuestionModelPopulator implements CompetitionSetupSubsectionModelPopulator { @Override public CompetitionSetupSubsectionViewModel populateModel(CompetitionResource competitionResource, Optional<Long> objectId) { return new QuestionViewModel(); } @Override CompetitionSetupSubsection sectionToPopulateModel(); @Override CompetitionSetupSubsectionViewModel populateModel(CompetitionResource competitionResource, Optional<Long> objectId); } | @Test public void testPopulateModel() { CompetitionResource competitionResource = newCompetitionResource() .withCompetitionCode("code") .withName("name") .withId(8L) .withResearchCategories(CollectionFunctions.asLinkedSet(2L, 3L)) .build(); QuestionViewModel viewModel = (QuestionViewModel) populator.populateModel(competitionResource, Optional.empty()); assertEquals(QuestionViewModel.class, viewModel.getClass()); } |
ProjectModelPopulator implements CompetitionSetupSubsectionModelPopulator { @Override public CompetitionSetupSubsection sectionToPopulateModel() { return CompetitionSetupSubsection.PROJECT_DETAILS; } @Override CompetitionSetupSubsection sectionToPopulateModel(); @Override CompetitionSetupSubsectionViewModel populateModel(CompetitionResource competitionResource, Optional<Long> objectId); } | @Test public void testSectionToPopulateModel() { CompetitionSetupSubsection result = populator.sectionToPopulateModel(); assertEquals(CompetitionSetupSubsection.PROJECT_DETAILS, result); } |
ProjectModelPopulator implements CompetitionSetupSubsectionModelPopulator { @Override public CompetitionSetupSubsectionViewModel populateModel(CompetitionResource competitionResource, Optional<Long> objectId) { return new ProjectViewModel(); } @Override CompetitionSetupSubsection sectionToPopulateModel(); @Override CompetitionSetupSubsectionViewModel populateModel(CompetitionResource competitionResource, Optional<Long> objectId); } | @Test public void testPopulateModel() { CompetitionResource competitionResource = newCompetitionResource() .withCompetitionCode("code") .withName("name") .withId(8L) .withResearchCategories(CollectionFunctions.asLinkedSet(2L, 3L)) .build(); ProjectViewModel viewModel = (ProjectViewModel) populator.populateModel(competitionResource, Optional.empty()); assertEquals(ProjectViewModel.class, viewModel.getClass()); } |
DetailsModelPopulator implements CompetitionSetupSubsectionModelPopulator { @Override public CompetitionSetupSubsection sectionToPopulateModel() { return CompetitionSetupSubsection.APPLICATION_DETAILS; } @Override CompetitionSetupSubsection sectionToPopulateModel(); @Override CompetitionSetupSubsectionViewModel populateModel(CompetitionResource competitionResource, Optional<Long> objectId); } | @Test public void testSectionToPopulateModel() { CompetitionSetupSubsection result = populator.sectionToPopulateModel(); assertEquals(CompetitionSetupSubsection.APPLICATION_DETAILS, result); } |
DetailsModelPopulator implements CompetitionSetupSubsectionModelPopulator { @Override public CompetitionSetupSubsectionViewModel populateModel(CompetitionResource competitionResource, Optional<Long> objectId) { return new DetailsViewModel(); } @Override CompetitionSetupSubsection sectionToPopulateModel(); @Override CompetitionSetupSubsectionViewModel populateModel(CompetitionResource competitionResource, Optional<Long> objectId); } | @Test public void testPopulateModel() { CompetitionResource competitionResource = newCompetitionResource() .withCompetitionCode("code") .withName("name") .withId(8L) .build(); DetailsViewModel viewModel = (DetailsViewModel) populator.populateModel(competitionResource, Optional.empty()); assertEquals(DetailsViewModel.class, viewModel.getClass()); } |
LandingModelPopulator implements CompetitionSetupSectionModelPopulator { @Override public CompetitionSetupSection sectionToPopulateModel() { return CompetitionSetupSection.APPLICATION_FORM; } @Override CompetitionSetupSection sectionToPopulateModel(); @Override CompetitionSetupViewModel populateModel(GeneralSetupViewModel generalViewModel, CompetitionResource competitionResource); } | @Test public void testSectionToPopulateModel() { CompetitionSetupSection result = populator.sectionToPopulateModel(); assertEquals(CompetitionSetupSection.APPLICATION_FORM, result); } |
LandingModelPopulator implements CompetitionSetupSectionModelPopulator { @Override public CompetitionSetupViewModel populateModel(GeneralSetupViewModel generalViewModel, CompetitionResource competitionResource) { List<SectionResource> sections = sectionService.getAllByCompetitionId(competitionResource.getId()); List<QuestionResource> questionResources = questionRestService.findByCompetition(competitionResource.getId()).getSuccess(); List<SectionResource> generalSections = sections.stream() .filter(sectionResource -> sectionResource.getType() == SectionType.GENERAL) .collect(Collectors.toList()); List<SectionResource> parentSections = generalSections.stream() .filter(sectionResource -> sectionResource.getParentSection() == null) .collect(Collectors.toList()); Map<CompetitionSetupSubsection, Boolean> subSectionsStatuses = convertWithDefaultsIfNotPresent(competitionSetupRestService.getSubsectionStatuses(competitionResource.getId()).getSuccess()); Map<Long, Boolean> questionStatuses = questionSetupRestService.getQuestionStatuses(competitionResource.getId(), sectionToPopulateModel()).getSuccess(); List<QuestionResource> questions = getSortedQuestions(questionResources, parentSections); List<QuestionResource> projectDetails = getSortedProjectDetails(questionResources, parentSections); Boolean allStatusesComplete = checkStatusesComplete(subSectionsStatuses, questionStatuses, questions, projectDetails); return new LandingViewModel(generalViewModel, questions, projectDetails, subSectionsStatuses, questionStatuses, allStatusesComplete); } @Override CompetitionSetupSection sectionToPopulateModel(); @Override CompetitionSetupViewModel populateModel(GeneralSetupViewModel generalViewModel, CompetitionResource competitionResource); } | @Test public void testPopulateModel() { CompetitionResource competition = newCompetitionResource() .withCompetitionCode("code") .withName("name") .withId(COMPETITION_ID) .withResearchCategories(CollectionFunctions.asLinkedSet(2L, 3L)) .build(); List<SectionResource> sections = newSectionResource().build(1); when(sectionService.getAllByCompetitionId(competition.getId())).thenReturn(sections); List<QuestionResource> questionResources = asList(newQuestionResource().withId(QUESTION_ID).build()); when(questionRestService.findByCompetition(competition.getId())).thenReturn(restSuccess(questionResources)); List<FormInputResource> formInputResources = newFormInputResource().withScope(APPLICATION).build(1); when(formInputRestService.getByQuestionIdAndScope(QUESTION_ID, APPLICATION)).thenReturn(restSuccess(formInputResources)); List<FormInputResource> formInputResourcesAssessment = newFormInputResource().withScope(ASSESSMENT).build(1); when(formInputRestService.getByQuestionIdAndScope(QUESTION_ID, ASSESSMENT)).thenReturn(restSuccess(formInputResourcesAssessment)); LandingViewModel viewModel = (LandingViewModel) populator.populateModel(getBasicGeneralSetupView(competition), competition); assertEquals(new ArrayList(), viewModel.getQuestions()); assertEquals(new ArrayList(), viewModel.getProjectDetails()); assertEquals(CompetitionSetupSection.APPLICATION_FORM, viewModel.getGeneral().getCurrentSection()); }
@Test public void testPopulateModelWithQuestions() { CompetitionResource competition = newCompetitionResource() .withCompetitionCode("code") .withName("name") .withId(COMPETITION_ID) .withResearchCategories(CollectionFunctions.asLinkedSet(2L, 3L)) .build(); Long questionId = 100L; List<SectionResource> sections = newSectionResource() .withName("Application questions") .withType(SectionType.GENERAL) .withQuestions(asList(questionId)) .build(1); when(sectionService.getAllByCompetitionId(competition.getId())).thenReturn(sections); List<QuestionResource> questionResources = asList(newQuestionResource().withId(questionId).build()); when(questionRestService.findByCompetition(competition.getId())).thenReturn(restSuccess(questionResources)); List<FormInputResource> formInputResources = newFormInputResource().withScope(APPLICATION).build(1); when(formInputRestService.getByQuestionIdAndScope(questionId, APPLICATION)).thenReturn(restSuccess(formInputResources)); List<FormInputResource> formInputResourcesAssessment = newFormInputResource().withScope(ASSESSMENT).build(1); when(formInputRestService.getByQuestionIdAndScope(questionId, ASSESSMENT)).thenReturn(restSuccess(formInputResourcesAssessment)); LandingViewModel viewModel = (LandingViewModel) populator.populateModel(getBasicGeneralSetupView(competition), competition); assertEquals(questionResources, viewModel.getQuestions()); assertEquals(new ArrayList(), viewModel.getProjectDetails()); assertEquals(CompetitionSetupSection.APPLICATION_FORM, viewModel.getGeneral().getCurrentSection()); } |
ProjectFormPopulator extends AbstractFormInputQuestionFormPopulator implements CompetitionSetupSubsectionFormPopulator { @Override public CompetitionSetupForm populateForm(CompetitionResource competitionResource, Optional<Long> objectId) { ProjectForm competitionSetupForm = new ProjectForm(); if (objectId.isPresent()) { CompetitionSetupQuestionResource questionResource = questionSetupCompetitionRestService .getByQuestionId(objectId.get()).getSuccess(); competitionSetupForm.setQuestion(questionResource); competitionSetupForm.setRemovable(true); populateCommon(questionResource, competitionSetupForm); } else { throw new ObjectNotFoundException(); } return competitionSetupForm; } @Override CompetitionSetupSubsection sectionToFill(); @Override CompetitionSetupForm populateForm(CompetitionResource competitionResource, Optional<Long> objectId); } | @Test public void testPopulateFormWithoutErrors() { CompetitionSetupQuestionResource resource = new CompetitionSetupQuestionResource(); when(questionRestService.findById(questionId)).thenReturn(restSuccess(questionResource)); when(questionSetupCompetitionRestService.getByQuestionId(questionId)).thenReturn(restSuccess(resource)); CompetitionSetupForm result = populator.populateForm(competitionResource, Optional.of(questionId)); assertTrue(result instanceof ProjectForm); ProjectForm form = (ProjectForm) result; assertEquals(form.getQuestion(), resource); }
@Test(expected = ObjectNotFoundException.class) public void testPopulateFormWithErrors() { when(questionSetupCompetitionRestService.getByQuestionId(questionNotFoundId)).thenThrow(new ObjectNotFoundException()); CompetitionSetupForm result = populator.populateForm(competitionResource, Optional.of(questionNotFoundId)); assertNull(result); }
@Test(expected = ObjectNotFoundException.class) public void testPopulateFormWithNoObjectIdErrors() { CompetitionSetupForm result = populator.populateForm(competitionResource, Optional.empty()); assertNull(result); } |
FinanceModelPopulator implements CompetitionSetupSubsectionModelPopulator { @Override public CompetitionSetupSubsection sectionToPopulateModel() { return CompetitionSetupSubsection.FINANCES; } @Override CompetitionSetupSubsection sectionToPopulateModel(); @Override CompetitionSetupSubsectionViewModel populateModel(CompetitionResource competitionResource, Optional<Long> objectId); } | @Test public void testSectionToPopulateModel() { CompetitionSetupSubsection result = populator.sectionToPopulateModel(); assertEquals(CompetitionSetupSubsection.FINANCES, result); } |
FinanceModelPopulator implements CompetitionSetupSubsectionModelPopulator { @Override public CompetitionSetupSubsectionViewModel populateModel(CompetitionResource competitionResource, Optional<Long> objectId) { return new FinanceViewModel( competitionResource.isNonFinanceType(), competitionResource.isKtp() ); } @Override CompetitionSetupSubsection sectionToPopulateModel(); @Override CompetitionSetupSubsectionViewModel populateModel(CompetitionResource competitionResource, Optional<Long> objectId); } | @Test public void testPopulateModel() { long competitionId = 8L; CompetitionResource competition = newCompetitionResource() .withCompetitionCode("code") .withName("name") .withId(competitionId) .withResearchCategories(CollectionFunctions.asLinkedSet(2L, 3L)) .withNonFinanceType(true) .withFundingType(FundingType.KTP) .build(); assertTrue(competition.isNonFinanceType()); FinanceViewModel viewModel = (FinanceViewModel) populator.populateModel(competition, Optional.empty()); assertEquals(FinanceViewModel.class, viewModel.getClass()); assertTrue(viewModel.isNoFinancesCompetition()); assertTrue(viewModel.isKtpCompetition()); } |
CompetitionSetupApplicationQuestionValidator { public void validate(QuestionForm form, BindingResult bindingResult, long questionId, CompetitionResource competitionResource) { validateRadioButtons(form, bindingResult, competitionResource); if (!competitionResource.isKtp()) { validateAssessmentGuidanceRows(form, bindingResult); } validateFileUploaded(form, bindingResult, questionId); validateTypeOfQuestion(form, bindingResult); validateAppendix(form, bindingResult); } void validate(QuestionForm form, BindingResult bindingResult, long questionId, CompetitionResource competitionResource); void validate(ProjectForm form, BindingResult bindingResult); } | @Test public void invalidApplicationQuestion() { long questionId = 1l; CompetitionResource competitionResource = newCompetitionResource() .withFundingType(FundingType.KTP) .build(); CompetitionSetupQuestionResource competitionSetupQuestionResource = newCompetitionSetupQuestionResource().build(); QuestionForm form = new QuestionForm(); form.setQuestion(competitionSetupQuestionResource); DataBinder dataBinder = new DataBinder(form); bindingResult = dataBinder.getBindingResult(); validator.validate(form, bindingResult, questionId, competitionResource); assertTrue(bindingResult.hasErrors()); assertEquals(2, bindingResult.getErrorCount()); assertEquals("This field cannot be left blank.", bindingResult.getFieldError("numberOfUploads").getDefaultMessage()); assertEquals("This field cannot be left blank.", bindingResult.getFieldError("question.templateDocument").getDefaultMessage()); } |
CompetitionSetupPostAwardServiceController { private String populateModel(Model model, CompetitionResource competition, PostAwardServiceForm form) { model.addAttribute(MODEL, choosePostAwardServiceModelPopulator.populateModel(competition)); model.addAttribute(FORM_ATTR_NAME, form); return "competition/setup/post-award-service"; } @PreAuthorize("hasPermission(#competitionId, 'org.innovateuk.ifs.competition.resource.CompetitionCompositeId', 'CHOOSE_POST_AWARD_SERVICE')") @GetMapping("/{competitionId}/post-award-service") String setupPostAwardService(@PathVariable(COMPETITION_ID_KEY) long competitionId, Model model); @PreAuthorize("hasPermission(#competitionId, 'org.innovateuk.ifs.competition.resource.CompetitionCompositeId', 'CHOOSE_POST_AWARD_SERVICE')") @PostMapping(value = "/{competitionId}/post-award-service") String configurePostAwardService(@PathVariable(COMPETITION_ID_KEY) long competitionId,
@Valid @ModelAttribute(FORM_ATTR_NAME) PostAwardServiceForm form,
BindingResult bindingResult,
Model model); } | @Test public void managePostAwardService() throws Exception { CompetitionResource competitionResource = CompetitionResourceBuilder.newCompetitionResource() .withId(COMPETITION_ID) .withName(COMPETITION_NAME) .build(); CompetitionPostAwardServiceResource competitionPostAwardServiceResource = CompetitionPostAwardServiceResourceBuilder.newCompetitionPostAwardServiceResource() .withCompetitionId(COMPETITION_ID) .withPostAwardService(PostAwardService.CONNECT) .build(); when(competitionRestService.getCompetitionById(COMPETITION_ID)).thenReturn(restSuccess(competitionResource)); when(competitionSetupPostAwardServiceRestService.getPostAwardService(COMPETITION_ID)).thenReturn(restSuccess(competitionPostAwardServiceResource)); ChoosePostAwardServiceViewModel viewModel = new ChoosePostAwardServiceViewModel(COMPETITION_ID, COMPETITION_NAME); when(choosePostAwardServiceModelPopulator.populateModel(competitionResource)).thenReturn(viewModel); PostAwardServiceForm expectedForm = new PostAwardServiceForm(); expectedForm.setPostAwardService(PostAwardService.CONNECT); mockMvc.perform(MockMvcRequestBuilders.get("/competition/setup/{competitionId}/post-award-service", COMPETITION_ID)) .andExpect(status().isOk()) .andExpect(view().name("competition/setup/post-award-service")) .andExpect(model().attribute("model", viewModel)) .andExpect(model().attribute("form", expectedForm)); }
@Test public void choosePostAwardServiceWithNoneSelected() throws Exception { CompetitionResource competitionResource = CompetitionResourceBuilder.newCompetitionResource() .withId(COMPETITION_ID) .withName(COMPETITION_NAME) .build(); when(competitionRestService.getCompetitionById(COMPETITION_ID)).thenReturn(restSuccess(competitionResource)); ChoosePostAwardServiceViewModel viewModel = new ChoosePostAwardServiceViewModel(COMPETITION_ID, COMPETITION_NAME); when(choosePostAwardServiceModelPopulator.populateModel(competitionResource)).thenReturn(viewModel); PostAwardServiceForm expectedForm = new PostAwardServiceForm(); mockMvc.perform(MockMvcRequestBuilders.post("/competition/setup/{competitionId}/post-award-service", COMPETITION_ID)) .andExpect(status().isOk()) .andExpect(view().name("competition/setup/post-award-service")) .andExpect(model().attribute("model", viewModel)) .andExpect(model().attribute("form", expectedForm)); verifyZeroInteractions(competitionSetupPostAwardServiceRestService); } |
ChoosePostAwardServiceModelPopulator { public ChoosePostAwardServiceViewModel populateModel(CompetitionResource competition) { return new ChoosePostAwardServiceViewModel(competition.getId(), competition.getName()); } ChoosePostAwardServiceViewModel populateModel(CompetitionResource competition); } | @Test public void shouldPopulate() { Long id = 1L; String name = "competition"; CompetitionResource competition = CompetitionResourceBuilder.newCompetitionResource() .withId(id) .withName(name) .build(); ChoosePostAwardServiceViewModel result = populator.populateModel(competition); assertEquals(id, result.getCompetitionId()); assertEquals(name, result.getCompetitionName()); } |
CompetitionUtils { public static boolean textToBoolean(String value) { return (value != null && ("yes".equalsIgnoreCase(value) || "1".equalsIgnoreCase(value))) ? true : false; } private CompetitionUtils(); static boolean textToBoolean(String value); static String booleanToText(Boolean value); final static Long ALL_INNOVATION_AREAS; } | @Test public void testTextToBoolean() { assertEquals(TRUE, CompetitionUtils.textToBoolean("yes")); assertEquals(TRUE, CompetitionUtils.textToBoolean("YeS")); assertEquals(FALSE, CompetitionUtils.textToBoolean("no")); assertEquals(FALSE, CompetitionUtils.textToBoolean("NO")); assertEquals(FALSE, CompetitionUtils.textToBoolean("8y7af87af")); assertEquals(FALSE, CompetitionUtils.textToBoolean(null)); } |
CompetitionUtils { public static String booleanToText(Boolean value) { if(value == null) { return ""; } return value ? "yes" : "no"; } private CompetitionUtils(); static boolean textToBoolean(String value); static String booleanToText(Boolean value); final static Long ALL_INNOVATION_AREAS; } | @Test public void testBooleanToText() { assertEquals("yes", CompetitionUtils.booleanToText(TRUE)); assertEquals("yes", CompetitionUtils.booleanToText(true)); assertEquals("no", CompetitionUtils.booleanToText(FALSE)); assertEquals("no", CompetitionUtils.booleanToText(false)); assertEquals("", CompetitionUtils.booleanToText(null)); } |
CompetitionSetupServiceImpl implements CompetitionSetupService { @Override public CompetitionSetupForm getSectionFormData(CompetitionResource competitionResource, CompetitionSetupSection section) { CompetitionSetupFormPopulator populator = formPopulators.get(section); if (populator == null) { LOG.error("unable to populate form for section " + section); throw new IllegalArgumentException(); } return populator.populateForm(competitionResource); } @Autowired void setCompetitionSetupFormPopulators(Collection<CompetitionSetupFormPopulator> populators); @Autowired void setCompetitionSetupSubsectionFormPopulators(Collection<CompetitionSetupSubsectionFormPopulator> populators); @Autowired void setCompetitionSetupSectionSavers(Collection<CompetitionSetupSectionUpdater> savers); @Autowired void setCompetitionSetupSubsectionSavers(Collection<CompetitionSetupSubsectionUpdater> savers); @Autowired void setCompetitionSetupSectionModelPopulators(Collection<CompetitionSetupSectionModelPopulator> populators); @Autowired void setCompetitionSetupSubsectionModelPopulators(Collection<CompetitionSetupSubsectionModelPopulator> populators); @Override CompetitionSetupViewModel populateCompetitionSectionModelAttributes(
CompetitionResource competitionResource,
UserResource userResource,
CompetitionSetupSection section
); @Override CompetitionSetupSubsectionViewModel populateCompetitionSubsectionModelAttributes(
CompetitionResource competitionResource,
CompetitionSetupSection section,
CompetitionSetupSubsection subsection,
Optional<Long> objectId
); @Override CompetitionSetupForm getSectionFormData(CompetitionResource competitionResource,
CompetitionSetupSection section); @Override CompetitionSetupForm getSubsectionFormData(CompetitionResource competitionResource,
CompetitionSetupSection section,
CompetitionSetupSubsection subsection,
Optional<Long> objectId); @Override ServiceResult<Void> saveCompetitionSetupSection(CompetitionSetupForm competitionSetupForm,
CompetitionResource competitionResource,
CompetitionSetupSection section); @Override ServiceResult<Void> saveCompetitionSetupSubsection(CompetitionSetupForm competitionSetupForm,
CompetitionResource competitionResource,
CompetitionSetupSection section,
CompetitionSetupSubsection subsection); @Override boolean hasInitialDetailsBeenPreviouslySubmitted(Long competitionId); @Override boolean isCompetitionReadyToOpen(CompetitionResource competitionResource); @Override ServiceResult<Void> setCompetitionAsReadyToOpen(Long competitionId); @Override ServiceResult<Void> setCompetitionAsCompetitionSetup(Long competitionId); @Override ServiceResult<Void> deleteCompetition(long competitionId); } | @Test public void getSectionFormData() { CompetitionResource competitionResource = newCompetitionResource().build(); CompetitionSetupFormPopulator matchingPopulator = mock(CompetitionSetupFormPopulator.class); when(matchingPopulator.sectionToFill()).thenReturn(CompetitionSetupSection.ADDITIONAL_INFO); CompetitionSetupForm matchingForm = mock(CompetitionSetupForm.class); when(matchingPopulator.populateForm(competitionResource)).thenReturn(matchingForm); CompetitionSetupFormPopulator otherPopulator = mock(CompetitionSetupFormPopulator.class); when(otherPopulator.sectionToFill()).thenReturn(CompetitionSetupSection.APPLICATION_FORM); CompetitionSetupForm otherForm = mock(CompetitionSetupForm.class); when(otherPopulator.populateForm(competitionResource)).thenReturn(otherForm); service.setCompetitionSetupFormPopulators(asList(matchingPopulator, otherPopulator)); CompetitionSetupForm result = service.getSectionFormData(competitionResource, CompetitionSetupSection.ADDITIONAL_INFO); assertEquals(matchingForm, result); verify(matchingPopulator).populateForm(competitionResource); verify(otherPopulator, never()).populateForm(competitionResource); } |
CompetitionSetupServiceImpl implements CompetitionSetupService { @Override public ServiceResult<Void> saveCompetitionSetupSection(CompetitionSetupForm competitionSetupForm, CompetitionResource competitionResource, CompetitionSetupSection section) { checkCompetitionInitialDetailsComplete(competitionResource, section); CompetitionSetupSectionUpdater saver = sectionSavers.get(section); if (saver == null || !saver.supportsForm(competitionSetupForm.getClass())) { LOG.error("unable to save section " + section); throw new IllegalArgumentException(); } return saver.saveSection(competitionResource, competitionSetupForm).andOnSuccess(() -> { if (competitionSetupForm.isMarkAsCompleteAction()) { return competitionSetupRestService.markSectionComplete(competitionResource.getId(), section).toServiceResult(); } return serviceSuccess(); }); } @Autowired void setCompetitionSetupFormPopulators(Collection<CompetitionSetupFormPopulator> populators); @Autowired void setCompetitionSetupSubsectionFormPopulators(Collection<CompetitionSetupSubsectionFormPopulator> populators); @Autowired void setCompetitionSetupSectionSavers(Collection<CompetitionSetupSectionUpdater> savers); @Autowired void setCompetitionSetupSubsectionSavers(Collection<CompetitionSetupSubsectionUpdater> savers); @Autowired void setCompetitionSetupSectionModelPopulators(Collection<CompetitionSetupSectionModelPopulator> populators); @Autowired void setCompetitionSetupSubsectionModelPopulators(Collection<CompetitionSetupSubsectionModelPopulator> populators); @Override CompetitionSetupViewModel populateCompetitionSectionModelAttributes(
CompetitionResource competitionResource,
UserResource userResource,
CompetitionSetupSection section
); @Override CompetitionSetupSubsectionViewModel populateCompetitionSubsectionModelAttributes(
CompetitionResource competitionResource,
CompetitionSetupSection section,
CompetitionSetupSubsection subsection,
Optional<Long> objectId
); @Override CompetitionSetupForm getSectionFormData(CompetitionResource competitionResource,
CompetitionSetupSection section); @Override CompetitionSetupForm getSubsectionFormData(CompetitionResource competitionResource,
CompetitionSetupSection section,
CompetitionSetupSubsection subsection,
Optional<Long> objectId); @Override ServiceResult<Void> saveCompetitionSetupSection(CompetitionSetupForm competitionSetupForm,
CompetitionResource competitionResource,
CompetitionSetupSection section); @Override ServiceResult<Void> saveCompetitionSetupSubsection(CompetitionSetupForm competitionSetupForm,
CompetitionResource competitionResource,
CompetitionSetupSection section,
CompetitionSetupSubsection subsection); @Override boolean hasInitialDetailsBeenPreviouslySubmitted(Long competitionId); @Override boolean isCompetitionReadyToOpen(CompetitionResource competitionResource); @Override ServiceResult<Void> setCompetitionAsReadyToOpen(Long competitionId); @Override ServiceResult<Void> setCompetitionAsCompetitionSetup(Long competitionId); @Override ServiceResult<Void> deleteCompetition(long competitionId); } | @Test(expected = IllegalStateException.class) public void saveCompetitionSetupSection_initialDetailsMustBeComplete() throws Exception { CompetitionSetupForm competitionSetupForm = new AdditionalInfoForm(); CompetitionResource competition = newCompetitionResource().withId(COMPETITION_ID).build(); CompetitionSetupSection section = CompetitionSetupSection.ADDITIONAL_INFO; when(competitionSetupRestService.getSectionStatuses(COMPETITION_ID)) .thenReturn(restSuccess(asMap(CompetitionSetupSection.INITIAL_DETAILS, Optional.empty()))); service.saveCompetitionSetupSection(competitionSetupForm, competition, section); } |
CompetitionSetupServiceImpl implements CompetitionSetupService { @Override public ServiceResult<Void> saveCompetitionSetupSubsection(CompetitionSetupForm competitionSetupForm, CompetitionResource competitionResource, CompetitionSetupSection section, CompetitionSetupSubsection subsection) { checkCompetitionInitialDetailsComplete(competitionResource, section); checkIfSubsectionIsInSection(section, subsection); CompetitionSetupSubsectionUpdater saver = subsectionSavers.get(subsection); if (saver == null || !saver.supportsForm(competitionSetupForm.getClass())) { LOG.error("unable to save subsection " + subsection); throw new IllegalArgumentException(); } ServiceResult<Void> result = saver.saveSection(competitionResource, competitionSetupForm); result.andOnSuccess(() -> { markQuestionAsComplete(subsection, competitionSetupForm, competitionResource.getId()); markSubSectionAsComplete(subsection, competitionResource.getId()); }); return result; } @Autowired void setCompetitionSetupFormPopulators(Collection<CompetitionSetupFormPopulator> populators); @Autowired void setCompetitionSetupSubsectionFormPopulators(Collection<CompetitionSetupSubsectionFormPopulator> populators); @Autowired void setCompetitionSetupSectionSavers(Collection<CompetitionSetupSectionUpdater> savers); @Autowired void setCompetitionSetupSubsectionSavers(Collection<CompetitionSetupSubsectionUpdater> savers); @Autowired void setCompetitionSetupSectionModelPopulators(Collection<CompetitionSetupSectionModelPopulator> populators); @Autowired void setCompetitionSetupSubsectionModelPopulators(Collection<CompetitionSetupSubsectionModelPopulator> populators); @Override CompetitionSetupViewModel populateCompetitionSectionModelAttributes(
CompetitionResource competitionResource,
UserResource userResource,
CompetitionSetupSection section
); @Override CompetitionSetupSubsectionViewModel populateCompetitionSubsectionModelAttributes(
CompetitionResource competitionResource,
CompetitionSetupSection section,
CompetitionSetupSubsection subsection,
Optional<Long> objectId
); @Override CompetitionSetupForm getSectionFormData(CompetitionResource competitionResource,
CompetitionSetupSection section); @Override CompetitionSetupForm getSubsectionFormData(CompetitionResource competitionResource,
CompetitionSetupSection section,
CompetitionSetupSubsection subsection,
Optional<Long> objectId); @Override ServiceResult<Void> saveCompetitionSetupSection(CompetitionSetupForm competitionSetupForm,
CompetitionResource competitionResource,
CompetitionSetupSection section); @Override ServiceResult<Void> saveCompetitionSetupSubsection(CompetitionSetupForm competitionSetupForm,
CompetitionResource competitionResource,
CompetitionSetupSection section,
CompetitionSetupSubsection subsection); @Override boolean hasInitialDetailsBeenPreviouslySubmitted(Long competitionId); @Override boolean isCompetitionReadyToOpen(CompetitionResource competitionResource); @Override ServiceResult<Void> setCompetitionAsReadyToOpen(Long competitionId); @Override ServiceResult<Void> setCompetitionAsCompetitionSetup(Long competitionId); @Override ServiceResult<Void> deleteCompetition(long competitionId); } | @Test(expected = IllegalStateException.class) public void saveCompetitionSetupSubsection_initialDetailsMustBeComplete() throws Exception { CompetitionSetupForm competitionSetupForm = new DetailsForm(); CompetitionResource competition = newCompetitionResource().withId(COMPETITION_ID).build(); CompetitionSetupSection section = CompetitionSetupSection.APPLICATION_FORM; CompetitionSetupSubsection subsection = CompetitionSetupSubsection.APPLICATION_DETAILS; when(competitionSetupRestService.getSectionStatuses(COMPETITION_ID)) .thenReturn(restSuccess(asMap(CompetitionSetupSection.INITIAL_DETAILS, Optional.empty()))); service.saveCompetitionSetupSubsection(competitionSetupForm, competition, section, subsection); } |
CompetitionSetupServiceImpl implements CompetitionSetupService { @Override public boolean isCompetitionReadyToOpen(CompetitionResource competitionResource) { if (competitionResource.getCompetitionStatus() != CompetitionStatus.COMPETITION_SETUP) { return false; } Map<CompetitionSetupSection, Optional<Boolean>> statuses = competitionSetupRestService.getSectionStatuses(competitionResource.getId()).getSuccess(); Optional<CompetitionSetupSection> notDoneSection = getRequiredSectionsForReadyToOpen().stream() .filter(section -> isNotDoneSection(statuses, section)) .findFirst(); return !notDoneSection.isPresent(); } @Autowired void setCompetitionSetupFormPopulators(Collection<CompetitionSetupFormPopulator> populators); @Autowired void setCompetitionSetupSubsectionFormPopulators(Collection<CompetitionSetupSubsectionFormPopulator> populators); @Autowired void setCompetitionSetupSectionSavers(Collection<CompetitionSetupSectionUpdater> savers); @Autowired void setCompetitionSetupSubsectionSavers(Collection<CompetitionSetupSubsectionUpdater> savers); @Autowired void setCompetitionSetupSectionModelPopulators(Collection<CompetitionSetupSectionModelPopulator> populators); @Autowired void setCompetitionSetupSubsectionModelPopulators(Collection<CompetitionSetupSubsectionModelPopulator> populators); @Override CompetitionSetupViewModel populateCompetitionSectionModelAttributes(
CompetitionResource competitionResource,
UserResource userResource,
CompetitionSetupSection section
); @Override CompetitionSetupSubsectionViewModel populateCompetitionSubsectionModelAttributes(
CompetitionResource competitionResource,
CompetitionSetupSection section,
CompetitionSetupSubsection subsection,
Optional<Long> objectId
); @Override CompetitionSetupForm getSectionFormData(CompetitionResource competitionResource,
CompetitionSetupSection section); @Override CompetitionSetupForm getSubsectionFormData(CompetitionResource competitionResource,
CompetitionSetupSection section,
CompetitionSetupSubsection subsection,
Optional<Long> objectId); @Override ServiceResult<Void> saveCompetitionSetupSection(CompetitionSetupForm competitionSetupForm,
CompetitionResource competitionResource,
CompetitionSetupSection section); @Override ServiceResult<Void> saveCompetitionSetupSubsection(CompetitionSetupForm competitionSetupForm,
CompetitionResource competitionResource,
CompetitionSetupSection section,
CompetitionSetupSubsection subsection); @Override boolean hasInitialDetailsBeenPreviouslySubmitted(Long competitionId); @Override boolean isCompetitionReadyToOpen(CompetitionResource competitionResource); @Override ServiceResult<Void> setCompetitionAsReadyToOpen(Long competitionId); @Override ServiceResult<Void> setCompetitionAsCompetitionSetup(Long competitionId); @Override ServiceResult<Void> deleteCompetition(long competitionId); } | @Test public void isCompetitionReadyToOpen() { CompetitionResource competitionResource = newCompetitionResource() .withId(COMPETITION_ID) .withCompetitionStatus(CompetitionStatus.COMPETITION_SETUP) .withStartDate(ZonedDateTime.now().plusDays(1)).build(); Map<CompetitionSetupSection, Optional<Boolean>> testSectionStatus = asMap( INITIAL_DETAILS, Optional.of(Boolean.TRUE), CompetitionSetupSection.ADDITIONAL_INFO, Optional.of(Boolean.TRUE), CompetitionSetupSection.PROJECT_ELIGIBILITY, Optional.of(Boolean.TRUE), CompetitionSetupSection.ORGANISATIONAL_ELIGIBILITY, Optional.of(Boolean.TRUE), CompetitionSetupSection.MILESTONES, Optional.of(Boolean.TRUE), CompetitionSetupSection.APPLICATION_FORM, Optional.of(Boolean.TRUE), CompetitionSetupSection.ASSESSORS, Optional.of(Boolean.FALSE), CompetitionSetupSection.CONTENT, Optional.of(Boolean.TRUE), CompetitionSetupSection.TERMS_AND_CONDITIONS, Optional.of(Boolean.TRUE) ); when(competitionSetupRestService.getSectionStatuses(COMPETITION_ID)).thenReturn(restSuccess(testSectionStatus)); assertTrue(service.isCompetitionReadyToOpen(competitionResource)); }
@Test public void isCompetitionReadyToOpenFailure() { Map<CompetitionSetupSection, Optional<Boolean>> testSectionStatus = new HashMap<>(); testSectionStatus.put(INITIAL_DETAILS, Optional.of(Boolean.TRUE)); testSectionStatus.put(CompetitionSetupSection.ADDITIONAL_INFO, Optional.of(Boolean.FALSE)); testSectionStatus.put(CompetitionSetupSection.PROJECT_ELIGIBILITY, Optional.of(Boolean.TRUE)); testSectionStatus.put(CompetitionSetupSection.MILESTONES, Optional.of(Boolean.TRUE)); testSectionStatus.put(CompetitionSetupSection.APPLICATION_FORM, Optional.of(Boolean.TRUE)); testSectionStatus.put(CompetitionSetupSection.TERMS_AND_CONDITIONS, Optional.of(Boolean.TRUE)); CompetitionResource competitionResource = newCompetitionResource() .withId(COMPETITION_ID) .withCompetitionStatus(CompetitionStatus.COMPETITION_SETUP) .withStartDate(ZonedDateTime.now().plusDays(1)).build(); when(competitionSetupRestService.getSectionStatuses(COMPETITION_ID)).thenReturn(restSuccess(testSectionStatus)); assertFalse(service.isCompetitionReadyToOpen(competitionResource)); } |
CompetitionSetupServiceImpl implements CompetitionSetupService { @Override public ServiceResult<Void> setCompetitionAsReadyToOpen(Long competitionId) { CompetitionResource competitionResource = competitionRestService.getCompetitionById(competitionId).getSuccess(); if (competitionResource.getCompetitionStatus() == CompetitionStatus.READY_TO_OPEN) { return serviceSuccess(); } if (isCompetitionReadyToOpen(competitionResource)) { return competitionSetupRestService.markAsSetup(competitionId).toServiceResult(); } else { return serviceFailure(new Error("competition.setup.not.ready.to.open", HttpStatus.BAD_REQUEST)); } } @Autowired void setCompetitionSetupFormPopulators(Collection<CompetitionSetupFormPopulator> populators); @Autowired void setCompetitionSetupSubsectionFormPopulators(Collection<CompetitionSetupSubsectionFormPopulator> populators); @Autowired void setCompetitionSetupSectionSavers(Collection<CompetitionSetupSectionUpdater> savers); @Autowired void setCompetitionSetupSubsectionSavers(Collection<CompetitionSetupSubsectionUpdater> savers); @Autowired void setCompetitionSetupSectionModelPopulators(Collection<CompetitionSetupSectionModelPopulator> populators); @Autowired void setCompetitionSetupSubsectionModelPopulators(Collection<CompetitionSetupSubsectionModelPopulator> populators); @Override CompetitionSetupViewModel populateCompetitionSectionModelAttributes(
CompetitionResource competitionResource,
UserResource userResource,
CompetitionSetupSection section
); @Override CompetitionSetupSubsectionViewModel populateCompetitionSubsectionModelAttributes(
CompetitionResource competitionResource,
CompetitionSetupSection section,
CompetitionSetupSubsection subsection,
Optional<Long> objectId
); @Override CompetitionSetupForm getSectionFormData(CompetitionResource competitionResource,
CompetitionSetupSection section); @Override CompetitionSetupForm getSubsectionFormData(CompetitionResource competitionResource,
CompetitionSetupSection section,
CompetitionSetupSubsection subsection,
Optional<Long> objectId); @Override ServiceResult<Void> saveCompetitionSetupSection(CompetitionSetupForm competitionSetupForm,
CompetitionResource competitionResource,
CompetitionSetupSection section); @Override ServiceResult<Void> saveCompetitionSetupSubsection(CompetitionSetupForm competitionSetupForm,
CompetitionResource competitionResource,
CompetitionSetupSection section,
CompetitionSetupSubsection subsection); @Override boolean hasInitialDetailsBeenPreviouslySubmitted(Long competitionId); @Override boolean isCompetitionReadyToOpen(CompetitionResource competitionResource); @Override ServiceResult<Void> setCompetitionAsReadyToOpen(Long competitionId); @Override ServiceResult<Void> setCompetitionAsCompetitionSetup(Long competitionId); @Override ServiceResult<Void> deleteCompetition(long competitionId); } | @Test public void setCompetitionAsReadyToOpenWhenReadyToOpen() { CompetitionResource competitionResource = newCompetitionResource() .withId(COMPETITION_ID) .withCompetitionStatus(CompetitionStatus.READY_TO_OPEN) .build(); when(competitionRestService.getCompetitionById(COMPETITION_ID)).thenReturn(restSuccess(competitionResource)); assertTrue(service.setCompetitionAsReadyToOpen(COMPETITION_ID).isSuccess()); verify(competitionRestService, only()).getCompetitionById(COMPETITION_ID); verifyNoMoreInteractions(competitionSetupRestService); }
@Test public void setCompetitionAsReadyToOpenSuccess() { Map<CompetitionSetupSection, Optional<Boolean>> testSectionStatus = new HashMap<>(); testSectionStatus.put(INITIAL_DETAILS, Optional.of(Boolean.TRUE)); testSectionStatus.put(CompetitionSetupSection.ADDITIONAL_INFO, Optional.of(Boolean.TRUE)); testSectionStatus.put(CompetitionSetupSection.PROJECT_ELIGIBILITY, Optional.of(Boolean.TRUE)); testSectionStatus.put(CompetitionSetupSection.ORGANISATIONAL_ELIGIBILITY, Optional.of(Boolean.TRUE)); testSectionStatus.put(CompetitionSetupSection.MILESTONES, Optional.of(Boolean.TRUE)); testSectionStatus.put(CompetitionSetupSection.APPLICATION_FORM, Optional.of(Boolean.TRUE)); testSectionStatus.put(CompetitionSetupSection.ASSESSORS, Optional.of(Boolean.FALSE)); testSectionStatus.put(CompetitionSetupSection.CONTENT, Optional.of(Boolean.TRUE)); testSectionStatus.put(CompetitionSetupSection.TERMS_AND_CONDITIONS, Optional.of(Boolean.TRUE)); CompetitionResource competitionResource = newCompetitionResource() .withId(COMPETITION_ID) .withCompetitionStatus(CompetitionStatus.COMPETITION_SETUP) .build(); when(competitionSetupRestService.getSectionStatuses(COMPETITION_ID)).thenReturn(restSuccess(testSectionStatus)); when(competitionSetupRestService.markAsSetup(COMPETITION_ID)).thenReturn(restSuccess()); when(competitionRestService.getCompetitionById(COMPETITION_ID)).thenReturn(restSuccess(competitionResource)); service.setCompetitionAsReadyToOpen(COMPETITION_ID).getSuccess(); verify(competitionRestService, only()).getCompetitionById(COMPETITION_ID); verify(competitionSetupRestService, times(1)).getSectionStatuses(COMPETITION_ID); verify(competitionSetupRestService, times(1)).markAsSetup(COMPETITION_ID); verifyNoMoreInteractions(competitionSetupRestService); }
@Test public void setCompetitionAsReadyToOpenFail() { Map<CompetitionSetupSection, Optional<Boolean>> testSectionStatus = new HashMap<>(); testSectionStatus.put(INITIAL_DETAILS, Optional.of(Boolean.TRUE)); testSectionStatus.put(CompetitionSetupSection.ADDITIONAL_INFO, Optional.empty()); testSectionStatus.put(CompetitionSetupSection.PROJECT_ELIGIBILITY, Optional.of(Boolean.TRUE)); testSectionStatus.put(CompetitionSetupSection.MILESTONES, Optional.of(Boolean.TRUE)); testSectionStatus.put(CompetitionSetupSection.APPLICATION_FORM,Optional.of( Boolean.TRUE)); testSectionStatus.put(CompetitionSetupSection.TERMS_AND_CONDITIONS, Optional.of(Boolean.TRUE)); CompetitionResource competitionResource = newCompetitionResource() .withId(COMPETITION_ID) .withCompetitionStatus(CompetitionStatus.COMPETITION_SETUP) .build(); when(competitionSetupRestService.getSectionStatuses(COMPETITION_ID)).thenReturn(restSuccess(testSectionStatus)); when(competitionRestService.getCompetitionById(COMPETITION_ID)).thenReturn(restSuccess(competitionResource)); ServiceResult<Void> updateResult = service.setCompetitionAsReadyToOpen(COMPETITION_ID); assertTrue(updateResult.isFailure()); assertTrue(updateResult.getFailure().is( new org.innovateuk.ifs.commons.error.Error("competition.setup.not.ready.to.open", BAD_REQUEST))); verify(competitionRestService, only()).getCompetitionById(COMPETITION_ID); verify(competitionSetupRestService, times(1)).getSectionStatuses(COMPETITION_ID); verifyNoMoreInteractions(competitionSetupRestService); } |
CompetitionSetupServiceImpl implements CompetitionSetupService { @Override public ServiceResult<Void> deleteCompetition(long competitionId) { return competitionInviteRestService .getInviteStatistics(competitionId).toServiceResult().andOnSuccess(inviteStatistics -> { if (inviteStatistics.getInvited() > 0 || inviteStatistics.getInviteList() > 0) { return serviceFailure(COMPETITION_WITH_ASSESSORS_CANNOT_BE_DELETED); } else { return competitionSetupRestService.delete(competitionId).toServiceResult(); } }); } @Autowired void setCompetitionSetupFormPopulators(Collection<CompetitionSetupFormPopulator> populators); @Autowired void setCompetitionSetupSubsectionFormPopulators(Collection<CompetitionSetupSubsectionFormPopulator> populators); @Autowired void setCompetitionSetupSectionSavers(Collection<CompetitionSetupSectionUpdater> savers); @Autowired void setCompetitionSetupSubsectionSavers(Collection<CompetitionSetupSubsectionUpdater> savers); @Autowired void setCompetitionSetupSectionModelPopulators(Collection<CompetitionSetupSectionModelPopulator> populators); @Autowired void setCompetitionSetupSubsectionModelPopulators(Collection<CompetitionSetupSubsectionModelPopulator> populators); @Override CompetitionSetupViewModel populateCompetitionSectionModelAttributes(
CompetitionResource competitionResource,
UserResource userResource,
CompetitionSetupSection section
); @Override CompetitionSetupSubsectionViewModel populateCompetitionSubsectionModelAttributes(
CompetitionResource competitionResource,
CompetitionSetupSection section,
CompetitionSetupSubsection subsection,
Optional<Long> objectId
); @Override CompetitionSetupForm getSectionFormData(CompetitionResource competitionResource,
CompetitionSetupSection section); @Override CompetitionSetupForm getSubsectionFormData(CompetitionResource competitionResource,
CompetitionSetupSection section,
CompetitionSetupSubsection subsection,
Optional<Long> objectId); @Override ServiceResult<Void> saveCompetitionSetupSection(CompetitionSetupForm competitionSetupForm,
CompetitionResource competitionResource,
CompetitionSetupSection section); @Override ServiceResult<Void> saveCompetitionSetupSubsection(CompetitionSetupForm competitionSetupForm,
CompetitionResource competitionResource,
CompetitionSetupSection section,
CompetitionSetupSubsection subsection); @Override boolean hasInitialDetailsBeenPreviouslySubmitted(Long competitionId); @Override boolean isCompetitionReadyToOpen(CompetitionResource competitionResource); @Override ServiceResult<Void> setCompetitionAsReadyToOpen(Long competitionId); @Override ServiceResult<Void> setCompetitionAsCompetitionSetup(Long competitionId); @Override ServiceResult<Void> deleteCompetition(long competitionId); } | @Test public void deleteCompetition() { CompetitionInviteStatisticsResource competitionInviteStatisticsResource = newCompetitionInviteStatisticsResource() .build(); when(competitionInviteRestService.getInviteStatistics(COMPETITION_ID)).thenReturn(restSuccess( competitionInviteStatisticsResource)); when(competitionSetupRestService.delete(COMPETITION_ID)).thenReturn(restSuccess()); service.deleteCompetition(COMPETITION_ID).getSuccess(); InOrder inOrder = inOrder(competitionInviteRestService, competitionSetupRestService); inOrder.verify(competitionInviteRestService).getInviteStatistics(COMPETITION_ID); inOrder.verify(competitionSetupRestService).delete(COMPETITION_ID); inOrder.verifyNoMoreInteractions(); }
@Test public void deleteCompetition_assessmentInvitesExist() { CompetitionInviteStatisticsResource competitionInviteStatisticsResource = newCompetitionInviteStatisticsResource() .withInviteList(1) .build(); when(competitionInviteRestService.getInviteStatistics(COMPETITION_ID)).thenReturn(restSuccess( competitionInviteStatisticsResource)); when(competitionSetupRestService.delete(COMPETITION_ID)).thenReturn(restSuccess()); ServiceResult<Void> result = service.deleteCompetition(COMPETITION_ID); assertTrue(result.isFailure()); assertTrue(result.getFailure().is(COMPETITION_WITH_ASSESSORS_CANNOT_BE_DELETED)); verify(competitionInviteRestService, only()).getInviteStatistics(COMPETITION_ID); verify(competitionSetupRestService, never()).delete(isA(Long.class)); } |
PasswordPolicyValidator { public ServiceResult<Void> validatePassword(String password, UserResource userResource) { List<ServiceResult<Void>> exclusionResults = flattenLists(simpleMap(exclusionRules, rule -> simpleMap(exclusionRulePatternGenerators, patternGenerator -> { List<String> excludedWords = rule.exclusionSupplier.apply(new ExclusionRuleTarget(userResource)); if (rule.mustContainAllExcludedWords) { return checkForExclusionWordsWithinPassword(password, rule, patternGenerator, excludedWords); } else { List<ServiceResult<Void>> results = simpleMap(excludedWords, excludedWord -> checkForExclusionWordsWithinPassword(password, rule, patternGenerator, singletonList(excludedWord))); return returnSuccessOrCollateFailures(results); } }) )); return returnSuccessOrCollateFailures(exclusionResults); } ServiceResult<Void> validatePassword(String password, UserResource userResource); ServiceResult<Void> validatePassword(String password, UserResource userResource, Long organisationId); } | @Test public void testValidatePasswordStopsUserUsingFullName() { UserResource user = newUserResource().withFirstName("Bobby").withLastName("Smith").build(); ServiceResult<Void> result = validator.validatePassword("B0bbySmith", user); assertTrue(result.isFailure()); assertTrue(result.getFailure().is(badRequestError(PASSWORD_MUST_NOT_CONTAIN_FIRST_OR_LAST_NAME))); assertTrue(validator.validatePassword("Bobby Smith", user). getFailure().is(badRequestError(PASSWORD_MUST_NOT_CONTAIN_FIRST_OR_LAST_NAME))); assertTrue(validator.validatePassword("B0bby sm1th", user). getFailure().is(badRequestError(PASSWORD_MUST_NOT_CONTAIN_FIRST_OR_LAST_NAME))); assertTrue(validator.validatePassword("sm1thB0bBy ", user). getFailure().is(badRequestError(PASSWORD_MUST_NOT_CONTAIN_FIRST_OR_LAST_NAME))); assertTrue(validator.validatePassword("sst5m1th B0bBYdef", user). getFailure().is(badRequestError(PASSWORD_MUST_NOT_CONTAIN_FIRST_OR_LAST_NAME))); assertTrue(validator.validatePassword("Something different", user).isSuccess()); assertTrue(validator.validatePassword("Babby Smoth", user).isSuccess()); }
@Test public void testValidatePasswordStopsUserUsingFullNameButNotWhenVeryShort() { UserResource user = newUserResource().withFirstName("Jo").withLastName("Om").build(); assertTrue(validator.validatePassword("jolomo 123", user).isSuccess()); assertTrue(validator.validatePassword("Joomla", user).isSuccess()); }
@Test public void testValidatePasswordStopsUserUsingFirstName() { UserResource user = newUserResource().withFirstName("William").withLastName("Shatner").build(); assertTrue(validator.validatePassword("William", user). getFailure().is(badRequestError(PASSWORD_MUST_NOT_CONTAIN_FIRST_OR_LAST_NAME))); assertTrue(validator.validatePassword("w1LLiaM", user). getFailure().is(badRequestError(PASSWORD_MUST_NOT_CONTAIN_FIRST_OR_LAST_NAME))); assertTrue(validator.validatePassword("123w1LLiaM456", user). getFailure().is(badRequestError(PASSWORD_MUST_NOT_CONTAIN_FIRST_OR_LAST_NAME))); assertTrue(validator.validatePassword("w1LLster", user).isSuccess()); }
@Test public void testValidatePasswordStopsUserUsingFirstNameButNotWhenVeryShort() { UserResource user = newUserResource().withFirstName("Jo").withLastName("Shatner").build(); assertTrue(validator.validatePassword("joomla", user).isSuccess()); }
@Test public void testValidatePasswordStopsUserUsingLastName() { UserResource user = newUserResource().withFirstName("William").withLastName("Shatner").build(); assertTrue(validator.validatePassword("Shatner", user). getFailure().is(badRequestError(PASSWORD_MUST_NOT_CONTAIN_FIRST_OR_LAST_NAME))); assertTrue(validator.validatePassword("sh4tner", user). getFailure().is(badRequestError(PASSWORD_MUST_NOT_CONTAIN_FIRST_OR_LAST_NAME))); assertTrue(validator.validatePassword("123sh4tner456", user). getFailure().is(badRequestError(PASSWORD_MUST_NOT_CONTAIN_FIRST_OR_LAST_NAME))); }
@Test public void testValidatePasswordStopsUserUsingLastNameButNotWhenVeryShort() { UserResource user = newUserResource().withFirstName("William").withLastName("Lo").build(); assertTrue(validator.validatePassword("highlow", user).isSuccess()); }
@Test public void testValidatePasswordStopsUserUsingOrganisationName() { User user = newUser(). withId(13L). withFirstName("Steve"). withLastName("Smith"). build(); Organisation org1 = newOrganisation().withId(123L).withName("Empire Ltd").build(); Organisation org2 = newOrganisation().withId(456L).withName("EGGS").build(); when(userRepositoryMock.findById(user.getId())).thenReturn(Optional.of(user)); when(organisationRepositoryMock.findDistinctByProcessRolesUserId(user.getId())).thenReturn(asList(org1, org2)); UserResource userResource = newUserResource(). withId(13L). withFirstName("Steve"). withLastName("Smith"). build(); assertTrue(validator.validatePassword("Empire Ltd", userResource). getFailure().is(badRequestError(PASSWORD_MUST_NOT_CONTAIN_ORGANISATION_NAME))); assertTrue(validator.validatePassword("EGGS", userResource). getFailure().is(badRequestError(PASSWORD_MUST_NOT_CONTAIN_ORGANISATION_NAME))); assertTrue(validator.validatePassword("123Empire Ltd456", userResource). getFailure().is(badRequestError(PASSWORD_MUST_NOT_CONTAIN_ORGANISATION_NAME))); assertTrue(validator.validatePassword("456eggs456", userResource). getFailure().is(badRequestError(PASSWORD_MUST_NOT_CONTAIN_ORGANISATION_NAME))); assertTrue(validator.validatePassword("456eggsempire ltd456", userResource). getFailure().is(badRequestError(PASSWORD_MUST_NOT_CONTAIN_ORGANISATION_NAME))); }
@Test public void testValidatePasswordUsingSpecialCharactersInOrganisationName() { User user = newUser(). withId(13L). withFirstName("Steve"). withLastName("Smith"). build(); Organisation org1 = newOrganisation().withId(123L).withName("(((£&").build(); when(userRepositoryMock.findById(user.getId())).thenReturn(Optional.of(user)); when(organisationRepositoryMock.findDistinctByProcessRolesUserId(user.getId())).thenReturn(asList(org1)); UserResource userResource = newUserResource(). withId(13L). withFirstName("Steve"). withLastName("Smith"). build(); assertTrue(validator.validatePassword("jenny", userResource).isSuccess()); }
@Test public void testValidatePasswordStopsUserUsingOrganisationNameButNotWhenVeryShort() { User user = newUser().withId(13L).withFirstName("William").withLastName("Lo").build(); Organisation org1 = newOrganisation().withId(123L).withName("Hi").build(); Organisation org2 = newOrganisation().withId(456L).withName("lo").build(); when(userRepositoryMock.findById(user.getId())).thenReturn(Optional.of(user)); when(organisationRepositoryMock.findDistinctByProcessRolesUserId(user.getId())).thenReturn(asList(org1, org2)); UserResource userResource = newUserResource(). withId(13L). withFirstName("William"). withLastName("Lo"). build(); assertTrue(validator.validatePassword("highlow", userResource).isSuccess()); }
@Test public void testValidatePasswordOrganisationConstraintIgnoresOrganisationMissingName() { User user = newUser().withId(13L).withFirstName("William").withLastName("Lo").build(); Organisation org1 = newOrganisation().withName().withId(123L).build(); Organisation org2 = newOrganisation().withName().withId(456L).build(); when(userRepositoryMock.findById(user.getId())).thenReturn(Optional.of(user)); when(organisationRepositoryMock.findDistinctByProcessRolesUserId(user.getId())).thenReturn(asList(org1, org2)); UserResource userResource = newUserResource(). withId(13L). withFirstName("William"). withLastName("Lo"). build(); assertTrue(validator.validatePassword("highlow", userResource).isSuccess()); } |
CompetitionSetupMilestoneServiceImpl implements CompetitionSetupMilestoneService { @Override public ServiceResult<List<MilestoneResource>> createMilestonesForIFSCompetition(Long competitionId) { List<MilestoneResource> newMilestones = new ArrayList<>(); Stream.of(MilestoneType.presetValues()).filter(milestoneType -> !milestoneType.isOnlyNonIfs()).forEach(type -> newMilestones.add(milestoneRestService.create(type, competitionId).getSuccess()) ); return serviceSuccess(newMilestones); } @Override ServiceResult<List<MilestoneResource>> createMilestonesForIFSCompetition(Long competitionId); @Override ServiceResult<Void> updateMilestonesForCompetition(List<MilestoneResource> milestones, Map<String, GenericMilestoneRowForm> milestoneEntries, Long competitionId); @Override List<Error> validateMilestoneDates(Map<String, GenericMilestoneRowForm> milestonesFormEntries); @Override boolean isMilestoneDateValid(Integer day, Integer month, Integer year); void sortMilestones(MilestonesForm milestoneForm); } | @Test public void testCreateMilestonesForCompetition() { when(milestoneRestService.create(any(MilestoneType.class), anyLong())).thenReturn(restSuccess(newMilestoneResource().with( (integer, milestoneResource) -> milestoneResource.setType(MilestoneType.OPEN_DATE)).build())); List<MilestoneResource> result = service.createMilestonesForIFSCompetition(123L).getSuccess(); result.forEach(milestoneResource -> assertEquals(MilestoneType.OPEN_DATE, milestoneResource.getType())); int numberOfMilestonesExpected = Arrays.stream(MilestoneType.presetValues()) .filter(milestoneType -> !milestoneType.isOnlyNonIfs()).collect(toList()).size(); assertEquals(numberOfMilestonesExpected, result.size()); verify(milestoneRestService, times(numberOfMilestonesExpected)).create(any(MilestoneType.class), anyLong()); } |
CompetitionSetupMilestoneServiceImpl implements CompetitionSetupMilestoneService { @Override public ServiceResult<Void> updateMilestonesForCompetition(List<MilestoneResource> milestones, Map<String, GenericMilestoneRowForm> milestoneEntries, Long competitionId) { List<MilestoneResource> updatedMilestones = new ArrayList<>(); milestones.forEach(milestoneResource -> { GenericMilestoneRowForm milestoneWithUpdate = milestoneEntries.getOrDefault(milestoneResource.getType().name(), null); if(milestoneWithUpdate != null) { ZonedDateTime temp = milestoneWithUpdate.getMilestoneAsZonedDateTime(); if (temp != null) { milestoneResource.setDate(temp); updatedMilestones.add(milestoneResource); } else { milestoneRestService .resetMilestone(milestoneResource) .getSuccess(); } } }); return milestoneRestService.updateMilestones(updatedMilestones).toServiceResult(); } @Override ServiceResult<List<MilestoneResource>> createMilestonesForIFSCompetition(Long competitionId); @Override ServiceResult<Void> updateMilestonesForCompetition(List<MilestoneResource> milestones, Map<String, GenericMilestoneRowForm> milestoneEntries, Long competitionId); @Override List<Error> validateMilestoneDates(Map<String, GenericMilestoneRowForm> milestonesFormEntries); @Override boolean isMilestoneDateValid(Integer day, Integer month, Integer year); void sortMilestones(MilestonesForm milestoneForm); } | @Test public void testUpdateMilestonesForCompetition() { List<MilestoneResource> oldMilestones = singletonList( newMilestoneResource() .with(milestoneResource -> milestoneResource.setType(MilestoneType.SUBMISSION_DATE)) .withDate(LocalDateTime.MAX.atZone(ZoneId.systemDefault())) .build()); LinkedMap<String, GenericMilestoneRowForm> newMilestones = new LinkedMap<>(); MilestoneRowForm milestoneRowForm = new MilestoneRowForm(MilestoneType.SUBMISSION_DATE, LocalDateTime.MIN.atZone(ZoneId.systemDefault())); newMilestones.put(MilestoneType.SUBMISSION_DATE.name(), milestoneRowForm); when(milestoneRestService.updateMilestones(anyListOf(MilestoneResource.class))).thenReturn(restSuccess()); ServiceResult<Void> result = service.updateMilestonesForCompetition(oldMilestones, newMilestones, 123L); assertTrue(result.isSuccess()); GenericMilestoneRowForm newMilestone = newMilestones.get(MilestoneType.SUBMISSION_DATE.name()); assertEquals(Integer.valueOf(LocalDate.MIN.getDayOfMonth()), newMilestone.getDay()); assertEquals(Integer.valueOf(LocalDate.MIN.getMonthValue()), newMilestone.getMonth()); assertEquals(Integer.valueOf(LocalDate.MIN.getYear()), newMilestone.getYear()); } |
CompetitionSetupMilestoneServiceImpl implements CompetitionSetupMilestoneService { @Override public List<Error> validateMilestoneDates(Map<String, GenericMilestoneRowForm> milestonesFormEntries) { List<Error> errors = new ArrayList<>(); milestonesFormEntries.values().forEach(milestone -> { Integer day = milestone.getDay(); Integer month = milestone.getMonth(); Integer year = milestone.getYear(); String fieldName = "milestone-" + milestone.getMilestoneNameType().toUpperCase(); String fieldValidationError = milestone.getMilestoneType().getMilestoneDescription(); if(!validTimeOfMiddayMilestone(milestone)) { errors.add(fieldError(fieldName, "", "error.milestone.invalid", fieldValidationError)); } boolean dateFieldsIncludeNull = (day == null || month == null || year == null); if((dateFieldsIncludeNull || !isMilestoneDateValid(day, month, year))) { errors.add(fieldError(fieldName, "", "error.milestone.invalid", fieldValidationError)); } }); return errors; } @Override ServiceResult<List<MilestoneResource>> createMilestonesForIFSCompetition(Long competitionId); @Override ServiceResult<Void> updateMilestonesForCompetition(List<MilestoneResource> milestones, Map<String, GenericMilestoneRowForm> milestoneEntries, Long competitionId); @Override List<Error> validateMilestoneDates(Map<String, GenericMilestoneRowForm> milestonesFormEntries); @Override boolean isMilestoneDateValid(Integer day, Integer month, Integer year); void sortMilestones(MilestonesForm milestoneForm); } | @Test public void validateMilestoneDatesTrue() { LinkedMap<String, GenericMilestoneRowForm> milestones = new LinkedMap<>(); MilestoneRowForm milestoneRowForm = new MilestoneRowForm(MilestoneType.SUBMISSION_DATE, LocalDateTime.MIN.atZone(ZoneId.systemDefault())); milestones.put(MilestoneType.SUBMISSION_DATE.name(), milestoneRowForm); List<Error> result = service.validateMilestoneDates(milestones); assertTrue(result.isEmpty()); }
@Test public void validateMilestoneDatesFalse() { LinkedMap<String, GenericMilestoneRowForm> milestones = new LinkedMap<>(); MilestoneRowForm milestoneRowForm = new MilestoneRowForm(MilestoneType.SUBMISSION_DATE, LocalDateTime.MAX.atZone(ZoneId.systemDefault())); milestones.put(MilestoneType.SUBMISSION_DATE.name(), milestoneRowForm); List<Error> result = service.validateMilestoneDates(milestones); assertTrue(!result.isEmpty()); } |
CompetitionSetupMilestoneServiceImpl implements CompetitionSetupMilestoneService { @Override public boolean isMilestoneDateValid(Integer day, Integer month, Integer year) { try{ TimeZoneUtil.fromUkTimeZone(year, month, day); return year <= 9999; } catch(DateTimeException dte){ LOG.trace("invalid milestone date", dte); return false; } } @Override ServiceResult<List<MilestoneResource>> createMilestonesForIFSCompetition(Long competitionId); @Override ServiceResult<Void> updateMilestonesForCompetition(List<MilestoneResource> milestones, Map<String, GenericMilestoneRowForm> milestoneEntries, Long competitionId); @Override List<Error> validateMilestoneDates(Map<String, GenericMilestoneRowForm> milestonesFormEntries); @Override boolean isMilestoneDateValid(Integer day, Integer month, Integer year); void sortMilestones(MilestonesForm milestoneForm); } | @Test public void testisMilestoneDateValidTrue() { Boolean resultOne = service.isMilestoneDateValid(1, 1, 1); Boolean resultTwo = service.isMilestoneDateValid(1, 1, 2000); Boolean resultThree = service.isMilestoneDateValid(31, 12, 9999); assertTrue(resultOne); assertTrue(resultTwo); assertTrue(resultThree); }
@Test public void testisMilestoneDateValidFalse() { Boolean resultOne = service.isMilestoneDateValid(Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE); Boolean resultTwo = service.isMilestoneDateValid(Integer.MAX_VALUE, Integer.MIN_VALUE, Integer.MIN_VALUE); Boolean resultThree = service.isMilestoneDateValid(2019, 12, 31); assertFalse(resultOne); assertFalse(resultTwo); assertFalse(resultThree); } |
CompetitionSetupInnovationLeadServiceImpl implements CompetitionSetupInnovationLeadService { @Override public ServiceResult<Void> addInnovationLead(Long competitionId, Long innovationLeadUserId) { return competitionSetupInnovationLeadRestService.addInnovationLead(competitionId, innovationLeadUserId).toServiceResult(); } @Override ServiceResult<Void> addInnovationLead(Long competitionId, Long innovationLeadUserId); @Override ServiceResult<Void> removeInnovationLead(Long competitionId, Long innovationLeadUserId); } | @Test public void addInnovationLead() { long competitionId = 1L; long innovationLeadUserId = 2L; when(competitionSetupInnovationLeadRestService.addInnovationLead(competitionId, innovationLeadUserId)).thenReturn(restSuccess()); competitionSetupInnovationLeadService.addInnovationLead(competitionId, innovationLeadUserId); verify(competitionSetupInnovationLeadRestService).addInnovationLead(competitionId, innovationLeadUserId); } |
CompetitionSetupInnovationLeadServiceImpl implements CompetitionSetupInnovationLeadService { @Override public ServiceResult<Void> removeInnovationLead(Long competitionId, Long innovationLeadUserId) { return competitionSetupInnovationLeadRestService.removeInnovationLead(competitionId, innovationLeadUserId).toServiceResult(); } @Override ServiceResult<Void> addInnovationLead(Long competitionId, Long innovationLeadUserId); @Override ServiceResult<Void> removeInnovationLead(Long competitionId, Long innovationLeadUserId); } | @Test public void removeInnovationLead() { long competitionId = 1L; long innovationLeadUserId = 2L; when(competitionSetupInnovationLeadRestService.removeInnovationLead(competitionId, innovationLeadUserId)).thenReturn(restSuccess()); competitionSetupInnovationLeadService.removeInnovationLead(competitionId, innovationLeadUserId); verify(competitionSetupInnovationLeadRestService).removeInnovationLead(competitionId, innovationLeadUserId); } |
CompetitionSetupPermissionRules { @PermissionRule(value = "MANAGE_INNOVATION_LEAD", description = "Allowed to manage innovation leads") public boolean manageInnovationLead(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser) { return competitionInitialDetailsSet(competitionCompositeId); } @PermissionRule(value = "MANAGE_INNOVATION_LEAD", description = "Allowed to manage innovation leads") boolean manageInnovationLead(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser); @PermissionRule(value = "MANAGE_STAKEHOLDERS", description = "Allowed to manage stakeholders") boolean manageStakeholders(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser); @PermissionRule(value = "MANAGE_COMP_FINANCE_USERS", description = "Allowed to manage competition finance") boolean manageCompetitionFinance(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser); @PermissionRule(value = "CHOOSE_POST_AWARD_SERVICE", description = "Allowed to choose post award service") boolean choosePostAwardService(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser); } | @Test public void manageInnovationLeads() { CompetitionCompositeId competitionId = CompetitionCompositeId.id(14L); CompetitionResource competitionResource = CompetitionResourceBuilder.newCompetitionResource().withSetupComplete(Boolean.TRUE).build(); UserResource loggedInUser = new UserResource(); when(competitionRestService.getCompetitionById(competitionId.id())).thenReturn(restSuccess(competitionResource)); when(competitionSetupService.hasInitialDetailsBeenPreviouslySubmitted(competitionId.id())).thenReturn(true); assertTrue(rules.manageInnovationLead(competitionId, loggedInUser)); } |
CompetitionSetupPermissionRules { @PermissionRule(value = "MANAGE_STAKEHOLDERS", description = "Allowed to manage stakeholders") public boolean manageStakeholders(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser) { return competitionInitialDetailsSet(competitionCompositeId); } @PermissionRule(value = "MANAGE_INNOVATION_LEAD", description = "Allowed to manage innovation leads") boolean manageInnovationLead(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser); @PermissionRule(value = "MANAGE_STAKEHOLDERS", description = "Allowed to manage stakeholders") boolean manageStakeholders(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser); @PermissionRule(value = "MANAGE_COMP_FINANCE_USERS", description = "Allowed to manage competition finance") boolean manageCompetitionFinance(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser); @PermissionRule(value = "CHOOSE_POST_AWARD_SERVICE", description = "Allowed to choose post award service") boolean choosePostAwardService(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser); } | @Test public void manageStakeholders() { CompetitionCompositeId competitionId = CompetitionCompositeId.id(14L); UserResource loggedInUser = new UserResource(); when(competitionSetupService.hasInitialDetailsBeenPreviouslySubmitted(competitionId.id())).thenReturn(Boolean.TRUE); assertTrue(rules.manageStakeholders(competitionId, loggedInUser)); } |
CompetitionSetupPermissionRules { @PermissionRule(value = "MANAGE_COMP_FINANCE_USERS", description = "Allowed to manage competition finance") public boolean manageCompetitionFinance(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser) { return competitionInitialDetailsSet(competitionCompositeId); } @PermissionRule(value = "MANAGE_INNOVATION_LEAD", description = "Allowed to manage innovation leads") boolean manageInnovationLead(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser); @PermissionRule(value = "MANAGE_STAKEHOLDERS", description = "Allowed to manage stakeholders") boolean manageStakeholders(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser); @PermissionRule(value = "MANAGE_COMP_FINANCE_USERS", description = "Allowed to manage competition finance") boolean manageCompetitionFinance(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser); @PermissionRule(value = "CHOOSE_POST_AWARD_SERVICE", description = "Allowed to choose post award service") boolean choosePostAwardService(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser); } | @Test public void manageCompetitionFinance() { CompetitionCompositeId competitionId = CompetitionCompositeId.id(14L); UserResource loggedInUser = new UserResource(); when(competitionSetupService.hasInitialDetailsBeenPreviouslySubmitted(competitionId.id())).thenReturn(Boolean.TRUE); assertTrue(rules.manageCompetitionFinance(competitionId, loggedInUser)); } |
CompetitionSetupPermissionRules { @PermissionRule(value = "CHOOSE_POST_AWARD_SERVICE", description = "Allowed to choose post award service") public boolean choosePostAwardService(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser) { return competitionInitialDetailsSet(competitionCompositeId); } @PermissionRule(value = "MANAGE_INNOVATION_LEAD", description = "Allowed to manage innovation leads") boolean manageInnovationLead(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser); @PermissionRule(value = "MANAGE_STAKEHOLDERS", description = "Allowed to manage stakeholders") boolean manageStakeholders(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser); @PermissionRule(value = "MANAGE_COMP_FINANCE_USERS", description = "Allowed to manage competition finance") boolean manageCompetitionFinance(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser); @PermissionRule(value = "CHOOSE_POST_AWARD_SERVICE", description = "Allowed to choose post award service") boolean choosePostAwardService(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser); } | @Test public void choosePostAwardService() { CompetitionCompositeId competitionId = CompetitionCompositeId.id(14L); UserResource loggedInUser = new UserResource(); when(competitionSetupService.hasInitialDetailsBeenPreviouslySubmitted(competitionId.id())).thenReturn(Boolean.TRUE); assertTrue(rules.choosePostAwardService(competitionId, loggedInUser)); } |
TermsAndConditionsModelPopulator implements CompetitionSetupSectionModelPopulator { @Override public CompetitionSetupSection sectionToPopulateModel() { return CompetitionSetupSection.TERMS_AND_CONDITIONS; } @Override CompetitionSetupSection sectionToPopulateModel(); @Override CompetitionSetupViewModel populateModel(GeneralSetupViewModel generalViewModel,
CompetitionResource competitionResource); } | @Test public void testSectionToPopulateModel() { CompetitionSetupSection result = populator.sectionToPopulateModel(); assertEquals(CompetitionSetupSection.TERMS_AND_CONDITIONS, result); } |
TermsAndConditionsModelPopulator implements CompetitionSetupSectionModelPopulator { @Override public CompetitionSetupViewModel populateModel(GeneralSetupViewModel generalViewModel, CompetitionResource competitionResource) { List<GrantTermsAndConditionsResource> termsAndConditionsList = termsAndConditionsRestService .getLatestVersionsForAllTermsAndConditions() .getSuccess(); GrantTermsAndConditionsResource termsAndConditions = termsAndConditionsRestService.getById( competitionResource.getTermsAndConditions().getId()).getSuccess(); boolean termsAndConditionsDocUploaded = competitionResource.isCompetitionTermsUploaded(); return new TermsAndConditionsViewModel(generalViewModel, termsAndConditionsList, termsAndConditions, termsAndConditionsDocUploaded); } @Override CompetitionSetupSection sectionToPopulateModel(); @Override CompetitionSetupViewModel populateModel(GeneralSetupViewModel generalViewModel,
CompetitionResource competitionResource); } | @Test public void populateModel() { List<GrantTermsAndConditionsResource> termsAndConditions = newGrantTermsAndConditionsResource().build(1); CompetitionResource competitionResource = newCompetitionResource() .withTermsAndConditions(termsAndConditions.get(0)) .withCompetitionTerms(newFileEntryResource().build()) .build(); when(termsAndConditionsRestService.getById(competitionResource.getTermsAndConditions().getId())) .thenReturn(restSuccess(competitionResource.getTermsAndConditions())); when(termsAndConditionsRestService.getLatestVersionsForAllTermsAndConditions()).thenReturn( restSuccess(termsAndConditions)); TermsAndConditionsViewModel viewModel = (TermsAndConditionsViewModel) populator.populateModel( getBasicGeneralSetupView(competitionResource), competitionResource); assertEquals(CompetitionSetupSection.TERMS_AND_CONDITIONS, viewModel.getGeneral().getCurrentSection()); assertEquals(viewModel.getTermsAndConditionsList(), termsAndConditions); assertEquals(viewModel.getCurrentTermsAndConditions(), termsAndConditions.get(0)); assertTrue(viewModel.isTermsAndConditionsDocUploaded()); } |
TermsAndConditionsFormPopulator implements CompetitionSetupFormPopulator { @Override public CompetitionSetupSection sectionToFill() { return CompetitionSetupSection.TERMS_AND_CONDITIONS; } @Override CompetitionSetupSection sectionToFill(); @Override CompetitionSetupForm populateForm(CompetitionResource competitionResource); } | @Test public void testSectionToFill() { CompetitionSetupSection result = service.sectionToFill(); assertEquals(CompetitionSetupSection.TERMS_AND_CONDITIONS, result); } |
TermsAndConditionsFormPopulator implements CompetitionSetupFormPopulator { @Override public CompetitionSetupForm populateForm(CompetitionResource competitionResource) { TermsAndConditionsForm termsAndConditionsForm = new TermsAndConditionsForm(); termsAndConditionsForm.setTermsAndConditionsId(competitionResource.getTermsAndConditions().getId()); return termsAndConditionsForm; } @Override CompetitionSetupSection sectionToFill(); @Override CompetitionSetupForm populateForm(CompetitionResource competitionResource); } | @Test public void testGetSectionFormDataTermsAndConditions() { GrantTermsAndConditionsResource termsAndConditions = newGrantTermsAndConditionsResource().build(); CompetitionResource competition = newCompetitionResource() .withTermsAndConditions(termsAndConditions).build(); CompetitionSetupForm result = service.populateForm(competition); assertTrue(result instanceof TermsAndConditionsForm); TermsAndConditionsForm form = (TermsAndConditionsForm) result; assertNotNull(form.getTermsAndConditionsId()); assertEquals(form.getTermsAndConditionsId(), termsAndConditions.getId()); } |
MenuModelPopulator implements CompetitionSetupSectionModelPopulator { @Override public CompetitionSetupSection sectionToPopulateModel() { return CompetitionSetupSection.HOME; } @Override CompetitionSetupSection sectionToPopulateModel(); @Override CompetitionSetupViewModel populateModel(GeneralSetupViewModel generalViewModel, CompetitionResource competitionResource); } | @Test public void testSectionToPopulateModel() { CompetitionSetupSection result = populator.sectionToPopulateModel(); assertEquals(CompetitionSetupSection.HOME, result); } |
MenuModelPopulator implements CompetitionSetupSectionModelPopulator { @Override public CompetitionSetupViewModel populateModel(GeneralSetupViewModel generalViewModel, CompetitionResource competitionResource) { PublicContentResource publicContent = publicContentService.getCompetitionById(competitionResource.getId()); Map<CompetitionSetupSection, Optional<Boolean>> statuses = competitionSetupRestService.getSectionStatuses(competitionResource.getId()).getSuccess(); Map<CompetitionSetupSection, Boolean> statusesWithValues = simpleMapKeyAndValue(statuses, key -> key, status -> status.orElse(false)); return new MenuViewModel(generalViewModel, publicContent.getPublishDate(), isPublicContentPublished(publicContent), statusesWithValues); } @Override CompetitionSetupSection sectionToPopulateModel(); @Override CompetitionSetupViewModel populateModel(GeneralSetupViewModel generalViewModel, CompetitionResource competitionResource); } | @Test public void testPopulateModel() { CompetitionResource competition = newCompetitionResource() .withCompetitionCode("code") .withName("name") .withId(COMPETITION_ID) .withResearchCategories(CollectionFunctions.asLinkedSet(2L, 3L)) .build(); ZonedDateTime today = ZonedDateTime.now(); PublicContentResource publicContentResource = newPublicContentResource().withPublishDate(today).build(); when(publicContentService.getCompetitionById(any(Long.class))).thenReturn(publicContentResource); MenuViewModel viewModel = (MenuViewModel) populator.populateModel(getBasicGeneralSetupView(competition), competition); assertEquals(today, viewModel.getPublishDate()); assertEquals(Boolean.TRUE, viewModel.isPublicContentPublished()); assertEquals(CompetitionSetupSection.HOME, viewModel.getGeneral().getCurrentSection()); } |
TermsAndConditionsSectionSaver extends AbstractSectionUpdater implements CompetitionSetupSectionUpdater { @Override public boolean supportsForm(Class<? extends CompetitionSetupForm> clazz) { return TermsAndConditionsForm.class.equals(clazz); } @Override boolean supportsForm(Class<? extends CompetitionSetupForm> clazz); @Override CompetitionSetupSection sectionToSave(); } | @Test public void supportsForm() { assertTrue(saver.supportsForm(TermsAndConditionsForm.class)); assertFalse(saver.supportsForm(InitialDetailsForm.class)); } |
MilestonesModelPopulator implements CompetitionSetupSectionModelPopulator { @Override public CompetitionSetupSection sectionToPopulateModel() { return CompetitionSetupSection.MILESTONES; } @Override CompetitionSetupSection sectionToPopulateModel(); @Override CompetitionSetupViewModel populateModel(GeneralSetupViewModel generalViewModel, CompetitionResource competitionResource); } | @Test public void testSectionToPopulateModel() { CompetitionSetupSection result = populator.sectionToPopulateModel(); assertEquals(CompetitionSetupSection.MILESTONES, result); } |
MilestonesModelPopulator implements CompetitionSetupSectionModelPopulator { @Override public CompetitionSetupViewModel populateModel(GeneralSetupViewModel generalViewModel, CompetitionResource competitionResource) { return new MilestonesViewModel(generalViewModel); } @Override CompetitionSetupSection sectionToPopulateModel(); @Override CompetitionSetupViewModel populateModel(GeneralSetupViewModel generalViewModel, CompetitionResource competitionResource); } | @Test public void testPopulateModel() { CompetitionResource competitionResource = newCompetitionResource() .withCompetitionCode("code") .withName("name") .withId(8L) .withResearchCategories(CollectionFunctions.asLinkedSet(2L, 3L)) .build(); MilestonesViewModel viewModel = (MilestonesViewModel) populator.populateModel(getBasicGeneralSetupView(competitionResource), competitionResource); assertEquals(CompetitionSetupSection.MILESTONES, viewModel.getGeneral().getCurrentSection()); } |
InnovationAreaAjaxController { @GetMapping("/get-innovation-areas/{innovationSectorId}") @ResponseBody public List<InnovationAreaResource> getInnovationAreas(@PathVariable("innovationSectorId") Long innovationSectorId) { if (CompetitionSpecialSectors.isOpenSector().test(innovationSectorId)) { List<InnovationAreaResource> returningList = categoryRestService.getInnovationAreasExcludingNone().getSuccess(); returningList.add(0, createAllInnovationArea()); return returningList; } else { return categoryRestService.getInnovationAreasBySector(innovationSectorId).getSuccess(); } } @GetMapping("/get-innovation-areas/{innovationSectorId}") @ResponseBody List<InnovationAreaResource> getInnovationAreas(@PathVariable("innovationSectorId") Long innovationSectorId); } | @Test public void getInnovationAreas() throws Exception { Long innovationAreaId = 5L; String innovationAreaName = "Innovation Area 1"; long innovationSectorId = 7L; List<InnovationAreaResource> innovationAreas = newInnovationAreaResource() .withId(innovationAreaId) .withName(innovationAreaName) .build(1); when(categoryRestService.getInnovationAreasBySector(innovationSectorId)) .thenReturn(restSuccess(innovationAreas)); mockMvc.perform(get(URL_PREFIX + "/get-innovation-areas/" + innovationSectorId)) .andExpect(status().isOk()) .andExpect(jsonPath("[0]id", is(5))) .andExpect(jsonPath("[0]name", is(innovationAreaName))) .andExpect(jsonPath("[0]type", is(INNOVATION_AREA.toString()))); Mockito.verify(categoryRestService).getInnovationAreasBySector(innovationSectorId); Mockito.verifyNoMoreInteractions(categoryRestService); } |
ManageInnovationLeadsModelPopulator { public ManageInnovationLeadsViewModel populateModel(CompetitionResource competition) { List<UserResource> availableInnovationLeadsNotAssignedToCompetition = competitionSetupInnovationLeadRestService.findAvailableInnovationLeadsNotAssignedToCompetition(competition.getId()).getSuccess(); List<UserResource> innovationLeadsAssignedToCompetition = competitionSetupInnovationLeadRestService.findInnovationLeadsAssignedToCompetition(competition.getId()).getSuccess(); return new ManageInnovationLeadsViewModel(competition.getId(), competition.getName(), competition.getLeadTechnologistName(), competition.getExecutiveName(), competition.getInnovationSectorName(), competition.getInnovationAreaNames(), sortByName(availableInnovationLeadsNotAssignedToCompetition), sortByName(innovationLeadsAssignedToCompetition)); } ManageInnovationLeadsViewModel populateModel(CompetitionResource competition); } | @Test public void populateModel() { Long competitionId = 1L; CompetitionResource competitionResource = newCompetitionResource() .withId(competitionId) .withName("comp name") .withLeadTechnologist(4L) .withLeadTechnologistName("lead technologist name") .withExecutiveName("executive name") .withInnovationSectorName("innovation sector name") .withInnovationAreaNames(EMPTY_SET) .build(); when(competitionSetupInnovationLeadRestService.findAvailableInnovationLeadsNotAssignedToCompetition(competitionId)).thenReturn(restSuccess(availableInnovationLeads)); when(competitionSetupInnovationLeadRestService.findInnovationLeadsAssignedToCompetition(competitionId)).thenReturn(restSuccess(innovationLeadsAssignedToCompetition)); ManageInnovationLeadsViewModel viewModel = populator.populateModel(competitionResource); assertEquals(3, viewModel.getAvailableInnovationLeads().size()); assertEquals(innLead3, viewModel.getAvailableInnovationLeads().get(0)); assertEquals(innLead4, viewModel.getAvailableInnovationLeads().get(1)); assertEquals(1, viewModel.getInnovationLeadsAssignedToCompetition().size()); assertEquals(innLead2, viewModel.getInnovationLeadsAssignedToCompetition().get(0)); assertEquals(competitionId, viewModel.getCompetitionId()); assertEquals(competitionResource.getName(), viewModel.getCompetitionName()); assertEquals(competitionResource.getLeadTechnologistName(), viewModel.getLeadTechnologistName()); assertEquals(competitionResource.getExecutiveName(), viewModel.getExecutiveName()); assertEquals(competitionResource.getInnovationSectorName(), viewModel.getInnovationSectorName()); assertEquals(competitionResource.getInnovationAreaNames(), viewModel.getInnovationAreaNames()); } |
InitialDetailsFormPopulator implements CompetitionSetupFormPopulator { @Override public CompetitionSetupSection sectionToFill() { return CompetitionSetupSection.INITIAL_DETAILS; } @Override CompetitionSetupSection sectionToFill(); @Override CompetitionSetupForm populateForm(CompetitionResource competitionResource); } | @Test public void testSectionToFill() { CompetitionSetupSection result = service.sectionToFill(); assertEquals(CompetitionSetupSection.INITIAL_DETAILS, result); } |
InitialDetailsFormPopulator implements CompetitionSetupFormPopulator { @Override public CompetitionSetupForm populateForm(CompetitionResource competitionResource) { final List<InnovationAreaResource> allInnovationAreas = categoryRestService.getInnovationAreas().getSuccess(); InitialDetailsForm competitionSetupForm = new InitialDetailsForm(); competitionSetupForm.setCompetitionTypeId(competitionResource.getCompetitionType()); competitionSetupForm.setExecutiveUserId(competitionResource.getExecutive()); competitionSetupForm.setInnovationSectorCategoryId(competitionResource.getInnovationSector()); Set<Long> innovationAreaCategoryIds = competitionResource.getInnovationAreas(); competitionSetupForm.setInnovationAreaCategoryIds(setInnovationAreas(innovationAreaCategoryIds, allInnovationAreas)); competitionSetupForm.setInnovationAreaNamesFormatted(getFormattedInnovationAreaNames(innovationAreaCategoryIds, allInnovationAreas)); competitionSetupForm.setInnovationLeadUserId(competitionResource.getLeadTechnologist()); if (competitionResource.getStartDate() != null) { competitionSetupForm.setOpeningDateDay(competitionResource.getStartDate().getDayOfMonth()); competitionSetupForm.setOpeningDateMonth(competitionResource.getStartDate().getMonth().getValue()); competitionSetupForm.setOpeningDateYear(competitionResource.getStartDate().getYear()); } competitionSetupForm.setTitle(competitionResource.getName()); competitionSetupForm.setStateAid(competitionResource.getStateAid()); competitionSetupForm.setFundingType(competitionResource.getFundingType()); return competitionSetupForm; } @Override CompetitionSetupSection sectionToFill(); @Override CompetitionSetupForm populateForm(CompetitionResource competitionResource); } | @Test public void getSectionFormDataInitialDetails() { Set<Long> innovationAreas = Stream.of(6L, 66L).collect(Collectors.toSet()); CompetitionResource competition = newCompetitionResource() .withCompetitionType(4L) .withExecutive(5L) .withInnovationAreas(innovationAreas) .withLeadTechnologist(7L) .withStartDate(ZonedDateTime.of(2000, 1, 2, 3, 4, 0, 0, ZoneId.systemDefault())) .withCompetitionCode("code") .withPafCode("paf") .withName("name") .withBudgetCode("budgetcode") .withStateAid(Boolean.TRUE) .withFundingType(FundingType.GRANT) .withId(8L).build(); List<InnovationAreaResource> innovationAreaCategories = new ArrayList<>(); when(categoryRestService.getInnovationAreas()).thenReturn(restSuccess(innovationAreaCategories)); when(categoryFormatter.format(innovationAreas, innovationAreaCategories)).thenReturn("formattedcategories"); CompetitionSetupForm result = service.populateForm(competition); assertTrue(result instanceof InitialDetailsForm); InitialDetailsForm form = (InitialDetailsForm) result; assertEquals(Long.valueOf(4L), form.getCompetitionTypeId()); assertEquals(Long.valueOf(5L), form.getExecutiveUserId()); assertThat(form.getInnovationAreaCategoryIds(), hasItems(6L, 66L)); assertThat(form.getInnovationAreaCategoryIds(), hasSize(2)); assertEquals("formattedcategories", form.getInnovationAreaNamesFormatted()); assertEquals(Long.valueOf(7L), form.getInnovationLeadUserId()); assertEquals(Integer.valueOf(2), form.getOpeningDateDay()); assertEquals(Integer.valueOf(1), form.getOpeningDateMonth()); assertEquals(Integer.valueOf(2000), form.getOpeningDateYear()); assertEquals("name", form.getTitle()); assertEquals(Boolean.TRUE, form.getStateAid()); assertEquals(FundingType.GRANT, form.getFundingType()); }
@Test public void getSectionFormDataInitialDetailsWithAllInnovationAreas() { CompetitionResource competition = newCompetitionResource() .withCompetitionType(4L) .withExecutive(5L) .withInnovationAreas(asSet(6L, 7L)) .withLeadTechnologist(7L) .withStartDate(ZonedDateTime.of(2000, 1, 2, 3, 4, 0, 0, ZoneId.systemDefault())) .withCompetitionCode("code") .withPafCode("paf") .withName("name") .withBudgetCode("budgetcode") .withStateAid(Boolean.TRUE) .withId(8L).build(); List<InnovationAreaResource> innovationAreaCategories = newInnovationAreaResource().withId(-1L, 6L, 7L).withName("None", "Innovation area 1", "Innovation area 2").build(3); when(categoryRestService.getInnovationAreas()).thenReturn(restSuccess(innovationAreaCategories)); CompetitionSetupForm result = service.populateForm(competition); assertTrue(result instanceof InitialDetailsForm); InitialDetailsForm form = (InitialDetailsForm) result; assertThat(form.getInnovationAreaCategoryIds(), hasSize(1)); assertEquals("All", form.getInnovationAreaNamesFormatted()); } |
InitialDetailsModelPopulator implements CompetitionSetupSectionModelPopulator<InitialDetailsViewModel> { @Override public CompetitionSetupSection sectionToPopulateModel() { return CompetitionSetupSection.INITIAL_DETAILS; } @Override CompetitionSetupSection sectionToPopulateModel(); @Override InitialDetailsViewModel populateModel(GeneralSetupViewModel generalViewModel, CompetitionResource competitionResource); } | @Test public void sectionToPopulateModel() { CompetitionSetupSection result = populator.sectionToPopulateModel(); assertEquals(CompetitionSetupSection.INITIAL_DETAILS, result); } |
InitialDetailsModelPopulator implements CompetitionSetupSectionModelPopulator<InitialDetailsViewModel> { @Override public InitialDetailsViewModel populateModel(GeneralSetupViewModel generalViewModel, CompetitionResource competitionResource) { return new InitialDetailsViewModel(generalViewModel, userRestService.findByUserRole(COMP_ADMIN).getSuccess(), categoryRestService.getInnovationSectors().getSuccess(), addAllInnovationAreaOption(categoryRestService.getInnovationAreas().getSuccess()), competitionRestService.getCompetitionTypes().getSuccess(), userRestService.findByUserRoleAndUserStatus(INNOVATION_LEAD, ACTIVE).getSuccess(), competitionSetupService.hasInitialDetailsBeenPreviouslySubmitted(competitionResource.getId())); } @Override CompetitionSetupSection sectionToPopulateModel(); @Override InitialDetailsViewModel populateModel(GeneralSetupViewModel generalViewModel, CompetitionResource competitionResource); } | @Test public void populateModel() { long competitionId = 8L; CompetitionResource competition = newCompetitionResource() .withCompetitionCode("code") .withName("name") .withId(competitionId) .withResearchCategories(asLinkedSet(2L, 3L)) .build(); List<UserResource> compExecs = newUserResource().build(1); List<InnovationSectorResource> innovationSectors = newInnovationSectorResource().build(2); List<InnovationAreaResource> innovationAreas = newInnovationAreaResource().build(2); List<CompetitionTypeResource> competitionTypes = newCompetitionTypeResource().build(2); List<UserResource> leadTechs = newUserResource().build(1); when(userRestService.findByUserRole(COMP_ADMIN)).thenReturn(restSuccess(compExecs)); when(categoryRestService.getInnovationSectors()).thenReturn(restSuccess(innovationSectors)); when(categoryRestService.getInnovationAreas()).thenReturn(restSuccess(innovationAreas)); when(competitionRestService.getCompetitionTypes()).thenReturn(restSuccess(competitionTypes)); when(userRestService.findByUserRoleAndUserStatus(INNOVATION_LEAD, ACTIVE)).thenReturn(restSuccess(leadTechs)); when(competitionSetupService.hasInitialDetailsBeenPreviouslySubmitted(competition.getId())).thenReturn(true); InitialDetailsViewModel viewModel = populator.populateModel(getBasicGeneralSetupView(competition), competition); assertEquals(compExecs, viewModel.getCompetitionExecutiveUsers()); assertEquals(innovationSectors, viewModel.getInnovationSectors()); assertTrue(viewModel.getInnovationAreas().containsAll(innovationAreas)); assertEquals(competitionTypes, viewModel.getCompetitionTypes()); assertEquals(leadTechs, viewModel.getInnovationLeadTechUsers()); assertEquals(CompetitionSetupSection.INITIAL_DETAILS, viewModel.getGeneral().getCurrentSection()); assertTrue(viewModel.getRestricted()); InOrder inOrder = inOrder(userRestService, categoryRestService, competitionRestService, userRestService, competitionSetupService); inOrder.verify(userRestService).findByUserRole(COMP_ADMIN); inOrder.verify(categoryRestService).getInnovationSectors(); inOrder.verify(categoryRestService).getInnovationAreas(); inOrder.verify(competitionRestService).getCompetitionTypes(); inOrder.verify(userRestService).findByUserRoleAndUserStatus(INNOVATION_LEAD, ACTIVE); inOrder.verify(competitionSetupService).hasInitialDetailsBeenPreviouslySubmitted(competition.getId()); inOrder.verifyNoMoreInteractions(); } |
AssessorsFormPopulator implements CompetitionSetupFormPopulator { @Override public CompetitionSetupForm populateForm(CompetitionResource competitionResource) { CompetitionAssessmentConfigResource competitionAssessmentConfigResource = competitionAssessmentConfigRestService.findOneByCompetitionId(competitionResource.getId()).getSuccess(); AssessorsForm competitionSetupForm = new AssessorsForm(); competitionSetupForm.setAssessorCount(competitionAssessmentConfigResource.getAssessorCount()); competitionSetupForm.setAssessorPay(competitionAssessmentConfigResource.getAssessorPay() != null ? competitionAssessmentConfigResource.getAssessorPay() : BigDecimal.ZERO); competitionSetupForm.setHasAssessmentPanel(competitionAssessmentConfigResource.getHasAssessmentPanel()); competitionSetupForm.setHasInterviewStage(competitionAssessmentConfigResource.getHasInterviewStage()); competitionSetupForm.setAssessorFinanceView(competitionAssessmentConfigResource.getAssessorFinanceView()); competitionSetupForm.setAverageAssessorScore(competitionAssessmentConfigResource.getIncludeAverageAssessorScoreInNotifications()); return competitionSetupForm; } @Override CompetitionSetupSection sectionToFill(); @Override CompetitionSetupForm populateForm(CompetitionResource competitionResource); } | @Test public void populateForm() { CompetitionResource competition = newCompetitionResource() .withActivityCode("Activity Code") .withCompetitionCode("c123") .withPafCode("p123") .withBudgetCode("b123") .withFunders(CompetitionFundersFixture.getTestCoFunders()) .withId(8L) .build(); CompetitionAssessmentConfigResource competitionAssessmentConfigResource = newCompetitionAssessmentConfigResource() .withIncludeAverageAssessorScoreInNotifications(false) .withAssessorCount(1) .withAssessorPay(BigDecimal.TEN) .withHasAssessmentPanel(FALSE) .withHasInterviewStage(FALSE) .withAssessorFinanceView(AssessorFinanceView.OVERVIEW) .build(); when(competitionAssessmentConfigRestService.findOneByCompetitionId(competition.getId())).thenReturn(restSuccess(competitionAssessmentConfigResource)); CompetitionSetupForm result = populator.populateForm(competition); assertTrue(result instanceof AssessorsForm); AssessorsForm form = (AssessorsForm) result; assertEquals(Integer.valueOf(1), form.getAssessorCount()); assertEquals(BigDecimal.TEN, form.getAssessorPay()); assertEquals(FALSE, form.getHasAssessmentPanel()); assertEquals(FALSE, form.getHasInterviewStage()); assertEquals(OVERVIEW, form.getAssessorFinanceView()); } |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.