Datasets:
Minata
/
src_fm_fc_ms_ff_method2testcases_v0

Dataset card Data Studio Files Community
1
src_fm_fc_ms_ff
stringlengths
43
86.8k
target
stringlengths
20
276k
FinanceLinksUtil { public Optional<String> financesLink(OrganisationResource organisation, List<ProcessRoleResource> processRoles, UserResource user, ApplicationResource application, CompetitionResource competition) { Optional<ProcessRoleResource> currentUserRole = getCurrentUsersRole(processRoles, user); UserResource authenticatedUser = userAuthenticationService.getAuthenticatedUser(httpServletUtil.request()); if (authenticatedUser.isInternalUser() || authenticatedUser.getRoles().contains(STAKEHOLDER) || authenticatedUser.getRoles().contains(EXTERNAL_FINANCE)) { if (!application.isSubmitted()) { if (authenticatedUser.getRoles().contains(IFS_ADMINISTRATOR) || authenticatedUser.getRoles().contains(SUPPORT) || authenticatedUser.getRoles().contains(EXTERNAL_FINANCE)) { return Optional.of(organisationIdInLink(application.getId(), organisation)); } } else { return Optional.of(organisationIdInLink(application.getId(), organisation)); } } if (currentUserRole.isPresent()) { if (applicantProcessRoles().contains(currentUserRole.get().getRole())) { if (competition.isKtp()) { return Optional.of(organisationIdInLink(application.getId(), organisation)); } else if (currentUserRole.get().getOrganisationId().equals(organisation.getId())) { return Optional.of(applicantsOrganisationLink(application.getId())); } } if (currentUserRole.get().getRole().isKta()) { return Optional.of(organisationIdInLink(application.getId(), organisation)); } CompetitionAssessmentConfigResource competitionAssessmentConfigResource = competitionAssessmentConfigRestService.findOneByCompetitionId(competition.getId()).getSuccess(); if (assessorProcessRoles().contains(currentUserRole.get().getRole()) && DETAILED.equals(competitionAssessmentConfigResource.getAssessorFinanceView())) { return Optional.of(assessorLink(application, organisation)); } } return Optional.empty(); } Optional<String> financesLink(OrganisationResource organisation, List<ProcessRoleResource> processRoles, UserResource user, ApplicationResource application, CompetitionResource competition); }
@Test public void financesLinkForInternalUser() { UserResource user = newUserResource() .withId(userId) .withRoleGlobal(Role.IFS_ADMINISTRATOR) .build(); when(userAuthenticationService.getAuthenticatedUser(any())).thenReturn(user); Optional<String> financeLink = financeLinksUtil.financesLink(organisation, Collections.singletonList(processRole), user, application, competition); assertTrue(financeLink.isPresent()); assertEquals("/application/1/form/FINANCE/3", financeLink.get()); } @Test public void financesLinkForSupport() { UserResource user = newUserResource() .withId(userId) .withRoleGlobal(Role.SUPPORT) .build(); when(userAuthenticationService.getAuthenticatedUser(any())).thenReturn(user); Optional<String> financeLink = financeLinksUtil.financesLink(organisation, Collections.singletonList(processRole), user, application, competition); assertTrue(financeLink.isPresent()); assertEquals("/application/1/form/FINANCE/3", financeLink.get()); } @Test public void financesLinkForExternalFinance() { UserResource user = newUserResource() .withId(userId) .withRoleGlobal(Role.EXTERNAL_FINANCE) .build(); when(userAuthenticationService.getAuthenticatedUser(any())).thenReturn(user); Optional<String> financeLink = financeLinksUtil.financesLink(organisation, Collections.singletonList(processRole), user, application, competition); assertTrue(financeLink.isPresent()); assertEquals("/application/1/form/FINANCE/3", financeLink.get()); } @Test public void financesLinkForStakeHolder() { UserResource user = newUserResource() .withId(userId) .withRoleGlobal(Role.STAKEHOLDER) .build(); application = newApplicationResource() .withId(applicationId) .withCompetition(competition.getId()) .withApplicationState(ApplicationState.SUBMITTED) .build(); when(userAuthenticationService.getAuthenticatedUser(any())).thenReturn(user); Optional<String> financeLink = financeLinksUtil.financesLink(organisation, Collections.singletonList(processRole), user, application, competition); assertTrue(financeLink.isPresent()); assertEquals("/application/1/form/FINANCE/3", financeLink.get()); } @Test public void financesLinkForLeadApplicant() { UserResource user = newUserResource() .withId(userId) .withRoleGlobal(Role.LEADAPPLICANT) .build(); when(userAuthenticationService.getAuthenticatedUser(any())).thenReturn(user); Optional<String> financeLink = financeLinksUtil.financesLink(organisation, Collections.singletonList(processRole), user, application, competition); assertTrue(financeLink.isPresent()); assertEquals("/application/1/form/FINANCE", financeLink.get()); } @Test public void financesLinkForCollaborator() { long organisationId = 4L; UserResource user = newUserResource() .withId(userId) .withRoleGlobal(Role.COLLABORATOR) .build(); organisation = newOrganisationResource().withId(organisationId).build(); CompetitionAssessmentConfigResource assessmentConfigResource = newCompetitionAssessmentConfigResource().build(); when(userAuthenticationService.getAuthenticatedUser(any())).thenReturn(user); when(competitionAssessmentConfigRestService.findOneByCompetitionId(anyLong())).thenReturn(RestResult.restSuccess(assessmentConfigResource)); Optional<String> financeLink = financeLinksUtil.financesLink(organisation, Collections.singletonList(processRole), user, application, competition); assertFalse(financeLink.isPresent()); } @Test public void financesLinkForAssessor() { UserResource user = newUserResource() .withId(userId) .withRoleGlobal(Role.ASSESSOR) .build(); processRole = newProcessRoleResource() .withUserId(userId) .withRole(Role.ASSESSOR) .build(); CompetitionAssessmentConfigResource assessmentConfigResource = newCompetitionAssessmentConfigResource() .withAssessorFinanceView(AssessorFinanceView.DETAILED).build(); when(userAuthenticationService.getAuthenticatedUser(any())).thenReturn(user); when(competitionAssessmentConfigRestService.findOneByCompetitionId(anyLong())).thenReturn(RestResult.restSuccess(assessmentConfigResource)); Optional<String> financeLink = financeLinksUtil.financesLink(organisation, Collections.singletonList(processRole), user, application, competition); assertTrue(financeLink.isPresent()); assertEquals("/assessment/application/1/detailed-finances/organisation/3", financeLink.get()); }
GrantProcessServiceImpl implements GrantProcessService { @Override public void createGrantProcess(long applicationId) { Optional<Application> application = applicationRepository.findById(applicationId); application.ifPresent((a) -> { Optional<GrantProcessConfiguration> config = grantProcessConfigurationRepository.findByCompetitionId(a.getCompetition().getId()); boolean sendByDefault = config.map(GrantProcessConfiguration::isSendByDefault).orElse(true); grantProcessRepository.save(new GrantProcess(applicationId, sendByDefault)); }); } @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 createGrantProcessDontSendByDefault() { long applicationId = 7L; long competitionId = 1L; Competition competition = CompetitionBuilder.newCompetition().withId(competitionId).build(); Application application = ApplicationBuilder.newApplication().withId(applicationId).withCompetition(competition).build(); GrantProcessConfiguration grantProcessConfiguration = createGrantProcessConfiguration(competition, false); GrantProcess grantProcess = new GrantProcess(applicationId); when(grantProcessRepository.save(grantProcess)).thenReturn(grantProcess); when(applicationRepository.findById(applicationId)).thenReturn(Optional.of(application)); when(grantProcessConfigurationRepository.findByCompetitionId(competitionId)).thenReturn(Optional.of(grantProcessConfiguration)); service.createGrantProcess(applicationId); verify(grantProcessRepository) .save(createLambdaMatcher(g -> { assertEquals(applicationId, g.getApplicationId()); assertFalse(g.isPending()); assertNull(g.getMessage()); assertNull(g.getSentRequested()); assertNull(g.getSentSucceeded()); assertNull(g.getLastProcessed()); })); } @Test public void createGrantProcessSendbyDefault() { long applicationId = 7L; long competitionId = 1L; Competition competition = CompetitionBuilder.newCompetition().withId(competitionId).build(); Application application = ApplicationBuilder.newApplication().withId(applicationId).withCompetition(competition).build(); GrantProcessConfiguration grantProcessConfiguration = createGrantProcessConfiguration(competition, true); GrantProcess grantProcess = new GrantProcess(applicationId); when(grantProcessRepository.save(grantProcess)).thenReturn(grantProcess); when(applicationRepository.findById(applicationId)).thenReturn(Optional.of(application)); when(grantProcessConfigurationRepository.findByCompetitionId(competitionId)).thenReturn(Optional.of(grantProcessConfiguration)); service.createGrantProcess(applicationId); verify(grantProcessRepository) .save(createLambdaMatcher(g -> { assertEquals(applicationId, g.getApplicationId()); assertTrue(g.isPending()); assertNull(g.getMessage()); assertNull(g.getSentRequested()); assertNull(g.getSentSucceeded()); assertNull(g.getLastProcessed()); })); } @Test public void createGrantProcessWhenNoConfig() { long applicationId = 7L; long competitionId = 1L; Competition competition = CompetitionBuilder.newCompetition().withId(competitionId).build(); Application application = ApplicationBuilder.newApplication().withId(applicationId).withCompetition(competition).build(); GrantProcess grantProcess = new GrantProcess(applicationId); when(grantProcessRepository.save(grantProcess)).thenReturn(grantProcess); when(applicationRepository.findById(applicationId)).thenReturn(Optional.of(application)); service.createGrantProcess(applicationId); verify(grantProcessRepository) .save(createLambdaMatcher(g -> { assertEquals(applicationId, g.getApplicationId()); assertTrue(g.isPending()); assertNull(g.getMessage()); assertNull(g.getSentRequested()); assertNull(g.getSentSucceeded()); assertNull(g.getLastProcessed()); })); }
ApplicationFundingBreakdownViewModelPopulator { public ApplicationFundingBreakdownViewModel populate(long applicationId, UserResource user) { ApplicationResource application = applicationRestService.getApplicationById(applicationId).getSuccess(); CompetitionResource competition = competitionRestService.getCompetitionById(application.getCompetition()).getSuccess(); List<ProcessRoleResource> processRoles = userRestService.findProcessRole(applicationId).getSuccess(); Map<Long, ApplicationFinanceResource> finances = applicationFinanceRestService.getFinanceTotals(applicationId).getSuccess() .stream().collect(toMap(ApplicationFinanceResource::getOrganisation, Function.identity())); List<OrganisationResource> organisations = organisationRestService.getOrganisationsByApplicationId(applicationId).getSuccess(); long leadOrganisationId = application.getLeadOrganisationId(); List<FinanceRowType> types = competition.getFinanceRowTypes().stream().filter(FinanceRowType::isCost).collect(toList()); List<BreakdownTableRow> rows = organisations.stream() .filter(organisation -> competition.isKtp() ? organisation.getId().equals(leadOrganisationId) : true) .map(organisation -> toFinanceTableRow(organisation, finances, leadOrganisationId, processRoles, user, application, competition)) .collect(toList()); if (!application.isSubmitted() && !competition.isKtp()) { rows.addAll(pendingOrganisations(applicationId, types)); } return new ApplicationFundingBreakdownViewModel(applicationId, competition.getName(), rows, application.isCollaborativeProject(), competition.getFundingType() == FundingType.KTP, types, finances.values().stream().anyMatch(ApplicationFinanceResource::isVatRegistered)); } ApplicationFundingBreakdownViewModel populate(long applicationId, UserResource user); }
@Test public void populateFinanceBreakdownForLeadAndPartnerForNonKtpApplication() { long applicationId = 1L; long competitionId = 2L; long leadOrganisationId = 3L; long partnerOrganisationId = 4L; long userId = 4L; String financeLinkUrl = "some url"; UserResource user = newUserResource() .withId(userId) .withRoleGlobal(Role.APPLICANT) .build(); CompetitionResource competition = newCompetitionResource() .withId(competitionId) .withFundingType(GRANT) .withFinanceRowTypes(Collections.singletonList(FinanceRowType.FINANCE)) .build(); ApplicationResource application = newApplicationResource() .withId(applicationId) .withCompetition(competition.getId()) .withLeadOrganisationId(leadOrganisationId) .build(); OrganisationResource leadOrganisation = newOrganisationResource().withId(leadOrganisationId).build(); OrganisationResource partnerOrganisation = newOrganisationResource().withId(partnerOrganisationId).build(); List<OrganisationResource> organisations = Arrays.asList(leadOrganisation, partnerOrganisation); ProcessRoleResource processRole = newProcessRoleResource() .withUserId(userId) .withRole(Role.LEADAPPLICANT) .withOrganisation(leadOrganisationId) .build(); ApplicationFinanceResource applicationFinance = newApplicationFinanceResource() .withOrganisation(leadOrganisationId) .withGrantClaimPercentage(BigDecimal.valueOf(100)) .build(); when(competitionRestService.getCompetitionById(competitionId)).thenReturn(restSuccess(competition)); when(applicationRestService.getApplicationById(applicationId)).thenReturn(restSuccess(application)); when(userRestService.findProcessRole(application.getId())).thenReturn(restSuccess(Collections.singletonList(processRole))); when(applicationFinanceRestService.getFinanceTotals(application.getId())).thenReturn(restSuccess(Collections.singletonList(applicationFinance))); when(organisationRestService.getOrganisationsByApplicationId(application.getId())).thenReturn(restSuccess(organisations)); when(financeLinksUtil.financesLink(leadOrganisation, Collections.singletonList(processRole), user, application, competition)).thenReturn(Optional.of(financeLinkUrl)); ApplicationFundingBreakdownViewModel model = populator.populate(applicationId, user); assertNotNull(model); assertEquals(2, model.getRows().size()); BreakdownTableRow leadOrganisationFinanceBreakdown = model.getRows().get(0); assertNotNull(leadOrganisationFinanceBreakdown); assertEquals(leadOrganisationId, leadOrganisationFinanceBreakdown.getOrganisationId().longValue()); Mockito.verify(inviteService, times(1)).getPendingInvitationsByApplicationId(applicationId); } @Test public void populateFinanceBreakdownOnlyForLeadForKtpApplication() { long applicationId = 1L; long competitionId = 2L; long leadOrganisationId = 3L; long partnerOrganisationId = 4L; long userId = 4L; String financeLinkUrl = "some url"; UserResource user = newUserResource() .withId(userId) .withRoleGlobal(Role.APPLICANT) .build(); CompetitionResource competition = newCompetitionResource() .withId(competitionId) .withFundingType(KTP) .withFinanceRowTypes(Collections.singletonList(FinanceRowType.FINANCE)) .build(); ApplicationResource application = newApplicationResource() .withId(applicationId) .withCompetition(competition.getId()) .withLeadOrganisationId(leadOrganisationId) .build(); OrganisationResource leadOrganisation = newOrganisationResource().withId(leadOrganisationId).build(); OrganisationResource partnerOrganisation = newOrganisationResource().withId(partnerOrganisationId).build(); List<OrganisationResource> organisations = Arrays.asList(leadOrganisation, partnerOrganisation); ProcessRoleResource processRole = newProcessRoleResource() .withUserId(userId) .withRole(Role.LEADAPPLICANT) .withOrganisation(leadOrganisationId) .build(); ApplicationFinanceResource applicationFinance = newApplicationFinanceResource() .withOrganisation(leadOrganisationId) .withGrantClaimPercentage(BigDecimal.valueOf(100)) .build(); when(competitionRestService.getCompetitionById(competitionId)).thenReturn(restSuccess(competition)); when(applicationRestService.getApplicationById(applicationId)).thenReturn(restSuccess(application)); when(userRestService.findProcessRole(application.getId())).thenReturn(restSuccess(Collections.singletonList(processRole))); when(applicationFinanceRestService.getFinanceTotals(application.getId())).thenReturn(restSuccess(Collections.singletonList(applicationFinance))); when(organisationRestService.getOrganisationsByApplicationId(application.getId())).thenReturn(restSuccess(organisations)); when(financeLinksUtil.financesLink(leadOrganisation, Collections.singletonList(processRole), user, application, competition)).thenReturn(Optional.of(financeLinkUrl)); ApplicationFundingBreakdownViewModel model = populator.populate(applicationId, user); assertNotNull(model); assertEquals(1, model.getRows().size()); BreakdownTableRow leadOrganisationFinanceBreakdown = model.getRows().get(0); assertNotNull(leadOrganisationFinanceBreakdown); assertEquals(leadOrganisationId, leadOrganisationFinanceBreakdown.getOrganisationId().longValue()); Mockito.verify(inviteService, times(0)).getPendingInvitationsByApplicationId(applicationId); }
ApplicationFinanceSummaryViewModelPopulator { public ApplicationFinanceSummaryViewModel populate(long applicationId, UserResource user) { ApplicationResource application = applicationRestService.getApplicationById(applicationId).getSuccess(); CompetitionResource competition = competitionRestService.getCompetitionById(application.getCompetition()).getSuccess(); List<ProcessRoleResource> processRoles = userRestService.findProcessRole(applicationId).getSuccess(); Optional<ProcessRoleResource> currentApplicantRole = getCurrentUsersRole(processRoles, user); return new ApplicationFinanceSummaryViewModel(competition, financeSummaryTableViewModelPopulator.populateAllOrganisations(application, competition, processRoles, user), currentApplicantRole.map(ProcessRoleResource::getOrganisationId).orElse(null)); } ApplicationFinanceSummaryViewModel populate(long applicationId, UserResource user); }
@Test public void populateFinanceLinksForNonKtpApplication() { setField(populator, "financeSummaryTableViewModelPopulator", financeSummaryTableViewModelPopulator); long applicationId = 1L; long competitionId = 2L; long organisationId = 3L; long userId = 4L; UserResource user = newUserResource() .withId(userId) .withRoleGlobal(Role.APPLICANT) .build(); CompetitionResource competition = newCompetitionResource() .withId(competitionId) .withFundingType(GRANT) .withFinanceRowTypes(Collections.singletonList(FinanceRowType.FINANCE)) .build(); ApplicationResource application = newApplicationResource() .withId(applicationId) .withCompetition(competition.getId()) .build(); OrganisationResource organisation = newOrganisationResource().withId(organisationId).build(); ProcessRoleResource processRole = newProcessRoleResource() .withUserId(userId) .withRole(Role.LEADAPPLICANT) .withOrganisation(organisationId) .build(); ApplicationFinanceResource applicationFinance = newApplicationFinanceResource() .withOrganisation(organisationId) .withGrantClaimPercentage(BigDecimal.valueOf(100)) .build(); SectionResource section = newSectionResource().build(); CompetitionApplicationConfigResource competitionApplicationConfig = newCompetitionApplicationConfigResource().build(); when(competitionRestService.getCompetitionById(competitionId)).thenReturn(restSuccess(competition)); when(applicationRestService.getApplicationById(applicationId)).thenReturn(restSuccess(application)); when(userRestService.findProcessRole(application.getId())).thenReturn(restSuccess(Collections.singletonList(processRole))); when(applicationFinanceRestService.getFinanceTotals(application.getId())).thenReturn(restSuccess(Collections.singletonList(applicationFinance))); when(organisationRestService.getOrganisationsByApplicationId(application.getId())).thenReturn(restSuccess(Collections.singletonList(organisation))); when(sectionStatusRestService.getCompletedSectionsByOrganisation(application.getId())).thenReturn(restSuccess(new HashMap<>())); when(sectionRestService.getSectionsByCompetitionIdAndType(competitionId, SectionType.FINANCE)).thenReturn(restSuccess(Collections.singletonList(section))); when(competitionApplicationConfigRestService.findOneByCompetitionId(competitionId)).thenReturn(restSuccess(competitionApplicationConfig)); ApplicationFinanceSummaryViewModel model = populator.populate(applicationId, user); assertNotNull(model); assertEquals(1, model.getFinanceSummaryTableViewModel().getRows().size()); FinanceSummaryTableRow row = model.getFinanceSummaryTableViewModel().getRows().get(0); assertNotNull(row); assertFalse(row.isShowViewFinancesLink()); assertNull(row.getUrl()); verify(financeLinksUtil, times(0)).financesLink(organisation, Collections.singletonList(processRole), user, application, competition); } @Test public void populateFinanceLinksForKtpApplication() { setField(populator, "financeSummaryTableViewModelPopulator", financeSummaryTableViewModelPopulator); long applicationId = 1L; long competitionId = 2L; String financeLinkUrl = "some url"; UserResource user = newUserResource() .withRoleGlobal(Role.APPLICANT) .build(); CompetitionResource competition = newCompetitionResource() .withId(competitionId) .withFundingType(KTP) .withFinanceRowTypes(Collections.singletonList(FinanceRowType.FINANCE)) .build(); ApplicationResource application = newApplicationResource() .withId(applicationId) .withCompetition(competition.getId()) .build(); OrganisationResource knowledgeBase = newOrganisationResource().build(); ProcessRoleResource knowledgeBaseProcessRole = newProcessRoleResource() .withUserId(user.getId()) .withRole(Role.LEADAPPLICANT) .withOrganisation(knowledgeBase.getId()) .build(); ApplicationFinanceResource knowledgeBaseFinance = newApplicationFinanceResource() .withOrganisation(knowledgeBase.getId()) .withGrantClaimPercentage(BigDecimal.valueOf(45)) .build(); OrganisationResource partner = newOrganisationResource().build(); ProcessRoleResource partnerProcessRole = newProcessRoleResource() .withUserId(user.getId()) .withRole(Role.PARTNER) .withOrganisation(partner.getId()) .build(); ApplicationFinanceResource partnerFinance = newApplicationFinanceResource() .withOrganisation(partner.getId()) .build(); SectionResource section = newSectionResource().build(); CompetitionApplicationConfigResource competitionApplicationConfig = newCompetitionApplicationConfigResource().build(); when(competitionRestService.getCompetitionById(competitionId)).thenReturn(restSuccess(competition)); when(applicationRestService.getApplicationById(applicationId)).thenReturn(restSuccess(application)); when(userRestService.findProcessRole(application.getId())).thenReturn(restSuccess(newArrayList(knowledgeBaseProcessRole, partnerProcessRole))); when(applicationFinanceRestService.getFinanceTotals(application.getId())).thenReturn(restSuccess(newArrayList(knowledgeBaseFinance, partnerFinance))); when(organisationRestService.getOrganisationsByApplicationId(application.getId())).thenReturn(restSuccess(newArrayList(knowledgeBase, partner))); when(sectionStatusRestService.getCompletedSectionsByOrganisation(application.getId())).thenReturn(restSuccess(new HashMap<>())); when(sectionRestService.getSectionsByCompetitionIdAndType(competitionId, SectionType.FINANCE)).thenReturn(restSuccess(Collections.singletonList(section))); when(competitionApplicationConfigRestService.findOneByCompetitionId(competitionId)).thenReturn(restSuccess(competitionApplicationConfig)); when(financeLinksUtil.financesLink(knowledgeBase, newArrayList(knowledgeBaseProcessRole, partnerProcessRole), user, application, competition)).thenReturn(Optional.of(financeLinkUrl)); when(financeLinksUtil.financesLink(partner, newArrayList(knowledgeBaseProcessRole, partnerProcessRole), user, application, competition)).thenReturn(Optional.of(financeLinkUrl)); ApplicationFinanceSummaryViewModel model = populator.populate(applicationId, user); assertNotNull(model); assertEquals(2, model.getFinanceSummaryTableViewModel().getRows().size()); FinanceSummaryTableRow knowledgeBaseRow = model.getFinanceSummaryTableViewModel().getRows().get(0); assertNotNull(knowledgeBaseRow); assertTrue(knowledgeBaseRow.isShowViewFinancesLink()); assertEquals(financeLinkUrl, knowledgeBaseRow.getUrl()); assertEquals(BigDecimal.ZERO, knowledgeBaseRow.getContribution()); assertEquals(BigDecimal.ZERO, knowledgeBaseRow.getContributionPercentage()); assertEquals(BigDecimal.ZERO, knowledgeBaseRow.getCosts()); assertEquals(BigDecimal.ZERO, knowledgeBaseRow.getFundingSought()); assertEquals(new BigDecimal("45"), knowledgeBaseRow.getClaimPercentage()); assertEquals(BigDecimal.ZERO, knowledgeBaseRow.getOtherFunding()); FinanceSummaryTableRow partnerRow = model.getFinanceSummaryTableViewModel().getRows().get(1); assertNotNull(partnerRow); assertTrue(partnerRow.isShowViewFinancesLink()); assertEquals(financeLinkUrl, partnerRow.getUrl()); assertEquals(BigDecimal.ZERO, partnerRow.getContribution()); assertEquals(new BigDecimal("55"), partnerRow.getContributionPercentage()); assertEquals(BigDecimal.ZERO, partnerRow.getCosts()); assertEquals(BigDecimal.ZERO, partnerRow.getFundingSought()); assertEquals(BigDecimal.ZERO, partnerRow.getClaimPercentage()); assertEquals(BigDecimal.ZERO, partnerRow.getOtherFunding()); }
ProjectServiceImpl implements ProjectService { @Override public ProjectResource getById(long projectId) { return projectRestService.getProjectById(projectId).getSuccess(); } @Override List<ProjectUserResource> getProjectUsersForProject(long projectId); @Override List<ProjectUserResource> getDisplayProjectUsersForProject(long projectId); @Override ProjectResource getById(long projectId); @Override ProjectResource getByApplicationId(long applicationId); @Override OrganisationResource getLeadOrganisation(long projectId); @Override List<OrganisationResource> getPartnerOrganisationsForProject(long projectId); @Override List<ProjectUserResource> getLeadPartners(long projectId); @Override List<ProjectUserResource> getPartners(long projectId); @Override boolean isUserLeadPartner(long projectId, long userId); @Override List<ProjectUserResource> getProjectUsersWithPartnerRole(long projectId); @Override Optional<ProjectUserResource> getProjectManager(long projectId); @Override final Boolean isProjectManager(long userId, long projectId); @Override Boolean isProjectFinanceContact(long userId, long projectId); @Override boolean userIsPartnerInOrganisationForProject(long projectId, long organisationId, long userId); @Override Long getOrganisationIdFromUser(long projectId, UserResource user); }
@Test public void getById() { ProjectResource projectResource = newProjectResource().build(); when(projectRestService.getProjectById(projectResource.getId())).thenReturn(restSuccess(projectResource)); ProjectResource returnedProjectResource = service.getById(projectResource.getId()); assertEquals(projectResource, returnedProjectResource); verify(projectRestService).getProjectById(projectResource.getId()); }
ProjectServiceImpl implements ProjectService { @Override public List<ProjectUserResource> getProjectUsersForProject(long projectId) { return projectRestService.getProjectUsersForProject(projectId).getSuccess(); } @Override List<ProjectUserResource> getProjectUsersForProject(long projectId); @Override List<ProjectUserResource> getDisplayProjectUsersForProject(long projectId); @Override ProjectResource getById(long projectId); @Override ProjectResource getByApplicationId(long applicationId); @Override OrganisationResource getLeadOrganisation(long projectId); @Override List<OrganisationResource> getPartnerOrganisationsForProject(long projectId); @Override List<ProjectUserResource> getLeadPartners(long projectId); @Override List<ProjectUserResource> getPartners(long projectId); @Override boolean isUserLeadPartner(long projectId, long userId); @Override List<ProjectUserResource> getProjectUsersWithPartnerRole(long projectId); @Override Optional<ProjectUserResource> getProjectManager(long projectId); @Override final Boolean isProjectManager(long userId, long projectId); @Override Boolean isProjectFinanceContact(long userId, long projectId); @Override boolean userIsPartnerInOrganisationForProject(long projectId, long organisationId, long userId); @Override Long getOrganisationIdFromUser(long projectId, UserResource user); }
@Test public void getProjectUsersForProject() { long projectId = 1; List<ProjectUserResource> projectUsers = newProjectUserResource().build(5); when(projectRestService.getProjectUsersForProject(projectId)).thenReturn(restSuccess(projectUsers)); List<ProjectUserResource> returnedProjectUsers = service.getProjectUsersForProject(projectId); assertEquals(returnedProjectUsers, projectUsers); verify(projectRestService).getProjectUsersForProject(projectId); }
ProjectServiceImpl implements ProjectService { @Override public ProjectResource getByApplicationId(long applicationId) { RestResult<ProjectResource> restResult = projectRestService.getByApplicationId(applicationId); if(restResult.isSuccess()){ return restResult.getSuccess(); } else { return null; } } @Override List<ProjectUserResource> getProjectUsersForProject(long projectId); @Override List<ProjectUserResource> getDisplayProjectUsersForProject(long projectId); @Override ProjectResource getById(long projectId); @Override ProjectResource getByApplicationId(long applicationId); @Override OrganisationResource getLeadOrganisation(long projectId); @Override List<OrganisationResource> getPartnerOrganisationsForProject(long projectId); @Override List<ProjectUserResource> getLeadPartners(long projectId); @Override List<ProjectUserResource> getPartners(long projectId); @Override boolean isUserLeadPartner(long projectId, long userId); @Override List<ProjectUserResource> getProjectUsersWithPartnerRole(long projectId); @Override Optional<ProjectUserResource> getProjectManager(long projectId); @Override final Boolean isProjectManager(long userId, long projectId); @Override Boolean isProjectFinanceContact(long userId, long projectId); @Override boolean userIsPartnerInOrganisationForProject(long projectId, long organisationId, long userId); @Override Long getOrganisationIdFromUser(long projectId, UserResource user); }
@Test public void getByApplicationId() { ApplicationResource applicationResource = newApplicationResource().build(); ProjectResource projectResource = newProjectResource().withApplication(applicationResource).build(); when(projectRestService.getByApplicationId(applicationResource.getId())).thenReturn(restSuccess(projectResource)); ProjectResource returnedProjectResource = service.getByApplicationId(applicationResource.getId()); assertEquals(returnedProjectResource, projectResource); verify(projectRestService).getByApplicationId(applicationResource.getId()); }
ProjectServiceImpl implements ProjectService { @Override public OrganisationResource getLeadOrganisation(long projectId) { return projectRestService.getLeadOrganisationByProject(projectId).getSuccess(); } @Override List<ProjectUserResource> getProjectUsersForProject(long projectId); @Override List<ProjectUserResource> getDisplayProjectUsersForProject(long projectId); @Override ProjectResource getById(long projectId); @Override ProjectResource getByApplicationId(long applicationId); @Override OrganisationResource getLeadOrganisation(long projectId); @Override List<OrganisationResource> getPartnerOrganisationsForProject(long projectId); @Override List<ProjectUserResource> getLeadPartners(long projectId); @Override List<ProjectUserResource> getPartners(long projectId); @Override boolean isUserLeadPartner(long projectId, long userId); @Override List<ProjectUserResource> getProjectUsersWithPartnerRole(long projectId); @Override Optional<ProjectUserResource> getProjectManager(long projectId); @Override final Boolean isProjectManager(long userId, long projectId); @Override Boolean isProjectFinanceContact(long userId, long projectId); @Override boolean userIsPartnerInOrganisationForProject(long projectId, long organisationId, long userId); @Override Long getOrganisationIdFromUser(long projectId, UserResource user); }
@Test public void getLeadOrganisation() { OrganisationResource organisationResource = newOrganisationResource().build(); ApplicationResource applicationResource = newApplicationResource().build(); ProjectResource projectResource = newProjectResource().withApplication(applicationResource).build(); when(projectRestService.getLeadOrganisationByProject(projectResource.getId())).thenReturn(restSuccess(organisationResource)); OrganisationResource returnedOrganisationResource = service.getLeadOrganisation(projectResource.getId()); assertEquals(organisationResource, returnedOrganisationResource); verify(projectRestService).getLeadOrganisationByProject(projectResource.getId()); }
ProjectServiceImpl implements ProjectService { @Override public List<OrganisationResource> getPartnerOrganisationsForProject(long projectId) { List<PartnerOrganisationResource> partnerOrganisationResources = partnerOrganisationRestService.getProjectPartnerOrganisations(projectId).getSuccess(); List<Long> organisationIds = removeDuplicates(simpleMap(partnerOrganisationResources, PartnerOrganisationResource::getOrganisation)); List<RestResult<OrganisationResource>> organisationResults = simpleMap(organisationIds, organisationId -> organisationRestService.getOrganisationById(organisationId)); RestResult<List<OrganisationResource>> organisationResultsCombined = aggregate(organisationResults); return organisationResultsCombined.getSuccess(); } @Override List<ProjectUserResource> getProjectUsersForProject(long projectId); @Override List<ProjectUserResource> getDisplayProjectUsersForProject(long projectId); @Override ProjectResource getById(long projectId); @Override ProjectResource getByApplicationId(long applicationId); @Override OrganisationResource getLeadOrganisation(long projectId); @Override List<OrganisationResource> getPartnerOrganisationsForProject(long projectId); @Override List<ProjectUserResource> getLeadPartners(long projectId); @Override List<ProjectUserResource> getPartners(long projectId); @Override boolean isUserLeadPartner(long projectId, long userId); @Override List<ProjectUserResource> getProjectUsersWithPartnerRole(long projectId); @Override Optional<ProjectUserResource> getProjectManager(long projectId); @Override final Boolean isProjectManager(long userId, long projectId); @Override Boolean isProjectFinanceContact(long userId, long projectId); @Override boolean userIsPartnerInOrganisationForProject(long projectId, long organisationId, long userId); @Override Long getOrganisationIdFromUser(long projectId, UserResource user); }
@Test public void getPartnerOrganisationsForProject() { long projectId = 1; long organisationId1 = 12; long organisationId2 = 14; List<PartnerOrganisationResource> partnerOrganisationResources = newPartnerOrganisationResource() .withOrganisation(organisationId1, organisationId2) .build(2); List<OrganisationResource> organisationResources = newOrganisationResource() .withId(organisationId1, organisationId2) .build(2); when(partnerOrganisationRestService.getProjectPartnerOrganisations(projectId)).thenReturn(restSuccess(partnerOrganisationResources)); when(organisationRestService.getOrganisationById(organisationId1)).thenReturn(restSuccess(organisationResources.get(0))); when(organisationRestService.getOrganisationById(organisationId2)).thenReturn(restSuccess(organisationResources.get(1))); List<OrganisationResource> result = service.getPartnerOrganisationsForProject(projectId); assertEquals(2, result.size()); assertEquals(organisationResources.get(0), result.get(0)); assertEquals(organisationResources.get(1), result.get(1)); }
ProjectServiceImpl implements ProjectService { @Override public Optional<ProjectUserResource> getProjectManager(long projectId) { return projectRestService.getProjectManager(projectId).toServiceResult().getOptionalSuccessObject(); } @Override List<ProjectUserResource> getProjectUsersForProject(long projectId); @Override List<ProjectUserResource> getDisplayProjectUsersForProject(long projectId); @Override ProjectResource getById(long projectId); @Override ProjectResource getByApplicationId(long applicationId); @Override OrganisationResource getLeadOrganisation(long projectId); @Override List<OrganisationResource> getPartnerOrganisationsForProject(long projectId); @Override List<ProjectUserResource> getLeadPartners(long projectId); @Override List<ProjectUserResource> getPartners(long projectId); @Override boolean isUserLeadPartner(long projectId, long userId); @Override List<ProjectUserResource> getProjectUsersWithPartnerRole(long projectId); @Override Optional<ProjectUserResource> getProjectManager(long projectId); @Override final Boolean isProjectManager(long userId, long projectId); @Override Boolean isProjectFinanceContact(long userId, long projectId); @Override boolean userIsPartnerInOrganisationForProject(long projectId, long organisationId, long userId); @Override Long getOrganisationIdFromUser(long projectId, UserResource user); }
@Test public void getProjectManager() { long projectId = 123; long projectManagerId = 987; when(projectRestService.getProjectManager(projectId)) .thenReturn(restSuccess(newProjectUserResource().withUser(projectManagerId).build())); assertTrue(service.getProjectManager(projectId).isPresent()); } @Test public void getProjectManager_notFound() { long projectId = 123; when(projectRestService.getProjectManager(projectId)) .thenReturn(restSuccess(null, HttpStatus.NOT_FOUND)); assertFalse(service.getProjectManager(projectId).isPresent()); }
ProjectServiceImpl implements ProjectService { @Override public final Boolean isProjectManager(long userId, long projectId) { return getProjectManager(projectId).map(maybePM -> maybePM.isUser(userId)).orElse(false); } @Override List<ProjectUserResource> getProjectUsersForProject(long projectId); @Override List<ProjectUserResource> getDisplayProjectUsersForProject(long projectId); @Override ProjectResource getById(long projectId); @Override ProjectResource getByApplicationId(long applicationId); @Override OrganisationResource getLeadOrganisation(long projectId); @Override List<OrganisationResource> getPartnerOrganisationsForProject(long projectId); @Override List<ProjectUserResource> getLeadPartners(long projectId); @Override List<ProjectUserResource> getPartners(long projectId); @Override boolean isUserLeadPartner(long projectId, long userId); @Override List<ProjectUserResource> getProjectUsersWithPartnerRole(long projectId); @Override Optional<ProjectUserResource> getProjectManager(long projectId); @Override final Boolean isProjectManager(long userId, long projectId); @Override Boolean isProjectFinanceContact(long userId, long projectId); @Override boolean userIsPartnerInOrganisationForProject(long projectId, long organisationId, long userId); @Override Long getOrganisationIdFromUser(long projectId, UserResource user); }
@Test public void isProjectManager() { final long projectId = 123; final long projectManagerId = 987; when(projectRestService.getProjectManager(projectId)) .thenReturn(restSuccess(newProjectUserResource().withUser(projectManagerId).build())); assertTrue(service.isProjectManager(projectManagerId, projectId)); }
ProjectServiceImpl implements ProjectService { @Override public Boolean isProjectFinanceContact(long userId, long projectId) { List<ProjectUserResource> projectFinanceContacts = projectRestService.getProjectFinanceContacts(projectId).getSuccess(); return projectFinanceContacts.stream().anyMatch(pu -> pu.isUser(userId)); } @Override List<ProjectUserResource> getProjectUsersForProject(long projectId); @Override List<ProjectUserResource> getDisplayProjectUsersForProject(long projectId); @Override ProjectResource getById(long projectId); @Override ProjectResource getByApplicationId(long applicationId); @Override OrganisationResource getLeadOrganisation(long projectId); @Override List<OrganisationResource> getPartnerOrganisationsForProject(long projectId); @Override List<ProjectUserResource> getLeadPartners(long projectId); @Override List<ProjectUserResource> getPartners(long projectId); @Override boolean isUserLeadPartner(long projectId, long userId); @Override List<ProjectUserResource> getProjectUsersWithPartnerRole(long projectId); @Override Optional<ProjectUserResource> getProjectManager(long projectId); @Override final Boolean isProjectManager(long userId, long projectId); @Override Boolean isProjectFinanceContact(long userId, long projectId); @Override boolean userIsPartnerInOrganisationForProject(long projectId, long organisationId, long userId); @Override Long getOrganisationIdFromUser(long projectId, UserResource user); }
@Test public void isProjectFinanceContact() { final long projectId = 123; final long projectFinanceContactId = 987; List<ProjectUserResource> projectFinanceContacts = Arrays.asList( newProjectUserResource().withUser(projectFinanceContactId).build(), newProjectUserResource().withUser(anyLong()).build() ); when(projectRestService.getProjectFinanceContacts(projectId)).thenReturn(restSuccess(projectFinanceContacts)); assertTrue(service.isProjectFinanceContact(projectFinanceContactId, projectId)); } @Test public void isProjectFinanceContact_emptyResults() { final long projectId = 123; when(projectRestService.getProjectFinanceContacts(projectId)).thenReturn(restSuccess(Collections.emptyList())); assertFalse(service.isProjectFinanceContact(anyLong(), projectId)); } @Test public void isProjectFinanceContact_notUser() { final long projectId = 123; final long projectFinanceContactId = 987; final long loggedInUserId = 742; when(projectRestService.getProjectFinanceContacts(projectId)) .thenReturn(restSuccess(Collections.singletonList(newProjectUserResource().withUser(projectFinanceContactId).build()))); assertFalse(service.isProjectFinanceContact(loggedInUserId, projectId)); }
ProjectServiceImpl implements ProjectService { @Override public boolean userIsPartnerInOrganisationForProject(long projectId, long organisationId, long userId) { List<ProjectUserResource> thisProjectUsers = getProjectUsersForProject(projectId); List<ProjectUserResource> projectUsersForOrganisation = simpleFilter(thisProjectUsers, user -> user.getOrganisation().equals(organisationId)); List<ProjectUserResource> projectUsersForUserAndOrganisation = simpleFilter(projectUsersForOrganisation, user -> user.getUser().equals(userId)); return !projectUsersForUserAndOrganisation.isEmpty(); } @Override List<ProjectUserResource> getProjectUsersForProject(long projectId); @Override List<ProjectUserResource> getDisplayProjectUsersForProject(long projectId); @Override ProjectResource getById(long projectId); @Override ProjectResource getByApplicationId(long applicationId); @Override OrganisationResource getLeadOrganisation(long projectId); @Override List<OrganisationResource> getPartnerOrganisationsForProject(long projectId); @Override List<ProjectUserResource> getLeadPartners(long projectId); @Override List<ProjectUserResource> getPartners(long projectId); @Override boolean isUserLeadPartner(long projectId, long userId); @Override List<ProjectUserResource> getProjectUsersWithPartnerRole(long projectId); @Override Optional<ProjectUserResource> getProjectManager(long projectId); @Override final Boolean isProjectManager(long userId, long projectId); @Override Boolean isProjectFinanceContact(long userId, long projectId); @Override boolean userIsPartnerInOrganisationForProject(long projectId, long organisationId, long userId); @Override Long getOrganisationIdFromUser(long projectId, UserResource user); }
@Test public void userIsPartnerInOrganisationForProject(){ long projectId = 1; long userId = 2; long expectedOrgId = 3; UserResource userResource = newUserResource().withId(userId).build(); setLoggedInUser(userResource); when(projectService.userIsPartnerInOrganisationForProject(projectId, expectedOrgId, userId)).thenReturn(true); boolean result = projectService.userIsPartnerInOrganisationForProject(projectId, expectedOrgId, userId); assertTrue(result); }
ProjectServiceImpl implements ProjectService { @Override public Long getOrganisationIdFromUser(long projectId, UserResource user) throws ForbiddenActionException { RestResult<OrganisationResource> organisationResource = organisationRestService.getByUserAndProjectId(user.getId(), projectId); if (organisationResource.toServiceResult().isFailure()) { throw new ForbiddenActionException(CANNOT_GET_ANY_USERS_FOR_PROJECT.getErrorKey(), Collections.singletonList(projectId)); } return organisationResource.getSuccess().getId(); } @Override List<ProjectUserResource> getProjectUsersForProject(long projectId); @Override List<ProjectUserResource> getDisplayProjectUsersForProject(long projectId); @Override ProjectResource getById(long projectId); @Override ProjectResource getByApplicationId(long applicationId); @Override OrganisationResource getLeadOrganisation(long projectId); @Override List<OrganisationResource> getPartnerOrganisationsForProject(long projectId); @Override List<ProjectUserResource> getLeadPartners(long projectId); @Override List<ProjectUserResource> getPartners(long projectId); @Override boolean isUserLeadPartner(long projectId, long userId); @Override List<ProjectUserResource> getProjectUsersWithPartnerRole(long projectId); @Override Optional<ProjectUserResource> getProjectManager(long projectId); @Override final Boolean isProjectManager(long userId, long projectId); @Override Boolean isProjectFinanceContact(long userId, long projectId); @Override boolean userIsPartnerInOrganisationForProject(long projectId, long organisationId, long userId); @Override Long getOrganisationIdFromUser(long projectId, UserResource user); }
@Test public void getOrganisationIdFromUser() { long projectId = 1; long userId = 2; long expectedOrgId = 3; UserResource userResource = newUserResource().withId(userId).build(); setLoggedInUser(userResource); when(projectService.getOrganisationIdFromUser(projectId, userResource)).thenReturn(expectedOrgId); long organisationId = projectService.getOrganisationIdFromUser(projectId, userResource); assertEquals(expectedOrgId, organisationId); }
InviteServiceImpl implements InviteService { @Override public List<ApplicationInviteResource> getPendingInvitationsByApplicationId(Long applicationId) { RestResult<List<InviteOrganisationResource>> pendingAssignableUsersResult = inviteRestService.getInvitesByApplication(applicationId); if(pendingAssignableUsersResult.isSuccess()){ return pendingAssignableUsersResult.getSuccess() .stream() .flatMap(item -> item.getInviteResources().stream()) .filter(item -> !InviteStatus.OPENED.equals(item.getStatus())) .collect(Collectors.toList()); } else { return new ArrayList<>(0); } } @Override List<ApplicationInviteResource> getPendingInvitationsByApplicationId(Long applicationId); }
@Test public void getPendingInvitations() throws Exception { ApplicationResource app = newApplicationResource() .with(id(1L)) .build(); ApplicationInviteResource inv1 = inviteResource("name1", "teamA", InviteStatus.CREATED); ApplicationInviteResource inv2 = inviteResource("name2", "teamA", InviteStatus.SENT); ApplicationInviteResource inv3 = inviteResource("name3", "teamA", InviteStatus.OPENED); InviteOrganisationResource inviteOrgResource = inviteOrganisationResource(inv1, inv2, inv3); List<InviteOrganisationResource> inviteOrgResources = Arrays.asList(inviteOrgResource); RestResult<List<InviteOrganisationResource>> invitesResult = restSuccess(inviteOrgResources, HttpStatus.OK); when(inviteRestService.getInvitesByApplication(app.getId())).thenReturn(invitesResult); List<ApplicationInviteResource> invites = service.getPendingInvitationsByApplicationId(app.getId()); verify(inviteRestService).getInvitesByApplication(app.getId()); assertTrue(invites.size() == 2); } @Test public void pendingOrganisationNamesOmitsEmptyOrganisationName() throws Exception { ApplicationResource app = newApplicationResource() .with(id(1L)) .build(); ApplicationInviteResource inv1 = inviteResource("kirk", "teamA", InviteStatus.CREATED); ApplicationInviteResource inv2 = inviteResource("picard", "", InviteStatus.CREATED); InviteOrganisationResource inviteOrgResource1 = inviteOrganisationResource(inv1); InviteOrganisationResource inviteOrgResource2 = inviteOrganisationResource(inv2); List<InviteOrganisationResource> inviteOrgResources = Arrays.asList(inviteOrgResource1, inviteOrgResource2); RestResult<List<InviteOrganisationResource>> invitesResult = RestResult.restSuccess(inviteOrgResources, HttpStatus.OK); when(inviteRestService.getInvitesByApplication(app.getId())).thenReturn(invitesResult); List<ApplicationInviteResource> invites = service.getPendingInvitationsByApplicationId(app.getId()); verify(inviteRestService).getInvitesByApplication(app.getId()); assertTrue(invites.size() == 2); assertTrue(invites.contains(inv1)); assertTrue(invites.contains(inv2)); } @Test public void nonAcceptedInvitationsAffectPendingAssignableUsers() throws Exception { ApplicationResource app = newApplicationResource() .with(id(1L)) .build(); ApplicationInviteResource inv1 = inviteResource("kirk", "teamA", InviteStatus.CREATED); ApplicationInviteResource inv2 = inviteResource("spock", "teamA", InviteStatus.SENT); ApplicationInviteResource inv3 = inviteResource("bones", "teamA", InviteStatus.OPENED); ApplicationInviteResource inv4 = inviteResource("picard", "teamB", InviteStatus.CREATED); InviteOrganisationResource inviteOrgResource1 = inviteOrganisationResource(inv1, inv2, inv3); InviteOrganisationResource inviteOrgResource2 = inviteOrganisationResource(inv4); List<InviteOrganisationResource> inviteOrgResources = Arrays.asList(inviteOrgResource1, inviteOrgResource2); RestResult<List<InviteOrganisationResource>> invitesResult = restSuccess(inviteOrgResources, HttpStatus.OK); when(inviteRestService.getInvitesByApplication(app.getId())).thenReturn(invitesResult); List<ApplicationInviteResource> invites = service.getPendingInvitationsByApplicationId(app.getId()); verify(inviteRestService).getInvitesByApplication(app.getId()); assertTrue(invites.size() == 3); assertTrue(invites.contains(inv1)); assertTrue(invites.contains(inv2)); assertTrue(invites.contains(inv4)); }
ControllersUtil { public static boolean isLeadPartner(final PartnerOrganisationRestService partnerOrganisationService, final Long projectId, final Long organisationId) { RestResult<List<PartnerOrganisationResource>> result = partnerOrganisationService.getProjectPartnerOrganisations(projectId); if(null != result && result.isSuccess()) { Optional<PartnerOrganisationResource> partnerOrganisationResource = simpleFindFirst(result.getSuccess(), PartnerOrganisationResource::isLeadOrganisation); return partnerOrganisationResource.isPresent() && partnerOrganisationResource.get().getOrganisation().equals(organisationId); } else { return false; } } private ControllersUtil(); static boolean isLeadPartner(final PartnerOrganisationRestService partnerOrganisationService, final Long projectId, final Long organisationId); }
@Test public void testIsLeadPartner() { Long projectId = 1L; Long organisationId = 2L; PartnerOrganisationResource partnerOrganisationResource = new PartnerOrganisationResource(); partnerOrganisationResource.setOrganisation(organisationId); partnerOrganisationResource.setLeadOrganisation(true); when(partnerOrganisationRestService.getProjectPartnerOrganisations(projectId)).thenReturn(restSuccess(singletonList(partnerOrganisationResource))); assertTrue(ControllersUtil.isLeadPartner(partnerOrganisationRestService, projectId, organisationId)); } @Test public void testNotLeadPartner() { Long projectId = 1L; Long organisationId = 2L; PartnerOrganisationResource partnerOrganisationResource = new PartnerOrganisationResource(); partnerOrganisationResource.setOrganisation(organisationId); partnerOrganisationResource.setLeadOrganisation(false); when(partnerOrganisationRestService.getProjectPartnerOrganisations(projectId)).thenReturn(restSuccess(singletonList(partnerOrganisationResource))); assertFalse(ControllersUtil.isLeadPartner(partnerOrganisationRestService, projectId, organisationId)); Long mismatchOrganisationId = 3L; partnerOrganisationResource.setOrganisation(mismatchOrganisationId); partnerOrganisationResource.setLeadOrganisation(true); assertFalse(ControllersUtil.isLeadPartner(partnerOrganisationRestService, projectId, organisationId)); }
StatusServiceImpl implements StatusService { @Override public ProjectTeamStatusResource getProjectTeamStatus(Long projectId, Optional<Long> filterByUserId) { return statusRestService.getProjectTeamStatus(projectId, filterByUserId).getSuccess(); } @Override ProjectTeamStatusResource getProjectTeamStatus(Long projectId, Optional<Long> filterByUserId); @Override ProjectStatusResource getProjectStatus(Long projectId); }
@Test public void testGetProjectTeamStatus() throws Exception { ProjectTeamStatusResource expectedProjectTeamStatusResource = newProjectTeamStatusResource().build(); when(statusRestService.getProjectTeamStatus(1L, Optional.empty())).thenReturn(restSuccess(expectedProjectTeamStatusResource)); ProjectTeamStatusResource projectTeamStatusResource = service.getProjectTeamStatus(1L, Optional.empty()); assertEquals(expectedProjectTeamStatusResource, projectTeamStatusResource); verify(statusRestService).getProjectTeamStatus(1L, Optional.empty()); } @Test public void testGetProjectTeamStatusWithFilterByUserId() throws Exception { ProjectTeamStatusResource expectedProjectTeamStatusResource = newProjectTeamStatusResource().build(); when(statusRestService.getProjectTeamStatus(1L, Optional.of(456L))).thenReturn(restSuccess(expectedProjectTeamStatusResource)); ProjectTeamStatusResource projectTeamStatusResource = service.getProjectTeamStatus(1L, Optional.of(456L)); assertEquals(expectedProjectTeamStatusResource, projectTeamStatusResource); verify(statusRestService).getProjectTeamStatus(1L, Optional.of(456L)); }
ProjectDetailsServiceImpl implements ProjectDetailsService { @Override public ServiceResult<Void> updateFinanceContact(ProjectOrganisationCompositeId composite, Long financeContactUserId) { return projectDetailsRestService.updateFinanceContact(composite, financeContactUserId).toServiceResult(); } @Override ServiceResult<Void> updateProjectManager(Long projectId, Long projectManagerUserId); @Override ServiceResult<Void> updateFinanceContact(ProjectOrganisationCompositeId composite, Long financeContactUserId); @Override ServiceResult<Void> updatePartnerProjectLocation(long projectId, long organisationId, PostcodeAndTownResource postcodeAndTown); @Override ServiceResult<Void> updateProjectStartDate(long projectId, LocalDate projectStartDate); @Override ServiceResult<Void> updateProjectDuration(long projectId, long durationInMonths); @Override ServiceResult<Void> updateAddress(Long projectId, AddressResource address); }
@Test public void updateFinanceContact() { long projectId = 1L; long organisationId = 2L; long financeContactId = 3L; when(projectDetailsRestService.updateFinanceContact(new ProjectOrganisationCompositeId(projectId, organisationId), financeContactId)).thenReturn(restSuccess()); service.updateFinanceContact(new ProjectOrganisationCompositeId(projectId, organisationId), financeContactId); verify(projectDetailsRestService).updateFinanceContact(new ProjectOrganisationCompositeId(projectId, organisationId), financeContactId); verifyNoMoreInteractions(projectDetailsRestService); }
ProjectDetailsServiceImpl implements ProjectDetailsService { @Override public ServiceResult<Void> updatePartnerProjectLocation(long projectId, long organisationId, PostcodeAndTownResource postcodeAndTown) { return projectDetailsRestService.updatePartnerProjectLocation(projectId, organisationId, postcodeAndTown).toServiceResult(); } @Override ServiceResult<Void> updateProjectManager(Long projectId, Long projectManagerUserId); @Override ServiceResult<Void> updateFinanceContact(ProjectOrganisationCompositeId composite, Long financeContactUserId); @Override ServiceResult<Void> updatePartnerProjectLocation(long projectId, long organisationId, PostcodeAndTownResource postcodeAndTown); @Override ServiceResult<Void> updateProjectStartDate(long projectId, LocalDate projectStartDate); @Override ServiceResult<Void> updateProjectDuration(long projectId, long durationInMonths); @Override ServiceResult<Void> updateAddress(Long projectId, AddressResource address); }
@Test public void updatePartnerProjectLocation() { long projectId = 1L; long organisationId = 2L; PostcodeAndTownResource postcodeAndTown = new PostcodeAndTownResource("TW14 9QG", null); when(projectDetailsRestService.updatePartnerProjectLocation(projectId, organisationId, postcodeAndTown)).thenReturn(restSuccess()); ServiceResult<Void> result = service.updatePartnerProjectLocation(projectId, organisationId, postcodeAndTown); assertTrue(result.isSuccess()); verify(projectDetailsRestService).updatePartnerProjectLocation(projectId, organisationId, postcodeAndTown); verifyNoMoreInteractions(projectDetailsRestService); }
GrantProcessServiceImpl implements GrantProcessService { @Override public void sendSucceeded(long applicationId) { GrantProcess process = grantProcessRepository.findOneByApplicationId(applicationId); grantProcessRepository.save(process.sendSucceeded(ZonedDateTime.now())); } @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 sendSucceeded() { ZonedDateTime now = ZonedDateTime.now(); long applicationId = 7L; GrantProcess grantProcess = new GrantProcess(applicationId); when(grantProcessRepository.findOneByApplicationId(applicationId)).thenReturn(grantProcess); when(grantProcessRepository.save(grantProcess)).thenReturn(grantProcess); service.sendSucceeded(applicationId); verify(grantProcessRepository).findOneByApplicationId(applicationId); verify(grantProcessRepository).save(createLambdaMatcher(g -> { assertEquals(applicationId, g.getApplicationId()); assertFalse(g.isPending()); assertNull(g.getMessage()); assertNull(g.getSentRequested()); assertNotNull(g.getSentSucceeded()); assertNull(g.getLastProcessed()); })); }
ProjectDetailsServiceImpl implements ProjectDetailsService { @Override public ServiceResult<Void> updateProjectManager(Long projectId, Long projectManagerUserId) { return projectDetailsRestService.updateProjectManager(projectId, projectManagerUserId).toServiceResult(); } @Override ServiceResult<Void> updateProjectManager(Long projectId, Long projectManagerUserId); @Override ServiceResult<Void> updateFinanceContact(ProjectOrganisationCompositeId composite, Long financeContactUserId); @Override ServiceResult<Void> updatePartnerProjectLocation(long projectId, long organisationId, PostcodeAndTownResource postcodeAndTown); @Override ServiceResult<Void> updateProjectStartDate(long projectId, LocalDate projectStartDate); @Override ServiceResult<Void> updateProjectDuration(long projectId, long durationInMonths); @Override ServiceResult<Void> updateAddress(Long projectId, AddressResource address); }
@Test public void updateProjectManager() { when(projectDetailsRestService.updateProjectManager(1L, 2L)).thenReturn(restSuccess()); service.updateProjectManager(1L, 2L); verify(projectDetailsRestService).updateProjectManager(1L, 2L); verifyNoMoreInteractions(projectDetailsRestService); }
ProjectDetailsServiceImpl implements ProjectDetailsService { @Override public ServiceResult<Void> updateProjectStartDate(long projectId, LocalDate projectStartDate) { return projectDetailsRestService.updateProjectStartDate(projectId, projectStartDate).toServiceResult(); } @Override ServiceResult<Void> updateProjectManager(Long projectId, Long projectManagerUserId); @Override ServiceResult<Void> updateFinanceContact(ProjectOrganisationCompositeId composite, Long financeContactUserId); @Override ServiceResult<Void> updatePartnerProjectLocation(long projectId, long organisationId, PostcodeAndTownResource postcodeAndTown); @Override ServiceResult<Void> updateProjectStartDate(long projectId, LocalDate projectStartDate); @Override ServiceResult<Void> updateProjectDuration(long projectId, long durationInMonths); @Override ServiceResult<Void> updateAddress(Long projectId, AddressResource address); }
@Test public void updateProjectStartDate() { LocalDate date = LocalDate.now(); when(projectDetailsRestService.updateProjectStartDate(1L, date)).thenReturn(restSuccess()); ServiceResult<Void> result = service.updateProjectStartDate(1L, date); assertTrue(result.isSuccess()); verify(projectDetailsRestService).updateProjectStartDate(1L, date); }
ProjectDetailsServiceImpl implements ProjectDetailsService { @Override public ServiceResult<Void> updateProjectDuration(long projectId, long durationInMonths) { return projectDetailsRestService.updateProjectDuration(projectId, durationInMonths).toServiceResult(); } @Override ServiceResult<Void> updateProjectManager(Long projectId, Long projectManagerUserId); @Override ServiceResult<Void> updateFinanceContact(ProjectOrganisationCompositeId composite, Long financeContactUserId); @Override ServiceResult<Void> updatePartnerProjectLocation(long projectId, long organisationId, PostcodeAndTownResource postcodeAndTown); @Override ServiceResult<Void> updateProjectStartDate(long projectId, LocalDate projectStartDate); @Override ServiceResult<Void> updateProjectDuration(long projectId, long durationInMonths); @Override ServiceResult<Void> updateAddress(Long projectId, AddressResource address); }
@Test public void updateProjectDuration() { long projectId = 3L; long durationInMonths = 18L; when(projectDetailsRestService.updateProjectDuration(projectId, durationInMonths)).thenReturn(restSuccess()); ServiceResult<Void> result = service.updateProjectDuration(projectId, durationInMonths); assertTrue(result.isSuccess()); verify(projectDetailsRestService).updateProjectDuration(projectId, durationInMonths); verifyNoMoreInteractions(projectDetailsRestService); }
ProjectDetailsServiceImpl implements ProjectDetailsService { @Override public ServiceResult<Void> updateAddress(Long projectId, AddressResource address) { return projectDetailsRestService.updateProjectAddress(projectId, address).toServiceResult(); } @Override ServiceResult<Void> updateProjectManager(Long projectId, Long projectManagerUserId); @Override ServiceResult<Void> updateFinanceContact(ProjectOrganisationCompositeId composite, Long financeContactUserId); @Override ServiceResult<Void> updatePartnerProjectLocation(long projectId, long organisationId, PostcodeAndTownResource postcodeAndTown); @Override ServiceResult<Void> updateProjectStartDate(long projectId, LocalDate projectStartDate); @Override ServiceResult<Void> updateProjectDuration(long projectId, long durationInMonths); @Override ServiceResult<Void> updateAddress(Long projectId, AddressResource address); }
@Test public void updateAddress() { long leadOrgId = 1L; long projectId = 2L; AddressResource addressResource = newAddressResource().build(); when(projectDetailsRestService.updateProjectAddress(projectId, addressResource)).thenReturn(restSuccess()); ServiceResult<Void> result = service.updateAddress(projectId, addressResource); assertTrue(result.isSuccess()); verify(projectDetailsRestService).updateProjectAddress(projectId, addressResource); verifyNoMoreInteractions(projectDetailsRestService); }
FinanceCheckServiceImpl implements FinanceCheckService { @Override public FinanceCheckResource getByProjectAndOrganisation(ProjectOrganisationCompositeId key) { return financeCheckRestService.getByProjectAndOrganisation(key.getProjectId(), key.getOrganisationId()).getSuccess(); } @Override FinanceCheckResource getByProjectAndOrganisation(ProjectOrganisationCompositeId key); @Override ServiceResult<FinanceCheckSummaryResource> getFinanceCheckSummary(Long projectId); @Override ServiceResult<FinanceCheckOverviewResource> getFinanceCheckOverview(Long projectId); @Override FinanceCheckEligibilityResource getFinanceCheckEligibilityDetails(Long projectId, Long organisationId); @Override ServiceResult<AttachmentResource> uploadFile(Long projectId, String contentType, long contentLength, String originalFilename, byte[] bytes); @Override ServiceResult<Void> deleteFile(Long fileId); @Override ByteArrayResource downloadFile(Long fileId); @Override ServiceResult<AttachmentResource> getAttachment(Long attachmentId); @Override FileEntryResource getAttachmentInfo(Long attachmentId); @Override ServiceResult<Long> saveQuery(QueryResource query); @Override ServiceResult<List<QueryResource>> getQueries(Long projectFinanceId); @Override ServiceResult<Void> saveQueryPost(PostResource post, long threadId); @Override ServiceResult<Void> closeQuery(Long queryId); @Override ServiceResult<Long> saveNote(NoteResource note); @Override ServiceResult<List<NoteResource>> loadNotes(Long projectFinanceId); @Override ServiceResult<Void> saveNotePost(PostResource post, long noteId); }
@Test public void testGet(){ Long projectId = 123L; Long organisationId = 456L; ProjectOrganisationCompositeId key = new ProjectOrganisationCompositeId(projectId, organisationId); FinanceCheckResource financeCheckResource = newFinanceCheckResource().build(); when(financeCheckRestServiceMock.getByProjectAndOrganisation(projectId, organisationId)).thenReturn(restSuccess(financeCheckResource)); FinanceCheckResource result = service.getByProjectAndOrganisation(key); assertEquals(financeCheckResource, result); }
FinanceCheckServiceImpl implements FinanceCheckService { @Override public ServiceResult<Void> closeQuery(Long queryId) { return queryService.close(queryId).toServiceResult(); } @Override FinanceCheckResource getByProjectAndOrganisation(ProjectOrganisationCompositeId key); @Override ServiceResult<FinanceCheckSummaryResource> getFinanceCheckSummary(Long projectId); @Override ServiceResult<FinanceCheckOverviewResource> getFinanceCheckOverview(Long projectId); @Override FinanceCheckEligibilityResource getFinanceCheckEligibilityDetails(Long projectId, Long organisationId); @Override ServiceResult<AttachmentResource> uploadFile(Long projectId, String contentType, long contentLength, String originalFilename, byte[] bytes); @Override ServiceResult<Void> deleteFile(Long fileId); @Override ByteArrayResource downloadFile(Long fileId); @Override ServiceResult<AttachmentResource> getAttachment(Long attachmentId); @Override FileEntryResource getAttachmentInfo(Long attachmentId); @Override ServiceResult<Long> saveQuery(QueryResource query); @Override ServiceResult<List<QueryResource>> getQueries(Long projectFinanceId); @Override ServiceResult<Void> saveQueryPost(PostResource post, long threadId); @Override ServiceResult<Void> closeQuery(Long queryId); @Override ServiceResult<Long> saveNote(NoteResource note); @Override ServiceResult<List<NoteResource>> loadNotes(Long projectFinanceId); @Override ServiceResult<Void> saveNotePost(PostResource post, long noteId); }
@Test public void testCloseQuery(){ Long queryId = 1L; when(projectFinanceQueriesRestServiceMock.close(queryId)).thenReturn(restSuccess()); ServiceResult<Void> result = service.closeQuery(queryId); assertTrue(result.isSuccess()); verify(projectFinanceQueriesRestServiceMock).close(queryId); }
InternalProjectSetupRowPopulator { public List<InternalProjectSetupRow> populate(List<ProjectStatusResource> projectStatusResources, CompetitionResource competition, UserResource user) { return projectStatusResources.stream() .map(status -> new InternalProjectSetupRow( status.getProjectTitle(), status.getApplicationNumber(), status.getProjectState(), status.getNumberOfPartners(), competition.getId(), status.getProjectLeadOrganisationName(), status.getProjectNumber(), getProjectCells(status, competition.getProjectSetupStages(), user, competition.getId()), ProjectActivityStates.COMPLETE == status.getGrantOfferLetterStatus(), status.isSentToIfsPa() )).collect(Collectors.toList()); } List<InternalProjectSetupRow> populate(List<ProjectStatusResource> projectStatusResources, CompetitionResource competition, UserResource user); }
@Test public void populate() { UserResource userResource = newUserResource().build(); List<ProjectSetupStage> projectSetupStages = asList(PROJECT_DETAILS, PROJECT_TEAM); CompetitionResource competitionResource = newCompetitionResource() .withProjectSetupStages(projectSetupStages) .build(); List<ProjectStatusResource> projectStatusResources = newProjectStatusResource() .withProjectTitles("project title") .withApplicationNumber(1L) .withProjectState(ProjectState.LIVE) .withNumberOfPartners(1) .withProjectLeadOrganisationName("Org name") .withProjectNumber(1L) .build(3); List<InternalProjectSetupRow> rows = populator.populate(projectStatusResources, competitionResource, userResource); Set<InternalProjectSetupCell> cells = rows.stream() .map(InternalProjectSetupRow::getStates) .findFirst().get(); assertEquals(2, cells.size()); List<ProjectSetupStage> stages = cells.stream() .map(InternalProjectSetupCell::getStage) .collect(Collectors.toList()); assertTrue(stages.contains(PROJECT_DETAILS)); assertTrue(stages.contains(PROJECT_TEAM)); }
GrantOfferLetterServiceImpl implements GrantOfferLetterService { @Override public Optional<ByteArrayResource> getGrantOfferFile(Long projectId) { return grantOfferLetterRestService.getGrantOfferFile(projectId).getSuccess(); } @Override Optional<ByteArrayResource> getSignedGrantOfferLetterFile(Long projectId); @Override Optional<FileEntryResource> getSignedGrantOfferLetterFileDetails(Long projectId); @Override Optional<ByteArrayResource> getGrantOfferFile(Long projectId); @Override Optional<FileEntryResource> getGrantOfferFileDetails(Long projectId); @Override ServiceResult<FileEntryResource> addSignedGrantOfferLetter(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<FileEntryResource> addGrantOfferLetter(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<Void> removeGrantOfferLetter(Long projectId); @Override ServiceResult<Void> removeAdditionalContractFile(Long projectId); @Override ServiceResult<Void> removeSignedGrantOfferLetter(Long projectId); @Override ServiceResult<Void> submitGrantOfferLetter(Long projectId); @Override ServiceResult<Void> sendGrantOfferLetter(Long projectId); @Override ServiceResult<Void> approveOrRejectSignedGrantOfferLetter(Long projectId, GrantOfferLetterApprovalResource grantOfferLetterApprovalResource); @Override ServiceResult<GrantOfferLetterStateResource> getGrantOfferLetterState(Long projectId); @Override Optional<ByteArrayResource> getAdditionalContractFile(Long projectId); @Override Optional<FileEntryResource> getAdditionalContractFileDetails(Long projectId); @Override ServiceResult<FileEntryResource> addAdditionalContractFile(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<StringResource> getDocusignUrl(long projectId); @Override ServiceResult<Void> importSignedOfferLetter(long projectId); }
@Test public void testGetGrantOfferLetterFile() { Optional<ByteArrayResource> content = Optional.of(new ByteArrayResource("My content!".getBytes())); when(grantOfferLetterRestService.getGrantOfferFile(123L)).thenReturn(restSuccess(content)); Optional<ByteArrayResource> result = grantOfferLetterService.getGrantOfferFile(123L); assertEquals(content, result); }
GrantOfferLetterServiceImpl implements GrantOfferLetterService { @Override public Optional<FileEntryResource> getGrantOfferFileDetails(Long projectId) { return grantOfferLetterRestService.getGrantOfferFileDetails(projectId).getSuccess(); } @Override Optional<ByteArrayResource> getSignedGrantOfferLetterFile(Long projectId); @Override Optional<FileEntryResource> getSignedGrantOfferLetterFileDetails(Long projectId); @Override Optional<ByteArrayResource> getGrantOfferFile(Long projectId); @Override Optional<FileEntryResource> getGrantOfferFileDetails(Long projectId); @Override ServiceResult<FileEntryResource> addSignedGrantOfferLetter(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<FileEntryResource> addGrantOfferLetter(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<Void> removeGrantOfferLetter(Long projectId); @Override ServiceResult<Void> removeAdditionalContractFile(Long projectId); @Override ServiceResult<Void> removeSignedGrantOfferLetter(Long projectId); @Override ServiceResult<Void> submitGrantOfferLetter(Long projectId); @Override ServiceResult<Void> sendGrantOfferLetter(Long projectId); @Override ServiceResult<Void> approveOrRejectSignedGrantOfferLetter(Long projectId, GrantOfferLetterApprovalResource grantOfferLetterApprovalResource); @Override ServiceResult<GrantOfferLetterStateResource> getGrantOfferLetterState(Long projectId); @Override Optional<ByteArrayResource> getAdditionalContractFile(Long projectId); @Override Optional<FileEntryResource> getAdditionalContractFileDetails(Long projectId); @Override ServiceResult<FileEntryResource> addAdditionalContractFile(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<StringResource> getDocusignUrl(long projectId); @Override ServiceResult<Void> importSignedOfferLetter(long projectId); }
@Test public void testGetGrantOfferLetterFileDetails() { FileEntryResource returnedFile = newFileEntryResource().build(); Optional<FileEntryResource> response = Optional.of(returnedFile); when(grantOfferLetterRestService.getGrantOfferFileDetails(123L)).thenReturn(restSuccess(response)); Optional<FileEntryResource> result = grantOfferLetterService.getGrantOfferFileDetails(123L); assertEquals(response, result); }
GrantOfferLetterServiceImpl implements GrantOfferLetterService { @Override public ServiceResult<FileEntryResource> addSignedGrantOfferLetter(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes) { return grantOfferLetterRestService.addSignedGrantOfferLetterFile(projectId, contentType, fileSize, originalFilename, bytes).toServiceResult(); } @Override Optional<ByteArrayResource> getSignedGrantOfferLetterFile(Long projectId); @Override Optional<FileEntryResource> getSignedGrantOfferLetterFileDetails(Long projectId); @Override Optional<ByteArrayResource> getGrantOfferFile(Long projectId); @Override Optional<FileEntryResource> getGrantOfferFileDetails(Long projectId); @Override ServiceResult<FileEntryResource> addSignedGrantOfferLetter(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<FileEntryResource> addGrantOfferLetter(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<Void> removeGrantOfferLetter(Long projectId); @Override ServiceResult<Void> removeAdditionalContractFile(Long projectId); @Override ServiceResult<Void> removeSignedGrantOfferLetter(Long projectId); @Override ServiceResult<Void> submitGrantOfferLetter(Long projectId); @Override ServiceResult<Void> sendGrantOfferLetter(Long projectId); @Override ServiceResult<Void> approveOrRejectSignedGrantOfferLetter(Long projectId, GrantOfferLetterApprovalResource grantOfferLetterApprovalResource); @Override ServiceResult<GrantOfferLetterStateResource> getGrantOfferLetterState(Long projectId); @Override Optional<ByteArrayResource> getAdditionalContractFile(Long projectId); @Override Optional<FileEntryResource> getAdditionalContractFileDetails(Long projectId); @Override ServiceResult<FileEntryResource> addAdditionalContractFile(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<StringResource> getDocusignUrl(long projectId); @Override ServiceResult<Void> importSignedOfferLetter(long projectId); }
@Test public void testAddSignedGrantOfferLetter() { FileEntryResource createdFile = newFileEntryResource().build(); when(grantOfferLetterRestService.addSignedGrantOfferLetterFile(123L, "text/plain", 1000, "filename.txt", "My content!".getBytes())). thenReturn(restSuccess(createdFile)); ServiceResult<FileEntryResource> result = grantOfferLetterService.addSignedGrantOfferLetter(123L, "text/plain", 1000, "filename.txt", "My content!".getBytes()); assertTrue(result.isSuccess()); assertEquals(createdFile, result.getSuccess()); }
GrantProcessServiceImpl implements GrantProcessService { @Override public void sendFailed(long applicationId, String message) { GrantProcess process = grantProcessRepository.findOneByApplicationId(applicationId); grantProcessRepository.save(process.sendFailed(ZonedDateTime.now(), message)); } @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 sendFailed() { ZonedDateTime now = ZonedDateTime.now(); long applicationId = 7L; String message = "message"; GrantProcess grantProcess = new GrantProcess(applicationId); when(grantProcessRepository.findOneByApplicationId(applicationId)).thenReturn(grantProcess); when(grantProcessRepository.save(grantProcess)).thenReturn(grantProcess); service.sendFailed(applicationId, message); verify(grantProcessRepository).findOneByApplicationId(applicationId); verify(grantProcessRepository).save(createLambdaMatcher(g -> { assertEquals(applicationId, g.getApplicationId()); assertFalse(g.isPending()); assertEquals(message, g.getMessage()); assertNull(g.getSentRequested()); assertNull(g.getSentSucceeded()); assertNotNull(g.getLastProcessed()); })); }
GrantOfferLetterServiceImpl implements GrantOfferLetterService { @Override public ServiceResult<FileEntryResource> addGrantOfferLetter(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes) { return grantOfferLetterRestService.addGrantOfferLetterFile(projectId, contentType, fileSize, originalFilename, bytes).toServiceResult(); } @Override Optional<ByteArrayResource> getSignedGrantOfferLetterFile(Long projectId); @Override Optional<FileEntryResource> getSignedGrantOfferLetterFileDetails(Long projectId); @Override Optional<ByteArrayResource> getGrantOfferFile(Long projectId); @Override Optional<FileEntryResource> getGrantOfferFileDetails(Long projectId); @Override ServiceResult<FileEntryResource> addSignedGrantOfferLetter(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<FileEntryResource> addGrantOfferLetter(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<Void> removeGrantOfferLetter(Long projectId); @Override ServiceResult<Void> removeAdditionalContractFile(Long projectId); @Override ServiceResult<Void> removeSignedGrantOfferLetter(Long projectId); @Override ServiceResult<Void> submitGrantOfferLetter(Long projectId); @Override ServiceResult<Void> sendGrantOfferLetter(Long projectId); @Override ServiceResult<Void> approveOrRejectSignedGrantOfferLetter(Long projectId, GrantOfferLetterApprovalResource grantOfferLetterApprovalResource); @Override ServiceResult<GrantOfferLetterStateResource> getGrantOfferLetterState(Long projectId); @Override Optional<ByteArrayResource> getAdditionalContractFile(Long projectId); @Override Optional<FileEntryResource> getAdditionalContractFileDetails(Long projectId); @Override ServiceResult<FileEntryResource> addAdditionalContractFile(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<StringResource> getDocusignUrl(long projectId); @Override ServiceResult<Void> importSignedOfferLetter(long projectId); }
@Test public void testAddGrantOfferLetter() { FileEntryResource createdFile = newFileEntryResource().build(); when(grantOfferLetterRestService.addGrantOfferLetterFile(123L, "text/plain", 1000, "filename.txt", "My content!".getBytes())). thenReturn(restSuccess(createdFile)); ServiceResult<FileEntryResource> result = grantOfferLetterService.addGrantOfferLetter(123L, "text/plain", 1000, "filename.txt", "My content!".getBytes()); assertTrue(result.isSuccess()); assertEquals(createdFile, result.getSuccess()); }
GrantOfferLetterServiceImpl implements GrantOfferLetterService { @Override public ServiceResult<Void> removeGrantOfferLetter(Long projectId) { return grantOfferLetterRestService.removeGrantOfferLetter(projectId).toServiceResult(); } @Override Optional<ByteArrayResource> getSignedGrantOfferLetterFile(Long projectId); @Override Optional<FileEntryResource> getSignedGrantOfferLetterFileDetails(Long projectId); @Override Optional<ByteArrayResource> getGrantOfferFile(Long projectId); @Override Optional<FileEntryResource> getGrantOfferFileDetails(Long projectId); @Override ServiceResult<FileEntryResource> addSignedGrantOfferLetter(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<FileEntryResource> addGrantOfferLetter(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<Void> removeGrantOfferLetter(Long projectId); @Override ServiceResult<Void> removeAdditionalContractFile(Long projectId); @Override ServiceResult<Void> removeSignedGrantOfferLetter(Long projectId); @Override ServiceResult<Void> submitGrantOfferLetter(Long projectId); @Override ServiceResult<Void> sendGrantOfferLetter(Long projectId); @Override ServiceResult<Void> approveOrRejectSignedGrantOfferLetter(Long projectId, GrantOfferLetterApprovalResource grantOfferLetterApprovalResource); @Override ServiceResult<GrantOfferLetterStateResource> getGrantOfferLetterState(Long projectId); @Override Optional<ByteArrayResource> getAdditionalContractFile(Long projectId); @Override Optional<FileEntryResource> getAdditionalContractFileDetails(Long projectId); @Override ServiceResult<FileEntryResource> addAdditionalContractFile(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<StringResource> getDocusignUrl(long projectId); @Override ServiceResult<Void> importSignedOfferLetter(long projectId); }
@Test public void testRemoveGrantOfferLetter() { long projectId = 123L; when(grantOfferLetterRestService.removeGrantOfferLetter(projectId)).thenReturn(restSuccess()); ServiceResult<Void> result = grantOfferLetterService.removeGrantOfferLetter(projectId); assertTrue(result.isSuccess()); }
GrantOfferLetterServiceImpl implements GrantOfferLetterService { @Override public ServiceResult<Void> removeAdditionalContractFile(Long projectId) { return grantOfferLetterRestService.removeAdditionalContractFile(projectId).toServiceResult(); } @Override Optional<ByteArrayResource> getSignedGrantOfferLetterFile(Long projectId); @Override Optional<FileEntryResource> getSignedGrantOfferLetterFileDetails(Long projectId); @Override Optional<ByteArrayResource> getGrantOfferFile(Long projectId); @Override Optional<FileEntryResource> getGrantOfferFileDetails(Long projectId); @Override ServiceResult<FileEntryResource> addSignedGrantOfferLetter(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<FileEntryResource> addGrantOfferLetter(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<Void> removeGrantOfferLetter(Long projectId); @Override ServiceResult<Void> removeAdditionalContractFile(Long projectId); @Override ServiceResult<Void> removeSignedGrantOfferLetter(Long projectId); @Override ServiceResult<Void> submitGrantOfferLetter(Long projectId); @Override ServiceResult<Void> sendGrantOfferLetter(Long projectId); @Override ServiceResult<Void> approveOrRejectSignedGrantOfferLetter(Long projectId, GrantOfferLetterApprovalResource grantOfferLetterApprovalResource); @Override ServiceResult<GrantOfferLetterStateResource> getGrantOfferLetterState(Long projectId); @Override Optional<ByteArrayResource> getAdditionalContractFile(Long projectId); @Override Optional<FileEntryResource> getAdditionalContractFileDetails(Long projectId); @Override ServiceResult<FileEntryResource> addAdditionalContractFile(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<StringResource> getDocusignUrl(long projectId); @Override ServiceResult<Void> importSignedOfferLetter(long projectId); }
@Test public void testRemoveAdditionalContractFile() { long projectId = 123L; when(grantOfferLetterRestService.removeAdditionalContractFile(projectId)).thenReturn(restSuccess()); ServiceResult<Void> result = grantOfferLetterService.removeAdditionalContractFile(projectId); assertTrue(result.isSuccess()); }
GrantOfferLetterServiceImpl implements GrantOfferLetterService { @Override public ServiceResult<Void> removeSignedGrantOfferLetter(Long projectId) { return grantOfferLetterRestService.removeSignedGrantOfferLetter(projectId).toServiceResult(); } @Override Optional<ByteArrayResource> getSignedGrantOfferLetterFile(Long projectId); @Override Optional<FileEntryResource> getSignedGrantOfferLetterFileDetails(Long projectId); @Override Optional<ByteArrayResource> getGrantOfferFile(Long projectId); @Override Optional<FileEntryResource> getGrantOfferFileDetails(Long projectId); @Override ServiceResult<FileEntryResource> addSignedGrantOfferLetter(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<FileEntryResource> addGrantOfferLetter(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<Void> removeGrantOfferLetter(Long projectId); @Override ServiceResult<Void> removeAdditionalContractFile(Long projectId); @Override ServiceResult<Void> removeSignedGrantOfferLetter(Long projectId); @Override ServiceResult<Void> submitGrantOfferLetter(Long projectId); @Override ServiceResult<Void> sendGrantOfferLetter(Long projectId); @Override ServiceResult<Void> approveOrRejectSignedGrantOfferLetter(Long projectId, GrantOfferLetterApprovalResource grantOfferLetterApprovalResource); @Override ServiceResult<GrantOfferLetterStateResource> getGrantOfferLetterState(Long projectId); @Override Optional<ByteArrayResource> getAdditionalContractFile(Long projectId); @Override Optional<FileEntryResource> getAdditionalContractFileDetails(Long projectId); @Override ServiceResult<FileEntryResource> addAdditionalContractFile(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<StringResource> getDocusignUrl(long projectId); @Override ServiceResult<Void> importSignedOfferLetter(long projectId); }
@Test public void testRemoveSignedGrantOfferLetter() { long projectId = 123L; when(grantOfferLetterRestService.removeSignedGrantOfferLetter(projectId)).thenReturn(restSuccess()); ServiceResult<Void> result = grantOfferLetterService.removeSignedGrantOfferLetter(projectId); assertTrue(result.isSuccess()); }
GrantOfferLetterServiceImpl implements GrantOfferLetterService { @Override public ServiceResult<Void> submitGrantOfferLetter(Long projectId) { return grantOfferLetterRestService.submitGrantOfferLetter(projectId).toServiceResult(); } @Override Optional<ByteArrayResource> getSignedGrantOfferLetterFile(Long projectId); @Override Optional<FileEntryResource> getSignedGrantOfferLetterFileDetails(Long projectId); @Override Optional<ByteArrayResource> getGrantOfferFile(Long projectId); @Override Optional<FileEntryResource> getGrantOfferFileDetails(Long projectId); @Override ServiceResult<FileEntryResource> addSignedGrantOfferLetter(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<FileEntryResource> addGrantOfferLetter(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<Void> removeGrantOfferLetter(Long projectId); @Override ServiceResult<Void> removeAdditionalContractFile(Long projectId); @Override ServiceResult<Void> removeSignedGrantOfferLetter(Long projectId); @Override ServiceResult<Void> submitGrantOfferLetter(Long projectId); @Override ServiceResult<Void> sendGrantOfferLetter(Long projectId); @Override ServiceResult<Void> approveOrRejectSignedGrantOfferLetter(Long projectId, GrantOfferLetterApprovalResource grantOfferLetterApprovalResource); @Override ServiceResult<GrantOfferLetterStateResource> getGrantOfferLetterState(Long projectId); @Override Optional<ByteArrayResource> getAdditionalContractFile(Long projectId); @Override Optional<FileEntryResource> getAdditionalContractFileDetails(Long projectId); @Override ServiceResult<FileEntryResource> addAdditionalContractFile(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<StringResource> getDocusignUrl(long projectId); @Override ServiceResult<Void> importSignedOfferLetter(long projectId); }
@Test public void testSubmitGrantOfferLetter() { long projectId = 123L; when(grantOfferLetterRestService.submitGrantOfferLetter(projectId)).thenReturn(restSuccess()); ServiceResult<Void> result = grantOfferLetterService.submitGrantOfferLetter(projectId); assertTrue(result.isSuccess()); }
GrantOfferLetterServiceImpl implements GrantOfferLetterService { @Override public Optional<ByteArrayResource> getAdditionalContractFile(Long projectId) { return grantOfferLetterRestService.getAdditionalContractFile(projectId).getSuccess(); } @Override Optional<ByteArrayResource> getSignedGrantOfferLetterFile(Long projectId); @Override Optional<FileEntryResource> getSignedGrantOfferLetterFileDetails(Long projectId); @Override Optional<ByteArrayResource> getGrantOfferFile(Long projectId); @Override Optional<FileEntryResource> getGrantOfferFileDetails(Long projectId); @Override ServiceResult<FileEntryResource> addSignedGrantOfferLetter(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<FileEntryResource> addGrantOfferLetter(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<Void> removeGrantOfferLetter(Long projectId); @Override ServiceResult<Void> removeAdditionalContractFile(Long projectId); @Override ServiceResult<Void> removeSignedGrantOfferLetter(Long projectId); @Override ServiceResult<Void> submitGrantOfferLetter(Long projectId); @Override ServiceResult<Void> sendGrantOfferLetter(Long projectId); @Override ServiceResult<Void> approveOrRejectSignedGrantOfferLetter(Long projectId, GrantOfferLetterApprovalResource grantOfferLetterApprovalResource); @Override ServiceResult<GrantOfferLetterStateResource> getGrantOfferLetterState(Long projectId); @Override Optional<ByteArrayResource> getAdditionalContractFile(Long projectId); @Override Optional<FileEntryResource> getAdditionalContractFileDetails(Long projectId); @Override ServiceResult<FileEntryResource> addAdditionalContractFile(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<StringResource> getDocusignUrl(long projectId); @Override ServiceResult<Void> importSignedOfferLetter(long projectId); }
@Test public void testGetAdditionalContractFile() { Optional<ByteArrayResource> content = Optional.of(new ByteArrayResource("My content!".getBytes())); when(grantOfferLetterRestService.getAdditionalContractFile(123L)).thenReturn(restSuccess(content)); Optional<ByteArrayResource> result = grantOfferLetterService.getAdditionalContractFile(123L); assertEquals(content, result); }
GrantOfferLetterServiceImpl implements GrantOfferLetterService { @Override public ServiceResult<FileEntryResource> addAdditionalContractFile(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes) { return grantOfferLetterRestService.addAdditionalContractFile(projectId, contentType, fileSize, originalFilename, bytes).toServiceResult(); } @Override Optional<ByteArrayResource> getSignedGrantOfferLetterFile(Long projectId); @Override Optional<FileEntryResource> getSignedGrantOfferLetterFileDetails(Long projectId); @Override Optional<ByteArrayResource> getGrantOfferFile(Long projectId); @Override Optional<FileEntryResource> getGrantOfferFileDetails(Long projectId); @Override ServiceResult<FileEntryResource> addSignedGrantOfferLetter(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<FileEntryResource> addGrantOfferLetter(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<Void> removeGrantOfferLetter(Long projectId); @Override ServiceResult<Void> removeAdditionalContractFile(Long projectId); @Override ServiceResult<Void> removeSignedGrantOfferLetter(Long projectId); @Override ServiceResult<Void> submitGrantOfferLetter(Long projectId); @Override ServiceResult<Void> sendGrantOfferLetter(Long projectId); @Override ServiceResult<Void> approveOrRejectSignedGrantOfferLetter(Long projectId, GrantOfferLetterApprovalResource grantOfferLetterApprovalResource); @Override ServiceResult<GrantOfferLetterStateResource> getGrantOfferLetterState(Long projectId); @Override Optional<ByteArrayResource> getAdditionalContractFile(Long projectId); @Override Optional<FileEntryResource> getAdditionalContractFileDetails(Long projectId); @Override ServiceResult<FileEntryResource> addAdditionalContractFile(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<StringResource> getDocusignUrl(long projectId); @Override ServiceResult<Void> importSignedOfferLetter(long projectId); }
@Test public void testAddAdditionalContractFile() { FileEntryResource createdFile = newFileEntryResource().build(); when(grantOfferLetterRestService.addAdditionalContractFile(123L, "text/plain", 1000, "filename.txt", "My content!".getBytes())). thenReturn(restSuccess(createdFile)); ServiceResult<FileEntryResource> result = grantOfferLetterService.addAdditionalContractFile(123L, "text/plain", 1000, "filename.txt", "My content!".getBytes()); assertTrue(result.isSuccess()); assertEquals(createdFile, result.getSuccess()); verify(grantOfferLetterRestService).addAdditionalContractFile(123L, "text/plain", 1000, "filename.txt", "My content!".getBytes()); }
GrantOfferLetterServiceImpl implements GrantOfferLetterService { @Override public ServiceResult<Void> approveOrRejectSignedGrantOfferLetter(Long projectId, GrantOfferLetterApprovalResource grantOfferLetterApprovalResource) { return grantOfferLetterRestService.approveOrRejectSignedGrantOfferLetter(projectId, grantOfferLetterApprovalResource).toServiceResult(); } @Override Optional<ByteArrayResource> getSignedGrantOfferLetterFile(Long projectId); @Override Optional<FileEntryResource> getSignedGrantOfferLetterFileDetails(Long projectId); @Override Optional<ByteArrayResource> getGrantOfferFile(Long projectId); @Override Optional<FileEntryResource> getGrantOfferFileDetails(Long projectId); @Override ServiceResult<FileEntryResource> addSignedGrantOfferLetter(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<FileEntryResource> addGrantOfferLetter(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<Void> removeGrantOfferLetter(Long projectId); @Override ServiceResult<Void> removeAdditionalContractFile(Long projectId); @Override ServiceResult<Void> removeSignedGrantOfferLetter(Long projectId); @Override ServiceResult<Void> submitGrantOfferLetter(Long projectId); @Override ServiceResult<Void> sendGrantOfferLetter(Long projectId); @Override ServiceResult<Void> approveOrRejectSignedGrantOfferLetter(Long projectId, GrantOfferLetterApprovalResource grantOfferLetterApprovalResource); @Override ServiceResult<GrantOfferLetterStateResource> getGrantOfferLetterState(Long projectId); @Override Optional<ByteArrayResource> getAdditionalContractFile(Long projectId); @Override Optional<FileEntryResource> getAdditionalContractFileDetails(Long projectId); @Override ServiceResult<FileEntryResource> addAdditionalContractFile(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<StringResource> getDocusignUrl(long projectId); @Override ServiceResult<Void> importSignedOfferLetter(long projectId); }
@Test public void testApproveOrRejectSignedGrantOfferLetter() { GrantOfferLetterApprovalResource grantOfferLetterApprovalResource = new GrantOfferLetterApprovalResource(ApprovalType.APPROVED, null); when(grantOfferLetterRestService.approveOrRejectSignedGrantOfferLetter(123L, grantOfferLetterApprovalResource)).thenReturn(restSuccess()); ServiceResult<Void> result = grantOfferLetterService.approveOrRejectSignedGrantOfferLetter(123L, grantOfferLetterApprovalResource); assertTrue(result.isSuccess()); verify(grantOfferLetterRestService).approveOrRejectSignedGrantOfferLetter(123L, grantOfferLetterApprovalResource); }
GrantOfferLetterServiceImpl implements GrantOfferLetterService { @Override public ServiceResult<Void> sendGrantOfferLetter(Long projectId) { return grantOfferLetterRestService.sendGrantOfferLetter(projectId).toServiceResult(); } @Override Optional<ByteArrayResource> getSignedGrantOfferLetterFile(Long projectId); @Override Optional<FileEntryResource> getSignedGrantOfferLetterFileDetails(Long projectId); @Override Optional<ByteArrayResource> getGrantOfferFile(Long projectId); @Override Optional<FileEntryResource> getGrantOfferFileDetails(Long projectId); @Override ServiceResult<FileEntryResource> addSignedGrantOfferLetter(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<FileEntryResource> addGrantOfferLetter(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<Void> removeGrantOfferLetter(Long projectId); @Override ServiceResult<Void> removeAdditionalContractFile(Long projectId); @Override ServiceResult<Void> removeSignedGrantOfferLetter(Long projectId); @Override ServiceResult<Void> submitGrantOfferLetter(Long projectId); @Override ServiceResult<Void> sendGrantOfferLetter(Long projectId); @Override ServiceResult<Void> approveOrRejectSignedGrantOfferLetter(Long projectId, GrantOfferLetterApprovalResource grantOfferLetterApprovalResource); @Override ServiceResult<GrantOfferLetterStateResource> getGrantOfferLetterState(Long projectId); @Override Optional<ByteArrayResource> getAdditionalContractFile(Long projectId); @Override Optional<FileEntryResource> getAdditionalContractFileDetails(Long projectId); @Override ServiceResult<FileEntryResource> addAdditionalContractFile(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<StringResource> getDocusignUrl(long projectId); @Override ServiceResult<Void> importSignedOfferLetter(long projectId); }
@Test public void testSendGrantOfferLetter() { when(grantOfferLetterRestService.sendGrantOfferLetter(123L)).thenReturn(restSuccess()); ServiceResult<Void> result = grantOfferLetterService.sendGrantOfferLetter(123L); assertTrue(result.isSuccess()); verify(grantOfferLetterRestService).sendGrantOfferLetter(123L); }
GrantOfferLetterServiceImpl implements GrantOfferLetterService { @Override public ServiceResult<GrantOfferLetterStateResource> getGrantOfferLetterState(Long projectId) { return grantOfferLetterRestService.getGrantOfferLetterState(projectId).toServiceResult(); } @Override Optional<ByteArrayResource> getSignedGrantOfferLetterFile(Long projectId); @Override Optional<FileEntryResource> getSignedGrantOfferLetterFileDetails(Long projectId); @Override Optional<ByteArrayResource> getGrantOfferFile(Long projectId); @Override Optional<FileEntryResource> getGrantOfferFileDetails(Long projectId); @Override ServiceResult<FileEntryResource> addSignedGrantOfferLetter(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<FileEntryResource> addGrantOfferLetter(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<Void> removeGrantOfferLetter(Long projectId); @Override ServiceResult<Void> removeAdditionalContractFile(Long projectId); @Override ServiceResult<Void> removeSignedGrantOfferLetter(Long projectId); @Override ServiceResult<Void> submitGrantOfferLetter(Long projectId); @Override ServiceResult<Void> sendGrantOfferLetter(Long projectId); @Override ServiceResult<Void> approveOrRejectSignedGrantOfferLetter(Long projectId, GrantOfferLetterApprovalResource grantOfferLetterApprovalResource); @Override ServiceResult<GrantOfferLetterStateResource> getGrantOfferLetterState(Long projectId); @Override Optional<ByteArrayResource> getAdditionalContractFile(Long projectId); @Override Optional<FileEntryResource> getAdditionalContractFileDetails(Long projectId); @Override ServiceResult<FileEntryResource> addAdditionalContractFile(Long projectId, String contentType, long fileSize, String originalFilename, byte[] bytes); @Override ServiceResult<StringResource> getDocusignUrl(long projectId); @Override ServiceResult<Void> importSignedOfferLetter(long projectId); }
@Test public void testGetGrantOfferLetterState() { Long projectId = 123L; GrantOfferLetterStateResource state = GrantOfferLetterStateResource.stateInformationForNonPartnersView(GrantOfferLetterState.APPROVED, GrantOfferLetterEvent.SIGNED_GOL_APPROVED); when(grantOfferLetterRestService.getGrantOfferLetterState(projectId)).thenReturn(restSuccess(state)); ServiceResult<GrantOfferLetterStateResource> result = grantOfferLetterService.getGrantOfferLetterState(projectId); assertTrue(result.isSuccess()); assertSame(state, result.getSuccess()); verify(grantOfferLetterRestService).getGrantOfferLetterState(projectId); }
GrantProcessServiceImpl implements GrantProcessService { @Override @Transactional(readOnly = true) public Optional<GrantProcess> findByApplicationId(Long applicationId) { return Optional.ofNullable(grantProcessRepository.findOneByApplicationId(applicationId)); } @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 getByApplicationIdNotPresent() { long applicationId = 7L; when(grantProcessRepository.findOneByApplicationId(applicationId)).thenReturn(null); Optional<GrantProcess> result = service.findByApplicationId(applicationId); assertFalse(result.isPresent()); } @Test public void getByApplicationIdPresent() { long applicationId = 7L; GrantProcess grantProcess = new GrantProcess(applicationId); when(grantProcessRepository.findOneByApplicationId(applicationId)).thenReturn(grantProcess); Optional<GrantProcess> result = service.findByApplicationId(applicationId); assertTrue(result.isPresent()); assertEquals(grantProcess, result.get()); }
ProjectFinanceServiceImpl implements ProjectFinanceService { @Override public List<ProjectFinanceResource> getProjectFinances(Long projectId) { return projectFinanceRestService.getProjectFinances(projectId).getSuccess(); } @Override List<ProjectFinanceResource> getProjectFinances(Long projectId); @Override ViabilityResource getViability(Long projectId, Long organisationId); @Override ServiceResult<Void> saveViability(Long projectId, Long organisationId, ViabilityState viability, ViabilityRagStatus viabilityRagRating); @Override EligibilityResource getEligibility(Long projectId, Long organisationId); @Override ServiceResult<Void> saveEligibility(Long projectId, Long organisationId, EligibilityState eligibility, EligibilityRagStatus eligibilityRagStatus); @Override boolean isCreditReportConfirmed(Long projectId, Long organisationId); @Override ServiceResult<Void> saveCreditReportConfirmed(Long projectId, Long organisationId, boolean confirmed); @Override ProjectFinanceResource getProjectFinance(Long projectId, Long organisationId); @Override ServiceResult<Boolean> hasAnyProjectOrganisationSizeChangedFromApplication(long projectId); }
@Test public void testGetProjectFinances() { List<ProjectFinanceResource> resources = newProjectFinanceResource().build(2); when(projectFinanceRestService.getProjectFinances(123L)).thenReturn(restSuccess(resources)); List<ProjectFinanceResource> financeTotals = service.getProjectFinances(123L); assertEquals(resources, financeTotals); }
ProjectFinanceServiceImpl implements ProjectFinanceService { @Override public ViabilityResource getViability(Long projectId, Long organisationId) { return projectFinanceRestService.getViability(projectId, organisationId).getSuccess(); } @Override List<ProjectFinanceResource> getProjectFinances(Long projectId); @Override ViabilityResource getViability(Long projectId, Long organisationId); @Override ServiceResult<Void> saveViability(Long projectId, Long organisationId, ViabilityState viability, ViabilityRagStatus viabilityRagRating); @Override EligibilityResource getEligibility(Long projectId, Long organisationId); @Override ServiceResult<Void> saveEligibility(Long projectId, Long organisationId, EligibilityState eligibility, EligibilityRagStatus eligibilityRagStatus); @Override boolean isCreditReportConfirmed(Long projectId, Long organisationId); @Override ServiceResult<Void> saveCreditReportConfirmed(Long projectId, Long organisationId, boolean confirmed); @Override ProjectFinanceResource getProjectFinance(Long projectId, Long organisationId); @Override ServiceResult<Boolean> hasAnyProjectOrganisationSizeChangedFromApplication(long projectId); }
@Test public void testGetViability() { ViabilityResource viability = new ViabilityResource(ViabilityState.APPROVED, ViabilityRagStatus.GREEN); when(projectFinanceRestService.getViability(123L, 456L)).thenReturn(restSuccess(viability)); ViabilityResource result = service.getViability(123L, 456L); assertEquals(viability, result); }
ProjectFinanceServiceImpl implements ProjectFinanceService { @Override public ServiceResult<Void> saveViability(Long projectId, Long organisationId, ViabilityState viability, ViabilityRagStatus viabilityRagRating) { return projectFinanceRestService.saveViability(projectId, organisationId, viability, viabilityRagRating).toServiceResult(); } @Override List<ProjectFinanceResource> getProjectFinances(Long projectId); @Override ViabilityResource getViability(Long projectId, Long organisationId); @Override ServiceResult<Void> saveViability(Long projectId, Long organisationId, ViabilityState viability, ViabilityRagStatus viabilityRagRating); @Override EligibilityResource getEligibility(Long projectId, Long organisationId); @Override ServiceResult<Void> saveEligibility(Long projectId, Long organisationId, EligibilityState eligibility, EligibilityRagStatus eligibilityRagStatus); @Override boolean isCreditReportConfirmed(Long projectId, Long organisationId); @Override ServiceResult<Void> saveCreditReportConfirmed(Long projectId, Long organisationId, boolean confirmed); @Override ProjectFinanceResource getProjectFinance(Long projectId, Long organisationId); @Override ServiceResult<Boolean> hasAnyProjectOrganisationSizeChangedFromApplication(long projectId); }
@Test public void testSaveViability() { when(projectFinanceRestService.saveViability(123L, 456L, ViabilityState.APPROVED, ViabilityRagStatus.GREEN)).thenReturn(restSuccess()); service.saveViability(123L, 456L, ViabilityState.APPROVED, ViabilityRagStatus.GREEN); verify(projectFinanceRestService).saveViability(123L, 456L, ViabilityState.APPROVED, ViabilityRagStatus.GREEN); }
ProjectFinanceServiceImpl implements ProjectFinanceService { @Override public EligibilityResource getEligibility(Long projectId, Long organisationId) { return projectFinanceRestService.getEligibility(projectId, organisationId).getSuccess(); } @Override List<ProjectFinanceResource> getProjectFinances(Long projectId); @Override ViabilityResource getViability(Long projectId, Long organisationId); @Override ServiceResult<Void> saveViability(Long projectId, Long organisationId, ViabilityState viability, ViabilityRagStatus viabilityRagRating); @Override EligibilityResource getEligibility(Long projectId, Long organisationId); @Override ServiceResult<Void> saveEligibility(Long projectId, Long organisationId, EligibilityState eligibility, EligibilityRagStatus eligibilityRagStatus); @Override boolean isCreditReportConfirmed(Long projectId, Long organisationId); @Override ServiceResult<Void> saveCreditReportConfirmed(Long projectId, Long organisationId, boolean confirmed); @Override ProjectFinanceResource getProjectFinance(Long projectId, Long organisationId); @Override ServiceResult<Boolean> hasAnyProjectOrganisationSizeChangedFromApplication(long projectId); }
@Test public void testGetEligibility() { EligibilityResource eligibility = new EligibilityResource(EligibilityState.APPROVED, EligibilityRagStatus.GREEN); when(projectFinanceRestService.getEligibility(123L, 456L)).thenReturn(restSuccess(eligibility)); EligibilityResource result = service.getEligibility(123L, 456L); assertEquals(eligibility, result); }
ProjectFinanceServiceImpl implements ProjectFinanceService { @Override public ServiceResult<Void> saveEligibility(Long projectId, Long organisationId, EligibilityState eligibility, EligibilityRagStatus eligibilityRagStatus) { return projectFinanceRestService.saveEligibility(projectId, organisationId, eligibility, eligibilityRagStatus).toServiceResult(); } @Override List<ProjectFinanceResource> getProjectFinances(Long projectId); @Override ViabilityResource getViability(Long projectId, Long organisationId); @Override ServiceResult<Void> saveViability(Long projectId, Long organisationId, ViabilityState viability, ViabilityRagStatus viabilityRagRating); @Override EligibilityResource getEligibility(Long projectId, Long organisationId); @Override ServiceResult<Void> saveEligibility(Long projectId, Long organisationId, EligibilityState eligibility, EligibilityRagStatus eligibilityRagStatus); @Override boolean isCreditReportConfirmed(Long projectId, Long organisationId); @Override ServiceResult<Void> saveCreditReportConfirmed(Long projectId, Long organisationId, boolean confirmed); @Override ProjectFinanceResource getProjectFinance(Long projectId, Long organisationId); @Override ServiceResult<Boolean> hasAnyProjectOrganisationSizeChangedFromApplication(long projectId); }
@Test public void testSaveEligibility() { when(projectFinanceRestService.saveEligibility(123L, 456L, EligibilityState.APPROVED, EligibilityRagStatus.GREEN)).thenReturn(restSuccess()); ServiceResult<Void> result = service.saveEligibility(123L, 456L, EligibilityState.APPROVED, EligibilityRagStatus.GREEN); assertTrue(result.isSuccess()); verify(projectFinanceRestService).saveEligibility(123L, 456L, EligibilityState.APPROVED, EligibilityRagStatus.GREEN); }
SpendProfileServiceImpl implements SpendProfileService { @Override public ServiceResult<Void> saveSpendProfile(Long projectId, Long organisationId, SpendProfileTableResource table) { return spendProfileRestService.saveSpendProfile(projectId, organisationId, table).toServiceResult(); } @Override ServiceResult<Void> generateSpendProfile(Long projectId); @Override ServiceResult<Void> approveOrRejectSpendProfile(Long projectId, ApprovalType approvalType); @Override ApprovalType getSpendProfileStatusByProjectId(Long projectId); @Override SpendProfileTableResource getSpendProfileTable(Long projectId, Long organisationId); @Override SpendProfileCSVResource getSpendProfileCSV(Long projectId, Long organisationId); @Override Optional<SpendProfileResource> getSpendProfile(Long projectId, Long organisationId); @Override ServiceResult<Void> saveSpendProfile(Long projectId, Long organisationId, SpendProfileTableResource table); @Override ServiceResult<Void> markSpendProfileComplete(Long projectId, Long organisationId); @Override ServiceResult<Void> markSpendProfileIncomplete(Long projectId, Long organisationId); @Override ServiceResult<Void> completeSpendProfilesReview(Long projectId); }
@Test public void saveSpendProfile() { Long projectId = 1L; Long organisationId = 1L; SpendProfileTableResource table = new SpendProfileTableResource(); when(spendProfileRestService.saveSpendProfile(projectId, organisationId, table)).thenReturn(restSuccess()); ServiceResult<Void> result = service.saveSpendProfile(projectId, organisationId, table); assertTrue(result.isSuccess()); }
SpendProfileServiceImpl implements SpendProfileService { @Override public ServiceResult<Void> markSpendProfileComplete(Long projectId, Long organisationId) { return spendProfileRestService.markSpendProfileComplete(projectId, organisationId).toServiceResult(); } @Override ServiceResult<Void> generateSpendProfile(Long projectId); @Override ServiceResult<Void> approveOrRejectSpendProfile(Long projectId, ApprovalType approvalType); @Override ApprovalType getSpendProfileStatusByProjectId(Long projectId); @Override SpendProfileTableResource getSpendProfileTable(Long projectId, Long organisationId); @Override SpendProfileCSVResource getSpendProfileCSV(Long projectId, Long organisationId); @Override Optional<SpendProfileResource> getSpendProfile(Long projectId, Long organisationId); @Override ServiceResult<Void> saveSpendProfile(Long projectId, Long organisationId, SpendProfileTableResource table); @Override ServiceResult<Void> markSpendProfileComplete(Long projectId, Long organisationId); @Override ServiceResult<Void> markSpendProfileIncomplete(Long projectId, Long organisationId); @Override ServiceResult<Void> completeSpendProfilesReview(Long projectId); }
@Test public void markSpendProfileComplete() { Long projectId = 1L; Long organisationId = 1L; when(spendProfileRestService.markSpendProfileComplete(projectId, organisationId)).thenReturn(restSuccess()); ServiceResult<Void> result = service.markSpendProfileComplete(projectId, organisationId); assertTrue(result.isSuccess()); }
SpendProfileServiceImpl implements SpendProfileService { @Override public ServiceResult<Void> markSpendProfileIncomplete(Long projectId, Long organisationId) { return spendProfileRestService.markSpendProfileIncomplete(projectId, organisationId).toServiceResult(); } @Override ServiceResult<Void> generateSpendProfile(Long projectId); @Override ServiceResult<Void> approveOrRejectSpendProfile(Long projectId, ApprovalType approvalType); @Override ApprovalType getSpendProfileStatusByProjectId(Long projectId); @Override SpendProfileTableResource getSpendProfileTable(Long projectId, Long organisationId); @Override SpendProfileCSVResource getSpendProfileCSV(Long projectId, Long organisationId); @Override Optional<SpendProfileResource> getSpendProfile(Long projectId, Long organisationId); @Override ServiceResult<Void> saveSpendProfile(Long projectId, Long organisationId, SpendProfileTableResource table); @Override ServiceResult<Void> markSpendProfileComplete(Long projectId, Long organisationId); @Override ServiceResult<Void> markSpendProfileIncomplete(Long projectId, Long organisationId); @Override ServiceResult<Void> completeSpendProfilesReview(Long projectId); }
@Test public void markSpendProfileIncomplete() { Long projectId = 1L; Long organisationId = 1L; when(spendProfileRestService.markSpendProfileIncomplete(projectId, organisationId)).thenReturn(restSuccess()); ServiceResult<Void> result = service.markSpendProfileIncomplete(projectId, organisationId); assertTrue(result.isSuccess()); }
SpendProfileServiceImpl implements SpendProfileService { @Override public ServiceResult<Void> completeSpendProfilesReview(Long projectId) { return spendProfileRestService.completeSpendProfilesReview(projectId).toServiceResult(); } @Override ServiceResult<Void> generateSpendProfile(Long projectId); @Override ServiceResult<Void> approveOrRejectSpendProfile(Long projectId, ApprovalType approvalType); @Override ApprovalType getSpendProfileStatusByProjectId(Long projectId); @Override SpendProfileTableResource getSpendProfileTable(Long projectId, Long organisationId); @Override SpendProfileCSVResource getSpendProfileCSV(Long projectId, Long organisationId); @Override Optional<SpendProfileResource> getSpendProfile(Long projectId, Long organisationId); @Override ServiceResult<Void> saveSpendProfile(Long projectId, Long organisationId, SpendProfileTableResource table); @Override ServiceResult<Void> markSpendProfileComplete(Long projectId, Long organisationId); @Override ServiceResult<Void> markSpendProfileIncomplete(Long projectId, Long organisationId); @Override ServiceResult<Void> completeSpendProfilesReview(Long projectId); }
@Test public void testCompleteSpendProfileReview() { Long projectId = 1L; when(spendProfileRestService.completeSpendProfilesReview(projectId)).thenReturn(restSuccess()); ServiceResult<Void> result = service.completeSpendProfilesReview(projectId); assertTrue(result.isSuccess()); }
SpendProfileServiceImpl implements SpendProfileService { @Override public ServiceResult<Void> approveOrRejectSpendProfile(Long projectId, ApprovalType approvalType) { return spendProfileRestService.acceptOrRejectSpendProfile(projectId, approvalType).toServiceResult(); } @Override ServiceResult<Void> generateSpendProfile(Long projectId); @Override ServiceResult<Void> approveOrRejectSpendProfile(Long projectId, ApprovalType approvalType); @Override ApprovalType getSpendProfileStatusByProjectId(Long projectId); @Override SpendProfileTableResource getSpendProfileTable(Long projectId, Long organisationId); @Override SpendProfileCSVResource getSpendProfileCSV(Long projectId, Long organisationId); @Override Optional<SpendProfileResource> getSpendProfile(Long projectId, Long organisationId); @Override ServiceResult<Void> saveSpendProfile(Long projectId, Long organisationId, SpendProfileTableResource table); @Override ServiceResult<Void> markSpendProfileComplete(Long projectId, Long organisationId); @Override ServiceResult<Void> markSpendProfileIncomplete(Long projectId, Long organisationId); @Override ServiceResult<Void> completeSpendProfilesReview(Long projectId); }
@Test public void approveOrRejectSpendProfile() { Long projectId = 201L; when(spendProfileRestService.acceptOrRejectSpendProfile(projectId, ApprovalType.APPROVED)).thenReturn(restSuccess()); ServiceResult<Void> result = service.approveOrRejectSpendProfile(projectId, ApprovalType.APPROVED); assertTrue(result.isSuccess()); }
SpendProfileServiceImpl implements SpendProfileService { @Override public ApprovalType getSpendProfileStatusByProjectId(Long projectId) { return spendProfileRestService.getSpendProfileStatusByProjectId(projectId).getSuccess(); } @Override ServiceResult<Void> generateSpendProfile(Long projectId); @Override ServiceResult<Void> approveOrRejectSpendProfile(Long projectId, ApprovalType approvalType); @Override ApprovalType getSpendProfileStatusByProjectId(Long projectId); @Override SpendProfileTableResource getSpendProfileTable(Long projectId, Long organisationId); @Override SpendProfileCSVResource getSpendProfileCSV(Long projectId, Long organisationId); @Override Optional<SpendProfileResource> getSpendProfile(Long projectId, Long organisationId); @Override ServiceResult<Void> saveSpendProfile(Long projectId, Long organisationId, SpendProfileTableResource table); @Override ServiceResult<Void> markSpendProfileComplete(Long projectId, Long organisationId); @Override ServiceResult<Void> markSpendProfileIncomplete(Long projectId, Long organisationId); @Override ServiceResult<Void> completeSpendProfilesReview(Long projectId); }
@Test public void getSpendProfileStatusByProjectId() { Long projectId = 201L; when(spendProfileRestService.getSpendProfileStatusByProjectId(projectId)).thenReturn(restSuccess(ApprovalType.APPROVED)); ApprovalType result = service.getSpendProfileStatusByProjectId(projectId); assertEquals(ApprovalType.APPROVED, result); when(spendProfileRestService.getSpendProfileStatusByProjectId(projectId)).thenReturn(restSuccess(ApprovalType.REJECTED)); result = service.getSpendProfileStatusByProjectId(projectId); assertEquals(ApprovalType.REJECTED, result); when(spendProfileRestService.getSpendProfileStatusByProjectId(projectId)).thenReturn(restSuccess(ApprovalType.UNSET)); result = service.getSpendProfileStatusByProjectId(projectId); assertEquals(ApprovalType.UNSET, result); }
DatesViewModel extends AbstractPublicContentViewModel { public List<DateViewModel> getSortedEvents() { List<DateViewModel> listToBeSorted = getPublicContentDates(); List<DateViewModel> emptyDates = new ArrayList(); List<DateViewModel> sortedList = new ArrayList(); listToBeSorted.stream() .filter(dateViewModel -> null != dateViewModel.getDateTime()) .sorted(Comparator.comparing(DateViewModel::getDateTime)) .forEach(dateViewModel -> sortedList.add(dateViewModel)); listToBeSorted.stream() .filter(dateViewModel -> null == dateViewModel.getDateTime()) .forEach(dateViewModel -> emptyDates.add(dateViewModel)); sortedList.addAll(emptyDates); return sortedList; } List<DateViewModel> getPublicContentDates(); void setPublicContentDates(List<DateViewModel> publicContentDates); List<DateViewModel> getSortedEvents(); }
@Test public void getSortedEventsTest() { List<DateViewModel> result = viewModel.getSortedEvents(); assertEquals("Date 2", result.get(0).getContent()); assertEquals("Date 1", result.get(1).getContent()); assertEquals("Date 3", result.get(2).getContent()); }
DateViewModel { public String getDateTimeFormatted() { if(null == dateTime) { return "Unknown"; } return dateTime.format(DATE_FORMAT); } ZonedDateTime getDateTime(); String getDateTimeFormatted(); void setDateTime(ZonedDateTime dateTime); String getContent(); void setContent(String content); static final DateTimeFormatter DATE_FORMAT; }
@Test public void getDateTimeFormattedTest() { String resultOne = viewModel.getDateTimeFormatted(); assertEquals("Unknown", resultOne); viewModel.setDateTime(ZonedDateTime.of(2015,1,1,0,0,0,0, ZoneId.systemDefault())); String resultTwo = viewModel.getDateTimeFormatted(); assertEquals("1 January 2015", resultTwo); viewModel.setDateTime(ZonedDateTime.of(2015,1,25,0,0,0,0, ZoneId.systemDefault())); String resultThree = viewModel.getDateTimeFormatted(); assertEquals("25 January 2015", resultThree); }
AbstractPublicContentFormPopulator implements PublicContentFormPopulator<F> { public F populate(PublicContentResource publicContentResource) { F form = createInitial(); populateSection(form, publicContentResource); return form; } F populate(PublicContentResource publicContentResource); }
@Test public void testPopulate() { long competitionId = 1L; ContentGroupResource contentGroup = newContentGroupResource() .withHeading("Heading") .withContent("Content") .build(); PublicContentSectionResource contentSection = newPublicContentSectionResource().withType(TEST_TYPE) .withStatus(PublicContentStatus.COMPLETE) .withContentGroups(asList(contentGroup)).build(); PublicContentResource contentResource = newPublicContentResource() .withCompetitionId(competitionId) .withPublishDate(ZonedDateTime.now()) .withContentSections(asList(contentSection)).build(); AbstractContentGroupForm form = (AbstractContentGroupForm) target.populate(contentResource); assertThat(form.getContentGroups().size(), equalTo(1)); assertThat(form.getContentGroups().get(0).getHeading(), equalTo(contentGroup.getHeading())); assertThat(form.getContentGroups().get(0).getContent(), equalTo(contentGroup.getContent())); assertThat(form.getContentGroups().get(0).getId(), equalTo(contentGroup.getId())); }
PublicContentServiceImpl implements PublicContentService { @Override public ServiceResult<Void> updateSection(PublicContentResource resource, PublicContentSectionType section) { return publicContentRestService.updateSection(resource, section).toServiceResult(); } @Override PublicContentResource getCompetitionById(Long id); @Override ServiceResult<Void> publishByCompetitionId(Long publicContentId); @Override ServiceResult<Void> updateSection(PublicContentResource resource, PublicContentSectionType section); @Override ServiceResult<Void> markSectionAsComplete(PublicContentResource resource, PublicContentSectionType section); @Override ServiceResult<Void> removeFile(AbstractContentGroupForm form); @Override ServiceResult<Void> uploadFile(Long competitionId, PublicContentSectionType type, List<ContentGroupForm> contentGroups); @Override ByteArrayResource downloadAttachment(Long contentGroupId); @Override FileEntryResource getFileDetails(Long contentGroupId); }
@Test public void testUpdateSection() { PublicContentResource resource = newPublicContentResource().build(); PublicContentSectionType type = PublicContentSectionType.ELIGIBILITY; when(publicContentRestService.updateSection(resource, type)).thenReturn(restSuccess()); target.updateSection(resource, type).getSuccess(); }
PublicContentServiceImpl implements PublicContentService { @Override public ServiceResult<Void> markSectionAsComplete(PublicContentResource resource, PublicContentSectionType section) { return publicContentRestService.markSectionAsComplete(resource, section).toServiceResult(); } @Override PublicContentResource getCompetitionById(Long id); @Override ServiceResult<Void> publishByCompetitionId(Long publicContentId); @Override ServiceResult<Void> updateSection(PublicContentResource resource, PublicContentSectionType section); @Override ServiceResult<Void> markSectionAsComplete(PublicContentResource resource, PublicContentSectionType section); @Override ServiceResult<Void> removeFile(AbstractContentGroupForm form); @Override ServiceResult<Void> uploadFile(Long competitionId, PublicContentSectionType type, List<ContentGroupForm> contentGroups); @Override ByteArrayResource downloadAttachment(Long contentGroupId); @Override FileEntryResource getFileDetails(Long contentGroupId); }
@Test public void testMarkSectionAsComplete() { PublicContentResource resource = newPublicContentResource().build(); PublicContentSectionType type = PublicContentSectionType.ELIGIBILITY; when(publicContentRestService.markSectionAsComplete(resource, type)).thenReturn(restSuccess()); target.markSectionAsComplete(resource, type).getSuccess(); }
PublicContentServiceImpl implements PublicContentService { @Override public PublicContentResource getCompetitionById(Long id) { return publicContentRestService.getByCompetitionId(id).getSuccess(); } @Override PublicContentResource getCompetitionById(Long id); @Override ServiceResult<Void> publishByCompetitionId(Long publicContentId); @Override ServiceResult<Void> updateSection(PublicContentResource resource, PublicContentSectionType section); @Override ServiceResult<Void> markSectionAsComplete(PublicContentResource resource, PublicContentSectionType section); @Override ServiceResult<Void> removeFile(AbstractContentGroupForm form); @Override ServiceResult<Void> uploadFile(Long competitionId, PublicContentSectionType type, List<ContentGroupForm> contentGroups); @Override ByteArrayResource downloadAttachment(Long contentGroupId); @Override FileEntryResource getFileDetails(Long contentGroupId); }
@Test public void testGetCompetitionById() { PublicContentResource resource = newPublicContentResource().build(); when(publicContentRestService.getByCompetitionId(COMPETITION_ID)).thenReturn(restSuccess(resource)); PublicContentResource result = target.getCompetitionById(COMPETITION_ID); assertThat(result, equalTo(resource)); }
PublicContentServiceImpl implements PublicContentService { @Override public ServiceResult<Void> publishByCompetitionId(Long publicContentId) { return publicContentRestService.publishByCompetitionId(publicContentId).toServiceResult(); } @Override PublicContentResource getCompetitionById(Long id); @Override ServiceResult<Void> publishByCompetitionId(Long publicContentId); @Override ServiceResult<Void> updateSection(PublicContentResource resource, PublicContentSectionType section); @Override ServiceResult<Void> markSectionAsComplete(PublicContentResource resource, PublicContentSectionType section); @Override ServiceResult<Void> removeFile(AbstractContentGroupForm form); @Override ServiceResult<Void> uploadFile(Long competitionId, PublicContentSectionType type, List<ContentGroupForm> contentGroups); @Override ByteArrayResource downloadAttachment(Long contentGroupId); @Override FileEntryResource getFileDetails(Long contentGroupId); }
@Test public void testPublishByCompetitionId() { when(publicContentRestService.publishByCompetitionId(COMPETITION_ID)).thenReturn(restSuccess()); ServiceResult<Void> result = target.publishByCompetitionId(COMPETITION_ID); assertTrue(result.isSuccess()); }
AbstractPublicContentSectionController { @GetMapping("/{competitionId}") public String readOnly(Model model, @PathVariable(COMPETITION_ID_KEY) long competitionId) { return readOnly(competitionId, model, Optional.empty()); } @GetMapping("/{competitionId}") String readOnly(Model model, @PathVariable(COMPETITION_ID_KEY) long competitionId); @GetMapping("/{competitionId}/edit") String edit(Model model, @PathVariable(COMPETITION_ID_KEY) long competitionId); @PostMapping(value = "/{competitionId}/edit") String markAsComplete(Model model, @PathVariable(COMPETITION_ID_KEY) long competitionId, @Valid @ModelAttribute(FORM_ATTR_NAME) F form, BindingResult bindingResult, ValidationHandler validationHandler); }
@Test public void readOnly() throws Exception { CompetitionResource competition = newCompetitionResource().build(); PublicContentResource publicContent = newPublicContentResource().build(); TestPublicContentForm expectedFormPopulated = new TestPublicContentForm(); TestPublicContentViewModel expectedViewModel = new TestPublicContentViewModel(); when(competitionRestService.getCompetitionById(competition.getId())).thenReturn(restSuccess(competition)); when(competitionSetupService.hasInitialDetailsBeenPreviouslySubmitted(competition.getId())).thenReturn(true); when(publicContentService.getCompetitionById(competition.getId())).thenReturn(publicContent); when(modelPopulator.populate(publicContent, true)).thenReturn(expectedViewModel); when(formPopulator.populate(publicContent)).thenReturn(expectedFormPopulated); mockMvc.perform(get("/competition/setup/public-content/test-content-section/{competitionId}", competition .getId())) .andExpect(status().isOk()) .andExpect(model().attribute("form", expectedFormPopulated)) .andExpect(model().attribute("model", expectedViewModel)) .andExpect(view().name("competition/public-content-form")); }
AbstractPublicContentSectionController { @GetMapping("/{competitionId}/edit") public String edit(Model model, @PathVariable(COMPETITION_ID_KEY) long competitionId) { return edit(competitionId, model, Optional.empty()); } @GetMapping("/{competitionId}") String readOnly(Model model, @PathVariable(COMPETITION_ID_KEY) long competitionId); @GetMapping("/{competitionId}/edit") String edit(Model model, @PathVariable(COMPETITION_ID_KEY) long competitionId); @PostMapping(value = "/{competitionId}/edit") String markAsComplete(Model model, @PathVariable(COMPETITION_ID_KEY) long competitionId, @Valid @ModelAttribute(FORM_ATTR_NAME) F form, BindingResult bindingResult, ValidationHandler validationHandler); }
@Test public void edit() throws Exception { CompetitionResource competition = newCompetitionResource().build(); PublicContentResource publicContent = newPublicContentResource().build(); TestPublicContentForm expectedFormPopulated = new TestPublicContentForm(); TestPublicContentViewModel expectedViewModel = new TestPublicContentViewModel(); when(competitionRestService.getCompetitionById(competition.getId())).thenReturn(restSuccess(competition)); when(competitionSetupService.hasInitialDetailsBeenPreviouslySubmitted(competition.getId())).thenReturn(true); when(publicContentService.getCompetitionById(competition.getId())).thenReturn(publicContent); when(modelPopulator.populate(publicContent, false)).thenReturn(expectedViewModel); when(formPopulator.populate(publicContent)).thenReturn(expectedFormPopulated); mockMvc.perform(get("/competition/setup/public-content/test-content-section/{competitionId}/edit", competition .getId())) .andExpect(status().isOk()) .andExpect(model().attribute("form", expectedFormPopulated)) .andExpect(model().attribute("model", expectedViewModel)) .andExpect(view().name("competition/public-content-form")); }
GrantProcess { public long getApplicationId() { return applicationId; } GrantProcess(); GrantProcess(long applicationId); GrantProcess(long applicationId, boolean pending); long getApplicationId(); ZonedDateTime getSentRequested(); ZonedDateTime getSentSucceeded(); boolean isPending(); String getMessage(); ZonedDateTime getLastProcessed(); GrantProcess requestSend(ZonedDateTime now); GrantProcess sendSucceeded(ZonedDateTime now); GrantProcess sendFailed(ZonedDateTime now, String message); @Override boolean equals(Object o); @Override int hashCode(); }
@Test public void getApplicationId() { assertEquals(APPLICATION_ID, grantProcess.getApplicationId()); assertEquals(APPLICATION_ID, sendRequestedGrantProcess.getApplicationId()); assertEquals(APPLICATION_ID, sendSucceededGrantProcess.getApplicationId()); assertEquals(APPLICATION_ID, sendFailedGrantProcess.getApplicationId()); }
AbstractPublicContentSectionController { @PostMapping(value = "/{competitionId}/edit") public String markAsComplete(Model model, @PathVariable(COMPETITION_ID_KEY) long competitionId, @Valid @ModelAttribute(FORM_ATTR_NAME) F form, BindingResult bindingResult, ValidationHandler validationHandler) { return markAsComplete(competitionId, model, form, validationHandler); } @GetMapping("/{competitionId}") String readOnly(Model model, @PathVariable(COMPETITION_ID_KEY) long competitionId); @GetMapping("/{competitionId}/edit") String edit(Model model, @PathVariable(COMPETITION_ID_KEY) long competitionId); @PostMapping(value = "/{competitionId}/edit") String markAsComplete(Model model, @PathVariable(COMPETITION_ID_KEY) long competitionId, @Valid @ModelAttribute(FORM_ATTR_NAME) F form, BindingResult bindingResult, ValidationHandler validationHandler); }
@Test public void markAsComplete_DatesSection() throws Exception { CompetitionResource competition = newCompetitionResource().build(); PublicContentResource publicContent = newPublicContentResource().build(); TestPublicContentForm expectedFormToSave = new TestPublicContentForm(); TestPublicContentViewModel expectedViewModel = new TestPublicContentViewModel(); PublicContentSectionResource publicContentSectionResource = newPublicContentSectionResource() .withType(DATES) .build(); expectedViewModel.setSection(publicContentSectionResource); when(competitionRestService.getCompetitionById(competition.getId())).thenReturn(restSuccess(competition)); when(competitionSetupService.hasInitialDetailsBeenPreviouslySubmitted(competition.getId())).thenReturn(true); when(publicContentService.getCompetitionById(competition.getId())).thenReturn(publicContent); when(modelPopulator.populate(publicContent, true)).thenReturn(expectedViewModel); when(formSaver.markAsComplete(expectedFormToSave, publicContent)).thenReturn(serviceSuccess()); mockMvc.perform(post("/competition/setup/public-content/test-content-section/{competitionId}/edit", competition .getId())) .andExpect(status().isFound()) .andExpect(model().attribute("form", expectedFormToSave)) .andExpect(view().name("redirect:/competition/setup/public-content/dates/" + competition.getId())); verify(formSaver, only()).markAsComplete(expectedFormToSave, publicContent); } @Test public void markAsComplete_SectionsOtherThanDates() throws Exception { CompetitionResource competition = newCompetitionResource().build(); PublicContentResource publicContent = newPublicContentResource().build(); TestPublicContentForm expectedFormToSave = new TestPublicContentForm(); TestPublicContentViewModel expectedViewModel = new TestPublicContentViewModel(); PublicContentSectionResource publicContentSectionResource = newPublicContentSectionResource() .withType(SUMMARY) .build(); expectedViewModel.setSection(publicContentSectionResource); when(competitionRestService.getCompetitionById(competition.getId())).thenReturn(restSuccess(competition)); when(competitionSetupService.hasInitialDetailsBeenPreviouslySubmitted(competition.getId())).thenReturn(true); when(publicContentService.getCompetitionById(competition.getId())).thenReturn(publicContent); when(modelPopulator.populate(publicContent, true)).thenReturn(expectedViewModel); when(formSaver.markAsComplete(expectedFormToSave, publicContent)).thenReturn(serviceSuccess()); mockMvc.perform(post("/competition/setup/public-content/test-content-section/{competitionId}/edit", competition .getId())) .andExpect(status().isOk()) .andExpect(model().attribute("form", expectedFormToSave)) .andExpect(model().attribute("model", expectedViewModel)) .andExpect(view().name("competition/public-content-form")); verify(formSaver, only()).markAsComplete(expectedFormToSave, publicContent); }
AbstractContentGroupController extends AbstractPublicContentSectionController<M, F> { @PostMapping(value = "/{competitionId}/edit", params = "uploadFile") public String saveAndUpload(Model model, @PathVariable(COMPETITION_ID_KEY) long competitionId, @ModelAttribute(FORM_ATTR_NAME) F form, BindingResult bindingResult, ValidationHandler validationHandler) { return saveAndFileAction(competitionId, model, form, validationHandler, () -> publicContentService.uploadFile(competitionId, getType(), form.getContentGroups())); } @PostMapping(value = "/{competitionId}/edit", params = "uploadFile") String saveAndUpload(Model model, @PathVariable(COMPETITION_ID_KEY) long competitionId, @ModelAttribute(FORM_ATTR_NAME) F form, BindingResult bindingResult, ValidationHandler validationHandler); @PostMapping(value = "/{competitionId}/edit", params = "removeFile") String saveAndRemove(Model model, @PathVariable(COMPETITION_ID_KEY) long competitionId, @ModelAttribute(FORM_ATTR_NAME) F form, BindingResult bindingResult, ValidationHandler validationHandler); @GetMapping("/{competitionId}/edit/{contentGroupId}") ResponseEntity<ByteArrayResource> getFileDetails(Model model, @PathVariable(COMPETITION_ID_KEY) long competitionId, @PathVariable("contentGroupId") long contentGroupId); }
@Test public void saveAndUpload() throws Exception { CompetitionResource competition = newCompetitionResource().build(); PublicContentResource publicContent = newPublicContentResource().build(); TestPublicContentForm expectedFormToSave = new TestPublicContentForm(); TestPublicContentForm expectedFormPopulated = new TestPublicContentForm(); TestPublicContentViewModel expectedViewModel = new TestPublicContentViewModel(); when(competitionRestService.getCompetitionById(competition.getId())).thenReturn(restSuccess(competition)); when(competitionSetupService.hasInitialDetailsBeenPreviouslySubmitted(competition.getId())).thenReturn(true); when(publicContentService.uploadFile(competition.getId(), publicContentSectionType, expectedFormToSave.getContentGroups())).thenReturn(serviceSuccess()); when(publicContentService.getCompetitionById(competition.getId())).thenReturn(publicContent); when(formSaver.save(expectedFormToSave, publicContent)).thenReturn(serviceSuccess()); when(modelPopulator.populate(publicContent, false)).thenReturn(expectedViewModel); when(formPopulator.populate(publicContent)).thenReturn(expectedFormPopulated); mockMvc.perform(post("/competition/setup/public-content/test-content-group/{competitionId}/edit", competition .getId()) .param("uploadFile", "")) .andExpect(status().isOk()) .andExpect(model().attribute("form", expectedFormPopulated)) .andExpect(model().attribute("model", expectedViewModel)) .andExpect(view().name("competition/public-content-form")); verify(formSaver, only()).save(expectedFormToSave, publicContent); verify(publicContentService).uploadFile(competition.getId(), publicContentSectionType, expectedFormToSave .getContentGroups()); }
AbstractContentGroupController extends AbstractPublicContentSectionController<M, F> { @PostMapping(value = "/{competitionId}/edit", params = "removeFile") public String saveAndRemove(Model model, @PathVariable(COMPETITION_ID_KEY) long competitionId, @ModelAttribute(FORM_ATTR_NAME) F form, BindingResult bindingResult, ValidationHandler validationHandler) { return saveAndFileAction(competitionId, model, form, validationHandler, () -> publicContentService.removeFile(form)); } @PostMapping(value = "/{competitionId}/edit", params = "uploadFile") String saveAndUpload(Model model, @PathVariable(COMPETITION_ID_KEY) long competitionId, @ModelAttribute(FORM_ATTR_NAME) F form, BindingResult bindingResult, ValidationHandler validationHandler); @PostMapping(value = "/{competitionId}/edit", params = "removeFile") String saveAndRemove(Model model, @PathVariable(COMPETITION_ID_KEY) long competitionId, @ModelAttribute(FORM_ATTR_NAME) F form, BindingResult bindingResult, ValidationHandler validationHandler); @GetMapping("/{competitionId}/edit/{contentGroupId}") ResponseEntity<ByteArrayResource> getFileDetails(Model model, @PathVariable(COMPETITION_ID_KEY) long competitionId, @PathVariable("contentGroupId") long contentGroupId); }
@Test public void saveAndRemove() throws Exception { CompetitionResource competition = newCompetitionResource().build(); PublicContentResource publicContent = newPublicContentResource().build(); TestPublicContentForm expectedFormToSave = new TestPublicContentForm(); TestPublicContentForm expectedFormPopulated = new TestPublicContentForm(); TestPublicContentViewModel expectedViewModel = new TestPublicContentViewModel(); when(competitionRestService.getCompetitionById(competition.getId())).thenReturn(restSuccess(competition)); when(competitionSetupService.hasInitialDetailsBeenPreviouslySubmitted(competition.getId())).thenReturn(true); when(publicContentService.removeFile(expectedFormToSave)).thenReturn(serviceSuccess()); when(publicContentService.getCompetitionById(competition.getId())).thenReturn(publicContent); when(formSaver.save(expectedFormToSave, publicContent)).thenReturn(serviceSuccess()); when(modelPopulator.populate(publicContent, false)).thenReturn(expectedViewModel); when(formPopulator.populate(publicContent)).thenReturn(expectedFormPopulated); mockMvc.perform(post("/competition/setup/public-content/test-content-group/{competitionId}/edit", competition .getId()) .param("removeFile", "")) .andExpect(status().isOk()) .andExpect(model().attribute("form", expectedFormPopulated)) .andExpect(model().attribute("model", expectedViewModel)) .andExpect(view().name("competition/public-content-form")); verify(formSaver, only()).save(expectedFormToSave, publicContent); verify(publicContentService).removeFile(expectedFormToSave); }
PublicContentMenuPopulator { public PublicContentMenuViewModel populate(CompetitionResource competition, String webBaseUrl) { PublicContentResource publicContent = publicContentService.getCompetitionById(competition.getId()); PublicContentMenuViewModel viewModel = new PublicContentMenuViewModel(); viewModel.setPublishDate(publicContent.getPublishDate()); viewModel.setSections(publicContent.getContentSections()); viewModel.setCompetition(competition); viewModel.setInviteOnly(publicContent.getInviteOnly()); viewModel.setWebBaseUrl(webBaseUrl); return viewModel; } PublicContentMenuViewModel populate(CompetitionResource competition, String webBaseUrl); }
@Test public void testPopulate() { List<PublicContentSectionResource> sections = asList(PublicContentSectionType.values()) .stream() .map(type -> newPublicContentSectionResource().withType(type).build()) .collect(Collectors.toList()); ZonedDateTime date = ZonedDateTime.now(); Boolean publishSetting = Boolean.FALSE; PublicContentResource publicContent = newPublicContentResource() .withContentSections(sections) .withPublishDate(date) .withInviteOnly(publishSetting) .build(); CompetitionResource competition = newCompetitionResource().withId(COMPETITION_ID).build(); when(publicContentService.getCompetitionById(COMPETITION_ID)).thenReturn(publicContent); when(competitionRestService.getCompetitionById(COMPETITION_ID)).thenReturn(restSuccess(competition)); PublicContentMenuViewModel viewModel = target.populate(competition, WEB_BASE_URL); assertThat(viewModel.getSections(), equalTo(sections)); assertThat(viewModel.getCompetition(), equalTo(competition)); assertThat(viewModel.getPublishDate(), equalTo(date)); assertThat(viewModel.isInviteOnly(), equalTo(publishSetting)); assertThat(viewModel.getCompetitionURL(), equalTo("https: }
ApplicationFundingDecisionServiceImpl implements ApplicationFundingDecisionService { @Override public ServiceResult<Void> saveApplicationFundingDecisionData(Long competitionId, FundingDecision fundingDecision, List<Long> applicationIds) { if (isAllowedFundingDecision(fundingDecision)) { Map<Long, FundingDecision> applicationIdToFundingDecision = applicationIds.stream().collect(toMap(Function.identity(), id -> fundingDecision)); applicationFundingDecisionRestService.saveApplicationFundingDecisionData(competitionId, applicationIdToFundingDecision).getSuccess(); } else { return serviceFailure(new Error("Disallowed funding decision submitted", HttpStatus.BAD_REQUEST)); } return serviceSuccess(); } @Override ServiceResult<Void> saveApplicationFundingDecisionData(Long competitionId, FundingDecision fundingDecision, List<Long> applicationIds); Optional<FundingDecision> getFundingDecisionForString(String val); }
@Test public void saveFundingDecision() throws Exception { List<Long> applicationIds = new ArrayList<>(); applicationIds.add(8L); applicationIds.add(9L); ApplicationSummaryPageResource applicationSummaryPageResource = new ApplicationSummaryPageResource(); List<ApplicationSummaryResource> applicationSummaryResources = newApplicationSummaryResource().withId(8L, 9L).build(4); applicationSummaryPageResource.setContent(applicationSummaryResources); when(applicationFundingDecisionRestService.saveApplicationFundingDecisionData(any(), any())).thenReturn(restSuccess()); service.saveApplicationFundingDecisionData(1L, FundingDecision.ON_HOLD, applicationIds); Map<Long, FundingDecision> expectedDecisionMap = new HashMap<>(); expectedDecisionMap.put(8L, FundingDecision.ON_HOLD); expectedDecisionMap.put(9L, FundingDecision.ON_HOLD); verify(applicationFundingDecisionRestService).saveApplicationFundingDecisionData(1L, expectedDecisionMap); } @Test public void saveFundingDecision_undecidedFundingDecisionChoice() throws Exception { List<Long> applicationIds = new ArrayList<>(); applicationIds.add(8L); applicationIds.add(9L); ApplicationSummaryPageResource applicationSummaryPageResource = new ApplicationSummaryPageResource(); List<ApplicationSummaryResource> applicationSummaryResources = newApplicationSummaryResource().withId(8L, 9L).build(2); applicationSummaryPageResource.setContent(applicationSummaryResources); ServiceResult<Void> result = service.saveApplicationFundingDecisionData(1L, FundingDecision.UNDECIDED, applicationIds); assertTrue(result.isFailure()); verifyZeroInteractions(applicationFundingDecisionRestService); }
ApplicationFundingDecisionServiceImpl implements ApplicationFundingDecisionService { public Optional<FundingDecision> getFundingDecisionForString(String val) { Optional<FundingDecision> fundingDecision = Optional.empty(); try { fundingDecision = Optional.of(FundingDecision.valueOf(val)); } catch (IllegalArgumentException e) { LOG.info("Funding decision string disallowed", e); } return fundingDecision; } @Override ServiceResult<Void> saveApplicationFundingDecisionData(Long competitionId, FundingDecision fundingDecision, List<Long> applicationIds); Optional<FundingDecision> getFundingDecisionForString(String val); }
@Test public void saveFundingDecision_getFundingDecisionForStringShouldReturnAppropriateFundingDecision() throws Exception { String fundingDecisionString = "ON_HOLD"; Optional<FundingDecision> fundingDecision = service.getFundingDecisionForString(fundingDecisionString); assertTrue(fundingDecision.isPresent()); assertEquals(fundingDecision.get(), FundingDecision.ON_HOLD); } @Test public void saveFundingDecision_getFundingDecisionForStringShouldReturnEmptyOptionalIfFundingDecisionisUnrecognized() throws Exception { String fundingDecisionString = "NOT_A_FUNDING_DECISION_AT_ALL"; Optional<FundingDecision> fundingDecision = service.getFundingDecisionForString(fundingDecisionString); assertTrue(!fundingDecision.isPresent()); }
NonIfsDetailsFormPopulator { public NonIfsDetailsForm populate(CompetitionResource competitionResource) { NonIfsDetailsForm form = new NonIfsDetailsForm(); form.setTitle(competitionResource.getName()); form.setInnovationSectorCategoryId(competitionResource.getInnovationSector()); form.setInnovationAreaCategoryId(competitionResource.getInnovationAreas().stream().findAny().orElse(null)); form.setUrl(competitionResource.getNonIfsUrl()); form.setApplicantNotifiedDate(new MilestoneOrEmptyRowForm(MilestoneType.NOTIFICATIONS, competitionResource.getFundersPanelEndDate())); form.setRegistrationCloseDate(new MilestoneRowForm(MilestoneType.REGISTRATION_DATE, competitionResource.getRegistrationDate())); form.setOpenDate(new MilestoneRowForm(MilestoneType.OPEN_DATE, competitionResource.getStartDate())); form.setCloseDate(new MilestoneRowForm(MilestoneType.SUBMISSION_DATE, competitionResource.getEndDate())); form.setFundingType(competitionResource.getFundingType()); return form; } NonIfsDetailsForm populate(CompetitionResource competitionResource); }
@Test public void testPopulate() { CompetitionResource competition = newCompetitionResource() .withName(COMPETITION_NAME).withInnovationSector(INNOVATION_SECTOR).withInnovationAreas(asSet(INNOVATION_AREA)) .withNonIfsUrl(COMPETITION_URL).withFundersPanelEndDate(NOTIFIED).withStartDate(OPEN).withEndDate(CLOSE) .withFundingType(GRANT) .build(); NonIfsDetailsForm form = target.populate(competition); assertThat(form.getTitle(), equalTo(COMPETITION_NAME)); assertThat(form.getUrl(), equalTo(COMPETITION_URL)); assertThat(form.getInnovationSectorCategoryId(), equalTo(INNOVATION_SECTOR)); assertThat(form.getInnovationAreaCategoryId(), equalTo(INNOVATION_AREA)); assertThat(form.getApplicantNotifiedDate().getDate(), equalTo(NOTIFIED)); assertThat(form.getOpenDate().getDate(), equalTo(OPEN)); assertThat(form.getCloseDate().getDate(), equalTo(CLOSE)); assertThat(form.getFundingType(), equalTo(GRANT)); }
GrantProcess { public ZonedDateTime getSentRequested() { return sentRequested; } GrantProcess(); GrantProcess(long applicationId); GrantProcess(long applicationId, boolean pending); long getApplicationId(); ZonedDateTime getSentRequested(); ZonedDateTime getSentSucceeded(); boolean isPending(); String getMessage(); ZonedDateTime getLastProcessed(); GrantProcess requestSend(ZonedDateTime now); GrantProcess sendSucceeded(ZonedDateTime now); GrantProcess sendFailed(ZonedDateTime now, String message); @Override boolean equals(Object o); @Override int hashCode(); }
@Test public void getSentRequested() { assertNull(grantProcess.getSentRequested()); assertEquals(SEND_REQUESTED_DATE, sendRequestedGrantProcess.getSentRequested()); assertEquals(SEND_REQUESTED_DATE, sendSucceededGrantProcess.getSentRequested()); assertEquals(SEND_REQUESTED_DATE, sendFailedGrantProcess.getSentRequested()); }
NonIfsDetailsFormSaver { public ServiceResult<Void> save(NonIfsDetailsForm form, CompetitionResource competitionResource) { if(!competitionResource.isNonIfs()) { return serviceFailure(CommonFailureKeys.ONLY_NON_IFS_COMPETITION_VALID); } Map<String, GenericMilestoneRowForm> mappedMilestones = createMilestoneMap(form); mapFormFields(form, competitionResource); return competitionSetupRestService.update(competitionResource).toServiceResult().andOnSuccess(() -> { List<MilestoneResource> milestones = getPublicMilestones(competitionResource); return competitionSetupMilestoneService.updateMilestonesForCompetition(milestones, mappedMilestones, competitionResource.getId()); }); } ServiceResult<Void> save(NonIfsDetailsForm form, CompetitionResource competitionResource); }
@Test public void testSaveSuccess() { NonIfsDetailsForm form = createForm(); CompetitionResource competition = newCompetitionResource().withNonIfs(true).build(); List<MilestoneResource> allMilestones = newMilestoneResource().build(1); when(competitionSetupMilestoneService.validateMilestoneDates(any())).thenReturn(emptyList()); when(competitionSetupRestService.update(competition)).thenReturn(restSuccess()); when(milestoneRestService.getAllMilestonesByCompetitionId(competition.getId())).thenReturn(restSuccess(allMilestones)); when(competitionSetupMilestoneService.updateMilestonesForCompetition(eq(allMilestones), any(), eq(competition.getId()))).thenReturn(serviceSuccess()); ServiceResult<Void> result = target.save(form, competition); assertThat(result.isSuccess(), equalTo(true)); assertThat(competition.getName(), equalTo(COMPETITION_NAME)); assertThat(competition.getNonIfsUrl(), equalTo(COMPETITION_URL)); assertThat(competition.getInnovationAreas(), equalTo(asSet(INNOVATION_AREA))); assertThat(competition.getInnovationSector(), equalTo(INNOVATION_SECTOR)); assertThat(competition.getFundingType(), equalTo(GRANT)); verify(competitionSetupMilestoneService).updateMilestonesForCompetition(eq(allMilestones), captor.capture(), eq(competition.getId())); Map<String, GenericMilestoneRowForm> milestones = captor.getValue(); assertThat(milestones.get(NOTIFICATIONS.name()).getDate(), equalTo(NOTIFIED)); assertThat(milestones.get(OPEN_DATE.name()).getDate(), equalTo(OPEN)); assertThat(milestones.get(REGISTRATION_DATE.name()).getDate(), equalTo(REGISTRATION)); assertThat(milestones.get(SUBMISSION_DATE.name()).getDate(), equalTo(CLOSE)); } @Test public void testSaveIfsCompetitionFailure() { NonIfsDetailsForm form = createForm(); CompetitionResource competition = newCompetitionResource().withNonIfs(false).build(); ServiceResult<Void> result = target.save(form, competition); assertThat(result.isFailure(), equalTo(true)); assertThat(result.getErrors().get(0).getErrorKey(), equalTo(CommonFailureKeys.ONLY_NON_IFS_COMPETITION_VALID.name())); }
NonIfsCompetitionController { @GetMapping("/non-ifs-competition/create") public String create() { CompetitionResource competition = competitionSetupRestService.createNonIfs() .getSuccess(); return String.format("redirect:/non-ifs-competition/setup/%s", competition.getId()); } @GetMapping("/non-ifs-competition/create") String create(); @GetMapping("/non-ifs-competition/setup/{competitionId}") String details(Model model, @PathVariable("competitionId") Long competitionId); @PostMapping("/non-ifs-competition/setup/{competitionId}") String save(Model model,@Valid @ModelAttribute(FORM_ATTR) NonIfsDetailsForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable("competitionId") Long competitionId); }
@Test public void testCreate() throws Exception { Long competitionId = 10L; when(competitionSetupRestService.createNonIfs()).thenReturn(restSuccess(newCompetitionResource().withId(competitionId).build())); mockMvc.perform(get("/non-ifs-competition/create/")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl("/non-ifs-competition/setup/"+competitionId)); }
NonIfsCompetitionController { @GetMapping("/non-ifs-competition/setup/{competitionId}") public String details(Model model, @PathVariable("competitionId") Long competitionId) { CompetitionResource competition = competitionRestService.getCompetitionById(competitionId).getSuccess(); if (!competition.isNonIfs()) { return "redirect:/competition/setup/" + competitionId; } return getDetailsPage(model, competition, Optional.empty()); } @GetMapping("/non-ifs-competition/create") String create(); @GetMapping("/non-ifs-competition/setup/{competitionId}") String details(Model model, @PathVariable("competitionId") Long competitionId); @PostMapping("/non-ifs-competition/setup/{competitionId}") String save(Model model,@Valid @ModelAttribute(FORM_ATTR) NonIfsDetailsForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable("competitionId") Long competitionId); }
@Test public void testDetails() throws Exception { Long competitionId = 11L; CompetitionResource competitionResource = newCompetitionResource().withId(competitionId).withNonIfs(true).build(); NonIfsDetailsForm nonIfsDetailsForm = new NonIfsDetailsForm(); NonIfsDetailsViewModel nonIfsDetailsViewModel = mock(NonIfsDetailsViewModel.class); when(competitionRestService.getCompetitionById(competitionId)).thenReturn(restSuccess(competitionResource)); when(nonIfsDetailsFormPopulator.populate(competitionResource)).thenReturn(nonIfsDetailsForm); when(nonIfsDetailsViewModelPopulator.populate(competitionResource)).thenReturn(nonIfsDetailsViewModel); mockMvc.perform(get("/non-ifs-competition/setup/"+competitionId)) .andExpect(status().is2xxSuccessful()) .andExpect(view().name("competition/non-ifs-details")) .andExpect(model().attribute("model", nonIfsDetailsViewModel)) .andExpect(model().attribute("form", nonIfsDetailsForm)); }
NonIfsCompetitionController { @PostMapping("/non-ifs-competition/setup/{competitionId}") public String save(Model model,@Valid @ModelAttribute(FORM_ATTR) NonIfsDetailsForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable("competitionId") Long competitionId) { CompetitionResource competition = competitionRestService.getCompetitionById(competitionId).getSuccess(); Supplier<String> failureView = () -> getDetailsPage(model, competition, Optional.of(form)); Supplier<String> successView = () -> "redirect:/competition/setup/public-content/" + competitionId; return validationHandler.performActionOrBindErrorsToField("", failureView, successView, () -> nonIfsDetailsFormSaver.save(form, competition)); } @GetMapping("/non-ifs-competition/create") String create(); @GetMapping("/non-ifs-competition/setup/{competitionId}") String details(Model model, @PathVariable("competitionId") Long competitionId); @PostMapping("/non-ifs-competition/setup/{competitionId}") String save(Model model,@Valid @ModelAttribute(FORM_ATTR) NonIfsDetailsForm form, BindingResult bindingResult, ValidationHandler validationHandler, @PathVariable("competitionId") Long competitionId); }
@Test public void testSave() throws Exception { Long competitionId = 11L; CompetitionResource competitionResource = newCompetitionResource().withId(competitionId).withNonIfs(true).build(); when(competitionRestService.getCompetitionById(competitionId)).thenReturn(restSuccess(competitionResource)); when(nonIfsDetailsFormSaver.save(any(), any())).thenReturn(serviceSuccess()); mockMvc.perform(post("/non-ifs-competition/setup/"+competitionId) .param("title", "Competition Title") .param("fundingType", FundingType.GRANT.name()) .param("innovationSectorCategoryId", "12") .param("innovationAreaCategoryId", "13") .param("openDate.year", "2017") .param("openDate.month", "01") .param("openDate.day", "01") .param("closeDate.year", "2017") .param("closeDate.month", "01") .param("closeDate.day", "01") .param("closeDate.time", "NINE_AM") .param("registrationCloseDate.year", "2017") .param("registrationCloseDate.month", "01") .param("registrationCloseDate.day", "01") .param("url","https: .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl("/competition/setup/public-content/" + competitionId)); verify(nonIfsDetailsFormSaver, times(1)).save(any(), any()); } @Test public void testSave_emptyInputsShouldReturnAppropriateErrors() throws Exception { Long competitionId = 11L; CompetitionResource competitionResource = newCompetitionResource().withId(competitionId).withNonIfs(true).build(); when(competitionRestService.getCompetitionById(competitionId)).thenReturn(restSuccess(competitionResource)); when(nonIfsDetailsFormSaver.save(any(), any())).thenReturn(serviceSuccess()); MvcResult mvcResult = mockMvc.perform(post("/non-ifs-competition/setup/"+competitionId) .param("title", "") .param("innovationSectorCategoryId", "") .param("innovationAreaCategoryId", "") .param("openDate.year", "") .param("openDate.month", "") .param("openDate.day", "") .param("closeDate.year", "") .param("closeDate.month", "") .param("closeDate.day", "") .param("closeDate.time", "") .param("registrationCloseDate.year", "") .param("registrationCloseDate.month", "") .param("registrationCloseDate.day", "") .param("url","")) .andExpect(status().is2xxSuccessful()) .andReturn(); BindingResult bindingResult = getBindingResult( mvcResult.getModelAndView().getModelMap(), "form" ); assertTrue(bindingResult.getFieldError("url").getDefaultMessage().equals("Please enter a competition URL.")); assertTrue(bindingResult.getFieldError("title").getDefaultMessage().equals("Please enter a title.")); assertTrue(bindingResult.getFieldError("fundingType").getDefaultMessage().equals("Enter a valid funding type.")); assertTrue(bindingResult.getFieldError("openDate").getDefaultMessage().equals("Please enter a valid date.")); assertTrue(bindingResult.getFieldError("registrationCloseDate").getDefaultMessage().equals("Please enter a valid date.")); assertTrue(bindingResult.getFieldError("closeDate").getDefaultMessage().equals("Please enter a valid date.")); assertTrue(bindingResult.getFieldError("innovationSectorCategoryId").getDefaultMessage().equals("This field cannot be left blank.")); assertTrue(bindingResult.getFieldError("innovationAreaCategoryId").getDefaultMessage().equals("This field cannot be left blank.")); verifyZeroInteractions(nonIfsDetailsFormSaver); } @Test public void testSave_noParametersShouldReturnAppropriateErrors() throws Exception { Long competitionId = 11L; CompetitionResource competitionResource = newCompetitionResource().withId(competitionId).withNonIfs(true).build(); when(competitionRestService.getCompetitionById(competitionId)).thenReturn(restSuccess(competitionResource)); when(nonIfsDetailsFormSaver.save(any(), any())).thenReturn(serviceSuccess()); MvcResult mvcResult = mockMvc.perform(post("/non-ifs-competition/setup/"+competitionId)) .andExpect(status().is2xxSuccessful()) .andReturn(); BindingResult bindingResult = getBindingResult( mvcResult.getModelAndView().getModelMap(), "form" ); assertEquals("Please enter a competition URL.", bindingResult.getFieldError("url").getDefaultMessage()); assertEquals("Please enter a title.",bindingResult.getFieldError("title").getDefaultMessage()); assertEquals("Please enter an open date.", bindingResult.getFieldError("openDate").getDefaultMessage()); assertEquals("Please enter a registration close date.", bindingResult.getFieldError("registrationCloseDate").getDefaultMessage()); assertEquals("Please enter a competition close date.", bindingResult.getFieldError("closeDate").getDefaultMessage()); assertEquals("This field cannot be left blank.", bindingResult.getFieldError("innovationSectorCategoryId").getDefaultMessage()); assertEquals("This field cannot be left blank.", bindingResult.getFieldError("innovationAreaCategoryId").getDefaultMessage()); verifyZeroInteractions(nonIfsDetailsFormSaver); } @Test public void testSave_yearFieldsUnderAndAboveLimitsAreRejectd() throws Exception { Long competitionId = 11L; CompetitionResource competitionResource = newCompetitionResource().withId(competitionId).withNonIfs(true).build(); when(competitionRestService.getCompetitionById(competitionId)).thenReturn(restSuccess(competitionResource)); when(nonIfsDetailsFormSaver.save(any(), any())).thenReturn(serviceSuccess()); MvcResult mvcResult = mockMvc.perform(post("/non-ifs-competition/setup/"+competitionId) .param("openDate.year", "1999") .param("openDate.month", "") .param("openDate.day", "") .param("closeDate.year", "10000") .param("closeDate.month", "") .param("closeDate.day", "") .param("closeDate.time", "") .param("registrationCloseDate.year", "-1") .param("registrationCloseDate.month", "") .param("registrationCloseDate.day", "")) .andExpect(status().is2xxSuccessful()) .andReturn(); BindingResult bindingResult = getBindingResult( mvcResult.getModelAndView().getModelMap(), "form" ); assertEquals("Please enter a valid date.", bindingResult.getFieldError("openDate.year").getDefaultMessage()); assertEquals("Please enter a valid date.", bindingResult.getFieldError("registrationCloseDate.year").getDefaultMessage()); assertEquals("Please enter a valid date.", bindingResult.getFieldError("closeDate.year").getDefaultMessage()); verifyZeroInteractions(nonIfsDetailsFormSaver); } @Test public void testSave_impossibleDatesShouldBeRejected() throws Exception { Long competitionId = 11L; CompetitionResource competitionResource = newCompetitionResource().withId(competitionId).withNonIfs(true).build(); when(competitionRestService.getCompetitionById(competitionId)).thenReturn(restSuccess(competitionResource)); when(nonIfsDetailsFormSaver.save(any(), any())).thenReturn(serviceSuccess()); MvcResult mvcResult = mockMvc.perform(post("/non-ifs-competition/setup/"+competitionId) .param("openDate.year", "01") .param("openDate.month", "13") .param("openDate.day", "32") .param("closeDate.year", "2017") .param("closeDate.month", "-1") .param("closeDate.day", "01") .param("registrationCloseDate.year", "2017") .param("registrationCloseDate.month", "02") .param("registrationCloseDate.day", "29")) .andExpect(status().is2xxSuccessful()) .andReturn(); BindingResult bindingResult = getBindingResult( mvcResult.getModelAndView().getModelMap(), "form" ); assertEquals("Please enter a valid date.", bindingResult.getFieldError("openDate").getDefaultMessage()); assertEquals("Please enter a valid date.", bindingResult.getFieldError("registrationCloseDate").getDefaultMessage()); assertEquals("Please enter a valid date.", bindingResult.getFieldError("closeDate").getDefaultMessage()); verifyZeroInteractions(nonIfsDetailsFormSaver); }
NonIfsDetailsViewModelPopulator { public NonIfsDetailsViewModel populate(CompetitionResource competition) { List<InnovationSectorResource> innovationSectorResourceList = categoryRestService.getInnovationSectors().getSuccess(); removeOpenSector(innovationSectorResourceList); List<InnovationAreaResource> innovationAreaResources = categoryRestService.getInnovationAreas().getSuccess(); return new NonIfsDetailsViewModel(competition, innovationSectorResourceList, innovationAreaResources, asList(FundingType.values())); } NonIfsDetailsViewModel populate(CompetitionResource competition); }
@Test public void testPopulate() { List<InnovationAreaResource> innovationAreas = new ArrayList<>(); List<InnovationSectorResource> innovationSectors = new ArrayList<>(); when(categoryRestService.getInnovationAreas()).thenReturn(restSuccess(innovationAreas)); when(categoryRestService.getInnovationSectors()).thenReturn(restSuccess(innovationSectors)); CompetitionResource competition = newCompetitionResource().build(); NonIfsDetailsViewModel viewModel = target.populate(competition); assertThat(viewModel.getInnovationAreas(), equalTo(innovationAreas)); assertThat(viewModel.getInnovationSectors(), equalTo(innovationSectors)); assertThat(viewModel.getCompetition(), equalTo(competition)); }
GrantProcess { public ZonedDateTime getSentSucceeded() { return sentSucceeded; } GrantProcess(); GrantProcess(long applicationId); GrantProcess(long applicationId, boolean pending); long getApplicationId(); ZonedDateTime getSentRequested(); ZonedDateTime getSentSucceeded(); boolean isPending(); String getMessage(); ZonedDateTime getLastProcessed(); GrantProcess requestSend(ZonedDateTime now); GrantProcess sendSucceeded(ZonedDateTime now); GrantProcess sendFailed(ZonedDateTime now, String message); @Override boolean equals(Object o); @Override int hashCode(); }
@Test public void getSentSucceeded() { assertNull(grantProcess.getSentSucceeded()); assertNull(sendRequestedGrantProcess.getSentSucceeded()); assertEquals(SEND_SUCCEEDED_DATE, sendSucceededGrantProcess.getSentSucceeded()); assertNull(sendFailedGrantProcess.getSentSucceeded()); }
AssessmentPermissionRules { @PermissionRule(value = "ASSESSMENT", description = "Only project finance or competition admin can see assessments " + "if the competition is in the correct state.") public boolean assessment(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser) { CompetitionResource competition = competitionRestService.getCompetitionById(competitionCompositeId.id()).getSuccess(); return isInternalAdmin(loggedInUser) && !competitionIsInInformOrLater(competition) && competitionIsInReadyToOpenOrLater(competition); } @PermissionRule(value = "ASSESSMENT", description = "Only project finance or competition admin can see assessments " + "if the competition is in the correct state.") boolean assessment(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser); @PermissionRule(value = "ASSESSMENT_APPLICATIONS", description = "Only project finance or competition admin can " + "see assessments if the competition is in the correct state.") boolean assessmentApplications(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser); }
@Test public void reviewPanel() { UserResource loggedInUser = compAdminUser(); for (CompetitionStatus competitionStatus : CompetitionStatus.values()) { final CompetitionResource competition = newCompetitionResource() .withCompetitionStatus(competitionStatus) .build(); when(competitionRestService.getCompetitionById(competition.getId())).thenReturn(restSuccess(competition)); switch (competitionStatus) { case COMPETITION_SETUP: case ASSESSOR_FEEDBACK: case PROJECT_SETUP: case PREVIOUS: assertFalse("With status " + competitionStatus.toString(), rules.assessment(CompetitionCompositeId.id(competition.getId()), loggedInUser)); break; default: assertTrue("With status " + competitionStatus.toString(), rules.assessment(CompetitionCompositeId.id(competition.getId()), loggedInUser)); } } }
AssessmentPermissionRules { @PermissionRule(value = "ASSESSMENT_APPLICATIONS", description = "Only project finance or competition admin can " + "see assessments if the competition is in the correct state.") public boolean assessmentApplications(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser) { CompetitionResource competition = competitionRestService.getCompetitionById(competitionCompositeId.id()).getSuccess(); return isInternalAdmin(loggedInUser) && !competitionIsInInformOrLater(competition); } @PermissionRule(value = "ASSESSMENT", description = "Only project finance or competition admin can see assessments " + "if the competition is in the correct state.") boolean assessment(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser); @PermissionRule(value = "ASSESSMENT_APPLICATIONS", description = "Only project finance or competition admin can " + "see assessments if the competition is in the correct state.") boolean assessmentApplications(CompetitionCompositeId competitionCompositeId, UserResource loggedInUser); }
@Test public void assessmentApplications() { UserResource loggedInUser = compAdminUser(); for (CompetitionStatus competitionStatus : CompetitionStatus.values()) { final CompetitionResource competition = newCompetitionResource() .withCompetitionStatus(competitionStatus) .build(); CompetitionAssessmentConfigResource competitionAssessmentConfigResource = newCompetitionAssessmentConfigResource() .withIncludeAverageAssessorScoreInNotifications(false) .withAssessorCount(5) .withAssessorPay(BigDecimal.valueOf(100)) .withHasAssessmentPanel(true) .withAssessorFinanceView(AssessorFinanceView.OVERVIEW) .build(); when(competitionRestService.getCompetitionById(competition.getId())).thenReturn(restSuccess(competition)); when(competitionAssessmentConfigRestService.findOneByCompetitionId(competition.getId())).thenReturn(restSuccess(competitionAssessmentConfigResource)); switch (competitionStatus) { case ASSESSOR_FEEDBACK: case PROJECT_SETUP: case PREVIOUS: assertFalse("With status " + competitionStatus.toString(), rules.assessmentApplications(CompetitionCompositeId.id(competition.getId()), loggedInUser)); break; default: assertTrue("With status " + competitionStatus.toString(), rules.assessmentApplications(CompetitionCompositeId.id(competition.getId()), loggedInUser)); } } }
AssessmentApplicationsController extends BaseAssessmentController { @GetMapping("/applications") public String manageApplications(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(value = "page", defaultValue = "0") int page, @RequestParam(value = "filterSearch", defaultValue = "") String filter) { CompetitionResource competitionResource = getCompetition(competitionId); ApplicationCountSummaryPageResource applicationCounts = getCounts(competitionId, page, filter); model.addAttribute("model", manageApplicationsPopulator.populateModel(competitionResource, applicationCounts, filter)); return "competition/manage-applications"; } @GetMapping("/applications") String manageApplications(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(value = "page", defaultValue = "0") int page, @RequestParam(value = "filterSearch", defaultValue = "") String filter); }
@Test public void manageApplications() throws Exception { CompetitionResource competitionResource = newCompetitionResource() .withName("name") .withCompetitionStatus(IN_ASSESSMENT) .build(); List<ApplicationCountSummaryResource> summaryResources = newApplicationCountSummaryResource() .withName("one", "two") .withLeadOrganisation("Lead Org 1", "Lead Org 2") .withAccepted(2L, 3L) .withAssessors(3L, 4L) .withSubmitted(1L, 2L).build(2); ApplicationCountSummaryPageResource expectedPageResource = new ApplicationCountSummaryPageResource(41, 3, summaryResources, 1, 20); when(competitionRestService.getCompetitionById(competitionResource.getId())).thenReturn(restSuccess(competitionResource)); when(applicationCountSummaryRestService.getApplicationCountSummariesByCompetitionId(competitionResource.getId(), 1,20,"filter")).thenReturn(restSuccess(expectedPageResource)); ManageApplicationsViewModel model = (ManageApplicationsViewModel) mockMvc.perform(get("/assessment/competition/{competitionId}/applications?page=1&filterSearch=filter", competitionResource.getId())) .andExpect(status().isOk()) .andExpect(view().name("competition/manage-applications")) .andExpect(model().attributeExists("model")) .andReturn().getModelAndView().getModel().get("model"); assertEquals(competitionResource.getId(), model.getCompetitionId()); assertEquals(competitionResource.getName(), model.getCompetitionName()); assertTrue(model.getInAssessment()); assertEquals(2, model.getApplications().size()); assertEquals(2L, model.getApplications().get(0).getAccepted()); assertEquals(3L, model.getApplications().get(0).getAssessors()); assertEquals(1L, model.getApplications().get(0).getCompleted()); assertEquals("Lead Org 1", model.getApplications().get(0).getLeadOrganisation()); assertEquals(3L, model.getApplications().get(1).getAccepted()); assertEquals(4L, model.getApplications().get(1).getAssessors()); assertEquals(2L, model.getApplications().get(1).getCompleted()); assertEquals("Lead Org 2", model.getApplications().get(1).getLeadOrganisation()); Pagination actualPagination = model.getPagination(); assertEquals(1, actualPagination.getCurrentPage()); assertEquals(20,actualPagination.getPageSize()); assertEquals(3, actualPagination.getTotalPages()); assertEquals("1 to 20", actualPagination.getPageNames().get(0).getTitle()); assertEquals("21 to 40", actualPagination.getPageNames().get(1).getTitle()); assertEquals("41 to 41", actualPagination.getPageNames().get(2).getTitle()); assertEquals("?filterSearch=filter&page=2", actualPagination.getPageNames().get(2).getPath()); }
AssessmentAssessorProgressController extends CompetitionManagementCookieController<ApplicationSelectionForm> { @GetMapping public String assessorProgress(@PathVariable long competitionId, @PathVariable long assessorId, @ModelAttribute(name = SELECTION_FORM, binding = false) ApplicationSelectionForm selectionForm, @RequestParam(value = "page", defaultValue = "1") int page, @RequestParam(value = "sort", defaultValue = "APPLICATION_NUMBER") Sort sort, @RequestParam(value = "filterSearch", defaultValue = "") String filter, Model model, HttpServletRequest request, HttpServletResponse response) { updateSelectionForm(request, response, competitionId, assessorId, selectionForm, filter); model.addAttribute("model", assessorAssessmentProgressModelPopulator.populateModel(competitionId, assessorId, page - 1, sort, filter)); return "competition/assessor-progress"; } @GetMapping String assessorProgress(@PathVariable long competitionId, @PathVariable long assessorId, @ModelAttribute(name = SELECTION_FORM, binding = false) ApplicationSelectionForm selectionForm, @RequestParam(value = "page", defaultValue = "1") int page, @RequestParam(value = "sort", defaultValue = "APPLICATION_NUMBER") Sort sort, @RequestParam(value = "filterSearch", defaultValue = "") String filter, Model model, HttpServletRequest request, HttpServletResponse response); @PostMapping("/withdraw/{assessmentId}") String withdrawAssessment(@PathVariable long competitionId, @PathVariable long assessorId, @PathVariable long assessmentId); @GetMapping(value = "/withdraw/{assessmentId}/confirm") String withdrawAssessmentConfirm( Model model, @PathVariable long competitionId, @PathVariable long assessorId, @PathVariable long assessmentId); @PostMapping String assessorAssign(@PathVariable long competitionId, @PathVariable long assessorId, @ModelAttribute(SELECTION_FORM) ApplicationSelectionForm selectionForm, HttpServletRequest request); @PostMapping(params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForResendList( @PathVariable long competitionId, @PathVariable long assessorId, @RequestParam("selectionId") long applicationId, @RequestParam("isSelected") boolean isSelected, @RequestParam(value = "filterSearch", defaultValue = "") String filter, HttpServletRequest request, HttpServletResponse response); @PostMapping(params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToResendList(@PathVariable long competitionId, @PathVariable long assessorId, @RequestParam("addAll") boolean addAll, @RequestParam(value = "filterSearch", defaultValue = "") String filter, HttpServletRequest request, HttpServletResponse response); }
@Test public void assessorProgress() throws Exception { long competitionId = 1L; long assessorId = 2L; long applicationId = 18L; AssessorProfileResource assessor = newAssessorProfileResource() .withProfile( newProfileResource() .withBusinessType(ACADEMIC) .withInnovationAreas( newInnovationAreaResource() .withName("Innovation 1", "Innovation 2") .build(2) ) .build() ) .withUser( newUserResource() .withFirstName("Paul") .withLastName("Plum") .build() ) .build(); List<AssessorAssessmentResource> assignedAssessments = newAssessorAssessmentResource() .withApplicationId(10L, 20L, 30L) .withApplicationName("Test App 1", "Test App 2", "Test App 3") .withTotalAssessors(5, 7, 6) .withLeadOrganisation("Lead Org 1", "Lead Org 2", "Lead Org 3") .withState(SUBMITTED, ACCEPTED, REJECTED) .withRejectionReason(null, null, CONFLICT_OF_INTEREST) .withRejectionComment(null, null, "rejection comment") .build(3); AssessorCompetitionSummaryResource assessorCompetitionSummaryResource = newAssessorCompetitionSummaryResource() .withCompetitionId(competitionId) .withCompetitionName("Test Competition") .withCompetitionStatus(IN_ASSESSMENT) .withTotalApplications(20L) .withAssessor(assessor) .withAssignedAssessments(assignedAssessments) .build(); List<ApplicationCountSummaryResource> summaryResources = newApplicationCountSummaryResource() .withName("one", "two") .withLeadOrganisation("Lead Org 1", "Lead Org 2") .withAccepted(2L, 3L) .withAssessors(3L, 4L) .withSubmitted(1L, 2L).build(2); ApplicationCountSummaryPageResource expectedPageResource = new ApplicationCountSummaryPageResource(41, 3, summaryResources, 1, 20); CompetitionResource competitionResource = newCompetitionResource() .withId(competitionId) .withName("name") .withCompetitionStatus(IN_ASSESSMENT) .build(); AssessmentCreateResource assessmentCreateResource = new AssessmentCreateResource(applicationId, assessorId); AssessmentResource assessmentResource = newAssessmentResource().build(); when(assessorCompetitionSummaryRestService.getAssessorSummary(assessorId, competitionId)) .thenReturn(restSuccess(assessorCompetitionSummaryResource)); when(competitionRestService.getCompetitionById(competitionResource.getId())).thenReturn(restSuccess(competitionResource)); when(applicationCountSummaryRestService.getApplicationCountSummariesByCompetitionIdAndAssessorId(competitionId, assessorId, 0, Sort.APPLICATION_NUMBER, "")).thenReturn(restSuccess(expectedPageResource)); when(applicationCountSummaryRestService.getApplicationIdsByCompetitionIdAndAssessorId(competitionResource.getId(), assessorId, "")).thenReturn(restSuccess(asList(1L, 21L))); MvcResult result = mockMvc.perform(get("/assessment/competition/{competitionId}/assessors/{assessorId}", competitionId, assessorId)) .andExpect(model().attributeExists("model")) .andExpect(view().name("competition/assessor-progress")) .andReturn(); verify(assessorCompetitionSummaryRestService).getAssessorSummary(assessorId, competitionId); AssessorAssessmentProgressViewModel model = (AssessorAssessmentProgressViewModel) result.getModelAndView().getModel().get("model"); assertEquals("Paul Plum", model.getAssessorName()); assertEquals(competitionId, model.getCompetitionId()); assertEquals("Test Competition", model.getCompetitionName()); assertEquals(IN_ASSESSMENT, model.getCompetitionStatus()); assertEquals("Academic", model.getBusinessType()); assertEquals(20L, model.getTotalApplications()); assertThat(model.getInnovationAreas(), hasItems("Innovation 1", "Innovation 2")); assertEquals(2, model.getAssigned().size()); assertEquals(1, model.getRejected().size()); assertEquals(assignedAssessments.get(0).getApplicationId(), model.getAssigned().get(0).getApplicationId()); assertEquals(assignedAssessments.get(0).getApplicationName(), model.getAssigned().get(0).getApplicationName()); assertEquals(assignedAssessments.get(0).getLeadOrganisation(), model.getAssigned().get(0).getLeadOrganisation()); assertEquals(assignedAssessments.get(0).getTotalAssessors(), model.getAssigned().get(0).getTotalAssessors()); assertEquals(assignedAssessments.get(0).getState(), model.getAssigned().get(0).getState()); assertEquals(assignedAssessments.get(1).getApplicationId(), model.getAssigned().get(1).getApplicationId()); assertEquals(assignedAssessments.get(1).getApplicationName(), model.getAssigned().get(1).getApplicationName()); assertEquals(assignedAssessments.get(1).getLeadOrganisation(), model.getAssigned().get(1).getLeadOrganisation()); assertEquals(assignedAssessments.get(1).getTotalAssessors(), model.getAssigned().get(1).getTotalAssessors()); assertEquals(assignedAssessments.get(1).getState(), model.getAssigned().get(1).getState()); assertEquals(assignedAssessments.get(2).getApplicationId(), model.getRejected().get(0).getApplicationId()); assertEquals(assignedAssessments.get(2).getApplicationName(), model.getRejected().get(0).getApplicationName()); assertEquals(assignedAssessments.get(2).getLeadOrganisation(), model.getRejected().get(0).getLeadOrganisation()); assertEquals(assignedAssessments.get(2).getTotalAssessors(), model.getRejected().get(0).getTotalAssessors()); assertEquals(assignedAssessments.get(2).getRejectReason(), model.getRejected().get(0).getRejectReason()); assertEquals(assignedAssessments.get(2).getRejectComment(), model.getRejected().get(0).getRejectComment()); AssessmentCreateResource expectedAssessmentCreateResource = newAssessmentCreateResource() .withApplicationId(applicationId) .withAssessorId(assessorId) .build(); AssessmentResource expectedAssessmentResource = newAssessmentResource().build(); ApplicationSelectionForm form = new ApplicationSelectionForm(); form.setSelectedApplications(singletonList(applicationId)); when(compressedCookieService.getCookieValue(any(), eq("applicationSelectionForm_comp_1"))).thenReturn(JsonTestUtil.toJson(form)); when(assessmentRestService.createAssessments(singletonList(expectedAssessmentCreateResource))).thenReturn(restSuccess(singletonList(expectedAssessmentResource))); mockMvc.perform(post("/assessment/competition/{competitionId}/assessors/{assessorId}", competitionId, assessorId)) .andExpect(status().is3xxRedirection()) .andReturn(); }
AssessmentAssessorProgressController extends CompetitionManagementCookieController<ApplicationSelectionForm> { @PostMapping("/withdraw/{assessmentId}") public String withdrawAssessment(@PathVariable long competitionId, @PathVariable long assessorId, @PathVariable long assessmentId) { assessmentRestService.withdrawAssessment(assessmentId).getSuccess(); return format("redirect:/assessment/competition/%s/assessors/%s", competitionId, assessorId); } @GetMapping String assessorProgress(@PathVariable long competitionId, @PathVariable long assessorId, @ModelAttribute(name = SELECTION_FORM, binding = false) ApplicationSelectionForm selectionForm, @RequestParam(value = "page", defaultValue = "1") int page, @RequestParam(value = "sort", defaultValue = "APPLICATION_NUMBER") Sort sort, @RequestParam(value = "filterSearch", defaultValue = "") String filter, Model model, HttpServletRequest request, HttpServletResponse response); @PostMapping("/withdraw/{assessmentId}") String withdrawAssessment(@PathVariable long competitionId, @PathVariable long assessorId, @PathVariable long assessmentId); @GetMapping(value = "/withdraw/{assessmentId}/confirm") String withdrawAssessmentConfirm( Model model, @PathVariable long competitionId, @PathVariable long assessorId, @PathVariable long assessmentId); @PostMapping String assessorAssign(@PathVariable long competitionId, @PathVariable long assessorId, @ModelAttribute(SELECTION_FORM) ApplicationSelectionForm selectionForm, HttpServletRequest request); @PostMapping(params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForResendList( @PathVariable long competitionId, @PathVariable long assessorId, @RequestParam("selectionId") long applicationId, @RequestParam("isSelected") boolean isSelected, @RequestParam(value = "filterSearch", defaultValue = "") String filter, HttpServletRequest request, HttpServletResponse response); @PostMapping(params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToResendList(@PathVariable long competitionId, @PathVariable long assessorId, @RequestParam("addAll") boolean addAll, @RequestParam(value = "filterSearch", defaultValue = "") String filter, HttpServletRequest request, HttpServletResponse response); }
@Test public void withdrawAssessment() throws Exception { long competitionId = 1L; long assessorId = 2L; long assessmentId = 3L; when(assessmentRestService.withdrawAssessment(assessmentId)).thenReturn(restSuccess()); mockMvc.perform( post("/assessment/competition/{competitionId}/assessors/{assessorId}/withdraw/{assessmentId}", competitionId, assessorId, assessmentId)) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(format("/assessment/competition/%s/assessors/%s", competitionId, assessorId))); InOrder inOrder = inOrder(assessmentRestService); inOrder.verify(assessmentRestService).withdrawAssessment(assessmentId); inOrder.verifyNoMoreInteractions(); }
AssessmentAssessorProgressController extends CompetitionManagementCookieController<ApplicationSelectionForm> { @GetMapping(value = "/withdraw/{assessmentId}/confirm") public String withdrawAssessmentConfirm( Model model, @PathVariable long competitionId, @PathVariable long assessorId, @PathVariable long assessmentId) { model.addAttribute("model", new AssessorAssessmentProgressRemoveViewModel( competitionId, assessorId, assessmentId )); return "competition/assessor-progress-remove-confirm"; } @GetMapping String assessorProgress(@PathVariable long competitionId, @PathVariable long assessorId, @ModelAttribute(name = SELECTION_FORM, binding = false) ApplicationSelectionForm selectionForm, @RequestParam(value = "page", defaultValue = "1") int page, @RequestParam(value = "sort", defaultValue = "APPLICATION_NUMBER") Sort sort, @RequestParam(value = "filterSearch", defaultValue = "") String filter, Model model, HttpServletRequest request, HttpServletResponse response); @PostMapping("/withdraw/{assessmentId}") String withdrawAssessment(@PathVariable long competitionId, @PathVariable long assessorId, @PathVariable long assessmentId); @GetMapping(value = "/withdraw/{assessmentId}/confirm") String withdrawAssessmentConfirm( Model model, @PathVariable long competitionId, @PathVariable long assessorId, @PathVariable long assessmentId); @PostMapping String assessorAssign(@PathVariable long competitionId, @PathVariable long assessorId, @ModelAttribute(SELECTION_FORM) ApplicationSelectionForm selectionForm, HttpServletRequest request); @PostMapping(params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForResendList( @PathVariable long competitionId, @PathVariable long assessorId, @RequestParam("selectionId") long applicationId, @RequestParam("isSelected") boolean isSelected, @RequestParam(value = "filterSearch", defaultValue = "") String filter, HttpServletRequest request, HttpServletResponse response); @PostMapping(params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToResendList(@PathVariable long competitionId, @PathVariable long assessorId, @RequestParam("addAll") boolean addAll, @RequestParam(value = "filterSearch", defaultValue = "") String filter, HttpServletRequest request, HttpServletResponse response); }
@Test public void withdrawAssessmentConfirm() throws Exception { long competitionId = 1L; long assessorId = 2L; long assessmentId = 3L; AssessorAssessmentProgressRemoveViewModel expectedModel = new AssessorAssessmentProgressRemoveViewModel( competitionId, assessorId, assessmentId ); mockMvc.perform( get("/assessment/competition/{competitionId}/assessors/{assessorId}/withdraw/{assessmentId}/confirm", competitionId, assessorId, assessmentId)) .andExpect(status().isOk()) .andExpect(model().attribute("model", expectedModel)) .andExpect(model().attributeExists("model")) .andExpect(view().name("competition/assessor-progress-remove-confirm")); }
InviteAssessorsController extends CompetitionManagementCookieController<AssessorSelectionForm> { @GetMapping public String assessors(@PathVariable("competitionId") long competitionId) { return format("redirect:/competition/%s/assessors/find", competitionId); } @GetMapping String assessors(@PathVariable("competitionId") long competitionId); @GetMapping("/find") String find(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) AssessorSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam(value = "assessorNameFilter", required = false) String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForInviteList( @PathVariable("competitionId") long competitionId, @RequestParam("selectionId") long assessorId, @RequestParam("isSelected") boolean isSelected, @RequestParam(defaultValue = "", required = false) String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("addAll") boolean addAll, @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "") String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find/addSelected") String addSelectedAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "", required = false) String assessorNameFilter, @ModelAttribute(SELECTION_FORM) AssessorSelectionForm selectionForm, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @GetMapping("/invite") String invite(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute(name = FORM_ATTR_NAME, binding = false) InviteNewAssessorsForm form, @RequestParam(defaultValue = "0") int page); @PostMapping(value = "/invite", params = {"remove"}) String removeInviteFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(name = "remove") String email, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"removeAll"}) String removeAllInvitesFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"addNewUser"}) String addNewUserToInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"removeNewUser"}) String removeNewUserFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form, @RequestParam(name = "removeNewUser") int position, @RequestParam(defaultValue = "0") int page); @PostMapping(value = "/invite", params = {"inviteNewUsers"}) String inviteNewUsersFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @Valid @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler); @GetMapping("/accepted") String accepted(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); }
@Test public void assessors() throws Exception { Long competitionId = 1L; mockMvc.perform(get("/competition/{competitionId}/assessors", competitionId)) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(format("/competition/%s/assessors/find", competitionId))); }
InviteAssessorsController extends CompetitionManagementCookieController<AssessorSelectionForm> { @GetMapping("/find") public String find(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) AssessorSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam(value = "assessorNameFilter", required = false) String assessorNameFilter, HttpServletRequest request, HttpServletResponse response) { updateSelectionForm(request, response, competitionId, selectionForm, assessorNameFilter); CompetitionInviteAssessorsFindViewModel inviteAssessorsFindViewModel = inviteAssessorsFindModelPopulator.populateModel(competitionId, page, assessorNameFilter); model.addAttribute("model", inviteAssessorsFindViewModel); return "assessors/find"; } @GetMapping String assessors(@PathVariable("competitionId") long competitionId); @GetMapping("/find") String find(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) AssessorSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam(value = "assessorNameFilter", required = false) String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForInviteList( @PathVariable("competitionId") long competitionId, @RequestParam("selectionId") long assessorId, @RequestParam("isSelected") boolean isSelected, @RequestParam(defaultValue = "", required = false) String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("addAll") boolean addAll, @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "") String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find/addSelected") String addSelectedAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "", required = false) String assessorNameFilter, @ModelAttribute(SELECTION_FORM) AssessorSelectionForm selectionForm, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @GetMapping("/invite") String invite(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute(name = FORM_ATTR_NAME, binding = false) InviteNewAssessorsForm form, @RequestParam(defaultValue = "0") int page); @PostMapping(value = "/invite", params = {"remove"}) String removeInviteFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(name = "remove") String email, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"removeAll"}) String removeAllInvitesFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"addNewUser"}) String addNewUserToInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"removeNewUser"}) String removeNewUserFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form, @RequestParam(name = "removeNewUser") int position, @RequestParam(defaultValue = "0") int page); @PostMapping(value = "/invite", params = {"inviteNewUsers"}) String inviteNewUsersFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @Valid @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler); @GetMapping("/accepted") String accepted(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); }
@Test public void find() throws Exception { int page = 2; Optional<Long> innovationArea = of(3L); String assessorNameFilter = ""; AvailableAssessorPageResource availableAssessorPageResource = newAvailableAssessorPageResource() .withContent(setUpAvailableAssessorResources()) .build(); List<InnovationSectorResource> expectedInnovationSectorOptions = newInnovationSectorResource().build(4); when(categoryRestServiceMock.getInnovationSectors()).thenReturn(restSuccess(expectedInnovationSectorOptions)); when(competitionInviteRestService.getAvailableAssessors(competition.getId(), page, assessorNameFilter)).thenReturn(restSuccess(availableAssessorPageResource)); when(competitionInviteRestService.getAvailableAssessorIds(competition.getId(), assessorNameFilter)).thenReturn(restSuccess(emptyList())); MvcResult result = mockMvc.perform(get("/competition/{competitionId}/assessors/find", competition.getId()) .param("page", "2") .param("assessorNameFilter", assessorNameFilter)) .andExpect(status().isOk()) .andExpect(model().attributeExists("model")) .andExpect(view().name("assessors/find")) .andReturn(); AssessorSelectionForm selectionForm = (AssessorSelectionForm) result.getModelAndView().getModel().get("assessorSelectionForm"); assertTrue(selectionForm.getSelectedAssessorIds().isEmpty()); assertCompetitionDetails(competition, result); assertAvailableAssessors(availableAssessorPageResource.getContent(), result); assertFindFilterOptionsAreCorrect(expectedInnovationSectorOptions, result); InOrder inOrder = inOrder(competitionRestService, competitionInviteRestService, categoryRestServiceMock); inOrder.verify(competitionInviteRestService).getAvailableAssessorIds(competition.getId(), assessorNameFilter); inOrder.verify(competitionRestService).getCompetitionById(competition.getId()); inOrder.verify(categoryRestServiceMock).getInnovationSectors(); inOrder.verify(competitionInviteRestService).getAvailableAssessors(competition.getId(), page, assessorNameFilter); inOrder.verifyNoMoreInteractions(); }
InviteAssessorsController extends CompetitionManagementCookieController<AssessorSelectionForm> { @GetMapping("/invite") public String invite(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute(name = FORM_ATTR_NAME, binding = false) InviteNewAssessorsForm form, @RequestParam(defaultValue = "0") int page) { if (form.getInvites().isEmpty()) { form.getInvites().add(new InviteNewAssessorsRowForm()); } model.addAttribute("model", inviteAssessorsInviteModelPopulator.populateModel(competitionId, page)); return "assessors/invite"; } @GetMapping String assessors(@PathVariable("competitionId") long competitionId); @GetMapping("/find") String find(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) AssessorSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam(value = "assessorNameFilter", required = false) String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForInviteList( @PathVariable("competitionId") long competitionId, @RequestParam("selectionId") long assessorId, @RequestParam("isSelected") boolean isSelected, @RequestParam(defaultValue = "", required = false) String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("addAll") boolean addAll, @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "") String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find/addSelected") String addSelectedAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "", required = false) String assessorNameFilter, @ModelAttribute(SELECTION_FORM) AssessorSelectionForm selectionForm, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @GetMapping("/invite") String invite(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute(name = FORM_ATTR_NAME, binding = false) InviteNewAssessorsForm form, @RequestParam(defaultValue = "0") int page); @PostMapping(value = "/invite", params = {"remove"}) String removeInviteFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(name = "remove") String email, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"removeAll"}) String removeAllInvitesFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"addNewUser"}) String addNewUserToInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"removeNewUser"}) String removeNewUserFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form, @RequestParam(name = "removeNewUser") int position, @RequestParam(defaultValue = "0") int page); @PostMapping(value = "/invite", params = {"inviteNewUsers"}) String inviteNewUsersFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @Valid @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler); @GetMapping("/accepted") String accepted(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); }
@Test public void invite() throws Exception { int page = 0; List<AssessorCreatedInviteResource> assessorCreatedInviteResources = setUpAssessorCreatedInviteResources(); AssessorCreatedInvitePageResource assessorCreatedInvitePageResource = newAssessorCreatedInvitePageResource() .withContent(assessorCreatedInviteResources) .build(); List<InnovationAreaResource> categoryResources = setupCategoryResources(); setupDefaultInviteViewExpectations(page, assessorCreatedInvitePageResource, categoryResources); InviteNewAssessorsForm expectedForm = new InviteNewAssessorsForm(); expectedForm.setInvites(singletonList(new InviteNewAssessorsRowForm())); MvcResult result = mockMvc.perform(get("/competition/{competitionId}/assessors/invite", competition.getId())) .andExpect(status().isOk()) .andExpect(model().attributeExists("model")) .andExpect(model().attribute("form", expectedForm)) .andExpect(view().name("assessors/invite")) .andReturn(); assertCompetitionDetails(competition, result); assertInvitedAssessors(assessorCreatedInviteResources, result); InviteNewAssessorsForm form = (InviteNewAssessorsForm) result.getModelAndView().getModel().get("form"); assertFalse(form.isVisible()); InOrder inOrder = inOrder(competitionRestService, competitionInviteRestService, categoryRestServiceMock); inOrder.verify(competitionRestService).getCompetitionById(competition.getId()); inOrder.verify(competitionInviteRestService).getCreatedInvites(competition.getId(), page); inOrder.verify(categoryRestServiceMock).getInnovationSectors(); inOrder.verifyNoMoreInteractions(); }
InviteAssessorsController extends CompetitionManagementCookieController<AssessorSelectionForm> { @PostMapping(value = "/invite", params = {"remove"}) public String removeInviteFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(name = "remove") String email, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form) { deleteInvite(email, competitionId).getSuccess(); return redirectToInvite(competitionId, page); } @GetMapping String assessors(@PathVariable("competitionId") long competitionId); @GetMapping("/find") String find(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) AssessorSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam(value = "assessorNameFilter", required = false) String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForInviteList( @PathVariable("competitionId") long competitionId, @RequestParam("selectionId") long assessorId, @RequestParam("isSelected") boolean isSelected, @RequestParam(defaultValue = "", required = false) String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("addAll") boolean addAll, @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "") String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find/addSelected") String addSelectedAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "", required = false) String assessorNameFilter, @ModelAttribute(SELECTION_FORM) AssessorSelectionForm selectionForm, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @GetMapping("/invite") String invite(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute(name = FORM_ATTR_NAME, binding = false) InviteNewAssessorsForm form, @RequestParam(defaultValue = "0") int page); @PostMapping(value = "/invite", params = {"remove"}) String removeInviteFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(name = "remove") String email, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"removeAll"}) String removeAllInvitesFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"addNewUser"}) String addNewUserToInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"removeNewUser"}) String removeNewUserFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form, @RequestParam(name = "removeNewUser") int position, @RequestParam(defaultValue = "0") int page); @PostMapping(value = "/invite", params = {"inviteNewUsers"}) String inviteNewUsersFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @Valid @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler); @GetMapping("/accepted") String accepted(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); }
@Test public void removeInviteFromInviteView() throws Exception { String email = "[email protected]"; when(competitionInviteRestService.deleteInvite(email, competition.getId())).thenReturn(restSuccess()); mockMvc.perform(post("/competition/{competitionId}/assessors/invite", competition.getId()) .param("remove", email) .param("page", "5")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(format("/competition/%s/assessors/invite?page=5", competition.getId()))) .andReturn(); verify(competitionInviteRestService, only()).deleteInvite(email, competition.getId()); }
GrantProcess { public boolean isPending() { return pending; } GrantProcess(); GrantProcess(long applicationId); GrantProcess(long applicationId, boolean pending); long getApplicationId(); ZonedDateTime getSentRequested(); ZonedDateTime getSentSucceeded(); boolean isPending(); String getMessage(); ZonedDateTime getLastProcessed(); GrantProcess requestSend(ZonedDateTime now); GrantProcess sendSucceeded(ZonedDateTime now); GrantProcess sendFailed(ZonedDateTime now, String message); @Override boolean equals(Object o); @Override int hashCode(); }
@Test public void isPending() { assertFalse(grantProcess.isPending()); assertTrue(sendRequestedGrantProcess.isPending()); assertFalse(sendSucceededGrantProcess.isPending()); assertTrue(sendFailedGrantProcess.isPending()); }
InviteAssessorsController extends CompetitionManagementCookieController<AssessorSelectionForm> { private ServiceResult<Void> deleteInvite(String email, long competitionId) { return competitionInviteRestService.deleteInvite(email, competitionId).toServiceResult(); } @GetMapping String assessors(@PathVariable("competitionId") long competitionId); @GetMapping("/find") String find(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) AssessorSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam(value = "assessorNameFilter", required = false) String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForInviteList( @PathVariable("competitionId") long competitionId, @RequestParam("selectionId") long assessorId, @RequestParam("isSelected") boolean isSelected, @RequestParam(defaultValue = "", required = false) String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("addAll") boolean addAll, @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "") String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find/addSelected") String addSelectedAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "", required = false) String assessorNameFilter, @ModelAttribute(SELECTION_FORM) AssessorSelectionForm selectionForm, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @GetMapping("/invite") String invite(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute(name = FORM_ATTR_NAME, binding = false) InviteNewAssessorsForm form, @RequestParam(defaultValue = "0") int page); @PostMapping(value = "/invite", params = {"remove"}) String removeInviteFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(name = "remove") String email, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"removeAll"}) String removeAllInvitesFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"addNewUser"}) String addNewUserToInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"removeNewUser"}) String removeNewUserFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form, @RequestParam(name = "removeNewUser") int position, @RequestParam(defaultValue = "0") int page); @PostMapping(value = "/invite", params = {"inviteNewUsers"}) String inviteNewUsersFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @Valid @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler); @GetMapping("/accepted") String accepted(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); }
@Test public void removeInviteFromInviteView_defaultParams() throws Exception { String email = "[email protected]"; when(competitionInviteRestService.deleteInvite(email, competition.getId())).thenReturn(restSuccess()); mockMvc.perform(post("/competition/{competitionId}/assessors/invite", competition.getId()) .param("remove", email)) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(format("/competition/%s/assessors/invite?page=0", competition.getId()))) .andReturn(); verify(competitionInviteRestService, only()).deleteInvite(email, competition.getId()); }
InviteAssessorsController extends CompetitionManagementCookieController<AssessorSelectionForm> { @PostMapping(value = "/invite", params = {"removeAll"}) public String removeAllInvitesFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form) { deleteAllInvites(competitionId).getSuccess(); return redirectToInvite(competitionId, page); } @GetMapping String assessors(@PathVariable("competitionId") long competitionId); @GetMapping("/find") String find(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) AssessorSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam(value = "assessorNameFilter", required = false) String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForInviteList( @PathVariable("competitionId") long competitionId, @RequestParam("selectionId") long assessorId, @RequestParam("isSelected") boolean isSelected, @RequestParam(defaultValue = "", required = false) String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("addAll") boolean addAll, @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "") String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find/addSelected") String addSelectedAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "", required = false) String assessorNameFilter, @ModelAttribute(SELECTION_FORM) AssessorSelectionForm selectionForm, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @GetMapping("/invite") String invite(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute(name = FORM_ATTR_NAME, binding = false) InviteNewAssessorsForm form, @RequestParam(defaultValue = "0") int page); @PostMapping(value = "/invite", params = {"remove"}) String removeInviteFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(name = "remove") String email, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"removeAll"}) String removeAllInvitesFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"addNewUser"}) String addNewUserToInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"removeNewUser"}) String removeNewUserFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form, @RequestParam(name = "removeNewUser") int position, @RequestParam(defaultValue = "0") int page); @PostMapping(value = "/invite", params = {"inviteNewUsers"}) String inviteNewUsersFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @Valid @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler); @GetMapping("/accepted") String accepted(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); }
@Test public void removeAllInvitesFromInviteView() throws Exception { when(competitionInviteRestService.deleteAllInvites(competition.getId())).thenReturn(restSuccess()); mockMvc.perform(post("/competition/{competitionId}/assessors/invite", competition.getId()) .param("removeAll", "")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(format("/competition/%s/assessors/invite?page=0", competition.getId()))) .andReturn(); verify(competitionInviteRestService).deleteAllInvites(competition.getId()); }
InviteAssessorsController extends CompetitionManagementCookieController<AssessorSelectionForm> { @PostMapping(value = "/invite", params = {"addNewUser"}) public String addNewUserToInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form) { form.getInvites().add(new InviteNewAssessorsRowForm()); form.setVisible(true); return invite(model, competitionId, form, page); } @GetMapping String assessors(@PathVariable("competitionId") long competitionId); @GetMapping("/find") String find(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) AssessorSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam(value = "assessorNameFilter", required = false) String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForInviteList( @PathVariable("competitionId") long competitionId, @RequestParam("selectionId") long assessorId, @RequestParam("isSelected") boolean isSelected, @RequestParam(defaultValue = "", required = false) String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("addAll") boolean addAll, @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "") String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find/addSelected") String addSelectedAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "", required = false) String assessorNameFilter, @ModelAttribute(SELECTION_FORM) AssessorSelectionForm selectionForm, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @GetMapping("/invite") String invite(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute(name = FORM_ATTR_NAME, binding = false) InviteNewAssessorsForm form, @RequestParam(defaultValue = "0") int page); @PostMapping(value = "/invite", params = {"remove"}) String removeInviteFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(name = "remove") String email, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"removeAll"}) String removeAllInvitesFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"addNewUser"}) String addNewUserToInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"removeNewUser"}) String removeNewUserFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form, @RequestParam(name = "removeNewUser") int position, @RequestParam(defaultValue = "0") int page); @PostMapping(value = "/invite", params = {"inviteNewUsers"}) String inviteNewUsersFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @Valid @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler); @GetMapping("/accepted") String accepted(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); }
@Test public void addNewUserToInviteView() throws Exception { int page = 0; List<AssessorCreatedInviteResource> assessorCreatedInviteResources = setUpAssessorCreatedInviteResources(); AssessorCreatedInvitePageResource assessorCreatedInvitePageResource = newAssessorCreatedInvitePageResource() .withContent(assessorCreatedInviteResources) .build(); List<InnovationAreaResource> categoryResources = setupCategoryResources(); setupDefaultInviteViewExpectations(page, assessorCreatedInvitePageResource, categoryResources); MvcResult result = mockMvc.perform(post("/competition/{competitionId}/assessors/invite", competition.getId()) .param("addNewUser", "submit")) .andExpect(status().isOk()) .andExpect(model().attributeExists("model")) .andExpect(model().attributeExists("form")) .andExpect(view().name("assessors/invite")) .andReturn(); InviteNewAssessorsForm form = (InviteNewAssessorsForm) result.getModelAndView().getModel().get("form"); InviteNewAssessorsRowForm expectedNewUserRow = new InviteNewAssessorsRowForm(); assertTrue(form.isVisible()); assertEquals(1, form.getInvites().size()); assertEquals(expectedNewUserRow, form.getInvites().get(0)); InOrder inOrder = inOrder(competitionRestService, competitionInviteRestService, categoryRestServiceMock); inOrder.verify(competitionRestService).getCompetitionById(competition.getId()); inOrder.verify(competitionInviteRestService).getCreatedInvites(competition.getId(), page); inOrder.verify(categoryRestServiceMock).getInnovationSectors(); inOrder.verifyNoMoreInteractions(); }
InviteAssessorsController extends CompetitionManagementCookieController<AssessorSelectionForm> { @PostMapping(value = "/invite", params = {"removeNewUser"}) public String removeNewUserFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form, @RequestParam(name = "removeNewUser") int position, @RequestParam(defaultValue = "0") int page) { form.getInvites().remove(position); form.setVisible(true); return invite(model, competitionId, form, page); } @GetMapping String assessors(@PathVariable("competitionId") long competitionId); @GetMapping("/find") String find(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) AssessorSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam(value = "assessorNameFilter", required = false) String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForInviteList( @PathVariable("competitionId") long competitionId, @RequestParam("selectionId") long assessorId, @RequestParam("isSelected") boolean isSelected, @RequestParam(defaultValue = "", required = false) String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("addAll") boolean addAll, @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "") String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find/addSelected") String addSelectedAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "", required = false) String assessorNameFilter, @ModelAttribute(SELECTION_FORM) AssessorSelectionForm selectionForm, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @GetMapping("/invite") String invite(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute(name = FORM_ATTR_NAME, binding = false) InviteNewAssessorsForm form, @RequestParam(defaultValue = "0") int page); @PostMapping(value = "/invite", params = {"remove"}) String removeInviteFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(name = "remove") String email, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"removeAll"}) String removeAllInvitesFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"addNewUser"}) String addNewUserToInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"removeNewUser"}) String removeNewUserFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form, @RequestParam(name = "removeNewUser") int position, @RequestParam(defaultValue = "0") int page); @PostMapping(value = "/invite", params = {"inviteNewUsers"}) String inviteNewUsersFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @Valid @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler); @GetMapping("/accepted") String accepted(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); }
@Test public void removeNewUserFromInviteView() throws Exception { int page = 0; List<AssessorCreatedInviteResource> assessorCreatedInviteResources = setUpAssessorCreatedInviteResources(); AssessorCreatedInvitePageResource assessorCreatedInvitePageResource = newAssessorCreatedInvitePageResource() .withContent(assessorCreatedInviteResources) .build(); List<InnovationAreaResource> categoryResources = setupCategoryResources(); setupDefaultInviteViewExpectations(page, assessorCreatedInvitePageResource, categoryResources); InviteNewAssessorsRowForm newUserRow1 = new InviteNewAssessorsRowForm(); newUserRow1.setName("Tester 1"); newUserRow1.setEmail("[email protected]"); MvcResult result = mockMvc.perform(post("/competition/{competitionId}/assessors/invite", competition.getId()) .param("removeNewUser", "0") .param("invites[0].email", "[email protected]") .param("invites[0].name", "Tester 1") .param("invites[1].email", "[email protected]") .param("invites[1].name", "Tester 2")) .andExpect(status().isOk()) .andExpect(model().attributeExists("model")) .andExpect(model().attributeExists("form")) .andExpect(view().name("assessors/invite")) .andReturn(); InviteNewAssessorsForm form = (InviteNewAssessorsForm) result.getModelAndView().getModel().get("form"); InviteNewAssessorsRowForm expectedNewUserRow = new InviteNewAssessorsRowForm(); expectedNewUserRow.setName("Tester 2"); expectedNewUserRow.setEmail("[email protected]"); assertTrue(form.isVisible()); assertEquals(1, form.getInvites().size()); assertEquals(expectedNewUserRow, form.getInvites().get(0)); InOrder inOrder = inOrder(competitionRestService, competitionInviteRestService, categoryRestServiceMock); inOrder.verify(competitionRestService).getCompetitionById(competition.getId()); inOrder.verify(competitionInviteRestService).getCreatedInvites(competition.getId(), page); inOrder.verify(categoryRestServiceMock).getInnovationSectors(); inOrder.verifyNoMoreInteractions(); }
InviteAssessorsController extends CompetitionManagementCookieController<AssessorSelectionForm> { @PostMapping(value = "/invite", params = {"inviteNewUsers"}) public String inviteNewUsersFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @Valid @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler) { form.setVisible(true); return validationHandler.failNowOrSucceedWith( () -> invite(model, competitionId, form, page), () -> { RestResult<Void> restResult = competitionInviteRestService.inviteNewUsers( newInviteFormToResource(form, competitionId), competitionId ); return validationHandler.addAnyErrors(restResult) .failNowOrSucceedWith( () -> invite(model, competitionId, form, page), () -> redirectToInvite(competitionId, page) ); } ); } @GetMapping String assessors(@PathVariable("competitionId") long competitionId); @GetMapping("/find") String find(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) AssessorSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam(value = "assessorNameFilter", required = false) String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForInviteList( @PathVariable("competitionId") long competitionId, @RequestParam("selectionId") long assessorId, @RequestParam("isSelected") boolean isSelected, @RequestParam(defaultValue = "", required = false) String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("addAll") boolean addAll, @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "") String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find/addSelected") String addSelectedAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "", required = false) String assessorNameFilter, @ModelAttribute(SELECTION_FORM) AssessorSelectionForm selectionForm, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @GetMapping("/invite") String invite(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute(name = FORM_ATTR_NAME, binding = false) InviteNewAssessorsForm form, @RequestParam(defaultValue = "0") int page); @PostMapping(value = "/invite", params = {"remove"}) String removeInviteFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(name = "remove") String email, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"removeAll"}) String removeAllInvitesFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"addNewUser"}) String addNewUserToInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"removeNewUser"}) String removeNewUserFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form, @RequestParam(name = "removeNewUser") int position, @RequestParam(defaultValue = "0") int page); @PostMapping(value = "/invite", params = {"inviteNewUsers"}) String inviteNewUsersFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @Valid @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler); @GetMapping("/accepted") String accepted(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); }
@Test public void inviteNewUsersFromInviteView() throws Exception { NewUserStagedInviteListResource expectedInviteListResource = newNewUserStagedInviteListResource() .withInvites( newNewUserStagedInviteResource() .withEmail("[email protected]", "[email protected]") .withName("Tester One", "Tester Two") .withInnovationAreaId(1L) .withCompetitionId(competition.getId()) .build(2) ) .build(); when(competitionInviteRestService.inviteNewUsers(expectedInviteListResource, competition.getId())) .thenReturn(restSuccess()); mockMvc.perform(post("/competition/{competitionId}/assessors/invite", competition.getId()) .param("inviteNewUsers", "") .param("selectedInnovationArea", "1") .param("invites[0].email", "[email protected]") .param("invites[0].name", "Tester One") .param("invites[1].email", "[email protected]") .param("invites[1].name", "Tester Two") .param("page", "5")) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(format("/competition/%s/assessors/invite?page=5", competition.getId()))); verify(competitionInviteRestService, only()).inviteNewUsers(expectedInviteListResource, competition.getId()); }
InviteAssessorsController extends CompetitionManagementCookieController<AssessorSelectionForm> { @GetMapping("/accepted") public String accepted(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page) { model.addAttribute("model", inviteAssessorsAcceptedModelPopulator.populateModel( competitionId, page )); return "assessors/accepted"; } @GetMapping String assessors(@PathVariable("competitionId") long competitionId); @GetMapping("/find") String find(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) AssessorSelectionForm selectionForm, @SuppressWarnings("unused") BindingResult bindingResult, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam(value = "assessorNameFilter", required = false) String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForInviteList( @PathVariable("competitionId") long competitionId, @RequestParam("selectionId") long assessorId, @RequestParam("isSelected") boolean isSelected, @RequestParam(defaultValue = "", required = false) String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find", params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam("addAll") boolean addAll, @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "") String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); @PostMapping(value = "/find/addSelected") String addSelectedAssessorsToInviteList(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "", required = false) String assessorNameFilter, @ModelAttribute(SELECTION_FORM) AssessorSelectionForm selectionForm, ValidationHandler validationHandler, HttpServletRequest request, HttpServletResponse response); @GetMapping("/invite") String invite(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute(name = FORM_ATTR_NAME, binding = false) InviteNewAssessorsForm form, @RequestParam(defaultValue = "0") int page); @PostMapping(value = "/invite", params = {"remove"}) String removeInviteFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(name = "remove") String email, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"removeAll"}) String removeAllInvitesFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @SuppressWarnings("unused") @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"addNewUser"}) String addNewUserToInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form); @PostMapping(value = "/invite", params = {"removeNewUser"}) String removeNewUserFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form, @RequestParam(name = "removeNewUser") int position, @RequestParam(defaultValue = "0") int page); @PostMapping(value = "/invite", params = {"inviteNewUsers"}) String inviteNewUsersFromInviteView(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page, @Valid @ModelAttribute(FORM_ATTR_NAME) InviteNewAssessorsForm form, @SuppressWarnings("unused") BindingResult bindingResult, ValidationHandler validationHandler); @GetMapping("/accepted") String accepted(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(defaultValue = "0") int page); }
@Test public void accepted() throws Exception { int page = 1; List<ParticipantStatusResource> status = Collections.singletonList(ACCEPTED); String assessorNameFilter = ""; List<AssessorInviteOverviewResource> assessorInviteOverviewResources = setUpAssessorInviteOverviewResources(); AssessorInviteOverviewPageResource pageResource = newAssessorInviteOverviewPageResource() .withContent(assessorInviteOverviewResources) .build(); when(competitionInviteRestService.getInvitationOverview(competition.getId(), page, status, empty(), empty())) .thenReturn(restSuccess(pageResource)); MvcResult result = mockMvc.perform(get("/competition/{competitionId}/assessors/accepted", competition.getId()) .param("page", "1")) .andExpect(status().isOk()) .andExpect(model().attributeExists("model")) .andExpect(view().name("assessors/accepted")) .andReturn(); assertCompetitionDetails(competition, result); assertInviteAccepted(assessorInviteOverviewResources, result); InOrder inOrder = inOrder(competitionRestService, competitionInviteRestService); inOrder.verify(competitionRestService).getCompetitionById(competition.getId()); inOrder.verify(competitionInviteRestService).getInvitationOverview(competition.getId(), page, status, empty(), empty()); inOrder.verifyNoMoreInteractions(); }
AssessmentAssessorsController extends BaseAssessmentController { @GetMapping("/assessors") public String manageAssessors(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(value = "page", defaultValue = "0") int page, @RequestParam(value = "assessorNameFilter", required = false) String assessorNameFilter ) { CompetitionResource competitionResource = getCompetition(competitionId); AssessorCountSummaryPageResource applicationCounts = getCounts(competitionId, assessorNameFilter, page); model.addAttribute("model", manageApplicationsPopulator.populateModel(competitionResource, applicationCounts)); return "competition/manage-assessors"; } @GetMapping("/assessors") String manageAssessors(Model model, @PathVariable("competitionId") long competitionId, @RequestParam(value = "page", defaultValue = "0") int page, @RequestParam(value = "assessorNameFilter", required = false) String assessorNameFilter ); }
@Test public void manageAssessors() throws Exception { final int pageNumber = 1; final int pageSize = 20; CompetitionResource competitionResource = newCompetitionResource() .withName("name") .withCompetitionStatus(IN_ASSESSMENT) .build(); List<AssessorCountSummaryResource> summaryResources = newAssessorCountSummaryResource() .withName("one", "two") .withSkillAreas("skill1", "skill2") .withTotalAssigned(2L, 3L) .withAssigned(5L, 7L) .withAccepted(11L, 13L) .withSubmitted(17L, 19L) .build(2); AssessorCountSummaryPageResource expectedPageResource = new AssessorCountSummaryPageResource(41, 3, summaryResources, pageNumber, pageSize); when(categoryRestServiceMock.getInnovationSectors()).thenReturn(restSuccess(newInnovationSectorResource().build(2))); when(competitionRestService.getCompetitionById(competitionResource.getId())).thenReturn(restSuccess(competitionResource)); when(assessorCountSummaryRestService.getAssessorCountSummariesByCompetitionId(competitionResource.getId(), "", pageNumber, pageSize)).thenReturn(restSuccess(expectedPageResource)); ManageAssessorsViewModel model = (ManageAssessorsViewModel) mockMvc.perform(get("/assessment/competition/{competitionId}/assessors?page=1", competitionResource.getId()) .param("assessorNameFilter","")) .andExpect(status().isOk()) .andExpect(view().name("competition/manage-assessors")) .andExpect(model().attributeExists("model")) .andReturn().getModelAndView().getModel().get("model"); assertEquals(competitionResource.getId().longValue(), model.getCompetitionId()); assertEquals(competitionResource.getName(), model.getCompetitionName()); assertTrue(model.isInAssessment()); assertEquals(2, model.getAssessors().size()); assertEquals(2L, model.getAssessors().get(0).getTotal()); assertEquals(5L, model.getAssessors().get(0).getAssigned()); assertEquals(11L, model.getAssessors().get(0).getAccepted()); assertEquals(17L, model.getAssessors().get(0).getSubmitted()); assertEquals("one", model.getAssessors().get(0).getName()); assertEquals("skill1", model.getAssessors().get(0).getSkillAreas()); assertEquals(3L, model.getAssessors().get(1).getTotal()); assertEquals(7L, model.getAssessors().get(1).getAssigned()); assertEquals(13L, model.getAssessors().get(1).getAccepted()); assertEquals(19L, model.getAssessors().get(1).getSubmitted()); assertEquals("two", model.getAssessors().get(1).getName()); assertEquals("skill2", model.getAssessors().get(1).getSkillAreas()); Pagination actualPagination = model.getPagination(); assertEquals(1, actualPagination.getCurrentPage()); assertEquals(20,actualPagination.getPageSize()); assertEquals(3, actualPagination.getTotalPages()); assertEquals("1 to 20", actualPagination.getPageNames().get(0).getTitle()); assertEquals("21 to 40", actualPagination.getPageNames().get(1).getTitle()); assertEquals("41 to 41", actualPagination.getPageNames().get(2).getTitle()); assertEquals("?page=2", actualPagination.getPageNames().get(2).getPath()); }
AssessmentApplicationProgressController extends CompetitionManagementCookieController<AvailableAssessorForm> { @GetMapping public String applicationProgress(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) AvailableAssessorForm selectionForm, @PathVariable long applicationId, @PathVariable long competitionId, @RequestParam(value = "page", defaultValue = "1") int page, @RequestParam(value = "assessorNameFilter", defaultValue = "") String filter, @RequestParam(value = "sort", defaultValue = "ASSESSOR") Sort sort, HttpServletRequest request, HttpServletResponse response) { updateSelectionForm(request, response, competitionId, applicationId, selectionForm, filter); return doProgressView(model, applicationId, filter, page - 1, sort); } @GetMapping String applicationProgress(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) AvailableAssessorForm selectionForm, @PathVariable long applicationId, @PathVariable long competitionId, @RequestParam(value = "page", defaultValue = "1") int page, @RequestParam(value = "assessorNameFilter", defaultValue = "") String filter, @RequestParam(value = "sort", defaultValue = "ASSESSOR") Sort sort, HttpServletRequest request, HttpServletResponse response); @PostMapping String assignAssessor(@PathVariable("competitionId") Long competitionId, @PathVariable("applicationId") Long applicationId, @ModelAttribute(SELECTION_FORM) AvailableAssessorForm selectionForm, HttpServletRequest request); @PostMapping("/withdraw/{assessmentId}") String withdrawAssessment(@PathVariable("competitionId") Long competitionId, @PathVariable("applicationId") Long applicationId, @PathVariable("assessmentId") Long assessmentId); @GetMapping(value = "/withdraw/{assessmentId}/confirm") String withdrawAssessmentConfirm( Model model, @PathVariable("competitionId") Long competitionId, @PathVariable("applicationId") Long applicationId, @PathVariable("assessmentId") Long assessmentId, @RequestParam(value = "sortField", defaultValue = "TITLE") String sortField); @PostMapping(params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForResendList( @PathVariable long competitionId, @PathVariable long applicationId, @RequestParam("selectionId") long assessorId, @RequestParam("isSelected") boolean isSelected, @RequestParam(value = "assessorNameFilter", defaultValue = "") String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); @PostMapping(params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToResendList(@PathVariable long competitionId, @PathVariable long applicationId, @RequestParam("addAll") boolean addAll, @RequestParam(value = "assessorNameFilter", defaultValue = "") String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); }
@Test public void applicationProgress() throws Exception { Long competitionId = 1L; Long applicationId = 2L; ApplicationAssessmentSummaryResource applicationAssessmentSummaryResource = setupApplicationAssessmentSummaryResource(competitionId, applicationId); List<ApplicationAssessorResource> assigned = setupAssignedApplicationAssessorResources(); List<ApplicationAssessorResource> rejected = setupRejectedApplicationAssessorResources(); List<ApplicationAssessorResource> withdrawn = setupWithdrawnApplicationAssessorResources(); ApplicationAvailableAssessorPageResource available = setupAvailableApplicationAssessorResources(); List<InnovationSectorResource> innovationSectors = setupInnovationSectors(); when(applicationAssessmentSummaryRestService.getApplicationAssessmentSummary(applicationId)).thenReturn(restSuccess(applicationAssessmentSummaryResource)); when(applicationAssessmentSummaryRestService.getAssignedAssessors(applicationId)).thenReturn(restSuccess(combineLists(assigned, rejected, withdrawn))); when(applicationAssessmentSummaryRestService.getAvailableAssessors(applicationId, 0, 20, "", Sort.ASSESSOR)).thenReturn(restSuccess(available)); when(categoryRestServiceMock.getInnovationSectors()).thenReturn(restSuccess(innovationSectors)); when(applicationAssessmentSummaryRestService.getAvailableAssessorsIds(applicationId, "")).thenReturn(restSuccess(asList(1L, 2L))); PaginationViewModel expectedPaginationModel = new PaginationViewModel(available); ApplicationAssessmentProgressViewModel expectedModel = new ApplicationAssessmentProgressViewModel( applicationId, "Progressive Machines", "Digital Manufacturing", competitionId, "Connected digital additive manufacturing", true, "Liquid Dynamics", asList("Acme Ltd.", "IO Systems"), setupExpectedAssignedRows(), setupExpectedRejectedRows(), setupExpectedPreviouslyAssignedRows(), setupExpectedAvailableAssessors(), innovationSectors, "", Sort.ASSESSOR, expectedPaginationModel, false ); mockMvc.perform(get("/assessment/competition/{competitionId}/application/{applicationId}/assessors?page=1&assessorNameFilter=&sort=ASSESSOR", competitionId, applicationId)) .andExpect(status().isOk()) .andExpect(model().attribute("model", expectedModel)) .andExpect(view().name("competition/application-progress")); InOrder inOrder = Mockito.inOrder(applicationAssessmentSummaryRestService, categoryRestServiceMock); inOrder.verify(applicationAssessmentSummaryRestService).getApplicationAssessmentSummary(applicationId); inOrder.verify(applicationAssessmentSummaryRestService).getAssignedAssessors(applicationId); inOrder.verify(applicationAssessmentSummaryRestService).getAvailableAssessors(applicationId, 0, 20, "", Sort.ASSESSOR); inOrder.verify(categoryRestServiceMock).getInnovationSectors(); inOrder.verifyNoMoreInteractions(); }
AssessmentApplicationProgressController extends CompetitionManagementCookieController<AvailableAssessorForm> { @PostMapping public String assignAssessor(@PathVariable("competitionId") Long competitionId, @PathVariable("applicationId") Long applicationId, @ModelAttribute(SELECTION_FORM) AvailableAssessorForm selectionForm, HttpServletRequest request) { AvailableAssessorForm submittedSelectionForm = getSelectionFormFromCookie(request, competitionId) .filter(form -> !form.getSelectedAssessors().isEmpty()) .orElse(selectionForm); List<AssessmentCreateResource> assessments = submittedSelectionForm.getSelectedAssessors().stream() .map(assessorId -> new AssessmentCreateResource(applicationId, assessorId)) .collect(Collectors.toList()); assessmentRestService.createAssessments(assessments).getSuccess(); return format("redirect:/assessment/competition/%s/application/%s/assessors", competitionId, applicationId); } @GetMapping String applicationProgress(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) AvailableAssessorForm selectionForm, @PathVariable long applicationId, @PathVariable long competitionId, @RequestParam(value = "page", defaultValue = "1") int page, @RequestParam(value = "assessorNameFilter", defaultValue = "") String filter, @RequestParam(value = "sort", defaultValue = "ASSESSOR") Sort sort, HttpServletRequest request, HttpServletResponse response); @PostMapping String assignAssessor(@PathVariable("competitionId") Long competitionId, @PathVariable("applicationId") Long applicationId, @ModelAttribute(SELECTION_FORM) AvailableAssessorForm selectionForm, HttpServletRequest request); @PostMapping("/withdraw/{assessmentId}") String withdrawAssessment(@PathVariable("competitionId") Long competitionId, @PathVariable("applicationId") Long applicationId, @PathVariable("assessmentId") Long assessmentId); @GetMapping(value = "/withdraw/{assessmentId}/confirm") String withdrawAssessmentConfirm( Model model, @PathVariable("competitionId") Long competitionId, @PathVariable("applicationId") Long applicationId, @PathVariable("assessmentId") Long assessmentId, @RequestParam(value = "sortField", defaultValue = "TITLE") String sortField); @PostMapping(params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForResendList( @PathVariable long competitionId, @PathVariable long applicationId, @RequestParam("selectionId") long assessorId, @RequestParam("isSelected") boolean isSelected, @RequestParam(value = "assessorNameFilter", defaultValue = "") String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); @PostMapping(params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToResendList(@PathVariable long competitionId, @PathVariable long applicationId, @RequestParam("addAll") boolean addAll, @RequestParam(value = "assessorNameFilter", defaultValue = "") String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); }
@Test public void assignAssessor() throws Exception { Long competitionId = 1L; Long applicationId = 2L; Long assessorId = 3L; AssessmentCreateResource expectedAssessmentCreateResource = newAssessmentCreateResource() .withApplicationId(applicationId) .withAssessorId(assessorId) .build(); AssessmentResource expectedAssessmentResource = newAssessmentResource().build(); AvailableAssessorForm form = new AvailableAssessorForm(); form.setSelectedAssessors(singletonList(assessorId)); when(assessmentRestService.createAssessments(singletonList(expectedAssessmentCreateResource))).thenReturn(restSuccess(singletonList(expectedAssessmentResource))); when(compressedCookieService.getCookieValue(any(), eq("availableAssessorsSelectionForm_comp_1"))).thenReturn(JsonTestUtil.toJson(form)); mockMvc.perform(post("/assessment/competition/{competitionId}/application/{applicationId}/assessors", competitionId, applicationId)) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(format("/assessment/competition/%s/application/%s/assessors", competitionId, applicationId))); verify(assessmentRestService, only()).createAssessments(singletonList(expectedAssessmentCreateResource)); verifyNoMoreInteractions(assessmentRestService, applicationAssessmentSummaryRestService); }
AssessmentApplicationProgressController extends CompetitionManagementCookieController<AvailableAssessorForm> { @PostMapping("/withdraw/{assessmentId}") public String withdrawAssessment(@PathVariable("competitionId") Long competitionId, @PathVariable("applicationId") Long applicationId, @PathVariable("assessmentId") Long assessmentId) { assessmentRestService.withdrawAssessment(assessmentId).getSuccess(); return redirectToProgress(competitionId, applicationId); } @GetMapping String applicationProgress(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) AvailableAssessorForm selectionForm, @PathVariable long applicationId, @PathVariable long competitionId, @RequestParam(value = "page", defaultValue = "1") int page, @RequestParam(value = "assessorNameFilter", defaultValue = "") String filter, @RequestParam(value = "sort", defaultValue = "ASSESSOR") Sort sort, HttpServletRequest request, HttpServletResponse response); @PostMapping String assignAssessor(@PathVariable("competitionId") Long competitionId, @PathVariable("applicationId") Long applicationId, @ModelAttribute(SELECTION_FORM) AvailableAssessorForm selectionForm, HttpServletRequest request); @PostMapping("/withdraw/{assessmentId}") String withdrawAssessment(@PathVariable("competitionId") Long competitionId, @PathVariable("applicationId") Long applicationId, @PathVariable("assessmentId") Long assessmentId); @GetMapping(value = "/withdraw/{assessmentId}/confirm") String withdrawAssessmentConfirm( Model model, @PathVariable("competitionId") Long competitionId, @PathVariable("applicationId") Long applicationId, @PathVariable("assessmentId") Long assessmentId, @RequestParam(value = "sortField", defaultValue = "TITLE") String sortField); @PostMapping(params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForResendList( @PathVariable long competitionId, @PathVariable long applicationId, @RequestParam("selectionId") long assessorId, @RequestParam("isSelected") boolean isSelected, @RequestParam(value = "assessorNameFilter", defaultValue = "") String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); @PostMapping(params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToResendList(@PathVariable long competitionId, @PathVariable long applicationId, @RequestParam("addAll") boolean addAll, @RequestParam(value = "assessorNameFilter", defaultValue = "") String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); }
@Test public void withdrawAssessment() throws Exception { Long competitionId = 1L; Long applicationId = 2L; Long assessmentId = 3L; when(assessmentRestService.withdrawAssessment(assessmentId)).thenReturn(restSuccess()); mockMvc.perform( post("/assessment/competition/{competitionId}/application/{applicationId}/assessors/withdraw/{assessmentId}", competitionId, applicationId, assessmentId)) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(format("/assessment/competition/%s/application/%s/assessors", competitionId, applicationId))); InOrder inOrder = inOrder(assessmentRestService); inOrder.verify(assessmentRestService).withdrawAssessment(assessmentId); inOrder.verifyNoMoreInteractions(); } @Test public void withdrawAssessment_preservesQueryParams() throws Exception { Long competitionId = 1L; Long applicationId = 2L; Long assessmentId = 3L; when(assessmentRestService.withdrawAssessment(assessmentId)).thenReturn(restSuccess()); mockMvc.perform( post("/assessment/competition/{competitionId}/application/{applicationId}/assessors/withdraw/{assessmentId}", competitionId, applicationId, assessmentId) .param("sortField", TOTAL_APPLICATIONS.name())) .andExpect(status().is3xxRedirection()) .andExpect(redirectedUrl(format("/assessment/competition/%s/application/%s/assessors", competitionId, applicationId))); InOrder inOrder = inOrder(assessmentRestService); inOrder.verify(assessmentRestService).withdrawAssessment(assessmentId); inOrder.verifyNoMoreInteractions(); }
GrantProcess { public String getMessage() { return message; } GrantProcess(); GrantProcess(long applicationId); GrantProcess(long applicationId, boolean pending); long getApplicationId(); ZonedDateTime getSentRequested(); ZonedDateTime getSentSucceeded(); boolean isPending(); String getMessage(); ZonedDateTime getLastProcessed(); GrantProcess requestSend(ZonedDateTime now); GrantProcess sendSucceeded(ZonedDateTime now); GrantProcess sendFailed(ZonedDateTime now, String message); @Override boolean equals(Object o); @Override int hashCode(); }
@Test public void getMessage() { assertNull(grantProcess.getMessage()); assertNull(sendRequestedGrantProcess.getMessage()); assertNull(sendSucceededGrantProcess.getMessage()); assertEquals(SEND_FAILED_MESSAGE, sendFailedGrantProcess.getMessage()); }
AssessmentApplicationProgressController extends CompetitionManagementCookieController<AvailableAssessorForm> { @GetMapping(value = "/withdraw/{assessmentId}/confirm") public String withdrawAssessmentConfirm( Model model, @PathVariable("competitionId") Long competitionId, @PathVariable("applicationId") Long applicationId, @PathVariable("assessmentId") Long assessmentId, @RequestParam(value = "sortField", defaultValue = "TITLE") String sortField) { model.addAttribute("model", new ApplicationAssessmentProgressRemoveViewModel( competitionId, applicationId, assessmentId, AvailableAssessorsSortFieldType.valueOf(sortField) )); return "competition/application-progress-remove-confirm"; } @GetMapping String applicationProgress(Model model, @ModelAttribute(name = SELECTION_FORM, binding = false) AvailableAssessorForm selectionForm, @PathVariable long applicationId, @PathVariable long competitionId, @RequestParam(value = "page", defaultValue = "1") int page, @RequestParam(value = "assessorNameFilter", defaultValue = "") String filter, @RequestParam(value = "sort", defaultValue = "ASSESSOR") Sort sort, HttpServletRequest request, HttpServletResponse response); @PostMapping String assignAssessor(@PathVariable("competitionId") Long competitionId, @PathVariable("applicationId") Long applicationId, @ModelAttribute(SELECTION_FORM) AvailableAssessorForm selectionForm, HttpServletRequest request); @PostMapping("/withdraw/{assessmentId}") String withdrawAssessment(@PathVariable("competitionId") Long competitionId, @PathVariable("applicationId") Long applicationId, @PathVariable("assessmentId") Long assessmentId); @GetMapping(value = "/withdraw/{assessmentId}/confirm") String withdrawAssessmentConfirm( Model model, @PathVariable("competitionId") Long competitionId, @PathVariable("applicationId") Long applicationId, @PathVariable("assessmentId") Long assessmentId, @RequestParam(value = "sortField", defaultValue = "TITLE") String sortField); @PostMapping(params = {"selectionId"}) @ResponseBody JsonNode selectAssessorForResendList( @PathVariable long competitionId, @PathVariable long applicationId, @RequestParam("selectionId") long assessorId, @RequestParam("isSelected") boolean isSelected, @RequestParam(value = "assessorNameFilter", defaultValue = "") String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); @PostMapping(params = {"addAll"}) @ResponseBody JsonNode addAllAssessorsToResendList(@PathVariable long competitionId, @PathVariable long applicationId, @RequestParam("addAll") boolean addAll, @RequestParam(value = "assessorNameFilter", defaultValue = "") String assessorNameFilter, HttpServletRequest request, HttpServletResponse response); }
@Test public void withdrawAssessmentConfirm() throws Exception { Long competitionId = 1L; Long applicationId = 2L; Long assessmentId = 3L; ApplicationAssessmentProgressRemoveViewModel expectedModel = new ApplicationAssessmentProgressRemoveViewModel( competitionId, applicationId, assessmentId, TITLE ); mockMvc.perform( get("/assessment/competition/{competitionId}/application/{applicationId}/assessors/withdraw/{assessmentId}/confirm", competitionId, applicationId, assessmentId)) .andExpect(status().isOk()) .andExpect(model().attribute("model", expectedModel)) .andExpect(model().attributeExists("model")) .andExpect(view().name("competition/application-progress-remove-confirm")); }