fix(gate) Removed BPN Property from Gate

bpdm-gate-api/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/api/model/AddressGateInputRequest.kt

@@ -42,6 +42,4 @@ data class AddressGateInputRequest(
     @Schema(description = "External id of the related site")
     val siteExternalId: String? = null,
 
-    @Schema(description = "Business Partner Number")
-    val bpn: String? = null
 )

bpdm-gate-api/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/api/model/AddressGateInputResponse.kt

@@ -44,9 +44,6 @@ data class AddressGateInputResponse(
     @Schema(description = "External id of the related site")
     val siteExternalId: String? = null,
 
-    @Schema(description = "Business Partner Number")
-    val bpn: String? = null,
-
     @Schema(description = "Time the sharing process was started according to SaaS")
     val processStartedAt: LocalDateTime? = null,
 )

bpdm-gate-api/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/api/model/LegalEntityGateInputRequest.kt

@@ -39,6 +39,4 @@ data class LegalEntityGateInputRequest(
     @Schema(description = "ID the record has in the external system where the record originates from", required = true)
     val externalId: String,
 
-    @Schema(description = "Business Partner Number")
-    val bpn: String?,
 )

bpdm-gate-api/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/api/model/LegalEntityGateInputResponse.kt

@@ -41,9 +41,6 @@ data class LegalEntityGateInputResponse(
     @Schema(description = "ID the record has in the external system where the record originates from", required = true)
     val externalId: String,
 
-    @Schema(description = "Business Partner Number")
-    val bpn: String?,
-
     @Schema(description = "Time the sharing process was started according to SaaS")
     val processStartedAt: LocalDateTime? = null,
 )

bpdm-gate-api/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/api/model/SiteGateInputRequest.kt

@@ -38,6 +38,4 @@ data class SiteGateInputRequest(
     @Schema(description = "External id of the related legal entity")
     val legalEntityExternalId: String,
 
-    @Schema(description = "Business Partner Number")
-    val bpn: String?,
 )

bpdm-gate-api/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/api/model/SiteGateInputResponse.kt

@@ -39,9 +39,6 @@ data class SiteGateInputResponse(
     @Schema(description = "External id of the related legal entity")
     val legalEntityExternalId: String,
 
-    @Schema(description = "Business Partner Number")
-    val bpn: String?,
-
     @Schema(description = "Time the sharing process was started according to SaaS")
     val processStartedAt: LocalDateTime? = null,
 )

bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/entity/LegalEntity.kt

