Dev s100/feature/180094 create required models as per s100 payload (#201

) * Added Models for s100 event AB#180094 * AB#180094 Updated DataReplacement property datatype * 177261 implement updated sap action rules (#195) * 177261-implement sap action rules AB#177261 AB#177486 AB#177487 * 177261-exception handling and logging AB#177261 AB#177486 * 177261-code uplifting AB#177261 * 177261-null check of unit of sale added in case of change and update actions AB#177261 AB#177490 * 177261-code uplifted and few warnings resolved AB#177261 * 177261-code refactoring AB#177261 AB#177490 * 177725-schema changes for enccontentpublished v2.2 event AB#177725 * 177261-added new logs and uplifted few existings logs AB#177261 * 177261-exception logs updated AB#177261 * 177261-unit test added for enc content sap message builder AB#177261 AB#177491 * 177261-unit test cases fixed AB#177261 AB#177491 * 177261-Wiremock changes AB#177261 * 177261-unit test added for enccontent sap message builder AB#177261 AB#177491 * 177261-logging middleware uplifted to resolve app insight exception logging issue AB#177261 * 177261-minor issue fixed AB#177261 * 177261-unit test updated AB#177261 AB#177491 * 177261-rule updated for additional coverage action AB#177261 * 177261-vulnerabilities fixed AB#177261 * 177261 Vulnerabilities fixed #AB177261 * 177261 Vulnerable dependencies fixed #AB177261 * 177261-unit test updated for enc content sap builder. AB#177261 AB#177491 * 177261 Removed stop command for SAP mock - AB#177261 * 177261 Reverted changes to SAP Mock AB #177261 * 177261 UTs modified to improve code coverage #AB177261 * 177261-code coverage improvement based on stryker AB#177261 * 177261 - Updated existing FTs' as per new rules and new payload schema. Added new FT's to validate mandatory attributes in the payload. AB#177261 * 177261 - Updated appsettings - AB#177261 * 177261 passed key vault url for FTs AB#177261 * 177261 - removed permit key section form appsettings AB#177261 * 177261 UTs added to improve code coverage AB#177261 * 177261-code refactoring AB#177261 * Removing keyvaulturl variable from YAML AB#177261 * 177261 - changed code for fetching keyvault secrets AB#177261 * 177261-minor change AB#177261 * 177261-updated mock service proj file AB#177261 * 177261-ukhoweeknumber issue fixed AB#177261 * 177261-Added FT for Re-issue scenario AB#177261 * 177261-changed property of input file to Copy always AB#177261 * 177902-exception logs formatting issue fix AB#177902 * 177261 Fixed UTs post refactoring error logs * 177902-Exception logs format fixed AB#177902 * 177261 Updated expected xml files AB#177261 * 177261 - Resolved review comments AB#177261 * 177261-code review comments fixed AB#177261 AB#181398 * updated correlationid * 177261-minor code review comment fixed AB#177261 AB#181398 * 177261-code review comments resolved in FT's AB#177261 * 177261-Updated payload and xml for Reissue scenario as per the latest updated payload AB#177261 --------- Co-authored-by: Vishal Dukare <[email protected]> Co-authored-by: rushikeshkhopatkar <[email protected]> Co-authored-by: Pooja More <[email protected]> Co-authored-by: rushikeshkhopatkar <[email protected]> Co-authored-by: Amogh Lanke <[email protected]> * Bump the all-packages group with 5 updates (#193) Bumps the all-packages group with 5 updates: | Package | From | To | | --- | --- | --- | | [Azure.Identity](https://github.com/Azure/azure-sdk-for-net) | `1.12.0` | `1.12.1` | | [Microsoft.Identity.Client](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet) | `4.64.1` | `4.65.0` | | [Swashbuckle.AspNetCore](https://github.com/domaindrivendev/Swashbuckle.AspNetCore) | `6.7.3` | `6.8.0` | | [Azure.Storage.Blobs](https://github.com/Azure/azure-sdk-for-net) | `12.22.0` | `12.22.1` | | [WireMock.Net](https://github.com/WireMock-Net/WireMock.Net) | `1.6.3` | `1.6.5` | Updates `Azure.Identity` from 1.12.0 to 1.12.1 - [Release notes](https://github.com/Azure/azure-sdk-for-net/releases) - [Commits](Azure/azure-sdk-for-net@Azure.Identity_1.12.0...Azure.Identity_1.12.1) Updates `Microsoft.Identity.Client` from 4.64.1 to 4.65.0 - [Release notes](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/releases) - [Changelog](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/blob/main/CHANGELOG.md) - [Commits](AzureAD/microsoft-authentication-library-for-dotnet@4.64.1...4.65.0) Updates `Microsoft.Identity.Client` from 4.64.1 to 4.65.0 - [Release notes](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/releases) - [Changelog](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/blob/main/CHANGELOG.md) - [Commits](AzureAD/microsoft-authentication-library-for-dotnet@4.64.1...4.65.0) Updates `Swashbuckle.AspNetCore` from 6.7.3 to 6.8.0 - [Release notes](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/releases) - [Commits](domaindrivendev/Swashbuckle.AspNetCore@v6.7.3...v6.8.0) Updates `Azure.Storage.Blobs` from 12.22.0 to 12.22.1 - [Release notes](https://github.com/Azure/azure-sdk-for-net/releases) - [Commits](Azure/azure-sdk-for-net@Azure.Storage.Blobs_12.22.0...Azure.Storage.Blobs_12.22.1) Updates `WireMock.Net` from 1.6.3 to 1.6.5 - [Release notes](https://github.com/WireMock-Net/WireMock.Net/releases) - [Changelog](https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md) - [Commits](WireMock-Net/WireMock.Net@1.6.3...1.6.5) --- updated-dependencies: - dependency-name: Azure.Identity dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-packages - dependency-name: Microsoft.Identity.Client dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-packages - dependency-name: Microsoft.Identity.Client dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-packages - dependency-name: Swashbuckle.AspNetCore dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-packages - dependency-name: Azure.Storage.Blobs dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-packages - dependency-name: WireMock.Net dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-packages ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Origin/feature/177940 pre prod pipeline (#194) * UPDATE PREPROD * feat: Update Azure Pipelines configuration for vNextIATDeploy and E2EDeploy stages * feat: Update Azure Pipelines configuration for vNextIATDeploy and E2EDeploy stages * Update Azure Pipelines configuration for vNextIATDeploy and E2EDeploy stages * Update Azure Pipelines configuration for vNextIATDeploy and E2EDeploy stages * Update Azure Pipelines configuration for * feat: Update Azure Pipelines * put back the iat condition * Update Terraform subcription (#197) --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Gaurav Mejari <[email protected]> Co-authored-by: pravinvarade10801 <[email protected]> Co-authored-by: Vishal Dukare <[email protected]> Co-authored-by: rushikeshkhopatkar <[email protected]> Co-authored-by: Pooja More <[email protected]> Co-authored-by: rushikeshkhopatkar <[email protected]> Co-authored-by: Amogh Lanke <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: rushdynajath <[email protected]>
UKHO · Oct 10, 2024 · 7b19536 · 7b19536
1 parent 1b73480
commit 7b19536
Show file tree

