fix(leaning-service-dummy) - Changed hasChanged variable to be vased …

…on Address Type
eclipse-tractusx · Nov 30, 2023 · 6471787 · 6471787
1 parent 700af9a
commit 6471787
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/.../main/kotlin/org/eclipse/tractusx/bpdm/cleaning/service/GenericBusinessPartnerMappings.kt b/.../main/kotlin/org/eclipse/tractusx/bpdm/cleaning/service/GenericBusinessPartnerMappings.kt
@@ -20,6 +20,7 @@
 package org.eclipse.tractusx.bpdm.cleaning.service
 
 
+import org.eclipse.tractusx.bpdm.common.dto.AddressType
 import org.eclipse.tractusx.bpdm.common.dto.ClassificationDto
 import org.eclipse.tractusx.orchestrator.api.model.*
 
@@ -28,7 +29,7 @@ fun BusinessPartnerGenericDto.toLegalEntityDto(bpnReferenceDto: BpnReferenceDto,
 
     return LegalEntityDto(
         bpnLReference = bpnReferenceDto,
-        hasChanged = true,
+        hasChanged = postalAddress.addressType in setOf(AddressType.LegalAddress, AddressType.LegalAndSiteMainAddress),
         legalName = nameParts.joinToString(" "),
         legalShortName = shortName,
         identifiers = identifiers.mapNotNull { it.toLegalEntityIdentifierDto() },
@@ -67,9 +68,10 @@ fun BusinessPartnerStateDto.toSiteState(): SiteStateDto? {
 
 fun BusinessPartnerGenericDto.toLogisticAddressDto(bpnReferenceDto: BpnReferenceDto):
         LogisticAddressDto {
+
     return LogisticAddressDto(
         bpnAReference = bpnReferenceDto,
-        hasChanged = true,
+        hasChanged = postalAddress.addressType == AddressType.AdditionalAddress,
         name = nameParts.joinToString(" "),
         states = emptyList(),
         identifiers = emptyList(),
@@ -83,7 +85,7 @@ fun BusinessPartnerGenericDto.toSiteDto(bpnReferenceDto: BpnReferenceDto, legalN
 
     return SiteDto(
         bpnSReference = bpnReferenceDto,
-        hasChanged = true,
+        hasChanged = postalAddress.addressType in setOf(AddressType.SiteMainAddress, AddressType.LegalAndSiteMainAddress),
         name = legalName,
         states = states.mapNotNull { it.toSiteState() },
         mainAddress = siteAddressReference

diff --git a/...my/src/test/kotlin/org/eclipse/tractusx/bpdm/cleaning/service/CleaningServiceDummyTest.kt b/...my/src/test/kotlin/org/eclipse/tractusx/bpdm/cleaning/service/CleaningServiceDummyTest.kt
@@ -66,7 +66,7 @@ class CleaningServiceDummyTest @Autowired constructor(
 
         val expectedAddress = expectedLogisticAddressDto.copy(bpnAReference = BpnReferenceDto(expectedBpnA.toString(), BpnReferenceType.Bpn))
 
-        val expectedLegalEntity = expectedLegalEntityDto.copy(legalAddress = expectedLogisticAddressDto)
+        val expectedLegalEntity = expectedLegalEntityDto.copy(legalAddress = expectedLogisticAddressDto, hasChanged = false)
 
         assertRecursively(resultedAddress).isEqualTo(expectedAddress)
 
@@ -97,7 +97,7 @@ class CleaningServiceDummyTest @Autowired constructor(
 
         val expectedAddress = expectedLogisticAddressDto.copy()
 
-        val expectedLegalEntity = expectedLegalEntityDto.copy(legalAddress = expectedLogisticAddressDto)
+        val expectedLegalEntity = expectedLegalEntityDto.copy(legalAddress = expectedLogisticAddressDto, hasChanged = false)
 
         // bpnAReference since they are generated
         assertRecursively(resultedAddress).ignoringFields("bpnAReference").isEqualTo(expectedAddress)
@@ -130,6 +130,7 @@ class CleaningServiceDummyTest @Autowired constructor(
 
         val expectedLegalEntity = expectedLegalEntityDto.copy(
             legalAddress = expectedLogisticAddressDto.copy(
+                hasChanged = false,
                 bpnAReference = BpnReferenceDto(
                     expectedBpnA.toString(),
                     BpnReferenceType.Bpn
@@ -174,7 +175,9 @@ class CleaningServiceDummyTest @Autowired constructor(
 
 
         val expectedLegalEntity = expectedLegalEntityDto.copy(
+            hasChanged = true,
             legalAddress = expectedLogisticAddressDto.copy(
+                hasChanged = false,
                 bpnAReference = BpnReferenceDto(
                     expectedBpnA.toString(),
                     BpnReferenceType.Bpn
@@ -183,7 +186,8 @@ class CleaningServiceDummyTest @Autowired constructor(
         )
 
         val expectedSite = expectedSiteDto.copy(
-            mainAddress = expectedLogisticAddressDto.copy(bpnAReference = BpnReferenceDto(expectedBpnA.toString(), BpnReferenceType.Bpn)),
+            hasChanged = true,
+            mainAddress = expectedLogisticAddressDto.copy(bpnAReference = BpnReferenceDto(expectedBpnA.toString(), BpnReferenceType.Bpn), hasChanged = false),
             bpnSReference = BpnReferenceDto(expectedBpnS.toString(), BpnReferenceType.Bpn)
         )
 
@@ -222,9 +226,9 @@ class CleaningServiceDummyTest @Autowired constructor(
         assertNotEquals(resultedAddress?.bpnAReference?.referenceValue, resultedLegalEntity?.legalAddress?.bpnAReference?.referenceValue)
         assertNotEquals(resultedAddress?.bpnAReference?.referenceValue, resultedSite?.mainAddress?.bpnAReference?.referenceValue)
 
-        val expectedLegalEntity = expectedLegalEntityDto.copy(legalAddress = expectedLogisticAddressDto.copy())
+        val expectedLegalEntity = expectedLegalEntityDto.copy(legalAddress = expectedLogisticAddressDto.copy(hasChanged = false), hasChanged = false)
 
-        val expectedSite = expectedSiteDto.copy(mainAddress = expectedLogisticAddressDto.copy())
+        val expectedSite = expectedSiteDto.copy(mainAddress = expectedLogisticAddressDto.copy(hasChanged = false), hasChanged = true)
 
 
         // ignoring bpnLReference and legalAddress.bpnAReference since they are generated