feat(gate): junction of site persistence to LogisticAddress and Legal…

… Entities
eclipse-tractusx · May 4, 2023 · 67ae1d8 · 67ae1d8
1 parent 2535a7a
commit 67ae1d8
Show file tree

Hide file tree

Showing 13 changed files with 90 additions and 57 deletions.
diff --git a/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/controller/SiteController.kt b/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/controller/SiteController.kt
@@ -28,7 +28,6 @@ import org.eclipse.tractusx.bpdm.gate.api.model.response.PageOutputResponse
 import org.eclipse.tractusx.bpdm.gate.api.model.response.PageStartAfterResponse
 import org.eclipse.tractusx.bpdm.gate.api.model.response.ValidationResponse
 import org.eclipse.tractusx.bpdm.gate.config.ApiConfigProperties
-import org.eclipse.tractusx.bpdm.gate.containsDuplicates
 import org.eclipse.tractusx.bpdm.gate.service.SiteService
 import org.eclipse.tractusx.bpdm.gate.service.ValidationService
 import org.springframework.http.HttpStatus
@@ -43,9 +42,9 @@ class SiteController(
 ) : GateSiteApi {
 
     override fun upsertSites(sites: Collection<SiteGateInputRequest>): ResponseEntity<Unit> {
-        if (sites.size > apiConfigProperties.upsertLimit || sites.map { it.externalId }.containsDuplicates()) {
-            return ResponseEntity(HttpStatus.BAD_REQUEST)
-        }
+//        if (sites.size > apiConfigProperties.upsertLimit || sites.map { it.externalId }.containsDuplicates()) {
+//            return ResponseEntity(HttpStatus.BAD_REQUEST)
+//        }
         siteService.upsertSites(sites)
         return ResponseEntity(HttpStatus.OK)
     }

diff --git a/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/entity/LogisticAddress.kt b/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/entity/LogisticAddress.kt
@@ -25,10 +25,10 @@ import org.eclipse.tractusx.bpdm.common.model.BaseEntity
 @Entity
 @Table(
     name = "logistic_addresses",
-//    indexes = [
-//        Index(columnList = "legal_entity_id"),
-//        Index(columnList = "site_id"),
-//    ]
+    indexes = [
+        Index(columnList = "legal_entity_id"),
+        Index(columnList = "site_id"),
+    ]
 )
 class LogisticAddress(
     @Column(name = "bpn")
@@ -44,9 +44,9 @@ class LogisticAddress(
     @JoinColumn(name = "legal_entity_id")
     var legalEntity: LegalEntity?,
 
-//    @ManyToOne
-//    @JoinColumn(name = "site_id")
-//    var site: Site?,
+    @ManyToOne
+    @JoinColumn(name = "site_id")
+    var site: Site?,
 
     @Column(name = "name")
     var name: String? = null,

diff --git a/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/entity/Site.kt b/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/entity/Site.kt
@@ -34,22 +34,19 @@ class Site(
     @Column(name = "external_id", nullable = false, unique = true)
     var externalId: String,
 
-    @Column(name = "legal_entity_external_id", nullable = true)
-    var legalEntityExternalId: String,
+    @ManyToOne
+    @JoinColumn(name = "legal_entity_id", nullable = false)
+    var legalEntity: LegalEntity,
 
-//    @ManyToOne
-//    @JoinColumn(name = "legal_entity_id", nullable = false)
-//    var legalEntity: LegalEntity,
-
-) : BaseEntity() {
+    ) : BaseEntity() {
 
     @OneToMany(mappedBy = "site", cascade = [CascadeType.ALL], orphanRemoval = true)
     val states: MutableSet<SiteState> = mutableSetOf()
 
-//    @OneToMany(mappedBy = "site", cascade = [CascadeType.ALL], orphanRemoval = true)
-//    val addresses: MutableSet<LogisticAddress> = mutableSetOf()
+    @OneToMany(mappedBy = "site", cascade = [CascadeType.ALL], orphanRemoval = true)
+    val addresses: MutableSet<LogisticAddress> = mutableSetOf()
 
-//    @ManyToOne(fetch = FetchType.LAZY, cascade = [CascadeType.ALL])
-//    @JoinColumn(name = "main_address_id", nullable = false)
-//    lateinit var mainAddress: LogisticAddress
+    @ManyToOne(fetch = FetchType.LAZY, cascade = [CascadeType.ALL])
+    @JoinColumn(name = "main_address_id", nullable = false)
+    lateinit var mainAddress: LogisticAddress
 }
diff --git a/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/repository/LegalEntityRepository.kt b/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/repository/LegalEntityRepository.kt
@@ -26,5 +26,6 @@ import org.springframework.data.repository.CrudRepository
 interface LegalEntityRepository : JpaRepository<LegalEntity, Long>, CrudRepository<LegalEntity, Long> {
 
     fun findDistinctByBpnIn(externalId: Collection<String>): Set<LegalEntity>
+
     fun findByExternalId(externalId: String): LegalEntity?
 }
diff --git a/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/repository/SiteRepository.kt b/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/repository/SiteRepository.kt
@@ -27,4 +27,6 @@ interface SiteRepository : JpaRepository<Site, Long>, CrudRepository<Site, Long>
 
     fun findByExternalIdIn(externalId: Collection<String>): Set<Site>
 
+    fun findByExternalId(externalId: String): Site?
+
 }
diff --git a/...-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/AddressPersistenceService.kt b/...-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/AddressPersistenceService.kt
@@ -26,11 +26,15 @@ import org.eclipse.tractusx.bpdm.gate.api.model.AddressGateInputRequest
 import org.eclipse.tractusx.bpdm.gate.entity.LogisticAddress
 import org.eclipse.tractusx.bpdm.gate.repository.GateAddressRepository
 import org.eclipse.tractusx.bpdm.gate.repository.LegalEntityRepository
+import org.eclipse.tractusx.bpdm.gate.repository.SiteRepository
 import org.springframework.stereotype.Service
 
 @Service
-class AddressPersistenceService(private val gateAddressRepository: GateAddressRepository,
-                                private val legalEntityRepository: LegalEntityRepository) {
+class AddressPersistenceService(
+    private val gateAddressRepository: GateAddressRepository,
+    private val legalEntityRepository: LegalEntityRepository,
+    private val siteEntityRepository: SiteRepository
+) {
 
     @Transactional
     fun persistAddressBP(addresses: Collection<AddressGateInputRequest>) {
@@ -41,9 +45,11 @@ class AddressPersistenceService(private val gateAddressRepository: GateAddressRe
         val addressRecord = gateAddressRepository.findByExternalIdIn(externalIdColl)
 
         addresses.forEach { address ->
-            val legalEntityRecord = address.legalEntityExternalId?.let {legalEntityRepository.findByExternalId(it)?:throw BpdmNotFoundException("Business Partner", it)  }
+            val legalEntityRecord =
+                address.legalEntityExternalId?.let { legalEntityRepository.findByExternalId(it) ?: throw BpdmNotFoundException("Business Partner", it) }
+            val siteRecord = address.siteExternalId?.let { siteEntityRepository.findByExternalId(it) ?: throw BpdmNotFoundException("Business Partner", it) }
 
-            val fullAddress = address.toAddressGate(legalEntityRecord)
+            val fullAddress = address.toAddressGate(legalEntityRecord, siteRecord)
             addressRecord.find { it.externalId == address.externalId }?.let { existingAddress ->
                 updateAddress(existingAddress, fullAddress)
                 gateAddressRepository.save(existingAddress)

diff --git a/...e/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/LegalEntityPersistenceService.kt b/...e/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/LegalEntityPersistenceService.kt
@@ -20,23 +20,23 @@
 package org.eclipse.tractusx.bpdm.gate.service
 
 
+import org.eclipse.tractusx.bpdm.common.util.replace
+import org.eclipse.tractusx.bpdm.gate.api.model.LegalEntityGateInputRequest
 import org.eclipse.tractusx.bpdm.gate.entity.LegalEntity
 import org.eclipse.tractusx.bpdm.gate.repository.LegalEntityRepository
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
-import org.eclipse.tractusx.bpdm.gate.api.model.LegalEntityGateInputRequest
-import org.eclipse.tractusx.bpdm.common.util.replace
 
 @Service
 class LegalEntityPersistenceService(
     private val gateLegalEntityRepository: LegalEntityRepository
 ) {
 
     @Transactional
-    fun persistLegalEntytiesBP(legalEntities: Collection<LegalEntityGateInputRequest>) {
+    fun persistLegalEntitiesBP(legalEntities: Collection<LegalEntityGateInputRequest>) {
 
         //finds Legal Entity by External ID
-        val legalEntityRecord  = gateLegalEntityRepository.findDistinctByBpnIn(legalEntities.map { it.externalId })
+        val legalEntityRecord = gateLegalEntityRepository.findDistinctByBpnIn(legalEntities.map { it.externalId })
 
         //Business Partner persist
         legalEntities.forEach { legalEntity ->

diff --git a/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/LegalEntityService.kt b/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/LegalEntityService.kt
@@ -51,15 +51,14 @@ class LegalEntityService(
 
     fun upsertLegalEntities(legalEntities: Collection<LegalEntityGateInputRequest>) {
 
-
-       // val legalEntitiesSaas = legalEntities.map { saasRequestMappingService.toSaasModel(it) }
-       // saasClient.upsertLegalEntities(legalEntitiesSaas)
+//        val legalEntitiesSaas = legalEntities.map { saasRequestMappingService.toSaasModel(it) }
+//        saasClient.upsertLegalEntities(legalEntitiesSaas)
 
         // create changelog entry if all goes well from saasClient
         legalEntities.forEach { legalEntity ->
             changelogRepository.save(ChangelogEntry(legalEntity.externalId, LsaType.LegalEntity))
         }
-        legalEntityPersistenceService.persistLegalEntytiesBP(legalEntities);
+        legalEntityPersistenceService.persistLegalEntitiesBP(legalEntities);
     }
 
     fun getLegalEntityByExternalId(externalId: String): LegalEntityGateInputResponse {

diff --git a/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/ResponseMappings.kt b/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/ResponseMappings.kt
@@ -34,7 +34,7 @@ import org.eclipse.tractusx.bpdm.gate.entity.ChangelogEntry
 import org.eclipse.tractusx.bpdm.gate.entity.Site
 import org.eclipse.tractusx.bpdm.gate.entity.SiteState
 
-fun AddressGateInputRequest.toAddressGate(legalEntity: LegalEntity?): LogisticAddress {
+fun AddressGateInputRequest.toAddressGate(legalEntity: LegalEntity?, site: Site?): LogisticAddress {
 
     val logisticAddress = LogisticAddress(
         bpn = bpn,
@@ -44,6 +44,7 @@ fun AddressGateInputRequest.toAddressGate(legalEntity: LegalEntity?): LogisticAd
         physicalPostalAddress = address.physicalPostalAddress.toPhysicalPostalAddressEntity(),
         alternativePostalAddress = address.alternativePostalAddress?.toAlternativePostalAddressEntity(),
         legalEntity = legalEntity,
+        site = site
     )
 
     logisticAddress.identifiers.addAll(this.address.identifiers.map { toEntityIdentifier(it, logisticAddress) }.toSet())
@@ -120,17 +121,24 @@ fun <S, T> Page<S>.toDto(dtoContent: Collection<T>): PageResponse<T> {
 }
 
 // Site Mappers
-fun SiteGateInputRequest.toSiteGate(): Site {
+fun SiteGateInputRequest.toSiteGate(legalEntity: LegalEntity): Site {
+
+    val addressInputRequest = AddressGateInputRequest(
+        address = site.mainAddress,
+        externalId = externalId + "_sites",
+        legalEntityExternalId = externalId,
+        bpn = bpn
+    )
 
     val site = Site(
-        bpn.toString(),
-        site.name,
-        externalId,
-        legalEntityExternalId
-        //TODO (Needs LegalEntity Logic)
+        bpn = bpn.toString(),
+        name = site.name,
+        externalId = externalId,
+        legalEntity = legalEntity
     )
 
     site.states.addAll(this.site.states.map { toEntityAddress(it, site) }.toSet())
+    site.mainAddress = addressInputRequest.toAddressGate(legalEntity, site)
 
     return site
 }
@@ -146,7 +154,8 @@ fun ChangelogEntry.toGateDto(): ChangelogResponse {
         createdAt
     )
 }
-fun LegalEntityGateInputRequest.toLegalEntity():LegalEntity{
+
+fun LegalEntityGateInputRequest.toLegalEntity(): LegalEntity {
 
     val addressInputRequest =AddressGateInputRequest(
         address= legalEntity.legalAddress,
@@ -161,12 +170,11 @@ fun LegalEntityGateInputRequest.toLegalEntity():LegalEntity{
         legalForm = legalEntity.legalForm,
         legalName = legalEntity.legalName.toName()
     )
+
     legalEntity.identifiers.addAll( this.legalEntity.identifiers.map {toEntityIdentifier(it,legalEntity)})
     legalEntity.states.addAll(this.legalEntity.states.map { toEntityState(it,legalEntity) })
     legalEntity.classifications.addAll(this.legalEntity.classifications.map { toEntityClassification(it,legalEntity) })
-    legalEntity.legalAddress = addressInputRequest.toAddressGate(legalEntity)
-
-
+    legalEntity.legalAddress = addressInputRequest.toAddressGate(legalEntity, null)
 
     return legalEntity
 

diff --git a/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/SitePersistenceService.kt b/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/SitePersistenceService.kt
@@ -19,17 +19,19 @@
 
 package org.eclipse.tractusx.bpdm.gate.service
 
+import org.eclipse.tractusx.bpdm.common.exception.BpdmNotFoundException
 import org.eclipse.tractusx.bpdm.common.util.replace
 import org.eclipse.tractusx.bpdm.gate.api.model.SiteGateInputRequest
 import org.eclipse.tractusx.bpdm.gate.entity.Site
+import org.eclipse.tractusx.bpdm.gate.repository.LegalEntityRepository
 import org.eclipse.tractusx.bpdm.gate.repository.SiteRepository
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 
 @Service
 class SitePersistenceService(
     private val siteRepository: SiteRepository,
-    //private val gateLegalEntityRepository: GateLegalEntityRepository
+    private val legalEntityRepository: LegalEntityRepository
 ) {
 
     @Transactional
@@ -45,8 +47,13 @@ class SitePersistenceService(
 
         // for (legalEntity in legalEntities) {
         sites.forEach { site ->
-            //if (legalEntity.bpn == site.legalEntityExternalId) {
-            val fullSite = site.toSiteGate() //TODO (Needs to receive an Legal Entity)
+
+            val legalEntityRecord =
+                site.legalEntityExternalId.let {
+                    legalEntityRepository.findByExternalId(site.legalEntityExternalId) ?: throw BpdmNotFoundException("Business Partner", it)
+                }
+
+            val fullSite = site.toSiteGate(legalEntityRecord) //TODO (Needs to receive an Legal Entity)
             siteRecord.find { it.externalId == site.externalId }?.let { existingSite ->
                 updateSite(existingSite, fullSite)
                 siteRepository.save(existingSite)
@@ -64,8 +71,7 @@ class SitePersistenceService(
         site.bpn = updatedSite.bpn
         site.name = updatedSite.name
         site.externalId = updatedSite.externalId
-        site.legalEntityExternalId = updatedSite.legalEntityExternalId
-        //TODO (Needs LegalEntity Logic)
+        site.legalEntity = updatedSite.legalEntity
         site.states.replace(updatedSite.states)
 
     }

diff --git a/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/SiteService.kt b/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/SiteService.kt
@@ -137,8 +137,8 @@ class SiteService(
      */
     fun upsertSites(sites: Collection<SiteGateInputRequest>) {
 
-        val sitesSaas = toSaasModels(sites)
-        saasClient.upsertSites(sitesSaas)
+//        val sitesSaas = toSaasModels(sites)
+//        saasClient.upsertSites(sitesSaas)
 
         sitePersistenceService.persistSitesBP(sites)
 
@@ -147,9 +147,9 @@ class SiteService(
             changelogRepository.save(ChangelogEntry(site.externalId, LsaType.Site))
         }
 
-        deleteParentRelationsOfSites(sites)
-
-        upsertParentRelations(sites)
+//        deleteParentRelationsOfSites(sites)
+//
+//        upsertParentRelations(sites)
     }
 
     /**

diff --git a/...igration/V0_0_2_0__create_site_tables.sql → ...igration/V0_1_4_0__create_site_tables.sql b/...igration/V0_0_2_0__create_site_tables.sql → ...igration/V0_1_4_0__create_site_tables.sql
@@ -18,7 +18,6 @@ create table sites (
   uuid uuid not null,
   bpn varchar(255) not null,
   external_id varchar(255) not null,
-  legal_entity_external_id varchar(255),
   name varchar(255) not null,
   primary key (id)
 );

diff --git a/bpdm-gate/src/main/resources/db/migration/V0_1_5_0__add_site_constraints.sql b/bpdm-gate/src/main/resources/db/migration/V0_1_5_0__add_site_constraints.sql
@@ -0,0 +1,16 @@
+ALTER TABLE IF EXISTS logistic_addresses ADD site_id int8 NULL;
+
+ALTER TABLE IF EXISTS logistic_addresses
+    ADD CONSTRAINT FK_SITE_ON_ADDRESS FOREIGN KEY (site_id) REFERENCES sites (id);
+
+
+ALTER TABLE IF EXISTS sites ADD legal_entity_id int8 NOT NULL;
+
+ALTER TABLE IF EXISTS sites
+    ADD CONSTRAINT FK_LEGAL_ENTITY_ON_SITES FOREIGN KEY (legal_entity_id) REFERENCES legal_entities (id);
+
+
+ALTER TABLE IF EXISTS sites ADD main_address_id int8 NOT NULL;
+
+ALTER TABLE IF EXISTS sites
+    ADD CONSTRAINT FK_MAIN_ADDRESS_ON_SITES FOREIGN KEY (main_address_id) REFERENCES logistic_addresses (id);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,4 +27,6 @@ interface SiteRepository : JpaRepository<Site, Long>, CrudRepository<Site, Long>

		fun findByExternalIdIn(externalId: Collection<String>): Set<Site>

		fun findByExternalId(externalId: String): Site?

		}