Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs =================================================================== diff -u -r508d720230c5f63bce7f95bddc3b7a04808d267d -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs (.../PersistenceRegistry.cs) (revision 508d720230c5f63bce7f95bddc3b7a04808d267d) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs (.../PersistenceRegistry.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -996,7 +996,7 @@ foreach (var entity in grassCoverErosionInwardsOutputs.Keys) { - grassCoverErosionInwardsOutputs[entity].StorageId = entity.GrassCoverErosionInwardsOutputId; + grassCoverErosionInwardsOutputs[entity].StorageId = entity.GrassCoverErosionInwardsOutputEntityId; } foreach (var entity in grassCoverErosionInwardsFailureMechanismSectionResults.Keys) @@ -1163,7 +1163,10 @@ orphanedProjectEntities.Add(projectEntity); } } - dbContext.ProjectEntities.RemoveRange(orphanedProjectEntities); + if (orphanedProjectEntities.Any()) + { + dbContext.ProjectEntities.RemoveRange(orphanedProjectEntities); + } var orphanedAssessmentSectionEntities = new List(); foreach (AssessmentSectionEntity assessmentSectionEntity in dbContext.AssessmentSectionEntities @@ -1174,7 +1177,10 @@ orphanedAssessmentSectionEntities.Add(assessmentSectionEntity); } } - dbContext.AssessmentSectionEntities.RemoveRange(orphanedAssessmentSectionEntities); + if (orphanedAssessmentSectionEntities.Any()) + { + dbContext.AssessmentSectionEntities.RemoveRange(orphanedAssessmentSectionEntities); + } var orphanedFailureMechanismEntities = new List(); foreach (FailureMechanismEntity failureMechanismEntity in dbContext.FailureMechanismEntities @@ -1185,7 +1191,10 @@ orphanedFailureMechanismEntities.Add(failureMechanismEntity); } } - dbContext.FailureMechanismEntities.RemoveRange(orphanedFailureMechanismEntities); + if (orphanedFailureMechanismEntities.Any()) + { + dbContext.FailureMechanismEntities.RemoveRange(orphanedFailureMechanismEntities); + } var orphanedFailureMechanismSectionEntities = new List(); foreach (FailureMechanismSectionEntity failureMechanismSectionEntity in dbContext.FailureMechanismSectionEntities @@ -1196,7 +1205,10 @@ orphanedFailureMechanismSectionEntities.Add(failureMechanismSectionEntity); } } - dbContext.FailureMechanismSectionEntities.RemoveRange(orphanedFailureMechanismSectionEntities); + if (orphanedFailureMechanismSectionEntities.Any()) + { + dbContext.FailureMechanismSectionEntities.RemoveRange(orphanedFailureMechanismSectionEntities); + } var orphanedPipingSectionResultEntities = new List(); foreach (PipingSectionResultEntity pipingSectionResultEntity in dbContext.PipingSectionResultEntities @@ -1207,7 +1219,10 @@ orphanedPipingSectionResultEntities.Add(pipingSectionResultEntity); } } - dbContext.PipingSectionResultEntities.RemoveRange(orphanedPipingSectionResultEntities); + if (orphanedPipingSectionResultEntities.Any()) + { + dbContext.PipingSectionResultEntities.RemoveRange(orphanedPipingSectionResultEntities); + } var orphanedGrassCoverErosionInwardsFailureMechanismMetaEntities = new List(); foreach (GrassCoverErosionInwardsFailureMechanismMetaEntity inputEntity in dbContext.GrassCoverErosionInwardsFailureMechanismMetaEntities @@ -1218,7 +1233,10 @@ orphanedGrassCoverErosionInwardsFailureMechanismMetaEntities.Add(inputEntity); } } - dbContext.GrassCoverErosionInwardsFailureMechanismMetaEntities.RemoveRange(orphanedGrassCoverErosionInwardsFailureMechanismMetaEntities); + if (orphanedGrassCoverErosionInwardsFailureMechanismMetaEntities.Any()) + { + dbContext.GrassCoverErosionInwardsFailureMechanismMetaEntities.RemoveRange(orphanedGrassCoverErosionInwardsFailureMechanismMetaEntities); + } var orphanedDikeProfileEntities = new List(); foreach (DikeProfileEntity dikeProfileEntity in dbContext.DikeProfileEntities @@ -1229,7 +1247,10 @@ orphanedDikeProfileEntities.Add(dikeProfileEntity); } } - dbContext.DikeProfileEntities.RemoveRange(orphanedDikeProfileEntities); + if (orphanedDikeProfileEntities.Any()) + { + dbContext.DikeProfileEntities.RemoveRange(orphanedDikeProfileEntities); + } var orphanedGrassCoverErosionInwardsCalculationEntities = new List(); foreach (GrassCoverErosionInwardsCalculationEntity calculationEntity in dbContext.GrassCoverErosionInwardsCalculationEntities @@ -1240,18 +1261,24 @@ orphanedGrassCoverErosionInwardsCalculationEntities.Add(calculationEntity); } } - dbContext.GrassCoverErosionInwardsCalculationEntities.RemoveRange(orphanedGrassCoverErosionInwardsCalculationEntities); + if (orphanedGrassCoverErosionInwardsCalculationEntities.Any()) + { + dbContext.GrassCoverErosionInwardsCalculationEntities.RemoveRange(orphanedGrassCoverErosionInwardsCalculationEntities); + } var orphanedGrassCoverErosionInwardsOutputEntities = new List(); foreach (GrassCoverErosionInwardsOutputEntity outputEntity in dbContext.GrassCoverErosionInwardsOutputEntities - .Where(e => e.GrassCoverErosionInwardsOutputId > 0)) + .Where(e => e.GrassCoverErosionInwardsOutputEntityId > 0)) { if (!grassCoverErosionInwardsOutputs.ContainsKey(outputEntity)) { orphanedGrassCoverErosionInwardsOutputEntities.Add(outputEntity); } } - dbContext.GrassCoverErosionInwardsOutputEntities.RemoveRange(orphanedGrassCoverErosionInwardsOutputEntities); + if (orphanedGrassCoverErosionInwardsOutputEntities.Any()) + { + dbContext.GrassCoverErosionInwardsOutputEntities.RemoveRange(orphanedGrassCoverErosionInwardsOutputEntities); + } var orphanedGrassCoverErosionInwardsSectionResultEntities = new List(); foreach (GrassCoverErosionInwardsSectionResultEntity sectionResultEntity in dbContext.GrassCoverErosionInwardsSectionResultEntities @@ -1262,7 +1289,10 @@ orphanedGrassCoverErosionInwardsSectionResultEntities.Add(sectionResultEntity); } } - dbContext.GrassCoverErosionInwardsSectionResultEntities.RemoveRange(orphanedGrassCoverErosionInwardsSectionResultEntities); + if (orphanedGrassCoverErosionInwardsSectionResultEntities.Any()) + { + dbContext.GrassCoverErosionInwardsSectionResultEntities.RemoveRange(orphanedGrassCoverErosionInwardsSectionResultEntities); + } var orphanedHeightStructuresSectionResultEntities = new List(); foreach (HeightStructuresSectionResultEntity sectionResultEntity in dbContext.HeightStructuresSectionResultEntities @@ -1273,7 +1303,10 @@ orphanedHeightStructuresSectionResultEntities.Add(sectionResultEntity); } } - dbContext.HeightStructuresSectionResultEntities.RemoveRange(orphanedHeightStructuresSectionResultEntities); + if (orphanedHeightStructuresSectionResultEntities.Any()) + { + dbContext.HeightStructuresSectionResultEntities.RemoveRange(orphanedHeightStructuresSectionResultEntities); + } var orphanedStrengthStabilityLengthwiseConstructionSectionResultEntities = new List(); foreach (StrengthStabilityLengthwiseConstructionSectionResultEntity sectionResultEntity in dbContext.StrengthStabilityLengthwiseConstructionSectionResultEntities @@ -1284,7 +1317,10 @@ orphanedStrengthStabilityLengthwiseConstructionSectionResultEntities.Add(sectionResultEntity); } } - dbContext.StrengthStabilityLengthwiseConstructionSectionResultEntities.RemoveRange(orphanedStrengthStabilityLengthwiseConstructionSectionResultEntities); + if (orphanedStrengthStabilityLengthwiseConstructionSectionResultEntities.Any()) + { + dbContext.StrengthStabilityLengthwiseConstructionSectionResultEntities.RemoveRange(orphanedStrengthStabilityLengthwiseConstructionSectionResultEntities); + } var orphanedTechnicalInnovationSectionResultEntities = new List(); foreach (TechnicalInnovationSectionResultEntity sectionResultEntity in dbContext.TechnicalInnovationSectionResultEntities @@ -1295,7 +1331,10 @@ orphanedTechnicalInnovationSectionResultEntities.Add(sectionResultEntity); } } - dbContext.TechnicalInnovationSectionResultEntities.RemoveRange(orphanedTechnicalInnovationSectionResultEntities); + if (orphanedTechnicalInnovationSectionResultEntities.Any()) + { + dbContext.TechnicalInnovationSectionResultEntities.RemoveRange(orphanedTechnicalInnovationSectionResultEntities); + } var orphanedWaterPressureAsphaltCoverSectionResultEntities = new List(); foreach (WaterPressureAsphaltCoverSectionResultEntity sectionResultEntity in dbContext.WaterPressureAsphaltCoverSectionResultEntities @@ -1306,7 +1345,10 @@ orphanedWaterPressureAsphaltCoverSectionResultEntities.Add(sectionResultEntity); } } - dbContext.WaterPressureAsphaltCoverSectionResultEntities.RemoveRange(orphanedWaterPressureAsphaltCoverSectionResultEntities); + if (orphanedWaterPressureAsphaltCoverSectionResultEntities.Any()) + { + dbContext.WaterPressureAsphaltCoverSectionResultEntities.RemoveRange(orphanedWaterPressureAsphaltCoverSectionResultEntities); + } var orphanedClosingStructureSectionResultEntities = new List(); foreach (ClosingStructureSectionResultEntity sectionResultEntity in dbContext.ClosingStructureSectionResultEntities @@ -1317,7 +1359,10 @@ orphanedClosingStructureSectionResultEntities.Add(sectionResultEntity); } } - dbContext.ClosingStructureSectionResultEntities.RemoveRange(orphanedClosingStructureSectionResultEntities); + if (orphanedClosingStructureSectionResultEntities.Any()) + { + dbContext.ClosingStructureSectionResultEntities.RemoveRange(orphanedClosingStructureSectionResultEntities); + } var orphanedMacrostabilityInwardsSectionResultEntities = new List(); foreach (MacrostabilityInwardsSectionResultEntity sectionResultEntity in dbContext.MacrostabilityInwardsSectionResultEntities @@ -1328,7 +1373,10 @@ orphanedMacrostabilityInwardsSectionResultEntities.Add(sectionResultEntity); } } - dbContext.MacrostabilityInwardsSectionResultEntities.RemoveRange(orphanedMacrostabilityInwardsSectionResultEntities); + if (orphanedMacrostabilityInwardsSectionResultEntities.Any()) + { + dbContext.MacrostabilityInwardsSectionResultEntities.RemoveRange(orphanedMacrostabilityInwardsSectionResultEntities); + } var orphanedMacrostabilityOutwardsSectionResultEntities = new List(); foreach (MacrostabilityOutwardsSectionResultEntity sectionResultEntity in dbContext.MacrostabilityOutwardsSectionResultEntities @@ -1339,7 +1387,10 @@ orphanedMacrostabilityOutwardsSectionResultEntities.Add(sectionResultEntity); } } - dbContext.MacrostabilityOutwardsSectionResultEntities.RemoveRange(orphanedMacrostabilityOutwardsSectionResultEntities); + if (orphanedMacrostabilityOutwardsSectionResultEntities.Any()) + { + dbContext.MacrostabilityOutwardsSectionResultEntities.RemoveRange(orphanedMacrostabilityOutwardsSectionResultEntities); + } var orphanedWaveImpactAsphaltCoverSectionResultEntities = new List(); foreach (WaveImpactAsphaltCoverSectionResultEntity sectionResultEntity in dbContext.WaveImpactAsphaltCoverSectionResultEntities @@ -1350,7 +1401,10 @@ orphanedWaveImpactAsphaltCoverSectionResultEntities.Add(sectionResultEntity); } } - dbContext.WaveImpactAsphaltCoverSectionResultEntities.RemoveRange(orphanedWaveImpactAsphaltCoverSectionResultEntities); + if (orphanedWaveImpactAsphaltCoverSectionResultEntities.Any()) + { + dbContext.WaveImpactAsphaltCoverSectionResultEntities.RemoveRange(orphanedWaveImpactAsphaltCoverSectionResultEntities); + } var orphanedGrassCoverErosionOutwardsSectionResultEntities = new List(); foreach (GrassCoverErosionOutwardsSectionResultEntity sectionResultEntity in dbContext.GrassCoverErosionOutwardsSectionResultEntities @@ -1361,7 +1415,10 @@ orphanedGrassCoverErosionOutwardsSectionResultEntities.Add(sectionResultEntity); } } - dbContext.GrassCoverErosionOutwardsSectionResultEntities.RemoveRange(orphanedGrassCoverErosionOutwardsSectionResultEntities); + if (orphanedGrassCoverErosionOutwardsSectionResultEntities.Any()) + { + dbContext.GrassCoverErosionOutwardsSectionResultEntities.RemoveRange(orphanedGrassCoverErosionOutwardsSectionResultEntities); + } var orphanedGrassCoverSlipOffInwardsSectionResultEntities = new List(); foreach (GrassCoverSlipOffInwardsSectionResultEntity sectionResultEntity in dbContext.GrassCoverSlipOffInwardsSectionResultEntities @@ -1372,7 +1429,10 @@ orphanedGrassCoverSlipOffInwardsSectionResultEntities.Add(sectionResultEntity); } } - dbContext.GrassCoverSlipOffInwardsSectionResultEntities.RemoveRange(orphanedGrassCoverSlipOffInwardsSectionResultEntities); + if (orphanedGrassCoverSlipOffInwardsSectionResultEntities.Any()) + { + dbContext.GrassCoverSlipOffInwardsSectionResultEntities.RemoveRange(orphanedGrassCoverSlipOffInwardsSectionResultEntities); + } var orphanedGrassCoverSlipOffOutwardsSectionResultEntities = new List(); foreach (GrassCoverSlipOffOutwardsSectionResultEntity sectionResultEntity in dbContext.GrassCoverSlipOffOutwardsSectionResultEntities @@ -1383,7 +1443,10 @@ orphanedGrassCoverSlipOffOutwardsSectionResultEntities.Add(sectionResultEntity); } } - dbContext.GrassCoverSlipOffOutwardsSectionResultEntities.RemoveRange(orphanedGrassCoverSlipOffOutwardsSectionResultEntities); + if (orphanedGrassCoverSlipOffOutwardsSectionResultEntities.Any()) + { + dbContext.GrassCoverSlipOffOutwardsSectionResultEntities.RemoveRange(orphanedGrassCoverSlipOffOutwardsSectionResultEntities); + } var orphanedMicrostabilitySectionResultEntities = new List(); foreach (MicrostabilitySectionResultEntity sectionResultEntity in dbContext.MicrostabilitySectionResultEntities @@ -1394,7 +1457,10 @@ orphanedMicrostabilitySectionResultEntities.Add(sectionResultEntity); } } - dbContext.MicrostabilitySectionResultEntities.RemoveRange(orphanedMicrostabilitySectionResultEntities); + if (orphanedMicrostabilitySectionResultEntities.Any()) + { + dbContext.MicrostabilitySectionResultEntities.RemoveRange(orphanedMicrostabilitySectionResultEntities); + } var orphanedPipingStructureSectionResultEntities = new List(); foreach (PipingStructureSectionResultEntity sectionResultEntity in dbContext.PipingStructureSectionResultEntities @@ -1405,7 +1471,10 @@ orphanedPipingStructureSectionResultEntities.Add(sectionResultEntity); } } - dbContext.PipingStructureSectionResultEntities.RemoveRange(orphanedPipingStructureSectionResultEntities); + if (orphanedPipingStructureSectionResultEntities.Any()) + { + dbContext.PipingStructureSectionResultEntities.RemoveRange(orphanedPipingStructureSectionResultEntities); + } var orphanedDuneErosionSectionResultEntities = new List(); foreach (DuneErosionSectionResultEntity sectionResultEntity in dbContext.DuneErosionSectionResultEntities @@ -1416,7 +1485,10 @@ orphanedDuneErosionSectionResultEntities.Add(sectionResultEntity); } } - dbContext.DuneErosionSectionResultEntities.RemoveRange(orphanedDuneErosionSectionResultEntities); + if (orphanedDuneErosionSectionResultEntities.Any()) + { + dbContext.DuneErosionSectionResultEntities.RemoveRange(orphanedDuneErosionSectionResultEntities); + } var orphanedStabilityStoneCoverSectionResultEntities = new List(); foreach (StabilityStoneCoverSectionResultEntity sectionResultEntity in dbContext.StabilityStoneCoverSectionResultEntities @@ -1427,7 +1499,10 @@ orphanedStabilityStoneCoverSectionResultEntities.Add(sectionResultEntity); } } - dbContext.StabilityStoneCoverSectionResultEntities.RemoveRange(orphanedStabilityStoneCoverSectionResultEntities); + if (orphanedStabilityStoneCoverSectionResultEntities.Any()) + { + dbContext.StabilityStoneCoverSectionResultEntities.RemoveRange(orphanedStabilityStoneCoverSectionResultEntities); + } var orphanedStrengthStabilityPointConstructionSectionResultEntities = new List(); foreach (StrengthStabilityPointConstructionSectionResultEntity sectionResultEntity in dbContext.StrengthStabilityPointConstructionSectionResultEntities @@ -1438,7 +1513,10 @@ orphanedStrengthStabilityPointConstructionSectionResultEntities.Add(sectionResultEntity); } } - dbContext.StrengthStabilityPointConstructionSectionResultEntities.RemoveRange(orphanedStrengthStabilityPointConstructionSectionResultEntities); + if (orphanedStrengthStabilityPointConstructionSectionResultEntities.Any()) + { + dbContext.StrengthStabilityPointConstructionSectionResultEntities.RemoveRange(orphanedStrengthStabilityPointConstructionSectionResultEntities); + } var orphanedHydraulicLocationEntities = new List(); foreach (HydraulicLocationEntity hydraulicLocationEntity in dbContext.HydraulicLocationEntities @@ -1449,7 +1527,10 @@ orphanedHydraulicLocationEntities.Add(hydraulicLocationEntity); } } - dbContext.HydraulicLocationEntities.RemoveRange(orphanedHydraulicLocationEntities); + if (orphanedHydraulicLocationEntities.Any()) + { + dbContext.HydraulicLocationEntities.RemoveRange(orphanedHydraulicLocationEntities); + } var orphanedCalculationGroupEntities = new List(); foreach (CalculationGroupEntity calculationGroupEntity in dbContext.CalculationGroupEntities @@ -1460,7 +1541,10 @@ orphanedCalculationGroupEntities.Add(calculationGroupEntity); } } - dbContext.CalculationGroupEntities.RemoveRange(orphanedCalculationGroupEntities); + if (orphanedCalculationGroupEntities.Any()) + { + dbContext.CalculationGroupEntities.RemoveRange(orphanedCalculationGroupEntities); + } var orphanedPipingCalculationEntities = new List(); foreach (PipingCalculationEntity pipingCalculationEntity in dbContext.PipingCalculationEntities @@ -1471,7 +1555,10 @@ orphanedPipingCalculationEntities.Add(pipingCalculationEntity); } } - dbContext.PipingCalculationEntities.RemoveRange(orphanedPipingCalculationEntities); + if (orphanedPipingCalculationEntities.Any()) + { + dbContext.PipingCalculationEntities.RemoveRange(orphanedPipingCalculationEntities); + } var orphanedPipingCalculationOutputEntities = new List(); foreach (PipingCalculationOutputEntity pipingCalculationOutputEntity in dbContext.PipingCalculationOutputEntities @@ -1482,7 +1569,10 @@ orphanedPipingCalculationOutputEntities.Add(pipingCalculationOutputEntity); } } - dbContext.PipingCalculationOutputEntities.RemoveRange(orphanedPipingCalculationOutputEntities); + if (orphanedPipingCalculationOutputEntities.Any()) + { + dbContext.PipingCalculationOutputEntities.RemoveRange(orphanedPipingCalculationOutputEntities); + } var orphanedPipingSemiProbabilisticOutputEntities = new List(); foreach (PipingSemiProbabilisticOutputEntity pipingSemiProbabilisticOutputEntity in dbContext.PipingSemiProbabilisticOutputEntities @@ -1493,7 +1583,10 @@ orphanedPipingSemiProbabilisticOutputEntities.Add(pipingSemiProbabilisticOutputEntity); } } - dbContext.PipingSemiProbabilisticOutputEntities.RemoveRange(orphanedPipingSemiProbabilisticOutputEntities); + if (orphanedPipingSemiProbabilisticOutputEntities.Any()) + { + dbContext.PipingSemiProbabilisticOutputEntities.RemoveRange(orphanedPipingSemiProbabilisticOutputEntities); + } var orphanedStochasticSoilModelEntities = new List(); foreach (StochasticSoilModelEntity stochasticSoilModelEntity in dbContext.StochasticSoilModelEntities @@ -1504,7 +1597,10 @@ orphanedStochasticSoilModelEntities.Add(stochasticSoilModelEntity); } } - dbContext.StochasticSoilModelEntities.RemoveRange(orphanedStochasticSoilModelEntities); + if (orphanedStochasticSoilModelEntities.Any()) + { + dbContext.StochasticSoilModelEntities.RemoveRange(orphanedStochasticSoilModelEntities); + } var orphanedStochasticSoilProfileEntities = new List(); foreach (StochasticSoilProfileEntity stochasticSoilProfileEntity in dbContext.StochasticSoilProfileEntities @@ -1515,7 +1611,10 @@ orphanedStochasticSoilProfileEntities.Add(stochasticSoilProfileEntity); } } - dbContext.StochasticSoilProfileEntities.RemoveRange(orphanedStochasticSoilProfileEntities); + if (orphanedStochasticSoilProfileEntities.Any()) + { + dbContext.StochasticSoilProfileEntities.RemoveRange(orphanedStochasticSoilProfileEntities); + } var orphanedSoilProfileEntities = new List(); foreach (SoilProfileEntity soilProfileEntity in dbContext.SoilProfileEntities @@ -1526,7 +1625,10 @@ orphanedSoilProfileEntities.Add(soilProfileEntity); } } - dbContext.SoilProfileEntities.RemoveRange(orphanedSoilProfileEntities); + if (orphanedSoilProfileEntities.Any()) + { + dbContext.SoilProfileEntities.RemoveRange(orphanedSoilProfileEntities); + } var orphanedSoilLayerEntities = new List(); foreach (SoilLayerEntity soilLayerEntity in dbContext.SoilLayerEntities @@ -1537,7 +1639,10 @@ orphanedSoilLayerEntities.Add(soilLayerEntity); } } - dbContext.SoilLayerEntities.RemoveRange(orphanedSoilLayerEntities); + if (orphanedSoilLayerEntities.Any()) + { + dbContext.SoilLayerEntities.RemoveRange(orphanedSoilLayerEntities); + } var orphanedSurfaceLineEntities = new List(); foreach (SurfaceLineEntity surfaceLineEntity in dbContext.SurfaceLineEntities @@ -1548,7 +1653,10 @@ orphanedSurfaceLineEntities.Add(surfaceLineEntity); } } - dbContext.SurfaceLineEntities.RemoveRange(orphanedSurfaceLineEntities); + if (orphanedSurfaceLineEntities.Any()) + { + dbContext.SurfaceLineEntities.RemoveRange(orphanedSurfaceLineEntities); + } var orphanedCharacteristicPointEntities = new List(); foreach (CharacteristicPointEntity characteristicPointEntity in dbContext.CharacteristicPointEntities @@ -1559,7 +1667,10 @@ orphanedCharacteristicPointEntities.Add(characteristicPointEntity); } } - dbContext.CharacteristicPointEntities.RemoveRange(orphanedCharacteristicPointEntities); + if (orphanedCharacteristicPointEntities.Any()) + { + dbContext.CharacteristicPointEntities.RemoveRange(orphanedCharacteristicPointEntities); + } var orphanedPipingFailureMechanismMetaEntities = new List(); foreach (PipingFailureMechanismMetaEntity pipingFailureMechanismMetaEntity in dbContext.PipingFailureMechanismMetaEntities @@ -1570,7 +1681,10 @@ orphanedPipingFailureMechanismMetaEntities.Add(pipingFailureMechanismMetaEntity); } } - dbContext.PipingFailureMechanismMetaEntities.RemoveRange(orphanedPipingFailureMechanismMetaEntities); + if (orphanedPipingFailureMechanismMetaEntities.Any()) + { + dbContext.PipingFailureMechanismMetaEntities.RemoveRange(orphanedPipingFailureMechanismMetaEntities); + } var orphanedProbabilisticOutputEntities = new List(); foreach (ProbabilisticOutputEntity outputEntity in dbContext.ProbabilisticOutputEntities @@ -1581,7 +1695,10 @@ orphanedProbabilisticOutputEntities.Add(outputEntity); } } - dbContext.ProbabilisticOutputEntities.RemoveRange(orphanedProbabilisticOutputEntities); + if (orphanedProbabilisticOutputEntities.Any()) + { + dbContext.ProbabilisticOutputEntities.RemoveRange(orphanedProbabilisticOutputEntities); + } } private static Dictionary CreateDictionary() Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql =================================================================== diff -u -r508d720230c5f63bce7f95bddc3b7a04808d267d -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 508d720230c5f63bce7f95bddc3b7a04808d267d) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 01-aug-2016 14:44:48 */ +/* Created On : 03-aug-2016 11:20:12 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -283,7 +283,7 @@ 'CalculateDikeHeight' TINYINT (1) NOT NULL, CONSTRAINT 'FK_GrassCoverErosionInwardsCalculationEntity_CalculationGroupEntity' FOREIGN KEY ('CalculationGroupEntityId') REFERENCES 'CalculationGroupEntity' ('CalculationGroupEntityId') ON DELETE Cascade ON UPDATE Cascade, CONSTRAINT 'FK_GrassCoverErosionInwardsCalculationEntity_DikeProfileEntity' FOREIGN KEY ('DikeProfileEntityId') REFERENCES 'DikeProfileEntity' ('DikeProfileEntityId') ON DELETE Set Null ON UPDATE Cascade, - CONSTRAINT 'FK_GrassCoverErosionInwardsCalculationEntity_GrassCoverErosionInwardsOutputEntity' FOREIGN KEY ('GrassCoverErosionInwardsOutputEntityId') REFERENCES 'GrassCoverErosionInwardsOutputEntity' ('GrassCoverErosionInwardsOutputId') ON DELETE Set Null ON UPDATE Cascade, + CONSTRAINT 'FK_GrassCoverErosionInwardsCalculationEntity_GrassCoverErosionInwardsOutputEntity' FOREIGN KEY ('GrassCoverErosionInwardsOutputEntityId') REFERENCES 'GrassCoverErosionInwardsOutputEntity' ('GrassCoverErosionInwardsOutputEntityId') ON DELETE Set Null ON UPDATE Cascade, CONSTRAINT 'FK_GrassCoverErosionInwardsCalculationEntity_HydraulicLocationEntity' FOREIGN KEY ('HydraulicLocationEntityId') REFERENCES 'HydraulicLocationEntity' ('HydraulicLocationEntityId') ON DELETE Set Null ON UPDATE Cascade ) ; @@ -615,7 +615,7 @@ CREATE TABLE 'GrassCoverErosionInwardsOutputEntity' ( - 'GrassCoverErosionInwardsOutputId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'GrassCoverErosionInwardsOutputEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'ProbabilisticOutputEntityId' INTEGER NOT NULL, 'IsOvertoppingDominant' TINYINT (1) NOT NULL, 'WaveHeight' REAL, Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsOutputEntity.cs =================================================================== diff -u -r89217cd12161055618bade4d54f34334c2714528 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsOutputEntity.cs (.../GrassCoverErosionInwardsOutputEntity.cs) (revision 89217cd12161055618bade4d54f34334c2714528) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsOutputEntity.cs (.../GrassCoverErosionInwardsOutputEntity.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -41,7 +41,7 @@ this.GrassCoverErosionInwardsCalculationEntities = new HashSet(); } - public long GrassCoverErosionInwardsOutputId { get; set; } + public long GrassCoverErosionInwardsOutputEntityId { get; set; } public long ProbabilisticOutputEntityId { get; set; } public byte IsOvertoppingDominant { get; set; } public Nullable WaveHeight { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IRingtoetsEntities.cs =================================================================== diff -u -r508d720230c5f63bce7f95bddc3b7a04808d267d -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IRingtoetsEntities.cs (.../IRingtoetsEntities.cs) (revision 508d720230c5f63bce7f95bddc3b7a04808d267d) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IRingtoetsEntities.cs (.../IRingtoetsEntities.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -264,6 +264,11 @@ /// DbSet ProbabilisticOutputEntities { get; } + /// + /// Gets or sets a value indicating whether automatic change detection is enabled or not. + /// + bool AutoDetectChangesEnabled { get; set; } + /// /// Persists all updates to the database and resets change tracking in the object context, see . /// Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialRingtoetsEntities.cs =================================================================== diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialRingtoetsEntities.cs (.../PartialRingtoetsEntities.cs) (revision 4512af7782ee31b36941bb280b54d9da2953dd71) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialRingtoetsEntities.cs (.../PartialRingtoetsEntities.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -32,5 +32,17 @@ /// A connection string. public RingtoetsEntities(string connString) : base(connString) {} + + public bool AutoDetectChangesEnabled + { + get + { + return Configuration.AutoDetectChangesEnabled; + } + set + { + Configuration.AutoDetectChangesEnabled = value; + } + } } } \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx =================================================================== diff -u -r508d720230c5f63bce7f95bddc3b7a04808d267d -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 508d720230c5f63bce7f95bddc3b7a04808d267d) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -129,9 +129,9 @@ - + - + @@ -581,7 +581,7 @@ - + @@ -1614,9 +1614,9 @@ - + - + @@ -2398,7 +2398,7 @@ - + @@ -2671,7 +2671,7 @@ - + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram =================================================================== diff -u -r508d720230c5f63bce7f95bddc3b7a04808d267d -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 508d720230c5f63bce7f95bddc3b7a04808d267d) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -7,44 +7,44 @@ - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - - + + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - + + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/IStorableExtensions.cs =================================================================== diff -u -rb5c11c4e073b7e10365ddbe62f83418ebaba14c4 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/IStorableExtensions.cs (.../IStorableExtensions.cs) (revision b5c11c4e073b7e10365ddbe62f83418ebaba14c4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/IStorableExtensions.cs (.../IStorableExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -21,7 +21,8 @@ using System; using System.Data.Entity; -using System.Linq; + +using Application.Ringtoets.Storage.DbContext; using Application.Ringtoets.Storage.Exceptions; using Application.Ringtoets.Storage.Properties; using Core.Common.Base.Storage; @@ -48,29 +49,38 @@ /// /// The corresponding with the Entity. /// The Entity set to obtain the existing entity from. - /// The function to obtain the id field of the Entity. + /// /// The stored as an Entity of type . /// Thrown when either: /// /// the Entity of type couldn't be found in the /// more than one Entity of type was found in the /// has not yet been saved in the database /// - public static T GetCorrespondingEntity(this IStorable storable, DbSet entitySet, Func getId) where T : class + public static T GetCorrespondingEntity(this IStorable storable, DbSet entitySet, IRingtoetsEntities context) where T : class { if (storable.IsNew()) { throw new EntityNotFoundException(string.Format(Resources.Error_Entity_Not_Found_0_1, typeof(T).Name, storable.StorageId)); } try { - Func expression = sle => getId(sle) == storable.StorageId; - return entitySet.Single(expression); + context.AutoDetectChangesEnabled = false; + T entity = entitySet.Find(storable.StorageId); + if (entity == null) + { + throw new EntityNotFoundException(string.Format(Resources.Error_Entity_Not_Found_0_1, typeof(T).Name, storable.StorageId)); + } + return entity; } catch (InvalidOperationException exception) { throw new EntityNotFoundException(string.Format(Resources.Error_Entity_Not_Found_0_1, typeof(T).Name, storable.StorageId), exception); } + finally + { + context.AutoDetectChangesEnabled = true; + } } } } \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensions.cs =================================================================== diff -u -r90deb88f193d2b0eb45c013b1101864c298a18d5 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensions.cs (.../GrassCoverErosionInwardsOutputEntityReadExtensions.cs) (revision 90deb88f193d2b0eb45c013b1101864c298a18d5) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensions.cs (.../GrassCoverErosionInwardsOutputEntityReadExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -47,7 +47,7 @@ entity.ProbabilisticOutputEntity.Read(), GetDikeHeightValue(entity)) { - StorageId = entity.GrassCoverErosionInwardsOutputId + StorageId = entity.GrassCoverErosionInwardsOutputEntityId }; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/AssessmentSectionUpdateExtensions.cs =================================================================== diff -u -r508d720230c5f63bce7f95bddc3b7a04808d267d -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/AssessmentSectionUpdateExtensions.cs (.../AssessmentSectionUpdateExtensions.cs) (revision 508d720230c5f63bce7f95bddc3b7a04808d267d) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/AssessmentSectionUpdateExtensions.cs (.../AssessmentSectionUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -78,7 +78,7 @@ throw new ArgumentNullException("registry"); } - AssessmentSectionEntity entity = section.GetCorrespondingEntity(context.AssessmentSectionEntities, o => o.AssessmentSectionEntityId); + AssessmentSectionEntity entity = section.GetCorrespondingEntity(context.AssessmentSectionEntities, context); entity.Id = section.Id; entity.Name = section.Name; entity.Composition = (short) section.Composition; Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/CalculationGroupUpdateExtensions.cs =================================================================== diff -u -r06e4debe3f4a9bdfb38c40b8c00ed013e8f7bb98 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/CalculationGroupUpdateExtensions.cs (.../CalculationGroupUpdateExtensions.cs) (revision 06e4debe3f4a9bdfb38c40b8c00ed013e8f7bb98) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/CalculationGroupUpdateExtensions.cs (.../CalculationGroupUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -69,7 +69,7 @@ throw new ArgumentNullException("context"); } - CalculationGroupEntity entity = calculationGroup.GetCorrespondingEntity(context.CalculationGroupEntities, o => o.CalculationGroupEntityId); + CalculationGroupEntity entity = calculationGroup.GetCorrespondingEntity(context.CalculationGroupEntities, context); entity.Name = calculationGroup.Name; entity.Order = order; Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/ClosingStructure/ClosingStructureFailureMechanismSectionResultUpdateExtensions.cs =================================================================== diff -u -ra294987551b0b2d8a27b6e1bc6235b0e2351b6f4 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/ClosingStructure/ClosingStructureFailureMechanismSectionResultUpdateExtensions.cs (.../ClosingStructureFailureMechanismSectionResultUpdateExtensions.cs) (revision a294987551b0b2d8a27b6e1bc6235b0e2351b6f4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/ClosingStructure/ClosingStructureFailureMechanismSectionResultUpdateExtensions.cs (.../ClosingStructureFailureMechanismSectionResultUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ ClosingStructureSectionResultEntity entity = result.GetCorrespondingEntity( context.ClosingStructureSectionResultEntities, - s => s.ClosingStructureSectionResultEntityId); + context); entity.LayerOne = Convert.ToByte(result.AssessmentLayerOne); entity.LayerTwoA = result.AssessmentLayerTwoA.ToNaNAsNull(); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/ClosingStructure/ClosingStructureFailureMechanismUpdateExtensions.cs =================================================================== diff -u -ra5714fc0488030773fff50dfc82041c6cb9edc2f -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/ClosingStructure/ClosingStructureFailureMechanismUpdateExtensions.cs (.../ClosingStructureFailureMechanismUpdateExtensions.cs) (revision a5714fc0488030773fff50dfc82041c6cb9edc2f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/ClosingStructure/ClosingStructureFailureMechanismUpdateExtensions.cs (.../ClosingStructureFailureMechanismUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ FailureMechanismEntity entity = mechanism.GetCorrespondingEntity( context.FailureMechanismEntities, - o => o.FailureMechanismEntityId); + context); entity.IsRelevant = Convert.ToByte(mechanism.IsRelevant); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/DuneErosion/DuneErosionFailureMechanismSectionResultUpdateExtensions.cs =================================================================== diff -u -ra294987551b0b2d8a27b6e1bc6235b0e2351b6f4 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/DuneErosion/DuneErosionFailureMechanismSectionResultUpdateExtensions.cs (.../DuneErosionFailureMechanismSectionResultUpdateExtensions.cs) (revision a294987551b0b2d8a27b6e1bc6235b0e2351b6f4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/DuneErosion/DuneErosionFailureMechanismSectionResultUpdateExtensions.cs (.../DuneErosionFailureMechanismSectionResultUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ DuneErosionSectionResultEntity entity = result.GetCorrespondingEntity( context.DuneErosionSectionResultEntities, - s => s.DuneErosionSectionResultEntityId); + context); entity.LayerTwoA = Convert.ToByte(result.AssessmentLayerTwoA); entity.LayerThree = result.AssessmentLayerThree.Value.ToNaNAsNull(); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/DuneErosion/DuneErosionFailureMechanismUpdateExtensions.cs =================================================================== diff -u -ra5714fc0488030773fff50dfc82041c6cb9edc2f -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/DuneErosion/DuneErosionFailureMechanismUpdateExtensions.cs (.../DuneErosionFailureMechanismUpdateExtensions.cs) (revision a5714fc0488030773fff50dfc82041c6cb9edc2f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/DuneErosion/DuneErosionFailureMechanismUpdateExtensions.cs (.../DuneErosionFailureMechanismUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ FailureMechanismEntity entity = mechanism.GetCorrespondingEntity( context.FailureMechanismEntities, - o => o.FailureMechanismEntityId); + context); entity.IsRelevant = Convert.ToByte(mechanism.IsRelevant); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/FailureMechanismSectionUpdateExtensions.cs =================================================================== diff -u -r508d720230c5f63bce7f95bddc3b7a04808d267d -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/FailureMechanismSectionUpdateExtensions.cs (.../FailureMechanismSectionUpdateExtensions.cs) (revision 508d720230c5f63bce7f95bddc3b7a04808d267d) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/FailureMechanismSectionUpdateExtensions.cs (.../FailureMechanismSectionUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -63,7 +63,7 @@ FailureMechanismSectionEntity entity = section.GetCorrespondingEntity( context.FailureMechanismSectionEntities, - o => o.FailureMechanismSectionEntityId); + context); entity.Name = section.Name; UpdateGeometry(section, entity); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverErosionInwards/DikeProfileUpdateExtensions.cs =================================================================== diff -u -ra5714fc0488030773fff50dfc82041c6cb9edc2f -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverErosionInwards/DikeProfileUpdateExtensions.cs (.../DikeProfileUpdateExtensions.cs) (revision a5714fc0488030773fff50dfc82041c6cb9edc2f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverErosionInwards/DikeProfileUpdateExtensions.cs (.../DikeProfileUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -61,7 +61,7 @@ DikeProfileEntity entity = profile.GetCorrespondingEntity( context.DikeProfileEntities, - o => o.DikeProfileEntityId); + context); // DikeProfile cannot be changed after construction. No need to update state in 'entity' Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverErosionInwards/GeneralGrassCoverErosionInwardsInputUpdateExtensions.cs =================================================================== diff -u -ra5714fc0488030773fff50dfc82041c6cb9edc2f -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverErosionInwards/GeneralGrassCoverErosionInwardsInputUpdateExtensions.cs (.../GeneralGrassCoverErosionInwardsInputUpdateExtensions.cs) (revision a5714fc0488030773fff50dfc82041c6cb9edc2f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverErosionInwards/GeneralGrassCoverErosionInwardsInputUpdateExtensions.cs (.../GeneralGrassCoverErosionInwardsInputUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ GrassCoverErosionInwardsFailureMechanismMetaEntity entity = input.GetCorrespondingEntity( context.GrassCoverErosionInwardsFailureMechanismMetaEntities, - inputEntity => inputEntity.GrassCoverErosionInwardsFailureMechanismMetaEntityId); + context); entity.N = input.N; registry.Register(entity, input); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationUpdateExtensions.cs =================================================================== diff -u -r66741e6e68057769a41a135dde00fdc82eeaeed4 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationUpdateExtensions.cs (.../GrassCoverErosionInwardsCalculationUpdateExtensions.cs) (revision 66741e6e68057769a41a135dde00fdc82eeaeed4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationUpdateExtensions.cs (.../GrassCoverErosionInwardsCalculationUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -66,7 +66,7 @@ GrassCoverErosionInwardsCalculationEntity entity = calculation.GetCorrespondingEntity( context.GrassCoverErosionInwardsCalculationEntities, - inputEntity => inputEntity.GrassCoverErosionInwardsCalculationEntityId); + context); entity.Name = calculation.Name; entity.Comments = calculation.Comments; entity.Order = order; Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismSectionResultUpdateExtensions.cs =================================================================== diff -u -ra294987551b0b2d8a27b6e1bc6235b0e2351b6f4 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismSectionResultUpdateExtensions.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultUpdateExtensions.cs) (revision a294987551b0b2d8a27b6e1bc6235b0e2351b6f4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismSectionResultUpdateExtensions.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ GrassCoverErosionInwardsSectionResultEntity entity = result.GetCorrespondingEntity( context.GrassCoverErosionInwardsSectionResultEntities, - o => o.GrassCoverErosionInwardsSectionResultEntityId); + context); entity.LayerOne = Convert.ToByte(result.AssessmentLayerOne); entity.LayerThree = result.AssessmentLayerThree.Value.ToNaNAsNull(); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismUpdateExtensions.cs =================================================================== diff -u -r1e9309149f9387c4e8b10f6c5f429797220b0ef8 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismUpdateExtensions.cs (.../GrassCoverErosionInwardsFailureMechanismUpdateExtensions.cs) (revision 1e9309149f9387c4e8b10f6c5f429797220b0ef8) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismUpdateExtensions.cs (.../GrassCoverErosionInwardsFailureMechanismUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ FailureMechanismEntity entity = mechanism.GetCorrespondingEntity( context.FailureMechanismEntities, - o => o.FailureMechanismEntityId); + context); entity.IsRelevant = Convert.ToByte(mechanism.IsRelevant); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputUpdateExtensions.cs =================================================================== diff -u -r90deb88f193d2b0eb45c013b1101864c298a18d5 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputUpdateExtensions.cs (.../GrassCoverErosionInwardsOutputUpdateExtensions.cs) (revision 90deb88f193d2b0eb45c013b1101864c298a18d5) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputUpdateExtensions.cs (.../GrassCoverErosionInwardsOutputUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -63,7 +63,7 @@ GrassCoverErosionInwardsOutputEntity entity = output.GetCorrespondingEntity( context.GrassCoverErosionInwardsOutputEntities, - o => o.GrassCoverErosionInwardsOutputId); + context); output.ProbabilityAssessmentOutput.Update(registry, context); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismSectionResultUpdateExtensions.cs =================================================================== diff -u -ra294987551b0b2d8a27b6e1bc6235b0e2351b6f4 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismSectionResultUpdateExtensions.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultUpdateExtensions.cs) (revision a294987551b0b2d8a27b6e1bc6235b0e2351b6f4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismSectionResultUpdateExtensions.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ GrassCoverErosionOutwardsSectionResultEntity entity = result.GetCorrespondingEntity( context.GrassCoverErosionOutwardsSectionResultEntities, - s => s.GrassCoverErosionOutwardsSectionResultEntityId); + context); entity.LayerOne = Convert.ToByte(result.AssessmentLayerOne); entity.LayerTwoA = Convert.ToByte(result.AssessmentLayerTwoA); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismUpdateExtensions.cs =================================================================== diff -u -ra5714fc0488030773fff50dfc82041c6cb9edc2f -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismUpdateExtensions.cs (.../GrassCoverErosionOutwardsFailureMechanismUpdateExtensions.cs) (revision a5714fc0488030773fff50dfc82041c6cb9edc2f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismUpdateExtensions.cs (.../GrassCoverErosionOutwardsFailureMechanismUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ FailureMechanismEntity entity = mechanism.GetCorrespondingEntity( context.FailureMechanismEntities, - o => o.FailureMechanismEntityId); + context); entity.IsRelevant = Convert.ToByte(mechanism.IsRelevant); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismSectionResultUpdateExtensions.cs =================================================================== diff -u -ra294987551b0b2d8a27b6e1bc6235b0e2351b6f4 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismSectionResultUpdateExtensions.cs (.../GrassCoverSlipOffInwardsFailureMechanismSectionResultUpdateExtensions.cs) (revision a294987551b0b2d8a27b6e1bc6235b0e2351b6f4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismSectionResultUpdateExtensions.cs (.../GrassCoverSlipOffInwardsFailureMechanismSectionResultUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ GrassCoverSlipOffInwardsSectionResultEntity entity = result.GetCorrespondingEntity( context.GrassCoverSlipOffInwardsSectionResultEntities, - s => s.GrassCoverSlipOffInwardsSectionResultEntityId); + context); entity.LayerOne = Convert.ToByte(result.AssessmentLayerOne); entity.LayerTwoA = Convert.ToByte(result.AssessmentLayerTwoA); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismUpdateExtensions.cs =================================================================== diff -u -ra5714fc0488030773fff50dfc82041c6cb9edc2f -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismUpdateExtensions.cs (.../GrassCoverSlipOffInwardsFailureMechanismUpdateExtensions.cs) (revision a5714fc0488030773fff50dfc82041c6cb9edc2f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismUpdateExtensions.cs (.../GrassCoverSlipOffInwardsFailureMechanismUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ FailureMechanismEntity entity = mechanism.GetCorrespondingEntity( context.FailureMechanismEntities, - o => o.FailureMechanismEntityId); + context); entity.IsRelevant = Convert.ToByte(mechanism.IsRelevant); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismSectionResultUpdateExtensions.cs =================================================================== diff -u -ra294987551b0b2d8a27b6e1bc6235b0e2351b6f4 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismSectionResultUpdateExtensions.cs (.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultUpdateExtensions.cs) (revision a294987551b0b2d8a27b6e1bc6235b0e2351b6f4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismSectionResultUpdateExtensions.cs (.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ GrassCoverSlipOffOutwardsSectionResultEntity entity = result.GetCorrespondingEntity( context.GrassCoverSlipOffOutwardsSectionResultEntities, - s => s.GrassCoverSlipOffOutwardsSectionResultEntityId); + context); entity.LayerOne = Convert.ToByte(result.AssessmentLayerOne); entity.LayerTwoA = Convert.ToByte(result.AssessmentLayerTwoA); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismUpdateExtensions.cs =================================================================== diff -u -ra5714fc0488030773fff50dfc82041c6cb9edc2f -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismUpdateExtensions.cs (.../GrassCoverSlipOffOutwardsFailureMechanismUpdateExtensions.cs) (revision a5714fc0488030773fff50dfc82041c6cb9edc2f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismUpdateExtensions.cs (.../GrassCoverSlipOffOutwardsFailureMechanismUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ FailureMechanismEntity entity = mechanism.GetCorrespondingEntity( context.FailureMechanismEntities, - o => o.FailureMechanismEntityId); + context); entity.IsRelevant = Convert.ToByte(mechanism.IsRelevant); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/HeightStructures/HeightStructuresFailureMechanismSectionResultUpdateExtensions.cs =================================================================== diff -u -ra294987551b0b2d8a27b6e1bc6235b0e2351b6f4 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/HeightStructures/HeightStructuresFailureMechanismSectionResultUpdateExtensions.cs (.../HeightStructuresFailureMechanismSectionResultUpdateExtensions.cs) (revision a294987551b0b2d8a27b6e1bc6235b0e2351b6f4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/HeightStructures/HeightStructuresFailureMechanismSectionResultUpdateExtensions.cs (.../HeightStructuresFailureMechanismSectionResultUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ HeightStructuresSectionResultEntity entity = result.GetCorrespondingEntity( context.HeightStructuresSectionResultEntities, - o => o.HeightStructuresSectionResultEntityId); + context); entity.LayerOne = Convert.ToByte(result.AssessmentLayerOne); entity.LayerThree = result.AssessmentLayerThree.Value.ToNaNAsNull(); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/HeightStructures/HeightStructuresFailureMechanismUpdateExtensions.cs =================================================================== diff -u -ra5714fc0488030773fff50dfc82041c6cb9edc2f -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/HeightStructures/HeightStructuresFailureMechanismUpdateExtensions.cs (.../HeightStructuresFailureMechanismUpdateExtensions.cs) (revision a5714fc0488030773fff50dfc82041c6cb9edc2f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/HeightStructures/HeightStructuresFailureMechanismUpdateExtensions.cs (.../HeightStructuresFailureMechanismUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ FailureMechanismEntity entity = mechanism.GetCorrespondingEntity( context.FailureMechanismEntities, - o => o.FailureMechanismEntityId); + context); entity.IsRelevant = Convert.ToByte(mechanism.IsRelevant); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/HydraulicBoundaryLocationUpdateExtensions.cs =================================================================== diff -u -ra294987551b0b2d8a27b6e1bc6235b0e2351b6f4 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/HydraulicBoundaryLocationUpdateExtensions.cs (.../HydraulicBoundaryLocationUpdateExtensions.cs) (revision a294987551b0b2d8a27b6e1bc6235b0e2351b6f4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/HydraulicBoundaryLocationUpdateExtensions.cs (.../HydraulicBoundaryLocationUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -59,7 +59,7 @@ HydraulicLocationEntity entity = location.GetCorrespondingEntity( context.HydraulicLocationEntities, - o => o.HydraulicLocationEntityId); + context); entity.Name = location.Name; entity.LocationX = location.Location.X.ToNaNAsNull(); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/IFailureMechanismUpdateExtensions.cs =================================================================== diff -u -r5b3736b5350315a520f72c90222af261ea651019 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/IFailureMechanismUpdateExtensions.cs (.../IFailureMechanismUpdateExtensions.cs) (revision 5b3736b5350315a520f72c90222af261ea651019) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/IFailureMechanismUpdateExtensions.cs (.../IFailureMechanismUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -59,7 +59,7 @@ FailureMechanismEntity entity = mechanism.GetCorrespondingEntity( context.FailureMechanismEntities, - o => o.FailureMechanismEntityId); + context); entity.IsRelevant = Convert.ToByte(mechanism.IsRelevant); entity.Comments = mechanism.Comments; Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/MacrostabilityInwards/MacrostabilityInwardsFailureMechanismSectionResultUpdateExtensions.cs =================================================================== diff -u -ra294987551b0b2d8a27b6e1bc6235b0e2351b6f4 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/MacrostabilityInwards/MacrostabilityInwardsFailureMechanismSectionResultUpdateExtensions.cs (.../MacrostabilityInwardsFailureMechanismSectionResultUpdateExtensions.cs) (revision a294987551b0b2d8a27b6e1bc6235b0e2351b6f4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/MacrostabilityInwards/MacrostabilityInwardsFailureMechanismSectionResultUpdateExtensions.cs (.../MacrostabilityInwardsFailureMechanismSectionResultUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -61,8 +61,8 @@ } MacrostabilityInwardsSectionResultEntity entity = result.GetCorrespondingEntity( - context.MacrostabilityInwardsSectionResultEntities, - s => s.MacrostabilityInwardsSectionResultEntityId); + context.MacrostabilityInwardsSectionResultEntities, + context); entity.LayerOne = Convert.ToByte(result.AssessmentLayerOne); entity.LayerTwoA = result.AssessmentLayerTwoA.ToNaNAsNull(); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/MacrostabilityInwards/MacrostabilityInwardsFailureMechanismUpdateExtensions.cs =================================================================== diff -u -ra5714fc0488030773fff50dfc82041c6cb9edc2f -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/MacrostabilityInwards/MacrostabilityInwardsFailureMechanismUpdateExtensions.cs (.../MacrostabilityInwardsFailureMechanismUpdateExtensions.cs) (revision a5714fc0488030773fff50dfc82041c6cb9edc2f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/MacrostabilityInwards/MacrostabilityInwardsFailureMechanismUpdateExtensions.cs (.../MacrostabilityInwardsFailureMechanismUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ FailureMechanismEntity entity = mechanism.GetCorrespondingEntity( context.FailureMechanismEntities, - o => o.FailureMechanismEntityId); + context); entity.IsRelevant = Convert.ToByte(mechanism.IsRelevant); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/MacrostabilityOutwards/MacrostabilityOutwardsFailureMechanismSectionResultUpdateExtensions.cs =================================================================== diff -u -ra294987551b0b2d8a27b6e1bc6235b0e2351b6f4 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/MacrostabilityOutwards/MacrostabilityOutwardsFailureMechanismSectionResultUpdateExtensions.cs (.../MacrostabilityOutwardsFailureMechanismSectionResultUpdateExtensions.cs) (revision a294987551b0b2d8a27b6e1bc6235b0e2351b6f4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/MacrostabilityOutwards/MacrostabilityOutwardsFailureMechanismSectionResultUpdateExtensions.cs (.../MacrostabilityOutwardsFailureMechanismSectionResultUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ MacrostabilityOutwardsSectionResultEntity entity = result.GetCorrespondingEntity( context.MacrostabilityOutwardsSectionResultEntities, - s => s.MacrostabilityOutwardsSectionResultEntityId); + context); entity.LayerOne = Convert.ToByte(result.AssessmentLayerOne); entity.LayerTwoA = result.AssessmentLayerTwoA.ToNaNAsNull(); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/MacrostabilityOutwards/MacrostabilityOutwardsFailureMechanismUpdateExtensions.cs =================================================================== diff -u -ra5714fc0488030773fff50dfc82041c6cb9edc2f -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/MacrostabilityOutwards/MacrostabilityOutwardsFailureMechanismUpdateExtensions.cs (.../MacrostabilityOutwardsFailureMechanismUpdateExtensions.cs) (revision a5714fc0488030773fff50dfc82041c6cb9edc2f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/MacrostabilityOutwards/MacrostabilityOutwardsFailureMechanismUpdateExtensions.cs (.../MacrostabilityOutwardsFailureMechanismUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ FailureMechanismEntity entity = mechanism.GetCorrespondingEntity( context.FailureMechanismEntities, - o => o.FailureMechanismEntityId); + context); entity.IsRelevant = Convert.ToByte(mechanism.IsRelevant); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Microstability/MicrostabilityFailureMechanismSectionResultUpdateExtensions.cs =================================================================== diff -u -ra294987551b0b2d8a27b6e1bc6235b0e2351b6f4 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Microstability/MicrostabilityFailureMechanismSectionResultUpdateExtensions.cs (.../MicrostabilityFailureMechanismSectionResultUpdateExtensions.cs) (revision a294987551b0b2d8a27b6e1bc6235b0e2351b6f4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Microstability/MicrostabilityFailureMechanismSectionResultUpdateExtensions.cs (.../MicrostabilityFailureMechanismSectionResultUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ MicrostabilitySectionResultEntity entity = result.GetCorrespondingEntity( context.MicrostabilitySectionResultEntities, - s => s.MicrostabilitySectionResultEntityId); + context); entity.LayerOne = Convert.ToByte(result.AssessmentLayerOne); entity.LayerTwoA = Convert.ToByte(result.AssessmentLayerTwoA); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Microstability/MicrostabilityFailureMechanismUpdateExtensions.cs =================================================================== diff -u -ra5714fc0488030773fff50dfc82041c6cb9edc2f -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Microstability/MicrostabilityFailureMechanismUpdateExtensions.cs (.../MicrostabilityFailureMechanismUpdateExtensions.cs) (revision a5714fc0488030773fff50dfc82041c6cb9edc2f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Microstability/MicrostabilityFailureMechanismUpdateExtensions.cs (.../MicrostabilityFailureMechanismUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ FailureMechanismEntity entity = mechanism.GetCorrespondingEntity( context.FailureMechanismEntities, - o => o.FailureMechanismEntityId); + context); entity.IsRelevant = Convert.ToByte(mechanism.IsRelevant); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Piping/PipingCalculationScenarioUpdateExtensions.cs =================================================================== diff -u -ra294987551b0b2d8a27b6e1bc6235b0e2351b6f4 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Piping/PipingCalculationScenarioUpdateExtensions.cs (.../PipingCalculationScenarioUpdateExtensions.cs) (revision a294987551b0b2d8a27b6e1bc6235b0e2351b6f4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Piping/PipingCalculationScenarioUpdateExtensions.cs (.../PipingCalculationScenarioUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -65,7 +65,7 @@ PipingCalculationEntity entity = calculation.GetCorrespondingEntity( context.PipingCalculationEntities, - o => o.PipingCalculationEntityId); + context); entity.RelevantForScenario = Convert.ToByte(calculation.IsRelevant); entity.ScenarioContribution = calculation.Contribution.Value.ToNaNAsNull(); entity.Name = calculation.Name; Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Piping/PipingFailureMechanismSectionResultUpdateExtensions.cs =================================================================== diff -u -ra294987551b0b2d8a27b6e1bc6235b0e2351b6f4 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Piping/PipingFailureMechanismSectionResultUpdateExtensions.cs (.../PipingFailureMechanismSectionResultUpdateExtensions.cs) (revision a294987551b0b2d8a27b6e1bc6235b0e2351b6f4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Piping/PipingFailureMechanismSectionResultUpdateExtensions.cs (.../PipingFailureMechanismSectionResultUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ PipingSectionResultEntity entity = result.GetCorrespondingEntity( context.PipingSectionResultEntities, - o => o.PipingSectionResultEntityId); + context); entity.LayerOne = Convert.ToByte(result.AssessmentLayerOne); entity.LayerThree = result.AssessmentLayerThree.Value.ToNaNAsNull(); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Piping/PipingFailureMechanismUpdateExtensions.cs =================================================================== diff -u -r06e4debe3f4a9bdfb38c40b8c00ed013e8f7bb98 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Piping/PipingFailureMechanismUpdateExtensions.cs (.../PipingFailureMechanismUpdateExtensions.cs) (revision 06e4debe3f4a9bdfb38c40b8c00ed013e8f7bb98) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Piping/PipingFailureMechanismUpdateExtensions.cs (.../PipingFailureMechanismUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -63,7 +63,7 @@ FailureMechanismEntity entity = mechanism.GetCorrespondingEntity( context.FailureMechanismEntities, - o => o.FailureMechanismEntityId); + context); entity.IsRelevant = Convert.ToByte(mechanism.IsRelevant); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Piping/PipingProbabilityAssessmentInputUpdateExtensions.cs =================================================================== diff -u -ra294987551b0b2d8a27b6e1bc6235b0e2351b6f4 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Piping/PipingProbabilityAssessmentInputUpdateExtensions.cs (.../PipingProbabilityAssessmentInputUpdateExtensions.cs) (revision a294987551b0b2d8a27b6e1bc6235b0e2351b6f4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Piping/PipingProbabilityAssessmentInputUpdateExtensions.cs (.../PipingProbabilityAssessmentInputUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -61,7 +61,7 @@ PipingFailureMechanismMetaEntity entity = probabilityAssessmentInput.GetCorrespondingEntity( context.PipingFailureMechanismMetaEntities, - o => o.PipingFailureMechanismMetaEntityId); + context); entity.A = probabilityAssessmentInput.A; Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Piping/PipingSoilLayerUpdateExtensions.cs =================================================================== diff -u -ra5714fc0488030773fff50dfc82041c6cb9edc2f -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Piping/PipingSoilLayerUpdateExtensions.cs (.../PipingSoilLayerUpdateExtensions.cs) (revision a5714fc0488030773fff50dfc82041c6cb9edc2f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Piping/PipingSoilLayerUpdateExtensions.cs (.../PipingSoilLayerUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -61,7 +61,7 @@ SoilLayerEntity entity = layer.GetCorrespondingEntity( context.SoilLayerEntities, - o => o.SoilLayerEntityId); + context); entity.IsAquifer = Convert.ToByte(layer.IsAquifer); entity.Top = layer.Top; Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Piping/PipingSoilProfileUpdateExtensions.cs =================================================================== diff -u -ra294987551b0b2d8a27b6e1bc6235b0e2351b6f4 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Piping/PipingSoilProfileUpdateExtensions.cs (.../PipingSoilProfileUpdateExtensions.cs) (revision a294987551b0b2d8a27b6e1bc6235b0e2351b6f4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Piping/PipingSoilProfileUpdateExtensions.cs (.../PipingSoilProfileUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ SoilProfileEntity entity = profile.GetCorrespondingEntity( context.SoilProfileEntities, - o => o.SoilProfileEntityId); + context); entity.Name = profile.Name; entity.Bottom = profile.Bottom.ToNaNAsNull(); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Piping/RingtoetsPipingSurfaceLineUpdateExtensions.cs =================================================================== diff -u -r508d720230c5f63bce7f95bddc3b7a04808d267d -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Piping/RingtoetsPipingSurfaceLineUpdateExtensions.cs (.../RingtoetsPipingSurfaceLineUpdateExtensions.cs) (revision 508d720230c5f63bce7f95bddc3b7a04808d267d) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Piping/RingtoetsPipingSurfaceLineUpdateExtensions.cs (.../RingtoetsPipingSurfaceLineUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -66,7 +66,7 @@ SurfaceLineEntity entity = surfaceLine.GetCorrespondingEntity( context.SurfaceLineEntities, - o => o.SurfaceLineEntityId); + context); entity.Name = surfaceLine.Name; entity.ReferenceLineIntersectionX = surfaceLine.ReferenceLineIntersectionWorldPoint.X.ToNaNAsNull(); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Piping/StochasticSoilModelUpdateExtensions.cs =================================================================== diff -u -r508d720230c5f63bce7f95bddc3b7a04808d267d -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Piping/StochasticSoilModelUpdateExtensions.cs (.../StochasticSoilModelUpdateExtensions.cs) (revision 508d720230c5f63bce7f95bddc3b7a04808d267d) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Piping/StochasticSoilModelUpdateExtensions.cs (.../StochasticSoilModelUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -63,7 +63,7 @@ StochasticSoilModelEntity entity = model.GetCorrespondingEntity( context.StochasticSoilModelEntities, - o => o.StochasticSoilModelEntityId); + context); entity.Name = model.Name; entity.SegmentName = model.SegmentName; Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Piping/StochasticSoilProfileUpdateExtensions.cs =================================================================== diff -u -ra294987551b0b2d8a27b6e1bc6235b0e2351b6f4 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Piping/StochasticSoilProfileUpdateExtensions.cs (.../StochasticSoilProfileUpdateExtensions.cs) (revision a294987551b0b2d8a27b6e1bc6235b0e2351b6f4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Piping/StochasticSoilProfileUpdateExtensions.cs (.../StochasticSoilProfileUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ StochasticSoilProfileEntity entity = profile.GetCorrespondingEntity( context.StochasticSoilProfileEntities, - o => o.StochasticSoilProfileEntityId); + context); entity.Probability = profile.Probability.ToNaNAsNull(); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/PipingStructure/PipingStructureFailureMechanismSectionResultUpdateExtensions.cs =================================================================== diff -u -ra294987551b0b2d8a27b6e1bc6235b0e2351b6f4 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/PipingStructure/PipingStructureFailureMechanismSectionResultUpdateExtensions.cs (.../PipingStructureFailureMechanismSectionResultUpdateExtensions.cs) (revision a294987551b0b2d8a27b6e1bc6235b0e2351b6f4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/PipingStructure/PipingStructureFailureMechanismSectionResultUpdateExtensions.cs (.../PipingStructureFailureMechanismSectionResultUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ PipingStructureSectionResultEntity entity = result.GetCorrespondingEntity( context.PipingStructureSectionResultEntities, - s => s.PipingStructureSectionResultEntityId); + context); entity.LayerOne = Convert.ToByte(result.AssessmentLayerOne); entity.LayerTwoA = Convert.ToByte(result.AssessmentLayerTwoA); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/PipingStructure/PipingStructureFailureMechanismUpdateExtensions.cs =================================================================== diff -u -ra5714fc0488030773fff50dfc82041c6cb9edc2f -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/PipingStructure/PipingStructureFailureMechanismUpdateExtensions.cs (.../PipingStructureFailureMechanismUpdateExtensions.cs) (revision a5714fc0488030773fff50dfc82041c6cb9edc2f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/PipingStructure/PipingStructureFailureMechanismUpdateExtensions.cs (.../PipingStructureFailureMechanismUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ FailureMechanismEntity entity = mechanism.GetCorrespondingEntity( context.FailureMechanismEntities, - o => o.FailureMechanismEntityId); + context); entity.IsRelevant = Convert.ToByte(mechanism.IsRelevant); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/ProbabilityAssessmentOutputUpdateExtensions.cs =================================================================== diff -u -r3ddadfbc5e096c8df7d709be0d9a9057cf4b8dd6 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/ProbabilityAssessmentOutputUpdateExtensions.cs (.../ProbabilityAssessmentOutputUpdateExtensions.cs) (revision 3ddadfbc5e096c8df7d709be0d9a9057cf4b8dd6) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/ProbabilityAssessmentOutputUpdateExtensions.cs (.../ProbabilityAssessmentOutputUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -63,7 +63,7 @@ ProbabilisticOutputEntity entity = output.GetCorrespondingEntity( context.ProbabilisticOutputEntities, - o => o.ProbabilisticOutputEntityId); + context); registry.Register(entity, output); } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/RingtoetsProjectUpdateExtensions.cs =================================================================== diff -u -re2e6d944af7b0cea6c9c34e77bd0644149526c37 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/RingtoetsProjectUpdateExtensions.cs (.../RingtoetsProjectUpdateExtensions.cs) (revision e2e6d944af7b0cea6c9c34e77bd0644149526c37) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/RingtoetsProjectUpdateExtensions.cs (.../RingtoetsProjectUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -59,7 +59,7 @@ ProjectEntity entity = project.GetCorrespondingEntity( context.ProjectEntities, - o => o.ProjectEntityId); + context); entity.Description = project.Description; Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/StabilityStoneCover/StabilityStoneCoverFailureMechanismSectionResultUpdateExtensions.cs =================================================================== diff -u -ra294987551b0b2d8a27b6e1bc6235b0e2351b6f4 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/StabilityStoneCover/StabilityStoneCoverFailureMechanismSectionResultUpdateExtensions.cs (.../StabilityStoneCoverFailureMechanismSectionResultUpdateExtensions.cs) (revision a294987551b0b2d8a27b6e1bc6235b0e2351b6f4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/StabilityStoneCover/StabilityStoneCoverFailureMechanismSectionResultUpdateExtensions.cs (.../StabilityStoneCoverFailureMechanismSectionResultUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ StabilityStoneCoverSectionResultEntity entity = result.GetCorrespondingEntity( context.StabilityStoneCoverSectionResultEntities, - s => s.StabilityStoneCoverSectionResultEntityId); + context); entity.LayerTwoA = Convert.ToByte(result.AssessmentLayerTwoA); entity.LayerThree = result.AssessmentLayerThree.Value.ToNaNAsNull(); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/StabilityStoneCover/StabilityStoneCoverFailureMechanismUpdateExtensions.cs =================================================================== diff -u -ra5714fc0488030773fff50dfc82041c6cb9edc2f -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/StabilityStoneCover/StabilityStoneCoverFailureMechanismUpdateExtensions.cs (.../StabilityStoneCoverFailureMechanismUpdateExtensions.cs) (revision a5714fc0488030773fff50dfc82041c6cb9edc2f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/StabilityStoneCover/StabilityStoneCoverFailureMechanismUpdateExtensions.cs (.../StabilityStoneCoverFailureMechanismUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ FailureMechanismEntity entity = mechanism.GetCorrespondingEntity( context.FailureMechanismEntities, - o => o.FailureMechanismEntityId); + context); entity.IsRelevant = Convert.ToByte(mechanism.IsRelevant); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/StrengthStabilityLengthwiseConstruction/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultUpdateExtensions.cs =================================================================== diff -u -ra294987551b0b2d8a27b6e1bc6235b0e2351b6f4 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/StrengthStabilityLengthwiseConstruction/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultUpdateExtensions.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultUpdateExtensions.cs) (revision a294987551b0b2d8a27b6e1bc6235b0e2351b6f4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/StrengthStabilityLengthwiseConstruction/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultUpdateExtensions.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ StrengthStabilityLengthwiseConstructionSectionResultEntity entity = result.GetCorrespondingEntity( context.StrengthStabilityLengthwiseConstructionSectionResultEntities, - o => o.StrengthStabilityLengthwiseConstructionSectionResultEntityId); + context); entity.LayerOne = Convert.ToByte(result.AssessmentLayerOne); entity.LayerThree = result.AssessmentLayerThree.Value.ToNaNAsNull(); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/StrengthStabilityLengthwiseConstruction/StrengthStabilityLengthwiseConstructionFailureMechanismUpdateExtensions.cs =================================================================== diff -u -ra5714fc0488030773fff50dfc82041c6cb9edc2f -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/StrengthStabilityLengthwiseConstruction/StrengthStabilityLengthwiseConstructionFailureMechanismUpdateExtensions.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismUpdateExtensions.cs) (revision a5714fc0488030773fff50dfc82041c6cb9edc2f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/StrengthStabilityLengthwiseConstruction/StrengthStabilityLengthwiseConstructionFailureMechanismUpdateExtensions.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ FailureMechanismEntity entity = mechanism.GetCorrespondingEntity( context.FailureMechanismEntities, - o => o.FailureMechanismEntityId); + context); entity.IsRelevant = Convert.ToByte(mechanism.IsRelevant); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/StrengthStabilityPointConstruction/StrengthStabilityPointConstructionFailureMechanismSectionResultUpdateExtensions.cs =================================================================== diff -u -ra294987551b0b2d8a27b6e1bc6235b0e2351b6f4 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/StrengthStabilityPointConstruction/StrengthStabilityPointConstructionFailureMechanismSectionResultUpdateExtensions.cs (.../StrengthStabilityPointConstructionFailureMechanismSectionResultUpdateExtensions.cs) (revision a294987551b0b2d8a27b6e1bc6235b0e2351b6f4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/StrengthStabilityPointConstruction/StrengthStabilityPointConstructionFailureMechanismSectionResultUpdateExtensions.cs (.../StrengthStabilityPointConstructionFailureMechanismSectionResultUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ StrengthStabilityPointConstructionSectionResultEntity entity = result.GetCorrespondingEntity( context.StrengthStabilityPointConstructionSectionResultEntities, - s => s.StrengthStabilityPointConstructionSectionResultEntityId); + context); entity.LayerTwoA = result.AssessmentLayerTwoA.ToNaNAsNull(); entity.LayerThree = result.AssessmentLayerThree.Value.ToNaNAsNull(); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/StrengthStabilityPointConstruction/StrengthStabilityPointConstructionFailureMechanismUpdateExtensions.cs =================================================================== diff -u -ra5714fc0488030773fff50dfc82041c6cb9edc2f -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/StrengthStabilityPointConstruction/StrengthStabilityPointConstructionFailureMechanismUpdateExtensions.cs (.../StrengthStabilityPointConstructionFailureMechanismUpdateExtensions.cs) (revision a5714fc0488030773fff50dfc82041c6cb9edc2f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/StrengthStabilityPointConstruction/StrengthStabilityPointConstructionFailureMechanismUpdateExtensions.cs (.../StrengthStabilityPointConstructionFailureMechanismUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ FailureMechanismEntity entity = mechanism.GetCorrespondingEntity( context.FailureMechanismEntities, - o => o.FailureMechanismEntityId); + context); entity.IsRelevant = Convert.ToByte(mechanism.IsRelevant); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/TechnicalInnovation/TechnicalInnovationFailureMechanismSectionResultUpdateExtensions.cs =================================================================== diff -u -ra294987551b0b2d8a27b6e1bc6235b0e2351b6f4 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/TechnicalInnovation/TechnicalInnovationFailureMechanismSectionResultUpdateExtensions.cs (.../TechnicalInnovationFailureMechanismSectionResultUpdateExtensions.cs) (revision a294987551b0b2d8a27b6e1bc6235b0e2351b6f4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/TechnicalInnovation/TechnicalInnovationFailureMechanismSectionResultUpdateExtensions.cs (.../TechnicalInnovationFailureMechanismSectionResultUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ TechnicalInnovationSectionResultEntity entity = result.GetCorrespondingEntity( context.TechnicalInnovationSectionResultEntities, - o => o.TechnicalInnovationSectionResultEntityId); + context); entity.LayerOne = Convert.ToByte(result.AssessmentLayerOne); entity.LayerThree = result.AssessmentLayerThree.Value.ToNaNAsNull(); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/TechnicalInnovation/TechnicalInnovationFailureMechanismUpdateExtensions.cs =================================================================== diff -u -ra5714fc0488030773fff50dfc82041c6cb9edc2f -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/TechnicalInnovation/TechnicalInnovationFailureMechanismUpdateExtensions.cs (.../TechnicalInnovationFailureMechanismUpdateExtensions.cs) (revision a5714fc0488030773fff50dfc82041c6cb9edc2f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/TechnicalInnovation/TechnicalInnovationFailureMechanismUpdateExtensions.cs (.../TechnicalInnovationFailureMechanismUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ FailureMechanismEntity entity = mechanism.GetCorrespondingEntity( context.FailureMechanismEntities, - o => o.FailureMechanismEntityId); + context); entity.IsRelevant = Convert.ToByte(mechanism.IsRelevant); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismSectionResultUpdateExtensions.cs =================================================================== diff -u -ra294987551b0b2d8a27b6e1bc6235b0e2351b6f4 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismSectionResultUpdateExtensions.cs (.../WaterPressureAsphaltCoverFailureMechanismSectionResultUpdateExtensions.cs) (revision a294987551b0b2d8a27b6e1bc6235b0e2351b6f4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismSectionResultUpdateExtensions.cs (.../WaterPressureAsphaltCoverFailureMechanismSectionResultUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ WaterPressureAsphaltCoverSectionResultEntity entity = result.GetCorrespondingEntity( context.WaterPressureAsphaltCoverSectionResultEntities, - o => o.WaterPressureAsphaltCoverSectionResultEntityId); + context); entity.LayerOne = Convert.ToByte(result.AssessmentLayerOne); entity.LayerThree = result.AssessmentLayerThree.Value.ToNaNAsNull(); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismUpdateExtensions.cs =================================================================== diff -u -ra5714fc0488030773fff50dfc82041c6cb9edc2f -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismUpdateExtensions.cs (.../WaterPressureAsphaltCoverFailureMechanismUpdateExtensions.cs) (revision a5714fc0488030773fff50dfc82041c6cb9edc2f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismUpdateExtensions.cs (.../WaterPressureAsphaltCoverFailureMechanismUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ FailureMechanismEntity entity = mechanism.GetCorrespondingEntity( context.FailureMechanismEntities, - o => o.FailureMechanismEntityId); + context); entity.IsRelevant = Convert.ToByte(mechanism.IsRelevant); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismSectionResultUpdateExtensions.cs =================================================================== diff -u -ra294987551b0b2d8a27b6e1bc6235b0e2351b6f4 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismSectionResultUpdateExtensions.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultUpdateExtensions.cs) (revision a294987551b0b2d8a27b6e1bc6235b0e2351b6f4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismSectionResultUpdateExtensions.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ WaveImpactAsphaltCoverSectionResultEntity entity = result.GetCorrespondingEntity( context.WaveImpactAsphaltCoverSectionResultEntities, - s => s.WaveImpactAsphaltCoverSectionResultEntityId); + context); entity.LayerOne = Convert.ToByte(result.AssessmentLayerOne); entity.LayerTwoA = result.AssessmentLayerTwoA.Value.ToNaNAsNull(); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismUpdateExtensions.cs =================================================================== diff -u -ra5714fc0488030773fff50dfc82041c6cb9edc2f -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismUpdateExtensions.cs (.../WaveImpactAsphaltCoverFailureMechanismUpdateExtensions.cs) (revision a5714fc0488030773fff50dfc82041c6cb9edc2f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismUpdateExtensions.cs (.../WaveImpactAsphaltCoverFailureMechanismUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -62,7 +62,7 @@ FailureMechanismEntity entity = mechanism.GetCorrespondingEntity( context.FailureMechanismEntities, - o => o.FailureMechanismEntityId); + context); entity.IsRelevant = Convert.ToByte(mechanism.IsRelevant); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs =================================================================== diff -u -ra20794746c723f3d02434953861bd3dc57800b73 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs (.../GrassCoverErosionInwardsOutputCreateExtensionsTest.cs) (revision a20794746c723f3d02434953861bd3dc57800b73) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs (.../GrassCoverErosionInwardsOutputCreateExtensionsTest.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -129,9 +129,9 @@ GrassCoverErosionInwardsOutputEntity entity = output.Create(registry); // Assert - entity.GrassCoverErosionInwardsOutputId = 984756; + entity.GrassCoverErosionInwardsOutputEntityId = 984756; registry.TransferIds(); - Assert.AreEqual(entity.GrassCoverErosionInwardsOutputId, output.StorageId); + Assert.AreEqual(entity.GrassCoverErosionInwardsOutputEntityId, output.StorageId); } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs =================================================================== diff -u -r508d720230c5f63bce7f95bddc3b7a04808d267d -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs (.../PersistenceRegistryTest.cs) (revision 508d720230c5f63bce7f95bddc3b7a04808d267d) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs (.../PersistenceRegistryTest.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -2292,7 +2292,7 @@ long storageId = new Random(21).Next(1, 4000); var entity = new GrassCoverErosionInwardsOutputEntity { - GrassCoverErosionInwardsOutputId = storageId + GrassCoverErosionInwardsOutputEntityId = storageId }; var model = new GrassCoverErosionInwardsOutput(1, false, new ProbabilityAssessmentOutput(1, 1, 1, 1, 1), 1); registry.Register(entity, model); @@ -3214,18 +3214,18 @@ var orphanedEntity = new GrassCoverErosionInwardsOutputEntity { - GrassCoverErosionInwardsOutputId = 1 + GrassCoverErosionInwardsOutputEntityId = 1 }; var persistentEntity = new GrassCoverErosionInwardsOutputEntity { - GrassCoverErosionInwardsOutputId = 2 + GrassCoverErosionInwardsOutputEntityId = 2 }; dbContext.GrassCoverErosionInwardsOutputEntities.Add(orphanedEntity); dbContext.GrassCoverErosionInwardsOutputEntities.Add(persistentEntity); var calculation = new GrassCoverErosionInwardsOutput(1, false, new ProbabilityAssessmentOutput(1, 1, 1, 1, 1), 1) { - StorageId = persistentEntity.GrassCoverErosionInwardsOutputId + StorageId = persistentEntity.GrassCoverErosionInwardsOutputEntityId }; var registry = new PersistenceRegistry(); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IStorableExtensionsTest.cs =================================================================== diff -u -rb5c11c4e073b7e10365ddbe62f83418ebaba14c4 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IStorableExtensionsTest.cs (.../IStorableExtensionsTest.cs) (revision b5c11c4e073b7e10365ddbe62f83418ebaba14c4) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IStorableExtensionsTest.cs (.../IStorableExtensionsTest.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -21,6 +21,8 @@ using System; using System.Collections.ObjectModel; + +using Application.Ringtoets.Storage.DbContext; using Application.Ringtoets.Storage.Exceptions; using Application.Ringtoets.Storage.TestUtil; using Core.Common.Base.Storage; @@ -58,104 +60,129 @@ public void Find_NoItemsInContext_ThrowsException() { // Setup + var mocks = new MockRepository(); + var context = mocks.Stub(); + mocks.ReplayAll(); + var storable = new SimpleStorable(); var set = new TestDbSet(new ObservableCollection()); // Call - TestDelegate test = () => storable.GetCorrespondingEntity(set, o => 1); + TestDelegate test = () => storable.GetCorrespondingEntity(set, context); // Assert var message = Assert.Throws(test).Message; Assert.AreEqual("Het object 'Object' met id '0' is niet gevonden.", message); + mocks.VerifyAll(); } [Test] public void Find_NoItemsWithIdInContext_ThrowsException() { // Setup + var mocks = new MockRepository(); + var context = mocks.Stub(); + mocks.ReplayAll(); + var storable = new SimpleStorable { StorageId = 21 }; var set = new TestDbSet(new ObservableCollection()); set.Add(new WithId { - Id = 11 + WithIdId = 11 }); // Call - TestDelegate test = () => storable.GetCorrespondingEntity(set, o => o.Id); + TestDelegate test = () => storable.GetCorrespondingEntity(set, context); // Assert var message = Assert.Throws(test).Message; Assert.AreEqual(string.Format("Het object 'WithId' met id '{0}' is niet gevonden.", storable.StorageId), message); + mocks.VerifyAll(); } [Test] public void Find_MultipleItemsWithIdInContext_ThrowsException() { // Setup + var mocks = new MockRepository(); + var context = mocks.Stub(); + mocks.ReplayAll(); + var storable = new SimpleStorable { StorageId = 21 }; var set = new TestDbSet(new ObservableCollection()); - set.Add(new WithId { Id = storable.StorageId }); - set.Add(new WithId { Id = storable.StorageId }); + set.Add(new WithId { WithIdId = storable.StorageId }); + set.Add(new WithId { WithIdId = storable.StorageId }); // Call - TestDelegate test = () => storable.GetCorrespondingEntity(set, o => o.Id); + TestDelegate test = () => storable.GetCorrespondingEntity(set, context); // Assert var message = Assert.Throws(test).Message; Assert.AreEqual(string.Format("Het object 'WithId' met id '{0}' is niet gevonden.", storable.StorageId), message); + mocks.VerifyAll(); } [Test] public void Find_ItemWithIdZeroInContext_ThrowsException() { // Setup + var mocks = new MockRepository(); + var context = mocks.Stub(); + mocks.ReplayAll(); + var storable = new SimpleStorable { StorageId = 0 }; var set = new TestDbSet(new ObservableCollection()); var expectedItem = new WithId { - Id = storable.StorageId + WithIdId = storable.StorageId }; set.Add(expectedItem); - set.Add(new WithId { Id = 19 }); + set.Add(new WithId { WithIdId = 19 }); // Call - TestDelegate test = () => storable.GetCorrespondingEntity(set, o => o.Id); + TestDelegate test = () => storable.GetCorrespondingEntity(set, context); // Assert var message = Assert.Throws(test).Message; Assert.AreEqual("Het object \'WithId\' met id \'0\' is niet gevonden.", message); + mocks.VerifyAll(); } [Test] public void Find_ItemWithIdNotZeroInContext_ReturnEntityFromContext() { // Setup + var mocks = new MockRepository(); + var context = mocks.Stub(); + mocks.ReplayAll(); + var storable = new SimpleStorable { StorageId = new Random(21).Next(1, int.MaxValue) }; var set = new TestDbSet(new ObservableCollection()); var expectedItem = new WithId { - Id = storable.StorageId + WithIdId = storable.StorageId }; set.Add(expectedItem); - set.Add(new WithId { Id = 19 }); + set.Add(new WithId { WithIdId = 19 }); // Call - WithId actualItem = storable.GetCorrespondingEntity(set, o => o.Id); + WithId actualItem = storable.GetCorrespondingEntity(set, context); // Assert Assert.AreSame(expectedItem, actualItem); + mocks.VerifyAll(); } } @@ -164,6 +191,6 @@ } public class WithId { - public long Id { get; set; } + public long WithIdId { get; set; } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs =================================================================== diff -u -r1e9309149f9387c4e8b10f6c5f429797220b0ef8 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs) (revision 1e9309149f9387c4e8b10f6c5f429797220b0ef8) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -268,7 +268,7 @@ GrassCoverErosionInwardsCalculationEntityId = 456, GrassCoverErosionInwardsOutputEntity = new GrassCoverErosionInwardsOutputEntity { - GrassCoverErosionInwardsOutputId = 9745, + GrassCoverErosionInwardsOutputEntityId = 9745, ProbabilisticOutputEntity = new ProbabilisticOutputEntity { ProbabilisticOutputEntityId = 3245 @@ -294,7 +294,7 @@ GrassCoverErosionInwardsCalculationEntityId = 456, GrassCoverErosionInwardsOutputEntity = new GrassCoverErosionInwardsOutputEntity { - GrassCoverErosionInwardsOutputId = 9745, + GrassCoverErosionInwardsOutputEntityId = 9745, ProbabilisticOutputEntity = new ProbabilisticOutputEntity { ProbabilisticOutputEntityId = 3245 Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs =================================================================== diff -u -r90deb88f193d2b0eb45c013b1101864c298a18d5 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs) (revision 90deb88f193d2b0eb45c013b1101864c298a18d5) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -48,7 +48,7 @@ }; var entity = new GrassCoverErosionInwardsOutputEntity { - GrassCoverErosionInwardsOutputId = 495876, + GrassCoverErosionInwardsOutputEntityId = 495876, WaveHeight = 1.1, IsOvertoppingDominant = Convert.ToByte(false), ProbabilisticOutputEntity = probabilisticOutputEntity, @@ -60,7 +60,7 @@ GrassCoverErosionInwardsOutput output = entity.Read(); // Assert - Assert.AreEqual(entity.GrassCoverErosionInwardsOutputId, output.StorageId); + Assert.AreEqual(entity.GrassCoverErosionInwardsOutputEntityId, output.StorageId); Assert.AreEqual(entity.WaveHeight, output.WaveHeight.Value); Assert.IsFalse(output.IsOvertoppingDominant); Assert.AreEqual(entity.DikeHeight, output.DikeHeight.Value); @@ -89,7 +89,7 @@ }; var entity = new GrassCoverErosionInwardsOutputEntity { - GrassCoverErosionInwardsOutputId = 7536, + GrassCoverErosionInwardsOutputEntityId = 7536, WaveHeight = null, IsOvertoppingDominant = Convert.ToByte(true), ProbabilisticOutputEntity = probabilisticOutputEntity, @@ -101,7 +101,7 @@ GrassCoverErosionInwardsOutput output = entity.Read(); // Assert - Assert.AreEqual(entity.GrassCoverErosionInwardsOutputId, output.StorageId); + Assert.AreEqual(entity.GrassCoverErosionInwardsOutputEntityId, output.StorageId); Assert.IsNaN(output.WaveHeight); Assert.IsTrue(output.IsOvertoppingDominant); Assert.IsNaN(output.DikeHeight); @@ -125,7 +125,7 @@ }; var entity = new GrassCoverErosionInwardsOutputEntity { - GrassCoverErosionInwardsOutputId = 7536, + GrassCoverErosionInwardsOutputEntityId = 7536, ProbabilisticOutputEntity = probabilisticOutputEntity, DikeHeight = null, IsDikeHeightCalculated = Convert.ToByte(false) Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationUpdateExtensionsTest.cs =================================================================== diff -u -r66741e6e68057769a41a135dde00fdc82eeaeed4 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationUpdateExtensionsTest.cs (.../GrassCoverErosionInwardsCalculationUpdateExtensionsTest.cs) (revision 66741e6e68057769a41a135dde00fdc82eeaeed4) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationUpdateExtensionsTest.cs (.../GrassCoverErosionInwardsCalculationUpdateExtensionsTest.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -415,7 +415,7 @@ var outputEntity = new GrassCoverErosionInwardsOutputEntity { - GrassCoverErosionInwardsOutputId = calculation.Output.StorageId, + GrassCoverErosionInwardsOutputEntityId = calculation.Output.StorageId, ProbabilisticOutputEntity = new ProbabilisticOutputEntity { ProbabilisticOutputEntityId = calculation.Output.ProbabilityAssessmentOutput.StorageId @@ -458,7 +458,7 @@ var outputEntity = new GrassCoverErosionInwardsOutputEntity { - GrassCoverErosionInwardsOutputId = 3, + GrassCoverErosionInwardsOutputEntityId = 3, ProbabilisticOutputEntity = new ProbabilisticOutputEntity { ProbabilisticOutputEntityId = 12 Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputUpdateExtensionsTest.cs =================================================================== diff -u -r3ddadfbc5e096c8df7d709be0d9a9057cf4b8dd6 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputUpdateExtensionsTest.cs (.../GrassCoverErosionInwardsOutputUpdateExtensionsTest.cs) (revision 3ddadfbc5e096c8df7d709be0d9a9057cf4b8dd6) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputUpdateExtensionsTest.cs (.../GrassCoverErosionInwardsOutputUpdateExtensionsTest.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -102,7 +102,7 @@ var entity = new GrassCoverErosionInwardsOutputEntity { - GrassCoverErosionInwardsOutputId = 23 + GrassCoverErosionInwardsOutputEntityId = 23 }; var probabilisticOutputEntity = new ProbabilisticOutputEntity { @@ -139,15 +139,15 @@ var persistentEntity = new GrassCoverErosionInwardsOutputEntity { - GrassCoverErosionInwardsOutputId = 23 + GrassCoverErosionInwardsOutputEntityId = 23 }; var persistentProbabilisticOutputEntity = new ProbabilisticOutputEntity { ProbabilisticOutputEntityId = 12 }; var orphanedEntity = new GrassCoverErosionInwardsOutputEntity { - GrassCoverErosionInwardsOutputId = 42 + GrassCoverErosionInwardsOutputEntityId = 42 }; var orphanedProbabilisticOutputEntity = new ProbabilisticOutputEntity { @@ -166,7 +166,7 @@ }; var output = new GrassCoverErosionInwardsOutput(1, true, probabilityAssessmentOutput, 1) { - StorageId = persistentEntity.GrassCoverErosionInwardsOutputId + StorageId = persistentEntity.GrassCoverErosionInwardsOutputEntityId }; // Call Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/RingtoetsProjectUpdateExtensionsTest.cs =================================================================== diff -u -re2e6d944af7b0cea6c9c34e77bd0644149526c37 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/RingtoetsProjectUpdateExtensionsTest.cs (.../RingtoetsProjectUpdateExtensionsTest.cs) (revision e2e6d944af7b0cea6c9c34e77bd0644149526c37) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/RingtoetsProjectUpdateExtensionsTest.cs (.../RingtoetsProjectUpdateExtensionsTest.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -26,7 +26,6 @@ using Application.Ringtoets.Storage.Exceptions; using Application.Ringtoets.Storage.TestUtil; using Application.Ringtoets.Storage.Update; -using Core.Common.Base.Data; using NUnit.Framework; using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/TestDbSet.cs =================================================================== diff -u -rbc9552772d4e6a6bd786dfcaef808da1964e8c53 -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/TestDbSet.cs (.../TestDbSet.cs) (revision bc9552772d4e6a6bd786dfcaef808da1964e8c53) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/TestDbSet.cs (.../TestDbSet.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) @@ -103,5 +103,16 @@ { return collection.GetEnumerator(); } + + public override T Find(params object[] keyValues) + { + var propertyInfo = typeof(T).GetProperty(typeof(T).Name + "Id"); + if (propertyInfo == null) + { + // Naming convention: Primary key of an entity should be named '+Id', but convention is violated: + throw new MissingMemberException(typeof(T).Name, typeof(T).Name + "Id"); + } + return collection.SingleOrDefault(i => propertyInfo.GetValue(i, null).Equals(keyValues[0])); + } } } \ No newline at end of file