feat(programmation): lors de la cloture, supprime les brouillons restants

Author: vmaubert

server/controllers/programmingPlanController.ts

@@ -28,6 +28,7 @@ import localPrescriptionRepository from '../repositories/localPrescriptionReposi
 import prescriptionRepository from '../repositories/prescriptionRepository';
 import prescriptionSubstanceRepository from '../repositories/prescriptionSubstanceRepository';
 import programmingPlanRepository from '../repositories/programmingPlanRepository';
+import { sampleRepository } from '../repositories/sampleRepository';
 import { userRepository } from '../repositories/userRepository';
 import { ProtectedSubRouter } from '../routers/routes.type';
 import { notificationService } from '../services/notificationService';
@@ -155,6 +156,8 @@ export const programmingPlanRouter = {
         closedBy: user.id
       });
 
+      await sampleRepository.deleteDraftOnProgrammingPlan(programmingPlan.id);
+
       const updatedProgrammingPlan = await programmingPlanRepository.findUnique(
         programmingPlan.id
       );

server/database/migrations/080-analysis-sample-items-cascade.ts

@@ -0,0 +1,28 @@
+import { Knex } from 'knex';
+
+export const up = async (knex: Knex) => {
+  await knex.schema.alterTable('analysis', (table) => {
+    table.dropForeign(['sample_id', 'item_number', 'copy_number']);
+  });
+
+  await knex.schema.alterTable('analysis', (table) => {
+    table
+      .foreign(['sample_id', 'item_number', 'copy_number'])
+      .references(['sample_id', 'item_number', 'copy_number'])
+      .inTable('sample_items')
+      .onDelete('CASCADE');
+  });
+};
+
+export const down = async (knex: Knex) => {
+  await knex.schema.alterTable('analysis', (table) => {
+    table.dropForeign(['sample_id', 'item_number', 'copy_number']);
+  });
+
+  await knex.schema.alterTable('analysis', (table) => {
+    table
+      .foreign(['sample_id', 'item_number', 'copy_number'])
+      .references(['sample_id', 'item_number', 'copy_number'])
+      .inTable('sample_items');
+  });
+};

server/repositories/sampleRepository.test.ts

@@ -5,6 +5,7 @@ import { genPartialAnalysis } from 'maestro-shared/test/analysisFixtures';
 import { genDocument } from 'maestro-shared/test/documentFixtures';
 import {
   Sample11Fixture,
+  Sample13Fixture,
   Sample2Fixture
 } from 'maestro-shared/test/sampleFixtures';
 import { Sampler1Fixture } from 'maestro-shared/test/userFixtures';
@@ -195,3 +196,31 @@ describe('findMany samples', async () => {
     expect(samples[0].id).toBe(analysisWithResidues.sampleId);
   });
 });
+
+describe('deleteDraftOnProgrammingPlan', async () => {
+  test('deletes only draft samples for the given programmingPlanId', async () => {
+    const before = await sampleRepository.findMany({
+      programmingPlanIds: toArray(Sample11Fixture.programmingPlanId)
+    });
+    expect(before).toHaveLength(4);
+
+    await sampleRepository.deleteDraftOnProgrammingPlan(
+      '00000000-0000-0000-0000-000000000000'
+    );
+
+    let after = await sampleRepository.findMany({
+      programmingPlanIds: toArray(Sample2Fixture.programmingPlanId)
+    });
+    expect(after).toHaveLength(4);
+
+    await sampleRepository.deleteDraftOnProgrammingPlan(
+      Sample11Fixture.programmingPlanId
+    );
+
+    after = await sampleRepository.findMany({
+      programmingPlanIds: toArray(Sample11Fixture.programmingPlanId)
+    });
+    expect(after).toHaveLength(1);
+    expect(after[0].id).toBe(Sample13Fixture.id);
+  });
+});

server/repositories/sampleRepository.ts

@@ -6,7 +6,10 @@ import {
   PartialSample,
   SampleChecked
 } from 'maestro-shared/schema/Sample/Sample';
-import { SampleStatus } from 'maestro-shared/schema/Sample/SampleStatus';
+import {
+  DraftStatusList,
+  SampleStatus
+} from 'maestro-shared/schema/Sample/SampleStatus';
 import z from 'zod';
 import { analysisResiduesTable, analysisTable } from './analysisRepository';
 import { companiesTable } from './companyRepository';
@@ -343,6 +346,17 @@ const deleteOne = async (id: string): Promise<void> => {
   await Samples().where({ id }).delete();
 };
 
+const deleteDraftOnProgrammingPlan = async (
+  programmingPlanId: string
+): Promise<void> => {
+  console.info('Delete draft samples on programmingPlan', programmingPlanId);
+  await kysely
+    .deleteFrom('samples')
+    .where('programmingPlanId', '=', programmingPlanId)
+    .where('status', 'in', DraftStatusList)
+    .execute();
+};
+
 export const formatPartialSample = (
   partialSample: PartialSample | SampleChecked
 ): PartialSampleDbo => ({
@@ -408,5 +422,6 @@ export const sampleRepository = {
   findMany,
   count,
   getNextSequence,
-  deleteOne
+  deleteOne,
+  deleteDraftOnProgrammingPlan
 };