Application.Ringtoets.Storage

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch '1579'

# Conflicts:

# Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql

# Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql

# Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram

# Application/Ringtoets/src/Application.Ringtoets.Storage/Ringtoets.rtd

# Application/Ringtoets/test/Application.Ringtoets.Migration.Core.Test/test-data/FullTestProject181.rtd

# Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs

# build/DatabaseStructure.sql

# design/DatabaseDesign.eap

    • -3
    • +5
    ./Application.Ringtoets.Storage.csproj
    • -74
    • +74
    ./DbContext/AssessmentSectionEntity.cs
    • -55
    • +55
    ./DbContext/BackgroundDataEntity.cs
    • -41
    • +41
    ./DbContext/BackgroundDataMetaEntity.cs
    • -93
    • +93
    ./DbContext/CalculationGroupEntity.cs
    • -80
    • +80
    ./DbContext/ClosingStructureEntity.cs
    • -101
    • +101
    ./DbContext/ClosingStructuresCalculationEntity.cs
    • -42
    • +42
    ./DbContext/ClosingStructuresFailureMechanismMetaEntity.cs
    • -46
    • +46
    ./DbContext/ClosingStructuresOutputEntity.cs
    • -43
    • +43
    ./DbContext/ClosingStructuresSectionResultEntity.cs
    • -63
    • +63
    ./DbContext/DikeProfileEntity.cs
    • -40
    • +40
    ./DbContext/DuneErosionFailureMechanismMetaEntity.cs
    • -42
    • +42
    ./DbContext/DuneErosionSectionResultEntity.cs
    • -60
    • +60
    ./DbContext/DuneLocationEntity.cs
    • -47
    • +47
    ./DbContext/DuneLocationOutputEntity.cs
  1. … 93 more files in changeset.
Updated database design: - Renamed PK of HydraulicLocationOutputEntity to match with the current naming conventions -- Updated migration script and integration test - Updated triggers of the HydraulicLocationEntity to match with the current naming convention and exhibit the correct behaviour

WTI-1579

    • -1
    • +1
    ./DbContext/HydraulicLocationOutputEntity.cs
    • -83
    • +83
    ./DbContext/RingtoetsEntities.edmx.diagram
  1. … 6 more files in changeset.
Added calculated reliability to structures output data model. WTI-1590

  1. … 9 more files in changeset.
Adapt storage with the N parameter for the Piping Structure failure mechanism WTI-1531

    • -1
    • +4
    ./Application.Ringtoets.Storage.csproj
    • -1
    • +12
    ./Create/PipingStructure/PipingStructureFailureMechanismCreateExtensions.cs
    • -0
    • +1
    ./DbContext/PartialRingtoetsEntities.cs
    • -0
    • +41
    ./DbContext/PipingStructureFailureMechanismMetaEntity.cs
    • -1
    • +2
    ./DbContext/RingtoetsEntities.Context.cs
    • -25
    • +86
    ./DbContext/RingtoetsEntities.edmx
    • -92
    • +94
    ./DbContext/RingtoetsEntities.edmx.diagram
    • -0
    • +35
    ./Read/FailureMechanismEntityReadExtensions.cs
    • -0
    • +56
    ./Read/PipingStructure/PipingStructureSectionResultEntityReadExtensions.cs
    • -56
    • +0
    ./Read/PipingStructures/PipingStructureSectionResultEntityReadExtensions.cs
  1. … 10 more files in changeset.
Removed semi probabilistic output property from overtopping output. WTI-1589

  1. … 17 more files in changeset.
Adapt storage to include the macro stability outwards probability assessment input WTI-1531

    • -2
    • +6
    ./Application.Ringtoets.Storage.csproj
    • -1
    • +1
    ./Create/AssessmentSectionCreateExtensions.cs
    • -6
    • +6
    ./Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensions.cs
    • -2
    • +2
    ./DbContext/FailureMechanismSectionEntity.cs
    • -0
    • +41
    ./DbContext/MacroStabilityOutwardsFailureMechanismMetaEntity.cs
    • -0
    • +43
    ./DbContext/MacroStabilityOutwardsSectionResultEntity.cs
    • -43
    • +0
    ./DbContext/MacrostabilityOutwardsSectionResultEntity.cs
    • -1
    • +2
    ./DbContext/PartialRingtoetsEntities.cs
    • -1
    • +2
    ./DbContext/RingtoetsEntities.Context.cs
    • -34
    • +95
    ./DbContext/RingtoetsEntities.edmx
    • -91
    • +93
    ./DbContext/RingtoetsEntities.edmx.diagram
    • -3
    • +6
    ./Read/FailureMechanismEntityReadExtensions.cs
    • -0
    • +59
    ./Read/MacroStabilityOutwards/MacroStabilityOutwardsFailureMechanismMetaEntityReadExtensions.cs
  1. … 21 more files in changeset.
