feat(pool): eclipse-tractusx#432 Upsert Business Partners from Cleani…

…ng Result

- create initial poll logic
- refactor legal entity creation validation so that it could be used by orchestrator DTOs

bpdm-common/src/main/kotlin/org/eclipse/tractusx/bpdm/common/dto/AddressIdentifierDto.kt

@@ -26,8 +26,8 @@ import org.eclipse.tractusx.bpdm.common.dto.openapidescription.AddressIdentifier
 data class AddressIdentifierDto(
 
     @get:Schema(description = AddressIdentifierDescription.value)
-    val value: String,
+    override val value: String,
 
     @get:Schema(description = AddressIdentifierDescription.type)
-    val type: String,
-)
+    override val type: String,
+) : IBaseAddressIdentifierDto

bpdm-common/src/main/kotlin/org/eclipse/tractusx/bpdm/common/dto/AddressStateDto.kt

@@ -28,14 +28,14 @@ import java.time.LocalDateTime
 data class AddressStateDto(
 
     @get:Schema(description = AddressStateDescription.description)
-    val description: String?,
+    override val description: String?,
 
     @get:Schema(description = AddressStateDescription.validFrom)
-    val validFrom: LocalDateTime?,
+    override val validFrom: LocalDateTime?,
 
     @get:Schema(description = AddressStateDescription.validTo)
-    val validTo: LocalDateTime?,
+    override val validTo: LocalDateTime?,
 
     @get:Schema(description = AddressStateDescription.type)
-    val type: BusinessStateType
-)
+    override val type: BusinessStateType
+): IBaseAddressStateDto

bpdm-common/src/main/kotlin/org/eclipse/tractusx/bpdm/common/dto/ClassificationDto.kt

@@ -27,11 +27,11 @@ import org.eclipse.tractusx.bpdm.common.model.ClassificationType
 data class ClassificationDto(
 
     @get:Schema(description = ClassificationDescription.type)
-    val type: ClassificationType,
+    override val type: ClassificationType,
 
     @get:Schema(description = ClassificationDescription.code)
-    val code: String?,
+    override val code: String?,
 
     @get:Schema(description = ClassificationDescription.value)
-    val value: String?
-)
+    override val value: String?
+) : IBaseClassificationDto

bpdm-common/src/main/kotlin/org/eclipse/tractusx/bpdm/common/dto/IBaseLegalEntityDto.kt

@@ -40,7 +40,4 @@ interface IBaseLegalEntityDto {
     @get:ArraySchema(arraySchema = Schema(description = LegalEntityDescription.classifications, required = false))
     val classifications: Collection<IBaseClassificationDto>
 
-    // TODO OpenAPI description for complex field does not work!!
-    @get:Schema(description = LegalEntityDescription.legalAddress)
-    val legalAddress: IBaseLogisticAddressDto?
 }

bpdm-common/src/main/kotlin/org/eclipse/tractusx/bpdm/common/dto/LegalEntityDto.kt

@@ -26,17 +26,17 @@ import org.eclipse.tractusx.bpdm.common.dto.openapidescription.LegalEntityDescri
 @Schema(description = LegalEntityDescription.header)
 data class LegalEntityDto(
     @get:ArraySchema(arraySchema = Schema(description = LegalEntityDescription.identifiers, required = false))
-    val identifiers: Collection<LegalEntityIdentifierDto> = emptyList(),
+    override val identifiers: Collection<LegalEntityIdentifierDto> = emptyList(),
 
     @get:Schema(description = LegalEntityDescription.legalShortName)
-    val legalShortName: String?,
+    override val legalShortName: String?,
 
     @get:Schema(description = LegalEntityDescription.legalForm)
-    val legalForm: String? = null,
+    override val legalForm: String? = null,
 
     @get:ArraySchema(arraySchema = Schema(description = LegalEntityDescription.states))
-    val states: Collection<LegalEntityStateDto> = emptyList(),
+    override val states: Collection<LegalEntityStateDto> = emptyList(),
 
     @get:ArraySchema(arraySchema = Schema(description = LegalEntityDescription.classifications, required = false))
-    val classifications: Collection<ClassificationDto> = emptyList(),
-)
+    override val classifications: Collection<ClassificationDto> = emptyList(),
+)  : IBaseLegalEntityDto

bpdm-common/src/main/kotlin/org/eclipse/tractusx/bpdm/common/dto/LegalEntityIdentifierDto.kt

@@ -22,15 +22,10 @@ package org.eclipse.tractusx.bpdm.common.dto
 import io.swagger.v3.oas.annotations.media.Schema
 import org.eclipse.tractusx.bpdm.common.dto.openapidescription.LegalEntityIdentifierDescription
 
