Skip to content

Commit

Permalink
feat(Gate) - Service logic fix in accordance to previous refactoring,…
Browse files Browse the repository at this point in the history 
… isOwner change to isOwnCompanyData on Mappings
  • Loading branch information
@alexsilva-CGI
alexsilva-CGI committed Oct 10, 2023
1 parent fd9b824 commit a5e7b7f
Show file tree
Hide file tree
Showing 11 changed files with 411 additions and 536 deletions.
29 changes: 0 additions & 29 deletions ...kotlin/org/eclipse/tractusx/bpdm/gate/api/model/wrapper/BusinessPartnerInputDtoWrapper.kt
View file

This file was deleted.

29 changes: 0 additions & 29 deletions ...otlin/org/eclipse/tractusx/bpdm/gate/api/model/wrapper/BusinessPartnerOutputDtoWrapper.kt
View file

This file was deleted.

29 changes: 0 additions & 29 deletions ...in/org/eclipse/tractusx/bpdm/gate/api/model/wrapper/BusinessPartnerWrapperInputRequest.kt
View file

This file was deleted.

29 changes: 0 additions & 29 deletions ...n/org/eclipse/tractusx/bpdm/gate/api/model/wrapper/BusinessPartnerWrapperOutputRequest.kt
View file

This file was deleted.

7 changes: 1 addition & 6 deletions ...te/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/controller/BusinessPartnerController.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import org.eclipse.tractusx.bpdm.gate.api.GateBusinessPartnerApi
import org.eclipse.tractusx.bpdm.gate.api.model.request.BusinessPartnerInputRequest
import org.eclipse.tractusx.bpdm.gate.api.model.response.BusinessPartnerInputDto
import org.eclipse.tractusx.bpdm.gate.api.model.response.BusinessPartnerOutputDto
import org.eclipse.tractusx.bpdm.gate.api.model.wrapper.BusinessPartnerWrapperInputRequest
import org.eclipse.tractusx.bpdm.gate.config.ApiConfigProperties
import org.eclipse.tractusx.bpdm.gate.containsDuplicates
import org.eclipse.tractusx.bpdm.gate.service.BusinessPartnerService
Expand All @@ -46,11 +45,7 @@ class BusinessPartnerController(
if (businessPartners.size > apiConfigProperties.upsertLimit || businessPartners.map { it.externalId }.containsDuplicates()) {
return ResponseEntity(HttpStatus.BAD_REQUEST)
}

val toWrapper: MutableCollection<BusinessPartnerWrapperInputRequest> = mutableListOf()
businessPartners.forEach { toWrapper.add(BusinessPartnerWrapperInputRequest(it, null, null)) }

val result = businessPartnerService.upsertBusinessPartnersInput(toWrapper)
val result = businessPartnerService.upsertBusinessPartnersInput(businessPartners)
return ResponseEntity.ok(result)
}

