DROP ME ? feat: sort tubes according to index

sub 30

Co-authored-by: Fael Bassetti <fael.bassetti@pix.fr>

api/lib/domain/models/Tube.js

@@ -6,12 +6,14 @@ export class Tube {
     practicalTitle_i18n,
     practicalDescription_i18n,
     competenceId,
+    index,
   }) {
     this.id = id;
     this.airtableId = airtableId;
     this.name = name;
     this.practicalTitle_i18n = practicalTitle_i18n;
     this.practicalDescription_i18n = practicalDescription_i18n;
     this.competenceId = competenceId;
+    this.index = index;
   }
 }

api/lib/domain/readmodels/CompetenceOverview.js

@@ -28,6 +28,7 @@ export class CompetenceOverview {
           id: tube.id,
           airtableId: tube.airtableId,
           name: tube.name,
+          index: tube.index,
           enConstructionSkillViews: CompetenceOverview.#buildEnConstructionSkillViews({ locale, skills: skillsForTube, tutorials: tutorialsForCompetence }),
           enProductionSkillViews: CompetenceOverview.#buildEnProductionSkillViews2({ locale, skills: skillsForTube, challenges: challengesForCompetence, tutorials: tutorialsForCompetence }),
           atelierSkillViews: CompetenceOverview.#buildAtelierSkillViews({ locale, skills: skillsForTube, challenges: challengesForCompetence }),
@@ -38,6 +39,7 @@ export class CompetenceOverview {
         airtableId: thematic.airtableId,
         name: thematic.name_i18n['fr'],
         tubeOverviews,
+        index: thematic.index,
       }));
     }
     return new CompetenceOverview({
@@ -159,11 +161,13 @@ export class ThematicOverview {
     airtableId,
     name,
     tubeOverviews,
+    index,
   }) {
     this.id = id;
     this.airtableId = airtableId;
     this.name = name;
     this.tubeOverviews = tubeOverviews;
+    this.index = index;
   }
 }
 
@@ -175,13 +179,15 @@ export class TubeOverview {
     enConstructionSkillViews,
     atelierSkillViews,
     enProductionSkillViews,
+    index,
   }) {
     this.id = id;
     this.airtableId = airtableId;
     this.name = name;
     this.enConstructionSkillViews = enConstructionSkillViews;
     this.atelierSkillViews = atelierSkillViews;
     this.enProductionSkillViews = enProductionSkillViews;
+    this.index = index;
   }
 }
 

api/lib/infrastructure/datasources/airtable/tube-datasource.js

