-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(pool): #658 consider in validation that if the BPN request ident…
…ifier is known to the pool, the task has to be considered as update, - validate duplicates over all addresses and all legal entities - move function to create and compare business partner in own files
- Loading branch information
1 parent
5147633
commit 35b7fd4
Showing
7 changed files
with
944 additions
and
641 deletions.
There are no files selected for viewing
285 changes: 178 additions & 107 deletions
285
bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/RequestValidationService.kt
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
183 changes: 183 additions & 0 deletions
183
...-pool/src/test/kotlin/org/eclipse/tractusx/bpdm/pool/service/BusinessPartnerComparator.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,183 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2021,2023 Contributors to the Eclipse Foundation | ||
| * | ||
| * See the NOTICE file(s) distributed with this work for additional | ||
| * information regarding copyright ownership. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Apache License, Version 2.0 which is available at | ||
| * https://www.apache.org/licenses/LICENSE-2.0. | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| * License for the specific language governing permissions and limitations | ||
| * under the License. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| ******************************************************************************/ | ||
|
|
||
| package org.eclipse.tractusx.bpdm.pool.service | ||
|
|
||
| import org.assertj.core.api.Assertions | ||
| import org.eclipse.tractusx.bpdm.common.dto.ILegalEntityStateDto | ||
| import org.eclipse.tractusx.bpdm.common.dto.ISiteStateDto | ||
| import org.eclipse.tractusx.bpdm.pool.api.model.* | ||
| import org.eclipse.tractusx.bpdm.pool.api.model.response.LegalEntityWithLegalAddressVerboseDto | ||
| import org.eclipse.tractusx.bpdm.pool.api.model.response.SiteWithMainAddressVerboseDto | ||
| import org.eclipse.tractusx.orchestrator.api.model.AddressIdentifierDto | ||
| import org.eclipse.tractusx.orchestrator.api.model.AddressStateDto | ||
| import org.eclipse.tractusx.orchestrator.api.model.LegalEntityClassificationDto | ||
| import org.eclipse.tractusx.orchestrator.api.model.LegalEntityDto | ||
| import org.eclipse.tractusx.orchestrator.api.model.LegalEntityIdentifierDto | ||
| import org.eclipse.tractusx.orchestrator.api.model.LogisticAddressDto | ||
| import org.eclipse.tractusx.orchestrator.api.model.SiteDto | ||
| import java.time.LocalDateTime | ||
| import java.time.temporal.ChronoUnit | ||
| import java.util.function.BiPredicate | ||
|
|
||
| fun compareLegalEntity(verboseRequest: LegalEntityWithLegalAddressVerboseDto, legalEntity: LegalEntityDto?) { | ||
|
|
||
| val verboseLegalEntity = verboseRequest.legalEntity | ||
|
|
||
| Assertions.assertThat(verboseLegalEntity.legalShortName).isEqualTo(legalEntity?.legalShortName) | ||
| Assertions.assertThat(verboseLegalEntity.legalFormVerbose?.technicalKey).isEqualTo(legalEntity?.legalForm) | ||
| compareStates(verboseLegalEntity.states, legalEntity?.states) | ||
| compareClassifications(verboseLegalEntity.classifications, legalEntity?.classifications) | ||
| compareIdentifiers(verboseLegalEntity.identifiers, legalEntity?.identifiers) | ||
|
|
||
| val verboseLegalAddress = verboseRequest.legalAddress | ||
| Assertions.assertThat(verboseLegalAddress.bpnLegalEntity).isEqualTo(legalEntity?.bpnLReference?.referenceValue) | ||
| Assertions.assertThat(verboseLegalAddress.isLegalAddress).isTrue() | ||
| compareLogisticAddress(verboseLegalAddress, legalEntity?.legalAddress) | ||
| } | ||
|
|
||
| fun compareSite(verboseRequest: SiteWithMainAddressVerboseDto, site: SiteDto?) { | ||
|
|
||
| val verboseSite = verboseRequest.site | ||
|
|
||
| Assertions.assertThat(verboseSite.name).isEqualTo(site?.name) | ||
| Assertions.assertThat(verboseSite.bpns).isEqualTo(site?.bpnSReference?.referenceValue) | ||
| compareSiteStates(verboseSite.states, site?.states) | ||
|
|
||
| val verboseMainAddress = verboseRequest.mainAddress | ||
| Assertions.assertThat(verboseMainAddress.bpnSite).isEqualTo(site?.bpnSReference?.referenceValue) | ||
| val mainAddress = site?.mainAddress | ||
| Assertions.assertThat(verboseMainAddress.isMainAddress).isTrue() | ||
| compareLogisticAddress(verboseMainAddress, mainAddress) | ||
| } | ||
|
|
||
| fun compareLogisticAddress(verboseAddress: LogisticAddressVerboseDto, address: LogisticAddressDto?) { | ||
|
|
||
| Assertions.assertThat(verboseAddress.name).isEqualTo(address?.name) | ||
| compareAddressStates(verboseAddress.states, address?.states) | ||
| compareAddressIdentifiers(verboseAddress.identifiers, address?.identifiers) | ||
|
|
||
|
|
||
| val verbosePhysicalAddress = verboseAddress.physicalPostalAddress | ||
| val physicalAddress = address?.physicalPostalAddress | ||
| Assertions.assertThat(verbosePhysicalAddress).usingRecursiveComparison() | ||
| .ignoringFields(PhysicalPostalAddressVerboseDto::countryVerbose.name, PhysicalPostalAddressVerboseDto::administrativeAreaLevel1Verbose.name) | ||
| .isEqualTo(physicalAddress) | ||
| Assertions.assertThat(verbosePhysicalAddress.country.name).isEqualTo(physicalAddress?.country?.name) | ||
| Assertions.assertThat(verbosePhysicalAddress.administrativeAreaLevel1).isEqualTo(physicalAddress?.administrativeAreaLevel1) | ||
| val verboseAlternAddress = verboseAddress.alternativePostalAddress | ||
| val alternAddress = address?.alternativePostalAddress | ||
| Assertions.assertThat(verboseAlternAddress).usingRecursiveComparison() | ||
| .ignoringFields(AlternativePostalAddressVerboseDto::countryVerbose.name, AlternativePostalAddressVerboseDto::administrativeAreaLevel1Verbose.name) | ||
| .isEqualTo(alternAddress) | ||
| Assertions.assertThat(verboseAlternAddress?.country?.name).isEqualTo(alternAddress?.country?.name) | ||
| Assertions.assertThat(verboseAlternAddress?.administrativeAreaLevel1).isEqualTo(alternAddress?.administrativeAreaLevel1) | ||
| } | ||
|
|
||
| fun compareAddressStates(statesVerbose: Collection<AddressStateVerboseDto>, states: Collection<AddressStateDto>?) { | ||
|
|
||
| Assertions.assertThat(statesVerbose.size).isEqualTo(states?.size ?: 0) | ||
| val sortedVerboseStates = statesVerbose.sortedBy { it.description } | ||
| val sortedStates = states?.sortedBy { it.description } | ||
| sortedVerboseStates.indices.forEach { | ||
| Assertions.assertThat(sortedVerboseStates[it].typeVerbose.technicalKey.name).isEqualTo(sortedStates!![it].type.name) | ||
| Assertions.assertThat(sortedVerboseStates[it]).usingRecursiveComparison() | ||
| .withEqualsForFields(isEqualToIgnoringMilliseconds(), AddressStateVerboseDto::validTo.name) | ||
| .withEqualsForFields(isEqualToIgnoringMilliseconds(), AddressStateVerboseDto::validFrom.name) | ||
| .ignoringFields(AddressStateVerboseDto::typeVerbose.name).isEqualTo(sortedStates[it]) | ||
| } | ||
| } | ||
|
|
||
| fun compareAddressIdentifiers(identifiersVerbose: Collection<AddressIdentifierVerboseDto>, identifiers: Collection<AddressIdentifierDto>?) { | ||
|
|
||
| Assertions.assertThat(identifiersVerbose.size).isEqualTo(identifiers?.size ?: 0) | ||
| val sortedVerboseIdentifiers = identifiersVerbose.sortedBy { it.typeVerbose.name } | ||
| val sortedIdentifiers = identifiers!!.sortedBy { it.type } | ||
| sortedVerboseIdentifiers.indices.forEach { | ||
| Assertions.assertThat(sortedVerboseIdentifiers[it].typeVerbose.technicalKey).isEqualTo(sortedIdentifiers[it].type) | ||
| Assertions.assertThat(sortedVerboseIdentifiers[it]).usingRecursiveComparison() | ||
| .ignoringFields(AddressIdentifierVerboseDto::typeVerbose.name) | ||
| .isEqualTo(sortedIdentifiers[it]) | ||
| } | ||
| } | ||
|
|
||
| fun compareStates(statesVerbose: Collection<LegalEntityStateVerboseDto>, states: Collection<ILegalEntityStateDto>?) { | ||
|
|
||
| Assertions.assertThat(statesVerbose.size).isEqualTo(states?.size ?: 0) | ||
| val sortedVerboseStates = statesVerbose.sortedBy { it.description } | ||
| val sortedStates = states!!.sortedBy { it.description } | ||
| sortedVerboseStates.indices.forEach { | ||
| Assertions.assertThat(sortedVerboseStates[it].typeVerbose.technicalKey.name).isEqualTo(sortedStates[it].type.name) | ||
| Assertions.assertThat(sortedVerboseStates[it]).usingRecursiveComparison() | ||
| .withEqualsForFields(isEqualToIgnoringMilliseconds(), LegalEntityStateVerboseDto::validTo.name ) | ||
| .withEqualsForFields(isEqualToIgnoringMilliseconds(), LegalEntityStateVerboseDto::validFrom.name) | ||
| .ignoringFields(LegalEntityStateVerboseDto::typeVerbose.name) | ||
| .isEqualTo(sortedStates[it]) | ||
| } | ||
| } | ||
|
|
||
| fun compareSiteStates(statesVerbose: Collection<SiteStateVerboseDto>, states: Collection<ISiteStateDto>?) { | ||
|
|
||
| Assertions.assertThat(statesVerbose.size).isEqualTo(states?.size ?: 0) | ||
| val sortedVerboseStates = statesVerbose.sortedBy { it.description } | ||
| val sortedStates = states!!.sortedBy { it.description } | ||
| sortedVerboseStates.indices.forEach { | ||
| Assertions.assertThat(sortedVerboseStates[it].typeVerbose.technicalKey.name).isEqualTo(sortedStates[it].type.name) | ||
| Assertions.assertThat(sortedVerboseStates[it]).usingRecursiveComparison() | ||
| .withEqualsForFields(isEqualToIgnoringMilliseconds(), SiteStateVerboseDto::validTo.name) | ||
| .withEqualsForFields(isEqualToIgnoringMilliseconds(), SiteStateVerboseDto::validFrom.name) | ||
| .ignoringFields(SiteStateVerboseDto::typeVerbose.name) | ||
| .isEqualTo(sortedStates[it]) | ||
| } | ||
| } | ||
|
|
||
| fun isEqualToIgnoringMilliseconds(): BiPredicate<LocalDateTime?, LocalDateTime?> { | ||
| return BiPredicate<LocalDateTime?, LocalDateTime?> { d1, d2 -> | ||
| (d1 == null && d2 == null) | ||
| || d1.truncatedTo(ChronoUnit.SECONDS).equals(d2.truncatedTo(ChronoUnit.SECONDS)) | ||
| } | ||
| } | ||
|
|
||
| fun compareClassifications( | ||
| classificationsVerbose: Collection<LegalEntityClassificationVerboseDto>, | ||
| classifications: Collection<LegalEntityClassificationDto>? | ||
| ) { | ||
|
|
||
| Assertions.assertThat(classificationsVerbose.size).isEqualTo(classifications?.size ?: 0) | ||
| val sortedVerboseClassifications = classificationsVerbose.sortedBy { it.typeVerbose.name } | ||
| val sortedClassifications = classifications!!.sortedBy { it.type.name } | ||
| sortedVerboseClassifications.indices.forEach { | ||
| Assertions.assertThat(sortedVerboseClassifications[it].typeVerbose.technicalKey.name).isEqualTo(sortedClassifications[it].type.name) | ||
| Assertions.assertThat(sortedVerboseClassifications[it]).usingRecursiveComparison() | ||
| .ignoringFields(LegalEntityClassificationVerboseDto::typeVerbose.name) | ||
| .isEqualTo(sortedClassifications[it]) | ||
| } | ||
| } | ||
|
|
||
| fun compareIdentifiers(identifiersVerbose: Collection<LegalEntityIdentifierVerboseDto>, identifiers: Collection<LegalEntityIdentifierDto>?) { | ||
|
|
||
| Assertions.assertThat(identifiersVerbose.size).isEqualTo(identifiers?.size ?: 0) | ||
| val sortedVerboseIdentifiers = identifiersVerbose.sortedBy { it.typeVerbose.name } | ||
| val sortedIdentifiers = identifiers!!.sortedBy { it.type } | ||
| sortedVerboseIdentifiers.indices.forEach { | ||
| Assertions.assertThat(sortedVerboseIdentifiers[it].typeVerbose.technicalKey).isEqualTo(sortedIdentifiers[it].type) | ||
| Assertions.assertThat(sortedVerboseIdentifiers[it]).usingRecursiveComparison() | ||
| .ignoringFields(LegalEntityIdentifierVerboseDto::typeVerbose.name).isEqualTo(sortedIdentifiers[it]) | ||
| } | ||
| } |
Oops, something went wrong.