Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Refactored queries into reusable queries by introducing a SQL query generator for migrated Hydraulic Boundary Locations

WTI-1579

    • -137
    • +193
    ./Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs
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

    • binary
    ./Application.Ringtoets.Migration.Core.Test/test-data/FullTestProject181.rtd
    • -0
    • +2
    ./Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj
    • -0
    • +229
    ./Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs
    • -20
    • +19
    ./Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs
    • -0
    • +38
    ./Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs
    • -0
    • +26
    ./Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs
  1. … 102 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

    • binary
    ./Application.Ringtoets.Migration.Core.Test/test-data/FullTestProject181.rtd
    • -5
    • +5
    ./Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs
  1. … 8 more files in changeset.
Added migration script and asserts to migrate hydraulic boundary location migration outputs to the correct calculation entities: - Expanded the reference file to be migrated with outputs on the HBLs

WTI-1579

    • binary
    ./Application.Ringtoets.Migration.Core.Test/test-data/FullTestProject173.rtd
    • binary
    ./Application.Ringtoets.Migration.Core.Test/test-data/FullTestProject181.rtd
    • -50
    • +180
    ./Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs
  1. … 1 more file in changeset.
Reverted commented explicit attribute

WTI-1579

    • -1
    • +1
    ./Application.Ringtoets.Storage.Test/RingtoetsDatabaseCreatorTest.cs
Added calculated reliability to structures output data model. WTI-1590

    • -10
    • +14
    ./Application.Ringtoets.Storage.Test/Create/StructuresOutputCreateExtensionsTest.cs
    • -9
    • +12
    ./Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs
  1. … 10 more files in changeset.
Adapt storage with the N parameter for the Piping Structure failure mechanism WTI-1531

    • binary
    ./Application.Ringtoets.Migration.Core.Test/test-data/FullTestProject181.rtd
    • -1
    • +5
    ./Application.Ringtoets.Storage.Test/Create/PipingStructure/PipingStructureFailureMechanismCreateExtensionsTest.cs
    • -0
    • +12
    ./Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs
    • -0
    • +248
    ./Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs
    • -0
    • +6
    ./Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs
    • -6
    • +16
    ./Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs
  1. … 16 more files in changeset.
Added migration script and asserts to migrate hydraulic boundary location migration inputs to the correct calculation entities

WTI-1579

    • binary
    ./Application.Ringtoets.Migration.Core.Test/test-data/FullTestProject173.rtd
    • -0
    • +87
    ./Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs
  1. … 1 more file in changeset.
Extend ringtoetsprojecttesthelper WTI-1531

    • -0
    • +24
    ./Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs
    • -2
    • +19
    ./Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs
Removed semi probabilistic output property from overtopping output. WTI-1589

    • -9
    • +2
    ./Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensionsTest.cs
    • -12
    • +2
    ./Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs
    • -1
    • +1
    ./Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
    • -13
    • +0
    ./Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs
    • -2
    • +2
    ./Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs
  1. … 14 more files in changeset.
Used the extension method to get Assessment Layer Two A result instead of property on data model. WTI-1589

    • -1
    • +0
    ./Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
  1. … 7 more files in changeset.
Adapt storage to include the macro stability outwards probability assessment input WTI-1531

    • binary
    ./Application.Ringtoets.Migration.Core.Test/test-data/FullTestProject181.rtd
    • -3
    • +4
    ./Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj
    • -3
    • +33
    ./Application.Ringtoets.Storage.Test/Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismCreateExtensionsTest.cs
    • -5
    • +5
    ./Application.Ringtoets.Storage.Test/Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs
    • -1
    • +13
    ./Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs
    • -11
    • +48
    ./Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs
    • -0
    • +79
    ./Application.Ringtoets.Storage.Test/Read/MacroStabilityOutwards/MacroStabilityOutwardsFailureMechanismMetaEntityReadExtensionsTest.cs
    • -0
    • +83
    ./Application.Ringtoets.Storage.Test/Read/MacroStabilityOutwards/MacroStabilityOutwardsSectionResultEntityReadExtensionsTest.cs
    • -82
    • +0
    ./Application.Ringtoets.Storage.Test/Read/MacroStabilityOutwardsSectionResultEntityReadExtensionsTest.cs
  1. … 27 more files in changeset.
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

    • -3
    • +3
    ./Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs
    • -2
    • +6
    ./Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs
    • -8
    • +8
    ./Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs
  1. … 3 more files in changeset.