Regenerated context files after merge

WTI-1579

    • -84
    • +84
    ./DbContext/RingtoetsEntities.edmx.diagram
Resolved by: - Discarding their changes on binary files - Merging .sql files

Merge branch 'master' into 1579

# Conflicts:

# Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql

# Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram

# Application/Ringtoets/src/Application.Ringtoets.Storage/Ringtoets.rtd

# build/DatabaseStructure.sql

# design/DatabaseDesign.eap

  1. … 5 more files in changeset.
Start renaming MacrostabilityOutwards -> MacroStabilityOutwards Start implementing probability assessment input and properties for macro stability outwards failure mechanism WTI-1531

    • -3
    • +3
    ./Application.Ringtoets.Storage.csproj
    • -1
    • +1
    ./Create/AssessmentSectionCreateExtensions.cs
    • -0
    • +62
    ./Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismCreateExtensions.cs
    • -0
    • +51
    ./Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensions.cs
    • -51
    • +0
    ./Create/MacrostabilityOutwards/MacrostabilityOutwardsFailureMechanismSectionResultCreateExtensions.cs
    • -4
    • +4
    ./Read/AssessmentSectionEntityReadExtensions.cs
    • -7
    • +7
    ./Read/FailureMechanismEntityReadExtensions.cs
    • -0
    • +56
    ./Read/MacroStabilityOutwardsSectionResultEntityReadExtensions.cs
    • -56
    • +0
    ./Read/MacrostabilityOutwardsSectionResultEntityReadExtensions.cs
  1. … 54 more files in changeset.
Fixed test in storage. WTI-1589

  1. … 2 more files in changeset.
Fixed test in storage. WTI-1589

  1. … 1 more file in changeset.
Regenerated context files related to the Ringtoets project files: - Regenerated with digit suffixes instead of written out digits

WTI-1579

    • -8
    • +8
    ./DbContext/HydraulicLocationEntity.cs
    • -40
    • +40
    ./DbContext/RingtoetsEntities.edmx
    • -82
    • +82
    ./DbContext/RingtoetsEntities.edmx.diagram
  1. … 4 more files in changeset.
Adapt N parameter in stability point structures failure mechanism to be a double on the data model and storage WTI-1531

    • -86
    • +86
    ./DbContext/RingtoetsEntities.edmx.diagram
    • -1
    • +1
    ./DbContext/StabilityPointStructuresFailureMechanismMetaEntity.cs
  1. … 12 more files in changeset.
Added reliability to output of grass cover erosion inwards calculation. WTI-1589

  1. … 10 more files in changeset.
Add N parameter to the grass cover erosion inwards, outwards and height structures failuremechanism database entities WTI-1531

    • -1
    • +1
    ./Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensions.cs
    • -1
    • +1
    ./DbContext/GrassCoverErosionInwardsFailureMechanismMetaEntity.cs
    • -1
    • +1
    ./DbContext/GrassCoverErosionOutwardsFailureMechanismMetaEntity.cs
    • -1
    • +1
    ./DbContext/HeightStructuresFailureMechanismMetaEntity.cs
    • -79
    • +79
    ./DbContext/RingtoetsEntities.edmx.diagram
  1. … 15 more files in changeset.
Regenerated context files related to the Ringtoets project files

WTI-1579

    • -1
    • +1
    ./DbContext/GrassCoverErosionOutwardsHydraulicLocationOutputEntity.cs
    • -1
    • +1
    ./DbContext/HydraulicLocationOutputEntity.cs
    • -89
    • +89
    ./DbContext/RingtoetsEntities.edmx.diagram
Resolved by: - temporarily discarding their changes when concerning a binary file - .sql files were merged accordingly

Merge branch 'master' into 1579

# Conflicts:

# Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql

# Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx

# Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram

# Application/Ringtoets/src/Application.Ringtoets.Storage/Ringtoets.rtd

# build/DatabaseStructure.sql

# design/DatabaseDesign.eap

    • -2
    • +1
    ./Application.Ringtoets.Storage.csproj
  1. … 5 more files in changeset.
