Datasets:
Minata
/
src_fm_fc_ms_ff_method2testcases_v0

Dataset card Data Studio Files Community
1
src_fm_fc_ms_ff
stringlengths
43
86.8k
target
stringlengths
20
276k
CompetitionSetupStakeholderController { @PreAuthorize("hasPermission(#competitionId, 'org.innovateuk.ifs.competition.resource.CompetitionCompositeId', 'MANAGE_STAKEHOLDERS')") @GetMapping("/{competitionId}/manage-stakeholders") public String manageStakeholders(@PathVariable(COMPETITION_ID_KEY) long competitionId, @RequestParam(value = "tab", defaultValue = DEFAULT_TAB) String tab, Model model) { InviteStakeholderForm form = new InviteStakeholderForm(); return doViewManageStakeholders(competitionId, model, form, tab); } @PreAuthorize("hasPermission(#competitionId, 'org.innovateuk.ifs.competition.resource.CompetitionCompositeId', 'MANAGE_STAKEHOLDERS')") @GetMapping("/{competitionId}/manage-stakeholders") String manageStakeholders(@PathVariable(COMPETITION_ID_KEY) long competitionId, @RequestParam(value = "tab", defaultValue = DEFAULT_TAB) String tab, Model model); @PostMapping(value = "/{competitionId}/manage-stakeholders", params = {"inviteStakeholder"}) String inviteStakeholder(@PathVariable(COMPETITION_ID_KEY) long competitionId, @RequestParam(value = "tab", defaultValue = DEFAULT_TAB) String tab, Model model, @Valid @ModelAttribute(FORM_ATTR_NAME) InviteStakeholderForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler); @PostMapping(value = "/{competitionId}/manage-stakeholders", params = {"addStakeholder"}) String addStakeholder(@PathVariable(COMPETITION_ID_KEY) long competitionId, @RequestParam("stakeholderUserId") long stakeholderUserId, Model model); @PostMapping(value = "/{competitionId}/manage-stakeholders", params = {"removeStakeholder"}) String removeStakeholder(@PathVariable(COMPETITION_ID_KEY) long competitionId, @RequestParam("stakeholderUserId") long stakeholderUserId, Model model); }
@Test public void manageStakeholders() throws Exception { String competitionName = "competitionName"; String tab = "add"; CompetitionResource competitionResource = CompetitionResourceBuilder.newCompetitionResource() .withId(COMPETITION_ID) .withName(competitionName) .build(); ManageStakeholderViewModel viewModel = new ManageStakeholderViewModel(COMPETITION_ID, competitionName, emptyList(), emptyList(), emptyList(), tab); when(competitionRestService.getCompetitionById(COMPETITION_ID)).thenReturn(restSuccess(competitionResource)); when(manageStakeholderModelPopulator.populateModel(competitionResource, tab)).thenReturn(viewModel); mockMvc.perform(MockMvcRequestBuilders.get("/competition/setup/{competitionId}/manage-stakeholders", COMPETITION_ID)) .andExpect(status().isOk()) .andExpect(view().name("competition/setup/manage-stakeholders")) .andExpect(model().attribute("model", viewModel)) .andExpect(model().attribute("form", new InviteStakeholderForm())); }
CompetitionSetupStakeholderController { @PostMapping(value = "/{competitionId}/manage-stakeholders", params = {"inviteStakeholder"}) public String inviteStakeholder(@PathVariable(COMPETITION_ID_KEY) long competitionId, @RequestParam(value = "tab", defaultValue = DEFAULT_TAB) String tab, Model model, @Valid @ModelAttribute(FORM_ATTR_NAME) InviteStakeholderForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler) { Supplier<String> failureView = () -> doViewManageStakeholders(competitionId, model, form, tab); form.setVisible(true); return validationHandler.failNowOrSucceedWith(failureView, () -> { InviteUserResource inviteUserResource = constructInviteUserResource(form); RestResult<Void> saveResult = competitionSetupStakeholderRestService.inviteStakeholder(inviteUserResource, competitionId); return handleInviteStakeholderErrors(saveResult, validationHandler, form). failNowOrSucceedWith(failureView, () -> "redirect:/competition/setup/" + competitionId + "/manage-stakeholders?tab=" + tab); }); } @PreAuthorize("hasPermission(#competitionId, 'org.innovateuk.ifs.competition.resource.CompetitionCompositeId', 'MANAGE_STAKEHOLDERS')") @GetMapping("/{competitionId}/manage-stakeholders") String manageStakeholders(@PathVariable(COMPETITION_ID_KEY) long competitionId, @RequestParam(value = "tab", defaultValue = DEFAULT_TAB) String tab, Model model); @PostMapping(value = "/{competitionId}/manage-stakeholders", params = {"inviteStakeholder"}) String inviteStakeholder(@PathVariable(COMPETITION_ID_KEY) long competitionId, @RequestParam(value = "tab", defaultValue = DEFAULT_TAB) String tab, Model model, @Valid @ModelAttribute(FORM_ATTR_NAME) InviteStakeholderForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler); @PostMapping(value = "/{competitionId}/manage-stakeholders", params = {"addStakeholder"}) String addStakeholder(@PathVariable(COMPETITION_ID_KEY) long competitionId, @RequestParam("stakeholderUserId") long stakeholderUserId, Model model); @PostMapping(value = "/{competitionId}/manage-stakeholders", params = {"removeStakeholder"}) String removeStakeholder(@PathVariable(COMPETITION_ID_KEY) long competitionId, @RequestParam("stakeholderUserId") long stakeholderUserId, Model model); }
@Test public void inviteStakeholderWhenInviteFails() throws Exception { String tab = "add"; String competitionName = "competitionName"; CompetitionResource competitionResource = CompetitionResourceBuilder.newCompetitionResource() .withId(COMPETITION_ID) .withName(competitionName) .build(); ManageStakeholderViewModel viewModel = new ManageStakeholderViewModel(COMPETITION_ID, competitionName, emptyList(), emptyList(), emptyList(), tab); when(competitionSetupStakeholderRestService.inviteStakeholder(any(), eq(COMPETITION_ID))).thenReturn(restFailure(STAKEHOLDER_INVITE_INVALID_EMAIL)); when(competitionRestService.getCompetitionById(COMPETITION_ID)).thenReturn(restSuccess(competitionResource)); when(manageStakeholderModelPopulator.populateModel(competitionResource, tab)).thenReturn(viewModel); mockMvc.perform(MockMvcRequestBuilders.post("/competition/setup/{competitionId}/manage-stakeholders?inviteStakeholder=inviteStakeholder", COMPETITION_ID). param("firstName", "First"). param("lastName", "Last"). param("emailAddress", "[email protected]")) .andExpect(status().isOk()) .andExpect(view().name("competition/setup/manage-stakeholders")); } @Test public void inviteStakeholderSuccess() throws Exception { when(competitionSetupStakeholderRestService.inviteStakeholder(any(), eq(COMPETITION_ID))).thenReturn(restSuccess()); mockMvc.perform(MockMvcRequestBuilders.post("/competition/setup/{competitionId}/manage-stakeholders?inviteStakeholder=inviteStakeholder", COMPETITION_ID). param("firstName", "First"). param("lastName", "Last"). param("emailAddress", "[email protected]")) .andExpect(status().is3xxRedirection()) .andExpect(view().name("redirect:/competition/setup/" + COMPETITION_ID + "/manage-stakeholders?tab=add")); verify(competitionSetupStakeholderRestService).inviteStakeholder(any(), eq(COMPETITION_ID)); }
CompetitionSetupStakeholderController { @PostMapping(value = "/{competitionId}/manage-stakeholders", params = {"addStakeholder"}) public String addStakeholder(@PathVariable(COMPETITION_ID_KEY) long competitionId, @RequestParam("stakeholderUserId") long stakeholderUserId, Model model) { competitionSetupStakeholderRestService.addStakeholder(competitionId, stakeholderUserId); return "redirect:/competition/setup/" + competitionId + "/manage-stakeholders?tab=" + DEFAULT_TAB; } @PreAuthorize("hasPermission(#competitionId, 'org.innovateuk.ifs.competition.resource.CompetitionCompositeId', 'MANAGE_STAKEHOLDERS')") @GetMapping("/{competitionId}/manage-stakeholders") String manageStakeholders(@PathVariable(COMPETITION_ID_KEY) long competitionId, @RequestParam(value = "tab", defaultValue = DEFAULT_TAB) String tab, Model model); @PostMapping(value = "/{competitionId}/manage-stakeholders", params = {"inviteStakeholder"}) String inviteStakeholder(@PathVariable(COMPETITION_ID_KEY) long competitionId, @RequestParam(value = "tab", defaultValue = DEFAULT_TAB) String tab, Model model, @Valid @ModelAttribute(FORM_ATTR_NAME) InviteStakeholderForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler); @PostMapping(value = "/{competitionId}/manage-stakeholders", params = {"addStakeholder"}) String addStakeholder(@PathVariable(COMPETITION_ID_KEY) long competitionId, @RequestParam("stakeholderUserId") long stakeholderUserId, Model model); @PostMapping(value = "/{competitionId}/manage-stakeholders", params = {"removeStakeholder"}) String removeStakeholder(@PathVariable(COMPETITION_ID_KEY) long competitionId, @RequestParam("stakeholderUserId") long stakeholderUserId, Model model); }
@Test public void addStakeholder() throws Exception { long stakeholderUserId = 2L; when(competitionSetupStakeholderRestService.addStakeholder(COMPETITION_ID, stakeholderUserId)).thenReturn(restSuccess()); mockMvc.perform(MockMvcRequestBuilders.post("/competition/setup/{competitionId}/manage-stakeholders?addStakeholder=addStakeholder&stakeholderUserId={stakeholderUserId}", COMPETITION_ID, stakeholderUserId) ) .andExpect(status().is3xxRedirection()) .andExpect(view().name("redirect:/competition/setup/" + COMPETITION_ID + "/manage-stakeholders?tab=add")); verify(competitionSetupStakeholderRestService).addStakeholder(COMPETITION_ID, stakeholderUserId); }
CompetitionSetupStakeholderController { @PostMapping(value = "/{competitionId}/manage-stakeholders", params = {"removeStakeholder"}) public String removeStakeholder(@PathVariable(COMPETITION_ID_KEY) long competitionId, @RequestParam("stakeholderUserId") long stakeholderUserId, Model model) { competitionSetupStakeholderRestService.removeStakeholder(competitionId, stakeholderUserId); return "redirect:/competition/setup/" + competitionId + "/manage-stakeholders?tab=" + ADDED_TAB; } @PreAuthorize("hasPermission(#competitionId, 'org.innovateuk.ifs.competition.resource.CompetitionCompositeId', 'MANAGE_STAKEHOLDERS')") @GetMapping("/{competitionId}/manage-stakeholders") String manageStakeholders(@PathVariable(COMPETITION_ID_KEY) long competitionId, @RequestParam(value = "tab", defaultValue = DEFAULT_TAB) String tab, Model model); @PostMapping(value = "/{competitionId}/manage-stakeholders", params = {"inviteStakeholder"}) String inviteStakeholder(@PathVariable(COMPETITION_ID_KEY) long competitionId, @RequestParam(value = "tab", defaultValue = DEFAULT_TAB) String tab, Model model, @Valid @ModelAttribute(FORM_ATTR_NAME) InviteStakeholderForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler); @PostMapping(value = "/{competitionId}/manage-stakeholders", params = {"addStakeholder"}) String addStakeholder(@PathVariable(COMPETITION_ID_KEY) long competitionId, @RequestParam("stakeholderUserId") long stakeholderUserId, Model model); @PostMapping(value = "/{competitionId}/manage-stakeholders", params = {"removeStakeholder"}) String removeStakeholder(@PathVariable(COMPETITION_ID_KEY) long competitionId, @RequestParam("stakeholderUserId") long stakeholderUserId, Model model); }
@Test public void removeStakeholder() throws Exception { long stakeholderUserId = 2L; when(competitionSetupStakeholderRestService.removeStakeholder(COMPETITION_ID, stakeholderUserId)).thenReturn(restSuccess()); mockMvc.perform(MockMvcRequestBuilders.post("/competition/setup/{competitionId}/manage-stakeholders?removeStakeholder=removeStakeholder&stakeholderUserId={stakeholderUserId}", COMPETITION_ID, stakeholderUserId) ) .andExpect(status().is3xxRedirection()) .andExpect(view().name("redirect:/competition/setup/" + COMPETITION_ID + "/manage-stakeholders?tab=added")); verify(competitionSetupStakeholderRestService).removeStakeholder(COMPETITION_ID, stakeholderUserId); }
ManageStakeholderModelPopulator { public ManageStakeholderViewModel populateModel(CompetitionResource competition, String tab) { List<UserResource> availableStakeholders = userRestService.findByUserRole(STAKEHOLDER).getSuccess(); List<UserResource> stakeholdersAssignedToCompetition = competitionSetupStakeholderRestService.findStakeholders(competition.getId()).getSuccess(); availableStakeholders.removeAll(stakeholdersAssignedToCompetition); List<UserResource> pendingStakeholderInvitesForCompetition = competitionSetupStakeholderRestService.findPendingStakeholderInvites(competition.getId()).getSuccess(); return new ManageStakeholderViewModel(competition.getId(), competition.getName(), sortByName(availableStakeholders), sortByName(stakeholdersAssignedToCompetition), sortByName(pendingStakeholderInvitesForCompetition), tab); } ManageStakeholderViewModel populateModel(CompetitionResource competition, String tab); }
@Test public void populateModel() { String tab = "add"; String competitionName = "competition1"; CompetitionResource competitionResource = newCompetitionResource() .withId(COMPETITION_ID) .withName(competitionName) .build(); long availableStakeholderUser1 = 14L; long availableStakeholderUser2 = 15L; long stakeholderAssignedToCompetition = 16L; long pendingStakeholderInvitesUser1 = 17L; long pendingStakeholderInvitesUser2 = 18L; List<UserResource> stakeholders = UserResourceBuilder.newUserResource() .withId(availableStakeholderUser1, availableStakeholderUser2, stakeholderAssignedToCompetition) .withFirstName("Sonal", "Rayon", "Kingsley") .withLastName("Dsilva", "Kevin", "Roy") .build(3); List<UserResource> pendingStakeholderInvites = UserResourceBuilder.newUserResource() .withId(pendingStakeholderInvitesUser1, pendingStakeholderInvitesUser2) .withFirstName("Rui", "Lance") .withLastName("Lemos", "Lemos") .build(2); when(userRestServiceMock.findByUserRole(STAKEHOLDER)).thenReturn(restSuccess(stakeholders)); when(competitionSetupStakeholderRestServiceMock.findStakeholders(COMPETITION_ID)).thenReturn(restSuccess(singletonList(stakeholders.get(2)))); when(competitionSetupStakeholderRestServiceMock.findPendingStakeholderInvites(COMPETITION_ID)).thenReturn(restSuccess(pendingStakeholderInvites)); ManageStakeholderViewModel viewModel = populator.populateModel(competitionResource, tab); assertEquals(COMPETITION_ID, viewModel.getCompetitionId()); assertEquals(competitionName, viewModel.getCompetitionName()); assertEquals(2, viewModel.getAvailableStakeholders().size()); assertEquals((Long)availableStakeholderUser2, viewModel.getAvailableStakeholders().get(0).getId()); assertEquals((Long)availableStakeholderUser1, viewModel.getAvailableStakeholders().get(1).getId()); assertEquals(1, viewModel.getStakeholdersAssignedToCompetition().size()); assertEquals((Long)stakeholderAssignedToCompetition, viewModel.getStakeholdersAssignedToCompetition().get(0).getId()); assertEquals((Long)pendingStakeholderInvitesUser2, viewModel.getPendingStakeholderInvitesForCompetition().get(0).getId()); assertEquals((Long)pendingStakeholderInvitesUser1, viewModel.getPendingStakeholderInvitesForCompetition().get(1).getId()); }
ProjectEligibilityModelPopulator implements CompetitionSetupSectionModelPopulator { @Override public CompetitionSetupSection sectionToPopulateModel() { return CompetitionSetupSection.PROJECT_ELIGIBILITY; } ProjectEligibilityModelPopulator(CategoryRestService categoryRestService, CategoryFormatter categoryFormatter, OrganisationTypeRestService organisationTypeRestService); @Override CompetitionSetupSection sectionToPopulateModel(); @Override CompetitionSetupViewModel populateModel( GeneralSetupViewModel generalViewModel, CompetitionResource competitionResource ); }
@Test public void testSectionToPopulateModel() { CompetitionSetupSection result = populator.sectionToPopulateModel(); assertEquals(CompetitionSetupSection.PROJECT_ELIGIBILITY, result); }
CompetitionSetupDocumentController { @GetMapping("/landing-page") public String projectDocumentLandingPage(Model model, @PathVariable(COMPETITION_ID_KEY) long competitionId, @ModelAttribute(LANDING_FORM_ATTR_NAME) LandingPageForm form, UserResource loggedInUser) { Redirect redirect = doViewProjectDocument(model, competitionId, loggedInUser); return redirect.redirect ? redirect.url : "competition/setup"; } @GetMapping("/landing-page") String projectDocumentLandingPage(Model model, @PathVariable(COMPETITION_ID_KEY) long competitionId, @ModelAttribute(LANDING_FORM_ATTR_NAME) LandingPageForm form, UserResource loggedInUser); @PostMapping("/landing-page") String saveProjectDocumentLandingPage(@ModelAttribute(LANDING_FORM_ATTR_NAME) LandingPageForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable(COMPETITION_ID_KEY) long competitionId, UserResource loggedInUser, Model model); @GetMapping("/add") String viewAddProjectDocument(@PathVariable(COMPETITION_ID_KEY) long competitionId, UserResource loggedInUser, Model model); @GetMapping("/{projectDocumentId}/edit") String viewEditProjectDocument(@PathVariable(COMPETITION_ID_KEY) long competitionId, @PathVariable("projectDocumentId") long projectDocumentId, UserResource loggedInUser, Model model); @PostMapping("/save") String saveProjectDocument(@PathVariable(COMPETITION_ID_KEY) long competitionId, Model model, @Valid @ModelAttribute(FORM_ATTR_NAME) ProjectDocumentForm form, BindingResult bindingResult, ValidationHandler validationHandler, UserResource loggedInUser); @PostMapping("/{projectDocumentId}/delete") String deleteProjectDocument(@PathVariable(COMPETITION_ID_KEY) long competitionId, @PathVariable("projectDocumentId") long projectDocumentId, Model model); static final String PROJECT_DOCUMENT_LANDING_REDIRECT; }
@Test public void projectDocumentLandingPage() throws Exception { CompetitionResource competitionResource = newCompetitionResource() .withId(COMPETITION_ID) .withCompetitionStatus(CompetitionStatus.COMPETITION_SETUP) .build(); ProjectDocumentViewModel viewModel = new ProjectDocumentViewModel(null); when(competitionRestService.getCompetitionById(COMPETITION_ID)).thenReturn(restSuccess(competitionResource)); when(competitionSetupService.populateCompetitionSectionModelAttributes(eq(competitionResource), any(), eq(PROJECT_DOCUMENT))).thenReturn(viewModel); ModelMap model = mockMvc.perform(get(URL_PREFIX + "/landing-page")) .andExpect(status().isOk()) .andExpect(view().name("competition/setup")) .andReturn().getModelAndView().getModelMap(); verify(competitionSetupService).populateCompetitionSectionModelAttributes(eq(competitionResource), any(), eq(PROJECT_DOCUMENT)); assertEquals(viewModel, model.get("model")); }
CompetitionSetupDocumentController { @GetMapping("/add") public String viewAddProjectDocument(@PathVariable(COMPETITION_ID_KEY) long competitionId, UserResource loggedInUser, Model model) { Redirect redirect = doViewProjectDocument(model, competitionId, loggedInUser); ProjectDocumentForm form = new ProjectDocumentForm(true, true); return redirect.redirect ? redirect.url : doViewSaveProjectDocument(model, form); } @GetMapping("/landing-page") String projectDocumentLandingPage(Model model, @PathVariable(COMPETITION_ID_KEY) long competitionId, @ModelAttribute(LANDING_FORM_ATTR_NAME) LandingPageForm form, UserResource loggedInUser); @PostMapping("/landing-page") String saveProjectDocumentLandingPage(@ModelAttribute(LANDING_FORM_ATTR_NAME) LandingPageForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable(COMPETITION_ID_KEY) long competitionId, UserResource loggedInUser, Model model); @GetMapping("/add") String viewAddProjectDocument(@PathVariable(COMPETITION_ID_KEY) long competitionId, UserResource loggedInUser, Model model); @GetMapping("/{projectDocumentId}/edit") String viewEditProjectDocument(@PathVariable(COMPETITION_ID_KEY) long competitionId, @PathVariable("projectDocumentId") long projectDocumentId, UserResource loggedInUser, Model model); @PostMapping("/save") String saveProjectDocument(@PathVariable(COMPETITION_ID_KEY) long competitionId, Model model, @Valid @ModelAttribute(FORM_ATTR_NAME) ProjectDocumentForm form, BindingResult bindingResult, ValidationHandler validationHandler, UserResource loggedInUser); @PostMapping("/{projectDocumentId}/delete") String deleteProjectDocument(@PathVariable(COMPETITION_ID_KEY) long competitionId, @PathVariable("projectDocumentId") long projectDocumentId, Model model); static final String PROJECT_DOCUMENT_LANDING_REDIRECT; }
@Test public void viewAddProjectDocument() throws Exception { List<CompetitionDocumentResource> projectDocuments = newCompetitionDocumentResource() .withTitle("Title") .withEditable(true) .withEnabled(true) .build(2); CompetitionResource competitionResource = newCompetitionResource() .withId(COMPETITION_ID) .withCompetitionStatus(CompetitionStatus.COMPETITION_SETUP) .withProjectDocument(projectDocuments) .build(); ProjectDocumentViewModel viewModel = new ProjectDocumentViewModel(null); when(competitionRestService.getCompetitionById(COMPETITION_ID)).thenReturn(restSuccess(competitionResource)); when(competitionSetupService.populateCompetitionSectionModelAttributes(eq(competitionResource), any(), eq(PROJECT_DOCUMENT))).thenReturn(viewModel); ModelMap model = mockMvc.perform(get(URL_PREFIX + "/add")) .andExpect(status().isOk()) .andExpect(view().name("competition/setup/save-project-document")) .andReturn().getModelAndView().getModelMap(); verify(competitionSetupService).populateCompetitionSectionModelAttributes(eq(competitionResource), any(), eq(PROJECT_DOCUMENT)); assertEquals(new ProjectDocumentForm(true, true), model.get("form")); assertEquals(viewModel, model.get("model")); }
CompetitionSetupDocumentController { @GetMapping("/{projectDocumentId}/edit") public String viewEditProjectDocument(@PathVariable(COMPETITION_ID_KEY) long competitionId, @PathVariable("projectDocumentId") long projectDocumentId, UserResource loggedInUser, Model model) { Redirect redirect = doViewProjectDocument(model, competitionId, loggedInUser); return redirect.redirect ? redirect.url : doViewEditProjectDocument(model, projectDocumentId); } @GetMapping("/landing-page") String projectDocumentLandingPage(Model model, @PathVariable(COMPETITION_ID_KEY) long competitionId, @ModelAttribute(LANDING_FORM_ATTR_NAME) LandingPageForm form, UserResource loggedInUser); @PostMapping("/landing-page") String saveProjectDocumentLandingPage(@ModelAttribute(LANDING_FORM_ATTR_NAME) LandingPageForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable(COMPETITION_ID_KEY) long competitionId, UserResource loggedInUser, Model model); @GetMapping("/add") String viewAddProjectDocument(@PathVariable(COMPETITION_ID_KEY) long competitionId, UserResource loggedInUser, Model model); @GetMapping("/{projectDocumentId}/edit") String viewEditProjectDocument(@PathVariable(COMPETITION_ID_KEY) long competitionId, @PathVariable("projectDocumentId") long projectDocumentId, UserResource loggedInUser, Model model); @PostMapping("/save") String saveProjectDocument(@PathVariable(COMPETITION_ID_KEY) long competitionId, Model model, @Valid @ModelAttribute(FORM_ATTR_NAME) ProjectDocumentForm form, BindingResult bindingResult, ValidationHandler validationHandler, UserResource loggedInUser); @PostMapping("/{projectDocumentId}/delete") String deleteProjectDocument(@PathVariable(COMPETITION_ID_KEY) long competitionId, @PathVariable("projectDocumentId") long projectDocumentId, Model model); static final String PROJECT_DOCUMENT_LANDING_REDIRECT; }
@Test public void viewEditProjectDocument() throws Exception { long projectDocumentId = 2L; CompetitionResource competitionResource = newCompetitionResource() .withId(COMPETITION_ID) .withCompetitionStatus(CompetitionStatus.COMPETITION_SETUP) .build(); long fileTypeId = 1L; CompetitionDocumentResource competitionDocumentResource = newCompetitionDocumentResource() .withId(projectDocumentId) .withTitle("Title") .withGuidance("Guidance") .withEditable(true) .withEnabled(true) .withFileType(singletonList(fileTypeId)) .build(); FileTypeResource fileTypeResource = new FileTypeResource(); fileTypeResource.setName("PDF"); ProjectDocumentViewModel viewModel = new ProjectDocumentViewModel(null); when(competitionRestService.getCompetitionById(COMPETITION_ID)).thenReturn(restSuccess(competitionResource)); when(competitionSetupService.populateCompetitionSectionModelAttributes(eq(competitionResource), any(), eq(PROJECT_DOCUMENT))).thenReturn(viewModel); when(competitionSetupDocumentRestService.findOne(projectDocumentId)).thenReturn(restSuccess(competitionDocumentResource)); when(fileTypeRestService.findOne(fileTypeId)).thenReturn(restSuccess(fileTypeResource)); ProjectDocumentForm expectedProjectDocumentForm = new ProjectDocumentForm(projectDocumentId, "Title", "Guidance", true, true); expectedProjectDocumentForm.setPdf(true); expectedProjectDocumentForm.setSpreadsheet(false); ModelMap model = mockMvc.perform(get(URL_PREFIX + "/" + projectDocumentId + "/edit")) .andExpect(status().isOk()) .andExpect(view().name("competition/setup/save-project-document")) .andReturn().getModelAndView().getModelMap(); verify(competitionSetupService).populateCompetitionSectionModelAttributes(eq(competitionResource), any(), eq(PROJECT_DOCUMENT)); assertEquals(expectedProjectDocumentForm, model.get("form")); assertEquals(viewModel, model.get("model")); }
CompetitionSetupDocumentController { @PostMapping("/{projectDocumentId}/delete") public String deleteProjectDocument(@PathVariable(COMPETITION_ID_KEY) long competitionId, @PathVariable("projectDocumentId") long projectDocumentId, Model model) { competitionSetupDocumentRestService.delete(projectDocumentId); return format(PROJECT_DOCUMENT_LANDING_REDIRECT, competitionId); } @GetMapping("/landing-page") String projectDocumentLandingPage(Model model, @PathVariable(COMPETITION_ID_KEY) long competitionId, @ModelAttribute(LANDING_FORM_ATTR_NAME) LandingPageForm form, UserResource loggedInUser); @PostMapping("/landing-page") String saveProjectDocumentLandingPage(@ModelAttribute(LANDING_FORM_ATTR_NAME) LandingPageForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable(COMPETITION_ID_KEY) long competitionId, UserResource loggedInUser, Model model); @GetMapping("/add") String viewAddProjectDocument(@PathVariable(COMPETITION_ID_KEY) long competitionId, UserResource loggedInUser, Model model); @GetMapping("/{projectDocumentId}/edit") String viewEditProjectDocument(@PathVariable(COMPETITION_ID_KEY) long competitionId, @PathVariable("projectDocumentId") long projectDocumentId, UserResource loggedInUser, Model model); @PostMapping("/save") String saveProjectDocument(@PathVariable(COMPETITION_ID_KEY) long competitionId, Model model, @Valid @ModelAttribute(FORM_ATTR_NAME) ProjectDocumentForm form, BindingResult bindingResult, ValidationHandler validationHandler, UserResource loggedInUser); @PostMapping("/{projectDocumentId}/delete") String deleteProjectDocument(@PathVariable(COMPETITION_ID_KEY) long competitionId, @PathVariable("projectDocumentId") long projectDocumentId, Model model); static final String PROJECT_DOCUMENT_LANDING_REDIRECT; }
@Test public void deleteProjectDocument() throws Exception { long projectDocumentId = 2L; when(competitionSetupDocumentRestService.delete(projectDocumentId)).thenReturn(restSuccess()); mockMvc.perform(post(URL_PREFIX + "/{projectDocumentId}/delete", projectDocumentId) ) .andExpect(status().is3xxRedirection()) .andExpect(view().name(format("redirect:/competition/setup/%d/section/project-document/landing-page", COMPETITION_ID))); verify(competitionSetupDocumentRestService).delete(projectDocumentId); }
ProjectDocumentPopulator implements CompetitionSetupSectionModelPopulator { @Override public CompetitionSetupViewModel populateModel(GeneralSetupViewModel generalViewModel, CompetitionResource competitionResource) { return new ProjectDocumentViewModel(generalViewModel); } @Override CompetitionSetupSection sectionToPopulateModel(); @Override CompetitionSetupViewModel populateModel(GeneralSetupViewModel generalViewModel, CompetitionResource competitionResource); }
@Test public void testPopulateModel() { CompetitionResource competitionResource = newCompetitionResource() .withId(COMPETITION_ID) .withName("name") .build(); GeneralSetupViewModel generalSetupViewModel = getBasicGeneralSetupView(competitionResource); ProjectDocumentViewModel viewModel = (ProjectDocumentViewModel) populator.populateModel(generalSetupViewModel, competitionResource); assertEquals(generalSetupViewModel, viewModel.getGeneral()); assertEquals(CompetitionSetupSection.PROJECT_DOCUMENT, viewModel.getGeneral().getCurrentSection()); }
InterviewPermissionRules { @PermissionRule(value = "INTERVIEW", description = "Only project finance or competition admin can see interview panels" + "if the competition is in the correct state.") public boolean interviewPanel(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser) { CompetitionResource competition = competitionRestService.getCompetitionById(competitionCompositeId.id()).getSuccess(); return isInternalAdmin(loggedInUser) && competitionHasInterviewPanel(competition) && !competitionIsInInformOrLater(competition); } @PermissionRule(value = "INTERVIEW", description = "Only project finance or competition admin can see interview panels" + "if the competition is in the correct state.") boolean interviewPanel(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser); @PermissionRule(value = "INTERVIEW_APPLICATIONS", description = "Only project finance or competition admin can " + "see interview panel applications if the competition is in the correct state.") boolean interviewPanelApplications(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser); }
@Test public void interviewPanel() { UserResource loggedInUser = compAdminUser(); for (CompetitionStatus competitionStatus : CompetitionStatus.values()) { final CompetitionResource competitionWithInterviewStage = newCompetitionResource() .withCompetitionStatus(competitionStatus) .build(); CompetitionAssessmentConfigResource competitionAssessmentConfigResourceWithInterviewStage = newCompetitionAssessmentConfigResource() .withIncludeAverageAssessorScoreInNotifications(false) .withAssessorCount(5) .withAssessorPay(BigDecimal.valueOf(100)) .withHasAssessmentPanel(true) .withHasInterviewStage(true) .withAssessorFinanceView(DETAILED) .build(); final CompetitionResource competitionWithoutInterviewStage = newCompetitionResource() .withCompetitionStatus(competitionStatus) .build(); CompetitionAssessmentConfigResource competitionAssessmentConfigResourceWithoutInterviewStage = newCompetitionAssessmentConfigResource() .withIncludeAverageAssessorScoreInNotifications(false) .withAssessorCount(5) .withAssessorPay(BigDecimal.valueOf(100)) .withHasAssessmentPanel(false) .withHasInterviewStage(false) .withAssessorFinanceView(DETAILED) .build(); when(competitionRestService.getCompetitionById(competitionWithInterviewStage.getId())).thenReturn(restSuccess(competitionWithInterviewStage)); when(competitionRestService.getCompetitionById(competitionWithoutInterviewStage.getId())).thenReturn(restSuccess(competitionWithoutInterviewStage)); when(competitionAssessmentConfigRestService.findOneByCompetitionId(competitionWithInterviewStage.getId())).thenReturn(restSuccess(competitionAssessmentConfigResourceWithInterviewStage)); when(competitionAssessmentConfigRestService.findOneByCompetitionId(competitionWithoutInterviewStage.getId())).thenReturn(restSuccess(competitionAssessmentConfigResourceWithoutInterviewStage)); switch (competitionStatus) { case ASSESSOR_FEEDBACK: case PROJECT_SETUP: case PREVIOUS: assertFalse("With interview stage and status " + competitionStatus.toString(), rules.interviewPanel(CompetitionCompositeId.id(competitionWithInterviewStage.getId()), loggedInUser)); break; default: assertTrue("With interview stage and status " + competitionStatus.toString(), rules.interviewPanel(CompetitionCompositeId.id(competitionWithInterviewStage.getId()), loggedInUser)); } assertFalse("Without interview stage and status " + competitionStatus.toString(), rules.interviewPanel(CompetitionCompositeId.id(competitionWithoutInterviewStage.getId()), loggedInUser)); } }
InterviewPermissionRules { @PermissionRule(value = "INTERVIEW_APPLICATIONS", description = "Only project finance or competition admin can " + "see interview panel applications if the competition is in the correct state.") public boolean interviewPanelApplications(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser) { CompetitionResource competition = competitionRestService.getCompetitionById(competitionCompositeId.id()).getSuccess(); return isInternalAdmin(loggedInUser) && competitionHasInterviewPanel(competition) && competitionIsInFundersPanel(competition); } @PermissionRule(value = "INTERVIEW", description = "Only project finance or competition admin can see interview panels" + "if the competition is in the correct state.") boolean interviewPanel(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser); @PermissionRule(value = "INTERVIEW_APPLICATIONS", description = "Only project finance or competition admin can " + "see interview panel applications if the competition is in the correct state.") boolean interviewPanelApplications(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser); }
@Test public void interviewPanelApplications() { UserResource loggedInUser = compAdminUser(); for (CompetitionStatus competitionStatus : CompetitionStatus.values()) { final CompetitionResource competitionWithInterviewStage = newCompetitionResource() .withCompetitionStatus(competitionStatus) .build(); CompetitionAssessmentConfigResource competitionAssessmentConfigResourceWithInterviewStage = newCompetitionAssessmentConfigResource() .withIncludeAverageAssessorScoreInNotifications(false) .withAssessorCount(5) .withAssessorPay(BigDecimal.valueOf(100)) .withHasAssessmentPanel(false) .withHasInterviewStage(true) .withAssessorFinanceView(DETAILED) .build(); final CompetitionResource competitionWithoutInterviewStage = newCompetitionResource() .withCompetitionStatus(competitionStatus) .build(); CompetitionAssessmentConfigResource competitionAssessmentConfigResourceWithoutInterviewStage = newCompetitionAssessmentConfigResource() .withIncludeAverageAssessorScoreInNotifications(false) .withAssessorCount(5) .withAssessorPay(BigDecimal.valueOf(100)) .withHasAssessmentPanel(false) .withHasInterviewStage(false) .withAssessorFinanceView(DETAILED) .build(); when(competitionRestService.getCompetitionById(competitionWithInterviewStage.getId())).thenReturn(restSuccess(competitionWithInterviewStage)); when(competitionRestService.getCompetitionById(competitionWithoutInterviewStage.getId())).thenReturn(restSuccess(competitionWithoutInterviewStage)); when(competitionAssessmentConfigRestService.findOneByCompetitionId(competitionWithInterviewStage.getId())).thenReturn(restSuccess(competitionAssessmentConfigResourceWithInterviewStage)); when(competitionAssessmentConfigRestService.findOneByCompetitionId(competitionWithoutInterviewStage.getId())).thenReturn(restSuccess(competitionAssessmentConfigResourceWithoutInterviewStage)); if (competitionStatus == CompetitionStatus.FUNDERS_PANEL) { assertTrue(rules.interviewPanelApplications(CompetitionCompositeId.id(competitionWithInterviewStage.getId()), loggedInUser)); } else { assertFalse(rules.interviewPanelApplications(CompetitionCompositeId.id(competitionWithInterviewStage.getId()), loggedInUser)); } assertFalse(rules.interviewPanelApplications(CompetitionCompositeId.id(competitionWithoutInterviewStage.getId()), loggedInUser)); } }
InterviewController { @GetMapping public String interviewPanel(@PathVariable("competitionId") long competitionId, Model model) { model.addAttribute("model", interviewModelPopulator.populateModel(competitionId)); return "competition/manage-interview-panel"; } @GetMapping String interviewPanel(@PathVariable("competitionId") long competitionId, Model model); }
@Test public void interviewPanel() throws Exception { long competitionId = 1L; String competitionName = "Competition x"; CompetitionStatus competitionStatus = CLOSED; competitionResource = newCompetitionResource() .with(id(competitionId)) .with(name(competitionName)) .withCompetitionStatus(competitionStatus) .build(); InterviewStatisticsResource keyStats = newInterviewStatisticsResource().build(); when(competitionRestService.getCompetitionById(competitionId)).thenReturn(restSuccess(competitionResource)); when(competitionKeyApplicationStatisticsRestService.getInterviewStatisticsByCompetition(competitionId)) .thenReturn(restSuccess(keyStats)); MvcResult result = mockMvc.perform(get("/assessment/interview/competition/{competitionId}", competitionId)) .andExpect(status().isOk()) .andExpect(view().name("competition/manage-interview-panel")) .andReturn(); InterviewViewModel model = (InterviewViewModel) result.getModelAndView().getModel().get("model"); verify(competitionRestService, only()).getCompetitionById(competitionId); assertEquals(competitionId, model.getCompetitionId()); assertEquals(competitionName, model.getCompetitionName()); assertEquals(competitionStatus, model.getCompetitionStatus()); assertEquals(keyStats, model.getKeyStats()); }
InterviewAllocationController extends CompetitionManagementCookieController<InterviewAllocationSelectionForm> { @GetMapping("/allocate-assessors") public String overview(Model model, @PathVariable("competitionId") long competitionId, @RequestParam MultiValueMap<String, String> queryParams, @RequestParam(value = "page", defaultValue = "0") int page) { CompetitionResource competitionResource = competitionRestService.getCompetitionById(competitionId).getSuccess(); model.addAttribute("model", interviewAcceptedAssessorsModelPopulator.populateModel( competitionResource )); return "assessors/interview/allocate-accepted-assessors"; } @GetMapping("/allocate-assessors") String overview(Model model, @PathVariable("competitionId") long competitionId, @RequestParam MultiValueMap<String, String> queryParams, @RequestParam(value = "page", defaultValue = "0") int page); @GetMapping("/unallocated-applications/{assessorId}") String applications(@ModelAttribute(name = SELECTION_FORM, binding = false) InterviewAllocationSelectionForm selectionForm, Model model, @PathVariable("competitionId") long competitionId, @PathVariable("assessorId") long assessorId, @RequestParam(value = "page", defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response); @GetMapping("/allocated-applications/{userId}") String allocated(@ModelAttribute(name = SELECTION_FORM, binding = false) InterviewAllocationSelectionForm selectionForm, Model model, @PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, @RequestParam(value = "page", defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response); @PostMapping("/allocate-applications/{userId}/addSelected") String allocateApplications(@PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId); @GetMapping("/allocate-applications/{userId}") String allocateApplications(Model model, @ModelAttribute(name = "form", binding = false) InterviewAllocationNotifyForm form, @PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, HttpServletRequest request); @PostMapping("/allocated-applications/{userId}") String removeApplication(@PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, @RequestParam("removeApplication") long applicationId); @PostMapping("/allocate-applications/{userId}") String notifyAssessor(Model model, @ModelAttribute(name = "form") InterviewAllocationNotifyForm form, @PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/allocate-applications/{userId}", params = {"remove"}) String removeInviteFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, @RequestParam(name = "remove") long removeId, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/unallocated-applications/{userId}", params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, @RequestParam("addAll") boolean addAll, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/unallocated-applications/{userId}", params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForInviteList( @PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, @RequestParam("selectionId") long assessorId, @RequestParam("isSelected") boolean isSelected, HttpServletRequest request, HttpServletResponse response); }
@Test public void overview() throws Exception { int page = 0; CompetitionResource competition = newCompetitionResource() .withId(1L) .withName("Competition x") .build(); when(competitionRestService.getCompetitionById(competition.getId())).thenReturn(restSuccess(competition)); InterviewAcceptedAssessorsResource interviewAcceptedAssessorsResource = newInterviewAcceptedAssessorsResource() .build(); InterviewAcceptedAssessorsRowViewModel assessors = new InterviewAcceptedAssessorsRowViewModel(interviewAcceptedAssessorsResource); InterviewAcceptedAssessorsPageResource pageResource = newInterviewAcceptedAssessorsPageResource() .withContent(singletonList(interviewAcceptedAssessorsResource)) .build(); when(interviewAllocationRestService.getInterviewAcceptedAssessors(competition.getId(), page)).thenReturn(restSuccess(pageResource)); MvcResult result = mockMvc.perform(get("/assessment/interview/competition/{competitionId}/assessors/allocate-assessors", competition.getId()) .param("page", "0")) .andExpect(status().isOk()) .andExpect(model().attributeExists("model")) .andExpect(view().name("assessors/interview/allocate-accepted-assessors")) .andReturn(); InterviewAcceptedAssessorsViewModel model = (InterviewAcceptedAssessorsViewModel) result.getModelAndView().getModel().get("model"); InOrder inOrder = inOrder(competitionRestService, interviewAllocationRestService); inOrder.verify(competitionRestService).getCompetitionById(competition.getId()); inOrder.verify(interviewAllocationRestService).getInterviewAcceptedAssessors(competition.getId(), page); inOrder.verifyNoMoreInteractions(); assertEquals((long) competition.getId(), model.getCompetitionId()); assertEquals(competition.getName(), model.getCompetitionName()); assertEquals(singletonList(assessors), model.getAssessors()); }
InterviewAllocationController extends CompetitionManagementCookieController<InterviewAllocationSelectionForm> { @GetMapping("/unallocated-applications/{assessorId}") public String applications(@ModelAttribute(name = SELECTION_FORM, binding = false) InterviewAllocationSelectionForm selectionForm, Model model, @PathVariable("competitionId") long competitionId, @PathVariable("assessorId") long assessorId, @RequestParam(value = "page", defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response) { updateSelectionForm(request, response, competitionId, assessorId, selectionForm); model.addAttribute("model", unallocatedInterviewApplicationsModelPopulator.populateModel( competitionId, assessorId, page )); return "assessors/interview/unallocated-applications"; } @GetMapping("/allocate-assessors") String overview(Model model, @PathVariable("competitionId") long competitionId, @RequestParam MultiValueMap<String, String> queryParams, @RequestParam(value = "page", defaultValue = "0") int page); @GetMapping("/unallocated-applications/{assessorId}") String applications(@ModelAttribute(name = SELECTION_FORM, binding = false) InterviewAllocationSelectionForm selectionForm, Model model, @PathVariable("competitionId") long competitionId, @PathVariable("assessorId") long assessorId, @RequestParam(value = "page", defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response); @GetMapping("/allocated-applications/{userId}") String allocated(@ModelAttribute(name = SELECTION_FORM, binding = false) InterviewAllocationSelectionForm selectionForm, Model model, @PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, @RequestParam(value = "page", defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response); @PostMapping("/allocate-applications/{userId}/addSelected") String allocateApplications(@PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId); @GetMapping("/allocate-applications/{userId}") String allocateApplications(Model model, @ModelAttribute(name = "form", binding = false) InterviewAllocationNotifyForm form, @PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, HttpServletRequest request); @PostMapping("/allocated-applications/{userId}") String removeApplication(@PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, @RequestParam("removeApplication") long applicationId); @PostMapping("/allocate-applications/{userId}") String notifyAssessor(Model model, @ModelAttribute(name = "form") InterviewAllocationNotifyForm form, @PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/allocate-applications/{userId}", params = {"remove"}) String removeInviteFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, @RequestParam(name = "remove") long removeId, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/unallocated-applications/{userId}", params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, @RequestParam("addAll") boolean addAll, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/unallocated-applications/{userId}", params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForInviteList( @PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, @RequestParam("selectionId") long assessorId, @RequestParam("isSelected") boolean isSelected, HttpServletRequest request, HttpServletResponse response); }
@Test public void applications() throws Exception { CompetitionResource competition = newCompetitionResource() .withId(1L) .withName("Competition x") .build(); UserResource user = newUserResource() .withId(1L) .withFirstName("Kieran") .withLastName("Hester") .build(); List<InnovationAreaResource> innovationAreas = newInnovationAreaResource() .withSector(1L, 2L) .withSectorName("Sector1", "Sector2") .build(2); ProfileResource profile = newProfileResource() .withInnovationAreas(innovationAreas) .withSkillsAreas("Skills") .withBusinessType(BusinessType.ACADEMIC) .build(); AssessorProfileResource assessorProfile = newAssessorProfileResource() .withUser(user) .withProfile(profile) .build(); InterviewApplicationPageResource pageResource = newInterviewApplicationPageResource() .withAllocatedApplications(1L) .withUnallocatedApplications(2L) .withContent(newInterviewApplicationResource() .withId(1L, 2L) .withLeadOrganisation("Lead 1", "Lead 2") .withNumberOfAssessors(1L, 2L) .build(2)) .build(); when(userRestServiceMock.retrieveUserById(user.getId())).thenReturn(restSuccess(user)); when(competitionRestService.getCompetitionById(competition.getId())).thenReturn(restSuccess(competition)); when(assessorRestService.getAssessorProfile(user.getId())).thenReturn(restSuccess(assessorProfile)); when(interviewAllocationRestService.getUnallocatedApplications(competition.getId(), user.getId(), 0)).thenReturn(restSuccess(pageResource)); MvcResult result = mockMvc.perform(get("/assessment/interview/competition/{competitionId}/assessors/unallocated-applications/{userId}", competition.getId(), user.getId())) .andExpect(status().isOk()) .andExpect(model().attributeExists("model")) .andExpect(view().name("assessors/interview/unallocated-applications")) .andReturn(); InterviewAssessorApplicationsViewModel model = (InterviewAssessorApplicationsViewModel) result.getModelAndView().getModel().get("model"); InOrder inOrder = inOrder(competitionRestService, userRestServiceMock, assessorRestService); inOrder.verify(userRestServiceMock).retrieveUserById(user.getId()); inOrder.verify(competitionRestService).getCompetitionById(competition.getId()); inOrder.verify(assessorRestService).getAssessorProfile(user.getId()); inOrder.verifyNoMoreInteractions(); assertEquals((long) competition.getId(), model.getCompetitionId()); assertEquals(competition.getName(), model.getCompetitionName()); assertEquals(profile.getBusinessType(), model.getProfile().getBusinessType()); assertEquals(profile.getSkillsAreas(), model.getProfile().getSkillsAreas()); assertEquals(pageResource.getAllocatedApplications(), model.getAllocatedApplications()); assertEquals(pageResource.getUnallocatedApplications(), model.getUnallocatedApplications()); assertEquals(pageResource.getContent().size(), model.getRows().size()); }
InterviewAllocationController extends CompetitionManagementCookieController<InterviewAllocationSelectionForm> { @GetMapping("/allocated-applications/{userId}") public String allocated(@ModelAttribute(name = SELECTION_FORM, binding = false) InterviewAllocationSelectionForm selectionForm, Model model, @PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, @RequestParam(value = "page", defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response) { updateSelectionForm(request, response, competitionId, userId, selectionForm); model.addAttribute("model", allocatedInterviewApplicationsModelPopulator.populateModel( competitionId, userId, page )); return "assessors/interview/allocated-applications"; } @GetMapping("/allocate-assessors") String overview(Model model, @PathVariable("competitionId") long competitionId, @RequestParam MultiValueMap<String, String> queryParams, @RequestParam(value = "page", defaultValue = "0") int page); @GetMapping("/unallocated-applications/{assessorId}") String applications(@ModelAttribute(name = SELECTION_FORM, binding = false) InterviewAllocationSelectionForm selectionForm, Model model, @PathVariable("competitionId") long competitionId, @PathVariable("assessorId") long assessorId, @RequestParam(value = "page", defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response); @GetMapping("/allocated-applications/{userId}") String allocated(@ModelAttribute(name = SELECTION_FORM, binding = false) InterviewAllocationSelectionForm selectionForm, Model model, @PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, @RequestParam(value = "page", defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response); @PostMapping("/allocate-applications/{userId}/addSelected") String allocateApplications(@PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId); @GetMapping("/allocate-applications/{userId}") String allocateApplications(Model model, @ModelAttribute(name = "form", binding = false) InterviewAllocationNotifyForm form, @PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, HttpServletRequest request); @PostMapping("/allocated-applications/{userId}") String removeApplication(@PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, @RequestParam("removeApplication") long applicationId); @PostMapping("/allocate-applications/{userId}") String notifyAssessor(Model model, @ModelAttribute(name = "form") InterviewAllocationNotifyForm form, @PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/allocate-applications/{userId}", params = {"remove"}) String removeInviteFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, @RequestParam(name = "remove") long removeId, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/unallocated-applications/{userId}", params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, @RequestParam("addAll") boolean addAll, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/unallocated-applications/{userId}", params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForInviteList( @PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, @RequestParam("selectionId") long assessorId, @RequestParam("isSelected") boolean isSelected, HttpServletRequest request, HttpServletResponse response); }
@Test public void allocated() throws Exception { CompetitionResource competition = newCompetitionResource() .withId(1L) .withName("Competition x") .build(); UserResource user = newUserResource() .withId(1L) .withFirstName("Kieran") .withLastName("Hester") .build(); InnovationAreaResource innovationArea = newInnovationAreaResource() .withSector(1l) .withSectorName("Digital manufacturing") .build(); ProfileResource profile = newProfileResource() .withInnovationAreas(singletonList(innovationArea)) .withSkillsAreas("Skills") .withBusinessType(BusinessType.ACADEMIC) .build(); AssessorProfileResource assessorProfile = newAssessorProfileResource() .withUser(user) .withProfile(profile) .build(); InterviewApplicationPageResource pageResource = newInterviewApplicationPageResource() .withAllocatedApplications(1L) .withUnallocatedApplications(2L) .withContent(newInterviewApplicationResource() .withId(1L, 2L) .withLeadOrganisation("Lead 1", "Lead 2") .withNumberOfAssessors(1L, 2L) .build(2)) .build(); when(userRestServiceMock.retrieveUserById(user.getId())).thenReturn(restSuccess(user)); when(competitionRestService.getCompetitionById(competition.getId())).thenReturn(restSuccess(competition)); when(assessorRestService.getAssessorProfile(user.getId())).thenReturn(restSuccess(assessorProfile)); when(interviewAllocationRestService.getAllocatedApplications(competition.getId(), user.getId(), 0)).thenReturn(restSuccess(pageResource)); MvcResult result = mockMvc.perform(get("/assessment/interview/competition/{competitionId}/assessors/allocated-applications/{userId}", competition.getId(), user.getId())) .andExpect(status().isOk()) .andExpect(model().attributeExists("model")) .andExpect(view().name("assessors/interview/allocated-applications")) .andReturn(); InterviewAssessorApplicationsViewModel model = (InterviewAssessorApplicationsViewModel) result.getModelAndView().getModel().get("model"); InOrder inOrder = inOrder(competitionRestService, userRestServiceMock, assessorRestService); inOrder.verify(userRestServiceMock).retrieveUserById(user.getId()); inOrder.verify(competitionRestService).getCompetitionById(competition.getId()); inOrder.verify(assessorRestService).getAssessorProfile(user.getId()); inOrder.verifyNoMoreInteractions(); assertEquals((long) competition.getId(), model.getCompetitionId()); assertEquals(competition.getName(), model.getCompetitionName()); assertEquals(profile.getBusinessType(), model.getProfile().getBusinessType()); assertEquals(profile.getSkillsAreas(), model.getProfile().getSkillsAreas()); assertEquals(pageResource.getAllocatedApplications(), model.getAllocatedApplications()); assertEquals(pageResource.getUnallocatedApplications(), model.getUnallocatedApplications()); assertEquals(pageResource.getContent().size(), model.getRows().size()); }
InterviewAllocationController extends CompetitionManagementCookieController<InterviewAllocationSelectionForm> { @PostMapping("/allocate-applications/{userId}/addSelected") public String allocateApplications(@PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId) { return redirectToSend(competitionId, userId); } @GetMapping("/allocate-assessors") String overview(Model model, @PathVariable("competitionId") long competitionId, @RequestParam MultiValueMap<String, String> queryParams, @RequestParam(value = "page", defaultValue = "0") int page); @GetMapping("/unallocated-applications/{assessorId}") String applications(@ModelAttribute(name = SELECTION_FORM, binding = false) InterviewAllocationSelectionForm selectionForm, Model model, @PathVariable("competitionId") long competitionId, @PathVariable("assessorId") long assessorId, @RequestParam(value = "page", defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response); @GetMapping("/allocated-applications/{userId}") String allocated(@ModelAttribute(name = SELECTION_FORM, binding = false) InterviewAllocationSelectionForm selectionForm, Model model, @PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, @RequestParam(value = "page", defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response); @PostMapping("/allocate-applications/{userId}/addSelected") String allocateApplications(@PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId); @GetMapping("/allocate-applications/{userId}") String allocateApplications(Model model, @ModelAttribute(name = "form", binding = false) InterviewAllocationNotifyForm form, @PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, HttpServletRequest request); @PostMapping("/allocated-applications/{userId}") String removeApplication(@PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, @RequestParam("removeApplication") long applicationId); @PostMapping("/allocate-applications/{userId}") String notifyAssessor(Model model, @ModelAttribute(name = "form") InterviewAllocationNotifyForm form, @PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/allocate-applications/{userId}", params = {"remove"}) String removeInviteFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, @RequestParam(name = "remove") long removeId, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/unallocated-applications/{userId}", params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, @RequestParam("addAll") boolean addAll, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/unallocated-applications/{userId}", params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForInviteList( @PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, @RequestParam("selectionId") long assessorId, @RequestParam("isSelected") boolean isSelected, HttpServletRequest request, HttpServletResponse response); }
@Test public void allocateApplications() throws Exception { CompetitionResource competition = newCompetitionResource() .withName("Competition") .build(); UserResource user = newUserResource() .withFirstName("Kieran") .withLastName("Hester") .build(); List<Long> selectedApplicationIds = asList(1L); AssessorInvitesToSendResource assessorInvitesToSendResource = newAssessorInvitesToSendResource().withContent("content").build(); List<InterviewApplicationResource> interviewApplicationResources = newInterviewApplicationResource().build(1); InterviewAllocationSelectionForm selectionForm = new InterviewAllocationSelectionForm(); selectionForm.setSelectedIds(selectedApplicationIds); String cookieContent = JsonUtil.getSerializedObject(selectionForm); String cookieName = format("%s_comp_%s_%s", InterviewAllocationController.SELECTION_FORM, competition.getId(), user.getId()); Cookie cookie = new Cookie(cookieName, getCompressedString(cookieContent)); when(userRestServiceMock.retrieveUserById(user.getId())).thenReturn(restSuccess(user)); when(competitionRestService.getCompetitionById(competition.getId())).thenReturn(restSuccess(competition)); when(interviewAllocationRestService.getUnallocatedApplicationsById(competition.getId(), selectedApplicationIds)) .thenReturn(restSuccess(interviewApplicationResources)); when(interviewAllocationRestService.getInviteToSend(competition.getId(), user.getId())).thenReturn(restSuccess(assessorInvitesToSendResource)); when(competitionRestService.getCompetitionById(competition.getId())).thenReturn(restSuccess(competition)); MvcResult result = mockMvc.perform(get("/assessment/interview/competition/{competitionId}/assessors/allocate-applications/{userId}", competition.getId(), user.getId()) .cookie(cookie)) .andExpect(status().isOk()) .andExpect(model().attributeExists("model")) .andExpect(view().name("assessors/interview/allocate-applications")) .andReturn(); InterviewAllocateApplicationsViewModel model = (InterviewAllocateApplicationsViewModel) result.getModelAndView().getModel().get("model"); InterviewAllocateApplicationsViewModel expectedViewModel = new InterviewAllocateApplicationsViewModel( competition.getId(), competition.getName(), user, assessorInvitesToSendResource.getContent(), interviewApplicationResources ); assertEquals(expectedViewModel, model); InterviewAllocationNotifyForm form = (InterviewAllocationNotifyForm) result.getModelAndView().getModel().get("form"); assertEquals(format("Applications for interview panel for '%s'", competition.getName()), form.getSubject()); InOrder inOrder = inOrder(userRestServiceMock, competitionRestService, interviewAllocationRestService, competitionRestService); inOrder.verify(userRestServiceMock).retrieveUserById(user.getId()); inOrder.verify(interviewAllocationRestService).getUnallocatedApplicationsById(competition.getId(), selectedApplicationIds); inOrder.verify(interviewAllocationRestService).getInviteToSend(competition.getId(), user.getId()); inOrder.verify(competitionRestService).getCompetitionById(competition.getId()); inOrder.verifyNoMoreInteractions(); }
InterviewAllocationController extends CompetitionManagementCookieController<InterviewAllocationSelectionForm> { @PostMapping("/allocate-applications/{userId}") public String notifyAssessor(Model model, @ModelAttribute(name = "form") InterviewAllocationNotifyForm form, @PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response) { Supplier<String> failureView = () -> allocateApplications(model, form, competitionId, userId, request); Supplier<String> successView = () -> { removeCookie(response, combineIds(competitionId, userId)); return redirectToAllocatedTab(competitionId, userId); }; return ifSelectionFormIsNotEmpty(competitionId, userId, request, selectionForm -> validationHandler .failNowOrSucceedWith( failureView, () -> { RestResult<Void> sendResult = interviewAllocationRestService.notifyAllocations( new InterviewNotifyAllocationResource( competitionId, userId, form.getSubject(), form.getContent(), selectionForm.getSelectedIds() ) ); return validationHandler .addAnyErrors(error(removeDuplicates(sendResult.getErrors()))) .failNowOrSucceedWith( failureView, successView ); } ) ); } @GetMapping("/allocate-assessors") String overview(Model model, @PathVariable("competitionId") long competitionId, @RequestParam MultiValueMap<String, String> queryParams, @RequestParam(value = "page", defaultValue = "0") int page); @GetMapping("/unallocated-applications/{assessorId}") String applications(@ModelAttribute(name = SELECTION_FORM, binding = false) InterviewAllocationSelectionForm selectionForm, Model model, @PathVariable("competitionId") long competitionId, @PathVariable("assessorId") long assessorId, @RequestParam(value = "page", defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response); @GetMapping("/allocated-applications/{userId}") String allocated(@ModelAttribute(name = SELECTION_FORM, binding = false) InterviewAllocationSelectionForm selectionForm, Model model, @PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, @RequestParam(value = "page", defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response); @PostMapping("/allocate-applications/{userId}/addSelected") String allocateApplications(@PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId); @GetMapping("/allocate-applications/{userId}") String allocateApplications(Model model, @ModelAttribute(name = "form", binding = false) InterviewAllocationNotifyForm form, @PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, HttpServletRequest request); @PostMapping("/allocated-applications/{userId}") String removeApplication(@PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, @RequestParam("removeApplication") long applicationId); @PostMapping("/allocate-applications/{userId}") String notifyAssessor(Model model, @ModelAttribute(name = "form") InterviewAllocationNotifyForm form, @PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/allocate-applications/{userId}", params = {"remove"}) String removeInviteFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, @RequestParam(name = "remove") long removeId, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/unallocated-applications/{userId}", params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, @RequestParam("addAll") boolean addAll, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/unallocated-applications/{userId}", params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForInviteList( @PathVariable("competitionId") long competitionId, @PathVariable("userId") long userId, @RequestParam("selectionId") long assessorId, @RequestParam("isSelected") boolean isSelected, HttpServletRequest request, HttpServletResponse response); }
@Test public void notifyAssessor() throws Exception { CompetitionResource competition = newCompetitionResource() .withName("Competition") .build(); UserResource user = newUserResource() .withFirstName("Kieran") .withLastName("Hester") .build(); List<Long> selectedApplicationIds = asList(1L); InterviewAllocationNotifyForm form = new InterviewAllocationNotifyForm(); form.setSubject("subject"); form.setContent("content"); InterviewAllocationSelectionForm selectionForm = new InterviewAllocationSelectionForm(); selectionForm.setSelectedIds(selectedApplicationIds); String cookieContent = JsonUtil.getSerializedObject(selectionForm); String cookieName = format("%s_comp_%s_%s", InterviewAllocationController.SELECTION_FORM, competition.getId(), user.getId()); Cookie cookie = new Cookie(cookieName, getCompressedString(cookieContent)); InterviewNotifyAllocationResource interviewNotifyAllocationResource = newInterviewNotifyAllocationResource() .withCompetitionId(competition.getId()) .withAssessorId(user.getId()) .withSubject(form.getSubject()) .withContent(form.getContent()) .withApplicationIds(selectionForm.getSelectedIds()) .build(); when(interviewAllocationRestService.notifyAllocations(interviewNotifyAllocationResource)).thenReturn(restSuccess()); mockMvc.perform(post("/assessment/interview/competition/{competitionId}/assessors/allocate-applications/{userId}", competition.getId(), user.getId()) .cookie(cookie) .contentType(APPLICATION_FORM_URLENCODED) .param("subject", form.getSubject()) .param("content", form.getContent())) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(format("/assessment/interview/competition/%s/assessors/allocated-applications/%s", competition.getId(), user.getId()))) .andReturn(); verify(interviewAllocationRestService, only()).notifyAllocations(interviewNotifyAllocationResource); }
InterviewApplicationAssignmentController extends CompetitionManagementCookieController<InterviewAssignmentSelectionForm> { @GetMapping("/find") public String find(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) InterviewAssignmentSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response) { updateSelectionForm(request, response, competitionId, selectionForm); InterviewAssignmentApplicationsFindViewModel interviewPanelApplicationsFindModel = interviewApplicationsFindModelPopulator.populateModel(competitionId, page); model.addAttribute("model", interviewPanelApplicationsFindModel); return "assessors/interview/application-find"; } @GetMapping("/find") String find(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) InterviewAssignmentSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"selectionId"}) @ResponseBody JsonNode selectApplicationForInviteList( @PathVariable("competitionId") long competitionId, @RequestParam("selectionId") long applicationId, @RequestParam("isSelected") boolean isSelected, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"addAll"}) @ResponseBody JsonNode addAllApplicationsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("addAll") boolean addAll, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find/addSelected") String addSelectedApplicationsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam Optional<Long> innovationArea, @ModelAttribute(SELECTION_FORM) InterviewAssignmentSelectionForm selectionForm, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @GetMapping("/invite") String invite(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam MultiValueMap<String, String> queryParams, @ModelAttribute(name = "form", binding = false) InterviewAssignmentSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult); @PostMapping(value = "/invite", params = "remove") String remove(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("remove") long applicationId, @RequestParam(defaultValue = "0") int page, @RequestParam MultiValueMap<String, String> queryParams, @ModelAttribute(name = "form") InterviewAssignmentSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler); @PostMapping(value = "/invite", params = "removeAll") String removeAll(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam MultiValueMap<String, String> queryParams, @ModelAttribute(name = "form") InterviewAssignmentSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler); @GetMapping("/view-status") String viewStatus(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); }
@Test public void find() throws Exception { int page = 2; AvailableApplicationPageResource availableAssessorPageResource = newAvailableApplicationPageResource() .withContent(newAvailableApplicationResource().build(2)) .build(); when(interviewAssignmentRestService.getAvailableApplicationIds(competition.getId())).thenReturn(restSuccess(singletonList(1L))); when(interviewAssignmentRestService.getAvailableApplications(competition.getId(), page)).thenReturn(restSuccess(availableAssessorPageResource)); MvcResult result = mockMvc.perform(get("/assessment/interview/competition/{competitionId}/applications/find", competition.getId()) .param("page", "2")) .andExpect(status().isOk()) .andExpect(model().attributeExists("model")) .andExpect(view().name("assessors/interview/application-find")) .andReturn(); InterviewAssignmentSelectionForm selectionForm = (InterviewAssignmentSelectionForm) result.getModelAndView().getModel().get("interviewAssignmentApplicationSelectionForm"); assertTrue(selectionForm.getSelectedIds().isEmpty()); assertCompetitionDetails(competition, result); assertAvailableApplications(availableAssessorPageResource.getContent(), result); InOrder inOrder = inOrder(competitionRestService, interviewAssignmentRestService, competitionKeyApplicationStatisticsRestService); inOrder.verify(interviewAssignmentRestService).getAvailableApplicationIds(competition.getId()); inOrder.verify(competitionRestService).getCompetitionById(competition.getId()); inOrder.verify(interviewAssignmentRestService).getAvailableApplications(competition.getId(), page); inOrder.verify(competitionKeyApplicationStatisticsRestService).getInterviewAssignmentStatisticsByCompetition(competition.getId()); inOrder.verifyNoMoreInteractions(); }
InterviewApplicationAssignmentController extends CompetitionManagementCookieController<InterviewAssignmentSelectionForm> { private List<Long> getAvailableApplicationIds(long competitionId) { return interviewAssignmentRestService.getAvailableApplicationIds(competitionId).getSuccess(); } @GetMapping("/find") String find(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) InterviewAssignmentSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"selectionId"}) @ResponseBody JsonNode selectApplicationForInviteList( @PathVariable("competitionId") long competitionId, @RequestParam("selectionId") long applicationId, @RequestParam("isSelected") boolean isSelected, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"addAll"}) @ResponseBody JsonNode addAllApplicationsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("addAll") boolean addAll, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find/addSelected") String addSelectedApplicationsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam Optional<Long> innovationArea, @ModelAttribute(SELECTION_FORM) InterviewAssignmentSelectionForm selectionForm, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @GetMapping("/invite") String invite(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam MultiValueMap<String, String> queryParams, @ModelAttribute(name = "form", binding = false) InterviewAssignmentSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult); @PostMapping(value = "/invite", params = "remove") String remove(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("remove") long applicationId, @RequestParam(defaultValue = "0") int page, @RequestParam MultiValueMap<String, String> queryParams, @ModelAttribute(name = "form") InterviewAssignmentSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler); @PostMapping(value = "/invite", params = "removeAll") String removeAll(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam MultiValueMap<String, String> queryParams, @ModelAttribute(name = "form") InterviewAssignmentSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler); @GetMapping("/view-status") String viewStatus(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); }
@Test public void find_defaultParams() throws Exception { int page = 0; AvailableApplicationPageResource availableAssessorPageResource = newAvailableApplicationPageResource() .withContent(newAvailableApplicationResource().build(2)) .build(); when(interviewAssignmentRestService.getAvailableApplicationIds(competition.getId())).thenReturn(restSuccess(singletonList(1L))); when(interviewAssignmentRestService.getAvailableApplications(competition.getId(), page)).thenReturn(restSuccess(availableAssessorPageResource)); MvcResult result = mockMvc.perform(get("/assessment/interview/competition/{competitionId}/applications/find", competition.getId())) .andExpect(status().isOk()) .andExpect(model().attributeExists("model")) .andExpect(view().name("assessors/interview/application-find")) .andReturn(); InterviewAssignmentSelectionForm selectionForm = (InterviewAssignmentSelectionForm) result.getModelAndView().getModel().get("interviewAssignmentApplicationSelectionForm"); assertTrue(selectionForm.getSelectedIds().isEmpty()); assertCompetitionDetails(competition, result); assertAvailableApplications(availableAssessorPageResource.getContent(), result); InOrder inOrder = inOrder(competitionRestService, interviewAssignmentRestService, competitionKeyApplicationStatisticsRestService); inOrder.verify(interviewAssignmentRestService).getAvailableApplicationIds(competition.getId()); inOrder.verify(competitionRestService).getCompetitionById(competition.getId()); inOrder.verify(interviewAssignmentRestService).getAvailableApplications(competition.getId(), page); inOrder.verify(competitionKeyApplicationStatisticsRestService).getInterviewAssignmentStatisticsByCompetition(competition.getId()); inOrder.verifyNoMoreInteractions(); } @Test public void find_existingCookie() throws Exception { int page = 0; long expectedApplicationId = 1L; InterviewAssignmentSelectionForm expectedSelectionForm = new InterviewAssignmentSelectionForm(); expectedSelectionForm.getSelectedIds().add(expectedApplicationId); Cookie selectionFormCookie = createFormCookie(expectedSelectionForm); AvailableApplicationPageResource availableAssessorPageResource = newAvailableApplicationPageResource() .withContent(newAvailableApplicationResource().build(2)) .build(); when(interviewAssignmentRestService.getAvailableApplicationIds(competition.getId())).thenReturn(restSuccess(asList(1L, 2L))); when(interviewAssignmentRestService.getAvailableApplications(competition.getId(), page)).thenReturn(restSuccess(availableAssessorPageResource)); MvcResult result = mockMvc.perform(get("/assessment/interview/competition/{competitionId}/applications/find", competition.getId()) .cookie(selectionFormCookie)) .andExpect(status().isOk()) .andExpect(model().attributeExists("model")) .andExpect(view().name("assessors/interview/application-find")) .andReturn(); InterviewAssignmentSelectionForm selectionForm = (InterviewAssignmentSelectionForm) result.getModelAndView().getModel().get("interviewAssignmentApplicationSelectionForm"); assertEquals(expectedSelectionForm, selectionForm); Optional<InterviewAssignmentSelectionForm> resultForm = getInterviewAssignmentSelectionFormFromCookie(result.getResponse(), format("interviewAssignmentApplicationSelectionForm_comp_%s", competition.getId())); assertTrue(resultForm.get().getSelectedIds().contains(expectedApplicationId)); assertCompetitionDetails(competition, result); assertAvailableApplications(availableAssessorPageResource.getContent(), result); InOrder inOrder = inOrder(competitionRestService, interviewAssignmentRestService, competitionKeyApplicationStatisticsRestService); inOrder.verify(interviewAssignmentRestService).getAvailableApplicationIds(competition.getId()); inOrder.verify(competitionRestService).getCompetitionById(competition.getId()); inOrder.verify(interviewAssignmentRestService).getAvailableApplications(competition.getId(), page); inOrder.verify(competitionKeyApplicationStatisticsRestService).getInterviewAssignmentStatisticsByCompetition(competition.getId()); inOrder.verifyNoMoreInteractions(); } @Test public void addApplicationSelectionFromFindView() throws Exception { long applicationId = 1L; Cookie formCookie = createFormCookie(new InterviewAssignmentSelectionForm()); when(interviewAssignmentRestService.getAvailableApplicationIds(competition.getId())).thenReturn(restSuccess(asList(1L, 2L))); MvcResult result = mockMvc.perform(post("/assessment/interview/competition/{competitionId}/applications/find", competition.getId()) .param("selectionId", valueOf(applicationId)) .param("isSelected", "true") .param("page", "1") .cookie(formCookie)) .andExpect(status().is2xxSuccessful()) .andExpect(jsonPath("selectionCount", is(1))) .andExpect(jsonPath("allSelected", is(false))) .andExpect(jsonPath("limitExceeded", is(false))) .andReturn(); Optional<InterviewAssignmentSelectionForm> resultForm = getInterviewAssignmentSelectionFormFromCookie(result.getResponse(), format("interviewAssignmentApplicationSelectionForm_comp_%s", competition.getId())); assertTrue(resultForm.get().getSelectedIds().contains(applicationId)); } @Test public void addApplicationSelectionFromFindView_defaultParams() throws Exception { long applicationId = 1L; Cookie formCookie = createFormCookie(new InterviewAssignmentSelectionForm()); when(interviewAssignmentRestService.getAvailableApplicationIds(competition.getId())).thenReturn(restSuccess(asList(1L, 2L))); MvcResult result = mockMvc.perform(post("/assessment/interview/competition/{competitionId}/applications/find", competition.getId()) .param("selectionId", valueOf(applicationId)) .param("isSelected", "true") .cookie(formCookie)) .andExpect(status().is2xxSuccessful()) .andExpect(jsonPath("selectionCount", is(1))) .andExpect(jsonPath("allSelected", is(false))) .andExpect(jsonPath("limitExceeded", is(false))) .andReturn(); Optional<InterviewAssignmentSelectionForm> resultForm = getInterviewAssignmentSelectionFormFromCookie(result.getResponse(), format("interviewAssignmentApplicationSelectionForm_comp_%s", competition.getId())); assertTrue(resultForm.get().getSelectedIds().contains(applicationId)); } @Test public void addAllApplicationsFromFindView_defaultParams() throws Exception { Cookie formCookie = createFormCookie(new InterviewAssignmentSelectionForm()); when(interviewAssignmentRestService.getAvailableApplicationIds(competition.getId())).thenReturn(restSuccess(asList(1L, 2L))); MvcResult result = mockMvc.perform(post("/assessment/interview/competition/{competitionId}/applications/find", competition.getId()) .param("addAll", "true") .cookie(formCookie)) .andExpect(status().is2xxSuccessful()) .andExpect(jsonPath("selectionCount", is(2))) .andExpect(jsonPath("allSelected", is(true))) .andExpect(jsonPath("limitExceeded", is(false))) .andReturn(); Optional<InterviewAssignmentSelectionForm> resultForm = getInterviewAssignmentSelectionFormFromCookie(result.getResponse(), format("interviewAssignmentApplicationSelectionForm_comp_%s", competition.getId())); assertEquals(2, resultForm.get().getSelectedIds().size()); } @Test public void removeApplicationSelectionFromFindView() throws Exception { long applicationId = 1L; InterviewAssignmentSelectionForm form = new InterviewAssignmentSelectionForm(); form.getSelectedIds().add(applicationId); Cookie formCookie = createFormCookie(form); when(interviewAssignmentRestService.getAvailableApplicationIds(competition.getId())).thenReturn(restSuccess(asList(1L, 2L))); MvcResult result = mockMvc.perform(post("/assessment/interview/competition/{competitionId}/applications/find", competition.getId()) .param("selectionId", valueOf(applicationId)) .param("isSelected", "false") .param("page", "1") .cookie(formCookie)) .andExpect(status().is2xxSuccessful()) .andExpect(jsonPath("selectionCount", is(0))) .andExpect(jsonPath("allSelected", is(false))) .andExpect(jsonPath("limitExceeded", is(false))) .andReturn(); Optional<InterviewAssignmentSelectionForm> resultForm = getInterviewAssignmentSelectionFormFromCookie(result.getResponse(), format("interviewAssignmentApplicationSelectionForm_comp_%s", competition.getId())); assertFalse(resultForm.get().getSelectedIds().contains(applicationId)); } @Test public void removeApplicationSelectionFromFindView_defaultParams() throws Exception { long applicationId = 1L; Cookie formCookie; InterviewAssignmentSelectionForm form = new InterviewAssignmentSelectionForm(); form.getSelectedIds().add(applicationId); formCookie = createFormCookie(form); when(interviewAssignmentRestService.getAvailableApplicationIds(competition.getId())).thenReturn(restSuccess(asList(1L, 2L))); MvcResult result = mockMvc.perform(post("/assessment/interview/competition/{competitionId}/applications/find", competition.getId()) .param("selectionId", valueOf(applicationId)) .param("isSelected", "false") .cookie(formCookie)) .andExpect(status().is2xxSuccessful()) .andExpect(jsonPath("selectionCount", is(0))) .andExpect(jsonPath("allSelected", is(false))) .andExpect(jsonPath("limitExceeded", is(false))) .andReturn(); Optional<InterviewAssignmentSelectionForm> resultForm = getInterviewAssignmentSelectionFormFromCookie(result.getResponse(), format("interviewAssignmentApplicationSelectionForm_comp_%s", competition.getId())); assertFalse(resultForm.get().getSelectedIds().contains(applicationId)); }
InterviewApplicationAssignmentController extends CompetitionManagementCookieController<InterviewAssignmentSelectionForm> { @GetMapping("/invite") public String invite(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam MultiValueMap<String, String> queryParams, @ModelAttribute(name = "form", binding = false) InterviewAssignmentSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult) { model.addAttribute("model", interviewApplicationsInviteModelPopulator .populateModel(competitionId, page)); model.addAttribute("form", selectionForm); return "assessors/interview/application-invite"; } @GetMapping("/find") String find(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) InterviewAssignmentSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"selectionId"}) @ResponseBody JsonNode selectApplicationForInviteList( @PathVariable("competitionId") long competitionId, @RequestParam("selectionId") long applicationId, @RequestParam("isSelected") boolean isSelected, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"addAll"}) @ResponseBody JsonNode addAllApplicationsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("addAll") boolean addAll, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find/addSelected") String addSelectedApplicationsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam Optional<Long> innovationArea, @ModelAttribute(SELECTION_FORM) InterviewAssignmentSelectionForm selectionForm, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @GetMapping("/invite") String invite(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam MultiValueMap<String, String> queryParams, @ModelAttribute(name = "form", binding = false) InterviewAssignmentSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult); @PostMapping(value = "/invite", params = "remove") String remove(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("remove") long applicationId, @RequestParam(defaultValue = "0") int page, @RequestParam MultiValueMap<String, String> queryParams, @ModelAttribute(name = "form") InterviewAssignmentSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler); @PostMapping(value = "/invite", params = "removeAll") String removeAll(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam MultiValueMap<String, String> queryParams, @ModelAttribute(name = "form") InterviewAssignmentSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler); @GetMapping("/view-status") String viewStatus(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); }
@Test public void invite() throws Exception { int page = 0; List<InterviewAssignmentStagedApplicationResource> interviewAssignmentStagedApplicationResources = setUpApplicationCreatedInviteResources(); InterviewAssignmentStagedApplicationPageResource interviewAssignmentStagedApplicationPageResource = newInterviewAssignmentStagedApplicationPageResource() .withContent(interviewAssignmentStagedApplicationResources) .build(); InterviewAssignmentKeyStatisticsResource interviewAssignmentKeyStatisticsResource = newInterviewAssignmentKeyStatisticsResource().build(); setupDefaultInviteViewExpectations(page, interviewAssignmentStagedApplicationPageResource); InviteNewAssessorsForm expectedForm = new InviteNewAssessorsForm(); expectedForm.setInvites(singletonList(new InviteNewAssessorsRowForm())); MvcResult result = mockMvc.perform(get("/assessment/interview/competition/{competitionId}/applications/invite", competition.getId())) .andExpect(status().isOk()) .andExpect(model().attributeExists("model")) .andExpect(view().name("assessors/interview/application-invite")) .andReturn(); assertCompetitionDetails(competition, result); assertInvitedApplications(interviewAssignmentStagedApplicationResources, result); InOrder inOrder = inOrder(competitionRestService, interviewAssignmentRestService, competitionKeyApplicationStatisticsRestService); inOrder.verify(competitionRestService).getCompetitionById(competition.getId()); inOrder.verify(interviewAssignmentRestService).getStagedApplications(competition.getId(), page); inOrder.verify(competitionKeyApplicationStatisticsRestService).getInterviewAssignmentStatisticsByCompetition(competition.getId()); inOrder.verifyNoMoreInteractions(); }
InterviewApplicationAssignmentController extends CompetitionManagementCookieController<InterviewAssignmentSelectionForm> { @PostMapping(value = "/invite", params = "remove") public String remove(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("remove") long applicationId, @RequestParam(defaultValue = "0") int page, @RequestParam MultiValueMap<String, String> queryParams, @ModelAttribute(name = "form") InterviewAssignmentSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler) { Supplier<String> failureAndSuccess = () -> invite(model, competitionId, page, queryParams, selectionForm, bindingResult); RestResult<Void> result = interviewAssignmentRestService.unstageApplication(applicationId); return validationHandler.addAnyErrors(result) .failNowOrSucceedWith(failureAndSuccess, failureAndSuccess); } @GetMapping("/find") String find(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) InterviewAssignmentSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"selectionId"}) @ResponseBody JsonNode selectApplicationForInviteList( @PathVariable("competitionId") long competitionId, @RequestParam("selectionId") long applicationId, @RequestParam("isSelected") boolean isSelected, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"addAll"}) @ResponseBody JsonNode addAllApplicationsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("addAll") boolean addAll, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find/addSelected") String addSelectedApplicationsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam Optional<Long> innovationArea, @ModelAttribute(SELECTION_FORM) InterviewAssignmentSelectionForm selectionForm, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @GetMapping("/invite") String invite(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam MultiValueMap<String, String> queryParams, @ModelAttribute(name = "form", binding = false) InterviewAssignmentSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult); @PostMapping(value = "/invite", params = "remove") String remove(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("remove") long applicationId, @RequestParam(defaultValue = "0") int page, @RequestParam MultiValueMap<String, String> queryParams, @ModelAttribute(name = "form") InterviewAssignmentSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler); @PostMapping(value = "/invite", params = "removeAll") String removeAll(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam MultiValueMap<String, String> queryParams, @ModelAttribute(name = "form") InterviewAssignmentSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler); @GetMapping("/view-status") String viewStatus(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); }
@Test public void remove() throws Exception { int page = 0; long applicationId = 123L; List<InterviewAssignmentStagedApplicationResource> interviewAssignmentStagedApplicationResources = setUpApplicationCreatedInviteResources(); InterviewAssignmentStagedApplicationPageResource interviewAssignmentStagedApplicationPageResource = newInterviewAssignmentStagedApplicationPageResource() .withContent(interviewAssignmentStagedApplicationResources) .build(); setupDefaultInviteViewExpectations(page, interviewAssignmentStagedApplicationPageResource); when(interviewAssignmentRestService.unstageApplication(applicationId)).thenReturn(restSuccess()); mockMvc.perform(post("/assessment/interview/competition/{competitionId}/applications/invite", competition.getId()) .param("remove", String.valueOf(applicationId))) .andExpect(status().isOk()) .andExpect(model().attributeExists("model")) .andExpect(view().name("assessors/interview/application-invite")); verify(interviewAssignmentRestService).unstageApplication(applicationId); }
InterviewApplicationAssignmentController extends CompetitionManagementCookieController<InterviewAssignmentSelectionForm> { @PostMapping(value = "/invite", params = "removeAll") public String removeAll(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam MultiValueMap<String, String> queryParams, @ModelAttribute(name = "form") InterviewAssignmentSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler) { Supplier<String> successView = () -> redirectToFind(competitionId, 0, Optional.empty()); Supplier<String> failureView = () -> invite(model, competitionId, page, queryParams, selectionForm, bindingResult); RestResult<Void> result = interviewAssignmentRestService.unstageApplications(competitionId); return validationHandler.addAnyErrors(result) .failNowOrSucceedWith(failureView, successView); } @GetMapping("/find") String find(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) InterviewAssignmentSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"selectionId"}) @ResponseBody JsonNode selectApplicationForInviteList( @PathVariable("competitionId") long competitionId, @RequestParam("selectionId") long applicationId, @RequestParam("isSelected") boolean isSelected, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"addAll"}) @ResponseBody JsonNode addAllApplicationsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("addAll") boolean addAll, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find/addSelected") String addSelectedApplicationsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam Optional<Long> innovationArea, @ModelAttribute(SELECTION_FORM) InterviewAssignmentSelectionForm selectionForm, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @GetMapping("/invite") String invite(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam MultiValueMap<String, String> queryParams, @ModelAttribute(name = "form", binding = false) InterviewAssignmentSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult); @PostMapping(value = "/invite", params = "remove") String remove(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("remove") long applicationId, @RequestParam(defaultValue = "0") int page, @RequestParam MultiValueMap<String, String> queryParams, @ModelAttribute(name = "form") InterviewAssignmentSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler); @PostMapping(value = "/invite", params = "removeAll") String removeAll(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam MultiValueMap<String, String> queryParams, @ModelAttribute(name = "form") InterviewAssignmentSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler); @GetMapping("/view-status") String viewStatus(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); }
@Test public void removeAll() throws Exception { when(interviewAssignmentRestService.unstageApplications(competition.getId())).thenReturn(restSuccess()); mockMvc.perform(post("/assessment/interview/competition/{competitionId}/applications/invite", competition.getId()) .param("removeAll", "true")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl("/assessment/interview/competition/" + competition.getId() + "/applications/find?page=0")); verify(interviewAssignmentRestService).unstageApplications(competition.getId()); }
InterviewApplicationAssignmentController extends CompetitionManagementCookieController<InterviewAssignmentSelectionForm> { @GetMapping("/view-status") public String viewStatus(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page) { model.addAttribute("model", interviewApplicationsStatusModelPopulator .populateModel(competitionId, page)); return "assessors/interview/application-view-status"; } @GetMapping("/find") String find(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) InterviewAssignmentSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"selectionId"}) @ResponseBody JsonNode selectApplicationForInviteList( @PathVariable("competitionId") long competitionId, @RequestParam("selectionId") long applicationId, @RequestParam("isSelected") boolean isSelected, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"addAll"}) @ResponseBody JsonNode addAllApplicationsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("addAll") boolean addAll, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find/addSelected") String addSelectedApplicationsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam Optional<Long> innovationArea, @ModelAttribute(SELECTION_FORM) InterviewAssignmentSelectionForm selectionForm, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @GetMapping("/invite") String invite(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam MultiValueMap<String, String> queryParams, @ModelAttribute(name = "form", binding = false) InterviewAssignmentSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult); @PostMapping(value = "/invite", params = "remove") String remove(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("remove") long applicationId, @RequestParam(defaultValue = "0") int page, @RequestParam MultiValueMap<String, String> queryParams, @ModelAttribute(name = "form") InterviewAssignmentSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler); @PostMapping(value = "/invite", params = "removeAll") String removeAll(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam MultiValueMap<String, String> queryParams, @ModelAttribute(name = "form") InterviewAssignmentSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler); @GetMapping("/view-status") String viewStatus(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); }
@Test public void viewStatus() throws Exception { int page = 0; List<InterviewAssignmentApplicationResource> interviewAssignmentApplicationResources = newInterviewAssignmentApplicationResource() .withId(1L, 2L) .withApplicationId(3L, 4L) .withApplicationName("App 1", "App 2") .withLeadOrganisationName("Org 1", "Org 2") .withStatus(InterviewAssignmentState.AWAITING_FEEDBACK_RESPONSE, InterviewAssignmentState.SUBMITTED_FEEDBACK_RESPONSE) .build(2); InterviewAssignmentApplicationPageResource interviewAssignmentApplicationPageResource = newInterviewAssignmentApplicationPageResource() .withContent(interviewAssignmentApplicationResources) .build(); when(interviewAssignmentRestService.getAssignedApplications(competition.getId(), page)).thenReturn(restSuccess(interviewAssignmentApplicationPageResource)); MvcResult result = mockMvc.perform(get("/assessment/interview/competition/{competitionId}/applications/view-status", competition.getId()) .param("page", "0")) .andExpect(status().isOk()) .andExpect(model().attributeExists("model")) .andExpect(view().name("assessors/interview/application-view-status")) .andReturn(); assertCompetitionDetails(competition, result); assertAssignedApplications(interviewAssignmentApplicationResources, result); InOrder inOrder = inOrder(competitionRestService, interviewAssignmentRestService, competitionKeyApplicationStatisticsRestService); inOrder.verify(competitionRestService).getCompetitionById(competition.getId()); inOrder.verify(interviewAssignmentRestService).getAssignedApplications(competition.getId(), page); inOrder.verify(competitionKeyApplicationStatisticsRestService).getInterviewAssignmentStatisticsByCompetition(competition.getId()); inOrder.verifyNoMoreInteractions(); }
InterviewAssessorSendInviteController extends CompetitionManagementCookieController<InterviewOverviewSelectionForm> { @PostMapping("/send") public String sendInvites(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute("form") @Valid SendInviteForm form, BindingResult bindingResult, ValidationHandler validationHandler) { Supplier<String> failureView = () -> getInvitesToSend(model, competitionId, form, bindingResult); return validationHandler.failNowOrSucceedWith(failureView, () -> { RestResult<Void> sendResult = interviewInviteRestService .sendAllInvites(competitionId, new AssessorInviteSendResource(form.getSubject(), form.getContent())); return validationHandler.addAnyErrors(error(removeDuplicates(sendResult.getErrors()))) .failNowOrSucceedWith(failureView, () -> redirectToPanelOverviewTab(competitionId)); }); } @GetMapping("/send") String getInvitesToSend(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute(name = "form", binding = false) SendInviteForm form, BindingResult bindingResult); @PostMapping("/send") String sendInvites(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute("form") @Valid SendInviteForm form, BindingResult bindingResult, ValidationHandler validationHandler); @GetMapping("/reviewResend") String getInvitesToResendFailureView(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute(name = "form", binding = false) ResendInviteForm inviteform, BindingResult bindingResult, ValidationHandler validationHandler); @PostMapping("/reviewResend") String getInvitesToResend(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @ModelAttribute(SELECTION_FORM) InterviewOverviewSelectionForm selectionForm, @ModelAttribute(name = "form", binding = false) ResendInviteForm inviteform, ValidationHandler validationHandler, BindingResult bindingResult, HttpServletRequest request); @PostMapping("/resend") String resendInvites(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute("form") @Valid ResendInviteForm form, BindingResult bindingResult, ValidationHandler validationHandler, HttpServletResponse response); }
@Test public void sendInvites() throws Exception { long competitionId = 5L; AssessorInviteSendResource expectedAssessorInviteSendResource = newAssessorInviteSendResource() .withSubject("Subject...") .withContent("Editable content...") .build(); when(interviewInviteRestService.sendAllInvites(competitionId, expectedAssessorInviteSendResource)).thenReturn(restSuccess()); mockMvc.perform(post("/assessment/interview/competition/{competitionId}/assessors/invite/send", competitionId) .contentType(APPLICATION_FORM_URLENCODED) .param("subject", "Subject...") .param("content", "Editable content...")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(format("/assessment/interview/competition/%s/assessors/pending-and-declined", competitionId))); InOrder inOrder = inOrder(interviewInviteRestService); inOrder.verify(interviewInviteRestService).sendAllInvites(competitionId, expectedAssessorInviteSendResource); inOrder.verifyNoMoreInteractions(); }
InterviewAssessorSendInviteController extends CompetitionManagementCookieController<InterviewOverviewSelectionForm> { @PostMapping("/resend") public String resendInvites (Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute("form") @Valid ResendInviteForm form, BindingResult bindingResult, ValidationHandler validationHandler, HttpServletResponse response){ Supplier<String> failureView = () -> getInvitesToResendFailureView(model, competitionId, form, bindingResult, validationHandler); return validationHandler.failNowOrSucceedWith(failureView, () -> { ServiceResult<Void> resendResult = interviewInviteRestService.resendInvites(form.getInviteIds(), new AssessorInviteSendResource(form.getSubject(), form.getContent())) .toServiceResult(); return validationHandler.addAnyErrors(resendResult, fieldErrorsToFieldErrors(), asGlobalErrors()) .failNowOrSucceedWith(failureView, () -> { removeCookie(response, competitionId); return redirectToOverview(competitionId, 0); }); }); } @GetMapping("/send") String getInvitesToSend(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute(name = "form", binding = false) SendInviteForm form, BindingResult bindingResult); @PostMapping("/send") String sendInvites(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute("form") @Valid SendInviteForm form, BindingResult bindingResult, ValidationHandler validationHandler); @GetMapping("/reviewResend") String getInvitesToResendFailureView(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute(name = "form", binding = false) ResendInviteForm inviteform, BindingResult bindingResult, ValidationHandler validationHandler); @PostMapping("/reviewResend") String getInvitesToResend(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @ModelAttribute(SELECTION_FORM) InterviewOverviewSelectionForm selectionForm, @ModelAttribute(name = "form", binding = false) ResendInviteForm inviteform, ValidationHandler validationHandler, BindingResult bindingResult, HttpServletRequest request); @PostMapping("/resend") String resendInvites(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute("form") @Valid ResendInviteForm form, BindingResult bindingResult, ValidationHandler validationHandler, HttpServletResponse response); }
@Test public void resendInvites() throws Exception { List<Long> inviteIds = asList(1L, 2L); AssessorInvitesToSendResource invite = newAssessorInvitesToSendResource().withCompetitionId(competition.getId()).build(); AssessorInviteSendResource expectedAssessorInviteSendResource = newAssessorInviteSendResource() .withSubject("Subject...") .withContent("Editable content...") .build(); when(interviewInviteRestService.resendInvites(inviteIds, expectedAssessorInviteSendResource)).thenReturn(restSuccess()); mockMvc.perform(post("/assessment/interview/competition/{competitionId}/assessors/invite/resend", competition.getId()) .contentType(APPLICATION_FORM_URLENCODED) .param("inviteIds[0]", inviteIds.get(0).toString()) .param("inviteIds[1]", inviteIds.get(1).toString()) .param("subject", "Subject...") .param("content", "Editable content...")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(format("/assessment/interview/competition/%s/assessors/pending-and-declined?page=0", competition.getId()))); InOrder inOrder = inOrder(interviewInviteRestService); inOrder.verify(interviewInviteRestService).resendInvites(inviteIds, expectedAssessorInviteSendResource); inOrder.verifyNoMoreInteractions(); }
InterviewApplicationSendInviteController { @PostMapping("/send") public String sendInvites(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute("form") @Valid InterviewApplicationSendForm form, BindingResult bindingResult, ValidationHandler validationHandler) { Supplier<String> failureView = () -> getInvitesToSend(model, competitionId, 0, form, bindingResult); return validationHandler.failNowOrSucceedWith(failureView, () -> { RestResult<Void> sendResult = interviewAssignmentRestService .sendAllInvites(competitionId, new AssessorInviteSendResource(form.getSubject(), form.getContent())); return validationHandler.addAnyErrors(error(removeDuplicates(sendResult.getErrors()))) .failNowOrSucceedWith(failureView, () -> redirectToStatusTab(competitionId)); }); } @Autowired InterviewApplicationSendInviteController(InterviewApplicationsSendModelPopulator interviewApplicationsSendModelPopulator, InterviewApplicationSentInviteModelPopulator interviewApplicationSentInviteModelPopulator, InterviewAssignmentRestService interviewAssignmentRestService); @GetMapping("/send") String getInvitesToSend(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @ModelAttribute(name = "form", binding = false) InterviewApplicationSendForm form, BindingResult bindingResult); @PostMapping("/send") String sendInvites(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute("form") @Valid InterviewApplicationSendForm form, BindingResult bindingResult, ValidationHandler validationHandler); @PostMapping(value = "/send", params = {"attachFeedbackApplicationId"}) String uploadFeedback(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute("form") InterviewApplicationSendForm form, BindingResult bindingResult, ValidationHandler validationHandler); @PostMapping(value = "/send", params = {"removeFeedbackApplicationId"}) String removeFeedback(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute("form") InterviewApplicationSendForm form, BindingResult bindingResult, ValidationHandler validationHandler); @GetMapping("/send/view-feedback/{applicationId}") @ResponseBody ResponseEntity<ByteArrayResource> downloadFeedback(Model model, @PathVariable("competitionId") long competitionId, @PathVariable("applicationId") long applicationId); @GetMapping(value = "/{applicationId}/view") String viewInvite(Model model, @PathVariable("competitionId") long competitionId, @PathVariable("applicationId") long applicationId); @GetMapping(value = "/{applicationId}/edit") String editInvite(Model model, @ModelAttribute("form") InterviewApplicationResendForm form, @PathVariable("competitionId") long competitionId, @PathVariable("applicationId") long applicationId); @PostMapping(value = "/{applicationId}/edit") String resendInvite(Model model, @Valid @ModelAttribute("form") InterviewApplicationResendForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable("competitionId") long competitionId, @PathVariable("applicationId") long applicationId); }
@Test public void sendInvites() throws Exception { long competitionId = 5L; AssessorInviteSendResource expectedAssessorInviteSendResource = newAssessorInviteSendResource() .withSubject("Subject...") .withContent("Editable content...") .build(); when(interviewAssignmentRestService.sendAllInvites(competitionId, expectedAssessorInviteSendResource)).thenReturn(restSuccess()); mockMvc.perform(post("/assessment/interview/competition/{competitionId}/applications/invite/send", competitionId) .contentType(APPLICATION_FORM_URLENCODED) .param("subject", "Subject...") .param("content", "Editable content...")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(format("/assessment/interview/competition/%s/applications/view-status", competitionId))); verify(interviewAssignmentRestService).sendAllInvites(competitionId, expectedAssessorInviteSendResource); verifyNoMoreInteractions(interviewAssignmentRestService); }
InterviewApplicationSendInviteController { @PostMapping(value = "/send", params = {"attachFeedbackApplicationId"}) public String uploadFeedback(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute("form") InterviewApplicationSendForm form, BindingResult bindingResult, ValidationHandler validationHandler) { Supplier<String> failureAndSuccesView = () -> getInvitesToSend(model, competitionId, form.getPage(), form, bindingResult); MultipartFile file = form.getNotEmptyFile(); int index = form.getFeedback().indexOf(file); return validationHandler.performFileUpload(String.format("feedback[%s]", index), failureAndSuccesView, () -> interviewAssignmentRestService .uploadFeedback(form.getAttachFeedbackApplicationId(), file.getContentType(), file.getSize(), file.getOriginalFilename(), getMultipartFileBytes(file))); } @Autowired InterviewApplicationSendInviteController(InterviewApplicationsSendModelPopulator interviewApplicationsSendModelPopulator, InterviewApplicationSentInviteModelPopulator interviewApplicationSentInviteModelPopulator, InterviewAssignmentRestService interviewAssignmentRestService); @GetMapping("/send") String getInvitesToSend(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @ModelAttribute(name = "form", binding = false) InterviewApplicationSendForm form, BindingResult bindingResult); @PostMapping("/send") String sendInvites(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute("form") @Valid InterviewApplicationSendForm form, BindingResult bindingResult, ValidationHandler validationHandler); @PostMapping(value = "/send", params = {"attachFeedbackApplicationId"}) String uploadFeedback(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute("form") InterviewApplicationSendForm form, BindingResult bindingResult, ValidationHandler validationHandler); @PostMapping(value = "/send", params = {"removeFeedbackApplicationId"}) String removeFeedback(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute("form") InterviewApplicationSendForm form, BindingResult bindingResult, ValidationHandler validationHandler); @GetMapping("/send/view-feedback/{applicationId}") @ResponseBody ResponseEntity<ByteArrayResource> downloadFeedback(Model model, @PathVariable("competitionId") long competitionId, @PathVariable("applicationId") long applicationId); @GetMapping(value = "/{applicationId}/view") String viewInvite(Model model, @PathVariable("competitionId") long competitionId, @PathVariable("applicationId") long applicationId); @GetMapping(value = "/{applicationId}/edit") String editInvite(Model model, @ModelAttribute("form") InterviewApplicationResendForm form, @PathVariable("competitionId") long competitionId, @PathVariable("applicationId") long applicationId); @PostMapping(value = "/{applicationId}/edit") String resendInvite(Model model, @Valid @ModelAttribute("form") InterviewApplicationResendForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable("competitionId") long competitionId, @PathVariable("applicationId") long applicationId); }
@Test public void uploadFeedback() throws Exception { long competitionId = 1L; long applicationId = 2L; when(interviewAssignmentRestService.uploadFeedback(applicationId, "application/pdf", 11, "testFile.pdf", "My content!".getBytes())) .thenReturn(restFailure(CommonErrors.payloadTooLargeError(1))); MockMultipartFile file = new MockMultipartFile("feedback[2]", "testFile.pdf", "application/pdf", "My content!".getBytes()); setupMocksForGet(competitionId); mockMvc.perform( fileUpload("/assessment/interview/competition/{competitionId}/applications/invite/send", competitionId) .file(file) .param("attachFeedbackApplicationId", "2")) .andExpect(status().isOk()) .andExpect(view().name("assessors/interview/application-send-invites")) .andReturn(); verify(interviewAssignmentRestService).uploadFeedback(applicationId, "application/pdf", 11, "testFile.pdf", "My content!".getBytes()); }
InterviewApplicationSendInviteController { @PostMapping(value = "/send", params = {"removeFeedbackApplicationId"}) public String removeFeedback(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute("form") InterviewApplicationSendForm form, BindingResult bindingResult, ValidationHandler validationHandler) { Supplier<String> failureAndSuccessView = () -> getInvitesToSend(model, competitionId, form.getPage(), form, bindingResult); RestResult<Void> sendResult = interviewAssignmentRestService .deleteFeedback(form.getRemoveFeedbackApplicationId()); return validationHandler.addAnyErrors(error(removeDuplicates(sendResult.getErrors()))) .failNowOrSucceedWith(failureAndSuccessView, failureAndSuccessView); } @Autowired InterviewApplicationSendInviteController(InterviewApplicationsSendModelPopulator interviewApplicationsSendModelPopulator, InterviewApplicationSentInviteModelPopulator interviewApplicationSentInviteModelPopulator, InterviewAssignmentRestService interviewAssignmentRestService); @GetMapping("/send") String getInvitesToSend(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @ModelAttribute(name = "form", binding = false) InterviewApplicationSendForm form, BindingResult bindingResult); @PostMapping("/send") String sendInvites(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute("form") @Valid InterviewApplicationSendForm form, BindingResult bindingResult, ValidationHandler validationHandler); @PostMapping(value = "/send", params = {"attachFeedbackApplicationId"}) String uploadFeedback(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute("form") InterviewApplicationSendForm form, BindingResult bindingResult, ValidationHandler validationHandler); @PostMapping(value = "/send", params = {"removeFeedbackApplicationId"}) String removeFeedback(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute("form") InterviewApplicationSendForm form, BindingResult bindingResult, ValidationHandler validationHandler); @GetMapping("/send/view-feedback/{applicationId}") @ResponseBody ResponseEntity<ByteArrayResource> downloadFeedback(Model model, @PathVariable("competitionId") long competitionId, @PathVariable("applicationId") long applicationId); @GetMapping(value = "/{applicationId}/view") String viewInvite(Model model, @PathVariable("competitionId") long competitionId, @PathVariable("applicationId") long applicationId); @GetMapping(value = "/{applicationId}/edit") String editInvite(Model model, @ModelAttribute("form") InterviewApplicationResendForm form, @PathVariable("competitionId") long competitionId, @PathVariable("applicationId") long applicationId); @PostMapping(value = "/{applicationId}/edit") String resendInvite(Model model, @Valid @ModelAttribute("form") InterviewApplicationResendForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable("competitionId") long competitionId, @PathVariable("applicationId") long applicationId); }
@Test public void removeFeedback() throws Exception { long competitionId = 1L; long applicationId = 2L; when(interviewAssignmentRestService.deleteFeedback(applicationId)) .thenReturn(restFailure(new Error("", HttpStatus.NOT_FOUND))); setupMocksForGet(competitionId); mockMvc.perform(post("/assessment/interview/competition/{competitionId}/applications/invite/send", competitionId) .contentType(APPLICATION_FORM_URLENCODED) .param("removeFeedbackApplicationId", "2")) .andExpect(status().isOk()) .andExpect(view().name("assessors/interview/application-send-invites")); verify(interviewAssignmentRestService).deleteFeedback(applicationId); }
InterviewApplicationSendInviteController { @GetMapping(value = "/{applicationId}/view") public String viewInvite(Model model, @PathVariable("competitionId") long competitionId, @PathVariable("applicationId") long applicationId) { InterviewAssignmentApplicationsSentInviteViewModel viewModel = interviewApplicationSentInviteModelPopulator.populate(competitionId, applicationId); model.addAttribute("model", viewModel); return "assessors/interview/application-view-invite"; } @Autowired InterviewApplicationSendInviteController(InterviewApplicationsSendModelPopulator interviewApplicationsSendModelPopulator, InterviewApplicationSentInviteModelPopulator interviewApplicationSentInviteModelPopulator, InterviewAssignmentRestService interviewAssignmentRestService); @GetMapping("/send") String getInvitesToSend(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @ModelAttribute(name = "form", binding = false) InterviewApplicationSendForm form, BindingResult bindingResult); @PostMapping("/send") String sendInvites(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute("form") @Valid InterviewApplicationSendForm form, BindingResult bindingResult, ValidationHandler validationHandler); @PostMapping(value = "/send", params = {"attachFeedbackApplicationId"}) String uploadFeedback(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute("form") InterviewApplicationSendForm form, BindingResult bindingResult, ValidationHandler validationHandler); @PostMapping(value = "/send", params = {"removeFeedbackApplicationId"}) String removeFeedback(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute("form") InterviewApplicationSendForm form, BindingResult bindingResult, ValidationHandler validationHandler); @GetMapping("/send/view-feedback/{applicationId}") @ResponseBody ResponseEntity<ByteArrayResource> downloadFeedback(Model model, @PathVariable("competitionId") long competitionId, @PathVariable("applicationId") long applicationId); @GetMapping(value = "/{applicationId}/view") String viewInvite(Model model, @PathVariable("competitionId") long competitionId, @PathVariable("applicationId") long applicationId); @GetMapping(value = "/{applicationId}/edit") String editInvite(Model model, @ModelAttribute("form") InterviewApplicationResendForm form, @PathVariable("competitionId") long competitionId, @PathVariable("applicationId") long applicationId); @PostMapping(value = "/{applicationId}/edit") String resendInvite(Model model, @Valid @ModelAttribute("form") InterviewApplicationResendForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable("competitionId") long competitionId, @PathVariable("applicationId") long applicationId); }
@Test public void viewInvite() throws Exception { long applicationId = 1L; ZonedDateTime dateAssigned = ZonedDateTime.now(); setupViewInvite(applicationId, dateAssigned); MvcResult result = mockMvc.perform(get("/assessment/interview/competition/{competitionId}/applications/invite/{applicationId}/view", competition.getId(), applicationId)) .andExpect(status().isOk()) .andExpect(model().attributeExists("model")) .andExpect(view().name("assessors/interview/application-view-invite")) .andReturn(); InterviewAssignmentApplicationsSentInviteViewModel model = (InterviewAssignmentApplicationsSentInviteViewModel) result.getModelAndView().getModel().get("model"); assertEquals("Content", model.getAdditionalText()); assertEquals("Subject", model.getSubject()); assertEquals("Template", model.getContent()); assertEquals("Organisation", model.getLeadOrganisation()); assertEquals("Filename", model.getFeedbackFilename()); assertEquals(dateAssigned, model.getDateAssigned()); assertTrue(model.hasAttachment()); }
InterviewApplicationSendInviteController { @PostMapping(value = "/{applicationId}/edit") public String resendInvite(Model model, @Valid @ModelAttribute("form") InterviewApplicationResendForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable("competitionId") long competitionId, @PathVariable("applicationId") long applicationId) { Supplier<String> failureView = () -> editInvite(model, form, competitionId, applicationId); Supplier<String> successView = () -> redirectToStatusTab(competitionId); return validationHandler.failNowOrSucceedWith(failureView, () -> { final RestResult<Void> fileResult; if (form.getFeedback() != null && !form.getFeedback().isEmpty()) { MultipartFile file = form.getFeedback(); interviewAssignmentRestService.deleteFeedback(applicationId); fileResult = interviewAssignmentRestService .uploadFeedback(applicationId, file.getContentType(), file.getSize(), file.getOriginalFilename(), getMultipartFileBytes(file)); } else if (form.isRemoveFile()) { fileResult = interviewAssignmentRestService.deleteFeedback(applicationId); } else { fileResult = restSuccess(); } return validationHandler.addAnyErrors(fileResult, fileUploadField("feedback")).failNowOrSucceedWith(failureView, () -> { RestResult<Void> result = interviewAssignmentRestService .resendInvite(applicationId, new AssessorInviteSendResource(form.getSubject(), form.getContent())); return validationHandler.addAnyErrors(error(removeDuplicates(result.getErrors()))) .failNowOrSucceedWith(failureView, successView); } ); }); } @Autowired InterviewApplicationSendInviteController(InterviewApplicationsSendModelPopulator interviewApplicationsSendModelPopulator, InterviewApplicationSentInviteModelPopulator interviewApplicationSentInviteModelPopulator, InterviewAssignmentRestService interviewAssignmentRestService); @GetMapping("/send") String getInvitesToSend(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @ModelAttribute(name = "form", binding = false) InterviewApplicationSendForm form, BindingResult bindingResult); @PostMapping("/send") String sendInvites(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute("form") @Valid InterviewApplicationSendForm form, BindingResult bindingResult, ValidationHandler validationHandler); @PostMapping(value = "/send", params = {"attachFeedbackApplicationId"}) String uploadFeedback(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute("form") InterviewApplicationSendForm form, BindingResult bindingResult, ValidationHandler validationHandler); @PostMapping(value = "/send", params = {"removeFeedbackApplicationId"}) String removeFeedback(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute("form") InterviewApplicationSendForm form, BindingResult bindingResult, ValidationHandler validationHandler); @GetMapping("/send/view-feedback/{applicationId}") @ResponseBody ResponseEntity<ByteArrayResource> downloadFeedback(Model model, @PathVariable("competitionId") long competitionId, @PathVariable("applicationId") long applicationId); @GetMapping(value = "/{applicationId}/view") String viewInvite(Model model, @PathVariable("competitionId") long competitionId, @PathVariable("applicationId") long applicationId); @GetMapping(value = "/{applicationId}/edit") String editInvite(Model model, @ModelAttribute("form") InterviewApplicationResendForm form, @PathVariable("competitionId") long competitionId, @PathVariable("applicationId") long applicationId); @PostMapping(value = "/{applicationId}/edit") String resendInvite(Model model, @Valid @ModelAttribute("form") InterviewApplicationResendForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable("competitionId") long competitionId, @PathVariable("applicationId") long applicationId); }
@Test public void editInvite_removeFile() throws Exception { long applicationId = 1L; ZonedDateTime dateAssigned = ZonedDateTime.now(); setupViewInvite(applicationId, dateAssigned); when(interviewAssignmentRestService.deleteFeedback(applicationId)).thenReturn(restSuccess()); when(interviewAssignmentRestService.resendInvite(eq(applicationId), any())).thenReturn(restSuccess()); mockMvc.perform(post("/assessment/interview/competition/{competitionId}/applications/invite/{applicationId}/edit", competition.getId(), applicationId) .param("subject", "Subject...") .param("content", "Editable content...") .param("removeFile", "true")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(String.format("/assessment/interview/competition/%s/applications/view-status", competition.getId()))); verify(interviewAssignmentRestService).deleteFeedback(applicationId); verify(interviewAssignmentRestService).resendInvite(applicationId, new AssessorInviteSendResource("Subject...", "Editable content...")); }
InterviewAssessorInviteController extends CompetitionManagementCookieController<InterviewSelectionForm> { @GetMapping public String assessors(@PathVariable("competitionId") long competitionId) { return format("redirect:/competition/%s/assessors/interview-find", competitionId); } @Autowired InterviewAssessorInviteController(InterviewInviteRestService interviewInviteRestService, InterviewInviteAssessorsFindModelPopulator interviewInviteAssessorsFindModelPopulator, InterviewInviteAssessorsInviteModelPopulator interviewInviteAssessorsInviteModelPopulator, InterviewInviteAssessorsAcceptedModelPopulator interviewInviteAssessorsAcceptedModelPopulator); @GetMapping String assessors(@PathVariable("competitionId") long competitionId); @GetMapping("/find") String find(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) InterviewSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForInviteList( @PathVariable("competitionId") long competitionId, @RequestParam("selectionId") long assessorId, @RequestParam("isSelected") boolean isSelected, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("addAll") boolean addAll, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find/addSelected") String addSelectedAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam Optional<Long> innovationArea, @ModelAttribute(SELECTION_FORM) InterviewSelectionForm selectionForm, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @GetMapping("/invite") String invite(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam MultiValueMap<String, String> queryParams); @PostMapping(value = "/invite", params = {"remove"}) String removeInviteFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(name = "remove") String email, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"removeAll"}) String removeAllInvitesFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @GetMapping("/accepted") String accepted(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); }
@Test public void assessors() throws Exception { Long competitionId = 1L; mockMvc.perform(get("/assessment/interview/competition/{competitionId}/assessors", competitionId)) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(format("/competition/%s/assessors/interview-find", competitionId))); }
InterviewAssessorInviteController extends CompetitionManagementCookieController<InterviewSelectionForm> { @GetMapping("/find") public String find(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) InterviewSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response) { updateSelectionForm(request, response, competitionId, selectionForm); InterviewInviteAssessorsFindViewModel interviewInviteAssessorsFindViewModel = interviewInviteAssessorsFindModelPopulator.populateModel(competitionId, page); model.addAttribute("model", interviewInviteAssessorsFindViewModel); return "assessors/interview/assessor-find"; } @Autowired InterviewAssessorInviteController(InterviewInviteRestService interviewInviteRestService, InterviewInviteAssessorsFindModelPopulator interviewInviteAssessorsFindModelPopulator, InterviewInviteAssessorsInviteModelPopulator interviewInviteAssessorsInviteModelPopulator, InterviewInviteAssessorsAcceptedModelPopulator interviewInviteAssessorsAcceptedModelPopulator); @GetMapping String assessors(@PathVariable("competitionId") long competitionId); @GetMapping("/find") String find(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) InterviewSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForInviteList( @PathVariable("competitionId") long competitionId, @RequestParam("selectionId") long assessorId, @RequestParam("isSelected") boolean isSelected, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("addAll") boolean addAll, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find/addSelected") String addSelectedAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam Optional<Long> innovationArea, @ModelAttribute(SELECTION_FORM) InterviewSelectionForm selectionForm, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @GetMapping("/invite") String invite(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam MultiValueMap<String, String> queryParams); @PostMapping(value = "/invite", params = {"remove"}) String removeInviteFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(name = "remove") String email, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"removeAll"}) String removeAllInvitesFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @GetMapping("/accepted") String accepted(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); }
@Test public void find() throws Exception { int page = 2; AvailableAssessorPageResource availableAssessorPageResource = newAvailableAssessorPageResource() .withContent(setUpAvailableAssessorResources()) .build(); when(interviewInviteRestService.getAvailableAssessors(competition.getId(), page)).thenReturn(restSuccess(availableAssessorPageResource)); when(interviewInviteRestService.getAvailableAssessorIds(competition.getId())).thenReturn(restSuccess(emptyList())); MvcResult result = mockMvc.perform(get("/assessment/interview/competition/{competitionId}/assessors/find", competition.getId()) .param("page", "2")) .andExpect(status().isOk()) .andExpect(model().attributeExists("model")) .andExpect(view().name("assessors/interview/assessor-find")) .andReturn(); InterviewSelectionForm selectionForm = (InterviewSelectionForm) result.getModelAndView().getModel().get("interviewSelectionForm"); assertTrue(selectionForm.getSelectedAssessorIds().isEmpty()); assertCompetitionDetails(competition, result); assertAvailableAssessors(availableAssessorPageResource.getContent(), result); InOrder inOrder = inOrder(competitionRestService, interviewInviteRestService, competitionKeyApplicationStatisticsRestService); inOrder.verify(interviewInviteRestService).getAvailableAssessorIds(competition.getId()); inOrder.verify(competitionRestService).getCompetitionById(competition.getId()); inOrder.verify(competitionKeyApplicationStatisticsRestService).getInterviewInviteStatisticsByCompetition(competition.getId()); inOrder.verify(interviewInviteRestService).getAvailableAssessors(competition.getId(), page); inOrder.verifyNoMoreInteractions(); }
InterviewAssessorInviteController extends CompetitionManagementCookieController<InterviewSelectionForm> { @GetMapping("/invite") public String invite(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam MultiValueMap<String, String> queryParams) { model.addAttribute("model", interviewInviteAssessorsInviteModelPopulator.populateModel(competitionId, page)); return "assessors/interview/assessor-invite"; } @Autowired InterviewAssessorInviteController(InterviewInviteRestService interviewInviteRestService, InterviewInviteAssessorsFindModelPopulator interviewInviteAssessorsFindModelPopulator, InterviewInviteAssessorsInviteModelPopulator interviewInviteAssessorsInviteModelPopulator, InterviewInviteAssessorsAcceptedModelPopulator interviewInviteAssessorsAcceptedModelPopulator); @GetMapping String assessors(@PathVariable("competitionId") long competitionId); @GetMapping("/find") String find(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) InterviewSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForInviteList( @PathVariable("competitionId") long competitionId, @RequestParam("selectionId") long assessorId, @RequestParam("isSelected") boolean isSelected, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("addAll") boolean addAll, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find/addSelected") String addSelectedAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam Optional<Long> innovationArea, @ModelAttribute(SELECTION_FORM) InterviewSelectionForm selectionForm, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @GetMapping("/invite") String invite(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam MultiValueMap<String, String> queryParams); @PostMapping(value = "/invite", params = {"remove"}) String removeInviteFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(name = "remove") String email, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"removeAll"}) String removeAllInvitesFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @GetMapping("/accepted") String accepted(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); }
@Test public void invite() throws Exception { int page = 0; List<AssessorCreatedInviteResource> assessorCreatedInviteResources = setUpAssessorCreatedInviteResources(); AssessorCreatedInvitePageResource assessorCreatedInvitePageResource = newAssessorCreatedInvitePageResource() .withContent(assessorCreatedInviteResources) .build(); List<InnovationAreaResource> categoryResources = setupCategoryResources(); setupDefaultInviteViewExpectations(page, assessorCreatedInvitePageResource, categoryResources); InviteNewAssessorsForm expectedForm = new InviteNewAssessorsForm(); expectedForm.setInvites(singletonList(new InviteNewAssessorsRowForm())); MvcResult result = mockMvc.perform(get("/assessment/interview/competition/{competitionId}/assessors/invite", competition.getId())) .andExpect(status().isOk()) .andExpect(model().attributeExists("model")) .andExpect(view().name("assessors/interview/assessor-invite")) .andReturn(); assertCompetitionDetails(competition, result); assertInvitedAssessors(assessorCreatedInviteResources, result); InOrder inOrder = inOrder(competitionRestService, interviewInviteRestService, categoryRestServiceMock, competitionKeyApplicationStatisticsRestService); inOrder.verify(competitionRestService).getCompetitionById(competition.getId()); inOrder.verify(competitionKeyApplicationStatisticsRestService).getInterviewInviteStatisticsByCompetition(competition.getId()); inOrder.verify(interviewInviteRestService).getCreatedInvites(competition.getId(), page); inOrder.verifyNoMoreInteractions(); }
InterviewAssessorInviteController extends CompetitionManagementCookieController<InterviewSelectionForm> { @PostMapping(value = "/invite", params = {"remove"}) public String removeInviteFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(name = "remove") String email, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form) { deleteInvite(email, competitionId).getSuccess(); return redirectToInvite(competitionId, page); } @Autowired InterviewAssessorInviteController(InterviewInviteRestService interviewInviteRestService, InterviewInviteAssessorsFindModelPopulator interviewInviteAssessorsFindModelPopulator, InterviewInviteAssessorsInviteModelPopulator interviewInviteAssessorsInviteModelPopulator, InterviewInviteAssessorsAcceptedModelPopulator interviewInviteAssessorsAcceptedModelPopulator); @GetMapping String assessors(@PathVariable("competitionId") long competitionId); @GetMapping("/find") String find(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) InterviewSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForInviteList( @PathVariable("competitionId") long competitionId, @RequestParam("selectionId") long assessorId, @RequestParam("isSelected") boolean isSelected, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("addAll") boolean addAll, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find/addSelected") String addSelectedAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam Optional<Long> innovationArea, @ModelAttribute(SELECTION_FORM) InterviewSelectionForm selectionForm, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @GetMapping("/invite") String invite(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam MultiValueMap<String, String> queryParams); @PostMapping(value = "/invite", params = {"remove"}) String removeInviteFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(name = "remove") String email, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"removeAll"}) String removeAllInvitesFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @GetMapping("/accepted") String accepted(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); }
@Test public void removeInviteFromInviteView() throws Exception { String email = "[email protected]"; when(interviewInviteRestService.deleteInvite(email, competition.getId())).thenReturn(restSuccess()); mockMvc.perform(post("/assessment/interview/competition/{competitionId}/assessors/invite", competition.getId()) .param("remove", email) .param("page", "5")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(format("/assessment/interview/competition/%s/assessors/invite?page=5", competition.getId()))) .andReturn(); verify(interviewInviteRestService, only()).deleteInvite(email, competition.getId()); }
InterviewAssessorInviteController extends CompetitionManagementCookieController<InterviewSelectionForm> { private ServiceResult<Void> deleteInvite(String email, long competitionId) { return interviewInviteRestService.deleteInvite(email, competitionId).toServiceResult(); } @Autowired InterviewAssessorInviteController(InterviewInviteRestService interviewInviteRestService, InterviewInviteAssessorsFindModelPopulator interviewInviteAssessorsFindModelPopulator, InterviewInviteAssessorsInviteModelPopulator interviewInviteAssessorsInviteModelPopulator, InterviewInviteAssessorsAcceptedModelPopulator interviewInviteAssessorsAcceptedModelPopulator); @GetMapping String assessors(@PathVariable("competitionId") long competitionId); @GetMapping("/find") String find(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) InterviewSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForInviteList( @PathVariable("competitionId") long competitionId, @RequestParam("selectionId") long assessorId, @RequestParam("isSelected") boolean isSelected, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("addAll") boolean addAll, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find/addSelected") String addSelectedAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam Optional<Long> innovationArea, @ModelAttribute(SELECTION_FORM) InterviewSelectionForm selectionForm, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @GetMapping("/invite") String invite(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam MultiValueMap<String, String> queryParams); @PostMapping(value = "/invite", params = {"remove"}) String removeInviteFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(name = "remove") String email, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"removeAll"}) String removeAllInvitesFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @GetMapping("/accepted") String accepted(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); }
@Test public void removeInviteFromInviteView_defaultParams() throws Exception { String email = "[email protected]"; when(interviewInviteRestService.deleteInvite(email, competition.getId())).thenReturn(restSuccess()); mockMvc.perform(post("/assessment/interview/competition/{competitionId}/assessors/invite", competition.getId()) .param("remove", email)) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(format("/assessment/interview/competition/%s/assessors/invite?page=0", competition.getId()))) .andReturn(); verify(interviewInviteRestService, only()).deleteInvite(email, competition.getId()); }
InterviewAssessorInviteController extends CompetitionManagementCookieController<InterviewSelectionForm> { @PostMapping(value = "/invite", params = {"removeAll"}) public String removeAllInvitesFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form) { deleteAllInvites(competitionId).getSuccess(); return redirectToInvite(competitionId, page); } @Autowired InterviewAssessorInviteController(InterviewInviteRestService interviewInviteRestService, InterviewInviteAssessorsFindModelPopulator interviewInviteAssessorsFindModelPopulator, InterviewInviteAssessorsInviteModelPopulator interviewInviteAssessorsInviteModelPopulator, InterviewInviteAssessorsAcceptedModelPopulator interviewInviteAssessorsAcceptedModelPopulator); @GetMapping String assessors(@PathVariable("competitionId") long competitionId); @GetMapping("/find") String find(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) InterviewSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForInviteList( @PathVariable("competitionId") long competitionId, @RequestParam("selectionId") long assessorId, @RequestParam("isSelected") boolean isSelected, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("addAll") boolean addAll, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find/addSelected") String addSelectedAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam Optional<Long> innovationArea, @ModelAttribute(SELECTION_FORM) InterviewSelectionForm selectionForm, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @GetMapping("/invite") String invite(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam MultiValueMap<String, String> queryParams); @PostMapping(value = "/invite", params = {"remove"}) String removeInviteFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(name = "remove") String email, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"removeAll"}) String removeAllInvitesFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @GetMapping("/accepted") String accepted(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); }
@Test public void removeAllInvitesFromInviteView() throws Exception { when(interviewInviteRestService.deleteAllInvites(competition.getId())).thenReturn(restSuccess()); mockMvc.perform(post("/assessment/interview/competition/{competitionId}/assessors/invite", competition.getId()) .param("removeAll", "")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(format("/assessment/interview/competition/%s/assessors/invite?page=0", competition.getId()))) .andReturn(); verify(interviewInviteRestService).deleteAllInvites(competition.getId()); }
InterviewAssessorInviteController extends CompetitionManagementCookieController<InterviewSelectionForm> { @GetMapping("/accepted") public String accepted(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page) { model.addAttribute("model", interviewInviteAssessorsAcceptedModelPopulator.populateModel( competitionId, page )); return "assessors/interview/assessor-accepted"; } @Autowired InterviewAssessorInviteController(InterviewInviteRestService interviewInviteRestService, InterviewInviteAssessorsFindModelPopulator interviewInviteAssessorsFindModelPopulator, InterviewInviteAssessorsInviteModelPopulator interviewInviteAssessorsInviteModelPopulator, InterviewInviteAssessorsAcceptedModelPopulator interviewInviteAssessorsAcceptedModelPopulator); @GetMapping String assessors(@PathVariable("competitionId") long competitionId); @GetMapping("/find") String find(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) InterviewSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForInviteList( @PathVariable("competitionId") long competitionId, @RequestParam("selectionId") long assessorId, @RequestParam("isSelected") boolean isSelected, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("addAll") boolean addAll, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find/addSelected") String addSelectedAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam Optional<Long> innovationArea, @ModelAttribute(SELECTION_FORM) InterviewSelectionForm selectionForm, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @GetMapping("/invite") String invite(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam MultiValueMap<String, String> queryParams); @PostMapping(value = "/invite", params = {"remove"}) String removeInviteFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(name = "remove") String email, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"removeAll"}) String removeAllInvitesFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @GetMapping("/accepted") String accepted(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); }
@Test public void accepted() throws Exception { int page = 1; List<ParticipantStatusResource> status = Collections.singletonList(ACCEPTED); List<AssessorInviteOverviewResource> assessorInviteOverviewResources = setUpAssessorInviteOverviewResources(); AssessorInviteOverviewPageResource pageResource = newAssessorInviteOverviewPageResource() .withContent(assessorInviteOverviewResources) .build(); when(interviewInviteRestService.getInvitationOverview(competition.getId(), page, status)) .thenReturn(restSuccess(pageResource)); MvcResult result = mockMvc.perform(get("/assessment/interview/competition/{competitionId}/assessors/accepted", competition.getId()) .param("page", "1")) .andExpect(status().isOk()) .andExpect(model().attributeExists("model")) .andExpect(view().name("assessors/interview/assessor-accepted")) .andReturn(); assertCompetitionDetails(competition, result); assertInviteAccepted(assessorInviteOverviewResources, result); InOrder inOrder = inOrder(competitionRestService, interviewInviteRestService); inOrder.verify(competitionRestService).getCompetitionById(competition.getId()); inOrder.verify(interviewInviteRestService).getInvitationOverview(competition.getId(), page, status); inOrder.verifyNoMoreInteractions(); }
InterviewInviteAssessorsOverviewController extends CompetitionManagementCookieController<InterviewOverviewSelectionForm> { @GetMapping("/pending-and-declined") public String overview(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) InterviewOverviewSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response) { updateOverviewSelectionForm(request, response, competitionId, selectionForm); model.addAttribute("model", interviewInviteAssessorsOverviewModelPopulator.populateModel( competitionId, page )); return "assessors/interview/assessor-overview"; } @GetMapping("/pending-and-declined") String overview(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) InterviewOverviewSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, 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, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/pending-and-declined", params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToResendList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("addAll") boolean addAll, HttpServletRequest request, HttpServletResponse response); }
@Test public void overview() throws Exception { int page = 1; List<Long> inviteIds = asList(1L, 2L); List<AssessorInviteOverviewResource> assessorInviteOverviewResources = setUpAssessorInviteOverviewResources(); AssessorInviteOverviewPageResource pageResource = newAssessorInviteOverviewPageResource() .withContent(assessorInviteOverviewResources) .build(); when(interviewInviteRestService.getInvitationOverview(competition.getId(), page, asList(REJECTED, PENDING))) .thenReturn(restSuccess(pageResource)); when(interviewInviteRestService.getNonAcceptedAssessorInviteIds(competition.getId())).thenReturn(restSuccess(inviteIds)); MvcResult result = mockMvc.perform(get("/assessment/interview/competition/{competitionId}/assessors/pending-and-declined", competition.getId()) .param("page", "1")) .andExpect(status().isOk()) .andExpect(model().attributeExists("model")) .andExpect(view().name("assessors/interview/assessor-overview")) .andReturn(); assertCompetitionDetails(competition, result); assertInviteOverviews(assessorInviteOverviewResources, result); InOrder inOrder = inOrder(competitionRestService, interviewInviteRestService, competitionKeyApplicationStatisticsRestService); inOrder.verify(interviewInviteRestService).getNonAcceptedAssessorInviteIds(competition.getId()); inOrder.verify(competitionRestService).getCompetitionById(competition.getId()); inOrder.verify(competitionKeyApplicationStatisticsRestService).getInterviewInviteStatisticsByCompetition(competition.getId()); inOrder.verify(interviewInviteRestService).getInvitationOverview(competition.getId(), page, asList(REJECTED, PENDING)); inOrder.verifyNoMoreInteractions(); }
AssessorManagementController { private boolean hasApplicationsAssigned(long userId) { return assessorRestService.hasApplicationsAssigned(userId).getSuccess(); } @GetMapping String viewUser(@PathVariable long userId, Model model); @GetMapping("/status") String viewStatus(@ModelAttribute(name = "form") ChangeRoleProfileForm form, @PathVariable long userId, Model model); @PostMapping("/status") String UpdateStatus(@ModelAttribute(name = "form") @Valid ChangeRoleProfileForm form, BindingResult bindingResult, @PathVariable long userId, Model model, ValidationHandler validationHandler); }
@Test public void viewFindExternalUsers() throws Exception { long userId = 1L; long modifiedId = 2L; RoleProfileStatusResource roleProfileStatusResource = newRoleProfileStatusResource().withModifiedBy(modifiedId).build(); UserResource userResource = newUserResource().build(); when(roleProfileStatusRestService.findByUserIdAndProfileRole(userId, ASSESSOR)).thenReturn(restSuccess(roleProfileStatusResource)); when(userRestService.retrieveUserById(modifiedId)).thenReturn(restSuccess(userResource)); when(assessorRestService.hasApplicationsAssigned(userId)).thenReturn(restSuccess(TRUE)); mockMvc.perform(get("/admin/user/{userId}/role-profile",userId)) .andExpect(status().isOk()) .andExpect(view().name("roleprofile/role-profile-details")); } @Test public void UpdateStatus_failure() throws Exception { long userId = 1L; long modifiedId = 2L; RoleProfileStatusResource roleProfileStatusResource = newRoleProfileStatusResource() .withUserId(userId) .withProfileRole(ASSESSOR) .withRoleProfileState(RoleProfileState.UNAVAILABLE) .withModifiedBy(modifiedId) .build(); UserResource userResource = newUserResource().withId(modifiedId).build(); when(roleProfileStatusRestService.findByUserIdAndProfileRole(userId, ASSESSOR)).thenReturn(restSuccess(roleProfileStatusResource)); when(userRestService.retrieveUserById(modifiedId)).thenReturn(restSuccess(userResource)); when(assessorRestService.hasApplicationsAssigned(userId)).thenReturn(restSuccess(TRUE)); mockMvc.perform(post("/admin/user/{userId}/role-profile/status",userId). param("roleProfileState", roleProfileStatusResource.getRoleProfileState().name())) .andExpect(status().isOk()) .andExpect(view().name("roleprofile/change-status")); }
AssessorManagementController { @GetMapping("/status") public String viewStatus(@ModelAttribute(name = "form") ChangeRoleProfileForm form, @PathVariable long userId, Model model) { RoleProfileStatusResource roleProfileStatus = getRoleProfileViewModel(userId).getRoleProfileStatus(); if (form.getRoleProfileState() == null) { form.setRoleProfileState(roleProfileStatus.getRoleProfileState()); if (form.getRoleProfileState() == UNAVAILABLE) { form.setUnavailableReason(roleProfileStatus.getDescription()); } if (form.getRoleProfileState() == DISABLED) { form.setDisabledReason(roleProfileStatus.getDescription()); } } model.addAttribute("state", roleProfileStatus.getRoleProfileState().getDescription().toLowerCase()); model.addAttribute("userId", userId); return "roleprofile/change-status"; } @GetMapping String viewUser(@PathVariable long userId, Model model); @GetMapping("/status") String viewStatus(@ModelAttribute(name = "form") ChangeRoleProfileForm form, @PathVariable long userId, Model model); @PostMapping("/status") String UpdateStatus(@ModelAttribute(name = "form") @Valid ChangeRoleProfileForm form, BindingResult bindingResult, @PathVariable long userId, Model model, ValidationHandler validationHandler); }
@Test public void viewStatus() throws Exception { long userId = 1L; long modifiedId = 2L; RoleProfileStatusResource roleProfileStatusResource = newRoleProfileStatusResource() .withUserId(userId) .withProfileRole(ASSESSOR) .withRoleProfileState(RoleProfileState.ACTIVE) .withModifiedBy(modifiedId) .build(); UserResource userResource = newUserResource().withId(modifiedId).build(); when(roleProfileStatusRestService.findByUserIdAndProfileRole(userId, ASSESSOR)).thenReturn(restSuccess(roleProfileStatusResource)); when(userRestService.retrieveUserById(modifiedId)).thenReturn(restSuccess(userResource)); when(assessorRestService.hasApplicationsAssigned(userId)).thenReturn(restSuccess(TRUE)); mockMvc.perform(get("/admin/user/{userId}/role-profile/status",userId)) .andExpect(status().isOk()) .andExpect(view().name("roleprofile/change-status")); }
StakeholderServiceImpl implements StakeholderService { @Override public ServiceResult<Void> createStakeholder(String inviteHash, RegistrationForm form) { StakeholderRegistrationResource stakeholderRegistrationResource = new StakeholderRegistrationResource(); stakeholderRegistrationResource.setPassword(form.getPassword()); stakeholderRegistrationResource.setFirstName(form.getFirstName()); stakeholderRegistrationResource.setLastName(form.getLastName()); return competitionSetupStakeholderRestService.createStakeholder(inviteHash, stakeholderRegistrationResource).toServiceResult(); } @Override ServiceResult<Void> createStakeholder(String inviteHash, RegistrationForm form); }
@Test public void createStakeholder() { RegistrationForm registrationForm = new RegistrationForm("Billy", "Ocean", "Passw0rd"); StakeholderRegistrationResource stakeholderRegistrationResource = newStakeholderRegistrationResource() .withFirstName(registrationForm.getFirstName()) .withLastName(registrationForm.getLastName()) .withPassword(registrationForm.getPassword()) .build(); when(competitionSetupStakeholderRestServiceMock.createStakeholder("hash1234", stakeholderRegistrationResource)).thenReturn(RestResult.restSuccess()); ServiceResult<Void> result = service.createStakeholder("hash1234", registrationForm); assertTrue(result.isSuccess()); }
InternalUserServiceImpl implements InternalUserService { @Override public ServiceResult<Void> createInternalUser(String inviteHash, RegistrationForm registrationForm) { InternalUserRegistrationResource internalUserRegistrationResource = new InternalUserRegistrationResource(); internalUserRegistrationResource.setPassword(registrationForm.getPassword()); internalUserRegistrationResource.setFirstName(registrationForm.getFirstName()); internalUserRegistrationResource.setLastName(registrationForm.getLastName()); return userRestService.createInternalUser(inviteHash, internalUserRegistrationResource).toServiceResult(); } @Override ServiceResult<Void> createInternalUser(String inviteHash, RegistrationForm registrationForm); @Override ServiceResult<Void> editInternalUser(EditUserResource editUserResource); }
@Test public void testCreateInternalUser(){ RegistrationForm registrationForm = new RegistrationForm("Arden", "Pimenta", "Passw0rd"); InternalUserRegistrationResource internalUserRegistrationResource = newInternalUserRegistrationResource() .withFirstName(registrationForm.getFirstName()) .withLastName(registrationForm.getLastName()) .withPassword(registrationForm.getPassword()) .build(); when(userRestServiceMock.createInternalUser("hash", internalUserRegistrationResource)).thenReturn(RestResult.restSuccess()); ServiceResult<Void> result = service.createInternalUser("hash", registrationForm); assertTrue(result.isSuccess()); }
InternalUserServiceImpl implements InternalUserService { @Override public ServiceResult<Void> editInternalUser(EditUserResource editUserResource) { return userRestService.editInternalUser(editUserResource).toServiceResult(); } @Override ServiceResult<Void> createInternalUser(String inviteHash, RegistrationForm registrationForm); @Override ServiceResult<Void> editInternalUser(EditUserResource editUserResource); }
@Test public void editInternalUser() throws Exception { EditUserResource editUserResource = new EditUserResource(); when(userRestServiceMock.editInternalUser(editUserResource)).thenReturn(restSuccess()); ServiceResult<Void> result = service.editInternalUser(editUserResource); assertTrue(result.isSuccess()); verify(userRestServiceMock).editInternalUser(editUserResource); }
StakeholderRegistrationController { @PostMapping("/{inviteHash}/register") public String submitYourDetails(Model model, @PathVariable("inviteHash") String inviteHash, @Valid @ModelAttribute(FORM_ATTR_NAME) RegistrationForm form, BindingResult bindingResult, ValidationHandler validationHandler, UserResource loggedInUser) { Supplier<String> failureView = () -> doViewYourDetails(model, inviteHash, loggedInUser); if(loggedInUser != null) { return failureView.get(); } else { return validationHandler.failNowOrSucceedWith(failureView, () -> { ServiceResult<Void> result = stakeholderService.createStakeholder(inviteHash, form); result.getErrors().forEach(error -> { if (StringUtils.hasText(error.getFieldName())) { bindingResult.rejectValue(error.getFieldName(), "stakeholders." + error.getErrorKey()); } else { bindingResult.reject("stakeholders." + error.getErrorKey()); } }); return validationHandler. failNowOrSucceedWith(failureView, () -> format("redirect:/stakeholder/%s/register/account-created", inviteHash)); }); } } @GetMapping("/{inviteHash}/register") String createAccount(@PathVariable("inviteHash") String inviteHash, Model model, @ModelAttribute("form") RegistrationForm form); @PostMapping("/{inviteHash}/register") String submitYourDetails(Model model, @PathVariable("inviteHash") String inviteHash, @Valid @ModelAttribute(FORM_ATTR_NAME) RegistrationForm form, BindingResult bindingResult, ValidationHandler validationHandler, UserResource loggedInUser); @GetMapping(value = "/{inviteHash}/register/account-created") String accountCreated(@PathVariable("inviteHash") String inviteHash, UserResource loggedInUser); }
@Test public void submitYourDetails() throws Exception { setLoggedInUser(null); RegistrationForm registrationForm = new RegistrationForm("Tyler", "Newall", "Passw0rd"); registrationForm.setEmail("[email protected]"); StakeholderInviteResource inviteResource = newStakeholderInviteResource() .withStatus(InviteStatus.SENT) .build(); when(stakeholderServiceMock.createStakeholder(eq("hash"), refEq(registrationForm))).thenReturn(ServiceResult.serviceSuccess()); when(competitionSetupStakeholderRestServiceMock.getStakeholderInvite("hash")).thenReturn(RestResult.restSuccess(inviteResource)); mockMvc.perform(post(URL_PREFIX + "/hash/register") .contentType(MediaType.APPLICATION_FORM_URLENCODED) .param("firstName", registrationForm.getFirstName()) .param("lastName", registrationForm.getLastName()) .param("email", registrationForm.getEmail()) .param("password", registrationForm.getPassword())) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl("/stakeholder/hash/register/account-created")); }
StakeholderRegistrationController { @GetMapping(value = "/{inviteHash}/register/account-created") public String accountCreated(@PathVariable("inviteHash") String inviteHash, UserResource loggedInUser) { boolean userIsLoggedIn = loggedInUser != null; if (userIsLoggedIn) { return "redirect:/"; } return competitionSetupStakeholderRestService.getStakeholderInvite(inviteHash).andOnSuccessReturn(invite -> { if (InviteStatus.OPENED != invite.getStatus()) { return format("redirect:/stakeholder/%s/register", inviteHash); } else { return "registration/account-created"; } }).getSuccess(); } @GetMapping("/{inviteHash}/register") String createAccount(@PathVariable("inviteHash") String inviteHash, Model model, @ModelAttribute("form") RegistrationForm form); @PostMapping("/{inviteHash}/register") String submitYourDetails(Model model, @PathVariable("inviteHash") String inviteHash, @Valid @ModelAttribute(FORM_ATTR_NAME) RegistrationForm form, BindingResult bindingResult, ValidationHandler validationHandler, UserResource loggedInUser); @GetMapping(value = "/{inviteHash}/register/account-created") String accountCreated(@PathVariable("inviteHash") String inviteHash, UserResource loggedInUser); }
@Test public void accountCreated() throws Exception { setLoggedInUser(null); StakeholderInviteResource inviteResource = newStakeholderInviteResource() .withStatus(InviteStatus.OPENED) .build(); when(competitionSetupStakeholderRestServiceMock.getStakeholderInvite("hash")).thenReturn(RestResult.restSuccess(inviteResource)); mockMvc.perform(get(URL_PREFIX + "/hash/register/account-created")) .andExpect(status().isOk()) .andExpect(view().name("registration/account-created")); }
MonitoringOfficerRegistrationController { @GetMapping("/{inviteHash}/register") public String openInvite(@PathVariable("inviteHash") String inviteHash, Model model, HttpServletRequest request, @ModelAttribute("form") RegistrationForm form, UserResource loggedInUser) { if (loggedInUser != null) { if (!competitionSetupMonitoringOfficerRestService.getMonitoringOfficerInvite(inviteHash).getSuccess().getEmail().equalsIgnoreCase(loggedInUser.getEmail())) { return "registration/error"; } } MonitoringOfficerInviteResource monitoringOfficerInviteResource = competitionSetupMonitoringOfficerRestService.openMonitoringOfficerInvite(inviteHash).getSuccess(); form.setEmail(monitoringOfficerInviteResource.getEmail()); model.addAttribute("model", RegistrationViewModelBuilder.aRegistrationViewModel().withPhoneRequired(true).withTermsRequired(false).withInvitee(true).build()); return "registration/register"; } @GetMapping("/{inviteHash}/register") String openInvite(@PathVariable("inviteHash") String inviteHash, Model model, HttpServletRequest request, @ModelAttribute("form") RegistrationForm form, UserResource loggedInUser); @PostMapping("/{inviteHash}/register") String submitDetails(Model model, @PathVariable("inviteHash") String inviteHash, @ModelAttribute(FORM_ATTR_NAME) @Validated({Default.class, PhoneNumberValidationGroup.class}) RegistrationForm monitoringOfficerRegistrationForm, BindingResult bindingResult, ValidationHandler validationHandler, UserResource loggedInUser); @GetMapping(value = "/{inviteHash}/register/account-created") String accountCreated(@PathVariable("inviteHash") String inviteHash, HttpServletRequest request, UserResource loggedInUser); }
@Test public void openInvite() throws Exception { setLoggedInUser(null); String hash = "hash"; MonitoringOfficerInviteResource monitoringOfficerInviteResource = newMonitoringOfficerInviteResource() .withEmail("[email protected]") .build(); RegistrationViewModel expectedViewModel = RegistrationViewModelBuilder.aRegistrationViewModel().withPhoneRequired(true).withTermsRequired(false).withInvitee(true).build(); when(competitionSetupMonitoringOfficerRestServiceMock.openMonitoringOfficerInvite(hash)).thenReturn(restSuccess(monitoringOfficerInviteResource)); mockMvc.perform(get(URL_PREFIX + "/{hash}/register", hash)) .andExpect(status().isOk()) .andExpect(model().hasNoErrors()) .andExpect(model().attribute("model", samePropertyValuesAs(expectedViewModel))) .andExpect(view().name("registration/register")); verify(competitionSetupMonitoringOfficerRestServiceMock).openMonitoringOfficerInvite(hash); }
MonitoringOfficerRegistrationController { @PostMapping("/{inviteHash}/register") public String submitDetails(Model model, @PathVariable("inviteHash") String inviteHash, @ModelAttribute(FORM_ATTR_NAME) @Validated({Default.class, PhoneNumberValidationGroup.class}) RegistrationForm monitoringOfficerRegistrationForm, BindingResult bindingResult, ValidationHandler validationHandler, UserResource loggedInUser) { Supplier<String> failureView = () -> doViewYourDetails(model, inviteHash, loggedInUser); if (loggedInUser != null) { return failureView.get(); } else { return validationHandler.failNowOrSucceedWith(failureView, () -> { ServiceResult<Void> result = monitoringOfficerService.activateAndUpdateMonitoringOfficer(inviteHash, monitoringOfficerRegistrationForm); result.getErrors().forEach(error -> { if (StringUtils.hasText(error.getFieldName())) { bindingResult.rejectValue(error.getFieldName(), "registration." + error.getErrorKey()); } else { bindingResult.reject("registration." + error.getErrorKey()); } }); return validationHandler. failNowOrSucceedWith(failureView, () -> format("redirect:/monitoring-officer/%s/register/account-created", inviteHash)); }); } } @GetMapping("/{inviteHash}/register") String openInvite(@PathVariable("inviteHash") String inviteHash, Model model, HttpServletRequest request, @ModelAttribute("form") RegistrationForm form, UserResource loggedInUser); @PostMapping("/{inviteHash}/register") String submitDetails(Model model, @PathVariable("inviteHash") String inviteHash, @ModelAttribute(FORM_ATTR_NAME) @Validated({Default.class, PhoneNumberValidationGroup.class}) RegistrationForm monitoringOfficerRegistrationForm, BindingResult bindingResult, ValidationHandler validationHandler, UserResource loggedInUser); @GetMapping(value = "/{inviteHash}/register/account-created") String accountCreated(@PathVariable("inviteHash") String inviteHash, HttpServletRequest request, UserResource loggedInUser); }
@Test public void submitDetails() throws Exception { setLoggedInUser(null); String hash = "hash"; RegistrationForm registrationForm = new RegistrationForm(); registrationForm.setFirstName("Tom"); registrationForm.setLastName("Baldwin"); registrationForm.setPassword("Passw0rd"); registrationForm.setEmail("[email protected]"); registrationForm.setPhoneNumber("0114 286 6356"); when(monitoringOfficerServiceMock.activateAndUpdateMonitoringOfficer(eq(hash), refEq(registrationForm))).thenReturn(ServiceResult.serviceSuccess()); mockMvc.perform(post(URL_PREFIX + "/{hash}/register", hash) .contentType(MediaType.APPLICATION_FORM_URLENCODED) .param("firstName", registrationForm.getFirstName()) .param("lastName", registrationForm.getLastName()) .param("email", registrationForm.getEmail()) .param("phoneNumber", registrationForm.getPhoneNumber()) .param("password", registrationForm.getPassword())) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl("/monitoring-officer/hash/register/account-created")); InOrder inOrder = inOrder(monitoringOfficerServiceMock, competitionSetupMonitoringOfficerRestServiceMock); inOrder.verify(monitoringOfficerServiceMock).activateAndUpdateMonitoringOfficer(eq(hash), refEq(registrationForm)); inOrder.verifyNoMoreInteractions(); }
MonitoringOfficerRegistrationController { @GetMapping(value = "/{inviteHash}/register/account-created") public String accountCreated(@PathVariable("inviteHash") String inviteHash, HttpServletRequest request, UserResource loggedInUser) { boolean userIsLoggedIn = loggedInUser != null; if (userIsLoggedIn) { return dashboardRedirect(request); } return competitionSetupMonitoringOfficerRestService.getMonitoringOfficerInvite(inviteHash).andOnSuccessReturn(invite -> { if (InviteStatus.OPENED != invite.getStatus()) { return format("redirect:/monitoring-officer/%s/register", inviteHash); } else { return "registration/account-created"; } }).getSuccess(); } @GetMapping("/{inviteHash}/register") String openInvite(@PathVariable("inviteHash") String inviteHash, Model model, HttpServletRequest request, @ModelAttribute("form") RegistrationForm form, UserResource loggedInUser); @PostMapping("/{inviteHash}/register") String submitDetails(Model model, @PathVariable("inviteHash") String inviteHash, @ModelAttribute(FORM_ATTR_NAME) @Validated({Default.class, PhoneNumberValidationGroup.class}) RegistrationForm monitoringOfficerRegistrationForm, BindingResult bindingResult, ValidationHandler validationHandler, UserResource loggedInUser); @GetMapping(value = "/{inviteHash}/register/account-created") String accountCreated(@PathVariable("inviteHash") String inviteHash, HttpServletRequest request, UserResource loggedInUser); }
@Test public void accountCreated() throws Exception { setLoggedInUser(null); String hash = "hash"; MonitoringOfficerInviteResource inviteResource = newMonitoringOfficerInviteResource() .withStatus(InviteStatus.OPENED) .build(); when(competitionSetupMonitoringOfficerRestServiceMock.getMonitoringOfficerInvite(hash)) .thenReturn(restSuccess(inviteResource)); mockMvc.perform(get(URL_PREFIX + "/{hash}/register/account-created", hash)) .andExpect(status().isOk()) .andExpect(view().name("registration/account-created")); verify(competitionSetupMonitoringOfficerRestServiceMock, only()).getMonitoringOfficerInvite(hash); }
InternalUserRegistrationController { @GetMapping("/{inviteHash}/register") public String yourDetails(Model model, @PathVariable("inviteHash") String inviteHash, @ModelAttribute(name = FORM_ATTR_NAME, binding = false) RegistrationForm form, UserResource loggedInUser) { RoleInviteResource invite = inviteUserRestService.getInvite(inviteHash).getSuccess(); form.setEmail(invite.getEmail()); return doViewYourDetails(model, inviteHash, loggedInUser); } @GetMapping("/{inviteHash}/register") String yourDetails(Model model, @PathVariable("inviteHash") String inviteHash, @ModelAttribute(name = FORM_ATTR_NAME, binding = false) RegistrationForm form, UserResource loggedInUser); @PostMapping("/{inviteHash}/register") String submitYourDetails(Model model, @PathVariable("inviteHash") String inviteHash, @Valid @ModelAttribute(FORM_ATTR_NAME) RegistrationForm registrationForm, BindingResult bindingResult, ValidationHandler validationHandler, UserResource loggedInUser); @GetMapping(value = "/{inviteHash}/register/account-created") String accountCreated(@PathVariable("inviteHash") String inviteHash, UserResource loggedInUser); }
@Test public void testYourDetails() throws Exception { setLoggedInUser(null); when(inviteUserRestServiceMock.getInvite("hash")).thenReturn(restSuccess(newRoleInviteResource().build())); RegistrationViewModel viewModel = aRegistrationViewModel().withPhoneRequired(false).withTermsRequired(false).withInvitee(true).build(); mockMvc.perform(get(URL_PREFIX + "/hash/register")) .andExpect(status().isOk()) .andExpect(view().name("registration/register")) .andExpect(model().attribute("model", samePropertyValuesAs(viewModel))); }
InternalUserRegistrationController { @PostMapping("/{inviteHash}/register") public String submitYourDetails(Model model, @PathVariable("inviteHash") String inviteHash, @Valid @ModelAttribute(FORM_ATTR_NAME) RegistrationForm registrationForm, BindingResult bindingResult, ValidationHandler validationHandler, UserResource loggedInUser) { Supplier<String> failureView = () -> doViewYourDetails(model, inviteHash, loggedInUser); if(loggedInUser != null){ return failureView.get(); } else { return validationHandler.failNowOrSucceedWith(failureView, () -> { ServiceResult<Void> result = internalUserService.createInternalUser(inviteHash, registrationForm); result.getErrors().forEach(error -> { if (StringUtils.hasText(error.getFieldName())) { bindingResult.rejectValue(error.getFieldName(), "registration." + error.getErrorKey()); } else { bindingResult.reject("registration." + error.getErrorKey()); } }); return validationHandler. failNowOrSucceedWith(failureView, () -> format("redirect:/registration/%s/register/account-created", inviteHash)); }); } } @GetMapping("/{inviteHash}/register") String yourDetails(Model model, @PathVariable("inviteHash") String inviteHash, @ModelAttribute(name = FORM_ATTR_NAME, binding = false) RegistrationForm form, UserResource loggedInUser); @PostMapping("/{inviteHash}/register") String submitYourDetails(Model model, @PathVariable("inviteHash") String inviteHash, @Valid @ModelAttribute(FORM_ATTR_NAME) RegistrationForm registrationForm, BindingResult bindingResult, ValidationHandler validationHandler, UserResource loggedInUser); @GetMapping(value = "/{inviteHash}/register/account-created") String accountCreated(@PathVariable("inviteHash") String inviteHash, UserResource loggedInUser); }
@Test public void testSubmitYourDetails() throws Exception { setLoggedInUser(null); RegistrationForm registrationForm = new RegistrationForm(); registrationForm.setFirstName("Arden"); registrationForm.setLastName("Pimenta"); registrationForm.setPassword("Passw0rd"); registrationForm.setEmail("[email protected]"); when(internalUserServiceMock.createInternalUser(eq("hash"), refEq(registrationForm))).thenReturn(serviceSuccess()); mockMvc.perform(post(URL_PREFIX + "/hash/register") .contentType(MediaType.APPLICATION_FORM_URLENCODED) .param("firstName", registrationForm.getFirstName()) .param("lastName", registrationForm.getLastName()) .param("password", registrationForm.getPassword()) .param("email", registrationForm.getEmail())) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl("/registration/hash/register/account-created")); }
InternalUserRegistrationController { @GetMapping(value = "/{inviteHash}/register/account-created") public String accountCreated(@PathVariable("inviteHash") String inviteHash, UserResource loggedInUser) { boolean userIsLoggedIn = loggedInUser != null; if (userIsLoggedIn) { return "redirect:/"; } return inviteUserRestService.checkExistingUser(inviteHash).andOnSuccessReturn(userExists -> { if (!userExists) { return format("redirect:/registration/%s/register", inviteHash); } else { return "registration/account-created"; } }).getSuccess(); } @GetMapping("/{inviteHash}/register") String yourDetails(Model model, @PathVariable("inviteHash") String inviteHash, @ModelAttribute(name = FORM_ATTR_NAME, binding = false) RegistrationForm form, UserResource loggedInUser); @PostMapping("/{inviteHash}/register") String submitYourDetails(Model model, @PathVariable("inviteHash") String inviteHash, @Valid @ModelAttribute(FORM_ATTR_NAME) RegistrationForm registrationForm, BindingResult bindingResult, ValidationHandler validationHandler, UserResource loggedInUser); @GetMapping(value = "/{inviteHash}/register/account-created") String accountCreated(@PathVariable("inviteHash") String inviteHash, UserResource loggedInUser); }
@Test public void testAccountCreated() throws Exception { setLoggedInUser(null); when(inviteUserRestServiceMock.checkExistingUser("hash")).thenReturn(RestResult.restSuccess(true)); mockMvc.perform(get(URL_PREFIX + "/hash/register/account-created")) .andExpect(status().isOk()) .andExpect(view().name("registration/account-created")); }
ReviewPermissionRules { @PermissionRule(value = "REVIEW", description = "Only project finance or competition admin can see review panels" + "if the competition is in the correct state.") public boolean reviewPanel(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser) { CompetitionResource competition = competitionRestService.getCompetitionById(competitionCompositeId.id()).getSuccess(); return isInternalAdmin(loggedInUser) && competitionHasReviewPanel(competition) && !competitionIsInInformOrLater(competition); } @PermissionRule(value = "REVIEW", description = "Only project finance or competition admin can see review panels" + "if the competition is in the correct state.") boolean reviewPanel(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser); @PermissionRule(value = "REVIEW_APPLICATIONS", description = "Only project finance or competition admin can " + "see review panel applications if the competition is in the correct state.") boolean reviewPanelApplications(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser); }
@Test public void reviewPanel() { UserResource loggedInUser = compAdminUser(); for (CompetitionStatus competitionStatus : CompetitionStatus.values()) { final CompetitionResource competitionWithInterviewStage = newCompetitionResource() .withCompetitionStatus(competitionStatus) .build(); CompetitionAssessmentConfigResource competitionAssessmentConfigResourceWithInterviewStage = newCompetitionAssessmentConfigResource() .withIncludeAverageAssessorScoreInNotifications(false) .withAssessorCount(5) .withAssessorPay(BigDecimal.valueOf(100)) .withHasAssessmentPanel(true) .withHasInterviewStage(true) .withAssessorFinanceView(DETAILED) .build(); final CompetitionResource competitionWithoutInterviewStage = newCompetitionResource() .withCompetitionStatus(competitionStatus) .build(); CompetitionAssessmentConfigResource competitionAssessmentConfigResourceWithoutInterviewStage = newCompetitionAssessmentConfigResource() .withIncludeAverageAssessorScoreInNotifications(false) .withAssessorCount(5) .withAssessorPay(BigDecimal.valueOf(100)) .withHasAssessmentPanel(false) .withHasInterviewStage(false) .withAssessorFinanceView(DETAILED) .build(); when(competitionRestService.getCompetitionById(competitionWithInterviewStage.getId())).thenReturn(restSuccess(competitionWithInterviewStage)); when(competitionRestService.getCompetitionById(competitionWithoutInterviewStage.getId())).thenReturn(restSuccess(competitionWithoutInterviewStage)); when(competitionAssessmentConfigRestService.findOneByCompetitionId(competitionWithInterviewStage.getId())).thenReturn(restSuccess(competitionAssessmentConfigResourceWithInterviewStage)); when(competitionAssessmentConfigRestService.findOneByCompetitionId(competitionWithoutInterviewStage.getId())).thenReturn(restSuccess(competitionAssessmentConfigResourceWithoutInterviewStage)); switch (competitionStatus) { case ASSESSOR_FEEDBACK: case PROJECT_SETUP: case PREVIOUS: assertFalse("With interview stage and status " + competitionStatus.toString(), rules.reviewPanel(CompetitionCompositeId.id(competitionWithInterviewStage.getId()), loggedInUser)); break; default: assertTrue("With interview stage and status " + competitionStatus.toString(), rules.reviewPanel(CompetitionCompositeId.id(competitionWithInterviewStage.getId()), loggedInUser)); } assertFalse("Without interview stage and status " + competitionStatus.toString(), rules.reviewPanel(CompetitionCompositeId.id(competitionWithoutInterviewStage.getId()), loggedInUser)); } }
ReviewPermissionRules { @PermissionRule(value = "REVIEW_APPLICATIONS", description = "Only project finance or competition admin can " + "see review panel applications if the competition is in the correct state.") public boolean reviewPanelApplications(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser) { CompetitionResource competition = competitionRestService.getCompetitionById(competitionCompositeId.id()).getSuccess(); return isInternalAdmin(loggedInUser) && competitionHasReviewPanel(competition) && competitionIsInFundersPanel(competition); } @PermissionRule(value = "REVIEW", description = "Only project finance or competition admin can see review panels" + "if the competition is in the correct state.") boolean reviewPanel(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser); @PermissionRule(value = "REVIEW_APPLICATIONS", description = "Only project finance or competition admin can " + "see review panel applications if the competition is in the correct state.") boolean reviewPanelApplications(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser); }
@Test public void reviewPanelApplications() { UserResource loggedInUser = compAdminUser(); for (CompetitionStatus competitionStatus : CompetitionStatus.values()) { final CompetitionResource competitionWithInterviewStage = newCompetitionResource() .withCompetitionStatus(competitionStatus) .build(); CompetitionAssessmentConfigResource competitionAssessmentConfigResourceWithInterviewStage = newCompetitionAssessmentConfigResource() .withIncludeAverageAssessorScoreInNotifications(false) .withAssessorCount(5) .withAssessorPay(BigDecimal.valueOf(100)) .withHasAssessmentPanel(true) .withHasInterviewStage(true) .withAssessorFinanceView(DETAILED) .build(); final CompetitionResource competitionWithoutInterviewStage = newCompetitionResource() .withCompetitionStatus(competitionStatus) .build(); CompetitionAssessmentConfigResource competitionAssessmentConfigResourceWithoutInterviewStage = newCompetitionAssessmentConfigResource() .withIncludeAverageAssessorScoreInNotifications(false) .withAssessorCount(5) .withAssessorPay(BigDecimal.valueOf(100)) .withHasAssessmentPanel(false) .withHasInterviewStage(false) .withAssessorFinanceView(DETAILED) .build(); when(competitionRestService.getCompetitionById(competitionWithInterviewStage.getId())).thenReturn(restSuccess(competitionWithInterviewStage)); when(competitionRestService.getCompetitionById(competitionWithoutInterviewStage.getId())).thenReturn(restSuccess(competitionWithoutInterviewStage)); when(competitionAssessmentConfigRestService.findOneByCompetitionId(competitionWithInterviewStage.getId())).thenReturn(restSuccess(competitionAssessmentConfigResourceWithInterviewStage)); when(competitionAssessmentConfigRestService.findOneByCompetitionId(competitionWithoutInterviewStage.getId())).thenReturn(restSuccess(competitionAssessmentConfigResourceWithoutInterviewStage)); if (competitionStatus == CompetitionStatus.FUNDERS_PANEL) { assertTrue(rules.reviewPanelApplications(CompetitionCompositeId.id(competitionWithInterviewStage.getId()), loggedInUser)); } else { assertFalse(rules.reviewPanelApplications(CompetitionCompositeId.id(competitionWithInterviewStage.getId()), loggedInUser)); } assertFalse(rules.reviewPanelApplications(CompetitionCompositeId.id(competitionWithoutInterviewStage.getId()), loggedInUser)); } }
ReviewSendInviteController extends CompetitionManagementCookieController<ReviewOverviewSelectionForm> { @PostMapping("/send") public String sendInvites(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute("form") @Valid SendInviteForm form, BindingResult bindingResult, ValidationHandler validationHandler) { Supplier<String> failureView = () -> getInvitesToSend(model, competitionId, form, bindingResult); return validationHandler.failNowOrSucceedWith(failureView, () -> { RestResult<Void> sendResult = reviewInviteRestService .sendAllInvites(competitionId, new AssessorInviteSendResource(form.getSubject(), form.getContent())); return validationHandler.addAnyErrors(error(removeDuplicates(sendResult.getErrors()))) .failNowOrSucceedWith(failureView, () -> redirectToPanelOverviewTab(competitionId)); }); } @GetMapping("/send") String getInvitesToSend(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute(name = "form", binding = false) SendInviteForm form, BindingResult bindingResult); @PostMapping("/send") String sendInvites(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute("form") @Valid SendInviteForm form, BindingResult bindingResult, ValidationHandler validationHandler); @GetMapping("/reviewResend") String getInvitesToResendFailureView(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute(name = "form", binding = false) ResendInviteForm inviteform, BindingResult bindingResult, ValidationHandler validationHandler); @PostMapping("/reviewResend") String getInvitesToResend(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @ModelAttribute(SELECTION_FORM) ReviewOverviewSelectionForm selectionForm, @ModelAttribute(name = "form", binding = false) ResendInviteForm inviteform, ValidationHandler validationHandler, BindingResult bindingResult, HttpServletRequest request); @PostMapping("/resend") String resendInvites(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute("form") @Valid ResendInviteForm form, BindingResult bindingResult, ValidationHandler validationHandler, HttpServletResponse response); }
@Test public void sendInvites() throws Exception { long competitionId = 5L; AssessorInviteSendResource expectedAssessorInviteSendResource = newAssessorInviteSendResource() .withSubject("Subject...") .withContent("Editable content...") .build(); when(reviewInviteRestService.sendAllInvites(competitionId, expectedAssessorInviteSendResource)).thenReturn(restSuccess()); mockMvc.perform(post("/panel/competition/{competitionId}/assessors/invite/send", competitionId) .contentType(APPLICATION_FORM_URLENCODED) .param("subject", "Subject...") .param("content", "Editable content...")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(format("/assessment/panel/competition/%s/assessors/pending-and-declined", competitionId))); InOrder inOrder = inOrder(reviewInviteRestService); inOrder.verify(reviewInviteRestService).sendAllInvites(competitionId, expectedAssessorInviteSendResource); inOrder.verifyNoMoreInteractions(); }
ReviewSendInviteController extends CompetitionManagementCookieController<ReviewOverviewSelectionForm> { @PostMapping("/resend") public String resendInvites (Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute("form") @Valid ResendInviteForm form, BindingResult bindingResult, ValidationHandler validationHandler, HttpServletResponse response){ Supplier<String> failureView = () -> getInvitesToResendFailureView(model, competitionId, form, bindingResult, validationHandler); return validationHandler.failNowOrSucceedWith(failureView, () -> { ServiceResult<Void> resendResult = reviewInviteRestService.resendInvites(form.getInviteIds(), new AssessorInviteSendResource(form.getSubject(), form.getContent())) .toServiceResult(); return validationHandler.addAnyErrors(resendResult, fieldErrorsToFieldErrors(), asGlobalErrors()) .failNowOrSucceedWith(failureView, () -> { removeCookie(response, competitionId); return redirectToOverview(competitionId, 0); }); }); } @GetMapping("/send") String getInvitesToSend(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute(name = "form", binding = false) SendInviteForm form, BindingResult bindingResult); @PostMapping("/send") String sendInvites(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute("form") @Valid SendInviteForm form, BindingResult bindingResult, ValidationHandler validationHandler); @GetMapping("/reviewResend") String getInvitesToResendFailureView(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute(name = "form", binding = false) ResendInviteForm inviteform, BindingResult bindingResult, ValidationHandler validationHandler); @PostMapping("/reviewResend") String getInvitesToResend(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @ModelAttribute(SELECTION_FORM) ReviewOverviewSelectionForm selectionForm, @ModelAttribute(name = "form", binding = false) ResendInviteForm inviteform, ValidationHandler validationHandler, BindingResult bindingResult, HttpServletRequest request); @PostMapping("/resend") String resendInvites(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute("form") @Valid ResendInviteForm form, BindingResult bindingResult, ValidationHandler validationHandler, HttpServletResponse response); }
@Test public void resendInvites() throws Exception { List<Long> inviteIds = asList(1L, 2L); AssessorInvitesToSendResource invite = newAssessorInvitesToSendResource().withCompetitionId(competition.getId()).build(); AssessorInviteSendResource expectedAssessorInviteSendResource = newAssessorInviteSendResource() .withSubject("Subject...") .withContent("Editable content...") .build(); when(reviewInviteRestService.resendInvites(inviteIds, expectedAssessorInviteSendResource)).thenReturn(restSuccess()); mockMvc.perform(post("/panel/competition/{competitionId}/assessors/invite/resend", competition.getId()) .contentType(APPLICATION_FORM_URLENCODED) .param("inviteIds[0]", inviteIds.get(0).toString()) .param("inviteIds[1]", inviteIds.get(1).toString()) .param("subject", "Subject...") .param("content", "Editable content...")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(format("/assessment/panel/competition/%s/assessors/pending-and-declined?page=0", competition.getId()))); InOrder inOrder = inOrder(reviewInviteRestService); inOrder.verify(reviewInviteRestService).resendInvites(inviteIds, expectedAssessorInviteSendResource); inOrder.verifyNoMoreInteractions(); }
ReviewManageApplicationsController { @GetMapping("/manage-applications") public String manageApplications(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(value = "page", defaultValue = "0") int page, @RequestParam(value = "filterSearch", defaultValue = "") String filter, @RequestParam(value = "sort", defaultValue = "") String sortBy) { CompetitionResource competitionResource = competitionRestService .getCompetitionById(competitionId) .getSuccess(); ApplicationSummaryPageResource applications = getSummaries(competitionResource.getId(), page, filter, sortBy); List<ApplicationSummaryResource> assignedApplications = getAssignedSummaries(competitionId); model.addAttribute("model", manageReviewApplicationsModelPopulator.populateModel(competitionResource, applications, assignedApplications, filter, sortBy)); return "competition/manage-applications-panel"; } @GetMapping("/manage-applications") String manageApplications(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(value = "page", defaultValue = "0") int page, @RequestParam(value = "filterSearch", defaultValue = "") String filter, @RequestParam(value = "sort", defaultValue = "") String sortBy); @GetMapping("/assign/{applicationId}") String assignApplication(@PathVariable("competitionId") long competitionId, @PathVariable("applicationId") long applicationId); @GetMapping("/unassign/{applicationId}") String unassignApplication(@PathVariable("competitionId") long competitionId, @PathVariable("applicationId") long applicationId); }
@Test public void manageApplications() throws Exception { CompetitionResource competitionResource = newCompetitionResource() .withId(1L) .withName("name") .withCompetitionStatus(IN_ASSESSMENT) .build(); List<ApplicationSummaryResource> summaryResources = newApplicationSummaryResource() .withId(1L, 2L) .withName("one", "two") .withLead("Lead 1", "Lead 2") .withInnovationArea("Digital manufacturing") .build(2); List<ApplicationSummaryResource> inPanelSummaryResources = newApplicationSummaryResource() .withId(3L, 4L) .withName("three", "four") .withLead("Lead 3", "Lead 4") .withInnovationArea("Digital manufacturing") .build(2); ApplicationSummaryPageResource expectedPageResource = new ApplicationSummaryPageResource(41, 3, summaryResources, 1, 20); ApplicationSummaryPageResource expectedInPanelPageResource = new ApplicationSummaryPageResource(12, 1, inPanelSummaryResources, 1, 2); when(competitionRestService.getCompetitionById(competitionResource.getId())) .thenReturn(restSuccess(competitionResource)); when(applicationSummaryRestService.getSubmittedApplicationsWithPanelStatus(competitionResource.getId(), "",1,20, Optional.of("filter"), Optional.empty(), Optional.of(false))) .thenReturn(restSuccess(expectedPageResource)); when(applicationSummaryRestService.getSubmittedApplicationsWithPanelStatus(competitionResource.getId(), null, 0, Integer.MAX_VALUE, Optional.empty(), Optional.empty(), Optional.of(true))) .thenReturn(restSuccess(expectedInPanelPageResource)); ManagePanelApplicationsViewModel model = (ManagePanelApplicationsViewModel) mockMvc .perform(get("/assessment/panel/competition/{competitionId}/manage-applications?page=1&filterSearch=filter", competitionResource.getId())) .andExpect(status().isOk()) .andExpect(view().name("competition/manage-applications-panel")) .andExpect(model().attributeExists("model")) .andReturn().getModelAndView().getModel().get("model"); assertEquals((long) competitionResource.getId(), model.getCompetitionId()); assertEquals(competitionResource.getName(), model.getCompetitionName()); assertEquals(competitionResource.getCompetitionStatus().getDisplayName(), model.getCompetitionStatus()); assertEquals(2, model.getApplications().size()); assertEquals("Lead 1", model.getApplications().get(0).getLeadOrganisation()); assertEquals("Lead 2", model.getApplications().get(1).getLeadOrganisation()); assertEquals(2, model.getAssignedApplications().size()); assertEquals("Lead 3", model.getAssignedApplications().get(0).getLeadOrganisation()); assertEquals("Lead 4", model.getAssignedApplications().get(1).getLeadOrganisation()); assertEquals("three", model.getAssignedApplications().get(0).getTitle()); assertEquals("four", model.getAssignedApplications().get(1).getTitle()); Pagination actualPagination = model.getPagination(); assertEquals(1, actualPagination.getCurrentPage()); assertEquals(20,actualPagination.getPageSize()); assertEquals(3, actualPagination.getTotalPages()); assertEquals("1 to 20", actualPagination.getPageNames().get(0).getTitle()); assertEquals("21 to 40", actualPagination.getPageNames().get(1).getTitle()); assertEquals("41 to 41", actualPagination.getPageNames().get(2).getTitle()); assertEquals("?filterSearch=filter&page=2", actualPagination.getPageNames().get(2).getPath()); }
ReviewInviteAssessorsController extends CompetitionManagementCookieController<ReviewSelectionForm> { @GetMapping public String assessors(@PathVariable("competitionId") long competitionId) { return format("redirect:/competition/%s/assessors/panel-find", competitionId); } @GetMapping String assessors(@PathVariable("competitionId") long competitionId); @GetMapping("/find") String find(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) ReviewSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForInviteList( @PathVariable("competitionId") long competitionId, @RequestParam("selectionId") long assessorId, @RequestParam("isSelected") boolean isSelected, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("addAll") boolean addAll, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find/addSelected") String addSelectedAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam Optional<Long> innovationArea, @ModelAttribute(SELECTION_FORM) ReviewSelectionForm selectionForm, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @GetMapping("/invite") String invite(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); @GetMapping("/accepted") String accepted(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); @PostMapping(value = "/invite", params = {"remove"}) String removeInviteFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(name = "remove") String email, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"removeAll"}) String removeAllInvitesFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); }
@Test public void assessors() throws Exception { Long competitionId = 1L; mockMvc.perform(get("/assessment/panel/competition/{competitionId}/assessors", competitionId)) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(format("/competition/%s/assessors/panel-find", competitionId))); }
ReviewInviteAssessorsController extends CompetitionManagementCookieController<ReviewSelectionForm> { @GetMapping("/find") public String find(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) ReviewSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response) { updateSelectionForm(request, response, competitionId, selectionForm); ReviewInviteAssessorsFindViewModel reviewInviteAssessorsFindViewModel = panelInviteAssessorsFindModelPopulator.populateModel(competitionId, page); model.addAttribute("model", reviewInviteAssessorsFindViewModel); return "assessors/panel-find"; } @GetMapping String assessors(@PathVariable("competitionId") long competitionId); @GetMapping("/find") String find(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) ReviewSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForInviteList( @PathVariable("competitionId") long competitionId, @RequestParam("selectionId") long assessorId, @RequestParam("isSelected") boolean isSelected, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("addAll") boolean addAll, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find/addSelected") String addSelectedAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam Optional<Long> innovationArea, @ModelAttribute(SELECTION_FORM) ReviewSelectionForm selectionForm, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @GetMapping("/invite") String invite(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); @GetMapping("/accepted") String accepted(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); @PostMapping(value = "/invite", params = {"remove"}) String removeInviteFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(name = "remove") String email, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"removeAll"}) String removeAllInvitesFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); }
@Test public void find() throws Exception { int page = 2; AvailableAssessorPageResource availableAssessorPageResource = newAvailableAssessorPageResource() .withContent(setUpAvailableAssessorResources()) .build(); when(reviewInviteRestService.getAvailableAssessors(competition.getId(), page)).thenReturn(restSuccess(availableAssessorPageResource)); when(reviewInviteRestService.getAvailableAssessorIds(competition.getId())).thenReturn(restSuccess(emptyList())); MvcResult result = mockMvc.perform(get("/assessment/panel/competition/{competitionId}/assessors/find", competition.getId()) .param("page", "2")) .andExpect(status().isOk()) .andExpect(model().attributeExists("model")) .andExpect(view().name("assessors/panel-find")) .andReturn(); ReviewSelectionForm selectionForm = (ReviewSelectionForm) result.getModelAndView().getModel().get("reviewSelectionForm"); assertTrue(selectionForm.getSelectedAssessorIds().isEmpty()); assertCompetitionDetails(competition, result); assertAvailableAssessors(availableAssessorPageResource.getContent(), result); InOrder inOrder = inOrder(competitionRestService, reviewInviteRestService, competitionKeyApplicationStatisticsRestService); inOrder.verify(reviewInviteRestService).getAvailableAssessorIds(competition.getId()); inOrder.verify(competitionRestService).getCompetitionById(competition.getId()); inOrder.verify(competitionKeyApplicationStatisticsRestService).getReviewInviteStatisticsByCompetition(competition.getId()); inOrder.verify(reviewInviteRestService).getAvailableAssessors(competition.getId(), page); inOrder.verifyNoMoreInteractions(); }
ReviewInviteAssessorsController extends CompetitionManagementCookieController<ReviewSelectionForm> { @GetMapping("/invite") public String invite(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page) { model.addAttribute("model", panelInviteAssessorsInviteModelPopulator.populateModel(competitionId, page)); return "assessors/panel-invite"; } @GetMapping String assessors(@PathVariable("competitionId") long competitionId); @GetMapping("/find") String find(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) ReviewSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForInviteList( @PathVariable("competitionId") long competitionId, @RequestParam("selectionId") long assessorId, @RequestParam("isSelected") boolean isSelected, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("addAll") boolean addAll, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find/addSelected") String addSelectedAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam Optional<Long> innovationArea, @ModelAttribute(SELECTION_FORM) ReviewSelectionForm selectionForm, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @GetMapping("/invite") String invite(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); @GetMapping("/accepted") String accepted(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); @PostMapping(value = "/invite", params = {"remove"}) String removeInviteFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(name = "remove") String email, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"removeAll"}) String removeAllInvitesFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); }
@Test public void invite() throws Exception { int page = 0; List<AssessorCreatedInviteResource> assessorCreatedInviteResources = setUpAssessorCreatedInviteResources(); AssessorCreatedInvitePageResource assessorCreatedInvitePageResource = newAssessorCreatedInvitePageResource() .withContent(assessorCreatedInviteResources) .build(); List<InnovationAreaResource> categoryResources = setupCategoryResources(); setupDefaultInviteViewExpectations(page, assessorCreatedInvitePageResource, categoryResources); InviteNewAssessorsForm expectedForm = new InviteNewAssessorsForm(); expectedForm.setInvites(singletonList(new InviteNewAssessorsRowForm())); MvcResult result = mockMvc.perform(get("/assessment/panel/competition/{competitionId}/assessors/invite", competition.getId())) .andExpect(status().isOk()) .andExpect(model().attributeExists("model")) .andExpect(view().name("assessors/panel-invite")) .andReturn(); assertCompetitionDetails(competition, result); assertInvitedAssessors(assessorCreatedInviteResources, result); InOrder inOrder = inOrder(competitionRestService, reviewInviteRestService); inOrder.verify(competitionRestService).getCompetitionById(competition.getId()); inOrder.verify(reviewInviteRestService).getCreatedInvites(competition.getId(), page); inOrder.verifyNoMoreInteractions(); }
ReviewInviteAssessorsController extends CompetitionManagementCookieController<ReviewSelectionForm> { @GetMapping("/accepted") public String accepted(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page) { model.addAttribute("model", panelInviteAssessorsAcceptedModelPopulator.populateModel( competitionId, page )); return "assessors/panel-accepted"; } @GetMapping String assessors(@PathVariable("competitionId") long competitionId); @GetMapping("/find") String find(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) ReviewSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForInviteList( @PathVariable("competitionId") long competitionId, @RequestParam("selectionId") long assessorId, @RequestParam("isSelected") boolean isSelected, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("addAll") boolean addAll, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find/addSelected") String addSelectedAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam Optional<Long> innovationArea, @ModelAttribute(SELECTION_FORM) ReviewSelectionForm selectionForm, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @GetMapping("/invite") String invite(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); @GetMapping("/accepted") String accepted(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); @PostMapping(value = "/invite", params = {"remove"}) String removeInviteFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(name = "remove") String email, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"removeAll"}) String removeAllInvitesFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); }
@Test public void accepted() throws Exception { int page = 1; List<ParticipantStatusResource> status = Collections.singletonList(ACCEPTED); List<AssessorInviteOverviewResource> assessorInviteOverviewResources = setUpAssessorInviteOverviewResources(); AssessorInviteOverviewPageResource pageResource = newAssessorInviteOverviewPageResource() .withContent(assessorInviteOverviewResources) .build(); when(reviewInviteRestService.getInvitationOverview(competition.getId(), page, status)) .thenReturn(restSuccess(pageResource)); MvcResult result = mockMvc.perform(get("/assessment/panel/competition/{competitionId}/assessors/accepted", competition.getId()) .param("page", "1")) .andExpect(status().isOk()) .andExpect(model().attributeExists("model")) .andExpect(view().name("assessors/panel-accepted")) .andReturn(); assertCompetitionDetails(competition, result); assertInviteAccepted(assessorInviteOverviewResources, result); InOrder inOrder = inOrder(competitionRestService, reviewInviteRestService); inOrder.verify(competitionRestService).getCompetitionById(competition.getId()); inOrder.verify(reviewInviteRestService).getInvitationOverview(competition.getId(), page, status); inOrder.verifyNoMoreInteractions(); }
ReviewInviteAssessorsController extends CompetitionManagementCookieController<ReviewSelectionForm> { @PostMapping(value = "/invite", params = {"remove"}) public String removeInviteFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(name = "remove") String email, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form) { deleteInvite(email, competitionId).getSuccess(); return redirectToInvite(competitionId, page); } @GetMapping String assessors(@PathVariable("competitionId") long competitionId); @GetMapping("/find") String find(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) ReviewSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForInviteList( @PathVariable("competitionId") long competitionId, @RequestParam("selectionId") long assessorId, @RequestParam("isSelected") boolean isSelected, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("addAll") boolean addAll, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find/addSelected") String addSelectedAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam Optional<Long> innovationArea, @ModelAttribute(SELECTION_FORM) ReviewSelectionForm selectionForm, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @GetMapping("/invite") String invite(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); @GetMapping("/accepted") String accepted(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); @PostMapping(value = "/invite", params = {"remove"}) String removeInviteFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(name = "remove") String email, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"removeAll"}) String removeAllInvitesFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); }
@Test public void removeInviteFromInviteView() throws Exception { String email = "[email protected]"; when(reviewInviteRestService.deleteInvite(email, competition.getId())).thenReturn(restSuccess()); mockMvc.perform(post("/assessment/panel/competition/{competitionId}/assessors/invite", competition.getId()) .param("remove", email) .param("page", "5")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(format("/assessment/panel/competition/%s/assessors/invite?page=5", competition.getId()))) .andReturn(); verify(reviewInviteRestService, only()).deleteInvite(email, competition.getId()); }
GoogleAnalyticsDataLayerController { @GetMapping("/application/{applicationId}/competition-name") public RestResult<String> getCompetitionNameForApplication(@PathVariable("applicationId") long applicationId) { return googleAnalyticsDataLayerService.getCompetitionNameByApplicationId(applicationId).toGetResponse(); } @GetMapping("/application/{applicationId}/competition-name") RestResult<String> getCompetitionNameForApplication(@PathVariable("applicationId") long applicationId); @GetMapping("/invite/{inviteHash}/competition-name") RestResult<String> getCompetitionNameForInvite(@PathVariable("inviteHash") String inviteHash); @GetMapping("/application/{applicationId}/user-roles") RestResult<List<Role>> getRolesByApplicationIdForCurrentUser(@PathVariable("applicationId") long applicationId); @GetMapping("/competition/{competitionId}/competition-name") RestResult<String> getCompetitionName(@PathVariable("competitionId") long competitionId); @GetMapping("/project/{projectId}/competition-name") RestResult<String> getCompetitionNameForProject(@PathVariable("projectId") long projectId); @GetMapping("/project/{projectId}/user-roles") RestResult<List<Role>> getRolesByProjectIdForCurrentUser(@PathVariable("projectId") long projectId); @GetMapping("/assessment/{assessmentId}/competition-name") RestResult<String> getCompetitionNameForAssessment(@PathVariable("assessmentId") long assessmentId); @GetMapping("/project/{projectId}/application-id") RestResult<Long> getApplicationIdForProject(@PathVariable("projectId") long projectId); @GetMapping("/assessment/{assessmentId}/application-id") RestResult<Long> getApplicationIdForAssessment(@PathVariable("assessmentId") long assessmentId); }
@Test public void getCompetitionNameForApplication() throws Exception { final long applicationId=7L; final String competitionName="Competition Name"; when(googleAnalyticsDataLayerServiceMock.getCompetitionNameByApplicationId(applicationId)) .thenReturn(serviceSuccess(competitionName)); mockMvc.perform(get("/analytics/application/{applicationId}/competition-name", applicationId)) .andExpect(status().isOk()) .andExpect(content().string(toJson(competitionName))); verify(googleAnalyticsDataLayerServiceMock, only()).getCompetitionNameByApplicationId(applicationId); }
ReviewInviteAssessorsController extends CompetitionManagementCookieController<ReviewSelectionForm> { private ServiceResult<Void> deleteInvite(String email, long competitionId) { return reviewInviteRestService.deleteInvite(email, competitionId).toServiceResult(); } @GetMapping String assessors(@PathVariable("competitionId") long competitionId); @GetMapping("/find") String find(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) ReviewSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForInviteList( @PathVariable("competitionId") long competitionId, @RequestParam("selectionId") long assessorId, @RequestParam("isSelected") boolean isSelected, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("addAll") boolean addAll, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find/addSelected") String addSelectedAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam Optional<Long> innovationArea, @ModelAttribute(SELECTION_FORM) ReviewSelectionForm selectionForm, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @GetMapping("/invite") String invite(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); @GetMapping("/accepted") String accepted(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); @PostMapping(value = "/invite", params = {"remove"}) String removeInviteFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(name = "remove") String email, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"removeAll"}) String removeAllInvitesFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); }
@Test public void removeInviteFromInviteView_defaultParams() throws Exception { String email = "[email protected]"; when(reviewInviteRestService.deleteInvite(email, competition.getId())).thenReturn(restSuccess()); mockMvc.perform(post("/assessment/panel/competition/{competitionId}/assessors/invite", competition.getId()) .param("remove", email)) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(format("/assessment/panel/competition/%s/assessors/invite?page=0", competition.getId()))) .andReturn(); verify(reviewInviteRestService, only()).deleteInvite(email, competition.getId()); }
ReviewInviteAssessorsController extends CompetitionManagementCookieController<ReviewSelectionForm> { @PostMapping(value = "/invite", params = {"removeAll"}) public String removeAllInvitesFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form) { deleteAllInvites(competitionId).getSuccess(); return redirectToInvite(competitionId, page); } @GetMapping String assessors(@PathVariable("competitionId") long competitionId); @GetMapping("/find") String find(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) ReviewSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForInviteList( @PathVariable("competitionId") long competitionId, @RequestParam("selectionId") long assessorId, @RequestParam("isSelected") boolean isSelected, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("addAll") boolean addAll, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find/addSelected") String addSelectedAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam Optional<Long> innovationArea, @ModelAttribute(SELECTION_FORM) ReviewSelectionForm selectionForm, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @GetMapping("/invite") String invite(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); @GetMapping("/accepted") String accepted(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); @PostMapping(value = "/invite", params = {"remove"}) String removeInviteFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(name = "remove") String email, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"removeAll"}) String removeAllInvitesFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); }
@Test public void removeAllInvitesFromInviteView() throws Exception { when(reviewInviteRestService.deleteAllInvites(competition.getId())).thenReturn(restSuccess()); mockMvc.perform(post("/assessment/panel/competition/{competitionId}/assessors/invite", competition.getId()) .param("removeAll", "")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(format("/assessment/panel/competition/%s/assessors/invite?page=0", competition.getId()))) .andReturn(); verify(reviewInviteRestService).deleteAllInvites(competition.getId()); }
ReviewController { @GetMapping public String assessmentPanel(@PathVariable("competitionId") long competitionId, Model model) { model.addAttribute("model", reviewModelPopulator.populateModel(competitionId)); return "competition/manage-assessment-panel"; } @GetMapping String assessmentPanel(@PathVariable("competitionId") long competitionId, Model model); @PostMapping("/notify-assessors") String notifyAssessors(@PathVariable("competitionId") long competitionId); }
@Test public void assessmentPanel() throws Exception { long competitionId = 1L; String competitionName = "Competition x"; CompetitionStatus competitionStatus = CLOSED; int applicationsInPanel = 5; int assessorsAccepted = 2; int assessorsPending = 3; boolean reviewsPending = true; competitionResource = newCompetitionResource() .with(id(competitionId)) .with(name(competitionName)) .withCompetitionStatus(competitionStatus) .build(); reviewKeyStatisticsResource = newReviewKeyStatisticsResource() .withApplicationsInPanel(applicationsInPanel) .withAssessorsAccepted(assessorsAccepted) .withAssessorsPending(assessorsPending) .build(); when(competitionRestService.getCompetitionById(competitionId)).thenReturn(restSuccess(competitionResource)); when(competitionKeyApplicationStatisticsRestService.getReviewKeyStatisticsByCompetition(competitionId)) .thenReturn(toGetResponse(reviewKeyStatisticsResource)); when(reviewRestService.isPendingReviewNotifications(competitionId)) .thenReturn(toGetResponse(reviewsPending)); MvcResult result = mockMvc.perform(get("/assessment/panel/competition/{competitionId}", competitionId)) .andExpect(status().isOk()) .andExpect(view().name("competition/manage-assessment-panel")) .andReturn(); ReviewViewModel model = (ReviewViewModel) result.getModelAndView().getModel().get("model"); verify(competitionRestService, only()).getCompetitionById(competitionId); assertEquals(competitionId, model.getCompetitionId()); assertEquals(competitionName, model.getCompetitionName()); assertEquals(competitionStatus, model.getCompetitionStatus()); assertEquals(applicationsInPanel, model.getApplicationsInPanel()); assertEquals(assessorsAccepted, model.getAssessorsAccepted()); assertEquals(assessorsPending, model.getAssessorsInvited()); assertEquals(reviewsPending, model.isPendingReviewNotifications()); }
ReviewController { @PostMapping("/notify-assessors") public String notifyAssessors(@PathVariable("competitionId") long competitionId) { reviewRestService.notifyAssessors(competitionId).getSuccess(); return format("redirect:/assessment/panel/competition/%d", competitionId); } @GetMapping String assessmentPanel(@PathVariable("competitionId") long competitionId, Model model); @PostMapping("/notify-assessors") String notifyAssessors(@PathVariable("competitionId") long competitionId); }
@Test public void notifyAssessors() throws Exception { long competitionId = 1L; when(reviewRestService.notifyAssessors(competitionId)).thenReturn(restSuccess()); mockMvc.perform(post("/assessment/panel/competition/{competitionId}/notify-assessors", competitionId)) .andExpect(status().is3xxRedirection()) .andExpect(MockMvcResultMatchers.redirectedUrl(format("/assessment/panel/competition/%d", competitionId))) .andReturn(); verify(reviewRestService, only()).notifyAssessors(competitionId); }
ReviewInviteAssessorsOverviewController extends CompetitionManagementCookieController<ReviewOverviewSelectionForm> { @GetMapping("/pending-and-declined") public String overview(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) ReviewOverviewSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, HttpServletRequest request, HttpServletResponse response) { updateOverviewSelectionForm(request, response, competitionId, selectionForm); model.addAttribute("model", panelInviteAssessorsOverviewModelPopulator.populateModel( competitionId, page )); return "assessors/panel-overview"; } @GetMapping("/pending-and-declined") String overview(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) ReviewOverviewSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, 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, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/pending-and-declined", params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToResendList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("addAll") boolean addAll, HttpServletRequest request, HttpServletResponse response); }
@Test public void overview() throws Exception { int page = 1; List<Long> inviteIds = asList(1L, 2L); List<AssessorInviteOverviewResource> assessorInviteOverviewResources = setUpAssessorInviteOverviewResources(); AssessorInviteOverviewPageResource pageResource = newAssessorInviteOverviewPageResource() .withContent(assessorInviteOverviewResources) .build(); when(reviewInviteRestService.getInvitationOverview(competition.getId(), page, asList(REJECTED, PENDING))) .thenReturn(restSuccess(pageResource)); when(reviewInviteRestService.getNonAcceptedAssessorInviteIds(competition.getId())).thenReturn(restSuccess(inviteIds)); MvcResult result = mockMvc.perform(get("/assessment/panel/competition/{competitionId}/assessors/pending-and-declined", competition.getId()) .param("page", "1")) .andExpect(status().isOk()) .andExpect(model().attributeExists("model")) .andExpect(view().name("assessors/panel-overview")) .andReturn(); assertCompetitionDetails(competition, result); assertInviteOverviews(assessorInviteOverviewResources, result); InOrder inOrder = inOrder(competitionRestService, reviewInviteRestService); inOrder.verify(reviewInviteRestService).getNonAcceptedAssessorInviteIds(competition.getId()); inOrder.verify(competitionRestService).getCompetitionById(competition.getId()); inOrder.verify(reviewInviteRestService).getInvitationOverview(competition.getId(), page, asList(REJECTED, PENDING)); inOrder.verifyNoMoreInteractions(); }
InviteUserServiceImpl implements InviteUserService { @Override public ServiceResult<Void> saveUserInvite (InviteUserResource inviteUserResource) { return inviteUserRestService.saveUserInvite(inviteUserResource).toServiceResult(); } @Override ServiceResult<Void> saveUserInvite(InviteUserResource inviteUserResource); }
@Test public void saveProjectInvite() throws Exception { InviteUserResource inviteUserResource = new InviteUserResource(); when(inviteUserRestService.saveUserInvite(inviteUserResource)).thenReturn(restSuccess()); ServiceResult<Void> result = service.saveUserInvite(inviteUserResource); assertTrue(result.isSuccess()); verify(inviteUserRestService).saveUserInvite(inviteUserResource); }
InviteUserController { @PostMapping("/invite-user") public String saveUserInvite(Model model, @Validated({Default.class, Primary.class}) @ModelAttribute(FORM_ATTR_NAME) InviteUserForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler) { Supplier<String> failureView = () -> doViewInviteNewUser(model, form, InviteUserView.INTERNAL_USER, Role.internalRoles()); return saveInvite(form, validationHandler, failureView); } @GetMapping("/invite-user") String inviteNewUser(Model model); @GetMapping("/invite-external-user") String inviteNewExternalUser(Model model); @PostMapping("/invite-user") String saveUserInvite(Model model, @Validated({Default.class, Primary.class}) @ModelAttribute(FORM_ATTR_NAME) InviteUserForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler); @PostMapping("/invite-external-user") String saveExternalUserInvite(Model model, @Validated({Default.class, Primary.class}) @ModelAttribute(FORM_ATTR_NAME) InviteUserForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler); }
@Test public void saveInternalUserInviteWhenSaveInviteFails() throws Exception { when(inviteUserServiceMock.saveUserInvite(Mockito.any())) .thenReturn(ServiceResult.serviceFailure(CommonFailureKeys.USER_ROLE_INVITE_TARGET_USER_ALREADY_INVITED)); mockMvc.perform(MockMvcRequestBuilders.post("/admin/invite-user"). param("firstName", "First"). param("lastName", "Last"). param("emailAddress", "[email protected]"). param("role", "IFS_ADMINISTRATOR")) .andExpect(status().isOk()) .andExpect(view().name("admin/invite-new-user")); } @Test public void saveInternalUserInviteSuccess() throws Exception { when(inviteUserServiceMock.saveUserInvite(Mockito.any())).thenReturn(ServiceResult.serviceSuccess()); mockMvc.perform(MockMvcRequestBuilders.post("/admin/invite-external-user"). param("firstName", "First"). param("lastName", "Last"). param("emailAddress", "[email protected]"). param("role", "IFS_ADMINISTRATOR")) .andExpect(status().is3xxRedirection()) .andExpect(view().name("redirect:/admin/users/pending")); } @Test public void saveExternalUserInviteWhenSaveInviteFails() throws Exception { when(inviteUserServiceMock.saveUserInvite(Mockito.any())) .thenReturn(ServiceResult.serviceFailure(CommonFailureKeys.USER_ROLE_INVITE_TARGET_USER_ALREADY_INVITED)); mockMvc.perform(MockMvcRequestBuilders.post("/admin/invite-external-user"). param("firstName", "First"). param("lastName", "Last"). param("emailAddress", "[email protected]"). param("role", "KNOWLEDGE_TRANSFER_ADVISER")) .andExpect(status().isOk()) .andExpect(view().name("admin/invite-new-user")); } @Test public void saveExternalUserInviteSuccess() throws Exception { when(inviteUserServiceMock.saveUserInvite(Mockito.any())).thenReturn(ServiceResult.serviceSuccess()); mockMvc.perform(MockMvcRequestBuilders.post("/admin/invite-external-user"). param("firstName", "First"). param("lastName", "Last"). param("emailAddress", "[email protected]"). param("role", "KNOWLEDGE_TRANSFER_ADVISER")) .andExpect(status().is3xxRedirection()) .andExpect(view().name("redirect:/admin/users/pending")); }
GoogleAnalyticsDataLayerController { @GetMapping("/invite/{inviteHash}/competition-name") public RestResult<String> getCompetitionNameForInvite(@PathVariable("inviteHash") String inviteHash) { return googleAnalyticsDataLayerService.getCompetitionNameByInviteHash(inviteHash).toGetResponse(); } @GetMapping("/application/{applicationId}/competition-name") RestResult<String> getCompetitionNameForApplication(@PathVariable("applicationId") long applicationId); @GetMapping("/invite/{inviteHash}/competition-name") RestResult<String> getCompetitionNameForInvite(@PathVariable("inviteHash") String inviteHash); @GetMapping("/application/{applicationId}/user-roles") RestResult<List<Role>> getRolesByApplicationIdForCurrentUser(@PathVariable("applicationId") long applicationId); @GetMapping("/competition/{competitionId}/competition-name") RestResult<String> getCompetitionName(@PathVariable("competitionId") long competitionId); @GetMapping("/project/{projectId}/competition-name") RestResult<String> getCompetitionNameForProject(@PathVariable("projectId") long projectId); @GetMapping("/project/{projectId}/user-roles") RestResult<List<Role>> getRolesByProjectIdForCurrentUser(@PathVariable("projectId") long projectId); @GetMapping("/assessment/{assessmentId}/competition-name") RestResult<String> getCompetitionNameForAssessment(@PathVariable("assessmentId") long assessmentId); @GetMapping("/project/{projectId}/application-id") RestResult<Long> getApplicationIdForProject(@PathVariable("projectId") long projectId); @GetMapping("/assessment/{assessmentId}/application-id") RestResult<Long> getApplicationIdForAssessment(@PathVariable("assessmentId") long assessmentId); }
@Test public void getCompetitionNameForInvite() throws Exception { final String inviteHash = new UUID(1L, 1L).toString(); final String competitionName="Competition Name"; when(googleAnalyticsDataLayerServiceMock.getCompetitionNameByInviteHash(inviteHash)) .thenReturn(serviceSuccess(competitionName)); mockMvc.perform(get("/analytics/invite/{inviteHash}/competition-name", inviteHash)) .andExpect(status().isOk()) .andExpect(content().string(toJson(competitionName))); verify(googleAnalyticsDataLayerServiceMock, only()).getCompetitionNameByInviteHash(inviteHash); }
UsersManagementController extends AsyncAdaptor { private String view(Model model, String activeTab, String filter, int page, int size, boolean adminUser) { final CompletableFuture<ManageUserPageResource> activeUsers; final CompletableFuture<ManageUserPageResource> inactiveUsers; final CompletableFuture<RoleInvitePageResource> pendingUsers; if (adminUser) { activeUsers = async(() -> userRestService.getActiveUsers(filter, page - 1 , size).getSuccess()); inactiveUsers = async(() -> userRestService.getInactiveUsers(filter, page - 1, size).getSuccess()); pendingUsers = async(() -> inviteUserRestService.getPendingInternalUserInvites(filter, page - 1, size).getSuccess()); } else { activeUsers = async(() -> userRestService.getActiveExternalUsers(filter, page - 1, size).getSuccess()); inactiveUsers = async(() -> userRestService.getInactiveExternalUsers(filter, page - 1, size).getSuccess()); pendingUsers = async(() -> new RoleInvitePageResource()); } awaitAll(activeUsers, inactiveUsers, pendingUsers) .thenAccept((activeInternalUsers, inactiveInternalUsers, pendingInternalUserInvites) -> { UserListViewModel viewModel = new UserListViewModel( activeTab, filter, activeInternalUsers.getContent(), inactiveInternalUsers.getContent(), pendingInternalUserInvites.getContent(), activeInternalUsers.getTotalElements(), inactiveInternalUsers.getTotalElements(), pendingInternalUserInvites.getTotalElements(), new PaginationViewModel(activeInternalUsers), new PaginationViewModel(inactiveInternalUsers), new PaginationViewModel(pendingInternalUserInvites), adminUser ); model.addAttribute("model", viewModel); model.addAttribute("externalRoleLinkEnabled", externalRoleLinkEnabled); }); return "admin/users"; } @AsyncMethod @SecuredBySpring(value = "UserManagementController.viewActive() method", description = "Only IFS administrators can view active internal users") @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @GetMapping("/active") String viewActiveUsers(Model model, UserResource user, @ModelAttribute(FORM_ATTR_NAME) UserManagementFilterForm filterForm, @RequestParam(defaultValue = DEFAULT_PAGE_NUMBER) int page, @RequestParam(defaultValue = DEFAULT_PAGE_SIZE) int size); @AsyncMethod @SecuredBySpring(value = "UserManagementController.viewInactive() method", description = "Only IFS administrators can view active internal users") @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @GetMapping("/inactive") String viewInactiveUsers(Model model, UserResource user, @ModelAttribute(FORM_ATTR_NAME) UserManagementFilterForm filterForm, @RequestParam(defaultValue = DEFAULT_PAGE_NUMBER) int page, @RequestParam(defaultValue = DEFAULT_PAGE_SIZE) int size); @AsyncMethod @SecuredBySpring(value = "UserManagementController.viewPending() method", description = "IFS administrators can view pending user invites") @PreAuthorize("hasAuthority('ifs_administrator')") @GetMapping("/pending") String viewPendingUsers(Model model, HttpServletRequest request, UserResource user, @Valid @ModelAttribute(FORM_ATTR_NAME) UserManagementFilterForm filterForm, @RequestParam(defaultValue = DEFAULT_PAGE_NUMBER) int page, @RequestParam(defaultValue = DEFAULT_PAGE_SIZE) int size); @SecuredBySpring(value = "RESEND_INTERNAL_USER_INVITE", description = "Only the IFS Administrators can resend invites to internal users") @PreAuthorize("hasAuthority('ifs_administrator')") @PostMapping("/pending/resend-invite") String resendInvite(@RequestParam("inviteId") long inviteId); }
@Test public void viewActive() throws Exception { when(userRestService.getActiveExternalUsers(null, 0, 5)).thenReturn(restSuccess(manageUserPageResource)); when(userRestService.getInactiveExternalUsers(null, 0, 5)).thenReturn(restSuccess(manageUserPageResource)); mockMvc.perform(get("/admin/users/active") .param("page", "1") .param("size", "5")) .andExpect(status().isOk()) .andExpect(view().name("admin/users")) .andExpect(model().attribute("model", new UserListViewModel( "active", null, manageUserPageResource.getContent(), manageUserPageResource.getContent(), roleInvitePageResource.getContent(), manageUserPageResource.getTotalElements(), manageUserPageResource.getTotalElements(), roleInvitePageResource.getTotalElements(), new PaginationViewModel(manageUserPageResource), new PaginationViewModel(manageUserPageResource), new PaginationViewModel(roleInvitePageResource), false) )) .andExpect(model().attribute("externalRoleLinkEnabled", true)); } @Test public void viewInactive() throws Exception { when(userRestService.getActiveExternalUsers(null, 0, 5)).thenReturn(restSuccess(manageUserPageResource)); when(userRestService.getInactiveExternalUsers(null, 0, 5)).thenReturn(restSuccess(manageUserPageResource)); mockMvc.perform(get("/admin/users/inactive") .param("page", "1") .param("size", "5")) .andExpect(status().isOk()) .andExpect(view().name("admin/users")) .andExpect(model().attribute("model", new UserListViewModel( "inactive", null, manageUserPageResource.getContent(), manageUserPageResource.getContent(), roleInvitePageResource.getContent(), manageUserPageResource.getTotalElements(), manageUserPageResource.getTotalElements(), roleInvitePageResource.getTotalElements(), new PaginationViewModel(manageUserPageResource), new PaginationViewModel(manageUserPageResource), new PaginationViewModel(roleInvitePageResource), false) )) .andExpect(model().attribute("externalRoleLinkEnabled", true)); } @Test public void viewPending() throws Exception { mockMvc.perform(get("/admin/users/pending") .param("page", "1") .param("size", "5")) .andExpect(status().isOk()) .andExpect(view().name("admin/users")) .andExpect(model().attribute("model", new UserListViewModel( "pending", null, manageUserPageResource.getContent(), manageUserPageResource.getContent(), roleInvitePageResource.getContent(), manageUserPageResource.getTotalElements(), manageUserPageResource.getTotalElements(), roleInvitePageResource.getTotalElements(), new PaginationViewModel(manageUserPageResource), new PaginationViewModel(manageUserPageResource), new PaginationViewModel(roleInvitePageResource), true) )) .andExpect(model().attribute("externalRoleLinkEnabled", true)); }
UsersManagementController extends AsyncAdaptor { @SecuredBySpring(value = "RESEND_INTERNAL_USER_INVITE", description = "Only the IFS Administrators can resend invites to internal users") @PreAuthorize("hasAuthority('ifs_administrator')") @PostMapping("/pending/resend-invite") public String resendInvite(@RequestParam("inviteId") long inviteId) { inviteUserRestService.resendInternalUserInvite(inviteId).getSuccess(); return "redirect:/admin/users/pending"; } @AsyncMethod @SecuredBySpring(value = "UserManagementController.viewActive() method", description = "Only IFS administrators can view active internal users") @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @GetMapping("/active") String viewActiveUsers(Model model, UserResource user, @ModelAttribute(FORM_ATTR_NAME) UserManagementFilterForm filterForm, @RequestParam(defaultValue = DEFAULT_PAGE_NUMBER) int page, @RequestParam(defaultValue = DEFAULT_PAGE_SIZE) int size); @AsyncMethod @SecuredBySpring(value = "UserManagementController.viewInactive() method", description = "Only IFS administrators can view active internal users") @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @GetMapping("/inactive") String viewInactiveUsers(Model model, UserResource user, @ModelAttribute(FORM_ATTR_NAME) UserManagementFilterForm filterForm, @RequestParam(defaultValue = DEFAULT_PAGE_NUMBER) int page, @RequestParam(defaultValue = DEFAULT_PAGE_SIZE) int size); @AsyncMethod @SecuredBySpring(value = "UserManagementController.viewPending() method", description = "IFS administrators can view pending user invites") @PreAuthorize("hasAuthority('ifs_administrator')") @GetMapping("/pending") String viewPendingUsers(Model model, HttpServletRequest request, UserResource user, @Valid @ModelAttribute(FORM_ATTR_NAME) UserManagementFilterForm filterForm, @RequestParam(defaultValue = DEFAULT_PAGE_NUMBER) int page, @RequestParam(defaultValue = DEFAULT_PAGE_SIZE) int size); @SecuredBySpring(value = "RESEND_INTERNAL_USER_INVITE", description = "Only the IFS Administrators can resend invites to internal users") @PreAuthorize("hasAuthority('ifs_administrator')") @PostMapping("/pending/resend-invite") String resendInvite(@RequestParam("inviteId") long inviteId); }
@Test public void resendInvite() throws Exception { when(inviteUserRestService.resendInternalUserInvite(123L)). thenReturn(restSuccess()); mockMvc.perform(post("/admin/users/pending/resend-invite?inviteId=" + 123L)) .andExpect(status().is3xxRedirection()) .andExpect(view().name("redirect:/admin/users/pending")); verify(inviteUserRestService).resendInternalUserInvite(123L); }
UserManagementController extends AsyncAdaptor { @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.viewUser() method", description = "IFS admins and support users can view users.") @GetMapping("/user/{userId}") public String viewUser(@PathVariable long userId) { return userRestService.retrieveUserById(userId).andOnSuccessReturn(user -> { if (UserStatus.ACTIVE.equals(user.getStatus())) { return redirectToActivePage(userId); } else { return redirectToInactivePage(userId); } }).getSuccess(); } @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.viewUser() method", description = "IFS admins and support users can view users.") @GetMapping("/user/{userId}") String viewUser(@PathVariable long userId); @PreAuthorize("hasPermission(#userId, 'org.innovateuk.ifs.user.resource.UserCompositeId', 'VIEW_USER_PAGE')") @GetMapping("/user/{userId}/inactive") String viewInactiveUser(@PathVariable long userId, Model model, UserResource loggedInUser); @PreAuthorize("hasPermission(#userId, 'org.innovateuk.ifs.user.resource.UserCompositeId', 'VIEW_USER_PAGE')") @GetMapping("/user/{userId}/active") String viewActiveUser(@PathVariable long userId, Model model, UserResource loggedInUser); @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.updateUser() method", description = "IFS admins and support users can edit users.") @PostMapping("/user/{userId}/active") String updateUser(@PathVariable long userId, Model model, UserResource loggedInUser, @Valid @ModelAttribute(FORM_ATTR_NAME) EditUserForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, HttpServletResponse response); @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.confirmEmailChange() method", description = "IFS admins and support users can confirm email change.") @GetMapping("/user/{userId}/active/confirm") String confirmEmailChange(@PathVariable long userId, Model model, @ModelAttribute(value = FORM_ATTR_NAME, binding = false) ConfirmEmailForm form, @SuppressWarnings("unused") BindingResult bindingResult, HttpServletRequest request); @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.confirmEmailChange() method", description = "IFS admins and support users can confirm email change.") @PostMapping("/user/{userId}/active/confirm") String confirmEmailChangePost(@PathVariable long userId, Model model, @Valid @ModelAttribute(value = FORM_ATTR_NAME) ConfirmEmailForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes); @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.deactivateUser() method", description = "IFS admins and support users can deactivate users.") @PostMapping(value = "/user/{userId}/active", params = "deactivateUser") String deactivateUser(@PathVariable long userId); @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.reactivateUser() method", description = "IFS admins and support users can reactivate users.") @PostMapping(value = "/user/{userId}/inactive", params = "reactivateUser") String reactivateUser(@PathVariable long userId); @AsyncMethod @SecuredBySpring(value = "UserManagementController.viewAvailableAssessors() method", description = "Only comp admin and project finance can view active assessors") @PreAuthorize("hasAnyAuthority('comp_admin' , 'project_finance')") @GetMapping("/assessors/available") String viewAvailableAssessors(Model model, UserResource user, @ModelAttribute(FORM_ATTR_NAME) UserManagementFilterForm filterForm, @RequestParam(defaultValue = DEFAULT_PAGE_NUMBER) int page, @RequestParam(defaultValue = DEFAULT_PAGE_SIZE) int size); @AsyncMethod @SecuredBySpring(value = "UserManagementController.viewAvailableAssessors() method", description = "Only comp admin and project finance can view unavailable assessors") @PreAuthorize("hasAnyAuthority('comp_admin' , 'project_finance')") @GetMapping("/assessors/unavailable") String viewUnavailableAssessors(Model model, UserResource user, @ModelAttribute(FORM_ATTR_NAME) UserManagementFilterForm filterForm, @RequestParam(defaultValue = DEFAULT_PAGE_NUMBER) int page, @RequestParam(defaultValue = DEFAULT_PAGE_SIZE) int size); @AsyncMethod @SecuredBySpring(value = "UserManagementController.viewAvailableAssessors() method", description = "Only comp admin and project finance can view disabled assessors") @PreAuthorize("hasAnyAuthority('comp_admin' , 'project_finance')") @GetMapping("/assessors/disabled") String viewDisabledAssessors(Model model, UserResource user, @ModelAttribute(FORM_ATTR_NAME) UserManagementFilterForm filterForm, @RequestParam(defaultValue = DEFAULT_PAGE_NUMBER) int page, @RequestParam(defaultValue = DEFAULT_PAGE_SIZE) int size); }
@Test public void viewUser() throws Exception { ZonedDateTime now = ZonedDateTime.now(); UserResource user = newUserResource().withCreatedOn(now).withCreatedBy("abc").withModifiedOn(now).withModifiedBy("abc").build(); when(userRestServiceMock.retrieveUserById(1L)).thenReturn(restSuccess(user)); mockMvc.perform(get("/admin/user/{userId}/inactive", 1L)) .andExpect(status().isOk()) .andExpect(view().name("admin/inactive-user")) .andExpect(model().attribute("model", new ViewUserViewModel(user, getLoggedInUser(), emptyList(), false))); }
UserManagementController extends AsyncAdaptor { @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.deactivateUser() method", description = "IFS admins and support users can deactivate users.") @PostMapping(value = "/user/{userId}/active", params = "deactivateUser") public String deactivateUser(@PathVariable long userId) { return userRestService.retrieveUserById(userId).andOnSuccess(user -> userRestService.deactivateUser(userId) .andOnSuccessReturn(p -> redirectToInactivePage(userId))) .getSuccess(); } @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.viewUser() method", description = "IFS admins and support users can view users.") @GetMapping("/user/{userId}") String viewUser(@PathVariable long userId); @PreAuthorize("hasPermission(#userId, 'org.innovateuk.ifs.user.resource.UserCompositeId', 'VIEW_USER_PAGE')") @GetMapping("/user/{userId}/inactive") String viewInactiveUser(@PathVariable long userId, Model model, UserResource loggedInUser); @PreAuthorize("hasPermission(#userId, 'org.innovateuk.ifs.user.resource.UserCompositeId', 'VIEW_USER_PAGE')") @GetMapping("/user/{userId}/active") String viewActiveUser(@PathVariable long userId, Model model, UserResource loggedInUser); @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.updateUser() method", description = "IFS admins and support users can edit users.") @PostMapping("/user/{userId}/active") String updateUser(@PathVariable long userId, Model model, UserResource loggedInUser, @Valid @ModelAttribute(FORM_ATTR_NAME) EditUserForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, HttpServletResponse response); @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.confirmEmailChange() method", description = "IFS admins and support users can confirm email change.") @GetMapping("/user/{userId}/active/confirm") String confirmEmailChange(@PathVariable long userId, Model model, @ModelAttribute(value = FORM_ATTR_NAME, binding = false) ConfirmEmailForm form, @SuppressWarnings("unused") BindingResult bindingResult, HttpServletRequest request); @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.confirmEmailChange() method", description = "IFS admins and support users can confirm email change.") @PostMapping("/user/{userId}/active/confirm") String confirmEmailChangePost(@PathVariable long userId, Model model, @Valid @ModelAttribute(value = FORM_ATTR_NAME) ConfirmEmailForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes); @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.deactivateUser() method", description = "IFS admins and support users can deactivate users.") @PostMapping(value = "/user/{userId}/active", params = "deactivateUser") String deactivateUser(@PathVariable long userId); @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.reactivateUser() method", description = "IFS admins and support users can reactivate users.") @PostMapping(value = "/user/{userId}/inactive", params = "reactivateUser") String reactivateUser(@PathVariable long userId); @AsyncMethod @SecuredBySpring(value = "UserManagementController.viewAvailableAssessors() method", description = "Only comp admin and project finance can view active assessors") @PreAuthorize("hasAnyAuthority('comp_admin' , 'project_finance')") @GetMapping("/assessors/available") String viewAvailableAssessors(Model model, UserResource user, @ModelAttribute(FORM_ATTR_NAME) UserManagementFilterForm filterForm, @RequestParam(defaultValue = DEFAULT_PAGE_NUMBER) int page, @RequestParam(defaultValue = DEFAULT_PAGE_SIZE) int size); @AsyncMethod @SecuredBySpring(value = "UserManagementController.viewAvailableAssessors() method", description = "Only comp admin and project finance can view unavailable assessors") @PreAuthorize("hasAnyAuthority('comp_admin' , 'project_finance')") @GetMapping("/assessors/unavailable") String viewUnavailableAssessors(Model model, UserResource user, @ModelAttribute(FORM_ATTR_NAME) UserManagementFilterForm filterForm, @RequestParam(defaultValue = DEFAULT_PAGE_NUMBER) int page, @RequestParam(defaultValue = DEFAULT_PAGE_SIZE) int size); @AsyncMethod @SecuredBySpring(value = "UserManagementController.viewAvailableAssessors() method", description = "Only comp admin and project finance can view disabled assessors") @PreAuthorize("hasAnyAuthority('comp_admin' , 'project_finance')") @GetMapping("/assessors/disabled") String viewDisabledAssessors(Model model, UserResource user, @ModelAttribute(FORM_ATTR_NAME) UserManagementFilterForm filterForm, @RequestParam(defaultValue = DEFAULT_PAGE_NUMBER) int page, @RequestParam(defaultValue = DEFAULT_PAGE_SIZE) int size); }
@Test public void deactivateUserSuccess() throws Exception { String email = "[email protected]"; Role role = IFS_ADMINISTRATOR; UserResource userResource = newUserResource() .withFirstName("first") .withLastName("last") .withEmail(email) .withRolesGlobal(Collections.singletonList(role)) .build(); when(userRestServiceMock.retrieveUserById(1L)).thenReturn(restSuccess(userResource)); when(userRestServiceMock.deactivateUser(1L)).thenReturn(restSuccess()); mockMvc.perform(post("/admin/user/{userId}/active", 1L). param("deactivateUser", "")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl("/admin/user/1/inactive")); verify(userRestServiceMock).deactivateUser(1L); } @Test public void deactivateUserDeactivateFails() throws Exception { String email = "[email protected]"; Role role = IFS_ADMINISTRATOR; UserResource userResource = newUserResource() .withFirstName("first") .withLastName("last") .withEmail(email) .withRolesGlobal(Collections.singletonList(role)) .build(); when(userRestServiceMock.retrieveUserById(1L)).thenReturn(restSuccess(userResource)); when(userRestServiceMock.deactivateUser(1L)).thenReturn(RestResult.restFailure(CommonFailureKeys.GENERAL_NOT_FOUND)); mockMvc.perform(post("/admin/user/{userId}/active", 1L). param("deactivateUser", "")) .andExpect(status().isNotFound()); verify(userRestServiceMock).deactivateUser(1L); }
UserManagementController extends AsyncAdaptor { @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.reactivateUser() method", description = "IFS admins and support users can reactivate users.") @PostMapping(value = "/user/{userId}/inactive", params = "reactivateUser") public String reactivateUser(@PathVariable long userId) { return userRestService.retrieveUserById(userId).andOnSuccess(user -> userRestService.reactivateUser(userId) .andOnSuccessReturn(p -> redirectToActivePage(userId))) .getSuccess(); } @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.viewUser() method", description = "IFS admins and support users can view users.") @GetMapping("/user/{userId}") String viewUser(@PathVariable long userId); @PreAuthorize("hasPermission(#userId, 'org.innovateuk.ifs.user.resource.UserCompositeId', 'VIEW_USER_PAGE')") @GetMapping("/user/{userId}/inactive") String viewInactiveUser(@PathVariable long userId, Model model, UserResource loggedInUser); @PreAuthorize("hasPermission(#userId, 'org.innovateuk.ifs.user.resource.UserCompositeId', 'VIEW_USER_PAGE')") @GetMapping("/user/{userId}/active") String viewActiveUser(@PathVariable long userId, Model model, UserResource loggedInUser); @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.updateUser() method", description = "IFS admins and support users can edit users.") @PostMapping("/user/{userId}/active") String updateUser(@PathVariable long userId, Model model, UserResource loggedInUser, @Valid @ModelAttribute(FORM_ATTR_NAME) EditUserForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, HttpServletResponse response); @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.confirmEmailChange() method", description = "IFS admins and support users can confirm email change.") @GetMapping("/user/{userId}/active/confirm") String confirmEmailChange(@PathVariable long userId, Model model, @ModelAttribute(value = FORM_ATTR_NAME, binding = false) ConfirmEmailForm form, @SuppressWarnings("unused") BindingResult bindingResult, HttpServletRequest request); @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.confirmEmailChange() method", description = "IFS admins and support users can confirm email change.") @PostMapping("/user/{userId}/active/confirm") String confirmEmailChangePost(@PathVariable long userId, Model model, @Valid @ModelAttribute(value = FORM_ATTR_NAME) ConfirmEmailForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes); @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.deactivateUser() method", description = "IFS admins and support users can deactivate users.") @PostMapping(value = "/user/{userId}/active", params = "deactivateUser") String deactivateUser(@PathVariable long userId); @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.reactivateUser() method", description = "IFS admins and support users can reactivate users.") @PostMapping(value = "/user/{userId}/inactive", params = "reactivateUser") String reactivateUser(@PathVariable long userId); @AsyncMethod @SecuredBySpring(value = "UserManagementController.viewAvailableAssessors() method", description = "Only comp admin and project finance can view active assessors") @PreAuthorize("hasAnyAuthority('comp_admin' , 'project_finance')") @GetMapping("/assessors/available") String viewAvailableAssessors(Model model, UserResource user, @ModelAttribute(FORM_ATTR_NAME) UserManagementFilterForm filterForm, @RequestParam(defaultValue = DEFAULT_PAGE_NUMBER) int page, @RequestParam(defaultValue = DEFAULT_PAGE_SIZE) int size); @AsyncMethod @SecuredBySpring(value = "UserManagementController.viewAvailableAssessors() method", description = "Only comp admin and project finance can view unavailable assessors") @PreAuthorize("hasAnyAuthority('comp_admin' , 'project_finance')") @GetMapping("/assessors/unavailable") String viewUnavailableAssessors(Model model, UserResource user, @ModelAttribute(FORM_ATTR_NAME) UserManagementFilterForm filterForm, @RequestParam(defaultValue = DEFAULT_PAGE_NUMBER) int page, @RequestParam(defaultValue = DEFAULT_PAGE_SIZE) int size); @AsyncMethod @SecuredBySpring(value = "UserManagementController.viewAvailableAssessors() method", description = "Only comp admin and project finance can view disabled assessors") @PreAuthorize("hasAnyAuthority('comp_admin' , 'project_finance')") @GetMapping("/assessors/disabled") String viewDisabledAssessors(Model model, UserResource user, @ModelAttribute(FORM_ATTR_NAME) UserManagementFilterForm filterForm, @RequestParam(defaultValue = DEFAULT_PAGE_NUMBER) int page, @RequestParam(defaultValue = DEFAULT_PAGE_SIZE) int size); }
@Test public void reactivateUserSuccess() throws Exception { String email = "[email protected]"; Role role = IFS_ADMINISTRATOR; UserResource userResource = newUserResource() .withFirstName("first") .withLastName("last") .withEmail(email) .withRolesGlobal(Collections.singletonList(role)) .build(); when(userRestServiceMock.retrieveUserById(1L)).thenReturn(restSuccess(userResource)); when(userRestServiceMock.reactivateUser(1L)).thenReturn(restSuccess()); mockMvc.perform(post("/admin/user/{userId}/inactive", 1L). param("reactivateUser", "")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl("/admin/user/1/active")); verify(userRestServiceMock).reactivateUser(1L); } @Test public void reactivateUserReactivateFails() throws Exception { String email = "[email protected]"; Role role = IFS_ADMINISTRATOR; UserResource userResource = newUserResource() .withFirstName("first") .withLastName("last") .withEmail(email) .withRolesGlobal(Collections.singletonList(role)) .build(); when(userRestServiceMock.retrieveUserById(1L)).thenReturn(restSuccess(userResource)); when(userRestServiceMock.reactivateUser(1L)).thenReturn(RestResult.restFailure(CommonFailureKeys.GENERAL_NOT_FOUND)); mockMvc.perform(post("/admin/user/{userId}/inactive", 1L). param("reactivateUser", "")) .andExpect(status().isNotFound()); verify(userRestServiceMock).reactivateUser(1L); }
UserManagementController extends AsyncAdaptor { @AsyncMethod @SecuredBySpring(value = "UserManagementController.viewAvailableAssessors() method", description = "Only comp admin and project finance can view active assessors") @PreAuthorize("hasAnyAuthority('comp_admin' , 'project_finance')") @GetMapping("/assessors/available") public String viewAvailableAssessors(Model model, UserResource user, @ModelAttribute(FORM_ATTR_NAME) UserManagementFilterForm filterForm, @RequestParam(defaultValue = DEFAULT_PAGE_NUMBER) int page, @RequestParam(defaultValue = DEFAULT_PAGE_SIZE) int size) { return viewAssessors(model, "available", filterForm.getFilter(), page, size); } @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.viewUser() method", description = "IFS admins and support users can view users.") @GetMapping("/user/{userId}") String viewUser(@PathVariable long userId); @PreAuthorize("hasPermission(#userId, 'org.innovateuk.ifs.user.resource.UserCompositeId', 'VIEW_USER_PAGE')") @GetMapping("/user/{userId}/inactive") String viewInactiveUser(@PathVariable long userId, Model model, UserResource loggedInUser); @PreAuthorize("hasPermission(#userId, 'org.innovateuk.ifs.user.resource.UserCompositeId', 'VIEW_USER_PAGE')") @GetMapping("/user/{userId}/active") String viewActiveUser(@PathVariable long userId, Model model, UserResource loggedInUser); @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.updateUser() method", description = "IFS admins and support users can edit users.") @PostMapping("/user/{userId}/active") String updateUser(@PathVariable long userId, Model model, UserResource loggedInUser, @Valid @ModelAttribute(FORM_ATTR_NAME) EditUserForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, HttpServletResponse response); @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.confirmEmailChange() method", description = "IFS admins and support users can confirm email change.") @GetMapping("/user/{userId}/active/confirm") String confirmEmailChange(@PathVariable long userId, Model model, @ModelAttribute(value = FORM_ATTR_NAME, binding = false) ConfirmEmailForm form, @SuppressWarnings("unused") BindingResult bindingResult, HttpServletRequest request); @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.confirmEmailChange() method", description = "IFS admins and support users can confirm email change.") @PostMapping("/user/{userId}/active/confirm") String confirmEmailChangePost(@PathVariable long userId, Model model, @Valid @ModelAttribute(value = FORM_ATTR_NAME) ConfirmEmailForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes); @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.deactivateUser() method", description = "IFS admins and support users can deactivate users.") @PostMapping(value = "/user/{userId}/active", params = "deactivateUser") String deactivateUser(@PathVariable long userId); @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.reactivateUser() method", description = "IFS admins and support users can reactivate users.") @PostMapping(value = "/user/{userId}/inactive", params = "reactivateUser") String reactivateUser(@PathVariable long userId); @AsyncMethod @SecuredBySpring(value = "UserManagementController.viewAvailableAssessors() method", description = "Only comp admin and project finance can view active assessors") @PreAuthorize("hasAnyAuthority('comp_admin' , 'project_finance')") @GetMapping("/assessors/available") String viewAvailableAssessors(Model model, UserResource user, @ModelAttribute(FORM_ATTR_NAME) UserManagementFilterForm filterForm, @RequestParam(defaultValue = DEFAULT_PAGE_NUMBER) int page, @RequestParam(defaultValue = DEFAULT_PAGE_SIZE) int size); @AsyncMethod @SecuredBySpring(value = "UserManagementController.viewAvailableAssessors() method", description = "Only comp admin and project finance can view unavailable assessors") @PreAuthorize("hasAnyAuthority('comp_admin' , 'project_finance')") @GetMapping("/assessors/unavailable") String viewUnavailableAssessors(Model model, UserResource user, @ModelAttribute(FORM_ATTR_NAME) UserManagementFilterForm filterForm, @RequestParam(defaultValue = DEFAULT_PAGE_NUMBER) int page, @RequestParam(defaultValue = DEFAULT_PAGE_SIZE) int size); @AsyncMethod @SecuredBySpring(value = "UserManagementController.viewAvailableAssessors() method", description = "Only comp admin and project finance can view disabled assessors") @PreAuthorize("hasAnyAuthority('comp_admin' , 'project_finance')") @GetMapping("/assessors/disabled") String viewDisabledAssessors(Model model, UserResource user, @ModelAttribute(FORM_ATTR_NAME) UserManagementFilterForm filterForm, @RequestParam(defaultValue = DEFAULT_PAGE_NUMBER) int page, @RequestParam(defaultValue = DEFAULT_PAGE_SIZE) int size); }
@Test public void viewAvailableAssessors() throws Exception { when(roleProfileStatusRestServiceMock.getAvailableAssessors(null, 0, 5)).thenReturn(restSuccess(userPageResource)); when(roleProfileStatusRestServiceMock.getUnavailableAssessors(null, 0, 5)).thenReturn(restSuccess(userPageResource)); when(roleProfileStatusRestServiceMock.getDisabledAssessors(null, 0, 5)).thenReturn(restSuccess(userPageResource)); mockMvc.perform(get("/admin/assessors/available") .param("page", "1") .param("size", "5")) .andExpect(status().isOk()) .andExpect(view().name("admin/assessors")) .andExpect(model().attribute("model", new AssessorListViewModel( "available", null, userPageResource.getContent(), userPageResource.getContent(), userPageResource.getContent(), userPageResource.getTotalElements(), userPageResource.getTotalElements(), userPageResource.getTotalElements(), new PaginationViewModel(userPageResource), new PaginationViewModel(userPageResource), new PaginationViewModel(userPageResource) ) )); }
GoogleAnalyticsDataLayerController { @GetMapping("/competition/{competitionId}/competition-name") public RestResult<String> getCompetitionName(@PathVariable("competitionId") long competitionId) { return googleAnalyticsDataLayerService.getCompetitionName(competitionId).toGetResponse(); } @GetMapping("/application/{applicationId}/competition-name") RestResult<String> getCompetitionNameForApplication(@PathVariable("applicationId") long applicationId); @GetMapping("/invite/{inviteHash}/competition-name") RestResult<String> getCompetitionNameForInvite(@PathVariable("inviteHash") String inviteHash); @GetMapping("/application/{applicationId}/user-roles") RestResult<List<Role>> getRolesByApplicationIdForCurrentUser(@PathVariable("applicationId") long applicationId); @GetMapping("/competition/{competitionId}/competition-name") RestResult<String> getCompetitionName(@PathVariable("competitionId") long competitionId); @GetMapping("/project/{projectId}/competition-name") RestResult<String> getCompetitionNameForProject(@PathVariable("projectId") long projectId); @GetMapping("/project/{projectId}/user-roles") RestResult<List<Role>> getRolesByProjectIdForCurrentUser(@PathVariable("projectId") long projectId); @GetMapping("/assessment/{assessmentId}/competition-name") RestResult<String> getCompetitionNameForAssessment(@PathVariable("assessmentId") long assessmentId); @GetMapping("/project/{projectId}/application-id") RestResult<Long> getApplicationIdForProject(@PathVariable("projectId") long projectId); @GetMapping("/assessment/{assessmentId}/application-id") RestResult<Long> getApplicationIdForAssessment(@PathVariable("assessmentId") long assessmentId); }
@Test public void getCompetitionName() throws Exception { final long competitionId=7L; final String competitionName="Competition Name"; when(googleAnalyticsDataLayerServiceMock.getCompetitionName(competitionId)) .thenReturn(serviceSuccess(competitionName)); mockMvc.perform(get("/analytics/competition/{competitionId}/competition-name", competitionId)) .andExpect(status().isOk()) .andExpect(content().string(toJson(competitionName))); verify(googleAnalyticsDataLayerServiceMock, only()).getCompetitionName(competitionId); }
UserManagementController extends AsyncAdaptor { @AsyncMethod @SecuredBySpring(value = "UserManagementController.viewAvailableAssessors() method", description = "Only comp admin and project finance can view unavailable assessors") @PreAuthorize("hasAnyAuthority('comp_admin' , 'project_finance')") @GetMapping("/assessors/unavailable") public String viewUnavailableAssessors(Model model, UserResource user, @ModelAttribute(FORM_ATTR_NAME) UserManagementFilterForm filterForm, @RequestParam(defaultValue = DEFAULT_PAGE_NUMBER) int page, @RequestParam(defaultValue = DEFAULT_PAGE_SIZE) int size) { return viewAssessors(model, "unavailable", filterForm.getFilter(), page, size); } @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.viewUser() method", description = "IFS admins and support users can view users.") @GetMapping("/user/{userId}") String viewUser(@PathVariable long userId); @PreAuthorize("hasPermission(#userId, 'org.innovateuk.ifs.user.resource.UserCompositeId', 'VIEW_USER_PAGE')") @GetMapping("/user/{userId}/inactive") String viewInactiveUser(@PathVariable long userId, Model model, UserResource loggedInUser); @PreAuthorize("hasPermission(#userId, 'org.innovateuk.ifs.user.resource.UserCompositeId', 'VIEW_USER_PAGE')") @GetMapping("/user/{userId}/active") String viewActiveUser(@PathVariable long userId, Model model, UserResource loggedInUser); @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.updateUser() method", description = "IFS admins and support users can edit users.") @PostMapping("/user/{userId}/active") String updateUser(@PathVariable long userId, Model model, UserResource loggedInUser, @Valid @ModelAttribute(FORM_ATTR_NAME) EditUserForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, HttpServletResponse response); @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.confirmEmailChange() method", description = "IFS admins and support users can confirm email change.") @GetMapping("/user/{userId}/active/confirm") String confirmEmailChange(@PathVariable long userId, Model model, @ModelAttribute(value = FORM_ATTR_NAME, binding = false) ConfirmEmailForm form, @SuppressWarnings("unused") BindingResult bindingResult, HttpServletRequest request); @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.confirmEmailChange() method", description = "IFS admins and support users can confirm email change.") @PostMapping("/user/{userId}/active/confirm") String confirmEmailChangePost(@PathVariable long userId, Model model, @Valid @ModelAttribute(value = FORM_ATTR_NAME) ConfirmEmailForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes); @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.deactivateUser() method", description = "IFS admins and support users can deactivate users.") @PostMapping(value = "/user/{userId}/active", params = "deactivateUser") String deactivateUser(@PathVariable long userId); @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.reactivateUser() method", description = "IFS admins and support users can reactivate users.") @PostMapping(value = "/user/{userId}/inactive", params = "reactivateUser") String reactivateUser(@PathVariable long userId); @AsyncMethod @SecuredBySpring(value = "UserManagementController.viewAvailableAssessors() method", description = "Only comp admin and project finance can view active assessors") @PreAuthorize("hasAnyAuthority('comp_admin' , 'project_finance')") @GetMapping("/assessors/available") String viewAvailableAssessors(Model model, UserResource user, @ModelAttribute(FORM_ATTR_NAME) UserManagementFilterForm filterForm, @RequestParam(defaultValue = DEFAULT_PAGE_NUMBER) int page, @RequestParam(defaultValue = DEFAULT_PAGE_SIZE) int size); @AsyncMethod @SecuredBySpring(value = "UserManagementController.viewAvailableAssessors() method", description = "Only comp admin and project finance can view unavailable assessors") @PreAuthorize("hasAnyAuthority('comp_admin' , 'project_finance')") @GetMapping("/assessors/unavailable") String viewUnavailableAssessors(Model model, UserResource user, @ModelAttribute(FORM_ATTR_NAME) UserManagementFilterForm filterForm, @RequestParam(defaultValue = DEFAULT_PAGE_NUMBER) int page, @RequestParam(defaultValue = DEFAULT_PAGE_SIZE) int size); @AsyncMethod @SecuredBySpring(value = "UserManagementController.viewAvailableAssessors() method", description = "Only comp admin and project finance can view disabled assessors") @PreAuthorize("hasAnyAuthority('comp_admin' , 'project_finance')") @GetMapping("/assessors/disabled") String viewDisabledAssessors(Model model, UserResource user, @ModelAttribute(FORM_ATTR_NAME) UserManagementFilterForm filterForm, @RequestParam(defaultValue = DEFAULT_PAGE_NUMBER) int page, @RequestParam(defaultValue = DEFAULT_PAGE_SIZE) int size); }
@Test public void viewUnavailableAssessors() throws Exception { when(roleProfileStatusRestServiceMock.getAvailableAssessors(null, 0, 5)).thenReturn(restSuccess(userPageResource)); when(roleProfileStatusRestServiceMock.getUnavailableAssessors(null, 0, 5)).thenReturn(restSuccess(userPageResource)); when(roleProfileStatusRestServiceMock.getDisabledAssessors(null, 0, 5)).thenReturn(restSuccess(userPageResource)); mockMvc.perform(get("/admin/assessors/unavailable") .param("page", "1") .param("size", "5")) .andExpect(status().isOk()) .andExpect(view().name("admin/assessors")) .andExpect(model().attribute("model", new AssessorListViewModel( "unavailable", null, userPageResource.getContent(), userPageResource.getContent(), userPageResource.getContent(), userPageResource.getTotalElements(), userPageResource.getTotalElements(), userPageResource.getTotalElements(), new PaginationViewModel(userPageResource), new PaginationViewModel(userPageResource), new PaginationViewModel(userPageResource) ) )); }
UserManagementController extends AsyncAdaptor { @AsyncMethod @SecuredBySpring(value = "UserManagementController.viewAvailableAssessors() method", description = "Only comp admin and project finance can view disabled assessors") @PreAuthorize("hasAnyAuthority('comp_admin' , 'project_finance')") @GetMapping("/assessors/disabled") public String viewDisabledAssessors(Model model, UserResource user, @ModelAttribute(FORM_ATTR_NAME) UserManagementFilterForm filterForm, @RequestParam(defaultValue = DEFAULT_PAGE_NUMBER) int page, @RequestParam(defaultValue = DEFAULT_PAGE_SIZE) int size) { return viewAssessors(model, "disabled", filterForm.getFilter(), page, size); } @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.viewUser() method", description = "IFS admins and support users can view users.") @GetMapping("/user/{userId}") String viewUser(@PathVariable long userId); @PreAuthorize("hasPermission(#userId, 'org.innovateuk.ifs.user.resource.UserCompositeId', 'VIEW_USER_PAGE')") @GetMapping("/user/{userId}/inactive") String viewInactiveUser(@PathVariable long userId, Model model, UserResource loggedInUser); @PreAuthorize("hasPermission(#userId, 'org.innovateuk.ifs.user.resource.UserCompositeId', 'VIEW_USER_PAGE')") @GetMapping("/user/{userId}/active") String viewActiveUser(@PathVariable long userId, Model model, UserResource loggedInUser); @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.updateUser() method", description = "IFS admins and support users can edit users.") @PostMapping("/user/{userId}/active") String updateUser(@PathVariable long userId, Model model, UserResource loggedInUser, @Valid @ModelAttribute(FORM_ATTR_NAME) EditUserForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, HttpServletResponse response); @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.confirmEmailChange() method", description = "IFS admins and support users can confirm email change.") @GetMapping("/user/{userId}/active/confirm") String confirmEmailChange(@PathVariable long userId, Model model, @ModelAttribute(value = FORM_ATTR_NAME, binding = false) ConfirmEmailForm form, @SuppressWarnings("unused") BindingResult bindingResult, HttpServletRequest request); @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.confirmEmailChange() method", description = "IFS admins and support users can confirm email change.") @PostMapping("/user/{userId}/active/confirm") String confirmEmailChangePost(@PathVariable long userId, Model model, @Valid @ModelAttribute(value = FORM_ATTR_NAME) ConfirmEmailForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes); @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.deactivateUser() method", description = "IFS admins and support users can deactivate users.") @PostMapping(value = "/user/{userId}/active", params = "deactivateUser") String deactivateUser(@PathVariable long userId); @PreAuthorize("hasAnyAuthority('ifs_administrator', 'support')") @SecuredBySpring(value = "UserManagementController.reactivateUser() method", description = "IFS admins and support users can reactivate users.") @PostMapping(value = "/user/{userId}/inactive", params = "reactivateUser") String reactivateUser(@PathVariable long userId); @AsyncMethod @SecuredBySpring(value = "UserManagementController.viewAvailableAssessors() method", description = "Only comp admin and project finance can view active assessors") @PreAuthorize("hasAnyAuthority('comp_admin' , 'project_finance')") @GetMapping("/assessors/available") String viewAvailableAssessors(Model model, UserResource user, @ModelAttribute(FORM_ATTR_NAME) UserManagementFilterForm filterForm, @RequestParam(defaultValue = DEFAULT_PAGE_NUMBER) int page, @RequestParam(defaultValue = DEFAULT_PAGE_SIZE) int size); @AsyncMethod @SecuredBySpring(value = "UserManagementController.viewAvailableAssessors() method", description = "Only comp admin and project finance can view unavailable assessors") @PreAuthorize("hasAnyAuthority('comp_admin' , 'project_finance')") @GetMapping("/assessors/unavailable") String viewUnavailableAssessors(Model model, UserResource user, @ModelAttribute(FORM_ATTR_NAME) UserManagementFilterForm filterForm, @RequestParam(defaultValue = DEFAULT_PAGE_NUMBER) int page, @RequestParam(defaultValue = DEFAULT_PAGE_SIZE) int size); @AsyncMethod @SecuredBySpring(value = "UserManagementController.viewAvailableAssessors() method", description = "Only comp admin and project finance can view disabled assessors") @PreAuthorize("hasAnyAuthority('comp_admin' , 'project_finance')") @GetMapping("/assessors/disabled") String viewDisabledAssessors(Model model, UserResource user, @ModelAttribute(FORM_ATTR_NAME) UserManagementFilterForm filterForm, @RequestParam(defaultValue = DEFAULT_PAGE_NUMBER) int page, @RequestParam(defaultValue = DEFAULT_PAGE_SIZE) int size); }
@Test public void viewDisabledAssessors() throws Exception { when(roleProfileStatusRestServiceMock.getAvailableAssessors(null, 0, 5)).thenReturn(restSuccess(userPageResource)); when(roleProfileStatusRestServiceMock.getUnavailableAssessors(null, 0, 5)).thenReturn(restSuccess(userPageResource)); when(roleProfileStatusRestServiceMock.getDisabledAssessors(null, 0, 5)).thenReturn(restSuccess(userPageResource)); mockMvc.perform(get("/admin/assessors/disabled") .param("page", "1") .param("size", "5")) .andExpect(status().isOk()) .andExpect(view().name("admin/assessors")) .andExpect(model().attribute("model", new AssessorListViewModel( "disabled", null, userPageResource.getContent(), userPageResource.getContent(), userPageResource.getContent(), userPageResource.getTotalElements(), userPageResource.getTotalElements(), userPageResource.getTotalElements(), new PaginationViewModel(userPageResource), new PaginationViewModel(userPageResource), new PaginationViewModel(userPageResource) ) )); }
ExternalUserManagementController { @SecuredBySpring(value = "FIND_EXTERNAL_USERS", description = "Only the support user or IFS Admin can access external user information") @PreAuthorize("hasAnyAuthority('support', 'ifs_administrator')") @GetMapping(value = "/users") public String viewFindExternalUsers(@ModelAttribute(FORM_ATTR_NAME) SearchExternalUsersForm form, Model model) { model.addAttribute("tab", "users"); return emptyPage(model); } @SecuredBySpring(value = "FIND_EXTERNAL_USERS", description = "Only the support user or IFS Admin can access external user information") @PreAuthorize("hasAnyAuthority('support', 'ifs_administrator')") @GetMapping(value = "/users") String viewFindExternalUsers(@ModelAttribute(FORM_ATTR_NAME) SearchExternalUsersForm form, Model model); @SecuredBySpring(value = "FIND_EXTERNAL_INVITES", description = "Only the support user or IFS Admin can access external user invites") @PreAuthorize("hasAnyAuthority('support', 'ifs_administrator')") @GetMapping(value = "/invites") String viewFindExternalInvites(@ModelAttribute(FORM_ATTR_NAME) SearchExternalUsersForm form, Model model); @SecuredBySpring(value = "FIND_EXTERNAL_USERS", description = "Only the support user or IFS Admin can access external user information") @PreAuthorize("hasAnyAuthority('support', 'ifs_administrator')") @PostMapping({"/users", "/invites"}) String findExternalUsers(@Valid @ModelAttribute(FORM_ATTR_NAME) SearchExternalUsersForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, Model model, HttpServletRequest request); }
@Test public void viewFindExternalUsers() throws Exception { mockMvc.perform(get("/admin/external/users")) .andExpect(status().isOk()) .andExpect(view().name("admin/search-external-users")) .andExpect(model().attribute("form", new SearchExternalUsersForm())) .andExpect(model().attribute("tab", "users")) .andExpect(model().attribute("mode", "init")) .andExpect(model().attribute("users", emptyList())); }
ExternalUserManagementController { @SecuredBySpring(value = "FIND_EXTERNAL_INVITES", description = "Only the support user or IFS Admin can access external user invites") @PreAuthorize("hasAnyAuthority('support', 'ifs_administrator')") @GetMapping(value = "/invites") public String viewFindExternalInvites(@ModelAttribute(FORM_ATTR_NAME) SearchExternalUsersForm form, Model model) { model.addAttribute("tab", "invites"); return emptyPage(model); } @SecuredBySpring(value = "FIND_EXTERNAL_USERS", description = "Only the support user or IFS Admin can access external user information") @PreAuthorize("hasAnyAuthority('support', 'ifs_administrator')") @GetMapping(value = "/users") String viewFindExternalUsers(@ModelAttribute(FORM_ATTR_NAME) SearchExternalUsersForm form, Model model); @SecuredBySpring(value = "FIND_EXTERNAL_INVITES", description = "Only the support user or IFS Admin can access external user invites") @PreAuthorize("hasAnyAuthority('support', 'ifs_administrator')") @GetMapping(value = "/invites") String viewFindExternalInvites(@ModelAttribute(FORM_ATTR_NAME) SearchExternalUsersForm form, Model model); @SecuredBySpring(value = "FIND_EXTERNAL_USERS", description = "Only the support user or IFS Admin can access external user information") @PreAuthorize("hasAnyAuthority('support', 'ifs_administrator')") @PostMapping({"/users", "/invites"}) String findExternalUsers(@Valid @ModelAttribute(FORM_ATTR_NAME) SearchExternalUsersForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, Model model, HttpServletRequest request); }
@Test public void viewFindExternalInvites() throws Exception { mockMvc.perform(get("/admin/external/invites")) .andExpect(status().isOk()) .andExpect(view().name("admin/search-external-users")) .andExpect(model().attribute("form", new SearchExternalUsersForm())) .andExpect(model().attribute("tab", "invites")) .andExpect(model().attribute("mode", "init")) .andExpect(model().attribute("users", emptyList())); }
ExternalUserManagementController { @SecuredBySpring(value = "FIND_EXTERNAL_USERS", description = "Only the support user or IFS Admin can access external user information") @PreAuthorize("hasAnyAuthority('support', 'ifs_administrator')") @PostMapping({"/users", "/invites"}) public String findExternalUsers(@Valid @ModelAttribute(FORM_ATTR_NAME) SearchExternalUsersForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, Model model, HttpServletRequest request) { Map<String, String[]> requestParams = request.getParameterMap(); if (requestParams.containsKey("pending")) { return findExternalInvites(form, validationHandler, model); } else { return findExternalUsers(form, validationHandler, model); } } @SecuredBySpring(value = "FIND_EXTERNAL_USERS", description = "Only the support user or IFS Admin can access external user information") @PreAuthorize("hasAnyAuthority('support', 'ifs_administrator')") @GetMapping(value = "/users") String viewFindExternalUsers(@ModelAttribute(FORM_ATTR_NAME) SearchExternalUsersForm form, Model model); @SecuredBySpring(value = "FIND_EXTERNAL_INVITES", description = "Only the support user or IFS Admin can access external user invites") @PreAuthorize("hasAnyAuthority('support', 'ifs_administrator')") @GetMapping(value = "/invites") String viewFindExternalInvites(@ModelAttribute(FORM_ATTR_NAME) SearchExternalUsersForm form, Model model); @SecuredBySpring(value = "FIND_EXTERNAL_USERS", description = "Only the support user or IFS Admin can access external user information") @PreAuthorize("hasAnyAuthority('support', 'ifs_administrator')") @PostMapping({"/users", "/invites"}) String findExternalUsers(@Valid @ModelAttribute(FORM_ATTR_NAME) SearchExternalUsersForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, Model model, HttpServletRequest request); }
@Test public void findExternalUsers() throws Exception { String searchString = "smith"; when(userRestService.findExternalUsers(searchString, SearchCategory.EMAIL)).thenReturn(restSuccess(emptyList())); mockMvc.perform(post("/admin/external/users"). param("searchString", searchString). param("searchCategory", "EMAIL")) .andExpect(status().isOk()) .andExpect(model().attribute("tab", "users")) .andExpect(model().attribute("mode", "search")) .andExpect(model().attribute("users", emptyList())); }
ExternalUserManagementController { private String findExternalInvites(SearchExternalUsersForm form, ValidationHandler validationHandler, Model model) { Supplier<String> failureView = () -> viewFindExternalInvites(form, model); return validationHandler.failNowOrSucceedWith(failureView, () -> { RestResult<List<ExternalInviteResource>> invites = inviteUserRestService.findExternalInvites(form.getSearchString().trim(), form.getSearchCategory()); return validationHandler.addAnyErrors(invites, fieldErrorsToFieldErrors(), asGlobalErrors()). failNowOrSucceedWith(failureView, () -> { model.addAttribute("mode", "search"); model.addAttribute("tab", "invites"); model.addAttribute("invites", invites.getSuccess()); return SEARCH_PAGE_TEMPLATE; } ); }); } @SecuredBySpring(value = "FIND_EXTERNAL_USERS", description = "Only the support user or IFS Admin can access external user information") @PreAuthorize("hasAnyAuthority('support', 'ifs_administrator')") @GetMapping(value = "/users") String viewFindExternalUsers(@ModelAttribute(FORM_ATTR_NAME) SearchExternalUsersForm form, Model model); @SecuredBySpring(value = "FIND_EXTERNAL_INVITES", description = "Only the support user or IFS Admin can access external user invites") @PreAuthorize("hasAnyAuthority('support', 'ifs_administrator')") @GetMapping(value = "/invites") String viewFindExternalInvites(@ModelAttribute(FORM_ATTR_NAME) SearchExternalUsersForm form, Model model); @SecuredBySpring(value = "FIND_EXTERNAL_USERS", description = "Only the support user or IFS Admin can access external user information") @PreAuthorize("hasAnyAuthority('support', 'ifs_administrator')") @PostMapping({"/users", "/invites"}) String findExternalUsers(@Valid @ModelAttribute(FORM_ATTR_NAME) SearchExternalUsersForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, Model model, HttpServletRequest request); }
@Test public void findExternalInvites() throws Exception { String searchString = "smith"; when(inviteUserRestService.findExternalInvites(searchString, SearchCategory.ORGANISATION_NAME)).thenReturn(restSuccess(emptyList())); mockMvc.perform(post("/admin/external/users"). param("searchString", searchString). param("searchCategory", "ORGANISATION_NAME"). param("pending", "")) .andExpect(status().isOk()) .andExpect(model().attribute("tab", "invites")) .andExpect(model().attribute("mode", "search")) .andExpect(model().attribute("invites", emptyList())); }
FinanceChecksQueriesController { private Optional<ProjectUserResource> getFinanceContact(Long projectId, Long organisationId) { List<ProjectUserResource> projectUsers = projectService.getProjectUsersForProject(projectId); return simpleFindFirst(projectUsers, pr -> pr.isFinanceContact() && organisationId.equals(pr.getOrganisation())); } @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @GetMapping String showPage(@P("projectId")@PathVariable Long projectId, @PathVariable Long organisationId, @RequestParam(value = "query_section", required = false) String querySection, Model model); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @PostMapping("/{queryId}/close") String closeQuery(@PathVariable Long projectId, @PathVariable Long organisationId, @PathVariable Long queryId, Model model); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @GetMapping("/attachment/{attachmentId}") @ResponseBody ResponseEntity<ByteArrayResource> downloadAttachment(@P("projectId")@PathVariable Long projectId, @PathVariable Long organisationId, @PathVariable Long attachmentId); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @GetMapping("/{queryId}/new-response") String viewNewResponse(@P("projectId")@PathVariable Long projectId, @PathVariable Long organisationId, @PathVariable Long queryId, @RequestParam(value = "query_section", required = false) String querySection, Model model, @ModelAttribute(name = "loggedInUser", binding = false) UserResource loggedInUser, HttpServletRequest request); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @PostMapping("/{queryId}/new-response") String saveResponse(Model model, @P("projectId")@PathVariable("projectId") final Long projectId, @PathVariable final Long organisationId, @PathVariable final Long queryId, @RequestParam(value = "query_section", required = false) String querySection, @Valid @ModelAttribute(FORM_ATTR) final FinanceChecksQueriesAddResponseForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, UserResource loggedInUser, HttpServletRequest request, HttpServletResponse response); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @PostMapping(value = "/{queryId}/new-response", params = "uploadAttachment") String saveNewResponseAttachment(Model model, @P("projectId")@PathVariable("projectId") final Long projectId, @PathVariable Long organisationId, @PathVariable Long queryId, @RequestParam(value = "query_section", required = false) String querySection, @ModelAttribute(FORM_ATTR) FinanceChecksQueriesAddResponseForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @GetMapping("/{queryId}/new-response/attachment/{attachmentId}") @ResponseBody ResponseEntity<ByteArrayResource> downloadResponseAttachment(@P("projectId")@PathVariable Long projectId, @PathVariable Long organisationId, @PathVariable Long queryId, @PathVariable Long attachmentId, HttpServletRequest request); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @PostMapping(value = "/{queryId}/new-response", params = "removeAttachment") String removeAttachment(@P("projectId")@PathVariable Long projectId, @PathVariable Long organisationId, @PathVariable Long queryId, @RequestParam(value = "query_section", required = false) final String querySection, @RequestParam(value = "removeAttachment") final Long attachmentId, @ModelAttribute(FORM_ATTR) FinanceChecksQueriesAddResponseForm form, HttpServletRequest request, HttpServletResponse response); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @GetMapping("/{queryId}/new-response/cancel") String cancelNewForm(@P("projectId")@PathVariable Long projectId, @PathVariable Long organisationId, @PathVariable Long queryId, @RequestParam(value = "query_section", required = false) String querySection, HttpServletRequest request, HttpServletResponse response); }
@Test public void testGetReadOnlyView() throws Exception { ProjectFinanceResource projectFinanceResource = newProjectFinanceResource().withProject(projectId).withOrganisation(applicantOrganisationId).withId(projectFinanceId).build(); when(projectFinanceService.getProjectFinance(projectId, applicantOrganisationId)).thenReturn(projectFinanceResource); when(financeCheckServiceMock.getQueries(projectFinanceId)).thenReturn(ServiceResult.serviceSuccess(queries)); MvcResult result = mockMvc.perform(get("/project/" + projectId + "/finance-check/organisation/" + applicantOrganisationId + "/query?query_section=Eligibility")) .andExpect(view().name("project/financecheck/queries")) .andReturn(); FinanceChecksQueriesViewModel queryViewModel = (FinanceChecksQueriesViewModel) result.getModelAndView().getModel().get("model"); assertEquals("Eligibility", queryViewModel.getQuerySection()); assertTrue(queryViewModel.getFinanceContact().isPresent()); assertEquals("[email protected]", queryViewModel.getFinanceContact().get().getEmail()); assertEquals("User1", queryViewModel.getFinanceContact().get().getUserName()); assertEquals("0117", queryViewModel.getFinanceContact().get().getPhoneNumber()); assertEquals("Org1", queryViewModel.getOrganisationName()); assertEquals("Project1", queryViewModel.getProjectName()); assertEquals(applicantOrganisationId, queryViewModel.getOrganisationId()); assertEquals(projectId, queryViewModel.getProjectId()); assertTrue(queryViewModel.isProjectIsActive()); assertEquals(3, queryViewModel.getQueries().size()); assertEquals("Query title", queryViewModel.getQueries().get(0).getTitle()); assertEquals(FinanceChecksSectionType.ELIGIBILITY, queryViewModel.getQueries().get(0).getSectionType()); assertEquals(false, queryViewModel.getQueries().get(0).isLastPostByInternalUser()); assertEquals(applicantOrganisationId, queryViewModel.getQueries().get(0).getOrganisationId()); assertEquals(projectId, queryViewModel.getQueries().get(0).getProjectId()); assertEquals(1L, queryViewModel.getQueries().get(0).getId().longValue()); assertEquals(2, queryViewModel.getQueries().get(0).getViewModelPosts().size()); assertEquals("Question", queryViewModel.getQueries().get(0).getViewModelPosts().get(0).body); assertEquals(financeTeamUser.getId(), queryViewModel.getQueries().get(0).getViewModelPosts().get(0).author.getId()); assertEquals("A Z - Innovate UK (Finance team)", queryViewModel.getQueries().get(0).getViewModelPosts().get(0).getUsername()); assertTrue(ZonedDateTime.now().plusMinutes(10L).isAfter(queryViewModel.getQueries().get(0).getViewModelPosts().get(0).createdOn)); assertEquals(1, queryViewModel.getQueries().get(0).getViewModelPosts().get(0).attachments.size()); assertEquals(23L, queryViewModel.getQueries().get(0).getViewModelPosts().get(0).attachments.get(0).id.longValue()); assertEquals("file1.txt", queryViewModel.getQueries().get(0).getViewModelPosts().get(0).attachments.get(0).name); assertEquals("Response", queryViewModel.getQueries().get(0).getViewModelPosts().get(1).body); assertEquals(financeContactUser.getId(), queryViewModel.getQueries().get(0).getViewModelPosts().get(1).author.getId()); assertEquals("B Z - Org1", queryViewModel.getQueries().get(0).getViewModelPosts().get(1).getUsername()); assertTrue(ZonedDateTime.now().plusMinutes(20L).isAfter(queryViewModel.getQueries().get(0).getViewModelPosts().get(1).createdOn)); assertEquals(0, queryViewModel.getQueries().get(0).getViewModelPosts().get(1).attachments.size()); assertEquals("Query2 title", queryViewModel.getQueries().get(1).getTitle()); assertEquals(FinanceChecksSectionType.ELIGIBILITY, queryViewModel.getQueries().get(1).getSectionType()); assertEquals(true, queryViewModel.getQueries().get(1).isLastPostByInternalUser()); assertEquals(applicantOrganisationId, queryViewModel.getQueries().get(1).getOrganisationId()); assertEquals(projectId, queryViewModel.getQueries().get(1).getProjectId()); assertEquals(3L, queryViewModel.getQueries().get(1).getId().longValue()); assertEquals(1, queryViewModel.getQueries().get(1).getViewModelPosts().size()); assertEquals("Question2", queryViewModel.getQueries().get(1).getViewModelPosts().get(0).body); assertEquals(financeTeamUser.getId(), queryViewModel.getQueries().get(1).getViewModelPosts().get(0).author.getId()); assertEquals("A Z - Innovate UK (Finance team)", queryViewModel.getQueries().get(1).getViewModelPosts().get(0).getUsername()); assertTrue(ZonedDateTime.now().plusMinutes(15L).isAfter(queryViewModel.getQueries().get(1).getViewModelPosts().get(0).createdOn)); assertEquals(0, queryViewModel.getQueries().get(1).getViewModelPosts().get(0).attachments.size()); assertEquals("Query title3", queryViewModel.getQueries().get(2).getTitle()); assertEquals(FinanceChecksSectionType.ELIGIBILITY, queryViewModel.getQueries().get(2).getSectionType()); assertEquals(false, queryViewModel.getQueries().get(2).isLastPostByInternalUser()); assertEquals(applicantOrganisationId, queryViewModel.getQueries().get(2).getOrganisationId()); assertEquals(projectId, queryViewModel.getQueries().get(2).getProjectId()); assertEquals(5L, queryViewModel.getQueries().get(2).getId().longValue()); assertEquals(2, queryViewModel.getQueries().get(2).getViewModelPosts().size()); assertEquals("Question3", queryViewModel.getQueries().get(2).getViewModelPosts().get(0).body); assertEquals(financeTeamUser.getId(), queryViewModel.getQueries().get(2).getViewModelPosts().get(0).author.getId()); assertEquals("A Z - Innovate UK (Finance team)", queryViewModel.getQueries().get(2).getViewModelPosts().get(0).getUsername()); assertTrue(ZonedDateTime.now().isAfter(queryViewModel.getQueries().get(2).getViewModelPosts().get(0).createdOn)); assertEquals(0, queryViewModel.getQueries().get(2).getViewModelPosts().get(0).attachments.size()); assertEquals("Response3", queryViewModel.getQueries().get(2).getViewModelPosts().get(1).body); assertEquals(financeContactUser.getId(), queryViewModel.getQueries().get(2).getViewModelPosts().get(1).author.getId()); assertEquals("B Z - Org1", queryViewModel.getQueries().get(2).getViewModelPosts().get(1).getUsername()); assertTrue(ZonedDateTime.now().plusMinutes(10L).isAfter(queryViewModel.getQueries().get(2).getViewModelPosts().get(1).createdOn)); assertEquals(0, queryViewModel.getQueries().get(2).getViewModelPosts().get(1).attachments.size()); } @Test public void testQueriesPageWhenFCIsProvided() throws Exception { ProjectFinanceResource projectFinanceResource = newProjectFinanceResource().withProject(projectId).withOrganisation(applicantOrganisationId).withId(projectFinanceId).build(); when(projectFinanceService.getProjectFinance(projectId, applicantOrganisationId)).thenReturn(projectFinanceResource); when(financeCheckServiceMock.getQueries(projectFinanceId)).thenReturn(ServiceResult.serviceSuccess(queries)); MvcResult result = mockMvc.perform(get("/project/" + projectId + "/finance-check/organisation/" + applicantOrganisationId + "/query?query_section=Eligibility")) .andExpect(status().isOk()) .andReturn(); FinanceChecksQueriesViewModel queryViewModel = (FinanceChecksQueriesViewModel) result.getModelAndView().getModel().get("model"); assertTrue(queryViewModel.getFinanceContact().isPresent()); } @Test public void testQueriesPageWhenFCIsNotProvided() throws Exception { ProjectFinanceResource projectFinanceResource = newProjectFinanceResource().withProject(projectId).withOrganisation(applicantOrganisationId).withId(projectFinanceId).build(); when(projectFinanceService.getProjectFinance(projectId, applicantOrganisationId)).thenReturn(projectFinanceResource); when(financeCheckServiceMock.getQueries(projectFinanceId)).thenReturn(ServiceResult.serviceSuccess(queries)); ProjectUserResource projectUsersWithoutFC = newProjectUserResource().withOrganisation(applicantOrganisationId).withUserName("User1").withEmail("[email protected]").withPhoneNumber("0117").withRole(PROJECT_MANAGER).build(); when(projectService.getProjectUsersForProject(projectId)).thenReturn(singletonList(projectUsersWithoutFC)); MvcResult result = mockMvc.perform(get("/project/" + projectId + "/finance-check/organisation/" + applicantOrganisationId + "/query?query_section=Eligibility")) .andExpect(status().isOk()) .andReturn(); FinanceChecksQueriesViewModel queryViewModel = (FinanceChecksQueriesViewModel) result.getModelAndView().getModel().get("model"); assertFalse(queryViewModel.getFinanceContact().isPresent()); } @Test public void testViewNewResponseWithAttachments() throws Exception { AttachmentResource attachment = new AttachmentResource(1L, "name", "mediaType", 2L, null); ProjectFinanceResource projectFinanceResource = newProjectFinanceResource().withProject(projectId).withOrganisation(applicantOrganisationId).withId(projectFinanceId).build(); when(projectFinanceService.getProjectFinance(projectId, applicantOrganisationId)).thenReturn(projectFinanceResource); when(financeCheckServiceMock.getQueries(projectFinanceId)).thenReturn(ServiceResult.serviceSuccess(queries)); when(financeCheckServiceMock.getAttachment(1L)).thenReturn(ServiceResult.serviceSuccess(attachment)); List<Long> attachmentIds = new ArrayList<>(); attachmentIds.add(1L); String cookieContent = JsonUtil.getSerializedObject(attachmentIds); String encryptedData = encryptor.encrypt(URLEncoder.encode(cookieContent, CharEncoding.UTF_8)); Cookie cookie = new Cookie("finance_checks_queries_new_response_attachments"+"_"+projectId+"_"+applicantOrganisationId+"_"+1L, encryptedData); MvcResult result = mockMvc.perform(get("/project/" + projectId + "/finance-check/organisation/" + applicantOrganisationId + "/query/"+ queryId + "/new-response?query_section=Eligibility") .cookie(cookie)) .andExpect(status().is2xxSuccessful()) .andExpect(view().name("project/financecheck/queries")) .andReturn(); FinanceChecksQueriesViewModel queryViewModel = (FinanceChecksQueriesViewModel) result.getModelAndView().getModel().get("model"); assertEquals("Eligibility", queryViewModel.getQuerySection()); assertTrue(queryViewModel.getFinanceContact().isPresent()); assertEquals("[email protected]", queryViewModel.getFinanceContact().get().getEmail()); assertEquals("User1", queryViewModel.getFinanceContact().get().getUserName()); assertEquals("0117", queryViewModel.getFinanceContact().get().getPhoneNumber()); assertEquals("Org1", queryViewModel.getOrganisationName()); assertEquals("Project1", queryViewModel.getProjectName()); assertEquals(applicantOrganisationId, queryViewModel.getOrganisationId()); assertEquals(projectId, queryViewModel.getProjectId()); assertEquals("/project/{projectId}/finance-check/organisation/{organisationId}/query", queryViewModel.getBaseUrl()); assertEquals(4000, queryViewModel.getMaxQueryCharacters()); assertEquals(400, queryViewModel.getMaxQueryWords()); assertEquals(1L, queryViewModel.getQueryId().longValue()); assertTrue(queryViewModel.isLeadPartnerOrganisation()); assertEquals(1, queryViewModel.getNewAttachmentLinks().size()); assertEquals("name", queryViewModel.getNewAttachmentLinks().get(1L)); }
FinanceChecksQueriesController { @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @PostMapping("/{queryId}/close") public String closeQuery(@PathVariable Long projectId, @PathVariable Long organisationId, @PathVariable Long queryId, Model model) { financeCheckService.closeQuery(queryId); return "redirect:/project/" + projectId + "/finance-check/organisation/" + organisationId + "/query"; } @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @GetMapping String showPage(@P("projectId")@PathVariable Long projectId, @PathVariable Long organisationId, @RequestParam(value = "query_section", required = false) String querySection, Model model); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @PostMapping("/{queryId}/close") String closeQuery(@PathVariable Long projectId, @PathVariable Long organisationId, @PathVariable Long queryId, Model model); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @GetMapping("/attachment/{attachmentId}") @ResponseBody ResponseEntity<ByteArrayResource> downloadAttachment(@P("projectId")@PathVariable Long projectId, @PathVariable Long organisationId, @PathVariable Long attachmentId); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @GetMapping("/{queryId}/new-response") String viewNewResponse(@P("projectId")@PathVariable Long projectId, @PathVariable Long organisationId, @PathVariable Long queryId, @RequestParam(value = "query_section", required = false) String querySection, Model model, @ModelAttribute(name = "loggedInUser", binding = false) UserResource loggedInUser, HttpServletRequest request); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @PostMapping("/{queryId}/new-response") String saveResponse(Model model, @P("projectId")@PathVariable("projectId") final Long projectId, @PathVariable final Long organisationId, @PathVariable final Long queryId, @RequestParam(value = "query_section", required = false) String querySection, @Valid @ModelAttribute(FORM_ATTR) final FinanceChecksQueriesAddResponseForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, UserResource loggedInUser, HttpServletRequest request, HttpServletResponse response); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @PostMapping(value = "/{queryId}/new-response", params = "uploadAttachment") String saveNewResponseAttachment(Model model, @P("projectId")@PathVariable("projectId") final Long projectId, @PathVariable Long organisationId, @PathVariable Long queryId, @RequestParam(value = "query_section", required = false) String querySection, @ModelAttribute(FORM_ATTR) FinanceChecksQueriesAddResponseForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @GetMapping("/{queryId}/new-response/attachment/{attachmentId}") @ResponseBody ResponseEntity<ByteArrayResource> downloadResponseAttachment(@P("projectId")@PathVariable Long projectId, @PathVariable Long organisationId, @PathVariable Long queryId, @PathVariable Long attachmentId, HttpServletRequest request); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @PostMapping(value = "/{queryId}/new-response", params = "removeAttachment") String removeAttachment(@P("projectId")@PathVariable Long projectId, @PathVariable Long organisationId, @PathVariable Long queryId, @RequestParam(value = "query_section", required = false) final String querySection, @RequestParam(value = "removeAttachment") final Long attachmentId, @ModelAttribute(FORM_ATTR) FinanceChecksQueriesAddResponseForm form, HttpServletRequest request, HttpServletResponse response); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @GetMapping("/{queryId}/new-response/cancel") String cancelNewForm(@P("projectId")@PathVariable Long projectId, @PathVariable Long organisationId, @PathVariable Long queryId, @RequestParam(value = "query_section", required = false) String querySection, HttpServletRequest request, HttpServletResponse response); }
@Test public void testCloseQuery() throws Exception { Long queryId = 1L; when(financeCheckServiceMock.closeQuery(queryId)).thenReturn(ServiceResult.serviceSuccess()); mockMvc.perform(post("/project/" + projectId + "/finance-check/organisation/" + applicantOrganisationId + "/query/{queryId}/close", queryId)) .andExpect(status().is3xxRedirection()) .andExpect(view().name("redirect:/project/" + projectId + "/finance-check/organisation/" + applicantOrganisationId + "/query")) .andReturn(); verify(financeCheckServiceMock).closeQuery(queryId); }
GoogleAnalyticsDataLayerController { @GetMapping("/project/{projectId}/competition-name") public RestResult<String> getCompetitionNameForProject(@PathVariable("projectId") long projectId) { return googleAnalyticsDataLayerService.getCompetitionNameByProjectId(projectId).toGetResponse(); } @GetMapping("/application/{applicationId}/competition-name") RestResult<String> getCompetitionNameForApplication(@PathVariable("applicationId") long applicationId); @GetMapping("/invite/{inviteHash}/competition-name") RestResult<String> getCompetitionNameForInvite(@PathVariable("inviteHash") String inviteHash); @GetMapping("/application/{applicationId}/user-roles") RestResult<List<Role>> getRolesByApplicationIdForCurrentUser(@PathVariable("applicationId") long applicationId); @GetMapping("/competition/{competitionId}/competition-name") RestResult<String> getCompetitionName(@PathVariable("competitionId") long competitionId); @GetMapping("/project/{projectId}/competition-name") RestResult<String> getCompetitionNameForProject(@PathVariable("projectId") long projectId); @GetMapping("/project/{projectId}/user-roles") RestResult<List<Role>> getRolesByProjectIdForCurrentUser(@PathVariable("projectId") long projectId); @GetMapping("/assessment/{assessmentId}/competition-name") RestResult<String> getCompetitionNameForAssessment(@PathVariable("assessmentId") long assessmentId); @GetMapping("/project/{projectId}/application-id") RestResult<Long> getApplicationIdForProject(@PathVariable("projectId") long projectId); @GetMapping("/assessment/{assessmentId}/application-id") RestResult<Long> getApplicationIdForAssessment(@PathVariable("assessmentId") long assessmentId); }
@Test public void getCompetitionNameForProject() throws Exception { final long projectId=7L; final String competitionName="Competition Name"; when(googleAnalyticsDataLayerServiceMock.getCompetitionNameByProjectId(projectId)) .thenReturn(serviceSuccess(competitionName)); mockMvc.perform(get("/analytics/project/{projectId}/competition-name", projectId)) .andExpect(status().isOk()) .andExpect(content().string(toJson(competitionName))); verify(googleAnalyticsDataLayerServiceMock, only()).getCompetitionNameByProjectId(projectId); }
FinanceChecksQueriesController { @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @GetMapping("/{queryId}/new-response") public String viewNewResponse(@P("projectId")@PathVariable Long projectId, @PathVariable Long organisationId, @PathVariable Long queryId, @RequestParam(value = "query_section", required = false) String querySection, Model model, @ModelAttribute(name = "loggedInUser", binding = false) UserResource loggedInUser, HttpServletRequest request) { partnerOrganisationRestService.getPartnerOrganisation(projectId, organisationId); List<Long> attachments = loadAttachmentsFromCookie(request, projectId, organisationId, queryId); populateQueriesViewModel(projectId, organisationId, queryId, querySection, attachments, model); model.addAttribute(FORM_ATTR, loadForm(request, projectId, organisationId, queryId).orElse(new FinanceChecksQueriesAddResponseForm())); return QUERIES_VIEW; } @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @GetMapping String showPage(@P("projectId")@PathVariable Long projectId, @PathVariable Long organisationId, @RequestParam(value = "query_section", required = false) String querySection, Model model); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @PostMapping("/{queryId}/close") String closeQuery(@PathVariable Long projectId, @PathVariable Long organisationId, @PathVariable Long queryId, Model model); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @GetMapping("/attachment/{attachmentId}") @ResponseBody ResponseEntity<ByteArrayResource> downloadAttachment(@P("projectId")@PathVariable Long projectId, @PathVariable Long organisationId, @PathVariable Long attachmentId); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @GetMapping("/{queryId}/new-response") String viewNewResponse(@P("projectId")@PathVariable Long projectId, @PathVariable Long organisationId, @PathVariable Long queryId, @RequestParam(value = "query_section", required = false) String querySection, Model model, @ModelAttribute(name = "loggedInUser", binding = false) UserResource loggedInUser, HttpServletRequest request); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @PostMapping("/{queryId}/new-response") String saveResponse(Model model, @P("projectId")@PathVariable("projectId") final Long projectId, @PathVariable final Long organisationId, @PathVariable final Long queryId, @RequestParam(value = "query_section", required = false) String querySection, @Valid @ModelAttribute(FORM_ATTR) final FinanceChecksQueriesAddResponseForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, UserResource loggedInUser, HttpServletRequest request, HttpServletResponse response); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @PostMapping(value = "/{queryId}/new-response", params = "uploadAttachment") String saveNewResponseAttachment(Model model, @P("projectId")@PathVariable("projectId") final Long projectId, @PathVariable Long organisationId, @PathVariable Long queryId, @RequestParam(value = "query_section", required = false) String querySection, @ModelAttribute(FORM_ATTR) FinanceChecksQueriesAddResponseForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @GetMapping("/{queryId}/new-response/attachment/{attachmentId}") @ResponseBody ResponseEntity<ByteArrayResource> downloadResponseAttachment(@P("projectId")@PathVariable Long projectId, @PathVariable Long organisationId, @PathVariable Long queryId, @PathVariable Long attachmentId, HttpServletRequest request); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @PostMapping(value = "/{queryId}/new-response", params = "removeAttachment") String removeAttachment(@P("projectId")@PathVariable Long projectId, @PathVariable Long organisationId, @PathVariable Long queryId, @RequestParam(value = "query_section", required = false) final String querySection, @RequestParam(value = "removeAttachment") final Long attachmentId, @ModelAttribute(FORM_ATTR) FinanceChecksQueriesAddResponseForm form, HttpServletRequest request, HttpServletResponse response); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @GetMapping("/{queryId}/new-response/cancel") String cancelNewForm(@P("projectId")@PathVariable Long projectId, @PathVariable Long organisationId, @PathVariable Long queryId, @RequestParam(value = "query_section", required = false) String querySection, HttpServletRequest request, HttpServletResponse response); }
@Test public void testViewNewResponse() throws Exception { ProjectFinanceResource projectFinanceResource = newProjectFinanceResource().withProject(projectId).withOrganisation(applicantOrganisationId).withId(projectFinanceId).build(); when(projectFinanceService.getProjectFinance(projectId, applicantOrganisationId)).thenReturn(projectFinanceResource); when(financeCheckServiceMock.getQueries(projectFinanceId)).thenReturn(ServiceResult.serviceSuccess(queries)); Cookie formCookie; FinanceChecksQueriesAddResponseForm form = new FinanceChecksQueriesAddResponseForm(); form.setResponse("comment"); formCookie = createFormCookie(form); MvcResult result = mockMvc.perform(get("/project/" + projectId + "/finance-check/organisation/" + applicantOrganisationId + "/query/" + queryId + "/new-response?query_section=Eligibility") .cookie(formCookie)) .andExpect(view().name("project/financecheck/queries")) .andReturn(); FinanceChecksQueriesViewModel responseViewModel = (FinanceChecksQueriesViewModel) result.getModelAndView().getModel().get("model"); FinanceChecksQueriesAddResponseForm modelForm = (FinanceChecksQueriesAddResponseForm) result.getModelAndView().getModel().get("form"); assertEquals("Eligibility", responseViewModel.getQuerySection()); assertTrue(responseViewModel.getFinanceContact().isPresent()); assertEquals("[email protected]", responseViewModel.getFinanceContact().get().getEmail()); assertEquals("User1", responseViewModel.getFinanceContact().get().getUserName()); assertEquals("0117", responseViewModel.getFinanceContact().get().getPhoneNumber()); assertEquals("Org1", responseViewModel.getOrganisationName()); assertEquals("Project1", responseViewModel.getProjectName()); assertEquals(applicantOrganisationId, responseViewModel.getOrganisationId()); assertEquals(projectId, responseViewModel.getProjectId()); assertEquals(1L, responseViewModel.getQueryId().longValue()); assertEquals("/project/{projectId}/finance-check/organisation/{organisationId}/query", responseViewModel.getBaseUrl()); assertEquals(4000, responseViewModel.getMaxQueryCharacters()); assertEquals(400, responseViewModel.getMaxQueryWords()); assertTrue(responseViewModel.isLeadPartnerOrganisation()); assertEquals(0, responseViewModel.getNewAttachmentLinks().size()); assertEquals("comment", modelForm.getResponse()); }
FinanceChecksQueriesController { @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @PostMapping(value = "/{queryId}/new-response", params = "uploadAttachment") public String saveNewResponseAttachment(Model model, @P("projectId")@PathVariable("projectId") final Long projectId, @PathVariable Long organisationId, @PathVariable Long queryId, @RequestParam(value = "query_section", required = false) String querySection, @ModelAttribute(FORM_ATTR) FinanceChecksQueriesAddResponseForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response) { List<Long> attachments = loadAttachmentsFromCookie(request, projectId, organisationId, queryId); Supplier<String> onSuccess = () -> redirectTo(rootView(projectId, organisationId, queryId, querySection)); Supplier<String> onError = () -> { FinanceChecksQueriesViewModel viewModel = populateQueriesViewModel(projectId, organisationId, queryId, querySection, attachments); model.addAttribute("model", viewModel); model.addAttribute("nonFormErrors", validationHandler.getAllErrors()); model.addAttribute("form", form); return QUERIES_VIEW; }; return validationHandler.performActionOrBindErrorsToField("attachment", onError, onSuccess, () -> { MultipartFile file = form.getAttachment(); ServiceResult<AttachmentResource> result = financeCheckService.uploadFile(projectId, file.getContentType(), file.getSize(), file.getOriginalFilename(), getMultipartFileBytes(file)); result.ifSuccessful(uploadedAttachment -> { attachments.add(result.getSuccess().id); saveAttachmentsToCookie(response, attachments, projectId, organisationId, queryId); saveFormToCookie(response, projectId, organisationId, queryId, form); }); model.addAttribute("model", populateQueriesViewModel(projectId, organisationId, queryId, querySection, attachments)); return result; }); } @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @GetMapping String showPage(@P("projectId")@PathVariable Long projectId, @PathVariable Long organisationId, @RequestParam(value = "query_section", required = false) String querySection, Model model); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @PostMapping("/{queryId}/close") String closeQuery(@PathVariable Long projectId, @PathVariable Long organisationId, @PathVariable Long queryId, Model model); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @GetMapping("/attachment/{attachmentId}") @ResponseBody ResponseEntity<ByteArrayResource> downloadAttachment(@P("projectId")@PathVariable Long projectId, @PathVariable Long organisationId, @PathVariable Long attachmentId); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @GetMapping("/{queryId}/new-response") String viewNewResponse(@P("projectId")@PathVariable Long projectId, @PathVariable Long organisationId, @PathVariable Long queryId, @RequestParam(value = "query_section", required = false) String querySection, Model model, @ModelAttribute(name = "loggedInUser", binding = false) UserResource loggedInUser, HttpServletRequest request); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @PostMapping("/{queryId}/new-response") String saveResponse(Model model, @P("projectId")@PathVariable("projectId") final Long projectId, @PathVariable final Long organisationId, @PathVariable final Long queryId, @RequestParam(value = "query_section", required = false) String querySection, @Valid @ModelAttribute(FORM_ATTR) final FinanceChecksQueriesAddResponseForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, UserResource loggedInUser, HttpServletRequest request, HttpServletResponse response); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @PostMapping(value = "/{queryId}/new-response", params = "uploadAttachment") String saveNewResponseAttachment(Model model, @P("projectId")@PathVariable("projectId") final Long projectId, @PathVariable Long organisationId, @PathVariable Long queryId, @RequestParam(value = "query_section", required = false) String querySection, @ModelAttribute(FORM_ATTR) FinanceChecksQueriesAddResponseForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @GetMapping("/{queryId}/new-response/attachment/{attachmentId}") @ResponseBody ResponseEntity<ByteArrayResource> downloadResponseAttachment(@P("projectId")@PathVariable Long projectId, @PathVariable Long organisationId, @PathVariable Long queryId, @PathVariable Long attachmentId, HttpServletRequest request); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @PostMapping(value = "/{queryId}/new-response", params = "removeAttachment") String removeAttachment(@P("projectId")@PathVariable Long projectId, @PathVariable Long organisationId, @PathVariable Long queryId, @RequestParam(value = "query_section", required = false) final String querySection, @RequestParam(value = "removeAttachment") final Long attachmentId, @ModelAttribute(FORM_ATTR) FinanceChecksQueriesAddResponseForm form, HttpServletRequest request, HttpServletResponse response); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @GetMapping("/{queryId}/new-response/cancel") String cancelNewForm(@P("projectId")@PathVariable Long projectId, @PathVariable Long organisationId, @PathVariable Long queryId, @RequestParam(value = "query_section", required = false) String querySection, HttpServletRequest request, HttpServletResponse response); }
@Test public void testSaveNewResponseAttachment() throws Exception { MockMultipartFile uploadedFile = new MockMultipartFile("attachment", "testFile.pdf", "application/pdf", "My content!".getBytes()); AttachmentResource attachment = new AttachmentResource(1L, "name", "mediaType", 2L, null); when(financeCheckServiceMock.uploadFile(projectId, "application/pdf", 11, "testFile.pdf", "My content!".getBytes())) .thenReturn(ServiceResult.serviceSuccess(attachment)); when(financeCheckServiceMock.getAttachment(1L)).thenReturn(ServiceResult.serviceSuccess(attachment)); ProjectFinanceResource projectFinanceResource = newProjectFinanceResource().withProject(projectId).withOrganisation(applicantOrganisationId).withId(projectFinanceId).build(); when(projectFinanceService.getProjectFinance(projectId, applicantOrganisationId)).thenReturn(projectFinanceResource); when(financeCheckServiceMock.getQueries(projectFinanceId)).thenReturn(ServiceResult.serviceSuccess(queries)); MvcResult result = mockMvc.perform( fileUpload("/project/" + projectId + "/finance-check/organisation/" + applicantOrganisationId + "/query/1/new-response"). file(uploadedFile). param("uploadAttachment", "")) .andExpect(cookie().exists("finance_checks_queries_new_response_attachments_"+projectId+"_"+applicantOrganisationId+"_"+1L)) .andExpect(redirectedUrl("/project/" + projectId + "/finance-check/organisation/" + applicantOrganisationId + "/query/" + queryId + "/new-response")) .andReturn(); List<Long> expectedAttachmentIds = new ArrayList<>(); expectedAttachmentIds.add(1L); assertEquals(URLEncoder.encode(JsonUtil.getSerializedObject(expectedAttachmentIds), CharEncoding.UTF_8), getDecryptedCookieValue(result.getResponse().getCookies(), "finance_checks_queries_new_response_attachments_" + projectId + "_" + applicantOrganisationId + "_" + queryId)); FinanceChecksQueriesAddResponseForm form = (FinanceChecksQueriesAddResponseForm) result.getModelAndView().getModel().get("form"); assertEquals(uploadedFile, form.getAttachment()); }
FinanceChecksQueriesController { @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @PostMapping(value = "/{queryId}/new-response", params = "removeAttachment") public String removeAttachment(@P("projectId")@PathVariable Long projectId, @PathVariable Long organisationId, @PathVariable Long queryId, @RequestParam(value = "query_section", required = false) final String querySection, @RequestParam(value = "removeAttachment") final Long attachmentId, @ModelAttribute(FORM_ATTR) FinanceChecksQueriesAddResponseForm form, HttpServletRequest request, HttpServletResponse response) { List<Long> attachments = loadAttachmentsFromCookie(request, projectId, organisationId, queryId); if (attachments.contains(attachmentId)) { financeCheckService.deleteFile(attachmentId).andOnSuccess(() -> attachments.remove(attachments.indexOf(attachmentId))); } saveAttachmentsToCookie(response, attachments, projectId, organisationId, queryId); saveFormToCookie(response, projectId, organisationId, queryId, form); return redirectTo(rootView(projectId, organisationId, queryId, querySection)); } @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @GetMapping String showPage(@P("projectId")@PathVariable Long projectId, @PathVariable Long organisationId, @RequestParam(value = "query_section", required = false) String querySection, Model model); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @PostMapping("/{queryId}/close") String closeQuery(@PathVariable Long projectId, @PathVariable Long organisationId, @PathVariable Long queryId, Model model); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @GetMapping("/attachment/{attachmentId}") @ResponseBody ResponseEntity<ByteArrayResource> downloadAttachment(@P("projectId")@PathVariable Long projectId, @PathVariable Long organisationId, @PathVariable Long attachmentId); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @GetMapping("/{queryId}/new-response") String viewNewResponse(@P("projectId")@PathVariable Long projectId, @PathVariable Long organisationId, @PathVariable Long queryId, @RequestParam(value = "query_section", required = false) String querySection, Model model, @ModelAttribute(name = "loggedInUser", binding = false) UserResource loggedInUser, HttpServletRequest request); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @PostMapping("/{queryId}/new-response") String saveResponse(Model model, @P("projectId")@PathVariable("projectId") final Long projectId, @PathVariable final Long organisationId, @PathVariable final Long queryId, @RequestParam(value = "query_section", required = false) String querySection, @Valid @ModelAttribute(FORM_ATTR) final FinanceChecksQueriesAddResponseForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, UserResource loggedInUser, HttpServletRequest request, HttpServletResponse response); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @PostMapping(value = "/{queryId}/new-response", params = "uploadAttachment") String saveNewResponseAttachment(Model model, @P("projectId")@PathVariable("projectId") final Long projectId, @PathVariable Long organisationId, @PathVariable Long queryId, @RequestParam(value = "query_section", required = false) String querySection, @ModelAttribute(FORM_ATTR) FinanceChecksQueriesAddResponseForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @GetMapping("/{queryId}/new-response/attachment/{attachmentId}") @ResponseBody ResponseEntity<ByteArrayResource> downloadResponseAttachment(@P("projectId")@PathVariable Long projectId, @PathVariable Long organisationId, @PathVariable Long queryId, @PathVariable Long attachmentId, HttpServletRequest request); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @PostMapping(value = "/{queryId}/new-response", params = "removeAttachment") String removeAttachment(@P("projectId")@PathVariable Long projectId, @PathVariable Long organisationId, @PathVariable Long queryId, @RequestParam(value = "query_section", required = false) final String querySection, @RequestParam(value = "removeAttachment") final Long attachmentId, @ModelAttribute(FORM_ATTR) FinanceChecksQueriesAddResponseForm form, HttpServletRequest request, HttpServletResponse response); @PreAuthorize("hasPermission(#projectId, 'org.innovateuk.ifs.project.resource.ProjectCompositeId', 'ACCESS_FINANCE_CHECKS_QUERIES_SECTION')") @GetMapping("/{queryId}/new-response/cancel") String cancelNewForm(@P("projectId")@PathVariable Long projectId, @PathVariable Long organisationId, @PathVariable Long queryId, @RequestParam(value = "query_section", required = false) String querySection, HttpServletRequest request, HttpServletResponse response); }
@Test public void testRemoveAttachment() throws Exception { ProjectFinanceResource projectFinanceResource = newProjectFinanceResource().withProject(projectId).withOrganisation(applicantOrganisationId).withId(projectFinanceId).build(); when(projectFinanceService.getProjectFinance(projectId, applicantOrganisationId)).thenReturn(projectFinanceResource); when(financeCheckServiceMock.getQueries(projectFinanceId)).thenReturn(ServiceResult.serviceSuccess(queries)); when(financeCheckServiceMock.deleteFile(1L)).thenReturn(ServiceResult.serviceSuccess()); List<Long> attachmentIds = new ArrayList<>(); attachmentIds.add(1L); Cookie cookie = createAttachmentsCookie(attachmentIds); MvcResult result = mockMvc.perform(post("/project/" + projectId + "/finance-check/organisation/" + applicantOrganisationId + "/query/"+ queryId + "/new-response?query_section=Eligibility") .param("removeAttachment", "1") .cookie(cookie) .contentType(MediaType.APPLICATION_FORM_URLENCODED) .param("response", "Query")) .andExpect(cookie().exists("finance_checks_queries_new_response_attachments_" + projectId + "_" + applicantOrganisationId + "_" + queryId)) .andExpect(cookie().exists("finance_checks_queries_new_response_form_" + projectId + "_" + applicantOrganisationId + "_" + queryId)) .andExpect(redirectedUrl("/project/" + projectId + "/finance-check/organisation/" + applicantOrganisationId + "/query/" + queryId + "/new-response?query_section=Eligibility")) .andReturn(); List<Long> expectedAttachmentIds = new ArrayList<>(); assertEquals(URLEncoder.encode(JsonUtil.getSerializedObject(expectedAttachmentIds), CharEncoding.UTF_8), getDecryptedCookieValue(result.getResponse().getCookies(), "finance_checks_queries_new_response_attachments_" + projectId + "_" + applicantOrganisationId + "_" + queryId)); FinanceChecksQueriesAddResponseForm expectedForm = new FinanceChecksQueriesAddResponseForm(); expectedForm.setResponse("Query"); assertEquals(URLEncoder.encode(JsonUtil.getSerializedObject(expectedForm), CharEncoding.UTF_8), getDecryptedCookieValue(result.getResponse().getCookies(), "finance_checks_queries_new_response_form_" + projectId + "_" + applicantOrganisationId + "_" + queryId)); verify(financeCheckServiceMock).deleteFile(1L); FinanceChecksQueriesAddResponseForm form = (FinanceChecksQueriesAddResponseForm) result.getModelAndView().getModel().get("form"); assertEquals("Query", form.getResponse()); assertEquals(null, form.getAttachment()); }
FinanceReviewerController { @GetMapping public String financeReviewer(@ModelAttribute(value = "form", binding = false) FinanceReviewerForm form, BindingResult bindingResult, @PathVariable long projectId, Model model) { model.addAttribute("model", new FinanceReviewerViewModel(projectRestService.getProjectById(projectId).getSuccess(), financeReviewerRestService.findFinanceUsers().getSuccess())); return "project/finance-reviewer"; } @GetMapping String financeReviewer(@ModelAttribute(value = "form", binding = false) FinanceReviewerForm form, BindingResult bindingResult, @PathVariable long projectId, Model model); @PostMapping String assignFinanceReviewer(@Valid @ModelAttribute(value = "form") FinanceReviewerForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable long projectId, @PathVariable long competitionId, Model model, RedirectAttributes redirectAttributes); }
@Test public void financeReviewer() throws Exception { long projectId = 1L; long competitionId = 2L; List<SimpleUserResource> users = newSimpleUserResource().build(1); ProjectResource project = newProjectResource() .withId(projectId) .withCompetition(competitionId) .withName("Project") .build(); when(financeReviewerRestService.findFinanceUsers()).thenReturn(restSuccess(users)); when(projectRestService.getProjectById(projectId)).thenReturn(restSuccess(project)); MvcResult result = mockMvc.perform(get("/competition/{competitionId}/project/{projectId}/finance-reviewer", competitionId, projectId)) .andExpect(status().isOk()) .andExpect(view().name("project/finance-reviewer")) .andReturn(); FinanceReviewerViewModel viewModel = (FinanceReviewerViewModel) result.getModelAndView().getModel().get("model"); assertEquals(viewModel.getCompetitionId(), competitionId); assertEquals(viewModel.getProjectId(), projectId); assertEquals(viewModel.getProjectName(), "Project"); assertEquals(viewModel.getUsers(), users); }
CompetitionStatusController { @SecuredBySpring(value = "TODO", description = "TODO") @GetMapping("/pending-spend-profiles") @PreAuthorize("hasAnyAuthority('project_finance')") public String viewPendingSpendProfiles(Model model, UserResource loggedInUser, @PathVariable Long competitionId) { long openQueryCount = competitionPostSubmissionRestService.getCompetitionOpenQueriesCount(competitionId).getSuccess(); List<SpendProfileStatusResource> pendingSpendProfiles = competitionPostSubmissionRestService.getPendingSpendProfiles(competitionId).getSuccess(); model.addAttribute(MODEL, new CompetitionPendingSpendProfilesViewModel(competitionRestService.getCompetitionById(competitionId).getSuccess(), pendingSpendProfiles, openQueryCount, pendingSpendProfiles.size(), true)); return "project/competition-pending-spend-profiles"; } @SecuredBySpring(value = "TODO", description = "TODO") @GetMapping @PreAuthorize("hasAnyAuthority('project_finance', 'comp_admin', 'support', 'innovation_lead', 'stakeholder', 'external_finance')") String viewCompetitionStatus(@PathVariable Long competitionId); @SecuredBySpring(value = "TODO", description = "TODO") @GetMapping("/all") @PreAuthorize("hasAnyAuthority('project_finance', 'comp_admin', 'support', 'innovation_lead', 'stakeholder', 'external_finance')") String viewCompetitionStatusAll(Model model, UserResource loggedInUser, @PathVariable Long competitionId, @RequestParam(name = "applicationSearchString", defaultValue = "") String applicationSearchString, @RequestParam(name = "page", defaultValue = "1") int page); @SecuredBySpring(value = "TODO", description = "TODO") @GetMapping("/queries") @PreAuthorize("hasAnyAuthority('project_finance')") String viewCompetitionStatusQueries(Model model, UserResource loggedInUser, @PathVariable Long competitionId); @SecuredBySpring(value = "TODO", description = "TODO") @GetMapping("/pending-spend-profiles") @PreAuthorize("hasAnyAuthority('project_finance')") String viewPendingSpendProfiles(Model model, UserResource loggedInUser, @PathVariable Long competitionId); @PreAuthorize("hasAuthority('project_finance')") @SecuredBySpring(value = "EXPORT_BANK_DETAILS", description = "Project finance users should be able export bank details") @GetMapping("/bank-details/export") void exportBankDetails(Model model, UserResource loggedInUser, @PathVariable Long competitionId, HttpServletResponse response); }
@Test public void viewPendingSpendProfiles() throws Exception { long competitionId = 123L; setLoggedInUser(newUserResource().withRolesGlobal(singletonList(Role.PROJECT_FINANCE)).build()); SpendProfileStatusResource pendingSpendProfile1 = new SpendProfileStatusResource(11L, 1L, "Project Name 1"); SpendProfileStatusResource pendingSpendProfile2 = new SpendProfileStatusResource(11L, 2L, "Project Name 2"); List<SpendProfileStatusResource> pendingSpendProfiles = asList(pendingSpendProfile1, pendingSpendProfile2); CompetitionResource competition = newCompetitionResource().withName("comp1").withId(123L).build(); when(competitionPostSubmissionRestService.getCompetitionOpenQueriesCount(competitionId)).thenReturn(restSuccess(4L)); when(competitionPostSubmissionRestService.getPendingSpendProfiles(competitionId)).thenReturn(restSuccess(pendingSpendProfiles)); when(competitionRestServiceMock.getCompetitionById(competitionId)).thenReturn(restSuccess(competition)); MvcResult result = mockMvc.perform(get("/competition/" + competitionId + "/status/pending-spend-profiles")) .andExpect(view().name("project/competition-pending-spend-profiles")) .andExpect(model().attribute("model", any(CompetitionPendingSpendProfilesViewModel.class))) .andReturn(); CompetitionPendingSpendProfilesViewModel viewModel = (CompetitionPendingSpendProfilesViewModel) result.getModelAndView().getModel().get("model"); assertEquals(123L, viewModel.getCompetitionId()); assertEquals("comp1", viewModel.getCompetitionName()); assertEquals(pendingSpendProfiles, viewModel.getPendingSpendProfiles()); assertEquals(4L, viewModel.getOpenQueryCount()); assertEquals(2, viewModel.getPendingSpendProfilesCount()); assertTrue(viewModel.isShowTabs()); }
CompetitionStatusController { @PreAuthorize("hasAuthority('project_finance')") @SecuredBySpring(value = "EXPORT_BANK_DETAILS", description = "Project finance users should be able export bank details") @GetMapping("/bank-details/export") public void exportBankDetails(Model model, UserResource loggedInUser, @PathVariable Long competitionId, HttpServletResponse response) throws IOException { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd_HH-mm"); String filename = String.format("Bank_details_%s_%s.csv", competitionId, ZonedDateTime.now().format(formatter)); response.setContentType("text/csv"); response.setHeader("Content-Transfer-Encoding", "binary"); response.setHeader("Content-Disposition", "attachment;filename=" + filename); final ByteArrayResource resource = bankDetailsRestService.downloadByCompetition(competitionId).getSuccess(); IOUtils.copy(resource.getInputStream(), response.getOutputStream()); response.flushBuffer(); } @SecuredBySpring(value = "TODO", description = "TODO") @GetMapping @PreAuthorize("hasAnyAuthority('project_finance', 'comp_admin', 'support', 'innovation_lead', 'stakeholder', 'external_finance')") String viewCompetitionStatus(@PathVariable Long competitionId); @SecuredBySpring(value = "TODO", description = "TODO") @GetMapping("/all") @PreAuthorize("hasAnyAuthority('project_finance', 'comp_admin', 'support', 'innovation_lead', 'stakeholder', 'external_finance')") String viewCompetitionStatusAll(Model model, UserResource loggedInUser, @PathVariable Long competitionId, @RequestParam(name = "applicationSearchString", defaultValue = "") String applicationSearchString, @RequestParam(name = "page", defaultValue = "1") int page); @SecuredBySpring(value = "TODO", description = "TODO") @GetMapping("/queries") @PreAuthorize("hasAnyAuthority('project_finance')") String viewCompetitionStatusQueries(Model model, UserResource loggedInUser, @PathVariable Long competitionId); @SecuredBySpring(value = "TODO", description = "TODO") @GetMapping("/pending-spend-profiles") @PreAuthorize("hasAnyAuthority('project_finance')") String viewPendingSpendProfiles(Model model, UserResource loggedInUser, @PathVariable Long competitionId); @PreAuthorize("hasAuthority('project_finance')") @SecuredBySpring(value = "EXPORT_BANK_DETAILS", description = "Project finance users should be able export bank details") @GetMapping("/bank-details/export") void exportBankDetails(Model model, UserResource loggedInUser, @PathVariable Long competitionId, HttpServletResponse response); }
@Test public void exportBankDetails() throws Exception { Long competitionId = 123L; ByteArrayResource result = new ByteArrayResource("My content!".getBytes()); when(bankDetailsRestServiceMock.downloadByCompetition(competitionId)).thenReturn(restSuccess(result)); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd_HH-mm"); mockMvc.perform(get("/competition/123/status/bank-details/export")) .andExpect(status().isOk()) .andExpect(content().contentType(("text/csv"))) .andExpect(header().string("Content-Type", "text/csv")) .andExpect(header().string("Content-disposition", "attachment;filename=" + String.format("Bank_details_%s_%s.csv", competitionId, ZonedDateTime.now().format(formatter)))) .andExpect(content().string("My content!")); verify(bankDetailsRestServiceMock).downloadByCompetition(123L); }
ProjectFinancePartnerFundingLevelViewModel { public boolean isTotalGrantZero() { return (totalGrant.compareTo(BigDecimal.ZERO) == 0); } ProjectFinancePartnerFundingLevelViewModel(long id, String name, boolean lead, int maximumFundingLevel, OrganisationSize organisationSize, BigDecimal costs, BigDecimal fundingLevel, BigDecimal otherFunding, BigDecimal totalGrant); long getId(); String getName(); BigDecimal getCosts(); int getMaximumFundingLevel(); BigDecimal getFundingLevel(); BigDecimal getOtherFunding(); BigDecimal getTotalGrant(); BigDecimal getFundingSought(); BigDecimal getPercentageOfTotalGrant(); BigDecimal calculateFundingSought(BigDecimal fundingLevel); BigDecimal calculatePercentageTotalGrant(BigDecimal calcFundingLevel); String getSubtitle(); boolean isTotalGrantZero(); }
@Test public void isTotalGrantZeroWithZeroTotalGrant() { ProjectFinancePartnerFundingLevelViewModel model = new ProjectFinancePartnerFundingLevelViewModel(1L, null, false, 0, null, BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ZERO, new BigDecimal("0")); assertTrue(model.isTotalGrantZero()); } @Test public void isTotalGrantZeroWithZeroWithScaleTotalGrant() { ProjectFinancePartnerFundingLevelViewModel model = new ProjectFinancePartnerFundingLevelViewModel(1L, null, false, 0, null, BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ZERO, new BigDecimal("0.00")); assertTrue(model.isTotalGrantZero()); } @Test public void isTotalGrantZeroWithNonZeroTotalGrant() { ProjectFinancePartnerFundingLevelViewModel model = new ProjectFinancePartnerFundingLevelViewModel(1L, null, false, 0, null, BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ZERO, new BigDecimal("1000")); assertFalse(model.isTotalGrantZero()); } @Test public void isTotalGrantZeroWithNonZeroWithScaleTotalGrant() { ProjectFinancePartnerFundingLevelViewModel model = new ProjectFinancePartnerFundingLevelViewModel(1L, null, false, 0, null, BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ZERO, new BigDecimal("1000.00")); assertFalse(model.isTotalGrantZero()); }
GoogleAnalyticsDataLayerController { @GetMapping("/assessment/{assessmentId}/competition-name") public RestResult<String> getCompetitionNameForAssessment(@PathVariable("assessmentId") long assessmentId) { return googleAnalyticsDataLayerService.getCompetitionNameByAssessmentId(assessmentId).toGetResponse(); } @GetMapping("/application/{applicationId}/competition-name") RestResult<String> getCompetitionNameForApplication(@PathVariable("applicationId") long applicationId); @GetMapping("/invite/{inviteHash}/competition-name") RestResult<String> getCompetitionNameForInvite(@PathVariable("inviteHash") String inviteHash); @GetMapping("/application/{applicationId}/user-roles") RestResult<List<Role>> getRolesByApplicationIdForCurrentUser(@PathVariable("applicationId") long applicationId); @GetMapping("/competition/{competitionId}/competition-name") RestResult<String> getCompetitionName(@PathVariable("competitionId") long competitionId); @GetMapping("/project/{projectId}/competition-name") RestResult<String> getCompetitionNameForProject(@PathVariable("projectId") long projectId); @GetMapping("/project/{projectId}/user-roles") RestResult<List<Role>> getRolesByProjectIdForCurrentUser(@PathVariable("projectId") long projectId); @GetMapping("/assessment/{assessmentId}/competition-name") RestResult<String> getCompetitionNameForAssessment(@PathVariable("assessmentId") long assessmentId); @GetMapping("/project/{projectId}/application-id") RestResult<Long> getApplicationIdForProject(@PathVariable("projectId") long projectId); @GetMapping("/assessment/{assessmentId}/application-id") RestResult<Long> getApplicationIdForAssessment(@PathVariable("assessmentId") long assessmentId); }
@Test public void getCompetitionNameForAssessment() throws Exception { final long assessmentId=7L; final String competitionName="Competition Name"; when(googleAnalyticsDataLayerServiceMock.getCompetitionNameByAssessmentId(assessmentId)) .thenReturn(serviceSuccess(competitionName)); mockMvc.perform(get("/analytics/assessment/{assessmentId}/competition-name", assessmentId)) .andExpect(status().isOk()) .andExpect(content().string(toJson(competitionName))); verify(googleAnalyticsDataLayerServiceMock, only()).getCompetitionNameByAssessmentId(assessmentId); }
ProjectFinanceFundingLevelController { @GetMapping public String viewFundingLevels(@ModelAttribute(name = "form", binding = false) ProjectFinanceFundingLevelForm form, @PathVariable long projectId, Model model, BindingResult bindingResult) { List<ProjectFinanceResource> projectFinances = projectFinanceRestService.getProjectFinances(projectId).getSuccess(); form.setPartners(projectFinances.stream() .collect(toMap(ProjectFinanceResource::getOrganisation, pf -> new ProjectFinancePartnerFundingLevelForm(pf.getGrantClaimPercentage())))); projectFinanceRestService.hasAnyProjectOrganisationSizeChangedFromApplication(projectId).andOnSuccess(() -> validateMaximumFundingLevels(bindingResult, projectFinances, form)); return viewFunding(projectId, projectFinances, model); } @GetMapping String viewFundingLevels(@ModelAttribute(name = "form", binding = false) ProjectFinanceFundingLevelForm form, @PathVariable long projectId, Model model, BindingResult bindingResult); @PostMapping String saveFundingLevels(@Valid @ModelAttribute("form") ProjectFinanceFundingLevelForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable long projectId, Model model, RedirectAttributes redirectAttributes); }
@Test public void viewFundingLevels() throws Exception { when(projectFinanceRestService.getProjectFinances(projectId)).thenReturn(restSuccess(asList(industrialFinances, academicFinances))); when(projectRestService.getProjectById(projectId)).thenReturn(restSuccess(project)); when(projectRestService.getLeadOrganisationByProject(projectId)).thenReturn(restSuccess(newOrganisationResource().withId(1L).build())); when(projectFinanceRestService.hasAnyProjectOrganisationSizeChangedFromApplication(projectId)).thenReturn(restSuccess(false)); when(competitionRestService.getCompetitionById(project.getCompetition())).thenReturn(restSuccess(competition)); when(applicationFinanceRestService.getFinanceTotals(project.getApplication())).thenReturn(restSuccess(asList(applicationIndustrialFinances, applicationAcademicFinances))); MvcResult result = mockMvc.perform(get("/project/{projectId}/funding-level", projectId)) .andExpect(status().isOk()) .andExpect(view().name("project/financecheck/funding-level")) .andReturn(); ProjectFinanceFundingLevelViewModel viewModel = (ProjectFinanceFundingLevelViewModel) result.getModelAndView().getModel().get("model"); BigDecimal totalGrant = industrialFinances.getTotalFundingSought().add(academicFinances.getTotalFundingSought()); assertEquals("Project", viewModel.getProjectName()); assertEquals(5L, viewModel.getApplicationId()); assertEquals(projectId, viewModel.getProjectId()); assertEquals(totalGrant.setScale(0, RoundingMode.HALF_UP), viewModel.getTotalFundingSought()); assertEquals(industrialFinances.getTotal().add(academicFinances.getTotal()), viewModel.getTotalCosts()); assertEquals(2, viewModel.getPartners().size()); ProjectFinancePartnerFundingLevelViewModel industrialViewModel = viewModel.getPartners().get(0); assertEquals(industrialOrganisation, industrialViewModel.getId()); assertEquals(60, industrialViewModel.getMaximumFundingLevel()); assertEquals(industrialFinances.getTotal(), industrialViewModel.getCosts()); assertEquals(industrialFinances.getTotalFundingSought().setScale(0, RoundingMode.HALF_UP), industrialViewModel.getFundingSought()); assertEquals(new BigDecimal("87.78"), industrialViewModel.getPercentageOfTotalGrant().setScale(MAX_DECIMAL_PLACES, RoundingMode.HALF_UP)); assertEquals(BigDecimal.ZERO, industrialViewModel.getOtherFunding()); assertEquals(totalGrant, industrialViewModel.getTotalGrant()); ProjectFinancePartnerFundingLevelViewModel academicViewModel = viewModel.getPartners().get(1); assertEquals(academicOrganisation, academicViewModel.getId()); assertEquals(100, academicViewModel.getMaximumFundingLevel()); assertEquals(academicFinances.getTotal(), academicViewModel.getCosts()); assertEquals(academicFinances.getTotalFundingSought(), academicViewModel.getFundingSought()); assertEquals(new BigDecimal("12.22"), academicViewModel.getPercentageOfTotalGrant().setScale(MAX_DECIMAL_PLACES, RoundingMode.HALF_UP)); assertEquals(BigDecimal.ZERO, academicViewModel.getOtherFunding()); assertEquals(totalGrant, academicViewModel.getTotalGrant()); }
ProjectFinanceFundingSoughtController { @GetMapping public String viewFundingLevels(@ModelAttribute(name = "form", binding = false) ProjectFinanceFundingSoughtForm form, @PathVariable long projectId, Model model) { List<ProjectFinanceResource> finances = projectFinanceRestService.getProjectFinances(projectId).getSuccess(); form.setPartners(finances.stream() .collect(toMap(ProjectFinanceResource::getOrganisation, pf -> new ProjectFinancePartnerFundingSoughtForm(pf.getTotalFundingSought())))); return viewFunding(projectId, finances, model); } @GetMapping String viewFundingLevels(@ModelAttribute(name = "form", binding = false) ProjectFinanceFundingSoughtForm form, @PathVariable long projectId, Model model); @PostMapping String saveFundingLevels(@Valid @ModelAttribute("form") ProjectFinanceFundingSoughtForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable long projectId, Model model, RedirectAttributes redirectAttributes); }
@Test public void viewFundingLevels() throws Exception { when(projectFinanceRestService.getProjectFinances(projectId)).thenReturn(restSuccess(asList(industrialFinances, academicFinances))); when(projectRestService.getProjectById(projectId)).thenReturn(restSuccess(project)); MvcResult result = mockMvc.perform(get("/project/{projectId}/funding-sought", projectId)) .andExpect(status().isOk()) .andExpect(view().name("project/financecheck/funding-sought")) .andReturn(); ProjectFinanceFundingSoughtViewModel viewModel = (ProjectFinanceFundingSoughtViewModel) result.getModelAndView().getModel().get("model"); BigDecimal totalGrant = industrialFinances.getTotalFundingSought().add(academicFinances.getTotalFundingSought()); assertEquals("Project", viewModel.getProjectName()); assertEquals(5L, viewModel.getApplicationId()); assertEquals(projectId, viewModel.getProjectId()); assertEquals(2, viewModel.getPartners().size()); ProjectFinancePartnerFundingSoughtViewModel industrialViewModel = viewModel.getPartners().get(0); assertEquals(industrialOrganisation, industrialViewModel.getId()); ProjectFinancePartnerFundingSoughtViewModel academicViewModel = viewModel.getPartners().get(1); assertEquals(academicOrganisation, academicViewModel.getId()); }
ProjectPartnerController { @GetMapping public String inviteProjectPartnerForm(@ModelAttribute(value = "form", binding = false) ProjectPartnerInviteForm form, BindingResult bindingResult, @PathVariable long projectId, Model model) { ProjectResource project = projectRestService.getProjectById(projectId).getSuccess(); model.addAttribute("model", new ProjectPartnerInviteViewModel(project)); return "project/project-partner-invite"; } @GetMapping String inviteProjectPartnerForm(@ModelAttribute(value = "form", binding = false) ProjectPartnerInviteForm form, BindingResult bindingResult, @PathVariable long projectId, Model model); @PostMapping String inviteProjectPartner(@Valid @ModelAttribute(value = "form") ProjectPartnerInviteForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable long competitionId, @PathVariable long projectId, Model model); }
@Test public void inviteProjectPartnerForm() throws Exception { long projectId = 999L; long competitionId = 888L; long applicationId = 444L; ProjectResource project = newProjectResource() .withId(projectId) .withCompetition(competitionId) .withApplication(applicationId) .withName("project") .build(); when(projectRestService.getProjectById(projectId)).thenReturn(restSuccess(project)); ProjectPartnerInviteViewModel expected = new ProjectPartnerInviteViewModel(project); MvcResult result = mockMvc.perform(get("/competition/{compId}/project/{projectId}/team/partner", competitionId, projectId)) .andExpect(status().isOk()) .andExpect(view().name("project/project-partner-invite")) .andReturn(); ProjectPartnerInviteViewModel actual = (ProjectPartnerInviteViewModel) result.getModelAndView().getModel().get("model"); assertEquals(expected, actual); }
ProjectPartnerController { @PostMapping public String inviteProjectPartner(@Valid @ModelAttribute(value = "form") ProjectPartnerInviteForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable long competitionId, @PathVariable long projectId, Model model) { Supplier<String> success = () -> String.format("redirect:/competition/%d/project/%d/team", competitionId, projectId); Supplier<String> failure = () -> inviteProjectPartnerForm(form, bindingResult, projectId, model); return validationHandler.failNowOrSucceedWith(failure, () -> { validationHandler.addAnyErrors( projectPartnerInviteRestService.invitePartnerOrganisation(projectId, new SendProjectPartnerInviteResource(form.getOrganisationName(), form.getUserName(), form.getEmail()))); return validationHandler.failNowOrSucceedWith(failure, success); }); } @GetMapping String inviteProjectPartnerForm(@ModelAttribute(value = "form", binding = false) ProjectPartnerInviteForm form, BindingResult bindingResult, @PathVariable long projectId, Model model); @PostMapping String inviteProjectPartner(@Valid @ModelAttribute(value = "form") ProjectPartnerInviteForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable long competitionId, @PathVariable long projectId, Model model); }
@Test public void inviteProjectPartner() throws Exception { long projectId = 999L; long competitionId = 888L; SendProjectPartnerInviteResource invite = new SendProjectPartnerInviteResource("org", "name", "[email protected]"); when(projectPartnerInviteRestService.invitePartnerOrganisation(projectId, invite)).thenReturn(restSuccess()); mockMvc.perform(post("/competition/{compId}/project/{projectId}/team/partner", competitionId, projectId) .param("organisationName", "org") .param("userName", "name") .param("email", "[email protected]")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl("/competition/888/project/999/team")); verify(projectPartnerInviteRestService).invitePartnerOrganisation(projectId, invite); }