src_fm_fc_ms_ff
stringlengths 43
86.8k
| target
stringlengths 20
276k
|
|---|---|
AssessorProfileDeclarationEditController { @PostMapping(path = "/edit", params = {"removeAppointment"}) public String removeAppointment(@ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form, @RequestParam(name = "removeAppointment") Integer position) { form.getAppointments().remove(position.intValue()); return doEditDeclaration(); } @GetMapping String getDeclaration(); @GetMapping(path = "/edit") String getEditDeclaration(UserResource loggedInUser,
@ModelAttribute(name = FORM_ATTR_NAME, binding = false) AssessorProfileDeclarationForm form,
BindingResult bindingResult); @PostMapping(path = "/edit") String submitDeclaration(UserResource loggedInUser,
@Valid @ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(path = "/edit", params = {"addAppointment"}) String addAppointment(@ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form); @PostMapping(path = "/edit", params = {"removeAppointment"}) String removeAppointment(@ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form,
@RequestParam(name = "removeAppointment") Integer position); @PostMapping(path = "/edit", params = {"addFamilyMemberAffiliation"}) String addFamilyMemberAffiliation(@ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form); @PostMapping(path = "/edit", params = {"removeFamilyMemberAffiliation"}) String removeFamilyMemberAffiliation(@ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form,
@RequestParam(name = "removeFamilyMemberAffiliation") Integer position); } | @Test public void removeAppointment() throws Exception { UserResource user = newUserResource().build(); setLoggedInUser(user); String principalEmployer = "Big Name Corporation"; String role = "Financial Accountant"; String professionalAffiliations = "Professional affiliations..."; String hasAppointments = "true"; String hasFinancialInterests = "true"; String financialInterests = "Other financial interests..."; String hasFamilyAffiliations = "false"; String hasFamilyFinancialInterests = "true"; String familyFinancialInterests = "Other family financial interests..."; MvcResult result = mockMvc.perform(post("/profile/declaration/edit") .contentType(APPLICATION_FORM_URLENCODED) .param("removeAppointment", "0") .param("principalEmployer", principalEmployer) .param("role", role) .param("professionalAffiliations", professionalAffiliations) .param("hasAppointments", hasAppointments) .param("appointments[0].organisation", "Org") .param("appointments[0].position", "Pos") .param("hasFinancialInterests", hasFinancialInterests) .param("financialInterests", financialInterests) .param("hasFamilyAffiliations", hasFamilyAffiliations) .param("hasFamilyFinancialInterests", hasFamilyFinancialInterests) .param("familyFinancialInterests", familyFinancialInterests)) .andExpect(status().isOk()) .andExpect(model().hasNoErrors()) .andExpect(model().attributeExists("form")) .andExpect(view().name("profile/declaration-of-interest-edit")) .andReturn(); AssessorProfileDeclarationForm form = (AssessorProfileDeclarationForm) result.getModelAndView().getModel().get("form"); assertEquals(principalEmployer, form.getPrincipalEmployer()); assertEquals(role, form.getRole()); assertEquals(professionalAffiliations, form.getProfessionalAffiliations()); assertTrue(form.getHasAppointments()); assertTrue("The list of appointments should be empty", form.getAppointments().isEmpty()); assertTrue(form.getHasFinancialInterests()); assertEquals(financialInterests, form.getFinancialInterests()); assertFalse(form.getHasFamilyAffiliations()); assertTrue(form.getFamilyAffiliations().isEmpty()); assertTrue(form.getHasFamilyFinancialInterests()); assertEquals(familyFinancialInterests, form.getFamilyFinancialInterests()); verifyZeroInteractions(userService); } |
AssessorProfileDeclarationEditController { @PostMapping(path = "/edit", params = {"addFamilyMemberAffiliation"}) public String addFamilyMemberAffiliation(@ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form) { form.getFamilyAffiliations().add(new AssessorProfileFamilyAffiliationForm()); return doEditDeclaration(); } @GetMapping String getDeclaration(); @GetMapping(path = "/edit") String getEditDeclaration(UserResource loggedInUser,
@ModelAttribute(name = FORM_ATTR_NAME, binding = false) AssessorProfileDeclarationForm form,
BindingResult bindingResult); @PostMapping(path = "/edit") String submitDeclaration(UserResource loggedInUser,
@Valid @ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(path = "/edit", params = {"addAppointment"}) String addAppointment(@ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form); @PostMapping(path = "/edit", params = {"removeAppointment"}) String removeAppointment(@ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form,
@RequestParam(name = "removeAppointment") Integer position); @PostMapping(path = "/edit", params = {"addFamilyMemberAffiliation"}) String addFamilyMemberAffiliation(@ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form); @PostMapping(path = "/edit", params = {"removeFamilyMemberAffiliation"}) String removeFamilyMemberAffiliation(@ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form,
@RequestParam(name = "removeFamilyMemberAffiliation") Integer position); } | @Test public void addFamilyMemberAffiliation() throws Exception { UserResource user = newUserResource().build(); setLoggedInUser(user); String principalEmployer = "Big Name Corporation"; String role = "Financial Accountant"; String professionalAffiliations = "Professional affiliations..."; String hasAppointments = "false"; String hasFinancialInterests = "true"; String financialInterests = "Other financial interests..."; String hasFamilyAffiliations = "true"; String hasFamilyFinancialInterests = "true"; String familyFinancialInterests = "Other family financial interests..."; MvcResult result = mockMvc.perform(post("/profile/declaration/edit") .contentType(APPLICATION_FORM_URLENCODED) .param("addFamilyMemberAffiliation", "") .param("principalEmployer", principalEmployer) .param("role", role) .param("professionalAffiliations", professionalAffiliations) .param("hasAppointments", hasAppointments) .param("hasFinancialInterests", hasFinancialInterests) .param("financialInterests", financialInterests) .param("hasFamilyAffiliations", hasFamilyAffiliations) .param("familyAffiliations[0].relation", "Relation") .param("familyAffiliations[0].organisation", "Org") .param("familyAffiliations[0].position", "Pos") .param("hasFamilyFinancialInterests", hasFamilyFinancialInterests) .param("familyFinancialInterests", familyFinancialInterests)) .andExpect(status().isOk()) .andExpect(model().hasNoErrors()) .andExpect(model().attributeExists("form")) .andExpect(view().name("profile/declaration-of-interest-edit")) .andReturn(); AssessorProfileDeclarationForm form = (AssessorProfileDeclarationForm) result.getModelAndView().getModel().get("form"); assertEquals(principalEmployer, form.getPrincipalEmployer()); assertEquals(role, form.getRole()); assertEquals(professionalAffiliations, form.getProfessionalAffiliations()); assertFalse(form.getHasAppointments()); assertTrue(form.getAppointments().isEmpty()); assertTrue(form.getHasFinancialInterests()); assertEquals(financialInterests, form.getFinancialInterests()); assertTrue(form.getHasFamilyAffiliations()); assertEquals("The family affiliation rows should contain the existing appointment as well as a blank one", asList(new AssessorProfileFamilyAffiliationForm("Relation", "Org", "Pos"), new AssessorProfileFamilyAffiliationForm()), form.getFamilyAffiliations()); assertTrue(form.getHasFamilyFinancialInterests()); assertEquals(familyFinancialInterests, form.getFamilyFinancialInterests()); verifyZeroInteractions(userService); } |
AssessorProfileDeclarationEditController { @PostMapping(path = "/edit", params = {"removeFamilyMemberAffiliation"}) public String removeFamilyMemberAffiliation(@ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form, @RequestParam(name = "removeFamilyMemberAffiliation") Integer position) { form.getFamilyAffiliations().remove(position.intValue()); return doEditDeclaration(); } @GetMapping String getDeclaration(); @GetMapping(path = "/edit") String getEditDeclaration(UserResource loggedInUser,
@ModelAttribute(name = FORM_ATTR_NAME, binding = false) AssessorProfileDeclarationForm form,
BindingResult bindingResult); @PostMapping(path = "/edit") String submitDeclaration(UserResource loggedInUser,
@Valid @ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping(path = "/edit", params = {"addAppointment"}) String addAppointment(@ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form); @PostMapping(path = "/edit", params = {"removeAppointment"}) String removeAppointment(@ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form,
@RequestParam(name = "removeAppointment") Integer position); @PostMapping(path = "/edit", params = {"addFamilyMemberAffiliation"}) String addFamilyMemberAffiliation(@ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form); @PostMapping(path = "/edit", params = {"removeFamilyMemberAffiliation"}) String removeFamilyMemberAffiliation(@ModelAttribute(FORM_ATTR_NAME) AssessorProfileDeclarationForm form,
@RequestParam(name = "removeFamilyMemberAffiliation") Integer position); } | @Test public void removeFamilyMemberAffiliation() throws Exception { UserResource user = newUserResource().build(); setLoggedInUser(user); String principalEmployer = "Big Name Corporation"; String role = "Financial Accountant"; String professionalAffiliations = "Professional affiliations..."; String hasAppointments = "false"; String hasFinancialInterests = "true"; String financialInterests = "Other financial interests..."; String hasFamilyAffiliations = "true"; String hasFamilyFinancialInterests = "true"; String familyFinancialInterests = "Other family financial interests..."; MvcResult result = mockMvc.perform(post("/profile/declaration/edit") .contentType(APPLICATION_FORM_URLENCODED) .param("removeFamilyMemberAffiliation", "0") .param("principalEmployer", principalEmployer) .param("role", role) .param("professionalAffiliations", professionalAffiliations) .param("hasAppointments", hasAppointments) .param("hasFinancialInterests", hasFinancialInterests) .param("financialInterests", financialInterests) .param("hasFamilyAffiliations", hasFamilyAffiliations) .param("familyAffiliations[0].relation", "Relation") .param("familyAffiliations[0].organisation", "Org") .param("familyAffiliations[0].position", "Pos") .param("hasFamilyFinancialInterests", hasFamilyFinancialInterests) .param("familyFinancialInterests", familyFinancialInterests)) .andExpect(status().isOk()) .andExpect(model().hasNoErrors()) .andExpect(model().attributeExists("form")) .andExpect(view().name("profile/declaration-of-interest-edit")) .andReturn(); AssessorProfileDeclarationForm form = (AssessorProfileDeclarationForm) result.getModelAndView().getModel().get("form"); assertEquals(principalEmployer, form.getPrincipalEmployer()); assertEquals(role, form.getRole()); assertEquals(professionalAffiliations, form.getProfessionalAffiliations()); assertFalse(form.getHasAppointments()); assertTrue(form.getAppointments().isEmpty()); assertTrue(form.getHasFinancialInterests()); assertEquals(financialInterests, form.getFinancialInterests()); assertTrue(form.getHasFamilyAffiliations()); assertTrue("The list of family affiliation rows should be empty", form.getFamilyAffiliations().isEmpty()); assertTrue(form.getHasFamilyFinancialInterests()); assertEquals(familyFinancialInterests, form.getFamilyFinancialInterests()); verifyZeroInteractions(userService); } |
AssessorProfileAgreementController { @GetMapping public String getAgreement(Model model, UserResource loggedInUser) { ProfileAgreementResource profileAgreementResource = profileRestService.getProfileAgreement(loggedInUser.getId()).getSuccess(); return doViewAgreement(model, profileAgreementResource); } @GetMapping String getAgreement(Model model,
UserResource loggedInUser); @PostMapping String submitAgreement(Model model,
UserResource loggedInUser); } | @Test public void getAgreement() throws Exception { UserResource user = newUserResource().build(); setLoggedInUser(user); ZonedDateTime expectedAgreementSignedDate = ZonedDateTime.now(); String expectedText = "Agreement text..."; ProfileAgreementResource profileAgreementResource = newProfileAgreementResource() .withAgreementSignedDate(expectedAgreementSignedDate) .withCurrentAgreement(true) .withAgreement(newAgreementResource() .withText(expectedText) .build()) .build(); when(profileRestService.getProfileAgreement(user.getId())).thenReturn(restSuccess(profileAgreementResource)); AssessorProfileAgreementViewModel expectedViewModel = new AssessorProfileAgreementViewModel(); expectedViewModel.setCurrentAgreement(true); expectedViewModel.setAgreementSignedDate(expectedAgreementSignedDate); expectedViewModel.setText(expectedText); mockMvc.perform(get("/profile/agreement")) .andExpect(status().isOk()) .andExpect(model().hasNoErrors()) .andExpect(model().attribute("model", expectedViewModel)) .andExpect(view().name("profile/agreement")); verify(profileRestService, only()).getProfileAgreement(user.getId()); } |
AssessorProfileAgreementController { @PostMapping public String submitAgreement(Model model, UserResource loggedInUser) { profileRestService.updateProfileAgreement(loggedInUser.getId()).getSuccess(); return "redirect:/assessor/dashboard"; } @GetMapping String getAgreement(Model model,
UserResource loggedInUser); @PostMapping String submitAgreement(Model model,
UserResource loggedInUser); } | @Test public void submitAgreement() throws Exception { UserResource user = newUserResource().build(); setLoggedInUser(user); when(profileRestService.updateProfileAgreement(user.getId())).thenReturn(restSuccess()); mockMvc.perform(post("/profile/agreement") .contentType(APPLICATION_FORM_URLENCODED) .param("agreesToTerms", "true")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl("/assessor/dashboard")); verify(profileRestService, only()).updateProfileAgreement(user.getId()); } |
SectionServiceImpl extends BaseTransactionalService implements SectionService { @Override public ServiceResult<SectionResource> getNextSection(final Long sectionId) { return getSection(sectionId).andOnSuccessReturn(sectionMapper::mapToResource).andOnSuccess(this::getNextSection); } @Override ServiceResult<SectionResource> getById(final Long sectionId); @Override ServiceResult<Set<Long>> getQuestionsForSectionAndSubsections(final Long sectionId); @Override ServiceResult<List<SectionResource>> getSectionsByCompetitionIdAndType(final long competitionId, final SectionType type); @Override ServiceResult<SectionResource> getNextSection(final Long sectionId); @Override ServiceResult<SectionResource> getNextSection(SectionResource section); @Override ServiceResult<SectionResource> getPreviousSection(final Long sectionId); @Override ServiceResult<SectionResource> getPreviousSection(SectionResource section); @Override ServiceResult<SectionResource> getSectionByQuestionId(final Long questionId); @Override @Cacheable(cacheNames="sectionsByCompetition", key = "T(java.lang.String).format('sectionsByCompetition:%d', #competitionId)", unless = "!T(org.innovateuk.ifs.cache.CacheHelper).cacheResultIfCompetitionIsOpen(#result)") ServiceResult<List<SectionResource>> getByCompetitionId(final Long competitionId); @Override ServiceResult<List<SectionResource>> getByCompetitionIdVisibleForAssessment(Long competitionId); @Override ServiceResult<List<SectionResource>> getChildSectionsByParentId(long parentId); } | @Test public void getNextSectionTest() throws Exception { Section section = newSection().withCompetitionAndPriority(newCompetition().build(), 1).build(); Section nextSection = newSection().build(); SectionResource nextSectionResource = newSectionResource().build(); when(sectionRepositoryMock.findById(anyLong())).thenReturn(Optional.of(section)); when(sectionRepositoryMock.findFirstByCompetitionIdAndPriorityGreaterThanAndParentSectionIsNullOrderByPriorityAsc( nullable(Long.class), nullable(Integer.class) )).thenReturn(nextSection); when(sectionMapper.mapToResource(any(Section.class))).thenReturn(nextSectionResource); SectionResource returnSection = sectionService.getNextSection(section.getId()).getSuccess(); assertEquals(nextSectionResource, returnSection); }
@Test public void getNextSectionWithParentSectionTest() throws Exception { Section parentSection = newSection().build(); Section section = newSection().withCompetitionAndPriorityAndParent(newCompetition().build(), 1, parentSection).build(); Section siblingSection = newSection().withCompetitionAndPriorityAndParent(newCompetition().build(), 2, parentSection).build(); SectionResource siblingSectionResource = newSectionResource().withCompetitionAndPriorityAndParent(newCompetition().build().getId(), 2, parentSection.getId()).build(); when(sectionRepositoryMock.findById(section.getId())).thenReturn(Optional.of(section)); when(sectionRepositoryMock.findFirstByCompetitionIdAndParentSectionIdAndPriorityGreaterThanAndQuestionGroupTrueOrderByPriorityAsc( anyLong(), anyLong(), anyInt() )).thenReturn(siblingSection); when(sectionMapper.mapToResource(any(Section.class))).thenReturn(siblingSectionResource); SectionResource returnSection = sectionService.getNextSection(section.getId()).getSuccess(); assertEquals(siblingSectionResource, returnSection); } |
AssessmentServiceImpl implements AssessmentService { @Override public AssessmentResource getById(Long id) { return assessmentRestService.getById(id).getSuccess(); } @Override AssessmentResource getById(Long id); @Override AssessmentResource getAssignableById(Long id); @Override AssessmentResource getRejectableById(Long id); @Override List<AssessmentResource> getByUserAndCompetition(Long userId, Long competitionId); @Override AssessmentTotalScoreResource getTotalScore(Long assessmentId); @Override ServiceResult<Void> recommend(Long assessmentId, Boolean fundingConfirmation, String feedback, String comment); @Override ServiceResult<Void> rejectInvitation(Long assessmentId, AssessmentRejectOutcomeValue reason, String comment); @Override ServiceResult<Void> acceptInvitation(Long assessmentId); @Override ServiceResult<Void> submitAssessments(List<Long> assessmentIds); } | @Test public void getById() throws Exception { AssessmentResource expected = newAssessmentResource() .build(); Long assessmentId = 1L; when(assessmentRestService.getById(assessmentId)).thenReturn(restSuccess(expected)); assertSame(expected, service.getById(assessmentId)); verify(assessmentRestService, only()).getById(assessmentId); } |
AssessmentServiceImpl implements AssessmentService { @Override public AssessmentResource getAssignableById(Long id) { return assessmentRestService.getAssignableById(id).getSuccess(); } @Override AssessmentResource getById(Long id); @Override AssessmentResource getAssignableById(Long id); @Override AssessmentResource getRejectableById(Long id); @Override List<AssessmentResource> getByUserAndCompetition(Long userId, Long competitionId); @Override AssessmentTotalScoreResource getTotalScore(Long assessmentId); @Override ServiceResult<Void> recommend(Long assessmentId, Boolean fundingConfirmation, String feedback, String comment); @Override ServiceResult<Void> rejectInvitation(Long assessmentId, AssessmentRejectOutcomeValue reason, String comment); @Override ServiceResult<Void> acceptInvitation(Long assessmentId); @Override ServiceResult<Void> submitAssessments(List<Long> assessmentIds); } | @Test public void getAssignableById() throws Exception { AssessmentResource expected = newAssessmentResource().build(); Long assessmentId = 1L; when(assessmentRestService.getAssignableById(assessmentId)).thenReturn(restSuccess(expected)); assertSame(expected, service.getAssignableById(assessmentId)); verify(assessmentRestService, only()).getAssignableById(assessmentId); } |
AssessmentServiceImpl implements AssessmentService { @Override public AssessmentResource getRejectableById(Long id) { return assessmentRestService.getRejectableById(id).getSuccess(); } @Override AssessmentResource getById(Long id); @Override AssessmentResource getAssignableById(Long id); @Override AssessmentResource getRejectableById(Long id); @Override List<AssessmentResource> getByUserAndCompetition(Long userId, Long competitionId); @Override AssessmentTotalScoreResource getTotalScore(Long assessmentId); @Override ServiceResult<Void> recommend(Long assessmentId, Boolean fundingConfirmation, String feedback, String comment); @Override ServiceResult<Void> rejectInvitation(Long assessmentId, AssessmentRejectOutcomeValue reason, String comment); @Override ServiceResult<Void> acceptInvitation(Long assessmentId); @Override ServiceResult<Void> submitAssessments(List<Long> assessmentIds); } | @Test public void getRejectableById() throws Exception { AssessmentResource expected = newAssessmentResource().build(); Long assessmentId = 1L; when(assessmentRestService.getRejectableById(assessmentId)).thenReturn(restSuccess(expected)); assertSame(expected, service.getRejectableById(assessmentId)); verify(assessmentRestService, only()).getRejectableById(assessmentId); } |
AssessmentServiceImpl implements AssessmentService { @Override public List<AssessmentResource> getByUserAndCompetition(Long userId, Long competitionId) { return assessmentRestService.getByUserAndCompetition(userId, competitionId).getSuccess(); } @Override AssessmentResource getById(Long id); @Override AssessmentResource getAssignableById(Long id); @Override AssessmentResource getRejectableById(Long id); @Override List<AssessmentResource> getByUserAndCompetition(Long userId, Long competitionId); @Override AssessmentTotalScoreResource getTotalScore(Long assessmentId); @Override ServiceResult<Void> recommend(Long assessmentId, Boolean fundingConfirmation, String feedback, String comment); @Override ServiceResult<Void> rejectInvitation(Long assessmentId, AssessmentRejectOutcomeValue reason, String comment); @Override ServiceResult<Void> acceptInvitation(Long assessmentId); @Override ServiceResult<Void> submitAssessments(List<Long> assessmentIds); } | @Test public void getByUserAndCompetition() throws Exception { List<AssessmentResource> expected = newAssessmentResource().build(2); Long userId = 1L; Long competitionId = 2L; when(assessmentRestService.getByUserAndCompetition(userId, competitionId)).thenReturn(restSuccess(expected)); assertSame(expected, service.getByUserAndCompetition(userId, competitionId)); verify(assessmentRestService, only()).getByUserAndCompetition(userId, competitionId); } |
AssessmentServiceImpl implements AssessmentService { @Override public AssessmentTotalScoreResource getTotalScore(Long assessmentId) { return assessmentRestService.getTotalScore(assessmentId).getSuccess(); } @Override AssessmentResource getById(Long id); @Override AssessmentResource getAssignableById(Long id); @Override AssessmentResource getRejectableById(Long id); @Override List<AssessmentResource> getByUserAndCompetition(Long userId, Long competitionId); @Override AssessmentTotalScoreResource getTotalScore(Long assessmentId); @Override ServiceResult<Void> recommend(Long assessmentId, Boolean fundingConfirmation, String feedback, String comment); @Override ServiceResult<Void> rejectInvitation(Long assessmentId, AssessmentRejectOutcomeValue reason, String comment); @Override ServiceResult<Void> acceptInvitation(Long assessmentId); @Override ServiceResult<Void> submitAssessments(List<Long> assessmentIds); } | @Test public void getTotalScore() throws Exception { AssessmentTotalScoreResource expected = newAssessmentTotalScoreResource().build(); Long assessmentId = 1L; when(assessmentRestService.getTotalScore(assessmentId)).thenReturn(restSuccess(expected)); assertSame(expected, service.getTotalScore(assessmentId)); verify(assessmentRestService, only()).getTotalScore(assessmentId); } |
AssessmentServiceImpl implements AssessmentService { @Override public ServiceResult<Void> recommend(Long assessmentId, Boolean fundingConfirmation, String feedback, String comment) { return assessmentRestService.recommend(assessmentId, new AssessmentFundingDecisionOutcomeResourceBuilder() .setFundingConfirmation(fundingConfirmation) .setFeedback(feedback) .setComment(comment) .createAssessmentFundingDecisionResource()).toServiceResult(); } @Override AssessmentResource getById(Long id); @Override AssessmentResource getAssignableById(Long id); @Override AssessmentResource getRejectableById(Long id); @Override List<AssessmentResource> getByUserAndCompetition(Long userId, Long competitionId); @Override AssessmentTotalScoreResource getTotalScore(Long assessmentId); @Override ServiceResult<Void> recommend(Long assessmentId, Boolean fundingConfirmation, String feedback, String comment); @Override ServiceResult<Void> rejectInvitation(Long assessmentId, AssessmentRejectOutcomeValue reason, String comment); @Override ServiceResult<Void> acceptInvitation(Long assessmentId); @Override ServiceResult<Void> submitAssessments(List<Long> assessmentIds); } | @Test public void recommend() throws Exception { Long assessmentId = 1L; String feedback = "feedback for decision"; String comment = "comment for decision"; AssessmentFundingDecisionOutcomeResource assessmentFundingDecisionOutcomeResource = newAssessmentFundingDecisionOutcomeResource() .withFundingConfirmation(TRUE) .withFeedback(feedback) .withComment(comment) .build(); when(assessmentRestService.recommend(assessmentId, assessmentFundingDecisionOutcomeResource)).thenReturn(restSuccess()); ServiceResult<Void> response = service.recommend(assessmentId, TRUE, feedback, comment); assertTrue(response.isSuccess()); verify(assessmentRestService, only()).recommend(assessmentId, assessmentFundingDecisionOutcomeResource); } |
AssessmentServiceImpl implements AssessmentService { @Override public ServiceResult<Void> rejectInvitation(Long assessmentId, AssessmentRejectOutcomeValue reason, String comment) { AssessmentRejectOutcomeResource assessmentRejectOutcomeResource = new AssessmentRejectOutcomeResource(); assessmentRejectOutcomeResource.setRejectReason(reason); assessmentRejectOutcomeResource.setRejectComment(comment); return assessmentRestService.rejectInvitation(assessmentId, assessmentRejectOutcomeResource).toServiceResult(); } @Override AssessmentResource getById(Long id); @Override AssessmentResource getAssignableById(Long id); @Override AssessmentResource getRejectableById(Long id); @Override List<AssessmentResource> getByUserAndCompetition(Long userId, Long competitionId); @Override AssessmentTotalScoreResource getTotalScore(Long assessmentId); @Override ServiceResult<Void> recommend(Long assessmentId, Boolean fundingConfirmation, String feedback, String comment); @Override ServiceResult<Void> rejectInvitation(Long assessmentId, AssessmentRejectOutcomeValue reason, String comment); @Override ServiceResult<Void> acceptInvitation(Long assessmentId); @Override ServiceResult<Void> submitAssessments(List<Long> assessmentIds); } | @Test public void rejectInvitation() throws Exception { Long assessmentId = 1L; AssessmentRejectOutcomeValue reason = CONFLICT_OF_INTEREST; String comment = "comment for rejection"; AssessmentRejectOutcomeResource assessmentRejectOutcomeResource = newAssessmentRejectOutcomeResource() .withRejectReason(reason) .withRejectComment(comment) .build(); when(assessmentRestService.rejectInvitation(assessmentId, assessmentRejectOutcomeResource)).thenReturn(restSuccess()); ServiceResult<Void> response = service.rejectInvitation(assessmentId, reason, comment); assertTrue(response.isSuccess()); verify(assessmentRestService, only()).rejectInvitation(assessmentId, assessmentRejectOutcomeResource); } |
AssessmentServiceImpl implements AssessmentService { @Override public ServiceResult<Void> acceptInvitation(Long assessmentId) { return assessmentRestService.acceptInvitation(assessmentId).toServiceResult(); } @Override AssessmentResource getById(Long id); @Override AssessmentResource getAssignableById(Long id); @Override AssessmentResource getRejectableById(Long id); @Override List<AssessmentResource> getByUserAndCompetition(Long userId, Long competitionId); @Override AssessmentTotalScoreResource getTotalScore(Long assessmentId); @Override ServiceResult<Void> recommend(Long assessmentId, Boolean fundingConfirmation, String feedback, String comment); @Override ServiceResult<Void> rejectInvitation(Long assessmentId, AssessmentRejectOutcomeValue reason, String comment); @Override ServiceResult<Void> acceptInvitation(Long assessmentId); @Override ServiceResult<Void> submitAssessments(List<Long> assessmentIds); } | @Test public void acceptInvitation() throws Exception { Long assessmentId = 1L; when(assessmentRestService.acceptInvitation(assessmentId)).thenReturn(restSuccess()); ServiceResult<Void> response = service.acceptInvitation(assessmentId); assertTrue(response.isSuccess()); verify(assessmentRestService, only()).acceptInvitation(assessmentId); } |
AssessmentServiceImpl implements AssessmentService { @Override public ServiceResult<Void> submitAssessments(List<Long> assessmentIds) { AssessmentSubmissionsResource assessmentSubmissions = new AssessmentSubmissionsResource(); assessmentSubmissions.setAssessmentIds(assessmentIds); return assessmentRestService.submitAssessments(assessmentSubmissions).toServiceResult(); } @Override AssessmentResource getById(Long id); @Override AssessmentResource getAssignableById(Long id); @Override AssessmentResource getRejectableById(Long id); @Override List<AssessmentResource> getByUserAndCompetition(Long userId, Long competitionId); @Override AssessmentTotalScoreResource getTotalScore(Long assessmentId); @Override ServiceResult<Void> recommend(Long assessmentId, Boolean fundingConfirmation, String feedback, String comment); @Override ServiceResult<Void> rejectInvitation(Long assessmentId, AssessmentRejectOutcomeValue reason, String comment); @Override ServiceResult<Void> acceptInvitation(Long assessmentId); @Override ServiceResult<Void> submitAssessments(List<Long> assessmentIds); } | @Test public void submitAssessments() throws Exception { AssessmentSubmissionsResource assessmentSubmissions = newAssessmentSubmissionsResource() .withAssessmentIds(asList(1L, 2L)) .build(); when(assessmentRestService.submitAssessments(assessmentSubmissions)).thenReturn(restSuccess()); ServiceResult<Void> response = service.submitAssessments(asList(1L, 2L)); assertTrue(response.isSuccess()); verify(assessmentRestService, only()).submitAssessments(assessmentSubmissions); } |
AssessmentFeedbackApplicationDetailsViewModel extends BaseAssessmentFeedbackViewModel { public boolean isKtpCompetition() { return ktpCompetition; } AssessmentFeedbackApplicationDetailsViewModel(long applicationId,
String applicationName,
LocalDate applicationStartDate,
long applicationDurationInMonths,
long daysLeft,
long daysLeftPercentage,
String questionShortName,
boolean ktpCompetition); long getApplicationId(); String getApplicationName(); LocalDate getApplicationStartDate(); long getApplicationDurationInMonths(); long getDaysLeft(); long getDaysLeftPercentage(); String getQuestionShortName(); boolean isKtpCompetition(); @Override boolean equals(Object o); @Override int hashCode(); @Override String toString(); } | @Test public void testKtpCompetition() { long applicationId = 1L; long applicationDurationInMonths = 15L; long daysLeft = 10L; long daysLeftPercentage = 5L; CompetitionResource competitionResource = CompetitionResourceBuilder.newCompetitionResource() .withFundingType(FundingType.KTP).build(); AssessmentFeedbackApplicationDetailsViewModel viewModel = new AssessmentFeedbackApplicationDetailsViewModel(applicationId, null, null, applicationDurationInMonths, daysLeft, daysLeftPercentage, null, competitionResource.isKtp()); assertTrue(viewModel.isKtpCompetition()); }
@Test public void testNonKtpCompetition() { long applicationId = 1L; long applicationDurationInMonths = 15L; long daysLeft = 10L; long daysLeftPercentage = 5L; CompetitionResource competitionResource = CompetitionResourceBuilder.newCompetitionResource() .withFundingType(FundingType.GRANT).build(); AssessmentFeedbackApplicationDetailsViewModel viewModel = new AssessmentFeedbackApplicationDetailsViewModel(applicationId, null, null, applicationDurationInMonths, daysLeft, daysLeftPercentage, null, competitionResource.isKtp()); assertFalse(viewModel.isKtpCompetition()); } |
SectionServiceImpl extends BaseTransactionalService implements SectionService { @Override public ServiceResult<SectionResource> getPreviousSection(final Long sectionId) { return getSection(sectionId).andOnSuccessReturn(sectionMapper::mapToResource).andOnSuccess(this::getPreviousSection); } @Override ServiceResult<SectionResource> getById(final Long sectionId); @Override ServiceResult<Set<Long>> getQuestionsForSectionAndSubsections(final Long sectionId); @Override ServiceResult<List<SectionResource>> getSectionsByCompetitionIdAndType(final long competitionId, final SectionType type); @Override ServiceResult<SectionResource> getNextSection(final Long sectionId); @Override ServiceResult<SectionResource> getNextSection(SectionResource section); @Override ServiceResult<SectionResource> getPreviousSection(final Long sectionId); @Override ServiceResult<SectionResource> getPreviousSection(SectionResource section); @Override ServiceResult<SectionResource> getSectionByQuestionId(final Long questionId); @Override @Cacheable(cacheNames="sectionsByCompetition", key = "T(java.lang.String).format('sectionsByCompetition:%d', #competitionId)", unless = "!T(org.innovateuk.ifs.cache.CacheHelper).cacheResultIfCompetitionIsOpen(#result)") ServiceResult<List<SectionResource>> getByCompetitionId(final Long competitionId); @Override ServiceResult<List<SectionResource>> getByCompetitionIdVisibleForAssessment(Long competitionId); @Override ServiceResult<List<SectionResource>> getChildSectionsByParentId(long parentId); } | @Test public void getPreviousSectionTest() throws Exception { Section section = newSection().withCompetitionAndPriority(newCompetition().build(), 1).build(); Section previousSection = newSection().build(); SectionResource previousSectionResource = newSectionResource().build(); when(sectionRepositoryMock.findById(anyLong())).thenReturn(Optional.of(section)); when(sectionRepositoryMock.findFirstByCompetitionIdAndPriorityLessThanAndParentSectionIsNullOrderByPriorityDesc( nullable(Long.class), nullable(Integer.class) )).thenReturn(previousSection); when(sectionMapper.mapToResource(any(Section.class))).thenReturn(previousSectionResource); SectionResource returnSection = sectionService.getPreviousSection(section.getId()).getSuccess(); assertEquals(previousSectionResource, returnSection); }
@Test public void getPreviousSectionWithParentSectionTest() throws Exception { Section parentSection = newSection().build(); Section section = newSection().withCompetitionAndPriorityAndParent(newCompetition().build(), 1, parentSection).build(); Section siblingSection = newSection().withCompetitionAndPriorityAndParent(newCompetition().build(), 2, parentSection).build(); SectionResource siblingSectionResource = newSectionResource().withCompetitionAndPriorityAndParent(newCompetition().build().getId(), 2, parentSection.getId()).build(); when(sectionRepositoryMock.findById(section.getId())).thenReturn(Optional.of(section)); when(sectionRepositoryMock.findFirstByCompetitionIdAndParentSectionIdAndPriorityLessThanAndQuestionGroupTrueOrderByPriorityDesc( anyLong(), anyLong(), anyInt() )).thenReturn(siblingSection); when(sectionMapper.mapToResource(any(Section.class))).thenReturn(siblingSectionResource); SectionResource returnSection = sectionService.getPreviousSection(section.getId()).getSuccess(); assertEquals(siblingSectionResource, returnSection); } |
AssessmentFeedbackViewModel extends BaseAssessmentFeedbackViewModel { public String getAppendixFileDescription() { return format("View %s appendix", lowerCase(getQuestionShortName())); } private AssessmentFeedbackViewModel(long assessmentId,
long daysLeft,
long daysLeftPercentage,
long applicationId,
String applicationName,
long questionId,
String questionNumber,
String questionShortName,
String questionName,
Integer maximumScore,
String applicantResponse,
List<FormInputResource> assessmentFormInputs,
boolean scoreFormInputExists,
boolean scopeFormInputExists,
List<FileDetailsViewModel> appendixDetails,
FileDetailsViewModel templateDocumentDetails,
String templateDocumentTitle,
List<ResearchCategoryResource> researchCategories); AssessmentFeedbackViewModel(AssessmentResource assessment, CompetitionResource competition, QuestionResource question, String applicantResponse,
List<FormInputResource> assessmentFormInputs,
boolean scoreFormInputExists,
boolean scopeFormInputExists,
List<FileDetailsViewModel> appendixDetails,
FileDetailsViewModel templateDocumentDetails,
String templateDocumentTitle,
List<ResearchCategoryResource> researchCategories); long getAssessmentId(); long getDaysLeft(); long getDaysLeftPercentage(); long getApplicationId(); String getApplicationName(); long getQuestionId(); String getQuestionNumber(); String getQuestionShortName(); String getQuestionName(); Integer getMaximumScore(); String getApplicantResponse(); List<FormInputResource> getAssessmentFormInputs(); boolean isScoreFormInputExists(); boolean isScopeFormInputExists(); List<FileDetailsViewModel> getAppendixDetails(); FileDetailsViewModel getTemplateDocumentDetails(); List<ResearchCategoryResource> getResearchCategories(); String getAppendixFileDescription(); boolean isAppendixExists(); String getTemplateDocumentFileDescription(); boolean isTemplateDocumentExists(); @Override boolean equals(Object o); @Override int hashCode(); @Override String toString(); } | @Test public void testGetAppendixFileDescription() throws Exception { final String questionShortName = "Technical approach"; AssessmentResource assessmentResource = newAssessmentResource().withApplication(1L).build(); CompetitionResource competitionResource = newCompetitionResource().withAssessorDeadlineDate(ZonedDateTime.now()).withAssessorAcceptsDate(ZonedDateTime.now()).build(); QuestionResource questionResource = newQuestionResource().withShortName(questionShortName).build(); List<FormInputResource> formInputResources = newFormInputResource().build(2); AssessmentFeedbackViewModel assessmentFeedbackViewModel = new AssessmentFeedbackViewModel( assessmentResource, competitionResource, questionResource, null, formInputResources, false, false, null, null, "template document", null ); assertEquals("View technical approach appendix", assessmentFeedbackViewModel.getAppendixFileDescription()); assertEquals("View template document", assessmentFeedbackViewModel.getTemplateDocumentFileDescription()); assertFalse(assessmentFeedbackViewModel.isAppendixExists()); assertFalse(assessmentFeedbackViewModel.isTemplateDocumentExists()); } |
AssessmentFeedbackController { @GetMapping("/question/{questionId}") public String getQuestion(Model model, @ModelAttribute(name = FORM_ATTR_NAME, binding = false) Form form, @PathVariable("assessmentId") long assessmentId, @PathVariable("questionId") long questionId) { QuestionResource question = getQuestionForAssessment(questionId, assessmentId); if (question.getQuestionSetupType().equals(QuestionSetupType.APPLICATION_DETAILS)) { return getApplicationDetails(model, assessmentId, question); } populateQuestionForm(form, assessmentId, questionId); return doViewQuestion(model, assessmentId, question); } @GetMapping("/question/{questionId}") String getQuestion(Model model,
@ModelAttribute(name = FORM_ATTR_NAME, binding = false) Form form,
@PathVariable("assessmentId") long assessmentId,
@PathVariable("questionId") long questionId); @PostMapping("/formInput/{formInputId}") @ResponseBody JsonNode updateFormInputResponse(
@PathVariable("assessmentId") long assessmentId,
@PathVariable("formInputId") long formInputId,
@RequestParam("value") String value); @PostMapping("/question/{questionId}") String save(
Model model,
@ModelAttribute(FORM_ATTR_NAME) Form form,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable("assessmentId") long assessmentId,
@PathVariable("questionId") long questionId); } | @Test public void getQuestion() throws Exception { long applicationId = 1L; CompetitionResource competitionResource = setupCompetitionResource(); AssessmentResource assessmentResource = setupAssessment(competitionResource.getId(), applicationId); SectionResource sectionResource = setupSection(SectionType.GENERAL); QuestionResource questionResource = setupQuestion(assessmentResource.getId()); QuestionResource previousQuestionResource = newQuestionResource() .withShortName("Previous question") .withSection(sectionResource.getId()) .build(); QuestionResource nextQuestionResource = newQuestionResource() .withShortName("Next question") .withSection(sectionResource.getId()) .build(); setupQuestionNavigation(questionResource.getId(), of(previousQuestionResource), of(nextQuestionResource)); List<FormInputResource> applicationFormInputs = setupApplicationFormInputs(questionResource.getId(), TEXTAREA); setupApplicantResponses(applicationId, applicationFormInputs); List<FormInputResource> assessmentFormInputs = setupAssessmentFormInputs(questionResource.getId(), TEXTAREA, ASSESSOR_SCORE); List<AssessorFormInputResponseResource> assessorResponses = setupAssessorResponses(assessmentResource.getId(), questionResource.getId(), assessmentFormInputs); Form expectedForm = new Form(); expectedForm.setFormInput(simpleToMap(assessorResponses, assessorFormInputResponseResource -> String.valueOf(assessorFormInputResponseResource.getFormInput()), AssessorFormInputResponseResource::getValue)); AssessmentFeedbackNavigationViewModel expectedNavigation = new AssessmentFeedbackNavigationViewModel(assessmentResource.getId(), of(previousQuestionResource), of(nextQuestionResource)); AssessmentFeedbackViewModel expectedViewModel = new AssessmentFeedbackViewModel( assessmentResource, competitionResource, questionResource, "Applicant response", assessmentFormInputs, true, false, emptyList(), null, null, null); mockMvc.perform(get("/{assessmentId}/question/{questionId}", assessmentResource.getId(), questionResource.getId())) .andExpect(status().isOk()) .andExpect(model().attribute("form", expectedForm)) .andExpect(model().attribute("model", expectedViewModel)) .andExpect(model().attribute("navigation", expectedNavigation)) .andExpect(view().name("assessment/application-question")); InOrder inOrder = inOrder(questionService, formInputRestService, assessorFormInputResponseRestService, assessmentService, competitionRestService, formInputResponseRestService, categoryRestServiceMock); inOrder.verify(questionService).getByIdAndAssessmentId(questionResource.getId(), assessmentResource.getId()); inOrder.verify(formInputRestService).getByQuestionIdAndScope(questionResource.getId(), APPLICATION); applicationFormInputs.forEach(formInput -> inOrder.verify(formInputResponseRestService).getByFormInputIdAndApplication(formInput.getId(), applicationId)); inOrder.verify(formInputRestService).getByQuestionIdAndScope(questionResource.getId(), ASSESSMENT); inOrder.verify(questionService).getPreviousQuestion(questionResource.getId()); inOrder.verify(questionService).getNextQuestion(questionResource.getId()); inOrder.verifyNoMoreInteractions(); } |
AssessmentFeedbackController { @PostMapping("/formInput/{formInputId}") public @ResponseBody JsonNode updateFormInputResponse( @PathVariable("assessmentId") long assessmentId, @PathVariable("formInputId") long formInputId, @RequestParam("value") String value) { try { assessorFormInputResponseRestService.updateFormInputResponse(assessmentId, formInputId, value) .getSuccess(); return createJsonObjectNode(true); } catch (Exception e) { LOG.error("exception thrown updating input form response", e); return createJsonObjectNode(false); } } @GetMapping("/question/{questionId}") String getQuestion(Model model,
@ModelAttribute(name = FORM_ATTR_NAME, binding = false) Form form,
@PathVariable("assessmentId") long assessmentId,
@PathVariable("questionId") long questionId); @PostMapping("/formInput/{formInputId}") @ResponseBody JsonNode updateFormInputResponse(
@PathVariable("assessmentId") long assessmentId,
@PathVariable("formInputId") long formInputId,
@RequestParam("value") String value); @PostMapping("/question/{questionId}") String save(
Model model,
@ModelAttribute(FORM_ATTR_NAME) Form form,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable("assessmentId") long assessmentId,
@PathVariable("questionId") long questionId); } | @Test public void updateFormInputResponse() throws Exception { Long assessmentId = 1L; String value = "Feedback"; Long formInputId = 1L; when(assessorFormInputResponseRestService.updateFormInputResponse(assessmentId, formInputId, value)).thenReturn( restSuccess()); mockMvc.perform(post("/{assessmentId}/formInput/{formInputId}", assessmentId, formInputId) .contentType(MediaType.APPLICATION_FORM_URLENCODED) .param("value", value)) .andExpect(status().isOk()) .andExpect(jsonPath("success", is("true"))) .andReturn(); verify(assessorFormInputResponseRestService, only()).updateFormInputResponse(assessmentId, formInputId, value); }
@Test public void updateFormInputResponse_exceedsCharacterSizeLimit() throws Exception { Long assessmentId = 1L; String value = "This is the feedback"; Long formInputId = 2L; when(assessorFormInputResponseRestService.updateFormInputResponse(assessmentId, formInputId, value)) .thenReturn(restFailure(fieldError("fieldName", "Feedback", "validation.field.too.many.characters", "", "5000", "0"))); when(messageSource.getMessage("validation.field.too.many.characters", new Object[]{"", "5000", "0"}, Locale.UK)) .thenReturn("This field cannot contain more than 5000 characters"); mockMvc.perform(post("/{assessmentId}/formInput/{formInputId}", assessmentId, formInputId) .contentType(MediaType.APPLICATION_FORM_URLENCODED) .param("value", value)) .andExpect(status().isOk()) .andExpect(jsonPath("success", is("false"))); verify(assessorFormInputResponseRestService, only()).updateFormInputResponse(assessmentId, formInputId, value); }
@Test public void updateFormInputResponse_exceedWordLimit() throws Exception { Long assessmentId = 1L; String value = "This is the feedback"; Long formInputId = 2L; when(assessorFormInputResponseRestService.updateFormInputResponse(assessmentId, formInputId, value)) .thenReturn(restFailure(fieldError("fieldName", "Feedback", "validation.field.max.word.count", "", 100))); when(messageSource.getMessage("validation.field.max.word.count", new Object[]{"", "100"}, Locale.UK)) .thenReturn("Maximum word count exceeded. Please reduce your word count to 100."); mockMvc.perform(post("/{assessmentId}/formInput/{formInputId}", assessmentId, formInputId) .contentType(MediaType.APPLICATION_FORM_URLENCODED) .param("value", value)) .andExpect(status().isOk()) .andExpect(jsonPath("success", is("false"))); verify(assessorFormInputResponseRestService, only()).updateFormInputResponse(assessmentId, formInputId, value); }
@Test public void updateFormInputResponse_scopeUnselected() throws Exception { Long assessmentId = 1L; String value = "none"; Long formInputId = 2L; when(assessorFormInputResponseRestService.updateFormInputResponse(assessmentId, formInputId, value)) .thenReturn(restFailure(fieldError("fieldName", "value", "validation.assessor.scope.invalidScope"))); when(messageSource.getMessage("validation.assessor.scope.invalidScope", new Object[]{}, Locale.UK)) .thenReturn("Please select the scope."); mockMvc.perform(post("/{assessmentId}/formInput/{formInputId}", assessmentId, formInputId) .contentType(MediaType.APPLICATION_FORM_URLENCODED) .param("value", value)) .andExpect(status().isOk()) .andExpect(jsonPath("success", is("false"))); verify(assessorFormInputResponseRestService, only()).updateFormInputResponse(assessmentId, formInputId, value); } |
AssessmentFeedbackController { @PostMapping("/question/{questionId}") public String save( Model model, @ModelAttribute(FORM_ATTR_NAME) Form form, @SuppressWarnings("UnusedParameters") BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable("assessmentId") long assessmentId, @PathVariable("questionId") long questionId) { Supplier<String> failureView = () -> doViewQuestion(model, assessmentId, getQuestionForAssessment(questionId, assessmentId)); return validationHandler.failNowOrSucceedWith(failureView, () -> { List<FormInputResource> formInputs = getAssessmentFormInputsForQuestion(questionId); AssessorFormInputResponsesResource responses = getFormInputResponses(form, formInputs, assessmentId); RestResult<Void> updateResult = assessorFormInputResponseRestService.updateFormInputResponses(responses); return validationHandler.addAnyErrors(updateResult, mappingFieldErrorToField(e -> { Matcher matcher = Pattern.compile("responses\\[(\\d)\\]\\.value").matcher(e.getFieldName()); if (matcher.find()) { int errorIndex = Integer.parseInt(matcher.group(1)); Long formInputResponseWithError = responses.getResponses().get(errorIndex).getFormInput(); return format("formInput[%s]", formInputResponseWithError); } else if (e.isFieldError() && !e.getArguments().isEmpty()) { return format("formInput[%s]", e.getArguments().get(0)); } return e.getFieldName(); }), asGlobalErrors()).failNowOrSucceedWith(failureView, () -> redirectToAssessmentOverview(assessmentId)); }); } @GetMapping("/question/{questionId}") String getQuestion(Model model,
@ModelAttribute(name = FORM_ATTR_NAME, binding = false) Form form,
@PathVariable("assessmentId") long assessmentId,
@PathVariable("questionId") long questionId); @PostMapping("/formInput/{formInputId}") @ResponseBody JsonNode updateFormInputResponse(
@PathVariable("assessmentId") long assessmentId,
@PathVariable("formInputId") long formInputId,
@RequestParam("value") String value); @PostMapping("/question/{questionId}") String save(
Model model,
@ModelAttribute(FORM_ATTR_NAME) Form form,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable("assessmentId") long assessmentId,
@PathVariable("questionId") long questionId); } | @Test public void save() throws Exception { long assessmentId = 1L; long questionId = 2L; List<FormInputResource> formInputs = setupAssessmentFormInputs(questionId, ASSESSOR_SCORE, TEXTAREA); Long formInputIdScore = formInputs.get(0).getId(); Long formInputIdFeedback = formInputs.get(1).getId(); String formInputScoreField = format("formInput[%s]", formInputIdScore); String formInputFeedbackField = format("formInput[%s]", formInputIdFeedback); AssessorFormInputResponsesResource responses = new AssessorFormInputResponsesResource( newAssessorFormInputResponseResource() .with(id(null)) .withAssessment(assessmentId) .withFormInput(formInputIdScore, formInputIdFeedback) .withValue("10", "Feedback") .build(2)); when(assessorFormInputResponseRestService.updateFormInputResponses(responses)) .thenReturn(restSuccess()); mockMvc.perform(post("/{assessmentId}/question/{questionId}", assessmentId, questionId) .contentType(MediaType.APPLICATION_FORM_URLENCODED) .param(formInputScoreField, "10") .param(formInputFeedbackField, "Feedback")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(format("/%s", assessmentId))) .andReturn(); verify(assessorFormInputResponseRestService, only()).updateFormInputResponses(responses); } |
AssessorCompetitionDashboardController { @GetMapping("/dashboard/competition/{competitionId}") public String competitionDashboard(final Model model, UserResource loggedInUser, @PathVariable("competitionId") final Long competitionId, @ModelAttribute(name = FORM_ATTR_NAME, binding = false) AssessorCompetitionDashboardAssessmentForm form) { model.addAttribute("model", assessorCompetitionDashboardModelPopulator.populateModel(competitionId, loggedInUser.getId())); return "assessor-competition-dashboard"; } @GetMapping("/dashboard/competition/{competitionId}") String competitionDashboard(final Model model,
UserResource loggedInUser,
@PathVariable("competitionId") final Long competitionId,
@ModelAttribute(name = FORM_ATTR_NAME, binding = false) AssessorCompetitionDashboardAssessmentForm form); @PostMapping("/dashboard/competition/{competitionId}") String submitAssessments(Model model,
@PathVariable("competitionId") Long competitionId,
UserResource loggedInUser,
@ModelAttribute(FORM_ATTR_NAME) @Valid AssessorCompetitionDashboardAssessmentForm form,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping("/dashboard/confirm-competition/{competitionId}") String confirmSubmitAssessments(Model model,
@PathVariable("competitionId") final Long competitionId,
UserResource loggedInUser,
@ModelAttribute(FORM_ATTR_NAME) @Valid AssessorCompetitionDashboardAssessmentForm form,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler); } | @Test public void competitionDashboard() throws Exception { when(assessorCompetitionDashboardModelPopulator.populateModel(anyLong(), anyLong())).thenReturn(viewModel); mockMvc.perform(get("/assessor/dashboard/competition/{competitionId}", competitionResource.getId())) .andExpect(status().isOk()) .andExpect(view().name("assessor-competition-dashboard")) .andExpect(model().attribute("model", viewModel)); } |
AssessorCompetitionDashboardController { @PostMapping("/dashboard/competition/{competitionId}") public String submitAssessments(Model model, @PathVariable("competitionId") Long competitionId, UserResource loggedInUser, @ModelAttribute(FORM_ATTR_NAME) @Valid AssessorCompetitionDashboardAssessmentForm form, @SuppressWarnings("UnusedParameters") BindingResult bindingResult, ValidationHandler validationHandler) { Supplier<String> renderDashboard = () -> competitionDashboard(model, loggedInUser, competitionId, form); return validationHandler.failNowOrSucceedWith( renderDashboard, () -> { ServiceResult<Void> serviceResult = assessmentService.submitAssessments(form.getAssessmentIds()); return validationHandler.addAnyErrors(serviceResult, asGlobalErrors()) .failNowOrSucceedWith(renderDashboard, renderDashboard); } ); } @GetMapping("/dashboard/competition/{competitionId}") String competitionDashboard(final Model model,
UserResource loggedInUser,
@PathVariable("competitionId") final Long competitionId,
@ModelAttribute(name = FORM_ATTR_NAME, binding = false) AssessorCompetitionDashboardAssessmentForm form); @PostMapping("/dashboard/competition/{competitionId}") String submitAssessments(Model model,
@PathVariable("competitionId") Long competitionId,
UserResource loggedInUser,
@ModelAttribute(FORM_ATTR_NAME) @Valid AssessorCompetitionDashboardAssessmentForm form,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler); @PostMapping("/dashboard/confirm-competition/{competitionId}") String confirmSubmitAssessments(Model model,
@PathVariable("competitionId") final Long competitionId,
UserResource loggedInUser,
@ModelAttribute(FORM_ATTR_NAME) @Valid AssessorCompetitionDashboardAssessmentForm form,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler); } | @Test public void submitAssessments_failure() throws Exception { List<Long> assessmentIds = asList(1L, 2L); when(assessmentService.submitAssessments(assessmentIds)).thenReturn(serviceFailure(new Error("Test Error", null))); when(assessorCompetitionDashboardModelPopulator.populateModel(anyLong(), anyLong())).thenReturn(viewModel); MvcResult result = mockMvc.perform(post("/assessor/dashboard/competition/{competitionId}", competitionResource.getId()) .contentType(APPLICATION_FORM_URLENCODED) .param("assessmentIds[0]", "1") .param("assessmentIds[1]", "2")) .andExpect(status().isOk()) .andExpect(model().hasErrors()) .andExpect(model().attributeExists("model")) .andExpect(view().name("assessor-competition-dashboard")) .andReturn(); AssessorCompetitionDashboardAssessmentForm form = (AssessorCompetitionDashboardAssessmentForm) requireNonNull(result.getModelAndView()).getModel().get("form"); assertEquals(assessmentIds, form.getAssessmentIds()); verify(assessmentService, times(1)).submitAssessments(assessmentIds); BindingResult bindingResult = form.getBindingResult(); assertEquals(1, bindingResult.getGlobalErrorCount()); assertEquals(1, bindingResult.getErrorCount()); assertEquals(0, bindingResult.getFieldErrorCount()); assertEquals("Test Error", bindingResult.getGlobalError().getCode()); } |
AssessorDashboardController { @GetMapping("/dashboard") @NavigationRoot public String dashboard(Model model, UserResource loggedInUser) { model.addAttribute("model", assessorDashboardModelPopulator.populateModel(loggedInUser)); return "assessor-dashboard"; } @GetMapping("/dashboard") @NavigationRoot String dashboard(Model model, UserResource loggedInUser); @GetMapping("/terms-and-conditions") String termsAndConditions(); } | @Test public void dashboard() throws Exception { final ZonedDateTime now = now(); final LocalDateTime time = LocalDateTime.of(now.getYear(), now.getMonth(), now.getDayOfMonth(), 23,59,59); Instant instant = time.toInstant(ZoneOffset.UTC); Clock clock = Clock.fixed(instant, systemDefault()); CompetitionResource competitionResource = newCompetitionResource() .withFundersPanelDate(now.plusDays(30)) .build(); CompetitionParticipantResource participant = newCompetitionParticipantResource() .withCompetitionParticipantRole(CompetitionParticipantRoleResource.ASSESSOR) .withStatus(ACCEPTED) .withUser(3L) .withCompetition(competitionResource.getId()) .withCompetitionName("Juggling Craziness") .withCompetitionStatus(IN_ASSESSMENT) .withAssessorAcceptsDate(now.minusDays(2)) .withAssessorDeadlineDate(now.plusDays(4)) .withSubmittedAssessments(1L) .withTotalAssessments(3L) .withPendingAssessments(1L) .build(); ReflectionTestUtils.setField(participant, "clock", clock, Clock.class); UserProfileStatusResource profileStatusResource = newUserProfileStatusResource() .withSkillsComplete(true) .withAffliliationsComplete(false) .withAgreementComplete(false) .build(); ReviewInviteResource invite = newReviewInviteResource() .withInviteHash("") .withCompetitionId(competitionResource.getId()) .withCompetitionName("Juggling Craziness") .build(); ReviewParticipantResource reviewParticipantResource = newReviewParticipantResource() .withCompetition(competitionResource.getId()) .withCompetitionName("Juggling Craziness") .withCompetitionParticipantRole(PANEL_ASSESSOR) .withStatus(PENDING) .withUser(3L) .withInvite(invite) .build(); InterviewInviteResource interviewInvite = newInterviewInviteResource() .withInviteHash("") .withCompetitionId(competitionResource.getId()) .withCompetitionName("Juggling Craziness") .build(); InterviewParticipantResource interviewParticipantResource = newInterviewParticipantResource() .withCompetition(competitionResource.getId()) .withCompetitionName("Juggling Craziness") .withCompetitionParticipantRole(PANEL_ASSESSOR) .withStatus(PENDING) .withUser(3L) .withInvite(interviewInvite) .build(); RoleProfileStatusResource roleProfileStatusResource = newRoleProfileStatusResource() .withRoleProfileState(RoleProfileState.ACTIVE) .build(); long userId = 3l; when(competitionParticipantRestService.getAssessorParticipants(userId)).thenReturn(restSuccess(singletonList(participant))); when(profileRestService.getUserProfileStatus(userId)).thenReturn(restSuccess(profileStatusResource)); when(reviewInviteRestService.getAllInvitesByUser(userId)).thenReturn(restSuccess(singletonList(reviewParticipantResource))); when(interviewInviteRestService.getAllInvitesByUser(userId)).thenReturn(restSuccess(singletonList(interviewParticipantResource))); when(competitionRestService.getCompetitionById(competitionResource.getId())).thenReturn(restSuccess(competitionResource)); when(roleProfileStatusRestService.findByUserIdAndProfileRole(userId, ASSESSOR)).thenReturn(restSuccess(roleProfileStatusResource)); MvcResult result = mockMvc.perform(get("/assessor/dashboard")) .andExpect(status().isOk()) .andExpect(model().attributeExists("model")) .andExpect(view().name("assessor-dashboard")) .andReturn(); AssessorDashboardViewModel model = (AssessorDashboardViewModel) result.getModelAndView().getModel().get("model"); List<AssessorDashboardActiveCompetitionViewModel> expectedActiveCompetitions = singletonList( new AssessorDashboardActiveCompetitionViewModel(competitionResource.getId(), "Juggling Craziness", 1, 3, 1, now.plusDays(4).toLocalDate(), 3, 50 ) ); AssessorProfileStatusViewModel expectedAssessorProfileStatusViewModel = new AssessorProfileStatusViewModel(profileStatusResource, RoleProfileState.ACTIVE); AssessorDashboardAssessmentPanelInviteViewModel expectedAssessmentPanelInviteViewModel = new AssessorDashboardAssessmentPanelInviteViewModel("Juggling Craziness", competitionResource.getId(), ""); AssessorDashboardInterviewInviteViewModel expectedInterviewInviteViewModel = new AssessorDashboardInterviewInviteViewModel("Juggling Craziness", competitionResource.getId(), ""); assertTrue(model.getPendingInvites().isEmpty()); assertEquals(expectedActiveCompetitions, model.getActiveCompetitions()); assertEquals(expectedAssessorProfileStatusViewModel, model.getProfileStatus()); assertTrue(model.getUpcomingCompetitions().isEmpty()); assertFalse(model.getAssessmentPanelInvites().isEmpty()); assertEquals(model.getAssessmentPanelInvites().get(0).getCompetitionId(), singletonList(expectedAssessmentPanelInviteViewModel).get(0).getCompetitionId()); assertEquals(model.getAssessmentPanelInvites().get(0).getCompetitionName(), singletonList(expectedAssessmentPanelInviteViewModel).get(0).getCompetitionName()); assertEquals(model.getAssessmentPanelInvites().get(0).getInviteHash(), singletonList(expectedAssessmentPanelInviteViewModel).get(0).getInviteHash()); assertEquals(model.getAssessmentPanelInvites(), singletonList(expectedAssessmentPanelInviteViewModel)); assertFalse(model.getInterviewPanelInvites().isEmpty()); assertEquals(model.getInterviewPanelInvites().get(0).getCompetitionId(), singletonList(expectedInterviewInviteViewModel).get(0).getCompetitionId()); assertEquals(model.getInterviewPanelInvites().get(0).getCompetitionName(), singletonList(expectedInterviewInviteViewModel).get(0).getCompetitionName()); assertEquals(model.getInterviewPanelInvites().get(0).getInviteHash(), singletonList(expectedInterviewInviteViewModel).get(0).getInviteHash()); assertEquals(model.getInterviewPanelInvites(), singletonList(expectedInterviewInviteViewModel)); } |
AssessorCompetitionDashboardModelPopulator { public AssessorCompetitionDashboardViewModel populateModel(Long competitionId, Long userId) { AssessorCompetitionDashboardResource assessorCompetitionDashboard = assessorCompetitionDashboardRestService.getAssessorCompetitionDashboard(competitionId, userId).getSuccess(); List<AssessorCompetitionDashboardApplicationViewModel> outstanding = getOutstandingAssessments(assessorCompetitionDashboard.getApplicationAssessments()); List<AssessorCompetitionDashboardApplicationViewModel> submitted = getSubmittedAssessments(assessorCompetitionDashboard.getApplicationAssessments()); boolean submitVisible = outstanding.stream() .anyMatch(AssessorCompetitionDashboardApplicationViewModel::isReadyToSubmit); return new AssessorCompetitionDashboardViewModel( assessorCompetitionDashboard.getCompetitionId(), assessorCompetitionDashboard.getCompetitionName(), assessorCompetitionDashboard.getInnovationLead(), assessorCompetitionDashboard.getAssessorAcceptDate(), assessorCompetitionDashboard.getAssessorDeadlineDate(), submitted, outstanding, submitVisible ); } AssessorCompetitionDashboardViewModel populateModel(Long competitionId, Long userId); } | @Test public void populateModel() { long compId = 1L; long userId = 1L; List<ApplicationAssessmentResource> submittedAssessments = newApplicationAssessmentResource() .withApplicationId(1L, 2L) .withAssessmentId(1L, 2L) .withApplicationName("Application Name") .withLeadOrganisation("Organisation 1", "Organisation 2") .withState(SUBMITTED, SUBMITTED) .withOverallScore(50, 55) .withRecommended(TRUE, TRUE) .build(2); List<ApplicationAssessmentResource> outstandingAssessments = newApplicationAssessmentResource() .withApplicationId(3L, 4L) .withAssessmentId(3L, 4L) .withApplicationName("Application Name") .withLeadOrganisation("Organisation 3", "Organisation 4") .withState(PENDING, PENDING) .build(2); AssessorCompetitionDashboardResource assessorCompetitionDashboardResource = newAssessorCompetitionDashboardResource() .withCompetitionId(compId) .withCompetitionName("Competition Name") .withInnovationLead("Innovation Lead") .withAssessorAcceptDate(ZonedDateTime.now().minusDays(2)) .withAssessorDeadlineDate(ZonedDateTime.now().plusDays(4)) .withApplicationAssessments(combineLists(submittedAssessments, outstandingAssessments)) .build(); when(assessorCompetitionDashboardRestService.getAssessorCompetitionDashboard(compId, userId)) .thenReturn(restSuccess(assessorCompetitionDashboardResource)); AssessorCompetitionDashboardViewModel viewModel = assessorCompetitionDashboardModelPopulator.populateModel(compId, userId); assertEquals(viewModel.getCompetitionId(), assessorCompetitionDashboardResource.getCompetitionId()); assertEquals(viewModel.getCompetitionTitle(), assessorCompetitionDashboardResource.getCompetitionName()); assertEquals(viewModel.getLeadTechnologist(), assessorCompetitionDashboardResource.getInnovationLead()); assertEquals(viewModel.getAcceptDeadline(), assessorCompetitionDashboardResource.getAssessorAcceptDate()); assertEquals(viewModel.getSubmitDeadline(), assessorCompetitionDashboardResource.getAssessorDeadlineDate()); assertEquals(viewModel.getSubmitted().size(), 2); assertEquals(viewModel.getOutstanding().size(), 2); verify(assessorCompetitionDashboardRestService, times(1)).getAssessorCompetitionDashboard(compId, userId); verifyNoMoreInteractions(assessorCompetitionDashboardRestService); } |
AssessorServiceImpl implements AssessorService { @Override public ServiceResult<Void> createAssessorByInviteHash(String inviteHash, RegistrationForm registrationForm, AddressResource address) { UserRegistrationResource userRegistrationResource = new UserRegistrationResource(); userRegistrationResource.setFirstName(registrationForm.getFirstName()); userRegistrationResource.setLastName(registrationForm.getLastName()); userRegistrationResource.setPhoneNumber(registrationForm.getPhoneNumber()); userRegistrationResource.setPassword(registrationForm.getPassword()); userRegistrationResource.setAddress(address); return assessorRestService.createAssessorByInviteHash(inviteHash, userRegistrationResource).toServiceResult(); } @Override ServiceResult<Void> createAssessorByInviteHash(String inviteHash, RegistrationForm registrationForm, AddressResource address); } | @Test public void createAssessorByInviteHash() { String hash = "hash"; String firstName = "Felix"; String lastName = "Wilson"; String phoneNumber = "12345678"; String password = "password"; RegistrationForm form = new RegistrationForm(); form.setFirstName(firstName); form.setLastName(lastName); form.setPhoneNumber(phoneNumber); form.setPassword(password); AddressResource addressResource = newAddressResource().build(); UserRegistrationResource userRegistration = newUserRegistrationResource() .withFirstName(firstName) .withLastName(lastName) .withPhoneNumber(phoneNumber) .withPassword(password) .withAddress(addressResource) .build(); when(assessorRestService.createAssessorByInviteHash(hash, userRegistration)).thenReturn(restSuccess()); ServiceResult<Void> response = service.createAssessorByInviteHash(hash, form, addressResource); assertTrue(response.isSuccess()); verify(assessorRestService, only()).createAssessorByInviteHash(hash, userRegistration); } |
AssessorRegistrationController { @GetMapping("/{inviteHash}/start") public String becomeAnAssessor(Model model, @PathVariable("inviteHash") String inviteHash) { model.addAttribute("model", becomeAnAssessorModelPopulator.populateModel(inviteHash)); return "registration/become-assessor"; } @GetMapping("/{inviteHash}/start") String becomeAnAssessor(Model model,
@PathVariable("inviteHash") String inviteHash); @GetMapping("/{inviteHash}/register") String yourDetails(Model model,
@PathVariable("inviteHash") String inviteHash,
@ModelAttribute(name = FORM_ATTR_NAME, binding = false) RegistrationForm form); @PostMapping("/{inviteHash}/register") String submitYourDetails(Model model,
@PathVariable("inviteHash") String inviteHash,
@Validated({Default.class, PhoneNumberValidationGroup.class}) @ModelAttribute(FORM_ATTR_NAME) RegistrationForm registrationForm,
BindingResult bindingResult,
ValidationHandler validationHandler); @GetMapping(value = "/{inviteHash}/register/account-created") String accountCreated(Model model, @PathVariable("inviteHash") String inviteHash, UserResource loggedInUser); @PostMapping(value = "/{inviteHash}/register", params = FORM_ACTION_PARAMETER) String addressFormAction(Model model,
@ModelAttribute(FORM_ATTR_NAME) RegistrationForm registrationForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable("inviteHash") String inviteHash); } | @Test public void becomeAnAssessor() throws Exception { CompetitionInviteResource competitionInviteResource = newCompetitionInviteResource().build(); when(competitionInviteRestService.getInvite("hash")).thenReturn(restSuccess(competitionInviteResource)); AssessorRegistrationBecomeAnAssessorViewModel expectedViewModel = new AssessorRegistrationBecomeAnAssessorViewModel("hash"); mockMvc.perform(get("/registration/{inviteHash}/start", "hash")) .andExpect(status().isOk()) .andExpect(model().attribute("model", expectedViewModel)) .andExpect(view().name("registration/become-assessor")); } |
AssessorRegistrationController { @GetMapping("/{inviteHash}/register") public String yourDetails(Model model, @PathVariable("inviteHash") String inviteHash, @ModelAttribute(name = FORM_ATTR_NAME, binding = false) RegistrationForm form) { form.setEmail(getAssociatedEmailFromInvite(inviteHash)); return doViewYourDetails(model, inviteHash); } @GetMapping("/{inviteHash}/start") String becomeAnAssessor(Model model,
@PathVariable("inviteHash") String inviteHash); @GetMapping("/{inviteHash}/register") String yourDetails(Model model,
@PathVariable("inviteHash") String inviteHash,
@ModelAttribute(name = FORM_ATTR_NAME, binding = false) RegistrationForm form); @PostMapping("/{inviteHash}/register") String submitYourDetails(Model model,
@PathVariable("inviteHash") String inviteHash,
@Validated({Default.class, PhoneNumberValidationGroup.class}) @ModelAttribute(FORM_ATTR_NAME) RegistrationForm registrationForm,
BindingResult bindingResult,
ValidationHandler validationHandler); @GetMapping(value = "/{inviteHash}/register/account-created") String accountCreated(Model model, @PathVariable("inviteHash") String inviteHash, UserResource loggedInUser); @PostMapping(value = "/{inviteHash}/register", params = FORM_ACTION_PARAMETER) String addressFormAction(Model model,
@ModelAttribute(FORM_ATTR_NAME) RegistrationForm registrationForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable("inviteHash") String inviteHash); } | @Test public void yourDetails() throws Exception { CompetitionInviteResource competitionInviteResource = newCompetitionInviteResource().withEmail("[email protected]").build(); when(competitionInviteRestService.getInvite("hash")).thenReturn(RestResult.restSuccess(competitionInviteResource)); RegistrationViewModel expectedViewModel = aRegistrationViewModel().withButtonText("Continue").withAddressRequired(true).withPhoneRequired(true).withInvitee(true).build(); mockMvc.perform(get("/registration/{inviteHash}/register", "hash")) .andExpect(status().isOk()) .andExpect(model().attribute("model", refEq(expectedViewModel))) .andExpect(view().name("registration/register")); } |
AssessorRegistrationController { @PostMapping("/{inviteHash}/register") public String submitYourDetails(Model model, @PathVariable("inviteHash") String inviteHash, @Validated({Default.class, PhoneNumberValidationGroup.class}) @ModelAttribute(FORM_ATTR_NAME) RegistrationForm registrationForm, BindingResult bindingResult, ValidationHandler validationHandler) { Supplier<String> failureView = () -> doViewYourDetails(model, inviteHash); return validationHandler.failNowOrSucceedWith(failureView, () -> { ServiceResult<Void> result = assessorService.createAssessorByInviteHash(inviteHash, registrationForm, registrationForm.getAddressForm().getSelectedAddress(this::searchPostcode)); 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}/start") String becomeAnAssessor(Model model,
@PathVariable("inviteHash") String inviteHash); @GetMapping("/{inviteHash}/register") String yourDetails(Model model,
@PathVariable("inviteHash") String inviteHash,
@ModelAttribute(name = FORM_ATTR_NAME, binding = false) RegistrationForm form); @PostMapping("/{inviteHash}/register") String submitYourDetails(Model model,
@PathVariable("inviteHash") String inviteHash,
@Validated({Default.class, PhoneNumberValidationGroup.class}) @ModelAttribute(FORM_ATTR_NAME) RegistrationForm registrationForm,
BindingResult bindingResult,
ValidationHandler validationHandler); @GetMapping(value = "/{inviteHash}/register/account-created") String accountCreated(Model model, @PathVariable("inviteHash") String inviteHash, UserResource loggedInUser); @PostMapping(value = "/{inviteHash}/register", params = FORM_ACTION_PARAMETER) String addressFormAction(Model model,
@ModelAttribute(FORM_ATTR_NAME) RegistrationForm registrationForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable("inviteHash") String inviteHash); } | @Test public void submitYourDetails() throws Exception { Title title = Title.Mr; String firstName = "Felix"; String lastName = "Wilson"; String phoneNumber = "12345678"; String password = "P@ssword1234"; String addressLine1 = "address1"; String town = "town"; String postcode = "postcode"; RegistrationForm expectedForm = new RegistrationForm(); expectedForm.setFirstName(firstName); expectedForm.setLastName(lastName); expectedForm.setPhoneNumber(phoneNumber); expectedForm.setPassword(password); AddressForm addressForm = expectedForm.getAddressForm(); AddressResource addressResource = new AddressResource(); addressResource.setAddressLine1(addressLine1); addressResource.setPostcode(postcode); addressResource.setTown(town); addressForm.setManualAddress(addressResource); addressForm.setAddressType(AddressForm.AddressType.MANUAL_ENTRY); String inviteHash = "hash"; CompetitionInviteResource competitionInviteResource = newCompetitionInviteResource().withEmail("[email protected]").build(); when(competitionInviteRestService.getInvite(inviteHash)).thenReturn(RestResult.restSuccess(competitionInviteResource)); when(assessorService.createAssessorByInviteHash(inviteHash, expectedForm, addressResource)).thenReturn(serviceSuccess()); mockMvc.perform(post("/registration/{inviteHash}/register", inviteHash) .contentType(APPLICATION_FORM_URLENCODED) .param("title", title.name()) .param("firstName", firstName) .param("lastName", lastName) .param("phoneNumber", phoneNumber) .param("password", password) .param("addressForm.addressType", AddressForm.AddressType.MANUAL_ENTRY.name()) .param("addressForm.selectedPostcode.addressLine1", addressLine1) .param("addressForm.selectedPostcode.town", town) .param("addressForm.selectedPostcode.postcode", postcode)) .andExpect(status().is3xxRedirection()) .andExpect(model().attribute("form", expectedForm)) .andExpect(redirectedUrl(format("/registration/%s/register/account-created", inviteHash))); verify(assessorService).createAssessorByInviteHash(inviteHash, expectedForm, addressResource); } |
AssessorRegistrationController { @GetMapping(value = "/{inviteHash}/register/account-created") public String accountCreated(Model model, @PathVariable("inviteHash") String inviteHash, UserResource loggedInUser) { boolean userIsLoggedIn = loggedInUser != null; if (userIsLoggedIn) { return format("redirect:/invite/competition/%s", inviteHash); } return competitionInviteRestService.checkExistingUser(inviteHash).andOnSuccessReturn(userExists -> { if (!userExists) { return format("redirect:/invite/competition/%s", inviteHash); } else { model.addAttribute("competitionInviteHash", inviteHash); return "registration/account-created"; } }).getSuccess(); } @GetMapping("/{inviteHash}/start") String becomeAnAssessor(Model model,
@PathVariable("inviteHash") String inviteHash); @GetMapping("/{inviteHash}/register") String yourDetails(Model model,
@PathVariable("inviteHash") String inviteHash,
@ModelAttribute(name = FORM_ATTR_NAME, binding = false) RegistrationForm form); @PostMapping("/{inviteHash}/register") String submitYourDetails(Model model,
@PathVariable("inviteHash") String inviteHash,
@Validated({Default.class, PhoneNumberValidationGroup.class}) @ModelAttribute(FORM_ATTR_NAME) RegistrationForm registrationForm,
BindingResult bindingResult,
ValidationHandler validationHandler); @GetMapping(value = "/{inviteHash}/register/account-created") String accountCreated(Model model, @PathVariable("inviteHash") String inviteHash, UserResource loggedInUser); @PostMapping(value = "/{inviteHash}/register", params = FORM_ACTION_PARAMETER) String addressFormAction(Model model,
@ModelAttribute(FORM_ATTR_NAME) RegistrationForm registrationForm,
BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable("inviteHash") String inviteHash); } | @Test public void accountCreated() throws Exception { String inviteHash = "hash"; setLoggedInUser(null); when(competitionInviteRestService.checkExistingUser(inviteHash)).thenReturn(restSuccess(true)); mockMvc.perform(get("/registration/{inviteHash}/register/account-created", inviteHash)) .andExpect(status().isOk()) .andExpect(model().attribute("competitionInviteHash", inviteHash)) .andExpect(view().name("registration/account-created")); verify(competitionInviteRestService, only()).checkExistingUser(inviteHash); } |
AssessmentReviewApplicationSummaryController { @GetMapping("/application/{applicationId}") public String viewApplication(@PathVariable("applicationId") long applicationId, @PathVariable("reviewId") long reviewId, Model model, UserResource user) { model.addAttribute("model", assessmentReviewApplicationSummaryModelPopulator.populateModel(user, applicationId)); return "assessor-panel-application-overview"; } @GetMapping("/application/{applicationId}") String viewApplication(@PathVariable("applicationId") long applicationId,
@PathVariable("reviewId") long reviewId,
Model model,
UserResource user); } | @Test public void viewApplication() throws Exception { long reviewId = 1L; long applicationId = 2L; AssessmentReviewApplicationSummaryViewModel model = mock(AssessmentReviewApplicationSummaryViewModel.class); when(assessmentReviewApplicationSummaryModelPopulator.populateModel(getLoggedInUser(), applicationId)).thenReturn(model); mockMvc.perform(get("/review/{reviewId}/application/{applicationId}", reviewId, applicationId)) .andExpect(view().name("assessor-panel-application-overview")) .andExpect(model().attribute("model", model)); } |
AssessmentReviewController { @GetMapping public String viewAssignment(@PathVariable("reviewId") long reviewId, @ModelAttribute(name = "form", binding = false) AssessmentReviewForm form, Model model) { model.addAttribute("model", assessmentReviewModelPopulator.populateModel(reviewId)); return "assessment/review-invitation"; } @GetMapping String viewAssignment(@PathVariable("reviewId") long reviewId,
@ModelAttribute(name = "form", binding = false) AssessmentReviewForm form,
Model model); @PostMapping("/respond") String respondToAssignment(Model model,
@PathVariable("reviewId") long reviewId,
@Valid @ModelAttribute("form") AssessmentReviewForm form,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler); } | @Test public void viewAssignment() throws Exception { AssessmentReviewViewModel expectedReviewViewModel = new AssessmentReviewViewModel( REVIEW_ID, COMPETITION_ID, APPLICATION_NAME, partners, leadOrganisation, PROJECT_SUMMARY_TEXT ); ReviewResource reviewResource = newReviewResource() .withId(REVIEW_ID) .withApplication(APPLICATION_ID) .withApplicationName(APPLICATION_NAME) .withCompetition(COMPETITION_ID) .build(); when(reviewRestService.getAssessmentReview(REVIEW_ID)).thenReturn(restSuccess(reviewResource)); mockMvc.perform(get("/review/{reviewId}", REVIEW_ID)) .andExpect(status().isOk()) .andExpect(model().attribute("model", expectedReviewViewModel)) .andExpect(view().name("assessment/review-invitation")).andReturn(); InOrder inOrder = inOrder(reviewRestService, formInputResponseRestService, userRestService, organisationService); inOrder.verify(reviewRestService).getAssessmentReview(REVIEW_ID); inOrder.verify(formInputResponseRestService).getByApplicationIdAndQuestionSetupType(APPLICATION_ID, PROJECT_SUMMARY); inOrder.verify(userRestService).findProcessRole(APPLICATION_ID); inOrder.verify(organisationService).getApplicationOrganisations(anyList()); inOrder.verify(organisationService).getApplicationLeadOrganisation(anyList()); inOrder.verifyNoMoreInteractions(); } |
AssessmentAssignmentController { @GetMapping("assignment") public String viewAssignment(@PathVariable("assessmentId") Long assessmentId, @ModelAttribute(name = "form", binding = false) AssessmentAssignmentForm form, Model model) { model.addAttribute("model", assessmentAssignmentModelPopulator.populateModel(assessmentId)); return "assessment/assessment-invitation"; } @GetMapping("assignment") String viewAssignment(@PathVariable("assessmentId") Long assessmentId,
@ModelAttribute(name = "form", binding = false) AssessmentAssignmentForm form,
Model model); @PostMapping("assignment/respond") String respondToAssignment(Model model,
@PathVariable("assessmentId") long assessmentId,
@Valid @ModelAttribute("form") AssessmentAssignmentForm form,
@SuppressWarnings("UnusedParameters") BindingResult bindingResult,
ValidationHandler validationHandler); } | @Test public void viewAssignment() throws Exception { long assessmentId = 1L; long competitionId = 3L; when(assessmentService.getAssignableById(assessmentId)).thenReturn(newAssessmentResource() .withApplication(APPLICATION_ID) .withApplicationName("Application name") .withCompetition(competitionId) .build()); AssessmentAssignmentViewModel expectedViewModel = new AssessmentAssignmentViewModel(assessmentId, competitionId, "Application name", partners, leadOrganisation, "Project summary"); mockMvc.perform(get("/{assessmentId}/assignment", assessmentId)) .andExpect(status().isOk()) .andExpect(model().attribute("model", expectedViewModel)) .andExpect(view().name("assessment/assessment-invitation")).andReturn(); InOrder inOrder = inOrder(assessmentService, formInputResponseRestService, userRestService, organisationService); inOrder.verify(assessmentService).getAssignableById(assessmentId); inOrder.verify(formInputResponseRestService).getByApplicationIdAndQuestionSetupType(APPLICATION_ID, PROJECT_SUMMARY); inOrder.verify(userRestService).findProcessRole(APPLICATION_ID); inOrder.verify(organisationService).getApplicationOrganisations(processRoleResources); inOrder.verify(organisationService).getApplicationLeadOrganisation(processRoleResources); inOrder.verifyNoMoreInteractions(); } |
AssessmentOverviewController { @GetMapping("/{assessmentId}") public String getOverview(Model model, @ModelAttribute(name = FORM_ATTR_NAME, binding = false) AssessmentOverviewForm form, @PathVariable("assessmentId") long assessmentId) { model.addAttribute("model", assessmentOverviewModelPopulator.populateModel(assessmentId)); return "assessment/application-overview"; } @GetMapping("/{assessmentId}") String getOverview(Model model,
@ModelAttribute(name = FORM_ATTR_NAME, binding = false) AssessmentOverviewForm form,
@PathVariable("assessmentId") long assessmentId); @GetMapping("/{assessmentId}/finances") String getFinancesSummary(Model model, @PathVariable("assessmentId") long assessmentId, UserResource user); @GetMapping("/{assessmentId}/terms-and-conditions") String getTermsAndConditions(Model model, @PathVariable("assessmentId") long assessmentId); @GetMapping("/application/{applicationId}/detailed-finances/organisation/{organisationId}") String getDetailedFinances(Model model,
@PathVariable long applicationId,
@PathVariable long organisationId,
UserResource user); @GetMapping("/{assessmentId}/application/{applicationId}/formInput/{formInputId}/file/{fileEntryId}/download") @ResponseBody ResponseEntity<ByteArrayResource> downloadAppendix(
@PathVariable("applicationId") Long applicationId,
@PathVariable("formInputId") Long formInputId,
@PathVariable("fileEntryId") Long fileEntryId,
UserResource loggedInUser); @PostMapping("/{assessmentId}/reject") String rejectInvitation(
Model model,
@Valid @ModelAttribute(FORM_ATTR_NAME) AssessmentOverviewForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable("assessmentId") Long assessmentId); } | @Test public void getOverview() throws Exception { List<AssessmentOverviewSectionViewModel> expectedSections = asList( new AssessmentOverviewSectionViewModel(sections.get(0).getId(), "Project details", "These do not need scoring.", asList( new AssessmentOverviewQuestionViewModel( questionApplicationDetails.getId(), questionApplicationDetails.getShortName(), questionApplicationDetails.getQuestionNumber(), questionApplicationDetails.getAssessorMaximumScore(), false, false, null, null), new AssessmentOverviewQuestionViewModel( questionScope.getId(), questionScope.getShortName(), questionScope.getQuestionNumber(), questionScope.getAssessorMaximumScore(), true, false, TRUE, null) ), false, false ), new AssessmentOverviewSectionViewModel(sections.get(1).getId(), "Application questions", "Each question should be given a score.", asList( new AssessmentOverviewQuestionViewModel( questionBusinessOpportunity.getId(), questionBusinessOpportunity.getShortName(), questionBusinessOpportunity.getQuestionNumber(), questionBusinessOpportunity.getAssessorMaximumScore(), true, true, null, "7"), new AssessmentOverviewQuestionViewModel( questionPotentialMarket.getId(), questionPotentialMarket.getShortName(), questionPotentialMarket.getQuestionNumber(), questionPotentialMarket.getAssessorMaximumScore(), true, false, null, null) ), false, false ), new AssessmentOverviewSectionViewModel((sections.get(2).getId()), "Finances", "Each partner is required to submit their own finances.", emptyList(), true, false ) ); List<AssessmentOverviewAppendixViewModel> expectedAppendices = singletonList( new AssessmentOverviewAppendixViewModel( potentialMarketFileEntryFormInput.getId(), 1L, "Potential market", "Project-plan.pdf", "110 KB") ); AssessmentOverviewViewModel expectedViewModel = new AssessmentOverviewViewModel( assessment.getId(), APPLICATION_ID, "Using natural gas to heat homes", competition.getId(), "Super creative competition name", 50L, 3L, expectedSections, expectedAppendices, null ); mockMvc.perform(get("/" + assessment.getId())) .andExpect(status().isOk()) .andExpect(model().attributeExists("model")) .andExpect(model().attribute("model", expectedViewModel)) .andExpect(view().name("assessment/application-overview")); InOrder inOrder = inOrder(assessmentService, competitionRestService, sectionRestService, questionRestService, formInputRestService, assessorFormInputResponseRestService, formInputResponseRestService); inOrder.verify(assessmentService).getById(assessment.getId()); inOrder.verify(competitionRestService).getCompetitionById(competition.getId()); inOrder.verify(questionRestService).findByCompetition(competition.getId()); inOrder.verify(sectionRestService).getByCompetitionIdVisibleForAssessment(competition.getId()); inOrder.verify(formInputRestService).getByCompetitionIdAndScope(competition.getId(), ASSESSMENT); inOrder.verify(assessorFormInputResponseRestService).getAllAssessorFormInputResponses(assessment.getId()); inOrder.verify(formInputResponseRestService).getResponsesByApplicationId(APPLICATION_ID); inOrder.verifyNoMoreInteractions(); } |
AssessmentOverviewController { @GetMapping("/{assessmentId}/finances") public String getFinancesSummary(Model model, @PathVariable("assessmentId") long assessmentId, UserResource user) { model.addAttribute("model", assessmentFinancesSummaryModelPopulator.populateModel(assessmentId, user)); return "assessment/application-finances-summary"; } @GetMapping("/{assessmentId}") String getOverview(Model model,
@ModelAttribute(name = FORM_ATTR_NAME, binding = false) AssessmentOverviewForm form,
@PathVariable("assessmentId") long assessmentId); @GetMapping("/{assessmentId}/finances") String getFinancesSummary(Model model, @PathVariable("assessmentId") long assessmentId, UserResource user); @GetMapping("/{assessmentId}/terms-and-conditions") String getTermsAndConditions(Model model, @PathVariable("assessmentId") long assessmentId); @GetMapping("/application/{applicationId}/detailed-finances/organisation/{organisationId}") String getDetailedFinances(Model model,
@PathVariable long applicationId,
@PathVariable long organisationId,
UserResource user); @GetMapping("/{assessmentId}/application/{applicationId}/formInput/{formInputId}/file/{fileEntryId}/download") @ResponseBody ResponseEntity<ByteArrayResource> downloadAppendix(
@PathVariable("applicationId") Long applicationId,
@PathVariable("formInputId") Long formInputId,
@PathVariable("fileEntryId") Long fileEntryId,
UserResource loggedInUser); @PostMapping("/{assessmentId}/reject") String rejectInvitation(
Model model,
@Valid @ModelAttribute(FORM_ATTR_NAME) AssessmentOverviewForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable("assessmentId") Long assessmentId); } | @Test public void getFinancesSummary() throws Exception { setupCompetition(); setupApplicationWithRoles(); ZonedDateTime now = ZonedDateTime.now(); CompetitionResource competitionResource = newCompetitionResource() .withAssessorAcceptsDate(now.minusDays(2)) .withAssessorDeadlineDate(now.plusDays(4)) .withFundingType(GRANT) .build(); competitionResource.setFinanceRowTypes(asList(FinanceRowType.values())); ApplicationResource applicationResource = applications.get(0); AssessmentResource assessmentResource = newAssessmentResource() .withApplication(applicationResource.getId()) .withApplicationName("Application name") .withCompetition(competitionResource.getId()) .withCollaborativeProject(true) .build(); ProcessRoleResource assessorRole = newProcessRoleResource().withUser(assessor).build(); when(competitionRestService.getCompetitionById(competitionResource.getId())).thenReturn(restSuccess(competitionResource)); when(assessmentService.getById(assessmentResource.getId())).thenReturn(assessmentResource); when(userRestService.findProcessRole(applicationResource.getId())).thenReturn(restSuccess(asList(assessorRole))); when(organisationService.getApplicationLeadOrganisation(asList(assessorRole))).thenReturn(Optional.ofNullable(newOrganisationResource().build())); ApplicationFinanceSummaryViewModel applicationFinanceSummaryViewModel = mock(ApplicationFinanceSummaryViewModel.class); when(applicationFinanceSummaryViewModelPopulator.populate(applicationResource.getId(), getLoggedInUser())).thenReturn(applicationFinanceSummaryViewModel); ApplicationFundingBreakdownViewModel applicationFundingBreakdownViewModel = mock(ApplicationFundingBreakdownViewModel.class); when(applicationFundingBreakdownViewModelPopulator.populate(applicationResource.getId(), getLoggedInUser())).thenReturn(applicationFundingBreakdownViewModel); AssessmentFinancesSummaryViewModel expectedViewModel = new AssessmentFinancesSummaryViewModel( assessmentResource.getId(), applicationResource.getId(), "Application name", 3, 50, GRANT, applicationFinanceSummaryViewModel, applicationFundingBreakdownViewModel); mockMvc.perform(get("/{assessmentId}/finances", assessmentResource.getId())) .andExpect(status().isOk()) .andExpect(model().attribute("model", expectedViewModel)) .andExpect(view().name("assessment/application-finances-summary")); } |
AssessmentOverviewController { @PostMapping("/{assessmentId}/reject") public String rejectInvitation( Model model, @Valid @ModelAttribute(FORM_ATTR_NAME) AssessmentOverviewForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable("assessmentId") Long assessmentId) { Supplier<String> failureView = () -> getOverview(model, form, assessmentId); return validationHandler.failNowOrSucceedWith(failureView, () -> { AssessmentResource assessment = assessmentService.getRejectableById(assessmentId); ServiceResult<Void> updateResult = assessmentService.rejectInvitation(assessment.getId(), form.getRejectReason(), form.getRejectComment()); return validationHandler.addAnyErrors(updateResult, fieldErrorsToFieldErrors(), asGlobalErrors()). failNowOrSucceedWith(failureView, () -> redirectToAssessorCompetitionDashboard(assessment.getCompetition())); }); } @GetMapping("/{assessmentId}") String getOverview(Model model,
@ModelAttribute(name = FORM_ATTR_NAME, binding = false) AssessmentOverviewForm form,
@PathVariable("assessmentId") long assessmentId); @GetMapping("/{assessmentId}/finances") String getFinancesSummary(Model model, @PathVariable("assessmentId") long assessmentId, UserResource user); @GetMapping("/{assessmentId}/terms-and-conditions") String getTermsAndConditions(Model model, @PathVariable("assessmentId") long assessmentId); @GetMapping("/application/{applicationId}/detailed-finances/organisation/{organisationId}") String getDetailedFinances(Model model,
@PathVariable long applicationId,
@PathVariable long organisationId,
UserResource user); @GetMapping("/{assessmentId}/application/{applicationId}/formInput/{formInputId}/file/{fileEntryId}/download") @ResponseBody ResponseEntity<ByteArrayResource> downloadAppendix(
@PathVariable("applicationId") Long applicationId,
@PathVariable("formInputId") Long formInputId,
@PathVariable("fileEntryId") Long fileEntryId,
UserResource loggedInUser); @PostMapping("/{assessmentId}/reject") String rejectInvitation(
Model model,
@Valid @ModelAttribute(FORM_ATTR_NAME) AssessmentOverviewForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable("assessmentId") Long assessmentId); } | @Test public void rejectInvitation() throws Exception { Long assessmentId = 1L; Long competitionId = 2L; AssessmentRejectOutcomeValue reason = CONFLICT_OF_INTEREST; String comment = String.join(" ", nCopies(100, "comment")); AssessmentResource assessment = newAssessmentResource() .with(id(assessmentId)) .withCompetition(competitionId) .build(); when(assessmentService.getRejectableById(assessmentId)).thenReturn(assessment); when(assessmentService.rejectInvitation(assessmentId, reason, comment)).thenReturn(serviceSuccess()); mockMvc.perform(post("/{assessmentId}/reject", assessmentId) .contentType(MediaType.APPLICATION_FORM_URLENCODED) .param("rejectReason", reason.name()) .param("rejectComment", comment)) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(format("/assessor/dashboard/competition/%s", competitionId))) .andReturn(); InOrder inOrder = inOrder(assessmentService); inOrder.verify(assessmentService).getRejectableById(assessmentId); inOrder.verify(assessmentService).rejectInvitation(assessmentId, reason, comment); inOrder.verifyNoMoreInteractions(); }
@Test public void rejectInvitation_eventNotAccepted() throws Exception { AssessmentRejectOutcomeValue reason = CONFLICT_OF_INTEREST; String comment = String.join(" ", nCopies(100, "comment")); when(assessmentService.getRejectableById(assessment.getId())).thenReturn(assessment); when(assessmentService.rejectInvitation(assessment.getId(), reason, comment)).thenReturn(serviceFailure(ASSESSMENT_REJECTION_FAILED)); AssessmentOverviewForm expectedForm = new AssessmentOverviewForm(); expectedForm.setRejectReason(reason); expectedForm.setRejectComment(comment); MvcResult result = mockMvc.perform(post("/{assessmentId}/reject", assessment.getId()) .contentType(MediaType.APPLICATION_FORM_URLENCODED) .param("rejectReason", reason.name()) .param("rejectComment", comment)) .andExpect(status().isOk()) .andExpect(model().attribute("form", expectedForm)) .andExpect(model().hasErrors()) .andExpect(model().attributeHasFieldErrors("form")) .andExpect(view().name("assessment/application-overview")) .andReturn(); AssessmentOverviewForm form = (AssessmentOverviewForm) result.getModelAndView().getModel().get("form"); BindingResult bindingResult = form.getBindingResult(); assertEquals(1, bindingResult.getGlobalErrorCount()); assertEquals(0, bindingResult.getFieldErrorCount()); assertEquals(ASSESSMENT_REJECTION_FAILED.name(), bindingResult.getGlobalError().getCode()); InOrder inOrder = inOrder(assessmentService, competitionRestService, sectionRestService, questionRestService, formInputRestService, assessorFormInputResponseRestService, formInputResponseRestService); inOrder.verify(assessmentService).getRejectableById(assessment.getId()); inOrder.verify(assessmentService).rejectInvitation(assessment.getId(), reason, comment); inOrder.verify(assessmentService).getById(assessment.getId()); inOrder.verify(competitionRestService).getCompetitionById(competition.getId()); inOrder.verify(questionRestService).findByCompetition(competition.getId()); inOrder.verify(sectionRestService).getByCompetitionIdVisibleForAssessment(competition.getId()); inOrder.verify(formInputRestService).getByCompetitionIdAndScope(competition.getId(), ASSESSMENT); inOrder.verify(assessorFormInputResponseRestService).getAllAssessorFormInputResponses(assessment.getId()); inOrder.verify(formInputResponseRestService).getResponsesByApplicationId(APPLICATION_ID); } |
AssessmentOverviewController { @GetMapping("/{assessmentId}/application/{applicationId}/formInput/{formInputId}/file/{fileEntryId}/download") public @ResponseBody ResponseEntity<ByteArrayResource> downloadAppendix( @PathVariable("applicationId") Long applicationId, @PathVariable("formInputId") Long formInputId, @PathVariable("fileEntryId") Long fileEntryId, UserResource loggedInUser) { ProcessRoleResource processRole = userRestService.findProcessRole(applicationId).getSuccess().stream() .filter(role -> loggedInUser.getId().equals(role.getUser())) .findAny() .orElseThrow(ObjectNotFoundException::new); final ByteArrayResource resource = formInputResponseRestService .getFile(formInputId, applicationId, processRole.getId(), fileEntryId).getSuccess(); final FormInputResponseFileEntryResource fileDetails = formInputResponseRestService .getFileDetails(formInputId, applicationId, processRole.getId(), fileEntryId).getSuccess(); return getFileResponseEntity(resource, fileDetails.getFileEntryResource()); } @GetMapping("/{assessmentId}") String getOverview(Model model,
@ModelAttribute(name = FORM_ATTR_NAME, binding = false) AssessmentOverviewForm form,
@PathVariable("assessmentId") long assessmentId); @GetMapping("/{assessmentId}/finances") String getFinancesSummary(Model model, @PathVariable("assessmentId") long assessmentId, UserResource user); @GetMapping("/{assessmentId}/terms-and-conditions") String getTermsAndConditions(Model model, @PathVariable("assessmentId") long assessmentId); @GetMapping("/application/{applicationId}/detailed-finances/organisation/{organisationId}") String getDetailedFinances(Model model,
@PathVariable long applicationId,
@PathVariable long organisationId,
UserResource user); @GetMapping("/{assessmentId}/application/{applicationId}/formInput/{formInputId}/file/{fileEntryId}/download") @ResponseBody ResponseEntity<ByteArrayResource> downloadAppendix(
@PathVariable("applicationId") Long applicationId,
@PathVariable("formInputId") Long formInputId,
@PathVariable("fileEntryId") Long fileEntryId,
UserResource loggedInUser); @PostMapping("/{assessmentId}/reject") String rejectInvitation(
Model model,
@Valid @ModelAttribute(FORM_ATTR_NAME) AssessmentOverviewForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable("assessmentId") Long assessmentId); } | @Test public void downloadAppendix() throws Exception { long assessmentId = 1L; long applicationId = 2L; long formInputId = 3L; long fileEntryId = 4L; UserResource assessor = getLoggedInUser(); ProcessRoleResource assessorRole = newProcessRoleResource().withUser(assessor).build(); ByteArrayResource fileContents = new ByteArrayResource("The returned file data".getBytes()); FileEntryResource fileEntry = newFileEntryResource().withMediaType("text/hello").withFilesizeBytes(1234L).build(); FormInputResponseFileEntryResource formInputResponseFileEntry = new FormInputResponseFileEntryResource(fileEntry, formInputId, applicationId, assessorRole.getId(), fileEntryId); when(userRestService.findProcessRole(applicationId)).thenReturn(restSuccess(asList(assessorRole))); when(formInputResponseRestService.getFile(formInputId, applicationId, assessorRole.getId(), fileEntryId)) .thenReturn(restSuccess(fileContents)); when(formInputResponseRestService.getFileDetails(formInputId, applicationId, assessorRole.getId(), fileEntryId)) .thenReturn(restSuccess(formInputResponseFileEntry)); mockMvc.perform(get("/{assessmentId}/application/{applicationId}/formInput/{formInputId}/file/{fileEntryId}/download", assessmentId, applicationId, formInputId, fileEntryId)) .andExpect(status().isOk()) .andExpect(content().string("The returned file data")) .andExpect(header().string("Content-Type", "text/hello")) .andExpect(header().longValue("Content-Length", "The returned file data".length())); verify(userRestService).findProcessRole(applicationId); verify(formInputResponseRestService).getFile(formInputId, applicationId, assessorRole.getId(), fileEntryId); verify(formInputResponseRestService).getFileDetails(formInputId, applicationId, assessorRole.getId(), fileEntryId); } |
AssessmentOverviewController { @GetMapping("/{assessmentId}/terms-and-conditions") public String getTermsAndConditions(Model model, @PathVariable("assessmentId") long assessmentId) { model.addAttribute("model", assessmentTermsAndConditionsModelPopulator.populate(assessmentId)); return "assessment/application-terms-and-conditions"; } @GetMapping("/{assessmentId}") String getOverview(Model model,
@ModelAttribute(name = FORM_ATTR_NAME, binding = false) AssessmentOverviewForm form,
@PathVariable("assessmentId") long assessmentId); @GetMapping("/{assessmentId}/finances") String getFinancesSummary(Model model, @PathVariable("assessmentId") long assessmentId, UserResource user); @GetMapping("/{assessmentId}/terms-and-conditions") String getTermsAndConditions(Model model, @PathVariable("assessmentId") long assessmentId); @GetMapping("/application/{applicationId}/detailed-finances/organisation/{organisationId}") String getDetailedFinances(Model model,
@PathVariable long applicationId,
@PathVariable long organisationId,
UserResource user); @GetMapping("/{assessmentId}/application/{applicationId}/formInput/{formInputId}/file/{fileEntryId}/download") @ResponseBody ResponseEntity<ByteArrayResource> downloadAppendix(
@PathVariable("applicationId") Long applicationId,
@PathVariable("formInputId") Long formInputId,
@PathVariable("fileEntryId") Long fileEntryId,
UserResource loggedInUser); @PostMapping("/{assessmentId}/reject") String rejectInvitation(
Model model,
@Valid @ModelAttribute(FORM_ATTR_NAME) AssessmentOverviewForm form,
@SuppressWarnings("unused") BindingResult bindingResult,
ValidationHandler validationHandler,
@PathVariable("assessmentId") Long assessmentId); } | @Test public void getTermsAndConditions() throws Exception { setupCompetition(); setupApplicationWithRoles(); GrantTermsAndConditionsResource grantTermsAndConditions = newGrantTermsAndConditionsResource() .withTemplate("terms-and-conditions-template") .build(); competition.setTermsAndConditions(grantTermsAndConditions); ApplicationResource applicationResource = applications.get(0); AssessmentResource assessmentResource = newAssessmentResource() .withApplication(applicationResource.getId()) .withApplicationName("Application name") .withCompetition(competitionResource.getId()) .withCollaborativeProject(true) .build(); AssessmentTermsAndConditionsViewModel expectedViewModel = new AssessmentTermsAndConditionsViewModel( assessmentResource.getId(), grantTermsAndConditions.getTemplate(), 3, 50, competitionId); when(assessmentService.getById(assessmentResource.getId())).thenReturn(assessmentResource); when(competitionRestService.getCompetitionById(assessmentResource.getCompetition())).thenReturn(restSuccess(competition)); mockMvc.perform(get("/{assessmentId}/terms-and-conditions", assessmentResource.getId())) .andExpect(status().isOk()) .andExpect(model().attribute("model", expectedViewModel)) .andExpect(view().name("assessment/application-terms-and-conditions")); InOrder inOrder = inOrder(assessmentService, competitionRestService); inOrder.verify(assessmentService).getById(assessmentResource.getId()); inOrder.verify(competitionRestService).getCompetitionById(assessmentResource.getCompetition()); inOrder.verifyNoMoreInteractions(); } |
CompetitionInviteViewModel extends BaseInviteViewModel { public Boolean isKtpCompetition() { return KTP.equals(competitionFundingType); } CompetitionInviteViewModel(String competitionInviteHash, CompetitionInviteResource invite, boolean userLoggedIn); String getCompetitionInviteHash(); ZonedDateTime getAcceptsDate(); ZonedDateTime getDeadlineDate(); ZonedDateTime getBriefingDate(); BigDecimal getAssessorPay(); Boolean isKtpCompetition(); @Override boolean equals(Object o); @Override int hashCode(); } | @Test public void testNonKtpCompetition() { String inviteHash = "invite-hash"; CompetitionInviteResource competitionInviteResource = CompetitionInviteResourceBuilder.newCompetitionInviteResource() .withCompetitionFundingType(FundingType.GRANT) .build(); CompetitionInviteViewModel viewModel = new CompetitionInviteViewModel(inviteHash, competitionInviteResource, false); assertFalse(viewModel.isKtpCompetition()); }
@Test public void testKtpCompetition() { String inviteHash = "invite-hash"; CompetitionInviteResource competitionInviteResource = CompetitionInviteResourceBuilder.newCompetitionInviteResource() .withCompetitionFundingType(FundingType.KTP) .build(); CompetitionInviteViewModel viewModel = new CompetitionInviteViewModel(inviteHash, competitionInviteResource, false); assertTrue(viewModel.isKtpCompetition()); } |
ReviewInviteController { @GetMapping("/invite/panel/{inviteHash}") public String openInvite(@PathVariable("inviteHash") String inviteHash, @ModelAttribute(name = "form", binding = false) ReviewInviteForm form, UserResource loggedInUser, Model model) { boolean userLoggedIn = loggedInUser != null; model.addAttribute("model", reviewInviteModelPopulator.populateModel(inviteHash, userLoggedIn)); return "assessor-panel-invite"; } @GetMapping("/invite/panel/{inviteHash}") String openInvite(@PathVariable("inviteHash") String inviteHash,
@ModelAttribute(name = "form", binding = false) ReviewInviteForm form,
UserResource loggedInUser,
Model model); @PostMapping("/invite/panel/{inviteHash}/decision") String handleDecision(Model model,
@PathVariable("inviteHash") String inviteHash,
UserResource loggedInUser,
@Valid @ModelAttribute("form") ReviewInviteForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @GetMapping("/invite-accept/panel/{inviteHash}/accept") @SecuredBySpring(value = "TODO", description = "TODO") @PreAuthorize("hasAuthority('assessor')") String confirmAcceptInvite(@PathVariable("inviteHash") String inviteHash); @GetMapping("/invite/panel/{inviteHash}/reject/thank-you") String rejectThankYou(@PathVariable("inviteHash") String inviteHash); @ModelAttribute("rejectionReasons") List<RejectionReasonResource> populateRejectionReasons(); } | @Test public void acceptInvite_notLoggedInAndExistingUser() throws Exception { setLoggedInUser(null); ZonedDateTime panelDate = ZonedDateTime.now(); Boolean accept = true; ReviewInviteResource inviteResource = newReviewInviteResource() .withCompetitionName("my competition") .withPanelDate(panelDate) .build(); ReviewInviteViewModel expectedViewModel = new ReviewInviteViewModel("hash", inviteResource, false); when(reviewInviteRestService.checkExistingUser("hash")).thenReturn(restSuccess(TRUE)); when(reviewInviteRestService.openInvite("hash")).thenReturn(restSuccess(inviteResource)); mockMvc.perform(post(restUrl + "{inviteHash}/decision", "hash") .contentType(MediaType.APPLICATION_FORM_URLENCODED) .param("acceptInvitation", accept.toString())) .andExpect(status().isOk()) .andExpect(model().attribute("model", expectedViewModel)) .andExpect(view().name("assessor-panel-accept-user-exists-but-not-logged-in")); InOrder inOrder = inOrder(reviewInviteRestService); inOrder.verify(reviewInviteRestService).checkExistingUser("hash"); inOrder.verify(reviewInviteRestService).openInvite("hash"); inOrder.verifyNoMoreInteractions(); }
@Test public void openInvite() throws Exception { ZonedDateTime panelDate = ZonedDateTime.now(); ReviewInviteResource inviteResource = newReviewInviteResource().withCompetitionName("my competition") .withPanelDate(panelDate) .build(); ReviewInviteViewModel expectedViewModel = new ReviewInviteViewModel("hash", inviteResource, true); when(reviewInviteRestService.openInvite("hash")).thenReturn(restSuccess(inviteResource)); mockMvc.perform(get(restUrl + "{inviteHash}", "hash")) .andExpect(status().isOk()) .andExpect(view().name("assessor-panel-invite")) .andExpect(model().attribute("model", expectedViewModel)); verify(reviewInviteRestService).openInvite("hash"); }
@Test public void openInvite_hashNotExists() throws Exception { when(reviewInviteRestService.openInvite("notExistHash")).thenReturn(restFailure(notFoundError(ReviewInviteResource.class, "notExistHash"))); mockMvc.perform(get(restUrl + "{inviteHash}", "notExistHash")) .andExpect(model().attributeDoesNotExist("model")) .andExpect(status().isNotFound()); verify(reviewInviteRestService).openInvite("notExistHash"); }
@Test public void noDecisionMade() throws Exception { ReviewInviteResource inviteResource = newReviewInviteResource().withCompetitionName("my competition").build(); when(reviewInviteRestService.openInvite("hash")).thenReturn(restSuccess(inviteResource)); ReviewInviteForm expectedForm = new ReviewInviteForm(); MvcResult result = mockMvc.perform(post(restUrl + "{inviteHash}/decision", "hash")) .andExpect(status().isOk()) .andExpect(model().hasErrors()) .andExpect(model().attributeHasFieldErrors("form", "acceptInvitation")) .andExpect(model().attribute("form", expectedForm)) .andExpect(model().attribute("rejectionReasons", rejectionReasons)) .andExpect(model().attributeExists("model")) .andExpect(view().name("assessor-panel-invite")).andReturn(); ReviewInviteViewModel model = (ReviewInviteViewModel) result.getModelAndView().getModel().get("model"); assertEquals("hash", model.getPanelInviteHash()); assertEquals("my competition", model.getCompetitionName()); ReviewInviteForm form = (ReviewInviteForm) result.getModelAndView().getModel().get("form"); BindingResult bindingResult = form.getBindingResult(); assertTrue(bindingResult.hasErrors()); assertEquals(0, bindingResult.getGlobalErrorCount()); assertEquals(1, bindingResult.getFieldErrorCount()); assertTrue(bindingResult.hasFieldErrors("acceptInvitation")); assertEquals("Please indicate your decision.", bindingResult.getFieldError("acceptInvitation").getDefaultMessage()); verify(reviewInviteRestService).openInvite("hash"); verifyNoMoreInteractions(reviewInviteRestService); }
@Test public void rejectInvite_hashNotExists() throws Exception { String comment = String.join(" ", nCopies(100, "comment")); Boolean accept = false; when(reviewInviteRestService.rejectInvite("notExistHash")).thenReturn(restFailure(notFoundError(ReviewInviteResource.class, "notExistHash"))); when(reviewInviteRestService.openInvite("notExistHash")).thenReturn(restFailure(notFoundError(ReviewInviteResource.class, "notExistHash"))); mockMvc.perform(post(restUrl + "{inviteHash}/decision", "notExistHash") .contentType(MediaType.APPLICATION_FORM_URLENCODED) .param("acceptInvitation", accept.toString())) .andExpect(status().isNotFound()); InOrder inOrder = inOrder(reviewInviteRestService); inOrder.verify(reviewInviteRestService).rejectInvite("notExistHash"); inOrder.verify(reviewInviteRestService).openInvite("notExistHash"); inOrder.verifyNoMoreInteractions(); } |
ReviewInviteController { @GetMapping("/invite-accept/panel/{inviteHash}/accept") @SecuredBySpring(value = "TODO", description = "TODO") @PreAuthorize("hasAuthority('assessor')") public String confirmAcceptInvite(@PathVariable("inviteHash") String inviteHash) { inviteRestService.acceptInvite(inviteHash).getSuccess(); return "redirect:/assessor/dashboard"; } @GetMapping("/invite/panel/{inviteHash}") String openInvite(@PathVariable("inviteHash") String inviteHash,
@ModelAttribute(name = "form", binding = false) ReviewInviteForm form,
UserResource loggedInUser,
Model model); @PostMapping("/invite/panel/{inviteHash}/decision") String handleDecision(Model model,
@PathVariable("inviteHash") String inviteHash,
UserResource loggedInUser,
@Valid @ModelAttribute("form") ReviewInviteForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @GetMapping("/invite-accept/panel/{inviteHash}/accept") @SecuredBySpring(value = "TODO", description = "TODO") @PreAuthorize("hasAuthority('assessor')") String confirmAcceptInvite(@PathVariable("inviteHash") String inviteHash); @GetMapping("/invite/panel/{inviteHash}/reject/thank-you") String rejectThankYou(@PathVariable("inviteHash") String inviteHash); @ModelAttribute("rejectionReasons") List<RejectionReasonResource> populateRejectionReasons(); } | @Test public void confirmAcceptInvite() throws Exception { when(reviewInviteRestService.acceptInvite("hash")).thenReturn(restSuccess()); mockMvc.perform(get("/invite-accept/panel/{inviteHash}/accept", "hash")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl("/assessor/dashboard")); verify(reviewInviteRestService).acceptInvite("hash"); } |
SectionServiceImpl extends BaseTransactionalService implements SectionService { @Override public ServiceResult<List<SectionResource>> getByCompetitionIdVisibleForAssessment(Long competitionId) { return serviceSuccess(simpleMap(sectionRepository.findByCompetitionIdAndDisplayInAssessmentApplicationSummaryTrueOrderByPriorityAsc(competitionId), sectionMapper::mapToResource)); } @Override ServiceResult<SectionResource> getById(final Long sectionId); @Override ServiceResult<Set<Long>> getQuestionsForSectionAndSubsections(final Long sectionId); @Override ServiceResult<List<SectionResource>> getSectionsByCompetitionIdAndType(final long competitionId, final SectionType type); @Override ServiceResult<SectionResource> getNextSection(final Long sectionId); @Override ServiceResult<SectionResource> getNextSection(SectionResource section); @Override ServiceResult<SectionResource> getPreviousSection(final Long sectionId); @Override ServiceResult<SectionResource> getPreviousSection(SectionResource section); @Override ServiceResult<SectionResource> getSectionByQuestionId(final Long questionId); @Override @Cacheable(cacheNames="sectionsByCompetition", key = "T(java.lang.String).format('sectionsByCompetition:%d', #competitionId)", unless = "!T(org.innovateuk.ifs.cache.CacheHelper).cacheResultIfCompetitionIsOpen(#result)") ServiceResult<List<SectionResource>> getByCompetitionId(final Long competitionId); @Override ServiceResult<List<SectionResource>> getByCompetitionIdVisibleForAssessment(Long competitionId); @Override ServiceResult<List<SectionResource>> getChildSectionsByParentId(long parentId); } | @Test public void getByCompetitionIdVisibleForAssessmentTest() throws Exception { Long competitionId = 1L; List<Section> sections = newSection().build(2); List<SectionResource> sectionResources = newSectionResource().build(2); when(sectionRepositoryMock.findByCompetitionIdAndDisplayInAssessmentApplicationSummaryTrueOrderByPriorityAsc(competitionId)).thenReturn(sections); when(sectionMapper.mapToResource(same(sections.get(0)))).thenReturn(sectionResources.get(0)); when(sectionMapper.mapToResource(same(sections.get(1)))).thenReturn(sectionResources.get(1)); ServiceResult<List<SectionResource>> result = sectionService.getByCompetitionIdVisibleForAssessment(competitionId); assertTrue(result.isSuccess()); assertEquals(sectionResources, result.getSuccess()); } |
ReviewInviteController { @GetMapping("/invite/panel/{inviteHash}/reject/thank-you") public String rejectThankYou(@PathVariable("inviteHash") String inviteHash) { return "assessor-panel-reject"; } @GetMapping("/invite/panel/{inviteHash}") String openInvite(@PathVariable("inviteHash") String inviteHash,
@ModelAttribute(name = "form", binding = false) ReviewInviteForm form,
UserResource loggedInUser,
Model model); @PostMapping("/invite/panel/{inviteHash}/decision") String handleDecision(Model model,
@PathVariable("inviteHash") String inviteHash,
UserResource loggedInUser,
@Valid @ModelAttribute("form") ReviewInviteForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @GetMapping("/invite-accept/panel/{inviteHash}/accept") @SecuredBySpring(value = "TODO", description = "TODO") @PreAuthorize("hasAuthority('assessor')") String confirmAcceptInvite(@PathVariable("inviteHash") String inviteHash); @GetMapping("/invite/panel/{inviteHash}/reject/thank-you") String rejectThankYou(@PathVariable("inviteHash") String inviteHash); @ModelAttribute("rejectionReasons") List<RejectionReasonResource> populateRejectionReasons(); } | @Test public void rejectThankYou() throws Exception { mockMvc.perform(get(restUrl + "{inviteHash}/reject/thank-you", "hash")) .andExpect(status().isOk()) .andExpect(view().name("assessor-panel-reject")) .andReturn(); } |
InterviewInviteController { @GetMapping("/invite/interview/{inviteHash}") public String openInvite(@PathVariable("inviteHash") String inviteHash, @ModelAttribute(name = "form", binding = false) InterviewInviteForm form, UserResource loggedInUser, Model model) { boolean userLoggedIn = loggedInUser != null; model.addAttribute("model", interviewInviteModelPopulator.populateModel(inviteHash, userLoggedIn)); return "assessor-interview-invite"; } @GetMapping("/invite/interview/{inviteHash}") String openInvite(@PathVariable("inviteHash") String inviteHash,
@ModelAttribute(name = "form", binding = false) InterviewInviteForm form,
UserResource loggedInUser,
Model model); @PostMapping("/invite/interview/{inviteHash}/decision") String handleDecision(Model model,
@PathVariable("inviteHash") String inviteHash,
UserResource loggedInUser,
@Valid @ModelAttribute("form") InterviewInviteForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @GetMapping("/invite-accept/interview/{inviteHash}/accept") @SecuredBySpring(value = "TODO", description = "TODO") @PreAuthorize("hasAuthority('assessor')") String confirmAcceptInvite(@PathVariable("inviteHash") String inviteHash); @GetMapping("/invite/interview/{inviteHash}/reject/thank-you") String rejectThankYou(@PathVariable("inviteHash") String inviteHash); @ModelAttribute("rejectionReasons") List<RejectionReasonResource> populateRejectionReasons(); } | @Test public void acceptInvite_notLoggedInAndExistingUser() throws Exception { setLoggedInUser(null); Boolean accept = true; InterviewInviteResource inviteResource = newInterviewInviteResource() .withCompetitionName("my competition") .build(); InterviewInviteViewModel expectedViewModel = new InterviewInviteViewModel("hash", inviteResource, false); when(interviewInviteRestService.checkExistingUser("hash")).thenReturn(restSuccess(TRUE)); when(interviewInviteRestService.openInvite("hash")).thenReturn(restSuccess(inviteResource)); mockMvc.perform(post(restUrl + "{inviteHash}/decision", "hash") .contentType(MediaType.APPLICATION_FORM_URLENCODED) .param("acceptInvitation", accept.toString())) .andExpect(status().isOk()) .andExpect(model().attribute("model", expectedViewModel)) .andExpect(view().name("assessor-interview-accept-user-exists-but-not-logged-in")); InOrder inOrder = inOrder(interviewInviteRestService); inOrder.verify(interviewInviteRestService).checkExistingUser("hash"); inOrder.verify(interviewInviteRestService).openInvite("hash"); inOrder.verifyNoMoreInteractions(); }
@Test public void openInvite() throws Exception { InterviewInviteResource inviteResource = newInterviewInviteResource().withCompetitionName("my competition") .build(); InterviewInviteViewModel expectedViewModel = new InterviewInviteViewModel("hash", inviteResource, true); when(interviewInviteRestService.openInvite("hash")).thenReturn(restSuccess(inviteResource)); mockMvc.perform(get(restUrl + "{inviteHash}", "hash")) .andExpect(status().isOk()) .andExpect(view().name("assessor-interview-invite")) .andExpect(model().attribute("model", expectedViewModel)); verify(interviewInviteRestService).openInvite("hash"); }
@Test public void openInvite_hashNotExists() throws Exception { when(interviewInviteRestService.openInvite("notExistHash")).thenReturn(restFailure(notFoundError(ReviewInviteResource.class, "notExistHash"))); mockMvc.perform(get(restUrl + "{inviteHash}", "notExistHash")) .andExpect(model().attributeDoesNotExist("model")) .andExpect(status().isNotFound()); verify(interviewInviteRestService).openInvite("notExistHash"); }
@Test public void noDecisionMade() throws Exception { InterviewInviteResource inviteResource = newInterviewInviteResource().withCompetitionName("my competition").build(); when(interviewInviteRestService.openInvite("hash")).thenReturn(restSuccess(inviteResource)); InterviewInviteForm expectedForm = new InterviewInviteForm(); MvcResult result = mockMvc.perform(post(restUrl + "{inviteHash}/decision", "hash")) .andExpect(status().isOk()) .andExpect(model().hasErrors()) .andExpect(model().attributeHasFieldErrors("form", "acceptInvitation")) .andExpect(model().attribute("form", expectedForm)) .andExpect(model().attribute("rejectionReasons", rejectionReasons)) .andExpect(model().attributeExists("model")) .andExpect(view().name("assessor-interview-invite")).andReturn(); InterviewInviteViewModel model = (InterviewInviteViewModel) result.getModelAndView().getModel().get("model"); assertEquals("hash", model.getPanelInviteHash()); assertEquals("my competition", model.getCompetitionName()); InterviewInviteForm form = (InterviewInviteForm) result.getModelAndView().getModel().get("form"); BindingResult bindingResult = form.getBindingResult(); assertTrue(bindingResult.hasErrors()); assertEquals(0, bindingResult.getGlobalErrorCount()); assertEquals(1, bindingResult.getFieldErrorCount()); assertTrue(bindingResult.hasFieldErrors("acceptInvitation")); assertEquals("Please indicate your decision.", bindingResult.getFieldError("acceptInvitation").getDefaultMessage()); verify(interviewInviteRestService).openInvite("hash"); verifyNoMoreInteractions(interviewInviteRestService); }
@Test public void rejectInvite_hashNotExists() throws Exception { String comment = String.join(" ", nCopies(100, "comment")); Boolean accept = false; when(interviewInviteRestService.rejectInvite("notExistHash")).thenReturn(restFailure(notFoundError(InterviewInviteResource.class, "notExistHash"))); when(interviewInviteRestService.openInvite("notExistHash")).thenReturn(restFailure(notFoundError(InterviewInviteResource.class, "notExistHash"))); mockMvc.perform(post(restUrl + "{inviteHash}/decision", "notExistHash") .contentType(MediaType.APPLICATION_FORM_URLENCODED) .param("acceptInvitation", accept.toString())) .andExpect(status().isNotFound()); InOrder inOrder = inOrder(interviewInviteRestService); inOrder.verify(interviewInviteRestService).rejectInvite("notExistHash"); inOrder.verify(interviewInviteRestService).openInvite("notExistHash"); inOrder.verifyNoMoreInteractions(); } |
InterviewInviteController { @GetMapping("/invite-accept/interview/{inviteHash}/accept") @SecuredBySpring(value = "TODO", description = "TODO") @PreAuthorize("hasAuthority('assessor')") public String confirmAcceptInvite(@PathVariable("inviteHash") String inviteHash) { inviteRestService.acceptInvite(inviteHash).getSuccess(); return "redirect:/assessor/dashboard"; } @GetMapping("/invite/interview/{inviteHash}") String openInvite(@PathVariable("inviteHash") String inviteHash,
@ModelAttribute(name = "form", binding = false) InterviewInviteForm form,
UserResource loggedInUser,
Model model); @PostMapping("/invite/interview/{inviteHash}/decision") String handleDecision(Model model,
@PathVariable("inviteHash") String inviteHash,
UserResource loggedInUser,
@Valid @ModelAttribute("form") InterviewInviteForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @GetMapping("/invite-accept/interview/{inviteHash}/accept") @SecuredBySpring(value = "TODO", description = "TODO") @PreAuthorize("hasAuthority('assessor')") String confirmAcceptInvite(@PathVariable("inviteHash") String inviteHash); @GetMapping("/invite/interview/{inviteHash}/reject/thank-you") String rejectThankYou(@PathVariable("inviteHash") String inviteHash); @ModelAttribute("rejectionReasons") List<RejectionReasonResource> populateRejectionReasons(); } | @Test public void confirmAcceptInvite() throws Exception { when(interviewInviteRestService.acceptInvite("hash")).thenReturn(restSuccess()); mockMvc.perform(get("/invite-accept/interview/{inviteHash}/accept", "hash")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl("/assessor/dashboard")); verify(interviewInviteRestService).acceptInvite("hash"); } |
SectionServiceImpl extends BaseTransactionalService implements SectionService { @Override public ServiceResult<List<SectionResource>> getChildSectionsByParentId(long parentId) { return serviceSuccess(getSection(parentId).getSuccess() .getChildSections().stream() .map(sectionMapper::mapToResource) .collect(toList())); } @Override ServiceResult<SectionResource> getById(final Long sectionId); @Override ServiceResult<Set<Long>> getQuestionsForSectionAndSubsections(final Long sectionId); @Override ServiceResult<List<SectionResource>> getSectionsByCompetitionIdAndType(final long competitionId, final SectionType type); @Override ServiceResult<SectionResource> getNextSection(final Long sectionId); @Override ServiceResult<SectionResource> getNextSection(SectionResource section); @Override ServiceResult<SectionResource> getPreviousSection(final Long sectionId); @Override ServiceResult<SectionResource> getPreviousSection(SectionResource section); @Override ServiceResult<SectionResource> getSectionByQuestionId(final Long questionId); @Override @Cacheable(cacheNames="sectionsByCompetition", key = "T(java.lang.String).format('sectionsByCompetition:%d', #competitionId)", unless = "!T(org.innovateuk.ifs.cache.CacheHelper).cacheResultIfCompetitionIsOpen(#result)") ServiceResult<List<SectionResource>> getByCompetitionId(final Long competitionId); @Override ServiceResult<List<SectionResource>> getByCompetitionIdVisibleForAssessment(Long competitionId); @Override ServiceResult<List<SectionResource>> getChildSectionsByParentId(long parentId); } | @Test public void getChildSectionsByParentId() throws Exception { List<SectionResource> childSectionResources = newSectionResource().build(2); List<Section> childSections = newSection().build(2); Section parentSection = newSection().withChildSections(childSections).build(); when(sectionRepositoryMock.findById(parentSection.getId())).thenReturn(Optional.of(parentSection)); when(sectionService.getChildSectionsByParentId(parentSection.getId())).thenReturn(serviceSuccess(childSectionResources)); when(sectionMapper.mapToResource(same(childSections.get(0)))).thenReturn(childSectionResources.get(0)); when(sectionMapper.mapToResource(same(childSections.get(1)))).thenReturn(childSectionResources.get(1)); ServiceResult<List<SectionResource>> result = sectionService.getChildSectionsByParentId(parentSection.getId()); assertTrue(result.isSuccess()); assertEquals(childSectionResources, result.getSuccess()); } |
InterviewInviteController { @GetMapping("/invite/interview/{inviteHash}/reject/thank-you") public String rejectThankYou(@PathVariable("inviteHash") String inviteHash) { return "assessor-interview-reject"; } @GetMapping("/invite/interview/{inviteHash}") String openInvite(@PathVariable("inviteHash") String inviteHash,
@ModelAttribute(name = "form", binding = false) InterviewInviteForm form,
UserResource loggedInUser,
Model model); @PostMapping("/invite/interview/{inviteHash}/decision") String handleDecision(Model model,
@PathVariable("inviteHash") String inviteHash,
UserResource loggedInUser,
@Valid @ModelAttribute("form") InterviewInviteForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @GetMapping("/invite-accept/interview/{inviteHash}/accept") @SecuredBySpring(value = "TODO", description = "TODO") @PreAuthorize("hasAuthority('assessor')") String confirmAcceptInvite(@PathVariable("inviteHash") String inviteHash); @GetMapping("/invite/interview/{inviteHash}/reject/thank-you") String rejectThankYou(@PathVariable("inviteHash") String inviteHash); @ModelAttribute("rejectionReasons") List<RejectionReasonResource> populateRejectionReasons(); } | @Test public void rejectThankYou() throws Exception { mockMvc.perform(get(restUrl + "{inviteHash}/reject/thank-you", "hash")) .andExpect(status().isOk()) .andExpect(view().name("assessor-interview-reject")) .andReturn(); } |
CompetitionInviteController { @GetMapping("/invite/competition/{inviteHash}") public String openInvite(@PathVariable("inviteHash") String inviteHash, @ModelAttribute(name = "form", binding = false) CompetitionInviteForm form, UserResource loggedInUser, Model model) { boolean userLoggedIn = loggedInUser != null; model.addAttribute("model", competitionInviteModelPopulator.populateModel(inviteHash, userLoggedIn)); return "assessor-competition-invite"; } @GetMapping("/invite/competition/{inviteHash}") String openInvite(@PathVariable("inviteHash") String inviteHash,
@ModelAttribute(name = "form", binding = false) CompetitionInviteForm form,
UserResource loggedInUser,
Model model); @PostMapping("/invite/competition/{inviteHash}/decision") String handleDecision(Model model,
@PathVariable("inviteHash") String inviteHash,
UserResource loggedInUser,
@Valid @ModelAttribute("form") CompetitionInviteForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @GetMapping("/invite-accept/competition/{inviteHash}/accept") @SecuredBySpring(value= "TODO", description = "TODO") @PreAuthorize("hasAuthority('assessor')") String confirmAcceptInvite(@PathVariable("inviteHash") String inviteHash); @GetMapping("/invite/competition/{inviteHash}/reject/thank-you") String rejectThankYou(@PathVariable("inviteHash") String inviteHash); @ModelAttribute("rejectionReasons") List<RejectionReasonResource> populateRejectionReasons(); } | @Test public void acceptInvite_notLoggedInAndExistingUser() throws Exception { setLoggedInUser(null); ZonedDateTime acceptsDate = ZonedDateTime.now(); ZonedDateTime deadlineDate = ZonedDateTime.now().plusDays(1); ZonedDateTime briefingDate = ZonedDateTime.now().plusDays(2); BigDecimal assessorPay = BigDecimal.TEN; Boolean accept = true; CompetitionInviteResource inviteResource = newCompetitionInviteResource() .withCompetitionName("my competition") .withAcceptsDate(acceptsDate).withDeadlineDate(deadlineDate) .withBriefingDate(briefingDate).withAssessorPay(assessorPay) .build(); CompetitionInviteViewModel expectedViewModel = new CompetitionInviteViewModel("hash", inviteResource, false); when(competitionInviteRestService.checkExistingUser("hash")).thenReturn(restSuccess(TRUE)); when(competitionInviteRestService.openInvite("hash")).thenReturn(restSuccess(inviteResource)); mockMvc.perform(post(restUrl + "{inviteHash}/decision", "hash") .contentType(MediaType.APPLICATION_FORM_URLENCODED) .param("acceptInvitation", accept.toString())) .andExpect(status().isOk()) .andExpect(model().attribute("model", expectedViewModel)) .andExpect(view().name("assessor-competition-accept-user-exists-but-not-logged-in")); InOrder inOrder = inOrder(competitionInviteRestService); inOrder.verify(competitionInviteRestService).checkExistingUser("hash"); inOrder.verify(competitionInviteRestService).openInvite("hash"); inOrder.verifyNoMoreInteractions(); }
@Test public void openInvite() throws Exception { ZonedDateTime acceptsDate = ZonedDateTime.now(); ZonedDateTime deadlineDate = ZonedDateTime.now().plusDays(1); ZonedDateTime briefingDate = ZonedDateTime.now().plusDays(2); BigDecimal assessorPay = BigDecimal.TEN; CompetitionInviteResource inviteResource = newCompetitionInviteResource().withCompetitionName("my competition") .withAcceptsDate(acceptsDate).withDeadlineDate(deadlineDate) .withBriefingDate(briefingDate).withAssessorPay(assessorPay).build(); CompetitionInviteViewModel expectedViewModel = new CompetitionInviteViewModel("hash", inviteResource, true); when(competitionInviteRestService.openInvite("hash")).thenReturn(restSuccess(inviteResource)); mockMvc.perform(get(restUrl + "{inviteHash}", "hash")) .andExpect(status().isOk()) .andExpect(view().name("assessor-competition-invite")) .andExpect(model().attribute("model", expectedViewModel)); verify(competitionInviteRestService).openInvite("hash"); }
@Test public void openInvite_hashNotExists() throws Exception { when(competitionInviteRestService.openInvite("notExistHash")).thenReturn(restFailure(notFoundError(CompetitionInviteResource.class, "notExistHash"))); mockMvc.perform(get(restUrl + "{inviteHash}", "notExistHash")) .andExpect(model().attributeDoesNotExist("model")) .andExpect(status().isNotFound()); verify(competitionInviteRestService).openInvite("notExistHash"); }
@Test public void noDecisionMade() throws Exception { CompetitionInviteResource inviteResource = newCompetitionInviteResource().withCompetitionName("my competition").build(); when(competitionInviteRestService.openInvite("hash")).thenReturn(restSuccess(inviteResource)); String comment = RandomStringUtils.random(5001); Boolean accept = false; CompetitionInviteForm expectedForm = new CompetitionInviteForm(); MvcResult result = mockMvc.perform(post(restUrl + "{inviteHash}/decision", "hash")) .andExpect(status().isOk()) .andExpect(model().hasErrors()) .andExpect(model().attributeHasFieldErrors("form", "acceptInvitation")) .andExpect(model().attribute("form", expectedForm)) .andExpect(model().attribute("rejectionReasons", rejectionReasons)) .andExpect(model().attributeExists("model")) .andExpect(view().name("assessor-competition-invite")).andReturn(); CompetitionInviteViewModel model = (CompetitionInviteViewModel) result.getModelAndView().getModel().get("model"); assertEquals("hash", model.getCompetitionInviteHash()); assertEquals("my competition", model.getCompetitionName()); CompetitionInviteForm form = (CompetitionInviteForm) result.getModelAndView().getModel().get("form"); BindingResult bindingResult = form.getBindingResult(); assertTrue(bindingResult.hasErrors()); assertEquals(0, bindingResult.getGlobalErrorCount()); assertEquals(1, bindingResult.getFieldErrorCount()); assertTrue(bindingResult.hasFieldErrors("acceptInvitation")); assertEquals("Please indicate your decision.", bindingResult.getFieldError("acceptInvitation").getDefaultMessage()); verify(competitionInviteRestService).openInvite("hash"); verifyNoMoreInteractions(competitionInviteRestService); }
@Test public void rejectInvite_noReason() throws Exception { Boolean accept = false; CompetitionInviteResource inviteResource = newCompetitionInviteResource().withCompetitionName("my competition").build(); when(competitionInviteRestService.openInvite("hash")).thenReturn(restSuccess(inviteResource)); String comment = String.join(" ", nCopies(100, "comment")); CompetitionInviteForm expectedForm = new CompetitionInviteForm(); expectedForm.setAcceptInvitation(accept); expectedForm.setRejectComment(comment); MvcResult result = mockMvc.perform(post(restUrl + "{inviteHash}/decision", "hash") .contentType(MediaType.APPLICATION_FORM_URLENCODED) .param("acceptInvitation", accept.toString()) .param("rejectComment", comment)) .andExpect(status().isOk()) .andExpect(model().attribute("form", expectedForm)) .andExpect(model().attribute("rejectionReasons", rejectionReasons)) .andExpect(model().attributeExists("model")) .andExpect(view().name("assessor-competition-invite")).andReturn(); CompetitionInviteViewModel model = (CompetitionInviteViewModel) result.getModelAndView().getModel().get("model"); assertEquals("hash", model.getCompetitionInviteHash()); assertEquals("my competition", model.getCompetitionName()); verify(competitionInviteRestService).openInvite("hash"); verifyNoMoreInteractions(competitionInviteRestService); }
@Test public void rejectInvite_exceedsCharacterSizeLimit() throws Exception { CompetitionInviteResource inviteResource = newCompetitionInviteResource().withCompetitionName("my competition").build(); when(competitionInviteRestService.openInvite("hash")).thenReturn(restSuccess(inviteResource)); String comment = RandomStringUtils.random(5001); Boolean accept = false; CompetitionInviteForm expectedForm = new CompetitionInviteForm(); expectedForm.setAcceptInvitation(accept); expectedForm.setRejectReason(newRejectionReasonResource().with(id(1L)).build()); expectedForm.setRejectComment(comment); MvcResult result = mockMvc.perform(post(restUrl + "{inviteHash}/decision", "hash") .contentType(MediaType.APPLICATION_FORM_URLENCODED) .param("acceptInvitation", accept.toString()) .param("rejectReason", "1") .param("rejectComment", comment)) .andExpect(status().isOk()) .andExpect(model().hasErrors()) .andExpect(model().attributeHasFieldErrors("form", "rejectComment")) .andExpect(model().attribute("form", expectedForm)) .andExpect(model().attribute("rejectionReasons", rejectionReasons)) .andExpect(model().attributeExists("model")) .andExpect(view().name("assessor-competition-invite")).andReturn(); CompetitionInviteViewModel model = (CompetitionInviteViewModel) result.getModelAndView().getModel().get("model"); assertEquals("hash", model.getCompetitionInviteHash()); assertEquals("my competition", model.getCompetitionName()); CompetitionInviteForm form = (CompetitionInviteForm) result.getModelAndView().getModel().get("form"); BindingResult bindingResult = form.getBindingResult(); assertTrue(bindingResult.hasErrors()); assertEquals(0, bindingResult.getGlobalErrorCount()); assertEquals(1, bindingResult.getFieldErrorCount()); assertTrue(bindingResult.hasFieldErrors("rejectComment")); assertEquals("This field cannot contain more than {1} characters.", bindingResult.getFieldError("rejectComment").getDefaultMessage()); assertEquals(5000, bindingResult.getFieldError("rejectComment").getArguments()[1]); verify(competitionInviteRestService).openInvite("hash"); verifyNoMoreInteractions(competitionInviteRestService); }
@Test public void rejectInvite_exceedsWordLimit() throws Exception { CompetitionInviteResource inviteResource = newCompetitionInviteResource().withCompetitionName("my competition").build(); when(competitionInviteRestService.openInvite("hash")).thenReturn(restSuccess(inviteResource)); String comment = String.join(" ", nCopies(101, "comment")); Boolean accept = false; CompetitionInviteForm expectedForm = new CompetitionInviteForm(); expectedForm.setAcceptInvitation(accept); expectedForm.setRejectReason(newRejectionReasonResource().with(id(1L)).build()); expectedForm.setRejectComment(comment); MvcResult result = mockMvc.perform(post(restUrl + "{inviteHash}/decision", "hash") .contentType(MediaType.APPLICATION_FORM_URLENCODED) .param("acceptInvitation", accept.toString()) .param("rejectReason", "1") .param("rejectComment", comment)) .andExpect(status().isOk()) .andExpect(model().hasErrors()) .andExpect(model().attributeHasFieldErrors("form", "rejectComment")) .andExpect(model().attribute("form", expectedForm)) .andExpect(model().attribute("rejectionReasons", rejectionReasons)) .andExpect(model().attributeExists("model")) .andExpect(view().name("assessor-competition-invite")).andReturn(); CompetitionInviteViewModel model = (CompetitionInviteViewModel) result.getModelAndView().getModel().get("model"); assertEquals("hash", model.getCompetitionInviteHash()); assertEquals("my competition", model.getCompetitionName()); CompetitionInviteForm form = (CompetitionInviteForm) result.getModelAndView().getModel().get("form"); BindingResult bindingResult = form.getBindingResult(); assertTrue(bindingResult.hasErrors()); assertEquals(0, bindingResult.getGlobalErrorCount()); assertEquals(1, bindingResult.getFieldErrorCount()); assertTrue(bindingResult.hasFieldErrors("rejectComment")); assertEquals("Maximum word count exceeded. Please reduce your word count to {1}.", bindingResult.getFieldError("rejectComment").getDefaultMessage()); assertEquals(100, bindingResult.getFieldError("rejectComment").getArguments()[1]); verify(competitionInviteRestService).openInvite("hash"); verifyNoMoreInteractions(competitionInviteRestService); }
@Test public void rejectInvite_hashNotExists() throws Exception { String comment = String.join(" ", nCopies(100, "comment")); Boolean accept = false; CompetitionRejectionResource competitionRejectionResource = new CompetitionRejectionResource(newRejectionReasonResource() .with(id(1L)) .build(), comment); when(competitionInviteRestService.rejectInvite("notExistHash", competitionRejectionResource)).thenReturn(restFailure(notFoundError(CompetitionInviteResource.class, "notExistHash"))); when(competitionInviteRestService.openInvite("notExistHash")).thenReturn(restFailure(notFoundError(CompetitionInviteResource.class, "notExistHash"))); mockMvc.perform(post(restUrl + "{inviteHash}/decision", "notExistHash") .contentType(MediaType.APPLICATION_FORM_URLENCODED) .param("acceptInvitation", accept.toString()) .param("rejectReason", "1") .param("rejectComment", comment)) .andExpect(status().isNotFound()); InOrder inOrder = inOrder(competitionInviteRestService); inOrder.verify(competitionInviteRestService).rejectInvite("notExistHash", competitionRejectionResource); inOrder.verify(competitionInviteRestService).openInvite("notExistHash"); inOrder.verifyNoMoreInteractions(); } |
CompetitionInviteController { @GetMapping("/invite-accept/competition/{inviteHash}/accept") @SecuredBySpring(value= "TODO", description = "TODO") @PreAuthorize("hasAuthority('assessor')") public String confirmAcceptInvite(@PathVariable("inviteHash") String inviteHash) { inviteRestService.acceptInvite(inviteHash).getSuccess(); return "redirect:/assessor/dashboard"; } @GetMapping("/invite/competition/{inviteHash}") String openInvite(@PathVariable("inviteHash") String inviteHash,
@ModelAttribute(name = "form", binding = false) CompetitionInviteForm form,
UserResource loggedInUser,
Model model); @PostMapping("/invite/competition/{inviteHash}/decision") String handleDecision(Model model,
@PathVariable("inviteHash") String inviteHash,
UserResource loggedInUser,
@Valid @ModelAttribute("form") CompetitionInviteForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @GetMapping("/invite-accept/competition/{inviteHash}/accept") @SecuredBySpring(value= "TODO", description = "TODO") @PreAuthorize("hasAuthority('assessor')") String confirmAcceptInvite(@PathVariable("inviteHash") String inviteHash); @GetMapping("/invite/competition/{inviteHash}/reject/thank-you") String rejectThankYou(@PathVariable("inviteHash") String inviteHash); @ModelAttribute("rejectionReasons") List<RejectionReasonResource> populateRejectionReasons(); } | @Test public void confirmAcceptInvite() throws Exception { when(competitionInviteRestService.acceptInvite("hash")).thenReturn(restSuccess()); mockMvc.perform(get("/invite-accept/competition/{inviteHash}/accept", "hash")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl("/assessor/dashboard")); verify(competitionInviteRestService).acceptInvite("hash"); } |
GrantMapper { public Grant mapToGrant(Project project) { long applicationId = project.getApplication().getId(); long competitionId = project.getApplication().getCompetition().getId(); Grant grant = new Grant(); grant.setSourceSystem("IFS"); grant.setId(applicationId); grant.setCompetitionCode(competitionId); grant.setTitle(project.getName()); grant.setGrantOfferLetterDate(project.getOfferSubmittedDate()); grant.setStartDate(project.getTargetStartDate()); grant.setDuration(project.getDurationInMonths()); FormInputResponse summaryResponse = formInputResponseRepository.findOneByApplicationIdAndFormInputDescription(applicationId, "Project summary"); grant.setSummary(summaryResponse != null ? summaryResponse.getValue() : NO_PROJECT_SUMMARY); FormInputResponse publicDescriptionResponse = formInputResponseRepository.findOneByApplicationIdAndFormInputDescription(applicationId, "Public description"); grant.setPublicDescription(publicDescriptionResponse != null ? publicDescriptionResponse.getValue() : NO_PUBLIC_DESCRIPTION); List<Participant> financeContactParticipants = simpleMap(project.getPartnerOrganisations(), partnerOrganisation -> { ProjectUser financeContact = simpleFindFirstMandatory(project.getProjectUsers(), projectUser -> projectUser.getOrganisation().getId().equals(partnerOrganisation.getOrganisation().getId()) && projectUser.getRole().isFinanceContact()); return toProjectTeamParticipant(project, partnerOrganisation, financeContact); }); PartnerOrganisation leadOrganisation = simpleFindFirstMandatory(project.getPartnerOrganisations(), PartnerOrganisation::isLeadOrganisation); ProjectUser projectManager = getOnlyElement(project.getProjectUsersWithRole(PROJECT_MANAGER)); Participant projectManagerParticipant = toProjectTeamParticipant(project, leadOrganisation, projectManager); InnovationLead innovationLead = innovationLeadRepository.getByCompetitionIdAndRole(competitionId, CompetitionParticipantRole.INNOVATION_LEAD).get(0); User innovationLeadUser = innovationLead.getUser(); Participant innovationLeadParticipant = toSimpleContactParticipant( innovationLeadUser.getId(), Role.INNOVATION_LEAD, innovationLeadUser.getEmail()); Optional<Participant> monitoringOfficerParticipant = project.getProjectMonitoringOfficer() .map(mo -> toSimpleContactParticipant(mo.getUser().getId(), Role.MONITORING_OFFICER, mo.getUser().getEmail())); List<Participant> fullParticipantList = combineLists( financeContactParticipants, singletonList(projectManagerParticipant), singletonList(innovationLeadParticipant), monitoringOfficerParticipant.map(Collections::singletonList).orElse(emptyList()) ); grant.setParticipants(fullParticipantList); return grant; } Grant mapToGrant(Project project); } | @Test public void mapToGrant() throws IOException { Project project = parameter.createProject(); when(formInputResponseRepository.findOneByApplicationIdAndFormInputDescription(project.getApplication().getId(), "Project summary")) .thenReturn(parameter.projectSummaryResponse()); when(formInputResponseRepository.findOneByApplicationIdAndFormInputDescription(project.getApplication().getId(), "Public description")) .thenReturn(parameter.publicDescriptionResponse()); when(spendProfileRepository.findOneByProjectIdAndOrganisationId(any(), any())) .thenAnswer(i -> Optional.of(parameter.createSpendProfile())); Map<FinanceRowType, FinanceRowCostCategory> industrialOrganisationFinances = asMap( FinanceRowType.FINANCE, newExcludedCostCategory().withCosts( newGrantClaimPercentage(). withGrantClaimPercentage(BigDecimal.valueOf(30)). build(1)). build()); ProjectFinanceResource projectFinance = newProjectFinanceResource() .withFinanceOrganisationDetails(industrialOrganisationFinances) .withMaximumFundingLevel(50) .build(); when(projectFinanceHandler.getProjectOrganisationFinances(any())).thenReturn(serviceSuccess(projectFinance)); List<InnovationLead> innovationLeads = newInnovationLead(). withUser(newUser().withEmailAddress("[email protected]", "[email protected]").buildArray(2, User.class)). build(2); when(innovationLeadRepository.getByCompetitionIdAndRole(project.getApplication().getCompetition().getId(), CompetitionParticipantRole.INNOVATION_LEAD)).thenReturn(innovationLeads); Grant grant = grantMapper.mapToGrant(project); if (OUTPUT_TEST_JSON) { File outDirectory = new File(OUTPUT_DIRECTORY); if (!outDirectory.exists()) { assertTrue(outDirectory.mkdir()); } Files.write(Paths.get(OUTPUT_DIRECTORY + "/grant-" + parameter.name() + ".json"), new ObjectMapper().writeValueAsString(grant).getBytes()); } assertThat(grant.getId(), equalTo(parameter.applicationId())); assertThat(grant.getCompetitionCode(), equalTo(parameter.competitionId())); assertThat(grant.getPublicDescription(), equalTo(parameter.publicDescription())); assertThat(grant.getSummary(), equalTo(parameter.projectSummary())); assertThat(grant.getStartDate(), equalTo(DEFAULT_START_DATE)); assertThat(grant.getGrantOfferLetterDate(), equalTo(DEFAULT_GOL_DATE)); assertThat(grant.getSourceSystem(), equalTo("IFS")); int expectedNumberOfParticipantRecords = 1 + (parameter.partnerOrganisationCount) + 1 + 1; assertThat(grant.getParticipants(), hasSize(expectedNumberOfParticipantRecords)); Participant projectManagerParticipant = getOnlyElement(simpleFilter(grant.getParticipants(), participant -> "Project manager".equals(participant.getContactRole()))); List<Participant> financeContactParticipants = simpleFilter(grant.getParticipants(), participant -> "Finance contact".equals(participant.getContactRole())); Participant innovationLeadParticipant = getOnlyElement(simpleFilter(grant.getParticipants(), participant -> "Innovation lead".equals(participant.getContactRole()))); Participant monitoringOfficerParticipant = getOnlyElement(simpleFilter(grant.getParticipants(), participant -> "Monitoring officer".equals(participant.getContactRole()))); assertThat(monitoringOfficerParticipant.getContactEmail(), equalTo("[email protected]")); assertThat(projectManagerParticipant.getContactEmail(), equalTo("[email protected]")); assertThat(innovationLeadParticipant.getContactEmail(), equalTo("[email protected]")); forEachWithIndex(financeContactParticipants, (i, participant) -> { assertThat(participant.getForecasts().size(), equalTo(parameter.costCategoryCount())); Forecast overheads = participant.getForecasts().stream() .filter(forecast -> OVERHEADS.equals(forecast.getCostCategory())) .findFirst() .orElseThrow(IllegalStateException::new); assertThat(overheads.getPeriods().size(), equalTo(parameter.duration())); if (parameter.expectedOverheads().size() > i) { assertThat(overheads.getCost(), equalTo(parameter.expectedOverheads().get(i))); } if (parameter.expectedOverheadRates().size() > i) { assertThat(participant.getOverheadRate().longValue(), equalTo(parameter.expectedOverheadRates().get(i))); } }); } |
FileFunctions { public static final File pathElementsToFile(List<String> pathElements) { return new File(pathElementsToPathString(pathElements)); } private FileFunctions(); static final String pathElementsToPathString(List<String> pathElements); static final List<String> pathStringToPathElements(final String pathString); static final String pathElementsToAbsolutePathString(List<String> pathElements, String absolutePathPrefix); static final List<String> pathElementsToAbsolutePathElements(List<String> pathElements, String absolutePathPrefix); static final File pathElementsToFile(List<String> pathElements); static final Path pathElementsToPath(List<String> pathElements); } | @Test public void testPathElementsToFile() { assertEquals("path" + separator + "to" + separator + "file", FileFunctions.pathElementsToFile(asList("path", "to", "file")).getPath()); }
@Test public void testPathElementsToFileWithLeadingSeparator() { assertEquals(separator + "path" + separator + "to" + separator + "file", FileFunctions.pathElementsToFile(asList(separator + "path", "to", "file")).getPath()); }
@Test public void testPathElementsToFileWithEmptyStringList() { assertEquals("", FileFunctions.pathElementsToFile(asList()).getPath()); }
@Test public void testPathElementsToFileWithNullStringList() { assertEquals("", FileFunctions.pathElementsToFile(null).getPath()); }
@Test public void testPathElementsToFileWithNullStringElements() { assertEquals("path" + separator + "null" + separator + "file", FileFunctions.pathElementsToFile(asList("path", null, "file")).getPath()); } |
CompetitionInviteController { @GetMapping("/invite/competition/{inviteHash}/reject/thank-you") public String rejectThankYou(@PathVariable("inviteHash") String inviteHash) { return "assessor-competition-reject"; } @GetMapping("/invite/competition/{inviteHash}") String openInvite(@PathVariable("inviteHash") String inviteHash,
@ModelAttribute(name = "form", binding = false) CompetitionInviteForm form,
UserResource loggedInUser,
Model model); @PostMapping("/invite/competition/{inviteHash}/decision") String handleDecision(Model model,
@PathVariable("inviteHash") String inviteHash,
UserResource loggedInUser,
@Valid @ModelAttribute("form") CompetitionInviteForm form,
BindingResult bindingResult,
ValidationHandler validationHandler); @GetMapping("/invite-accept/competition/{inviteHash}/accept") @SecuredBySpring(value= "TODO", description = "TODO") @PreAuthorize("hasAuthority('assessor')") String confirmAcceptInvite(@PathVariable("inviteHash") String inviteHash); @GetMapping("/invite/competition/{inviteHash}/reject/thank-you") String rejectThankYou(@PathVariable("inviteHash") String inviteHash); @ModelAttribute("rejectionReasons") List<RejectionReasonResource> populateRejectionReasons(); } | @Test public void rejectThankYou() throws Exception { mockMvc.perform(get(restUrl + "{inviteHash}/reject/thank-you", "hash")) .andExpect(status().isOk()) .andExpect(view().name("assessor-competition-reject")) .andReturn(); } |
FormInputResponseServiceImpl implements FormInputResponseService { @Override public Map<Long, FormInputResponseResource> mapFormInputResponsesToFormInput(List<FormInputResponseResource> responses) { return simpleToMap( responses, response -> response.getFormInput(), response -> response ); } @Override Map<Long, FormInputResponseResource> mapFormInputResponsesToFormInput(List<FormInputResponseResource> responses); } | @Test public void mapResponsesToFormInputs() { List<FormInputResponseResource> formInputResponses = newFormInputResponseResource(). withFormInputs(3L, 2L, 1L). build(3); Map<Long, FormInputResponseResource> response = service.mapFormInputResponsesToFormInput(formInputResponses); assertEquals(formInputResponses.get(0), response.get(3L)); assertEquals(formInputResponses.get(1), response.get(2L)); assertEquals(formInputResponses.get(2), response.get(1L)); } |
InterviewFeedbackViewModelPopulator { public InterviewFeedbackViewModel populate(long applicationId, String competitionName, UserResource userResource, boolean isFeedbackReleased) { String responseFilename = ofNullable(interviewResponseRestService.findResponse(applicationId).getSuccess()) .map(FileEntryResource::getName) .orElse(null); Optional<ProcessRoleResource> role = userRestService.findProcessRole(userResource.getId(), applicationId).getOptionalSuccessObject(); String feedbackFilename = ofNullable(interviewAssignmentRestService.findFeedback(applicationId).getSuccess()) .map(FileEntryResource::getName) .orElse(null); return new InterviewFeedbackViewModel(applicationId, competitionName, responseFilename, feedbackFilename, role.map(ProcessRoleResource::getRole).map(Role::isLeadApplicant).orElse(false), isFeedbackReleased, userResource.hasRole(Role.ASSESSOR) || userResource.hasAnyRoles(Role.internalRoles()) ); } InterviewFeedbackViewModelPopulator(InterviewResponseRestService interviewResponseRestService, InterviewAssignmentRestService interviewAssignmentRestService, UserRestService userRestService); InterviewFeedbackViewModel populate(long applicationId, String competitionName, UserResource userResource, boolean isFeedbackReleased); } | @Test public void testPopulate() { long applicationId = 1L; UserResource user = newUserResource().withRolesGlobal(asList(Role.APPLICANT)).build(); ProcessRoleResource role = newProcessRoleResource().withRole(Role.LEADAPPLICANT).build(); when(interviewResponseRestService.findResponse(applicationId)).thenReturn(restSuccess(newFileEntryResource().withName("response").build())); when(interviewAssignmentRestService.findFeedback(applicationId)).thenReturn(restSuccess(newFileEntryResource().withName("feedback").build())); when(userRestService.findProcessRole(user.getId(), applicationId)).thenReturn(restSuccess(role)); InterviewFeedbackViewModel viewModel = viewModelPopulator.populate(applicationId, "CompetitionName", user, true); assertThat(viewModel.getResponseFilename(), is(equalTo("response"))); assertThat(viewModel.getFeedbackFilename(), is(equalTo("feedback"))); assertThat(viewModel.isLeadApplicant(), is(true)); assertThat(viewModel.hasResponse(), is(true)); assertThat(viewModel.hasFeedback(), is(true)); assertThat(viewModel.isFeedbackReleased(), is(true)); assertThat(viewModel.isResponseSectionEnabled(), is(true)); assertThat(viewModel.isAssessorOrAdmin(), is(false)); } |
GrantAgreementReadOnlyPopulator implements QuestionReadOnlyViewModelPopulator<GrantAgreementReadOnlyViewModel> { @Override public GrantAgreementReadOnlyViewModel populate(CompetitionResource competition, QuestionResource question, ApplicationReadOnlyData data, ApplicationReadOnlySettings settings) { Optional<FileEntryResource> grantAgreement = grantTransferRestService.findGrantAgreement(data.getApplication().getId()).getOptionalSuccessObject(); return new GrantAgreementReadOnlyViewModel(data, question, grantAgreement.map(FileEntryResource::getName).orElse(null)); } GrantAgreementReadOnlyPopulator(EuGrantTransferRestService grantTransferRestService); @Override GrantAgreementReadOnlyViewModel populate(CompetitionResource competition, QuestionResource question, ApplicationReadOnlyData data, ApplicationReadOnlySettings settings); @Override Set<QuestionSetupType> questionTypes(); } | @Test public void populate() { ApplicationResource application = newApplicationResource() .build(); CompetitionResource competition = newCompetitionResource() .build(); QuestionResource question = newQuestionResource() .withShortName("Grant agreement") .build(); FileEntryResource file = newFileEntryResource().withName("file.name").build(); when(euGrantTransferRestService.findGrantAgreement(application.getId())).thenReturn(restSuccess(file)); ApplicationReadOnlyData data = new ApplicationReadOnlyData(application, competition, newUserResource().build(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList()); GrantAgreementReadOnlyViewModel viewModel = populator.populate(competition, question, data, defaultSettings()); assertEquals("file.name", viewModel.getFilename()); assertEquals("Grant agreement", viewModel.getName()); assertEquals(application.getId(), (Long) viewModel.getApplicationId()); assertEquals(question.getId(), (Long) viewModel.getQuestionId()); assertFalse(viewModel.isComplete()); assertFalse(viewModel.isLead()); } |
GrantTransferDetailsReadOnlyPopulator implements QuestionReadOnlyViewModelPopulator<GrantTransferDetailsReadOnlyViewModel> { @Override public GrantTransferDetailsReadOnlyViewModel populate(CompetitionResource competition, QuestionResource question, ApplicationReadOnlyData data, ApplicationReadOnlySettings settings) { Optional<EuGrantTransferResource> grantTransferResource = grantTransferRestService.findDetailsByApplicationId(data.getApplication().getId()).getOptionalSuccessObject(); if (grantTransferResource.isPresent()) { return new GrantTransferDetailsReadOnlyViewModel( data, question, grantTransferResource.get().getGrantAgreementNumber(), grantTransferResource.get().getParticipantId(), grantTransferResource.get().getProjectName(), grantTransferResource.get().getProjectStartDate(), grantTransferResource.get().getProjectEndDate(), grantTransferResource.get().getFundingContribution(), grantTransferResource.get().getProjectCoordinator(), grantTransferResource .map(EuGrantTransferResource::getActionType) .orElse(null) ); } return new GrantTransferDetailsReadOnlyViewModel(data, question); } GrantTransferDetailsReadOnlyPopulator(EuGrantTransferRestService grantTransferRestService); @Override GrantTransferDetailsReadOnlyViewModel populate(CompetitionResource competition, QuestionResource question, ApplicationReadOnlyData data, ApplicationReadOnlySettings settings); @Override Set<QuestionSetupType> questionTypes(); } | @Test public void populate() { ApplicationResource application = newApplicationResource() .build(); CompetitionResource competition = newCompetitionResource() .build(); QuestionResource question = newQuestionResource() .withShortName("Application details") .build(); EuActionTypeResource actionTypeResource = new EuActionTypeResource(); when(euGrantTransferRestService.findDetailsByApplicationId(application.getId())).thenReturn(restSuccess(newEuGrantTransferResource() .withActionType(actionTypeResource) .withFundingContribution(BigDecimal.TEN) .withProjectName("project") .withProjectStartDate(LocalDate.now()) .withProjectEndDate(LocalDate.now()) .withParticipantId("123456789") .withGrantAgreementNumber("123456") .withProjectCoordinator(true) .build())); ApplicationReadOnlyData data = new ApplicationReadOnlyData(application, competition, newUserResource().build(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList()); GrantTransferDetailsReadOnlyViewModel viewModel = populator.populate(competition, question, data, defaultSettings()); assertEquals(viewModel.getActionType(), actionTypeResource); assertEquals(viewModel.getFundingContribution(), BigDecimal.TEN); assertEquals(viewModel.getProjectName(), "project"); assertEquals(viewModel.getParticipantId(), "123456789"); assertEquals(viewModel.getGrantAgreementNumber(), "123456"); assertEquals(viewModel.getProjectCoordinator(), true); assertEquals("Application details", viewModel.getName()); assertEquals(application.getId(), (Long) viewModel.getApplicationId()); assertEquals(question.getId(), (Long) viewModel.getQuestionId()); assertFalse(viewModel.isComplete()); assertFalse(viewModel.isLead()); } |
ApplicationDetailsReadOnlyViewModelPopulator implements QuestionReadOnlyViewModelPopulator<ApplicationDetailsReadOnlyViewModel> { @Override public ApplicationDetailsReadOnlyViewModel populate(CompetitionResource competition, QuestionResource question, ApplicationReadOnlyData data, ApplicationReadOnlySettings settings) { return new ApplicationDetailsReadOnlyViewModel(data, question); } @Override ApplicationDetailsReadOnlyViewModel populate(CompetitionResource competition, QuestionResource question, ApplicationReadOnlyData data, ApplicationReadOnlySettings settings); @Override Set<QuestionSetupType> questionTypes(); } | @Test public void populate() { LocalDate startDate = LocalDate.now(); ApplicationResource application = newApplicationResource() .withName("Application name") .withStartDate(startDate) .withDurationInMonths(2L) .withResubmission(true) .withPreviousApplicationNumber("1234") .withPreviousApplicationTitle("Previous") .withInnovationArea(newInnovationAreaResource().withName("Innovation area").build()) .build(); CompetitionResource competition = newCompetitionResource() .withName("Competition name") .withInnovationAreas(asSet(1L, 2L)) .withFundingType(PROCUREMENT) .build(); QuestionResource question = newQuestionResource() .withShortName("Application details") .build(); ApplicationReadOnlyData data = new ApplicationReadOnlyData(application, competition, newUserResource().build(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList()); ApplicationDetailsReadOnlyViewModel viewModel = populator.populate(competition, question, data, defaultSettings()); assertEquals("Application name", viewModel.getApplicationName()); assertEquals("Competition name", viewModel.getCompetitionName()); assertEquals(startDate, viewModel.getStartDate()); assertEquals(2L, (long) viewModel.getDuration()); assertTrue(viewModel.getResubmission()); assertEquals("1234", viewModel.getPreviousApplicationNumber()); assertEquals("Previous", viewModel.getPreviousApplicationTitle()); assertTrue(viewModel.isCanSelectInnovationArea()); assertEquals("Innovation area", viewModel.getInnovationAreaName()); assertEquals("Application details", viewModel.getName()); assertEquals(application.getId(), (Long) viewModel.getApplicationId()); assertEquals(question.getId(), (Long) viewModel.getQuestionId()); assertFalse(viewModel.isComplete()); assertFalse(viewModel.isLead()); assertTrue(viewModel.isProcurementCompetition()); }
@Test public void populateKtpCompetition() { LocalDate startDate = LocalDate.now(); ApplicationResource application = newApplicationResource() .withName("Application name") .withStartDate(startDate) .withDurationInMonths(2L) .withResubmission(true) .withPreviousApplicationNumber("1234") .withPreviousApplicationTitle("Previous") .withInnovationArea(newInnovationAreaResource().withName("Innovation area").build()) .build(); CompetitionResource competition = newCompetitionResource() .withName("Competition name") .withInnovationAreas(asSet(1L, 2L)) .withFundingType(KTP) .build(); QuestionResource question = newQuestionResource() .withShortName("Application details") .build(); ApplicationReadOnlyData data = new ApplicationReadOnlyData(application, competition, newUserResource().build(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList()); ApplicationDetailsReadOnlyViewModel viewModel = populator.populate(competition, question, data, defaultSettings()); assertEquals("Application name", viewModel.getApplicationName()); assertEquals("Competition name", viewModel.getCompetitionName()); assertEquals(startDate, viewModel.getStartDate()); assertEquals(2L, (long) viewModel.getDuration()); assertTrue(viewModel.getResubmission()); assertEquals("1234", viewModel.getPreviousApplicationNumber()); assertEquals("Previous", viewModel.getPreviousApplicationTitle()); assertTrue(viewModel.isCanSelectInnovationArea()); assertEquals("Innovation area", viewModel.getInnovationAreaName()); assertEquals("Application details", viewModel.getName()); assertEquals(application.getId(), (Long) viewModel.getApplicationId()); assertEquals(question.getId(), (Long) viewModel.getQuestionId()); assertFalse(viewModel.isComplete()); assertFalse(viewModel.isLead()); assertTrue(viewModel.isKtpCompetition()); } |
FinanceReadOnlyViewModelPopulator extends AsyncAdaptor { public FinanceReadOnlyViewModel populate(ApplicationReadOnlyData data) { CompetitionResource competition = data.getCompetition(); ApplicationResource application = data.getApplication(); Future<SectionResource> financeSection = async(() -> sectionRestService.getSectionsByCompetitionIdAndType(competition.getId(), SectionType.FINANCE).getSuccess().get(0)); Future<ApplicationFinanceSummaryViewModel> applicationFinanceSummaryViewModel = async(() -> applicationFinanceSummaryViewModelPopulator.populate(application.getId(), data.getUser())); Future<ApplicationResearchParticipationViewModel> applicationResearchParticipationViewModel = async(() -> applicationResearchParticipationViewModelPopulator.populate(application.getId())); Future<ApplicationFundingBreakdownViewModel> applicationFundingBreakdownViewModel = async(() -> applicationFundingBreakdownViewModelPopulator.populate(application.getId(), data.getUser())); return new FinanceReadOnlyViewModel( application.getId(), competition.isFullyFunded(), resolve(financeSection).getId(), resolve(applicationFinanceSummaryViewModel), resolve(applicationResearchParticipationViewModel), resolve(applicationFundingBreakdownViewModel), application.isCollaborativeProject(), competition.isKtp()); } FinanceReadOnlyViewModelPopulator(ApplicationFinanceSummaryViewModelPopulator applicationFinanceSummaryViewModelPopulator,
ApplicationFundingBreakdownViewModelPopulator applicationFundingBreakdownViewModelPopulator,
ApplicationResearchParticipationViewModelPopulator applicationResearchParticipationViewModelPopulator,
SectionRestService sectionRestService); FinanceReadOnlyViewModel populate(ApplicationReadOnlyData data); } | @Test public void populate() { setField(populator, "asyncFuturesGenerator", futuresGeneratorMock); ApplicationResource application = newApplicationResource() .build(); CompetitionResource competition = newCompetitionResource() .build(); SectionResource financeSection = newSectionResource().build(); UserResource user = newUserResource().build(); ApplicationFinanceSummaryViewModel applicationFinanceSummaryViewModel = mock(ApplicationFinanceSummaryViewModel.class); ApplicationResearchParticipationViewModel applicationResearchParticipationViewModel = mock(ApplicationResearchParticipationViewModel.class); ApplicationFundingBreakdownViewModel applicationFundingBreakdownViewModel = mock(ApplicationFundingBreakdownViewModel.class); when(sectionRestService.getSectionsByCompetitionIdAndType(competition.getId(), SectionType.FINANCE)).thenReturn(restSuccess(singletonList(financeSection))); when(applicationFinanceSummaryViewModelPopulator.populate(application.getId(), user)).thenReturn(applicationFinanceSummaryViewModel); when(applicationResearchParticipationViewModelPopulator.populate(application.getId())).thenReturn(applicationResearchParticipationViewModel); when(applicationFundingBreakdownViewModelPopulator.populate(application.getId(), user)).thenReturn(applicationFundingBreakdownViewModel); ApplicationReadOnlyData data = new ApplicationReadOnlyData(application, competition, user, emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList()); FinanceReadOnlyViewModel viewModel = populator.populate(data); assertEquals((long) financeSection.getId(), viewModel.getFinanceSectionId()); assertEquals(applicationFinanceSummaryViewModel, viewModel.getApplicationFinanceSummaryViewModel()); assertEquals(applicationFundingBreakdownViewModel, viewModel.getApplicationFundingBreakdownViewModel()); assertEquals(applicationResearchParticipationViewModel, viewModel.getApplicationResearchParticipationViewModel()); assertEquals("Finances summary", viewModel.getName()); assertEquals(application.getId(), (Long) viewModel.getApplicationId()); } |
GenericQuestionReadOnlyViewModelPopulator implements QuestionReadOnlyViewModelPopulator<GenericQuestionReadOnlyViewModel> { @Override public GenericQuestionReadOnlyViewModel populate(CompetitionResource competition, QuestionResource question, ApplicationReadOnlyData data, ApplicationReadOnlySettings settings) { Collection<FormInputResource> formInputs = data.getQuestionIdToApplicationFormInputs().get(question.getId()); Optional<FormInputResource> answerInput = formInputs.stream().filter(formInput -> formInput.getType().equals(TEXTAREA) || formInput.getType().equals(MULTIPLE_CHOICE)) .findAny(); Optional<FormInputResource> appendix = formInputs.stream().filter(formInput -> formInput.getType().equals(FILEUPLOAD)) .findAny(); Optional<FormInputResource> templateDocument = formInputs.stream().filter(formInput -> formInput.getType().equals(TEMPLATE_DOCUMENT)) .findAny(); Optional<FormInputResponseResource> textResponse = answerInput .map(input -> data.getFormInputIdToFormInputResponses().get(input.getId())); Optional<FormInputResponseResource> appendixResponse = appendix .map(input -> data.getFormInputIdToFormInputResponses().get(input.getId())); Optional<FormInputResponseResource> templateDocumentResponse = templateDocument .map(input -> data.getFormInputIdToFormInputResponses().get(input.getId())); return new GenericQuestionReadOnlyViewModel(data, question, questionName(question), question.getName(), answerInput.map(input -> input.getType().equals(FormInputType.MULTIPLE_CHOICE) ? textResponse.map(FormInputResponseResource::getMultipleChoiceOptionText).orElse(null) : textResponse.map(FormInputResponseResource::getValue).orElse(null)).orElse(null), appendixResponse.map(resp -> files(resp, question, data, settings)).orElse(Collections.emptyList()), templateDocumentResponse.flatMap(resp -> files(resp, question, data, settings).stream().findFirst()).orElse(null), templateDocument.map(FormInputResource::getDescription).orElse(null), allFeedback(data, question, settings), allScores(data, question, settings), inScope(data, settings), totalScope(data, settings), hasScope(data, question) ); } @Override GenericQuestionReadOnlyViewModel populate(CompetitionResource competition, QuestionResource question, ApplicationReadOnlyData data, ApplicationReadOnlySettings settings); @Override Set<QuestionSetupType> questionTypes(); } | @Test public void populate() { Map<Long, BigDecimal> scores = new HashMap<>(); scores.put(question.getId(), new BigDecimal("1")); Map<Long, String> feedbackStrings = new HashMap<>(); feedbackStrings.put(question.getId(), "Feedback"); FormInputResource textarea = newFormInputResource() .withType(FormInputType.TEXTAREA) .withScope(FormInputScope.APPLICATION) .withQuestion(question.getId()) .build(); FormInputResource appendix = newFormInputResource() .withType(FormInputType.FILEUPLOAD) .withScope(FormInputScope.APPLICATION) .withQuestion(question.getId()) .build(); FormInputResource templateDocument = newFormInputResource() .withType(FormInputType.TEMPLATE_DOCUMENT) .withScope(FormInputScope.APPLICATION) .withQuestion(question.getId()) .withDescription("Document Title") .build(); FormInputResource feedback = newFormInputResource() .withType(FormInputType.TEXTAREA) .withScope(FormInputScope.ASSESSMENT) .withQuestion(question.getId()) .build(); FormInputResource score = newFormInputResource() .withType(FormInputType.ASSESSOR_SCORE) .withScope(FormInputScope.ASSESSMENT) .withQuestion(question.getId()) .build(); FormInputResponseResource textareaResponse = newFormInputResponseResource() .withFormInputs(textarea.getId()) .withValue("Some text") .build(); FormInputResponseResource appendixResponse = newFormInputResponseResource() .withFormInputs(appendix.getId()) .withFileEntries(newFileEntryResource() .withName("Appendix1.pdf", "Appendix2.pdf") .build(2)) .build(); FormInputResponseResource templateDocumentResponse = newFormInputResponseResource() .withFormInputs(templateDocument.getId()) .withFileEntries(newFileEntryResource() .withName("template.pdf") .build(1)) .build(); AssessorFormInputResponseResource feedbackResponse = newAssessorFormInputResponseResource() .withFormInput(feedback.getId()) .withQuestion(question.getId()) .withValue("Feedback") .build(); AssessorFormInputResponseResource scoreResponse = newAssessorFormInputResponseResource() .withFormInput(score.getId()) .withQuestion(question.getId()) .withValue("1") .build(); ApplicationAssessmentResource assessorResponseFuture = newApplicationAssessmentResource() .withApplicationId(application.getId()) .withTestId(3L) .withAveragePercentage(new BigDecimal("50.0")) .withScores(scores) .withFeedback(feedbackStrings) .build(); ApplicationReadOnlyData data = new ApplicationReadOnlyData(application, competition, newUserResource().build(), emptyList(), emptyList(), asList(textarea, appendix, templateDocument, feedback, score), asList(textareaResponse, appendixResponse, templateDocumentResponse), emptyList(), singletonList(assessorResponseFuture)); GenericQuestionReadOnlyViewModel viewModel = populator.populate(competition, question, data, ApplicationReadOnlySettings.defaultSettings().setAssessmentId(3L)); assertEquals("Some text", viewModel.getAnswer()); assertEquals("Appendix1.pdf", viewModel.getAppendices().get(0).getFilename()); assertEquals("Appendix2.pdf", viewModel.getAppendices().get(1).getFilename()); assertEquals("Question text?", viewModel.getQuestion()); assertEquals("template.pdf", viewModel.getTemplateFile().getFilename()); assertEquals("Document Title", viewModel.getTemplateDocumentTitle()); assertEquals("1. Question", viewModel.getName()); assertEquals(application.getId(), (Long) viewModel.getApplicationId()); assertEquals(question.getId(), (Long) viewModel.getQuestionId()); assertFalse(viewModel.isComplete()); assertFalse(viewModel.isLead()); assertTrue(viewModel.hasAssessorResponse()); assertEquals("Feedback", viewModel.getFeedback().get(0)); assertEquals(new BigDecimal("1"), viewModel.getScores().get(0)); }
@Test public void populateForMultipleChoiceOptions() { FormInputResource multipleChoice = newFormInputResource() .withType(FormInputType.MULTIPLE_CHOICE) .withScope(FormInputScope.APPLICATION) .withQuestion(question.getId()) .build(); FormInputResponseResource multipleChoiceResponse = newFormInputResponseResource() .withFormInputs(multipleChoice.getId()) .withMultipleChoiceOptionText("Some text") .build(); ApplicationReadOnlyData data = new ApplicationReadOnlyData(application, competition, newUserResource().build(), emptyList(), emptyList(), asList(multipleChoice), asList(multipleChoiceResponse), emptyList(), emptyList()); GenericQuestionReadOnlyViewModel viewModel = populator.populate(competition, question, data, ApplicationReadOnlySettings.defaultSettings().setAssessmentId(1L)); assertEquals("Some text", viewModel.getAnswer()); } |
GrantServiceImpl implements GrantService { @Override @Transactional public ServiceResult<Void> sendReadyProjects() { return grantProcessService.findOneReadyToSend() .map(this::sendProject) .orElse(serviceSuccess()); } @Override @Transactional ServiceResult<Void> sendReadyProjects(); } | @Test public void sendReadyProjects() { User user = newUser() .withFirstName("A") .withLastName("B") .withEmailAddress("[email protected]") .withUid("uid") .build(); setLoggedInUser(newUserResource() .withId(user.getId()) .build()); Organisation organisation1 = newOrganisation().build(); Organisation organisation2 = newOrganisation().build(); ProjectUser projectManager = newProjectUser() .withRole(PROJECT_MANAGER) .withUser(user) .withOrganisation(organisation1) .build(); ProjectUser financeContactOrg1 = newProjectUser() .withRole(PROJECT_FINANCE_CONTACT) .withUser(newUser().withUid("financeContactOrg1").build()) .withOrganisation(organisation1) .build(); ProjectUser normalPartnerOrg1 = newProjectUser() .withRole(PROJECT_PARTNER) .withUser(newUser().withUid("normalPartnerOrg1").build()) .withOrganisation(organisation1) .build(); ProjectUser financeContactOrg2 = newProjectUser() .withRole(PROJECT_FINANCE_CONTACT) .withUser(newUser().withUid("financeContactOrg2").build()) .withOrganisation(organisation2) .build(); ProjectUser normalPartnerOrg2 = newProjectUser() .withRole(PROJECT_PARTNER) .withUser(newUser().withUid("normalPartnerOrg2").build()) .withOrganisation(organisation2) .build(); List<ProjectUser> projectUsers = asList(projectManager, financeContactOrg1, normalPartnerOrg1, financeContactOrg2, normalPartnerOrg2); Project project = newProject() .withId(1L) .withDuration(12L) .withProjectUsers(projectUsers) .withPartnerOrganisations(newPartnerOrganisation() .withOrganisation(organisation1, organisation2) .build(2) ) .withApplication( newApplication() .withId(APPLICATION_ID) .withCompetition( newCompetition().withId(2L).build()) .build()).build(); GrantProcess process = new GrantProcess(APPLICATION_ID); Grant grant = new Grant().id(APPLICATION_ID); when(projectRepository.findOneByApplicationId(APPLICATION_ID)).thenReturn(project); when(grantMapper.mapToGrant(project)).thenReturn(grant); when(grantEndpoint.send(grant)).thenReturn(serviceSuccess()); when(grantProcessService.findOneReadyToSend()).thenReturn(of(process)); ServiceResult<Void> result = service.sendReadyProjects(); assertThat(result.isSuccess(), equalTo(true)); verify(grantEndpoint, only()).send(createLambdaMatcher(matchGrant(project))); assertTrue(projectManager.getUser().hasRole(Role.LIVE_PROJECTS_USER)); assertTrue(financeContactOrg1.getUser().hasRole(Role.LIVE_PROJECTS_USER)); assertTrue(financeContactOrg2.getUser().hasRole(Role.LIVE_PROJECTS_USER)); assertFalse(normalPartnerOrg1.getUser().hasRole(Role.LIVE_PROJECTS_USER)); assertFalse(normalPartnerOrg2.getUser().hasRole(Role.LIVE_PROJECTS_USER)); verify(userService).evictUserCache("uid"); verify(userService).evictUserCache("financeContactOrg1"); verify(userService).evictUserCache("financeContactOrg2"); verifyNoMoreInteractions(userService); } |
ResearchCategoryReadOnlyViewModelPopulator implements QuestionReadOnlyViewModelPopulator<ResearchCategoryReadOnlyViewModel> { @Override public ResearchCategoryReadOnlyViewModel populate(CompetitionResource competition, QuestionResource question, ApplicationReadOnlyData data, ApplicationReadOnlySettings settings) { return new ResearchCategoryReadOnlyViewModel(data, question); } @Override ResearchCategoryReadOnlyViewModel populate(CompetitionResource competition, QuestionResource question, ApplicationReadOnlyData data, ApplicationReadOnlySettings settings); @Override Set<QuestionSetupType> questionTypes(); } | @Test public void populate() { ApplicationResource application = newApplicationResource() .withResearchCategory(newResearchCategoryResource().withName("Research category").build()) .build(); CompetitionResource competition = newCompetitionResource() .build(); QuestionResource question = newQuestionResource() .withShortName("Research category") .build(); ApplicationReadOnlyData data = new ApplicationReadOnlyData(application, competition, newUserResource().build(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList()); ResearchCategoryReadOnlyViewModel viewModel = populator.populate(competition, question, data, defaultSettings()); assertEquals("Research category", viewModel.getResearchCategory()); assertEquals("Research category", viewModel.getName()); assertEquals(application.getId(), (Long) viewModel.getApplicationId()); assertEquals(question.getId(), (Long) viewModel.getQuestionId()); assertFalse(viewModel.isComplete()); assertFalse(viewModel.isLead()); } |
ApplicationTeamReadOnlyViewModelPopulator implements QuestionReadOnlyViewModelPopulator<ApplicationTeamReadOnlyViewModel> { @Override public ApplicationTeamReadOnlyViewModel populate(CompetitionResource competition, QuestionResource question, ApplicationReadOnlyData data, ApplicationReadOnlySettings settings) { boolean internalUser = data.getUser().isInternalUser(); List<ProcessRoleResource> applicationProcessRoles = userRestService.findProcessRole(data.getApplication().getId()).getSuccess(); List<ProcessRoleResource> processRoles = applicationProcessRoles.stream() .filter(role -> applicantProcessRoles().contains(role.getRole())) .collect(toList()); List<InviteOrganisationResource> inviteOrganisationResources = emptyList(); if (showInvites(data)) { inviteOrganisationResources = inviteRestService.getInvitesByApplication(data.getApplication().getId()).getSuccess(); } Optional<ProcessRoleResource> ktaProcessRole = Optional.empty(); String ktaPhoneNumber = null; if (competition.isKtp()) { ktaProcessRole = applicationProcessRoles.stream() .filter(role -> KNOWLEDGE_TRANSFER_ADVISER == role.getRole()) .findAny(); if(internalUser && ktaProcessRole.isPresent()) { ktaPhoneNumber = getPhoneNumber(ktaProcessRole.get().getUserEmail()); } } List<OrganisationResource> organisations = organisationRestService.getOrganisationsByApplicationId(data.getApplication().getId()).getSuccess(); Multimap<Long, ProcessRoleResource> organisationToProcessRole = index(processRoles, ProcessRoleResource::getOrganisationId); Map<Long, InviteOrganisationResource> organisationToInvite = inviteOrganisationResources.stream() .filter(organisationInvite -> organisationInvite.getOrganisation() != null) .collect(toMap(InviteOrganisationResource::getOrganisation, Function.identity())); List<ApplicationTeamOrganisationReadOnlyViewModel> organisationViewModels = organisations.stream() .map(organisation -> toOrganisationTeamViewModel(data.getApplication(), organisation, organisationToProcessRole.get(organisation.getId()), organisationToInvite.get(organisation.getId()), internalUser)) .collect(toList()); organisationViewModels.addAll(inviteOrganisationResources.stream() .filter(invite -> invite.getOrganisation() == null) .map(this::toInviteOrganisationTeamViewModel) .collect(toList())); return new ApplicationTeamReadOnlyViewModel(data, question, organisationViewModels, ktaProcessRole, ktaPhoneNumber, internalUser); } @Override ApplicationTeamReadOnlyViewModel populate(CompetitionResource competition, QuestionResource question, ApplicationReadOnlyData data, ApplicationReadOnlySettings settings); @Override Set<QuestionSetupType> questionTypes(); } | @Test public void populate() { UserResource user = newUserResource().withRoleGlobal(Role.SUPPORT).build(); UserResource collaborator = newUserResource().build(); OrganisationResource leadOrganisation = newOrganisationResource() .withName("Lead") .build(); OrganisationResource collaboratorOrganisation = newOrganisationResource() .withName("Collaborator") .withIsInternational(true) .build(); ProcessRoleResource leadRole = newProcessRoleResource() .withRole(Role.LEADAPPLICANT) .withOrganisation(leadOrganisation.getId()) .withUser(user) .build(); ProcessRoleResource collaboratorRole = newProcessRoleResource() .withRole(Role.COLLABORATOR) .withOrganisation(collaboratorOrganisation.getId()) .withUser(collaborator) .build(); ApplicationInviteResource collaboratorInvite = newApplicationInviteResource() .withName("Collaborator Invite") .withStatus(InviteStatus.OPENED) .withUsers(collaborator.getId()) .build(); ApplicationInviteResource newUserInvite = newApplicationInviteResource() .withName("New user") .withStatus(InviteStatus.SENT) .withSentOn(ZonedDateTime.now().minusDays(10).minusHours(1)) .build(); InviteOrganisationResource collaboratorOrganisationInvite = newInviteOrganisationResource() .withOrganisationNameConfirmed(collaboratorOrganisation.getName()) .withOrganisation(collaboratorOrganisation.getId()) .withInviteResources(singletonList(collaboratorInvite)) .build(); InviteOrganisationResource invitedOrganisation = newInviteOrganisationResource() .withOrganisationName("New organisation") .withInviteResources(singletonList(newUserInvite)) .build(); CompetitionResource competition = newCompetitionResource() .withCollaborationLevel(CollaborationLevel.SINGLE) .build(); ApplicationResource application = newApplicationResource() .withCompetition(competition.getId()) .build(); QuestionResource question = newQuestionResource().build(); AddressResource address = newAddressResource().build(); when(userRestService.findProcessRole(application.getId())).thenReturn(restSuccess(asList(leadRole, collaboratorRole))); when(inviteRestService.getInvitesByApplication(application.getId())).thenReturn(restSuccess(asList(collaboratorOrganisationInvite, invitedOrganisation))); when(organisationRestService.getOrganisationsByApplicationId(application.getId())).thenReturn(restSuccess(asList(leadOrganisation, collaboratorOrganisation))); when(userRestService.findUserByEmail(any())).thenReturn(restSuccess(newUserResource().withPhoneNumber("999").build())); when(applicationOrganisationAddressRestService.getAddress(application.getId(), collaboratorOrganisation.getId(), OrganisationAddressType.INTERNATIONAL)).thenReturn(restSuccess(address)); ApplicationReadOnlyData data = new ApplicationReadOnlyData(application, competition, user, emptyList(), emptyList(), emptyList(), emptyList(), emptyList(), emptyList()); ApplicationTeamReadOnlyViewModel viewModel = populator.populate(competition, question, data, defaultSettings()); assertEquals((Long) application.getId(), viewModel.getApplicationId()); assertEquals((long) question.getId(), viewModel.getQuestionId()); assertEquals(3, viewModel.getOrganisations().size()); ApplicationTeamOrganisationReadOnlyViewModel leadOrganisationViewModel = viewModel.getOrganisations().get(0); assertEquals("Lead", leadOrganisationViewModel.getName()); assertEquals(1, leadOrganisationViewModel.getUsers().size()); assertTrue(leadOrganisationViewModel.isLead()); assertTrue(leadOrganisationViewModel.isExisting()); assertNull(leadOrganisationViewModel.getAddress()); ApplicationTeamUserReadOnlyViewModel leadUserViewModel = leadOrganisationViewModel.getUsers().get(0); assertTrue(leadUserViewModel.isLead()); assertFalse(leadUserViewModel.isInvite()); assertEquals("999", leadUserViewModel.getPhone()); ApplicationTeamOrganisationReadOnlyViewModel collaboratorOrganisationViewModel = viewModel.getOrganisations().get(1); assertEquals("Collaborator", collaboratorOrganisationViewModel.getName()); assertEquals(1, collaboratorOrganisationViewModel.getUsers().size()); assertFalse(collaboratorOrganisationViewModel.isLead()); assertTrue(collaboratorOrganisationViewModel.isExisting()); assertSame(address, collaboratorOrganisationViewModel.getAddress()); ApplicationTeamUserReadOnlyViewModel collaboratorUserViewModel = collaboratorOrganisationViewModel.getUsers().get(0); assertFalse(collaboratorUserViewModel.isLead()); assertFalse(collaboratorUserViewModel.isInvite()); assertEquals("999", collaboratorUserViewModel.getPhone()); ApplicationTeamOrganisationReadOnlyViewModel inviteOrganisationViewModel = viewModel.getOrganisations().get(2); assertEquals("New organisation", inviteOrganisationViewModel.getName()); assertEquals(1, inviteOrganisationViewModel.getUsers().size()); assertFalse(inviteOrganisationViewModel.isLead()); assertFalse(inviteOrganisationViewModel.isExisting()); assertNull(inviteOrganisationViewModel.getType()); assertNull(inviteOrganisationViewModel.getAddress()); ApplicationTeamUserReadOnlyViewModel inviteViewModel = inviteOrganisationViewModel.getUsers().get(0); assertTrue(inviteViewModel.isInvite()); assertEquals("New user (pending for 10 days)", inviteViewModel.getName()); } |
ApplicationReadOnlyViewModelPopulator extends AsyncAdaptor { public ApplicationReadOnlyViewModel populate(long applicationId, UserResource user, ApplicationReadOnlySettings settings) { ApplicationResource application = applicationRestService.getApplicationById(applicationId).getSuccess(); CompetitionResource competition = competitionRestService.getCompetitionById(application.getCompetition()).getSuccess(); return populate(application, competition, user, settings); } @Autowired void setPopulatorMap(List<QuestionReadOnlyViewModelPopulator<?>> populators); ApplicationReadOnlyViewModel populate(long applicationId, UserResource user, ApplicationReadOnlySettings settings); ApplicationReadOnlyViewModel populate(ApplicationResource application, CompetitionResource competition, UserResource user, ApplicationReadOnlySettings settings); } | @Test public void populate() { long applicationId = 1L; long assessmentId = 2L; UserResource user = newUserResource() .withRoleGlobal(Role.APPLICANT) .build(); ApplicationReadOnlySettings settings = ApplicationReadOnlySettings.defaultSettings() .setIncludeQuestionLinks(true) .setIncludeStatuses(true) .setAssessmentId(assessmentId); QuestionReadOnlyViewModelPopulator mockPopulator = mock(QuestionReadOnlyViewModelPopulator.class); setField(populator, "populatorMap", asMap(QuestionSetupType.APPLICATION_TEAM, mockPopulator)); setField(populator, "asyncFuturesGenerator", futuresGeneratorMock); CompetitionResource competition = newCompetitionResource().build(); ApplicationResource application = newApplicationResource() .withId(applicationId) .withCompetition(competition.getId()) .build(); List<QuestionResource> questions = newQuestionResource() .withQuestionSetupType(QuestionSetupType.APPLICATION_TEAM) .build(1); List<FormInputResource> formInputs = newFormInputResource().withQuestion(2L).build(1); List<FormInputResponseResource> responses = newFormInputResponseResource().build(1); List<QuestionStatusResource> questionStatuses = newQuestionStatusResource() .withQuestion(questions.get(0).getId()) .build(1); OrganisationResource organisation = newOrganisationResource().build(); List<SectionResource> sections = newSectionResource() .withName("Section with questions", "Finance section") .withChildSections(Collections.emptyList(), Collections.singletonList(1L)) .withQuestions(questions.stream().map(QuestionResource::getId).collect(Collectors.toList()), emptyList()) .build(2); ProcessRoleResource processRole = newProcessRoleResource().withRole(Role.LEADAPPLICANT).withUser(user).build(); Map<Long, BigDecimal> scores = new HashMap<>(); scores.put(1L, new BigDecimal("9")); Map<Long, String> feedback = new HashMap<>(); feedback.put(1L, "Hello world"); ApplicationAssessmentResource assessorResponseFuture = newApplicationAssessmentResource() .withApplicationId(applicationId) .withTestId(3L) .withAveragePercentage(new BigDecimal("50.0")) .withScores(scores) .withFeedback(feedback) .build(); ApplicationReadOnlyData expectedData = new ApplicationReadOnlyData(application, competition, user, newArrayList(processRole), questions, formInputs, responses, questionStatuses, singletonList(assessorResponseFuture)); ApplicationQuestionReadOnlyViewModel expectedRowModel = mock(ApplicationQuestionReadOnlyViewModel.class); FinanceReadOnlyViewModel expectedFinanceSummary = mock(FinanceReadOnlyViewModel.class); when(financeSummaryViewModelPopulator.populate(expectedData)).thenReturn(expectedFinanceSummary); when(applicationRestService.getApplicationById(applicationId)).thenReturn(restSuccess(application)); when(competitionRestService.getCompetitionById(competition.getId())).thenReturn(restSuccess(competition)); when(questionRestService.findByCompetition(competition.getId())).thenReturn(restSuccess(questions)); when(formInputRestService.getByCompetitionId(competition.getId())).thenReturn(restSuccess(formInputs)); when(formInputResponseRestService.getResponsesByApplicationId(application.getId())).thenReturn(restSuccess(responses)); when(organisationRestService.getByUserAndApplicationId(user.getId(), applicationId)).thenReturn(restSuccess(organisation)); when(questionStatusRestService.findByApplicationAndOrganisation(applicationId, organisation.getId())).thenReturn(restSuccess(questionStatuses)); when(sectionRestService.getByCompetition(competition.getId())).thenReturn(restSuccess(sections)); when(userRestService.findProcessRole(application.getId())).thenReturn(restSuccess(newArrayList(processRole))); when(assessorFormInputResponseRestService.getApplicationAssessment(applicationId, assessmentId)).thenReturn(restSuccess(assessorResponseFuture)); when(mockPopulator.populate(competition, questions.get(0), expectedData, settings)).thenReturn(expectedRowModel); ApplicationReadOnlyViewModel viewModel = populator.populate(applicationId, user, settings); assertEquals(viewModel.getSettings(), settings); assertEquals(viewModel.getSections().size(), 2); Iterator<ApplicationSectionReadOnlyViewModel> iterator = viewModel.getSections().iterator(); ApplicationSectionReadOnlyViewModel sectionWithQuestion = iterator.next(); assertEquals(sectionWithQuestion.getName(), "Section with questions"); assertEquals(sectionWithQuestion.getQuestions().iterator().next(), expectedRowModel); ApplicationSectionReadOnlyViewModel financeSection = iterator.next(); assertEquals(financeSection.getName(), "Finance section"); assertEquals(financeSection.getQuestions().iterator().next(), expectedFinanceSummary); verify(mockPopulator).populate(competition, questions.get(0), expectedData, settings); } |
ApplicationCompletedViewModel { public boolean completedOrMarkedAsComplete(QuestionResource questionResource, SectionResource sectionResource) throws ExecutionException, InterruptedException { return (questionResource.isMarkAsCompletedEnabled() && getMarkedAsComplete().contains(questionResource.getId())) || completedSectionsByUserOrganisation.contains(sectionResource.getId()); } ApplicationCompletedViewModel(Set<Long> sectionsMarkedAsComplete,
Future<Set<Long>> markedAsComplete,
Set<Long> completedSectionsByUserOrganisation,
boolean financeSectionComplete,
boolean financeOverviewSectionComplete); Set<Long> getSectionsMarkedAsComplete(); Set<Long> getMarkedAsComplete(); boolean completedOrMarkedAsComplete(QuestionResource questionResource, SectionResource sectionResource); boolean isFinanceSectionComplete(); boolean isFinanceOverviewSectionComplete(); } | @Test public void completedOrMarkedAsCompleteTest() throws Exception{ QuestionResource questionResource = newQuestionResource() .with(questionResource1 -> { questionResource1.setId(1L); questionResource1.setMarkAsCompletedEnabled(Boolean.TRUE); }) .build(); SectionResource sectionResource = newSectionResource().withId(54L).build(); assertTrue(viewModel.completedOrMarkedAsComplete(questionResource, sectionResource)); questionResource = newQuestionResource() .with(questionResource1 -> { questionResource1.setId(23L); questionResource1.setMarkAsCompletedEnabled(Boolean.TRUE); }) .build(); assertFalse(viewModel.completedOrMarkedAsComplete(questionResource, sectionResource)); questionResource = newQuestionResource() .with(questionResource1 -> { questionResource1.setId(3L); questionResource1.setMarkAsCompletedEnabled(Boolean.FALSE); }) .build(); assertFalse(viewModel.completedOrMarkedAsComplete(questionResource, sectionResource)); sectionResource = newSectionResource().withId(1L).build(); assertTrue(viewModel.completedOrMarkedAsComplete(questionResource, sectionResource)); } |
NavigationViewModel { public Boolean getHasNavigation(){ return !StringUtils.isEmpty(previousUrl) || !StringUtils.isEmpty(nextUrl); } String getPreviousUrl(); void setPreviousUrl(String previousUrl); String getPreviousText(); void setPreviousText(String previousText); String getNextUrl(); void setNextUrl(String nextUrl); String getNextText(); void setNextText(String nextText); Boolean getHasNavigation(); @Override boolean equals(Object o); @Override int hashCode(); } | @Test public void testGetHasNavigation() { viewModel.setNextText("Next one please"); viewModel.setNextUrl("http: assertEquals(Boolean.TRUE, viewModel.getHasNavigation()); }
@Test public void testGetHasNavigationFalse() { assertEquals(Boolean.FALSE, viewModel.getHasNavigation()); } |
AcademicCostViewModelPopulator { public AcademicCostViewModel populate(long organisationId, long applicationId, long sectionId, boolean applicant) { ApplicationResource application = applicationRestService.getApplicationById(applicationId).getSuccess(); CompetitionResource competition = competitionRestService.getCompetitionById(application.getCompetition()).getSuccess(); List<Long> completedSectionIds = sectionService.getCompleted(applicationId, organisationId); OrganisationResource organisation = organisationRestService.getOrganisationById(organisationId).getSuccess(); ApplicationFinanceResource finance = applicationFinanceRestService.getFinanceDetails(applicationId, organisationId).getSuccess(); boolean includeVat = STANDARD_WITH_VAT.equals(competition.getApplicationFinanceType()); boolean complete = completedSectionIds.contains(sectionId); boolean open = applicant && competition.isOpen() && application.isOpen(); return new AcademicCostViewModel( getYourFinancesUrl(applicationId, organisationId, applicant), application.getName(), competition.getName(), organisation.getName(), applicationId, sectionId, organisationId, finance.getId(), applicant, includeVat, open, complete); } AcademicCostViewModelPopulator(); @Autowired AcademicCostViewModelPopulator(ApplicationRestService applicationRestService, CompetitionRestService competitionRestService, SectionService sectionService, OrganisationRestService organisationRestService, ApplicationFinanceRestService applicationFinanceRestService); AcademicCostViewModel populate(long organisationId, long applicationId, long sectionId, boolean applicant); } | @Test public void populate() { CompetitionResource competition = newCompetitionResource() .withApplicationFinanceType(ApplicationFinanceType.STANDARD_WITH_VAT) .build(); OrganisationResource organisation = newOrganisationResource() .withName("orgname") .withOrganisationType(OrganisationTypeEnum.BUSINESS.getId()) .build(); ApplicationResource application = newApplicationResource() .withId(APPLICATION_ID) .withCompetition(competition.getId()) .withName("Name") .build(); ApplicationFinanceResource finance = newApplicationFinanceResource().build(); when(applicationRestService.getApplicationById(APPLICATION_ID)).thenReturn(restSuccess(application)); when(competitionRestService.getCompetitionById(application.getCompetition())).thenReturn(restSuccess(competition)); when(organisationRestService.getOrganisationById(ORGANISATION_ID)).thenReturn(restSuccess(organisation)); when(sectionService.getCompleted(APPLICATION_ID, ORGANISATION_ID)).thenReturn(asList(SECTION_ID)); when(applicationFinanceRestService.getFinanceDetails(APPLICATION_ID, ORGANISATION_ID)).thenReturn(restSuccess(finance)); AcademicCostViewModel viewModel = service.populate(ORGANISATION_ID, APPLICATION_ID, SECTION_ID, true); assertEquals(viewModel.getApplicationFinanceId(), (long) finance.getId()); assertEquals(viewModel.getApplicationId(), (Long) application.getId()); assertEquals(viewModel.getSectionId(), SECTION_ID); assertEquals(viewModel.getOrganisationId(), ORGANISATION_ID); assertEquals(viewModel.getApplicationName(), application.getName()); assertEquals(viewModel.getOrganisationName(), organisation.getName()); assertEquals(viewModel.isIncludeVat(), true); assertEquals(viewModel.isComplete(), true); assertEquals(viewModel.isOpen(), false); assertEquals(viewModel.getFinancesUrl(), String.format("/application/%d/form/FINANCE", APPLICATION_ID)); assertEquals(viewModel.isApplicant(), true); } |
ApplicationAcademicCostFormPopulator extends AbstractAcademicCostFormPopulator<ApplicationFinanceResource> { public void populate(AcademicCostForm form, long applicationId, long organisationId) { ApplicationFinanceResource finance = applicationFinanceRestService.getFinanceDetails(applicationId, organisationId).getSuccess(); populate(form, finance); } void populate(AcademicCostForm form, long applicationId, long organisationId); } | @Test public void populate() { AcademicCostForm form = new AcademicCostForm(); when(applicationFinanceRestService.getFinanceDetails(APPLICATION_ID, ORGANISATION_ID)).thenReturn(restSuccess(newApplicationFinanceResource() .withAcademicCosts() .withFinanceFileEntry(FILE_ENTRY_ID) .build())); when(fileEntryRestService.findOne(FILE_ENTRY_ID)).thenReturn(restSuccess(newFileEntryResource().withName("Filename").build())); service.populate(form, APPLICATION_ID, ORGANISATION_ID); assertEquals(form.getTsbReference(), "TSBReference"); assertEquals(form.getIncurredStaff(), new BigDecimal("100")); assertEquals(form.getIncurredOtherCosts(), new BigDecimal("100")); assertEquals(form.getIncurredTravel(), new BigDecimal("100")); assertEquals(form.getAllocatedEstateCosts(), new BigDecimal("100")); assertEquals(form.getAllocatedInvestigators(), new BigDecimal("200")); assertEquals(form.getAllocatedOtherCosts(), new BigDecimal("200")); assertEquals(form.getIndirectCosts(), new BigDecimal("100")); assertEquals(form.getExceptionsOtherCosts(), new BigDecimal("300")); assertEquals(form.getExceptionsStaff(), new BigDecimal("300")); assertEquals(form.getFilename(), "Filename"); }
@Test public void populate_emptyFinances() { AcademicCostForm form = new AcademicCostForm(); ApplicationFinanceResource finance = newApplicationFinanceResource() .withFinanceOrganisationDetails(emptyMap()).build(); when(applicationFinanceRestService.getFinanceDetails(APPLICATION_ID, ORGANISATION_ID)).thenReturn(restSuccess(finance)); when(fileEntryRestService.findOne(FILE_ENTRY_ID)).thenReturn(restFailure(new RestFailure(emptyList(), HttpStatus.NOT_FOUND))); service.populate(form, APPLICATION_ID, ORGANISATION_ID); verify(defaultFinanceRowRestService).create(argThat(hasName("tsb_reference"))); verify(defaultFinanceRowRestService).create(argThat(hasName("incurred_staff"))); verify(defaultFinanceRowRestService).create(argThat(hasName("incurred_travel_subsistence"))); verify(defaultFinanceRowRestService).create(argThat(hasName("incurred_other_costs"))); verify(defaultFinanceRowRestService).create(argThat(hasName("allocated_investigators"))); verify(defaultFinanceRowRestService).create(argThat(hasName("allocated_estates_costs"))); verify(defaultFinanceRowRestService).create(argThat(hasName("allocated_other_costs"))); verify(defaultFinanceRowRestService).create(argThat(hasName("indirect_costs"))); verify(defaultFinanceRowRestService).create(argThat(hasName("exceptions_staff"))); verify(defaultFinanceRowRestService).create(argThat(hasName("exceptions_other_costs"))); assertNull(form.getFilename()); } |
SpendProfileCalculations { BigDecimal getOverheadPercentage() { BigDecimal total = getTotal(); if (total.compareTo(BigDecimal.ZERO) == 0) { return BigDecimal.ZERO; } return getTotalOverhead().multiply(BigDecimal.valueOf(100)) .divide(total, 2, BigDecimal.ROUND_HALF_UP); } SpendProfileCalculations(SpendProfile spendProfile); } | @Test public void overheadCalculationZero() { List<Cost> costs = asList( newOverheadCost(BigDecimal.ZERO), newLabourCost(BigDecimal.ZERO) ); assertThat(BigDecimal.ZERO, Matchers.comparesEqualTo(newCalculations(costs).getOverheadPercentage())); }
@Test public void overheadCalculationFifty() { List<Cost> costs = asList( newOverheadCost(BigDecimal.ONE), newLabourCost(BigDecimal.ONE) ); assertThat(FIFTY_PERCENT, Matchers.comparesEqualTo(newCalculations(costs).getOverheadPercentage())); }
@Test public void overheadCalculationHundred() { List<Cost> costs = asList( newOverheadCost(BigDecimal.ONE), newLabourCost(BigDecimal.ZERO) ); assertThat(HUNDRED_PERCENT, Matchers.comparesEqualTo(newCalculations(costs).getOverheadPercentage())); } |
AbstractYourProjectCostsSaver extends AsyncAdaptor { public ServiceResult<Void> save(YourProjectCostsForm form, long targetId, OrganisationResource organisation, ValidationMessages messages) { BaseFinanceResource finance = getFinanceResource(targetId, organisation.getId()); List<CompletableFuture<ValidationMessages>> futures = new ArrayList<>(); if (finance.getFinanceOrganisationDetails().containsKey(FinanceRowType.LABOUR)) { futures.add(saveLabourCosts(form.getLabour(), finance)); } if (finance.getFinanceOrganisationDetails().containsKey(FinanceRowType.OVERHEADS)) { futures.add(saveOverheads(form.getOverhead(), finance)); } if (finance.getFinanceOrganisationDetails().containsKey(FinanceRowType.MATERIALS)) { futures.add(saveRows(form.getMaterialRows(), finance)); } if (finance.getFinanceOrganisationDetails().containsKey(FinanceRowType.CAPITAL_USAGE)) { futures.add(saveRows(form.getCapitalUsageRows(), finance)); } if (finance.getFinanceOrganisationDetails().containsKey(FinanceRowType.SUBCONTRACTING_COSTS)) { futures.add(saveRows(form.getSubcontractingRows(), finance)); } if (finance.getFinanceOrganisationDetails().containsKey(FinanceRowType.TRAVEL)) { futures.add(saveRows(form.getTravelRows(), finance)); } if (finance.getFinanceOrganisationDetails().containsKey(FinanceRowType.OTHER_COSTS)) { futures.add(saveRows(form.getOtherRows(), finance)); } if (finance.getFinanceOrganisationDetails().containsKey(FinanceRowType.PROCUREMENT_OVERHEADS)) { futures.add(saveRows(form.getProcurementOverheadRows(), finance)); } if (finance.getFinanceOrganisationDetails().containsKey(FinanceRowType.VAT)) { futures.add(saveVat(form.getVatForm(), finance)); } if (finance.getFinanceOrganisationDetails().containsKey(FinanceRowType.ASSOCIATE_SALARY_COSTS)) { futures.add(saveRowsAndDeleteBlank(form.getAssociateSalaryCostRows(), finance)); } if (finance.getFinanceOrganisationDetails().containsKey(FinanceRowType.ASSOCIATE_DEVELOPMENT_COSTS)) { futures.add(saveRowsAndDeleteBlank(form.getAssociateDevelopmentCostRows(), finance)); } if (finance.getFinanceOrganisationDetails().containsKey(FinanceRowType.ASSOCIATE_SUPPORT)) { futures.add(saveRows(form.getAssociateSupportCostRows(), finance)); } if (finance.getFinanceOrganisationDetails().containsKey(FinanceRowType.ESTATE_COSTS)) { futures.add(saveRows(form.getEstateCostRows(), finance)); } if (finance.getFinanceOrganisationDetails().containsKey(FinanceRowType.KNOWLEDGE_BASE)) { futures.add(saveRows(form.getKnowledgeBaseCostRows(), finance)); } if (finance.getFinanceOrganisationDetails().containsKey(FinanceRowType.CONSUMABLES)) { futures.add(saveRows(form.getConsumableCostRows(), finance)); } if (finance.getFinanceOrganisationDetails().containsKey(FinanceRowType.KTP_TRAVEL)) { futures.add(saveRows(form.getKtpTravelCostRows(), finance)); } if (finance.getFinanceOrganisationDetails().containsKey(FinanceRowType.ADDITIONAL_COMPANY_COSTS)) { futures.add(saveAdditionalCompanyCosts(form.getAdditionalCompanyCostForm(), finance)); } awaitAll(futures) .thenAccept(messages::addAll); if (messages.getErrors().isEmpty()) { return serviceSuccess(); } else { return serviceFailure(messages.getErrors()); } } ServiceResult<Void> saveType(YourProjectCostsForm form, FinanceRowType type, long targetId, long organisationId); ServiceResult<Void> save(YourProjectCostsForm form, long targetId, OrganisationResource organisation, ValidationMessages messages); void removeRowFromForm(YourProjectCostsForm form, String id); void removeFinanceRow(String id); Map.Entry<String, R> addRowForm(YourProjectCostsForm form, FinanceRowType rowType); } | @Test public void save() { YourProjectCostsForm form = new YourProjectCostsForm(); LabourForm labourForm = new LabourForm(); labourForm.setWorkingDaysPerYear(365); LabourRowForm labourRow = new LabourRowForm(); labourRow.setGross(new BigDecimal(123)); labourForm.setRows(asMap(UNSAVED_ROW_PREFIX, labourRow)); form.setLabour(labourForm); OverheadForm overheadForm = new OverheadForm(); overheadForm.setRateType(OverheadRateType.TOTAL); overheadForm.setTotalSpreadsheet(100); form.setOverhead(overheadForm); MaterialRowForm materialRow = new MaterialRowForm(); materialRow.setCost(new BigDecimal(123)); form.setMaterialRows(asMap(UNSAVED_ROW_PREFIX, materialRow)); CapitalUsageRowForm capitalUsageRow = new CapitalUsageRowForm(); capitalUsageRow.setNetValue(new BigDecimal(123)); form.setCapitalUsageRows(asMap(UNSAVED_ROW_PREFIX, capitalUsageRow)); SubcontractingRowForm subcontractingRow = new SubcontractingRowForm(); subcontractingRow.setCost(new BigDecimal(123)); form.setSubcontractingRows(asMap(UNSAVED_ROW_PREFIX, subcontractingRow)); TravelRowForm travelRow = new TravelRowForm(); travelRow.setEachCost(new BigDecimal(123)); form.setTravelRows(asMap(UNSAVED_ROW_PREFIX, travelRow)); OtherCostRowForm otherRow = new OtherCostRowForm(); otherRow.setEstimate(new BigDecimal(123)); form.setOtherRows(asMap(UNSAVED_ROW_PREFIX, otherRow)); VatForm vat = new VatForm(); vat.setRegistered(false); form.setVatForm(vat); form.getAdditionalCompanyCostForm().setAssociateSalary(new AdditionalCostAndDescription()); form.getAdditionalCompanyCostForm().setCapitalEquipment(new AdditionalCostAndDescription()); form.getAdditionalCompanyCostForm().setConsumables(new AdditionalCostAndDescription()); form.getAdditionalCompanyCostForm().setManagementSupervision(new AdditionalCostAndDescription()); form.getAdditionalCompanyCostForm().setOtherCosts(new AdditionalCostAndDescription()); form.getAdditionalCompanyCostForm().setOtherStaff(new AdditionalCostAndDescription()); FinanceRowItem mockResponse = mock(FinanceRowItem.class); when(financeRowRestService.update(any())).thenReturn(restSuccess(new ValidationMessages())); when(financeRowRestService.create(any())).thenReturn(restSuccess(mockResponse)); OrganisationResource organisationResource = newOrganisationResource().withId(2L).build(); ServiceResult<Void> result = target.save(form, 1L, organisationResource, new ValidationMessages()); assertTrue(result.isSuccess()); LabourCost workingDaysCost = ((LabourCostCategory) APPLICATION_FINANCE_RESOURCE.getFinanceOrganisationDetails().get(FinanceRowType.LABOUR)).getWorkingDaysPerYearCostItem(); assertEquals(workingDaysCost.getLabourDays(), (Integer) 365); verify(financeRowRestService).update(workingDaysCost); Overhead overhead = (Overhead) APPLICATION_FINANCE_RESOURCE.getFinanceOrganisationDetails().get(FinanceRowType.OVERHEADS).getCosts().get(0); assertEquals(overhead.getRateType(), OverheadRateType.TOTAL); assertEquals(overhead.getRate(), (Integer) 100); verify(financeRowRestService).update(overhead); verify(financeRowRestService).create(isA(LabourCost.class)); verify(financeRowRestService).create(isA(Materials.class)); verify(financeRowRestService).create(isA(CapitalUsage.class)); verify(financeRowRestService).create(isA(SubContractingCost.class)); verify(financeRowRestService).create(isA(TravelCost.class)); verify(financeRowRestService).create(isA(OtherCost.class)); verify(financeRowRestService).update(isA(Vat.class)); verify(financeRowRestService, times(6)).update(isA(AdditionalCompanyCost.class)); verify(financeRowRestService, times(6)).update(mockResponse); verifyNoMoreInteractions(financeRowRestService); } |
AbstractYourProjectCostsFormPopulator { public YourProjectCostsForm populateForm(long targetId, long organisationId) { YourProjectCostsForm form = new YourProjectCostsForm(); BaseFinanceResource finance = getFinanceResource(targetId, organisationId); form.setOverhead(overhead(finance)); form.setLabour(labour(finance)); form.setCapitalUsageRows(toRows(finance, FinanceRowType.CAPITAL_USAGE, CapitalUsageRowForm.class, CapitalUsage.class)); form.setMaterialRows(toRows(finance, FinanceRowType.MATERIALS, MaterialRowForm.class, Materials.class)); form.setOtherRows(toRows(finance, FinanceRowType.OTHER_COSTS, OtherCostRowForm.class, OtherCost.class)); form.setSubcontractingRows(toRows(finance, FinanceRowType.SUBCONTRACTING_COSTS, SubcontractingRowForm.class, SubContractingCost.class)); form.setTravelRows(toRows(finance, FinanceRowType.TRAVEL, TravelRowForm.class, TravelCost.class)); form.setVatForm(vat(finance)); form.setProcurementOverheadRows(toRows(finance, FinanceRowType.PROCUREMENT_OVERHEADS, ProcurementOverheadRowForm.class, ProcurementOverhead.class)); form.setAssociateSalaryCostRows(associateSalaryCostRows(finance)); form.setAssociateDevelopmentCostRows(associateDevelopment(finance)); form.setConsumableCostRows(toRows(finance, FinanceRowType.CONSUMABLES, ConsumablesRowForm.class, Consumable.class)); form.setKnowledgeBaseCostRows(toRows(finance, FinanceRowType.KNOWLEDGE_BASE, KnowledgeBaseCostRowForm.class, KnowledgeBaseCost.class, numberOfRows(finance, FinanceRowType.KNOWLEDGE_BASE) < 2)); form.setAssociateSupportCostRows(toRows(finance, FinanceRowType.ASSOCIATE_SUPPORT, AssociateSupportCostRowForm.class, AssociateSupportCost.class)); form.setEstateCostRows(toRows(finance, FinanceRowType.ESTATE_COSTS, EstateCostRowForm.class, EstateCost.class)); form.setKtpTravelCostRows(toRows(finance, FinanceRowType.KTP_TRAVEL, KtpTravelRowForm.class, KtpTravelCost.class, Comparator.comparing(cost -> ofNullable(cost.getType()).map(KtpTravelCostType::ordinal).orElse(2)))); form.setAdditionalCompanyCostForm(additionalCompanyCostForm(finance)); OrganisationResource organisation = organisationRestService.getOrganisationById(organisationId).getSuccess(); if (ApplicationFinanceResource.class.equals(finance.getClass()) && organisation.getOrganisationTypeEnum() == OrganisationTypeEnum.KNOWLEDGE_BASE) { form.setJustificationForm(justificationForm(finance)); } return form; } YourProjectCostsForm populateForm(long targetId, long organisationId); } | @Test public void populate() { when(overheadFileRestService.getOverheadFileDetails(any())).thenReturn(RestResult.restSuccess(newFileEntryResource().withName("filename").build())); OrganisationResource organisationResource = newOrganisationResource() .withId(2L) .withOrganisationType(1L) .build(); when(organisationRestService.getOrganisationById(organisationResource.getId())).thenReturn(restSuccess(organisationResource)); YourProjectCostsForm form = target.populateForm( 1L, organisationResource.getId()); Assert.assertEquals((Integer) 250, form.getLabour().getWorkingDaysPerYear()); Assert.assertEquals(3, form.getLabour().getRows().size()); Assert.assertEquals((Long) 1L, form.getOverhead().getCostId()); Assert.assertEquals(OverheadRateType.TOTAL, form.getOverhead().getRateType()); Assert.assertEquals("filename", form.getOverhead().getFilename()); Assert.assertEquals((Integer) 1000, form.getOverhead().getTotalSpreadsheet()); Assert.assertEquals(3, form.getMaterialRows().size()); Assert.assertEquals(3, form.getCapitalUsageRows().size()); Assert.assertEquals(3, form.getSubcontractingRows().size()); Assert.assertEquals(3, form.getTravelRows().size()); Assert.assertEquals(3, form.getOtherRows().size()); Assert.assertNotNull(form.getJustificationForm()); Assert.assertEquals(3, form.getProcurementOverheadRows().size()); Assert.assertEquals(false, form.getVatForm().getRegistered()); Assert.assertEquals(2, form.getAssociateSalaryCostRows().size()); Assert.assertEquals(2, form.getAssociateDevelopmentCostRows().size()); Assert.assertEquals(3, form.getConsumableCostRows().size()); Assert.assertEquals(2, form.getKnowledgeBaseCostRows().size()); Assert.assertEquals(3, form.getAssociateSupportCostRows().size()); Assert.assertEquals(3, form.getEstateCostRows().size()); Assert.assertEquals(3, form.getTravelRows().size()); Assert.assertEquals(3, form.getKtpTravelCostRows().size()); Assert.assertNotNull(form.getAdditionalCompanyCostForm().getAssociateSalary()); } |
YourProjectCostsViewModelPopulator { public YourProjectCostsViewModel populate(long applicationId, long sectionId, long organisationId, UserResource user) { ApplicationResource application = applicationRestService.getApplicationById(applicationId).getSuccess(); CompetitionResource competition = competitionRestService.getCompetitionById(application.getCompetition()).getSuccess(); OrganisationResource organisation = organisationRestService.getOrganisationById(organisationId).getSuccess(); List<Long> completedSectionIds = sectionService.getCompleted(applicationId, organisationId); boolean userCanEdit = !(user.isInternalUser() || user.hasRole(Role.EXTERNAL_FINANCE)) && userRestService.findProcessRole(user.getId(), applicationId).getOptionalSuccessObject() .map(role -> role.getOrganisationId() != null && role.getOrganisationId().equals(organisationId)) .orElse(false); boolean open = userCanEdit && application.isOpen() && competition.isOpen(); boolean complete = completedSectionIds.contains(sectionId); boolean includeVat = STANDARD_WITH_VAT.equals(competition.getApplicationFinanceType()); return new YourProjectCostsViewModel(applicationId, competition.getName(), sectionId, competition.getId(), organisationId, complete, open, includeVat, application.getName(), organisation.getName(), getYourFinancesUrl(applicationId, organisationId), FundingType.PROCUREMENT == competition.getFundingType(), FundingType.KTP == competition.getFundingType(), competition.getFinanceRowTypes(), competition.isOverheadsAlwaysTwenty(), CovidType.ADDITIONAL_FUNDING.equals(competition.getCovidType()), organisation.getOrganisationType().equals(OrganisationTypeEnum.KNOWLEDGE_BASE.getId())); } YourProjectCostsViewModel populate(long applicationId, long sectionId, long organisationId, UserResource user); } | @Test public void populate() { CompetitionResource competition = newCompetitionResource() .withApplicationFinanceType(ApplicationFinanceType.STANDARD_WITH_VAT) .withFundingType(FundingType.PROCUREMENT) .build(); OrganisationResource organisation = newOrganisationResource() .withName("orgname") .withOrganisationType(OrganisationTypeEnum.BUSINESS.getId()) .build(); ApplicationResource application = newApplicationResource() .withId(APPLICATION_ID) .withCompetition(competition.getId()) .withName("Name") .build(); UserResource user = newUserResource().build(); when(userRestService.findProcessRole(user.getId(), application.getId())).thenReturn(restSuccess(newProcessRoleResource() .withOrganisation(organisation.getId()) .build())); when(applicationRestService.getApplicationById(APPLICATION_ID)).thenReturn(restSuccess(application)); when(competitionRestService.getCompetitionById(application.getCompetition())).thenReturn(restSuccess(competition)); when(organisationRestService.getOrganisationById(ORGANISATION_ID)).thenReturn(restSuccess(organisation)); when(sectionService.getCompleted(APPLICATION_ID, ORGANISATION_ID)).thenReturn(singletonList(SECTION_ID)); YourProjectCostsViewModel viewModel = service.populate(APPLICATION_ID, SECTION_ID, ORGANISATION_ID, user); assertEquals((long) viewModel.getApplicationId(), APPLICATION_ID); assertEquals((long) viewModel.getSectionId(), SECTION_ID); assertEquals((long) viewModel.getCompetitionId(), (long) competition.getId()); assertEquals(viewModel.getApplicationName(), application.getName()); assertEquals(viewModel.getCompetitionId(), competition.getId()); assertEquals(viewModel.getOrganisationName(), organisation.getName()); assertTrue(viewModel.isIncludeVat()); assertTrue(viewModel.isComplete()); assertFalse(viewModel.isOpen()); assertEquals(viewModel.getFinancesUrl(), String.format("/application/%d/form/FINANCE/%d", APPLICATION_ID, ORGANISATION_ID)); assertFalse(viewModel.isInternal()); assertTrue(viewModel.isReadOnly()); assertTrue(viewModel.isProcurementCompetition()); assertEquals("state_aid_checkbox_label", viewModel.getStateAidCheckboxLabelFragment()); }
@Test public void populate_nonProcurement() { CompetitionResource competition = newCompetitionResource() .withApplicationFinanceType(ApplicationFinanceType.STANDARD_WITH_VAT) .withFundingType(FundingType.GRANT) .build(); OrganisationResource organisation = newOrganisationResource() .withName("orgname") .withOrganisationType(OrganisationTypeEnum.BUSINESS.getId()) .build(); ApplicationResource application = newApplicationResource() .withId(APPLICATION_ID) .withCompetition(competition.getId()) .withName("Name") .build(); UserResource user = newUserResource().build(); when(userRestService.findProcessRole(user.getId(), application.getId())).thenReturn(restSuccess(newProcessRoleResource() .withOrganisation(organisation.getId()) .build())); when(applicationRestService.getApplicationById(APPLICATION_ID)).thenReturn(restSuccess(application)); when(competitionRestService.getCompetitionById(application.getCompetition())).thenReturn(restSuccess(competition)); when(organisationRestService.getOrganisationById(ORGANISATION_ID)).thenReturn(restSuccess(organisation)); when(sectionService.getCompleted(APPLICATION_ID, ORGANISATION_ID)).thenReturn(singletonList(SECTION_ID)); YourProjectCostsViewModel viewModel = service.populate(APPLICATION_ID, SECTION_ID, ORGANISATION_ID, user); assertFalse(viewModel.isProcurementCompetition()); assertEquals("state_aid_checkbox_label", viewModel.getStateAidCheckboxLabelFragment()); }
@Test public void populate_ktp() { CompetitionResource competition = newCompetitionResource() .withApplicationFinanceType(ApplicationFinanceType.STANDARD_WITH_VAT) .withFundingType(FundingType.KTP) .build(); OrganisationResource organisation = newOrganisationResource() .withName("orgname") .withOrganisationType(OrganisationTypeEnum.BUSINESS.getId()) .build(); ApplicationResource application = newApplicationResource() .withId(APPLICATION_ID) .withCompetition(competition.getId()) .withName("Name") .build(); UserResource user = newUserResource().build(); when(userRestService.findProcessRole(user.getId(), application.getId())).thenReturn(restSuccess(newProcessRoleResource() .withOrganisation(organisation.getId()) .build())); when(applicationRestService.getApplicationById(APPLICATION_ID)).thenReturn(restSuccess(application)); when(competitionRestService.getCompetitionById(application.getCompetition())).thenReturn(restSuccess(competition)); when(organisationRestService.getOrganisationById(ORGANISATION_ID)).thenReturn(restSuccess(organisation)); when(sectionService.getCompleted(APPLICATION_ID, ORGANISATION_ID)).thenReturn(singletonList(SECTION_ID)); YourProjectCostsViewModel viewModel = service.populate(APPLICATION_ID, SECTION_ID, ORGANISATION_ID, user); assertTrue(viewModel.isKtpCompetition()); assertEquals("ktp_state_aid_checkbox_label", viewModel.getStateAidCheckboxLabelFragment()); } |
QuestionServiceImpl implements QuestionService { @Override public ServiceResult<Void> assign(Long questionId, Long applicationId, Long assigneeId, Long assignedById) { return questionStatusRestService.assign(questionId, applicationId, assigneeId, assignedById).toServiceResult(); } QuestionServiceImpl(QuestionRestService questionRestService,
QuestionStatusRestService questionStatusRestService,
UserRestService userRestService); @Override ServiceResult<Void> assign(Long questionId, Long applicationId, Long assigneeId, Long assignedById); @Override List<ValidationMessages> markAsComplete(Long questionId, Long applicationId, Long markedAsCompleteById); @Override void markAsIncomplete(Long questionId, Long applicationId, Long markedAsInCompleteById); @Override Map<Long, QuestionStatusResource> getQuestionStatusesForApplicationAndOrganisation(Long applicationId, Long userOrganisationId); @Override List<QuestionStatusResource> getNotificationsForUser(Collection<QuestionStatusResource> questionStatuses, Long userId); @Override void removeNotifications(List<QuestionStatusResource> questionStatuses); @Override Future<Set<Long>> getMarkedAsComplete(Long applicationId, Long organisationId); @Override QuestionResource getByIdAndAssessmentId(Long questionId, Long assessmentId); @Override Optional<QuestionResource> getNextQuestion(Long questionId); @Override Optional<QuestionResource> getPreviousQuestion(Long questionId); @Override Optional<QuestionResource> getPreviousQuestionBySection(Long sectionId); @Override Optional<QuestionResource> getNextQuestionBySection(Long sectionId); @Override ServiceResult<QuestionResource> getQuestionByCompetitionIdAndFormInputType(Long competitionId, FormInputType formInputType); @Override QuestionStatusResource getByQuestionIdAndApplicationIdAndOrganisationId(Long questionId, Long applicationId, Long organisationId); @Override Map<Long, QuestionStatusResource> getQuestionStatusesByQuestionIdsAndApplicationIdAndOrganisationId(List<Long> questionIds, Long applicationId, Long organisationId); List<QuestionStatusResource> findQuestionStatusesByQuestionAndApplicationId(Long questionId, Long applicationId); @Override void assignQuestion(Long applicationId, HttpServletRequest request, ProcessRoleResource assignedBy); @Override void assignQuestion(Long applicationId, UserResource user, HttpServletRequest request); @Override Long extractQuestionProcessRoleIdFromAssignSubmit(HttpServletRequest request); } | @Test public void testAssign() throws Exception { Long questionId = 1L; Long applicationId = 2L; Long assigneeId = 3L; Long assignedById = 4L; when(questionStatusRestService.assign(questionId, applicationId, assigneeId, assignedById)).thenReturn(restSuccess()); ServiceResult<Void> result = service.assign(questionId, applicationId, assigneeId, assignedById); assertTrue(result.isSuccess()); verify(questionStatusRestService).assign(questionId, applicationId, assigneeId, assignedById); } |
QuestionServiceImpl implements QuestionService { @Override public List<ValidationMessages> markAsComplete(Long questionId, Long applicationId, Long markedAsCompleteById) { questionStatusRestService.assign(questionId, applicationId, 0L, 0L); LOG.debug(String.format("mark question(application details) as complete %s / %s /%s ", questionId, applicationId, markedAsCompleteById)); return questionStatusRestService.markAsComplete(questionId, applicationId, markedAsCompleteById).getSuccess(); } QuestionServiceImpl(QuestionRestService questionRestService,
QuestionStatusRestService questionStatusRestService,
UserRestService userRestService); @Override ServiceResult<Void> assign(Long questionId, Long applicationId, Long assigneeId, Long assignedById); @Override List<ValidationMessages> markAsComplete(Long questionId, Long applicationId, Long markedAsCompleteById); @Override void markAsIncomplete(Long questionId, Long applicationId, Long markedAsInCompleteById); @Override Map<Long, QuestionStatusResource> getQuestionStatusesForApplicationAndOrganisation(Long applicationId, Long userOrganisationId); @Override List<QuestionStatusResource> getNotificationsForUser(Collection<QuestionStatusResource> questionStatuses, Long userId); @Override void removeNotifications(List<QuestionStatusResource> questionStatuses); @Override Future<Set<Long>> getMarkedAsComplete(Long applicationId, Long organisationId); @Override QuestionResource getByIdAndAssessmentId(Long questionId, Long assessmentId); @Override Optional<QuestionResource> getNextQuestion(Long questionId); @Override Optional<QuestionResource> getPreviousQuestion(Long questionId); @Override Optional<QuestionResource> getPreviousQuestionBySection(Long sectionId); @Override Optional<QuestionResource> getNextQuestionBySection(Long sectionId); @Override ServiceResult<QuestionResource> getQuestionByCompetitionIdAndFormInputType(Long competitionId, FormInputType formInputType); @Override QuestionStatusResource getByQuestionIdAndApplicationIdAndOrganisationId(Long questionId, Long applicationId, Long organisationId); @Override Map<Long, QuestionStatusResource> getQuestionStatusesByQuestionIdsAndApplicationIdAndOrganisationId(List<Long> questionIds, Long applicationId, Long organisationId); List<QuestionStatusResource> findQuestionStatusesByQuestionAndApplicationId(Long questionId, Long applicationId); @Override void assignQuestion(Long applicationId, HttpServletRequest request, ProcessRoleResource assignedBy); @Override void assignQuestion(Long applicationId, UserResource user, HttpServletRequest request); @Override Long extractQuestionProcessRoleIdFromAssignSubmit(HttpServletRequest request); } | @Test public void testMarkAsComplete() throws Exception { Long questionId = 1L; Long applicationId = 2L; Long markedAsCompleteById = 3L; List<ValidationMessages> validationMessages = new ArrayList<>(); when(questionStatusRestService.markAsComplete(questionId, applicationId, markedAsCompleteById)).thenReturn(restSuccess(validationMessages)); List<ValidationMessages> result = service.markAsComplete(questionId, applicationId, markedAsCompleteById); verify(questionStatusRestService).assign(questionId, applicationId, 0L, 0L); assertEquals(validationMessages, result); } |
QuestionServiceImpl implements QuestionService { @Override public void markAsIncomplete(Long questionId, Long applicationId, Long markedAsInCompleteById) { LOG.debug(String.format("mark section as incomplete %s / %s /%s ", questionId, applicationId, markedAsInCompleteById)); if (isApplicationTeamQuestion(questionId)) { questionStatusRestService.markTeamAsInComplete(questionId, applicationId, markedAsInCompleteById); } else { questionStatusRestService.markAsInComplete(questionId, applicationId, markedAsInCompleteById); } } QuestionServiceImpl(QuestionRestService questionRestService,
QuestionStatusRestService questionStatusRestService,
UserRestService userRestService); @Override ServiceResult<Void> assign(Long questionId, Long applicationId, Long assigneeId, Long assignedById); @Override List<ValidationMessages> markAsComplete(Long questionId, Long applicationId, Long markedAsCompleteById); @Override void markAsIncomplete(Long questionId, Long applicationId, Long markedAsInCompleteById); @Override Map<Long, QuestionStatusResource> getQuestionStatusesForApplicationAndOrganisation(Long applicationId, Long userOrganisationId); @Override List<QuestionStatusResource> getNotificationsForUser(Collection<QuestionStatusResource> questionStatuses, Long userId); @Override void removeNotifications(List<QuestionStatusResource> questionStatuses); @Override Future<Set<Long>> getMarkedAsComplete(Long applicationId, Long organisationId); @Override QuestionResource getByIdAndAssessmentId(Long questionId, Long assessmentId); @Override Optional<QuestionResource> getNextQuestion(Long questionId); @Override Optional<QuestionResource> getPreviousQuestion(Long questionId); @Override Optional<QuestionResource> getPreviousQuestionBySection(Long sectionId); @Override Optional<QuestionResource> getNextQuestionBySection(Long sectionId); @Override ServiceResult<QuestionResource> getQuestionByCompetitionIdAndFormInputType(Long competitionId, FormInputType formInputType); @Override QuestionStatusResource getByQuestionIdAndApplicationIdAndOrganisationId(Long questionId, Long applicationId, Long organisationId); @Override Map<Long, QuestionStatusResource> getQuestionStatusesByQuestionIdsAndApplicationIdAndOrganisationId(List<Long> questionIds, Long applicationId, Long organisationId); List<QuestionStatusResource> findQuestionStatusesByQuestionAndApplicationId(Long questionId, Long applicationId); @Override void assignQuestion(Long applicationId, HttpServletRequest request, ProcessRoleResource assignedBy); @Override void assignQuestion(Long applicationId, UserResource user, HttpServletRequest request); @Override Long extractQuestionProcessRoleIdFromAssignSubmit(HttpServletRequest request); } | @Test public void testMarkAsInComplete() throws Exception { Long applicationId = 1L; Long markedAsInCompleteById = 2L; QuestionResource questionResource = newQuestionResource() .build(); when(questionRestService.findById(questionResource.getId())).thenReturn(restSuccess(questionResource)); service.markAsIncomplete(questionResource.getId(), applicationId, markedAsInCompleteById); verify(questionStatusRestService).markAsInComplete(questionResource.getId(), applicationId, markedAsInCompleteById); }
@Test public void testMarkAsInComplete_applicationTeamQuestion() throws Exception { Long applicationId = 1L; Long markedAsInCompleteById = 2L; QuestionResource questionResource = newQuestionResource() .withQuestionSetupType(APPLICATION_TEAM) .build(); when(questionRestService.findById(questionResource.getId())).thenReturn(restSuccess(questionResource)); service.markAsIncomplete(questionResource.getId(), applicationId, markedAsInCompleteById); verify(questionStatusRestService).markTeamAsInComplete(questionResource.getId(), applicationId, markedAsInCompleteById); } |
QuestionServiceImpl implements QuestionService { @Override public List<QuestionStatusResource> getNotificationsForUser(Collection<QuestionStatusResource> questionStatuses, Long userId) { return questionStatuses.stream(). filter(qs -> userId.equals(qs.getAssigneeUserId()) && (qs.getNotified() != null && qs.getNotified().equals(Boolean.FALSE))) .collect(Collectors.toList()); } QuestionServiceImpl(QuestionRestService questionRestService,
QuestionStatusRestService questionStatusRestService,
UserRestService userRestService); @Override ServiceResult<Void> assign(Long questionId, Long applicationId, Long assigneeId, Long assignedById); @Override List<ValidationMessages> markAsComplete(Long questionId, Long applicationId, Long markedAsCompleteById); @Override void markAsIncomplete(Long questionId, Long applicationId, Long markedAsInCompleteById); @Override Map<Long, QuestionStatusResource> getQuestionStatusesForApplicationAndOrganisation(Long applicationId, Long userOrganisationId); @Override List<QuestionStatusResource> getNotificationsForUser(Collection<QuestionStatusResource> questionStatuses, Long userId); @Override void removeNotifications(List<QuestionStatusResource> questionStatuses); @Override Future<Set<Long>> getMarkedAsComplete(Long applicationId, Long organisationId); @Override QuestionResource getByIdAndAssessmentId(Long questionId, Long assessmentId); @Override Optional<QuestionResource> getNextQuestion(Long questionId); @Override Optional<QuestionResource> getPreviousQuestion(Long questionId); @Override Optional<QuestionResource> getPreviousQuestionBySection(Long sectionId); @Override Optional<QuestionResource> getNextQuestionBySection(Long sectionId); @Override ServiceResult<QuestionResource> getQuestionByCompetitionIdAndFormInputType(Long competitionId, FormInputType formInputType); @Override QuestionStatusResource getByQuestionIdAndApplicationIdAndOrganisationId(Long questionId, Long applicationId, Long organisationId); @Override Map<Long, QuestionStatusResource> getQuestionStatusesByQuestionIdsAndApplicationIdAndOrganisationId(List<Long> questionIds, Long applicationId, Long organisationId); List<QuestionStatusResource> findQuestionStatusesByQuestionAndApplicationId(Long questionId, Long applicationId); @Override void assignQuestion(Long applicationId, HttpServletRequest request, ProcessRoleResource assignedBy); @Override void assignQuestion(Long applicationId, UserResource user, HttpServletRequest request); @Override Long extractQuestionProcessRoleIdFromAssignSubmit(HttpServletRequest request); } | @Test public void testGetNotificationsForUser() throws Exception { Long userId = 1L; QuestionStatusResource notUserStatus = new QuestionStatusResource(); notUserStatus.setAssigneeUserId(2L); notUserStatus.setNotified(false); QuestionStatusResource notifiedStatus = new QuestionStatusResource(); notifiedStatus.setAssigneeUserId(userId); notifiedStatus.setNotified(true); QuestionStatusResource notNotifiedStatus = new QuestionStatusResource(); notNotifiedStatus.setAssigneeUserId(userId); notNotifiedStatus.setNotified(false); Collection<QuestionStatusResource> questionStatuses = Lists.newArrayList(notUserStatus, notifiedStatus, notNotifiedStatus); List<QuestionStatusResource> returnedQuestionStatuses = service.getNotificationsForUser(questionStatuses, userId); assertEquals(returnedQuestionStatuses.size(), 1); assertEquals(returnedQuestionStatuses.get(0), notNotifiedStatus); } |
QuestionServiceImpl implements QuestionService { @Override public void removeNotifications(List<QuestionStatusResource> questionStatuses) { questionStatuses.forEach(qs -> questionStatusRestService.updateNotification(qs.getId(), true)); } QuestionServiceImpl(QuestionRestService questionRestService,
QuestionStatusRestService questionStatusRestService,
UserRestService userRestService); @Override ServiceResult<Void> assign(Long questionId, Long applicationId, Long assigneeId, Long assignedById); @Override List<ValidationMessages> markAsComplete(Long questionId, Long applicationId, Long markedAsCompleteById); @Override void markAsIncomplete(Long questionId, Long applicationId, Long markedAsInCompleteById); @Override Map<Long, QuestionStatusResource> getQuestionStatusesForApplicationAndOrganisation(Long applicationId, Long userOrganisationId); @Override List<QuestionStatusResource> getNotificationsForUser(Collection<QuestionStatusResource> questionStatuses, Long userId); @Override void removeNotifications(List<QuestionStatusResource> questionStatuses); @Override Future<Set<Long>> getMarkedAsComplete(Long applicationId, Long organisationId); @Override QuestionResource getByIdAndAssessmentId(Long questionId, Long assessmentId); @Override Optional<QuestionResource> getNextQuestion(Long questionId); @Override Optional<QuestionResource> getPreviousQuestion(Long questionId); @Override Optional<QuestionResource> getPreviousQuestionBySection(Long sectionId); @Override Optional<QuestionResource> getNextQuestionBySection(Long sectionId); @Override ServiceResult<QuestionResource> getQuestionByCompetitionIdAndFormInputType(Long competitionId, FormInputType formInputType); @Override QuestionStatusResource getByQuestionIdAndApplicationIdAndOrganisationId(Long questionId, Long applicationId, Long organisationId); @Override Map<Long, QuestionStatusResource> getQuestionStatusesByQuestionIdsAndApplicationIdAndOrganisationId(List<Long> questionIds, Long applicationId, Long organisationId); List<QuestionStatusResource> findQuestionStatusesByQuestionAndApplicationId(Long questionId, Long applicationId); @Override void assignQuestion(Long applicationId, HttpServletRequest request, ProcessRoleResource assignedBy); @Override void assignQuestion(Long applicationId, UserResource user, HttpServletRequest request); @Override Long extractQuestionProcessRoleIdFromAssignSubmit(HttpServletRequest request); } | @Test public void testRemoveNotifications() throws Exception { Long status1Id = 1L; Long status2Id = 2L; QuestionStatusResource status1 = new QuestionStatusResource(); status1.setId(status1Id); QuestionStatusResource status2 = new QuestionStatusResource(); status2.setId(status2Id); List<QuestionStatusResource> questionStatuses = Lists.newArrayList(status1, status2); service.removeNotifications(questionStatuses); verify(questionStatusRestService).updateNotification(status1Id, true); verify(questionStatusRestService).updateNotification(status2Id, true); } |
QuestionServiceImpl implements QuestionService { @Override public Future<Set<Long>> getMarkedAsComplete(Long applicationId, Long organisationId) { return questionStatusRestService.getMarkedAsComplete(applicationId, organisationId); } QuestionServiceImpl(QuestionRestService questionRestService,
QuestionStatusRestService questionStatusRestService,
UserRestService userRestService); @Override ServiceResult<Void> assign(Long questionId, Long applicationId, Long assigneeId, Long assignedById); @Override List<ValidationMessages> markAsComplete(Long questionId, Long applicationId, Long markedAsCompleteById); @Override void markAsIncomplete(Long questionId, Long applicationId, Long markedAsInCompleteById); @Override Map<Long, QuestionStatusResource> getQuestionStatusesForApplicationAndOrganisation(Long applicationId, Long userOrganisationId); @Override List<QuestionStatusResource> getNotificationsForUser(Collection<QuestionStatusResource> questionStatuses, Long userId); @Override void removeNotifications(List<QuestionStatusResource> questionStatuses); @Override Future<Set<Long>> getMarkedAsComplete(Long applicationId, Long organisationId); @Override QuestionResource getByIdAndAssessmentId(Long questionId, Long assessmentId); @Override Optional<QuestionResource> getNextQuestion(Long questionId); @Override Optional<QuestionResource> getPreviousQuestion(Long questionId); @Override Optional<QuestionResource> getPreviousQuestionBySection(Long sectionId); @Override Optional<QuestionResource> getNextQuestionBySection(Long sectionId); @Override ServiceResult<QuestionResource> getQuestionByCompetitionIdAndFormInputType(Long competitionId, FormInputType formInputType); @Override QuestionStatusResource getByQuestionIdAndApplicationIdAndOrganisationId(Long questionId, Long applicationId, Long organisationId); @Override Map<Long, QuestionStatusResource> getQuestionStatusesByQuestionIdsAndApplicationIdAndOrganisationId(List<Long> questionIds, Long applicationId, Long organisationId); List<QuestionStatusResource> findQuestionStatusesByQuestionAndApplicationId(Long questionId, Long applicationId); @Override void assignQuestion(Long applicationId, HttpServletRequest request, ProcessRoleResource assignedBy); @Override void assignQuestion(Long applicationId, UserResource user, HttpServletRequest request); @Override Long extractQuestionProcessRoleIdFromAssignSubmit(HttpServletRequest request); } | @Test public void testGetMarkedAsComplete() throws Exception { Long applicationId = 1L; Long organisationId = 2L; Future<Set<Long>> future = mock(Future.class); Set<Long> ids = Sets.newHashSet(1L); when(future.get()).thenReturn(ids); when(questionStatusRestService.getMarkedAsComplete(applicationId, organisationId)).thenReturn(future); Future<Set<Long>> result = service.getMarkedAsComplete(applicationId, organisationId); assertEquals(ids, result.get()); } |
QuestionServiceImpl implements QuestionService { @Override public QuestionResource getByIdAndAssessmentId(Long questionId, Long assessmentId) { return questionRestService.getByIdAndAssessmentId(questionId, assessmentId).getSuccess(); } QuestionServiceImpl(QuestionRestService questionRestService,
QuestionStatusRestService questionStatusRestService,
UserRestService userRestService); @Override ServiceResult<Void> assign(Long questionId, Long applicationId, Long assigneeId, Long assignedById); @Override List<ValidationMessages> markAsComplete(Long questionId, Long applicationId, Long markedAsCompleteById); @Override void markAsIncomplete(Long questionId, Long applicationId, Long markedAsInCompleteById); @Override Map<Long, QuestionStatusResource> getQuestionStatusesForApplicationAndOrganisation(Long applicationId, Long userOrganisationId); @Override List<QuestionStatusResource> getNotificationsForUser(Collection<QuestionStatusResource> questionStatuses, Long userId); @Override void removeNotifications(List<QuestionStatusResource> questionStatuses); @Override Future<Set<Long>> getMarkedAsComplete(Long applicationId, Long organisationId); @Override QuestionResource getByIdAndAssessmentId(Long questionId, Long assessmentId); @Override Optional<QuestionResource> getNextQuestion(Long questionId); @Override Optional<QuestionResource> getPreviousQuestion(Long questionId); @Override Optional<QuestionResource> getPreviousQuestionBySection(Long sectionId); @Override Optional<QuestionResource> getNextQuestionBySection(Long sectionId); @Override ServiceResult<QuestionResource> getQuestionByCompetitionIdAndFormInputType(Long competitionId, FormInputType formInputType); @Override QuestionStatusResource getByQuestionIdAndApplicationIdAndOrganisationId(Long questionId, Long applicationId, Long organisationId); @Override Map<Long, QuestionStatusResource> getQuestionStatusesByQuestionIdsAndApplicationIdAndOrganisationId(List<Long> questionIds, Long applicationId, Long organisationId); List<QuestionStatusResource> findQuestionStatusesByQuestionAndApplicationId(Long questionId, Long applicationId); @Override void assignQuestion(Long applicationId, HttpServletRequest request, ProcessRoleResource assignedBy); @Override void assignQuestion(Long applicationId, UserResource user, HttpServletRequest request); @Override Long extractQuestionProcessRoleIdFromAssignSubmit(HttpServletRequest request); } | @Test public void testGetByIdAndAssessmentId() throws Exception { Long questionId = 1L; Long assessmentId = 2L; QuestionResource question = new QuestionResource(); when(questionRestService.getByIdAndAssessmentId(questionId, assessmentId)).thenReturn(restSuccess(question)); QuestionResource returnedQuestion = service.getByIdAndAssessmentId(questionId, assessmentId); assertEquals(question, returnedQuestion); verify(questionRestService, only()).getByIdAndAssessmentId(questionId, assessmentId); } |
QuestionServiceImpl implements QuestionService { @Override public Optional<QuestionResource> getNextQuestion(Long questionId) { return questionRestService.getNextQuestion(questionId).getOptionalSuccessObject(); } QuestionServiceImpl(QuestionRestService questionRestService,
QuestionStatusRestService questionStatusRestService,
UserRestService userRestService); @Override ServiceResult<Void> assign(Long questionId, Long applicationId, Long assigneeId, Long assignedById); @Override List<ValidationMessages> markAsComplete(Long questionId, Long applicationId, Long markedAsCompleteById); @Override void markAsIncomplete(Long questionId, Long applicationId, Long markedAsInCompleteById); @Override Map<Long, QuestionStatusResource> getQuestionStatusesForApplicationAndOrganisation(Long applicationId, Long userOrganisationId); @Override List<QuestionStatusResource> getNotificationsForUser(Collection<QuestionStatusResource> questionStatuses, Long userId); @Override void removeNotifications(List<QuestionStatusResource> questionStatuses); @Override Future<Set<Long>> getMarkedAsComplete(Long applicationId, Long organisationId); @Override QuestionResource getByIdAndAssessmentId(Long questionId, Long assessmentId); @Override Optional<QuestionResource> getNextQuestion(Long questionId); @Override Optional<QuestionResource> getPreviousQuestion(Long questionId); @Override Optional<QuestionResource> getPreviousQuestionBySection(Long sectionId); @Override Optional<QuestionResource> getNextQuestionBySection(Long sectionId); @Override ServiceResult<QuestionResource> getQuestionByCompetitionIdAndFormInputType(Long competitionId, FormInputType formInputType); @Override QuestionStatusResource getByQuestionIdAndApplicationIdAndOrganisationId(Long questionId, Long applicationId, Long organisationId); @Override Map<Long, QuestionStatusResource> getQuestionStatusesByQuestionIdsAndApplicationIdAndOrganisationId(List<Long> questionIds, Long applicationId, Long organisationId); List<QuestionStatusResource> findQuestionStatusesByQuestionAndApplicationId(Long questionId, Long applicationId); @Override void assignQuestion(Long applicationId, HttpServletRequest request, ProcessRoleResource assignedBy); @Override void assignQuestion(Long applicationId, UserResource user, HttpServletRequest request); @Override Long extractQuestionProcessRoleIdFromAssignSubmit(HttpServletRequest request); } | @Test public void testGetNextQuestion() throws Exception { Long questionId = 1L; QuestionResource question = new QuestionResource(); when(questionRestService.getNextQuestion(questionId)).thenReturn(restSuccess(question)); Optional<QuestionResource> result = service.getNextQuestion(questionId); assertTrue(result.isPresent()); assertEquals(question, result.get()); } |
QuestionServiceImpl implements QuestionService { @Override public Optional<QuestionResource> getPreviousQuestion(Long questionId) { return questionRestService.getPreviousQuestion(questionId).getOptionalSuccessObject(); } QuestionServiceImpl(QuestionRestService questionRestService,
QuestionStatusRestService questionStatusRestService,
UserRestService userRestService); @Override ServiceResult<Void> assign(Long questionId, Long applicationId, Long assigneeId, Long assignedById); @Override List<ValidationMessages> markAsComplete(Long questionId, Long applicationId, Long markedAsCompleteById); @Override void markAsIncomplete(Long questionId, Long applicationId, Long markedAsInCompleteById); @Override Map<Long, QuestionStatusResource> getQuestionStatusesForApplicationAndOrganisation(Long applicationId, Long userOrganisationId); @Override List<QuestionStatusResource> getNotificationsForUser(Collection<QuestionStatusResource> questionStatuses, Long userId); @Override void removeNotifications(List<QuestionStatusResource> questionStatuses); @Override Future<Set<Long>> getMarkedAsComplete(Long applicationId, Long organisationId); @Override QuestionResource getByIdAndAssessmentId(Long questionId, Long assessmentId); @Override Optional<QuestionResource> getNextQuestion(Long questionId); @Override Optional<QuestionResource> getPreviousQuestion(Long questionId); @Override Optional<QuestionResource> getPreviousQuestionBySection(Long sectionId); @Override Optional<QuestionResource> getNextQuestionBySection(Long sectionId); @Override ServiceResult<QuestionResource> getQuestionByCompetitionIdAndFormInputType(Long competitionId, FormInputType formInputType); @Override QuestionStatusResource getByQuestionIdAndApplicationIdAndOrganisationId(Long questionId, Long applicationId, Long organisationId); @Override Map<Long, QuestionStatusResource> getQuestionStatusesByQuestionIdsAndApplicationIdAndOrganisationId(List<Long> questionIds, Long applicationId, Long organisationId); List<QuestionStatusResource> findQuestionStatusesByQuestionAndApplicationId(Long questionId, Long applicationId); @Override void assignQuestion(Long applicationId, HttpServletRequest request, ProcessRoleResource assignedBy); @Override void assignQuestion(Long applicationId, UserResource user, HttpServletRequest request); @Override Long extractQuestionProcessRoleIdFromAssignSubmit(HttpServletRequest request); } | @Test public void testGetPreviousQuestion() throws Exception { Long questionId = 1L; QuestionResource question = new QuestionResource(); when(questionRestService.getPreviousQuestion(questionId)).thenReturn(restSuccess(question)); Optional<QuestionResource> result = service.getPreviousQuestion(questionId); assertTrue(result.isPresent()); assertEquals(question, result.get()); } |
QuestionServiceImpl implements QuestionService { @Override public Optional<QuestionResource> getNextQuestionBySection(Long sectionId) { return questionRestService.getNextQuestionBySection(sectionId).getOptionalSuccessObject(); } QuestionServiceImpl(QuestionRestService questionRestService,
QuestionStatusRestService questionStatusRestService,
UserRestService userRestService); @Override ServiceResult<Void> assign(Long questionId, Long applicationId, Long assigneeId, Long assignedById); @Override List<ValidationMessages> markAsComplete(Long questionId, Long applicationId, Long markedAsCompleteById); @Override void markAsIncomplete(Long questionId, Long applicationId, Long markedAsInCompleteById); @Override Map<Long, QuestionStatusResource> getQuestionStatusesForApplicationAndOrganisation(Long applicationId, Long userOrganisationId); @Override List<QuestionStatusResource> getNotificationsForUser(Collection<QuestionStatusResource> questionStatuses, Long userId); @Override void removeNotifications(List<QuestionStatusResource> questionStatuses); @Override Future<Set<Long>> getMarkedAsComplete(Long applicationId, Long organisationId); @Override QuestionResource getByIdAndAssessmentId(Long questionId, Long assessmentId); @Override Optional<QuestionResource> getNextQuestion(Long questionId); @Override Optional<QuestionResource> getPreviousQuestion(Long questionId); @Override Optional<QuestionResource> getPreviousQuestionBySection(Long sectionId); @Override Optional<QuestionResource> getNextQuestionBySection(Long sectionId); @Override ServiceResult<QuestionResource> getQuestionByCompetitionIdAndFormInputType(Long competitionId, FormInputType formInputType); @Override QuestionStatusResource getByQuestionIdAndApplicationIdAndOrganisationId(Long questionId, Long applicationId, Long organisationId); @Override Map<Long, QuestionStatusResource> getQuestionStatusesByQuestionIdsAndApplicationIdAndOrganisationId(List<Long> questionIds, Long applicationId, Long organisationId); List<QuestionStatusResource> findQuestionStatusesByQuestionAndApplicationId(Long questionId, Long applicationId); @Override void assignQuestion(Long applicationId, HttpServletRequest request, ProcessRoleResource assignedBy); @Override void assignQuestion(Long applicationId, UserResource user, HttpServletRequest request); @Override Long extractQuestionProcessRoleIdFromAssignSubmit(HttpServletRequest request); } | @Test public void testGetNextQuestionBySection() throws Exception { Long sectionId = 1L; QuestionResource question = new QuestionResource(); when(questionRestService.getNextQuestionBySection(sectionId)).thenReturn(restSuccess(question)); Optional<QuestionResource> result = service.getNextQuestionBySection(sectionId); assertTrue(result.isPresent()); assertEquals(question, result.get()); } |
QuestionServiceImpl implements QuestionService { @Override public Optional<QuestionResource> getPreviousQuestionBySection(Long sectionId) { return questionRestService.getPreviousQuestionBySection(sectionId).getOptionalSuccessObject(); } QuestionServiceImpl(QuestionRestService questionRestService,
QuestionStatusRestService questionStatusRestService,
UserRestService userRestService); @Override ServiceResult<Void> assign(Long questionId, Long applicationId, Long assigneeId, Long assignedById); @Override List<ValidationMessages> markAsComplete(Long questionId, Long applicationId, Long markedAsCompleteById); @Override void markAsIncomplete(Long questionId, Long applicationId, Long markedAsInCompleteById); @Override Map<Long, QuestionStatusResource> getQuestionStatusesForApplicationAndOrganisation(Long applicationId, Long userOrganisationId); @Override List<QuestionStatusResource> getNotificationsForUser(Collection<QuestionStatusResource> questionStatuses, Long userId); @Override void removeNotifications(List<QuestionStatusResource> questionStatuses); @Override Future<Set<Long>> getMarkedAsComplete(Long applicationId, Long organisationId); @Override QuestionResource getByIdAndAssessmentId(Long questionId, Long assessmentId); @Override Optional<QuestionResource> getNextQuestion(Long questionId); @Override Optional<QuestionResource> getPreviousQuestion(Long questionId); @Override Optional<QuestionResource> getPreviousQuestionBySection(Long sectionId); @Override Optional<QuestionResource> getNextQuestionBySection(Long sectionId); @Override ServiceResult<QuestionResource> getQuestionByCompetitionIdAndFormInputType(Long competitionId, FormInputType formInputType); @Override QuestionStatusResource getByQuestionIdAndApplicationIdAndOrganisationId(Long questionId, Long applicationId, Long organisationId); @Override Map<Long, QuestionStatusResource> getQuestionStatusesByQuestionIdsAndApplicationIdAndOrganisationId(List<Long> questionIds, Long applicationId, Long organisationId); List<QuestionStatusResource> findQuestionStatusesByQuestionAndApplicationId(Long questionId, Long applicationId); @Override void assignQuestion(Long applicationId, HttpServletRequest request, ProcessRoleResource assignedBy); @Override void assignQuestion(Long applicationId, UserResource user, HttpServletRequest request); @Override Long extractQuestionProcessRoleIdFromAssignSubmit(HttpServletRequest request); } | @Test public void testGetPreviousQuestionBySection() throws Exception { Long sectionId = 1L; QuestionResource question = new QuestionResource(); when(questionRestService.getPreviousQuestionBySection(sectionId)).thenReturn(restSuccess(question)); Optional<QuestionResource> result = service.getPreviousQuestionBySection(sectionId); assertTrue(result.isPresent()); assertEquals(question, result.get()); } |
QuestionServiceImpl implements QuestionService { @Override public ServiceResult<QuestionResource> getQuestionByCompetitionIdAndFormInputType(Long competitionId, FormInputType formInputType) { return questionRestService.getQuestionByCompetitionIdAndFormInputType(competitionId, formInputType).toServiceResult(); } QuestionServiceImpl(QuestionRestService questionRestService,
QuestionStatusRestService questionStatusRestService,
UserRestService userRestService); @Override ServiceResult<Void> assign(Long questionId, Long applicationId, Long assigneeId, Long assignedById); @Override List<ValidationMessages> markAsComplete(Long questionId, Long applicationId, Long markedAsCompleteById); @Override void markAsIncomplete(Long questionId, Long applicationId, Long markedAsInCompleteById); @Override Map<Long, QuestionStatusResource> getQuestionStatusesForApplicationAndOrganisation(Long applicationId, Long userOrganisationId); @Override List<QuestionStatusResource> getNotificationsForUser(Collection<QuestionStatusResource> questionStatuses, Long userId); @Override void removeNotifications(List<QuestionStatusResource> questionStatuses); @Override Future<Set<Long>> getMarkedAsComplete(Long applicationId, Long organisationId); @Override QuestionResource getByIdAndAssessmentId(Long questionId, Long assessmentId); @Override Optional<QuestionResource> getNextQuestion(Long questionId); @Override Optional<QuestionResource> getPreviousQuestion(Long questionId); @Override Optional<QuestionResource> getPreviousQuestionBySection(Long sectionId); @Override Optional<QuestionResource> getNextQuestionBySection(Long sectionId); @Override ServiceResult<QuestionResource> getQuestionByCompetitionIdAndFormInputType(Long competitionId, FormInputType formInputType); @Override QuestionStatusResource getByQuestionIdAndApplicationIdAndOrganisationId(Long questionId, Long applicationId, Long organisationId); @Override Map<Long, QuestionStatusResource> getQuestionStatusesByQuestionIdsAndApplicationIdAndOrganisationId(List<Long> questionIds, Long applicationId, Long organisationId); List<QuestionStatusResource> findQuestionStatusesByQuestionAndApplicationId(Long questionId, Long applicationId); @Override void assignQuestion(Long applicationId, HttpServletRequest request, ProcessRoleResource assignedBy); @Override void assignQuestion(Long applicationId, UserResource user, HttpServletRequest request); @Override Long extractQuestionProcessRoleIdFromAssignSubmit(HttpServletRequest request); } | @Test public void testGetQuestionByFormInputType() throws Exception { QuestionResource question = new QuestionResource(); when(questionRestService.getQuestionByCompetitionIdAndFormInputType(123L, FormInputType.TEXTAREA)).thenReturn(restSuccess(question)); ServiceResult<QuestionResource> result = service.getQuestionByCompetitionIdAndFormInputType(123L, FormInputType.TEXTAREA); assertTrue(result.isSuccess()); assertEquals(question, result.getSuccess()); } |
QuestionServiceImpl implements QuestionService { @Override public Map<Long, QuestionStatusResource> getQuestionStatusesForApplicationAndOrganisation(Long applicationId, Long userOrganisationId) { return mapToQuestionIds(questionStatusRestService.findByApplicationAndOrganisation(applicationId, userOrganisationId).getSuccess()); } QuestionServiceImpl(QuestionRestService questionRestService,
QuestionStatusRestService questionStatusRestService,
UserRestService userRestService); @Override ServiceResult<Void> assign(Long questionId, Long applicationId, Long assigneeId, Long assignedById); @Override List<ValidationMessages> markAsComplete(Long questionId, Long applicationId, Long markedAsCompleteById); @Override void markAsIncomplete(Long questionId, Long applicationId, Long markedAsInCompleteById); @Override Map<Long, QuestionStatusResource> getQuestionStatusesForApplicationAndOrganisation(Long applicationId, Long userOrganisationId); @Override List<QuestionStatusResource> getNotificationsForUser(Collection<QuestionStatusResource> questionStatuses, Long userId); @Override void removeNotifications(List<QuestionStatusResource> questionStatuses); @Override Future<Set<Long>> getMarkedAsComplete(Long applicationId, Long organisationId); @Override QuestionResource getByIdAndAssessmentId(Long questionId, Long assessmentId); @Override Optional<QuestionResource> getNextQuestion(Long questionId); @Override Optional<QuestionResource> getPreviousQuestion(Long questionId); @Override Optional<QuestionResource> getPreviousQuestionBySection(Long sectionId); @Override Optional<QuestionResource> getNextQuestionBySection(Long sectionId); @Override ServiceResult<QuestionResource> getQuestionByCompetitionIdAndFormInputType(Long competitionId, FormInputType formInputType); @Override QuestionStatusResource getByQuestionIdAndApplicationIdAndOrganisationId(Long questionId, Long applicationId, Long organisationId); @Override Map<Long, QuestionStatusResource> getQuestionStatusesByQuestionIdsAndApplicationIdAndOrganisationId(List<Long> questionIds, Long applicationId, Long organisationId); List<QuestionStatusResource> findQuestionStatusesByQuestionAndApplicationId(Long questionId, Long applicationId); @Override void assignQuestion(Long applicationId, HttpServletRequest request, ProcessRoleResource assignedBy); @Override void assignQuestion(Long applicationId, UserResource user, HttpServletRequest request); @Override Long extractQuestionProcessRoleIdFromAssignSubmit(HttpServletRequest request); } | @Test public void testGetQuestionStatusesForApplicationAndOrganisation() throws Exception { Long applicationId = 1L; Long userOrganisationId = 2L; Long question1 = 3L; Long question2 = 4L; QuestionStatusResource status1 = new QuestionStatusResource(); status1.setQuestion(question1); QuestionStatusResource status2 = new QuestionStatusResource(); status2.setQuestion(question2); when(questionStatusRestService.findByApplicationAndOrganisation(applicationId, userOrganisationId)).thenReturn(restSuccess(Lists.newArrayList(status1, status2))); Map<Long, QuestionStatusResource> result = service.getQuestionStatusesForApplicationAndOrganisation(applicationId, userOrganisationId); assertEquals(status1, result.get(question1)); assertEquals(status2, result.get(question2)); } |
QuestionServiceImpl implements QuestionService { @Override public QuestionStatusResource getByQuestionIdAndApplicationIdAndOrganisationId(Long questionId, Long applicationId, Long organisationId) { List<QuestionStatusResource> questionStatuses = questionStatusRestService.findByQuestionAndApplicationAndOrganisation(questionId, applicationId, organisationId).getSuccess(); if (questionStatuses == null || questionStatuses.isEmpty()) { return null; } return questionStatuses.get(0); } QuestionServiceImpl(QuestionRestService questionRestService,
QuestionStatusRestService questionStatusRestService,
UserRestService userRestService); @Override ServiceResult<Void> assign(Long questionId, Long applicationId, Long assigneeId, Long assignedById); @Override List<ValidationMessages> markAsComplete(Long questionId, Long applicationId, Long markedAsCompleteById); @Override void markAsIncomplete(Long questionId, Long applicationId, Long markedAsInCompleteById); @Override Map<Long, QuestionStatusResource> getQuestionStatusesForApplicationAndOrganisation(Long applicationId, Long userOrganisationId); @Override List<QuestionStatusResource> getNotificationsForUser(Collection<QuestionStatusResource> questionStatuses, Long userId); @Override void removeNotifications(List<QuestionStatusResource> questionStatuses); @Override Future<Set<Long>> getMarkedAsComplete(Long applicationId, Long organisationId); @Override QuestionResource getByIdAndAssessmentId(Long questionId, Long assessmentId); @Override Optional<QuestionResource> getNextQuestion(Long questionId); @Override Optional<QuestionResource> getPreviousQuestion(Long questionId); @Override Optional<QuestionResource> getPreviousQuestionBySection(Long sectionId); @Override Optional<QuestionResource> getNextQuestionBySection(Long sectionId); @Override ServiceResult<QuestionResource> getQuestionByCompetitionIdAndFormInputType(Long competitionId, FormInputType formInputType); @Override QuestionStatusResource getByQuestionIdAndApplicationIdAndOrganisationId(Long questionId, Long applicationId, Long organisationId); @Override Map<Long, QuestionStatusResource> getQuestionStatusesByQuestionIdsAndApplicationIdAndOrganisationId(List<Long> questionIds, Long applicationId, Long organisationId); List<QuestionStatusResource> findQuestionStatusesByQuestionAndApplicationId(Long questionId, Long applicationId); @Override void assignQuestion(Long applicationId, HttpServletRequest request, ProcessRoleResource assignedBy); @Override void assignQuestion(Long applicationId, UserResource user, HttpServletRequest request); @Override Long extractQuestionProcessRoleIdFromAssignSubmit(HttpServletRequest request); } | @Test public void testGetByQuestionIdAndApplicationIdAndOrganisationId() throws Exception { Long questionId = 1L; Long applicationId = 2L; Long organisationId = 3L; QuestionStatusResource status = new QuestionStatusResource(); when(questionStatusRestService.findByQuestionAndApplicationAndOrganisation(questionId, applicationId, organisationId)).thenReturn(restSuccess(Lists.newArrayList(status))); QuestionStatusResource result = service.getByQuestionIdAndApplicationIdAndOrganisationId(questionId, applicationId, organisationId); assertEquals(result, status); } |
QuestionServiceImpl implements QuestionService { @Override public Map<Long, QuestionStatusResource> getQuestionStatusesByQuestionIdsAndApplicationIdAndOrganisationId(List<Long> questionIds, Long applicationId, Long organisationId) { return mapToQuestionIds(questionStatusRestService.getQuestionStatusesByQuestionIdsAndApplicationIdAndOrganisationId(questionIds, applicationId, organisationId).getSuccess()); } QuestionServiceImpl(QuestionRestService questionRestService,
QuestionStatusRestService questionStatusRestService,
UserRestService userRestService); @Override ServiceResult<Void> assign(Long questionId, Long applicationId, Long assigneeId, Long assignedById); @Override List<ValidationMessages> markAsComplete(Long questionId, Long applicationId, Long markedAsCompleteById); @Override void markAsIncomplete(Long questionId, Long applicationId, Long markedAsInCompleteById); @Override Map<Long, QuestionStatusResource> getQuestionStatusesForApplicationAndOrganisation(Long applicationId, Long userOrganisationId); @Override List<QuestionStatusResource> getNotificationsForUser(Collection<QuestionStatusResource> questionStatuses, Long userId); @Override void removeNotifications(List<QuestionStatusResource> questionStatuses); @Override Future<Set<Long>> getMarkedAsComplete(Long applicationId, Long organisationId); @Override QuestionResource getByIdAndAssessmentId(Long questionId, Long assessmentId); @Override Optional<QuestionResource> getNextQuestion(Long questionId); @Override Optional<QuestionResource> getPreviousQuestion(Long questionId); @Override Optional<QuestionResource> getPreviousQuestionBySection(Long sectionId); @Override Optional<QuestionResource> getNextQuestionBySection(Long sectionId); @Override ServiceResult<QuestionResource> getQuestionByCompetitionIdAndFormInputType(Long competitionId, FormInputType formInputType); @Override QuestionStatusResource getByQuestionIdAndApplicationIdAndOrganisationId(Long questionId, Long applicationId, Long organisationId); @Override Map<Long, QuestionStatusResource> getQuestionStatusesByQuestionIdsAndApplicationIdAndOrganisationId(List<Long> questionIds, Long applicationId, Long organisationId); List<QuestionStatusResource> findQuestionStatusesByQuestionAndApplicationId(Long questionId, Long applicationId); @Override void assignQuestion(Long applicationId, HttpServletRequest request, ProcessRoleResource assignedBy); @Override void assignQuestion(Long applicationId, UserResource user, HttpServletRequest request); @Override Long extractQuestionProcessRoleIdFromAssignSubmit(HttpServletRequest request); } | @Test public void testGetQuestionStatusesByQuestionIdsAndApplicationIdAndOrganisationId() throws Exception { Long applicationId = 1L; Long userOrganisationId = 2L; Long question1 = 3L; Long question2 = 4L; QuestionStatusResource status1 = new QuestionStatusResource(); status1.setQuestion(question1); QuestionStatusResource status2 = new QuestionStatusResource(); status2.setQuestion(question2); List<Long> questionIds = Lists.newArrayList(question1, question2); when(questionStatusRestService.getQuestionStatusesByQuestionIdsAndApplicationIdAndOrganisationId(questionIds, applicationId, userOrganisationId)).thenReturn(restSuccess(Lists.newArrayList(status1, status2))); Map<Long, QuestionStatusResource> result = service.getQuestionStatusesByQuestionIdsAndApplicationIdAndOrganisationId(questionIds, applicationId, userOrganisationId); assertEquals(status1, result.get(question1)); assertEquals(status2, result.get(question2)); } |
QuestionServiceImpl implements QuestionService { public List<QuestionStatusResource> findQuestionStatusesByQuestionAndApplicationId(Long questionId, Long applicationId) { return questionStatusRestService.findQuestionStatusesByQuestionAndApplicationId(questionId, applicationId).getSuccess(); } QuestionServiceImpl(QuestionRestService questionRestService,
QuestionStatusRestService questionStatusRestService,
UserRestService userRestService); @Override ServiceResult<Void> assign(Long questionId, Long applicationId, Long assigneeId, Long assignedById); @Override List<ValidationMessages> markAsComplete(Long questionId, Long applicationId, Long markedAsCompleteById); @Override void markAsIncomplete(Long questionId, Long applicationId, Long markedAsInCompleteById); @Override Map<Long, QuestionStatusResource> getQuestionStatusesForApplicationAndOrganisation(Long applicationId, Long userOrganisationId); @Override List<QuestionStatusResource> getNotificationsForUser(Collection<QuestionStatusResource> questionStatuses, Long userId); @Override void removeNotifications(List<QuestionStatusResource> questionStatuses); @Override Future<Set<Long>> getMarkedAsComplete(Long applicationId, Long organisationId); @Override QuestionResource getByIdAndAssessmentId(Long questionId, Long assessmentId); @Override Optional<QuestionResource> getNextQuestion(Long questionId); @Override Optional<QuestionResource> getPreviousQuestion(Long questionId); @Override Optional<QuestionResource> getPreviousQuestionBySection(Long sectionId); @Override Optional<QuestionResource> getNextQuestionBySection(Long sectionId); @Override ServiceResult<QuestionResource> getQuestionByCompetitionIdAndFormInputType(Long competitionId, FormInputType formInputType); @Override QuestionStatusResource getByQuestionIdAndApplicationIdAndOrganisationId(Long questionId, Long applicationId, Long organisationId); @Override Map<Long, QuestionStatusResource> getQuestionStatusesByQuestionIdsAndApplicationIdAndOrganisationId(List<Long> questionIds, Long applicationId, Long organisationId); List<QuestionStatusResource> findQuestionStatusesByQuestionAndApplicationId(Long questionId, Long applicationId); @Override void assignQuestion(Long applicationId, HttpServletRequest request, ProcessRoleResource assignedBy); @Override void assignQuestion(Long applicationId, UserResource user, HttpServletRequest request); @Override Long extractQuestionProcessRoleIdFromAssignSubmit(HttpServletRequest request); } | @Test public void testFindQuestionStatusesByQuestionAndApplicationId() throws Exception { Long applicationId = 1L; Long questionId = 2L; QuestionStatusResource status1 = new QuestionStatusResource(); QuestionStatusResource status2 = new QuestionStatusResource(); List<QuestionStatusResource> statuses = Lists.newArrayList(status1, status2); when(questionStatusRestService.findQuestionStatusesByQuestionAndApplicationId(questionId, applicationId)).thenReturn(restSuccess(statuses)); List<QuestionStatusResource> result = service.findQuestionStatusesByQuestionAndApplicationId(questionId, applicationId); assertEquals(statuses, result); } |
SectionServiceImpl implements SectionService { @Override public List<SectionResource> filterParentSections(List<SectionResource> sections) { if (sections == null) { return new ArrayList<>(); } List<SectionResource> childSections = getChildSections(sections, new ArrayList<>()); return sections.stream() .filter(s -> childSections.stream() .noneMatch(c -> c.getId().equals(s.getId()))) .sorted(Comparator.comparing(SectionResource::getPriority)) .collect(toList()); } @Override ValidationMessages markAsComplete(long sectionId, long applicationId, long markedAsCompleteById); @Override void markAsNotRequired(Long sectionId, Long applicationId, Long markedAsCompleteById); @Override void markAsInComplete(Long sectionId, Long applicationId, Long markedAsInCompleteById); @Override SectionResource getById(Long sectionId); @Override List<Long> getCompleted(Long applicationId, Long organisationId); @Override Map<Long, Set<Long>> getCompletedSectionsByOrganisation(Long applicationId); @Override List<SectionResource> filterParentSections(List<SectionResource> sections); @Override List<SectionResource> getAllByCompetitionId(final long competitionId); List<SectionResource> findResourceByIdInList(final List<Long> ids, final List<SectionResource> list); @Override SectionResource getSectionByQuestionId(long questionId); @Override Set<Long> getQuestionsForSectionAndSubsections(long sectionId); @Override List<SectionResource> getSectionsForCompetitionByType(long competitionId, SectionType type); @Override SectionResource getFinanceSection(long competitionId); @Override SectionResource getTermsAndConditionsSection(long competitionId); @Override SectionResource getOrganisationFinanceSection(long competitionId); } | @Test public void filterParentSections() { List<SectionResource> parentSections = service.filterParentSections(asList(parentSection, childSection1)); assertEquals(parentSection.getId(), parentSections.get(0).getId()); }
@Test public void filterParentSectionsToEnsureSectionsSortedByPriority() { SectionResource parentSection1 = newSectionResource().withCompetition(competition.getId()).withPriority(3).build(); SectionResource parentSection2 = newSectionResource().withCompetition(competition.getId()).withPriority(1).build(); SectionResource parentSection3 = newSectionResource().withCompetition(competition.getId()).withPriority(2).build(); SectionResource childSection11 = newSectionResource().withCompetition(competition.getId()).withParentSection(parentSection1.getId()).build(); SectionResource childSection12 = newSectionResource().withCompetition(competition.getId()).withParentSection(parentSection1.getId()).build(); SectionResource childSection21 = newSectionResource().withCompetition(competition.getId()).withParentSection(parentSection2.getId()).build(); parentSection1.setChildSections(asList(childSection11.getId(), childSection12.getId())); parentSection2.setChildSections(asList(childSection21.getId(), childSection12.getId())); List<SectionResource> allSections = asList(parentSection1, parentSection2, parentSection3, childSection11, childSection12, childSection21); when(sectionRestService.getByCompetition(anyLong())).thenReturn(restSuccess(allSections)); List<SectionResource> filterParentSections = service.filterParentSections(allSections); assertEquals(3, filterParentSections.size()); assertEquals(parentSection2, filterParentSections.get(0)); assertEquals(parentSection3, filterParentSections.get(1)); assertEquals(parentSection1, filterParentSections.get(2)); } |
SectionServiceImpl implements SectionService { @Override public List<SectionResource> getSectionsForCompetitionByType(long competitionId, SectionType type) { return sectionRestService.getSectionsByCompetitionIdAndType(competitionId, type).getSuccess(); } @Override ValidationMessages markAsComplete(long sectionId, long applicationId, long markedAsCompleteById); @Override void markAsNotRequired(Long sectionId, Long applicationId, Long markedAsCompleteById); @Override void markAsInComplete(Long sectionId, Long applicationId, Long markedAsInCompleteById); @Override SectionResource getById(Long sectionId); @Override List<Long> getCompleted(Long applicationId, Long organisationId); @Override Map<Long, Set<Long>> getCompletedSectionsByOrganisation(Long applicationId); @Override List<SectionResource> filterParentSections(List<SectionResource> sections); @Override List<SectionResource> getAllByCompetitionId(final long competitionId); List<SectionResource> findResourceByIdInList(final List<Long> ids, final List<SectionResource> list); @Override SectionResource getSectionByQuestionId(long questionId); @Override Set<Long> getQuestionsForSectionAndSubsections(long sectionId); @Override List<SectionResource> getSectionsForCompetitionByType(long competitionId, SectionType type); @Override SectionResource getFinanceSection(long competitionId); @Override SectionResource getTermsAndConditionsSection(long competitionId); @Override SectionResource getOrganisationFinanceSection(long competitionId); } | @Test public void getSectionsByType() { SectionResource section = newSectionResource().build(); when(sectionRestService.getSectionsByCompetitionIdAndType(competition.getId(), SectionType.FINANCE)).thenReturn(restSuccess(singletonList(section))); List<SectionResource> result = service.getSectionsForCompetitionByType(competition.getId(), SectionType.FINANCE); assertEquals(1, result.size()); assertEquals(section, result.get(0)); } |
SectionServiceImpl implements SectionService { @Override public SectionResource getFinanceSection(long competitionId) { return getSingleSectionByType(competitionId, SectionType.FINANCE); } @Override ValidationMessages markAsComplete(long sectionId, long applicationId, long markedAsCompleteById); @Override void markAsNotRequired(Long sectionId, Long applicationId, Long markedAsCompleteById); @Override void markAsInComplete(Long sectionId, Long applicationId, Long markedAsInCompleteById); @Override SectionResource getById(Long sectionId); @Override List<Long> getCompleted(Long applicationId, Long organisationId); @Override Map<Long, Set<Long>> getCompletedSectionsByOrganisation(Long applicationId); @Override List<SectionResource> filterParentSections(List<SectionResource> sections); @Override List<SectionResource> getAllByCompetitionId(final long competitionId); List<SectionResource> findResourceByIdInList(final List<Long> ids, final List<SectionResource> list); @Override SectionResource getSectionByQuestionId(long questionId); @Override Set<Long> getQuestionsForSectionAndSubsections(long sectionId); @Override List<SectionResource> getSectionsForCompetitionByType(long competitionId, SectionType type); @Override SectionResource getFinanceSection(long competitionId); @Override SectionResource getTermsAndConditionsSection(long competitionId); @Override SectionResource getOrganisationFinanceSection(long competitionId); } | @Test public void getFinanceSection() { SectionResource section = newSectionResource().build(); when(sectionRestService.getSectionsByCompetitionIdAndType(competition.getId(), SectionType.FINANCE)).thenReturn(restSuccess(singletonList(section))); SectionResource result = service.getFinanceSection(competition.getId()); assertEquals(section, result); } |
SectionServiceImpl implements SectionService { @Override public SectionResource getOrganisationFinanceSection(long competitionId) { return getSingleSectionByType(competitionId, ORGANISATION_FINANCES); } @Override ValidationMessages markAsComplete(long sectionId, long applicationId, long markedAsCompleteById); @Override void markAsNotRequired(Long sectionId, Long applicationId, Long markedAsCompleteById); @Override void markAsInComplete(Long sectionId, Long applicationId, Long markedAsInCompleteById); @Override SectionResource getById(Long sectionId); @Override List<Long> getCompleted(Long applicationId, Long organisationId); @Override Map<Long, Set<Long>> getCompletedSectionsByOrganisation(Long applicationId); @Override List<SectionResource> filterParentSections(List<SectionResource> sections); @Override List<SectionResource> getAllByCompetitionId(final long competitionId); List<SectionResource> findResourceByIdInList(final List<Long> ids, final List<SectionResource> list); @Override SectionResource getSectionByQuestionId(long questionId); @Override Set<Long> getQuestionsForSectionAndSubsections(long sectionId); @Override List<SectionResource> getSectionsForCompetitionByType(long competitionId, SectionType type); @Override SectionResource getFinanceSection(long competitionId); @Override SectionResource getTermsAndConditionsSection(long competitionId); @Override SectionResource getOrganisationFinanceSection(long competitionId); } | @Test public void getOrganisationFinanceSection() { SectionResource section = newSectionResource().build(); when(sectionRestService.getSectionsByCompetitionIdAndType(competition.getId(), SectionType.ORGANISATION_FINANCES)).thenReturn(restSuccess(singletonList(section))); SectionResource result = service.getOrganisationFinanceSection(competition.getId()); assertEquals(section, result); } |
ApplicationServiceImpl implements ApplicationService { @Override public ApplicationResource getById(Long applicationId) { if (applicationId == null) { return null; } return applicationRestService.getApplicationById(applicationId).getSuccess(); } @Override ApplicationResource getById(Long applicationId); @Override ApplicationResource createApplication(long competitionId, long userId, long organisationId, String applicationName); @Override ServiceResult<ValidationMessages> save(ApplicationResource application); @Override OrganisationResource getLeadOrganisation(Long applicationId); @Override ServiceResult<Void> removeCollaborator(Long applicationInviteId); @Override ServiceResult<Void> markAsIneligible(long applicationId, IneligibleOutcomeResource reason); } | @Test public void getById() { Long applicationId = 3L; ApplicationResource application = new ApplicationResource(); when(applicationRestService.getApplicationById(applicationId)).thenReturn(restSuccess(application)); ApplicationResource returnedApplication = service.getById(applicationId); assertEquals(application, returnedApplication); }
@Test(expected = ObjectNotFoundException.class) public void testGetByIdNotFound() { Long applicationId = 5L; when(applicationRestService.getApplicationById(applicationId)).thenThrow(new ObjectNotFoundException("Application not found", asList(applicationId))); service.getById(applicationId); }
@Test public void getByIdNullValue() { ApplicationResource returnedApplication = service.getById(null); assertEquals(null, returnedApplication); } |
GrantProcessServiceImpl implements GrantProcessService { @Override @Transactional(readOnly = true) public List<GrantProcess> findReadyToSend() { return grantProcessRepository.findByPendingIsTrue(); } @Override @Transactional(readOnly = true) Optional<GrantProcess> findByApplicationId(Long applicationId); @Override void createGrantProcess(long applicationId); @Override @Transactional(readOnly = true) List<GrantProcess> findReadyToSend(); @Override @Transactional(readOnly = true) Optional<GrantProcess> findOneReadyToSend(); @Override void sendSucceeded(long applicationId); @Override void sendFailed(long applicationId, String message); } | @Test public void findReadyToSend() { GrantProcess grantProcessOne = new GrantProcess(1); GrantProcess grantProcessTwo = new GrantProcess(2); List<GrantProcess> readyToSend = asList(grantProcessOne, grantProcessTwo); when(grantProcessRepository.findByPendingIsTrue()).thenReturn(readyToSend); assertThat(service.findReadyToSend(), is(readyToSend)); verify(grantProcessRepository, only()).findByPendingIsTrue(); } |
ApplicationServiceImpl implements ApplicationService { @Override public ServiceResult<ValidationMessages> save(ApplicationResource application) { return applicationRestService.saveApplication(application).toServiceResult(); } @Override ApplicationResource getById(Long applicationId); @Override ApplicationResource createApplication(long competitionId, long userId, long organisationId, String applicationName); @Override ServiceResult<ValidationMessages> save(ApplicationResource application); @Override OrganisationResource getLeadOrganisation(Long applicationId); @Override ServiceResult<Void> removeCollaborator(Long applicationInviteId); @Override ServiceResult<Void> markAsIneligible(long applicationId, IneligibleOutcomeResource reason); } | @Test public void save() { ApplicationResource application = new ApplicationResource(); ValidationMessages validationMessages = new ValidationMessages(); when(applicationRestService.saveApplication(application)).thenReturn(restSuccess(validationMessages)); ServiceResult<ValidationMessages> result = service.save(application); assertTrue(result.isSuccess()); Mockito.inOrder(applicationRestService).verify(applicationRestService, calls(1)).saveApplication(application); } |
ApplicationServiceImpl implements ApplicationService { @Override public ServiceResult<Void> removeCollaborator(Long applicationInviteId) { return inviteRestService.removeApplicationInvite(applicationInviteId).toServiceResult(); } @Override ApplicationResource getById(Long applicationId); @Override ApplicationResource createApplication(long competitionId, long userId, long organisationId, String applicationName); @Override ServiceResult<ValidationMessages> save(ApplicationResource application); @Override OrganisationResource getLeadOrganisation(Long applicationId); @Override ServiceResult<Void> removeCollaborator(Long applicationInviteId); @Override ServiceResult<Void> markAsIneligible(long applicationId, IneligibleOutcomeResource reason); } | @Test public void removeCollaborator() { Long applicationInviteId = 80512L; ServiceResult<Void> result = service.removeCollaborator(applicationInviteId); assertTrue(result.isSuccess()); Mockito.inOrder(inviteRestService).verify(inviteRestService, calls(1)).removeApplicationInvite(applicationInviteId); } |
ApplicationServiceImpl implements ApplicationService { @Override public ServiceResult<Void> markAsIneligible(long applicationId, IneligibleOutcomeResource reason) { return applicationRestService.markAsIneligible(applicationId, reason).toServiceResult(); } @Override ApplicationResource getById(Long applicationId); @Override ApplicationResource createApplication(long competitionId, long userId, long organisationId, String applicationName); @Override ServiceResult<ValidationMessages> save(ApplicationResource application); @Override OrganisationResource getLeadOrganisation(Long applicationId); @Override ServiceResult<Void> removeCollaborator(Long applicationInviteId); @Override ServiceResult<Void> markAsIneligible(long applicationId, IneligibleOutcomeResource reason); } | @Test public void markAsIneligible() { long applicationId = 1L; IneligibleOutcomeResource reason = newIneligibleOutcomeResource() .withReason("reason") .build(); when(applicationRestService.markAsIneligible(applicationId, reason)).thenReturn(restSuccess()); ServiceResult<Void> result = service.markAsIneligible(applicationId, reason); assertTrue(result.isSuccess()); InOrder inOrder = inOrder(applicationRestService); inOrder.verify(applicationRestService).markAsIneligible(applicationId, reason); inOrder.verifyNoMoreInteractions(); } |
ApplicationPrintPopulator { public String print(final Long applicationId, Model model, UserResource user) { ApplicationResource application = applicationRestService.getApplicationById(applicationId).getSuccess(); CompetitionResource competition = competitionRestService.getCompetitionById(application.getCompetition()).getSuccess(); ApplicationReadOnlySettings settings = defaultSettings() .setIncludeAllAssessorFeedback(userCanViewFeedback(user, competition, application)); ApplicationReadOnlyViewModel applicationReadOnlyViewModel = applicationReadOnlyViewModelPopulator.populate(applicationId, user, settings); model.addAttribute("model", applicationReadOnlyViewModel); return "application/print"; } String print(final Long applicationId,
Model model, UserResource user); } | @Test public void testPrint() { Model model = mock(Model.class); UserResource user = UserResourceBuilder.newUserResource().build(); long applicationId = 1L; ApplicationReadOnlyViewModel viewModel = mock(ApplicationReadOnlyViewModel.class); CompetitionResource competition = newCompetitionResource().build(); ApplicationResource application = newApplicationResource() .withId(applicationId) .withCompetition(competition.getId()) .build(); when(applicationRestService.getApplicationById(applicationId)).thenReturn(restSuccess(application)); when(competitionRestService.getCompetitionById(competition.getId())).thenReturn(restSuccess(competition)); when(applicationReadOnlyViewModelPopulator.populate(applicationId, user, defaultSettings().setIncludeAllAssessorFeedback(true))).thenReturn(viewModel); applicationPrintPopulator.print(applicationId, model, user); verify(model).addAttribute("model", viewModel); } |
AssignButtonsPopulator { public AssignButtonsViewModel populate(AbstractApplicantResource resource, ApplicantQuestionResource question, boolean hideAssignButtons) { AssignButtonsViewModel viewModel = new AssignButtonsViewModel(); viewModel.setAssignedBy(question.allAssignedStatuses() .map(ApplicantQuestionStatusResource::getAssignedBy).map(ApplicantResource::getProcessRole).findAny().orElse(null)); viewModel.setAssignee(question.allAssignedStatuses() .map(ApplicantQuestionStatusResource::getAssignee).map(ApplicantResource::getProcessRole).findAny().orElse(null)); viewModel.setLeadApplicant(resource.getApplicants().stream().filter(ApplicantResource::isLead).map(ApplicantResource::getProcessRole).findAny().orElse(null)); viewModel.setCurrentApplicant(resource.getCurrentApplicant().getProcessRole()); viewModel.setAssignableApplicants(resource.getApplicants().stream().map(ApplicantResource::getProcessRole).collect(Collectors.toList())); viewModel.setPendingAssignableUsers(inviteService.getPendingInvitationsByApplicationId(resource.getApplication().getId())); viewModel.setHideAssignButtons(hideAssignButtons); viewModel.setQuestion(question.getQuestion()); return viewModel; } AssignButtonsPopulator(InviteService inviteService); AssignButtonsViewModel populate(AbstractApplicantResource resource, ApplicantQuestionResource question, boolean hideAssignButtons); } | @Test public void testPopulate() { ApplicantQuestionResource question = applicantQuestionResource().build(); boolean hideAssignButtons = false; List<ApplicationInviteResource> invites = newApplicationInviteResource().withStatus(InviteStatus.SENT).build(1); when(inviteService.getPendingInvitationsByApplicationId(question.getApplication().getId())).thenReturn(invites); AssignButtonsViewModel viewModel = assignButtonsPopulator.populate(question, question, hideAssignButtons); assertThat(viewModel.getAssignedBy(), equalTo(assignedBy.getProcessRole())); assertThat(viewModel.getAssignableApplicants(), equalTo(question.getApplicants().stream().map(ApplicantResource::getProcessRole).collect(toList()))); assertThat(viewModel.getAssignee(), equalTo(assignee.getProcessRole())); assertThat(viewModel.getLeadApplicant(), equalTo(assignee.getProcessRole())); assertThat(viewModel.getCurrentApplicant(), equalTo(assignee.getProcessRole())); assertThat(viewModel.getQuestion(), equalTo(question.getQuestion())); assertThat(viewModel.getPendingAssignableUsers(), equalTo(invites)); assertThat(viewModel.isAssigned(), equalTo(true)); assertThat(viewModel.isAssignedByCurrentUser(), equalTo(false)); assertThat(viewModel.isAssignedByLead(), equalTo(false)); assertThat(viewModel.isAssignedTo(assignee.getProcessRole()), equalTo(true)); assertThat(viewModel.isAssignedTo(assignedBy.getProcessRole()), equalTo(false)); assertThat(viewModel.isAssignedToLead(), equalTo(true)); assertThat(viewModel.isHideAssignButtons(), equalTo(hideAssignButtons)); assertThat(viewModel.isNotAssigned(), equalTo(false)); } |
FinanceServiceImpl implements FinanceService { @Override public ApplicationFinanceResource getApplicationFinanceByApplicationIdAndOrganisationId(Long applicationId, Long organisationId) { return applicationFinanceRestService.getApplicationFinance(applicationId, organisationId).getSuccess(); } @Override ApplicationFinanceResource getApplicationFinance(Long userId, Long applicationId); @Override ApplicationFinanceResource getApplicationFinanceByApplicationIdAndOrganisationId(Long applicationId, Long organisationId); @Override ApplicationFinanceResource getApplicationFinanceDetails(Long userId, Long applicationId); @Override ApplicationFinanceResource getApplicationFinanceDetails(Long userId, Long applicationId, Long organisationId); @Override List<ApplicationFinanceResource> getApplicationFinanceDetails(Long applicationId); @Override List<ApplicationFinanceResource> getApplicationFinanceTotals(Long applicationId); @Override RestResult<FileEntryResource> getFinanceEntry(Long applicationFinanceFileEntryId); @Override RestResult<FileEntryResource> getFinanceEntryByApplicationFinanceId(Long applicationFinanceId); @Override RestResult<ByteArrayResource> getFinanceDocumentByApplicationFinance(Long applicationFinanceId); } | @Test public void testGetApplicationFinanceByApplicationIdAndOrganisationId() { Long applicationId = 1L; Long organisationId = 1L; ApplicationFinanceResource applicationFinanceResource = ApplicationFinanceResourceBuilder.newApplicationFinanceResource().build(); when(applicationFinanceRestService.getApplicationFinance(applicationId, organisationId)).thenReturn(restSuccess(applicationFinanceResource)); ApplicationFinanceResource result = service.getApplicationFinanceByApplicationIdAndOrganisationId(applicationId, organisationId); assertEquals(applicationFinanceResource, result); } |
FinanceServiceImpl implements FinanceService { @Override public ApplicationFinanceResource getApplicationFinanceDetails(Long userId, Long applicationId) { ProcessRoleResource userApplicationRole = userRestService.findProcessRole(userId, applicationId).getSuccess(); return getApplicationFinanceDetails(userId, applicationId, userApplicationRole.getOrganisationId()); } @Override ApplicationFinanceResource getApplicationFinance(Long userId, Long applicationId); @Override ApplicationFinanceResource getApplicationFinanceByApplicationIdAndOrganisationId(Long applicationId, Long organisationId); @Override ApplicationFinanceResource getApplicationFinanceDetails(Long userId, Long applicationId); @Override ApplicationFinanceResource getApplicationFinanceDetails(Long userId, Long applicationId, Long organisationId); @Override List<ApplicationFinanceResource> getApplicationFinanceDetails(Long applicationId); @Override List<ApplicationFinanceResource> getApplicationFinanceTotals(Long applicationId); @Override RestResult<FileEntryResource> getFinanceEntry(Long applicationFinanceFileEntryId); @Override RestResult<FileEntryResource> getFinanceEntryByApplicationFinanceId(Long applicationFinanceId); @Override RestResult<ByteArrayResource> getFinanceDocumentByApplicationFinance(Long applicationFinanceId); } | @Test public void testGetApplicationFinanceDetailsByApplicationId() { Long applicationId = 1L; List<ApplicationFinanceResource> applicationFinanceResources = ApplicationFinanceResourceBuilder.newApplicationFinanceResource().build(3); when(applicationFinanceRestService.getFinanceDetails(applicationId)).thenReturn(restSuccess(applicationFinanceResources)); List<ApplicationFinanceResource> result = service.getApplicationFinanceDetails(applicationId); assertEquals(applicationFinanceResources, result); } |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.