Hide file tree

Showing 7 changed files with 124 additions and 0 deletions.
diff --git a/src/UKHO.ERPFacade.Common/Models/S100Event/S100BoundingBox.cs b/src/UKHO.ERPFacade.Common/Models/S100Event/S100BoundingBox.cs
@@ -0,0 +1,16 @@
+using Newtonsoft.Json;
+
+namespace UKHO.ERPFacade.Common.Models.S100Event
+{
+    public class S100BoundingBox
+    {
+        [JsonProperty("northLimit")]
+        public double NorthLimit { get; set; }
+        [JsonProperty("southLimit")]
+        public int SouthLimit { get; set; }
+        [JsonProperty("eastLimit")]
+        public int EastLimit { get; set; }
+        [JsonProperty("westLimit")]
+        public double WestLimit { get; set; }
+    }
+}
diff --git a/src/UKHO.ERPFacade.Common/Models/S100Event/S100CompositionChanges.cs b/src/UKHO.ERPFacade.Common/Models/S100Event/S100CompositionChanges.cs
@@ -0,0 +1,12 @@
+using Newtonsoft.Json;
+
+namespace UKHO.ERPFacade.Common.Models.S100Event
+{
+    public class S100CompositionChanges
+    {
+        [JsonProperty("addProducts")]
+        public List<string> AddProducts { get; set; }
+        [JsonProperty("removeProducts")]
+        public List<string> RemoveProducts { get; set; }
+    }
+}
diff --git a/src/UKHO.ERPFacade.Common/Models/S100Event/S100EventData.cs b/src/UKHO.ERPFacade.Common/Models/S100Event/S100EventData.cs
@@ -0,0 +1,14 @@
+using Newtonsoft.Json;
+
+namespace UKHO.ERPFacade.Common.Models.S100Event
+{
+    public class S100EventData
+    {
+        [JsonProperty("correlationId")]
+        public string CorrelationId { get; set; }
+        [JsonProperty("products")]
+        public List<S100Product> Products { get; set; }
+        [JsonProperty("unitsOfSale")]
+        public List<S100UnitsOfSale> UnitsOfSale { get; set; }
+    }
+}
diff --git a/src/UKHO.ERPFacade.Common/Models/S100Event/S100EventPayload.cs b/src/UKHO.ERPFacade.Common/Models/S100Event/S100EventPayload.cs
@@ -0,0 +1,8 @@
+namespace UKHO.ERPFacade.Common.Models.S100Event
+{
+    public class S100EventPayload
+    {
+        public string Type { get; set; }
+        public S100EventData S100EventData { get; set; }
+    }
+}
diff --git a/src/UKHO.ERPFacade.Common/Models/S100Event/S100Product.cs b/src/UKHO.ERPFacade.Common/Models/S100Event/S100Product.cs
@@ -0,0 +1,38 @@
+using Newtonsoft.Json;
+
+namespace UKHO.ERPFacade.Common.Models.S100Event
+{
+    public class S100Product
+    {
+        [JsonProperty("productType")]
+        public string ProductType { get; set; }
+        [JsonProperty("productIdentifier")]
+        public string ProductIdentifier { get; set; }
+        [JsonProperty("productName")]
+        public string ProductName { get; set; }
+        [JsonProperty("editionNumber")]
+        public int EditionNumber { get; set; }
+        [JsonProperty("updateNumber")]
+        public int UpdateNumber { get; set; }
+        [JsonProperty("mayAffectHoldings")]
+        public bool MayAffectHoldings { get; set; }
+        [JsonProperty("contentChange")]
+        public bool ContentChange { get; set; }
+        [JsonProperty("providerName")]
+        public string ProviderName { get; set; }
+        [JsonProperty("producingAgency")]
+        public string ProducingAgency { get; set; }
+        [JsonProperty("status")]
+        public S100Status Status { get; set; }
+        [JsonProperty("replaces")]
+        public List<string> Replaces { get; set; }
+        [JsonProperty("dataReplacement")]
+        public List<string> DataReplacement { get; set; }
+        [JsonProperty("boundingBox")]
+        public S100BoundingBox BoundingBox { get; set; }
+        [JsonProperty("fileSize")]
+        public int FileSize { get; set; }
+        [JsonProperty("inUnitsOfSale")]
+        public List<string> InUnitsOfSale { get; set; }
+    }
+}
diff --git a/src/UKHO.ERPFacade.Common/Models/S100Event/S100Status.cs b/src/UKHO.ERPFacade.Common/Models/S100Event/S100Status.cs
@@ -0,0 +1,14 @@
+using Newtonsoft.Json;
+
+namespace UKHO.ERPFacade.Common.Models.S100Event
+{
+    public class S100Status
+    {
+        [JsonProperty("statusName")]
+        public string StatusName { get; set; }
+        [JsonProperty("statusDate")]
+        public DateTime StatusDate { get; set; }
+        [JsonProperty("isNewCell")]
+        public bool IsNewCell { get; set; }
+    }
+}
diff --git a/src/UKHO.ERPFacade.Common/Models/S100Event/S100UnitsOfSale.cs b/src/UKHO.ERPFacade.Common/Models/S100Event/S100UnitsOfSale.cs
@@ -0,0 +1,22 @@
+using Newtonsoft.Json;
+
+namespace UKHO.ERPFacade.Common.Models.S100Event
+{
+    public class S100UnitsOfSale
+    {
+        [JsonProperty("unitName")]
+        public string UnitName { get; set; }
+        [JsonProperty("title")]
+        public string Title { get; set; }
+        [JsonProperty("unitSize")]
+        public string UnitSize { get; set; }
+        [JsonProperty("status")]
+        public string Status { get; set; }
+        [JsonProperty("isNewUnitOfSale")]
+        public bool IsNewUnitOfSale { get; set; }
+        [JsonProperty("boundingBox")]
+        public S100BoundingBox BoundingBox { get; set; }
+        [JsonProperty("compositionChanges")]
+        public S100CompositionChanges CompositionChanges { get; set; }
+    }
+}