-@Schema(description = LegalEntityIdentifierDescription.header)
-data class LegalEntityIdentifierDto(
-
-    @get:Schema(description = LegalEntityIdentifierDescription.value)
-    val value: String,
 
-    @get:Schema(description = LegalEntityIdentifierDescription.type)
-    val type: String,
+data class LegalEntityIdentifierDto(
 
-    @get:Schema(description = LegalEntityIdentifierDescription.issuingBody)
-    val issuingBody: String?
-)
+    override val value: String,
+    override val type: String,
+    override val issuingBody: String?
+) : IBaseLegalEntityIdentifierDto

bpdm-common/src/main/kotlin/org/eclipse/tractusx/bpdm/common/dto/LegalEntityStateDto.kt

@@ -28,14 +28,14 @@ import java.time.LocalDateTime
 data class LegalEntityStateDto(
 
     @get:Schema(description = LegalEntityStateDescription.description)
-    val description: String?,
+    override val description: String?,
 
     @get:Schema(description = LegalEntityStateDescription.validFrom)
-    val validFrom: LocalDateTime?,
+    override val validFrom: LocalDateTime?,
 
     @get:Schema(description = LegalEntityStateDescription.validTo)
-    val validTo: LocalDateTime?,
+    override val validTo: LocalDateTime?,
 
     @get:Schema(description = LegalEntityStateDescription.type)
-    val type: BusinessStateType
-)
+    override val type: BusinessStateType
+) : IBaseLegalEntityStateDto

bpdm-common/src/main/kotlin/org/eclipse/tractusx/bpdm/common/dto/LogisticAddressDto.kt

@@ -30,16 +30,12 @@ data class LogisticAddressDto(
     val name: String? = null,
 
     @get:ArraySchema(arraySchema = Schema(description = LogisticAddressDescription.states))
-    val states: Collection<AddressStateDto> = emptyList(),
+    override val states: Collection<AddressStateDto> = emptyList(),
 
     @get:ArraySchema(arraySchema = Schema(description = LogisticAddressDescription.identifiers))
-    val identifiers: Collection<AddressIdentifierDto> = emptyList(),
+    override val identifiers: Collection<AddressIdentifierDto> = emptyList(),
 
-    // TODO OpenAPI description for complex field does not work!!
-    @get:Schema(description = LogisticAddressDescription.physicalPostalAddress)
-    val physicalPostalAddress: PhysicalPostalAddressDto,
+    override val physicalPostalAddress: PhysicalPostalAddressDto,
 
-    // TODO OpenAPI description for complex field does not work!!
-    @get:Schema(description = LogisticAddressDescription.alternativePostalAddress)
-    val alternativePostalAddress: AlternativePostalAddressDto? = null
-)
+    override val alternativePostalAddress: AlternativePostalAddressDto? = null
+) : IBaseLogisticAddressDto

bpdm-orchestrator-api/src/main/kotlin/org/eclipse/tractusx/orchestrator/api/model/LegalEntityDto.kt

@@ -44,6 +44,6 @@ data class LegalEntityDto(
 
     override val classifications: Collection<BusinessPartnerClassificationDto> = emptyList(),
 
-    override val legalAddress: LogisticAddressDto? = null
+    val legalAddress: LogisticAddressDto? = null
 
 ) : IBaseLegalEntityDto

bpdm-pool/pom.xml

@@ -43,6 +43,10 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>bpdm-pool-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>bpdm-orchestrator-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib</artifactId>

bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/BusinessPartnerBuildService.kt

