diff --git a/CHANGELOG.md b/CHANGELOG.md index f27aa5c7d..864e77316 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,7 @@ For changes to the BPDM Helm charts please consult the [changelog](charts/bpdm/C - BPDM Cleaning Service Dummy: Removed assignment of uncategorized identifier while performing cleaning task process. ([#1098](https://github.com/eclipse-tractusx/bpdm/pull/1098)) - BPDM Pool: Fix error querying legal forms when non-gleif legacy legal forms are present in the database ([#1107](https://github.com/eclipse-tractusx/bpdm/issues/1107)) - BPDM: Fix denial of service attack vulnerability CVE-2024-47535 ([#1112](https://github.com/eclipse-tractusx/bpdm/issues/1112)) +- BPDM Gate: Fix error on writing golden record task result missing legal name into output stage. Result is now correctly written. ([#1115](https://github.com/eclipse-tractusx/bpdm/issues/1115)) ## [6.1.0] - [2024-07-15] diff --git a/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/model/upsert/output/OutputUpsertData.kt b/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/model/upsert/output/OutputUpsertData.kt index bc8bbfa9b..b340ea8e9 100644 --- a/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/model/upsert/output/OutputUpsertData.kt +++ b/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/model/upsert/output/OutputUpsertData.kt @@ -29,7 +29,7 @@ data class OutputUpsertData( val roles: Collection, val isOwnCompanyData: Boolean, val legalEntityBpn: String, - val legalName: String, + val legalName: String?, val shortName: String?, val legalForm: String?, val siteBpn: String?, diff --git a/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/OrchestratorMappings.kt b/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/OrchestratorMappings.kt index 98d4b6a37..55261ecf7 100644 --- a/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/OrchestratorMappings.kt +++ b/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/OrchestratorMappings.kt @@ -218,7 +218,7 @@ class OrchestratorMappings( identifiers = uncategorized.identifiers.mapNotNull { toIdentifier(it, BusinessPartnerType.GENERIC) } .plus(legalEntity.identifiers.mapNotNull { toIdentifier(it, BusinessPartnerType.LEGAL_ENTITY) }) .plus(postalAddress.identifiers.mapNotNull { toIdentifier(it, BusinessPartnerType.ADDRESS) }), - legalName = legalEntity.legalName ?: throw BpdmNullMappingException(BusinessPartner::class, OutputUpsertData::class, LegalEntity::legalName), + legalName = legalEntity.legalName, siteName = site?.siteName, addressName = postalAddress.addressName, legalForm = legalEntity.legalForm, diff --git a/charts/bpdm/Chart.yaml b/charts/bpdm/Chart.yaml index eddaeef99..dab1bf01d 100644 --- a/charts/bpdm/Chart.yaml +++ b/charts/bpdm/Chart.yaml @@ -22,8 +22,8 @@ apiVersion: v2 name: bpdm type: application description: A Helm chart for Kubernetes that deploys the BPDM applications -version: 5.2.0-rc4 -appVersion: "6.2.0-rc4" +version: 5.2.0-SNAPSHOT +appVersion: "6.2.0-SNAPSHOT" home: https://github.com/eclipse-tractusx/bpdm sources: - https://github.com/eclipse-tractusx/bpdm @@ -33,19 +33,19 @@ maintainers: dependencies: - name: bpdm-gate - version: 6.2.0-rc4 + version: 6.2.0-SNAPSHOT alias: bpdm-gate condition: bpdm-gate.enabled - name: bpdm-pool - version: 7.2.0-rc4 + version: 7.2.0-SNAPSHOT alias: bpdm-pool condition: bpdm-pool.enabled - name: bpdm-cleaning-service-dummy - version: 3.2.0-rc4 + version: 3.2.0-SNAPSHOT alias: bpdm-cleaning-service-dummy condition: bpdm-cleaning-service-dummy.enabled - name: bpdm-orchestrator - version: 3.2.0-rc4 + version: 3.2.0-SNAPSHOT alias: bpdm-orchestrator condition: bpdm-orchestrator.enabled - name: bpdm-common diff --git a/charts/bpdm/charts/bpdm-cleaning-service-dummy/Chart.yaml b/charts/bpdm/charts/bpdm-cleaning-service-dummy/Chart.yaml index 8b87e8de6..d00ba861b 100644 --- a/charts/bpdm/charts/bpdm-cleaning-service-dummy/Chart.yaml +++ b/charts/bpdm/charts/bpdm-cleaning-service-dummy/Chart.yaml @@ -21,8 +21,8 @@ apiVersion: v2 type: application name: bpdm-cleaning-service-dummy -appVersion: "6.2.0-rc4" -version: 3.2.0-rc4 +appVersion: "6.2.0-SNAPSHOT" +version: 3.2.0-SNAPSHOT description: A Helm chart for deploying the BPDM cleaning service home: https://eclipse-tractusx.github.io/docs/kits/Business%20Partner%20Kit/Adoption%20View sources: diff --git a/charts/bpdm/charts/bpdm-gate/Chart.yaml b/charts/bpdm/charts/bpdm-gate/Chart.yaml index 42d1a38ff..ebfdde5ea 100644 --- a/charts/bpdm/charts/bpdm-gate/Chart.yaml +++ b/charts/bpdm/charts/bpdm-gate/Chart.yaml @@ -21,8 +21,8 @@ apiVersion: v2 type: application name: bpdm-gate -appVersion: "6.2.0-rc4" -version: 6.2.0-rc4 +appVersion: "6.2.0-SNAPSHOT" +version: 6.2.0-SNAPSHOT description: A Helm chart for deploying the BPDM gate service home: https://eclipse-tractusx.github.io/docs/kits/Business%20Partner%20Kit/Adoption%20View sources: diff --git a/charts/bpdm/charts/bpdm-orchestrator/Chart.yaml b/charts/bpdm/charts/bpdm-orchestrator/Chart.yaml index ca0ef584e..36c6a9907 100644 --- a/charts/bpdm/charts/bpdm-orchestrator/Chart.yaml +++ b/charts/bpdm/charts/bpdm-orchestrator/Chart.yaml @@ -21,8 +21,8 @@ apiVersion: v2 type: application name: bpdm-orchestrator -appVersion: "6.2.0-rc4" -version: 3.2.0-rc4 +appVersion: "6.2.0-SNAPSHOT" +version: 3.2.0-SNAPSHOT description: A Helm chart for deploying the BPDM Orchestrator service home: https://eclipse-tractusx.github.io/docs/kits/Business%20Partner%20Kit/Adoption%20View sources: diff --git a/charts/bpdm/charts/bpdm-pool/Chart.yaml b/charts/bpdm/charts/bpdm-pool/Chart.yaml index 6a2b05d27..960bb5c60 100644 --- a/charts/bpdm/charts/bpdm-pool/Chart.yaml +++ b/charts/bpdm/charts/bpdm-pool/Chart.yaml @@ -21,8 +21,8 @@ apiVersion: v2 type: application name: bpdm-pool -appVersion: "6.2.0-rc4" -version: 7.2.0-rc4 +appVersion: "6.2.0-SNAPSHOT" +version: 7.2.0-SNAPSHOT description: A Helm chart for deploying the BPDM pool service home: https://eclipse-tractusx.github.io/docs/kits/Business%20Partner%20Kit/Adoption%20View sources: diff --git a/pom.xml b/pom.xml index 6e4256694..d57407495 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ - 6.2.0-rc4 + 6.2.0-SNAPSHOT 21 21 21