Merge pull request #983 from eclipse-tractusx/fix/6.0.2

Patch Version Increase to 6.0.2
eclipse-tractusx · Jul 3, 2024 · da31584 · da31584
2 parents 4202a42 + b8da347
commit da31584
Show file tree

Hide file tree

Showing 15 changed files with 53 additions and 35 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,13 @@ The format is based on Keep a Changelog (https://keepachangelog.com/en/1.0.0/),
 
 For changes to the BPDM Helm charts please consult the [changelog](charts/bpdm/CHANGELOG.md) of the charts directly.
 
+## [6.0.2] - [2024-07-03]
+
+### Changed
+
+- BPDM Gate: Now sends alternative addresses which are NULL correctly to the Orchestrator
+- BPDM Pool: Changed Checksum generation algorithm: Now checksum includes the BPN with prefix
+
 ## [6.0.1] - [2024-05-27]
 
 ### Removed

diff --git a/bpdm-cleaning-service-dummy/pom.xml b/bpdm-cleaning-service-dummy/pom.xml
@@ -31,7 +31,7 @@
  <parent>
  <groupId>org.eclipse.tractusx</groupId>
  <artifactId>bpdm-parent</artifactId>
- <version>6.0.1</version>
+ <version>6.0.2</version>
  </parent>
 
  <dependencies>

diff --git a/bpdm-common-test/pom.xml b/bpdm-common-test/pom.xml
@@ -31,7 +31,7 @@
  <parent>
  <groupId>org.eclipse.tractusx</groupId>
  <artifactId>bpdm-parent</artifactId>
- <version>6.0.1</version>
+ <version>6.0.2</version>
  </parent>
 
  <dependencies>

diff --git a/.../main/kotlin/org/eclipse/tractusx/bpdm/test/testdata/pool/BusinessPartnerVerboseValues.kt b/.../main/kotlin/org/eclipse/tractusx/bpdm/test/testdata/pool/BusinessPartnerVerboseValues.kt
@@ -41,6 +41,18 @@ import java.time.ZoneOffset
  */
 object BusinessPartnerVerboseValues {
 
+ val firstBpnL = "BPNL000000000065"
+ val secondBpnL = "BPNL00000000015G"
+ val thirdBpnl = "BPNL00000000024R"
+
+ val firstBpnA = "BPNA00000000009W"
+ val secondBpnA = "BPNA000000000197"
+ val thirdBpnA = "BPNA00000000028I"
+
+ val firstBpnS = "BPNS0000000000WN"
+ val secondBpnS = "BPNS0000000001VY"
+ val thirdBpnS = "BPNS0000000002V9"
+
  private val createdTime1 = LocalDateTime.of(2020, 1, 1, 1, 1)
  val language0 = TypeKeyNameVerboseDto(LanguageCode.undefined, LanguageCode.undefined.getName())
  val language1 = TypeKeyNameVerboseDto(LanguageCode.en, LanguageCode.en.getName())
@@ -208,7 +220,7 @@ object BusinessPartnerVerboseValues {
  )
 
  val addressPartner1 = LogisticAddressVerboseDto(
- bpna = "BPNA000000000001",
+ bpna = firstBpnA,
  physicalPostalAddress = address1,
  bpnLegalEntity = null,
  bpnSite = null,
@@ -220,7 +232,7 @@ object BusinessPartnerVerboseValues {
  )
 
  val addressPartner2 = LogisticAddressVerboseDto(
- bpna = "BPNA0000000001YN",
+ bpna = secondBpnA,
  physicalPostalAddress = address2,
  bpnLegalEntity = null,
  bpnSite = null,
@@ -232,7 +244,7 @@ object BusinessPartnerVerboseValues {
  )
 
  val addressPartner3 = LogisticAddressVerboseDto(
- bpna = "BPNA0000000002XY",
+ bpna = thirdBpnA,
  physicalPostalAddress = address3,
  bpnLegalEntity = null,
  bpnSite = null,
@@ -259,32 +271,32 @@ object BusinessPartnerVerboseValues {
  )
 
  val site1 = SiteVerboseDto(
- bpns = "BPNS000000000001",
+ bpns = firstBpnS,
  name = "Stammwerk A",
  states = listOf(siteStatus1),
- bpnLegalEntity = "BPNL000000000001",
+ bpnLegalEntity = firstBpnL,
  confidenceCriteria = confidenceCriteria1,
  isCatenaXMemberData = false,
  createdAt = Instant.now(),
  updatedAt = Instant.now(),
  )
 
  val site2 = SiteVerboseDto(
- bpns = "BPNS0000000001YN",
+ bpns = secondBpnS,
  name = "Halle B1",
  states = listOf(siteStatus2),
- bpnLegalEntity = "BPNL0000000001YN",
+ bpnLegalEntity = secondBpnL,
  confidenceCriteria = confidenceCriteria2,
  isCatenaXMemberData = false,
  createdAt = Instant.now(),
  updatedAt = Instant.now(),
  )
 
  val site3 = SiteVerboseDto(
- bpns = "BPNS0000000002XY",
+ bpns = thirdBpnS,
  name = "主厂房 C",
  states = listOf(siteStatus3),
- bpnLegalEntity = "BPNL0000000002XY",
+ bpnLegalEntity = thirdBpnl,
  confidenceCriteria = confidenceCriteria3,
  isCatenaXMemberData = false,
  createdAt = Instant.now(),
@@ -321,7 +333,7 @@ object BusinessPartnerVerboseValues {
 
  val legalEntity1 = LegalEntityWithLegalAddressVerboseDto(
  LegalEntityVerboseDto(
- bpnl = "BPNL000000000001",
+ bpnl = firstBpnL,
  legalName = "Business Partner Name",
  legalFormVerbose = legalForm1,
  identifiers = listOf(identifier1),
@@ -333,7 +345,7 @@ object BusinessPartnerVerboseValues {
  updatedAt = Instant.now(),
  ),
  legalAddress = LogisticAddressVerboseDto(
- bpna = "BPNA000000000001",
+ bpna = firstBpnA,
  physicalPostalAddress = PhysicalPostalAddressVerboseDto(
  geographicCoordinates = null,
  countryVerbose = country1,
@@ -361,7 +373,7 @@ object BusinessPartnerVerboseValues {
 
  val legalEntity2 = LegalEntityWithLegalAddressVerboseDto(
  LegalEntityVerboseDto(
- bpnl = "BPNL0000000001YN",
+ bpnl = secondBpnL,
  legalName = "Another Organisation Corp",
  legalFormVerbose = legalForm2,
  identifiers = listOf(identifier2),
@@ -373,7 +385,7 @@ object BusinessPartnerVerboseValues {
  updatedAt = Instant.now(),
  ),
  legalAddress = LogisticAddressVerboseDto(
- bpna = "BPNA000000000001",
+ bpna = firstBpnA,
  physicalPostalAddress = PhysicalPostalAddressVerboseDto(
  geographicCoordinates = null,
  countryVerbose = country2,
@@ -401,7 +413,7 @@ object BusinessPartnerVerboseValues {
 
  val legalEntity3 = LegalEntityWithLegalAddressVerboseDto(
  LegalEntityVerboseDto(
- bpnl = "BPNL0000000002XY",
+ bpnl = thirdBpnl,
  legalName = "好公司 合伙制企业",
  legalFormVerbose = legalForm3,
  identifiers = listOf(identifier3),
@@ -413,7 +425,7 @@ object BusinessPartnerVerboseValues {
  updatedAt = Instant.now(),
  ),
  legalAddress = LogisticAddressVerboseDto(
- bpna = "BPNA000000000001",
+ bpna = firstBpnA,
  physicalPostalAddress = PhysicalPostalAddressVerboseDto(
  geographicCoordinates = null,
  countryVerbose = country3,
@@ -441,7 +453,7 @@ object BusinessPartnerVerboseValues {
 
  val legalEntityUpsert1 = LegalEntityPartnerCreateVerboseDto(
  legalEntity = LegalEntityVerboseDto(
- bpnl = "BPNL000000000001",
+ bpnl = firstBpnL,
  legalName = "Business Partner Name",
  legalFormVerbose = legalForm1,
  identifiers = listOf(LegalEntityIdentifierVerboseDto("ID-XYZ", identifierType1, "Agency X")),
@@ -461,7 +473,7 @@ object BusinessPartnerVerboseValues {
 
  val legalEntityUpsert2 = LegalEntityPartnerCreateVerboseDto(
  legalEntity = LegalEntityVerboseDto(
- bpnl = "BPNL0000000001YN",
+ bpnl = secondBpnL,
  legalName = "Another Organisation Corp",
  legalFormVerbose = legalForm2,
  identifiers = listOf(LegalEntityIdentifierVerboseDto("Another ID Value", identifierType2, "Body Y")),
@@ -481,7 +493,7 @@ object BusinessPartnerVerboseValues {
 
  val legalEntityUpsert3 = LegalEntityPartnerCreateVerboseDto(
  legalEntity = LegalEntityVerboseDto(
- bpnl = "BPNL0000000002XY",
+ bpnl = thirdBpnl,
  legalName = "好公司 合伙制企业",
  legalFormVerbose = legalForm3,
  identifiers = listOf(LegalEntityIdentifierVerboseDto("An ID Value", identifierType3, "Official Z")),
@@ -501,7 +513,7 @@ object BusinessPartnerVerboseValues {
 
  val legalEntityUpsertMultipleIdentifier = LegalEntityPartnerCreateVerboseDto(
  legalEntity = LegalEntityVerboseDto(
- bpnl = "BPNL000000000001",
+ bpnl = firstBpnL,
  legalName = "Business Partner Name",
  legalFormVerbose = legalForm1,
  identifiers = listOf(

diff --git a/bpdm-common/pom.xml b/bpdm-common/pom.xml
@@ -31,7 +31,7 @@
  <parent>
  <groupId>org.eclipse.tractusx</groupId>
  <artifactId>bpdm-parent</artifactId>
- <version>6.0.1</version>
+ <version>6.0.2</version>
  </parent>
 
  <dependencies>

diff --git a/bpdm-gate-api/pom.xml b/bpdm-gate-api/pom.xml
@@ -31,7 +31,7 @@
  <parent>
  <artifactId>bpdm-parent</artifactId>
  <groupId>org.eclipse.tractusx</groupId>
- <version>6.0.1</version>
+ <version>6.0.2</version>
  </parent>
 
  <properties>

diff --git a/bpdm-gate/pom.xml b/bpdm-gate/pom.xml
@@ -31,7 +31,7 @@
  <parent>
  <groupId>org.eclipse.tractusx</groupId>
  <artifactId>bpdm-parent</artifactId>
- <version>6.0.1</version>
+ <version>6.0.2</version>
  </parent>
 
  <dependencies>

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
@@ -33,10 +33,9 @@ import org.eclipse.tractusx.bpdm.gate.entity.PhysicalPostalAddressDb
 import org.eclipse.tractusx.bpdm.gate.entity.StreetDb
 import org.eclipse.tractusx.bpdm.gate.entity.generic.*
 import org.eclipse.tractusx.orchestrator.api.model.*
-import org.eclipse.tractusx.orchestrator.api.model.BpnReferenceType
 import org.springframework.stereotype.Service
 import java.time.ZoneOffset
-import java.util.SortedSet
+import java.util.*
 
 @Service
 class OrchestratorMappings(
@@ -134,7 +133,7 @@ class OrchestratorMappings(
  deliveryServiceNumber
  )
  }
- } ?: AlternativeAddress.empty,
+ },
  hasChanged = null
  )
  }

diff --git a/bpdm-orchestrator-api/pom.xml b/bpdm-orchestrator-api/pom.xml
@@ -30,7 +30,7 @@
  <parent>
  <groupId>org.eclipse.tractusx</groupId>
  <artifactId>bpdm-parent</artifactId>
- <version>6.0.1</version>
+ <version>6.0.2</version>
  </parent>
 
  <properties>

diff --git a/bpdm-orchestrator/pom.xml b/bpdm-orchestrator/pom.xml
@@ -31,7 +31,7 @@
  <parent>
  <groupId>org.eclipse.tractusx</groupId>
  <artifactId>bpdm-parent</artifactId>
- <version>6.0.1</version>
+ <version>6.0.2</version>
  </parent>
 
  <dependencies>

diff --git a/bpdm-pool-api/pom.xml b/bpdm-pool-api/pom.xml
@@ -31,7 +31,7 @@
  <parent>
  <groupId>org.eclipse.tractusx</groupId>
  <artifactId>bpdm-parent</artifactId>
- <version>6.0.1</version>
+ <version>6.0.2</version>
  </parent>
 
  <properties>

diff --git a/bpdm-pool/pom.xml b/bpdm-pool/pom.xml
@@ -31,7 +31,7 @@
  <parent>
  <groupId>org.eclipse.tractusx</groupId>
  <artifactId>bpdm-parent</artifactId>
- <version>6.0.1</version>
+ <version>6.0.2</version>
  </parent>
 
  <dependencies>

diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/BpnIssuingService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/BpnIssuingService.kt
@@ -92,7 +92,7 @@ class BpnIssuingService(
 
  private fun createBpn(number: Long, bpnChar: Char): String {
  val code = toBpnCode(number)
- val checksum = calculateChecksum(code)
+ val checksum = calculateChecksum(bpnConfigProperties.id + bpnChar + code)
 
  return "${bpnConfigProperties.id}$bpnChar$code$checksum"
  }

diff --git a/bpdm-pool/src/test/kotlin/org/eclipse/tractusx/bpdm/pool/controller/SiteControllerIT.kt b/bpdm-pool/src/test/kotlin/org/eclipse/tractusx/bpdm/pool/controller/SiteControllerIT.kt
@@ -492,15 +492,15 @@ class SiteControllerIT @Autowired constructor(
  BusinessPartnerVerboseValues.addressPartner1.copy(
  addressType = AddressType.SiteMainAddress,
  bpnSite = BusinessPartnerVerboseValues.site1.bpns,
- bpna = "BPNA0000000001YN"
+ bpna = BusinessPartnerVerboseValues.secondBpnA
  )
  val site1 = BusinessPartnerVerboseValues.site1.copy(bpnLegalEntity = bpnL1)
 
  val legalAddress2: LogisticAddressVerboseDto =
  BusinessPartnerVerboseValues.addressPartner2.copy(
  addressType = AddressType.SiteMainAddress,
  bpnSite = BusinessPartnerVerboseValues.site2.bpns,
- bpna = "BPNA0000000002XY"
+ bpna = BusinessPartnerVerboseValues.thirdBpnA
  )
  val site2 = BusinessPartnerVerboseValues.site2.copy(bpnLegalEntity = bpnL1)
 

diff --git a/pom.xml b/pom.xml
@@ -27,7 +27,7 @@
  <artifactId>bpdm-parent</artifactId>
  <name>Business Partner Data Management Parent</name>
  <description>Parent pom of Business Partner Data Management</description>
- <version>6.0.1</version>
+ <version>6.0.2</version>
  <packaging>pom</packaging>
 
  <parent>