src_fm_fc_ms_ff
stringlengths 43
86.8k
| target
stringlengths 20
276k
|
|---|---|
AffiliationServiceImpl extends BaseTransactionalService implements AffiliationService { @Override @Transactional public ServiceResult<Void> updateUserAffiliations(long userId, AffiliationListResource affiliations) { return find(userRepository.findById(userId), notFoundError(User.class, userId)).andOnSuccess(user -> { List<Affiliation> targetAffiliations = user.getAffiliations(); targetAffiliations.clear(); affiliationMapper.mapToDomain(affiliations.getAffiliationResourceList()) .forEach(affiliation -> { affiliation.setUser(user); targetAffiliations.add(affiliation); }); userRepository.save(user); return serviceSuccess(); }); } @Override ServiceResult<AffiliationListResource> getUserAffiliations(long userId); @Override @Transactional ServiceResult<Void> updateUserAffiliations(long userId, AffiliationListResource affiliations); } | @Test public void updateUserAffiliations() throws Exception { Long userId = 1L; List<AffiliationResource> affiliationResources = newAffiliationResource().build(2); AffiliationListResource affiliationListResource = newAffiliationListResource() .withAffiliationList(affiliationResources) .build(); List<Affiliation> affiliations = newAffiliation().build(2); User existingUser = newUser() .withAffiliations(new ArrayList<>()) .build(); when(userRepositoryMock.findById(userId)).thenReturn(Optional.of(existingUser)); when(affiliationMapperMock.mapToDomain(affiliationResources)).thenReturn(affiliations); when(userRepositoryMock.save(createUserExpectations(existingUser.getId(), affiliations))).thenReturn(newUser().build()); ServiceResult<Void> response = service.updateUserAffiliations(userId, affiliationListResource); assertTrue(response.isSuccess()); InOrder inOrder = inOrder(userRepositoryMock, affiliationMapperMock); inOrder.verify(userRepositoryMock).findById(userId); inOrder.verify(affiliationMapperMock).mapToDomain(affiliationResources); inOrder.verify(userRepositoryMock).save(createUserExpectations(existingUser.getId(), affiliations)); inOrder.verifyNoMoreInteractions(); }
@Test public void updateUserAffiliations_userDoesNotExist() throws Exception { Long userIdNotExists = 1L; ServiceResult<Void> result = service.updateUserAffiliations(userIdNotExists, new AffiliationListResource()); assertTrue(result.getFailure().is(notFoundError(User.class, userIdNotExists))); verify(userRepositoryMock, only()).findById(userIdNotExists); verifyZeroInteractions(affiliationMapperMock); } |
QuestionSetupCompetitionController { @GetMapping("/get-by-id/{questionId}") public RestResult<CompetitionSetupQuestionResource> getByQuestionId(@PathVariable final long questionId) { return questionSetupCompetitionService.getByQuestionId(questionId).toGetResponse(); } @GetMapping("/get-by-id/{questionId}") RestResult<CompetitionSetupQuestionResource> getByQuestionId(@PathVariable final long questionId); @PutMapping("/save") RestResult<Void> save(@RequestBody final CompetitionSetupQuestionResource competitionSetupQuestionResource); @PostMapping("/add-default-to-competition/{competitionId}") RestResult<CompetitionSetupQuestionResource> addDefaultToCompetitionId(
@PathVariable long competitionId); @PostMapping("/add-research-category-question-to-competition/{competitionId}") RestResult<Void> addResearchCategoryQuestionToCompetition(@PathVariable long competitionId); @DeleteMapping("/delete-by-id/{questionId}") RestResult<Void> deleteById(@PathVariable long questionId); @PostMapping(value = "/template-file/{questionId}", produces = "application/json") RestResult<Void> uploadTemplateFile(@RequestHeader(value = "Content-Type", required = false) String contentType,
@RequestHeader(value = "Content-Length", required = false) String contentLength,
@RequestParam(value = "filename", required = false) String originalFilename,
@PathVariable long questionId,
HttpServletRequest request); @DeleteMapping(value = "/template-file/{questionId}", produces = "application/json") RestResult<Void> deleteFile(@PathVariable long questionId); } | @Test public void getByQuestionId() throws Exception { final Long questionId = 1L; when(questionSetupCompetitionServiceMock.getByQuestionId(questionId)).thenReturn(serviceSuccess(newCompetitionSetupQuestionResource().build())); mockMvc.perform(get("/question-setup/get-by-id/{questionId}", questionId)) .andExpect(status().isOk()); verify(questionSetupCompetitionServiceMock, only()).getByQuestionId(questionId); } |
QuestionSetupCompetitionController { @PutMapping("/save") public RestResult<Void> save(@RequestBody final CompetitionSetupQuestionResource competitionSetupQuestionResource) { return questionSetupCompetitionService.update(competitionSetupQuestionResource).toPutResponse(); } @GetMapping("/get-by-id/{questionId}") RestResult<CompetitionSetupQuestionResource> getByQuestionId(@PathVariable final long questionId); @PutMapping("/save") RestResult<Void> save(@RequestBody final CompetitionSetupQuestionResource competitionSetupQuestionResource); @PostMapping("/add-default-to-competition/{competitionId}") RestResult<CompetitionSetupQuestionResource> addDefaultToCompetitionId(
@PathVariable long competitionId); @PostMapping("/add-research-category-question-to-competition/{competitionId}") RestResult<Void> addResearchCategoryQuestionToCompetition(@PathVariable long competitionId); @DeleteMapping("/delete-by-id/{questionId}") RestResult<Void> deleteById(@PathVariable long questionId); @PostMapping(value = "/template-file/{questionId}", produces = "application/json") RestResult<Void> uploadTemplateFile(@RequestHeader(value = "Content-Type", required = false) String contentType,
@RequestHeader(value = "Content-Length", required = false) String contentLength,
@RequestParam(value = "filename", required = false) String originalFilename,
@PathVariable long questionId,
HttpServletRequest request); @DeleteMapping(value = "/template-file/{questionId}", produces = "application/json") RestResult<Void> deleteFile(@PathVariable long questionId); } | @Test public void save() throws Exception { final CompetitionSetupQuestionResource question = newCompetitionSetupQuestionResource().build(); when(questionSetupCompetitionServiceMock.update(question)).thenReturn(serviceSuccess(newCompetitionSetupQuestionResource().withTitle("expected question").build())); mockMvc.perform(put("/question-setup/save") .contentType(MediaType.APPLICATION_JSON) .content(objectMapper.writeValueAsString(question))) .andExpect(status().isOk()); verify(questionSetupCompetitionServiceMock, only()).update(question); } |
QuestionSetupCompetitionController { @PostMapping("/add-default-to-competition/{competitionId}") public RestResult<CompetitionSetupQuestionResource> addDefaultToCompetitionId( @PathVariable long competitionId) { return questionSetupCompetitionService.createByCompetitionId(competitionId).toPostCreateResponse(); } @GetMapping("/get-by-id/{questionId}") RestResult<CompetitionSetupQuestionResource> getByQuestionId(@PathVariable final long questionId); @PutMapping("/save") RestResult<Void> save(@RequestBody final CompetitionSetupQuestionResource competitionSetupQuestionResource); @PostMapping("/add-default-to-competition/{competitionId}") RestResult<CompetitionSetupQuestionResource> addDefaultToCompetitionId(
@PathVariable long competitionId); @PostMapping("/add-research-category-question-to-competition/{competitionId}") RestResult<Void> addResearchCategoryQuestionToCompetition(@PathVariable long competitionId); @DeleteMapping("/delete-by-id/{questionId}") RestResult<Void> deleteById(@PathVariable long questionId); @PostMapping(value = "/template-file/{questionId}", produces = "application/json") RestResult<Void> uploadTemplateFile(@RequestHeader(value = "Content-Type", required = false) String contentType,
@RequestHeader(value = "Content-Length", required = false) String contentLength,
@RequestParam(value = "filename", required = false) String originalFilename,
@PathVariable long questionId,
HttpServletRequest request); @DeleteMapping(value = "/template-file/{questionId}", produces = "application/json") RestResult<Void> deleteFile(@PathVariable long questionId); } | @Test public void addDefaultToCompetitionId() throws Exception { final Long competitionId = 1L; when(questionSetupCompetitionServiceMock.createByCompetitionId(competitionId)).thenReturn(serviceSuccess(newCompetitionSetupQuestionResource().build())); mockMvc.perform(post("/question-setup/add-default-to-competition/{competitionId}", competitionId)) .andExpect(status().isCreated()); verify(questionSetupCompetitionServiceMock, only()).createByCompetitionId(competitionId); } |
QuestionSetupCompetitionController { @PostMapping("/add-research-category-question-to-competition/{competitionId}") public RestResult<Void> addResearchCategoryQuestionToCompetition(@PathVariable long competitionId) { return questionSetupCompetitionService.addResearchCategoryQuestionToCompetition(competitionId) .toPostCreateResponse(); } @GetMapping("/get-by-id/{questionId}") RestResult<CompetitionSetupQuestionResource> getByQuestionId(@PathVariable final long questionId); @PutMapping("/save") RestResult<Void> save(@RequestBody final CompetitionSetupQuestionResource competitionSetupQuestionResource); @PostMapping("/add-default-to-competition/{competitionId}") RestResult<CompetitionSetupQuestionResource> addDefaultToCompetitionId(
@PathVariable long competitionId); @PostMapping("/add-research-category-question-to-competition/{competitionId}") RestResult<Void> addResearchCategoryQuestionToCompetition(@PathVariable long competitionId); @DeleteMapping("/delete-by-id/{questionId}") RestResult<Void> deleteById(@PathVariable long questionId); @PostMapping(value = "/template-file/{questionId}", produces = "application/json") RestResult<Void> uploadTemplateFile(@RequestHeader(value = "Content-Type", required = false) String contentType,
@RequestHeader(value = "Content-Length", required = false) String contentLength,
@RequestParam(value = "filename", required = false) String originalFilename,
@PathVariable long questionId,
HttpServletRequest request); @DeleteMapping(value = "/template-file/{questionId}", produces = "application/json") RestResult<Void> deleteFile(@PathVariable long questionId); } | @Test public void addResearchCategoryQuestionToCompetition() throws Exception { final long competitionId = 1L; when(questionSetupCompetitionServiceMock.addResearchCategoryQuestionToCompetition(competitionId)) .thenReturn(serviceSuccess()); mockMvc.perform(post("/question-setup/add-research-category-question-to-competition/{competitionId}", competitionId)) .andExpect(status().isCreated()); verify(questionSetupCompetitionServiceMock, only()).addResearchCategoryQuestionToCompetition(competitionId); } |
QuestionSetupCompetitionController { @DeleteMapping("/delete-by-id/{questionId}") public RestResult<Void> deleteById(@PathVariable long questionId) { return questionSetupCompetitionService.delete(questionId).toDeleteResponse(); } @GetMapping("/get-by-id/{questionId}") RestResult<CompetitionSetupQuestionResource> getByQuestionId(@PathVariable final long questionId); @PutMapping("/save") RestResult<Void> save(@RequestBody final CompetitionSetupQuestionResource competitionSetupQuestionResource); @PostMapping("/add-default-to-competition/{competitionId}") RestResult<CompetitionSetupQuestionResource> addDefaultToCompetitionId(
@PathVariable long competitionId); @PostMapping("/add-research-category-question-to-competition/{competitionId}") RestResult<Void> addResearchCategoryQuestionToCompetition(@PathVariable long competitionId); @DeleteMapping("/delete-by-id/{questionId}") RestResult<Void> deleteById(@PathVariable long questionId); @PostMapping(value = "/template-file/{questionId}", produces = "application/json") RestResult<Void> uploadTemplateFile(@RequestHeader(value = "Content-Type", required = false) String contentType,
@RequestHeader(value = "Content-Length", required = false) String contentLength,
@RequestParam(value = "filename", required = false) String originalFilename,
@PathVariable long questionId,
HttpServletRequest request); @DeleteMapping(value = "/template-file/{questionId}", produces = "application/json") RestResult<Void> deleteFile(@PathVariable long questionId); } | @Test public void deleteById() throws Exception { final long questionId = 1L; when(questionSetupCompetitionServiceMock.delete(questionId)).thenReturn(serviceSuccess()); mockMvc.perform(delete("/question-setup/delete-by-id/{questionId}", questionId)) .andExpect(status().isNoContent()); verify(questionSetupCompetitionServiceMock, only()).delete(questionId); } |
QuestionFileSetupCompetitionServiceImpl implements QuestionFileSetupCompetitionService { @Override @Transactional public ServiceResult<Void> deleteTemplateFile(long questionId) { return findFormInputByQuestionId(questionId).andOnSuccess(formInput -> { long fileId = formInput.getFile().getId(); return fileService.deleteFileIgnoreNotFound(fileId).andOnSuccessReturnVoid(() -> { formInput.setFile(null); }); }); } @Override @Transactional ServiceResult<Void> uploadTemplateFile(String contentType, String contentLength, String originalFilename, long questionId, HttpServletRequest request); @Override @Transactional ServiceResult<Void> deleteTemplateFile(long questionId); } | @Test public void deleteTemplateFile_submitted() throws Exception { final long questionId = 1L; final long fileId = 101L; final FileEntry fileEntry = new FileEntry(fileId, "somefile.pdf", MediaType.APPLICATION_PDF, 1111L); FormInput formInput = newFormInput() .withFile(fileEntry) .build(); when(formInputRepository.findByQuestionIdAndScopeAndType(questionId, FormInputScope.APPLICATION, FormInputType.TEMPLATE_DOCUMENT)).thenReturn(formInput); when(fileServiceMock.deleteFileIgnoreNotFound(fileId)).thenReturn(ServiceResult.serviceSuccess(fileEntry)); ServiceResult<Void> response = service.deleteTemplateFile(questionId); assertTrue(response.isSuccess()); assertNull(formInput.getFile()); } |
QuestionSetupCompetitionServiceImpl extends BaseTransactionalService implements QuestionSetupCompetitionService { @Override public ServiceResult<CompetitionSetupQuestionResource> getByQuestionId(long questionId) { return find(questionRepository.findById(questionId), notFoundError(Question.class, questionId)) .andOnSuccess(question -> mapQuestionToSuperQuestionResource(question)); } @Override ServiceResult<CompetitionSetupQuestionResource> getByQuestionId(long questionId); @Override @Transactional ServiceResult<CompetitionSetupQuestionResource> createByCompetitionId(long competitionId); @Override @Transactional ServiceResult<Void> addResearchCategoryQuestionToCompetition(long competitionId); @Override @Transactional ServiceResult<Void> delete(long questionId); @Override @Transactional ServiceResult<CompetitionSetupQuestionResource> update(CompetitionSetupQuestionResource competitionSetupQuestionResource); } | @Test public void getByQuestionId() { Long questionId = 1L; List<GuidanceRow> guidanceRows = newFormInputGuidanceRow().build(1); Question question = newQuestion(). withFormInputs(asList( newFormInput() .withType(FormInputType.FILEUPLOAD) .withScope(FormInputScope.APPLICATION) .withAllowedFileTypes(asSet(PDF, SPREADSHEET)) .withGuidanceAnswer(fileUploadGuidance) .withActive(true) .build(), newFormInput() .withType(FormInputType.TEXTAREA) .withScope(FormInputScope.APPLICATION) .withWordCount(maxWords) .withGuidanceTitle(guidanceTitle) .withGuidanceAnswer(guidance) .withActive(true) .build(), newFormInput() .withType(FormInputType.TEMPLATE_DOCUMENT) .withScope(FormInputScope.APPLICATION) .withActive(true) .build(), newFormInput() .withType(FormInputType.MULTIPLE_CHOICE) .withScope(FormInputScope.APPLICATION) .withGuidanceTitle(guidanceTitle) .withGuidanceAnswer(guidance) .withMultipleChoiceOptions(newMultipleChoiceOption().build(2)) .withActive(true) .build(), newFormInput() .withType(FormInputType.TEXTAREA) .withScope(FormInputScope.ASSESSMENT) .withWordCount(assessmentMaxWords) .withGuidanceTitle(assessmentGuidanceTitle) .withGuidanceAnswer(assessmentGuidanceAnswer) .withGuidanceRows(guidanceRows) .withActive(true) .build(), newFormInput() .withType(FormInputType.ASSESSOR_SCORE) .withScope(FormInputScope.ASSESSMENT) .withActive(true) .build(), newFormInput() .withType(FormInputType.ASSESSOR_RESEARCH_CATEGORY) .withScope(FormInputScope.ASSESSMENT) .withActive(true) .build(), newFormInput() .withType(FormInputType.ASSESSOR_APPLICATION_IN_SCOPE) .withScope(FormInputScope.ASSESSMENT) .withActive(true) .build() ) ) .withQuestionNumber(number) .withAssessorMaximumScore(scoreTotal) .withDescription(subTitle) .withShortName(shortTitle) .withName(title) .withQuestionSetupType(questionSetupType) .withId(questionId) .build(); when(questionRepository.findById(questionId)).thenReturn(Optional.of(question)); when(guidanceRowMapper.mapToResource(guidanceRows)).thenReturn(new ArrayList<>()); ServiceResult<CompetitionSetupQuestionResource> result = service.getByQuestionId(questionId); assertTrue(result.isSuccess()); CompetitionSetupQuestionResource resource = result.getSuccess(); assertEquals(resource.getAppendix(), true); assertEquals(resource.getScored(), true); assertEquals(resource.getWrittenFeedback(), true); assertEquals(resource.getScope(), true); assertEquals(resource.getResearchCategoryQuestion(), true); assertEquals(resource.getAssessmentGuidance(), assessmentGuidanceAnswer); assertEquals(resource.getAssessmentGuidanceTitle(), assessmentGuidanceTitle); assertEquals(resource.getAssessmentMaxWords(), assessmentMaxWords); assertEquals(resource.getGuidanceTitle(), guidanceTitle); assertEquals(resource.getMaxWords(), maxWords); assertEquals(resource.getTextArea(), true); assertEquals(resource.getScoreTotal(), scoreTotal); assertEquals(resource.getNumber(), number); assertEquals(resource.getQuestionId(), questionId); assertEquals(resource.getSubTitle(), subTitle); assertEquals(resource.getShortTitle(), shortTitle); assertEquals(resource.getTitle(), title); assertEquals(resource.getGuidance(), guidance); assertEquals(resource.getType(), QuestionSetupType.SCOPE); assertEquals(resource.getAppendixGuidance(), fileUploadGuidance); assertEquals(resource.getAllowedAppendixResponseFileTypes(), asSet(PDF, SPREADSHEET)); assertEquals(resource.getTemplateDocument(), true); assertEquals(resource.getMultipleChoice(), true); assertEquals(resource.getChoices().size(), 2); verify(guidanceRowMapper).mapToResource(guidanceRows); } |
QuestionSetupCompetitionServiceImpl extends BaseTransactionalService implements QuestionSetupCompetitionService { @Override @Transactional public ServiceResult<CompetitionSetupQuestionResource> update(CompetitionSetupQuestionResource competitionSetupQuestionResource) { Long questionId = competitionSetupQuestionResource.getQuestionId(); Question question = questionRepository.findById(questionId).get(); if (question.getQuestionSetupType() != QuestionSetupType.APPLICATION_DETAILS) { question.setShortName(competitionSetupQuestionResource.getShortTitle()); } question.setName(competitionSetupQuestionResource.getTitle()); question.setDescription(competitionSetupQuestionResource.getSubTitle()); question.setAssessorMaximumScore(competitionSetupQuestionResource.getScoreTotal()); markTextAreaAsActiveOrInactive(questionId, competitionSetupQuestionResource); markMultipleChoiceAsActiveOrInactive(questionId, competitionSetupQuestionResource); markAppendixAsActiveOrInactive(questionId, competitionSetupQuestionResource); markTemplateUploadAsActiveOrInactive(questionId, competitionSetupQuestionResource); markScoredAsActiveOrInactive(questionId, competitionSetupQuestionResource); markWrittenFeedbackAsActiveOrInactive(questionId, competitionSetupQuestionResource); markResearchCategoryQuestionAsActiveOrInactive(questionId, competitionSetupQuestionResource); markScopeAsActiveOrInactive(questionId, competitionSetupQuestionResource); return serviceSuccess(competitionSetupQuestionResource); } @Override ServiceResult<CompetitionSetupQuestionResource> getByQuestionId(long questionId); @Override @Transactional ServiceResult<CompetitionSetupQuestionResource> createByCompetitionId(long competitionId); @Override @Transactional ServiceResult<Void> addResearchCategoryQuestionToCompetition(long competitionId); @Override @Transactional ServiceResult<Void> delete(long questionId); @Override @Transactional ServiceResult<CompetitionSetupQuestionResource> update(CompetitionSetupQuestionResource competitionSetupQuestionResource); } | @Test public void update() { long questionId = 1L; List<GuidanceRowResource> guidanceRows = newFormInputGuidanceRowResourceBuilder().build(1); when(guidanceRowMapper.mapToDomain(guidanceRows)).thenReturn(new ArrayList<>()); CompetitionSetupQuestionResource resource = newCompetitionSetupQuestionResource() .withAppendix(true) .withGuidance(guidance) .withGuidanceTitle(guidanceTitle) .withTextArea(true) .withMaxWords(maxWords) .withTemplateDocument(true) .withTemplateTitle("Template") .withMultipleChoice(true) .withMultipleChoiceOptions(newMultipleChoiceOptionResource().withId(1L , null).withText("Update", "Create").build(2)) .withNumber(number) .withTitle(title) .withShortTitle(newShortTitle) .withSubTitle(subTitle) .withQuestionId(questionId) .withAssessmentGuidance(assessmentGuidanceAnswer) .withAssessmentGuidanceTitle(assessmentGuidanceTitle) .withAssessmentMaxWords(assessmentMaxWords) .withGuidanceRows(guidanceRows) .withScored(true) .withScoreTotal(scoreTotal) .withWrittenFeedback(true) .build(); Question question = newQuestion(). withShortName(newShortTitle).build(); FormInput questionFormInput = newFormInput().build(); FormInput appendixFormInput = newFormInput().build(); FormInput templateFormInput = newFormInput().build(); FormInput multipleChoiceFormInput = newFormInput() .withMultipleChoiceOptions(newMultipleChoiceOption().withId(1L, 2L).withText("to be updated", "to be deleted").build(2)) .build(); FormInput researchCategoryQuestionFormInput = newFormInput().build(); FormInput scopeQuestionFormInput = newFormInput().build(); FormInput scoredQuestionFormInput = newFormInput().build(); FormInput writtenFeedbackFormInput = newFormInput() .withGuidanceRows(newFormInputGuidanceRow().build(2)) .build(); when(formInputRepository.findByQuestionIdAndScopeAndType(questionId, FormInputScope.APPLICATION, FormInputType.TEXTAREA)).thenReturn(questionFormInput); when(formInputRepository.findByQuestionIdAndScopeAndType(questionId, FormInputScope.APPLICATION, FormInputType.FILEUPLOAD)).thenReturn(appendixFormInput); when(formInputRepository.findByQuestionIdAndScopeAndType(questionId, FormInputScope.APPLICATION, FormInputType.TEMPLATE_DOCUMENT)).thenReturn(templateFormInput); when(formInputRepository.findByQuestionIdAndScopeAndType(questionId, FormInputScope.APPLICATION, FormInputType.MULTIPLE_CHOICE)).thenReturn(multipleChoiceFormInput); when(questionRepository.findById(questionId)).thenReturn(Optional.of(question)); when(formInputRepository.findByQuestionIdAndScopeAndType(questionId, FormInputScope.ASSESSMENT, FormInputType.ASSESSOR_RESEARCH_CATEGORY)).thenReturn(researchCategoryQuestionFormInput); when(formInputRepository.findByQuestionIdAndScopeAndType(questionId, FormInputScope.ASSESSMENT, FormInputType.ASSESSOR_APPLICATION_IN_SCOPE)).thenReturn(scopeQuestionFormInput); when(formInputRepository.findByQuestionIdAndScopeAndType(questionId, FormInputScope.ASSESSMENT, FormInputType.ASSESSOR_SCORE)).thenReturn(scoredQuestionFormInput); when(formInputRepository.findByQuestionIdAndScopeAndType(questionId, FormInputScope.ASSESSMENT, FormInputType.TEXTAREA)).thenReturn(writtenFeedbackFormInput); doNothing().when(guidanceRowRepository).deleteAll(writtenFeedbackFormInput.getGuidanceRows()); when(guidanceRowRepository.saveAll(writtenFeedbackFormInput.getGuidanceRows())).thenReturn(writtenFeedbackFormInput.getGuidanceRows()); ServiceResult<CompetitionSetupQuestionResource> result = service.update(resource); assertTrue(result.isSuccess()); assertNotEquals(question.getQuestionNumber(), number); assertEquals(question.getDescription(), subTitle); assertEquals(question.getName(), title); assertEquals(questionFormInput.getGuidanceTitle(), guidanceTitle); assertEquals(questionFormInput.getGuidanceAnswer(), guidance); assertEquals(questionFormInput.getWordCount(), maxWords); assertEquals(writtenFeedbackFormInput.getGuidanceAnswer(), assessmentGuidanceAnswer); assertEquals(writtenFeedbackFormInput.getGuidanceTitle(), assessmentGuidanceTitle); assertEquals(question.getShortName(), newShortTitle); assertEquals(appendixFormInput.getActive(), true); assertEquals(appendixFormInput.getGuidanceAnswer(), null); assertEquals(templateFormInput.getActive(), true); assertEquals(templateFormInput.getDescription(), "Template"); assertEquals(multipleChoiceFormInput.getActive(), true); verify(multipleChoiceOptionRepository).save(argThat(lambdaMatches(choice -> choice.getId() == null))); verify(multipleChoiceOptionRepository).delete(argThat(lambdaMatches(choice -> choice.getId().equals(2L)))); assertEquals(multipleChoiceFormInput.getMultipleChoiceOptions().stream() .filter(choice -> choice.getId().equals(1L)).findAny().get().getText(), "Update"); assertEquals(researchCategoryQuestionFormInput.getActive(), true); assertEquals(scopeQuestionFormInput.getActive(), true); assertEquals(scoredQuestionFormInput.getActive(), true); assertEquals(writtenFeedbackFormInput.getActive(), true); verify(guidanceRowMapper).mapToDomain(guidanceRows); }
@Test public void update_shouldNotChangeAppendixFormInputWhenOptionIsNull() { setMocksForSuccessfulUpdate(); CompetitionSetupQuestionResource resource = createValidQuestionResourceWithoutAppendixOptions(); resource.setAppendix(false); resource.setNumberOfUploads(0); resource.setAllowedAppendixResponseFileTypes(asSet(PDF)); resource.setAppendixGuidance(fileUploadGuidance); boolean appendixEnabled = true; String guidanceAnswer = "Only excel files with spaghetti VB macros allowed"; FileTypeCategory allowedFileTypes = FileTypeCategory.PDF; FormInput appendixFormInput = newFormInput() .withActive(appendixEnabled) .withWordCount(1) .withGuidanceAnswer(guidanceAnswer) .withAllowedFileTypes(asSet(allowedFileTypes)) .build(); when(formInputRepository.findByQuestionIdAndScopeAndType( 1L, FormInputScope.APPLICATION, FormInputType.FILEUPLOAD )).thenReturn(appendixFormInput); ServiceResult<CompetitionSetupQuestionResource> result = service.update(resource); assertEquals(true, result.isSuccess()); assertNotEquals(appendixEnabled, appendixFormInput.getActive()); assertNotEquals(allowedFileTypes, appendixFormInput.getAllowedFileTypes()); assertNotEquals(guidanceAnswer, appendixFormInput.getGuidanceAnswer()); }
@Test public void update_shouldResetAppendixOptionsFormInputWhenItsNotSelected() { setMocksForSuccessfulUpdate(); CompetitionSetupQuestionResource resource = createValidQuestionResourceWithoutAppendixOptions(); FileTypeCategory allowedFileTypes = FileTypeCategory.PDF; resource.setAppendix(false); resource.setNumberOfUploads(0); resource.setAllowedAppendixResponseFileTypes(asSet(PDF)); resource.setAppendixGuidance(fileUploadGuidance); FormInput appendixFormInput = newFormInput() .withActive(true) .withWordCount(1) .withGuidanceAnswer("Only excel files with spaghetti VB macros allowed") .withAllowedFileTypes(asSet(allowedFileTypes)) .build(); when(formInputRepository.findByQuestionIdAndScopeAndType( 1L, FormInputScope.APPLICATION, FormInputType.FILEUPLOAD )).thenReturn(appendixFormInput); ServiceResult<CompetitionSetupQuestionResource> result = service.update(resource); assertEquals(true, result.isSuccess()); assertFalse(appendixFormInput.getActive()); assertNull(appendixFormInput.getAllowedFileTypes()); assertNull(appendixFormInput.getGuidanceAnswer()); }
@Test public void update_shouldSetAppendixOptionsFormInputWhenSelected() { setMocksForSuccessfulUpdate(); CompetitionSetupQuestionResource resource = createValidQuestionResourceWithoutAppendixOptions(); resource.setAppendix(true); resource.setNumberOfUploads(1); resource.setAllowedAppendixResponseFileTypes(asSet(PDF)); resource.setAppendixGuidance(fileUploadGuidance); FormInput appendixFormInput = newFormInput().build(); when(formInputRepository.findByQuestionIdAndScopeAndType( 1L, FormInputScope.APPLICATION, FormInputType.FILEUPLOAD )).thenReturn(appendixFormInput); ServiceResult<CompetitionSetupQuestionResource> result = service.update(resource); assertTrue(result.isSuccess()); assertTrue(appendixFormInput.getActive()); assertEquals(resource.getNumberOfUploads(), appendixFormInput.getWordCount()); assertEquals(asSet(PDF), appendixFormInput.getAllowedFileTypes()); assertEquals(fileUploadGuidance, appendixFormInput.getGuidanceAnswer()); }
@Test public void update_shouldAppendFileTypeSeparatedByComma() { Long questionId = 1L; setMocksForSuccessfulUpdate(); CompetitionSetupQuestionResource resource = createValidQuestionResourceWithoutAppendixOptions(); resource.setAppendix(true); resource.setNumberOfUploads(1); resource.setAllowedAppendixResponseFileTypes(newLinkedHashSet(asSet(PDF, SPREADSHEET))); resource.setAppendixGuidance(fileUploadGuidance); FormInput appendixFormInput = newFormInput().build(); when(formInputRepository.findByQuestionIdAndScopeAndType(questionId, FormInputScope.APPLICATION, FormInputType.FILEUPLOAD)).thenReturn(appendixFormInput); service.update(resource); assertTrue(appendixFormInput.getAllowedFileTypes().contains(PDF)); assertTrue(appendixFormInput.getAllowedFileTypes().contains(SPREADSHEET)); }
@Test public void update_shouldAllowMultipleAppendixuploads() { Long questionId = 1L; setMocksForSuccessfulUpdate(); CompetitionSetupQuestionResource resource = createValidQuestionResourceWithoutAppendixOptions(); resource.setAppendix(true); resource.setNumberOfUploads(3); resource.setAllowedAppendixResponseFileTypes(newLinkedHashSet(asSet(PDF, SPREADSHEET))); resource.setAppendixGuidance(fileUploadGuidance); FormInput appendixFormInput = newFormInput().build(); when(formInputRepository.findByQuestionIdAndScopeAndType(questionId, FormInputScope.APPLICATION, FormInputType.FILEUPLOAD)).thenReturn(appendixFormInput); ServiceResult<CompetitionSetupQuestionResource> result = service.update(resource); assertTrue(result.isSuccess()); assertTrue(appendixFormInput.getActive()); assertEquals(resource.getNumberOfUploads(), appendixFormInput.getWordCount()); assertTrue(appendixFormInput.getAllowedFileTypes().contains(PDF)); assertTrue(appendixFormInput.getAllowedFileTypes().contains(SPREADSHEET)); }
@Test public void update_shouldNotUpdateApplicationDetailsHeading() { long questionId = 1L; String oldShortTitle = "Application details"; List<GuidanceRowResource> guidanceRows = newFormInputGuidanceRowResourceBuilder().build(1); when(guidanceRowMapper.mapToDomain(guidanceRows)).thenReturn(new ArrayList<>()); CompetitionSetupQuestionResource resource = newCompetitionSetupQuestionResource() .withAppendix(false) .withGuidance(guidance) .withGuidanceTitle(guidanceTitle) .withMaxWords(maxWords) .withNumber(number) .withTitle(title) .withShortTitle(newShortTitle) .withSubTitle(subTitle) .withQuestionId(questionId) .withType(QuestionSetupType.APPLICATION_DETAILS) .withAssessmentGuidance(assessmentGuidanceAnswer) .withAssessmentGuidanceTitle(assessmentGuidanceTitle) .withAssessmentMaxWords(assessmentMaxWords) .withGuidanceRows(guidanceRows) .withScored(true) .withScoreTotal(scoreTotal) .withWrittenFeedback(true) .build(); Question question = newQuestion(). withShortName(oldShortTitle) .withQuestionSetupType(QuestionSetupType.APPLICATION_DETAILS).build(); FormInput questionFormInput = newFormInput().build(); FormInput appendixFormInput = newFormInput().build(); FormInput researchCategoryQuestionFormInput = newFormInput().build(); FormInput scopeQuestionFormInput = newFormInput().build(); FormInput scoredQuestionFormInput = newFormInput().build(); FormInput writtenFeedbackFormInput = newFormInput() .withGuidanceRows(newFormInputGuidanceRow().build(2)) .build(); when(formInputRepository.findByQuestionIdAndScopeAndType(questionId, FormInputScope.APPLICATION, FormInputType.TEXTAREA)).thenReturn(questionFormInput); when(formInputRepository.findByQuestionIdAndScopeAndType(questionId, FormInputScope.APPLICATION, FormInputType.FILEUPLOAD)).thenReturn(appendixFormInput); when(questionRepository.findById(questionId)).thenReturn(Optional.of(question)); when(formInputRepository.findByQuestionIdAndScopeAndType(questionId, FormInputScope.ASSESSMENT, FormInputType.ASSESSOR_RESEARCH_CATEGORY)).thenReturn(researchCategoryQuestionFormInput); when(formInputRepository.findByQuestionIdAndScopeAndType(questionId, FormInputScope.ASSESSMENT, FormInputType.ASSESSOR_APPLICATION_IN_SCOPE)).thenReturn(scopeQuestionFormInput); when(formInputRepository.findByQuestionIdAndScopeAndType(questionId, FormInputScope.ASSESSMENT, FormInputType.ASSESSOR_SCORE)).thenReturn(scoredQuestionFormInput); when(formInputRepository.findByQuestionIdAndScopeAndType(questionId, FormInputScope.ASSESSMENT, FormInputType.TEXTAREA)).thenReturn(writtenFeedbackFormInput); doNothing().when(guidanceRowRepository).deleteAll(writtenFeedbackFormInput.getGuidanceRows()); when(guidanceRowRepository.saveAll(writtenFeedbackFormInput.getGuidanceRows())).thenReturn(writtenFeedbackFormInput.getGuidanceRows()); ServiceResult<CompetitionSetupQuestionResource> result = service.update(resource); assertTrue(result.isSuccess()); assertNotEquals(question.getQuestionNumber(), number); assertEquals(question.getShortName(), oldShortTitle); } |
UserController { @PostMapping("/internal/create/{inviteHash}") public RestResult<Void> createInternalUser(@PathVariable("inviteHash") String inviteHash, @Valid @RequestBody InternalUserRegistrationResource internalUserRegistrationResource){ return registrationService.createUser(anUserCreationResource() .withFirstName(internalUserRegistrationResource.getFirstName()) .withLastName(internalUserRegistrationResource.getLastName()) .withPassword(internalUserRegistrationResource.getPassword()) .withInviteHash(inviteHash) .build()) .andOnSuccessReturnVoid() .toPostCreateResponse(); } @GetMapping("/uid/{uid}") RestResult<UserResource> getUserByUid(@PathVariable String uid); @GetMapping("/id/{id}") RestResult<UserResource> getUserById(@PathVariable long id); @PostMapping RestResult<UserResource> createUser(@RequestBody UserCreationResource userCreationResource); @GetMapping("/find-by-role/{userRole}") RestResult<List<UserResource>> findByRole(@PathVariable Role userRole); @GetMapping("/find-by-role-and-status/{userRole}/status/{userStatus}") RestResult<List<UserResource>> findByRoleAndUserStatus(@PathVariable Role userRole, @PathVariable UserStatus userStatus); @GetMapping("/active") RestResult<ManageUserPageResource> findActiveUsers(@RequestParam(required = false) String filter,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE_NUMBER) int pageIndex,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize); @GetMapping("/inactive") RestResult<ManageUserPageResource> findInactiveUsers(@RequestParam(required = false) String filter,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE_NUMBER) int pageIndex,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize); @GetMapping("/external/active") RestResult<ManageUserPageResource> findActiveExternalUsers(@RequestParam(required = false) String filter,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE_NUMBER) int pageIndex,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize); @GetMapping("/external/inactive") RestResult<ManageUserPageResource> findInactiveExternalUsers(@RequestParam(required = false) String filter,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE_NUMBER) int pageIndex,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize); @PostMapping("/internal/create/{inviteHash}") RestResult<Void> createInternalUser(@PathVariable("inviteHash") String inviteHash, @Valid @RequestBody InternalUserRegistrationResource internalUserRegistrationResource); @PostMapping("/internal/edit") RestResult<Void> editInternalUser(@Valid @RequestBody EditUserResource editUserResource); @GetMapping("/find-all/") RestResult<List<UserResource>> findAll(); @GetMapping("/find-external-users") RestResult<List<UserOrganisationResource>> findExternalUsers(@RequestParam String searchString,
@RequestParam SearchCategory searchCategory); @GetMapping("/find-by-email/{email}/") RestResult<UserResource> findByEmail(@PathVariable String email); @GetMapping("/find-assignable-users/{applicationId}") RestResult<Set<UserResource>> findAssignableUsers(@PathVariable long applicationId); @GetMapping("/find-related-users/{applicationId}") RestResult<Set<UserResource>> findRelatedUsers(@PathVariable long applicationId); @GetMapping("/" + URL_SEND_PASSWORD_RESET_NOTIFICATION + "/{emailAddress}/") RestResult<Void> sendPasswordResetNotification(@PathVariable String emailAddress); @GetMapping("/" + URL_CHECK_PASSWORD_RESET_HASH + "/{hash}") RestResult<Void> checkPasswordReset(@PathVariable String hash); @PostMapping("/" + URL_PASSWORD_RESET + "/{hash}") RestResult<Void> resetPassword(@PathVariable String hash, @RequestBody final String password); @GetMapping("/" + URL_VERIFY_EMAIL + "/{hash}") RestResult<Void> verifyEmail(@PathVariable String hash); @PutMapping("/" + URL_RESEND_EMAIL_VERIFICATION_NOTIFICATION + "/{emailAddress}/") RestResult<Void> resendEmailVerificationNotification(@PathVariable String emailAddress); @PostMapping("/id/{userId}/agree-new-site-terms-and-conditions") RestResult<Void> agreeNewSiteTermsAndConditions(@PathVariable long userId); @PostMapping("/update-details") RestResult<Void> updateDetails(@RequestBody UserResource userResource); @PutMapping("{id}/update-email/{email:.+}") RestResult<Void> updateEmail(@PathVariable long id, @PathVariable String email); @PostMapping("/id/{id}/deactivate") RestResult<Void> deactivateUser(@PathVariable long id); @PostMapping("/id/{id}/reactivate") RestResult<Void> reactivateUser(@PathVariable long id); @PostMapping("{id}/grant/{role}") RestResult<Void> grantRole(@PathVariable long id, @PathVariable Role role); static final Sort DEFAULT_USER_SORT; } | @Test public void testCreateInternalUser() throws Exception { InternalUserRegistrationResource internalUserRegistrationResource = newInternalUserRegistrationResource() .withFirstName("First") .withLastName("Last") .withPassword("Passw0rd123") .build(); when(registrationServiceMock.createUser(refEq(anUserCreationResource() .withFirstName(internalUserRegistrationResource.getFirstName()) .withLastName(internalUserRegistrationResource.getLastName()) .withPassword(internalUserRegistrationResource.getPassword()) .withInviteHash("SomeHashString") .build()))).thenReturn(serviceSuccess(new UserResource())); mockMvc.perform( post("/user/internal/create/SomeHashString") .contentType(APPLICATION_JSON) .content(objectMapper.writeValueAsBytes(internalUserRegistrationResource)) ).andExpect(status().isCreated()); } |
QuestionSetupCompetitionServiceImpl extends BaseTransactionalService implements QuestionSetupCompetitionService { @Override @Transactional public ServiceResult<Void> delete(long questionId) { return questionSetupAddAndRemoveService.deleteQuestionInCompetition(questionId); } @Override ServiceResult<CompetitionSetupQuestionResource> getByQuestionId(long questionId); @Override @Transactional ServiceResult<CompetitionSetupQuestionResource> createByCompetitionId(long competitionId); @Override @Transactional ServiceResult<Void> addResearchCategoryQuestionToCompetition(long competitionId); @Override @Transactional ServiceResult<Void> delete(long questionId); @Override @Transactional ServiceResult<CompetitionSetupQuestionResource> update(CompetitionSetupQuestionResource competitionSetupQuestionResource); } | @Test public void delete() { long questionId = 1L; when(questionSetupAddAndRemoveService.deleteQuestionInCompetition(questionId)).thenReturn(serviceSuccess()); assertTrue(service.delete(questionId).isSuccess()); } |
QuestionSetupCompetitionServiceImpl extends BaseTransactionalService implements QuestionSetupCompetitionService { @Override @Transactional public ServiceResult<CompetitionSetupQuestionResource> createByCompetitionId(long competitionId) { return find(competitionRepository.findById(competitionId), notFoundError(Competition.class, competitionId)) .andOnSuccess(competition -> questionSetupAddAndRemoveService.addDefaultAssessedQuestionToCompetition(competition)) .andOnSuccess(this::mapQuestionToSuperQuestionResource); } @Override ServiceResult<CompetitionSetupQuestionResource> getByQuestionId(long questionId); @Override @Transactional ServiceResult<CompetitionSetupQuestionResource> createByCompetitionId(long competitionId); @Override @Transactional ServiceResult<Void> addResearchCategoryQuestionToCompetition(long competitionId); @Override @Transactional ServiceResult<Void> delete(long questionId); @Override @Transactional ServiceResult<CompetitionSetupQuestionResource> update(CompetitionSetupQuestionResource competitionSetupQuestionResource); } | @Test public void createByCompetitionId() { Competition competition = newCompetition().build(); Question newlyCreatedQuestion = newQuestion().build(); when(competitionRepositoryMock.findById(competition.getId())).thenReturn(Optional.of(competition)); when(questionSetupAddAndRemoveService.addDefaultAssessedQuestionToCompetition(competition)).thenReturn(serviceSuccess(newlyCreatedQuestion)); when(questionRepository.findById(newlyCreatedQuestion.getId())).thenReturn(Optional.of(newlyCreatedQuestion)); ServiceResult<CompetitionSetupQuestionResource> result = service.createByCompetitionId(competition.getId()); assertTrue(result.isSuccess()); CompetitionSetupQuestionResource resource = result.getSuccess(); assertEquals(newlyCreatedQuestion.getId(), resource.getQuestionId()); }
@Test public void createByCompetitionId_withNonExistentCompId() { Long competitionId = 22L; when(competitionRepositoryMock.findById(competitionId)).thenReturn(Optional.empty()); ServiceResult<CompetitionSetupQuestionResource> result = service.createByCompetitionId(competitionId); assertTrue(result.isFailure()); assertTrue(result.getFailure().is(CommonErrors.notFoundError(Competition.class, competitionId))); }
@Test public void createByCompetitionId_whenDefaultCreationFails() { Competition competition = newCompetition().build(); when(competitionRepositoryMock.findById(competition.getId())).thenReturn(Optional.of(competition)); when(questionSetupAddAndRemoveService.addDefaultAssessedQuestionToCompetition(competition)).thenReturn(serviceFailure(COMPETITION_NOT_EDITABLE)); ServiceResult<CompetitionSetupQuestionResource> result = service.createByCompetitionId(competition.getId()); assertTrue(result.isFailure()); assertTrue(result.getFailure().is(COMPETITION_NOT_EDITABLE)); } |
QuestionSetupCompetitionServiceImpl extends BaseTransactionalService implements QuestionSetupCompetitionService { @Override @Transactional public ServiceResult<Void> addResearchCategoryQuestionToCompetition(long competitionId) { return find(competitionRepository.findById(competitionId), notFoundError(Competition.class, competitionId)) .andOnSuccess(this::saveNewResearchCategoryQuestionForCompetition) .andOnSuccessReturnVoid(); } @Override ServiceResult<CompetitionSetupQuestionResource> getByQuestionId(long questionId); @Override @Transactional ServiceResult<CompetitionSetupQuestionResource> createByCompetitionId(long competitionId); @Override @Transactional ServiceResult<Void> addResearchCategoryQuestionToCompetition(long competitionId); @Override @Transactional ServiceResult<Void> delete(long questionId); @Override @Transactional ServiceResult<CompetitionSetupQuestionResource> update(CompetitionSetupQuestionResource competitionSetupQuestionResource); } | @Test public void addResearchCategoryQuestionToCompetition() { Competition competition = newCompetition().build(); Section section = newSection().build(); Question createdQuestion = newQuestion().build(); when(competitionRepositoryMock.findById(competition.getId())).thenReturn(Optional.of(competition)); when(sectionRepository.findFirstByCompetitionIdAndName(competition.getId(), PROJECT_DETAILS.getName())) .thenReturn(section); when(questionRepository.save(createResearchCategoryQuestionExpectations(competition, section))) .thenReturn(createdQuestion); ServiceResult<Void> result = service.addResearchCategoryQuestionToCompetition(competition.getId()); assertTrue(result.isSuccess()); verify(competitionRepositoryMock).findById(competition.getId()); verify(sectionRepository).findFirstByCompetitionIdAndName(competition.getId(), PROJECT_DETAILS.getName()); verify(questionRepository).save(createResearchCategoryQuestionExpectations(competition, section)); verify(questionPriorityOrderService).prioritiseResearchCategoryQuestionAfterCreation(createdQuestion); } |
QuestionPriorityOrderService { @Transactional @NotSecured("Must be secured by other services.") public Question prioritiseResearchCategoryQuestionAfterCreation(Question createdQuestion) { Question applicationDetailsQuestion = questionRepository.findFirstByCompetitionIdAndQuestionSetupType (createdQuestion.getCompetition().getId(), QuestionSetupType.APPLICATION_DETAILS); QuestionSection questionSection = QuestionSection.findByName(createdQuestion.getSection().getName()); updateFollowingQuestionsPrioritiesByDelta(1, applicationDetailsQuestion.getPriority(), createdQuestion.getCompetition() .getId(), questionSection); createdQuestion.setPriority(applicationDetailsQuestion.getPriority() + 1); return questionRepository.save(createdQuestion); } @Transactional @NotSecured("Must be secured by other services.") Question prioritiseResearchCategoryQuestionAfterCreation(Question createdQuestion); @Transactional @NotSecured("Must be secured by other services.") Question prioritiseAssessedQuestionAfterCreation(Question createdQuestion); @Transactional @NotSecured("Must be secured by other services.") void reprioritiseQuestionsAfterDeletion(Question deletedQuestion); @NotSecured("Must be secured by other services.") void persistAndPrioritiseSections(Competition competition, List<Section> sections, Section parent); @NotSecured("Must be secured by other services.") List<Question> peristAndPrioritiesQuestions(Competition competition, List<Question> questions, Section parent); @NotSecured("Must be secured by other services.") List<Question> peristAndPrioritiesQuestions(Competition competition, List<Question> questions, Section parent,
FormValidator notEmptyValidator, FormValidator wordCountValidator,
FormValidator researchCategoryValidator, FormValidator assessorScopeValidator,
FormValidator assessorScoreValidator, FormValidator requiredFileValidator,
FormValidator requiredMultipleChoiceValidator); } | @Test public void prioritiseResearchCategoryQuestionAfterCreation() { Competition competition = newCompetition().build(); Section section = newSection() .withName(PROJECT_DETAILS.getName()) .build(); Question newlyCreatedQuestion = newQuestion() .withCompetition(competition) .withSection(section) .withPriority((Integer) null) .build(); Question applicationDetailsQuestion = newQuestion() .withPriority(2) .build(); List<Question> questions = newQuestion() .withPriority(3, 4, 5) .build(3); when(questionRepositoryMock.findFirstByCompetitionIdAndQuestionSetupType(competition.getId(), APPLICATION_DETAILS)).thenReturn(applicationDetailsQuestion); when(questionRepositoryMock.findByCompetitionIdAndSectionNameAndPriorityGreaterThanOrderByPriorityAsc( competition.getId(), PROJECT_DETAILS.getName(), applicationDetailsQuestion.getPriority())).thenReturn( questions); service.prioritiseResearchCategoryQuestionAfterCreation(newlyCreatedQuestion); assertEquals(applicationDetailsQuestion.getPriority() + 1, newlyCreatedQuestion.getPriority().intValue()); List<Question> expectedQuestions = newQuestion() .withId(questions.get(0).getId(), questions.get(1).getId(), questions.get(2).getId()) .withPriority(5, 5, 6) .build(3); verify(questionRepositoryMock).saveAll(refEq(expectedQuestions)); verify(questionRepositoryMock).save(refEq(newlyCreatedQuestion)); } |
QuestionPriorityOrderService { @Transactional @NotSecured("Must be secured by other services.") public Question prioritiseAssessedQuestionAfterCreation(Question createdQuestion) { Question assessedQuestionWithHighestPriority = questionRepository .findFirstByCompetitionIdAndSectionNameOrderByPriorityDesc(createdQuestion.getCompetition().getId(), APPLICATION_QUESTIONS.getName()); createdQuestion.setPriority(assessedQuestionWithHighestPriority.getPriority() + 1); Question questionSaved = questionRepository.save(createdQuestion); questionNumberOrderService.updateAssessedQuestionsNumbers(createdQuestion.getCompetition().getId()); return questionSaved; } @Transactional @NotSecured("Must be secured by other services.") Question prioritiseResearchCategoryQuestionAfterCreation(Question createdQuestion); @Transactional @NotSecured("Must be secured by other services.") Question prioritiseAssessedQuestionAfterCreation(Question createdQuestion); @Transactional @NotSecured("Must be secured by other services.") void reprioritiseQuestionsAfterDeletion(Question deletedQuestion); @NotSecured("Must be secured by other services.") void persistAndPrioritiseSections(Competition competition, List<Section> sections, Section parent); @NotSecured("Must be secured by other services.") List<Question> peristAndPrioritiesQuestions(Competition competition, List<Question> questions, Section parent); @NotSecured("Must be secured by other services.") List<Question> peristAndPrioritiesQuestions(Competition competition, List<Question> questions, Section parent,
FormValidator notEmptyValidator, FormValidator wordCountValidator,
FormValidator researchCategoryValidator, FormValidator assessorScopeValidator,
FormValidator assessorScoreValidator, FormValidator requiredFileValidator,
FormValidator requiredMultipleChoiceValidator); } | @Test public void prioritiseAssessedQuestionAfterCreation() { Competition competition = newCompetition().build(); List<Question> existingQuestions = newQuestion() .withId(1L, 2L, 3L, 4L) .withPriority(1, 2, 3, null) .withCompetition(competition) .build(4); Question lastPrioritizedQuestion = existingQuestions.get(2); Question newlyCreatedQuestion = existingQuestions.get(3); when(questionRepositoryMock.findFirstByCompetitionIdAndSectionNameOrderByPriorityDesc(lastPrioritizedQuestion.getCompetition().getId(), APPLICATION_QUESTIONS.getName())).thenReturn(lastPrioritizedQuestion); service.prioritiseAssessedQuestionAfterCreation(newlyCreatedQuestion); Question expectedQuestion = newlyCreatedQuestion; expectedQuestion.setPriority(4); verify(questionNumberOrderServiceMock).updateAssessedQuestionsNumbers(expectedQuestion.getCompetition().getId()); verify(questionRepositoryMock, times(1)).save(refEq(expectedQuestion)); } |
UserController { @PostMapping("/id/{userId}/agree-new-site-terms-and-conditions") public RestResult<Void> agreeNewSiteTermsAndConditions(@PathVariable long userId) { return userService.agreeNewTermsAndConditions(userId).toPostResponse(); } @GetMapping("/uid/{uid}") RestResult<UserResource> getUserByUid(@PathVariable String uid); @GetMapping("/id/{id}") RestResult<UserResource> getUserById(@PathVariable long id); @PostMapping RestResult<UserResource> createUser(@RequestBody UserCreationResource userCreationResource); @GetMapping("/find-by-role/{userRole}") RestResult<List<UserResource>> findByRole(@PathVariable Role userRole); @GetMapping("/find-by-role-and-status/{userRole}/status/{userStatus}") RestResult<List<UserResource>> findByRoleAndUserStatus(@PathVariable Role userRole, @PathVariable UserStatus userStatus); @GetMapping("/active") RestResult<ManageUserPageResource> findActiveUsers(@RequestParam(required = false) String filter,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE_NUMBER) int pageIndex,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize); @GetMapping("/inactive") RestResult<ManageUserPageResource> findInactiveUsers(@RequestParam(required = false) String filter,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE_NUMBER) int pageIndex,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize); @GetMapping("/external/active") RestResult<ManageUserPageResource> findActiveExternalUsers(@RequestParam(required = false) String filter,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE_NUMBER) int pageIndex,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize); @GetMapping("/external/inactive") RestResult<ManageUserPageResource> findInactiveExternalUsers(@RequestParam(required = false) String filter,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE_NUMBER) int pageIndex,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize); @PostMapping("/internal/create/{inviteHash}") RestResult<Void> createInternalUser(@PathVariable("inviteHash") String inviteHash, @Valid @RequestBody InternalUserRegistrationResource internalUserRegistrationResource); @PostMapping("/internal/edit") RestResult<Void> editInternalUser(@Valid @RequestBody EditUserResource editUserResource); @GetMapping("/find-all/") RestResult<List<UserResource>> findAll(); @GetMapping("/find-external-users") RestResult<List<UserOrganisationResource>> findExternalUsers(@RequestParam String searchString,
@RequestParam SearchCategory searchCategory); @GetMapping("/find-by-email/{email}/") RestResult<UserResource> findByEmail(@PathVariable String email); @GetMapping("/find-assignable-users/{applicationId}") RestResult<Set<UserResource>> findAssignableUsers(@PathVariable long applicationId); @GetMapping("/find-related-users/{applicationId}") RestResult<Set<UserResource>> findRelatedUsers(@PathVariable long applicationId); @GetMapping("/" + URL_SEND_PASSWORD_RESET_NOTIFICATION + "/{emailAddress}/") RestResult<Void> sendPasswordResetNotification(@PathVariable String emailAddress); @GetMapping("/" + URL_CHECK_PASSWORD_RESET_HASH + "/{hash}") RestResult<Void> checkPasswordReset(@PathVariable String hash); @PostMapping("/" + URL_PASSWORD_RESET + "/{hash}") RestResult<Void> resetPassword(@PathVariable String hash, @RequestBody final String password); @GetMapping("/" + URL_VERIFY_EMAIL + "/{hash}") RestResult<Void> verifyEmail(@PathVariable String hash); @PutMapping("/" + URL_RESEND_EMAIL_VERIFICATION_NOTIFICATION + "/{emailAddress}/") RestResult<Void> resendEmailVerificationNotification(@PathVariable String emailAddress); @PostMapping("/id/{userId}/agree-new-site-terms-and-conditions") RestResult<Void> agreeNewSiteTermsAndConditions(@PathVariable long userId); @PostMapping("/update-details") RestResult<Void> updateDetails(@RequestBody UserResource userResource); @PutMapping("{id}/update-email/{email:.+}") RestResult<Void> updateEmail(@PathVariable long id, @PathVariable String email); @PostMapping("/id/{id}/deactivate") RestResult<Void> deactivateUser(@PathVariable long id); @PostMapping("/id/{id}/reactivate") RestResult<Void> reactivateUser(@PathVariable long id); @PostMapping("{id}/grant/{role}") RestResult<Void> grantRole(@PathVariable long id, @PathVariable Role role); static final Sort DEFAULT_USER_SORT; } | @Test public void agreeNewSiteTermsAndConditions() throws Exception { long userId = 1L; when(userServiceMock.agreeNewTermsAndConditions(1L)).thenReturn(serviceSuccess(newUserResource().build())); mockMvc.perform(post("/user/id/{userId}/agree-new-site-terms-and-conditions", userId)) .andExpect(status().isOk()); verify(userServiceMock, only()).agreeNewTermsAndConditions(userId); } |
QuestionPriorityOrderService { @Transactional @NotSecured("Must be secured by other services.") public void reprioritiseQuestionsAfterDeletion(Question deletedQuestion) { QuestionSection questionSection = QuestionSection.findByName(deletedQuestion.getSection().getName()); updateFollowingQuestionsPrioritiesByDelta(-1, deletedQuestion.getPriority(), deletedQuestion.getCompetition().getId(), questionSection); } @Transactional @NotSecured("Must be secured by other services.") Question prioritiseResearchCategoryQuestionAfterCreation(Question createdQuestion); @Transactional @NotSecured("Must be secured by other services.") Question prioritiseAssessedQuestionAfterCreation(Question createdQuestion); @Transactional @NotSecured("Must be secured by other services.") void reprioritiseQuestionsAfterDeletion(Question deletedQuestion); @NotSecured("Must be secured by other services.") void persistAndPrioritiseSections(Competition competition, List<Section> sections, Section parent); @NotSecured("Must be secured by other services.") List<Question> peristAndPrioritiesQuestions(Competition competition, List<Question> questions, Section parent); @NotSecured("Must be secured by other services.") List<Question> peristAndPrioritiesQuestions(Competition competition, List<Question> questions, Section parent,
FormValidator notEmptyValidator, FormValidator wordCountValidator,
FormValidator researchCategoryValidator, FormValidator assessorScopeValidator,
FormValidator assessorScoreValidator, FormValidator requiredFileValidator,
FormValidator requiredMultipleChoiceValidator); } | @Test public void reprioritiseQuestionsAfterDeletion_deleteMiddleQuestionShouldAffectOnlySubsequentPriorities() { Competition competition = newCompetition().build(); List<Question> existingQuestions = newQuestion() .withId(1L, 2L, 4L) .withPriority(1, 2, 4) .withCompetition(competition) .build(3); Section section = newSection() .withName(APPLICATION_QUESTIONS.getName()) .build(); Question deletedQuestion = newQuestion() .withId(3L) .withPriority(3) .withCompetition(competition) .withSection(section) .build(); when(questionRepositoryMock.findByCompetitionIdAndSectionNameAndPriorityGreaterThanOrderByPriorityAsc( deletedQuestion.getCompetition().getId(), APPLICATION_QUESTIONS.getName(), deletedQuestion.getPriority())) .thenReturn(existingQuestions); service.reprioritiseQuestionsAfterDeletion(deletedQuestion); List<Question> expectedQuestions = newQuestion() .withId(1L, 2L, 4L) .withPriority(1, 2, 3) .withCompetition(competition) .build(3); verify(questionRepositoryMock).saveAll(refEq(expectedQuestions)); }
@Test public void reprioritiseQuestionsAfterDeletion_deleteFirstQuestionShouldAffectAllPriorities() { Competition competition = newCompetition().build(); List<Question> existingQuestions = newQuestion() .withId(2L, 3L, 4L) .withPriority(2, 3, 4) .withCompetition(competition) .build(3); Section section = newSection() .withName(APPLICATION_QUESTIONS.getName()) .build(); Question deletedQuestion = newQuestion() .withId(1L) .withPriority(1) .withCompetition(competition) .withSection(section) .build(); when(questionRepositoryMock.findByCompetitionIdAndSectionNameAndPriorityGreaterThanOrderByPriorityAsc( deletedQuestion.getCompetition().getId(), APPLICATION_QUESTIONS.getName(), deletedQuestion.getPriority())) .thenReturn(existingQuestions); service.reprioritiseQuestionsAfterDeletion(deletedQuestion); List<Question> expectedQuestions = newQuestion() .withId(2L, 3L, 4L) .withPriority(1, 2, 3) .withCompetition(competition) .build(3); verify(questionRepositoryMock).saveAll(refEq(expectedQuestions)); }
@Test public void reprioritiseQuestionsAfterDeletion_deleteLastQuestionShouldAffectNoPriorities() { Competition competition = newCompetition().build(); List<Question> existingQuestions = newQuestion() .withId(1L, 2L, 3L) .withPriority(1, 2, 3) .withCompetition(competition) .build(3); Section section = newSection() .withName(APPLICATION_QUESTIONS.getName()) .build(); Question lastQuestion = newQuestion() .withId(4L) .withPriority(3) .withCompetition(competition) .withSection(section) .build(); when(questionRepositoryMock.findByCompetitionIdAndSectionNameAndPriorityGreaterThanOrderByPriorityAsc( lastQuestion.getCompetition().getId(), APPLICATION_QUESTIONS.getName(), lastQuestion.getPriority())) .thenReturn(existingQuestions); service.reprioritiseQuestionsAfterDeletion(lastQuestion); List<Question> expectedQuestions = newQuestion() .withId(1L, 2L, 3L) .withPriority(1, 2, 3) .withCompetition(competition) .build(3); verify(questionRepositoryMock).saveAll(refEq(expectedQuestions)); } |
QuestionSetupAddAndRemoveServiceImpl implements QuestionSetupAddAndRemoveService { @Override public ServiceResult<Void> deleteQuestionInCompetition(long questionId) { return find(questionRepository.findFirstById(questionId), notFoundError(Question.class, questionId)) .andOnSuccess(this::deleteQuestion); } @Override ServiceResult<Question> addDefaultAssessedQuestionToCompetition(Competition competition); @Override ServiceResult<Void> deleteQuestionInCompetition(long questionId); } | @Test public void deleteQuestionInCompetition_questionNotFoundShouldResultInServiceFailure() { final long questionId = 1L; when(questionRepositoryMock.findFirstById(questionId)).thenReturn(null); ServiceResult<Void> resultAssessedQuestion = service.deleteQuestionInCompetition(questionId); assertTrue(resultAssessedQuestion.isFailure()); }
@Test public void deleteQuestionInCompetition_questionWithoutCompetitionShouldResultInServiceFailure() { Question question = newQuestion().build(); when(questionRepositoryMock.findFirstById(question.getId())).thenReturn(question); ServiceResult<Void> resultAssessedQuestion = service.deleteQuestionInCompetition(question.getId()); assertTrue(resultAssessedQuestion.isFailure()); }
@Test public void deleteQuestionInCompetition_competitionNotInSetupOrReadyStateShouldResultInFailure() { Competition competition = newCompetition().withCompetitionStatus(CompetitionStatus.OPEN).build(); Question question = newQuestion().withCompetition(competition).build(); when(questionRepositoryMock.findFirstById(question.getId())).thenReturn(question); ServiceResult<Void> resultAssessedQuestion = service.deleteQuestionInCompetition(question.getId()); assertTrue(resultAssessedQuestion.isFailure()); }
@Test public void deleteAssessedQuestionInCompetition_questionSectionTotalQuestionIsOneOrLessShouldResultInFailure() { Competition readyToOpenCompetition = newCompetition().withCompetitionStatus(CompetitionStatus.READY_TO_OPEN).build(); Section section = newSection().withName(APPLICATION_QUESTIONS.getName()).build(); Question question = newQuestion().withCompetition(readyToOpenCompetition).withSection(section).build(); when(questionRepositoryMock.findFirstById(question.getId())).thenReturn(question); when(questionRepositoryMock.countByCompetitionId(readyToOpenCompetition.getId())).thenReturn(1L); ServiceResult<Void> resultAssessedQuestion = service.deleteQuestionInCompetition(question.getId()); assertTrue(resultAssessedQuestion.isFailure()); }
@Test public void deleteQuestionInCompetition_invalidSectionShouldResultInFailure() { Competition readyToOpenCompetition = newCompetition().withCompetitionStatus(CompetitionStatus.READY_TO_OPEN).build(); Question question = newQuestion().withCompetition(readyToOpenCompetition).build(); ServiceResult<Void> resultNonExisting = service.deleteQuestionInCompetition(question.getId()); assertTrue(resultNonExisting.isFailure()); ServiceResult<Void> resultInvalid = service.deleteQuestionInCompetition(question.getId()); assertTrue(resultInvalid.isFailure()); } |
QuestionSetupAddAndRemoveServiceImpl implements QuestionSetupAddAndRemoveService { @Override public ServiceResult<Question> addDefaultAssessedQuestionToCompetition(Competition competition) { if (competition == null || competitionIsNotInSetupOrReadyToOpenState(competition)) { return serviceFailure(new Error(COMPETITION_NOT_EDITABLE)); } return find(sectionRepository.findFirstByCompetitionIdAndName( competition.getId(), APPLICATION_QUESTIONS.getName()), notFoundError(Section.class) ).andOnSuccess(section -> initializeAndPersistQuestion(section, competition)); } @Override ServiceResult<Question> addDefaultAssessedQuestionToCompetition(Competition competition); @Override ServiceResult<Void> deleteQuestionInCompetition(long questionId); } | @Test public void addDefaultAssessedQuestionToCompetition_competitionIsNullShouldResultInFailure() { ServiceResult<Question> result = service.addDefaultAssessedQuestionToCompetition(null); assertTrue(result.isFailure()); }
@Test public void addDefaultAssessedQuestionToCompetition_competitionIsNotInReadyOrSetupStateShouldResultInFailure() { Competition competitionInWrongState = newCompetition().withCompetitionStatus(CompetitionStatus.OPEN).build(); ServiceResult<Question> result = service.addDefaultAssessedQuestionToCompetition(competitionInWrongState); assertTrue(result.isFailure()); }
@Test public void addDefaultAssessedQuestionToCompetition_sectionCannotBeFoundShouldResultInServiceFailure() { Competition competitionInWrongState = newCompetition().withCompetitionStatus(CompetitionStatus.READY_TO_OPEN).build(); when(sectionRepositoryMock.findFirstByCompetitionIdAndName(competitionInWrongState.getId(), APPLICATION_QUESTIONS.getName())).thenReturn(null); ServiceResult<Question> result = service.addDefaultAssessedQuestionToCompetition(competitionInWrongState); assertTrue(result.isFailure()); } |
UserController { @PostMapping("/internal/edit") public RestResult<Void> editInternalUser(@Valid @RequestBody EditUserResource editUserResource){ UserResource userToEdit = getUserToEdit(editUserResource); return registrationService.editInternalUser(userToEdit, editUserResource.getUserRoleType()).toPostResponse(); } @GetMapping("/uid/{uid}") RestResult<UserResource> getUserByUid(@PathVariable String uid); @GetMapping("/id/{id}") RestResult<UserResource> getUserById(@PathVariable long id); @PostMapping RestResult<UserResource> createUser(@RequestBody UserCreationResource userCreationResource); @GetMapping("/find-by-role/{userRole}") RestResult<List<UserResource>> findByRole(@PathVariable Role userRole); @GetMapping("/find-by-role-and-status/{userRole}/status/{userStatus}") RestResult<List<UserResource>> findByRoleAndUserStatus(@PathVariable Role userRole, @PathVariable UserStatus userStatus); @GetMapping("/active") RestResult<ManageUserPageResource> findActiveUsers(@RequestParam(required = false) String filter,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE_NUMBER) int pageIndex,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize); @GetMapping("/inactive") RestResult<ManageUserPageResource> findInactiveUsers(@RequestParam(required = false) String filter,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE_NUMBER) int pageIndex,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize); @GetMapping("/external/active") RestResult<ManageUserPageResource> findActiveExternalUsers(@RequestParam(required = false) String filter,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE_NUMBER) int pageIndex,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize); @GetMapping("/external/inactive") RestResult<ManageUserPageResource> findInactiveExternalUsers(@RequestParam(required = false) String filter,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE_NUMBER) int pageIndex,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize); @PostMapping("/internal/create/{inviteHash}") RestResult<Void> createInternalUser(@PathVariable("inviteHash") String inviteHash, @Valid @RequestBody InternalUserRegistrationResource internalUserRegistrationResource); @PostMapping("/internal/edit") RestResult<Void> editInternalUser(@Valid @RequestBody EditUserResource editUserResource); @GetMapping("/find-all/") RestResult<List<UserResource>> findAll(); @GetMapping("/find-external-users") RestResult<List<UserOrganisationResource>> findExternalUsers(@RequestParam String searchString,
@RequestParam SearchCategory searchCategory); @GetMapping("/find-by-email/{email}/") RestResult<UserResource> findByEmail(@PathVariable String email); @GetMapping("/find-assignable-users/{applicationId}") RestResult<Set<UserResource>> findAssignableUsers(@PathVariable long applicationId); @GetMapping("/find-related-users/{applicationId}") RestResult<Set<UserResource>> findRelatedUsers(@PathVariable long applicationId); @GetMapping("/" + URL_SEND_PASSWORD_RESET_NOTIFICATION + "/{emailAddress}/") RestResult<Void> sendPasswordResetNotification(@PathVariable String emailAddress); @GetMapping("/" + URL_CHECK_PASSWORD_RESET_HASH + "/{hash}") RestResult<Void> checkPasswordReset(@PathVariable String hash); @PostMapping("/" + URL_PASSWORD_RESET + "/{hash}") RestResult<Void> resetPassword(@PathVariable String hash, @RequestBody final String password); @GetMapping("/" + URL_VERIFY_EMAIL + "/{hash}") RestResult<Void> verifyEmail(@PathVariable String hash); @PutMapping("/" + URL_RESEND_EMAIL_VERIFICATION_NOTIFICATION + "/{emailAddress}/") RestResult<Void> resendEmailVerificationNotification(@PathVariable String emailAddress); @PostMapping("/id/{userId}/agree-new-site-terms-and-conditions") RestResult<Void> agreeNewSiteTermsAndConditions(@PathVariable long userId); @PostMapping("/update-details") RestResult<Void> updateDetails(@RequestBody UserResource userResource); @PutMapping("{id}/update-email/{email:.+}") RestResult<Void> updateEmail(@PathVariable long id, @PathVariable String email); @PostMapping("/id/{id}/deactivate") RestResult<Void> deactivateUser(@PathVariable long id); @PostMapping("/id/{id}/reactivate") RestResult<Void> reactivateUser(@PathVariable long id); @PostMapping("{id}/grant/{role}") RestResult<Void> grantRole(@PathVariable long id, @PathVariable Role role); static final Sort DEFAULT_USER_SORT; } | @Test public void editInternalUser() throws Exception { EditUserResource editUserResource = new EditUserResource(1L, "First", "Last", Role.IFS_ADMINISTRATOR); when(registrationServiceMock.editInternalUser(any(), any())).thenReturn(serviceSuccess(newUserResource().build())); mockMvc.perform(post("/user/internal/edit") .contentType(APPLICATION_JSON) .content(toJson(editUserResource))) .andExpect(status().isOk()); verify(registrationServiceMock).editInternalUser(any(), any()); } |
ProjectInvitePermissionRules extends BasePermissionRules { @PermissionRule(value = "SAVE_PROJECT_INVITE", description = "A user can save a project invite that they are partners on and belong to same organisation") public boolean partnersOnProjectCanSaveInvite(final ProjectUserInviteResource invite, UserResource user) { return isUserPartnerOnProjectWithinSameOrganisation(invite, user); } @PermissionRule(value = "READ_PROJECT_INVITE", description = "A user can view a project invite that they are partners on") boolean partnersOnProjectCanViewInvite(final ProjectUserInviteResource invite, UserResource user); @PermissionRule(value = "READ_PROJECT_INVITE", description = "Internal users can see the invites to any project") boolean internalUsersCanReadInvite(final ProjectUserInviteResource invite, UserResource user); @PermissionRule(value = "SEND_PROJECT_INVITE", description = "A user can send a project invite that they are partners on and belong to same organisation") boolean partnersOnProjectCanSendInvite(final ProjectUserInviteResource invite, UserResource user); @PermissionRule(value = "SEND_PROJECT_INVITE", description = "Internal users can send invites to any project") boolean internalUsersCanSendInvite(final ProjectUserInviteResource invite, UserResource user); @PermissionRule(value = "SAVE_PROJECT_INVITE", description = "A user can save a project invite that they are partners on and belong to same organisation") boolean partnersOnProjectCanSaveInvite(final ProjectUserInviteResource invite, UserResource user); @PermissionRule(value = "SAVE_PROJECT_INVITE", description = "Internal users can save invites to any project") boolean internalUsersCanSaveInvite(final ProjectUserInviteResource invite, UserResource user); @PermissionRule(value = "DELETE_PROJECT_INVITE", description = "A user can delete a project invite that they are partners on and belong to same organisation") boolean partnersOnProjectCanDeleteInvite(final ProjectUserInviteResource invite, UserResource user); @PermissionRule(value = "DELETE_PROJECT_INVITE", description = "Internal users can delete invites to any project") boolean internalUsersCanDeleteInvite(final ProjectUserInviteResource invite, UserResource user); } | @Test public void partnersOnProjectCanSaveInvite() { assertTrue(rules.partnersOnProjectCanSaveInvite(projectUserInviteResourceForOrganisationOne, userOnProjectForOrganisationOne)); assertTrue(rules.partnersOnProjectCanSaveInvite(projectUserInviteResourceForOrganisationTwo, userOnProjectForOrganisationTwo)); assertFalse(rules.partnersOnProjectCanSaveInvite(projectUserInviteResourceForOrganisationOne, userOnProjectForOrganisationTwo)); assertFalse(rules.partnersOnProjectCanSaveInvite(projectUserInviteResourceForOrganisationOne, userNotOnProject)); } |
ProjectInvitePermissionRules extends BasePermissionRules { @PermissionRule(value = "SEND_PROJECT_INVITE", description = "A user can send a project invite that they are partners on and belong to same organisation") public boolean partnersOnProjectCanSendInvite(final ProjectUserInviteResource invite, UserResource user) { return isUserPartnerOnProjectWithinSameOrganisation(invite, user) && isProjectActive(invite.getProject()); } @PermissionRule(value = "READ_PROJECT_INVITE", description = "A user can view a project invite that they are partners on") boolean partnersOnProjectCanViewInvite(final ProjectUserInviteResource invite, UserResource user); @PermissionRule(value = "READ_PROJECT_INVITE", description = "Internal users can see the invites to any project") boolean internalUsersCanReadInvite(final ProjectUserInviteResource invite, UserResource user); @PermissionRule(value = "SEND_PROJECT_INVITE", description = "A user can send a project invite that they are partners on and belong to same organisation") boolean partnersOnProjectCanSendInvite(final ProjectUserInviteResource invite, UserResource user); @PermissionRule(value = "SEND_PROJECT_INVITE", description = "Internal users can send invites to any project") boolean internalUsersCanSendInvite(final ProjectUserInviteResource invite, UserResource user); @PermissionRule(value = "SAVE_PROJECT_INVITE", description = "A user can save a project invite that they are partners on and belong to same organisation") boolean partnersOnProjectCanSaveInvite(final ProjectUserInviteResource invite, UserResource user); @PermissionRule(value = "SAVE_PROJECT_INVITE", description = "Internal users can save invites to any project") boolean internalUsersCanSaveInvite(final ProjectUserInviteResource invite, UserResource user); @PermissionRule(value = "DELETE_PROJECT_INVITE", description = "A user can delete a project invite that they are partners on and belong to same organisation") boolean partnersOnProjectCanDeleteInvite(final ProjectUserInviteResource invite, UserResource user); @PermissionRule(value = "DELETE_PROJECT_INVITE", description = "Internal users can delete invites to any project") boolean internalUsersCanDeleteInvite(final ProjectUserInviteResource invite, UserResource user); } | @Test public void partnersOnProjectCanSendInvite() { assertTrue(rules.partnersOnProjectCanSendInvite(projectUserInviteResourceForOrganisationOne, userOnProjectForOrganisationOne)); assertTrue(rules.partnersOnProjectCanSendInvite(projectUserInviteResourceForOrganisationTwo, userOnProjectForOrganisationTwo)); assertFalse(rules.partnersOnProjectCanSendInvite(projectUserInviteResourceForOrganisationOne, userOnProjectForOrganisationTwo)); assertFalse(rules.partnersOnProjectCanSendInvite(projectUserInviteResourceForOrganisationOne, userNotOnProject)); } |
ProjectInvitePermissionRules extends BasePermissionRules { @PermissionRule(value = "READ_PROJECT_INVITE", description = "A user can view a project invite that they are partners on") public boolean partnersOnProjectCanViewInvite(final ProjectUserInviteResource invite, UserResource user) { return isUserMemberOfProjectTeam(invite, user); } @PermissionRule(value = "READ_PROJECT_INVITE", description = "A user can view a project invite that they are partners on") boolean partnersOnProjectCanViewInvite(final ProjectUserInviteResource invite, UserResource user); @PermissionRule(value = "READ_PROJECT_INVITE", description = "Internal users can see the invites to any project") boolean internalUsersCanReadInvite(final ProjectUserInviteResource invite, UserResource user); @PermissionRule(value = "SEND_PROJECT_INVITE", description = "A user can send a project invite that they are partners on and belong to same organisation") boolean partnersOnProjectCanSendInvite(final ProjectUserInviteResource invite, UserResource user); @PermissionRule(value = "SEND_PROJECT_INVITE", description = "Internal users can send invites to any project") boolean internalUsersCanSendInvite(final ProjectUserInviteResource invite, UserResource user); @PermissionRule(value = "SAVE_PROJECT_INVITE", description = "A user can save a project invite that they are partners on and belong to same organisation") boolean partnersOnProjectCanSaveInvite(final ProjectUserInviteResource invite, UserResource user); @PermissionRule(value = "SAVE_PROJECT_INVITE", description = "Internal users can save invites to any project") boolean internalUsersCanSaveInvite(final ProjectUserInviteResource invite, UserResource user); @PermissionRule(value = "DELETE_PROJECT_INVITE", description = "A user can delete a project invite that they are partners on and belong to same organisation") boolean partnersOnProjectCanDeleteInvite(final ProjectUserInviteResource invite, UserResource user); @PermissionRule(value = "DELETE_PROJECT_INVITE", description = "Internal users can delete invites to any project") boolean internalUsersCanDeleteInvite(final ProjectUserInviteResource invite, UserResource user); } | @Test public void partnersOnProjectCanViewInvite(){ assertTrue(rules.partnersOnProjectCanViewInvite(projectUserInviteResourceForOrganisationOne, userOnProjectForOrganisationOne)); assertTrue(rules.partnersOnProjectCanViewInvite(projectUserInviteResourceForOrganisationOne, userOnProjectForOrganisationTwo)); assertFalse(rules.partnersOnProjectCanViewInvite(projectUserInviteResourceForOrganisationOne, userNotOnProject)); } |
InviteUserPermissionRules extends BasePermissionRules { @PermissionRule(value = "SAVE_USER_INVITE", description = "Only an IFS Administrator can save a new user invite") public boolean ifsAdminCanSaveNewUserInvite(final UserResource invitedUser, UserResource user) { return user.hasRole(IFS_ADMINISTRATOR); } @PermissionRule(value = "SAVE_USER_INVITE", description = "Only an IFS Administrator can save a new user invite") boolean ifsAdminCanSaveNewUserInvite(final UserResource invitedUser, UserResource user); @PermissionRule(value = "READ", description = "Internal users can view pending internal user invites") boolean internalUsersCanViewPendingInternalUserInvites(RoleInvitePageResource invite, UserResource user); } | @Test public void ifsAdminCanSaveNewUserInvite() { assertTrue(rules.ifsAdminCanSaveNewUserInvite(invitedUser, ifsAdmin)); assertFalse(rules.ifsAdminCanSaveNewUserInvite(invitedUser, nonIfsAdmin)); } |
InviteUserPermissionRules extends BasePermissionRules { @PermissionRule(value = "READ", description = "Internal users can view pending internal user invites") public boolean internalUsersCanViewPendingInternalUserInvites(RoleInvitePageResource invite, UserResource user) { return user.hasRole(IFS_ADMINISTRATOR); } @PermissionRule(value = "SAVE_USER_INVITE", description = "Only an IFS Administrator can save a new user invite") boolean ifsAdminCanSaveNewUserInvite(final UserResource invitedUser, UserResource user); @PermissionRule(value = "READ", description = "Internal users can view pending internal user invites") boolean internalUsersCanViewPendingInternalUserInvites(RoleInvitePageResource invite, UserResource user); } | @Test public void internalUsersCanViewPendingInternalUserInvites() { RoleInvitePageResource invite = new RoleInvitePageResource(); assertTrue(rules.internalUsersCanViewPendingInternalUserInvites(invite, ifsAdmin)); assertFalse(rules.internalUsersCanViewPendingInternalUserInvites(invite, nonIfsAdmin)); } |
InviteOrganisationPermissionRules extends BasePermissionRules { @PermissionRule(value = "SEND", description = "lead applicant can send an organisation invite for the application") public boolean leadApplicantCanInviteAnOrganisationToTheApplication(InviteOrganisationResource inviteOrganisation, UserResource user) { return isLeadApplicantForAllApplications(inviteOrganisation, user); } @PermissionRule(value = "SEND", description = "lead applicant can send an organisation invite for the application") boolean leadApplicantCanInviteAnOrganisationToTheApplication(InviteOrganisationResource inviteOrganisation, UserResource user); @PermissionRule(value = "CREATE_APPLICATION_INVITES", description = "Lead applicant or collaborator can create invites for the specified application if the application is still editable") boolean leadApplicantCanCreateApplicationInvitesIfApplicationEditable(InviteOrganisationResource inviteOrganisation, UserResource user); @PermissionRule(value = "READ", description = "a consortium member and the lead applicant can view the invites of all organisations") boolean consortiumCanViewAnyInviteOrganisation(InviteOrganisationResource inviteOrganisation, UserResource user); @PermissionRule(value = "READ", description = "a support user can view the invites of all organisations") boolean supportCanViewAnyInviteOrganisation(InviteOrganisationResource inviteOrganisation, UserResource user); @PermissionRule(value = "READ_FOR_UPDATE", description = "a consortium member can view the invites of their own organisation or if lead applicant") boolean consortiumCanViewAnInviteOrganisation(InviteOrganisationResource inviteOrganisation, UserResource user); @PermissionRule(value = "READ_FOR_UPDATE", description = "System Registration user can view or update an organisation invite to the application") boolean systemRegistrarCanViewOrganisationInviteToTheApplication(final InviteOrganisationResource inviteOrganisation, final UserResource user); @PermissionRule(value = "SAVE", description = "lead applicant can save an organisation invite for the application") boolean leadApplicantCanSaveInviteAnOrganisationToTheApplication(InviteOrganisationResource inviteOrganisation, UserResource user); } | @Test public void leadApplicantCanInviteAnOrganisationToTheApplication() { List<ApplicationInviteResource> inviteResource = newApplicationInviteResource().withApplication(applicationResource.getId()).build(5); InviteOrganisationResource inviteOrganisationResource = newInviteOrganisationResource().withInviteResources(inviteResource).build(); assertTrue(rules.leadApplicantCanInviteAnOrganisationToTheApplication(inviteOrganisationResource, leadApplicant)); assertFalse(rules.leadApplicantCanInviteAnOrganisationToTheApplication(inviteOrganisationResource, collaborator)); assertFalse(rules.leadApplicantCanInviteAnOrganisationToTheApplication(inviteOrganisationResource, otherApplicant)); } |
InviteOrganisationPermissionRules extends BasePermissionRules { @PermissionRule(value = "READ", description = "a consortium member and the lead applicant can view the invites of all organisations") public boolean consortiumCanViewAnyInviteOrganisation(InviteOrganisationResource inviteOrganisation, UserResource user) { return isApplicationCollaboratorOrIsLeadApplicant(inviteOrganisation, user); } @PermissionRule(value = "SEND", description = "lead applicant can send an organisation invite for the application") boolean leadApplicantCanInviteAnOrganisationToTheApplication(InviteOrganisationResource inviteOrganisation, UserResource user); @PermissionRule(value = "CREATE_APPLICATION_INVITES", description = "Lead applicant or collaborator can create invites for the specified application if the application is still editable") boolean leadApplicantCanCreateApplicationInvitesIfApplicationEditable(InviteOrganisationResource inviteOrganisation, UserResource user); @PermissionRule(value = "READ", description = "a consortium member and the lead applicant can view the invites of all organisations") boolean consortiumCanViewAnyInviteOrganisation(InviteOrganisationResource inviteOrganisation, UserResource user); @PermissionRule(value = "READ", description = "a support user can view the invites of all organisations") boolean supportCanViewAnyInviteOrganisation(InviteOrganisationResource inviteOrganisation, UserResource user); @PermissionRule(value = "READ_FOR_UPDATE", description = "a consortium member can view the invites of their own organisation or if lead applicant") boolean consortiumCanViewAnInviteOrganisation(InviteOrganisationResource inviteOrganisation, UserResource user); @PermissionRule(value = "READ_FOR_UPDATE", description = "System Registration user can view or update an organisation invite to the application") boolean systemRegistrarCanViewOrganisationInviteToTheApplication(final InviteOrganisationResource inviteOrganisation, final UserResource user); @PermissionRule(value = "SAVE", description = "lead applicant can save an organisation invite for the application") boolean leadApplicantCanSaveInviteAnOrganisationToTheApplication(InviteOrganisationResource inviteOrganisation, UserResource user); } | @Test public void consortiumCanViewAnyInviteOrganisation() { List<ApplicationInviteResource> inviteResource = newApplicationInviteResource().withApplication(applicationResource.getId()).build(5); InviteOrganisationResource inviteOrganisationResource = newInviteOrganisationResource().withInviteResources(inviteResource).build(); assertTrue(rules.consortiumCanViewAnyInviteOrganisation(inviteOrganisationResource, leadApplicant)); assertTrue(rules.consortiumCanViewAnyInviteOrganisation(inviteOrganisationResource, collaborator)); assertFalse(rules.consortiumCanViewAnyInviteOrganisation(inviteOrganisationResource, support)); assertFalse(rules.consortiumCanViewAnyInviteOrganisation(inviteOrganisationResource, otherApplicant)); } |
InviteOrganisationPermissionRules extends BasePermissionRules { @PermissionRule(value = "READ", description = "a support user can view the invites of all organisations") public boolean supportCanViewAnyInviteOrganisation(InviteOrganisationResource inviteOrganisation, UserResource user) { return user.hasRole(SUPPORT); } @PermissionRule(value = "SEND", description = "lead applicant can send an organisation invite for the application") boolean leadApplicantCanInviteAnOrganisationToTheApplication(InviteOrganisationResource inviteOrganisation, UserResource user); @PermissionRule(value = "CREATE_APPLICATION_INVITES", description = "Lead applicant or collaborator can create invites for the specified application if the application is still editable") boolean leadApplicantCanCreateApplicationInvitesIfApplicationEditable(InviteOrganisationResource inviteOrganisation, UserResource user); @PermissionRule(value = "READ", description = "a consortium member and the lead applicant can view the invites of all organisations") boolean consortiumCanViewAnyInviteOrganisation(InviteOrganisationResource inviteOrganisation, UserResource user); @PermissionRule(value = "READ", description = "a support user can view the invites of all organisations") boolean supportCanViewAnyInviteOrganisation(InviteOrganisationResource inviteOrganisation, UserResource user); @PermissionRule(value = "READ_FOR_UPDATE", description = "a consortium member can view the invites of their own organisation or if lead applicant") boolean consortiumCanViewAnInviteOrganisation(InviteOrganisationResource inviteOrganisation, UserResource user); @PermissionRule(value = "READ_FOR_UPDATE", description = "System Registration user can view or update an organisation invite to the application") boolean systemRegistrarCanViewOrganisationInviteToTheApplication(final InviteOrganisationResource inviteOrganisation, final UserResource user); @PermissionRule(value = "SAVE", description = "lead applicant can save an organisation invite for the application") boolean leadApplicantCanSaveInviteAnOrganisationToTheApplication(InviteOrganisationResource inviteOrganisation, UserResource user); } | @Test public void supportCanViewAnyInviteOrganisation() { List<ApplicationInviteResource> inviteResource = newApplicationInviteResource().withApplication(applicationResource.getId()).build(5); InviteOrganisationResource inviteOrganisationResource = newInviteOrganisationResource().withInviteResources(inviteResource).build(); assertFalse(rules.supportCanViewAnyInviteOrganisation(inviteOrganisationResource, leadApplicant)); assertFalse(rules.supportCanViewAnyInviteOrganisation(inviteOrganisationResource, collaborator)); assertTrue(rules.supportCanViewAnyInviteOrganisation(inviteOrganisationResource, support)); assertFalse(rules.supportCanViewAnyInviteOrganisation(inviteOrganisationResource, otherApplicant)); } |
InviteOrganisationPermissionRules extends BasePermissionRules { @PermissionRule(value = "READ_FOR_UPDATE", description = "a consortium member can view the invites of their own organisation or if lead applicant") public boolean consortiumCanViewAnInviteOrganisation(InviteOrganisationResource inviteOrganisation, UserResource user) { if (inviteOrganisation.getOrganisation() == null) { return isLeadApplicantForAllApplications(inviteOrganisation, user); } return isApplicationCollaboratorForOrganisationOrIsLeadApplicant(inviteOrganisation, user); } @PermissionRule(value = "SEND", description = "lead applicant can send an organisation invite for the application") boolean leadApplicantCanInviteAnOrganisationToTheApplication(InviteOrganisationResource inviteOrganisation, UserResource user); @PermissionRule(value = "CREATE_APPLICATION_INVITES", description = "Lead applicant or collaborator can create invites for the specified application if the application is still editable") boolean leadApplicantCanCreateApplicationInvitesIfApplicationEditable(InviteOrganisationResource inviteOrganisation, UserResource user); @PermissionRule(value = "READ", description = "a consortium member and the lead applicant can view the invites of all organisations") boolean consortiumCanViewAnyInviteOrganisation(InviteOrganisationResource inviteOrganisation, UserResource user); @PermissionRule(value = "READ", description = "a support user can view the invites of all organisations") boolean supportCanViewAnyInviteOrganisation(InviteOrganisationResource inviteOrganisation, UserResource user); @PermissionRule(value = "READ_FOR_UPDATE", description = "a consortium member can view the invites of their own organisation or if lead applicant") boolean consortiumCanViewAnInviteOrganisation(InviteOrganisationResource inviteOrganisation, UserResource user); @PermissionRule(value = "READ_FOR_UPDATE", description = "System Registration user can view or update an organisation invite to the application") boolean systemRegistrarCanViewOrganisationInviteToTheApplication(final InviteOrganisationResource inviteOrganisation, final UserResource user); @PermissionRule(value = "SAVE", description = "lead applicant can save an organisation invite for the application") boolean leadApplicantCanSaveInviteAnOrganisationToTheApplication(InviteOrganisationResource inviteOrganisation, UserResource user); } | @Test public void consortiumCanViewAnInviteOrganisationToTheApplication() { List<ApplicationInviteResource> inviteResource = newApplicationInviteResource().withApplication(applicationResource.getId()).build(5); InviteOrganisationResource inviteOrganisationResource = newInviteOrganisationResource().withInviteResources(inviteResource).build(); assertTrue(rules.consortiumCanViewAnInviteOrganisation(inviteOrganisationResource, leadApplicant)); assertFalse(rules.consortiumCanViewAnInviteOrganisation(inviteOrganisationResource, collaborator)); assertFalse(rules.consortiumCanViewAnInviteOrganisation(inviteOrganisationResource, otherApplicant)); }
@Test public void consortiumCanViewAnInviteOrganisationToTheApplicationForAConfirmedOrganisation() { List<ApplicationInviteResource> inviteResource = newApplicationInviteResource().withApplication(applicationResource.getId()).build(5); InviteOrganisationResource inviteOrganisationResource = newInviteOrganisationResource() .withOrganisation(organisationResource.getId()) .withInviteResources(inviteResource) .build(); assertTrue(rules.consortiumCanViewAnInviteOrganisation(inviteOrganisationResource, leadApplicant)); assertTrue(rules.consortiumCanViewAnInviteOrganisation(inviteOrganisationResource, collaborator)); assertFalse(rules.consortiumCanViewAnInviteOrganisation(inviteOrganisationResource, otherApplicant)); } |
UserController { @PostMapping("/id/{id}/deactivate") public RestResult<Void> deactivateUser(@PathVariable long id) { return registrationService.deactivateUser(id).toPostResponse(); } @GetMapping("/uid/{uid}") RestResult<UserResource> getUserByUid(@PathVariable String uid); @GetMapping("/id/{id}") RestResult<UserResource> getUserById(@PathVariable long id); @PostMapping RestResult<UserResource> createUser(@RequestBody UserCreationResource userCreationResource); @GetMapping("/find-by-role/{userRole}") RestResult<List<UserResource>> findByRole(@PathVariable Role userRole); @GetMapping("/find-by-role-and-status/{userRole}/status/{userStatus}") RestResult<List<UserResource>> findByRoleAndUserStatus(@PathVariable Role userRole, @PathVariable UserStatus userStatus); @GetMapping("/active") RestResult<ManageUserPageResource> findActiveUsers(@RequestParam(required = false) String filter,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE_NUMBER) int pageIndex,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize); @GetMapping("/inactive") RestResult<ManageUserPageResource> findInactiveUsers(@RequestParam(required = false) String filter,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE_NUMBER) int pageIndex,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize); @GetMapping("/external/active") RestResult<ManageUserPageResource> findActiveExternalUsers(@RequestParam(required = false) String filter,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE_NUMBER) int pageIndex,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize); @GetMapping("/external/inactive") RestResult<ManageUserPageResource> findInactiveExternalUsers(@RequestParam(required = false) String filter,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE_NUMBER) int pageIndex,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize); @PostMapping("/internal/create/{inviteHash}") RestResult<Void> createInternalUser(@PathVariable("inviteHash") String inviteHash, @Valid @RequestBody InternalUserRegistrationResource internalUserRegistrationResource); @PostMapping("/internal/edit") RestResult<Void> editInternalUser(@Valid @RequestBody EditUserResource editUserResource); @GetMapping("/find-all/") RestResult<List<UserResource>> findAll(); @GetMapping("/find-external-users") RestResult<List<UserOrganisationResource>> findExternalUsers(@RequestParam String searchString,
@RequestParam SearchCategory searchCategory); @GetMapping("/find-by-email/{email}/") RestResult<UserResource> findByEmail(@PathVariable String email); @GetMapping("/find-assignable-users/{applicationId}") RestResult<Set<UserResource>> findAssignableUsers(@PathVariable long applicationId); @GetMapping("/find-related-users/{applicationId}") RestResult<Set<UserResource>> findRelatedUsers(@PathVariable long applicationId); @GetMapping("/" + URL_SEND_PASSWORD_RESET_NOTIFICATION + "/{emailAddress}/") RestResult<Void> sendPasswordResetNotification(@PathVariable String emailAddress); @GetMapping("/" + URL_CHECK_PASSWORD_RESET_HASH + "/{hash}") RestResult<Void> checkPasswordReset(@PathVariable String hash); @PostMapping("/" + URL_PASSWORD_RESET + "/{hash}") RestResult<Void> resetPassword(@PathVariable String hash, @RequestBody final String password); @GetMapping("/" + URL_VERIFY_EMAIL + "/{hash}") RestResult<Void> verifyEmail(@PathVariable String hash); @PutMapping("/" + URL_RESEND_EMAIL_VERIFICATION_NOTIFICATION + "/{emailAddress}/") RestResult<Void> resendEmailVerificationNotification(@PathVariable String emailAddress); @PostMapping("/id/{userId}/agree-new-site-terms-and-conditions") RestResult<Void> agreeNewSiteTermsAndConditions(@PathVariable long userId); @PostMapping("/update-details") RestResult<Void> updateDetails(@RequestBody UserResource userResource); @PutMapping("{id}/update-email/{email:.+}") RestResult<Void> updateEmail(@PathVariable long id, @PathVariable String email); @PostMapping("/id/{id}/deactivate") RestResult<Void> deactivateUser(@PathVariable long id); @PostMapping("/id/{id}/reactivate") RestResult<Void> reactivateUser(@PathVariable long id); @PostMapping("{id}/grant/{role}") RestResult<Void> grantRole(@PathVariable long id, @PathVariable Role role); static final Sort DEFAULT_USER_SORT; } | @Test public void deactivateUser() throws Exception { when(registrationServiceMock.deactivateUser(123L)).thenReturn(serviceSuccess(newUserResource().build())); mockMvc.perform(post("/user/id/123/deactivate")).andExpect(status().isOk()); verify(registrationServiceMock).deactivateUser(123L); } |
InviteOrganisationPermissionRules extends BasePermissionRules { @PermissionRule(value = "SAVE", description = "lead applicant can save an organisation invite for the application") public boolean leadApplicantCanSaveInviteAnOrganisationToTheApplication(InviteOrganisationResource inviteOrganisation, UserResource user) { return isLeadApplicantForAllApplications(inviteOrganisation, user); } @PermissionRule(value = "SEND", description = "lead applicant can send an organisation invite for the application") boolean leadApplicantCanInviteAnOrganisationToTheApplication(InviteOrganisationResource inviteOrganisation, UserResource user); @PermissionRule(value = "CREATE_APPLICATION_INVITES", description = "Lead applicant or collaborator can create invites for the specified application if the application is still editable") boolean leadApplicantCanCreateApplicationInvitesIfApplicationEditable(InviteOrganisationResource inviteOrganisation, UserResource user); @PermissionRule(value = "READ", description = "a consortium member and the lead applicant can view the invites of all organisations") boolean consortiumCanViewAnyInviteOrganisation(InviteOrganisationResource inviteOrganisation, UserResource user); @PermissionRule(value = "READ", description = "a support user can view the invites of all organisations") boolean supportCanViewAnyInviteOrganisation(InviteOrganisationResource inviteOrganisation, UserResource user); @PermissionRule(value = "READ_FOR_UPDATE", description = "a consortium member can view the invites of their own organisation or if lead applicant") boolean consortiumCanViewAnInviteOrganisation(InviteOrganisationResource inviteOrganisation, UserResource user); @PermissionRule(value = "READ_FOR_UPDATE", description = "System Registration user can view or update an organisation invite to the application") boolean systemRegistrarCanViewOrganisationInviteToTheApplication(final InviteOrganisationResource inviteOrganisation, final UserResource user); @PermissionRule(value = "SAVE", description = "lead applicant can save an organisation invite for the application") boolean leadApplicantCanSaveInviteAnOrganisationToTheApplication(InviteOrganisationResource inviteOrganisation, UserResource user); } | @Test public void leadApplicantCanSaveInviteAnOrganisationToTheApplication() { List<ApplicationInviteResource> inviteResource = newApplicationInviteResource().withApplication(applicationResource.getId()).build(5); InviteOrganisationResource inviteOrganisationResource = newInviteOrganisationResource() .withInviteResources(inviteResource) .build(); assertTrue(rules.leadApplicantCanSaveInviteAnOrganisationToTheApplication(inviteOrganisationResource, leadApplicant)); assertFalse(rules.leadApplicantCanSaveInviteAnOrganisationToTheApplication(inviteOrganisationResource, collaborator)); assertFalse(rules.leadApplicantCanSaveInviteAnOrganisationToTheApplication(inviteOrganisationResource, otherApplicant)); } |
InviteOrganisationPermissionRules extends BasePermissionRules { @PermissionRule(value = "CREATE_APPLICATION_INVITES", description = "Lead applicant or collaborator can create invites for the specified application if the application is still editable") public boolean leadApplicantCanCreateApplicationInvitesIfApplicationEditable(InviteOrganisationResource inviteOrganisation, UserResource user) { if (inviteOrganisation.getInviteResources().isEmpty()) { throw new ForbiddenActionException("Missing Invite Resource"); } if (!allInviteApplicationIdsMatch(inviteOrganisation)) { throw new ForbiddenActionException("Not all invite application ids match"); } if (isApplicationCollaboratorOrIsLeadApplicant(inviteOrganisation, user)) { long applicationId = inviteOrganisation.getInviteResources().get(0).getApplication(); Application application = getApplication(applicationId); return checkCollaborationLevel(inviteOrganisation, applicationId) && applicationIsEditable(application); } return false; } @PermissionRule(value = "SEND", description = "lead applicant can send an organisation invite for the application") boolean leadApplicantCanInviteAnOrganisationToTheApplication(InviteOrganisationResource inviteOrganisation, UserResource user); @PermissionRule(value = "CREATE_APPLICATION_INVITES", description = "Lead applicant or collaborator can create invites for the specified application if the application is still editable") boolean leadApplicantCanCreateApplicationInvitesIfApplicationEditable(InviteOrganisationResource inviteOrganisation, UserResource user); @PermissionRule(value = "READ", description = "a consortium member and the lead applicant can view the invites of all organisations") boolean consortiumCanViewAnyInviteOrganisation(InviteOrganisationResource inviteOrganisation, UserResource user); @PermissionRule(value = "READ", description = "a support user can view the invites of all organisations") boolean supportCanViewAnyInviteOrganisation(InviteOrganisationResource inviteOrganisation, UserResource user); @PermissionRule(value = "READ_FOR_UPDATE", description = "a consortium member can view the invites of their own organisation or if lead applicant") boolean consortiumCanViewAnInviteOrganisation(InviteOrganisationResource inviteOrganisation, UserResource user); @PermissionRule(value = "READ_FOR_UPDATE", description = "System Registration user can view or update an organisation invite to the application") boolean systemRegistrarCanViewOrganisationInviteToTheApplication(final InviteOrganisationResource inviteOrganisation, final UserResource user); @PermissionRule(value = "SAVE", description = "lead applicant can save an organisation invite for the application") boolean leadApplicantCanSaveInviteAnOrganisationToTheApplication(InviteOrganisationResource inviteOrganisation, UserResource user); } | @Test public void leadApplicantCanCreateApplicationInvitesIfApplicationEditableWhenApplicationCreated() { List<ApplicationInviteResource> inviteResource = newApplicationInviteResource().withApplication(applicationResource.getId()).build(5); InviteOrganisationResource inviteOrganisationResource = newInviteOrganisationResource() .withInviteResources(inviteResource) .build(); Competition competition = newCompetition().withCollaborationLevel(SINGLE_OR_COLLABORATIVE).build(); Application application = ApplicationBuilder.newApplication() .withCompetition(competition) .withApplicationState(ApplicationState.CREATED).build(); when(applicationRepository.findById(applicationResource.getId())) .thenReturn(Optional.of(application)); assertTrue(rules.leadApplicantCanCreateApplicationInvitesIfApplicationEditable(inviteOrganisationResource, leadApplicant)); assertTrue(rules.leadApplicantCanCreateApplicationInvitesIfApplicationEditable(inviteOrganisationResource, collaborator)); assertFalse(rules.leadApplicantCanCreateApplicationInvitesIfApplicationEditable(inviteOrganisationResource, otherApplicant)); }
@Test public void leadApplicantCanCreateApplicationInvitesIfApplicationEditableWhenApplicationOpen() { List<ApplicationInviteResource> inviteResource = newApplicationInviteResource().withApplication(applicationResource.getId()).build(5); InviteOrganisationResource inviteOrganisationResource = newInviteOrganisationResource() .withInviteResources(inviteResource) .build(); Competition competition = newCompetition().withCollaborationLevel(SINGLE_OR_COLLABORATIVE).build(); Application application = ApplicationBuilder.newApplication() .withCompetition(competition) .withApplicationState(ApplicationState.OPENED).build(); when(applicationRepository.findById(applicationResource.getId())) .thenReturn(Optional.of(application)); assertTrue(rules.leadApplicantCanCreateApplicationInvitesIfApplicationEditable(inviteOrganisationResource, leadApplicant)); assertTrue(rules.leadApplicantCanCreateApplicationInvitesIfApplicationEditable(inviteOrganisationResource, collaborator)); assertFalse(rules.leadApplicantCanCreateApplicationInvitesIfApplicationEditable(inviteOrganisationResource, otherApplicant)); }
@Test public void leadApplicantAndCollaboratorCannotCreateApplicationInvitesIfApplicationEditableWhenApplicationCreated() { List<ApplicationInviteResource> inviteResource = ApplicationInviteResourceBuilder.newApplicationInviteResource().withApplication(applicationResource.getId()).build(5); InviteOrganisationResource inviteOrganisationResource = newInviteOrganisationResource() .withInviteResources(inviteResource) .build(); when(processRoleRepository.existsByUserIdAndApplicationIdAndRole(leadApplicant.getId(), applicationResource.getId(), LEADAPPLICANT)) .thenReturn(false); when(processRoleRepository.existsByUserIdAndApplicationIdAndRole(collaborator.getId(), applicationResource.getId(), COLLABORATOR)) .thenReturn(false); Application application = ApplicationBuilder.newApplication() .withApplicationState(ApplicationState.CREATED).build(); when(applicationRepository.findById(applicationResource.getId())) .thenReturn(Optional.of(application)); assertFalse(rules.leadApplicantCanCreateApplicationInvitesIfApplicationEditable(inviteOrganisationResource, leadApplicant)); assertFalse(rules.leadApplicantCanCreateApplicationInvitesIfApplicationEditable(inviteOrganisationResource, collaborator)); assertFalse(rules.leadApplicantCanCreateApplicationInvitesIfApplicationEditable(inviteOrganisationResource, otherApplicant)); }
@Test public void leadApplicantAndCollaboratorCannotCreateApplicationInvitesIfApplicationEditableWhenApplicationOpen() { List<ApplicationInviteResource> inviteResource = ApplicationInviteResourceBuilder.newApplicationInviteResource().withApplication(applicationResource.getId()).build(5); InviteOrganisationResource inviteOrganisationResource = newInviteOrganisationResource() .withInviteResources(inviteResource) .build(); when(processRoleRepository.existsByUserIdAndApplicationIdAndRole(leadApplicant.getId(), applicationResource.getId(), LEADAPPLICANT)) .thenReturn(false); when(processRoleRepository.existsByUserIdAndApplicationIdAndRole(collaborator.getId(), applicationResource.getId(), COLLABORATOR)) .thenReturn(false); Competition competition = newCompetition().withCollaborationLevel(SINGLE_OR_COLLABORATIVE).build(); Application application = ApplicationBuilder.newApplication() .withCompetition(competition) .withApplicationState(ApplicationState.OPENED).build(); when(applicationRepository.findById(applicationResource.getId())) .thenReturn(Optional.of(application)); assertFalse(rules.leadApplicantCanCreateApplicationInvitesIfApplicationEditable(inviteOrganisationResource, leadApplicant)); assertFalse(rules.leadApplicantCanCreateApplicationInvitesIfApplicationEditable(inviteOrganisationResource, collaborator)); assertFalse(rules.leadApplicantCanCreateApplicationInvitesIfApplicationEditable(inviteOrganisationResource, otherApplicant)); }
@Test public void leadApplicantCanCreateApplicationInvitesIfApplicationEditableWhenApplicationSubmitted() { List<ApplicationInviteResource> inviteResource = newApplicationInviteResource().withApplication(applicationResource.getId()).build(5); InviteOrganisationResource inviteOrganisationResource = newInviteOrganisationResource() .withInviteResources(inviteResource) .build(); Competition competition = newCompetition().withCollaborationLevel(SINGLE_OR_COLLABORATIVE).build(); Application application = ApplicationBuilder.newApplication() .withCompetition(competition) .withApplicationState(ApplicationState.SUBMITTED).build(); when(applicationRepository.findById(applicationResource.getId())) .thenReturn(Optional.of(application)); assertFalse(rules.leadApplicantCanCreateApplicationInvitesIfApplicationEditable(inviteOrganisationResource, leadApplicant)); assertFalse(rules.leadApplicantCanCreateApplicationInvitesIfApplicationEditable(inviteOrganisationResource, collaborator)); assertFalse(rules.leadApplicantCanCreateApplicationInvitesIfApplicationEditable(inviteOrganisationResource, otherApplicant)); }
@Test public void leadApplicantCanCreateApplicationInvitesIfApplicationEditable_newCollaboratingOrganisationAndCollaborationLevelIsSingle() { List<ApplicationInviteResource> inviteResource = newApplicationInviteResource().withApplication(applicationResource.getId()).build(5); InviteOrganisationResource inviteOrganisationResource = newInviteOrganisationResource() .withInviteResources(inviteResource) .build(); Competition competition = newCompetition().withCollaborationLevel(SINGLE).build(); Application application = ApplicationBuilder.newApplication() .withCompetition(competition) .withApplicationState(ApplicationState.OPENED).build(); when(applicationRepository.findById(applicationResource.getId())) .thenReturn(Optional.of(application)); assertFalse(rules.leadApplicantCanCreateApplicationInvitesIfApplicationEditable(inviteOrganisationResource, leadApplicant)); }
@Test public void leadApplicantCanCreateApplicationInvitesIfApplicationEditable_newCollaboratingOrganisationAndCollaborationLevelIsSingleOrCollaborative() { List<ApplicationInviteResource> inviteResource = newApplicationInviteResource().withApplication(applicationResource.getId()).build(5); InviteOrganisationResource inviteOrganisationResource = newInviteOrganisationResource() .withInviteResources(inviteResource) .build(); Competition competition = newCompetition().withCollaborationLevel(SINGLE_OR_COLLABORATIVE).build(); Application application = ApplicationBuilder.newApplication() .withCompetition(competition) .withApplicationState(ApplicationState.OPENED).build(); when(applicationRepository.findById(applicationResource.getId())) .thenReturn(Optional.of(application)); assertTrue(rules.leadApplicantCanCreateApplicationInvitesIfApplicationEditable(inviteOrganisationResource, leadApplicant)); }
@Test public void leadApplicantCanCreateApplicationInvitesIfApplicationEditable_existingOrganisationAndCollaborationLevelIsSingleOrCollaborative() { long existingOrganisationId = 1L; List<ApplicationInviteResource> inviteResource = newApplicationInviteResource().withApplication(applicationResource.getId()).build(5); InviteOrganisationResource inviteOrganisationResource = newInviteOrganisationResource() .withOrganisation(existingOrganisationId) .withInviteResources(inviteResource) .build(); Competition competition = newCompetition().withCollaborationLevel(SINGLE_OR_COLLABORATIVE).build(); Application application = ApplicationBuilder.newApplication() .withCompetition(competition) .withApplicationState(ApplicationState.OPENED).build(); when(applicationRepository.findById(applicationResource.getId())) .thenReturn(Optional.of(application)); assertTrue(rules.leadApplicantCanCreateApplicationInvitesIfApplicationEditable(inviteOrganisationResource, leadApplicant)); }
@Test public void leadApplicantCanCreateApplicationInvitesIfApplicationEditable_newCollaboratingOrganisationAndCollaborationLevelIsCollaborative() { List<ApplicationInviteResource> inviteResource = newApplicationInviteResource().withApplication(applicationResource.getId()).build(5); InviteOrganisationResource inviteOrganisationResource = newInviteOrganisationResource() .withInviteResources(inviteResource) .build(); Competition competition = newCompetition().withCollaborationLevel(COLLABORATIVE).build(); Application application = ApplicationBuilder.newApplication() .withCompetition(competition) .withApplicationState(ApplicationState.OPENED).build(); when(applicationRepository.findById(applicationResource.getId())) .thenReturn(Optional.of(application)); assertTrue(rules.leadApplicantCanCreateApplicationInvitesIfApplicationEditable(inviteOrganisationResource, leadApplicant)); }
@Test public void leadApplicantCanCreateApplicationInvitesIfApplicationEditable_existingOrganisationAndCollaborationLevelIsCollaborative() { long existingOrganisationId = 1L; List<ApplicationInviteResource> inviteResource = newApplicationInviteResource().withApplication(applicationResource.getId()).build(5); InviteOrganisationResource inviteOrganisationResource = newInviteOrganisationResource() .withOrganisation(existingOrganisationId) .withInviteResources(inviteResource) .build(); Competition competition = newCompetition().withCollaborationLevel(COLLABORATIVE).build(); Application application = ApplicationBuilder.newApplication() .withCompetition(competition) .withApplicationState(ApplicationState.OPENED).build(); when(applicationRepository.findById(applicationResource.getId())) .thenReturn(Optional.of(application)); assertTrue(rules.leadApplicantCanCreateApplicationInvitesIfApplicationEditable(inviteOrganisationResource, leadApplicant)); } |
UserController { @PostMapping("/id/{id}/reactivate") public RestResult<Void> reactivateUser(@PathVariable long id) { return registrationService.activateUser(id).toPostResponse(); } @GetMapping("/uid/{uid}") RestResult<UserResource> getUserByUid(@PathVariable String uid); @GetMapping("/id/{id}") RestResult<UserResource> getUserById(@PathVariable long id); @PostMapping RestResult<UserResource> createUser(@RequestBody UserCreationResource userCreationResource); @GetMapping("/find-by-role/{userRole}") RestResult<List<UserResource>> findByRole(@PathVariable Role userRole); @GetMapping("/find-by-role-and-status/{userRole}/status/{userStatus}") RestResult<List<UserResource>> findByRoleAndUserStatus(@PathVariable Role userRole, @PathVariable UserStatus userStatus); @GetMapping("/active") RestResult<ManageUserPageResource> findActiveUsers(@RequestParam(required = false) String filter,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE_NUMBER) int pageIndex,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize); @GetMapping("/inactive") RestResult<ManageUserPageResource> findInactiveUsers(@RequestParam(required = false) String filter,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE_NUMBER) int pageIndex,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize); @GetMapping("/external/active") RestResult<ManageUserPageResource> findActiveExternalUsers(@RequestParam(required = false) String filter,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE_NUMBER) int pageIndex,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize); @GetMapping("/external/inactive") RestResult<ManageUserPageResource> findInactiveExternalUsers(@RequestParam(required = false) String filter,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE_NUMBER) int pageIndex,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize); @PostMapping("/internal/create/{inviteHash}") RestResult<Void> createInternalUser(@PathVariable("inviteHash") String inviteHash, @Valid @RequestBody InternalUserRegistrationResource internalUserRegistrationResource); @PostMapping("/internal/edit") RestResult<Void> editInternalUser(@Valid @RequestBody EditUserResource editUserResource); @GetMapping("/find-all/") RestResult<List<UserResource>> findAll(); @GetMapping("/find-external-users") RestResult<List<UserOrganisationResource>> findExternalUsers(@RequestParam String searchString,
@RequestParam SearchCategory searchCategory); @GetMapping("/find-by-email/{email}/") RestResult<UserResource> findByEmail(@PathVariable String email); @GetMapping("/find-assignable-users/{applicationId}") RestResult<Set<UserResource>> findAssignableUsers(@PathVariable long applicationId); @GetMapping("/find-related-users/{applicationId}") RestResult<Set<UserResource>> findRelatedUsers(@PathVariable long applicationId); @GetMapping("/" + URL_SEND_PASSWORD_RESET_NOTIFICATION + "/{emailAddress}/") RestResult<Void> sendPasswordResetNotification(@PathVariable String emailAddress); @GetMapping("/" + URL_CHECK_PASSWORD_RESET_HASH + "/{hash}") RestResult<Void> checkPasswordReset(@PathVariable String hash); @PostMapping("/" + URL_PASSWORD_RESET + "/{hash}") RestResult<Void> resetPassword(@PathVariable String hash, @RequestBody final String password); @GetMapping("/" + URL_VERIFY_EMAIL + "/{hash}") RestResult<Void> verifyEmail(@PathVariable String hash); @PutMapping("/" + URL_RESEND_EMAIL_VERIFICATION_NOTIFICATION + "/{emailAddress}/") RestResult<Void> resendEmailVerificationNotification(@PathVariable String emailAddress); @PostMapping("/id/{userId}/agree-new-site-terms-and-conditions") RestResult<Void> agreeNewSiteTermsAndConditions(@PathVariable long userId); @PostMapping("/update-details") RestResult<Void> updateDetails(@RequestBody UserResource userResource); @PutMapping("{id}/update-email/{email:.+}") RestResult<Void> updateEmail(@PathVariable long id, @PathVariable String email); @PostMapping("/id/{id}/deactivate") RestResult<Void> deactivateUser(@PathVariable long id); @PostMapping("/id/{id}/reactivate") RestResult<Void> reactivateUser(@PathVariable long id); @PostMapping("{id}/grant/{role}") RestResult<Void> grantRole(@PathVariable long id, @PathVariable Role role); static final Sort DEFAULT_USER_SORT; } | @Test public void reactivateUser() throws Exception { when(registrationServiceMock.activateUser(123L)).thenReturn(serviceSuccess(newUserResource().build())); mockMvc.perform(post("/user/id/123/reactivate")).andExpect(status().isOk()); verify(registrationServiceMock).activateUser(123L); } |
ApplicationInviteLookupStrategy { @PermissionEntityLookupStrategy public ApplicationInviteResource getApplicationInviteResource(final Long id){ return applicationInviteMapper.mapToResource(applicationInviteRepository.findById(id).orElse(null)); } @PermissionEntityLookupStrategy ApplicationInviteResource getApplicationInviteResource(final Long id); } | @Test public void testFindById() { ApplicationInviteResource applicationInviteResource = newApplicationInviteResource().withId(inviteId).build(); ApplicationInvite applicationInvite = newApplicationInvite().withId(inviteId).build(); when(applicationInviteMapper.mapToResource(applicationInvite)).thenReturn(applicationInviteResource); when(applicationInviteRepository.findById(inviteId)).thenReturn(Optional.of(applicationInvite)); assertEquals(applicationInviteResource, lookup.getApplicationInviteResource(inviteId)); } |
ApplicationInvitePermissionRules { @PermissionRule(value = "SEND", description = "lead applicant can invite to the application") public boolean leadApplicantCanInviteToTheApplication(final ApplicationInvite invite, final UserResource user) { return isLeadForInvite(invite, user); } @PermissionRule(value = "SEND", description = "lead applicant can invite to the application") boolean leadApplicantCanInviteToTheApplication(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "SEND", description = "collaborator can invite to the application for thier organisation") boolean collaboratorCanInviteToApplicationForTheirOrganisation(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "SAVE", description = "lead applicant can save invite to the application") boolean leadApplicantCanSaveInviteToTheApplication(final ApplicationInviteResource invite, final UserResource user); @PermissionRule(value = "SAVE", description = "collaborator can save invite to the application for their organisation") boolean collaboratorCanSaveInviteToApplicationForTheirOrganisation(final ApplicationInviteResource invite, final UserResource user); @PermissionRule(value = "SAVE", description = "lead applicant can save invite kta to the application") boolean leadApplicantCanSaveKtaInviteToTheApplication(final ApplicationKtaInviteResource invite, final UserResource user); @PermissionRule(value = "DELETE", description = "lead applicant can remove kta invite to the application") boolean leadApplicantCanRemoveKtaInviteToTheApplication(final ApplicationKtaInviteResource invite, final UserResource user); @PermissionRule(value = "ACCEPT", description = "Kta user can accept the invite to the application") boolean ktaCanAcceptAnInviteAddressedToThem(final ApplicationKtaInviteResource invite, final UserResource user); @PermissionRule(value = "READ", description = "collaborator can view an invite to the application on for their organisation") boolean collaboratorCanReadInviteForTheirApplicationForTheirOrganisation(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "READ", description = "lead applicant can view an invite to the application") boolean leadApplicantReadInviteToTheApplication(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "DELETE", description = "lead applicant can delete as long as its not their own.") boolean leadCanDeleteNotOwnInvite(final ApplicationInviteResource invite, final UserResource user); @PermissionRule(value = "DELETE", description = "collaborator can delete invite as long as its not their own.") boolean collaboratorCanDeleteNotOwnInvite(final ApplicationInviteResource invite, final UserResource user); } | @Test public void leadApplicantCanInviteToTheApplication() { assertTrue(rules.leadApplicantCanInviteToTheApplication(invite, leadApplicant)); assertFalse(rules.leadApplicantCanInviteToTheApplication(invite, collaborator)); assertFalse(rules.leadApplicantCanInviteToTheApplication(invite, otherLeadApplicant)); } |
ApplicationInvitePermissionRules { @PermissionRule(value = "SEND", description = "collaborator can invite to the application for thier organisation") public boolean collaboratorCanInviteToApplicationForTheirOrganisation(final ApplicationInvite invite, final UserResource user) { return applicationIsEditable(invite.getTarget()) && isCollaboratorOnInvite(invite, user); } @PermissionRule(value = "SEND", description = "lead applicant can invite to the application") boolean leadApplicantCanInviteToTheApplication(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "SEND", description = "collaborator can invite to the application for thier organisation") boolean collaboratorCanInviteToApplicationForTheirOrganisation(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "SAVE", description = "lead applicant can save invite to the application") boolean leadApplicantCanSaveInviteToTheApplication(final ApplicationInviteResource invite, final UserResource user); @PermissionRule(value = "SAVE", description = "collaborator can save invite to the application for their organisation") boolean collaboratorCanSaveInviteToApplicationForTheirOrganisation(final ApplicationInviteResource invite, final UserResource user); @PermissionRule(value = "SAVE", description = "lead applicant can save invite kta to the application") boolean leadApplicantCanSaveKtaInviteToTheApplication(final ApplicationKtaInviteResource invite, final UserResource user); @PermissionRule(value = "DELETE", description = "lead applicant can remove kta invite to the application") boolean leadApplicantCanRemoveKtaInviteToTheApplication(final ApplicationKtaInviteResource invite, final UserResource user); @PermissionRule(value = "ACCEPT", description = "Kta user can accept the invite to the application") boolean ktaCanAcceptAnInviteAddressedToThem(final ApplicationKtaInviteResource invite, final UserResource user); @PermissionRule(value = "READ", description = "collaborator can view an invite to the application on for their organisation") boolean collaboratorCanReadInviteForTheirApplicationForTheirOrganisation(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "READ", description = "lead applicant can view an invite to the application") boolean leadApplicantReadInviteToTheApplication(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "DELETE", description = "lead applicant can delete as long as its not their own.") boolean leadCanDeleteNotOwnInvite(final ApplicationInviteResource invite, final UserResource user); @PermissionRule(value = "DELETE", description = "collaborator can delete invite as long as its not their own.") boolean collaboratorCanDeleteNotOwnInvite(final ApplicationInviteResource invite, final UserResource user); } | @Test public void collaboratorCanInviteToApplicantForTheirOrganisation() { assertTrue(rules.collaboratorCanInviteToApplicationForTheirOrganisation(invite, collaborator)); assertFalse(rules.collaboratorCanInviteToApplicationForTheirOrganisation(invite, leadApplicant)); assertFalse(rules.collaboratorCanInviteToApplicationForTheirOrganisation(invite, otherCollaborator)); } |
ApplicationInvitePermissionRules { @PermissionRule(value = "SAVE", description = "lead applicant can save invite to the application") public boolean leadApplicantCanSaveInviteToTheApplication(final ApplicationInviteResource invite, final UserResource user) { return applicationIsEditableById(invite.getApplication()) && isLeadForInvite(invite, user); } @PermissionRule(value = "SEND", description = "lead applicant can invite to the application") boolean leadApplicantCanInviteToTheApplication(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "SEND", description = "collaborator can invite to the application for thier organisation") boolean collaboratorCanInviteToApplicationForTheirOrganisation(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "SAVE", description = "lead applicant can save invite to the application") boolean leadApplicantCanSaveInviteToTheApplication(final ApplicationInviteResource invite, final UserResource user); @PermissionRule(value = "SAVE", description = "collaborator can save invite to the application for their organisation") boolean collaboratorCanSaveInviteToApplicationForTheirOrganisation(final ApplicationInviteResource invite, final UserResource user); @PermissionRule(value = "SAVE", description = "lead applicant can save invite kta to the application") boolean leadApplicantCanSaveKtaInviteToTheApplication(final ApplicationKtaInviteResource invite, final UserResource user); @PermissionRule(value = "DELETE", description = "lead applicant can remove kta invite to the application") boolean leadApplicantCanRemoveKtaInviteToTheApplication(final ApplicationKtaInviteResource invite, final UserResource user); @PermissionRule(value = "ACCEPT", description = "Kta user can accept the invite to the application") boolean ktaCanAcceptAnInviteAddressedToThem(final ApplicationKtaInviteResource invite, final UserResource user); @PermissionRule(value = "READ", description = "collaborator can view an invite to the application on for their organisation") boolean collaboratorCanReadInviteForTheirApplicationForTheirOrganisation(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "READ", description = "lead applicant can view an invite to the application") boolean leadApplicantReadInviteToTheApplication(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "DELETE", description = "lead applicant can delete as long as its not their own.") boolean leadCanDeleteNotOwnInvite(final ApplicationInviteResource invite, final UserResource user); @PermissionRule(value = "DELETE", description = "collaborator can delete invite as long as its not their own.") boolean collaboratorCanDeleteNotOwnInvite(final ApplicationInviteResource invite, final UserResource user); } | @Test public void leadApplicantCanSaveInviteToTheApplication() { assertTrue(rules.leadApplicantCanSaveInviteToTheApplication(inviteResource, leadApplicant)); assertFalse(rules.leadApplicantCanSaveInviteToTheApplication(inviteResource, collaborator)); assertFalse(rules.leadApplicantCanSaveInviteToTheApplication(inviteResource, otherLeadApplicant)); } |
ApplicationInvitePermissionRules { @PermissionRule(value = "SAVE", description = "lead applicant can save invite kta to the application") public boolean leadApplicantCanSaveKtaInviteToTheApplication(final ApplicationKtaInviteResource invite, final UserResource user) { return applicationIsEditableById(invite.getApplication()) && isLeadForInvite(invite, user); } @PermissionRule(value = "SEND", description = "lead applicant can invite to the application") boolean leadApplicantCanInviteToTheApplication(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "SEND", description = "collaborator can invite to the application for thier organisation") boolean collaboratorCanInviteToApplicationForTheirOrganisation(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "SAVE", description = "lead applicant can save invite to the application") boolean leadApplicantCanSaveInviteToTheApplication(final ApplicationInviteResource invite, final UserResource user); @PermissionRule(value = "SAVE", description = "collaborator can save invite to the application for their organisation") boolean collaboratorCanSaveInviteToApplicationForTheirOrganisation(final ApplicationInviteResource invite, final UserResource user); @PermissionRule(value = "SAVE", description = "lead applicant can save invite kta to the application") boolean leadApplicantCanSaveKtaInviteToTheApplication(final ApplicationKtaInviteResource invite, final UserResource user); @PermissionRule(value = "DELETE", description = "lead applicant can remove kta invite to the application") boolean leadApplicantCanRemoveKtaInviteToTheApplication(final ApplicationKtaInviteResource invite, final UserResource user); @PermissionRule(value = "ACCEPT", description = "Kta user can accept the invite to the application") boolean ktaCanAcceptAnInviteAddressedToThem(final ApplicationKtaInviteResource invite, final UserResource user); @PermissionRule(value = "READ", description = "collaborator can view an invite to the application on for their organisation") boolean collaboratorCanReadInviteForTheirApplicationForTheirOrganisation(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "READ", description = "lead applicant can view an invite to the application") boolean leadApplicantReadInviteToTheApplication(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "DELETE", description = "lead applicant can delete as long as its not their own.") boolean leadCanDeleteNotOwnInvite(final ApplicationInviteResource invite, final UserResource user); @PermissionRule(value = "DELETE", description = "collaborator can delete invite as long as its not their own.") boolean collaboratorCanDeleteNotOwnInvite(final ApplicationInviteResource invite, final UserResource user); } | @Test public void leadApplicantCanSaveKtaInviteToTheApplication() { assertTrue(rules.leadApplicantCanSaveKtaInviteToTheApplication(inviteKtaResource, leadApplicant)); assertFalse(rules.leadApplicantCanSaveKtaInviteToTheApplication(inviteKtaResource, collaborator)); assertFalse(rules.leadApplicantCanSaveKtaInviteToTheApplication(inviteKtaResource, otherLeadApplicant)); } |
ApplicationInvitePermissionRules { @PermissionRule(value = "SAVE", description = "collaborator can save invite to the application for their organisation") public boolean collaboratorCanSaveInviteToApplicationForTheirOrganisation(final ApplicationInviteResource invite, final UserResource user) { return applicationIsEditableById(invite.getApplication()) && isCollaboratorOnInvite(invite, user); } @PermissionRule(value = "SEND", description = "lead applicant can invite to the application") boolean leadApplicantCanInviteToTheApplication(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "SEND", description = "collaborator can invite to the application for thier organisation") boolean collaboratorCanInviteToApplicationForTheirOrganisation(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "SAVE", description = "lead applicant can save invite to the application") boolean leadApplicantCanSaveInviteToTheApplication(final ApplicationInviteResource invite, final UserResource user); @PermissionRule(value = "SAVE", description = "collaborator can save invite to the application for their organisation") boolean collaboratorCanSaveInviteToApplicationForTheirOrganisation(final ApplicationInviteResource invite, final UserResource user); @PermissionRule(value = "SAVE", description = "lead applicant can save invite kta to the application") boolean leadApplicantCanSaveKtaInviteToTheApplication(final ApplicationKtaInviteResource invite, final UserResource user); @PermissionRule(value = "DELETE", description = "lead applicant can remove kta invite to the application") boolean leadApplicantCanRemoveKtaInviteToTheApplication(final ApplicationKtaInviteResource invite, final UserResource user); @PermissionRule(value = "ACCEPT", description = "Kta user can accept the invite to the application") boolean ktaCanAcceptAnInviteAddressedToThem(final ApplicationKtaInviteResource invite, final UserResource user); @PermissionRule(value = "READ", description = "collaborator can view an invite to the application on for their organisation") boolean collaboratorCanReadInviteForTheirApplicationForTheirOrganisation(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "READ", description = "lead applicant can view an invite to the application") boolean leadApplicantReadInviteToTheApplication(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "DELETE", description = "lead applicant can delete as long as its not their own.") boolean leadCanDeleteNotOwnInvite(final ApplicationInviteResource invite, final UserResource user); @PermissionRule(value = "DELETE", description = "collaborator can delete invite as long as its not their own.") boolean collaboratorCanDeleteNotOwnInvite(final ApplicationInviteResource invite, final UserResource user); } | @Test public void collaboratorCanSaveInviteToApplicantForTheirOrganisation() { assertTrue(rules.collaboratorCanSaveInviteToApplicationForTheirOrganisation(inviteResource, collaborator)); assertFalse(rules.collaboratorCanSaveInviteToApplicationForTheirOrganisation(inviteResource, leadApplicant)); assertFalse(rules.collaboratorCanSaveInviteToApplicationForTheirOrganisation(inviteResource, otherCollaborator)); } |
ApplicationInvitePermissionRules { @PermissionRule(value = "READ", description = "collaborator can view an invite to the application on for their organisation") public boolean collaboratorCanReadInviteForTheirApplicationForTheirOrganisation(final ApplicationInvite invite, final UserResource user) { return isCollaboratorOnInvite(invite, user); } @PermissionRule(value = "SEND", description = "lead applicant can invite to the application") boolean leadApplicantCanInviteToTheApplication(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "SEND", description = "collaborator can invite to the application for thier organisation") boolean collaboratorCanInviteToApplicationForTheirOrganisation(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "SAVE", description = "lead applicant can save invite to the application") boolean leadApplicantCanSaveInviteToTheApplication(final ApplicationInviteResource invite, final UserResource user); @PermissionRule(value = "SAVE", description = "collaborator can save invite to the application for their organisation") boolean collaboratorCanSaveInviteToApplicationForTheirOrganisation(final ApplicationInviteResource invite, final UserResource user); @PermissionRule(value = "SAVE", description = "lead applicant can save invite kta to the application") boolean leadApplicantCanSaveKtaInviteToTheApplication(final ApplicationKtaInviteResource invite, final UserResource user); @PermissionRule(value = "DELETE", description = "lead applicant can remove kta invite to the application") boolean leadApplicantCanRemoveKtaInviteToTheApplication(final ApplicationKtaInviteResource invite, final UserResource user); @PermissionRule(value = "ACCEPT", description = "Kta user can accept the invite to the application") boolean ktaCanAcceptAnInviteAddressedToThem(final ApplicationKtaInviteResource invite, final UserResource user); @PermissionRule(value = "READ", description = "collaborator can view an invite to the application on for their organisation") boolean collaboratorCanReadInviteForTheirApplicationForTheirOrganisation(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "READ", description = "lead applicant can view an invite to the application") boolean leadApplicantReadInviteToTheApplication(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "DELETE", description = "lead applicant can delete as long as its not their own.") boolean leadCanDeleteNotOwnInvite(final ApplicationInviteResource invite, final UserResource user); @PermissionRule(value = "DELETE", description = "collaborator can delete invite as long as its not their own.") boolean collaboratorCanDeleteNotOwnInvite(final ApplicationInviteResource invite, final UserResource user); } | @Test public void collaboratorCanReadInviteForTheirApplicationForTheirOrganisation() { assertTrue(rules.collaboratorCanReadInviteForTheirApplicationForTheirOrganisation(invite, collaborator)); assertFalse(rules.collaboratorCanReadInviteForTheirApplicationForTheirOrganisation(invite, leadApplicant)); assertFalse(rules.collaboratorCanReadInviteForTheirApplicationForTheirOrganisation(invite, otherCollaborator)); } |
ApplicationInvitePermissionRules { @PermissionRule(value = "READ", description = "lead applicant can view an invite to the application") public boolean leadApplicantReadInviteToTheApplication(final ApplicationInvite invite, final UserResource user) { return isLeadForInvite(invite, user); } @PermissionRule(value = "SEND", description = "lead applicant can invite to the application") boolean leadApplicantCanInviteToTheApplication(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "SEND", description = "collaborator can invite to the application for thier organisation") boolean collaboratorCanInviteToApplicationForTheirOrganisation(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "SAVE", description = "lead applicant can save invite to the application") boolean leadApplicantCanSaveInviteToTheApplication(final ApplicationInviteResource invite, final UserResource user); @PermissionRule(value = "SAVE", description = "collaborator can save invite to the application for their organisation") boolean collaboratorCanSaveInviteToApplicationForTheirOrganisation(final ApplicationInviteResource invite, final UserResource user); @PermissionRule(value = "SAVE", description = "lead applicant can save invite kta to the application") boolean leadApplicantCanSaveKtaInviteToTheApplication(final ApplicationKtaInviteResource invite, final UserResource user); @PermissionRule(value = "DELETE", description = "lead applicant can remove kta invite to the application") boolean leadApplicantCanRemoveKtaInviteToTheApplication(final ApplicationKtaInviteResource invite, final UserResource user); @PermissionRule(value = "ACCEPT", description = "Kta user can accept the invite to the application") boolean ktaCanAcceptAnInviteAddressedToThem(final ApplicationKtaInviteResource invite, final UserResource user); @PermissionRule(value = "READ", description = "collaborator can view an invite to the application on for their organisation") boolean collaboratorCanReadInviteForTheirApplicationForTheirOrganisation(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "READ", description = "lead applicant can view an invite to the application") boolean leadApplicantReadInviteToTheApplication(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "DELETE", description = "lead applicant can delete as long as its not their own.") boolean leadCanDeleteNotOwnInvite(final ApplicationInviteResource invite, final UserResource user); @PermissionRule(value = "DELETE", description = "collaborator can delete invite as long as its not their own.") boolean collaboratorCanDeleteNotOwnInvite(final ApplicationInviteResource invite, final UserResource user); } | @Test public void leadApplicantReadInviteToTheApplication() { assertTrue(rules.leadApplicantReadInviteToTheApplication(invite, leadApplicant)); assertFalse(rules.leadApplicantReadInviteToTheApplication(invite, collaborator)); assertFalse(rules.leadApplicantReadInviteToTheApplication(invite, otherLeadApplicant)); } |
UserController { @GetMapping("/find-external-users") public RestResult<List<UserOrganisationResource>> findExternalUsers(@RequestParam String searchString, @RequestParam SearchCategory searchCategory) { return userService.findByProcessRolesAndSearchCriteria(Role.externalApplicantRoles(), searchString, searchCategory).toGetResponse(); } @GetMapping("/uid/{uid}") RestResult<UserResource> getUserByUid(@PathVariable String uid); @GetMapping("/id/{id}") RestResult<UserResource> getUserById(@PathVariable long id); @PostMapping RestResult<UserResource> createUser(@RequestBody UserCreationResource userCreationResource); @GetMapping("/find-by-role/{userRole}") RestResult<List<UserResource>> findByRole(@PathVariable Role userRole); @GetMapping("/find-by-role-and-status/{userRole}/status/{userStatus}") RestResult<List<UserResource>> findByRoleAndUserStatus(@PathVariable Role userRole, @PathVariable UserStatus userStatus); @GetMapping("/active") RestResult<ManageUserPageResource> findActiveUsers(@RequestParam(required = false) String filter,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE_NUMBER) int pageIndex,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize); @GetMapping("/inactive") RestResult<ManageUserPageResource> findInactiveUsers(@RequestParam(required = false) String filter,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE_NUMBER) int pageIndex,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize); @GetMapping("/external/active") RestResult<ManageUserPageResource> findActiveExternalUsers(@RequestParam(required = false) String filter,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE_NUMBER) int pageIndex,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize); @GetMapping("/external/inactive") RestResult<ManageUserPageResource> findInactiveExternalUsers(@RequestParam(required = false) String filter,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE_NUMBER) int pageIndex,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize); @PostMapping("/internal/create/{inviteHash}") RestResult<Void> createInternalUser(@PathVariable("inviteHash") String inviteHash, @Valid @RequestBody InternalUserRegistrationResource internalUserRegistrationResource); @PostMapping("/internal/edit") RestResult<Void> editInternalUser(@Valid @RequestBody EditUserResource editUserResource); @GetMapping("/find-all/") RestResult<List<UserResource>> findAll(); @GetMapping("/find-external-users") RestResult<List<UserOrganisationResource>> findExternalUsers(@RequestParam String searchString,
@RequestParam SearchCategory searchCategory); @GetMapping("/find-by-email/{email}/") RestResult<UserResource> findByEmail(@PathVariable String email); @GetMapping("/find-assignable-users/{applicationId}") RestResult<Set<UserResource>> findAssignableUsers(@PathVariable long applicationId); @GetMapping("/find-related-users/{applicationId}") RestResult<Set<UserResource>> findRelatedUsers(@PathVariable long applicationId); @GetMapping("/" + URL_SEND_PASSWORD_RESET_NOTIFICATION + "/{emailAddress}/") RestResult<Void> sendPasswordResetNotification(@PathVariable String emailAddress); @GetMapping("/" + URL_CHECK_PASSWORD_RESET_HASH + "/{hash}") RestResult<Void> checkPasswordReset(@PathVariable String hash); @PostMapping("/" + URL_PASSWORD_RESET + "/{hash}") RestResult<Void> resetPassword(@PathVariable String hash, @RequestBody final String password); @GetMapping("/" + URL_VERIFY_EMAIL + "/{hash}") RestResult<Void> verifyEmail(@PathVariable String hash); @PutMapping("/" + URL_RESEND_EMAIL_VERIFICATION_NOTIFICATION + "/{emailAddress}/") RestResult<Void> resendEmailVerificationNotification(@PathVariable String emailAddress); @PostMapping("/id/{userId}/agree-new-site-terms-and-conditions") RestResult<Void> agreeNewSiteTermsAndConditions(@PathVariable long userId); @PostMapping("/update-details") RestResult<Void> updateDetails(@RequestBody UserResource userResource); @PutMapping("{id}/update-email/{email:.+}") RestResult<Void> updateEmail(@PathVariable long id, @PathVariable String email); @PostMapping("/id/{id}/deactivate") RestResult<Void> deactivateUser(@PathVariable long id); @PostMapping("/id/{id}/reactivate") RestResult<Void> reactivateUser(@PathVariable long id); @PostMapping("{id}/grant/{role}") RestResult<Void> grantRole(@PathVariable long id, @PathVariable Role role); static final Sort DEFAULT_USER_SORT; } | @Test public void findExternalUsers() throws Exception { String searchString = "%aar%"; SearchCategory searchCategory = SearchCategory.NAME; List<UserOrganisationResource> userOrganisationResources = newUserOrganisationResource().build(2); when(userServiceMock.findByProcessRolesAndSearchCriteria(Role.externalApplicantRoles(), searchString, searchCategory)).thenReturn(serviceSuccess(userOrganisationResources)); mockMvc.perform(get("/user/find-external-users?searchString=" + searchString + "&searchCategory=" + searchCategory)) .andExpect(status().isOk()) .andExpect(content().json(toJson(userOrganisationResources))); verify(userServiceMock).findByProcessRolesAndSearchCriteria(Role.externalApplicantRoles(), searchString, searchCategory); } |
ApplicationInvitePermissionRules { @PermissionRule(value = "DELETE", description = "lead applicant can delete as long as its not their own.") public boolean leadCanDeleteNotOwnInvite(final ApplicationInviteResource invite, final UserResource user) { return applicationIsEditableById(invite.getApplication()) && isNotOwnInvite(invite, user) && isLeadForInvite(invite, user); } @PermissionRule(value = "SEND", description = "lead applicant can invite to the application") boolean leadApplicantCanInviteToTheApplication(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "SEND", description = "collaborator can invite to the application for thier organisation") boolean collaboratorCanInviteToApplicationForTheirOrganisation(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "SAVE", description = "lead applicant can save invite to the application") boolean leadApplicantCanSaveInviteToTheApplication(final ApplicationInviteResource invite, final UserResource user); @PermissionRule(value = "SAVE", description = "collaborator can save invite to the application for their organisation") boolean collaboratorCanSaveInviteToApplicationForTheirOrganisation(final ApplicationInviteResource invite, final UserResource user); @PermissionRule(value = "SAVE", description = "lead applicant can save invite kta to the application") boolean leadApplicantCanSaveKtaInviteToTheApplication(final ApplicationKtaInviteResource invite, final UserResource user); @PermissionRule(value = "DELETE", description = "lead applicant can remove kta invite to the application") boolean leadApplicantCanRemoveKtaInviteToTheApplication(final ApplicationKtaInviteResource invite, final UserResource user); @PermissionRule(value = "ACCEPT", description = "Kta user can accept the invite to the application") boolean ktaCanAcceptAnInviteAddressedToThem(final ApplicationKtaInviteResource invite, final UserResource user); @PermissionRule(value = "READ", description = "collaborator can view an invite to the application on for their organisation") boolean collaboratorCanReadInviteForTheirApplicationForTheirOrganisation(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "READ", description = "lead applicant can view an invite to the application") boolean leadApplicantReadInviteToTheApplication(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "DELETE", description = "lead applicant can delete as long as its not their own.") boolean leadCanDeleteNotOwnInvite(final ApplicationInviteResource invite, final UserResource user); @PermissionRule(value = "DELETE", description = "collaborator can delete invite as long as its not their own.") boolean collaboratorCanDeleteNotOwnInvite(final ApplicationInviteResource invite, final UserResource user); } | @Test public void leadCanDeleteNotOwnInvite() { assertTrue(rules.leadCanDeleteNotOwnInvite(inviteResource, leadApplicant)); assertFalse(rules.leadCanDeleteNotOwnInvite(inviteResource, collaborator)); assertFalse(rules.leadCanDeleteNotOwnInvite(inviteResourceLead, leadApplicant)); } |
ApplicationInvitePermissionRules { @PermissionRule(value = "DELETE", description = "collaborator can delete invite as long as its not their own.") public boolean collaboratorCanDeleteNotOwnInvite(final ApplicationInviteResource invite, final UserResource user) { return applicationIsEditableById(invite.getApplication()) && isNotOwnInvite(invite, user) && isCollaboratorOnInvite(invite, user); } @PermissionRule(value = "SEND", description = "lead applicant can invite to the application") boolean leadApplicantCanInviteToTheApplication(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "SEND", description = "collaborator can invite to the application for thier organisation") boolean collaboratorCanInviteToApplicationForTheirOrganisation(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "SAVE", description = "lead applicant can save invite to the application") boolean leadApplicantCanSaveInviteToTheApplication(final ApplicationInviteResource invite, final UserResource user); @PermissionRule(value = "SAVE", description = "collaborator can save invite to the application for their organisation") boolean collaboratorCanSaveInviteToApplicationForTheirOrganisation(final ApplicationInviteResource invite, final UserResource user); @PermissionRule(value = "SAVE", description = "lead applicant can save invite kta to the application") boolean leadApplicantCanSaveKtaInviteToTheApplication(final ApplicationKtaInviteResource invite, final UserResource user); @PermissionRule(value = "DELETE", description = "lead applicant can remove kta invite to the application") boolean leadApplicantCanRemoveKtaInviteToTheApplication(final ApplicationKtaInviteResource invite, final UserResource user); @PermissionRule(value = "ACCEPT", description = "Kta user can accept the invite to the application") boolean ktaCanAcceptAnInviteAddressedToThem(final ApplicationKtaInviteResource invite, final UserResource user); @PermissionRule(value = "READ", description = "collaborator can view an invite to the application on for their organisation") boolean collaboratorCanReadInviteForTheirApplicationForTheirOrganisation(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "READ", description = "lead applicant can view an invite to the application") boolean leadApplicantReadInviteToTheApplication(final ApplicationInvite invite, final UserResource user); @PermissionRule(value = "DELETE", description = "lead applicant can delete as long as its not their own.") boolean leadCanDeleteNotOwnInvite(final ApplicationInviteResource invite, final UserResource user); @PermissionRule(value = "DELETE", description = "collaborator can delete invite as long as its not their own.") boolean collaboratorCanDeleteNotOwnInvite(final ApplicationInviteResource invite, final UserResource user); } | @Test public void collaboratorCanDeleteNotOwnInvite() { assertFalse(rules.collaboratorCanDeleteNotOwnInvite(inviteResource, leadApplicant)); assertTrue(rules.collaboratorCanDeleteNotOwnInvite(inviteResource, collaborator)); assertFalse(rules.collaboratorCanDeleteNotOwnInvite(inviteResourceCollab, collaborator)); } |
ApplicationKtaInviteLookupStrategy { @PermissionEntityLookupStrategy public ApplicationKtaInviteResource getApplicationInviteResource(final Long id){ return applicationKtaInviteMapper.mapToResource(applicationKtaInviteRepository.findById(id).orElse(null)); } @PermissionEntityLookupStrategy ApplicationKtaInviteResource getApplicationInviteResource(final Long id); @PermissionEntityLookupStrategy ApplicationKtaInviteResource getKtaInviteByHash(final String hash); } | @Test public void findById() { ApplicationKtaInviteResource applicationKtaInviteResource = newApplicationKtaInviteResource().withId(inviteId).build(); ApplicationKtaInvite applicationKtaInvite = newApplicationKtaInvite().withId(inviteId).build(); when(applicationKtaInviteMapper.mapToResource(applicationKtaInvite)).thenReturn(applicationKtaInviteResource); when(applicationKtaInviteRepository.findById(inviteId)).thenReturn(Optional.of(applicationKtaInvite)); assertEquals(applicationKtaInviteResource, lookup.getApplicationInviteResource(inviteId)); } |
ApplicationKtaInviteLookupStrategy { @PermissionEntityLookupStrategy public ApplicationKtaInviteResource getKtaInviteByHash(final String hash){ return applicationKtaInviteMapper.mapToResource(applicationKtaInviteRepository.getByHash(hash)); } @PermissionEntityLookupStrategy ApplicationKtaInviteResource getApplicationInviteResource(final Long id); @PermissionEntityLookupStrategy ApplicationKtaInviteResource getKtaInviteByHash(final String hash); } | @Test public void findByHash() { ApplicationKtaInviteResource applicationKtaInviteResource = newApplicationKtaInviteResource().withId(inviteId).build(); ApplicationKtaInvite applicationKtaInvite = newApplicationKtaInvite().withId(inviteId).build(); when(applicationKtaInviteMapper.mapToResource(applicationKtaInvite)).thenReturn(applicationKtaInviteResource); when(applicationKtaInviteRepository.getByHash(hash)).thenReturn(applicationKtaInvite); assertEquals(applicationKtaInviteResource, lookup.getKtaInviteByHash(hash)); } |
ApplicationKtaInviteController { @PostMapping("/resend-kta-invite") public RestResult<Void> resendKtaInvite(@RequestBody ApplicationKtaInviteResource inviteResource) { return applicationKtaInviteService.resendKtaInvite(inviteResource).toPostCreateResponse(); } @GetMapping("/get-kta-invite-by-application-id/{applicationId}") RestResult<ApplicationKtaInviteResource> getKtaInviteByApplication(@PathVariable long applicationId); @PostMapping("/save-kta-invite") RestResult<Void> saveKtaInvite(@RequestBody ApplicationKtaInviteResource inviteResource); @PostMapping("/resend-kta-invite") RestResult<Void> resendKtaInvite(@RequestBody ApplicationKtaInviteResource inviteResource); @DeleteMapping("/remove-kta-invite-by-application/{applicationId}") RestResult<Void> removeKtaInvite(@PathVariable("applicationId") long applicationId); @GetMapping("/hash/{hash}") RestResult<ApplicationKtaInviteResource> getKtaInviteByHash(@PathVariable String hash); @PostMapping("/hash/{hash}") RestResult<Void> acceptInvite(@PathVariable String hash); } | @Test public void resendKtaInvite() throws Exception { long applicationId = 1L; ApplicationKtaInviteResource inviteResource = newApplicationKtaInviteResource() .withApplication(applicationId) .withEmail("testemail") .build(); when(applicationKtaInviteService.resendKtaInvite(inviteResource)).thenReturn(serviceSuccess()); mockMvc.perform(post("/kta-invite/resend-kta-invite") .contentType(APPLICATION_JSON) .content(toJson(inviteResource))) .andExpect(status().isCreated()); } |
ApplicationKtaInviteController { @PostMapping("/save-kta-invite") public RestResult<Void> saveKtaInvite(@RequestBody ApplicationKtaInviteResource inviteResource) { return applicationKtaInviteService.saveKtaInvite(inviteResource).toPostCreateResponse(); } @GetMapping("/get-kta-invite-by-application-id/{applicationId}") RestResult<ApplicationKtaInviteResource> getKtaInviteByApplication(@PathVariable long applicationId); @PostMapping("/save-kta-invite") RestResult<Void> saveKtaInvite(@RequestBody ApplicationKtaInviteResource inviteResource); @PostMapping("/resend-kta-invite") RestResult<Void> resendKtaInvite(@RequestBody ApplicationKtaInviteResource inviteResource); @DeleteMapping("/remove-kta-invite-by-application/{applicationId}") RestResult<Void> removeKtaInvite(@PathVariable("applicationId") long applicationId); @GetMapping("/hash/{hash}") RestResult<ApplicationKtaInviteResource> getKtaInviteByHash(@PathVariable String hash); @PostMapping("/hash/{hash}") RestResult<Void> acceptInvite(@PathVariable String hash); } | @Test public void saveKtaInvite() throws Exception { long applicationId = 1L; ApplicationKtaInviteResource inviteResource = newApplicationKtaInviteResource() .withApplication(applicationId) .withEmail("testemail") .build(); when(applicationKtaInviteService.saveKtaInvite(inviteResource)).thenReturn(serviceSuccess()); mockMvc.perform(post("/kta-invite/save-kta-invite") .contentType(APPLICATION_JSON) .content(toJson(inviteResource))) .andExpect(status().isCreated()); } |
ApplicationKtaInviteController { @DeleteMapping("/remove-kta-invite-by-application/{applicationId}") public RestResult<Void> removeKtaInvite(@PathVariable("applicationId") long applicationId) { return applicationKtaInviteService.removeKtaInviteByApplication(applicationId).toDeleteResponse(); } @GetMapping("/get-kta-invite-by-application-id/{applicationId}") RestResult<ApplicationKtaInviteResource> getKtaInviteByApplication(@PathVariable long applicationId); @PostMapping("/save-kta-invite") RestResult<Void> saveKtaInvite(@RequestBody ApplicationKtaInviteResource inviteResource); @PostMapping("/resend-kta-invite") RestResult<Void> resendKtaInvite(@RequestBody ApplicationKtaInviteResource inviteResource); @DeleteMapping("/remove-kta-invite-by-application/{applicationId}") RestResult<Void> removeKtaInvite(@PathVariable("applicationId") long applicationId); @GetMapping("/hash/{hash}") RestResult<ApplicationKtaInviteResource> getKtaInviteByHash(@PathVariable String hash); @PostMapping("/hash/{hash}") RestResult<Void> acceptInvite(@PathVariable String hash); } | @Test public void removeKtaInvite() throws Exception { long applicationId = 456L; when(applicationKtaInviteService.removeKtaInviteByApplication(applicationId)).thenReturn(serviceSuccess()); mockMvc.perform(delete("/kta-invite/remove-kta-invite-by-application/"+applicationId)) .andExpect(status().isNoContent()); } |
ApplicationKtaInviteController { @GetMapping("/get-kta-invite-by-application-id/{applicationId}") public RestResult<ApplicationKtaInviteResource> getKtaInviteByApplication(@PathVariable long applicationId) { return applicationKtaInviteService.getKtaInviteByApplication(applicationId).toGetResponse(); } @GetMapping("/get-kta-invite-by-application-id/{applicationId}") RestResult<ApplicationKtaInviteResource> getKtaInviteByApplication(@PathVariable long applicationId); @PostMapping("/save-kta-invite") RestResult<Void> saveKtaInvite(@RequestBody ApplicationKtaInviteResource inviteResource); @PostMapping("/resend-kta-invite") RestResult<Void> resendKtaInvite(@RequestBody ApplicationKtaInviteResource inviteResource); @DeleteMapping("/remove-kta-invite-by-application/{applicationId}") RestResult<Void> removeKtaInvite(@PathVariable("applicationId") long applicationId); @GetMapping("/hash/{hash}") RestResult<ApplicationKtaInviteResource> getKtaInviteByHash(@PathVariable String hash); @PostMapping("/hash/{hash}") RestResult<Void> acceptInvite(@PathVariable String hash); } | @Test public void getKtaInviteByApplication() throws Exception { long applicationId = 1L; ApplicationKtaInviteResource inviteResource = newApplicationKtaInviteResource() .build(); when(applicationKtaInviteService.getKtaInviteByApplication(applicationId)).thenReturn(serviceSuccess(inviteResource)); mockMvc.perform(get("/kta-invite/get-kta-invite-by-application-id/{applicationId}", applicationId) .contentType(APPLICATION_JSON)) .andExpect(status().isOk()) .andExpect(content().json(toJson(inviteResource))); } |
ApplicationKtaInviteController { @GetMapping("/hash/{hash}") public RestResult<ApplicationKtaInviteResource> getKtaInviteByHash(@PathVariable String hash) { return applicationKtaInviteService.getKtaInviteByHash(hash).toGetResponse(); } @GetMapping("/get-kta-invite-by-application-id/{applicationId}") RestResult<ApplicationKtaInviteResource> getKtaInviteByApplication(@PathVariable long applicationId); @PostMapping("/save-kta-invite") RestResult<Void> saveKtaInvite(@RequestBody ApplicationKtaInviteResource inviteResource); @PostMapping("/resend-kta-invite") RestResult<Void> resendKtaInvite(@RequestBody ApplicationKtaInviteResource inviteResource); @DeleteMapping("/remove-kta-invite-by-application/{applicationId}") RestResult<Void> removeKtaInvite(@PathVariable("applicationId") long applicationId); @GetMapping("/hash/{hash}") RestResult<ApplicationKtaInviteResource> getKtaInviteByHash(@PathVariable String hash); @PostMapping("/hash/{hash}") RestResult<Void> acceptInvite(@PathVariable String hash); } | @Test public void getKtaInviteByHash() throws Exception { String hash = "hash"; ApplicationKtaInviteResource inviteResource = newApplicationKtaInviteResource() .build(); when(applicationKtaInviteService.getKtaInviteByHash(hash)).thenReturn(serviceSuccess(inviteResource)); mockMvc.perform(get("/kta-invite/hash/{hash}", hash) .contentType(APPLICATION_JSON)) .andExpect(status().isOk()) .andExpect(content().json(toJson(inviteResource))); } |
ApplicationKtaInviteController { @PostMapping("/hash/{hash}") public RestResult<Void> acceptInvite(@PathVariable String hash) { return applicationKtaInviteService.acceptInvite(hash).toGetResponse(); } @GetMapping("/get-kta-invite-by-application-id/{applicationId}") RestResult<ApplicationKtaInviteResource> getKtaInviteByApplication(@PathVariable long applicationId); @PostMapping("/save-kta-invite") RestResult<Void> saveKtaInvite(@RequestBody ApplicationKtaInviteResource inviteResource); @PostMapping("/resend-kta-invite") RestResult<Void> resendKtaInvite(@RequestBody ApplicationKtaInviteResource inviteResource); @DeleteMapping("/remove-kta-invite-by-application/{applicationId}") RestResult<Void> removeKtaInvite(@PathVariable("applicationId") long applicationId); @GetMapping("/hash/{hash}") RestResult<ApplicationKtaInviteResource> getKtaInviteByHash(@PathVariable String hash); @PostMapping("/hash/{hash}") RestResult<Void> acceptInvite(@PathVariable String hash); } | @Test public void acceptInvite() throws Exception { String hash = "hash"; when(applicationKtaInviteService.acceptInvite(hash)).thenReturn(serviceSuccess()); mockMvc.perform(post("/kta-invite/hash/{hash}", hash) .contentType(APPLICATION_JSON)) .andExpect(status().isOk()); verify(applicationKtaInviteService).acceptInvite(hash); } |
UserController { @PostMapping("{id}/grant/{role}") public RestResult<Void> grantRole(@PathVariable long id, @PathVariable Role role) { return userService.grantRole(new GrantRoleCommand(id, role)).toPostResponse(); } @GetMapping("/uid/{uid}") RestResult<UserResource> getUserByUid(@PathVariable String uid); @GetMapping("/id/{id}") RestResult<UserResource> getUserById(@PathVariable long id); @PostMapping RestResult<UserResource> createUser(@RequestBody UserCreationResource userCreationResource); @GetMapping("/find-by-role/{userRole}") RestResult<List<UserResource>> findByRole(@PathVariable Role userRole); @GetMapping("/find-by-role-and-status/{userRole}/status/{userStatus}") RestResult<List<UserResource>> findByRoleAndUserStatus(@PathVariable Role userRole, @PathVariable UserStatus userStatus); @GetMapping("/active") RestResult<ManageUserPageResource> findActiveUsers(@RequestParam(required = false) String filter,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE_NUMBER) int pageIndex,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize); @GetMapping("/inactive") RestResult<ManageUserPageResource> findInactiveUsers(@RequestParam(required = false) String filter,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE_NUMBER) int pageIndex,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize); @GetMapping("/external/active") RestResult<ManageUserPageResource> findActiveExternalUsers(@RequestParam(required = false) String filter,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE_NUMBER) int pageIndex,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize); @GetMapping("/external/inactive") RestResult<ManageUserPageResource> findInactiveExternalUsers(@RequestParam(required = false) String filter,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE_NUMBER) int pageIndex,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize); @PostMapping("/internal/create/{inviteHash}") RestResult<Void> createInternalUser(@PathVariable("inviteHash") String inviteHash, @Valid @RequestBody InternalUserRegistrationResource internalUserRegistrationResource); @PostMapping("/internal/edit") RestResult<Void> editInternalUser(@Valid @RequestBody EditUserResource editUserResource); @GetMapping("/find-all/") RestResult<List<UserResource>> findAll(); @GetMapping("/find-external-users") RestResult<List<UserOrganisationResource>> findExternalUsers(@RequestParam String searchString,
@RequestParam SearchCategory searchCategory); @GetMapping("/find-by-email/{email}/") RestResult<UserResource> findByEmail(@PathVariable String email); @GetMapping("/find-assignable-users/{applicationId}") RestResult<Set<UserResource>> findAssignableUsers(@PathVariable long applicationId); @GetMapping("/find-related-users/{applicationId}") RestResult<Set<UserResource>> findRelatedUsers(@PathVariable long applicationId); @GetMapping("/" + URL_SEND_PASSWORD_RESET_NOTIFICATION + "/{emailAddress}/") RestResult<Void> sendPasswordResetNotification(@PathVariable String emailAddress); @GetMapping("/" + URL_CHECK_PASSWORD_RESET_HASH + "/{hash}") RestResult<Void> checkPasswordReset(@PathVariable String hash); @PostMapping("/" + URL_PASSWORD_RESET + "/{hash}") RestResult<Void> resetPassword(@PathVariable String hash, @RequestBody final String password); @GetMapping("/" + URL_VERIFY_EMAIL + "/{hash}") RestResult<Void> verifyEmail(@PathVariable String hash); @PutMapping("/" + URL_RESEND_EMAIL_VERIFICATION_NOTIFICATION + "/{emailAddress}/") RestResult<Void> resendEmailVerificationNotification(@PathVariable String emailAddress); @PostMapping("/id/{userId}/agree-new-site-terms-and-conditions") RestResult<Void> agreeNewSiteTermsAndConditions(@PathVariable long userId); @PostMapping("/update-details") RestResult<Void> updateDetails(@RequestBody UserResource userResource); @PutMapping("{id}/update-email/{email:.+}") RestResult<Void> updateEmail(@PathVariable long id, @PathVariable String email); @PostMapping("/id/{id}/deactivate") RestResult<Void> deactivateUser(@PathVariable long id); @PostMapping("/id/{id}/reactivate") RestResult<Void> reactivateUser(@PathVariable long id); @PostMapping("{id}/grant/{role}") RestResult<Void> grantRole(@PathVariable long id, @PathVariable Role role); static final Sort DEFAULT_USER_SORT; } | @Test public void grantRole() throws Exception { long userId = 1L; Role grantRole = Role.APPLICANT; when(userServiceMock.grantRole(new GrantRoleCommand(userId, grantRole))).thenReturn(serviceSuccess(newUserResource().build())); mockMvc.perform(post("/user/{userId}/grant/{role}", userId, grantRole.name())) .andExpect(status().isOk()); verify(userServiceMock).grantRole(new GrantRoleCommand(userId, grantRole)); } |
InviteUserController { @PostMapping("/save-invite") public RestResult<Void> saveUserInvite(@RequestBody InviteUserResource inviteUserResource) { return inviteUserService.saveUserInvite(inviteUserResource.getInvitedUser(), inviteUserResource.getRole()).toPostResponse(); } @PostMapping("/save-invite") RestResult<Void> saveUserInvite(@RequestBody InviteUserResource inviteUserResource); @GetMapping("/get-invite/{inviteHash}") RestResult<RoleInviteResource> getInvite(@PathVariable("inviteHash") String inviteHash); @GetMapping("/check-existing-user/{inviteHash}") RestResult<Boolean> checkExistingUser(@PathVariable("inviteHash") String inviteHash); @GetMapping("/internal/pending") RestResult<RoleInvitePageResource> findPendingInternalUserInvites(@RequestParam(required = false) String filter,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE_NUMBER) int pageIndex,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize); @PutMapping("/internal/pending/{inviteId}/resend") RestResult<Void> resendPendingInternalUserInvite(@PathVariable("inviteId") long inviteId); @GetMapping("/find-external-invites") RestResult<List<ExternalInviteResource>> findExternalInvites(@RequestParam(value = "searchString") final String searchString,
@RequestParam(value = "searchCategory") final SearchCategory searchCategory); } | @Test public void saveUserInvite() throws Exception { when(inviteUserServiceMock.saveUserInvite(inviteUserResource.getInvitedUser(), inviteUserResource.getRole())).thenReturn(serviceSuccess()); mockMvc.perform(post("/invite-user/save-invite") .contentType(APPLICATION_JSON) .content(toJson(inviteUserResource))) .andExpect(status().isOk()); verify(inviteUserServiceMock).saveUserInvite(inviteUserResource.getInvitedUser(), inviteUserResource.getRole()); } |
InviteUserController { @GetMapping("/get-invite/{inviteHash}") public RestResult<RoleInviteResource> getInvite(@PathVariable("inviteHash") String inviteHash){ return inviteUserService.getInvite(inviteHash).toGetResponse(); } @PostMapping("/save-invite") RestResult<Void> saveUserInvite(@RequestBody InviteUserResource inviteUserResource); @GetMapping("/get-invite/{inviteHash}") RestResult<RoleInviteResource> getInvite(@PathVariable("inviteHash") String inviteHash); @GetMapping("/check-existing-user/{inviteHash}") RestResult<Boolean> checkExistingUser(@PathVariable("inviteHash") String inviteHash); @GetMapping("/internal/pending") RestResult<RoleInvitePageResource> findPendingInternalUserInvites(@RequestParam(required = false) String filter,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE_NUMBER) int pageIndex,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize); @PutMapping("/internal/pending/{inviteId}/resend") RestResult<Void> resendPendingInternalUserInvite(@PathVariable("inviteId") long inviteId); @GetMapping("/find-external-invites") RestResult<List<ExternalInviteResource>> findExternalInvites(@RequestParam(value = "searchString") final String searchString,
@RequestParam(value = "searchCategory") final SearchCategory searchCategory); } | @Test public void getInvite() throws Exception { when(inviteUserServiceMock.getInvite("SomeHashString")).thenReturn(serviceSuccess(new RoleInviteResource())); mockMvc.perform(get("/invite-user/get-invite/SomeHashString")).andExpect(status().isOk()); verify(inviteUserServiceMock).getInvite("SomeHashString"); } |
InviteUserController { @GetMapping("/check-existing-user/{inviteHash}") public RestResult<Boolean> checkExistingUser(@PathVariable("inviteHash") String inviteHash) { return inviteUserService.checkExistingUser(inviteHash).toGetResponse(); } @PostMapping("/save-invite") RestResult<Void> saveUserInvite(@RequestBody InviteUserResource inviteUserResource); @GetMapping("/get-invite/{inviteHash}") RestResult<RoleInviteResource> getInvite(@PathVariable("inviteHash") String inviteHash); @GetMapping("/check-existing-user/{inviteHash}") RestResult<Boolean> checkExistingUser(@PathVariable("inviteHash") String inviteHash); @GetMapping("/internal/pending") RestResult<RoleInvitePageResource> findPendingInternalUserInvites(@RequestParam(required = false) String filter,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE_NUMBER) int pageIndex,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize); @PutMapping("/internal/pending/{inviteId}/resend") RestResult<Void> resendPendingInternalUserInvite(@PathVariable("inviteId") long inviteId); @GetMapping("/find-external-invites") RestResult<List<ExternalInviteResource>> findExternalInvites(@RequestParam(value = "searchString") final String searchString,
@RequestParam(value = "searchCategory") final SearchCategory searchCategory); } | @Test public void checkExistingUser() throws Exception { when(inviteUserServiceMock.checkExistingUser("SomeHashString")).thenReturn(serviceSuccess(true)); mockMvc.perform(get("/invite-user/check-existing-user/SomeHashString")).andExpect(status().isOk()); verify(inviteUserServiceMock).checkExistingUser("SomeHashString"); } |
InviteUserController { @GetMapping("/find-external-invites") public RestResult<List<ExternalInviteResource>> findExternalInvites(@RequestParam(value = "searchString") final String searchString, @RequestParam(value = "searchCategory") final SearchCategory searchCategory) { return inviteUserService.findExternalInvites(searchString, searchCategory).toGetResponse(); } @PostMapping("/save-invite") RestResult<Void> saveUserInvite(@RequestBody InviteUserResource inviteUserResource); @GetMapping("/get-invite/{inviteHash}") RestResult<RoleInviteResource> getInvite(@PathVariable("inviteHash") String inviteHash); @GetMapping("/check-existing-user/{inviteHash}") RestResult<Boolean> checkExistingUser(@PathVariable("inviteHash") String inviteHash); @GetMapping("/internal/pending") RestResult<RoleInvitePageResource> findPendingInternalUserInvites(@RequestParam(required = false) String filter,
@RequestParam(value = "page", defaultValue = DEFAULT_PAGE_NUMBER) int pageIndex,
@RequestParam(value = "size", defaultValue = DEFAULT_PAGE_SIZE) int pageSize); @PutMapping("/internal/pending/{inviteId}/resend") RestResult<Void> resendPendingInternalUserInvite(@PathVariable("inviteId") long inviteId); @GetMapping("/find-external-invites") RestResult<List<ExternalInviteResource>> findExternalInvites(@RequestParam(value = "searchString") final String searchString,
@RequestParam(value = "searchCategory") final SearchCategory searchCategory); } | @Test public void findExternalInvites() throws Exception { String searchString = "%a%"; SearchCategory searchCategory = SearchCategory.NAME; List<ExternalInviteResource> externalInviteResources = Collections.singletonList(new ExternalInviteResource()); when(inviteUserServiceMock.findExternalInvites(searchString, searchCategory)).thenReturn(serviceSuccess(externalInviteResources)); mockMvc.perform(get("/invite-user/find-external-invites?searchString=" + searchString + "&searchCategory=" + searchCategory.name())) .andExpect(status().isOk()) .andExpect(content().json(toJson(externalInviteResources))); verify(inviteUserServiceMock).findExternalInvites(searchString, searchCategory); } |
InviteOrganisationController { @GetMapping("/{id}") public RestResult<InviteOrganisationResource> getById(@PathVariable("id") long id) { return service.getById(id).toGetResponse(); } @GetMapping("/{id}") RestResult<InviteOrganisationResource> getById(@PathVariable("id") long id); @GetMapping("/organisation/{organisationId}/application/{applicationId}") RestResult<InviteOrganisationResource> getByOrganisationIdWithInvitesForApplication(@PathVariable("organisationId") long organisationId,
@PathVariable("applicationId") long applicationId); @PutMapping("/save") RestResult<Void> put(@RequestBody InviteOrganisationResource inviteOrganisationResource); } | @Test public void getById() throws Exception { InviteOrganisationResource inviteOrganisationResource = newInviteOrganisationResource().build(); when(inviteOrganisationServiceMock.getById(inviteOrganisationResource.getId())) .thenReturn(serviceSuccess(inviteOrganisationResource)); mockMvc.perform(get("/inviteorganisation/{id}", inviteOrganisationResource.getId())) .andExpect(status().isOk()) .andExpect(content().json(toJson(inviteOrganisationResource))); verify(inviteOrganisationServiceMock, only()).getById(inviteOrganisationResource.getId()); } |
InviteOrganisationController { @GetMapping("/organisation/{organisationId}/application/{applicationId}") public RestResult<InviteOrganisationResource> getByOrganisationIdWithInvitesForApplication(@PathVariable("organisationId") long organisationId, @PathVariable("applicationId") long applicationId) { return service.getByOrganisationIdWithInvitesForApplication(organisationId, applicationId).toGetResponse(); } @GetMapping("/{id}") RestResult<InviteOrganisationResource> getById(@PathVariable("id") long id); @GetMapping("/organisation/{organisationId}/application/{applicationId}") RestResult<InviteOrganisationResource> getByOrganisationIdWithInvitesForApplication(@PathVariable("organisationId") long organisationId,
@PathVariable("applicationId") long applicationId); @PutMapping("/save") RestResult<Void> put(@RequestBody InviteOrganisationResource inviteOrganisationResource); } | @Test public void getByOrganisationIdWithInvitesForApplication() throws Exception { long organisationId = 1L; long applicationId = 2L; InviteOrganisationResource inviteOrganisationResource = newInviteOrganisationResource().build(); when(inviteOrganisationServiceMock.getByOrganisationIdWithInvitesForApplication(inviteOrganisationResource.getId(), applicationId)) .thenReturn(serviceSuccess(inviteOrganisationResource)); mockMvc.perform(get("/inviteorganisation/organisation/{organisationId}/application/{applicationId}", organisationId, applicationId)) .andExpect(status().isOk()) .andExpect(content().json(toJson(inviteOrganisationResource))); verify(inviteOrganisationServiceMock, only()).getByOrganisationIdWithInvitesForApplication(organisationId, applicationId); } |
ApplicationInviteController { @PostMapping("/create-application-invites") public RestResult<Void> createApplicationInvites(@RequestBody InviteOrganisationResource inviteOrganisationResource) { return applicationInviteService.createApplicationInvites(inviteOrganisationResource, Optional.empty()).toPostCreateResponse(); } @PostMapping("/create-application-invites") RestResult<Void> createApplicationInvites(@RequestBody InviteOrganisationResource inviteOrganisationResource); @PostMapping("/create-application-invites/{applicationId}") RestResult<Void> createApplicationInvitesForApplication(@RequestBody InviteOrganisationResource inviteOrganisationResource, @PathVariable("applicationId") long applicationId); @GetMapping("/get-invite-by-hash/{hash}") RestResult<ApplicationInviteResource> getInviteByHash(@PathVariable("hash") String hash); @GetMapping("/get-invite-organisation-by-hash/{hash}") RestResult<InviteOrganisationResource> getInviteOrganisationByHash(@PathVariable("hash") String hash); @GetMapping("/get-invites-by-application-id/{applicationId}") RestResult<List<InviteOrganisationResource>> getInvitesByApplication(@PathVariable("applicationId") Long applicationId); @PostMapping("/save-invites") RestResult<Void> saveInvites(@RequestBody List<ApplicationInviteResource> inviteResources); @PostMapping("/resend-invite") RestResult<Void> resendInvite(@RequestBody ApplicationInviteResource inviteResource); @PutMapping("/accept-invite/{hash}/{userId}") RestResult<Void> acceptInvite( @PathVariable("hash") String hash, @PathVariable("userId") Long userId); @PutMapping("/accept-invite/{hash}/{userId}/{organisationId}") RestResult<Void> acceptInvite( @PathVariable("hash") String hash, @PathVariable("userId") long userId, @PathVariable("organisationId") long organisationId); @DeleteMapping("/remove-invite/{inviteId}") RestResult<Void> removeApplicationInvite(@PathVariable("inviteId") long applicationInviteResourceId); @GetMapping("/check-existing-user/{inviteHash}") RestResult<Boolean> checkExistingUser(@PathVariable("inviteHash") String inviteHash); @GetMapping("/get-user/{inviteHash}") RestResult<UserResource> getUser(@PathVariable("inviteHash") String inviteHash); } | @Test public void postingOrganisationInviteResourceContainingInviteResourcesShouldInitiateSaveCalls() throws Exception { long applicationId = 1L; List<ApplicationInviteResource> inviteResources = newApplicationInviteResource() .withApplication(1L) .withName("testname") .withEmail("testemail") .build(5); InviteOrganisationResource inviteOrganisationResource = newInviteOrganisationResource() .withInviteResources(inviteResources) .withOrganisationName("new organisation") .build(); String organisationResourceString = objectMapper.writeValueAsString(inviteOrganisationResource); when(applicationInviteService.createApplicationInvites(inviteOrganisationResource, Optional.of(applicationId))).thenReturn(serviceSuccess()); mockMvc.perform(post("/invite/create-application-invites/" + applicationId, "json") .header("IFS_AUTH_TOKEN", "123abc") .contentType(APPLICATION_JSON) .content(organisationResourceString)) .andExpect(status().isCreated()) .andDo(document("invite/create-application-invites/" + applicationId)); verify(applicationInviteService, times(1)).createApplicationInvites(inviteOrganisationResource, Optional.of(applicationId)); }
@Test public void invalidInviteOrganisationResourceShouldReturnErrorMessage() throws Exception { long applicationId = 1L; List<ApplicationInviteResource> inviteResources = newApplicationInviteResource() .withApplication(1L) .withName("testname") .withEmail("testemail") .build(5); InviteOrganisationResource inviteOrganisationResource = newInviteOrganisationResource() .withInviteResources(inviteResources) .build(); String organisationResourceString = objectMapper.writeValueAsString(inviteOrganisationResource); when(applicationInviteService.createApplicationInvites(inviteOrganisationResource, Optional.of(applicationId))).thenReturn(serviceFailure(badRequestError("no invites"))); mockMvc.perform(post("/invite/create-application-invites/"+applicationId, "json") .contentType(APPLICATION_JSON) .content(organisationResourceString)) .andExpect(status().isBadRequest()); } |
ApplicationInviteController { @PostMapping("/resend-invite") public RestResult<Void> resendInvite(@RequestBody ApplicationInviteResource inviteResource) { return applicationInviteService.resendInvite(inviteResource).toPostCreateResponse(); } @PostMapping("/create-application-invites") RestResult<Void> createApplicationInvites(@RequestBody InviteOrganisationResource inviteOrganisationResource); @PostMapping("/create-application-invites/{applicationId}") RestResult<Void> createApplicationInvitesForApplication(@RequestBody InviteOrganisationResource inviteOrganisationResource, @PathVariable("applicationId") long applicationId); @GetMapping("/get-invite-by-hash/{hash}") RestResult<ApplicationInviteResource> getInviteByHash(@PathVariable("hash") String hash); @GetMapping("/get-invite-organisation-by-hash/{hash}") RestResult<InviteOrganisationResource> getInviteOrganisationByHash(@PathVariable("hash") String hash); @GetMapping("/get-invites-by-application-id/{applicationId}") RestResult<List<InviteOrganisationResource>> getInvitesByApplication(@PathVariable("applicationId") Long applicationId); @PostMapping("/save-invites") RestResult<Void> saveInvites(@RequestBody List<ApplicationInviteResource> inviteResources); @PostMapping("/resend-invite") RestResult<Void> resendInvite(@RequestBody ApplicationInviteResource inviteResource); @PutMapping("/accept-invite/{hash}/{userId}") RestResult<Void> acceptInvite( @PathVariable("hash") String hash, @PathVariable("userId") Long userId); @PutMapping("/accept-invite/{hash}/{userId}/{organisationId}") RestResult<Void> acceptInvite( @PathVariable("hash") String hash, @PathVariable("userId") long userId, @PathVariable("organisationId") long organisationId); @DeleteMapping("/remove-invite/{inviteId}") RestResult<Void> removeApplicationInvite(@PathVariable("inviteId") long applicationInviteResourceId); @GetMapping("/check-existing-user/{inviteHash}") RestResult<Boolean> checkExistingUser(@PathVariable("inviteHash") String inviteHash); @GetMapping("/get-user/{inviteHash}") RestResult<UserResource> getUser(@PathVariable("inviteHash") String inviteHash); } | @Test public void resendInvite() throws Exception { long applicationId = 1L; ApplicationInviteResource inviteResource = newApplicationInviteResource() .withApplication(applicationId) .withName("testname") .withEmail("testemail") .build(); when(applicationInviteService.resendInvite(inviteResource)).thenReturn(serviceSuccess()); mockMvc.perform(post("/invite/resend-invite") .contentType(APPLICATION_JSON) .content(toJson(inviteResource))) .andExpect(status().isCreated()); } |
ApplicationInviteController { @PutMapping("/accept-invite/{hash}/{userId}") public RestResult<Void> acceptInvite( @PathVariable("hash") String hash, @PathVariable("userId") Long userId) { return acceptApplicationInviteService.acceptInvite(hash, userId, Optional.empty()) .andOnSuccessReturn(result -> { crmService.syncCrmContact(userId); return result; }) .toPutResponse(); } @PostMapping("/create-application-invites") RestResult<Void> createApplicationInvites(@RequestBody InviteOrganisationResource inviteOrganisationResource); @PostMapping("/create-application-invites/{applicationId}") RestResult<Void> createApplicationInvitesForApplication(@RequestBody InviteOrganisationResource inviteOrganisationResource, @PathVariable("applicationId") long applicationId); @GetMapping("/get-invite-by-hash/{hash}") RestResult<ApplicationInviteResource> getInviteByHash(@PathVariable("hash") String hash); @GetMapping("/get-invite-organisation-by-hash/{hash}") RestResult<InviteOrganisationResource> getInviteOrganisationByHash(@PathVariable("hash") String hash); @GetMapping("/get-invites-by-application-id/{applicationId}") RestResult<List<InviteOrganisationResource>> getInvitesByApplication(@PathVariable("applicationId") Long applicationId); @PostMapping("/save-invites") RestResult<Void> saveInvites(@RequestBody List<ApplicationInviteResource> inviteResources); @PostMapping("/resend-invite") RestResult<Void> resendInvite(@RequestBody ApplicationInviteResource inviteResource); @PutMapping("/accept-invite/{hash}/{userId}") RestResult<Void> acceptInvite( @PathVariable("hash") String hash, @PathVariable("userId") Long userId); @PutMapping("/accept-invite/{hash}/{userId}/{organisationId}") RestResult<Void> acceptInvite( @PathVariable("hash") String hash, @PathVariable("userId") long userId, @PathVariable("organisationId") long organisationId); @DeleteMapping("/remove-invite/{inviteId}") RestResult<Void> removeApplicationInvite(@PathVariable("inviteId") long applicationInviteResourceId); @GetMapping("/check-existing-user/{inviteHash}") RestResult<Boolean> checkExistingUser(@PathVariable("inviteHash") String inviteHash); @GetMapping("/get-user/{inviteHash}") RestResult<UserResource> getUser(@PathVariable("inviteHash") String inviteHash); } | @Test public void acceptInvite() throws Exception { String hash = "abcdef"; long userId = 1L; when(acceptApplicationInviteService.acceptInvite(hash, userId, Optional.empty())).thenReturn(serviceSuccess()); mockMvc.perform(put("/invite/accept-invite/{hash}/{userId}", hash, userId)) .andExpect(status().isOk()); verify(acceptApplicationInviteService).acceptInvite(hash, userId, Optional.empty()); verify(crmService).syncCrmContact(userId); }
@Test public void acceptInvite_withOrganisationId() throws Exception { String hash = "abcdef"; long userId = 1L; long organisationId = 2L; when(acceptApplicationInviteService.acceptInvite(hash, userId, Optional.of(organisationId))).thenReturn(serviceSuccess()); mockMvc.perform(put("/invite/accept-invite/{hash}/{userId}/{organisationId}", hash, userId, organisationId)) .andExpect(status().isOk()); verify(acceptApplicationInviteService).acceptInvite(hash, userId, Optional.of(organisationId)); verify(crmService).syncCrmContact(userId); } |
RegistrationServiceImpl extends BaseTransactionalService implements RegistrationService { @Override @Transactional public ServiceResult<UserResource> createUser(UserCreationResource user) { ServiceResult<UserResource> userResult = serviceSuccess(user.toUserResource()); if (!shouldBePending(user)) { userResult = userResult.andOnSuccess(u -> validateUser(user.getPassword(), u)); } ServiceResult<User> result = userResult.andOnSuccessReturn(userResource -> assembleUserFromResource(userResource, user)) .andOnSuccess(savedUser -> createUserWithUid(savedUser, getPasswordOrPlaceholder(user), user.getAddress())); if (shouldSendVerificationEmail(user)) { result = result .andOnSuccess(savedUser -> sendUserVerificationEmail(ofNullable(user.getCompetitionId()), ofNullable(user.getOrganisationId()), savedUser)); } if (shouldBePending(user)) { result = result.andOnSuccess(this::saveUserAsPending); } else { result = result.andOnSuccess(savedUser -> markLatestSiteTermsAndConditions(savedUser, user)) .andOnSuccess(savedUser -> handleInvite(savedUser, user)); } if (shouldImmediatelyActivate(user)) { result = result .andOnSuccess(this::activateUser); } return result .andOnSuccessReturn(userMapper::mapToResource); } @Override @Transactional ServiceResult<UserResource> createUser(UserCreationResource user); @Override @Transactional ServiceResult<Void> resendUserVerificationEmail(final UserResource user); @Override @Transactional @UserUpdate ServiceResult<UserResource> activateUser(long userId); @Override @Transactional @UserUpdate ServiceResult<UserResource> deactivateUser(long userId); @Override @Transactional ServiceResult<User> activatePendingUser(User user,
String password,
String hash); @Override @Transactional ServiceResult<Void> activateApplicantAndSendDiversitySurvey(long userId); @Override @Transactional ServiceResult<Void> activateAssessorAndSendDiversitySurvey(long userId); @Override @Transactional @UserUpdate ServiceResult<UserResource> editInternalUser(UserResource userToEdit, Role userRoleType); } | @Test public void createUser() { AddressResource addressResource = newAddressResource().withAddressLine1("Electric Works").withTown("Sheffield").withPostcode("S1 2BJ").build(); Address address = newAddress().withAddressLine1("Electric Works").withTown("Sheffield").withPostcode("S1 2BJ").build(); UserCreationResource userToCreateResource = anUserCreationResource() .withFirstName("First") .withLastName("Last") .withPhoneNumber("01234 567890") .withEmail("[email protected]") .withPassword("Passw0rd123") .withAddress(addressResource) .withRole(Role.ASSESSOR) .build(); Long profileId = 1L; Profile userProfile = newProfile() .withId(profileId) .withAddress(address) .build(); User userToCreate = newUser() .withId((Long) null) .withFirstName("First") .withLastName("Last") .withPhoneNumber("01234 567890") .withEmailAddress("[email protected]") .withRoles(singleton(Role.ASSESSOR)) .withProfileId(userProfile.getId()) .build(); when(profileRepositoryMock.findById(userToCreate.getProfileId())).thenReturn(Optional.of(userProfile)); when(profileRepositoryMock.save(any(Profile.class))).thenReturn(userProfile); when(passwordPolicyValidatorMock.validatePassword("Passw0rd123", userToCreateResource.toUserResource())).thenReturn(serviceSuccess()); when(userMapperMock.mapToDomain(userToCreateResource.toUserResource())).thenReturn(userToCreate); when(addressMapperMock.mapToDomain(userToCreateResource.getAddress())).thenReturn( newAddress().withAddressLine1("Electric Works").withTown("Sheffield").withPostcode("S1 2BJ").build()); when(idpServiceMock.createUserRecordWithUid("[email protected]", "Passw0rd123")).thenReturn(serviceSuccess("new-uid")); User userToSave = createLambdaMatcher(user -> { assertNull(user.getId()); assertEquals("First Last", user.getName()); assertEquals("First", user.getFirstName()); assertEquals("Last", user.getLastName()); assertEquals("01234 567890", user.getPhoneNumber()); assertEquals("[email protected]", user.getEmail()); assertEquals("new-uid", user.getUid()); assertEquals(1, user.getRoles().size()); assertEquals(userToCreate.getRoles(), user.getRoles()); assertNotNull(user.getProfileId()); Profile profile = profileRepositoryMock.findById(user.getProfileId()).get(); assertEquals(profileId, profile.getId()); assertNull(profile.getSkillsAreas()); assertNull(profile.getBusinessType()); assertNull(profile.getAgreement()); assertNull(profile.getCreatedBy()); assertNull(profile.getCreatedOn()); assertNull(profile.getModifiedBy()); assertNull(profile.getModifiedOn()); assertEquals(address, profile.getAddress()); return true; }); User savedUser = newUser().build(); UserResource savedUserResource = newUserResource().build(); when(userRepositoryMock.save(userToSave)).thenReturn(savedUser); when(userRepositoryMock.save(savedUser)).thenReturn(savedUser); when(userMapperMock.mapToResource(savedUser)).thenReturn(savedUserResource); UserResource result = service.createUser(userToCreateResource).getSuccess(); assertEquals(savedUserResource, result); }
@Test public void createUser_applicantUserButIdpCallFails() { UserCreationResource userToCreateResource = anUserCreationResource() .withFirstName("First") .withLastName("Last") .withPhoneNumber("01234 567890") .withEmail("[email protected]") .withPassword("thepassword") .withRole(Role.APPLICANT) .build(); UserResource user = new UserResource(); SiteTermsAndConditionsResource siteTermsAndConditions = newSiteTermsAndConditionsResource().build(); when(termsAndConditionsServiceMock.getLatestSiteTermsAndConditions()).thenReturn(serviceSuccess(siteTermsAndConditions)); when(idpServiceMock.createUserRecordWithUid("[email protected]", "thepassword")).thenReturn(serviceFailure(new Error(RestIdentityProviderService.ServiceFailures.UNABLE_TO_CREATE_USER, INTERNAL_SERVER_ERROR))); when(userMapperMock.mapToResource(isA(User.class))).thenReturn(user); when(passwordPolicyValidatorMock.validatePassword(eq("thepassword"), any(UserResource.class))).thenReturn(serviceSuccess()); ServiceResult<UserResource> result = service.createUser(userToCreateResource); assertTrue(result.isFailure()); assertTrue(result.getFailure().is(new Error(RestIdentityProviderService.ServiceFailures.UNABLE_TO_CREATE_USER, INTERNAL_SERVER_ERROR))); }
@Test public void createUser_applicantUserButPasswordValidationFails() { UserCreationResource userToCreateResource = anUserCreationResource() .withFirstName("First") .withLastName("Last") .withPhoneNumber("01234 567890") .withEmail("[email protected]") .withPassword("thepassword") .withRole(Role.APPLICANT) .build(); UserResource user = new UserResource(); when(idpServiceMock.createUserRecordWithUid("[email protected]", "thepassword")).thenReturn(serviceFailure(new Error(RestIdentityProviderService.ServiceFailures.UNABLE_TO_CREATE_USER, INTERNAL_SERVER_ERROR))); when(userMapperMock.mapToResource(isA(User.class))).thenReturn(user); when(passwordPolicyValidatorMock.validatePassword(eq("thepassword"), any(UserResource.class))).thenReturn(serviceFailure(badRequestError("bad password"))); ServiceResult<UserResource> result = service.createUser(userToCreateResource); assertTrue(result.isFailure()); assertTrue(result.getFailure().is(Error.fieldError("password", null, "bad password"))); }
@Test public void createPendingMonitoringOfficer() { UserCreationResource userToCreateResource = anUserCreationResource() .withFirstName("First") .withLastName("Last") .withPhoneNumber("01234 567890") .withEmail("[email protected]") .withPassword("thepassword") .withRole(Role.MONITORING_OFFICER) .build(); User user = newUser().withEmailAddress("[email protected]").build(); MonitoringOfficerCreateResource resource = new MonitoringOfficerCreateResource( "Steve", "Smith", "011432333333", "[email protected]"); String password = "superSecurePassword"; when(idpServiceMock.createUserRecordWithUid(anyString(), anyString())).thenReturn(serviceSuccess("uid")); when(profileRepositoryMock.save(any(Profile.class))).thenReturn(newProfile().build()); when(userRepositoryMock.save(any(User.class))).thenReturn(user); service.createUser(userToCreateResource).getSuccess(); verify(idpServiceMock).createUserRecordWithUid(anyString(), anyString()); verify(profileRepositoryMock).save(any(Profile.class)); verify(userRepositoryMock, times(2)).save(any(User.class)); } |
ProjectInviteController { @GetMapping(GET_PROJECT_INVITE_LIST + "{projectId}") public RestResult<List<ProjectUserInviteResource>> getInvitesByProject(@PathVariable("projectId") Long projectId) { return projectInviteService.getInvitesByProject(projectId).toGetResponse(); } @GetMapping(GET_INVITE_BY_HASH + "{hash}") RestResult<ProjectUserInviteResource> getProjectInviteByHash(@PathVariable("hash") String hash); @GetMapping(GET_PROJECT_INVITE_LIST + "{projectId}") RestResult<List<ProjectUserInviteResource>> getInvitesByProject(@PathVariable("projectId") Long projectId); @PutMapping(value = ACCEPT_INVITE + "{hash}/{userId}") RestResult<Void> acceptInvite(@PathVariable("hash") String hash, @PathVariable("userId") Long userId); @GetMapping(CHECK_EXISTING_USER_URL + "{hash}") RestResult<Boolean> checkExistingUser( @PathVariable("hash") String hash); @GetMapping(GET_USER_BY_HASH_MAPPING + "{hash}") RestResult<UserResource> getUser( @PathVariable("hash") String hash); } | @Test public void getInvitesByProjectWhenErrorWhilstRetrieving() throws Exception { Long projectId = 123L; when(projectInviteServiceMock.getInvitesByProject(projectId)). thenReturn(serviceFailure(new Error(PROJECT_INVITE_INVALID_PROJECT_ID, NOT_FOUND))); mockMvc.perform(get("/project-invite/get-invites-by-project-id/{projectId}", projectId)). andExpect(status().isNotFound()); verify(projectInviteServiceMock).getInvitesByProject(projectId); }
@Test public void getInvitesByProjectSuccess() throws Exception { Long projectId = 123L; List<ProjectUserInviteResource> projectUserInviteResources = newProjectUserInviteResource(). withId(1L). withEmail("[email protected]"). withName("test-project-invitece"). withStatus(InviteStatus.CREATED). withOrganisation(25L). withProject(2L). build(5); when(projectInviteServiceMock.getInvitesByProject(projectId)).thenReturn(serviceSuccess(projectUserInviteResources)); mockMvc.perform(get("/project-invite/get-invites-by-project-id/{projectId}", projectId)). andExpect(status().isOk()). andExpect(content().json(toJson(projectUserInviteResources))); verify(projectInviteServiceMock).getInvitesByProject(projectId); } |
RejectionReasonController { @GetMapping("/find-all-active") public RestResult<List<RejectionReasonResource>> findAllActive() { return rejectionReasonService.findAllActive().toGetResponse(); } @GetMapping("/find-all-active") RestResult<List<RejectionReasonResource>> findAllActive(); } | @Test public void findAllActive() throws Exception { List<RejectionReasonResource> expected = newRejectionReasonResource().build(2); when(rejectionReasonServiceMock.findAllActive()).thenReturn(serviceSuccess(expected)); mockMvc.perform(get("/rejection-reason/find-all-active")) .andExpect(status().isOk()) .andExpect(jsonPath("$", hasSize(2))) .andExpect(content().string(objectMapper.writeValueAsString(expected))); verify(rejectionReasonServiceMock, only()).findAllActive(); } |
ApplicationKtaInviteServiceImpl extends InviteService<ApplicationKtaInvite> implements ApplicationKtaInviteService { @Override @Transactional public ServiceResult<Void> saveKtaInvite(ApplicationKtaInviteResource inviteResource) { return validateKtaApplication(inviteResource, EDIT_EMAIL_FIELD).andOnSuccess(validated -> { ApplicationKtaInvite invite = mapKtaInviteResourceToKtaInvite(inviteResource); applicationKtaInviteRepository.save(invite); return applicationInviteNotificationService.inviteKta(invite); }); } @Override ServiceResult<ApplicationKtaInviteResource> getKtaInviteByApplication(long applicationId); @Override ServiceResult<Void> resendKtaInvite(ApplicationKtaInviteResource inviteResource); @Override @Transactional ServiceResult<Void> removeKtaInviteByApplication(long applicationId); @Override @Transactional ServiceResult<Void> saveKtaInvite(ApplicationKtaInviteResource inviteResource); @Override ServiceResult<ApplicationKtaInviteResource> getKtaInviteByHash(String hash); @Override @Transactional ServiceResult<Void> acceptInvite(String hash); } | @Test public void saveKtaInviteGivenInvitePresentAlready() { ApplicationKtaInviteResource invite = newApplicationKtaInviteResource() .withEmail("[email protected]") .withApplication(123L).build(); ApplicationKtaInvite otherInvite = newApplicationKtaInvite() .withEmail("[email protected]") .build(); when(applicationKtaInviteRepository.findByApplicationId(invite.getApplication())).thenReturn(Optional.of(otherInvite)); ServiceResult<Void> result = inviteKtaService.saveKtaInvite(invite); assertTrue(result.isFailure()); assertEquals(1, result.getFailure().getErrors().size()); assertEquals("kta.already.invited", result.getFailure().getErrors().get(0).getErrorKey()); }
@Test public void saveKtaInviteForNonKtaUser() { ApplicationKtaInviteResource invite = newApplicationKtaInviteResource() .withEmail("[email protected]") .withApplication(123L).build(); when(applicationKtaInviteRepository.findByApplicationId(invite.getApplication())).thenReturn(Optional.empty()); UserResource user = newUserResource().withRolesGlobal(singletonList(Role.APPLICANT)).build(); when(userService.findByEmail("[email protected]")).thenReturn(serviceSuccess(user)); ServiceResult<Void> result = inviteKtaService.saveKtaInvite(invite); assertTrue(result.isFailure()); assertEquals(1, result.getFailure().getErrors().size()); assertEquals("user.not.registered.kta", result.getFailure().getErrors().get(0).getErrorKey()); }
@Test public void saveKtaInvite() { ApplicationKtaInviteResource invite = newApplicationKtaInviteResource() .withEmail("[email protected]") .withApplication(123L).build(); when(applicationKtaInviteRepository.findByApplicationId(invite.getApplication())).thenReturn(Optional.empty()); UserResource user = newUserResource().withRolesGlobal(singletonList(Role.KNOWLEDGE_TRANSFER_ADVISER)).build(); when(userService.findByEmail("[email protected]")).thenReturn(serviceSuccess(user)); when(applicationInviteNotificationService.inviteKta(any())).thenAnswer(invocation -> serviceSuccess()); ServiceResult<Void> result = inviteKtaService.saveKtaInvite(invite); assertTrue(result.isSuccess()); } |
ApplicationKtaInviteServiceImpl extends InviteService<ApplicationKtaInvite> implements ApplicationKtaInviteService { @Override public ServiceResult<ApplicationKtaInviteResource> getKtaInviteByHash(String hash) { return getByHash(hash) .andOnSuccessReturn(this::mapInviteToKtaInviteResource); } @Override ServiceResult<ApplicationKtaInviteResource> getKtaInviteByApplication(long applicationId); @Override ServiceResult<Void> resendKtaInvite(ApplicationKtaInviteResource inviteResource); @Override @Transactional ServiceResult<Void> removeKtaInviteByApplication(long applicationId); @Override @Transactional ServiceResult<Void> saveKtaInvite(ApplicationKtaInviteResource inviteResource); @Override ServiceResult<ApplicationKtaInviteResource> getKtaInviteByHash(String hash); @Override @Transactional ServiceResult<Void> acceptInvite(String hash); } | @Test public void getKtaInviteByHash() { String hash = "hash"; long leadOrganisationId = 31L; Organisation leadOrganisation = newOrganisation().withName("Empire Ltd").withId(leadOrganisationId).build(); ApplicationKtaInviteResource inviteResource = newApplicationKtaInviteResource().build(); ApplicationKtaInvite invite = new ApplicationKtaInvite(); when(applicationKtaInviteRepository.getByHash(hash)).thenReturn(invite); when(applicationKtaInviteMapper.mapToResource(invite)).thenReturn(inviteResource); when(organisationRepository.findById(inviteResource.getLeadOrganisationId())).thenReturn(Optional.of(leadOrganisation)); ServiceResult<ApplicationKtaInviteResource> result = inviteKtaService.getKtaInviteByHash(hash); assertTrue(result.isSuccess()); assertEquals(result.getSuccess(), inviteResource); } |
ApplicationKtaInviteServiceImpl extends InviteService<ApplicationKtaInvite> implements ApplicationKtaInviteService { @Override @Transactional public ServiceResult<Void> acceptInvite(String hash) { return getByHash(hash) .andOnSuccess(invite -> { applicationKtaInviteRepository.save(invite.open()); ProcessRole ktaProcessRole = new ProcessRole(invite.getUser(), invite.getTarget().getId(), Role.KNOWLEDGE_TRANSFER_ADVISER); processRoleRepository.save(ktaProcessRole); return serviceSuccess(); }); } @Override ServiceResult<ApplicationKtaInviteResource> getKtaInviteByApplication(long applicationId); @Override ServiceResult<Void> resendKtaInvite(ApplicationKtaInviteResource inviteResource); @Override @Transactional ServiceResult<Void> removeKtaInviteByApplication(long applicationId); @Override @Transactional ServiceResult<Void> saveKtaInvite(ApplicationKtaInviteResource inviteResource); @Override ServiceResult<ApplicationKtaInviteResource> getKtaInviteByHash(String hash); @Override @Transactional ServiceResult<Void> acceptInvite(String hash); } | @Test public void acceptInvite() { String hash = "hash"; ApplicationKtaInvite invite = mock(ApplicationKtaInvite.class); when(applicationKtaInviteRepository.getByHash(hash)).thenReturn(invite); when(invite.getTarget()).thenReturn(newApplication().build()); when(invite.getUser()).thenReturn(newUser().build()); ServiceResult<Void> result = inviteKtaService.acceptInvite(hash); assertTrue(result.isSuccess()); verify(processRoleRepository).save(any(ProcessRole.class)); verify(applicationKtaInviteRepository).save(invite.open()); } |
InviteOrganisationServiceImpl extends BaseTransactionalService implements InviteOrganisationService { @Override public ServiceResult<InviteOrganisationResource> getById(long id) { return find(inviteOrganisationRepository.findById(id), notFoundError(InviteOrganisation.class, id)) .andOnSuccessReturn(mapper::mapToResource); } @Override ServiceResult<InviteOrganisationResource> getById(long id); @Override ServiceResult<InviteOrganisationResource> getByOrganisationIdWithInvitesForApplication(long organisationId, long applicationId); @Override @Transactional ServiceResult<InviteOrganisationResource> save(InviteOrganisationResource inviteOrganisationResource); } | @Test public void getById() throws Exception { InviteOrganisation inviteOrganisation = newInviteOrganisation().build(); InviteOrganisationResource inviteOrganisationResource = newInviteOrganisationResource().build(); when(inviteOrganisationRepositoryMock.findById(inviteOrganisation.getId())).thenReturn(Optional.of(inviteOrganisation)); when(inviteOrganisationMapperMock.mapToResource(inviteOrganisation)).thenReturn(inviteOrganisationResource); ServiceResult<InviteOrganisationResource> result = service.getById(inviteOrganisation.getId()); assertEquals(inviteOrganisationResource, result.getSuccess()); InOrder inOrder = inOrder(inviteOrganisationRepositoryMock, inviteOrganisationMapperMock); inOrder.verify(inviteOrganisationRepositoryMock).findById(inviteOrganisation.getId()); inOrder.verify(inviteOrganisationMapperMock).mapToResource(inviteOrganisation); inOrder.verifyNoMoreInteractions(); } |
InviteOrganisationServiceImpl extends BaseTransactionalService implements InviteOrganisationService { @Override public ServiceResult<InviteOrganisationResource> getByOrganisationIdWithInvitesForApplication(long organisationId, long applicationId) { return find(inviteOrganisationRepository.findOneByOrganisationIdAndInvitesApplicationId(organisationId, applicationId), notFoundError(InviteOrganisation.class, asList(organisationId, applicationId))).andOnSuccessReturn(mapper::mapToResource); } @Override ServiceResult<InviteOrganisationResource> getById(long id); @Override ServiceResult<InviteOrganisationResource> getByOrganisationIdWithInvitesForApplication(long organisationId, long applicationId); @Override @Transactional ServiceResult<InviteOrganisationResource> save(InviteOrganisationResource inviteOrganisationResource); } | @Test public void getByOrganisationIdWithInvitesForApplication() throws Exception { long organisationId = 1L; long applicationId = 2L; InviteOrganisation inviteOrganisation = newInviteOrganisation().build(); InviteOrganisationResource inviteOrganisationResource = newInviteOrganisationResource().build(); when(inviteOrganisationRepositoryMock.findOneByOrganisationIdAndInvitesApplicationId(organisationId, applicationId)).thenReturn(inviteOrganisation); when(inviteOrganisationMapperMock.mapToResource(inviteOrganisation)).thenReturn(inviteOrganisationResource); ServiceResult<InviteOrganisationResource> result = service.getByOrganisationIdWithInvitesForApplication(organisationId, applicationId); assertEquals(inviteOrganisationResource, result.getSuccess()); InOrder inOrder = inOrder(inviteOrganisationRepositoryMock, inviteOrganisationMapperMock); inOrder.verify(inviteOrganisationRepositoryMock).findOneByOrganisationIdAndInvitesApplicationId(organisationId, applicationId); inOrder.verify(inviteOrganisationMapperMock).mapToResource(inviteOrganisation); inOrder.verifyNoMoreInteractions(); } |
RejectionReasonServiceImpl implements RejectionReasonService { @Override public ServiceResult<List<RejectionReasonResource>> findAllActive() { return serviceSuccess(simpleMap(rejectionReasonRepository.findByActiveTrueOrderByPriorityAsc(), rejectionReasonMapper::mapToResource)); } @Override ServiceResult<List<RejectionReasonResource>> findAllActive(); @Override ServiceResult<RejectionReasonResource> findById(Long id); } | @Test public void findAllActive() throws Exception { List<RejectionReasonResource> rejectionReasonResources = newRejectionReasonResource().build(2); List<RejectionReason> rejectionReasons = newRejectionReason().build(2); when(rejectionReasonRepositoryMock.findByActiveTrueOrderByPriorityAsc()).thenReturn(rejectionReasons); when(rejectionReasonMapperMock.mapToResource(same(rejectionReasons.get(0)))).thenReturn(rejectionReasonResources.get(0)); when(rejectionReasonMapperMock.mapToResource(same(rejectionReasons.get(1)))).thenReturn(rejectionReasonResources.get(1)); List<RejectionReasonResource> found = rejectionReasonService.findAllActive().getSuccess(); assertEquals(rejectionReasonResources, found); InOrder inOrder = inOrder(rejectionReasonRepositoryMock, rejectionReasonMapperMock); inOrder.verify(rejectionReasonRepositoryMock, calls(1)).findByActiveTrueOrderByPriorityAsc(); inOrder.verify(rejectionReasonMapperMock, calls(2)).mapToResource(isA(RejectionReason.class)); inOrder.verifyNoMoreInteractions(); } |
RejectionReasonServiceImpl implements RejectionReasonService { @Override public ServiceResult<RejectionReasonResource> findById(Long id) { return find(rejectionReasonRepository.findById(id), notFoundError(RejectionReason.class, id)).andOnSuccessReturn(rejectionReasonMapper::mapToResource); } @Override ServiceResult<List<RejectionReasonResource>> findAllActive(); @Override ServiceResult<RejectionReasonResource> findById(Long id); } | @Test public void findById() throws Exception { Long rejectionReasonId = 1L; RejectionReasonResource rejectionReasonResource = newRejectionReasonResource().build(); RejectionReason rejectionReason = newRejectionReason().build(); when(rejectionReasonRepositoryMock.findById(rejectionReasonId)).thenReturn(Optional.of(rejectionReason)); when(rejectionReasonMapperMock.mapToResource(same(rejectionReason))).thenReturn(rejectionReasonResource); RejectionReasonResource found = rejectionReasonService.findById(rejectionReasonId).getSuccess(); assertEquals(rejectionReasonResource, found); InOrder inOrder = inOrder(rejectionReasonRepositoryMock, rejectionReasonMapperMock); inOrder.verify(rejectionReasonRepositoryMock, calls(1)).findById(rejectionReasonId); inOrder.verify(rejectionReasonMapperMock, calls(1)).mapToResource(rejectionReason); inOrder.verifyNoMoreInteractions(); } |
ApplicationInviteNotificationService { @Transactional ServiceResult<Void> inviteCollaborators(List<ApplicationInvite> invites) { for (ApplicationInvite invite : invites) { ServiceResult<Void> inviteResult = processCollaboratorInvite(webBaseUrl, invite, false); if (inviteResult.isFailure()) { return inviteResult; } } return serviceSuccess(); } ApplicationInviteNotificationService(); @Transactional ServiceResult<Void> resendCollaboratorInvite(ApplicationInvite invite); @Transactional ServiceResult<Void> resendKtaInvite(ApplicationKtaInvite invite); @Transactional ServiceResult<Void> inviteKta(ApplicationKtaInvite invite); ServiceResult<Void> removeKtaFromApplication(ApplicationKtaInvite invite); } | @Test public void inviteCollaborators() { Competition competition = newCompetition().build(); Application application = newApplication().withCompetition(competition).withName("AppName").build(); User leadApplicant = newUser() .withTitle(Title.Dr) .withEmailAddress("[email protected]") .withFirstName("Nico").build(); Organisation leadOrganisation = newOrganisation() .withId(43L) .withName("Empire Ltd") .build(); ProcessRole processRole1 = newProcessRole() .with(id(1L)) .withApplication(application) .withUser(leadApplicant) .withRole(Role.LEADAPPLICANT) .withOrganisationId(leadOrganisation.getId()) .build(); application.setProcessRoles(singletonList(processRole1)); ApplicationInvite invite = newApplicationInvite().withApplication(application).build(); invite.setName("Nico"); invite.setEmail("[email protected]"); invite.setHash("hash234"); InviteOrganisation inviteOrganisation = new InviteOrganisation("SomeOrg", null, singletonList(invite)); invite.setInviteOrganisation(inviteOrganisation); when(organisationRepositoryMock.findById(leadOrganisation.getId())).thenReturn(Optional.of(leadOrganisation)); when(notificationServiceMock.sendNotificationWithFlush(isA(Notification.class), eq(NotificationMedium.EMAIL))).thenReturn(serviceSuccess()); when(organisationRepositoryMock.findById(leadOrganisation.getId())).thenReturn(Optional.of(leadOrganisation)); when(notificationServiceMock.sendNotificationWithFlush(createNotificationExpectations(invite, application, competition, leadOrganisation), eq(NotificationMedium.EMAIL))).thenReturn(serviceSuccess()); ServiceResult<Void> results = inviteService.inviteCollaborators(singletonList(invite)); assertThat(results.isSuccess()).isTrue(); assertFalse("hash234".equals(invite.getHash())); verify(organisationRepositoryMock).findById(leadOrganisation.getId()); verify(notificationServiceMock).sendNotificationWithFlush(isA(Notification.class), eq(NotificationMedium.EMAIL)); verify(organisationRepositoryMock).findById(leadOrganisation.getId()); verify(notificationServiceMock).sendNotificationWithFlush(createNotificationExpectations(invite, application, competition, leadOrganisation), eq(NotificationMedium.EMAIL)); }
@Test public void inviteCollaboratorsInvalid() { Application application = newApplication().withName("AppName").build(); User leadApplicant = newUser() .withTitle(Title.Dr) .withEmailAddress("[email protected]") .withFirstName("Nico").build(); Organisation leadOrganisation = newOrganisation().withName("Empire Ltd").build(); ProcessRole processRole1 = newProcessRole() .with(id(1L)) .withApplication(application) .withUser(leadApplicant) .withRole(Role.LEADAPPLICANT) .withOrganisationId(leadOrganisation.getId()) .build(); application.setProcessRoles(singletonList(processRole1)); ApplicationInvite invite = newApplicationInvite().withApplication(application).build(); invite.setName("Nico"); invite.setEmail("nicotest.nl"); ServiceResult<Void> results = inviteService.inviteCollaborators(singletonList(invite)); assertThat(results.isFailure()).isTrue(); }
@Test public void inviteCollaboratorsEmailFailsToSend() { Competition competition = newCompetition().build(); Application application = newApplication().withCompetition(competition).withName("AppName").build(); User leadApplicant = newUser() .withTitle(Title.Dr) .withEmailAddress("[email protected]") .withFirstName("Nico").build(); Organisation leadOrganisation = newOrganisation() .withId(43L) .withName("Empire Ltd") .build(); ProcessRole processRole1 = newProcessRole() .with(id(1L)) .withApplication(application) .withUser(leadApplicant) .withRole(Role.LEADAPPLICANT) .withOrganisationId(leadOrganisation.getId()) .build(); application.setProcessRoles(singletonList(processRole1)); ApplicationInvite invite = newApplicationInvite().withApplication(application).build(); invite.setName("Nico"); invite.setEmail("[email protected]"); InviteOrganisation inviteOrganisation = new InviteOrganisation("SomeOrg", null, singletonList(invite)); invite.setInviteOrganisation(inviteOrganisation); when(organisationRepositoryMock.findById(leadOrganisation.getId())).thenReturn(Optional.of(leadOrganisation)); when(notificationServiceMock.sendNotificationWithFlush(isA(Notification.class), eq(NotificationMedium.EMAIL))).thenReturn(serviceFailure(forbiddenError())); ServiceResult<Void> results = inviteService.inviteCollaborators(singletonList(invite)); assertThatServiceFailureIs(results, forbiddenError()); verify(organisationRepositoryMock).findById(leadOrganisation.getId()); verify(notificationServiceMock).sendNotificationWithFlush(isA(Notification.class), eq(NotificationMedium.EMAIL)); } |
ApplicationInviteNotificationService { @Transactional public ServiceResult<Void> resendCollaboratorInvite(ApplicationInvite invite) { return processCollaboratorInvite(webBaseUrl, invite, true); } ApplicationInviteNotificationService(); @Transactional ServiceResult<Void> resendCollaboratorInvite(ApplicationInvite invite); @Transactional ServiceResult<Void> resendKtaInvite(ApplicationKtaInvite invite); @Transactional ServiceResult<Void> inviteKta(ApplicationKtaInvite invite); ServiceResult<Void> removeKtaFromApplication(ApplicationKtaInvite invite); } | @Test public void resendCollaboratorInvite() { Competition competition = newCompetition().build(); Application application = newApplication() .withCompetition(competition) .withName("application name") .build(); User leadApplicant = newUser() .withTitle(Title.Mr) .withEmailAddress("email.address") .withFirstName("Kieran").build(); Organisation leadOrganisation = newOrganisation() .withId(43L) .withName("Imaginative organisation name") .build(); ProcessRole processRole1 = newProcessRole() .with(id(1L)) .withApplication(application) .withUser(leadApplicant) .withRole(Role.LEADAPPLICANT) .withOrganisationId(leadOrganisation.getId()) .build(); application.setProcessRoles(singletonList(processRole1)); ApplicationInvite invite = newApplicationInvite().withApplication(application).build(); invite.setName("Steve Smith"); invite.setEmail("[email protected]"); InviteOrganisation inviteOrganisation = new InviteOrganisation("Another imaginative organisation name", null, singletonList(invite)); invite.setInviteOrganisation(inviteOrganisation); invite.setHash("hash123"); when(organisationRepositoryMock.findById(leadOrganisation.getId())).thenReturn(Optional.of(leadOrganisation)); when(notificationServiceMock.sendNotificationWithFlush(isA(Notification.class), eq(NotificationMedium.EMAIL))) .thenReturn(serviceSuccess()); when(notificationServiceMock.sendNotificationWithFlush(createNotificationExpectations(invite, application, competition, leadOrganisation), eq(NotificationMedium.EMAIL))).thenReturn(serviceSuccess()); ServiceResult<Void> result = inviteService.resendCollaboratorInvite(invite); assertTrue(result.isSuccess()); assertEquals("hash123", invite.getHash()); verify(organisationRepositoryMock).findById(leadOrganisation.getId()); verify(notificationServiceMock).sendNotificationWithFlush(isA(Notification.class), eq(NotificationMedium.EMAIL)); verify(organisationRepositoryMock).findById(leadOrganisation.getId()); verify(notificationServiceMock).sendNotificationWithFlush(createNotificationExpectations(invite, application, competition, leadOrganisation), eq(NotificationMedium.EMAIL)); } |
AcceptApplicationInviteServiceImpl extends InviteService<ApplicationInvite> implements AcceptApplicationInviteService { @Override @Transactional public ServiceResult<Void> acceptInvite(String inviteHash, long userId, Optional<Long> organisationId) { return find(invite(inviteHash), user(userId)).andOnSuccess((invite, user) -> { if (!invite.getEmail().equalsIgnoreCase(user.getEmail())) { LOG.error( "Invite (id: {}) email address does not match user's (id: {})", invite.getId(), user.getId() ); return serviceFailure(new Error( "Invite email address not the same as the user's email address", NOT_ACCEPTABLE )); } invite.open(); if (invite.getInviteOrganisation().getOrganisation() == null) { if (!organisationId.isPresent()) { return serviceFailure(notFoundError(Organisation.class)); } assignOrganisationToInvite(invite, organisationRepository.findById(organisationId.get()).orElse(null)); } initializeInvitee(invite, user); return serviceSuccess(); }); } @Override @Transactional ServiceResult<Void> acceptInvite(String inviteHash, long userId, Optional<Long> organisationId); } | @Test public void acceptInvite_failsOnEmailAddressMismatch() { ApplicationInvite invite = newApplicationInvite() .withEmail("[email protected]") .build(); User user = newUser() .withEmailAddress("[email protected]") .build(); when(applicationInviteRepositoryMock.getByHash(testInviteHash)).thenReturn(invite); when(userRepositoryMock.findById(user.getId())).thenReturn(Optional.of(user)); ServiceResult<Void> result = service.acceptInvite(testInviteHash, user.getId(), Optional.empty()); assertThat(result.isFailure()).isTrue(); }
@Test public void acceptInvite_replaceWithExistingCollaboratorInviteOrganisation() { InviteOrganisation inviteOrganisationToBeReplaced = newInviteOrganisation().build(); ApplicationInvite invite = createAndExpectInvite(inviteOrganisationToBeReplaced); User user = createAndExpectInviteUser(); Organisation usersCurrentOrganisation = createAndExpectUsersCurrentOrganisation(user); InviteOrganisation collaboratorInviteOrganisation = newInviteOrganisation() .withOrganisation(usersCurrentOrganisation) .build(); when(inviteOrganisationRepositoryMock.findFirstByOrganisationIdAndInvitesApplicationId( usersCurrentOrganisation.getId(), invite.getTarget().getId() )) .thenReturn(Optional.of(collaboratorInviteOrganisation)); when(applicationService.linkAddressesToOrganisation(usersCurrentOrganisation.getId(), invite.getTarget().getId())).thenReturn(serviceSuccess()); when(processRoleRepositoryMock.save(any())).thenAnswer(invocation -> { ProcessRole role = invocation.getArgument(0); role.setId(1L); return role; }); ServiceResult<Void> result = service.acceptInvite(testInviteHash, user.getId(), Optional.of(usersCurrentOrganisation.getId())); InOrder inOrder = inOrder(inviteOrganisationRepositoryMock, applicationInviteRepositoryMock); inOrder.verify(inviteOrganisationRepositoryMock).saveAndFlush(inviteOrganisationToBeReplaced); inOrder.verify(inviteOrganisationRepositoryMock).delete(inviteOrganisationToBeReplaced); verify(applicationService).linkAddressesToOrganisation(usersCurrentOrganisation.getId(), invite.getTarget().getId()); assertThat(result.isSuccess()).isTrue(); assertThat(invite.getInviteOrganisation()) .isEqualToComparingFieldByField(collaboratorInviteOrganisation); }
@Test public void acceptInvite_previousInviteOrganisationIsNotDeletedIfThereAreOtherInvitesAttached() { InviteOrganisation inviteOrganisationToBeReplaced = newInviteOrganisation() .withInvites(newApplicationInvite().build(2)) .build(); ApplicationInvite invite = createAndExpectInvite(inviteOrganisationToBeReplaced); User user = createAndExpectInviteUser(); Organisation usersCurrentOrganisation = createAndExpectUsersCurrentOrganisation(user); InviteOrganisation collaboratorInviteOrganisation = newInviteOrganisation() .withOrganisation(usersCurrentOrganisation) .build(); when(inviteOrganisationRepositoryMock.findFirstByOrganisationIdAndInvitesApplicationId( usersCurrentOrganisation.getId(), invite.getTarget().getId() )) .thenReturn(Optional.of(collaboratorInviteOrganisation)); when(applicationService.linkAddressesToOrganisation(usersCurrentOrganisation.getId(), invite.getTarget().getId())).thenReturn(serviceSuccess()); when(processRoleRepositoryMock.save(any())).thenAnswer(invocation -> { ProcessRole role = invocation.getArgument(0); role.setId(1L); return role; }); ServiceResult<Void> result = service.acceptInvite(testInviteHash, user.getId(), Optional.of(usersCurrentOrganisation.getId())); verify(inviteOrganisationRepositoryMock, never()).delete(inviteOrganisationToBeReplaced); verify(applicationService).linkAddressesToOrganisation(usersCurrentOrganisation.getId(), invite.getTarget().getId()); assertThat(result.isSuccess()).isTrue(); }
@Test public void acceptInvite_assignsUsersCurrentOrganisationIfNoCollaboratorOrganisationExists() { ApplicationInvite invite = createAndExpectInvite(newInviteOrganisation().build()); User user = createAndExpectInviteUser(); Organisation usersCurrentOrganisation = createAndExpectUsersCurrentOrganisation(user); when(inviteOrganisationRepositoryMock.findFirstByOrganisationIdAndInvitesApplicationId( usersCurrentOrganisation.getId(), invite.getTarget().getId() )) .thenReturn(Optional.empty()); when(applicationService.linkAddressesToOrganisation(usersCurrentOrganisation.getId(), invite.getTarget().getId())).thenReturn(serviceSuccess()); when(processRoleRepositoryMock.save(any())).thenAnswer(invocation -> { ProcessRole role = invocation.getArgument(0); role.setId(1L); return role; }); ServiceResult<Void> result = service.acceptInvite(testInviteHash, user.getId(), Optional.of(usersCurrentOrganisation.getId())); verify(applicationService).linkAddressesToOrganisation(usersCurrentOrganisation.getId(), invite.getTarget().getId()); assertThat(result.isSuccess()).isTrue(); assertThat(invite.getInviteOrganisation().getOrganisation()) .isEqualToComparingFieldByField(usersCurrentOrganisation); }
@Test public void acceptInvite_processRoleIsCreatedAndApplicationProgressIsUpdated() { ApplicationInvite invite = createAndExpectInvite(newInviteOrganisation().build()); User user = createAndExpectInviteUser(); Organisation usersCurrentOrganisation = createAndExpectUsersCurrentOrganisation(user); when(inviteOrganisationRepositoryMock.findFirstByOrganisationIdAndInvitesApplicationId( usersCurrentOrganisation.getId(), invite.getTarget().getId() )) .thenReturn(Optional.empty()); ProcessRole expectedProcessRole = new ProcessRole( user, invite.getTarget().getId(), Role.COLLABORATOR, usersCurrentOrganisation.getId() ); when(processRoleRepositoryMock.save(expectedProcessRole)).thenAnswer(invocation -> { expectedProcessRole.setId(100L); return expectedProcessRole; }); when(applicationProgressService.updateApplicationProgress(invite.getTarget().getId())) .thenReturn(serviceSuccess(BigDecimal.ONE)); when(applicationService.linkAddressesToOrganisation(usersCurrentOrganisation.getId(), invite.getTarget().getId())).thenReturn(serviceSuccess()); ServiceResult<Void> result = service.acceptInvite(testInviteHash, user.getId(), Optional.of(usersCurrentOrganisation.getId())); verify(autoCompleteSectionsUtil).intitialiseCompleteSectionsForOrganisation(invite.getTarget(), usersCurrentOrganisation.getId(), expectedProcessRole.getId()); expectedProcessRole.setId(null); verify(processRoleRepositoryMock).save(expectedProcessRole); verify(applicationProgressService).updateApplicationProgress(invite.getTarget().getId()); verify(applicationService).linkAddressesToOrganisation(usersCurrentOrganisation.getId(), invite.getTarget().getId()); assertThat(result.isSuccess()).isTrue(); assertThat(invite.getTarget().getProcessRoles()) .contains(expectedProcessRole); } |
InviteUserServiceImpl extends BaseTransactionalService implements InviteUserService { @Override @Transactional public ServiceResult<Void> saveUserInvite(UserResource invitedUser, Role role) { if (StringUtils.isEmpty(invitedUser.getEmail()) || StringUtils.isEmpty(invitedUser.getFirstName()) || StringUtils.isEmpty(invitedUser.getLastName()) || role == null){ return serviceFailure(USER_ROLE_INVITE_INVALID); } if (externalRolesToInvite().contains(role)) { return validateExternalUserEmailDomain(invitedUser.getEmail(), role) .andOnSuccess(() -> validateAndSaveInvite(invitedUser, role)) .andOnSuccess(this::inviteExternalUser); } else if (internalRoles().contains(role)) { return validateInternalUserEmailDomain(invitedUser.getEmail()) .andOnSuccess(() -> validateAndSaveInvite(invitedUser, role)) .andOnSuccess(this::inviteInternalUser); } else { return serviceFailure(NOT_AN_INTERNAL_USER_ROLE); } } @Override @Transactional ServiceResult<Void> saveUserInvite(UserResource invitedUser, Role role); @Override ServiceResult<RoleInviteResource> getInvite(String inviteHash); @Override ServiceResult<Boolean> checkExistingUser(String inviteHash); @Override ServiceResult<RoleInvitePageResource> findPendingInternalUserInvites(String filter, Pageable pageable); @Override ServiceResult<List<ExternalInviteResource>> findExternalInvites(String searchString, SearchCategory searchCategory); @Override ServiceResult<Void> resendInvite(long inviteId); static final String INTERNAL_USER_WEB_CONTEXT; static final String EXTERNAL_USER_WEB_CONTEXT; } | @Test public void saveUserInviteWhenUserDetailsMissing() throws Exception { UserResource invitedUser = UserResourceBuilder.newUserResource().build(); ServiceResult<Void> result = service.saveUserInvite(invitedUser, Role.SUPPORT); assertTrue(result.isFailure()); assertTrue(result.getFailure().is(USER_ROLE_INVITE_INVALID)); }
@Test public void saveUserInviteWhenUserRoleIsNotSpecified() throws Exception { ServiceResult<Void> result = service.saveUserInvite(invitedUser, null); assertTrue(result.isFailure()); assertTrue(result.getFailure().is(USER_ROLE_INVITE_INVALID)); }
@Test public void saveInternalUserInviteWhenRoleSpecifiedIsNotInternalRole() { ServiceResult<Void> result = service.saveUserInvite(invitedUser, COLLABORATOR); assertTrue(result.isFailure()); assertTrue(result.getFailure().is(NOT_AN_INTERNAL_USER_ROLE)); }
@Test public void saveInternalUserInviteWhenEmailDomainIsIncorrect() throws Exception { Role role = Role.SUPPORT; invitedUser.setEmail("[email protected]"); ServiceResult<Void> result = service.saveUserInvite(invitedUser, role); assertTrue(result.isFailure()); assertTrue(result.getFailure().is(USER_ROLE_INVITE_INVALID_EMAIL)); }
@Test public void saveInternalUserInviteWhenUserAlreadyInvited() throws Exception { RoleInvite roleInvite = new RoleInvite(); when(userRepositoryMock.findByEmail(invitedUser.getEmail())).thenReturn(Optional.empty()); when(roleInviteRepositoryMock.findByEmail(invitedUser.getEmail())).thenReturn(Collections.singletonList(roleInvite)); ServiceResult<Void> result = service.saveUserInvite(invitedUser, SUPPORT); assertTrue(result.isFailure()); assertTrue(result.getFailure().is(USER_ROLE_INVITE_TARGET_USER_ALREADY_INVITED)); }
@Test public void inviteInternalUserSendEmailSucceeds() throws Exception { Role role = Role.IFS_ADMINISTRATOR; RoleInvite expectedRoleInvite = newRoleInvite(). withEmail("[email protected]"). withName("Astle Pimenta"). withRole(role). withStatus(CREATED). withHash("1234"). build(); when(roleInviteRepositoryMock.save(any(RoleInvite.class))).thenReturn(expectedRoleInvite); NotificationTarget notificationTarget = new UserNotificationTarget("Astle Pimenta", "[email protected]"); Map<String, Object> expectedNotificationArgs = asMap( "role", role.getDisplayName(), "inviteUrl", webBaseUrl + InviteUserServiceImpl.INTERNAL_USER_WEB_CONTEXT + "/" + expectedRoleInvite.getHash() + "/register" ); Notification expectedNotification = new Notification(systemNotificationSource, notificationTarget, INVITE_INTERNAL_USER, expectedNotificationArgs); when(notificationService.sendNotificationWithFlush(expectedNotification, EMAIL)).thenReturn(serviceSuccess()); when(loggedInUserSupplierMock.get()).thenReturn(newUser().build()); when(roleInviteRepositoryMock.save(any(RoleInvite.class))).thenReturn(expectedRoleInvite); when(userRepositoryMock.findByEmail(invitedUser.getEmail())).thenReturn(Optional.empty()); ServiceResult<Void> result = service.saveUserInvite(invitedUser, IFS_ADMINISTRATOR); assertTrue(result.isSuccess()); verify(roleInviteRepositoryMock, times(2)).save(roleInviteArgumentCaptor.capture()); verify(notificationService).sendNotificationWithFlush(expectedNotification, EMAIL); List<RoleInvite> captured = roleInviteArgumentCaptor.getAllValues(); assertEquals("[email protected]", captured.get(0).getEmail()); assertEquals("Astle Pimenta", captured.get(0).getName()); assertEquals(role, captured.get(0).getTarget()); assertEquals(CREATED, captured.get(0).getStatus()); assertEquals("[email protected]", captured.get(1).getEmail()); assertEquals("Astle Pimenta", captured.get(1).getName()); assertEquals(role, captured.get(1).getTarget()); assertEquals(loggedInUserSupplierMock.get(), captured.get(1).getSentBy()); assertFalse(now().isBefore(captured.get(1).getSentOn())); assertEquals(SENT, captured.get(1).getStatus()); assertFalse(captured.get(1).getHash().isEmpty()); }
@Test public void inviteInternalUserSendEmailFails() throws Exception { Role role = SUPPORT; RoleInvite expectedRoleInvite = newRoleInvite() .withEmail("[email protected]") .withName("Astle Pimenta") .withRole(role) .withStatus(CREATED).withHash("") .build(); when(roleInviteRepositoryMock.save(any(RoleInvite.class))).thenReturn(expectedRoleInvite); when(userRepositoryMock.findByEmail(invitedUser.getEmail())).thenReturn(Optional.empty()); NotificationTarget notificationTarget = new UserNotificationTarget("Astle Pimenta", "[email protected]"); Map<String, Object> expectedNotificationArgs = asMap( "role", role.getDisplayName(), "inviteUrl", webBaseUrl + InviteUserServiceImpl.INTERNAL_USER_WEB_CONTEXT + "/" + expectedRoleInvite.getHash() + "/register" ); Notification expectedNotification = new Notification(systemNotificationSource, notificationTarget, INVITE_INTERNAL_USER, expectedNotificationArgs); when(notificationService.sendNotificationWithFlush(expectedNotification, EMAIL)).thenReturn(serviceFailure(GENERAL_UNEXPECTED_ERROR)); ServiceResult<Void> result = service.saveUserInvite(invitedUser, SUPPORT); assertTrue(result.isFailure()); verify(roleInviteRepositoryMock, times(1)).save(roleInviteArgumentCaptor.capture()); verify(notificationService).sendNotificationWithFlush(expectedNotification, EMAIL); List<RoleInvite> captured = roleInviteArgumentCaptor.getAllValues(); assertEquals("[email protected]", captured.get(0).getEmail()); assertEquals("Astle Pimenta", captured.get(0).getName()); assertEquals(role, captured.get(0).getTarget()); assertEquals(CREATED, captured.get(0).getStatus()); assertEquals(1, result.getErrors().size()); assertEquals(GENERAL_UNEXPECTED_ERROR.name(), result.getErrors().get(0).getErrorKey()); assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, result.getErrors().get(0).getStatusCode()); }
@Test public void saveInternalUserInviteWhenEmailAlreadyTaken() throws Exception { Role role = Role.IFS_ADMINISTRATOR; RoleInvite expectedRoleInvite = newRoleInvite() .withEmail("[email protected]") .withName("Astle Pimenta") .withRole(role) .withStatus(CREATED) .withHash("") .build(); when(roleInviteRepositoryMock.save(any(RoleInvite.class))).thenReturn(expectedRoleInvite); when(loggedInUserSupplierMock.get()).thenReturn(newUser().build()); expectedRoleInvite.setHash("1234"); when(roleInviteRepositoryMock.save(any(RoleInvite.class))).thenReturn(expectedRoleInvite); when(userRepositoryMock.findByEmail(invitedUser.getEmail())).thenReturn(Optional.of(newUser().build())); ServiceResult<Void> result = service.saveUserInvite(invitedUser, IFS_ADMINISTRATOR); assertTrue(result.isFailure()); assertTrue(result.getFailure().is(USER_ROLE_INVITE_EMAIL_TAKEN)); verify(roleInviteRepositoryMock, never()).save(Mockito.any(RoleInvite.class)); verify(notificationService, never()).sendNotificationWithFlush(any(Notification.class), eq(EMAIL)); }
@Test public void saveKtaUserInviteWhenEmailDomainIsIncorrect() throws Exception { Role role = KNOWLEDGE_TRANSFER_ADVISER; invitedUser.setEmail("[email protected]"); ServiceResult<Void> result = service.saveUserInvite(invitedUser, role); assertTrue(result.isFailure()); assertTrue(result.getFailure().is(KTA_USER_ROLE_INVITE_INVALID_EMAIL)); verify(roleInviteRepositoryMock, never()).save(Mockito.any(RoleInvite.class)); }
@Test public void saveKtaUserInviteWhenEmailAlreadyTaken() throws Exception { invitedUser.setEmail("[email protected]"); when(loggedInUserSupplierMock.get()).thenReturn(newUser().build()); when(userRepositoryMock.findByEmail(invitedUser.getEmail())).thenReturn(Optional.of(newUser().build())); ServiceResult<Void> result = service.saveUserInvite(invitedUser, KNOWLEDGE_TRANSFER_ADVISER); assertTrue(result.isFailure()); assertTrue(result.getFailure().is(USER_ROLE_INVITE_EMAIL_TAKEN)); verify(roleInviteRepositoryMock, never()).save(Mockito.any(RoleInvite.class)); }
@Test public void saveKtaUserInviteWhenUserAlreadyInvited() throws Exception { RoleInvite roleInvite = new RoleInvite(); invitedUser.setEmail("[email protected]"); when(userRepositoryMock.findByEmail(invitedUser.getEmail())).thenReturn(Optional.empty()); when(roleInviteRepositoryMock.findByEmail(invitedUser.getEmail())).thenReturn(Collections.singletonList(roleInvite)); ServiceResult<Void> result = service.saveUserInvite(invitedUser, KNOWLEDGE_TRANSFER_ADVISER); assertTrue(result.isFailure()); assertTrue(result.getFailure().is(USER_ROLE_INVITE_TARGET_USER_ALREADY_INVITED)); verify(roleInviteRepositoryMock, never()).save(Mockito.any(RoleInvite.class)); }
@Test public void saveKtaUserInviteSucceeds() throws Exception { Role role = KNOWLEDGE_TRANSFER_ADVISER; invitedUser.setEmail("[email protected]"); RoleInvite expectedRoleInvite = newRoleInvite(). withEmail("[email protected]"). withName("Astle Pimenta"). withRole(role). withStatus(CREATED). withHash("1234"). build(); when(roleInviteRepositoryMock.save(any(RoleInvite.class))).thenReturn(expectedRoleInvite); when(loggedInUserSupplierMock.get()).thenReturn(newUser().build()); when(roleInviteRepositoryMock.save(any(RoleInvite.class))).thenReturn(expectedRoleInvite); when(userRepositoryMock.findByEmail(invitedUser.getEmail())).thenReturn(Optional.empty()); NotificationTarget notificationTarget = new UserNotificationTarget(expectedRoleInvite.getName(), expectedRoleInvite.getEmail()); Map<String, Object> emailTemplateArgs = asMap("role", role.getDisplayName().toLowerCase(), "inviteUrl", "base/registration/1234/register"); Notification expectedNotification = new Notification(systemNotificationSource, notificationTarget, INVITE_EXTERNAL_USER, emailTemplateArgs); when(notificationService.sendNotificationWithFlush(expectedNotification, EMAIL)).thenReturn(serviceSuccess()); ServiceResult<Void> result = service.saveUserInvite(invitedUser, role); assertTrue(result.isSuccess()); verify(roleInviteRepositoryMock, times(2)).save(roleInviteArgumentCaptor.capture()); List<RoleInvite> captured = roleInviteArgumentCaptor.getAllValues(); assertEquals("[email protected]", captured.get(0).getEmail()); assertEquals("Astle Pimenta", captured.get(0).getName()); assertEquals(role, captured.get(0).getTarget()); assertEquals(CREATED, captured.get(0).getStatus()); assertNotNull(captured.get(1).getSentOn()); } |
RegistrationServiceImpl extends BaseTransactionalService implements RegistrationService { @Override @Transactional @UserUpdate public ServiceResult<UserResource> editInternalUser(UserResource userToEdit, Role userRoleType) { return validateInternalUserRole(userRoleType) .andOnSuccess(() -> ServiceResult.getNonNullValue(userRepository.findById(userToEdit.getId()).orElse(null), notFoundError(User.class))) .andOnSuccess(user -> getInternalRoleResources(userRoleType) .andOnSuccessReturn(roleResources -> { Set<Role> roleList = new HashSet<>(roleResources); user.setFirstName(userToEdit.getFirstName()); user.setLastName(userToEdit.getLastName()); user.setRoles(roleList); return userRepository.save(user); }) ).andOnSuccessReturn(userMapper::mapToResource); } @Override @Transactional ServiceResult<UserResource> createUser(UserCreationResource user); @Override @Transactional ServiceResult<Void> resendUserVerificationEmail(final UserResource user); @Override @Transactional @UserUpdate ServiceResult<UserResource> activateUser(long userId); @Override @Transactional @UserUpdate ServiceResult<UserResource> deactivateUser(long userId); @Override @Transactional ServiceResult<User> activatePendingUser(User user,
String password,
String hash); @Override @Transactional ServiceResult<Void> activateApplicantAndSendDiversitySurvey(long userId); @Override @Transactional ServiceResult<Void> activateAssessorAndSendDiversitySurvey(long userId); @Override @Transactional @UserUpdate ServiceResult<UserResource> editInternalUser(UserResource userToEdit, Role userRoleType); } | @Test public void editInternalUser_whenNewRoleIsNotInternalRole() { UserResource userToEdit = UserResourceBuilder.newUserResource().build(); ServiceResult<UserResource> result = service.editInternalUser(userToEdit, Role.COLLABORATOR); assertTrue(result.isFailure()); assertTrue(result.getFailure().is(NOT_AN_INTERNAL_USER_ROLE)); }
@Test public void editInternalUser_whenUserDoesNotExist() { UserResource userToEdit = UserResourceBuilder.newUserResource().build(); when(baseUserServiceMock.getUserById(userToEdit.getId())).thenReturn(serviceFailure(notFoundError(User.class, userToEdit.getId()))); ServiceResult<UserResource> result = service.editInternalUser(userToEdit, Role.SUPPORT); assertTrue(result.isFailure()); assertEquals(GENERAL_NOT_FOUND.getErrorKey(), result.getErrors().get(0).getErrorKey()); }
@Test public void editInternalUser_success() { setUpUsersForEditInternalUserSuccess(); Role newRole = Role.SUPPORT; when(userRepositoryMock.findById(userToEdit.getId())).thenReturn(Optional.of(userInDB)); when(userMapperMock.mapToDomain(userResourceInDB)).thenReturn(userInDB); ServiceResult<UserResource> result = service.editInternalUser(userToEdit, newRole); assertTrue(result.isSuccess()); verify(userRepositoryMock).save(userInDB); assertTrue(userInDB.getRoles().stream().anyMatch(role1 -> role1.equals(Role.SUPPORT))); assertEquals(userInDB.getFirstName(), userToEdit.getFirstName()); assertEquals(userInDB.getLastName(), userToEdit.getLastName()); } |
InviteUserServiceImpl extends BaseTransactionalService implements InviteUserService { @Override public ServiceResult<RoleInviteResource> getInvite(String inviteHash) { RoleInvite roleInvite = roleInviteRepository.getByHash(inviteHash); return serviceSuccess(roleInviteMapper.mapToResource(roleInvite)); } @Override @Transactional ServiceResult<Void> saveUserInvite(UserResource invitedUser, Role role); @Override ServiceResult<RoleInviteResource> getInvite(String inviteHash); @Override ServiceResult<Boolean> checkExistingUser(String inviteHash); @Override ServiceResult<RoleInvitePageResource> findPendingInternalUserInvites(String filter, Pageable pageable); @Override ServiceResult<List<ExternalInviteResource>> findExternalInvites(String searchString, SearchCategory searchCategory); @Override ServiceResult<Void> resendInvite(long inviteId); static final String INTERNAL_USER_WEB_CONTEXT; static final String EXTERNAL_USER_WEB_CONTEXT; } | @Test public void testGetInvite(){ RoleInvite roleInvite = newRoleInvite().build(); when(roleInviteRepositoryMock.getByHash("SomeInviteHash")).thenReturn(roleInvite); when(roleInviteMapperMock.mapToResource(roleInvite)).thenReturn(newRoleInviteResource().build()); ServiceResult<RoleInviteResource> result = service.getInvite("SomeInviteHash"); assertTrue(result.isSuccess()); } |
InviteUserServiceImpl extends BaseTransactionalService implements InviteUserService { @Override public ServiceResult<Boolean> checkExistingUser(String inviteHash) { return getByHash(inviteHash) .andOnSuccessReturn(i -> userRepository.findByEmail(i.getEmail())) .andOnSuccess(u -> serviceSuccess(u.isPresent())); } @Override @Transactional ServiceResult<Void> saveUserInvite(UserResource invitedUser, Role role); @Override ServiceResult<RoleInviteResource> getInvite(String inviteHash); @Override ServiceResult<Boolean> checkExistingUser(String inviteHash); @Override ServiceResult<RoleInvitePageResource> findPendingInternalUserInvites(String filter, Pageable pageable); @Override ServiceResult<List<ExternalInviteResource>> findExternalInvites(String searchString, SearchCategory searchCategory); @Override ServiceResult<Void> resendInvite(long inviteId); static final String INTERNAL_USER_WEB_CONTEXT; static final String EXTERNAL_USER_WEB_CONTEXT; } | @Test public void testCheckExistingUser(){ RoleInvite roleInvite = newRoleInvite().build(); when(roleInviteRepositoryMock.getByHash("SomeInviteHash")).thenReturn(roleInvite); when(userRepositoryMock.findByEmail(roleInvite.getEmail())).thenReturn(Optional.of(newUser().build())); ServiceResult<Boolean> result = service.checkExistingUser("SomeInviteHash"); assertTrue(result.isSuccess()); assertTrue(result.getSuccess()); } |
InviteUserServiceImpl extends BaseTransactionalService implements InviteUserService { @Override public ServiceResult<RoleInvitePageResource> findPendingInternalUserInvites(String filter, Pageable pageable) { Page<RoleInvite> pagedResult = roleInviteRepository.findByEmailContainsAndStatus(filter, InviteStatus.SENT, pageable); List<RoleInviteResource> roleInviteResources = pagedResult.getContent() .stream() .map(roleInviteMapper::mapToResource) .collect(Collectors.toList()); return serviceSuccess(new RoleInvitePageResource(pagedResult.getTotalElements(), pagedResult.getTotalPages(), roleInviteResources, pagedResult.getNumber(), pagedResult.getSize())); } @Override @Transactional ServiceResult<Void> saveUserInvite(UserResource invitedUser, Role role); @Override ServiceResult<RoleInviteResource> getInvite(String inviteHash); @Override ServiceResult<Boolean> checkExistingUser(String inviteHash); @Override ServiceResult<RoleInvitePageResource> findPendingInternalUserInvites(String filter, Pageable pageable); @Override ServiceResult<List<ExternalInviteResource>> findExternalInvites(String searchString, SearchCategory searchCategory); @Override ServiceResult<Void> resendInvite(long inviteId); static final String INTERNAL_USER_WEB_CONTEXT; static final String EXTERNAL_USER_WEB_CONTEXT; } | @Test public void findPendingInternalUsers() { Pageable pageable = PageRequest.of(0, 5); Role role = Role.IFS_ADMINISTRATOR; List<RoleInvite> roleInvites = RoleInviteBuilder.newRoleInvite() .withRole(role) .withName("Arden Pimenta") .withEmail("[email protected]") .build(4); Page<RoleInvite> page = new PageImpl<>(roleInvites, pageable, 4L); RoleInviteResource roleInviteResource = new RoleInviteResource(); roleInviteResource.setName("Arden Pimenta"); roleInviteResource.setEmail("[email protected]"); roleInviteResource.setRoleName("ifs_administrator"); when(roleInviteRepositoryMock.findByEmailContainsAndStatus("", SENT, pageable)).thenReturn(page); when(roleInviteMapperMock.mapToResource(Mockito.any(RoleInvite.class))).thenReturn(roleInviteResource); ServiceResult<RoleInvitePageResource> result = service.findPendingInternalUserInvites("", pageable); assertTrue(result.isSuccess()); RoleInvitePageResource resultObject = result.getSuccess(); assertEquals(5, resultObject.getSize()); assertEquals(1, resultObject.getTotalPages()); assertEquals(4, resultObject.getContent().size()); assertEquals(roleInviteResource, resultObject.getContent().get(0)); } |
InviteUserServiceImpl extends BaseTransactionalService implements InviteUserService { @Override public ServiceResult<List<ExternalInviteResource>> findExternalInvites(String searchString, SearchCategory searchCategory) { String searchStringExpr = "%" + StringUtils.trim(searchString) + "%"; return validateSearchString(searchString).andOnSuccess(() -> find(() -> findApplicationInvitesBySearchCriteria(searchStringExpr, searchCategory), () -> findProjectInvitesBySearchCriteria(searchStringExpr, searchCategory)) .andOnSuccess((appInvites, prjInvites) -> serviceSuccess(sortByEmail(Stream.concat( getApplicationInvitesAsExternalInviteResource(appInvites).stream(), getProjectInvitesAsExternalInviteResource(prjInvites).stream()).collect(Collectors.toList()))) ) ); } @Override @Transactional ServiceResult<Void> saveUserInvite(UserResource invitedUser, Role role); @Override ServiceResult<RoleInviteResource> getInvite(String inviteHash); @Override ServiceResult<Boolean> checkExistingUser(String inviteHash); @Override ServiceResult<RoleInvitePageResource> findPendingInternalUserInvites(String filter, Pageable pageable); @Override ServiceResult<List<ExternalInviteResource>> findExternalInvites(String searchString, SearchCategory searchCategory); @Override ServiceResult<Void> resendInvite(long inviteId); static final String INTERNAL_USER_WEB_CONTEXT; static final String EXTERNAL_USER_WEB_CONTEXT; } | @Test public void findExternalInvitesWhenSearchStringIsNull(){ String searchString = null; SearchCategory searchCategory = SearchCategory.NAME; ServiceResult<List<ExternalInviteResource>> result = service.findExternalInvites(searchString, searchCategory); assertTrue(result.isFailure()); assertEquals(USER_SEARCH_INVALID_INPUT_LENGTH.getErrorKey(), result.getFailure().getErrors().get(0).getErrorKey()); verify(applicationInviteRepositoryMock, never()).findByNameLikeAndStatusIn(searchString, EnumSet.of(CREATED, SENT)); verify(applicationInviteRepositoryMock, never()).findByInviteOrganisationOrganisationNameLikeAndStatusIn(searchString, EnumSet.of(CREATED, SENT)); verify(applicationInviteRepositoryMock, never()).findByEmailLikeAndStatusIn(searchString, EnumSet.of(CREATED, SENT)); verify(projectUserInviteRepositoryMock, never()).findByNameLikeAndStatusIn(searchString, EnumSet.of(CREATED, SENT)); verify(projectUserInviteRepositoryMock, never()).findByOrganisationNameLikeAndStatusIn(searchString, EnumSet.of(CREATED, SENT)); verify(projectUserInviteRepositoryMock, never()).findByEmailLikeAndStatusIn(searchString, EnumSet.of(CREATED, SENT)); }
@Test public void findExternalInvitesWhenSearchStringIsEmpty(){ String searchString = ""; SearchCategory searchCategory = SearchCategory.NAME; ServiceResult<List<ExternalInviteResource>> result = service.findExternalInvites(searchString, searchCategory); assertTrue(result.isFailure()); assertEquals(USER_SEARCH_INVALID_INPUT_LENGTH.getErrorKey(), result.getFailure().getErrors().get(0).getErrorKey()); verify(applicationInviteRepositoryMock, never()).findByNameLikeAndStatusIn(searchString, EnumSet.of(CREATED, SENT)); verify(applicationInviteRepositoryMock, never()).findByInviteOrganisationOrganisationNameLikeAndStatusIn(searchString, EnumSet.of(CREATED, SENT)); verify(applicationInviteRepositoryMock, never()).findByEmailLikeAndStatusIn(searchString, EnumSet.of(CREATED, SENT)); verify(projectUserInviteRepositoryMock, never()).findByNameLikeAndStatusIn(searchString, EnumSet.of(CREATED, SENT)); verify(projectUserInviteRepositoryMock, never()).findByOrganisationNameLikeAndStatusIn(searchString, EnumSet.of(CREATED, SENT)); verify(projectUserInviteRepositoryMock, never()).findByEmailLikeAndStatusIn(searchString, EnumSet.of(CREATED, SENT)); }
@Test public void findExternalInvitesWhenSearchStringLengthLessThan5(){ String searchString = "a"; String searchStringExpr = "%a%"; SearchCategory searchCategory = SearchCategory.NAME; ServiceResult<List<ExternalInviteResource>> result = service.findExternalInvites(searchString, searchCategory); assertTrue(result.isFailure()); assertEquals(USER_SEARCH_INVALID_INPUT_LENGTH.getErrorKey(), result.getFailure().getErrors().get(0).getErrorKey()); verify(applicationInviteRepositoryMock, never()).findByNameLikeAndStatusIn(searchStringExpr, EnumSet.of(CREATED, SENT)); verify(applicationInviteRepositoryMock, never()).findByInviteOrganisationOrganisationNameLikeAndStatusIn(searchStringExpr, EnumSet.of(CREATED, SENT)); verify(applicationInviteRepositoryMock, never()).findByEmailLikeAndStatusIn(searchStringExpr, EnumSet.of(CREATED, SENT)); verify(projectUserInviteRepositoryMock, never()).findByNameLikeAndStatusIn(searchStringExpr, EnumSet.of(CREATED, SENT)); verify(projectUserInviteRepositoryMock, never()).findByOrganisationNameLikeAndStatusIn(searchStringExpr, EnumSet.of(CREATED, SENT)); verify(projectUserInviteRepositoryMock, never()).findByEmailLikeAndStatusIn(searchStringExpr, EnumSet.of(CREATED, SENT)); }
@Test public void findExternalInvitesWhenSearchStringIsAllSpaces(){ String searchString = " "; SearchCategory searchCategory = SearchCategory.NAME; ServiceResult<List<ExternalInviteResource>> result = service.findExternalInvites(searchString, searchCategory); assertTrue(result.isFailure()); assertEquals(USER_SEARCH_INVALID_INPUT_LENGTH.getErrorKey(), result.getFailure().getErrors().get(0).getErrorKey()); verify(applicationInviteRepositoryMock, never()).findByNameLikeAndStatusIn(searchString, EnumSet.of(CREATED, SENT)); verify(applicationInviteRepositoryMock, never()).findByInviteOrganisationOrganisationNameLikeAndStatusIn(searchString, EnumSet.of(CREATED, SENT)); verify(applicationInviteRepositoryMock, never()).findByEmailLikeAndStatusIn(searchString, EnumSet.of(CREATED, SENT)); verify(projectUserInviteRepositoryMock, never()).findByNameLikeAndStatusIn(searchString, EnumSet.of(CREATED, SENT)); verify(projectUserInviteRepositoryMock, never()).findByOrganisationNameLikeAndStatusIn(searchString, EnumSet.of(CREATED, SENT)); verify(projectUserInviteRepositoryMock, never()).findByEmailLikeAndStatusIn(searchString, EnumSet.of(CREATED, SENT)); }
@Test public void findExternalInvitesWhenSearchCategoryIsName() { String searchString = "smith"; String searchStringExpr = "%smith%"; SearchCategory searchCategory = SearchCategory.NAME; List<ApplicationInvite> applicationInvites = setUpMockingCreateApplicationInvites(); List<ProjectUserInvite> projectInvites = setUpMockingCreateProjectInvites(); when(applicationInviteRepositoryMock.findByNameLikeAndStatusIn(searchStringExpr, EnumSet.of(CREATED, SENT))).thenReturn(applicationInvites); when(projectUserInviteRepositoryMock.findByNameLikeAndStatusIn(searchStringExpr, EnumSet.of(CREATED, SENT))).thenReturn(projectInvites); ServiceResult<List<ExternalInviteResource>> result = service.findExternalInvites(searchString, searchCategory); assertFindExternalInvites(result); verify(applicationInviteRepositoryMock).findByNameLikeAndStatusIn(searchStringExpr, EnumSet.of(CREATED, SENT)); verify(applicationInviteRepositoryMock, never()).findByInviteOrganisationOrganisationNameLikeAndStatusIn(searchStringExpr, EnumSet.of(CREATED, SENT)); verify(applicationInviteRepositoryMock, never()).findByEmailLikeAndStatusIn(searchStringExpr, EnumSet.of(CREATED, SENT)); verify(projectUserInviteRepositoryMock).findByNameLikeAndStatusIn(searchStringExpr, EnumSet.of(CREATED, SENT)); verify(projectUserInviteRepositoryMock, never()).findByOrganisationNameLikeAndStatusIn(searchStringExpr, EnumSet.of(CREATED, SENT)); verify(projectUserInviteRepositoryMock, never()).findByEmailLikeAndStatusIn(searchStringExpr, EnumSet.of(CREATED, SENT)); }
@Test public void findExternalInvitesWhenSearchCategoryIsOrganisationName() { String searchString = "smith"; String searchStringExpr = "%smith%"; SearchCategory searchCategory = SearchCategory.ORGANISATION_NAME; List<ApplicationInvite> applicationInvites = setUpMockingCreateApplicationInvites(); List<ProjectUserInvite> projectInvites = setUpMockingCreateProjectInvites(); when(applicationInviteRepositoryMock.findByInviteOrganisationOrganisationNameLikeAndStatusIn(searchStringExpr, EnumSet.of(CREATED, SENT))).thenReturn(applicationInvites); when(projectUserInviteRepositoryMock.findByOrganisationNameLikeAndStatusIn(searchStringExpr, EnumSet.of(CREATED, SENT))).thenReturn(projectInvites); ServiceResult<List<ExternalInviteResource>> result = service.findExternalInvites(searchString, searchCategory); assertFindExternalInvites(result); verify(applicationInviteRepositoryMock, never()).findByNameLikeAndStatusIn(searchStringExpr, EnumSet.of(CREATED, SENT)); verify(applicationInviteRepositoryMock).findByInviteOrganisationOrganisationNameLikeAndStatusIn(searchStringExpr, EnumSet.of(CREATED, SENT)); verify(applicationInviteRepositoryMock, never()).findByEmailLikeAndStatusIn(searchStringExpr, EnumSet.of(CREATED, SENT)); verify(projectUserInviteRepositoryMock, never()).findByNameLikeAndStatusIn(searchStringExpr, EnumSet.of(CREATED, SENT)); verify(projectUserInviteRepositoryMock).findByOrganisationNameLikeAndStatusIn(searchStringExpr, EnumSet.of(CREATED, SENT)); verify(projectUserInviteRepositoryMock, never()).findByEmailLikeAndStatusIn(searchStringExpr, EnumSet.of(CREATED, SENT)); }
@Test public void findExternalInvitesWhenSearchCategoryIsEmail() { String searchString = "smith"; String searchStringExpr = "%smith%"; SearchCategory searchCategory = SearchCategory.EMAIL; List<ApplicationInvite> applicationInvites = setUpMockingCreateApplicationInvites(); List<ProjectUserInvite> projectInvites = setUpMockingCreateProjectInvites(); when(applicationInviteRepositoryMock.findByEmailLikeAndStatusIn(searchStringExpr, EnumSet.of(CREATED, SENT))).thenReturn(applicationInvites); when(projectUserInviteRepositoryMock.findByEmailLikeAndStatusIn(searchStringExpr, EnumSet.of(CREATED, SENT))).thenReturn(projectInvites); ServiceResult<List<ExternalInviteResource>> result = service.findExternalInvites(searchString, searchCategory); assertFindExternalInvites(result); verify(applicationInviteRepositoryMock, never()).findByNameLikeAndStatusIn(searchStringExpr, EnumSet.of(CREATED, SENT)); verify(applicationInviteRepositoryMock, never()).findByInviteOrganisationOrganisationNameLikeAndStatusIn(searchStringExpr, EnumSet.of(CREATED, SENT)); verify(applicationInviteRepositoryMock).findByEmailLikeAndStatusIn(searchStringExpr, EnumSet.of(CREATED, SENT)); verify(projectUserInviteRepositoryMock, never()).findByNameLikeAndStatusIn(searchStringExpr, EnumSet.of(CREATED, SENT)); verify(projectUserInviteRepositoryMock, never()).findByOrganisationNameLikeAndStatusIn(searchStringExpr, EnumSet.of(CREATED, SENT)); verify(projectUserInviteRepositoryMock).findByEmailLikeAndStatusIn(searchStringExpr, EnumSet.of(CREATED, SENT)); } |
InviteUserServiceImpl extends BaseTransactionalService implements InviteUserService { @Override public ServiceResult<Void> resendInvite(long inviteId) { return findRoleInvite(inviteId) .andOnSuccess(invite -> { if (externalRolesToInvite().contains(invite.getTarget())) { return inviteExternalUser(invite); } else if (internalRoles().contains(invite.getTarget())) { return inviteInternalUser(invite); } else { return serviceFailure(NOT_AN_INTERNAL_USER_ROLE); } }); } @Override @Transactional ServiceResult<Void> saveUserInvite(UserResource invitedUser, Role role); @Override ServiceResult<RoleInviteResource> getInvite(String inviteHash); @Override ServiceResult<Boolean> checkExistingUser(String inviteHash); @Override ServiceResult<RoleInvitePageResource> findPendingInternalUserInvites(String filter, Pageable pageable); @Override ServiceResult<List<ExternalInviteResource>> findExternalInvites(String searchString, SearchCategory searchCategory); @Override ServiceResult<Void> resendInvite(long inviteId); static final String INTERNAL_USER_WEB_CONTEXT; static final String EXTERNAL_USER_WEB_CONTEXT; } | @Test public void resendInternalUserInvite() { Role targetRole = Role.PROJECT_FINANCE; RoleInvite existingInvite = newRoleInvite(). withName("name"). withEmail("[email protected]"). withTarget(targetRole). withHash("hashhashhash"). build(); when(roleInviteRepositoryMock.findById(123L)).thenReturn(Optional.of(existingInvite)); Role roleResource = Role.PROJECT_FINANCE; NotificationTarget notificationTarget = new UserNotificationTarget(existingInvite.getName(), existingInvite.getEmail()); Map<String, Object> emailTemplateArgs = asMap("role", roleResource.getDisplayName(), "inviteUrl", "base/management/registration/hashhashhash/register"); Notification expectedNotification = new Notification(systemNotificationSource, notificationTarget, INVITE_INTERNAL_USER, emailTemplateArgs); when(notificationService.sendNotificationWithFlush(expectedNotification, EMAIL)).thenReturn(serviceSuccess()); User loggedInUser = newUser().build(); when(loggedInUserSupplierMock.get()).thenReturn(loggedInUser); ServiceResult<Void> result = service.resendInvite(123L); assertTrue(result.isSuccess()); verify(notificationService).sendNotificationWithFlush(expectedNotification, EMAIL); verify(roleInviteRepositoryMock).save(existingInvite); assertThat(existingInvite.getSentBy(), equalTo(loggedInUser)); assertThat(existingInvite.getSentOn(), lessThanOrEqualTo(now())); assertThat(existingInvite.getSentOn().plus(50, MILLIS), greaterThan(now())); }
@Test public void resendInternalUserInviteButInviteNotFound() { when(roleInviteRepositoryMock.findById(123L)).thenReturn(Optional.empty()); ServiceResult<Void> result = service.resendInvite(123L); assertTrue(result.isFailure()); assertTrue(result.getFailure().is(notFoundError(RoleInvite.class, 123L))); verify(roleInviteRepositoryMock).findById(123L); verifyNoMoreInteractions(roleInviteRepositoryMock, notificationService); } |
ApplicationInviteServiceImpl extends InviteService<ApplicationInvite> implements ApplicationInviteService { @Override public ServiceResult<ApplicationInvite> findOneByHash(String hash) { return getByHash(hash); } @Override ServiceResult<ApplicationInvite> findOneByHash(String hash); @Override @Transactional ServiceResult<Void> createApplicationInvites(InviteOrganisationResource inviteOrganisationResource, Optional<Long> applicationId); @Override ServiceResult<InviteOrganisationResource> getInviteOrganisationByHash(String hash); @Override ServiceResult<List<InviteOrganisationResource>> getInvitesByApplication(Long applicationId); @Override @Transactional ServiceResult<Void> saveInvites(List<ApplicationInviteResource> inviteResources); @Override @Transactional ServiceResult<Void> resendInvite(ApplicationInviteResource inviteResource); @Override ServiceResult<ApplicationInviteResource> getInviteByHash(String hash); @Override ServiceResult<Boolean> checkUserExistsForInvite(String inviteHash); @Override ServiceResult<UserResource> getUserByInviteHash(String hash); @Override @Transactional ServiceResult<Void> removeApplicationInvite(long applicationInviteId); } | @Test public void findOneByHash() { String hash = "123abc"; ApplicationInvite applicationInvite = newApplicationInvite().build(); when(applicationInviteRepository.getByHash(hash)).thenReturn(applicationInvite); ServiceResult<ApplicationInvite> result = inviteService.findOneByHash(hash); assertThat(result.getSuccess()).isEqualTo(applicationInvite); } |
ApplicationInviteServiceImpl extends InviteService<ApplicationInvite> implements ApplicationInviteService { @Override @Transactional public ServiceResult<Void> createApplicationInvites(InviteOrganisationResource inviteOrganisationResource, Optional<Long> applicationId) { String errorField = applicationId.isPresent() ? EDIT_EMAIL_FIELD : NEW_EMAIL_FIELD; return validateInviteOrganisationResource(inviteOrganisationResource).andOnSuccess(() -> validateUniqueEmails(inviteOrganisationResource.getInviteResources(), errorField)).andOnSuccess(() -> findOrAssembleInviteOrganisationFromResource(inviteOrganisationResource, applicationId).andOnSuccess(inviteOrganisation -> { List<ApplicationInvite> invites = saveInviteOrganisationWithInvites(inviteOrganisation, inviteOrganisationResource.getInviteResources()); return applicationInviteNotificationService.inviteCollaborators(invites); })); } @Override ServiceResult<ApplicationInvite> findOneByHash(String hash); @Override @Transactional ServiceResult<Void> createApplicationInvites(InviteOrganisationResource inviteOrganisationResource, Optional<Long> applicationId); @Override ServiceResult<InviteOrganisationResource> getInviteOrganisationByHash(String hash); @Override ServiceResult<List<InviteOrganisationResource>> getInvitesByApplication(Long applicationId); @Override @Transactional ServiceResult<Void> saveInvites(List<ApplicationInviteResource> inviteResources); @Override @Transactional ServiceResult<Void> resendInvite(ApplicationInviteResource inviteResource); @Override ServiceResult<ApplicationInviteResource> getInviteByHash(String hash); @Override ServiceResult<Boolean> checkUserExistsForInvite(String inviteHash); @Override ServiceResult<UserResource> getUserByInviteHash(String hash); @Override @Transactional ServiceResult<Void> removeApplicationInvite(long applicationInviteId); } | @Test public void createApplicationInvites() { Long applicationId = 1L; List<ApplicationInviteResource> inviteResources = newApplicationInviteResource() .withApplication(1L) .withName("testname") .withEmail("testemail", "testemail1", "testemail2", "testemail3", "testemail4") .build(5); InviteOrganisationResource inviteOrganisationResource = newInviteOrganisationResource() .withInviteResources(inviteResources) .withOrganisationName("new organisation") .build(); InviteOrganisation saveInviteOrganisationExpectations = argThat(lambdaMatches(inviteOrganisation -> { assertThat(inviteOrganisation.getOrganisationName()).isEqualTo("new organisation"); return true; })); when(inviteOrganisationRepository.save(saveInviteOrganisationExpectations)) .thenReturn(saveInviteOrganisationExpectations); when(inviteOrganisationMapper.mapToResource(isA(List.class))).thenReturn(emptyList()); when(inviteOrganisationRepository.findAllById(isA(List.class))) .thenReturn(newInviteOrganisation().build(inviteResources.size())); List<ApplicationInvite> savedInvites = ApplicationInviteBuilder.newApplicationInvite().build(5); List<ApplicationInvite> saveInvitesExpectations = argThat(lambdaMatches(invites -> { assertThat(invites).hasSize(5); assertThat(invites.get(0).getName()).isEqualTo("testname"); return true; })); when(applicationInviteRepository.saveAll(saveInvitesExpectations)).thenReturn(savedInvites); when(applicationRepository.findById(isA(Long.class))).thenReturn(Optional.of(newApplication().withId(1L).build())); when(applicationInviteNotificationService.inviteCollaborators(isA(List.class))).thenReturn(serviceSuccess()); ServiceResult<Void> result = inviteService.createApplicationInvites(inviteOrganisationResource, Optional.of(applicationId)); assertThat(result.isSuccess()).isTrue(); verify(inviteOrganisationRepository).save(isA(InviteOrganisation.class)); verify(applicationInviteRepository, times(5)).save(isA(ApplicationInvite.class)); verify(applicationInviteNotificationService, times(1)).inviteCollaborators(isA(List.class)); }
@Test public void createApplicationInvitesWithInvalidOrganisationInviteNoOrganisationName() { Long applicationId = 1L; List<ApplicationInviteResource> inviteResources = newApplicationInviteResource() .withApplication(1L) .withName("testname") .withEmail("testemail") .build(5); InviteOrganisationResource inviteOrganisationResource = newInviteOrganisationResource() .withInviteResources(inviteResources) .build(); when(inviteOrganisationMapper.mapToResource(isA(List.class))).thenReturn(asList()); when(inviteOrganisationRepository.findAllById(isA(List.class))) .thenReturn(newInviteOrganisation().build(inviteResources.size())); when(applicationRepository.findById(isA(Long.class))) .thenReturn(Optional.of(newApplication().withId(1L).build())); ServiceResult<Void> result = inviteService.createApplicationInvites(inviteOrganisationResource, Optional.of(applicationId)); assertThat(result.isFailure()).isTrue(); verify(inviteOrganisationRepository, never()).save(isA(InviteOrganisation.class)); verify(applicationInviteRepository, never()).saveAll(isA(List.class)); }
@Test public void createApplicationInvites_inviteOrganisationResourceHasNoOrganisationResultsInNewInviteOrganisationWithoutOrganisationId() { Long applicationId = 1L; List<ApplicationInviteResource> inviteResources = newApplicationInviteResource() .withApplication(1L) .withName("testname") .withEmail("testemail") .build(1); InviteOrganisationResource inviteOrganisationResource = newInviteOrganisationResource() .withOrganisationName("An invite organisation with an organisation") .withInviteResources(inviteResources) .build(); when(inviteOrganisationMapper.mapToResource(isA(List.class))).thenReturn(asList()); when(inviteOrganisationRepository.findAllById(isA(List.class))) .thenReturn(newInviteOrganisation().build(inviteResources.size())); when(applicationRepository.findById(isA(Long.class))).thenReturn(Optional.of(newApplication().withId(1L).build())); when(applicationInviteNotificationService.inviteCollaborators(isA(List.class))).thenReturn(serviceSuccess()); ServiceResult<Void> result = inviteService.createApplicationInvites(inviteOrganisationResource, Optional.of(applicationId)); assertThat(result.isSuccess()).isTrue(); ArgumentCaptor<InviteOrganisation> argument = ArgumentCaptor.forClass(InviteOrganisation.class); verify(inviteOrganisationRepository, times(1)).save(argument.capture()); assertThat(inviteOrganisationResource.getOrganisationName()).isEqualTo(argument.getValue().getOrganisationName()); assertThat(argument.getValue().getOrganisation()).isNull(); verify(applicationInviteRepository, times(1)).save(isA(ApplicationInvite.class)); verify(applicationInviteNotificationService, times(1)).inviteCollaborators(isA(List.class)); }
@Test public void createApplicationInvites_inviteOrganisationResourceHasOrganisationButNoInviteOrganisationExistsResultsInNewInviteOrganisationWithOrganisationId() { Long applicationId = 1L; List<ApplicationInviteResource> inviteResources = newApplicationInviteResource() .withApplication(1L) .withName("testname") .withEmail("testemail") .build(1); InviteOrganisationResource inviteOrganisationResource = newInviteOrganisationResource() .withOrganisationName("An invite organisation with an organisation") .withOrganisation(2L) .withInviteResources(inviteResources) .build(); Organisation organisation = newOrganisation().withId(3L).build(); when(inviteOrganisationMapper.mapToResource(isA(List.class))).thenReturn(asList()); when(inviteOrganisationRepository.findAllById(isA(List.class))).thenReturn(newInviteOrganisation().build(inviteResources.size())); when(organisationRepository.findById(inviteOrganisationResource.getOrganisation())).thenReturn(Optional.of(organisation)); when(applicationRepository.findById(isA(Long.class))).thenReturn(Optional.of(newApplication().withId(1L).build())); when(applicationInviteNotificationService.inviteCollaborators(isA(List.class))).thenReturn(serviceSuccess()); ServiceResult<Void> result = inviteService.createApplicationInvites(inviteOrganisationResource, Optional.of(applicationId)); assertThat(result.isSuccess()).isTrue(); ArgumentCaptor<InviteOrganisation> argument = ArgumentCaptor.forClass(InviteOrganisation.class); verify(inviteOrganisationRepository, times(1)).save(argument.capture()); assertThat(organisation.getId()) .isEqualTo(argument.getValue().getOrganisation().getId()); assertThat(inviteOrganisationResource.getOrganisationName()) .isEqualTo(argument.getValue().getOrganisationName()); verify(applicationInviteRepository, times(1)).save(isA(ApplicationInvite.class)); verify(applicationInviteNotificationService, times(1)).inviteCollaborators(isA(List.class)); }
@Test public void createApplicationInvites_inviteOrganisationResourceHasOrganisationAndInviteOrganisationExistsResultsInExistingInviteOrganisationWithOrganisationId() { Long applicationId = 1L; List<ApplicationInviteResource> inviteResources = newApplicationInviteResource() .withApplication(1L) .withName("testname") .withEmail("testemail") .build(1); InviteOrganisationResource inviteOrganisationResource = newInviteOrganisationResource() .withOrganisationName("An invite organisation with an organisation") .withOrganisation(3L) .withInviteResources(inviteResources) .build(); Organisation organisation = newOrganisation().withName("Already existing organisation name").withId(3L).build(); InviteOrganisation inviteOrganisation = newInviteOrganisation().withOrganisationName("Already existing invite organisation name").withOrganisation(organisation).build(); when(inviteOrganisationMapper.mapToResource(isA(List.class))).thenReturn(asList()); when(inviteOrganisationRepository.findAllById(isA(List.class))) .thenReturn(newInviteOrganisation().build(inviteResources.size())); when(organisationRepository.findById(inviteOrganisationResource.getOrganisation())).thenReturn(Optional.of(organisation)); when(inviteOrganisationRepository.findOneByOrganisationIdAndInvitesApplicationId( inviteOrganisation.getOrganisation().getId(), applicationId )) .thenReturn(inviteOrganisation); when(applicationRepository.findById(isA(Long.class))).thenReturn(Optional.of(newApplication().withId(1L).build())); when(applicationInviteNotificationService.inviteCollaborators(isA(List.class))).thenReturn(serviceSuccess()); ServiceResult<Void> result = inviteService.createApplicationInvites(inviteOrganisationResource, Optional.of(applicationId)); assertThat(result.isSuccess()).isTrue(); ArgumentCaptor<InviteOrganisation> argument = ArgumentCaptor.forClass(InviteOrganisation.class); verify(inviteOrganisationRepository, times(1)).save(argument.capture()); assertThat(inviteOrganisation.getOrganisation().getName()) .isEqualTo(argument.getValue().getOrganisation().getName()); assertThat(inviteOrganisation.getOrganisationName()) .isEqualTo(argument.getValue().getOrganisationName()); verify(applicationInviteRepository, times(1)).save(isA(ApplicationInvite.class)); verify(applicationInviteNotificationService, times(1)).inviteCollaborators(isA(List.class)); } |
ApplicationInviteServiceImpl extends InviteService<ApplicationInvite> implements ApplicationInviteService { @Override public ServiceResult<InviteOrganisationResource> getInviteOrganisationByHash(String hash) { return getByHash(hash).andOnSuccessReturn(invite -> inviteOrganisationMapper.mapToResource(inviteOrganisationRepository.findById(invite.getInviteOrganisation().getId()).orElse(null))); } @Override ServiceResult<ApplicationInvite> findOneByHash(String hash); @Override @Transactional ServiceResult<Void> createApplicationInvites(InviteOrganisationResource inviteOrganisationResource, Optional<Long> applicationId); @Override ServiceResult<InviteOrganisationResource> getInviteOrganisationByHash(String hash); @Override ServiceResult<List<InviteOrganisationResource>> getInvitesByApplication(Long applicationId); @Override @Transactional ServiceResult<Void> saveInvites(List<ApplicationInviteResource> inviteResources); @Override @Transactional ServiceResult<Void> resendInvite(ApplicationInviteResource inviteResource); @Override ServiceResult<ApplicationInviteResource> getInviteByHash(String hash); @Override ServiceResult<Boolean> checkUserExistsForInvite(String inviteHash); @Override ServiceResult<UserResource> getUserByInviteHash(String hash); @Override @Transactional ServiceResult<Void> removeApplicationInvite(long applicationInviteId); } | @Test public void getInviteOrganisationByHash() { Competition competition = newCompetition().build(); User user = newUser().build(); Organisation organisation = newOrganisation().build(); ProcessRole leadApplicantProcessRole = newProcessRole() .withUser(user) .withRole(Role.LEADAPPLICANT) .withOrganisationId(organisation.getId()) .build(); Application application = newApplication() .withCompetition(competition) .withProcessRoles(leadApplicantProcessRole) .build(); InviteOrganisation inviteOrganisation = newInviteOrganisation().build(); ApplicationInvite invite = ApplicationInviteBuilder.newApplicationInvite() .withInviteOrganisation(inviteOrganisation) .withApplication(application) .build(); ApplicationInviteResource inviteResource = newApplicationInviteResource() .withApplication(application.getId()) .build(); InviteOrganisationResource expectedInviteOrganisationResource = newInviteOrganisationResource(). withId(inviteOrganisation.getId()). withInviteResources(singletonList(inviteResource)). build(); when(applicationInviteRepository.getByHash("an organisation hash")).thenReturn(invite); when(inviteOrganisationRepository.findById(inviteOrganisation.getId())).thenReturn(Optional.of(inviteOrganisation)); when(inviteOrganisationMapper.mapToResource(inviteOrganisation)).thenReturn(expectedInviteOrganisationResource); InviteOrganisationResource inviteOrganisationResource = inviteService.getInviteOrganisationByHash("an organisation hash").getSuccess(); assertThat(expectedInviteOrganisationResource).isEqualTo(inviteOrganisationResource); }
@Test public void getInviteOrganisationByHashButInviteOrganisationNotFound() { when(applicationInviteRepository.getByHash("an organisation hash")).thenReturn(null); ServiceResult<InviteOrganisationResource> organisationInvite = inviteService.getInviteOrganisationByHash("an organisation hash"); assertThat(organisationInvite.isFailure()).isTrue(); assertThat( organisationInvite .getFailure() .is(notFoundError(ApplicationInvite.class, "an organisation hash")) ) .isTrue(); } |
ApplicationInviteServiceImpl extends InviteService<ApplicationInvite> implements ApplicationInviteService { @Override @Transactional public ServiceResult<Void> removeApplicationInvite(long applicationInviteId) { return find(applicationInviteMapper.mapIdToDomain(applicationInviteId), notFoundError(ApplicationInvite.class)) .andOnSuccessReturnVoid(this::removeApplicationInvite); } @Override ServiceResult<ApplicationInvite> findOneByHash(String hash); @Override @Transactional ServiceResult<Void> createApplicationInvites(InviteOrganisationResource inviteOrganisationResource, Optional<Long> applicationId); @Override ServiceResult<InviteOrganisationResource> getInviteOrganisationByHash(String hash); @Override ServiceResult<List<InviteOrganisationResource>> getInvitesByApplication(Long applicationId); @Override @Transactional ServiceResult<Void> saveInvites(List<ApplicationInviteResource> inviteResources); @Override @Transactional ServiceResult<Void> resendInvite(ApplicationInviteResource inviteResource); @Override ServiceResult<ApplicationInviteResource> getInviteByHash(String hash); @Override ServiceResult<Boolean> checkUserExistsForInvite(String inviteHash); @Override ServiceResult<UserResource> getUserByInviteHash(String hash); @Override @Transactional ServiceResult<Void> removeApplicationInvite(long applicationInviteId); } | @Test public void removeApplicationInvite_deletesInviteOrganisationAndOrganisationOnLastInvite() throws Exception { User user = newUser().build(); Organisation organisation = newOrganisation().build(); List<ProcessRole> inviteProcessRoles = newProcessRole() .withOrganisationId(organisation.getId()) .withRole(Role.COLLABORATOR) .build(1); Application application = newApplication() .withProcessRoles(inviteProcessRoles.get(0)) .build(); InviteOrganisation inviteOrganisation = newInviteOrganisation() .withOrganisation(organisation) .build(); ApplicationInvite invite = newApplicationInvite() .withUser(user) .withApplication(application) .withInviteOrganisation(inviteOrganisation) .build(); when(applicationInviteMapper.mapIdToDomain(invite.getId())).thenReturn(invite); when(processRoleRepository.findByUserAndApplicationId(user, application.getId())) .thenReturn(inviteProcessRoles); when(applicationProgressService.updateApplicationProgress(application.getId())) .thenReturn(serviceSuccess(BigDecimal.valueOf(35L))); ServiceResult<Void> applicationInviteResult = inviteService.removeApplicationInvite(invite.getId()); InOrder inOrder = inOrder( questionReassignmentService, processRoleRepository, inviteOrganisationRepository ); inOrder.verify(questionReassignmentService).reassignCollaboratorResponsesAndQuestionStatuses( invite.getTarget().getId(), inviteProcessRoles, invite.getTarget().getLeadApplicantProcessRole() ); inOrder.verify(processRoleRepository).deleteAll(inviteProcessRoles); inOrder.verify(inviteOrganisationRepository).delete(invite.getInviteOrganisation()); inOrder.verifyNoMoreInteractions(); assertThat(applicationInviteResult.isSuccess()).isTrue(); }
@Test public void removeApplicationInvite_deletesInviteFromInviteOrganisationButNotOrganisationFinanceData() throws Exception { User user = newUser().build(); Organisation organisation = newOrganisation().build(); List<ProcessRole> inviteProcessRoles = newProcessRole() .withOrganisationId(organisation.getId()) .withRole(Role.COLLABORATOR) .build(1); Application application = newApplication() .withProcessRoles(inviteProcessRoles.get(0)) .build(); InviteOrganisation inviteOrganisation = newInviteOrganisation() .withOrganisation(organisation) .build(); List<ApplicationInvite> applicationInvites = newApplicationInvite() .withUser(user) .withApplication(application) .withInviteOrganisation(inviteOrganisation) .build(2); ApplicationInvite applicationInviteToDelete = applicationInvites.get(0); inviteOrganisation.setInvites(applicationInvites); when(applicationInviteMapper.mapIdToDomain(applicationInviteToDelete.getId())) .thenReturn(applicationInviteToDelete); when(processRoleRepository.findByUserAndApplicationId(user, application.getId())) .thenReturn(inviteProcessRoles); ServiceResult<Void> applicationInviteResult = inviteService.removeApplicationInvite(applicationInviteToDelete.getId()); InOrder inOrder = inOrder(questionReassignmentService, processRoleRepository); inOrder.verify(questionReassignmentService).reassignCollaboratorResponsesAndQuestionStatuses( applicationInviteToDelete.getTarget().getId(), inviteProcessRoles, applicationInviteToDelete.getTarget().getLeadApplicantProcessRole() ); inOrder.verify(processRoleRepository).deleteAll(inviteProcessRoles); inOrder.verifyNoMoreInteractions(); assertThat(applicationInviteResult.isSuccess()).isTrue(); }
@Test public void removeApplicationInvite_deletesInviteFromInviteOrganisationAndOrganisationFinanceDataIfLastActiveUser() { User user = newUser().build(); Organisation organisation = newOrganisation().build(); List<ProcessRole> inviteProcessRoles = newProcessRole() .withOrganisationId(organisation.getId()) .withRole(Role.COLLABORATOR) .build(1); Application application = newApplication() .withProcessRoles(inviteProcessRoles.get(0)) .build(); InviteOrganisation inviteOrganisation = newInviteOrganisation() .withOrganisation(organisation) .build(); List<ApplicationInvite> applicationInvites = newApplicationInvite() .withUser(user) .withApplication(application) .withInviteOrganisation(inviteOrganisation) .build(2); ApplicationInvite applicationInviteToDelete = applicationInvites.get(0); inviteOrganisation.setInvites(applicationInvites); ApplicationFinance applicationFinance = newApplicationFinance().build(); when(applicationInviteMapper.mapIdToDomain(applicationInviteToDelete.getId())) .thenReturn(applicationInviteToDelete); when(processRoleRepository.findByUserAndApplicationId(user, application.getId())) .thenReturn(inviteProcessRoles); when(applicationFinanceRepository.findByApplicationIdAndOrganisationId( application.getId(), organisation.getId() )) .thenReturn(Optional.of(applicationFinance)); when(applicationProgressService.updateApplicationProgress(application.getId())) .thenReturn(serviceSuccess(BigDecimal.valueOf(35L))); ServiceResult<Void> applicationInviteResult = inviteService.removeApplicationInvite(applicationInviteToDelete.getId()); inviteOrganisation.getInvites().remove(applicationInviteToDelete); InOrder inOrder = inOrder( questionReassignmentService, processRoleRepository, applicationFinanceRepository ); inOrder.verify(questionReassignmentService).reassignCollaboratorResponsesAndQuestionStatuses( applicationInviteToDelete.getTarget().getId(), inviteProcessRoles, applicationInviteToDelete.getTarget().getLeadApplicantProcessRole() ); inOrder.verify(processRoleRepository).deleteAll(inviteProcessRoles); inOrder.verify(applicationFinanceRepository).findByApplicationIdAndOrganisationId( application.getId(), organisation.getId() ); inOrder.verify(applicationFinanceRepository).delete(applicationFinance); inOrder.verifyNoMoreInteractions(); assertThat(applicationInviteResult.isSuccess()).isTrue(); assertThat(inviteOrganisation.getOrganisation()).isNull(); } |
QuestionReassignmentServiceImpl implements QuestionReassignmentService { @Override public void reassignCollaboratorResponsesAndQuestionStatuses(Long applicationId, List<ProcessRole> collaboratorProcessRoles, ProcessRole leadApplicantProcessRole) { collaboratorProcessRoles.forEach(collaboratorProcessRole -> { List<ProcessRole> organisationRoles = getOrganisationProcessRolesExcludingCollaborator(applicationId, collaboratorProcessRole); reassignCollaboratorFormResponses(leadApplicantProcessRole, collaboratorProcessRole, organisationRoles); reassignCollaboratorQuestionStatuses(applicationId, leadApplicantProcessRole, collaboratorProcessRole, organisationRoles); }); } @Override void reassignCollaboratorResponsesAndQuestionStatuses(Long applicationId, List<ProcessRole> collaboratorProcessRoles, ProcessRole leadApplicantProcessRole); } | @Test public void reassignCollaboratorResponsesAndQuestionStatuses_reassignsQuestionsToLeadApplicantWhenLastAssignableUser() throws Exception { User inviteUser = inviteProcessRoles.get(0).getUser(); Application application = newApplication().withProcessRoles(leadApplicantProcessRole, inviteProcessRoles.get(0)).build(); Question question = newQuestion().withMultipleStatuses(false).build(); List<FormInputResponse> inviteResponses = newFormInputResponse() .withFormInputs( newFormInput().withQuestion(question).build(1) ) .withUpdatedBy(inviteProcessRoles.get(0)) .withValue("Test value") .build(2); List<QuestionStatus> questionStatuses = newQuestionStatus() .withApplication(application) .withQuestion(question) .withMarkedAsCompleteBy(inviteProcessRoles.get(0)) .withAssignee(inviteProcessRoles.get(0)) .withAssignedBy(inviteProcessRoles.get(0)) .withMarkedAsComplete(true) .build(2); when(processRoleRepositoryMock.findByUserAndApplicationId(inviteUser, application.getId())).thenReturn(inviteProcessRoles); when(processRoleRepositoryMock.findByApplicationIdAndOrganisationId(application.getId(), inviteProcessRoles.get(0).getOrganisationId())) .thenReturn(newArrayList(inviteProcessRoles.get(0))); when(formInputResponseRepositoryMock.findByUpdatedById(inviteProcessRoles.get(0).getId())).thenReturn(inviteResponses); when(questionStatusRepositoryMock.findByApplicationIdAndMarkedAsCompleteByIdOrAssigneeIdOrAssignedById( application.getId(), inviteProcessRoles.get(0).getId(), inviteProcessRoles.get(0).getId(), inviteProcessRoles.get(0).getId() )).thenReturn(questionStatuses); questionReassignmentService.reassignCollaboratorResponsesAndQuestionStatuses(application.getId(), inviteProcessRoles, leadApplicantProcessRole); InOrder inOrder = inOrder(formInputResponseRepositoryMock, questionStatusRepositoryMock); inOrder.verify(formInputResponseRepositoryMock).saveAll( createLambdaMatcher((List<FormInputResponse> actual) -> actual.stream().allMatch(fir -> fir.getUpdatedBy().equals(leadApplicantProcessRole)) ) ); inOrder.verify(questionStatusRepositoryMock).saveAll( createLambdaMatcher((List<QuestionStatus> actual) -> actual.stream().allMatch(qs -> qs.getMarkedAsCompleteBy().equals(leadApplicantProcessRole) && qs.getAssignedBy().equals(leadApplicantProcessRole) && qs.getAssignee().equals(leadApplicantProcessRole)) ) ); inOrder.verify(questionStatusRepositoryMock).deleteAll(anyCollectionOf(QuestionStatus.class)); inOrder.verifyNoMoreInteractions(); }
@Test public void reassignCollaboratorResponsesAndQuestionStatuses_reassignsQuestionsToOtherOrganisationMemberWhenAnotherOrganisationMemberIsAssignable() { User inviteUser = inviteProcessRoles.get(0).getUser(); List<ProcessRole> organisationProcessRoles = newArrayList( newProcessRole() .withId(10L) .withRole(COLLABORATOR) .build(), inviteProcessRoles.get(0), newProcessRole() .withId(11L) .withRole(COLLABORATOR) .build() ); Application application = newApplication() .withProcessRoles(leadApplicantProcessRole, inviteProcessRoles.get(0)) .build(); Question question = newQuestion().withMultipleStatuses(true).build(); List<FormInputResponse> inviteResponses = newFormInputResponse() .withFormInputs( newFormInput().withQuestion(question).build(1) ) .withUpdatedBy(inviteProcessRoles.get(0)) .withValue("Test value") .build(2); List<QuestionStatus> questionStatuses = newQuestionStatus() .withApplication(application) .withQuestion(question) .withAssignedBy(inviteProcessRoles.get(0)) .withAssignee(leadApplicantProcessRole) .withMarkedAsCompleteBy(inviteProcessRoles.get(0)) .withMarkedAsComplete(true) .build(2); Long inviteProcessRoleId = inviteProcessRoles.get(0).getId(); when(processRoleRepositoryMock.findByUserAndApplicationId(inviteUser, application.getId())).thenReturn(inviteProcessRoles); when(processRoleRepositoryMock.findByApplicationIdAndOrganisationId(application.getId(), inviteProcessRoles.get(0).getOrganisationId())) .thenReturn(organisationProcessRoles); when(formInputResponseRepositoryMock.findByUpdatedById(inviteProcessRoleId)).thenReturn(inviteResponses); when(questionStatusRepositoryMock.findByApplicationIdAndMarkedAsCompleteByIdOrAssigneeIdOrAssignedById( application.getId(), inviteProcessRoleId, inviteProcessRoleId, inviteProcessRoleId )).thenReturn(questionStatuses); questionReassignmentService.reassignCollaboratorResponsesAndQuestionStatuses(application.getId(), inviteProcessRoles, leadApplicantProcessRole); InOrder inOrder = inOrder(formInputResponseRepositoryMock, questionStatusRepositoryMock); inOrder.verify(formInputResponseRepositoryMock).saveAll( createLambdaMatcher((List<FormInputResponse> actual) -> actual.stream().allMatch(fir -> fir.getUpdatedBy().equals(organisationProcessRoles.get(0))) ) ); inOrder.verify(questionStatusRepositoryMock).saveAll( createLambdaMatcher((List<QuestionStatus> actual) -> actual.stream().allMatch(qs -> qs.getMarkedAsCompleteBy().equals(organisationProcessRoles.get(0)) && qs.getAssignedBy().equals(organisationProcessRoles.get(0)) && qs.getAssignee().equals(leadApplicantProcessRole) ) ) ); inOrder.verify(questionStatusRepositoryMock).deleteAll(anyCollectionOf(QuestionStatus.class)); inOrder.verifyNoMoreInteractions(); } |
ProjectUserInvite extends ProjectInvite<ProjectUserInvite> { public Organisation getOrganisation() { return organisation; } ProjectUserInvite(); ProjectUserInvite(final String name, final String email, final String hash, final Organisation organisation, final Project project, final InviteStatus status); Organisation getOrganisation(); void setOrganisation(final Organisation organisation); } | @Test public void constructedProjectInviteShouldReturnCorrectAttributes() throws Exception { assertEquals(name, constructedInvite.getName()); assertEquals(email, constructedInvite.getEmail()); assertEquals(project, constructedInvite.getTarget()); assertEquals(hash, constructedInvite.getHash()); assertEquals(organisation, constructedInvite.getOrganisation()); assertEquals(status, constructedInvite.getStatus()); }
@Test public void gettingProjectInviteAnyAttributeAfterSettingShouldReturnCorrectValue() throws Exception { assertEquals(inviteId, setInvite.getId()); assertEquals(name, setInvite.getName()); assertEquals(email, setInvite.getEmail()); assertEquals(project, setInvite.getTarget()); assertEquals(hash, setInvite.getHash()); assertEquals(organisation, setInvite.getOrganisation()); } |
RegistrationServiceImpl extends BaseTransactionalService implements RegistrationService { @Override @Transactional @UserUpdate public ServiceResult<UserResource> deactivateUser(long userId) { return getUser(userId).andOnSuccess(this::deactivateUser) .andOnSuccessReturn(userMapper::mapToResource); } @Override @Transactional ServiceResult<UserResource> createUser(UserCreationResource user); @Override @Transactional ServiceResult<Void> resendUserVerificationEmail(final UserResource user); @Override @Transactional @UserUpdate ServiceResult<UserResource> activateUser(long userId); @Override @Transactional @UserUpdate ServiceResult<UserResource> deactivateUser(long userId); @Override @Transactional ServiceResult<User> activatePendingUser(User user,
String password,
String hash); @Override @Transactional ServiceResult<Void> activateApplicantAndSendDiversitySurvey(long userId); @Override @Transactional ServiceResult<Void> activateAssessorAndSendDiversitySurvey(long userId); @Override @Transactional @UserUpdate ServiceResult<UserResource> editInternalUser(UserResource userToEdit, Role userRoleType); } | @Test public void deactivateUser_success() { setUpUsersForEditInternalUserSuccess(); when(userRepositoryMock.findById(userToEdit.getId())).thenReturn(Optional.of(userInDB)); when(idpServiceMock.deactivateUser(userToEdit.getUid())).thenReturn(ServiceResult.serviceSuccess("")); userInDB.setStatus(UserStatus.INACTIVE); when(userRepositoryMock.save(userInDB)).thenReturn(userInDB); ServiceResult<UserResource> result = service.deactivateUser(userToEdit.getId()); verify(userRepositoryMock).save(userInDB); assertTrue(result.isSuccess()); }
@Test public void deactivateUser_idpFails() { setUpUsersForEditInternalUserSuccess(); when(userRepositoryMock.findById(userToEdit.getId())).thenReturn(Optional.of(userInDB)); when(idpServiceMock.deactivateUser(userToEdit.getUid())).thenReturn(ServiceResult.serviceFailure(GENERAL_NOT_FOUND)); ServiceResult<UserResource> result = service.deactivateUser(userToEdit.getId()); assertTrue(result.isFailure()); }
@Test public void deactivateUser_noUser() { setUpUsersForEditInternalUserSuccess(); when(userRepositoryMock.findById(userToEdit.getId())).thenReturn(Optional.empty()); ServiceResult<UserResource> result = service.deactivateUser(userToEdit.getId()); assertTrue(result.isFailure()); } |
ActivityLogServiceImpl implements ActivityLogService { @Override public void recordActivityByApplicationId(long applicationId, ActivityType activityType) { applicationRepository.findById(applicationId) .ifPresent(application -> { ActivityLog log = new ActivityLog(application, activityType); activityLogRepository.save(log); }); } @Override void recordActivityByApplicationId(long applicationId, ActivityType activityType); @Override void recordActivityByProjectId(long projectId, ActivityType activityType); @Override void recordActivityByProjectIdAndOrganisationIdAndAuthorId(long projectId, long organisationId, long authorId, ActivityType activityType); @Override void recordActivityByProjectIdAndOrganisationId(long projectId, long organisationId, ActivityType activityType); @Override void recordDocumentActivityByProjectId(long projectId, ActivityType activityType, long documentConfigId); @Override void recordQueryActivityByProjectFinanceId(long projectFinanceId, ActivityType activityType, long threadId); @Transactional(readOnly = true) ServiceResult<List<ActivityLogResource>> findByApplicationId(long applicationId); } | @Test public void recordActivityByApplicationId() { Application application = newApplication().build(); when(applicationRepository.findById(application.getId())).thenReturn(Optional.of(application)); activityLogService.recordActivityByApplicationId(application.getId(), TEST_ACTIVITY_TYPE); verify(activityLogRepository).save(new ActivityLog(application, TEST_ACTIVITY_TYPE)); } |
ActivityLogServiceImpl implements ActivityLogService { @Override public void recordActivityByProjectId(long projectId, ActivityType activityType) { projectRepository.findById(projectId) .ifPresent(project -> { ActivityLog log = new ActivityLog(project.getApplication(), activityType); activityLogRepository.save(log); }); } @Override void recordActivityByApplicationId(long applicationId, ActivityType activityType); @Override void recordActivityByProjectId(long projectId, ActivityType activityType); @Override void recordActivityByProjectIdAndOrganisationIdAndAuthorId(long projectId, long organisationId, long authorId, ActivityType activityType); @Override void recordActivityByProjectIdAndOrganisationId(long projectId, long organisationId, ActivityType activityType); @Override void recordDocumentActivityByProjectId(long projectId, ActivityType activityType, long documentConfigId); @Override void recordQueryActivityByProjectFinanceId(long projectFinanceId, ActivityType activityType, long threadId); @Transactional(readOnly = true) ServiceResult<List<ActivityLogResource>> findByApplicationId(long applicationId); } | @Test public void recordActivityByProjectId() { Application application = newApplication().build(); Project project = newProject().withApplication(application).build(); when(projectRepository.findById(project.getId())).thenReturn(Optional.of(project)); activityLogService.recordActivityByProjectId(project.getId(), TEST_ACTIVITY_TYPE); verify(activityLogRepository).save(new ActivityLog(application, TEST_ACTIVITY_TYPE)); } |
ActivityLogServiceImpl implements ActivityLogService { @Override public void recordActivityByProjectIdAndOrganisationId(long projectId, long organisationId, ActivityType activityType) { projectRepository.findById(projectId) .ifPresent(project -> { organisationRepository.findById(organisationId).ifPresent(organisation -> { ActivityLog log = new ActivityLog(project.getApplication(), activityType, organisation); activityLogRepository.save(log); }); }); } @Override void recordActivityByApplicationId(long applicationId, ActivityType activityType); @Override void recordActivityByProjectId(long projectId, ActivityType activityType); @Override void recordActivityByProjectIdAndOrganisationIdAndAuthorId(long projectId, long organisationId, long authorId, ActivityType activityType); @Override void recordActivityByProjectIdAndOrganisationId(long projectId, long organisationId, ActivityType activityType); @Override void recordDocumentActivityByProjectId(long projectId, ActivityType activityType, long documentConfigId); @Override void recordQueryActivityByProjectFinanceId(long projectFinanceId, ActivityType activityType, long threadId); @Transactional(readOnly = true) ServiceResult<List<ActivityLogResource>> findByApplicationId(long applicationId); } | @Test public void recordActivityByProjectIdAndOrganisationId() { Application application = newApplication().build(); Project project = newProject().withApplication(application).build(); Organisation organisation = newOrganisation().build(); when(projectRepository.findById(project.getId())).thenReturn(Optional.of(project)); when(organisationRepository.findById(organisation.getId())).thenReturn(Optional.of(organisation)); activityLogService.recordActivityByProjectIdAndOrganisationId(project.getId(), organisation.getId(), TEST_ACTIVITY_TYPE); verify(activityLogRepository).save(new ActivityLog(application, TEST_ACTIVITY_TYPE, organisation)); } |
ActivityLogServiceImpl implements ActivityLogService { @Override public void recordDocumentActivityByProjectId(long projectId, ActivityType activityType, long documentConfigId) { projectRepository.findById(projectId) .ifPresent(project -> { competitionDocumentConfigRepository.findById(documentConfigId).ifPresent(document -> { ActivityLog log = new ActivityLog(project.getApplication(), activityType, document); activityLogRepository.save(log); }); }); } @Override void recordActivityByApplicationId(long applicationId, ActivityType activityType); @Override void recordActivityByProjectId(long projectId, ActivityType activityType); @Override void recordActivityByProjectIdAndOrganisationIdAndAuthorId(long projectId, long organisationId, long authorId, ActivityType activityType); @Override void recordActivityByProjectIdAndOrganisationId(long projectId, long organisationId, ActivityType activityType); @Override void recordDocumentActivityByProjectId(long projectId, ActivityType activityType, long documentConfigId); @Override void recordQueryActivityByProjectFinanceId(long projectFinanceId, ActivityType activityType, long threadId); @Transactional(readOnly = true) ServiceResult<List<ActivityLogResource>> findByApplicationId(long applicationId); } | @Test public void recordDocumentActivityByProjectId() { Application application = newApplication().build(); Project project = newProject().withApplication(application).build(); CompetitionDocument documentConfig = newCompetitionDocument().build(); when(projectRepository.findById(project.getId())).thenReturn(Optional.of(project)); when(competitionDocumentConfigRepository.findById(documentConfig.getId())).thenReturn(Optional.of(documentConfig)); activityLogService.recordDocumentActivityByProjectId(project.getId(), TEST_ACTIVITY_TYPE, documentConfig.getId()); verify(activityLogRepository).save(new ActivityLog(application, TEST_ACTIVITY_TYPE, documentConfig)); } |
ActivityLogServiceImpl implements ActivityLogService { @Override public void recordQueryActivityByProjectFinanceId(long projectFinanceId, ActivityType activityType, long threadId) { projectFinanceRepository.findById(projectFinanceId) .ifPresent(projectFinance -> { queryRepository.findById(threadId).ifPresent(query -> { ActivityLog log = new ActivityLog(projectFinance.getProject().getApplication(), activityType, query, projectFinance.getOrganisation()); activityLogRepository.save(log); }); }); } @Override void recordActivityByApplicationId(long applicationId, ActivityType activityType); @Override void recordActivityByProjectId(long projectId, ActivityType activityType); @Override void recordActivityByProjectIdAndOrganisationIdAndAuthorId(long projectId, long organisationId, long authorId, ActivityType activityType); @Override void recordActivityByProjectIdAndOrganisationId(long projectId, long organisationId, ActivityType activityType); @Override void recordDocumentActivityByProjectId(long projectId, ActivityType activityType, long documentConfigId); @Override void recordQueryActivityByProjectFinanceId(long projectFinanceId, ActivityType activityType, long threadId); @Transactional(readOnly = true) ServiceResult<List<ActivityLogResource>> findByApplicationId(long applicationId); } | @Test public void recordQueryActivityByProjectFinanceId() { Application application = newApplication().build(); Project project = newProject().withApplication(application).build(); Organisation organisation = newOrganisation().build(); ProjectFinance projectFinance = newProjectFinance() .withProject(project) .withOrganisation(organisation) .build(); Query query = new Query(1L, null, null, null, null, null, null); when(projectFinanceRepository.findById(projectFinance.getId())).thenReturn(Optional.of(projectFinance)); when(queryRepository.findById(query.id())).thenReturn(Optional.of(query)); activityLogService.recordQueryActivityByProjectFinanceId(projectFinance.getId(),TEST_ACTIVITY_TYPE, query.id()); verify(activityLogRepository).save(new ActivityLog(application, TEST_ACTIVITY_TYPE, query, organisation)); } |
ActivityLogServiceImpl implements ActivityLogService { @Transactional(readOnly = true) public ServiceResult<List<ActivityLogResource>> findByApplicationId(long applicationId) { return serviceSuccess(activityLogRepository.findByApplicationIdOrderByCreatedOnDesc(applicationId) .stream() .map(ActivityLogServiceImpl::toResource) .collect(toList())); } @Override void recordActivityByApplicationId(long applicationId, ActivityType activityType); @Override void recordActivityByProjectId(long projectId, ActivityType activityType); @Override void recordActivityByProjectIdAndOrganisationIdAndAuthorId(long projectId, long organisationId, long authorId, ActivityType activityType); @Override void recordActivityByProjectIdAndOrganisationId(long projectId, long organisationId, ActivityType activityType); @Override void recordDocumentActivityByProjectId(long projectId, ActivityType activityType, long documentConfigId); @Override void recordQueryActivityByProjectFinanceId(long projectFinanceId, ActivityType activityType, long threadId); @Transactional(readOnly = true) ServiceResult<List<ActivityLogResource>> findByApplicationId(long applicationId); } | @Test public void findByApplicationId() { long applicationId = 1L; Application application = newApplication().build(); Organisation organisation = newOrganisation() .withName("My organisation") .build(); Query query = new Query(1L, null, null, null, FinanceChecksSectionType.VIABILITY, null, null); CompetitionDocument competitionDocument = newCompetitionDocument() .withTitle("My document") .build(); User createdBy = newUser() .withFirstName("Bob") .withLastName("Name") .withRoles(singleton(PROJECT_FINANCE)) .build(); ZonedDateTime createdOn = now(); ActivityLog activityLog = new ActivityLog(application, TEST_ACTIVITY_TYPE, query, organisation); setField(activityLog, "createdOn", createdOn); setField(activityLog, "createdBy", createdBy); setField(activityLog, "competitionDocument", competitionDocument); when(activityLogRepository.findByApplicationIdOrderByCreatedOnDesc(applicationId)).thenReturn(singletonList(activityLog)); ServiceResult<List<ActivityLogResource>> result = activityLogService.findByApplicationId(applicationId); assertTrue(result.isSuccess()); assertEquals(1, result.getSuccess().size()); ActivityLogResource activityLogResource = result.getSuccess().get(0); assertEquals(TEST_ACTIVITY_TYPE, activityLogResource.getActivityType()); assertEquals(createdBy.getId().longValue(), activityLogResource.getAuthoredBy()); assertEquals("Bob Name", activityLogResource.getAuthoredByName()); assertEquals(singleton(PROJECT_FINANCE), activityLogResource.getAuthoredByRoles()); assertEquals(createdOn, activityLogResource.getCreatedOn()); assertEquals(competitionDocument.getId(), activityLogResource.getDocumentConfig()); assertEquals("My document", activityLogResource.getDocumentConfigName()); assertEquals(organisation.getId(), activityLogResource.getOrganisation()); assertEquals("My organisation", activityLogResource.getOrganisationName()); assertEquals(query.id(), activityLogResource.getQuery()); assertEquals(FinanceChecksSectionType.VIABILITY, activityLogResource.getQueryType()); assertTrue(activityLogResource.isOrganisationRemoved()); } |
ActivityLog { public boolean isOrganisationRemoved() { return getOrganisation().map(org -> ofNullable(getApplication()) .map(a -> a.getProject()) .map(p -> p.getOrganisations()) .map(orgs -> !simpleAnyMatch(orgs, o -> org.getId().equals(o.getId()))) .orElse(true) ).orElse(false); } ActivityLog(); ActivityLog(Application application, ActivityType type, CompetitionDocument competitionDocument); ActivityLog(Application application, ActivityType type, Query query, Organisation organisation); ActivityLog(Application application, ActivityType type); ActivityLog(Application application, ActivityType type, Organisation organisation); ActivityLog(Application application, ActivityType type, Organisation organisation, User author); Long getId(); Application getApplication(); Optional<Organisation> getOrganisation(); ActivityType getType(); User getCreatedBy(); User getAuthor(); ZonedDateTime getCreatedOn(); Optional<CompetitionDocument> getCompetitionDocument(); Optional<Query> getQuery(); @Override boolean equals(Object o); @Override int hashCode(); boolean isOrganisationRemoved(); } | @Test public void organisationRemovedShouldBeFalseWhenTheOrganisationIsOnTheProject(){ Organisation org = newOrganisation().build(); ActivityLog activityLog = newActivityLog() .withOrganisation(org) .withApplication(newApplication() .withProject(newProject() .withPartnerOrganisations( asList(newPartnerOrganisation() .withOrganisation(org) .build())) .build()) .build()) .build(); Assert.assertFalse(activityLog.isOrganisationRemoved()); }
@Test public void organisationRemovedShouldBeTrueWhenTheOrganisationIsNotOnTheProject(){ Organisation org = newOrganisation().build(); ActivityLog activityLog = newActivityLog() .withOrganisation(org) .withApplication(newApplication() .withProject(newProject() .withPartnerOrganisations( asList(newPartnerOrganisation() .withOrganisation(newOrganisation() .build()) .build())) .build()) .build()) .build(); Assert.assertTrue(activityLog.isOrganisationRemoved()); }
@Test public void organisationRemovedShouldBeFalseWhenNoOrganisationOnTheActivityLog(){ ActivityLog activityLog = newActivityLog() .withApplication(newApplication() .withProject(newProject() .withPartnerOrganisations( asList(newPartnerOrganisation() .withOrganisation(newOrganisation() .build()) .build())) .build()) .build()) .build(); Assert.assertFalse(activityLog.isOrganisationRemoved()); } |
ActivityLog { public User getAuthor() { return ofNullable(author).orElse(getCreatedBy()); } ActivityLog(); ActivityLog(Application application, ActivityType type, CompetitionDocument competitionDocument); ActivityLog(Application application, ActivityType type, Query query, Organisation organisation); ActivityLog(Application application, ActivityType type); ActivityLog(Application application, ActivityType type, Organisation organisation); ActivityLog(Application application, ActivityType type, Organisation organisation, User author); Long getId(); Application getApplication(); Optional<Organisation> getOrganisation(); ActivityType getType(); User getCreatedBy(); User getAuthor(); ZonedDateTime getCreatedOn(); Optional<CompetitionDocument> getCompetitionDocument(); Optional<Query> getQuery(); @Override boolean equals(Object o); @Override int hashCode(); boolean isOrganisationRemoved(); } | @Test public void testAuthorIsCreatedByWhenNotExpicitlySpecified(){ User createdBy = UserBuilder.newUser().build(); ActivityLog activityLog = newActivityLog().withCreatedBy(createdBy).build(); Assert.assertEquals(createdBy, activityLog.getAuthor()); } |
EuGrantTransferController { @PostMapping(value = "/grant-agreement/{applicationId}", produces = "application/json") public RestResult<Void> uploadGrantAgreement(@RequestHeader(value = "Content-Type", required = false) String contentType, @RequestHeader(value = "Content-Length", required = false) String contentLength, @RequestParam(value = "filename", required = false) String originalFilename, @PathVariable("applicationId") long applicationId, HttpServletRequest request) { return euGrantTransferService.uploadGrantAgreement(contentType, contentLength, originalFilename, applicationId, request).toPostCreateResponse(); } @GetMapping(value = "{applicationId}", produces = "application/json") RestResult<EuGrantTransferResource> getGrantTransferByApplicationId(@PathVariable("applicationId") long applicationId); @PostMapping(value = "{applicationId}", produces = "application/json") RestResult<Void> getGrantTransferByApplicationId(@PathVariable("applicationId") long applicationId,
@RequestBody EuGrantTransferResource euGrantTransferResource); @PostMapping(value = "/grant-agreement/{applicationId}", produces = "application/json") RestResult<Void> uploadGrantAgreement(@RequestHeader(value = "Content-Type", required = false) String contentType,
@RequestHeader(value = "Content-Length", required = false) String contentLength,
@RequestParam(value = "filename", required = false) String originalFilename,
@PathVariable("applicationId") long applicationId,
HttpServletRequest request); @DeleteMapping(value = "/grant-agreement/{applicationId}", produces = "application/json") RestResult<Void> deleteGrantAgreement(@PathVariable("applicationId") long applicationId); @GetMapping(value = "/grant-agreement/{applicationId}", produces = "application/json") @ResponseBody ResponseEntity<Object> downloadGrantAgreement(@PathVariable("applicationId") long applicationId); @GetMapping(value = "/grant-agreement-details/{applicationId}", produces = "application/json") RestResult<FileEntryResource> findGrantAgreement(@PathVariable("applicationId") long applicationId); } | @Test public void uploadGrantAgreement() throws Exception { final long applicationId = 77L; when(euGrantTransferService.uploadGrantAgreement(eq("application/pdf"), eq("1234"), eq("randomFile.pdf"), eq(applicationId), any(HttpServletRequest.class))).thenReturn(serviceSuccess()); mockMvc.perform(post("/eu-grant-transfer/grant-agreement/{applicationId}", applicationId) .param("filename", "randomFile.pdf") .headers(createFileUploadHeader("application/pdf", 1234))) .andExpect(status().isCreated()); verify(euGrantTransferService).uploadGrantAgreement(eq("application/pdf"), eq("1234"), eq("randomFile.pdf"), eq(applicationId), any(HttpServletRequest.class)); } |
EuGrantTransferController { @DeleteMapping(value = "/grant-agreement/{applicationId}", produces = "application/json") public RestResult<Void> deleteGrantAgreement(@PathVariable("applicationId") long applicationId) { return euGrantTransferService.deleteGrantAgreement(applicationId).toDeleteResponse(); } @GetMapping(value = "{applicationId}", produces = "application/json") RestResult<EuGrantTransferResource> getGrantTransferByApplicationId(@PathVariable("applicationId") long applicationId); @PostMapping(value = "{applicationId}", produces = "application/json") RestResult<Void> getGrantTransferByApplicationId(@PathVariable("applicationId") long applicationId,
@RequestBody EuGrantTransferResource euGrantTransferResource); @PostMapping(value = "/grant-agreement/{applicationId}", produces = "application/json") RestResult<Void> uploadGrantAgreement(@RequestHeader(value = "Content-Type", required = false) String contentType,
@RequestHeader(value = "Content-Length", required = false) String contentLength,
@RequestParam(value = "filename", required = false) String originalFilename,
@PathVariable("applicationId") long applicationId,
HttpServletRequest request); @DeleteMapping(value = "/grant-agreement/{applicationId}", produces = "application/json") RestResult<Void> deleteGrantAgreement(@PathVariable("applicationId") long applicationId); @GetMapping(value = "/grant-agreement/{applicationId}", produces = "application/json") @ResponseBody ResponseEntity<Object> downloadGrantAgreement(@PathVariable("applicationId") long applicationId); @GetMapping(value = "/grant-agreement-details/{applicationId}", produces = "application/json") RestResult<FileEntryResource> findGrantAgreement(@PathVariable("applicationId") long applicationId); } | @Test public void deleteGrantAgreement() throws Exception { final long applicationId = 22L; when(euGrantTransferService.deleteGrantAgreement(applicationId)).thenReturn(serviceSuccess()); mockMvc.perform(delete("/eu-grant-transfer/grant-agreement/{applicationId}", applicationId)) .andExpect(status().isNoContent()); verify(euGrantTransferService).deleteGrantAgreement(applicationId); } |
EuGrantTransferController { @GetMapping(value = "/grant-agreement/{applicationId}", produces = "application/json") public @ResponseBody ResponseEntity<Object> downloadGrantAgreement(@PathVariable("applicationId") long applicationId) { return fileControllerUtils.handleFileDownload(() -> euGrantTransferService.downloadGrantAgreement(applicationId)); } @GetMapping(value = "{applicationId}", produces = "application/json") RestResult<EuGrantTransferResource> getGrantTransferByApplicationId(@PathVariable("applicationId") long applicationId); @PostMapping(value = "{applicationId}", produces = "application/json") RestResult<Void> getGrantTransferByApplicationId(@PathVariable("applicationId") long applicationId,
@RequestBody EuGrantTransferResource euGrantTransferResource); @PostMapping(value = "/grant-agreement/{applicationId}", produces = "application/json") RestResult<Void> uploadGrantAgreement(@RequestHeader(value = "Content-Type", required = false) String contentType,
@RequestHeader(value = "Content-Length", required = false) String contentLength,
@RequestParam(value = "filename", required = false) String originalFilename,
@PathVariable("applicationId") long applicationId,
HttpServletRequest request); @DeleteMapping(value = "/grant-agreement/{applicationId}", produces = "application/json") RestResult<Void> deleteGrantAgreement(@PathVariable("applicationId") long applicationId); @GetMapping(value = "/grant-agreement/{applicationId}", produces = "application/json") @ResponseBody ResponseEntity<Object> downloadGrantAgreement(@PathVariable("applicationId") long applicationId); @GetMapping(value = "/grant-agreement-details/{applicationId}", produces = "application/json") RestResult<FileEntryResource> findGrantAgreement(@PathVariable("applicationId") long applicationId); } | @Test public void downloadGrantAgreement() throws Exception { final long applicationId = 22L; Function<EuGrantTransferService, ServiceResult<FileAndContents>> serviceCallToDownload = (service) -> service.downloadGrantAgreement(applicationId); assertGetFileContents("/eu-grant-transfer/grant-agreement/{applicationId}", new Object[]{applicationId}, emptyMap(), euGrantTransferService, serviceCallToDownload); } |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.