Extended migration script: - Generates 8 calculations based for each hydraulic boundary location and mapped accordingly

Warning:

- Hydraulic Boundary Location output is currently cleared during migration

- Input settings for the HBLs are not migrated yet

WTI-1579

    • -0
    • +12
    ./Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs
  1. … 1 more file 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.Test/Application.Ringtoets.Storage.Test.csproj
    • -1
    • +1
    ./Application.Ringtoets.Storage.Test/Create/AssessmentSectionCreateExtensionsTest.cs
    • -0
    • +153
    ./Application.Ringtoets.Storage.Test/Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismCreateExtensionsTest.cs
    • -0
    • +94
    ./Application.Ringtoets.Storage.Test/Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs
    • -153
    • +0
    ./Application.Ringtoets.Storage.Test/Create/MacrostabilityOutwards/MacrostabilityOutwardsFailureMechanismCreateExtensionsTest.cs
    • -94
    • +0
    ./Application.Ringtoets.Storage.Test/Create/MacrostabilityOutwards/MacrostabilityOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs
    • -4
    • +4
    ./Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
    • -2
    • +2
    ./Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs
    • -0
    • +82
    ./Application.Ringtoets.Storage.Test/Read/MacroStabilityOutwardsSectionResultEntityReadExtensionsTest.cs
    • -81
    • +0
    ./Application.Ringtoets.Storage.Test/Read/MacrostabilityOutwardsSectionResultEntityReadExtensionsTest.cs
    • -4
    • +4
    ./Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs
  1. … 54 more files in changeset.
Fixed test in storage. WTI-1589

    • -1
    • +1
    ./Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensionsTest.cs
    • -0
    • +2
    ./Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs
  1. … 1 more file in changeset.
Fixed test in storage. WTI-1589

    • -1
    • +0
    ./Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs
  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

    • -1
    • +1
    ./Application.Ringtoets.Storage.Test/RingtoetsDatabaseCreatorTest.cs
  1. … 7 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

    • -1
    • +2
    ./Application.Ringtoets.Storage.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs
    • -42
    • +0
    ./Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs
    • -2
    • +2
    ./Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs
    • -1
    • +1
    ./Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs
  1. … 13 more files in changeset.
Added reliability to output of grass cover erosion inwards calculation. WTI-1589

    • -1
    • +1
    ./Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensionsTest.cs
    • -2
    • +4
    ./Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs
    • -2
    • +2
    ./Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs
  1. … 8 more files in changeset.
