Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -r0046acb203ae12c74743abc12f57e557d96f9c5a -rbb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 0046acb203ae12c74743abc12f57e557d96f9c5a)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision bb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f)
@@ -54,6 +54,7 @@
+
@@ -92,6 +93,9 @@
RingtoetsEntities.tt
+
+ RingtoetsEntities.tt
+
RingtoetsEntities.tt
@@ -193,6 +197,7 @@
+
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwardsFailureMechanismCreateExtensions.cs
===================================================================
diff -u -rd21cd84fd8eaf1281fd1469932414e42a50c635d -rbb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwardsFailureMechanismCreateExtensions.cs (.../GrassCoverErosionInwardsFailureMechanismCreateExtensions.cs) (revision d21cd84fd8eaf1281fd1469932414e42a50c635d)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwardsFailureMechanismCreateExtensions.cs (.../GrassCoverErosionInwardsFailureMechanismCreateExtensions.cs) (revision bb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f)
@@ -52,9 +52,20 @@
};
mechanism.AddEntitiesForFailureMechanismSections(registry, entity);
+ AddEntitiesForSectionResults(mechanism, registry);
registry.Register(entity, mechanism);
return entity;
}
+
+ private static void AddEntitiesForSectionResults(GrassCoverErosionInwardsFailureMechanism mechanism, PersistenceRegistry registry)
+ {
+ foreach (var failureMechanismSectionResult in mechanism.SectionResults)
+ {
+ var sectionResultEntity = failureMechanismSectionResult.Create(registry);
+ var section = registry.Get(failureMechanismSectionResult.Section);
+ section.GrassCoverErosionInwardsSectionResultEntities.Add(sectionResultEntity);
+ }
+ }
}
}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwardsFailureMechanismSectionResultCreateExtensions.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwardsFailureMechanismSectionResultCreateExtensions.cs (revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwardsFailureMechanismSectionResultCreateExtensions.cs (revision bb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f)
@@ -0,0 +1,57 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Application.Ringtoets.Storage.DbContext;
+using Ringtoets.GrassCoverErosionInwards.Data;
+
+namespace Application.Ringtoets.Storage.Create
+{
+ ///
+ /// Extension methods for related to creating a
+ /// .
+ ///
+ internal static class GrassCoverErosionInwardsFailureMechanismSectionResultCreateExtensions
+ {
+ ///
+ /// Creates a based on the information of the .
+ ///
+ /// The result to create a database entity for.
+ /// The object keeping track of create operations.
+ /// A new .
+ /// Thrown when is null.
+ internal static GrassCoverErosionInwardsSectionResultEntity Create(this GrassCoverErosionInwardsFailureMechanismSectionResult result, PersistenceRegistry registry)
+ {
+ if (registry == null)
+ {
+ throw new ArgumentNullException("registry");
+ }
+ var pipingSectionResultEntity = new GrassCoverErosionInwardsSectionResultEntity
+ {
+ LayerOne = Convert.ToByte(result.AssessmentLayerOne),
+ LayerThree = result.AssessmentLayerThree.Value.ToNullableDecimal()
+ };
+
+ registry.Register(pipingSectionResultEntity, result);
+ return pipingSectionResultEntity;
+ }
+ }
+}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs
===================================================================
diff -u -ra8e1897a44aceb5ed4c884797fbb80c9cb92d218 -rbb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs (.../PersistenceRegistry.cs) (revision a8e1897a44aceb5ed4c884797fbb80c9cb92d218)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs (.../PersistenceRegistry.cs) (revision bb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f)
@@ -31,6 +31,7 @@
using Ringtoets.Common.Data.Calculation;
using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.GrassCoverErosionInwards.Data;
using Ringtoets.HydraRing.Data;
using Ringtoets.Integration.Data;
using Ringtoets.Piping.Data;
@@ -51,6 +52,7 @@
private readonly Dictionary failureMechanisms = new Dictionary(new ReferenceEqualityComparer());
private readonly Dictionary failureMechanismSections = new Dictionary();
private readonly Dictionary pipingFailureMechanismSectionResults = new Dictionary();
+ private readonly Dictionary grassCoverErosionInwardsFailureMechanismSectionResults = new Dictionary();
private readonly Dictionary hydraulicLocations = new Dictionary(new ReferenceEqualityComparer());
private readonly Dictionary calculationGroups = new Dictionary(new ReferenceEqualityComparer());
private readonly Dictionary pipingCalculations = new Dictionary(new ReferenceEqualityComparer());
@@ -101,6 +103,22 @@
/// Registers a create or update operation for and the
/// that was constructed with the information.
///
+ /// The to be registered.
+ /// The to be registered.
+ /// Thrown when either:
+ ///
+ /// - is null
+ /// - is null
+ ///
+ public void Register(GrassCoverErosionInwardsSectionResultEntity entity, GrassCoverErosionInwardsFailureMechanismSectionResult model)
+ {
+ Register(grassCoverErosionInwardsFailureMechanismSectionResults, entity, model);
+ }
+
+ ///
+ /// Registers a create or update operation for and the
+ /// that was constructed with the information.
+ ///
/// The to be registered.
/// The to be registered.
/// Thrown when either:
@@ -572,6 +590,11 @@
pipingFailureMechanismSectionResults[entity].StorageId = entity.PipingSectionResultEntityId;
}
+ foreach (var entity in grassCoverErosionInwardsFailureMechanismSectionResults.Keys)
+ {
+ grassCoverErosionInwardsFailureMechanismSectionResults[entity].StorageId = entity.GrassCoverErosionInwardsSectionResultEntityId;
+ }
+
foreach (var entity in hydraulicLocations.Keys)
{
hydraulicLocations[entity].StorageId = entity.HydraulicLocationEntityId;
@@ -697,6 +720,17 @@
}
dbContext.PipingSectionResultEntities.RemoveRange(orphanedPipingSectionResultEntities);
+ var orphanedGrassCoverErosionInwardsSectionResultEntities = new List();
+ foreach (GrassCoverErosionInwardsSectionResultEntity sectionResultEntity in dbContext.GrassCoverErosionInwardsSectionResultEntities
+ .Where(e => e.GrassCoverErosionInwardsSectionResultEntityId > 0))
+ {
+ if (!grassCoverErosionInwardsFailureMechanismSectionResults.ContainsKey(sectionResultEntity))
+ {
+ orphanedGrassCoverErosionInwardsSectionResultEntities.Add(sectionResultEntity);
+ }
+ }
+ dbContext.GrassCoverErosionInwardsSectionResultEntities.RemoveRange(orphanedGrassCoverErosionInwardsSectionResultEntities);
+
var orphanedHydraulicLocationEntities = new List();
foreach (HydraulicLocationEntity hydraulicLocationEntity in dbContext.HydraulicLocationEntities
.Where(e => e.HydraulicLocationEntityId > 0))
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PipingFailureMechanismCreateExtensions.cs
===================================================================
diff -u -ra8e1897a44aceb5ed4c884797fbb80c9cb92d218 -rbb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PipingFailureMechanismCreateExtensions.cs (.../PipingFailureMechanismCreateExtensions.cs) (revision a8e1897a44aceb5ed4c884797fbb80c9cb92d218)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PipingFailureMechanismCreateExtensions.cs (.../PipingFailureMechanismCreateExtensions.cs) (revision bb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f)
@@ -56,15 +56,15 @@
AddEntitiesForStochasticSoilModels(mechanism, registry, entity);
AddEntitiesForSurfaceLines(mechanism, registry, entity);
mechanism.AddEntitiesForFailureMechanismSections(registry, entity);
- AddEntitiesForSectionResults(mechanism, registry, entity);
+ AddEntitiesForSectionResults(mechanism, registry);
entity.CalculationGroupEntity = mechanism.CalculationsGroup.Create(registry, 0);
registry.Register(entity, mechanism);
return entity;
}
- private static void AddEntitiesForSectionResults(PipingFailureMechanism mechanism, PersistenceRegistry registry, FailureMechanismEntity entity)
+ private static void AddEntitiesForSectionResults(PipingFailureMechanism mechanism, PersistenceRegistry registry)
{
foreach (var pipingFailureMechanismSectionResult in mechanism.SectionResults)
{
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql
===================================================================
diff -u -r0046acb203ae12c74743abc12f57e557d96f9c5a -rbb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 0046acb203ae12c74743abc12f57e557d96f9c5a)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision bb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f)
@@ -1,6 +1,6 @@
/* ---------------------------------------------------- */
/* Generated by Enterprise Architect Version 12.0 */
-/* Created On : 14-jun-2016 15:22:47 */
+/* Created On : 15-jun-2016 10:12:53 */
/* DBMS : SQLite */
/* ---------------------------------------------------- */
@@ -72,6 +72,9 @@
DROP TABLE IF EXISTS 'PipingSectionResultEntity'
;
+DROP TABLE IF EXISTS 'GrassCoverErosionInwardsSectionResultEntity'
+;
+
/* Create Tables with Primary and Foreign Keys, Check and Unique Constraints */
CREATE TABLE 'VersionEntity'
@@ -341,10 +344,20 @@
'FailureMechanismSectionEntityId' INTEGER,
'LayerOne' TINYINT (1) NOT NULL, -- true or false
'LayerThree' NUMERIC,
- CONSTRAINT 'FK_PipingSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE No Action ON UPDATE No Action
+ CONSTRAINT 'FK_PipingSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
)
;
+CREATE TABLE 'GrassCoverErosionInwardsSectionResultEntity'
+(
+ 'GrassCoverErosionInwardsSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+ 'FailureMechanismSectionEntityId' INTEGER,
+ 'LayerOne' TINYINT (1) NOT NULL, -- true or false
+ 'LayerThree' NUMERIC,
+ CONSTRAINT 'FK_GrassCoverErosionInwardsSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
+)
+;
+
/* Create Indexes and Triggers */
CREATE INDEX 'IXFK_PipingFailureMechanismMetaEntity_FailureMechanismEntity'
@@ -434,3 +447,7 @@
CREATE INDEX 'IXFK_PipingSectionResultEntity_FailureMechanismSectionEntity'
ON 'PipingSectionResultEntity' ('FailureMechanismSectionEntityId' ASC)
;
+
+CREATE INDEX 'IXFK_GrassCoverErosionInwardsSectionResultEntity_FailureMechanismSectionEntity'
+ ON 'GrassCoverErosionInwardsSectionResultEntity' ('FailureMechanismSectionEntityId' ASC)
+;
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismSectionEntity.cs
===================================================================
diff -u -ra8e1897a44aceb5ed4c884797fbb80c9cb92d218 -rbb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismSectionEntity.cs (.../FailureMechanismSectionEntity.cs) (revision a8e1897a44aceb5ed4c884797fbb80c9cb92d218)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismSectionEntity.cs (.../FailureMechanismSectionEntity.cs) (revision bb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f)
@@ -39,6 +39,7 @@
public FailureMechanismSectionEntity()
{
this.FailureMechanismSectionPointEntities = new HashSet();
+ this.GrassCoverErosionInwardsSectionResultEntities = new HashSet();
this.PipingSectionResultEntities = new HashSet();
}
@@ -50,6 +51,8 @@
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
public virtual ICollection FailureMechanismSectionPointEntities { get; set; }
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+ public virtual ICollection GrassCoverErosionInwardsSectionResultEntities { get; set; }
+ [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
public virtual ICollection PipingSectionResultEntities { get; set; }
}
}
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsSectionResultEntity.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsSectionResultEntity.cs (revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsSectionResultEntity.cs (revision bb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f)
@@ -0,0 +1,45 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+//------------------------------------------------------------------------------
+//
+// This code was generated from a template.
+//
+// Manual changes to this file may cause unexpected behavior in your application.
+// Manual changes to this file will be overwritten if the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace Application.Ringtoets.Storage.DbContext
+{
+ using System;
+ using System.Collections.Generic;
+
+ public partial class GrassCoverErosionInwardsSectionResultEntity
+ {
+ public long GrassCoverErosionInwardsSectionResultEntityId { get; set; }
+ public Nullable FailureMechanismSectionEntityId { get; set; }
+ public byte LayerOne { get; set; }
+ public Nullable LayerThree { get; set; }
+
+ public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; }
+ }
+}
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IRingtoetsEntities.cs
===================================================================
diff -u -ra8e1897a44aceb5ed4c884797fbb80c9cb92d218 -rbb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IRingtoetsEntities.cs (.../IRingtoetsEntities.cs) (revision a8e1897a44aceb5ed4c884797fbb80c9cb92d218)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IRingtoetsEntities.cs (.../IRingtoetsEntities.cs) (revision bb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f)
@@ -61,6 +61,12 @@
DbSet PipingSectionResultEntities { get; }
///
+ /// Gets a of containing
+ /// every entity found in the database.
+ ///
+ DbSet GrassCoverErosionInwardsSectionResultEntities { get; }
+
+ ///
/// Gets a of containing
/// every entity found in the database.
///
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs
===================================================================
diff -u -ra8e1897a44aceb5ed4c884797fbb80c9cb92d218 -rbb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision a8e1897a44aceb5ed4c884797fbb80c9cb92d218)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision bb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f)
@@ -58,6 +58,7 @@
public virtual DbSet FailureMechanismEntities { get; set; }
public virtual DbSet FailureMechanismSectionEntities { get; set; }
public virtual DbSet FailureMechanismSectionPointEntities { get; set; }
+ public virtual DbSet GrassCoverErosionInwardsSectionResultEntities { get; set; }
public virtual DbSet HydraulicLocationEntities { get; set; }
public virtual DbSet PipingCalculationEntities { get; set; }
public virtual DbSet PipingCalculationOutputEntities { get; set; }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx
===================================================================
diff -u -r0046acb203ae12c74743abc12f57e557d96f9c5a -rbb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 0046acb203ae12c74743abc12f57e557d96f9c5a)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision bb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f)
@@ -65,6 +65,15 @@
+
+
+
+
+
+
+
+
+
@@ -335,6 +344,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -546,6 +567,7 @@
+
@@ -590,6 +612,10 @@
+
+
+
+
@@ -670,6 +696,7 @@
+
@@ -738,6 +765,10 @@
+
+
+
+
@@ -849,6 +880,7 @@
+
@@ -862,6 +894,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -1233,6 +1275,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1437,6 +1491,16 @@
+
+
+
+
+
+
+
+
+
+
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram
===================================================================
diff -u -r0046acb203ae12c74743abc12f57e557d96f9c5a -rbb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 0046acb203ae12c74743abc12f57e557d96f9c5a)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision bb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f)
@@ -5,28 +5,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -40,6 +41,7 @@
+
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverErosionInwardsFailureMechanismSectionResultUpdateExtensions.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverErosionInwardsFailureMechanismSectionResultUpdateExtensions.cs (revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverErosionInwardsFailureMechanismSectionResultUpdateExtensions.cs (revision bb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f)
@@ -0,0 +1,83 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Linq;
+using Application.Ringtoets.Storage.Create;
+using Application.Ringtoets.Storage.DbContext;
+using Application.Ringtoets.Storage.Exceptions;
+using Application.Ringtoets.Storage.Properties;
+using Ringtoets.GrassCoverErosionInwards.Data;
+
+namespace Application.Ringtoets.Storage.Update
+{
+ ///
+ /// Extension methods for related to updating a
+ /// .
+ ///
+ internal static class GrassCoverErosionInwardsFailureMechanismSectionResultUpdateExtensions
+ {
+ ///
+ /// Updates a in the database based on the information of the
+ /// .
+ ///
+ /// The result to update the database entity for.
+ /// The object keeping track of update operations.
+ /// The context to obtain the existing entity from.
+ /// Thrown when either:
+ ///
+ /// - is null
+ /// - is null
+ ///
+ /// When
+ /// does not have a corresponding entity in .
+ internal static void Update(this GrassCoverErosionInwardsFailureMechanismSectionResult result, PersistenceRegistry registry, IRingtoetsEntities context)
+ {
+ if (context == null)
+ {
+ throw new ArgumentNullException("context");
+ }
+ if (registry == null)
+ {
+ throw new ArgumentNullException("registry");
+ }
+
+ GrassCoverErosionInwardsSectionResultEntity entity = GetCorrespondingGrassCoverErosionInwardsSectionResult(result, context);
+
+ entity.LayerOne = Convert.ToByte(result.AssessmentLayerOne);
+ entity.LayerThree = Convert.ToDecimal(result.AssessmentLayerThree);
+
+ registry.Register(entity, result);
+ }
+
+ private static GrassCoverErosionInwardsSectionResultEntity GetCorrespondingGrassCoverErosionInwardsSectionResult(GrassCoverErosionInwardsFailureMechanismSectionResult result, IRingtoetsEntities context)
+ {
+ try
+ {
+ return context.GrassCoverErosionInwardsSectionResultEntities.Single(sle => sle.GrassCoverErosionInwardsSectionResultEntityId == result.StorageId);
+ }
+ catch (InvalidOperationException exception)
+ {
+ throw new EntityNotFoundException(string.Format(Resources.Error_Entity_Not_Found_0_1, typeof(GrassCoverErosionInwardsSectionResultEntity).Name, result.StorageId), exception);
+ }
+ }
+ }
+}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverErosionInwardsFailureMechanismUpdateExtensions.cs
===================================================================
diff -u -rd86b1c6e4ebde1570bec162a9043bbb437de5d9c -rbb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverErosionInwardsFailureMechanismUpdateExtensions.cs (.../GrassCoverErosionInwardsFailureMechanismUpdateExtensions.cs) (revision d86b1c6e4ebde1570bec162a9043bbb437de5d9c)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/GrassCoverErosionInwardsFailureMechanismUpdateExtensions.cs (.../GrassCoverErosionInwardsFailureMechanismUpdateExtensions.cs) (revision bb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f)
@@ -62,8 +62,24 @@
entity.IsRelevant = Convert.ToByte(mechanism.IsRelevant);
mechanism.UpdateFailureMechanismSections(registry, entity, context);
+ UpdateSectionResults(mechanism, registry, context);
registry.Register(entity, mechanism);
}
+
+ private static void UpdateSectionResults(GrassCoverErosionInwardsFailureMechanism mechanism, PersistenceRegistry registry, IRingtoetsEntities context)
+ {
+ foreach (var sectionResult in mechanism.SectionResults)
+ {
+ if (sectionResult.IsNew())
+ {
+ registry.Get(sectionResult.Section).GrassCoverErosionInwardsSectionResultEntities.Add(sectionResult.Create(registry));
+ }
+ else
+ {
+ sectionResult.Update(registry, context);
+ }
+ }
+ }
}
}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/PipingFailureMechanismUpdateExtensions.cs
===================================================================
diff -u -ra8e1897a44aceb5ed4c884797fbb80c9cb92d218 -rbb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/PipingFailureMechanismUpdateExtensions.cs (.../PipingFailureMechanismUpdateExtensions.cs) (revision a8e1897a44aceb5ed4c884797fbb80c9cb92d218)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/PipingFailureMechanismUpdateExtensions.cs (.../PipingFailureMechanismUpdateExtensions.cs) (revision bb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f)
@@ -67,13 +67,13 @@
UpdateSoilModels(mechanism, registry, context, entity);
UpdateSurfaceLines(mechanism, registry, context, entity);
mechanism.UpdateFailureMechanismSections(registry, entity, context);
- UpdateSectionResults(mechanism, registry, context, entity);
+ UpdateSectionResults(mechanism, registry, context);
mechanism.CalculationsGroup.Update(registry, context);
registry.Register(entity, mechanism);
}
- private static void UpdateSectionResults(PipingFailureMechanism mechanism, PersistenceRegistry registry, IRingtoetsEntities context, FailureMechanismEntity entity)
+ private static void UpdateSectionResults(PipingFailureMechanism mechanism, PersistenceRegistry registry, IRingtoetsEntities context)
{
foreach (var sectionResult in mechanism.SectionResults)
{
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj
===================================================================
diff -u -r0046acb203ae12c74743abc12f57e557d96f9c5a -rbb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj (.../Application.Ringtoets.Storage.Test.csproj) (revision 0046acb203ae12c74743abc12f57e557d96f9c5a)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj (.../Application.Ringtoets.Storage.Test.csproj) (revision bb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f)
@@ -82,6 +82,7 @@
+
@@ -134,6 +135,7 @@
+
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwardsFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -rd21cd84fd8eaf1281fd1469932414e42a50c635d -rbb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwardsFailureMechanismCreateExtensionsTest.cs (.../GrassCoverErosionInwardsFailureMechanismCreateExtensionsTest.cs) (revision d21cd84fd8eaf1281fd1469932414e42a50c635d)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwardsFailureMechanismCreateExtensionsTest.cs (.../GrassCoverErosionInwardsFailureMechanismCreateExtensionsTest.cs) (revision bb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f)
@@ -20,6 +20,7 @@
// All rights reserved.
using System;
+using System.Linq;
using Application.Ringtoets.Storage.Create;
using Application.Ringtoets.Storage.DbContext;
using Core.Common.Base.Geometry;
@@ -97,6 +98,7 @@
// Assert
Assert.AreEqual(1, entity.FailureMechanismSectionEntities.Count);
+ Assert.AreEqual(1, entity.FailureMechanismSectionEntities.SelectMany(fms => fms.GrassCoverErosionInwardsSectionResultEntities).Count());
}
}
}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwardsMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwardsMechanismSectionResultCreateExtensionsTest.cs (revision 0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwardsMechanismSectionResultCreateExtensionsTest.cs (revision bb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f)
@@ -0,0 +1,81 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Application.Ringtoets.Storage.Create;
+using Core.Common.Base.Data;
+using Core.Common.Base.Geometry;
+using NUnit.Framework;
+using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.GrassCoverErosionInwards.Data;
+
+namespace Application.Ringtoets.Storage.Test.Create
+{
+ [TestFixture]
+ public class GrassCoverErosionInwardsFailureMechanismSectionResultCreateExtensionsTest
+ {
+ [Test]
+ public void Create_WithoutPersistenceRegistry_ThrowsArgumentNullException()
+ {
+ // Setup
+ var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(new FailureMechanismSection("", new[] { new Point2D(0, 0) }));
+
+ // Call
+ TestDelegate test = () => sectionResult.Create(null);
+
+ // Assert
+ Assert.Throws(test);
+ }
+
+ [Test]
+ public void Create_WithDifferentResults_ReturnsEntityWithExpectedResults(
+ [Values(true, false)] bool assessmentLayerOneResult,
+ [Values(3.2, 4.5)] double assessmentLayerThreeResult
+ )
+ {
+ // Setup
+ var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(new FailureMechanismSection("", new[] { new Point2D(0, 0) }));
+ sectionResult.AssessmentLayerOne = assessmentLayerOneResult;
+ sectionResult.AssessmentLayerThree = (RoundedDouble) assessmentLayerThreeResult;
+
+ // Call
+ var result = sectionResult.Create(new PersistenceRegistry());
+
+ // Assert
+ Assert.AreEqual(Convert.ToByte(assessmentLayerOneResult), result.LayerOne);
+ Assert.AreEqual(Convert.ToDecimal(assessmentLayerThreeResult), result.LayerThree);
+ }
+
+ [Test]
+ public void Create_WithNaNLevel3Result_ReturnsEntityWithExpectedResults()
+ {
+ // Setup
+ var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(new FailureMechanismSection("", new[] { new Point2D(0, 0) }));
+ sectionResult.AssessmentLayerThree = (RoundedDouble) double.NaN;
+
+ // Call
+ var result = sectionResult.Create(new PersistenceRegistry());
+
+ // Assert
+ Assert.IsNull(result.LayerThree);
+ }
+ }
+}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs
===================================================================
diff -u -ra8e1897a44aceb5ed4c884797fbb80c9cb92d218 -rbb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs (.../PersistenceRegistryTest.cs) (revision a8e1897a44aceb5ed4c884797fbb80c9cb92d218)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs (.../PersistenceRegistryTest.cs) (revision bb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f)
@@ -34,6 +34,7 @@
using Ringtoets.Common.Data.AssessmentSection;
using Ringtoets.Common.Data.Calculation;
using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.GrassCoverErosionInwards.Data;
using Ringtoets.HydraRing.Data;
using Ringtoets.Integration.Data;
using Ringtoets.Integration.Data.StandAlone;
@@ -906,6 +907,34 @@
}
[Test]
+ public void Register_WithNullGrassCoverErosionInwardsFailureMechanismSectionResult_ThrowsArgumentNullException()
+ {
+ // Setup
+ var registry = new PersistenceRegistry();
+
+ // Call
+ TestDelegate test = () => registry.Register(new GrassCoverErosionInwardsSectionResultEntity(), null);
+
+ // Assert
+ var paramName = Assert.Throws(test).ParamName;
+ Assert.AreEqual("model", paramName);
+ }
+
+ [Test]
+ public void Register_WithNullGrassCoverErosionInwardsSectionResultEntity_ThrowsArgumentNullException()
+ {
+ // Setup
+ var registry = new PersistenceRegistry();
+
+ // Call
+ TestDelegate test = () => registry.Register(null, new GrassCoverErosionInwardsFailureMechanismSectionResult(new TestFailureMechanismSection()));
+
+ // Assert
+ var paramName = Assert.Throws(test).ParamName;
+ Assert.AreEqual("entity", paramName);
+ }
+
+ [Test]
public void Register_WithNullHydraulicLocationEntity_ThrowsArgumentNullException()
{
// Setup
@@ -1374,6 +1403,27 @@
}
[Test]
+ public void TransferIds_WithGrassCoverErosionInwardsSectionResultEntityAddedWithGrassCoverErosionInwardsFailureMechanismSectionResult_EqualGrassCoverErosionInwardsSectionEntityIdAndGrassCoverErosionInwardsFailureMechanismSectionResultStorageId()
+ {
+ // Setup
+ var registry = new PersistenceRegistry();
+
+ long storageId = new Random(21).Next(1,4000);
+ var entity = new GrassCoverErosionInwardsSectionResultEntity()
+ {
+ GrassCoverErosionInwardsSectionResultEntityId = storageId
+ };
+ var model = new GrassCoverErosionInwardsFailureMechanismSectionResult(new TestFailureMechanismSection());
+ registry.Register(entity, model);
+
+ // Call
+ registry.TransferIds();
+
+ // Assert
+ Assert.AreEqual(storageId, model.StorageId);
+ }
+
+ [Test]
public void TransferIds_WithHydraulicLocationEntityAdded_EqualHydraulicLocationEntityIdAndHydraulicBoundaryLocationStorageId()
{
// Setup
@@ -1799,6 +1849,42 @@
}
[Test]
+ public void RemoveUntouched_GrassCoverErosionInwardsSectionResultEntity_OrphanedEntityIsRemovedFromRingtoetsEntities()
+ {
+ // Setup
+ var mocks = new MockRepository();
+ IRingtoetsEntities dbContext = RingtoetsEntitiesHelper.CreateStub(mocks);
+ mocks.ReplayAll();
+
+ var orphanedEntity = new GrassCoverErosionInwardsSectionResultEntity
+ {
+ GrassCoverErosionInwardsSectionResultEntityId = 1
+ };
+ var persistentEntity = new GrassCoverErosionInwardsSectionResultEntity
+ {
+ GrassCoverErosionInwardsSectionResultEntityId = 2
+ };
+ dbContext.GrassCoverErosionInwardsSectionResultEntities.Add(orphanedEntity);
+ dbContext.GrassCoverErosionInwardsSectionResultEntities.Add(persistentEntity);
+
+ var section = new GrassCoverErosionInwardsFailureMechanismSectionResult(new TestFailureMechanismSection())
+ {
+ StorageId = persistentEntity.GrassCoverErosionInwardsSectionResultEntityId
+ };
+
+ var registry = new PersistenceRegistry();
+ registry.Register(persistentEntity, section);
+
+ // Call
+ registry.RemoveUntouched(dbContext);
+
+ // Assert
+ Assert.AreEqual(1, dbContext.GrassCoverErosionInwardsSectionResultEntities.Count());
+ CollectionAssert.Contains(dbContext.GrassCoverErosionInwardsSectionResultEntities, persistentEntity);
+ mocks.VerifyAll();
+ }
+
+ [Test]
public void RemoveUntouched_HydraulicLocationEntity_OrphanedEntityIsRemovedFromRingtoetsEntities()
{
// Setup
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/GrassCoverErosionInwardsFailureMechanismSectionResultUpdateExtensionsTest.cs
===================================================================
diff -u
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/GrassCoverErosionInwardsFailureMechanismSectionResultUpdateExtensionsTest.cs (revision 0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/GrassCoverErosionInwardsFailureMechanismSectionResultUpdateExtensionsTest.cs (revision bb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f)
@@ -0,0 +1,159 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Application.Ringtoets.Storage.Create;
+using Application.Ringtoets.Storage.DbContext;
+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.GrassCoverErosionInwards.Data;
+
+namespace Application.Ringtoets.Storage.Test.Update
+{
+ [TestFixture]
+ public class GrassCoverErosionInwardsFailureMechanismSectionResultUpdateExtensionsTest
+ {
+ [Test]
+ public void Update_WithoutContext_ArgumentNullException()
+ {
+ // Setup
+ var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(new TestFailureMechanismSection());
+
+ // Call
+ TestDelegate test = () => sectionResult.Update(new PersistenceRegistry(), null);
+
+ // Assert
+ var paramName = Assert.Throws(test).ParamName;
+ Assert.AreEqual("context", paramName);
+ }
+
+ [Test]
+ public void Update_WithoutPersistenceRegistry_ArgumentNullException()
+ {
+ // Setup
+ var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(new TestFailureMechanismSection());
+
+ // Call
+ TestDelegate test = () =>
+ {
+ using (var ringtoetsEntities = new RingtoetsEntities())
+ {
+ sectionResult.Update(null, ringtoetsEntities);
+ }
+ };
+
+ // Assert
+ var paramName = Assert.Throws(test).ParamName;
+ Assert.AreEqual("registry", paramName);
+ }
+
+ [Test]
+ public void Update_ContextWithNoGrassCoverErosionInwardsSoilLayer_EntityNotFoundException()
+ {
+ // Setup
+ var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(new TestFailureMechanismSection());
+
+ // Call
+ TestDelegate test = () =>
+ {
+ using (var ringtoetsEntities = new RingtoetsEntities())
+ {
+ sectionResult.Update(new PersistenceRegistry(), ringtoetsEntities);
+ }
+ };
+
+ // Assert
+ var expectedMessage = String.Format("Het object 'GrassCoverErosionInwardsSectionResultEntity' met id '{0}' is niet gevonden.", 0);
+ EntityNotFoundException exception = Assert.Throws(test);
+ Assert.AreEqual(expectedMessage, exception.Message);
+ }
+
+ [Test]
+ public void Update_ContextWithNoGrassCoverErosionInwardsSoilLayerWithId_EntityNotFoundException()
+ {
+ // Setup
+ MockRepository mocks = new MockRepository();
+ var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
+
+ mocks.ReplayAll();
+
+ var storageId = 1;
+ var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(new TestFailureMechanismSection())
+ {
+ StorageId = storageId
+ };
+
+ ringtoetsEntities.GrassCoverErosionInwardsSectionResultEntities.Add(new GrassCoverErosionInwardsSectionResultEntity
+ {
+ GrassCoverErosionInwardsSectionResultEntityId = 2
+ });
+
+ // Call
+ TestDelegate test = () => sectionResult.Update(new PersistenceRegistry(), ringtoetsEntities);
+
+ // Assert
+ var expectedMessage = String.Format("Het object 'GrassCoverErosionInwardsSectionResultEntity' met id '{0}' is niet gevonden.", storageId);
+ EntityNotFoundException exception = Assert.Throws(test);
+ Assert.AreEqual(expectedMessage, exception.Message);
+
+ mocks.VerifyAll();
+ }
+
+ [Test]
+ public void Update_WithGrassCoverErosionInwardsSoilLayer_PropertiesUpdated()
+ {
+ // Setup
+ MockRepository mocks = new MockRepository();
+ var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
+
+ mocks.ReplayAll();
+
+ var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(new TestFailureMechanismSection())
+ {
+ StorageId = 1,
+ AssessmentLayerOne = true,
+ AssessmentLayerThree = (RoundedDouble) 4.4
+ };
+
+ var sectionResultEntity = new GrassCoverErosionInwardsSectionResultEntity
+ {
+ GrassCoverErosionInwardsSectionResultEntityId = sectionResult.StorageId,
+ LayerOne = Convert.ToByte(false),
+ LayerThree = 1.1m,
+ };
+
+ ringtoetsEntities.GrassCoverErosionInwardsSectionResultEntities.Add(sectionResultEntity);
+
+ // Call
+ sectionResult.Update(new PersistenceRegistry(), ringtoetsEntities);
+
+ // Assert
+ Assert.AreEqual(Convert.ToByte(true), sectionResultEntity.LayerOne);
+ Assert.AreEqual(sectionResult.AssessmentLayerThree.Value.ToNullableDecimal(), sectionResultEntity.LayerThree);
+
+ mocks.VerifyAll();
+ }
+ }
+}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/GrassCoverErosionInwardsFailureMechanismUpdateExtensionsTest.cs
===================================================================
diff -u -rae6f0c6b534ca650e160ae6d9c0bc90369d25c68 -rbb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/GrassCoverErosionInwardsFailureMechanismUpdateExtensionsTest.cs (.../GrassCoverErosionInwardsFailureMechanismUpdateExtensionsTest.cs) (revision ae6f0c6b534ca650e160ae6d9c0bc90369d25c68)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/GrassCoverErosionInwardsFailureMechanismUpdateExtensionsTest.cs (.../GrassCoverErosionInwardsFailureMechanismUpdateExtensionsTest.cs) (revision bb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f)
@@ -186,6 +186,7 @@
// Assert
Assert.AreEqual(1, failureMechanismEntity.FailureMechanismSectionEntities.Count);
+ Assert.AreEqual(1, failureMechanismEntity.FailureMechanismSectionEntities.SelectMany(fms => fms.GrassCoverErosionInwardsSectionResultEntities).Count());
mocks.VerifyAll();
}
@@ -233,6 +234,7 @@
// Assert
Assert.AreEqual(1, failureMechanismEntity.FailureMechanismSectionEntities.Count);
+ Assert.AreEqual(1, failureMechanismEntity.FailureMechanismSectionEntities.SelectMany(fms => fms.GrassCoverErosionInwardsSectionResultEntities).Count());
Assert.AreEqual(testName, failureMechanismEntity.FailureMechanismSectionEntities.ElementAt(0).Name);
mocks.VerifyAll();
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsEntitiesHelper.cs
===================================================================
diff -u -ra8e1897a44aceb5ed4c884797fbb80c9cb92d218 -rbb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsEntitiesHelper.cs (.../RingtoetsEntitiesHelper.cs) (revision a8e1897a44aceb5ed4c884797fbb80c9cb92d218)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsEntitiesHelper.cs (.../RingtoetsEntitiesHelper.cs) (revision bb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f)
@@ -24,7 +24,6 @@
using Application.Ringtoets.Storage.DbContext;
using Rhino.Mocks;
-using Ringtoets.Piping.Data;
namespace Application.Ringtoets.Storage.TestUtil
{
@@ -42,7 +41,8 @@
DbSet failureMechanismsSet = CreateEmptyTestDbSet();
DbSet failureMechanismSectionsSet = CreateEmptyTestDbSet();
DbSet failureMechanismSectionPointsSet = CreateEmptyTestDbSet();
- DbSet pipingSectionResultssSet = CreateEmptyTestDbSet();
+ DbSet pipingSectionResultsSet = CreateEmptyTestDbSet();
+ DbSet grassCoverErosionInwardsSectionResultsSet = CreateEmptyTestDbSet();
DbSet assessmentSectionsSet = CreateEmptyTestDbSet();
DbSet referenceLinesSet = CreateEmptyTestDbSet();
DbSet calculationGroupsSet = CreateEmptyTestDbSet();
@@ -65,7 +65,8 @@
ringtoetsEntities.Stub(r => r.FailureMechanismEntities).Return(failureMechanismsSet);
ringtoetsEntities.Stub(r => r.FailureMechanismSectionEntities).Return(failureMechanismSectionsSet);
ringtoetsEntities.Stub(r => r.FailureMechanismSectionPointEntities).Return(failureMechanismSectionPointsSet);
- ringtoetsEntities.Stub(r => r.PipingSectionResultEntities).Return(pipingSectionResultssSet);
+ ringtoetsEntities.Stub(r => r.PipingSectionResultEntities).Return(pipingSectionResultsSet);
+ ringtoetsEntities.Stub(r => r.GrassCoverErosionInwardsSectionResultEntities).Return(grassCoverErosionInwardsSectionResultsSet);
ringtoetsEntities.Stub(r => r.AssessmentSectionEntities).Return(assessmentSectionsSet);
ringtoetsEntities.Stub(r => r.ReferenceLinePointEntities).Return(referenceLinesSet);
ringtoetsEntities.Stub(r => r.CalculationGroupEntities).Return(calculationGroupsSet);
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResult.cs
===================================================================
diff -u -r94b85dc077cddf7535b328b8b3a96a494afac0f6 -rbb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResult.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResult.cs) (revision 94b85dc077cddf7535b328b8b3a96a494afac0f6)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResult.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResult.cs) (revision bb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f)
@@ -21,6 +21,7 @@
using System;
using Core.Common.Base.Data;
+using Core.Common.Base.Storage;
using Ringtoets.Common.Data.FailureMechanism;
namespace Ringtoets.GrassCoverErosionInwards.Data
@@ -29,7 +30,7 @@
/// This class holds the information of the result of the
/// for a grass cover erosion inwards assessment.
///
- public class GrassCoverErosionInwardsFailureMechanismSectionResult : FailureMechanismSectionResult
+ public class GrassCoverErosionInwardsFailureMechanismSectionResult : FailureMechanismSectionResult, IStorable
{
private readonly RoundedDouble assessmentLayerTwoA;
@@ -61,5 +62,7 @@
/// Gets or sets the state of the assessment layer one.
///
public bool AssessmentLayerOne { get; set; }
+
+ public long StorageId { get; set; }
}
}
\ No newline at end of file