diff --git a/api/src/prescription/learner-management/application/jobs/compute-certificability-job-controller.js b/api/src/prescription/learner-management/application/jobs/compute-certificability-job-controller.js index 005f4ec759f..ac1ad4af510 100644 --- a/api/src/prescription/learner-management/application/jobs/compute-certificability-job-controller.js +++ b/api/src/prescription/learner-management/application/jobs/compute-certificability-job-controller.js @@ -1,4 +1,4 @@ -import { usecases } from '../../../../../lib/domain/usecases/index.js'; +import { usecases } from '../../../../../src/prescription/learner-management/domain/usecases/index.js'; import { JobController } from '../../../../shared/application/jobs/job-controller.js'; import { ComputeCertificabilityJob } from '../../domain/models/ComputeCertificabilityJob.js'; diff --git a/api/lib/domain/usecases/compute-organization-learner-certificability.js b/api/src/prescription/learner-management/domain/usecases/compute-organization-learner-certificability.js similarity index 93% rename from api/lib/domain/usecases/compute-organization-learner-certificability.js rename to api/src/prescription/learner-management/domain/usecases/compute-organization-learner-certificability.js index 798e14c42c7..1bb335310d1 100644 --- a/api/lib/domain/usecases/compute-organization-learner-certificability.js +++ b/api/src/prescription/learner-management/domain/usecases/compute-organization-learner-certificability.js @@ -3,7 +3,7 @@ const computeOrganizationLearnerCertificability = async function ({ organizationLearnerRepository, placementProfileService, }) { - const organizationLearner = await organizationLearnerRepository.get(organizationLearnerId); + const organizationLearner = await organizationLearnerRepository.getLearnerInfo(organizationLearnerId); const placementProfile = await placementProfileService.getPlacementProfile({ userId: organizationLearner.userId, diff --git a/api/src/prescription/learner-management/domain/usecases/index.js b/api/src/prescription/learner-management/domain/usecases/index.js index 3e54cfdf757..98c1e457b32 100644 --- a/api/src/prescription/learner-management/domain/usecases/index.js +++ b/api/src/prescription/learner-management/domain/usecases/index.js @@ -7,6 +7,7 @@ import * as campaignRepository from '../../../../../lib/infrastructure/repositor import * as libOrganizationLearnerRepository from '../../../../../lib/infrastructure/repositories/organization-learner-repository.js'; import * as userRepository from '../../../../identity-access-management/infrastructure/repositories/user.repository.js'; import * as organizationFeatureApi from '../../../../organizational-entities/application/api/organization-features-api.js'; +import * as placementProfileService from '../../../../shared/domain/services/placement-profile-service.js'; import { logErrorWithCorrelationIds } from '../../../../shared/infrastructure/monitoring-tools.js'; import * as organizationRepository from '../../../../shared/infrastructure/repositories/organization-repository.js'; import { injectDependencies } from '../../../../shared/infrastructure/utils/dependency-injection.js'; @@ -46,6 +47,7 @@ import { importStorage } from '../../infrastructure/storage/import-storage.js'; * @typedef {import ('../../infrastructure/repositories/organization-learner-import-format-repository.js')} OrganizationLearnerImportFormatRepository * @typedef {import ('../../infrastructure/repositories/organization-learner-repository.js')} OrganizationLearnerRepository * @typedef {import ('../../../../shared/infrastructure/repositories/organization-repository.js')} OrganizationRepository + * @typedef {import ('../../../../shared/domain/services/placement-profile-service.js')} placementProfileService * @typedef {import('../../../organization-learner/infrastructure/repositories/registration-organization-learner-repository.js')} registrationOrganizationLearnerRepository * @typedef {import ('../../infrastructure/repositories/student-repository.js')} studentRepository * @typedef {import ('../../infrastructure/repositories/sup-organization-learner-repository.js')} SupOrganizationLearnerRepository @@ -72,6 +74,7 @@ const dependencies = { organizationLearnerImportFormatRepository, organizationLearnerRepository, organizationRepository, + placementProfileService, registrationOrganizationLearnerRepository, studentRepository, supOrganizationLearnerRepository, @@ -96,6 +99,7 @@ const usecasesWithoutInjectedDependencies = { /** * @typedef PrescriptionLearnerManagementUsecases + * @property {computeOrganizationLearnerCertificability} computeOrganizationLearnerCertificability * @property {saveOrganizationLearnersFile} saveOrganizationLearnersFile * @property {sendOrganizationLearnersFile} sendOrganizationLearnersFile * @property {validateOrganizationLearnersFile} validateOrganizationLearnersFile diff --git a/api/tests/prescription/learner-management/unit/application/jobs/compute-certificability-job-controller_test.js b/api/tests/prescription/learner-management/unit/application/jobs/compute-certificability-job-controller_test.js index eeeb64d64cc..b5b1cb27f09 100644 --- a/api/tests/prescription/learner-management/unit/application/jobs/compute-certificability-job-controller_test.js +++ b/api/tests/prescription/learner-management/unit/application/jobs/compute-certificability-job-controller_test.js @@ -1,5 +1,5 @@ -import { usecases } from '../../../../../../lib/domain/usecases/index.js'; import { ComputeCertificabilityJobController } from '../../../../../../src/prescription/learner-management/application/jobs/compute-certificability-job-controller.js'; +import { usecases } from '../../../../../../src/prescription/learner-management/domain/usecases/index.js'; import { expect, sinon } from '../../../../../test-helper.js'; describe('Unit | Prescription | Application | Jobs | computeCertificabilityJobController', function () { diff --git a/api/tests/unit/domain/usecases/compute-organization-learner-certificability_test.js b/api/tests/prescription/organization-learner/unit/domain/usecases/compute-organization-learner-certificability_test.js similarity index 81% rename from api/tests/unit/domain/usecases/compute-organization-learner-certificability_test.js rename to api/tests/prescription/organization-learner/unit/domain/usecases/compute-organization-learner-certificability_test.js index e4af604a368..006db9f9cfe 100644 --- a/api/tests/unit/domain/usecases/compute-organization-learner-certificability_test.js +++ b/api/tests/prescription/organization-learner/unit/domain/usecases/compute-organization-learner-certificability_test.js @@ -1,5 +1,5 @@ -import { usecases } from '../../../../lib/domain/usecases/index.js'; -import { domainBuilder, expect, sinon } from '../../../test-helper.js'; +import { usecases } from '../../../../../../src/prescription/learner-management/domain/usecases/index.js'; +import { domainBuilder, expect, sinon } from '../../../../../test-helper.js'; describe('Unit | UseCase | compute-organization-learner-certificabilty', function () { let clock; @@ -18,13 +18,13 @@ describe('Unit | UseCase | compute-organization-learner-certificabilty', functio it('should update certificability for an organization learner', async function () { // given const organizationLearnerRepository = { - get: sinon.stub(), + getLearnerInfo: sinon.stub(), updateCertificability: sinon.stub(), }; const organizationLearnerId = 1; const organizationLearner = domainBuilder.buildOrganizationLearner({ id: organizationLearnerId }); sinon.stub(organizationLearner, 'updateCertificability'); - organizationLearnerRepository.get.withArgs(organizationLearner.id).returns(organizationLearner); + organizationLearnerRepository.getLearnerInfo.withArgs(organizationLearner.id).returns(organizationLearner); const placementProfileService = { getPlacementProfile: sinon.stub(), };