From aaa8b0d7b489668f17654452b2b7d5be517c0fe0 Mon Sep 17 00:00:00 2001 From: matheusspacifico Date: Tue, 29 Jul 2025 14:48:56 -0300 Subject: [PATCH 1/3] refactor: move all shared exceptions to shared module --- .../user/create/RegisterUserAccountServiceImpl.kt | 2 +- .../user/create/RegisterUserAccountServiceImplTest.kt | 2 +- .../application/protocol/find/FindProtocolServiceImpl.kt | 2 +- .../protocol/find/FindProtocolStageServiceImpl.kt | 2 +- .../application/question/find/FindQuestionServiceImpl.kt | 2 +- .../report/find/service/ExportProtocolServiceImpl.kt | 2 +- .../report/find/service/FindAnswerServiceImpl.kt | 3 +-- .../report/find/service/FindSourceServiceImpl.kt | 2 +- .../find/service/IncludedStudiesAnswersServiceImpl.kt | 2 +- .../find/services/FindSystematicStudyServiceImpl.kt | 2 +- .../update/services/UpdateSystematicStudyServiceImpl.kt | 2 +- .../search/delete/DeleteSearchSessionServiceImpl.kt | 2 +- .../search/find/service/FindSearchSessionServiceImpl.kt | 2 +- .../search/update/PatchSearchSessionServiceImpl.kt | 2 +- .../search/update/UpdateSearchSessionServiceImpl.kt | 2 +- .../shared/exceptions/UniquenessViolationException.kt | 3 --- .../application/shared/presenter/PreconditionChecker.kt | 6 +++--- .../shared/presenter/PreconditionCheckerNEW.kt | 6 +++--- .../study/find/service/FindStudyReviewServiceImpl.kt | 2 +- .../implementation/BatchAnswerQuestionServiceImpl.kt | 2 +- .../update/implementation/MarkAsDuplicatedServiceImpl.kt | 2 +- .../update/implementation/RemoveCriteriaServiceImpl.kt | 2 +- .../implementation/UpdateStudyReviewExtractionService.kt | 2 +- .../implementation/UpdateStudyReviewPriorityService.kt | 2 +- .../implementation/UpdateStudyReviewSelectionService.kt | 2 +- .../update/implementation/UpdateStudyReviewServiceImpl.kt | 2 +- .../protocol/find/FindProtocolServiceImplTest.kt | 6 +++--- .../protocol/update/UpdateProtocolServiceImplTest.kt | 6 +++--- .../question/find/FindQuestionServiceImplTest.kt | 4 ++-- .../report/find/ExportProtocolServiceImplTest.kt | 2 +- .../application/report/find/FindSourceServiceImplTest.kt | 2 +- .../report/find/IncludedStudiesAnswersServiceImplTest.kt | 2 +- .../review/create/CreateSystematicStudyServiceImplTest.kt | 4 ++-- .../services/FindAllSystematicStudiesServiceImplTest.kt | 4 ++-- .../find/services/FindSystematicStudyServiceImplTest.kt | 6 +++--- .../services/UpdateSystematicStudyServiceImplTest.kt | 6 +++--- .../search/create/CreateSearchSessionServiceImplTest.kt | 6 +++--- .../find/FindAllSearchSessionsBySourceServiceImplTest.kt | 4 ++-- .../search/find/FindAllSearchSessionsServiceImplTest.kt | 4 ++-- .../search/find/FindSearchSessionServiceImplTest.kt | 6 +++--- .../search/update/UpdateSearchSessionServiceImplTest.kt | 6 +++--- .../shared/presenter/PreconditionCheckerTest.kt | 6 +++--- .../study/update/MarkAsDuplicatedServiceImplTest.kt | 3 +-- .../update/UpdateStudyReviewExtractionServiceTest.kt | 2 +- .../study/update/UpdateStudyReviewPriorityServiceTest.kt | 2 +- .../update/UpdateStudyReviewSelectionStatusServiceTest.kt | 2 +- .../study/update/UpdateStudyReviewServiceImplTest.kt | 2 +- .../all/application/util/PreconditionCheckerMockingNew.kt | 6 +++--- .../domain/shared/exception}/EntityNotFoundException.kt | 2 +- .../shared/exception}/UnauthenticatedUserException.kt | 2 +- .../domain/shared/exception}/UnauthorizedUserException.kt | 2 +- .../shared/exception}/UniquenessViolationException.kt | 2 +- .../br/all/security/service/AuthenticationInfoService.kt | 4 +--- .../br/all/security/service/AuthenticationService.kt | 2 +- .../br/all/shared/error/ErrorResponseEntityFactory.kt | 8 ++++---- 55 files changed, 84 insertions(+), 91 deletions(-) delete mode 100644 review/src/main/kotlin/br/all/application/shared/exceptions/UniquenessViolationException.kt rename {review/src/main/kotlin/br/all/application/shared/exceptions => shared/src/main/kotlin/br/all/domain/shared/exception}/EntityNotFoundException.kt (70%) rename {review/src/main/kotlin/br/all/application/shared/exceptions => shared/src/main/kotlin/br/all/domain/shared/exception}/UnauthenticatedUserException.kt (71%) rename {review/src/main/kotlin/br/all/application/shared/exceptions => shared/src/main/kotlin/br/all/domain/shared/exception}/UnauthorizedUserException.kt (71%) rename {account/src/main/kotlin/br/all/application/shared => shared/src/main/kotlin/br/all/domain/shared/exception}/UniquenessViolationException.kt (74%) diff --git a/account/src/main/kotlin/br/all/application/user/create/RegisterUserAccountServiceImpl.kt b/account/src/main/kotlin/br/all/application/user/create/RegisterUserAccountServiceImpl.kt index 2b72d2403..5fafd6c42 100644 --- a/account/src/main/kotlin/br/all/application/user/create/RegisterUserAccountServiceImpl.kt +++ b/account/src/main/kotlin/br/all/application/user/create/RegisterUserAccountServiceImpl.kt @@ -1,10 +1,10 @@ package br.all.application.user.create -import br.all.application.shared.UniquenessViolationException import br.all.application.user.create.RegisterUserAccountService.RequestModel import br.all.application.user.create.RegisterUserAccountService.ResponseModel import br.all.application.user.repository.UserAccountRepository import br.all.application.user.repository.toDto +import br.all.domain.shared.exception.UniquenessViolationException import br.all.domain.shared.user.Email import br.all.domain.user.* diff --git a/account/src/test/kotlin/br/all/application/user/create/RegisterUserAccountServiceImplTest.kt b/account/src/test/kotlin/br/all/application/user/create/RegisterUserAccountServiceImplTest.kt index 10f7cca27..294fe01e7 100644 --- a/account/src/test/kotlin/br/all/application/user/create/RegisterUserAccountServiceImplTest.kt +++ b/account/src/test/kotlin/br/all/application/user/create/RegisterUserAccountServiceImplTest.kt @@ -1,6 +1,5 @@ package br.all.application.user.create -import br.all.application.shared.UniquenessViolationException import br.all.application.user.repository.UserAccountRepository import br.all.application.user.utils.TestDataFactory import io.mockk.every @@ -9,6 +8,7 @@ import io.mockk.junit5.MockKExtension import io.mockk.verifyOrder import org.junit.jupiter.api.* import org.junit.jupiter.api.extension.ExtendWith +import br.all.domain.shared.exception.UniquenessViolationException @Tag("UnitTest") @Tag("ServiceTest") diff --git a/review/src/main/kotlin/br/all/application/protocol/find/FindProtocolServiceImpl.kt b/review/src/main/kotlin/br/all/application/protocol/find/FindProtocolServiceImpl.kt index 5f6e43889..537a81a79 100644 --- a/review/src/main/kotlin/br/all/application/protocol/find/FindProtocolServiceImpl.kt +++ b/review/src/main/kotlin/br/all/application/protocol/find/FindProtocolServiceImpl.kt @@ -5,7 +5,7 @@ import br.all.application.protocol.find.FindProtocolService.ResponseModel import br.all.application.protocol.repository.ProtocolRepository import br.all.application.review.repository.SystematicStudyRepository import br.all.application.review.repository.fromDto -import br.all.application.shared.exceptions.EntityNotFoundException +import br.all.domain.shared.exception.EntityNotFoundException import br.all.application.shared.presenter.prepareIfFailsPreconditions import br.all.application.user.CredentialsService import br.all.domain.model.review.SystematicStudy diff --git a/review/src/main/kotlin/br/all/application/protocol/find/FindProtocolStageServiceImpl.kt b/review/src/main/kotlin/br/all/application/protocol/find/FindProtocolStageServiceImpl.kt index 6c17f69d4..c900bf90f 100644 --- a/review/src/main/kotlin/br/all/application/protocol/find/FindProtocolStageServiceImpl.kt +++ b/review/src/main/kotlin/br/all/application/protocol/find/FindProtocolStageServiceImpl.kt @@ -9,7 +9,7 @@ import br.all.application.protocol.find.FindProtocolStageService.ProtocolStage import br.all.application.protocol.repository.ProtocolDto import br.all.application.question.repository.QuestionRepository import br.all.application.review.repository.fromDto -import br.all.application.shared.exceptions.EntityNotFoundException +import br.all.domain.shared.exception.EntityNotFoundException import br.all.application.shared.presenter.prepareIfFailsPreconditions import br.all.application.study.repository.StudyReviewRepository import br.all.domain.model.question.QuestionContextEnum diff --git a/review/src/main/kotlin/br/all/application/question/find/FindQuestionServiceImpl.kt b/review/src/main/kotlin/br/all/application/question/find/FindQuestionServiceImpl.kt index 5927f0b03..6a7ce26a4 100644 --- a/review/src/main/kotlin/br/all/application/question/find/FindQuestionServiceImpl.kt +++ b/review/src/main/kotlin/br/all/application/question/find/FindQuestionServiceImpl.kt @@ -4,7 +4,7 @@ import br.all.application.question.find.FindQuestionService.* import br.all.application.question.repository.QuestionRepository import br.all.application.review.repository.SystematicStudyRepository import br.all.application.review.repository.fromDto -import br.all.application.shared.exceptions.EntityNotFoundException +import br.all.domain.shared.exception.EntityNotFoundException import br.all.application.shared.presenter.prepareIfFailsPreconditions import br.all.application.user.CredentialsService import br.all.domain.model.question.QuestionId diff --git a/review/src/main/kotlin/br/all/application/report/find/service/ExportProtocolServiceImpl.kt b/review/src/main/kotlin/br/all/application/report/find/service/ExportProtocolServiceImpl.kt index d6888a901..837ce0b76 100644 --- a/review/src/main/kotlin/br/all/application/report/find/service/ExportProtocolServiceImpl.kt +++ b/review/src/main/kotlin/br/all/application/report/find/service/ExportProtocolServiceImpl.kt @@ -5,7 +5,7 @@ import br.all.application.protocol.repository.ProtocolRepository import br.all.application.report.find.presenter.ExportProtocolPresenter import br.all.application.review.repository.SystematicStudyRepository import br.all.application.review.repository.fromDto -import br.all.application.shared.exceptions.EntityNotFoundException +import br.all.domain.shared.exception.EntityNotFoundException import br.all.application.shared.presenter.prepareIfFailsPreconditions import br.all.application.user.CredentialsService import br.all.domain.model.review.SystematicStudy diff --git a/review/src/main/kotlin/br/all/application/report/find/service/FindAnswerServiceImpl.kt b/review/src/main/kotlin/br/all/application/report/find/service/FindAnswerServiceImpl.kt index e177d36e9..c06ddc4a1 100644 --- a/review/src/main/kotlin/br/all/application/report/find/service/FindAnswerServiceImpl.kt +++ b/review/src/main/kotlin/br/all/application/report/find/service/FindAnswerServiceImpl.kt @@ -4,12 +4,11 @@ import br.all.application.question.repository.QuestionRepository import br.all.application.report.find.presenter.FindAnswerPresenter import br.all.application.review.repository.SystematicStudyRepository import br.all.application.review.repository.fromDto -import br.all.application.shared.exceptions.EntityNotFoundException +import br.all.domain.shared.exception.EntityNotFoundException import br.all.application.shared.presenter.prepareIfFailsPreconditions import br.all.application.study.repository.StudyReviewRepository import br.all.application.user.CredentialsService import br.all.domain.model.review.SystematicStudy -import java.util.* class FindAnswerServiceImpl( private val credentialsService: CredentialsService, diff --git a/review/src/main/kotlin/br/all/application/report/find/service/FindSourceServiceImpl.kt b/review/src/main/kotlin/br/all/application/report/find/service/FindSourceServiceImpl.kt index 08743ea03..f8ff54837 100644 --- a/review/src/main/kotlin/br/all/application/report/find/service/FindSourceServiceImpl.kt +++ b/review/src/main/kotlin/br/all/application/report/find/service/FindSourceServiceImpl.kt @@ -4,7 +4,7 @@ import br.all.application.protocol.repository.ProtocolRepository import br.all.application.report.find.presenter.FindSourcePresenter import br.all.application.review.repository.SystematicStudyRepository import br.all.application.review.repository.fromDto -import br.all.application.shared.exceptions.EntityNotFoundException +import br.all.domain.shared.exception.EntityNotFoundException import br.all.application.shared.presenter.prepareIfFailsPreconditions import br.all.application.study.repository.StudyReviewDto import br.all.application.study.repository.StudyReviewRepository diff --git a/review/src/main/kotlin/br/all/application/report/find/service/IncludedStudiesAnswersServiceImpl.kt b/review/src/main/kotlin/br/all/application/report/find/service/IncludedStudiesAnswersServiceImpl.kt index 6bf52cbb3..6ff08417b 100644 --- a/review/src/main/kotlin/br/all/application/report/find/service/IncludedStudiesAnswersServiceImpl.kt +++ b/review/src/main/kotlin/br/all/application/report/find/service/IncludedStudiesAnswersServiceImpl.kt @@ -5,7 +5,7 @@ import br.all.application.question.repository.QuestionRepository import br.all.application.report.find.presenter.IncludedStudiesAnswersPresenter import br.all.application.review.repository.SystematicStudyRepository import br.all.application.review.repository.fromDto -import br.all.application.shared.exceptions.EntityNotFoundException +import br.all.domain.shared.exception.EntityNotFoundException import br.all.application.shared.presenter.prepareIfFailsPreconditions import br.all.application.study.repository.StudyReviewRepository import br.all.application.user.CredentialsService diff --git a/review/src/main/kotlin/br/all/application/review/find/services/FindSystematicStudyServiceImpl.kt b/review/src/main/kotlin/br/all/application/review/find/services/FindSystematicStudyServiceImpl.kt index d9c6afbfa..a7edfd260 100644 --- a/review/src/main/kotlin/br/all/application/review/find/services/FindSystematicStudyServiceImpl.kt +++ b/review/src/main/kotlin/br/all/application/review/find/services/FindSystematicStudyServiceImpl.kt @@ -4,7 +4,7 @@ import br.all.application.review.find.presenter.FindSystematicStudyPresenter import br.all.application.review.find.services.FindSystematicStudyService.RequestModel import br.all.application.review.find.services.FindSystematicStudyService.ResponseModel import br.all.application.review.repository.SystematicStudyRepository -import br.all.application.shared.exceptions.EntityNotFoundException +import br.all.domain.shared.exception.EntityNotFoundException import br.all.application.shared.presenter.prepareIfUnauthorized import br.all.application.user.CredentialsService diff --git a/review/src/main/kotlin/br/all/application/review/update/services/UpdateSystematicStudyServiceImpl.kt b/review/src/main/kotlin/br/all/application/review/update/services/UpdateSystematicStudyServiceImpl.kt index 635722c2a..76de2a921 100644 --- a/review/src/main/kotlin/br/all/application/review/update/services/UpdateSystematicStudyServiceImpl.kt +++ b/review/src/main/kotlin/br/all/application/review/update/services/UpdateSystematicStudyServiceImpl.kt @@ -6,7 +6,7 @@ import br.all.application.review.repository.toDto import br.all.application.review.update.presenter.UpdateSystematicStudyPresenter import br.all.application.review.update.services.UpdateSystematicStudyService.RequestModel import br.all.application.review.update.services.UpdateSystematicStudyService.ResponseModel -import br.all.application.shared.exceptions.EntityNotFoundException +import br.all.domain.shared.exception.EntityNotFoundException import br.all.application.shared.presenter.prepareIfUnauthorized import br.all.application.user.CredentialsService import br.all.domain.model.review.SystematicStudy diff --git a/review/src/main/kotlin/br/all/application/search/delete/DeleteSearchSessionServiceImpl.kt b/review/src/main/kotlin/br/all/application/search/delete/DeleteSearchSessionServiceImpl.kt index 93c25f35c..c94a6596d 100644 --- a/review/src/main/kotlin/br/all/application/search/delete/DeleteSearchSessionServiceImpl.kt +++ b/review/src/main/kotlin/br/all/application/search/delete/DeleteSearchSessionServiceImpl.kt @@ -3,7 +3,7 @@ package br.all.application.search.delete import br.all.application.review.repository.SystematicStudyRepository import br.all.application.review.repository.fromDto import br.all.application.search.repository.SearchSessionRepository -import br.all.application.shared.exceptions.EntityNotFoundException +import br.all.domain.shared.exception.EntityNotFoundException import br.all.application.shared.presenter.prepareIfFailsPreconditions import br.all.application.user.CredentialsService import br.all.domain.model.review.SystematicStudy diff --git a/review/src/main/kotlin/br/all/application/search/find/service/FindSearchSessionServiceImpl.kt b/review/src/main/kotlin/br/all/application/search/find/service/FindSearchSessionServiceImpl.kt index 0a2cc516d..26242f3a8 100644 --- a/review/src/main/kotlin/br/all/application/search/find/service/FindSearchSessionServiceImpl.kt +++ b/review/src/main/kotlin/br/all/application/search/find/service/FindSearchSessionServiceImpl.kt @@ -6,7 +6,7 @@ import br.all.application.search.find.presenter.FindSearchSessionPresenter import br.all.application.search.find.service.FindSearchSessionService.RequestModel import br.all.application.search.find.service.FindSearchSessionService.ResponseModel import br.all.application.search.repository.SearchSessionRepository -import br.all.application.shared.exceptions.EntityNotFoundException +import br.all.domain.shared.exception.EntityNotFoundException import br.all.application.shared.presenter.prepareIfFailsPreconditions import br.all.application.user.CredentialsService import br.all.domain.model.review.SystematicStudy diff --git a/review/src/main/kotlin/br/all/application/search/update/PatchSearchSessionServiceImpl.kt b/review/src/main/kotlin/br/all/application/search/update/PatchSearchSessionServiceImpl.kt index 6dab525e9..f25e67c85 100644 --- a/review/src/main/kotlin/br/all/application/search/update/PatchSearchSessionServiceImpl.kt +++ b/review/src/main/kotlin/br/all/application/search/update/PatchSearchSessionServiceImpl.kt @@ -5,7 +5,7 @@ import br.all.application.review.repository.SystematicStudyRepository import br.all.application.review.repository.fromDto import br.all.application.search.repository.SearchSessionRepository import br.all.application.search.update.PatchSearchSessionService.ResponseModel -import br.all.application.shared.exceptions.EntityNotFoundException +import br.all.domain.shared.exception.EntityNotFoundException import br.all.application.shared.presenter.prepareIfFailsPreconditions import br.all.application.study.repository.StudyReviewRepository import br.all.application.study.repository.toDto diff --git a/review/src/main/kotlin/br/all/application/search/update/UpdateSearchSessionServiceImpl.kt b/review/src/main/kotlin/br/all/application/search/update/UpdateSearchSessionServiceImpl.kt index cf95e9429..98356cbbf 100644 --- a/review/src/main/kotlin/br/all/application/search/update/UpdateSearchSessionServiceImpl.kt +++ b/review/src/main/kotlin/br/all/application/search/update/UpdateSearchSessionServiceImpl.kt @@ -7,7 +7,7 @@ import br.all.application.search.repository.fromDto import br.all.application.search.repository.toDto import br.all.application.search.update.UpdateSearchSessionService.RequestModel import br.all.application.search.update.UpdateSearchSessionService.ResponseModel -import br.all.application.shared.exceptions.EntityNotFoundException +import br.all.domain.shared.exception.EntityNotFoundException import br.all.application.shared.presenter.prepareIfFailsPreconditions import br.all.application.user.CredentialsService import br.all.domain.model.protocol.toSearchSource diff --git a/review/src/main/kotlin/br/all/application/shared/exceptions/UniquenessViolationException.kt b/review/src/main/kotlin/br/all/application/shared/exceptions/UniquenessViolationException.kt deleted file mode 100644 index 6cd2e1658..000000000 --- a/review/src/main/kotlin/br/all/application/shared/exceptions/UniquenessViolationException.kt +++ /dev/null @@ -1,3 +0,0 @@ -package br.all.application.shared.exceptions - -class UniquenessViolationException(message: String? = null, cause: Throwable? = null) : Exception(message, cause) \ No newline at end of file diff --git a/review/src/main/kotlin/br/all/application/shared/presenter/PreconditionChecker.kt b/review/src/main/kotlin/br/all/application/shared/presenter/PreconditionChecker.kt index b5c7826b9..28832cc67 100644 --- a/review/src/main/kotlin/br/all/application/shared/presenter/PreconditionChecker.kt +++ b/review/src/main/kotlin/br/all/application/shared/presenter/PreconditionChecker.kt @@ -2,9 +2,9 @@ package br.all.application.shared.presenter import br.all.application.user.credentials.ResearcherCredentialsService import br.all.application.review.repository.SystematicStudyRepository -import br.all.application.shared.exceptions.EntityNotFoundException -import br.all.application.shared.exceptions.UnauthenticatedUserException -import br.all.application.shared.exceptions.UnauthorizedUserException +import br.all.domain.shared.exception.EntityNotFoundException +import br.all.domain.shared.exception.UnauthenticatedUserException +import br.all.domain.shared.exception.UnauthorizedUserException import br.all.domain.model.user.ResearcherId import br.all.domain.model.review.SystematicStudyId diff --git a/review/src/main/kotlin/br/all/application/shared/presenter/PreconditionCheckerNEW.kt b/review/src/main/kotlin/br/all/application/shared/presenter/PreconditionCheckerNEW.kt index 525ff2f66..fc416f529 100644 --- a/review/src/main/kotlin/br/all/application/shared/presenter/PreconditionCheckerNEW.kt +++ b/review/src/main/kotlin/br/all/application/shared/presenter/PreconditionCheckerNEW.kt @@ -1,8 +1,8 @@ package br.all.application.shared.presenter -import br.all.application.shared.exceptions.EntityNotFoundException -import br.all.application.shared.exceptions.UnauthenticatedUserException -import br.all.application.shared.exceptions.UnauthorizedUserException +import br.all.domain.shared.exception.EntityNotFoundException +import br.all.domain.shared.exception.UnauthenticatedUserException +import br.all.domain.shared.exception.UnauthorizedUserException import br.all.domain.model.user.Researcher import br.all.domain.model.user.Role import br.all.domain.model.user.Role.ADMIN diff --git a/review/src/main/kotlin/br/all/application/study/find/service/FindStudyReviewServiceImpl.kt b/review/src/main/kotlin/br/all/application/study/find/service/FindStudyReviewServiceImpl.kt index 187151e10..d0d8b3e10 100644 --- a/review/src/main/kotlin/br/all/application/study/find/service/FindStudyReviewServiceImpl.kt +++ b/review/src/main/kotlin/br/all/application/study/find/service/FindStudyReviewServiceImpl.kt @@ -2,7 +2,7 @@ package br.all.application.study.find.service import br.all.application.review.repository.SystematicStudyRepository import br.all.application.review.repository.fromDto -import br.all.application.shared.exceptions.EntityNotFoundException +import br.all.domain.shared.exception.EntityNotFoundException import br.all.application.shared.presenter.prepareIfFailsPreconditions import br.all.application.study.find.presenter.FindStudyReviewPresenter import br.all.application.study.find.service.FindStudyReviewService.RequestModel diff --git a/review/src/main/kotlin/br/all/application/study/update/implementation/BatchAnswerQuestionServiceImpl.kt b/review/src/main/kotlin/br/all/application/study/update/implementation/BatchAnswerQuestionServiceImpl.kt index b9ecc7d9f..640a8a209 100644 --- a/review/src/main/kotlin/br/all/application/study/update/implementation/BatchAnswerQuestionServiceImpl.kt +++ b/review/src/main/kotlin/br/all/application/study/update/implementation/BatchAnswerQuestionServiceImpl.kt @@ -4,7 +4,7 @@ import br.all.application.question.repository.QuestionRepository import br.all.application.question.repository.fromDto import br.all.application.review.repository.SystematicStudyRepository import br.all.application.review.repository.fromDto -import br.all.application.shared.exceptions.EntityNotFoundException +import br.all.domain.shared.exception.EntityNotFoundException import br.all.application.shared.presenter.prepareIfFailsPreconditions import br.all.application.study.repository.StudyReviewRepository import br.all.application.study.repository.fromDto diff --git a/review/src/main/kotlin/br/all/application/study/update/implementation/MarkAsDuplicatedServiceImpl.kt b/review/src/main/kotlin/br/all/application/study/update/implementation/MarkAsDuplicatedServiceImpl.kt index 41d573c99..a9caa7417 100644 --- a/review/src/main/kotlin/br/all/application/study/update/implementation/MarkAsDuplicatedServiceImpl.kt +++ b/review/src/main/kotlin/br/all/application/study/update/implementation/MarkAsDuplicatedServiceImpl.kt @@ -2,7 +2,7 @@ package br.all.application.study.update.implementation import br.all.application.review.repository.SystematicStudyRepository import br.all.application.review.repository.fromDto -import br.all.application.shared.exceptions.EntityNotFoundException +import br.all.domain.shared.exception.EntityNotFoundException import br.all.application.shared.presenter.prepareIfFailsPreconditions import br.all.application.study.repository.StudyReviewRepository import br.all.application.study.repository.fromDto diff --git a/review/src/main/kotlin/br/all/application/study/update/implementation/RemoveCriteriaServiceImpl.kt b/review/src/main/kotlin/br/all/application/study/update/implementation/RemoveCriteriaServiceImpl.kt index 986bf2327..e83475901 100644 --- a/review/src/main/kotlin/br/all/application/study/update/implementation/RemoveCriteriaServiceImpl.kt +++ b/review/src/main/kotlin/br/all/application/study/update/implementation/RemoveCriteriaServiceImpl.kt @@ -2,7 +2,7 @@ package br.all.application.study.update.implementation import br.all.application.review.repository.SystematicStudyRepository import br.all.application.review.repository.fromDto -import br.all.application.shared.exceptions.EntityNotFoundException +import br.all.domain.shared.exception.EntityNotFoundException import br.all.application.shared.presenter.prepareIfFailsPreconditions import br.all.application.study.repository.StudyReviewRepository import br.all.application.study.repository.fromDto diff --git a/review/src/main/kotlin/br/all/application/study/update/implementation/UpdateStudyReviewExtractionService.kt b/review/src/main/kotlin/br/all/application/study/update/implementation/UpdateStudyReviewExtractionService.kt index b2299b59e..8f8baf6c2 100644 --- a/review/src/main/kotlin/br/all/application/study/update/implementation/UpdateStudyReviewExtractionService.kt +++ b/review/src/main/kotlin/br/all/application/study/update/implementation/UpdateStudyReviewExtractionService.kt @@ -2,7 +2,7 @@ package br.all.application.study.update.implementation import br.all.application.review.repository.SystematicStudyRepository import br.all.application.review.repository.fromDto -import br.all.application.shared.exceptions.EntityNotFoundException +import br.all.domain.shared.exception.EntityNotFoundException import br.all.application.shared.presenter.prepareIfFailsPreconditions import br.all.application.study.repository.StudyReviewRepository import br.all.application.study.repository.fromDto diff --git a/review/src/main/kotlin/br/all/application/study/update/implementation/UpdateStudyReviewPriorityService.kt b/review/src/main/kotlin/br/all/application/study/update/implementation/UpdateStudyReviewPriorityService.kt index f5178af4d..4c7bda606 100644 --- a/review/src/main/kotlin/br/all/application/study/update/implementation/UpdateStudyReviewPriorityService.kt +++ b/review/src/main/kotlin/br/all/application/study/update/implementation/UpdateStudyReviewPriorityService.kt @@ -2,7 +2,7 @@ package br.all.application.study.update.implementation import br.all.application.review.repository.SystematicStudyRepository import br.all.application.review.repository.fromDto -import br.all.application.shared.exceptions.EntityNotFoundException +import br.all.domain.shared.exception.EntityNotFoundException import br.all.application.shared.presenter.prepareIfFailsPreconditions import br.all.application.study.repository.StudyReviewRepository import br.all.application.study.repository.fromDto diff --git a/review/src/main/kotlin/br/all/application/study/update/implementation/UpdateStudyReviewSelectionService.kt b/review/src/main/kotlin/br/all/application/study/update/implementation/UpdateStudyReviewSelectionService.kt index bbc5f4a5f..eb9719239 100644 --- a/review/src/main/kotlin/br/all/application/study/update/implementation/UpdateStudyReviewSelectionService.kt +++ b/review/src/main/kotlin/br/all/application/study/update/implementation/UpdateStudyReviewSelectionService.kt @@ -2,7 +2,7 @@ package br.all.application.study.update.implementation import br.all.application.review.repository.SystematicStudyRepository import br.all.application.review.repository.fromDto -import br.all.application.shared.exceptions.EntityNotFoundException +import br.all.domain.shared.exception.EntityNotFoundException import br.all.application.shared.presenter.prepareIfFailsPreconditions import br.all.application.study.repository.StudyReviewRepository import br.all.application.study.repository.fromDto diff --git a/review/src/main/kotlin/br/all/application/study/update/implementation/UpdateStudyReviewServiceImpl.kt b/review/src/main/kotlin/br/all/application/study/update/implementation/UpdateStudyReviewServiceImpl.kt index 475d1706b..bf7730c5a 100644 --- a/review/src/main/kotlin/br/all/application/study/update/implementation/UpdateStudyReviewServiceImpl.kt +++ b/review/src/main/kotlin/br/all/application/study/update/implementation/UpdateStudyReviewServiceImpl.kt @@ -2,7 +2,7 @@ package br.all.application.study.update.implementation import br.all.application.review.repository.SystematicStudyRepository import br.all.application.review.repository.fromDto -import br.all.application.shared.exceptions.EntityNotFoundException +import br.all.domain.shared.exception.EntityNotFoundException import br.all.application.shared.presenter.prepareIfFailsPreconditions import br.all.application.study.repository.StudyReviewRepository import br.all.application.study.repository.fromStudyUpdateRequestModel diff --git a/review/src/test/kotlin/br/all/application/protocol/find/FindProtocolServiceImplTest.kt b/review/src/test/kotlin/br/all/application/protocol/find/FindProtocolServiceImplTest.kt index 5ee20dc0b..fcf1ddc42 100644 --- a/review/src/test/kotlin/br/all/application/protocol/find/FindProtocolServiceImplTest.kt +++ b/review/src/test/kotlin/br/all/application/protocol/find/FindProtocolServiceImplTest.kt @@ -3,9 +3,9 @@ package br.all.application.protocol.find import br.all.application.protocol.repository.ProtocolRepository import br.all.application.protocol.util.TestDataFactory import br.all.application.review.repository.SystematicStudyRepository -import br.all.application.shared.exceptions.EntityNotFoundException -import br.all.application.shared.exceptions.UnauthenticatedUserException -import br.all.application.shared.exceptions.UnauthorizedUserException +import br.all.domain.shared.exception.EntityNotFoundException +import br.all.domain.shared.exception.UnauthenticatedUserException +import br.all.domain.shared.exception.UnauthorizedUserException import br.all.application.user.CredentialsService import br.all.application.util.PreconditionCheckerMockingNew import io.mockk.every diff --git a/review/src/test/kotlin/br/all/application/protocol/update/UpdateProtocolServiceImplTest.kt b/review/src/test/kotlin/br/all/application/protocol/update/UpdateProtocolServiceImplTest.kt index b4ef5dc0e..dda08ed09 100644 --- a/review/src/test/kotlin/br/all/application/protocol/update/UpdateProtocolServiceImplTest.kt +++ b/review/src/test/kotlin/br/all/application/protocol/update/UpdateProtocolServiceImplTest.kt @@ -3,9 +3,9 @@ package br.all.application.protocol.update import br.all.application.protocol.repository.ProtocolRepository import br.all.application.protocol.util.TestDataFactory import br.all.application.review.repository.SystematicStudyRepository -import br.all.application.shared.exceptions.EntityNotFoundException -import br.all.application.shared.exceptions.UnauthenticatedUserException -import br.all.application.shared.exceptions.UnauthorizedUserException +import br.all.domain.shared.exception.EntityNotFoundException +import br.all.domain.shared.exception.UnauthenticatedUserException +import br.all.domain.shared.exception.UnauthorizedUserException import br.all.application.study.repository.StudyReviewRepository import br.all.application.user.CredentialsService import br.all.application.util.PreconditionCheckerMockingNew diff --git a/review/src/test/kotlin/br/all/application/question/find/FindQuestionServiceImplTest.kt b/review/src/test/kotlin/br/all/application/question/find/FindQuestionServiceImplTest.kt index 3dc8cb0dd..1f09a1877 100644 --- a/review/src/test/kotlin/br/all/application/question/find/FindQuestionServiceImplTest.kt +++ b/review/src/test/kotlin/br/all/application/question/find/FindQuestionServiceImplTest.kt @@ -4,8 +4,8 @@ import br.all.application.question.create.CreateQuestionService.* import br.all.application.question.repository.QuestionRepository import br.all.application.question.util.TestDataFactory import br.all.application.review.repository.SystematicStudyRepository -import br.all.application.shared.exceptions.UnauthenticatedUserException -import br.all.application.shared.exceptions.UnauthorizedUserException +import br.all.domain.shared.exception.UnauthenticatedUserException +import br.all.domain.shared.exception.UnauthorizedUserException import br.all.application.user.CredentialsService import br.all.application.util.PreconditionCheckerMockingNew import io.mockk.every diff --git a/review/src/test/kotlin/br/all/application/report/find/ExportProtocolServiceImplTest.kt b/review/src/test/kotlin/br/all/application/report/find/ExportProtocolServiceImplTest.kt index 62bf4ae84..23ea0a94a 100644 --- a/review/src/test/kotlin/br/all/application/report/find/ExportProtocolServiceImplTest.kt +++ b/review/src/test/kotlin/br/all/application/report/find/ExportProtocolServiceImplTest.kt @@ -5,7 +5,7 @@ import br.all.application.report.find.presenter.ExportProtocolPresenter import br.all.application.report.find.service.ExportProtocolService import br.all.application.report.find.service.ExportProtocolServiceImpl import br.all.application.review.repository.SystematicStudyRepository -import br.all.application.shared.exceptions.EntityNotFoundException +import br.all.domain.shared.exception.EntityNotFoundException import br.all.application.protocol.util.TestDataFactory as ProtocolDtoFactory import br.all.application.user.CredentialsService import br.all.application.util.PreconditionCheckerMockingNew diff --git a/review/src/test/kotlin/br/all/application/report/find/FindSourceServiceImplTest.kt b/review/src/test/kotlin/br/all/application/report/find/FindSourceServiceImplTest.kt index b94b3a270..fba84f71a 100644 --- a/review/src/test/kotlin/br/all/application/report/find/FindSourceServiceImplTest.kt +++ b/review/src/test/kotlin/br/all/application/report/find/FindSourceServiceImplTest.kt @@ -5,7 +5,7 @@ import br.all.application.report.find.presenter.FindSourcePresenter import br.all.application.report.find.service.FindSourceService import br.all.application.report.find.service.FindSourceServiceImpl import br.all.application.review.repository.SystematicStudyRepository -import br.all.application.shared.exceptions.EntityNotFoundException +import br.all.domain.shared.exception.EntityNotFoundException import br.all.application.study.repository.StudyReviewRepository import br.all.application.user.CredentialsService import br.all.application.util.PreconditionCheckerMockingNew diff --git a/review/src/test/kotlin/br/all/application/report/find/IncludedStudiesAnswersServiceImplTest.kt b/review/src/test/kotlin/br/all/application/report/find/IncludedStudiesAnswersServiceImplTest.kt index 8c52c2dd8..5b0c265cc 100644 --- a/review/src/test/kotlin/br/all/application/report/find/IncludedStudiesAnswersServiceImplTest.kt +++ b/review/src/test/kotlin/br/all/application/report/find/IncludedStudiesAnswersServiceImplTest.kt @@ -11,7 +11,7 @@ import br.all.application.user.CredentialsService import br.all.application.util.PreconditionCheckerMockingNew import br.all.application.report.find.service.IncludedStudiesAnswersService.RequestModel import br.all.application.report.util.TestDataFactory -import br.all.application.shared.exceptions.EntityNotFoundException +import br.all.domain.shared.exception.EntityNotFoundException import br.all.application.shared.presenter.prepareIfFailsPreconditions import br.all.domain.model.question.QuestionContextEnum import io.mockk.every diff --git a/review/src/test/kotlin/br/all/application/review/create/CreateSystematicStudyServiceImplTest.kt b/review/src/test/kotlin/br/all/application/review/create/CreateSystematicStudyServiceImplTest.kt index 14bfc6d3c..7e4b6ac44 100644 --- a/review/src/test/kotlin/br/all/application/review/create/CreateSystematicStudyServiceImplTest.kt +++ b/review/src/test/kotlin/br/all/application/review/create/CreateSystematicStudyServiceImplTest.kt @@ -3,8 +3,8 @@ package br.all.application.review.create import br.all.application.protocol.repository.ProtocolRepository import br.all.application.review.repository.SystematicStudyRepository import br.all.application.review.util.TestDataFactory -import br.all.application.shared.exceptions.UnauthenticatedUserException -import br.all.application.shared.exceptions.UnauthorizedUserException +import br.all.domain.shared.exception.UnauthenticatedUserException +import br.all.domain.shared.exception.UnauthorizedUserException import br.all.application.user.CredentialsService import br.all.application.util.PreconditionCheckerMockingNew import br.all.domain.services.UuidGeneratorService diff --git a/review/src/test/kotlin/br/all/application/review/find/services/FindAllSystematicStudiesServiceImplTest.kt b/review/src/test/kotlin/br/all/application/review/find/services/FindAllSystematicStudiesServiceImplTest.kt index e8a2e1098..ab2d61ff9 100644 --- a/review/src/test/kotlin/br/all/application/review/find/services/FindAllSystematicStudiesServiceImplTest.kt +++ b/review/src/test/kotlin/br/all/application/review/find/services/FindAllSystematicStudiesServiceImplTest.kt @@ -3,8 +3,8 @@ package br.all.application.review.find.services import br.all.application.review.find.presenter.FindAllSystematicStudyPresenter import br.all.application.review.repository.SystematicStudyRepository import br.all.application.review.util.TestDataFactory -import br.all.application.shared.exceptions.UnauthenticatedUserException -import br.all.application.shared.exceptions.UnauthorizedUserException +import br.all.domain.shared.exception.UnauthenticatedUserException +import br.all.domain.shared.exception.UnauthorizedUserException import br.all.application.user.CredentialsService import br.all.application.util.PreconditionCheckerMockingNew import io.mockk.every diff --git a/review/src/test/kotlin/br/all/application/review/find/services/FindSystematicStudyServiceImplTest.kt b/review/src/test/kotlin/br/all/application/review/find/services/FindSystematicStudyServiceImplTest.kt index 794058420..edf0046aa 100644 --- a/review/src/test/kotlin/br/all/application/review/find/services/FindSystematicStudyServiceImplTest.kt +++ b/review/src/test/kotlin/br/all/application/review/find/services/FindSystematicStudyServiceImplTest.kt @@ -3,9 +3,9 @@ package br.all.application.review.find.services import br.all.application.review.find.presenter.FindSystematicStudyPresenter import br.all.application.review.repository.SystematicStudyRepository import br.all.application.review.util.TestDataFactory -import br.all.application.shared.exceptions.EntityNotFoundException -import br.all.application.shared.exceptions.UnauthenticatedUserException -import br.all.application.shared.exceptions.UnauthorizedUserException +import br.all.domain.shared.exception.EntityNotFoundException +import br.all.domain.shared.exception.UnauthenticatedUserException +import br.all.domain.shared.exception.UnauthorizedUserException import br.all.application.user.CredentialsService import br.all.application.util.PreconditionCheckerMockingNew import io.mockk.every diff --git a/review/src/test/kotlin/br/all/application/review/update/services/UpdateSystematicStudyServiceImplTest.kt b/review/src/test/kotlin/br/all/application/review/update/services/UpdateSystematicStudyServiceImplTest.kt index 186732f91..e7dbf1944 100644 --- a/review/src/test/kotlin/br/all/application/review/update/services/UpdateSystematicStudyServiceImplTest.kt +++ b/review/src/test/kotlin/br/all/application/review/update/services/UpdateSystematicStudyServiceImplTest.kt @@ -4,9 +4,9 @@ import br.all.application.review.repository.SystematicStudyDto import br.all.application.review.repository.SystematicStudyRepository import br.all.application.review.update.presenter.UpdateSystematicStudyPresenter import br.all.application.review.util.TestDataFactory -import br.all.application.shared.exceptions.EntityNotFoundException -import br.all.application.shared.exceptions.UnauthenticatedUserException -import br.all.application.shared.exceptions.UnauthorizedUserException +import br.all.domain.shared.exception.EntityNotFoundException +import br.all.domain.shared.exception.UnauthenticatedUserException +import br.all.domain.shared.exception.UnauthorizedUserException import br.all.application.user.CredentialsService import br.all.application.util.PreconditionCheckerMockingNew import io.mockk.every diff --git a/review/src/test/kotlin/br/all/application/search/create/CreateSearchSessionServiceImplTest.kt b/review/src/test/kotlin/br/all/application/search/create/CreateSearchSessionServiceImplTest.kt index 42a8eec8a..4b3511aab 100644 --- a/review/src/test/kotlin/br/all/application/search/create/CreateSearchSessionServiceImplTest.kt +++ b/review/src/test/kotlin/br/all/application/search/create/CreateSearchSessionServiceImplTest.kt @@ -4,9 +4,9 @@ import br.all.application.protocol.repository.ProtocolRepository import br.all.application.review.repository.SystematicStudyRepository import br.all.application.search.util.TestDataFactory import br.all.application.search.repository.SearchSessionRepository -import br.all.application.shared.exceptions.EntityNotFoundException -import br.all.application.shared.exceptions.UnauthenticatedUserException -import br.all.application.shared.exceptions.UnauthorizedUserException +import br.all.domain.shared.exception.EntityNotFoundException +import br.all.domain.shared.exception.UnauthenticatedUserException +import br.all.domain.shared.exception.UnauthorizedUserException import br.all.application.study.repository.StudyReviewRepository import br.all.application.user.CredentialsService import br.all.application.util.PreconditionCheckerMockingNew diff --git a/review/src/test/kotlin/br/all/application/search/find/FindAllSearchSessionsBySourceServiceImplTest.kt b/review/src/test/kotlin/br/all/application/search/find/FindAllSearchSessionsBySourceServiceImplTest.kt index 3ed9029cf..ca198e87a 100644 --- a/review/src/test/kotlin/br/all/application/search/find/FindAllSearchSessionsBySourceServiceImplTest.kt +++ b/review/src/test/kotlin/br/all/application/search/find/FindAllSearchSessionsBySourceServiceImplTest.kt @@ -6,8 +6,8 @@ import br.all.application.search.find.service.FindAllSearchSessionsBySourceServi import br.all.application.search.find.service.FindAllSearchSessionsBySourceServiceImpl import br.all.application.search.repository.SearchSessionRepository import br.all.application.search.util.TestDataFactory -import br.all.application.shared.exceptions.UnauthenticatedUserException -import br.all.application.shared.exceptions.UnauthorizedUserException +import br.all.domain.shared.exception.UnauthenticatedUserException +import br.all.domain.shared.exception.UnauthorizedUserException import br.all.application.user.CredentialsService import br.all.application.util.PreconditionCheckerMockingNew import io.mockk.every diff --git a/review/src/test/kotlin/br/all/application/search/find/FindAllSearchSessionsServiceImplTest.kt b/review/src/test/kotlin/br/all/application/search/find/FindAllSearchSessionsServiceImplTest.kt index 2ebb67cba..be7c474b1 100644 --- a/review/src/test/kotlin/br/all/application/search/find/FindAllSearchSessionsServiceImplTest.kt +++ b/review/src/test/kotlin/br/all/application/search/find/FindAllSearchSessionsServiceImplTest.kt @@ -5,8 +5,8 @@ import br.all.application.search.find.presenter.FindAllSearchSessionsPresenter import br.all.application.search.find.service.FindAllSearchSessionsServiceImpl import br.all.application.search.repository.SearchSessionRepository import br.all.application.search.util.TestDataFactory -import br.all.application.shared.exceptions.UnauthenticatedUserException -import br.all.application.shared.exceptions.UnauthorizedUserException +import br.all.domain.shared.exception.UnauthenticatedUserException +import br.all.domain.shared.exception.UnauthorizedUserException import br.all.application.user.CredentialsService import br.all.application.util.PreconditionCheckerMockingNew import io.mockk.every diff --git a/review/src/test/kotlin/br/all/application/search/find/FindSearchSessionServiceImplTest.kt b/review/src/test/kotlin/br/all/application/search/find/FindSearchSessionServiceImplTest.kt index fae5ee1dc..491dd62a6 100644 --- a/review/src/test/kotlin/br/all/application/search/find/FindSearchSessionServiceImplTest.kt +++ b/review/src/test/kotlin/br/all/application/search/find/FindSearchSessionServiceImplTest.kt @@ -5,9 +5,9 @@ import br.all.application.search.find.presenter.FindSearchSessionPresenter import br.all.application.search.find.service.FindSearchSessionServiceImpl import br.all.application.search.repository.SearchSessionRepository import br.all.application.search.util.TestDataFactory -import br.all.application.shared.exceptions.EntityNotFoundException -import br.all.application.shared.exceptions.UnauthenticatedUserException -import br.all.application.shared.exceptions.UnauthorizedUserException +import br.all.domain.shared.exception.EntityNotFoundException +import br.all.domain.shared.exception.UnauthenticatedUserException +import br.all.domain.shared.exception.UnauthorizedUserException import br.all.application.user.CredentialsService import br.all.application.util.PreconditionCheckerMockingNew import io.mockk.every diff --git a/review/src/test/kotlin/br/all/application/search/update/UpdateSearchSessionServiceImplTest.kt b/review/src/test/kotlin/br/all/application/search/update/UpdateSearchSessionServiceImplTest.kt index 217307515..7b0d6ea83 100644 --- a/review/src/test/kotlin/br/all/application/search/update/UpdateSearchSessionServiceImplTest.kt +++ b/review/src/test/kotlin/br/all/application/search/update/UpdateSearchSessionServiceImplTest.kt @@ -4,9 +4,9 @@ import br.all.application.review.repository.SystematicStudyRepository import br.all.application.search.repository.SearchSessionDto import br.all.application.search.repository.SearchSessionRepository import br.all.application.search.util.TestDataFactory -import br.all.application.shared.exceptions.EntityNotFoundException -import br.all.application.shared.exceptions.UnauthenticatedUserException -import br.all.application.shared.exceptions.UnauthorizedUserException +import br.all.domain.shared.exception.EntityNotFoundException +import br.all.domain.shared.exception.UnauthenticatedUserException +import br.all.domain.shared.exception.UnauthorizedUserException import br.all.application.user.CredentialsService import br.all.application.util.PreconditionCheckerMockingNew import io.mockk.* diff --git a/review/src/test/kotlin/br/all/application/shared/presenter/PreconditionCheckerTest.kt b/review/src/test/kotlin/br/all/application/shared/presenter/PreconditionCheckerTest.kt index c69609d0a..6963316b1 100644 --- a/review/src/test/kotlin/br/all/application/shared/presenter/PreconditionCheckerTest.kt +++ b/review/src/test/kotlin/br/all/application/shared/presenter/PreconditionCheckerTest.kt @@ -2,9 +2,9 @@ package br.all.application.shared.presenter import br.all.application.user.credentials.ResearcherCredentialsService import br.all.application.review.repository.SystematicStudyRepository -import br.all.application.shared.exceptions.EntityNotFoundException -import br.all.application.shared.exceptions.UnauthenticatedUserException -import br.all.application.shared.exceptions.UnauthorizedUserException +import br.all.domain.shared.exception.EntityNotFoundException +import br.all.domain.shared.exception.UnauthenticatedUserException +import br.all.domain.shared.exception.UnauthorizedUserException import br.all.domain.model.user.ResearcherId import br.all.domain.model.review.SystematicStudyId import io.mockk.every diff --git a/review/src/test/kotlin/br/all/application/study/update/MarkAsDuplicatedServiceImplTest.kt b/review/src/test/kotlin/br/all/application/study/update/MarkAsDuplicatedServiceImplTest.kt index d37b59b97..9b29c5a69 100644 --- a/review/src/test/kotlin/br/all/application/study/update/MarkAsDuplicatedServiceImplTest.kt +++ b/review/src/test/kotlin/br/all/application/study/update/MarkAsDuplicatedServiceImplTest.kt @@ -1,7 +1,7 @@ package br.all.application.study.update import br.all.application.review.repository.SystematicStudyRepository -import br.all.application.shared.exceptions.EntityNotFoundException +import br.all.domain.shared.exception.EntityNotFoundException import br.all.application.study.repository.StudyReviewRepository import br.all.application.study.update.implementation.MarkAsDuplicatedServiceImpl import br.all.application.study.update.interfaces.MarkAsDuplicatedPresenter @@ -13,7 +13,6 @@ import io.mockk.impl.annotations.MockK import io.mockk.junit5.MockKExtension import org.junit.jupiter.api.* import org.junit.jupiter.api.extension.ExtendWith -import java.util.* @Tag("UnitTest") @Tag("ServiceTest") diff --git a/review/src/test/kotlin/br/all/application/study/update/UpdateStudyReviewExtractionServiceTest.kt b/review/src/test/kotlin/br/all/application/study/update/UpdateStudyReviewExtractionServiceTest.kt index 5e46f3dd6..87ccc5c04 100644 --- a/review/src/test/kotlin/br/all/application/study/update/UpdateStudyReviewExtractionServiceTest.kt +++ b/review/src/test/kotlin/br/all/application/study/update/UpdateStudyReviewExtractionServiceTest.kt @@ -1,7 +1,7 @@ package br.all.application.study.update import br.all.application.review.repository.SystematicStudyRepository -import br.all.application.shared.exceptions.EntityNotFoundException +import br.all.domain.shared.exception.EntityNotFoundException import br.all.application.study.repository.StudyReviewRepository import br.all.application.study.update.implementation.UpdateStudyReviewExtractionService import br.all.application.study.update.interfaces.UpdateStudyReviewStatusPresenter diff --git a/review/src/test/kotlin/br/all/application/study/update/UpdateStudyReviewPriorityServiceTest.kt b/review/src/test/kotlin/br/all/application/study/update/UpdateStudyReviewPriorityServiceTest.kt index 7941e8b93..d9c3a467d 100644 --- a/review/src/test/kotlin/br/all/application/study/update/UpdateStudyReviewPriorityServiceTest.kt +++ b/review/src/test/kotlin/br/all/application/study/update/UpdateStudyReviewPriorityServiceTest.kt @@ -1,7 +1,7 @@ package br.all.application.study.update import br.all.application.review.repository.SystematicStudyRepository -import br.all.application.shared.exceptions.EntityNotFoundException +import br.all.domain.shared.exception.EntityNotFoundException import br.all.application.study.repository.StudyReviewRepository import br.all.application.study.update.implementation.UpdateStudyReviewPriorityService import br.all.application.study.update.interfaces.UpdateStudyReviewStatusPresenter diff --git a/review/src/test/kotlin/br/all/application/study/update/UpdateStudyReviewSelectionStatusServiceTest.kt b/review/src/test/kotlin/br/all/application/study/update/UpdateStudyReviewSelectionStatusServiceTest.kt index d3aac10c1..092d4b3df 100644 --- a/review/src/test/kotlin/br/all/application/study/update/UpdateStudyReviewSelectionStatusServiceTest.kt +++ b/review/src/test/kotlin/br/all/application/study/update/UpdateStudyReviewSelectionStatusServiceTest.kt @@ -1,7 +1,7 @@ package br.all.application.study.update import br.all.application.review.repository.SystematicStudyRepository -import br.all.application.shared.exceptions.EntityNotFoundException +import br.all.domain.shared.exception.EntityNotFoundException import br.all.application.study.repository.StudyReviewRepository import br.all.application.study.update.implementation.UpdateStudyReviewSelectionService import br.all.application.study.update.interfaces.UpdateStudyReviewStatusPresenter diff --git a/review/src/test/kotlin/br/all/application/study/update/UpdateStudyReviewServiceImplTest.kt b/review/src/test/kotlin/br/all/application/study/update/UpdateStudyReviewServiceImplTest.kt index 1262712ae..90658b4c4 100644 --- a/review/src/test/kotlin/br/all/application/study/update/UpdateStudyReviewServiceImplTest.kt +++ b/review/src/test/kotlin/br/all/application/study/update/UpdateStudyReviewServiceImplTest.kt @@ -1,7 +1,7 @@ package br.all.application.study.update import br.all.application.review.repository.SystematicStudyRepository -import br.all.application.shared.exceptions.EntityNotFoundException +import br.all.domain.shared.exception.EntityNotFoundException import br.all.application.study.repository.StudyReviewRepository import br.all.application.study.update.implementation.UpdateStudyReviewServiceImpl import br.all.application.study.update.interfaces.UpdateStudyReviewPresenter diff --git a/review/src/test/kotlin/br/all/application/util/PreconditionCheckerMockingNew.kt b/review/src/test/kotlin/br/all/application/util/PreconditionCheckerMockingNew.kt index ad4286309..837aa0a44 100644 --- a/review/src/test/kotlin/br/all/application/util/PreconditionCheckerMockingNew.kt +++ b/review/src/test/kotlin/br/all/application/util/PreconditionCheckerMockingNew.kt @@ -3,9 +3,9 @@ package br.all.application.util import br.all.application.question.repository.QuestionRepository import br.all.application.review.repository.SystematicStudyDto import br.all.application.review.repository.SystematicStudyRepository -import br.all.application.shared.exceptions.EntityNotFoundException -import br.all.application.shared.exceptions.UnauthenticatedUserException -import br.all.application.shared.exceptions.UnauthorizedUserException +import br.all.domain.shared.exception.EntityNotFoundException +import br.all.domain.shared.exception.UnauthenticatedUserException +import br.all.domain.shared.exception.UnauthorizedUserException import br.all.application.shared.presenter.GenericPresenter import br.all.application.shared.presenter.prepareIfFailsPreconditions import br.all.application.user.CredentialsService diff --git a/review/src/main/kotlin/br/all/application/shared/exceptions/EntityNotFoundException.kt b/shared/src/main/kotlin/br/all/domain/shared/exception/EntityNotFoundException.kt similarity index 70% rename from review/src/main/kotlin/br/all/application/shared/exceptions/EntityNotFoundException.kt rename to shared/src/main/kotlin/br/all/domain/shared/exception/EntityNotFoundException.kt index 2c09a0a70..56f438bac 100644 --- a/review/src/main/kotlin/br/all/application/shared/exceptions/EntityNotFoundException.kt +++ b/shared/src/main/kotlin/br/all/domain/shared/exception/EntityNotFoundException.kt @@ -1,3 +1,3 @@ -package br.all.application.shared.exceptions +package br.all.domain.shared.exception class EntityNotFoundException(message: String? = null, cause: Throwable? = null) : Exception(message, cause) \ No newline at end of file diff --git a/review/src/main/kotlin/br/all/application/shared/exceptions/UnauthenticatedUserException.kt b/shared/src/main/kotlin/br/all/domain/shared/exception/UnauthenticatedUserException.kt similarity index 71% rename from review/src/main/kotlin/br/all/application/shared/exceptions/UnauthenticatedUserException.kt rename to shared/src/main/kotlin/br/all/domain/shared/exception/UnauthenticatedUserException.kt index 4ae3f28b7..c7a095474 100644 --- a/review/src/main/kotlin/br/all/application/shared/exceptions/UnauthenticatedUserException.kt +++ b/shared/src/main/kotlin/br/all/domain/shared/exception/UnauthenticatedUserException.kt @@ -1,3 +1,3 @@ -package br.all.application.shared.exceptions +package br.all.domain.shared.exception class UnauthenticatedUserException (message: String? = null, cause: Throwable? = null) : Exception(message, cause) \ No newline at end of file diff --git a/review/src/main/kotlin/br/all/application/shared/exceptions/UnauthorizedUserException.kt b/shared/src/main/kotlin/br/all/domain/shared/exception/UnauthorizedUserException.kt similarity index 71% rename from review/src/main/kotlin/br/all/application/shared/exceptions/UnauthorizedUserException.kt rename to shared/src/main/kotlin/br/all/domain/shared/exception/UnauthorizedUserException.kt index b3b50ada4..08293f6bd 100644 --- a/review/src/main/kotlin/br/all/application/shared/exceptions/UnauthorizedUserException.kt +++ b/shared/src/main/kotlin/br/all/domain/shared/exception/UnauthorizedUserException.kt @@ -1,3 +1,3 @@ -package br.all.application.shared.exceptions +package br.all.domain.shared.exception class UnauthorizedUserException (message: String? = null, cause: Throwable? = null) : Exception(message, cause) \ No newline at end of file diff --git a/account/src/main/kotlin/br/all/application/shared/UniquenessViolationException.kt b/shared/src/main/kotlin/br/all/domain/shared/exception/UniquenessViolationException.kt similarity index 74% rename from account/src/main/kotlin/br/all/application/shared/UniquenessViolationException.kt rename to shared/src/main/kotlin/br/all/domain/shared/exception/UniquenessViolationException.kt index 95e38b127..6b3f10373 100644 --- a/account/src/main/kotlin/br/all/application/shared/UniquenessViolationException.kt +++ b/shared/src/main/kotlin/br/all/domain/shared/exception/UniquenessViolationException.kt @@ -1,3 +1,3 @@ -package br.all.application.shared +package br.all.domain.shared.exception class UniquenessViolationException(message: String? = null, cause: Throwable? = null) : Exception(message, cause) \ No newline at end of file diff --git a/web/src/main/kotlin/br/all/security/service/AuthenticationInfoService.kt b/web/src/main/kotlin/br/all/security/service/AuthenticationInfoService.kt index d0e17a1f6..98c10eece 100644 --- a/web/src/main/kotlin/br/all/security/service/AuthenticationInfoService.kt +++ b/web/src/main/kotlin/br/all/security/service/AuthenticationInfoService.kt @@ -1,10 +1,8 @@ package br.all.security.service -import br.all.application.shared.exceptions.UnauthorizedUserException -import org.springframework.http.HttpStatus +import br.all.domain.shared.exception.UnauthorizedUserException import org.springframework.security.core.context.SecurityContextHolder import org.springframework.stereotype.Service -import org.springframework.web.server.ResponseStatusException import java.util.* @Service diff --git a/web/src/main/kotlin/br/all/security/service/AuthenticationService.kt b/web/src/main/kotlin/br/all/security/service/AuthenticationService.kt index 9af5d9942..e52ffc323 100644 --- a/web/src/main/kotlin/br/all/security/service/AuthenticationService.kt +++ b/web/src/main/kotlin/br/all/security/service/AuthenticationService.kt @@ -1,6 +1,6 @@ package br.all.security.service -import br.all.application.shared.exceptions.UnauthorizedUserException +import br.all.domain.shared.exception.UnauthorizedUserException import br.all.application.user.find.LoadAccountCredentialsService import br.all.application.user.update.UpdateRefreshTokenService import br.all.application.user.update.UpdateRefreshTokenService.RequestModel diff --git a/web/src/main/kotlin/br/all/shared/error/ErrorResponseEntityFactory.kt b/web/src/main/kotlin/br/all/shared/error/ErrorResponseEntityFactory.kt index 6d283101b..9ec454572 100644 --- a/web/src/main/kotlin/br/all/shared/error/ErrorResponseEntityFactory.kt +++ b/web/src/main/kotlin/br/all/shared/error/ErrorResponseEntityFactory.kt @@ -1,9 +1,9 @@ package br.all.shared.error -import br.all.application.shared.exceptions.EntityNotFoundException -import br.all.application.shared.exceptions.UnauthenticatedUserException -import br.all.application.shared.exceptions.UnauthorizedUserException -import br.all.application.shared.exceptions.UniquenessViolationException +import br.all.domain.shared.exception.EntityNotFoundException +import br.all.domain.shared.exception.UnauthenticatedUserException +import br.all.domain.shared.exception.UnauthorizedUserException +import br.all.domain.shared.exception.UniquenessViolationException import org.springframework.http.HttpStatus.* import org.springframework.http.ResponseEntity From c11c73dbdd832c1ee84f6934a97baa3d835dd1ab Mon Sep 17 00:00:00 2001 From: matheusspacifico Date: Thu, 31 Jul 2025 14:37:09 -0300 Subject: [PATCH 2/3] refactor: move generic presenter to shared module --- .../user/create/RegisterUserAccountPresenter.kt | 2 +- .../all/application/protocol/find/FindProtocolPresenter.kt | 2 +- .../protocol/find/FindProtocolStagePresenter.kt | 2 +- .../application/protocol/update/UpdateProtocolPresenter.kt | 2 +- .../application/question/create/CreateQuestionPresenter.kt | 2 +- .../all/application/question/find/FindQuestionPresenter.kt | 2 +- .../findAll/FindAllBySystematicStudyIdPresenter.kt | 2 +- .../question/update/presenter/UpdateQuestionPresenter.kt | 2 +- .../report/find/presenter/AuthorNetworkPresenter.kt | 2 +- .../report/find/presenter/ExportProtocolPresenter.kt | 2 +- .../report/find/presenter/FindAnswerPresenter.kt | 2 +- .../report/find/presenter/FindCriteriaPresenter.kt | 2 +- .../report/find/presenter/FindKeywordsPresenter.kt | 2 +- .../report/find/presenter/FindSourcePresenter.kt | 2 +- .../report/find/presenter/FindStudiesByStagePresenter.kt | 2 +- .../find/presenter/FindStudyReviewCriteriaPresenter.kt | 2 +- .../find/presenter/IncludedStudiesAnswersPresenter.kt | 2 +- .../report/find/presenter/StudiesFunnelPresenter.kt | 2 +- .../review/create/CreateSystematicStudyPresenter.kt | 2 +- .../find/presenter/FindAllSystematicStudyPresenter.kt | 2 +- .../review/find/presenter/FindSystematicStudyPresenter.kt | 2 +- .../update/presenter/UpdateSystematicStudyPresenter.kt | 2 +- .../search/create/CreateSearchSessionPresenter.kt | 2 +- .../search/delete/DeleteSearchSessionPresenter.kt | 2 +- .../presenter/FindAllSearchSessionsBySourcePresenter.kt | 2 +- .../find/presenter/FindAllSearchSessionsPresenter.kt | 2 +- .../search/find/presenter/FindSearchSessionPresenter.kt | 2 +- .../search/update/PatchSearchSessionPresenter.kt | 2 +- .../search/update/UpdateSearchSessionPresenter.kt | 2 +- .../all/application/shared/presenter/GenericPresenter.kt | 7 ------- .../application/shared/presenter/PreconditionChecker.kt | 1 + .../application/shared/presenter/PreconditionCheckerNEW.kt | 1 + .../application/study/create/CreateStudyReviewPresenter.kt | 2 +- .../find/presenter/FindAllStudyReviewsByAuthorPresenter.kt | 2 +- .../presenter/FindAllStudyReviewsBySessionPresenter.kt | 2 +- .../find/presenter/FindAllStudyReviewsBySourcePresenter.kt | 2 +- .../study/find/presenter/FindAllStudyReviewsPresenter.kt | 2 +- .../study/find/presenter/FindStudyReviewPresenter.kt | 2 +- .../update/interfaces/BatchAnswerQuestionPresenter.kt | 2 +- .../study/update/interfaces/MarkAsDuplicatedPresenter.kt | 2 +- .../study/update/interfaces/RemoveCriteriaPresenter.kt | 2 +- .../study/update/interfaces/UpdateStudyReviewPresenter.kt | 2 +- .../update/interfaces/UpdateStudyReviewStatusPresenter.kt | 2 +- .../shared/presenter/PreconditionCheckerTest.kt | 1 + .../br/all/application/util/PreconditionCheckerMocking.kt | 2 +- .../all/application/util/PreconditionCheckerMockingNew.kt | 2 +- .../br/all/domain/shared/presenter}/GenericPresenter.kt | 2 +- 47 files changed, 46 insertions(+), 50 deletions(-) delete mode 100644 review/src/main/kotlin/br/all/application/shared/presenter/GenericPresenter.kt rename {account/src/main/kotlin/br/all/application/shared => shared/src/main/kotlin/br/all/domain/shared/presenter}/GenericPresenter.kt (79%) diff --git a/account/src/main/kotlin/br/all/application/user/create/RegisterUserAccountPresenter.kt b/account/src/main/kotlin/br/all/application/user/create/RegisterUserAccountPresenter.kt index a0c78b747..f1710ddd8 100644 --- a/account/src/main/kotlin/br/all/application/user/create/RegisterUserAccountPresenter.kt +++ b/account/src/main/kotlin/br/all/application/user/create/RegisterUserAccountPresenter.kt @@ -1,6 +1,6 @@ package br.all.application.user.create -import br.all.application.shared.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter import br.all.application.user.create.RegisterUserAccountService.ResponseModel interface RegisterUserAccountPresenter : GenericPresenter diff --git a/review/src/main/kotlin/br/all/application/protocol/find/FindProtocolPresenter.kt b/review/src/main/kotlin/br/all/application/protocol/find/FindProtocolPresenter.kt index e98af4639..c73c0307e 100644 --- a/review/src/main/kotlin/br/all/application/protocol/find/FindProtocolPresenter.kt +++ b/review/src/main/kotlin/br/all/application/protocol/find/FindProtocolPresenter.kt @@ -1,6 +1,6 @@ package br.all.application.protocol.find import br.all.application.protocol.find.FindProtocolService.ResponseModel -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter interface FindProtocolPresenter : GenericPresenter diff --git a/review/src/main/kotlin/br/all/application/protocol/find/FindProtocolStagePresenter.kt b/review/src/main/kotlin/br/all/application/protocol/find/FindProtocolStagePresenter.kt index 5717add2c..351e47db5 100644 --- a/review/src/main/kotlin/br/all/application/protocol/find/FindProtocolStagePresenter.kt +++ b/review/src/main/kotlin/br/all/application/protocol/find/FindProtocolStagePresenter.kt @@ -1,6 +1,6 @@ package br.all.application.protocol.find -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter import br.all.application.protocol.find.FindProtocolStageService.ResponseModel interface FindProtocolStagePresenter : GenericPresenter \ No newline at end of file diff --git a/review/src/main/kotlin/br/all/application/protocol/update/UpdateProtocolPresenter.kt b/review/src/main/kotlin/br/all/application/protocol/update/UpdateProtocolPresenter.kt index e3be1de88..91b8dbfa0 100644 --- a/review/src/main/kotlin/br/all/application/protocol/update/UpdateProtocolPresenter.kt +++ b/review/src/main/kotlin/br/all/application/protocol/update/UpdateProtocolPresenter.kt @@ -1,6 +1,6 @@ package br.all.application.protocol.update import br.all.application.protocol.update.UpdateProtocolService.ResponseModel -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter interface UpdateProtocolPresenter : GenericPresenter diff --git a/review/src/main/kotlin/br/all/application/question/create/CreateQuestionPresenter.kt b/review/src/main/kotlin/br/all/application/question/create/CreateQuestionPresenter.kt index d274e4977..9d1ed45b8 100644 --- a/review/src/main/kotlin/br/all/application/question/create/CreateQuestionPresenter.kt +++ b/review/src/main/kotlin/br/all/application/question/create/CreateQuestionPresenter.kt @@ -1,7 +1,7 @@ package br.all.application.question.create import br.all.application.question.create.CreateQuestionService.ResponseModel -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter interface CreateQuestionPresenter : GenericPresenter diff --git a/review/src/main/kotlin/br/all/application/question/find/FindQuestionPresenter.kt b/review/src/main/kotlin/br/all/application/question/find/FindQuestionPresenter.kt index 36aca4c69..0396e329b 100644 --- a/review/src/main/kotlin/br/all/application/question/find/FindQuestionPresenter.kt +++ b/review/src/main/kotlin/br/all/application/question/find/FindQuestionPresenter.kt @@ -1,7 +1,7 @@ package br.all.application.question.find import br.all.application.question.find.FindQuestionService.ResponseModel -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter interface FindQuestionPresenter: GenericPresenter { } \ No newline at end of file diff --git a/review/src/main/kotlin/br/all/application/question/findAll/FindAllBySystematicStudyIdPresenter.kt b/review/src/main/kotlin/br/all/application/question/findAll/FindAllBySystematicStudyIdPresenter.kt index a955b2d32..738c01eef 100644 --- a/review/src/main/kotlin/br/all/application/question/findAll/FindAllBySystematicStudyIdPresenter.kt +++ b/review/src/main/kotlin/br/all/application/question/findAll/FindAllBySystematicStudyIdPresenter.kt @@ -1,7 +1,7 @@ package br.all.application.question.findAll import br.all.application.question.findAll.FindAllBySystematicStudyIdService.* -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter interface FindAllBySystematicStudyIdPresenter: GenericPresenter { } \ No newline at end of file diff --git a/review/src/main/kotlin/br/all/application/question/update/presenter/UpdateQuestionPresenter.kt b/review/src/main/kotlin/br/all/application/question/update/presenter/UpdateQuestionPresenter.kt index 8f98bdece..a977ec487 100644 --- a/review/src/main/kotlin/br/all/application/question/update/presenter/UpdateQuestionPresenter.kt +++ b/review/src/main/kotlin/br/all/application/question/update/presenter/UpdateQuestionPresenter.kt @@ -1,6 +1,6 @@ package br.all.application.question.update.presenter import br.all.application.question.update.services.UpdateQuestionService.ResponseModel -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter interface UpdateQuestionPresenter : GenericPresenter \ No newline at end of file diff --git a/review/src/main/kotlin/br/all/application/report/find/presenter/AuthorNetworkPresenter.kt b/review/src/main/kotlin/br/all/application/report/find/presenter/AuthorNetworkPresenter.kt index 225fd2fb7..47df04efb 100644 --- a/review/src/main/kotlin/br/all/application/report/find/presenter/AuthorNetworkPresenter.kt +++ b/review/src/main/kotlin/br/all/application/report/find/presenter/AuthorNetworkPresenter.kt @@ -1,6 +1,6 @@ package br.all.application.report.find.presenter import br.all.application.report.find.service.AuthorNetworkService.ResponseModel -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter interface AuthorNetworkPresenter: GenericPresenter \ No newline at end of file diff --git a/review/src/main/kotlin/br/all/application/report/find/presenter/ExportProtocolPresenter.kt b/review/src/main/kotlin/br/all/application/report/find/presenter/ExportProtocolPresenter.kt index a2d2e43cc..d1a48e585 100644 --- a/review/src/main/kotlin/br/all/application/report/find/presenter/ExportProtocolPresenter.kt +++ b/review/src/main/kotlin/br/all/application/report/find/presenter/ExportProtocolPresenter.kt @@ -1,6 +1,6 @@ package br.all.application.report.find.presenter import br.all.application.report.find.service.ExportProtocolService -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter interface ExportProtocolPresenter: GenericPresenter \ No newline at end of file diff --git a/review/src/main/kotlin/br/all/application/report/find/presenter/FindAnswerPresenter.kt b/review/src/main/kotlin/br/all/application/report/find/presenter/FindAnswerPresenter.kt index 522e5a459..300a4e368 100644 --- a/review/src/main/kotlin/br/all/application/report/find/presenter/FindAnswerPresenter.kt +++ b/review/src/main/kotlin/br/all/application/report/find/presenter/FindAnswerPresenter.kt @@ -1,6 +1,6 @@ package br.all.application.report.find.presenter import br.all.application.report.find.service.FindAnswerService -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter interface FindAnswerPresenter: GenericPresenter \ No newline at end of file diff --git a/review/src/main/kotlin/br/all/application/report/find/presenter/FindCriteriaPresenter.kt b/review/src/main/kotlin/br/all/application/report/find/presenter/FindCriteriaPresenter.kt index 7099eaaf8..92b556845 100644 --- a/review/src/main/kotlin/br/all/application/report/find/presenter/FindCriteriaPresenter.kt +++ b/review/src/main/kotlin/br/all/application/report/find/presenter/FindCriteriaPresenter.kt @@ -1,6 +1,6 @@ package br.all.application.report.find.presenter import br.all.application.report.find.service.FindCriteriaService.ResponseModel -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter interface FindCriteriaPresenter: GenericPresenter \ No newline at end of file diff --git a/review/src/main/kotlin/br/all/application/report/find/presenter/FindKeywordsPresenter.kt b/review/src/main/kotlin/br/all/application/report/find/presenter/FindKeywordsPresenter.kt index 618f50f30..f2153f822 100644 --- a/review/src/main/kotlin/br/all/application/report/find/presenter/FindKeywordsPresenter.kt +++ b/review/src/main/kotlin/br/all/application/report/find/presenter/FindKeywordsPresenter.kt @@ -1,6 +1,6 @@ package br.all.application.report.find.presenter -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter import br.all.application.report.find.service.FindKeywordsService.ResponseModel interface FindKeywordsPresenter: GenericPresenter \ No newline at end of file diff --git a/review/src/main/kotlin/br/all/application/report/find/presenter/FindSourcePresenter.kt b/review/src/main/kotlin/br/all/application/report/find/presenter/FindSourcePresenter.kt index fbacba315..751845bb3 100644 --- a/review/src/main/kotlin/br/all/application/report/find/presenter/FindSourcePresenter.kt +++ b/review/src/main/kotlin/br/all/application/report/find/presenter/FindSourcePresenter.kt @@ -1,6 +1,6 @@ package br.all.application.report.find.presenter import br.all.application.report.find.service.FindSourceService.ResponseModel -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter interface FindSourcePresenter: GenericPresenter \ No newline at end of file diff --git a/review/src/main/kotlin/br/all/application/report/find/presenter/FindStudiesByStagePresenter.kt b/review/src/main/kotlin/br/all/application/report/find/presenter/FindStudiesByStagePresenter.kt index 115f7aaa1..f6d2a5638 100644 --- a/review/src/main/kotlin/br/all/application/report/find/presenter/FindStudiesByStagePresenter.kt +++ b/review/src/main/kotlin/br/all/application/report/find/presenter/FindStudiesByStagePresenter.kt @@ -1,6 +1,6 @@ package br.all.application.report.find.presenter import br.all.application.report.find.service.FindStudiesByStageService -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter interface FindStudiesByStagePresenter: GenericPresenter \ No newline at end of file diff --git a/review/src/main/kotlin/br/all/application/report/find/presenter/FindStudyReviewCriteriaPresenter.kt b/review/src/main/kotlin/br/all/application/report/find/presenter/FindStudyReviewCriteriaPresenter.kt index 90e2ad4cf..f18a7b841 100644 --- a/review/src/main/kotlin/br/all/application/report/find/presenter/FindStudyReviewCriteriaPresenter.kt +++ b/review/src/main/kotlin/br/all/application/report/find/presenter/FindStudyReviewCriteriaPresenter.kt @@ -1,6 +1,6 @@ package br.all.application.report.find.presenter -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter import br.all.application.report.find.service.FindStudyReviewCriteriaService interface FindStudyReviewCriteriaPresenter: GenericPresenter \ No newline at end of file diff --git a/review/src/main/kotlin/br/all/application/report/find/presenter/IncludedStudiesAnswersPresenter.kt b/review/src/main/kotlin/br/all/application/report/find/presenter/IncludedStudiesAnswersPresenter.kt index 768693702..f16086401 100644 --- a/review/src/main/kotlin/br/all/application/report/find/presenter/IncludedStudiesAnswersPresenter.kt +++ b/review/src/main/kotlin/br/all/application/report/find/presenter/IncludedStudiesAnswersPresenter.kt @@ -1,6 +1,6 @@ package br.all.application.report.find.presenter -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter import br.all.application.report.find.service.IncludedStudiesAnswersService.ResponseModel interface IncludedStudiesAnswersPresenter: GenericPresenter \ No newline at end of file diff --git a/review/src/main/kotlin/br/all/application/report/find/presenter/StudiesFunnelPresenter.kt b/review/src/main/kotlin/br/all/application/report/find/presenter/StudiesFunnelPresenter.kt index 2f24f35e7..b4e48a4f1 100644 --- a/review/src/main/kotlin/br/all/application/report/find/presenter/StudiesFunnelPresenter.kt +++ b/review/src/main/kotlin/br/all/application/report/find/presenter/StudiesFunnelPresenter.kt @@ -1,6 +1,6 @@ package br.all.application.report.find.presenter import br.all.application.report.find.service.StudiesFunnelService -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter interface StudiesFunnelPresenter: GenericPresenter \ No newline at end of file diff --git a/review/src/main/kotlin/br/all/application/review/create/CreateSystematicStudyPresenter.kt b/review/src/main/kotlin/br/all/application/review/create/CreateSystematicStudyPresenter.kt index 035f8806a..fe1fd3fe6 100644 --- a/review/src/main/kotlin/br/all/application/review/create/CreateSystematicStudyPresenter.kt +++ b/review/src/main/kotlin/br/all/application/review/create/CreateSystematicStudyPresenter.kt @@ -1,6 +1,6 @@ package br.all.application.review.create import br.all.application.review.create.CreateSystematicStudyService.ResponseModel -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter interface CreateSystematicStudyPresenter : GenericPresenter diff --git a/review/src/main/kotlin/br/all/application/review/find/presenter/FindAllSystematicStudyPresenter.kt b/review/src/main/kotlin/br/all/application/review/find/presenter/FindAllSystematicStudyPresenter.kt index d606ce3eb..bc8c5650c 100644 --- a/review/src/main/kotlin/br/all/application/review/find/presenter/FindAllSystematicStudyPresenter.kt +++ b/review/src/main/kotlin/br/all/application/review/find/presenter/FindAllSystematicStudyPresenter.kt @@ -1,6 +1,6 @@ package br.all.application.review.find.presenter import br.all.application.review.find.services.FindAllSystematicStudiesService.ResponseModel -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter interface FindAllSystematicStudyPresenter : GenericPresenter diff --git a/review/src/main/kotlin/br/all/application/review/find/presenter/FindSystematicStudyPresenter.kt b/review/src/main/kotlin/br/all/application/review/find/presenter/FindSystematicStudyPresenter.kt index 4952240d5..b75b8bcc6 100644 --- a/review/src/main/kotlin/br/all/application/review/find/presenter/FindSystematicStudyPresenter.kt +++ b/review/src/main/kotlin/br/all/application/review/find/presenter/FindSystematicStudyPresenter.kt @@ -1,6 +1,6 @@ package br.all.application.review.find.presenter import br.all.application.review.find.services.FindSystematicStudyService.ResponseModel -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter interface FindSystematicStudyPresenter : GenericPresenter diff --git a/review/src/main/kotlin/br/all/application/review/update/presenter/UpdateSystematicStudyPresenter.kt b/review/src/main/kotlin/br/all/application/review/update/presenter/UpdateSystematicStudyPresenter.kt index d96136a3f..7dbd59897 100644 --- a/review/src/main/kotlin/br/all/application/review/update/presenter/UpdateSystematicStudyPresenter.kt +++ b/review/src/main/kotlin/br/all/application/review/update/presenter/UpdateSystematicStudyPresenter.kt @@ -1,6 +1,6 @@ package br.all.application.review.update.presenter import br.all.application.review.update.services.UpdateSystematicStudyService.ResponseModel -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter interface UpdateSystematicStudyPresenter : GenericPresenter diff --git a/review/src/main/kotlin/br/all/application/search/create/CreateSearchSessionPresenter.kt b/review/src/main/kotlin/br/all/application/search/create/CreateSearchSessionPresenter.kt index 6e5daaca2..c45259e45 100644 --- a/review/src/main/kotlin/br/all/application/search/create/CreateSearchSessionPresenter.kt +++ b/review/src/main/kotlin/br/all/application/search/create/CreateSearchSessionPresenter.kt @@ -1,6 +1,6 @@ package br.all.application.search.create -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter import br.all.application.search.create.CreateSearchSessionService.ResponseModel interface CreateSearchSessionPresenter : GenericPresenter \ No newline at end of file diff --git a/review/src/main/kotlin/br/all/application/search/delete/DeleteSearchSessionPresenter.kt b/review/src/main/kotlin/br/all/application/search/delete/DeleteSearchSessionPresenter.kt index a202c3eca..51a210f10 100644 --- a/review/src/main/kotlin/br/all/application/search/delete/DeleteSearchSessionPresenter.kt +++ b/review/src/main/kotlin/br/all/application/search/delete/DeleteSearchSessionPresenter.kt @@ -1,6 +1,6 @@ package br.all.application.search.delete -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter import br.all.application.search.delete.DeleteSearchSessionService.ResponseModel interface DeleteSearchSessionPresenter: GenericPresenter \ No newline at end of file diff --git a/review/src/main/kotlin/br/all/application/search/find/presenter/FindAllSearchSessionsBySourcePresenter.kt b/review/src/main/kotlin/br/all/application/search/find/presenter/FindAllSearchSessionsBySourcePresenter.kt index 41cddd6ba..64b23b796 100644 --- a/review/src/main/kotlin/br/all/application/search/find/presenter/FindAllSearchSessionsBySourcePresenter.kt +++ b/review/src/main/kotlin/br/all/application/search/find/presenter/FindAllSearchSessionsBySourcePresenter.kt @@ -1,6 +1,6 @@ package br.all.application.search.find.presenter import br.all.application.search.find.service.FindAllSearchSessionsBySourceService.ResponseModel -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter interface FindAllSearchSessionsBySourcePresenter: GenericPresenter \ No newline at end of file diff --git a/review/src/main/kotlin/br/all/application/search/find/presenter/FindAllSearchSessionsPresenter.kt b/review/src/main/kotlin/br/all/application/search/find/presenter/FindAllSearchSessionsPresenter.kt index 05d6c568c..7fd4d02ed 100644 --- a/review/src/main/kotlin/br/all/application/search/find/presenter/FindAllSearchSessionsPresenter.kt +++ b/review/src/main/kotlin/br/all/application/search/find/presenter/FindAllSearchSessionsPresenter.kt @@ -1,6 +1,6 @@ package br.all.application.search.find.presenter import br.all.application.search.find.service.FindAllSearchSessionsService.ResponseModel -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter interface FindAllSearchSessionsPresenter: GenericPresenter \ No newline at end of file diff --git a/review/src/main/kotlin/br/all/application/search/find/presenter/FindSearchSessionPresenter.kt b/review/src/main/kotlin/br/all/application/search/find/presenter/FindSearchSessionPresenter.kt index 376578652..fe96eea25 100644 --- a/review/src/main/kotlin/br/all/application/search/find/presenter/FindSearchSessionPresenter.kt +++ b/review/src/main/kotlin/br/all/application/search/find/presenter/FindSearchSessionPresenter.kt @@ -2,6 +2,6 @@ package br.all.application.search.find.presenter import br.all.application.search.find.service.FindSearchSessionService import br.all.application.search.find.service.FindSearchSessionService.ResponseModel -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter interface FindSearchSessionPresenter: GenericPresenter \ No newline at end of file diff --git a/review/src/main/kotlin/br/all/application/search/update/PatchSearchSessionPresenter.kt b/review/src/main/kotlin/br/all/application/search/update/PatchSearchSessionPresenter.kt index 2853831f9..4a4f69fad 100644 --- a/review/src/main/kotlin/br/all/application/search/update/PatchSearchSessionPresenter.kt +++ b/review/src/main/kotlin/br/all/application/search/update/PatchSearchSessionPresenter.kt @@ -1,6 +1,6 @@ package br.all.application.search.update -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter import br.all.application.search.update.PatchSearchSessionService.ResponseModel interface PatchSearchSessionPresenter : GenericPresenter \ No newline at end of file diff --git a/review/src/main/kotlin/br/all/application/search/update/UpdateSearchSessionPresenter.kt b/review/src/main/kotlin/br/all/application/search/update/UpdateSearchSessionPresenter.kt index fefa55caa..b658840e5 100644 --- a/review/src/main/kotlin/br/all/application/search/update/UpdateSearchSessionPresenter.kt +++ b/review/src/main/kotlin/br/all/application/search/update/UpdateSearchSessionPresenter.kt @@ -1,6 +1,6 @@ package br.all.application.search.update import br.all.application.search.update.UpdateSearchSessionService.ResponseModel -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter interface UpdateSearchSessionPresenter : GenericPresenter \ No newline at end of file diff --git a/review/src/main/kotlin/br/all/application/shared/presenter/GenericPresenter.kt b/review/src/main/kotlin/br/all/application/shared/presenter/GenericPresenter.kt deleted file mode 100644 index 1262ed4e9..000000000 --- a/review/src/main/kotlin/br/all/application/shared/presenter/GenericPresenter.kt +++ /dev/null @@ -1,7 +0,0 @@ -package br.all.application.shared.presenter - -interface GenericPresenter { - fun prepareSuccessView(response: T) - fun prepareFailView(throwable: Throwable) - fun isDone(): Boolean -} \ No newline at end of file diff --git a/review/src/main/kotlin/br/all/application/shared/presenter/PreconditionChecker.kt b/review/src/main/kotlin/br/all/application/shared/presenter/PreconditionChecker.kt index 28832cc67..1b3d375ce 100644 --- a/review/src/main/kotlin/br/all/application/shared/presenter/PreconditionChecker.kt +++ b/review/src/main/kotlin/br/all/application/shared/presenter/PreconditionChecker.kt @@ -7,6 +7,7 @@ import br.all.domain.shared.exception.UnauthenticatedUserException import br.all.domain.shared.exception.UnauthorizedUserException import br.all.domain.model.user.ResearcherId import br.all.domain.model.review.SystematicStudyId +import br.all.domain.shared.presenter.GenericPresenter class PreconditionChecker( private val reviewRepository: SystematicStudyRepository, diff --git a/review/src/main/kotlin/br/all/application/shared/presenter/PreconditionCheckerNEW.kt b/review/src/main/kotlin/br/all/application/shared/presenter/PreconditionCheckerNEW.kt index fc416f529..91d77b33f 100644 --- a/review/src/main/kotlin/br/all/application/shared/presenter/PreconditionCheckerNEW.kt +++ b/review/src/main/kotlin/br/all/application/shared/presenter/PreconditionCheckerNEW.kt @@ -8,6 +8,7 @@ import br.all.domain.model.user.Role import br.all.domain.model.user.Role.ADMIN import br.all.domain.model.user.Role.COLLABORATOR import br.all.domain.model.review.SystematicStudy +import br.all.domain.shared.presenter.GenericPresenter fun GenericPresenter<*>.prepareIfFailsPreconditions( diff --git a/review/src/main/kotlin/br/all/application/study/create/CreateStudyReviewPresenter.kt b/review/src/main/kotlin/br/all/application/study/create/CreateStudyReviewPresenter.kt index db69c1ddf..1c3c4837c 100644 --- a/review/src/main/kotlin/br/all/application/study/create/CreateStudyReviewPresenter.kt +++ b/review/src/main/kotlin/br/all/application/study/create/CreateStudyReviewPresenter.kt @@ -1,6 +1,6 @@ package br.all.application.study.create -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter import br.all.application.study.create.CreateStudyReviewService.ResponseModel interface CreateStudyReviewPresenter : GenericPresenter diff --git a/review/src/main/kotlin/br/all/application/study/find/presenter/FindAllStudyReviewsByAuthorPresenter.kt b/review/src/main/kotlin/br/all/application/study/find/presenter/FindAllStudyReviewsByAuthorPresenter.kt index f0af9a242..1aaf4841e 100644 --- a/review/src/main/kotlin/br/all/application/study/find/presenter/FindAllStudyReviewsByAuthorPresenter.kt +++ b/review/src/main/kotlin/br/all/application/study/find/presenter/FindAllStudyReviewsByAuthorPresenter.kt @@ -1,6 +1,6 @@ package br.all.application.study.find.presenter -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter import br.all.application.study.find.service.FindAllStudyReviewsByAuthorService.ResponseModel interface FindAllStudyReviewsByAuthorPresenter: GenericPresenter \ No newline at end of file diff --git a/review/src/main/kotlin/br/all/application/study/find/presenter/FindAllStudyReviewsBySessionPresenter.kt b/review/src/main/kotlin/br/all/application/study/find/presenter/FindAllStudyReviewsBySessionPresenter.kt index 6cac12635..65ac4dd6d 100644 --- a/review/src/main/kotlin/br/all/application/study/find/presenter/FindAllStudyReviewsBySessionPresenter.kt +++ b/review/src/main/kotlin/br/all/application/study/find/presenter/FindAllStudyReviewsBySessionPresenter.kt @@ -1,6 +1,6 @@ package br.all.application.study.find.presenter -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter import br.all.application.study.find.service.FindAllStudyReviewsBySessionService.ResponseModel interface FindAllStudyReviewsBySessionPresenter: GenericPresenter \ No newline at end of file diff --git a/review/src/main/kotlin/br/all/application/study/find/presenter/FindAllStudyReviewsBySourcePresenter.kt b/review/src/main/kotlin/br/all/application/study/find/presenter/FindAllStudyReviewsBySourcePresenter.kt index 2b4e835d9..972699c04 100644 --- a/review/src/main/kotlin/br/all/application/study/find/presenter/FindAllStudyReviewsBySourcePresenter.kt +++ b/review/src/main/kotlin/br/all/application/study/find/presenter/FindAllStudyReviewsBySourcePresenter.kt @@ -1,6 +1,6 @@ package br.all.application.study.find.presenter -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter import br.all.application.study.find.service.FindAllStudyReviewsBySourceService.ResponseModel interface FindAllStudyReviewsBySourcePresenter : GenericPresenter \ No newline at end of file diff --git a/review/src/main/kotlin/br/all/application/study/find/presenter/FindAllStudyReviewsPresenter.kt b/review/src/main/kotlin/br/all/application/study/find/presenter/FindAllStudyReviewsPresenter.kt index f936735e1..61b51f88b 100644 --- a/review/src/main/kotlin/br/all/application/study/find/presenter/FindAllStudyReviewsPresenter.kt +++ b/review/src/main/kotlin/br/all/application/study/find/presenter/FindAllStudyReviewsPresenter.kt @@ -1,6 +1,6 @@ package br.all.application.study.find.presenter -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter import br.all.application.study.find.service.FindAllStudyReviewsService.ResponseModel interface FindAllStudyReviewsPresenter : GenericPresenter \ No newline at end of file diff --git a/review/src/main/kotlin/br/all/application/study/find/presenter/FindStudyReviewPresenter.kt b/review/src/main/kotlin/br/all/application/study/find/presenter/FindStudyReviewPresenter.kt index c40c14129..93e7908c0 100644 --- a/review/src/main/kotlin/br/all/application/study/find/presenter/FindStudyReviewPresenter.kt +++ b/review/src/main/kotlin/br/all/application/study/find/presenter/FindStudyReviewPresenter.kt @@ -1,6 +1,6 @@ package br.all.application.study.find.presenter -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter import br.all.application.study.find.service.FindStudyReviewService.ResponseModel interface FindStudyReviewPresenter : GenericPresenter \ No newline at end of file diff --git a/review/src/main/kotlin/br/all/application/study/update/interfaces/BatchAnswerQuestionPresenter.kt b/review/src/main/kotlin/br/all/application/study/update/interfaces/BatchAnswerQuestionPresenter.kt index 627d35bb8..ee19e87bf 100644 --- a/review/src/main/kotlin/br/all/application/study/update/interfaces/BatchAnswerQuestionPresenter.kt +++ b/review/src/main/kotlin/br/all/application/study/update/interfaces/BatchAnswerQuestionPresenter.kt @@ -1,6 +1,6 @@ package br.all.application.study.update.interfaces -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter import br.all.application.study.update.interfaces.BatchAnswerQuestionService.ResponseModel interface BatchAnswerQuestionPresenter: GenericPresenter \ No newline at end of file diff --git a/review/src/main/kotlin/br/all/application/study/update/interfaces/MarkAsDuplicatedPresenter.kt b/review/src/main/kotlin/br/all/application/study/update/interfaces/MarkAsDuplicatedPresenter.kt index 341d91e88..233772a2e 100644 --- a/review/src/main/kotlin/br/all/application/study/update/interfaces/MarkAsDuplicatedPresenter.kt +++ b/review/src/main/kotlin/br/all/application/study/update/interfaces/MarkAsDuplicatedPresenter.kt @@ -1,6 +1,6 @@ package br.all.application.study.update.interfaces -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter import br.all.application.study.update.interfaces.MarkAsDuplicatedService.ResponseModel interface MarkAsDuplicatedPresenter : GenericPresenter \ No newline at end of file diff --git a/review/src/main/kotlin/br/all/application/study/update/interfaces/RemoveCriteriaPresenter.kt b/review/src/main/kotlin/br/all/application/study/update/interfaces/RemoveCriteriaPresenter.kt index ab24adad1..5c289a47a 100644 --- a/review/src/main/kotlin/br/all/application/study/update/interfaces/RemoveCriteriaPresenter.kt +++ b/review/src/main/kotlin/br/all/application/study/update/interfaces/RemoveCriteriaPresenter.kt @@ -1,6 +1,6 @@ package br.all.application.study.update.interfaces -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter interface RemoveCriteriaPresenter: GenericPresenter \ No newline at end of file diff --git a/review/src/main/kotlin/br/all/application/study/update/interfaces/UpdateStudyReviewPresenter.kt b/review/src/main/kotlin/br/all/application/study/update/interfaces/UpdateStudyReviewPresenter.kt index f4156d3dc..096aa4936 100644 --- a/review/src/main/kotlin/br/all/application/study/update/interfaces/UpdateStudyReviewPresenter.kt +++ b/review/src/main/kotlin/br/all/application/study/update/interfaces/UpdateStudyReviewPresenter.kt @@ -1,5 +1,5 @@ package br.all.application.study.update.interfaces -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter interface UpdateStudyReviewPresenter : GenericPresenter diff --git a/review/src/main/kotlin/br/all/application/study/update/interfaces/UpdateStudyReviewStatusPresenter.kt b/review/src/main/kotlin/br/all/application/study/update/interfaces/UpdateStudyReviewStatusPresenter.kt index 87d11490a..88c318024 100644 --- a/review/src/main/kotlin/br/all/application/study/update/interfaces/UpdateStudyReviewStatusPresenter.kt +++ b/review/src/main/kotlin/br/all/application/study/update/interfaces/UpdateStudyReviewStatusPresenter.kt @@ -1,6 +1,6 @@ package br.all.application.study.update.interfaces -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter import br.all.application.study.update.interfaces.UpdateStudyReviewStatusService.ResponseModel interface UpdateStudyReviewStatusPresenter : GenericPresenter diff --git a/review/src/test/kotlin/br/all/application/shared/presenter/PreconditionCheckerTest.kt b/review/src/test/kotlin/br/all/application/shared/presenter/PreconditionCheckerTest.kt index 6963316b1..1ef84ef80 100644 --- a/review/src/test/kotlin/br/all/application/shared/presenter/PreconditionCheckerTest.kt +++ b/review/src/test/kotlin/br/all/application/shared/presenter/PreconditionCheckerTest.kt @@ -7,6 +7,7 @@ import br.all.domain.shared.exception.UnauthenticatedUserException import br.all.domain.shared.exception.UnauthorizedUserException import br.all.domain.model.user.ResearcherId import br.all.domain.model.review.SystematicStudyId +import br.all.domain.shared.presenter.GenericPresenter import io.mockk.every import io.mockk.mockk import io.mockk.verify diff --git a/review/src/test/kotlin/br/all/application/util/PreconditionCheckerMocking.kt b/review/src/test/kotlin/br/all/application/util/PreconditionCheckerMocking.kt index e41dab172..186c7f3b8 100644 --- a/review/src/test/kotlin/br/all/application/util/PreconditionCheckerMocking.kt +++ b/review/src/test/kotlin/br/all/application/util/PreconditionCheckerMocking.kt @@ -3,7 +3,7 @@ package br.all.application.util import br.all.application.question.repository.QuestionRepository import br.all.application.user.credentials.ResearcherCredentialsService import br.all.application.review.repository.SystematicStudyRepository -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter import br.all.domain.model.user.toResearcherId import br.all.domain.model.review.toSystematicStudyId import io.mockk.every diff --git a/review/src/test/kotlin/br/all/application/util/PreconditionCheckerMockingNew.kt b/review/src/test/kotlin/br/all/application/util/PreconditionCheckerMockingNew.kt index 837aa0a44..350e3865d 100644 --- a/review/src/test/kotlin/br/all/application/util/PreconditionCheckerMockingNew.kt +++ b/review/src/test/kotlin/br/all/application/util/PreconditionCheckerMockingNew.kt @@ -6,7 +6,7 @@ import br.all.application.review.repository.SystematicStudyRepository import br.all.domain.shared.exception.EntityNotFoundException import br.all.domain.shared.exception.UnauthenticatedUserException import br.all.domain.shared.exception.UnauthorizedUserException -import br.all.application.shared.presenter.GenericPresenter +import br.all.domain.shared.presenter.GenericPresenter import br.all.application.shared.presenter.prepareIfFailsPreconditions import br.all.application.user.CredentialsService import io.github.serpro69.kfaker.Faker diff --git a/account/src/main/kotlin/br/all/application/shared/GenericPresenter.kt b/shared/src/main/kotlin/br/all/domain/shared/presenter/GenericPresenter.kt similarity index 79% rename from account/src/main/kotlin/br/all/application/shared/GenericPresenter.kt rename to shared/src/main/kotlin/br/all/domain/shared/presenter/GenericPresenter.kt index b340d32da..bdc877976 100644 --- a/account/src/main/kotlin/br/all/application/shared/GenericPresenter.kt +++ b/shared/src/main/kotlin/br/all/domain/shared/presenter/GenericPresenter.kt @@ -1,4 +1,4 @@ -package br.all.application.shared +package br.all.domain.shared.presenter interface GenericPresenter { fun prepareSuccessView(response: T) From 865de307d5ba40e6ac0dc53c4e5d96f095118d0a Mon Sep 17 00:00:00 2001 From: matheusspacifico Date: Thu, 31 Jul 2025 14:49:28 -0300 Subject: [PATCH 3/3] refactor: move researcher related classes to shared module --- .../review/repository/SystematicStudyMapper.kt | 2 +- .../application/search/repository/SearchSessionMapper.kt | 2 +- .../application/shared/presenter/PreconditionChecker.kt | 2 +- .../shared/presenter/PreconditionCheckerNEW.kt | 8 ++++---- .../kotlin/br/all/application/user/CredentialsService.kt | 6 +++--- .../user/credentials/FakeResearcherCredentialsService.kt | 2 +- .../user/credentials/ResearcherCredentialsService.kt | 2 +- .../kotlin/br/all/domain/model/review/SystematicStudy.kt | 2 +- .../kotlin/br/all/domain/model/search/SearchSession.kt | 2 +- .../br/all/application/search/util/TestDataFactory.kt | 2 +- .../shared/presenter/PreconditionCheckerTest.kt | 2 +- .../br/all/application/util/PreconditionCheckerMocking.kt | 2 +- .../br/all/domain/model/review/SystematicStudyTest.kt | 2 +- .../br/all/domain/model/search/SearchSessionTest.kt | 2 +- .../main/kotlin/br/all/domain/shared}/user/Researcher.kt | 2 +- .../kotlin/br/all/domain/shared}/user/ResearcherId.kt | 2 +- .../src/main/kotlin/br/all/domain/shared}/user/Role.kt | 2 +- 17 files changed, 22 insertions(+), 22 deletions(-) rename {review/src/main/kotlin/br/all/domain/model => shared/src/main/kotlin/br/all/domain/shared}/user/Researcher.kt (83%) rename {review/src/main/kotlin/br/all/domain/model => shared/src/main/kotlin/br/all/domain/shared}/user/ResearcherId.kt (91%) rename {review/src/main/kotlin/br/all/domain/model => shared/src/main/kotlin/br/all/domain/shared}/user/Role.kt (58%) diff --git a/review/src/main/kotlin/br/all/application/review/repository/SystematicStudyMapper.kt b/review/src/main/kotlin/br/all/application/review/repository/SystematicStudyMapper.kt index 961dbc4e3..025cda28a 100644 --- a/review/src/main/kotlin/br/all/application/review/repository/SystematicStudyMapper.kt +++ b/review/src/main/kotlin/br/all/application/review/repository/SystematicStudyMapper.kt @@ -1,7 +1,7 @@ package br.all.application.review.repository import br.all.application.review.create.CreateSystematicStudyService.RequestModel -import br.all.domain.model.user.ResearcherId +import br.all.domain.shared.user.ResearcherId import br.all.domain.model.review.SystematicStudy import br.all.domain.model.review.SystematicStudyId import java.util.* diff --git a/review/src/main/kotlin/br/all/application/search/repository/SearchSessionMapper.kt b/review/src/main/kotlin/br/all/application/search/repository/SearchSessionMapper.kt index 2bdc8944b..10d7ed2c1 100644 --- a/review/src/main/kotlin/br/all/application/search/repository/SearchSessionMapper.kt +++ b/review/src/main/kotlin/br/all/application/search/repository/SearchSessionMapper.kt @@ -1,7 +1,7 @@ package br.all.application.search.repository import br.all.application.search.create.CreateSearchSessionService.RequestModel import br.all.domain.model.protocol.SearchSource -import br.all.domain.model.user.ResearcherId +import br.all.domain.shared.user.ResearcherId import br.all.domain.model.review.SystematicStudyId import br.all.domain.model.search.SearchSession import br.all.domain.model.search.SearchSessionID diff --git a/review/src/main/kotlin/br/all/application/shared/presenter/PreconditionChecker.kt b/review/src/main/kotlin/br/all/application/shared/presenter/PreconditionChecker.kt index 1b3d375ce..5de37e18a 100644 --- a/review/src/main/kotlin/br/all/application/shared/presenter/PreconditionChecker.kt +++ b/review/src/main/kotlin/br/all/application/shared/presenter/PreconditionChecker.kt @@ -5,7 +5,7 @@ import br.all.application.review.repository.SystematicStudyRepository import br.all.domain.shared.exception.EntityNotFoundException import br.all.domain.shared.exception.UnauthenticatedUserException import br.all.domain.shared.exception.UnauthorizedUserException -import br.all.domain.model.user.ResearcherId +import br.all.domain.shared.user.ResearcherId import br.all.domain.model.review.SystematicStudyId import br.all.domain.shared.presenter.GenericPresenter diff --git a/review/src/main/kotlin/br/all/application/shared/presenter/PreconditionCheckerNEW.kt b/review/src/main/kotlin/br/all/application/shared/presenter/PreconditionCheckerNEW.kt index 91d77b33f..6d5f87d17 100644 --- a/review/src/main/kotlin/br/all/application/shared/presenter/PreconditionCheckerNEW.kt +++ b/review/src/main/kotlin/br/all/application/shared/presenter/PreconditionCheckerNEW.kt @@ -3,10 +3,10 @@ package br.all.application.shared.presenter import br.all.domain.shared.exception.EntityNotFoundException import br.all.domain.shared.exception.UnauthenticatedUserException import br.all.domain.shared.exception.UnauthorizedUserException -import br.all.domain.model.user.Researcher -import br.all.domain.model.user.Role -import br.all.domain.model.user.Role.ADMIN -import br.all.domain.model.user.Role.COLLABORATOR +import br.all.domain.shared.user.Researcher +import br.all.domain.shared.user.Role +import br.all.domain.shared.user.Role.ADMIN +import br.all.domain.shared.user.Role.COLLABORATOR import br.all.domain.model.review.SystematicStudy import br.all.domain.shared.presenter.GenericPresenter diff --git a/review/src/main/kotlin/br/all/application/user/CredentialsService.kt b/review/src/main/kotlin/br/all/application/user/CredentialsService.kt index c7bd692d3..36004de22 100644 --- a/review/src/main/kotlin/br/all/application/user/CredentialsService.kt +++ b/review/src/main/kotlin/br/all/application/user/CredentialsService.kt @@ -1,8 +1,8 @@ package br.all.application.user -import br.all.domain.model.user.Researcher -import br.all.domain.model.user.ResearcherId -import br.all.domain.model.user.Role +import br.all.domain.shared.user.Researcher +import br.all.domain.shared.user.ResearcherId +import br.all.domain.shared.user.Role import io.swagger.v3.oas.annotations.media.Schema import java.util.UUID diff --git a/review/src/main/kotlin/br/all/application/user/credentials/FakeResearcherCredentialsService.kt b/review/src/main/kotlin/br/all/application/user/credentials/FakeResearcherCredentialsService.kt index 22e8718da..b10846e5a 100644 --- a/review/src/main/kotlin/br/all/application/user/credentials/FakeResearcherCredentialsService.kt +++ b/review/src/main/kotlin/br/all/application/user/credentials/FakeResearcherCredentialsService.kt @@ -1,6 +1,6 @@ package br.all.application.user.credentials -import br.all.domain.model.user.ResearcherId +import br.all.domain.shared.user.ResearcherId import org.springframework.stereotype.Service @Service diff --git a/review/src/main/kotlin/br/all/application/user/credentials/ResearcherCredentialsService.kt b/review/src/main/kotlin/br/all/application/user/credentials/ResearcherCredentialsService.kt index f7cbd4356..2f2615c5d 100644 --- a/review/src/main/kotlin/br/all/application/user/credentials/ResearcherCredentialsService.kt +++ b/review/src/main/kotlin/br/all/application/user/credentials/ResearcherCredentialsService.kt @@ -1,6 +1,6 @@ package br.all.application.user.credentials -import br.all.domain.model.user.ResearcherId +import br.all.domain.shared.user.ResearcherId interface ResearcherCredentialsService { fun isAuthenticated(researcherId: ResearcherId): Boolean diff --git a/review/src/main/kotlin/br/all/domain/model/review/SystematicStudy.kt b/review/src/main/kotlin/br/all/domain/model/review/SystematicStudy.kt index 50a0c71a3..69ce0e5c7 100644 --- a/review/src/main/kotlin/br/all/domain/model/review/SystematicStudy.kt +++ b/review/src/main/kotlin/br/all/domain/model/review/SystematicStudy.kt @@ -1,7 +1,7 @@ package br.all.domain.model.review import br.all.domain.shared.ddd.Entity -import br.all.domain.model.user.ResearcherId +import br.all.domain.shared.user.ResearcherId import br.all.domain.shared.ddd.Notification import br.all.domain.shared.utils.exists import java.util.* diff --git a/review/src/main/kotlin/br/all/domain/model/search/SearchSession.kt b/review/src/main/kotlin/br/all/domain/model/search/SearchSession.kt index 8e598a807..b8ce58d8f 100644 --- a/review/src/main/kotlin/br/all/domain/model/search/SearchSession.kt +++ b/review/src/main/kotlin/br/all/domain/model/search/SearchSession.kt @@ -2,7 +2,7 @@ package br.all.domain.model.search import br.all.domain.shared.ddd.Entity import br.all.domain.model.protocol.SearchSource -import br.all.domain.model.user.ResearcherId +import br.all.domain.shared.user.ResearcherId import br.all.domain.model.review.SystematicStudyId import br.all.domain.shared.ddd.Notification import java.time.LocalDateTime diff --git a/review/src/test/kotlin/br/all/application/search/util/TestDataFactory.kt b/review/src/test/kotlin/br/all/application/search/util/TestDataFactory.kt index a574db434..1bb4debdb 100644 --- a/review/src/test/kotlin/br/all/application/search/util/TestDataFactory.kt +++ b/review/src/test/kotlin/br/all/application/search/util/TestDataFactory.kt @@ -10,7 +10,7 @@ import br.all.application.search.repository.SearchSessionDto import br.all.application.search.update.UpdateSearchSessionService import br.all.application.search.update.UpdateSearchSessionService.RequestModel import br.all.domain.model.protocol.SearchSource -import br.all.domain.model.user.ResearcherId +import br.all.domain.shared.user.ResearcherId import br.all.domain.model.review.SystematicStudyId import br.all.domain.model.search.SearchSession import br.all.domain.model.search.SearchSessionID diff --git a/review/src/test/kotlin/br/all/application/shared/presenter/PreconditionCheckerTest.kt b/review/src/test/kotlin/br/all/application/shared/presenter/PreconditionCheckerTest.kt index 1ef84ef80..3ec130153 100644 --- a/review/src/test/kotlin/br/all/application/shared/presenter/PreconditionCheckerTest.kt +++ b/review/src/test/kotlin/br/all/application/shared/presenter/PreconditionCheckerTest.kt @@ -5,7 +5,7 @@ import br.all.application.review.repository.SystematicStudyRepository import br.all.domain.shared.exception.EntityNotFoundException import br.all.domain.shared.exception.UnauthenticatedUserException import br.all.domain.shared.exception.UnauthorizedUserException -import br.all.domain.model.user.ResearcherId +import br.all.domain.shared.user.ResearcherId import br.all.domain.model.review.SystematicStudyId import br.all.domain.shared.presenter.GenericPresenter import io.mockk.every diff --git a/review/src/test/kotlin/br/all/application/util/PreconditionCheckerMocking.kt b/review/src/test/kotlin/br/all/application/util/PreconditionCheckerMocking.kt index 186c7f3b8..80b63fa7f 100644 --- a/review/src/test/kotlin/br/all/application/util/PreconditionCheckerMocking.kt +++ b/review/src/test/kotlin/br/all/application/util/PreconditionCheckerMocking.kt @@ -4,7 +4,7 @@ import br.all.application.question.repository.QuestionRepository import br.all.application.user.credentials.ResearcherCredentialsService import br.all.application.review.repository.SystematicStudyRepository import br.all.domain.shared.presenter.GenericPresenter -import br.all.domain.model.user.toResearcherId +import br.all.domain.shared.user.toResearcherId import br.all.domain.model.review.toSystematicStudyId import io.mockk.every import java.util.* diff --git a/review/src/test/kotlin/br/all/domain/model/review/SystematicStudyTest.kt b/review/src/test/kotlin/br/all/domain/model/review/SystematicStudyTest.kt index e9e0f3e8a..664865e91 100644 --- a/review/src/test/kotlin/br/all/domain/model/review/SystematicStudyTest.kt +++ b/review/src/test/kotlin/br/all/domain/model/review/SystematicStudyTest.kt @@ -1,6 +1,6 @@ package br.all.domain.model.review -import br.all.domain.model.user.ResearcherId +import br.all.domain.shared.user.ResearcherId import org.junit.jupiter.api.* import org.junit.jupiter.api.Assertions.* import org.junit.jupiter.api.assertDoesNotThrow diff --git a/review/src/test/kotlin/br/all/domain/model/search/SearchSessionTest.kt b/review/src/test/kotlin/br/all/domain/model/search/SearchSessionTest.kt index dcb7de383..f7fa3540b 100644 --- a/review/src/test/kotlin/br/all/domain/model/search/SearchSessionTest.kt +++ b/review/src/test/kotlin/br/all/domain/model/search/SearchSessionTest.kt @@ -1,7 +1,7 @@ package br.all.domain.model.search import br.all.domain.model.protocol.SearchSource -import br.all.domain.model.user.ResearcherId +import br.all.domain.shared.user.ResearcherId import br.all.domain.model.review.SystematicStudyId import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test diff --git a/review/src/main/kotlin/br/all/domain/model/user/Researcher.kt b/shared/src/main/kotlin/br/all/domain/shared/user/Researcher.kt similarity index 83% rename from review/src/main/kotlin/br/all/domain/model/user/Researcher.kt rename to shared/src/main/kotlin/br/all/domain/shared/user/Researcher.kt index 32bbfce0b..992cc2484 100644 --- a/review/src/main/kotlin/br/all/domain/model/user/Researcher.kt +++ b/shared/src/main/kotlin/br/all/domain/shared/user/Researcher.kt @@ -1,4 +1,4 @@ -package br.all.domain.model.user +package br.all.domain.shared.user import br.all.domain.shared.ddd.Entity import java.util.UUID diff --git a/review/src/main/kotlin/br/all/domain/model/user/ResearcherId.kt b/shared/src/main/kotlin/br/all/domain/shared/user/ResearcherId.kt similarity index 91% rename from review/src/main/kotlin/br/all/domain/model/user/ResearcherId.kt rename to shared/src/main/kotlin/br/all/domain/shared/user/ResearcherId.kt index f4cd4ad04..67e6b4b5e 100644 --- a/review/src/main/kotlin/br/all/domain/model/user/ResearcherId.kt +++ b/shared/src/main/kotlin/br/all/domain/shared/user/ResearcherId.kt @@ -1,4 +1,4 @@ -package br.all.domain.model.user +package br.all.domain.shared.user import br.all.domain.shared.ddd.Identifier import br.all.domain.shared.ddd.Notification diff --git a/review/src/main/kotlin/br/all/domain/model/user/Role.kt b/shared/src/main/kotlin/br/all/domain/shared/user/Role.kt similarity index 58% rename from review/src/main/kotlin/br/all/domain/model/user/Role.kt rename to shared/src/main/kotlin/br/all/domain/shared/user/Role.kt index 8e6ed2dde..2546921df 100644 --- a/review/src/main/kotlin/br/all/domain/model/user/Role.kt +++ b/shared/src/main/kotlin/br/all/domain/shared/user/Role.kt @@ -1,4 +1,4 @@ -package br.all.domain.model.user +package br.all.domain.shared.user enum class Role { COLLABORATOR,