[TECH] Pix 17139/refactor application transaction

 #11776

Author: pix-service-auto-merge

api/src/prescription/campaign-participation/application/learner-participation-controller.js

@@ -1,7 +1,6 @@
 import { DomainTransaction } from '../../../shared/domain/DomainTransaction.js';
 import { monitoringTools } from '../../../shared/infrastructure/monitoring-tools.js';
 import * as requestResponseUtils from '../../../shared/infrastructure/utils/request-response-utils.js';
-import { ApplicationTransaction } from '../../shared/infrastructure/ApplicationTransaction.js';
 import { usecases } from '../domain/usecases/index.js';
 import * as campaignParticipationSerializer from '../infrastructure/serializers/jsonapi/campaign-participation-serializer.js';
 import * as sharedProfileForCampaignSerializer from '../infrastructure/serializers/jsonapi/shared-profile-for-campaign-serializer.js';
@@ -21,14 +20,13 @@ const shareCampaignResult = async function (request, _) {
   const userId = request.auth.credentials.userId;
   const campaignParticipationId = request.params.campaignParticipationId;
 
-  await ApplicationTransaction.execute(async () => {
+  return DomainTransaction.execute(async () => {
     await usecases.shareCampaignResult({
       userId,
       campaignParticipationId,
     });
+    return null;
   });
-
-  return null;
 };
 
 const beginImprovement = async function (request) {

api/src/prescription/campaign/application/campaign-adminstration-controller.js

@@ -2,6 +2,7 @@ import _ from 'lodash';
 
 import { usecases } from '../../../../src/prescription/campaign/domain/usecases/index.js';
 import * as checkAdminMemberHasRoleSuperAdminUseCase from '../../../shared/application/usecases/checkAdminMemberHasRoleSuperAdmin.js';
+import { DomainTransaction } from '../../../shared/domain/DomainTransaction.js';
 import * as csvSerializer from '../../../shared/infrastructure/serializers/csv/csv-serializer.js';
 import * as requestResponseUtils from '../../../shared/infrastructure/utils/request-response-utils.js';
 import { extractUserIdFromRequest } from '../../../shared/infrastructure/utils/request-response-utils.js';
@@ -138,9 +139,9 @@ const deleteCampaigns = async function (request, h) {
   const userId = extractUserIdFromRequest(request);
   const { organizationId } = request.params;
   const campaignIds = request.deserializedPayload.map(({ id }) => id);
-
-  await usecases.deleteCampaigns({ userId, organizationId, campaignIds });
-
+  await DomainTransaction.execute(async () => {
+    await usecases.deleteCampaigns({ userId, organizationId, campaignIds });
+  });
   return h.response(null).code(204);
 };
 

api/src/prescription/campaign/infrastructure/repositories/campaign-administration-repository.js

@@ -2,9 +2,9 @@ import _ from 'lodash';
 
 import { knex } from '../../../../../db/knex-database-connection.js';
 import { CAMPAIGN_FEATURES } from '../../../../shared/domain/constants.js';
+import { DomainTransaction } from '../../../../shared/domain/DomainTransaction.js';
 import { cryptoService } from '../../../../shared/domain/services/crypto-service.js';
 import * as skillRepository from '../../../../shared/infrastructure/repositories/skill-repository.js';
-import { ApplicationTransaction } from '../../../shared/infrastructure/ApplicationTransaction.js';
 import { UnknownCampaignId } from '../../domain/errors.js';
 import { Campaign } from '../../domain/models/Campaign.js';
 
@@ -31,7 +31,7 @@ const CAMPAIGN_ATTRIBUTES = [
 ];
 
 const getByIds = async (ids) => {
-  const knexConn = ApplicationTransaction.getConnection();
+  const knexConn = DomainTransaction.getConnection();
   const campaigns = await knexConn('campaigns').whereIn('id', ids);
 
   if (campaigns.length === 0) return null;
@@ -64,7 +64,7 @@ const get = async function (id) {
 };
 
 const update = async function (campaign) {
-  const knexConn = ApplicationTransaction.getConnection();
+  const knexConn = DomainTransaction.getConnection();
   const [editedCampaign] = await knexConn('campaigns')
     .where({ id: campaign.id })
     .update(_.pick(campaign, CAMPAIGN_ATTRIBUTES))

api/src/prescription/learner-management/infrastructure/repositories/organization-learner-import-format-repository.js

@@ -1,15 +1,13 @@
 import { ORGANIZATION_FEATURE } from '../../../../shared/domain/constants.js';
 import { DomainTransaction } from '../../../../shared/domain/DomainTransaction.js';
-import { ApplicationTransaction } from '../../../shared/infrastructure/ApplicationTransaction.js';
 import { OrganizationLearnerImportFormat } from '../../domain/models/OrganizationLearnerImportFormat.js';
 
 function _toDomain(data) {
   return new OrganizationLearnerImportFormat(data);
 }
 
 const get = async function (organizationId) {
-  const knex = ApplicationTransaction.getConnection();
-
+  const knex = DomainTransaction.getConnection();
   const configResult = await knex('organization-features')
     .select('params')
     .join('features', function () {

api/src/prescription/shared/infrastructure/ApplicationTransaction.js

@@ -1,6 +1,5 @@
 import { learnerParticipationController } from '../../../../../src/prescription/campaign-participation/application/learner-participation-controller.js';
 import { usecases } from '../../../../../src/prescription/campaign-participation/domain/usecases/index.js';
-import { ApplicationTransaction } from '../../../../../src/prescription/shared/infrastructure/ApplicationTransaction.js';
 import { DomainTransaction } from '../../../../../src/shared/domain/DomainTransaction.js';
 import { domainBuilder, expect, hFake, sinon } from '../../../../test-helper.js';
 
@@ -25,10 +24,10 @@ describe('Unit | Application | Controller | Learner-Participation', function ()
         },
       };
       sinon.stub(usecases, 'shareCampaignResult');
-      sinon.stub(ApplicationTransaction, 'execute').callsFake((callback) => {
+      sinon.stub(DomainTransaction, 'execute').callsFake((callback) => {
         return callback();
       });
-      sinon.stub(ApplicationTransaction, 'getTransactionAsDomainTransaction');
+      sinon.stub(DomainTransaction, 'getConnection');
     });
 
     it('should call the usecase to share campaign result', async function () {

api/tests/prescription/campaign-participation/unit/application/learner-participation-controller_test.js

@@ -3,7 +3,6 @@ import fs from 'node:fs/promises';
 import { scoOrganizationManagementController } from '../../../../../src/prescription/learner-management/application/sco-organization-management-controller.js';
 import { usecases } from '../../../../../src/prescription/learner-management/domain/usecases/index.js';
 import { OrganizationLearnerParser } from '../../../../../src/prescription/learner-management/infrastructure/serializers/csv/organization-learner-parser.js';
-import { ApplicationTransaction } from '../../../../../src/prescription/shared/infrastructure/ApplicationTransaction.js';
 import { FileValidationError } from '../../../../../src/shared/domain/errors.js';
 import { catchErr, expect, hFake, sinon } from '../../../../test-helper.js';
 
@@ -14,7 +13,6 @@ describe('Unit | Application | Organizations | organization-controller', functio
     const payload = { path: 'path-to-file' };
     const format = 'xml';
     let dependencies;
-    let domainTransaction;
 
     const request = {
       auth: { credentials: { userId: connectedUserId } },
@@ -27,12 +25,6 @@ describe('Unit | Application | Organizations | organization-controller', functio
       sinon.stub(fs, 'unlink').resolves();
       sinon.stub(usecases, 'uploadSiecleFile');
       sinon.stub(usecases, 'uploadCsvFile');
-      sinon.stub(ApplicationTransaction, 'execute');
-      sinon.stub(ApplicationTransaction, 'getTransactionAsDomainTransaction');
-
-      domainTransaction = Symbol('domainTransaction');
-      ApplicationTransaction.execute.callsFake((callback) => callback());
-      ApplicationTransaction.getTransactionAsDomainTransaction.returns(domainTransaction);
 
       usecases.uploadSiecleFile.resolves();
       dependencies = { logErrorWithCorrelationIds: sinon.stub(), logWarnWithCorrelationIds: sinon.stub() };