Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj =================================================================== diff -u -rfadb006ef0285eb3fdbdbfc805729b37c8dbc0e6 -r97b905a386a23f1b200a86ea29bcd699c33bf537 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision fadb006ef0285eb3fdbdbfc805729b37c8dbc0e6) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 97b905a386a23f1b200a86ea29bcd699c33bf537) @@ -53,15 +53,11 @@ Properties\GlobalAssembly.cs - RingtoetsEntities.tt - - RingtoetsEntities.tt - RingtoetsEntities.tt @@ -73,9 +69,6 @@ RingtoetsEntities.tt - - Code - Fisheye: Tag 97b905a386a23f1b200a86ea29bcd699c33bf537 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/Converters/DuneAssessmentSectionEntityConverter.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql =================================================================== diff -u -r01e8a3970f39975558bdf694df5ec66791ab95b9 -r97b905a386a23f1b200a86ea29bcd699c33bf537 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 01e8a3970f39975558bdf694df5ec66791ab95b9) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 97b905a386a23f1b200a86ea29bcd699c33bf537) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 10-Mar-2016 08:58:54 */ +/* Created On : 14-Mar-2016 11:53:27 AM */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -9,9 +9,6 @@ DROP TABLE IF EXISTS 'DikeAssessmentSectionEntity' ; -DROP TABLE IF EXISTS 'DuneAssessmentSectionEntity' -; - DROP TABLE IF EXISTS 'FailureMechanismEntity' ; @@ -30,27 +27,16 @@ 'Name' VARCHAR NOT NULL, 'Norm' INT(4) NOT NULL, 'Order' INT(4) NOT NULL, - CONSTRAINT 'FK_DikeAssessmentSection_ProjectEntity' FOREIGN KEY ('ProjectEntityId') REFERENCES 'ProjectEntity' ('ProjectEntityId') ON DELETE Cascade ON UPDATE Cascade + CONSTRAINT 'FK_AssessmentSection_ProjectEntity' FOREIGN KEY ('ProjectEntityId') REFERENCES 'ProjectEntity' ('ProjectEntityId') ON DELETE Cascade ON UPDATE Cascade ) ; -CREATE TABLE 'DuneAssessmentSectionEntity' -( - 'DuneAssessmentSectionEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'ProjectEntityId' INTEGER NOT NULL, - 'Name' VARCHAR NOT NULL, - 'Norm' INT(4) NOT NULL, - 'Order' INT(4) NOT NULL, - CONSTRAINT 'FK_DuneAssessmentSection_ProjectEntity' FOREIGN KEY ('ProjectEntityId') REFERENCES 'ProjectEntity' ('ProjectEntityId') ON DELETE Cascade ON UPDATE Cascade -) -; - CREATE TABLE 'FailureMechanismEntity' ( 'FailureMechanismEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'FailureMechanismType' SMALLINT NOT NULL, -- Enumerator for different failure mechanism types (piping, macrostability, dunes, etc) 'DikeAssessmentSectionEntityId' INTEGER NOT NULL, - CONSTRAINT 'FK_FailureMechanism_AssessmentSection' FOREIGN KEY ('DikeAssessmentSectionEntityId') REFERENCES 'DikeAssessmentSectionEntity' ('DikeAssessmentSectionEntityId') ON DELETE Cascade ON UPDATE Cascade, + 'FailureMechanismType' SMALLINT NOT NULL, -- Enumerator for different failure mechanism types (piping, macrostability, dunes, etc) + CONSTRAINT 'FK_FailureMechanismEntity_AssessmentSectionEntity' FOREIGN KEY ('DikeAssessmentSectionEntityId') REFERENCES 'DikeAssessmentSectionEntity' ('DikeAssessmentSectionEntityId') ON DELETE Cascade ON UPDATE Cascade, CONSTRAINT 'UI_AS_FMT' UNIQUE ('FailureMechanismType','DikeAssessmentSectionEntityId') ) ; @@ -74,14 +60,10 @@ /* Create Indexes and Triggers */ -CREATE INDEX 'IXFK_DikeAssessmentSectionEntity' +CREATE INDEX 'IXFK_AssessmentSection_ProjectEntity' ON 'DikeAssessmentSectionEntity' ('ProjectEntityId' ASC) ; -CREATE INDEX 'IXFK_DuneAssessmentSectionEntity' - ON 'DuneAssessmentSectionEntity' ('ProjectEntityId' ASC) -; - -CREATE INDEX 'IXFK_FailureMechanism_AssessmentSection' +CREATE INDEX 'IXFK_FailureMechanismEntity_AssessmentSectionEntity' ON 'FailureMechanismEntity' ('DikeAssessmentSectionEntityId' ASC) ; Fisheye: Tag 97b905a386a23f1b200a86ea29bcd699c33bf537 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DuneAssessmentSectionEntity.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismEntity.cs =================================================================== diff -u -r0d9da8780296497d090770edacbaf51b00be8af6 -r97b905a386a23f1b200a86ea29bcd699c33bf537 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismEntity.cs (.../FailureMechanismEntity.cs) (revision 0d9da8780296497d090770edacbaf51b00be8af6) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismEntity.cs (.../FailureMechanismEntity.cs) (revision 97b905a386a23f1b200a86ea29bcd699c33bf537) @@ -36,8 +36,8 @@ public partial class FailureMechanismEntity { public long FailureMechanismEntityId { get; set; } - public short FailureMechanismType { get; set; } public long DikeAssessmentSectionEntityId { get; set; } + public short FailureMechanismType { get; set; } public virtual DikeAssessmentSectionEntity DikeAssessmentSectionEntity { get; set; } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IRingtoetsEntities.cs =================================================================== diff -u -r3c1b05ca357443b861187ba196b806ebab57a929 -r97b905a386a23f1b200a86ea29bcd699c33bf537 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IRingtoetsEntities.cs (.../IRingtoetsEntities.cs) (revision 3c1b05ca357443b861187ba196b806ebab57a929) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IRingtoetsEntities.cs (.../IRingtoetsEntities.cs) (revision 97b905a386a23f1b200a86ea29bcd699c33bf537) @@ -41,11 +41,6 @@ IDbSet DikeAssessmentSectionEntities { get; } /// - /// of - /// - IDbSet DuneAssessmentSectionEntities { get; } - - /// /// of /// IDbSet FailureMechanismEntities { get; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ProjectEntity.cs =================================================================== diff -u -r0d9da8780296497d090770edacbaf51b00be8af6 -r97b905a386a23f1b200a86ea29bcd699c33bf537 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ProjectEntity.cs (.../ProjectEntity.cs) (revision 0d9da8780296497d090770edacbaf51b00be8af6) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ProjectEntity.cs (.../ProjectEntity.cs) (revision 97b905a386a23f1b200a86ea29bcd699c33bf537) @@ -39,7 +39,6 @@ public ProjectEntity() { this.DikeAssessmentSectionEntities = new HashSet(); - this.DuneAssessmentSectionEntities = new HashSet(); } public long ProjectEntityId { get; set; } @@ -48,7 +47,5 @@ [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection DikeAssessmentSectionEntities { get; set; } - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection DuneAssessmentSectionEntities { get; set; } } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs =================================================================== diff -u -r0d9da8780296497d090770edacbaf51b00be8af6 -r97b905a386a23f1b200a86ea29bcd699c33bf537 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision 0d9da8780296497d090770edacbaf51b00be8af6) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision 97b905a386a23f1b200a86ea29bcd699c33bf537) @@ -53,7 +53,6 @@ } public virtual IDbSet DikeAssessmentSectionEntities { get; set; } - public virtual IDbSet DuneAssessmentSectionEntities { get; set; } public virtual IDbSet FailureMechanismEntities { get; set; } public virtual IDbSet ProjectEntities { get; set; } public virtual IDbSet Versions { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx =================================================================== diff -u -r01e8a3970f39975558bdf694df5ec66791ab95b9 -r97b905a386a23f1b200a86ea29bcd699c33bf537 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 01e8a3970f39975558bdf694df5ec66791ab95b9) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 97b905a386a23f1b200a86ea29bcd699c33bf537) @@ -15,23 +15,13 @@ - - - - - - - - - - - + @@ -62,18 +52,6 @@ - - - - - - - - - - - - @@ -88,18 +66,13 @@ - - - - - @@ -111,7 +84,6 @@ - @@ -123,10 +95,6 @@ - - - - @@ -140,24 +108,13 @@ - - - - - - - - - - - - + @@ -168,7 +125,6 @@ - @@ -203,18 +159,6 @@ - - - - - - - - - - - - @@ -232,22 +176,11 @@ - - - - - - - - - - - - + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram =================================================================== diff -u -r01e8a3970f39975558bdf694df5ec66791ab95b9 -r97b905a386a23f1b200a86ea29bcd699c33bf537 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 01e8a3970f39975558bdf694df5ec66791ab95b9) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 97b905a386a23f1b200a86ea29bcd699c33bf537) @@ -5,14 +5,12 @@ - - - - - + + + + - Fisheye: Tag 97b905a386a23f1b200a86ea29bcd699c33bf537 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/DuneAssessmentSectionEntityPersistor.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/ProjectEntityPersistor.cs =================================================================== diff -u -ra4488b072ec47efe5bf9a2cf2a69a0d9d32333a5 -r97b905a386a23f1b200a86ea29bcd699c33bf537 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/ProjectEntityPersistor.cs (.../ProjectEntityPersistor.cs) (revision a4488b072ec47efe5bf9a2cf2a69a0d9d32333a5) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Persistors/ProjectEntityPersistor.cs (.../ProjectEntityPersistor.cs) (revision 97b905a386a23f1b200a86ea29bcd699c33bf537) @@ -45,7 +45,6 @@ private readonly ICollection modifiedList = new List(); private readonly DikeAssessmentSectionEntityPersistor dikeAssessmentSectionEntityPersistor; - private readonly DuneAssessmentSectionEntityPersistor duneAssessmentSectionEntityPersistor; /// /// Instantiate a new ProjectEntityPersistor. @@ -64,7 +63,6 @@ converter = new ProjectEntityConverter(); dikeAssessmentSectionEntityPersistor = new DikeAssessmentSectionEntityPersistor(dbContext); - duneAssessmentSectionEntityPersistor = new DuneAssessmentSectionEntityPersistor(dbContext); } /// @@ -81,19 +79,14 @@ } var project = converter.ConvertEntityToModel(entry); - var nrOfItems = entry.DikeAssessmentSectionEntities.Count + entry.DuneAssessmentSectionEntities.Count; + var nrOfItems = entry.DikeAssessmentSectionEntities.Count; var assessmentSections = new object[nrOfItems]; foreach (var sectionEntity in entry.DikeAssessmentSectionEntities) { assessmentSections[sectionEntity.Order] = dikeAssessmentSectionEntityPersistor.LoadModel(sectionEntity); } - foreach (var sectionEntity in entry.DuneAssessmentSectionEntities) - { - assessmentSections[sectionEntity.Order] = duneAssessmentSectionEntityPersistor.LoadModel(sectionEntity); - } - // Add to items sorted foreach (var assessmentSection in assessmentSections) { @@ -201,7 +194,6 @@ { UpdateStorageIdsInModel(); dikeAssessmentSectionEntityPersistor.PerformPostSaveActions(); - duneAssessmentSectionEntityPersistor.PerformPostSaveActions(); } /// @@ -217,15 +209,10 @@ if (item is DikeAssessmentSection) { dikeAssessmentSectionEntityPersistor.UpdateModel(entity.DikeAssessmentSectionEntities, (DikeAssessmentSection) item, order); + order++; } - else if (item is DuneAssessmentSection) - { - duneAssessmentSectionEntityPersistor.UpdateModel(entity.DuneAssessmentSectionEntities, (DuneAssessmentSection) item, order); - } - order++; } dikeAssessmentSectionEntityPersistor.RemoveUnModifiedEntries(entity.DikeAssessmentSectionEntities); - duneAssessmentSectionEntityPersistor.RemoveUnModifiedEntries(entity.DuneAssessmentSectionEntities); } /// @@ -241,15 +228,10 @@ if (item is DikeAssessmentSection) { dikeAssessmentSectionEntityPersistor.InsertModel(entity.DikeAssessmentSectionEntities, (DikeAssessmentSection) item, order); + order++; } - else if (item is DuneAssessmentSection) - { - duneAssessmentSectionEntityPersistor.InsertModel(entity.DuneAssessmentSectionEntities, (DuneAssessmentSection) item, order); - } - order++; } dikeAssessmentSectionEntityPersistor.RemoveUnModifiedEntries(entity.DikeAssessmentSectionEntities); - duneAssessmentSectionEntityPersistor.RemoveUnModifiedEntries(entity.DuneAssessmentSectionEntities); } /// Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj =================================================================== diff -u -rfadb006ef0285eb3fdbdbfc805729b37c8dbc0e6 -r97b905a386a23f1b200a86ea29bcd699c33bf537 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj (.../Application.Ringtoets.Storage.Test.csproj) (revision fadb006ef0285eb3fdbdbfc805729b37c8dbc0e6) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj (.../Application.Ringtoets.Storage.Test.csproj) (revision 97b905a386a23f1b200a86ea29bcd699c33bf537) @@ -81,21 +81,16 @@ - - - - Code - Code Fisheye: Tag 97b905a386a23f1b200a86ea29bcd699c33bf537 refers to a dead (removed) revision in file `Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Converters/DuneAssessmentSectionEntityConverterTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 97b905a386a23f1b200a86ea29bcd699c33bf537 refers to a dead (removed) revision in file `Application/Ringtoets/test/Application.Ringtoets.Storage.Test/DbContext/DuneAssessmentSectionEntityTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 97b905a386a23f1b200a86ea29bcd699c33bf537 refers to a dead (removed) revision in file `Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Persistors/DuneAssessmentSectionEntityPersistorTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Persistors/ProjectEntityPersistorTest.cs =================================================================== diff -u -rd180f991b1e2664695dc4e98118e3159256fe3cd -r97b905a386a23f1b200a86ea29bcd699c33bf537 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Persistors/ProjectEntityPersistorTest.cs (.../ProjectEntityPersistorTest.cs) (revision d180f991b1e2664695dc4e98118e3159256fe3cd) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Persistors/ProjectEntityPersistorTest.cs (.../ProjectEntityPersistorTest.cs) (revision 97b905a386a23f1b200a86ea29bcd699c33bf537) @@ -177,14 +177,6 @@ Norm = 1, Order = 0 } - }, - DuneAssessmentSectionEntities = new List - { - new DuneAssessmentSectionEntity - { - Norm = 1, - Order = 1 - } } } }); @@ -200,9 +192,8 @@ Assert.IsInstanceOf(model); Assert.AreEqual(storageId, model.StorageId); Assert.AreEqual(description, model.Description); - Assert.AreEqual(2, model.Items.Count); + Assert.AreEqual(1, model.Items.Count); Assert.AreEqual(1, model.Items.Count(i => i is DikeAssessmentSection)); - Assert.AreEqual(1, model.Items.Count(i => i is DuneAssessmentSection)); mockRepository.VerifyAll(); } @@ -281,8 +272,7 @@ Description = description, Items = { - new DikeAssessmentSection(), - new DuneAssessmentSection() + new DikeAssessmentSection() } }; @@ -308,7 +298,6 @@ Assert.AreEqual(storageId, projectEntity.ProjectEntityId); Assert.AreEqual(description, projectEntity.Description); Assert.AreEqual(1, projectEntity.DikeAssessmentSectionEntities.Count); - Assert.AreEqual(1, projectEntity.DuneAssessmentSectionEntities.Count); mockRepository.VerifyAll(); } @@ -460,8 +449,7 @@ Description = description, Items = { - new DikeAssessmentSection(), - new DuneAssessmentSection() + new DikeAssessmentSection() } }; @@ -483,7 +471,6 @@ Assert.AreEqual(storageId, projectEntity.ProjectEntityId); Assert.AreEqual(description, projectEntity.Description); Assert.AreEqual(1, projectEntity.DikeAssessmentSectionEntities.Count); - Assert.AreEqual(1, projectEntity.DuneAssessmentSectionEntities.Count); mockRepository.VerifyAll(); } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectHelperTest.cs =================================================================== diff -u -rfadb006ef0285eb3fdbdbfc805729b37c8dbc0e6 -r97b905a386a23f1b200a86ea29bcd699c33bf537 --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectHelperTest.cs (.../RingtoetsProjectHelperTest.cs) (revision fadb006ef0285eb3fdbdbfc805729b37c8dbc0e6) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectHelperTest.cs (.../RingtoetsProjectHelperTest.cs) (revision 97b905a386a23f1b200a86ea29bcd699c33bf537) @@ -36,7 +36,6 @@ string expectedProjectName = "tempProjectFile"; string expectedDescription = "description"; string expectedDikeAssessmentSectionName = "dikeAssessmentSection"; - string expectedDuneAssessmentSectionName = "duneAssessmentSection"; // Call Project project = RingtoetsProjectHelper.GetFullTestProject(); @@ -48,10 +47,6 @@ DikeAssessmentSection dikeAssessmentSection = project.Items.OfType().FirstOrDefault(); Assert.IsInstanceOf(dikeAssessmentSection); Assert.AreEqual(expectedDikeAssessmentSectionName, dikeAssessmentSection.Name); - - DuneAssessmentSection duneAssessmentSection = project.Items.OfType().FirstOrDefault(); - Assert.IsInstanceOf(duneAssessmentSection); - Assert.AreEqual(expectedDuneAssessmentSectionName, duneAssessmentSection.Name); } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectHelper.cs =================================================================== diff -u -rfadb006ef0285eb3fdbdbfc805729b37c8dbc0e6 -r97b905a386a23f1b200a86ea29bcd699c33bf537 --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectHelper.cs (.../RingtoetsProjectHelper.cs) (revision fadb006ef0285eb3fdbdbfc805729b37c8dbc0e6) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectHelper.cs (.../RingtoetsProjectHelper.cs) (revision 97b905a386a23f1b200a86ea29bcd699c33bf537) @@ -44,10 +44,6 @@ new DikeAssessmentSection { Name = "dikeAssessmentSection" - }, - new DuneAssessmentSection - { - Name = "duneAssessmentSection" } } };