Add N parameter to the grass cover erosion inwards, outwards and height structures failuremechanism database entities WTI-1531

    • -1
    • +1
    ./Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismCreateExtensionsTest.cs
    • -1
    • +1
    ./Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs
    • -1
    • +1
    ./Application.Ringtoets.Storage.Test/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensionsTest.cs
    • -3
    • +45
    ./Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs
    • -2
    • +6
    ./Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs
    • -3
    • +7
    ./Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs
    • -2
    • +3
    ./Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensionsTest.cs
    • -2
    • +3
    ./Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismMetaEntityReadExtensionsTest.cs
    • -1
    • +2
    ./Application.Ringtoets.Storage.Test/Read/HeightStructures/HeightStructuresFailureMechanismMetaEntityReadExtensionsTest.cs
    • -2
    • +2
    ./Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs
  1. … 14 more files in changeset.
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.Test/Application.Ringtoets.Storage.Test.csproj
    • -3
    • +10
    ./Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs
    • -5
    • +1
    ./Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs
  1. … 3 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

    • -2
    • +3
    ./Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismCreateExtensionsTest.cs
    • -2
    • +4
    ./Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs
    • -2
    • +3
    ./Application.Ringtoets.Storage.Test/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensionsTest.cs
    • -2
    • +2
    ./Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs
    • -1
    • +1
    ./Application.Ringtoets.Storage.Test/Read/ClosingStructures/ClosingStructuresFailureMechanismMetaEntityReadExtensionsTest.cs
    • -5
    • +7
    ./Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs
    • -3
    • +5
    ./Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensionsTest.cs
    • -3
    • +5
    ./Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismMetaEntityReadExtensionsTest.cs
    • -2
    • +2
    ./Application.Ringtoets.Storage.Test/Read/HeightStructures/HeightStructuresFailureMechanismMetaEntityReadExtensionsTest.cs
    • -1
    • +1
    ./Application.Ringtoets.Storage.Test/Read/StabilityPointStructures/StabilityPointStructureFailureMechanismMetaEntityReadExtensionsTest.cs
    • -3
    • +3
    ./Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs
  1. … 26 more files in changeset.
Extended asserts for the RingtoetsProjectTestHelper: - Introduced simple asserts for calculations 2 and 4 => simple unconfigured calculations which are asserted to enforce every combination possible during the roundtrip test - Duplicated outputs for calculations 3 based on calculation 1

WTI-1579

    • -0
    • +38
    ./Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs
    • -0
    • +26
    ./Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs
Adapted MacroStabilityInwardsInput (only holds manual assessment level). WTI-1562

    • -2
    • +4
    ./Application.Ringtoets.Storage.Test/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityReadExtensionsTest.cs
  1. … 1 more file in changeset.
Introduced a HydraulicLocationEntityTestFactory: - Used te generate minimal hydraulic location entities that are accepted by the its read extensions - Implemented factory creation method in the tests that make use of HydraulicLocationEntities

WTI-1579

    • -20
    • +19
    ./Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs
    • -4
    • +2
    ./Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs
    • -5
    • +2
    ./Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs
    • -5
    • +2
    ./Application.Ringtoets.Storage.Test/Read/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationEntityReadExtensionsTest.cs
    • -5
    • +2
    ./Application.Ringtoets.Storage.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs
    • -0
    • +1
    ./Application.Ringtoets.Storage.TestUtil.Test/Application.Ringtoets.Storage.TestUtil.Test.csproj
    • -0
    • +51
    ./Application.Ringtoets.Storage.TestUtil.Test/Hydraulics/HydraulicLocationEntityTestFactoryTest.cs
    • -0
    • +1
    ./Application.Ringtoets.Storage.TestUtil/Application.Ringtoets.Storage.TestUtil.csproj
    • -0
    • +66
    ./Application.Ringtoets.Storage.TestUtil/Hydraulics/HydraulicLocationEntityTestFactory.cs
Adapted MacroStabilityInwardsInput (only holds manual assessment level). WTI-1562

    • -28
    • +4
    ./Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs
  1. … 1 more file in changeset.
Fixed test for the HydraulicLocationEntity read extensions

WTI-1579

    • -1
    • +10
    ./Application.Ringtoets.Storage.Test/Read/HydraulicLocationEntityReadExtensionsTest.cs
Adjusted the read extensions for the HydraulicBoundaryLocations

WTI-1579

    • -107
    • +139
    ./Application.Ringtoets.Storage.Test/Read/HydraulicLocationEntityReadExtensionsTest.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

    • -5
    • +5
    ./Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationCreateExtensionsTest.cs
    • -1
    • +1
    ./Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensionsTest.cs
  1. … 5 more files in changeset.