@@ -61,9 +61,12 @@ class BusinessPartnerBuildService(
     fun createLegalEntities(requests: Collection<LegalEntityPartnerCreateRequest>): LegalEntityPartnerCreateResponseWrapper {
         logger.info { "Create ${requests.size} new legal entities" }
 
-        val errorsByRequest = requestValidationService.validateLegalEntityCreates(requests)
-        val errors = errorsByRequest.flatMap { it.value }
-        val validRequests = requests.filterNot { errorsByRequest.containsKey(it) }
+
+        val errorsByRequest = requestValidationService.validateLegalEntityCreates(requests.associateWith { it.legalEntity }) { theRequest -> theRequest.index }
+        val errorsByRequestAddress = requestValidationService.validateLegalEntityCreatesAddresses(requests.associateWith { it.legalAddress }) { theRequest -> theRequest.index }
+
+        val errors = errorsByRequest.flatMap { it.value } + errorsByRequestAddress.flatMap { it.value }
+        val validRequests = requests.filterNot { errorsByRequest.containsKey(it) || errorsByRequestAddress.containsKey(it) }
 
         val legalEntityMetadataMap = metadataService.getMetadata(requests.map { it.legalEntity }).toMapping()
         val addressMetadataMap = metadataService.getMetadata(requests.map { it.legalAddress }).toMapping()
@@ -410,8 +413,8 @@ class BusinessPartnerBuildService(
             bpn = bpn,
             legalEntity = null,
             site = null,
-            physicalPostalAddress = createPhysicalAddress(dto.physicalPostalAddress, metadataMap),
-            alternativePostalAddress = dto.alternativePostalAddress?.let { createAlternativeAddress(it, metadataMap) },
+            physicalPostalAddress = createPhysicalAddress(dto.physicalPostalAddress, metadataMap.regions),
+            alternativePostalAddress = dto.alternativePostalAddress?.let { createAlternativeAddress(it, metadataMap.regions) },
             name = dto.name
         )
 
@@ -422,24 +425,24 @@ class BusinessPartnerBuildService(
 
     private fun updateLogisticAddress(address: LogisticAddress, dto: LogisticAddressDto, metadataMap: AddressMetadataMapping) {
         address.name = dto.name
-        address.physicalPostalAddress = createPhysicalAddress(dto.physicalPostalAddress, metadataMap)
-        address.alternativePostalAddress = dto.alternativePostalAddress?.let { createAlternativeAddress(it, metadataMap) }
+        address.physicalPostalAddress = createPhysicalAddress(dto.physicalPostalAddress, metadataMap.regions)
+        address.alternativePostalAddress = dto.alternativePostalAddress?.let { createAlternativeAddress(it, metadataMap.regions) }
 
         address.identifiers.apply {
             clear()
-            addAll(dto.identifiers.map { toEntity(it, metadataMap, address) })
+            addAll(dto.identifiers.map { toEntity(it, metadataMap.idTypes, address) })
         }
         address.states.apply {
             clear()
             addAll(dto.states.map { toEntity(it, address) })
         }
     }
 
-    private fun createPhysicalAddress(physicalAddress: PhysicalPostalAddressDto, metadataMap: AddressMetadataMapping): PhysicalPostalAddress {
+    private fun createPhysicalAddress(physicalAddress: PhysicalPostalAddressDto, regions: Map<String, Region>): PhysicalPostalAddress {
         return PhysicalPostalAddress(
             geographicCoordinates = physicalAddress.geographicCoordinates?.let { toEntity(it) },
             country = physicalAddress.country,
-            administrativeAreaLevel1 = metadataMap.regions[physicalAddress.administrativeAreaLevel1],
+            administrativeAreaLevel1 = regions[physicalAddress.administrativeAreaLevel1],
             administrativeAreaLevel2 = physicalAddress.administrativeAreaLevel2,
             administrativeAreaLevel3 = physicalAddress.administrativeAreaLevel3,
             postCode = physicalAddress.postalCode,
@@ -454,11 +457,11 @@ class BusinessPartnerBuildService(
         )
     }
 
-    private fun createAlternativeAddress(alternativeAddress: AlternativePostalAddressDto, metadataMap: AddressMetadataMapping): AlternativePostalAddress {
+    private fun createAlternativeAddress(alternativeAddress: AlternativePostalAddressDto,  regions: Map<String, Region>): AlternativePostalAddress {
         return AlternativePostalAddress(
             geographicCoordinates = alternativeAddress.geographicCoordinates?.let { toEntity(it) },
             country = alternativeAddress.country,
-            administrativeAreaLevel1 = metadataMap.regions[alternativeAddress.administrativeAreaLevel1],
+            administrativeAreaLevel1 = regions[alternativeAddress.administrativeAreaLevel1],
             postCode = alternativeAddress.postalCode,
             city = alternativeAddress.city,
             deliveryServiceType = alternativeAddress.deliveryServiceType,
@@ -530,12 +533,12 @@ class BusinessPartnerBuildService(
 
     private fun toEntity(
         dto: AddressIdentifierDto,
-        metadataMap: AddressMetadataMapping,
+        idTypes: Map<String, IdentifierType>,
         partner: LogisticAddress
     ): AddressIdentifier {
         return AddressIdentifier(
             value = dto.value,
-            type = metadataMap.idTypes[dto.type]!!,
+            type = idTypes[dto.type]!!,
             address = partner
         )
     }
@@ -561,13 +564,14 @@ class BusinessPartnerBuildService(
         )
 
 
-    private data class LegalEntityMetadataMapping(
+    data class LegalEntityMetadataMapping(
         val idTypes: Map<String, IdentifierType>,
         val legalForms: Map<String, LegalForm>
     )
 
-    private data class AddressMetadataMapping(
+    data class AddressMetadataMapping(
         val idTypes: Map<String, IdentifierType>,
         val regions: Map<String, Region>
     )
+
 }