@@ -14,6 +14,7 @@ export const tubeDatasource = datasource.extend({
     'id persistant',
     'Nom',
     'Competences (id persistant)',
+    'Index',
   ],
 
   fromAirTableObject(airtableRecord) {
@@ -23,6 +24,7 @@ export const tubeDatasource = datasource.extend({
       name: airtableRecord.get('Nom'),
       // FIXME remplacer par Competence (via Thematique) (id persistant) ?
       competenceId: _.head(airtableRecord.get('Competences (id persistant)')),
+      index: airtableRecord.get('Index'),
     };
   },
 

api/lib/infrastructure/serializers/jsonapi/competence-overview-serializer.js

@@ -27,6 +27,7 @@ export function serialize(competenceOverview) {
         'airtableId',
         'name',
         'tubeOverviews',
+        'index',
       ],
       tubeOverviews: {
         include: true,
@@ -37,6 +38,7 @@ export function serialize(competenceOverview) {
           'enConstructionSkillViews',
           'enProductionSkillViews',
           'atelierSkillViews',
+          'index',
         ],
         enConstructionSkillViews: {
           include: true,

api/tests/acceptance/application/databases/replication-data-controller_test.js

@@ -95,6 +95,7 @@ async function mockCurrentContent() {
 
   const expectedTube = domainBuilder.buildTube();
   delete expectedTube.airtableId;
+  delete expectedTube.index;
 
   const expectedCurrentContent = {
     attachments: [

api/tests/integration/infrastructure/repositories/tube-repository_test.js

@@ -21,7 +21,8 @@ describe('Integration | Repository | tube-repository', () => {
             fr: 'practicalDescriptionFrFr tube1',
             en: 'practicalDescriptionEnUs tube1',
           },
-          competenceId: 'competenceId'
+          competenceId: 'competenceId',
+          index: 1,
         }),
         airtableBuilder.factory.buildTube({
           id: 'tubeId2',
@@ -34,7 +35,8 @@ describe('Integration | Repository | tube-repository', () => {
             fr: 'practicalDescriptionFrFr tube2',
             en: 'practicalDescriptionEnUs tube2',
           },
-          competenceId: 'competenceId'
+          competenceId: 'competenceId',
+          index: 2,
         }),
       ]).activate().nockScope;
       const tube1DescriptionEn = databaseBuilder.factory.buildTranslation({
@@ -98,6 +100,7 @@ describe('Integration | Repository | tube-repository', () => {
             en: tube1DescriptionEn.value,
           },
           competenceId: 'competenceId',
+          index: 1,
         }),
         domainBuilder.buildTube({
           id: 'tubeId2',
@@ -112,6 +115,7 @@ describe('Integration | Repository | tube-repository', () => {
             en: tube2DescriptionEn.value,
           },
           competenceId: 'competenceId',
+          index: 2,
         }),
       ]);
 
@@ -135,6 +139,7 @@ describe('Integration | Repository | tube-repository', () => {
           en: 'practicalDescriptionEnUs tube1',
         },
         competenceId: 'competenceId1',
+        index: 0,
       };
       const tube1DescriptionEn = databaseBuilder.factory.buildTranslation({
         key: 'tube.tubeId1.practicalDescription',
@@ -166,6 +171,7 @@ describe('Integration | Repository | tube-repository', () => {
             'id persistant': tube1.id,
             'Nom': tube1.name,
             'Competences (id persistant)': [tube1.competenceId],
+            'Index': tube1.index,
           },
           get: function(field) { return this.fields[field]; },
         }];
@@ -189,6 +195,7 @@ describe('Integration | Repository | tube-repository', () => {
             en: tube1DescriptionEn.value,
           },
           competenceId: 'competenceId1',
+          index: 0,
         })
       ]);
     });

api/tests/tooling/airtable-builder/factory/build-tube.js

@@ -2,6 +2,7 @@ export function buildTube({
   id,
   name,
   competenceId,
+  index,
 } = {}) {
 
   return {
@@ -10,6 +11,7 @@ export function buildTube({
       'id persistant': id,
       'Nom': name,
       'Competences (id persistant)': [competenceId],
+      'Index': index,
     },
   };
 }

api/tests/tooling/domain-builder/factory/build-tube.js

@@ -12,7 +12,8 @@ export function buildTube({
     fr: 'Identifier un navigateur web et un moteur de recherche, connaître le fonctionnement du moteur de recherche',
     en: 'Identify a web browser and a search engine, know how the search engine works',
   },
-  competenceId = 'recsvLz0W2ShyfD63'
+  competenceId = 'recsvLz0W2ShyfD63',
+  index = 0,
 } = {}) {
   return new Tube({
     id,
@@ -21,5 +22,6 @@ export function buildTube({
     practicalTitle_i18n,
     practicalDescription_i18n,
     competenceId,
+    index,
   });
 }

api/tests/tooling/domain-builder/factory/datasource-objects/build-tube-datasource-object.js

@@ -4,11 +4,13 @@ export function buildTubeDatasourceObject(
     airtableId,
     name = '@Moteur',
     competenceId = 'recsvLz0W2ShyfD63',
+    index = 0,
   } = {}) {
   return {
     id,
     airtableId: airtableId ?? id,
     name,
     competenceId,
+    index,
   };
 }

api/tests/tooling/input-output-data-builder/factory/build-tube.js

@@ -10,6 +10,7 @@ export function buildTube({
     en: practicalDescriptionEnUs,
   } = {},
   competenceId,
+  index,
 } = {}) {
   return {
     id,
@@ -21,6 +22,7 @@ export function buildTube({
       'Description pratique fr-fr': practicalDescriptionFrFr,
       'Description pratique en-us': practicalDescriptionEnUs,
       'Competences (id persistant)': [competenceId],
+      'Index': index,
     },
   };
 }