fix(api): cleaning code and fixing tests for deleting organization le…

…arners feature
1024pix · Nov 14, 2024 · 19c6768 · 19c6768
1 parent 186048b
commit 19c6768
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/api/scripts/prod/delete-organization-learners-from-organization.js b/api/scripts/prod/delete-organization-learners-from-organization.js
@@ -29,6 +29,7 @@ async function deleteOrganizationLearnersFromOrganization(organizationId, date)
     await usecases.deleteOrganizationLearners({
       organizationLearnerIds: organizationLearnerToDeleteIds,
       userId: engineeringUserId,
+      organizationId,
     });
 
     await _anonymizeOrganizationLearners({ organizationId });

diff --git a/api/src/prescription/learner-management/application/organization-learners-controller.js b/api/src/prescription/learner-management/application/organization-learners-controller.js
@@ -6,11 +6,13 @@ import { usecases } from '../domain/usecases/index.js';
 const deleteOrganizationLearners = async function (request, h) {
   const authenticatedUserId = request.auth.credentials.userId;
   const listLearners = request.payload.listLearners;
+  const organizationId = request.params.id;
 
   await DomainTransaction.execute(async () => {
     await usecases.deleteOrganizationLearners({
       organizationLearnerIds: listLearners,
       userId: authenticatedUserId,
+      organizationId,
     });
   });
   return h.response().code(200);

diff --git a/api/src/prescription/learner-management/domain/usecases/delete-organization-learners.js b/api/src/prescription/learner-management/domain/usecases/delete-organization-learners.js
@@ -11,7 +11,10 @@ const deleteOrganizationLearners = async function ({
     organizationId,
   });
 
-  const organizationLearnerList = new OrganizationLearnerList(organizationId, learnersBelogingToOrganization);
+  const organizationLearnerList = new OrganizationLearnerList({
+    organizationId,
+    organizationLearnerIds: learnersBelogingToOrganization,
+  });
 
   organizationLearnerList.canDeleteOrganizationLearners(organizationLearnerIds);
   await campaignParticipationRepository.removeByOrganizationLearnerIds({

diff --git a/...ption/learner-management/infrastructure/repositories/campaign-participation-repository.js b/...ption/learner-management/infrastructure/repositories/campaign-participation-repository.js
@@ -2,10 +2,7 @@ import { DomainTransaction } from '../../../../shared/domain/DomainTransaction.j
 
 const learnersBelongingToOrganization = function ({ organizationId }) {
   const knexConnection = DomainTransaction.getConnection();
-  return knexConnection('view-active-organization-learners')
-    .where('organizationId', organizationId)
-    .select('id')
-    .pluck('id');
+  return knexConnection('view-active-organization-learners').where({ organizationId }).select('id').pluck('id');
 };
 const removeByOrganizationLearnerIds = function ({ organizationLearnerIds, userId }) {
   const knexConnection = DomainTransaction.getConnection();