Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.1_17.2.sql =================================================================== diff -u -r1543dcd22a7c56965614a332de89abcc1f4491ee -rd1f8355cc00c35f21fe9ad916db4ac54a46d9ccf --- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.1_17.2.sql (.../Migration_17.1_17.2.sql) (revision 1543dcd22a7c56965614a332de89abcc1f4491ee) +++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.1_17.2.sql (.../Migration_17.1_17.2.sql) (revision d1f8355cc00c35f21fe9ad916db4ac54a46d9ccf) @@ -1334,6 +1334,71 @@ JOIN TempAssessmentSectionFailureMechanism AS asfm ON asfm.[FailureMechanismId] = sps.[FailureMechanismEntityId] WHERE source.[Id] IS NOT sps.[Id]; +INSERT INTO TempChanges +SELECT + asfm.[AssessmentSectionId], + asfm.[AssessmentSectionName], + asfm.[FailureMechanismId], + asfm.[FailureMechanismName], + "Het geregistreerde resultaat voor toetslaag 3 in '" || fms.[Name] || "' ('" || source.[LayerThree] || "') kon niet worden geconverteerd naar een geldige kans en is verwijderd." + FROM PipingSectionResultEntity as psr + JOIN [SOURCEPROJECT].PipingSectionResultEntity AS source ON psr.[rowid] = source.[rowid] + JOIN FailureMechanismSectionEntity as fms ON fms.[FailureMechanismSectionEntityId] = psr.[FailureMechanismSectionEntityId] + JOIN TempAssessmentSectionFailureMechanism AS asfm ON asfm.[FailureMechanismId] = fms.[FailureMechanismEntityId] + WHERE source.[LayerThree] IS NOT psr.[LayerThree]; + +INSERT INTO TempChanges +SELECT + asfm.[AssessmentSectionId], + asfm.[AssessmentSectionName], + asfm.[FailureMechanismId], + asfm.[FailureMechanismName], + "Het geregistreerde resultaat voor toetslaag 3 in '" || fms.[Name] || "' ('" || source.[LayerThree] || "') kon niet worden geconverteerd naar een geldige kans en is verwijderd." + FROM GrassCoverErosionInwardsSectionResultEntity as gceisr + JOIN [SOURCEPROJECT].GrassCoverErosionInwardsSectionResultEntity AS source ON gceisr.[rowid] = source.[rowid] + JOIN FailureMechanismSectionEntity as fms ON fms.[FailureMechanismSectionEntityId] = gceisr.[FailureMechanismSectionEntityId] + JOIN TempAssessmentSectionFailureMechanism AS asfm ON asfm.[FailureMechanismId] = fms.[FailureMechanismEntityId] + WHERE source.[LayerThree] IS NOT gceisr.[LayerThree]; + +INSERT INTO TempChanges +SELECT + asfm.[AssessmentSectionId], + asfm.[AssessmentSectionName], + asfm.[FailureMechanismId], + asfm.[FailureMechanismName], + "Het geregistreerde resultaat voor toetslaag 3 in '" || fms.[Name] || "' ('" || source.[LayerThree] || "') kon niet worden geconverteerd naar een geldige kans en is verwijderd." + FROM ClosingStructuresSectionResultEntity as cssr + JOIN [SOURCEPROJECT].ClosingStructuresSectionResultEntity AS source ON cssr.[rowid] = source.[rowid] + JOIN FailureMechanismSectionEntity as fms ON fms.[FailureMechanismSectionEntityId] = cssr.[FailureMechanismSectionEntityId] + JOIN TempAssessmentSectionFailureMechanism AS asfm ON asfm.[FailureMechanismId] = fms.[FailureMechanismEntityId] + WHERE source.[LayerThree] IS NOT cssr.[LayerThree]; + +INSERT INTO TempChanges +SELECT + asfm.[AssessmentSectionId], + asfm.[AssessmentSectionName], + asfm.[FailureMechanismId], + asfm.[FailureMechanismName], + "Het geregistreerde resultaat voor toetslaag 3 in '" || fms.[Name] || "' ('" || source.[LayerThree] || "') kon niet worden geconverteerd naar een geldige kans en is verwijderd." + FROM HeightStructuresSectionResultEntity as hssr + JOIN [SOURCEPROJECT].HeightStructuresSectionResultEntity AS source ON hssr.[rowid] = source.[rowid] + JOIN FailureMechanismSectionEntity as fms ON fms.[FailureMechanismSectionEntityId] = hssr.[FailureMechanismSectionEntityId] + JOIN TempAssessmentSectionFailureMechanism AS asfm ON asfm.[FailureMechanismId] = fms.[FailureMechanismEntityId] + WHERE source.[LayerThree] IS NOT hssr.[LayerThree]; + +INSERT INTO TempChanges +SELECT + asfm.[AssessmentSectionId], + asfm.[AssessmentSectionName], + asfm.[FailureMechanismId], + asfm.[FailureMechanismName], + "Het geregistreerde resultaat voor toetslaag 3 in '" || fms.[Name] || "' ('" || source.[LayerThree] || "') kon niet worden geconverteerd naar een geldige kans en is verwijderd." + FROM StabilityPointStructuresSectionResultEntity as spssr + JOIN [SOURCEPROJECT].StabilityPointStructuresSectionResultEntity AS source ON spssr.[rowid] = source.[rowid] + JOIN FailureMechanismSectionEntity as fms ON fms.[FailureMechanismSectionEntityId] = spssr.[FailureMechanismSectionEntityId] + JOIN TempAssessmentSectionFailureMechanism AS asfm ON asfm.[FailureMechanismId] = fms.[FailureMechanismEntityId] + WHERE source.[LayerThree] IS NOT spssr.[LayerThree]; + INSERT INTO [LOGDATABASE].MigrationLogEntity ( [FromVersion], [ToVersion], Index: Application/Ringtoets/test/Application.Ringtoets.Migration.Core.Test/test-data/FullTestProject171.rtd =================================================================== diff -u -r1543dcd22a7c56965614a332de89abcc1f4491ee -rd1f8355cc00c35f21fe9ad916db4ac54a46d9ccf Binary files differ Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo172IntegrationTest.cs =================================================================== diff -u -r1543dcd22a7c56965614a332de89abcc1f4491ee -rd1f8355cc00c35f21fe9ad916db4ac54a46d9ccf --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo172IntegrationTest.cs (.../MigrationTo172IntegrationTest.cs) (revision 1543dcd22a7c56965614a332de89abcc1f4491ee) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo172IntegrationTest.cs (.../MigrationTo172IntegrationTest.cs) (revision d1f8355cc00c35f21fe9ad916db4ac54a46d9ccf) @@ -430,7 +430,7 @@ { ReadOnlyCollection messages = reader.GetMigrationLogMessages(); - Assert.AreEqual(17, messages.Count); + Assert.AreEqual(33, messages.Count); AssertMigrationLogMessageEqual( new MigrationLogMessage("17.1", newVersion, "Gevolgen van de migratie van versie 17.1 naar versie 17.2:"), messages[0]); @@ -482,9 +482,65 @@ AssertMigrationLogMessageEqual( new MigrationLogMessage("17.1", newVersion, " - Het ID van kunstwerk '10' is veranderd naar '104'."), messages[16]); + + AssertMigrationLogMessageEqual( + new MigrationLogMessage("17.1", newVersion, "* Traject: 'assessmentSectionResults'"), + messages[17]); + AssertMigrationLogMessageEqual( + new MigrationLogMessage("17.1", newVersion, " + Toetsspoor: 'Piping'"), + messages[18]); + AssertLayerThreeMigrationMessage(new[] + { + messages[19], + messages[20] + }); + AssertMigrationLogMessageEqual( + new MigrationLogMessage("17.1", newVersion, " + Toetsspoor: 'Grasbekleding erosie kruin en binnentalud'"), + messages[21]); + AssertLayerThreeMigrationMessage(new[] + { + messages[22], + messages[23] + }); + AssertMigrationLogMessageEqual( + new MigrationLogMessage("17.1", newVersion, " + Toetsspoor: 'Hoogte kunstwerk'"), + messages[24]); + AssertLayerThreeMigrationMessage(new[] + { + messages[25], + messages[26] + }); + AssertMigrationLogMessageEqual( + new MigrationLogMessage("17.1", newVersion, " + Toetsspoor: 'Betrouwbaarheid sluiting kunstwerk'"), + messages[27]); + AssertLayerThreeMigrationMessage(new[] + { + messages[28], + messages[29] + }); + AssertMigrationLogMessageEqual( + new MigrationLogMessage("17.1", newVersion, " + Toetsspoor: 'Sterkte en stabiliteit puntconstructies'"), + messages[30]); + AssertLayerThreeMigrationMessage(new[] + { + messages[31], + messages[32] + }); } } + private static void AssertLayerThreeMigrationMessage(MigrationLogMessage[] messages) + { + Assert.AreEqual(2, messages.Length); + + AssertMigrationLogMessageEqual( + new MigrationLogMessage("17.1", newVersion, " - Het geregistreerde resultaat voor toetslaag 3 in 'Vak 1' ('5.0') kon niet worden geconverteerd naar een geldige kans en is verwijderd."), + messages[0]); + AssertMigrationLogMessageEqual( + new MigrationLogMessage("17.1", newVersion, " - Het geregistreerde resultaat voor toetslaag 3 in 'Vak 2' ('-10.0') kon niet worden geconverteerd naar een geldige kans en is verwijderd."), + messages[1]); + } + private static void AssertMigrationLogMessageEqual(MigrationLogMessage expected, MigrationLogMessage actual) { Assert.AreEqual(expected.ToVersion, actual.ToVersion);