fix(specification): add ids of underlying entities so that save reuse…

api/apps/api/src/modules/specification/adapters/specification-feature-config.api.entity.ts

@@ -17,6 +17,7 @@ export class SpecificationFeatureConfigApiEntity {
 
   @ManyToOne(() => SpecificationApiEntity, {
     onDelete: 'CASCADE',
+    orphanedRowAction: 'delete',
   })
   @JoinColumn({
     name: 'specification_id',

api/apps/api/src/modules/specification/adapters/specification-feature.api.entity.ts

@@ -14,6 +14,7 @@ export class SpecificationFeatureApiEntity {
 
   @ManyToOne(() => SpecificationFeatureConfigApiEntity, {
     onDelete: 'CASCADE',
+    orphanedRowAction: 'delete',
   })
   @JoinColumn({
     name: 'specification_feature_config_id',

api/apps/api/src/modules/specification/adapters/specification.repository.ts

@@ -119,15 +119,17 @@ export class DbSpecificationRepository implements SpecificationRepository {
         scenarioId: snapshot.scenarioId,
         specificationFeaturesConfiguration: this.specificationFeatureConfigRepo.create(
           snapshot.config.map((configuration) => ({
+            id: configuration.id,
             againstFeatureId: configuration.againstFeatureId,
             baseFeatureId: configuration.baseFeatureId,
             operation: configuration.operation,
             splitByProperty: configuration.splitByProperty,
             selectSubSets: configuration.selectSubSets,
             features: configuration.resultFeatures.map((feature) =>
               this.specificationFeatureRepo.create({
+                id: feature.id,
                 calculated: feature.calculated,
-                featureId: feature.id,
+                featureId: feature.featureId,
               }),
             ),
             featuresDetermined: configuration.featuresDetermined,
@@ -164,6 +166,7 @@ export class DbSpecificationRepository implements SpecificationRepository {
       config:
         specification.specificationFeaturesConfiguration?.map(
           (specificationFeature) => ({
+            id: specificationFeature.id,
             againstFeatureId:
               specificationFeature.againstFeatureId ?? undefined,
             baseFeatureId: specificationFeature.baseFeatureId,
@@ -173,7 +176,8 @@ export class DbSpecificationRepository implements SpecificationRepository {
             selectSubSets: specificationFeature.selectSubSets ?? undefined,
             resultFeatures:
               specificationFeature.features?.map((feature) => ({
-                id: feature.featureId,
+                id: feature.id,
+                featureId: feature.featureId,
                 calculated: feature.calculated,
               })) ?? [],
           }),

api/apps/api/src/modules/specification/application/__tests__/calculate-features.handler.fixtures.ts

@@ -38,7 +38,7 @@ export const getFixtures = async () => {
     featuresDetermined: true,
     resultFeatures: [
       {
-        id: calculatedFeatureId,
+        featureId: calculatedFeatureId,
         calculated: true,
       },
     ],
@@ -48,11 +48,11 @@ export const getFixtures = async () => {
     featuresDetermined: true,
     resultFeatures: [
       {
-        id: calculatedFeatureId,
+        featureId: calculatedFeatureId,
         calculated: true,
       },
       {
-        id: nonCalculatedFeatureId,
+        featureId: nonCalculatedFeatureId,
         calculated: false,
       },
     ],

api/apps/api/src/modules/specification/application/__tests__/determine-features.handler.fixtures.ts

@@ -103,11 +103,11 @@ export const getFixtures = async () => {
         new DetermineFeatures({
           features: [
             {
-              id: calculatedFeatureId,
+              featureId: calculatedFeatureId,
               calculated: true,
             },
             {
-              id: nonCalculatedFeatureId,
+              featureId: nonCalculatedFeatureId,
               calculated: false,
             },
           ],

api/apps/api/src/modules/specification/application/__tests__/in-memory-specification.repo.ts

@@ -49,7 +49,7 @@ export class InMemorySpecificationRepo implements SpecificationRepository {
       .flatMap((spec) =>
         spec.toSnapshot().config.flatMap((config) => ({
           specId: spec.id,
-          features: config.resultFeatures.map((feature) => feature.id),
+          features: config.resultFeatures.map((feature) => feature.featureId),
         })),
       )
       .filter(

api/apps/api/src/modules/specification/domain/__tests__/determine-features/fixtures.ts

@@ -28,33 +28,33 @@ export const getFixtures = () => {
 
   const featuresFromSplit = [
     {
-      id: v4(),
+      featureId: v4(),
       calculated: true,
     },
     {
-      id: v4(),
+      featureId: v4(),
       calculated: true,
     },
   ];
 
   const featuresFromStratificationSomeCalculated = [
     {
-      id: v4(),
+      featureId: v4(),
       calculated: true,
     },
     {
-      id: nonCalculatedFeature,
+      featureId: nonCalculatedFeature,
       calculated: false,
     },
   ];
 
   const featuresFromStratificationAllCalculated = [
     {
-      id: v4(),
+      featureId: v4(),
       calculated: true,
     },
     {
-      id: v4(),
+      featureId: v4(),
       calculated: true,
     },
   ];

api/apps/api/src/modules/specification/domain/__tests__/mark-as-calculated/fixtures.ts

@@ -58,7 +58,7 @@ export const getFixtures = () => {
             featuresDetermined: true,
             resultFeatures: [
               {
-                id: v4(),
+                featureId: v4(),
                 calculated: true,
               },
             ],
@@ -68,11 +68,11 @@ export const getFixtures = () => {
             featuresDetermined: true,
             resultFeatures: [
               {
-                id: nonCalculatedFeatureOne,
+                featureId: nonCalculatedFeatureOne,
                 calculated: false,
               },
               {
-                id: nonCalculatedFeatureTwo,
+                featureId: nonCalculatedFeatureTwo,
                 calculated: false,
               },
             ],

api/apps/api/src/modules/specification/domain/feature-config.ts

@@ -5,7 +5,8 @@ export enum SpecificationOperation {
 }
 
 export interface FeatureState {
-  id: string;
+  id?: string;
+  featureId: string;
   calculated: boolean;
 }
 
@@ -17,6 +18,7 @@ export interface FeatureSubSet {
 }
 
 interface FeatureConfigBase {
+  id?: string;
   operation: SpecificationOperation;
   baseFeatureId: string;
   splitByProperty?: string;

api/apps/api/src/modules/specification/domain/specification.ts

@@ -106,7 +106,7 @@ export class Specification extends AggregateRoot {
   markAsCalculated(featureIds: string[]): void {
     this.configuration.forEach((featureConfig) =>
       featureConfig.resultFeatures.forEach((feature) => {
-        if (featureIds.includes(feature.id)) {
+        if (featureIds.includes(feature.featureId)) {
           feature.calculated = true;
         }
       }),
@@ -137,7 +137,7 @@ export class Specification extends AggregateRoot {
     return this.configuration.flatMap((featureConfig) =>
       featureConfig.resultFeatures
         .filter((feature) => !feature.calculated)
-        .map((feature) => feature.id),
+        .map((feature) => feature.featureId),
     );
   }
 }

api/apps/api/test/integration/fixtures.ts

@@ -50,32 +50,38 @@ export const getFixtures = async () => {
         },
         config: [
           {
+            id: v4(),
             operation: SpecificationOperation.Split,
             featuresDetermined: true,
             baseFeatureId: splitBaseFeatureId,
             resultFeatures: [
               {
-                id: calculatedFeatureId,
+                id: v4(),
+                featureId: calculatedFeatureId,
                 calculated: true,
               },
               {
-                id: calculatedForBothFeatureId,
+                id: v4(),
+                featureId: calculatedForBothFeatureId,
                 calculated: true,
               },
             ],
           },
           {
+            id: v4(),
             operation: SpecificationOperation.Stratification,
             featuresDetermined: true,
             againstFeatureId: stratificationAgainstFeatureId,
             baseFeatureId: stratificationBaseFeatureId,
             resultFeatures: [
               {
-                id: nonCalculatedFeatureId,
+                id: v4(),
+                featureId: nonCalculatedFeatureId,
                 calculated: false,
               },
               {
-                id: calculatedForBothFeatureId,
+                id: v4(),
+                featureId: calculatedForBothFeatureId,
                 calculated: true,
               },
             ],