@@ -30,7 +30,7 @@ import java.time.Instant
 )
 class LegalEntity(
     @Column(name = "bpn")
-    var bpn: String?,
+    var bpn: String? = null,
 
     @Column(name = "externalId", nullable = false, unique = true)
     var externalId: String,

bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/entity/LogisticAddress.kt

@@ -32,7 +32,7 @@ import org.eclipse.tractusx.bpdm.common.model.BaseEntity
 )
 class LogisticAddress(
     @Column(name = "bpn")
-    var bpn: String?,
+    var bpn: String? = null,
 
     @Column(name = "external_id", nullable = false, unique = true)
     var externalId: String,

bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/entity/Site.kt

@@ -26,7 +26,7 @@ import org.eclipse.tractusx.bpdm.common.model.BaseEntity
 @Table(name = "sites")
 class Site(
     @Column(name = "bpn")
-    var bpn: String?,
+    var bpn: String? = null,
 
     @Column(name = "name", nullable = false)
     var name: String,

bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/AddressPersistenceService.kt

@@ -67,7 +67,6 @@ class AddressPersistenceService(
     private fun updateAddress(address: LogisticAddress, changeAddress: AddressGateInputRequest, legalEntityRecord: LegalEntity?, siteRecord: Site?) {
 
         address.name = changeAddress.address.name
-        address.bpn = changeAddress.bpn
         address.externalId = changeAddress.externalId
         address.legalEntity = legalEntityRecord
         address.site = siteRecord

bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/LegalEntityPersistenceService.kt

@@ -67,7 +67,6 @@ class LegalEntityPersistenceService(
         legalEntityRequest: LegalEntityGateInputRequest,
         logisticAddressRecord: LogisticAddress
     ): LegalEntity {
-        legalEntity.bpn = legalEntityRequest.bpn
         legalEntity.externalId = legalEntityRequest.externalId
         legalEntity.legalForm = legalEntityRequest.legalEntity.legalForm
         legalEntity.legalName = Name(value = legalEntityRequest.legalNameParts[0], shortName = legalEntityRequest.legalEntity.legalShortName)
@@ -82,7 +81,6 @@ class LegalEntityPersistenceService(
     private fun updateAddress(address: LogisticAddress, changeAddress: LogisticAddress) {
 
         address.name = changeAddress.name
-        address.bpn = changeAddress.bpn
         address.externalId = changeAddress.externalId
         address.legalEntity = changeAddress.legalEntity
         address.siteExternalId = changeAddress.siteExternalId

bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/LegalEntityService.kt

@@ -162,7 +162,6 @@ private fun toValidSingleLegalEntity(legalEntity: LegalEntity): LegalEntityGateI
     return LegalEntityGateInputResponse(
         legalEntity = legalEntity.toLegalEntityDto(),
         legalAddress = legalEntity.legalAddress.toLogisticAddressDto(),
-        bpn = legalEntity.bpn,
         externalId = legalEntity.externalId
     )
 }

bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/ResponseMappings.kt

@@ -31,7 +31,6 @@ import java.time.temporal.ChronoUnit
 fun AddressGateInputRequest.toAddressGate(legalEntity: LegalEntity?, site: Site?): LogisticAddress {
 
     val logisticAddress = LogisticAddress(
-        bpn = bpn,
         externalId = externalId,
         siteExternalId = siteExternalId.toString(),
         name = address.name,
@@ -117,10 +116,9 @@ fun SiteGateInputRequest.toSiteGate(legalEntity: LegalEntity): Site {
     )
 
     val site = Site(
-        bpn = bpn,
         name = site.name,
         externalId = externalId,
-        legalEntity = legalEntity
+        legalEntity = legalEntity,
     )
 
     site.states.addAll(this.site.states.map { toEntityAddress(it, site) }.toSet())
@@ -150,7 +148,6 @@ fun LegalEntityGateInputRequest.toLegalEntity(): LegalEntity {
     )
 
     val legalEntity = LegalEntity(
-        bpn = bpn,
         externalId = externalId,
         currentness = createCurrentnessTimestamp(),
         legalForm = legalEntity.legalForm,
@@ -198,7 +195,6 @@ fun LogisticAddress.toAddressGateInputResponse(logisticAddressPage: LogisticAddr
         externalId = externalId,
         legalEntityExternalId = legalEntity?.externalId,
         siteExternalId = site?.externalId,
-        bpn = bpn,
         processStartedAt = null //TODO Remove ?
     )
 
@@ -323,7 +319,6 @@ fun LegalEntity.LegalEntityGateInputResponse(legalEntity: LegalEntity): LegalEnt
         legalEntity = legalEntity.toLegalEntityDto(),
         legalAddress = legalAddress.toLogisticAddressDto(),
         externalId = legalEntity.externalId,
-        bpn = legalEntity.bpn,
         processStartedAt = null
     )
 }
@@ -349,7 +344,6 @@ fun Site.toSiteGateInputResponse(sitePage: Site): SiteGateInputResponse {
         site = sitePage.toSiteDto(),
         externalId = externalId,
         legalEntityExternalId = legalEntity.externalId,
-        bpn = bpn,
         processStartedAt = null //TODO Remove this?
     )
 

bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/SaasRequestMappingService.kt

@@ -40,7 +40,7 @@ class SaasRequestMappingService(
             externalId = request.externalId,
             dataSource = saasConfigProperties.datasource,
             types = listOf(TypeKeyNameUrlSaas(BusinessPartnerTypeSaas.LEGAL_ENTITY.name)),
-            identifiers = toLegalEntityIdentifiersSaas(legalEntity.identifiers, request.bpn),
+            identifiers = toLegalEntityIdentifiersSaas(legalEntity.identifiers, ""),
             names = toNamesSaas(request.legalNameParts[0]),
             // TODO Only the first state is passed to SaaS, any others are ignored
             status = legalEntity.states.map { it.toSaasModel() }.firstOrNull(),
@@ -57,7 +57,7 @@ class SaasRequestMappingService(
             externalId = request.externalId,
             dataSource = saasConfigProperties.datasource,
             types = listOf(TypeKeyNameUrlSaas(BusinessPartnerTypeSaas.ORGANIZATIONAL_UNIT.name)),
-            identifiers = toIdentifiersSaas(request.bpn),
+            identifiers = toIdentifiersSaas(""),
             names = toNamesSaas(site.name),
             status = site.states.map { it.toSaasModel() }.firstOrNull(),
             // TODO Known issue: Name, state, BPN-A and identifiers of the main address are not transferred to SaaS yet!!
@@ -72,7 +72,7 @@ class SaasRequestMappingService(
             externalId = request.externalId,
             dataSource = saasConfigProperties.datasource,
             types = listOf(TypeKeyNameUrlSaas(BusinessPartnerTypeSaas.BP_ADDRESS.name)),
-            identifiers = toAddressIdentifiersSaas(address.identifiers, request.bpn),
+            identifiers = toAddressIdentifiersSaas(address.identifiers, ""),
             names = toNamesSaas(address.name),
             status = address.states.map { it.toSaasModel() }.firstOrNull(),
             addresses = toAddressesSaasModel(address)

bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/SitePersistenceService.kt

@@ -74,7 +74,6 @@ class SitePersistenceService(
 
     private fun updateSite(site: Site, updatedSite: SiteGateInputRequest, legalEntityRecord: LegalEntity) {
 
-        site.bpn = updatedSite.bpn
         site.name = updatedSite.site.name
         site.externalId = updatedSite.externalId
         site.legalEntity = legalEntityRecord
@@ -85,7 +84,6 @@ class SitePersistenceService(
     private fun updateAddress(address: LogisticAddress, changeAddress: LogisticAddress) {
 
         address.name = changeAddress.name
-        address.bpn = changeAddress.bpn
         address.externalId = changeAddress.externalId
         address.legalEntity = changeAddress.legalEntity
         address.siteExternalId = changeAddress.siteExternalId

bpdm-gate/src/main/resources/db/migration/V0_1_6_0__drop_bpn_not_null_from_legal_entity.sql

@@ -0,0 +1 @@
+ALTER TABLE bpdmgate.legal_entities ALTER COLUMN bpn DROP NOT NULL;

bpdm-gate/src/test/kotlin/org/eclipse/tractusx/bpdm/gate/util/RequestValues.kt

@@ -267,24 +267,24 @@ object RequestValues {
         legalAddress = address1,
         legalNameParts = arrayOf(CommonValues.name1),
         externalId = CommonValues.externalId1,
-        bpn = CommonValues.bpn1
+
     )
 
     val legalEntityGateInputRequest2 = LegalEntityGateInputRequest(
         legalEntity = legalEntity2,
         legalAddress = address2,
         legalNameParts = arrayOf(CommonValues.name3),
         externalId = CommonValues.externalId2,
-        bpn = CommonValues.bpn2
-    )
+
+        )
 
     val legalEntityGateInputRequest3 = LegalEntityGateInputRequest(
         legalEntity = legalEntity3,
         legalAddress = address3,
         legalNameParts = arrayOf(CommonValues.name1),
         externalId = CommonValues.externalId3,
-        bpn = CommonValues.bpn3
-    )
+
+        )
 
     val site1 = SiteGateDto(
         name = CommonValues.nameSite1,
@@ -302,15 +302,15 @@ object RequestValues {
         site = site1,
         externalId = CommonValues.externalIdSite1,
         legalEntityExternalId = CommonValues.externalId1,
-        bpn = CommonValues.bpnSite1
-    )
+
+        )
 
     val siteGateInputRequest2 = SiteGateInputRequest(
         site = site2,
         externalId = CommonValues.externalIdSite2,
         legalEntityExternalId = CommonValues.externalId2,
-        bpn = CommonValues.bpnSite2
-    )
+
+        )
 
     val addressGateInputRequest1 = AddressGateInputRequest(
         address = address1.copy(
@@ -321,8 +321,8 @@ object RequestValues {
         ),
         externalId = CommonValues.externalIdAddress1,
         legalEntityExternalId = CommonValues.externalId1,
-        bpn = CommonValues.bpnAddress1
-    )
+
+        )
 
     val addressGateInputRequest2 = AddressGateInputRequest(
         address = address2.copy(
@@ -333,7 +333,7 @@ object RequestValues {
         ),
         externalId = CommonValues.externalIdAddress2,
         siteExternalId = CommonValues.externalIdSite1,
-        bpn = CommonValues.bpnAddress2
-    )
+
+        )
 
 }

bpdm-gate/src/test/kotlin/org/eclipse/tractusx/bpdm/gate/util/ResponseValues.kt

@@ -281,23 +281,20 @@ object ResponseValues {
         legalEntity = RequestValues.legalEntity1,
         legalAddress = RequestValues.address1,
         externalId = CommonValues.externalId1,
-        bpn = CommonValues.bpn1,
         processStartedAt = SaasValues.modificationTime1,
     )
 
     val legalEntityGateInputResponse2 = LegalEntityGateInputResponse(
         legalEntity = RequestValues.legalEntity2,
         legalAddress = RequestValues.address2,
         externalId = CommonValues.externalId2,
-        bpn = CommonValues.bpn2,
         processStartedAt = SaasValues.modificationTime2,
     )
 
     val legalEntityGateInputResponse3 = LegalEntityGateInputResponse(
         legalEntity = RequestValues.legalEntity3,
         legalAddress = RequestValues.address3,
         externalId = CommonValues.externalId3,
-        bpn = CommonValues.bpn3,
         processStartedAt = null,
     )
 
@@ -306,14 +303,12 @@ object ResponseValues {
         legalEntity = RequestValues.legalEntity1,
         legalAddress = RequestValues.address1,
         externalId = CommonValues.externalId1,
-        bpn = CommonValues.bpn1,
         processStartedAt = null
     )
     val newLegalEntityGateInputResponse2 = LegalEntityGateInputResponse(
         legalEntity = RequestValues.legalEntity2,
         legalAddress = RequestValues.address2,
         externalId = CommonValues.externalId2,
-        bpn = CommonValues.bpn2,
         processStartedAt = null,
     )
 
@@ -352,15 +347,13 @@ object ResponseValues {
         site = RequestValues.site1,
         externalId = CommonValues.externalIdSite1,
         legalEntityExternalId = CommonValues.externalId1,
-        bpn = CommonValues.bpnSite1,
         processStartedAt = SaasValues.modificationTime1,
     )
 
     val siteGateInputResponse2 = SiteGateInputResponse(
         site = RequestValues.site2,
         externalId = CommonValues.externalIdSite2,
         legalEntityExternalId = CommonValues.externalId2,
-        bpn = CommonValues.bpnSite2,
         processStartedAt = SaasValues.modificationTime2,
     )
 
@@ -369,15 +362,13 @@ object ResponseValues {
         site = RequestValues.site1,
         externalId = CommonValues.externalIdSite1,
         legalEntityExternalId = CommonValues.externalId1,
-        bpn = CommonValues.bpnSite1,
         processStartedAt = null,
     )
 
     val persistenceSiteGateInputResponse2 = SiteGateInputResponse(
         site = RequestValues.site2,
         externalId = CommonValues.externalIdSite2,
         legalEntityExternalId = CommonValues.externalId2,
-        bpn = CommonValues.bpnSite2,
         processStartedAt = null,
     )
 
@@ -404,7 +395,6 @@ object ResponseValues {
             ),
         externalId = CommonValues.externalIdAddress1,
         legalEntityExternalId = CommonValues.externalId1,
-        bpn = CommonValues.bpnAddress1,
         processStartedAt = SaasValues.modificationTime1,
     )
 
@@ -419,7 +409,6 @@ object ResponseValues {
             ),
         externalId = CommonValues.externalIdAddress2,
         siteExternalId = CommonValues.externalIdSite1,
-        bpn = CommonValues.bpnAddress2,
         processStartedAt = SaasValues.modificationTime2,
     )
 
@@ -441,7 +430,6 @@ object ResponseValues {
         ),
         externalId = CommonValues.externalIdAddress1,
         legalEntityExternalId = null,
-        bpn = CommonValues.bpnAddress1,
         processStartedAt = null,
     )
 
@@ -453,7 +441,6 @@ object ResponseValues {
             )
         ),
         externalId = CommonValues.externalIdAddress2,
-        bpn = CommonValues.bpnAddress2,
         siteExternalId = null,
         processStartedAt = null,
     )