Expand Down
65 changes: 35 additions & 30 deletions bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/AddressService.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,9 @@ import org.eclipse.tractusx.bpdm.gate.api.model.request.AddressGateInputRequest
import org.eclipse.tractusx.bpdm.gate.api.model.request.AddressGateOutputRequest
import org.eclipse.tractusx.bpdm.gate.api.model.response.AddressGateInputDto
import org.eclipse.tractusx.bpdm.gate.api.model.response.AddressGateOutputDto
import org.eclipse.tractusx.bpdm.gate.api.model.wrapper.BusinessPartnerInputDtoWrapper
import org.eclipse.tractusx.bpdm.gate.api.model.wrapper.BusinessPartnerOutputDtoWrapper
import org.eclipse.tractusx.bpdm.gate.api.model.wrapper.BusinessPartnerWrapperInputRequest
import org.eclipse.tractusx.bpdm.gate.api.model.wrapper.BusinessPartnerWrapperOutputRequest
import org.eclipse.tractusx.bpdm.gate.entity.generic.BusinessPartner
import org.eclipse.tractusx.bpdm.gate.repository.generic.BusinessPartnerRepository
import org.springframework.data.domain.Page
import org.springframework.data.domain.PageRequest
import org.springframework.http.HttpStatus
import org.springframework.stereotype.Service
Expand All @@ -46,31 +44,35 @@ class AddressService(

fun getAddresses(page: Int, size: Int, externalIds: Collection<String>? = null): PageDto<AddressGateInputDto> {

val businessPartnerPage = businessPartnerService.getBusinessPartnersInputLSA(PageRequest.of(page, size), externalIds)
val businessPartnerPage =
businessPartnerService.getBusinessPartners(pageRequest = PageRequest.of(page, size), externalIds = externalIds, stage = StageType.Input)

return PageDto( //TODO totalElements and totalPages need change
val validEntities = toValidLogisticAddressesGeneric(businessPartnerPage)

return PageDto( //TODO TotalElements and TotalPages need change
page = page,
totalElements = businessPartnerPage.totalElements,
totalPages = businessPartnerPage.totalPages,
contentSize = toValidLogisticAddressesGeneric(businessPartnerPage).size,
content = toValidLogisticAddressesGeneric(businessPartnerPage)
contentSize = validEntities.size,
content = validEntities
)
}

private fun toValidLogisticAddressesGeneric(businessPartnerPage: PageDto<BusinessPartnerInputDtoWrapper>): List<AddressGateInputDto> {
private fun toValidLogisticAddressesGeneric(businessPartnerPage: Page<BusinessPartner>): List<AddressGateInputDto> {
return businessPartnerPage.content
.filter { it.businessPartner.postalAddress.addressType == AddressType.AdditionalAddress && checkExistentRelation(StageType.Input, it.parentId) }
.map { it.businessPartner.toAddressGateInputDto(it.parentId, it.parentType) }
.filter { it.postalAddress.addressType == AddressType.AdditionalAddress && checkExistentRelation(StageType.Input, it.parentId) }
.map { it.toAddressGateInputDto(it.parentId, it.parentType) }
}

fun getAddressByExternalId(externalId: String): AddressGateInputDto {

val businessPartnerPage = businessPartnerService.getBusinessPartnersInputLSA(PageRequest.of(0, 1), listOf(externalId))
val businessPartnerPage =
businessPartnerService.getBusinessPartners(pageRequest = PageRequest.of(0, 1), externalIds = listOf(externalId), stage = StageType.Input)

val businessPartner = businessPartnerPage.content.firstOrNull { it.businessPartner.postalAddress.addressType == AddressType.AdditionalAddress }
val businessPartner = businessPartnerPage.content.firstOrNull { it.postalAddress.addressType == AddressType.AdditionalAddress }
?: throw BpdmNotFoundException(("Address does not exist"), externalId)

return businessPartner.businessPartner.toAddressGateInputDto(businessPartner.parentId, businessPartner.parentType)
return businessPartner.toAddressGateInputDto(businessPartner.parentId, businessPartner.parentType)

}

Expand All @@ -79,22 +81,25 @@ class AddressService(
*/
fun getAddressesOutput(externalIds: Collection<String>? = null, page: Int, size: Int): PageDto<AddressGateOutputDto> {

val businessPartnerPage = businessPartnerService.getBusinessPartnersOutputLSA(PageRequest.of(page, size), externalIds)
val businessPartnerPage =
businessPartnerService.getBusinessPartners(pageRequest = PageRequest.of(page, size), externalIds = externalIds, stage = StageType.Output)

val validEntities = toValidOutputLogisticAddressesGeneric(businessPartnerPage)

return PageDto(
page = page,
totalElements = businessPartnerPage.totalElements,
totalPages = businessPartnerPage.totalPages,
contentSize = toValidOutputLogisticAddressesGeneric(businessPartnerPage).size,
content = toValidOutputLogisticAddressesGeneric(businessPartnerPage),
contentSize = validEntities.size,
content = validEntities,
)

}

private fun toValidOutputLogisticAddressesGeneric(businessPartnerPage: PageDto<BusinessPartnerOutputDtoWrapper>): List<AddressGateOutputDto> {
private fun toValidOutputLogisticAddressesGeneric(businessPartnerPage: Page<BusinessPartner>): List<AddressGateOutputDto> {
return businessPartnerPage.content
.filter { it.businessPartner.postalAddress.addressType == AddressType.AdditionalAddress && checkExistentRelation(StageType.Output, it.parentId) }
.map { it.businessPartner.toAddressGateOutputDto(it.parentId, it.parentType) }
.filter { it.postalAddress.addressType == AddressType.AdditionalAddress && checkExistentRelation(StageType.Output, it.parentId) }
.map { it.toAddressGateOutputDto(it.parentId, it.parentType) }
}

private fun checkExistentRelation(type: StageType, searchId: String?): Boolean {
Expand All @@ -110,7 +115,7 @@ class AddressService(
**/
fun upsertAddresses(addresses: Collection<AddressGateInputRequest>) {

val mappedGBP: MutableCollection<BusinessPartnerWrapperInputRequest> = mutableListOf()
var mappedGBP: List<BusinessPartner> = emptyList()

addresses.forEach { address ->

Expand All @@ -122,25 +127,25 @@ class AddressService(

if (address.siteExternalId != null) {

val mapBusinessPartner = address.toBusinessPartnerDto()
val mapBusinessPartner = address.toBusinessPartnerDtoSite(address.siteExternalId, BusinessPartnerType.SITE)

val relatedLE = businessPartnerRepository.findByStageAndExternalId(StageType.Input, address.siteExternalId)
if (relatedLE == null || relatedLE.postalAddress.addressType != AddressType.SiteMainAddress) {
throw ResponseStatusException(HttpStatus.NOT_FOUND, "Related Input Site doesn't exist")
}

mappedGBP.add(BusinessPartnerWrapperInputRequest(mapBusinessPartner, address.siteExternalId, BusinessPartnerType.SITE))
mappedGBP = mappedGBP.plus(mapBusinessPartner)

} else if (address.legalEntityExternalId != null) {

val mapBusinessPartner = address.toBusinessPartnerDto()
val mapBusinessPartner = address.toBusinessPartnerDtoSite(address.legalEntityExternalId, BusinessPartnerType.LEGAL_ENTITY)

val relatedLE = businessPartnerRepository.findByStageAndExternalId(StageType.Input, address.legalEntityExternalId)
if (relatedLE == null || relatedLE.postalAddress.addressType != AddressType.LegalAddress) {
throw ResponseStatusException(HttpStatus.NOT_FOUND, "Related Input Legal Entity doesn't exist")
}

mappedGBP.add(BusinessPartnerWrapperInputRequest(mapBusinessPartner, address.legalEntityExternalId, BusinessPartnerType.LEGAL_ENTITY))
mappedGBP = mappedGBP.plus(mapBusinessPartner)

}
}
Expand All @@ -154,7 +159,7 @@ class AddressService(
**/
fun upsertOutputAddresses(addresses: Collection<AddressGateOutputRequest>) {

val mappedGBP: MutableCollection<BusinessPartnerWrapperOutputRequest> = mutableListOf()
var mappedGBP: List<BusinessPartner> = emptyList()

addresses.forEach { address ->

Expand All @@ -165,7 +170,7 @@ class AddressService(

if (address.siteExternalId != null) {

val mapBusinessPartner = address.toBusinessPartnerOutputDto()
val mapBusinessPartner = address.toBusinessPartnerOutputDtoSite(address.siteExternalId, BusinessPartnerType.SITE)

if (relatedAddress.parentType != BusinessPartnerType.SITE) {
throw ResponseStatusException(HttpStatus.BAD_REQUEST, "Related Input Address doesn't have site relationship")
Expand All @@ -176,11 +181,11 @@ class AddressService(
throw ResponseStatusException(HttpStatus.BAD_REQUEST, "Related Input Site doesn't exist")
}

mappedGBP.add(BusinessPartnerWrapperOutputRequest(mapBusinessPartner, address.siteExternalId, BusinessPartnerType.SITE))
mappedGBP = mappedGBP.plus(mapBusinessPartner)

} else if (address.legalEntityExternalId != null) {

val mapBusinessPartner = address.toBusinessPartnerOutputDto()
val mapBusinessPartner = address.toBusinessPartnerOutputDtoSite(address.legalEntityExternalId, BusinessPartnerType.LEGAL_ENTITY)

if (relatedAddress.parentType != BusinessPartnerType.LEGAL_ENTITY) {
throw ResponseStatusException(HttpStatus.BAD_REQUEST, "Related Input Address doesn't have Legal Entity relationship")
Expand All @@ -191,7 +196,7 @@ class AddressService(
throw ResponseStatusException(HttpStatus.BAD_REQUEST, "Related Input Legal Entity doesn't exist")
}

mappedGBP.add(BusinessPartnerWrapperOutputRequest(mapBusinessPartner, address.legalEntityExternalId, BusinessPartnerType.LEGAL_ENTITY))
mappedGBP = mappedGBP.plus(mapBusinessPartner)

}
}
Expand Down
Loading

0 comments on commit a5e7b7f

Please sign in to comment.