Adapt data model to include an N length effect parameter for the grass cover in/outwards, height structures and dune erosion failure mechanisms. WTI-1531

    • -1
    • +1
    ./Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensions.cs
    • -1
    • +2
    ./Read/HeightStructures/HeightStructuresFailureMechanismMetaEntityReadExtensions.cs
  1. … 31 more files in changeset.
Adapted MacroStabilityInwardsInput (only holds manual assessment level). WTI-1562

  1. … 1 more file in changeset.
Included the load of HydraulicLocationCalculationEntities to load all necessary tables to generate a RingtoetsProject from a .rtd file

WTI-1579

    • -0
    • +1
    ./DbContext/PartialRingtoetsEntities.cs
Adapted MacroStabilityInwardsInput (only holds manual assessment level). WTI-1562

    • -12
    • +5
    ./Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensions.cs
  1. … 1 more file in changeset.
Clean up of source file

WTI-1579

    • -1
    • +1
    ./Create/HydraulicBoundaryLocationOutputCreateExtensions.cs
Adjusted the read extensions for the HydraulicBoundaryLocations

WTI-1579

    • -26
    • +31
    ./Read/HydraulicLocationEntityReadExtensions.cs
  1. … 1 more file in changeset.
Separated the read extensions for the HydraulicBoundaryLocationOutput into two separate implementations: - Removed obsolete interface => there's no 100% common ground between the entities anymore and thus the extensions should be separated.

WTI-1579

    • -2
    • +0
    ./Application.Ringtoets.Storage.csproj
    • -1
    • +1
    ./DbContext/GrassCoverErosionOutwardsHydraulicLocationOutputEntity.cs
    • -1
    • +1
    ./DbContext/HydraulicLocationOutputEntity.cs
    • -71
    • +0
    ./DbContext/IHydraulicLocationOutputEntity.cs
    • -29
    • +0
    ./DbContext/PartialGrassCoverErosionOutwardsHydraulicLocationOutputEntity.cs
  1. … 2 more files in changeset.
Separated the read extensions for the Hydraulic Boundary Location Output into two separate implementations

WTI-1579

    • -0
    • +1
    ./Application.Ringtoets.Storage.csproj
    • -0
    • +52
    ./Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsHydraulicLocationOutputEntityReadExtensions.cs
    • -4
    • +4
    ./Read/HydraulicLocationOutputEntityReadExtensions.cs
  1. … 3 more files in changeset.
Add N parameter to the database for the stability stone cover failure mechanism WTI-1531

    • -0
    • +1
    ./Application.Ringtoets.Storage.csproj
    • -1
    • +1
    ./DbContext/RingtoetsEntities.Designer.cs
    • -89
    • +89
    ./DbContext/RingtoetsEntities.edmx.diagram
    • -0
    • +1
    ./DbContext/StabilityStoneCoverFailureMechanismMetaEntity.cs
    • -0
    • +11
    ./Read/FailureMechanismEntityReadExtensions.cs
    • -0
    • +49
    ./Read/StabilityStoneCover/StabilityStoneCoverFailureMechanismMetaEntityReadExtensions.cs
  1. … 13 more files in changeset.
Adjusted CreateExtensions to create HydraulicLocationEntities: - Create the CalculationEntities by using the newly introduced HydraulicBoundaryLocationsCalculationsCreateExtensions - Adjusted tests -> removed obsolete tests asserting the output -- Improved tests for the HydraulicBoundaryLocationsCalculationsCreateExtensions: assert output that does and does not contain GeneralResults (illustrationpoints)

WTI-1579

    • -16
    • +11
    ./Create/HydraulicBoundaryLocationCreateExtensions.cs
  1. … 2 more files in changeset.
Introduced create extensions to create Hydraulic Boundary Location calculations

WTI-1579

    • -1
    • +1
    ./Application.Ringtoets.Storage.csproj
  1. … 1 more file in changeset.
Introduced create extensions to create Hydraulic Boundary Location calculations

WTI-1579

    • -0
    • +68
    ./Create/HydraulicBoundaryLocationCalculationCreateExtensions.cs
  1. … 1 more file in changeset.
Removed partial hydraulic location output entity: - Implemented Hydraulic Location output on AssessmentSection as a specific implementatio, adjusted direct tests of this method

WTI-1579

    • -0
    • +36
    ./Create/HydraulicBoundaryLocationOutputCreateExtensions.cs
  1. … 1 more file in changeset.