[TECH] arrêter d'utiliser les champs userId / snappedAt (Pix-17286)

api/db/database-builder/factory/build-knowledge-element-snapshot.js

@@ -7,24 +7,20 @@ import { buildUser } from './build-user.js';
 
 const buildKnowledgeElementSnapshot = function ({
   id = databaseBuffer.getNextId(),
-  userId,
-  snappedAt = new Date('2020-01-01'),
   snapshot,
   campaignParticipationId,
+  userId,
 } = {}) {
-  const dateMinusOneDay = new Date(snappedAt.getTime() - 1000 * 60 * 60 * 24 * 7);
-  userId = _.isUndefined(userId) ? buildUser().id : userId;
   if (!snapshot) {
     const knowledgeElements = [];
-    knowledgeElements.push(buildKnowledgeElement({ userId, createdAt: dateMinusOneDay }));
-    knowledgeElements.push(buildKnowledgeElement({ userId, createdAt: dateMinusOneDay }));
+    userId = _.isUndefined(userId) ? buildUser().id : userId;
+    knowledgeElements.push(buildKnowledgeElement({ userId, createdAt: new Date('2020-01-01') }));
+    knowledgeElements.push(buildKnowledgeElement({ userId, createdAt: new Date('2020-01-01') }));
     snapshot = new KnowledgeElementCollection(knowledgeElements).toSnapshot();
   }
 
   const values = {
     id,
-    userId,
-    snappedAt,
     snapshot,
     campaignParticipationId,
   };

api/db/database-builder/factory/knowledge-elements-snapshot-factory.js

@@ -1,13 +1,11 @@
 import { databaseBuffer } from '../database-buffer.js';
 import { buildKnowledgeElement } from './build-knowledge-element.js';
 
-function buildSnapshot({ id, userId, snappedAt, knowledgeElementsAttributes, campaignParticipationId }) {
+function buildSnapshot({ id, knowledgeElementsAttributes, campaignParticipationId }) {
   const knowledgeElements = knowledgeElementsAttributes.map((attributes) => buildKnowledgeElement(attributes));
 
   const values = {
     id,
-    userId,
-    snappedAt,
     snapshot: JSON.stringify(knowledgeElements),
     campaignParticipationId,
   };

api/db/seeds/data/common/tooling/campaign-tooling.js

@@ -238,8 +238,6 @@ async function createAssessmentCampaign({
 
       if (isShared) {
         databaseBuilder.factory.buildKnowledgeElementSnapshot({
-          userId,
-          snappedAt: sharedAt,
           snapshot: new KnowledgeElementCollection(keDataForSnapshot).toSnapshot(),
           campaignParticipationId,
         });
@@ -402,8 +400,6 @@ async function createProfilesCollectionCampaign({
         );
       }
       databaseBuilder.factory.buildKnowledgeElementSnapshot({
-        userId,
-        snappedAt: sharedAt,
         snapshot: new KnowledgeElementCollection(keDataForSnapshot).toSnapshot(),
         campaignParticipationId,
       });

api/scripts/prod/generate-knowledge-element-snapshots-for-campaigns.js

@@ -46,21 +46,17 @@ function _validateAndNormalizeArgs({ concurrency, maxSnapshotCount }) {
 
 async function getEligibleCampaignParticipations(maxSnapshotCount) {
   return knex('campaign-participations')
-    .select('campaign-participations.userId', 'campaign-participations.sharedAt', 'campaign-participations.id')
-    .leftJoin('knowledge-element-snapshots', function () {
-      this.on('knowledge-element-snapshots.userId', 'campaign-participations.userId').andOn(
-        'knowledge-element-snapshots.snappedAt',
-        'campaign-participations.sharedAt',
-      );
-    })
+    .select('campaign-participations.id', 'campaign-participations.userId', 'campaign-participations.sharedAt')
+    .leftJoin(
+      'knowledge-element-snapshots',
+      'knowledge-element-snapshots.campaignParticipationId',
+      'campaign-participations.id',
+    )
     .whereNotNull('campaign-participations.sharedAt')
     .where((qb) => {
-      qb.whereNull('knowledge-element-snapshots.snappedAt').orWhereRaw('?? != ??', [
-        'campaign-participations.sharedAt',
-        'knowledge-element-snapshots.snappedAt',
-      ]);
+      qb.whereNull('knowledge-element-snapshots.campaignParticipationId');
     })
-    .orderBy('campaign-participations.userId')
+    .orderBy('campaign-participations.id')
     .limit(maxSnapshotCount);
 }
 
@@ -79,8 +75,6 @@ async function generateKnowledgeElementSnapshots(
       });
       try {
         await dependencies.knowledgeElementSnapshotRepository.save({
-          userId,
-          snappedAt: sharedAt,
           snapshot: new KnowledgeElementCollection(knowledgeElements).toSnapshot(),
           campaignParticipationId: id,
         });

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

@@ -38,8 +38,6 @@ const updateWithSnapshot = async function (campaignParticipation) {
     limitDate: campaignParticipation.sharedAt,
   });
   await knowledgeElementSnapshotRepository.save({
-    userId: campaignParticipation.userId,
-    snappedAt: campaignParticipation.sharedAt,
     snapshot: new KnowledgeElementCollection(knowledgeElements).toSnapshot(),
     campaignParticipationId: campaignParticipation.id,
   });

api/src/prescription/campaign/application/api/knowledge-element-snapshots-api.js

@@ -22,8 +22,6 @@ import { KnowledgeElementSnapshot } from './models/KnowledgeElementSnapshot.js';
  */
 export async function save(knowledgeElementSnapshotPayload) {
   await usecases.saveKnowledgeElementSnapshotForParticipation({
-    userId: knowledgeElementSnapshotPayload.userId,
-    snappedAt: new Date(),
     knowledgeElementCollection: new KnowledgeElementCollection(knowledgeElementSnapshotPayload.knowledgeElements),
     campaignParticipationId: knowledgeElementSnapshotPayload.campaignParticipationId,
   });

api/src/prescription/campaign/domain/usecases/save-knowledge-element-snapshot-for-participation.js

@@ -1,15 +1,11 @@
 import { withTransaction } from '../../../../shared/domain/DomainTransaction.js';
 
 export const saveKnowledgeElementSnapshotForParticipation = withTransaction(async function ({
-  userId,
-  snappedAt,
   knowledgeElementCollection,
   campaignParticipationId,
   knowledgeElementSnapshotRepository,
 }) {
   await knowledgeElementSnapshotRepository.save({
-    userId,
-    snappedAt,
     snapshot: knowledgeElementCollection.toSnapshot(),
     campaignParticipationId,
   });

api/src/prescription/campaign/infrastructure/repositories/knowledge-element-snapshot-repository.js

@@ -2,7 +2,7 @@ import { DomainTransaction } from '../../../../shared/domain/DomainTransaction.j
 import { KnowledgeElement } from '../../../../shared/domain/models/KnowledgeElement.js';
 import { CampaignParticipationKnowledgeElementSnapshots } from '../../../shared/domain/read-models/CampaignParticipationKnowledgeElementSnapshots.js';
 
-export async function save({ userId, snappedAt, snapshot, campaignParticipationId }) {
+export async function save({ snapshot, campaignParticipationId }) {
   const knexConn = DomainTransaction.getConnection();
   const existingSnapshot = await knexConn
     .select('id')
@@ -12,15 +12,11 @@ export async function save({ userId, snappedAt, snapshot, campaignParticipationI
   if (existingSnapshot) {
     return await knexConn('knowledge-element-snapshots')
       .update({
-        userId,
-        snappedAt,
         snapshot,
       })
       .where('campaignParticipationId', campaignParticipationId);
   } else {
     return await knexConn('knowledge-element-snapshots').insert({
-      userId,
-      snappedAt,
       snapshot,
       campaignParticipationId,
     });

api/src/prescription/scripts/add-missing-knowledge-element-snapshots.js

@@ -69,8 +69,6 @@ class AddMissingKnowledgeElementSnapshots extends Script {
         limitDate: participation.sharedAt,
       });
       await knowledgeElementSnapshotRepository.save({
-        userId: participation.userId,
-        snappedAt: participation.sharedAt,
         snapshot: new KnowledgeElementCollection(knowledgeElements).toSnapshot(),
         campaignParticipationId,
       });

api/tests/evaluation/integration/domain/usecases/get-next-challenge-for-campaign-assessment_test.js

@@ -133,8 +133,6 @@ describe('Evaluation | Integration | Domain | Use Cases | get-next-challenge-for
       });
       const knowledgeElementsBefore = new KnowledgeElementCollection([knowledgeElement]);
       databaseBuilder.factory.buildKnowledgeElementSnapshot({
-        userId,
-        snappedAt: new Date('2019-01-01'),
         campaignParticipationId,
         snapshot: knowledgeElementsBefore.toSnapshot(),
       });

api/tests/evaluation/integration/domain/usecases/handle-badge-acquisition_test.js

@@ -168,8 +168,6 @@ describe('Integration | Usecase | Handle Badge Acquisition', function () {
       });
       const knowledgeElementsBefore = new KnowledgeElementCollection([ke1, ke2]);
       databaseBuilder.factory.buildKnowledgeElementSnapshot({
-        userId,
-        snappedAt: new Date(),
         campaignParticipationId,
         snapshot: knowledgeElementsBefore.toSnapshot(),
       });

api/tests/evaluation/integration/domain/usecases/handle-stage-acquisition_test.js

@@ -305,8 +305,6 @@ describe('Evaluation | Integration | Usecase | Handle Stage Acquisition', functi
             domainBuilder.buildKnowledgeElement({ userId, skillId: 'web4', status: 'invalidated' }),
           ];
           databaseBuilder.factory.buildKnowledgeElementSnapshot({
-            userId,
-            snappedAt: new Date(),
             snapshot: new KnowledgeElementCollection(knowledgeElements).toSnapshot(),
             campaignParticipationId,
           });
@@ -449,8 +447,6 @@ describe('Evaluation | Integration | Usecase | Handle Stage Acquisition', functi
             domainBuilder.buildKnowledgeElement({ userId, skillId: 'web4', status: 'invalidated' }),
           ];
           databaseBuilder.factory.buildKnowledgeElementSnapshot({
-            userId,
-            snappedAt: new Date(),
             snapshot: new KnowledgeElementCollection(knowledgeElements).toSnapshot(),
             campaignParticipationId,
           });

api/tests/evaluation/integration/domain/usecases/save-and-correct-answer-for-campaign_test.js

@@ -207,8 +207,6 @@ describe('Evaluation | Integration | Usecase | Save and correct answer for campa
       });
       const knowledgeElementsBefore = new KnowledgeElementCollection([knowledgeElement]);
       databaseBuilder.factory.buildKnowledgeElementSnapshot({
-        userId,
-        snappedAt: new Date('2019-01-01'),
         campaignParticipationId,
         snapshot: knowledgeElementsBefore.toSnapshot(),
       });