Skip to content

Commit

Permalink
feat(bridge-tests): Tests for syncing new legal entities, site & addr…
Browse files Browse the repository at this point in the history 
…esses eclipse-tractusx#210
  • Loading branch information
@martinfkaeser @rainer-exxcellent
martinfkaeser authored and rainer-exxcellent committed Aug 23, 2023
1 parent b0964f0 commit 8a6e519
Show file tree
Hide file tree
Showing 4 changed files with 286 additions and 10 deletions.
237 changes: 227 additions & 10 deletions bpdm-bridge-dummy/src/test/kotlin/com/catenax/bpdm/bridge/dummy/BridgeSyncIT.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,20 @@
package com.catenax.bpdm.bridge.dummy

import com.catenax.bpdm.bridge.dummy.client.BridgeClient
import com.catenax.bpdm.bridge.dummy.util.BpdmGateContextInitializer
import com.catenax.bpdm.bridge.dummy.util.BpdmPoolContextInitializer
import com.catenax.bpdm.bridge.dummy.util.OpenSearchContextInitializer
import com.catenax.bpdm.bridge.dummy.util.PostgreSQLContextInitializer
import com.catenax.bpdm.bridge.dummy.testdata.GateRequestValues
import com.catenax.bpdm.bridge.dummy.util.*
import org.assertj.core.api.Assertions.assertThat
import org.eclipse.tractusx.bpdm.common.dto.request.AddressPartnerBpnSearchRequest
import org.eclipse.tractusx.bpdm.common.dto.request.PaginationRequest
import org.eclipse.tractusx.bpdm.common.dto.request.SiteBpnSearchRequest
import org.eclipse.tractusx.bpdm.common.dto.response.LogisticAddressVerboseDto
import org.eclipse.tractusx.bpdm.gate.api.client.GateClient
import org.eclipse.tractusx.bpdm.gate.api.model.*
import org.eclipse.tractusx.bpdm.gate.api.model.request.AddressGateInputRequest
import org.eclipse.tractusx.bpdm.gate.api.model.request.ChangeLogSearchRequest
import org.eclipse.tractusx.bpdm.gate.api.model.request.LegalEntityGateInputRequest
import org.eclipse.tractusx.bpdm.gate.api.model.request.SiteGateInputRequest
import org.eclipse.tractusx.bpdm.gate.api.model.response.SharingStateDto
import org.eclipse.tractusx.bpdm.pool.api.client.PoolApiClient
import org.junit.jupiter.api.Test
import com.catenax.bpdm.bridge.dummy.testdata.GateRequestValues
Expand All @@ -46,6 +54,12 @@ import org.eclipse.tractusx.bpdm.pool.api.model.request.LegalEntityPropertiesSea
import org.eclipse.tractusx.bpdm.pool.api.model.response.LegalEntityMatchVerboseDto
import org.eclipse.tractusx.bpdm.pool.api.model.response.SitePoolVerboseDto
import org.junit.jupiter.api.*
import org.eclipse.tractusx.bpdm.pool.api.model.request.AddressPropertiesSearchRequest
import org.eclipse.tractusx.bpdm.pool.api.model.request.ChangelogSearchRequest
import org.eclipse.tractusx.bpdm.pool.api.model.request.LegalEntityPropertiesSearchRequest
import org.eclipse.tractusx.bpdm.pool.api.model.response.LegalEntityMatchVerboseDto
import org.eclipse.tractusx.bpdm.pool.api.model.response.SitePoolVerboseDto
import org.junit.jupiter.api.*
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.boot.test.context.SpringBootTest
import org.springframework.test.context.ActiveProfiles
Expand All @@ -61,17 +75,87 @@ private val DEFAULT_PAGINATION_REQUEST = PaginationRequest(0, 100)
class BridgeSyncIT @Autowired constructor(
val bridgeClient: BridgeClient,
val gateClient: GateClient,
val poolClient: PoolApiClient
val poolClient: PoolApiClient,
val testHelpers: TestHelpers
) {

@BeforeEach
fun beforeEach() {
testHelpers.truncateDbTables()
testHelpers.createPoolMetadata()
}

@Test
fun `just use API clients`() {
assertGateChangelogHasCount(0)
val poolChangelogResponses = poolClient.changelogs().getChangelogEntries(
paginationRequest = DEFAULT_PAGINATION_REQUEST, changelogSearchRequest = ChangelogSearchRequest(fromTime = null, bpns = null)
)
assertThat(poolChangelogResponses.contentSize).isZero()
bridgeClient.bridge().triggerSync()
}

@Test
fun `sync new legal entities`() {
val gateLegalEntityRequests = listOf(
GateRequestValues.legalEntityGateInputRequest1,
GateRequestValues.legalEntityGateInputRequest2,
GateRequestValues.legalEntityGateInputRequest3
)
gateClient.legalEntities().upsertLegalEntities(gateLegalEntityRequests)

assertGateChangelogHasCount(3 + 3) // 3 LEs + 3 addresses
assertSharingStatesSuccessful(0)

// Action: Sync from Gate to Pool and BPN back to Gate
bridgeClient.bridge().triggerSync()

// 3 legal entities + 3 legal addresses
assertPoolChangelogHasCount(3 + 3)

// 3 legal entities
val sharingStatesOkay = assertSharingStatesSuccessful(6)
val bpnByExternalId = buildBpnByExternalIdMap(sharingStatesOkay)

val gateLegalEntityRequestByBpn = gateLegalEntityRequests.associateBy { bpnByExternalId[it.externalId]!! }

val poolLegalEntityResponses = poolClient.legalEntities().getLegalEntities(
bpSearchRequest = LegalEntityPropertiesSearchRequest.EmptySearchRequest,
paginationRequest = DEFAULT_PAGINATION_REQUEST
)
assertThat(poolLegalEntityResponses.contentSize).isEqualTo(3)

val poolLegalEntityByBpn = poolLegalEntityResponses.content.associateBy { it.legalEntity.bpnl }

val legalEntitiesGateAndPool = gateLegalEntityRequestByBpn.keys
.map { Pair(gateLegalEntityRequestByBpn[it]!!, poolLegalEntityByBpn[it]!!) }

assertThat(legalEntitiesGateAndPool.size).isEqualTo(3)
legalEntitiesGateAndPool.forEach { (gateVersion, poolVersion) ->
assertEqualLegalEntity(gateVersion, poolVersion)
}
}

@Test
fun `use API clients`() {
val gateChangelogs = gateClient.changelog().getChangelogEntriesLsaType(
paginationRequest = PaginationRequest(0, 10), fromTime = null, lsaType = null
fun `sync new sites`() {
// site needs parent legal entity!
val gateLegalEntityRequests = listOf(
GateRequestValues.legalEntityGateInputRequest1,
GateRequestValues.legalEntityGateInputRequest2,
GateRequestValues.legalEntityGateInputRequest3
)
val poolChangelogs = poolClient.businessPartners().getChangelogEntries(
paginationRequest = PaginationRequest(0, 10), modifiedAfter = null, bpn = null
gateClient.legalEntities().upsertLegalEntities(gateLegalEntityRequests)

val gateSiteRequests = listOf(
GateRequestValues.siteGateInputRequest1,
GateRequestValues.siteGateInputRequest2
)
gateClient.sites().upsertSites(gateSiteRequests)

assertGateChangelogHasCount(3 + 2 + 3 + 2) // 3 LEs + 2 sites + 3 le addresses + 2 site main addresses
assertSharingStatesSuccessful(0)

// Action: Sync from Gate to Pool and BPN back to Gate
bridgeClient.bridge().triggerSync()
val poolClient: PoolApiClient,
val testHelpers: TestHelpers
Expand Down Expand Up @@ -282,6 +366,139 @@ class BridgeSyncIT @Autowired constructor(
assertThat(poolVersion.site.states.map { it.description }).isEqualTo(gateVersion.site.states.map { it.description })
}

private fun assertEqualAddress(gateVersion: AddressGateInputRequest, poolVersion: LogisticAddressVerboseDto) {
assertThat(poolVersion.name).isEqualTo(gateVersion.address.nameParts.first())
assertThat(poolVersion.physicalPostalAddress.street?.name).isEqualTo(gateVersion.address.physicalPostalAddress.street?.name)
assertThat(poolVersion.physicalPostalAddress.baseAddress.city).isEqualTo(gateVersion.address.physicalPostalAddress.baseAddress.city)
assertThat(poolVersion.alternativePostalAddress?.deliveryServiceNumber).isEqualTo(gateVersion.address.alternativePostalAddress?.deliveryServiceNumber)
assertThat(poolVersion.alternativePostalAddress?.baseAddress?.city).isEqualTo(gateVersion.address.alternativePostalAddress?.baseAddress?.city)

// 3 legal entities + 3 legal addresses & 2 sites + 2 main addresses
assertPoolChangelogHasCount(3 + 3 + 2 + 2)

// 3 LEs + 2 sites
val sharingStatesOkay = assertSharingStatesSuccessful(3 + 2)
val bpnByExternalId = buildBpnByExternalIdMap(sharingStatesOkay)

val gateSiteRequestsByBpn = gateSiteRequests.associateBy { bpnByExternalId[it.externalId]!! }

val poolSiteResponses = poolClient.sites().searchSites(
siteSearchRequest = SiteBpnSearchRequest(sites = gateSiteRequestsByBpn.keys),
paginationRequest = DEFAULT_PAGINATION_REQUEST
)
assertThat(poolSiteResponses.contentSize).isEqualTo(2)

val poolSiteByBpn = poolSiteResponses.content.associateBy { it.site.bpns }

val sitesGateAndPool = gateSiteRequestsByBpn.keys
.map { Pair(gateSiteRequestsByBpn[it]!!, poolSiteByBpn[it]!!) }

assertThat(sitesGateAndPool.size).isEqualTo(2)
sitesGateAndPool.forEach { (gateVersion, poolVersion) ->
assertEqualSite(gateVersion, poolVersion)
}
}

@Test
fun `sync new addresses`() {
// address needs parent legal entity and site!
val gateLegalEntityRequests = listOf(
GateRequestValues.legalEntityGateInputRequest1,
)
gateClient.legalEntities().upsertLegalEntities(gateLegalEntityRequests)
val gateSiteRequests = listOf(
GateRequestValues.siteGateInputRequest1,
)
gateClient.sites().upsertSites(gateSiteRequests)

val gateAddressRequests = listOf(
GateRequestValues.addressGateInputRequest1,
GateRequestValues.addressGateInputRequest2
)
gateClient.addresses().upsertAddresses(gateAddressRequests)

assertGateChangelogHasCount(1 + 1 + 2 + 2) // 1 LE + 1 site + 2 addresses
assertSharingStatesSuccessful(0)

// Action: Sync from Gate to Pool and BPN back to Gate
bridgeClient.bridge().triggerSync()

// 1 legal entity + 1 legal address & 1 site + 1 main address & 2 addresses
assertPoolChangelogHasCount(1 + 1 + 1 + 1 + 2)

// 1 LE + 1 site + 2 addresses
val sharingStatesOkay = assertSharingStatesSuccessful(1 + 1 + 2)
val bpnByExternalId = buildBpnByExternalIdMap(sharingStatesOkay)

val gateAddressRequestsByBpn = gateAddressRequests.associateBy { bpnByExternalId[it.externalId]!! }

val poolAddressResponses = poolClient.addresses().searchAddresses(
addressSearchRequest = AddressPartnerBpnSearchRequest(addresses = gateAddressRequestsByBpn.keys),
paginationRequest = DEFAULT_PAGINATION_REQUEST
)
assertThat(poolAddressResponses.contentSize).isEqualTo(2)

val poolAddressByBpn = poolAddressResponses.content.associateBy { it.bpna }

val addressesGateAndPool = gateAddressRequestsByBpn.keys
.map { Pair(gateAddressRequestsByBpn[it]!!, poolAddressByBpn[it]!!) }

assertThat(addressesGateAndPool.size).isEqualTo(2)
addressesGateAndPool.forEach { (gateVersion, poolVersion) ->
assertEqualAddress(gateVersion, poolVersion)
}
}

private fun buildBpnByExternalIdMap(sharingStatesOkay: List<SharingStateDto>) =
sharingStatesOkay
.associateBy { it.externalId }
.mapValues { it.value.bpn }

private fun assertGateChangelogHasCount(changelogCount: Int) {
val gateChangelogResponses = gateClient.changelog().getInputChangelog(
paginationRequest = DEFAULT_PAGINATION_REQUEST,
searchRequest = ChangeLogSearchRequest(fromTime = null, lsaTypes = emptySet())
)
assertThat(gateChangelogResponses.contentSize).isEqualTo(changelogCount)
}

private fun assertPoolChangelogHasCount(changelogCount: Int) {
val poolChangelogResponses = poolClient.changelogs().getChangelogEntries(
paginationRequest = DEFAULT_PAGINATION_REQUEST,
changelogSearchRequest = ChangelogSearchRequest(fromTime = null, bpns = null)

)
assertThat(poolChangelogResponses.contentSize).isEqualTo(changelogCount)

}

private fun assertSharingStatesSuccessful(successfulStatesCount: Int): List<SharingStateDto> {
val sharingStates = gateClient.sharingState().getSharingStates(
paginationRequest = DEFAULT_PAGINATION_REQUEST,
lsaType = null,
externalIds = null
)
val sharingStatesOkay = sharingStates.content
.filter { it.sharingStateType == SharingStateType.Success && it.bpn != null }
assertThat(sharingStatesOkay.size).isEqualTo(successfulStatesCount)
return sharingStatesOkay
}

private fun assertEqualLegalEntity(gateVersion: LegalEntityGateInputRequest, poolVersion: LegalEntityMatchVerboseDto) {
assertThat(poolVersion.legalEntity.legalShortName).isEqualTo(gateVersion.legalEntity.legalShortName)
// assertThat(poolVersion.legalAddress.name).isEqualTo(gateVersion.legalAddress.nameParts.first())
assertThat(poolVersion.legalAddress.physicalPostalAddress.street?.name).isEqualTo(gateVersion.legalAddress.physicalPostalAddress.street?.name)
assertThat(poolVersion.legalAddress.physicalPostalAddress.baseAddress.city).isEqualTo(gateVersion.legalAddress.physicalPostalAddress.baseAddress.city)
// assertThat(poolVersion.legalName).isEqualTo(gateVersion.legalNameParts.first()) // TODO not working, not yet persisted!
assertThat(poolVersion.legalAddress.alternativePostalAddress?.deliveryServiceNumber).isEqualTo(gateVersion.legalAddress.alternativePostalAddress?.deliveryServiceNumber)
assertThat(poolVersion.legalAddress.alternativePostalAddress?.baseAddress?.city).isEqualTo(gateVersion.legalAddress.alternativePostalAddress?.baseAddress?.city)
}

private fun assertEqualSite(gateVersion: SiteGateInputRequest, poolVersion: SitePoolVerboseDto) {
assertThat(poolVersion.site.name).isEqualTo(gateVersion.site.nameParts.first())
assertThat(poolVersion.site.states.map { it.description }).isEqualTo(gateVersion.site.states.map { it.description })
}

private fun assertEqualAddress(gateVersion: AddressGateInputRequest, poolVersion: LogisticAddressVerboseDto) {
assertThat(poolVersion.name).isEqualTo(gateVersion.address.nameParts.first())
assertThat(poolVersion.physicalPostalAddress.street?.name).isEqualTo(gateVersion.address.physicalPostalAddress.street?.name)
Expand Down
9 changes: 9 additions & 0 deletions bpdm-bridge-dummy/src/test/kotlin/com/catenax/bpdm/bridge/dummy/testdata/CommonValues.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ package com.catenax.bpdm.bridge.dummy.testdata
import com.neovisionaries.i18n.CountryCode
import com.neovisionaries.i18n.LanguageCode
import org.eclipse.tractusx.bpdm.common.dto.NameRegioncodeVerboseDto
import org.eclipse.tractusx.bpdm.common.dto.NameRegioncodeDto
import org.eclipse.tractusx.bpdm.common.model.BusinessStateType
import org.eclipse.tractusx.bpdm.common.model.CharacterSet
import org.eclipse.tractusx.bpdm.common.model.ClassificationType
Expand All @@ -42,6 +43,10 @@ object CommonValues {
const val externalId4 = "external-4"
const val externalId5 = "external-5"

val lsaTypeParam = LsaType.Address
val lsaTypeParamNotFound = LsaType.Site
val lsaNone = OptionalLsaType.None

const val externalIdSite1 = "site-external-1"
const val externalIdSite2 = "site-external-2"

Expand Down Expand Up @@ -180,6 +185,10 @@ object CommonValues {
// val adminAreaLevel1RegionCode_2 = "GA"
// val adminAreaLevel1Region2 = NameRegioncodeDto(adminAreaLevel1RegionCode_2, "Georgia")

val adminAreaLevel1RegionCode_1: String = "adminAreaLevel1RegionCode_1"
val adminAreaLevel1Region1: NameRegioncodeDto? = null
val adminAreaLevel1RegionCode_2: String = "adminAreaLevel1RegionCode_2"
val adminAreaLevel1Region2: NameRegioncodeDto? = null
val adminAreaLevel1RegionCode_1: String? = null
val adminAreaLevel1Region1: NameRegioncodeVerboseDto? = null
val adminAreaLevel1RegionCode_2: String? = null
Expand Down
Loading

0 comments on commit 8a6e519

Please sign in to comment.