diff --git a/bpdm-common/src/main/kotlin/org/eclipse/tractusx/bpdm/common/dto/BasePostalAddressDto.kt b/bpdm-common/src/main/kotlin/org/eclipse/tractusx/bpdm/common/dto/BasePostalAddressDto.kt index c1547e11d..7e4cc657a 100644 --- a/bpdm-common/src/main/kotlin/org/eclipse/tractusx/bpdm/common/dto/BasePostalAddressDto.kt +++ b/bpdm-common/src/main/kotlin/org/eclipse/tractusx/bpdm/common/dto/BasePostalAddressDto.kt @@ -32,7 +32,7 @@ data class BasePostalAddressDto( val country: CountryCode, @get:Schema(description = "A postal code, also known as postcode, PIN or ZIP Code") - val postCode: String? = null, + val postalCode: String? = null, @get:Schema(description = "The city of the address (Synonym: Town, village, municipality)") val city: String, diff --git a/bpdm-common/src/main/kotlin/org/eclipse/tractusx/bpdm/common/dto/PhysicalPostalAddressDto.kt b/bpdm-common/src/main/kotlin/org/eclipse/tractusx/bpdm/common/dto/PhysicalPostalAddressDto.kt index 1e3788050..2fff25842 100644 --- a/bpdm-common/src/main/kotlin/org/eclipse/tractusx/bpdm/common/dto/PhysicalPostalAddressDto.kt +++ b/bpdm-common/src/main/kotlin/org/eclipse/tractusx/bpdm/common/dto/PhysicalPostalAddressDto.kt @@ -38,7 +38,7 @@ data class PhysicalPostalAddressDto( val areaPart: AreaDistrictDto, @get:Schema(description = "A separate postal code for a company, also known as postcode, PIN or ZIP Code") - val companyPostCode: String? = null, + val companyPostalCode: String? = null, @get:Schema(description = "The practice of designating an area for industrial development") val industrialZone: String? = null, diff --git a/bpdm-common/src/main/kotlin/org/eclipse/tractusx/bpdm/common/dto/response/BasePostalAddressResponse.kt b/bpdm-common/src/main/kotlin/org/eclipse/tractusx/bpdm/common/dto/response/BasePostalAddressResponse.kt index e841efa85..00aa71923 100644 --- a/bpdm-common/src/main/kotlin/org/eclipse/tractusx/bpdm/common/dto/response/BasePostalAddressResponse.kt +++ b/bpdm-common/src/main/kotlin/org/eclipse/tractusx/bpdm/common/dto/response/BasePostalAddressResponse.kt @@ -34,7 +34,7 @@ data class BasePostalAddressResponse( val country: TypeKeyNameDto, @get:Schema(description = "A postal code, also known as postcode, PIN or ZIP Code") - val postCode: String? = null, + val postalCode: String? = null, @get:Schema(description = "The city of the address (Synonym: Town, village, municipality)") val city: String, diff --git a/bpdm-common/src/main/kotlin/org/eclipse/tractusx/bpdm/common/dto/response/PhysicalPostalAddressResponse.kt b/bpdm-common/src/main/kotlin/org/eclipse/tractusx/bpdm/common/dto/response/PhysicalPostalAddressResponse.kt index 95ac5f32d..05eca6e50 100644 --- a/bpdm-common/src/main/kotlin/org/eclipse/tractusx/bpdm/common/dto/response/PhysicalPostalAddressResponse.kt +++ b/bpdm-common/src/main/kotlin/org/eclipse/tractusx/bpdm/common/dto/response/PhysicalPostalAddressResponse.kt @@ -34,12 +34,12 @@ data class PhysicalPostalAddressResponse( @get:Schema(description = "Street") val street: StreetDto? = null, - + @field:JsonUnwrapped val areaPart: AreaDistrictResponse, @get:Schema(description = "A separate postal code for a company, also known as postcode, PIN or ZIP Code") - val companyPostCode: String? = null, + val companyPostalCode: String? = null, @get:Schema(description = "The practice of designating an area for industrial development") val industrialZone: String? = null, diff --git a/bpdm-common/src/main/kotlin/org/eclipse/tractusx/bpdm/common/service/SaasMappings.kt b/bpdm-common/src/main/kotlin/org/eclipse/tractusx/bpdm/common/service/SaasMappings.kt index a2f3dcab6..c368f63fb 100644 --- a/bpdm-common/src/main/kotlin/org/eclipse/tractusx/bpdm/common/service/SaasMappings.kt +++ b/bpdm-common/src/main/kotlin/org/eclipse/tractusx/bpdm/common/service/SaasMappings.kt @@ -212,7 +212,7 @@ object SaasMappings { } return PhysicalPostalAddressDto( - companyPostCode = map.companyPostCode(), + companyPostalCode = map.companyPostCode(), industrialZone = map.industrialZone(), building = map.building(), floor = map.floor(), @@ -228,7 +228,7 @@ object SaasMappings { geographicCoordinates = map.geoCoordinates(), city = city, country = country, - postCode = map.postcode(), + postalCode = map.postcode(), ) ) } @@ -259,7 +259,7 @@ object SaasMappings { geographicCoordinates = map.geoCoordinates(), city = city, country = country, - postCode = map.postcode(), + postalCode = map.postcode(), ) ) } 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 index 5b0e5c528..4aa792962 100644 --- 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 @@ -63,7 +63,7 @@ fun AlternativePostalAddressDto.toAlternativePostalAddressEntity(): AlternativeP geographicCoordinates = baseAddress.geographicCoordinates?.toGeographicCoordinateEntity(), country = baseAddress.country, administrativeAreaLevel1 = null, // TODO Add region mapping Logic - postCode = baseAddress.postCode, + postCode = baseAddress.postalCode, city = baseAddress.city, deliveryServiceType = deliveryServiceType, deliveryServiceNumber = deliveryServiceNumber @@ -79,11 +79,11 @@ fun PhysicalPostalAddressDto.toPhysicalPostalAddressEntity(): PhysicalPostalAddr administrativeAreaLevel1 = null, // TODO Add region mapping Logic administrativeAreaLevel2 = areaPart.administrativeAreaLevel2, administrativeAreaLevel3 = areaPart.administrativeAreaLevel3, - postCode = baseAddress.postCode, + postCode = baseAddress.postalCode, city = baseAddress.city, districtLevel1 = areaPart.district, street = street?.toStreetEntity(), - companyPostCode = companyPostCode, + companyPostCode = companyPostalCode, industrialZone = industrialZone, building = building, floor = floor, diff --git a/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/SaasDtoToSaasAddressMapping.kt b/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/SaasDtoToSaasAddressMapping.kt index 90bae7f8f..6c65d6a3a 100644 --- a/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/SaasDtoToSaasAddressMapping.kt +++ b/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/SaasDtoToSaasAddressMapping.kt @@ -69,13 +69,13 @@ class SaasDtoToSaasAddressMapping(private val postalAdress: BasePostalAddressDto fun postcodes(physicalAddress: PhysicalPostalAddressDto?): Collection { return listOfNotNull( - postalAdress.postCode?.let { + postalAdress.postalCode?.let { PostCodeSaas( value = it, type = SaasPostCodeType.REGULAR.toSaasTypeDto() ) }, - physicalAddress?.companyPostCode?.let { + physicalAddress?.companyPostalCode?.let { PostCodeSaas( value = it, type = SaasPostCodeType.LARGE_MAIL_USER.toSaasTypeDto() diff --git a/bpdm-gate/src/test/kotlin/org/eclipse/tractusx/bpdm/gate/service/SaasDtoToSaasAddressMappingTest.kt b/bpdm-gate/src/test/kotlin/org/eclipse/tractusx/bpdm/gate/service/SaasDtoToSaasAddressMappingTest.kt index 4716b7ed2..35db79a15 100644 --- a/bpdm-gate/src/test/kotlin/org/eclipse/tractusx/bpdm/gate/service/SaasDtoToSaasAddressMappingTest.kt +++ b/bpdm-gate/src/test/kotlin/org/eclipse/tractusx/bpdm/gate/service/SaasDtoToSaasAddressMappingTest.kt @@ -30,7 +30,7 @@ class SaasDtoToSaasAddressMappingTest { assertThat(areaPart.district).isEqualTo(findValue(addressSaas.localities, SaasLocalityType.DISTRICT)) assertThat(baseAddressDto.geographicCoordinates?.latitude).isEqualTo(addressSaas.geographicCoordinates?.latitude) assertThat(baseAddressDto.geographicCoordinates?.longitude).isEqualTo(addressSaas.geographicCoordinates?.longitude) - assertThat(baseAddressDto.postCode).isEqualTo(findValue(addressSaas.postCodes, SaasPostCodeType.REGULAR)) + assertThat(baseAddressDto.postalCode).isEqualTo(findValue(addressSaas.postCodes, SaasPostCodeType.REGULAR)) assertThat(streetDto?.name).isEqualTo(findObject(addressSaas.thoroughfares, SaasThoroughfareType.STREET)?.name) assertThat(streetDto?.houseNumber).isEqualTo(findObject(addressSaas.thoroughfares, SaasThoroughfareType.STREET)?.number) assertThat(streetDto?.direction).isEqualTo(findObject(addressSaas.thoroughfares, SaasThoroughfareType.STREET)?.direction) @@ -75,7 +75,7 @@ class SaasDtoToSaasAddressMappingTest { assertThat(areaPart.district).isEqualTo(findValue(addressSaas.localities, SaasLocalityType.DISTRICT)) assertThat(baseAddressDto.geographicCoordinates?.latitude).isEqualTo(addressSaas.geographicCoordinates?.latitude) assertThat(baseAddressDto.geographicCoordinates?.longitude).isEqualTo(addressSaas.geographicCoordinates?.longitude) - assertThat(baseAddressDto.postCode).isEqualTo(findValue(addressSaas.postCodes, SaasPostCodeType.REGULAR)) + assertThat(baseAddressDto.postalCode).isEqualTo(findValue(addressSaas.postCodes, SaasPostCodeType.REGULAR)) assertThat(streetDto?.name).isEqualTo(findObject(addressSaas.thoroughfares, SaasThoroughfareType.STREET)?.name) assertThat(streetDto?.houseNumber).isEqualTo(findObject(addressSaas.thoroughfares, SaasThoroughfareType.STREET)?.number) assertThat(streetDto?.direction).isEqualTo(findObject(addressSaas.thoroughfares, SaasThoroughfareType.STREET)?.direction) @@ -104,7 +104,7 @@ class SaasDtoToSaasAddressMappingTest { assertThat(areaPart.district).isEqualTo(findValue(addressSaas.localities, SaasLocalityType.DISTRICT)) assertThat(baseAddressDto.geographicCoordinates?.latitude).isEqualTo(addressSaas.geographicCoordinates?.latitude) assertThat(baseAddressDto.geographicCoordinates?.longitude).isEqualTo(addressSaas.geographicCoordinates?.longitude) - assertThat(baseAddressDto.postCode).isEqualTo(findValue(addressSaas.postCodes, SaasPostCodeType.REGULAR)) + assertThat(baseAddressDto.postalCode).isEqualTo(findValue(addressSaas.postCodes, SaasPostCodeType.REGULAR)) assertThat(streetDto?.name).isEqualTo(findObject(addressSaas.thoroughfares, SaasThoroughfareType.STREET)?.name) assertThat(streetDto?.houseNumber).isEqualTo(findObject(addressSaas.thoroughfares, SaasThoroughfareType.STREET)?.number) assertThat(streetDto?.direction).isEqualTo(findObject(addressSaas.thoroughfares, SaasThoroughfareType.STREET)?.direction) diff --git a/bpdm-gate/src/test/kotlin/org/eclipse/tractusx/bpdm/gate/util/RequestValues.kt b/bpdm-gate/src/test/kotlin/org/eclipse/tractusx/bpdm/gate/util/RequestValues.kt index 76d797a6c..11f9f67f5 100644 --- a/bpdm-gate/src/test/kotlin/org/eclipse/tractusx/bpdm/gate/util/RequestValues.kt +++ b/bpdm-gate/src/test/kotlin/org/eclipse/tractusx/bpdm/gate/util/RequestValues.kt @@ -131,7 +131,7 @@ object RequestValues { baseAddress = BasePostalAddressDto( geographicCoordinates = geoCoordinate1, country = CommonValues.country1, - postCode = CommonValues.postCode1, + postalCode = CommonValues.postCode1, city = CommonValues.city1, ) ) @@ -150,7 +150,7 @@ object RequestValues { baseAddress = BasePostalAddressDto( geographicCoordinates = geoCoordinate2, country = CommonValues.country2, - postCode = CommonValues.postCode2, + postalCode = CommonValues.postCode2, city = CommonValues.city2, ) ) diff --git a/bpdm-gate/src/test/kotlin/org/eclipse/tractusx/bpdm/gate/util/ResponseValues.kt b/bpdm-gate/src/test/kotlin/org/eclipse/tractusx/bpdm/gate/util/ResponseValues.kt index e47bced8c..dbe45c5bc 100644 --- a/bpdm-gate/src/test/kotlin/org/eclipse/tractusx/bpdm/gate/util/ResponseValues.kt +++ b/bpdm-gate/src/test/kotlin/org/eclipse/tractusx/bpdm/gate/util/ResponseValues.kt @@ -178,7 +178,7 @@ object ResponseValues { baseAddress = BasePostalAddressResponse( geographicCoordinates = geoCoordinate1, country = country1, - postCode = CommonValues.postCode1, + postalCode = CommonValues.postCode1, city = CommonValues.city1, ) ) @@ -197,7 +197,7 @@ object ResponseValues { baseAddress = BasePostalAddressResponse( geographicCoordinates = geoCoordinate2, country = country2, - postCode = CommonValues.postCode2, + postalCode = CommonValues.postCode2, city = CommonValues.city2, ) ) diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/BusinessPartnerBuildService.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/BusinessPartnerBuildService.kt index 73e925f3b..ffbb1ff69 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/BusinessPartnerBuildService.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/BusinessPartnerBuildService.kt @@ -432,11 +432,11 @@ class BusinessPartnerBuildService( administrativeAreaLevel1 = null, administrativeAreaLevel2 = area.administrativeAreaLevel2, administrativeAreaLevel3 = area.administrativeAreaLevel3, - postCode = baseAddress.postCode, + postCode = baseAddress.postalCode, city = baseAddress.city, districtLevel1 = area.district, street = physicalAddress.street?.let { createStreet(it) }, - companyPostCode = physicalAddress.companyPostCode, + companyPostCode = physicalAddress.companyPostalCode, industrialZone = physicalAddress.industrialZone, building = physicalAddress.building, floor = physicalAddress.floor, @@ -455,7 +455,7 @@ class BusinessPartnerBuildService( // metadataMap.regions[it] ?: throw BpdmNotFoundException(Region::class, it) // }, administrativeAreaLevel1 = null, - postCode = baseAddress.postCode, + postCode = baseAddress.postalCode, city = baseAddress.city, deliveryServiceType = alternativeAddress.deliveryServiceType, deliveryServiceNumber = alternativeAddress.deliveryServiceNumber diff --git a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/ResponseMappings.kt b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/ResponseMappings.kt index ae3a44f59..9872ca574 100644 --- a/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/ResponseMappings.kt +++ b/bpdm-pool/src/main/kotlin/org/eclipse/tractusx/bpdm/pool/service/ResponseMappings.kt @@ -151,7 +151,7 @@ fun PhysicalPostalAddress.toDto(): PhysicalPostalAddressResponse { baseAddress = BasePostalAddressResponse( geographicCoordinates = geographicCoordinates?.toDto(), country = country.toDto(), - postCode = postCode, + postalCode = postCode, city = city, ), street = street?.toDto(), @@ -161,7 +161,7 @@ fun PhysicalPostalAddress.toDto(): PhysicalPostalAddressResponse { administrativeAreaLevel3 = administrativeAreaLevel3, district = districtLevel1, ), - companyPostCode = companyPostCode, + companyPostalCode = companyPostCode, industrialZone = industrialZone, building = building, floor = floor, @@ -174,7 +174,7 @@ fun AlternativePostalAddress.toDto(): AlternativePostalAddressResponse { baseAddress = BasePostalAddressResponse( geographicCoordinates = geographicCoordinates?.toDto(), country = country.toDto(), - postCode = postCode, + postalCode = postCode, city = city, ), areaPart = AreaDistrictAlternativResponse( diff --git a/bpdm-pool/src/test/kotlin/org/eclipse/tractusx/bpdm/common/service/SaasAddressToDtoMappingTest.kt b/bpdm-pool/src/test/kotlin/org/eclipse/tractusx/bpdm/common/service/SaasAddressToDtoMappingTest.kt index aa0807105..70e980291 100644 --- a/bpdm-pool/src/test/kotlin/org/eclipse/tractusx/bpdm/common/service/SaasAddressToDtoMappingTest.kt +++ b/bpdm-pool/src/test/kotlin/org/eclipse/tractusx/bpdm/common/service/SaasAddressToDtoMappingTest.kt @@ -63,7 +63,7 @@ class SaasAddressToDtoMappingTest { Assertions.assertThat(areaDto.district).isEqualTo(findValue(addressSaas.localities, SaasLocalityType.DISTRICT)) Assertions.assertThat(baseAddressDto.geographicCoordinates?.latitude).isEqualTo(addressSaas.geographicCoordinates?.latitude) Assertions.assertThat(baseAddressDto.geographicCoordinates?.longitude).isEqualTo(addressSaas.geographicCoordinates?.longitude) - Assertions.assertThat(baseAddressDto.postCode).isEqualTo(findValue(addressSaas.postCodes, SaasPostCodeType.REGULAR)) + Assertions.assertThat(baseAddressDto.postalCode).isEqualTo(findValue(addressSaas.postCodes, SaasPostCodeType.REGULAR)) Assertions.assertThat(streetDto?.name).isEqualTo(findObject(addressSaas.thoroughfares, SaasThoroughfareType.STREET)?.name) Assertions.assertThat(streetDto?.houseNumber).isEqualTo(findObject(addressSaas.thoroughfares, SaasThoroughfareType.STREET)?.number) Assertions.assertThat(streetDto?.direction).isEqualTo(findObject(addressSaas.thoroughfares, SaasThoroughfareType.STREET)?.direction) @@ -88,7 +88,7 @@ class SaasAddressToDtoMappingTest { Assertions.assertThat(areaDto.district).isEqualTo(findValue(addressSaas.localities, SaasLocalityType.DISTRICT)) Assertions.assertThat(baseAddressDto.geographicCoordinates?.latitude).isEqualTo(addressSaas.geographicCoordinates?.latitude) Assertions.assertThat(baseAddressDto.geographicCoordinates?.longitude).isEqualTo(addressSaas.geographicCoordinates?.longitude) - Assertions.assertThat(baseAddressDto.postCode).isEqualTo(findValue(addressSaas.postCodes, SaasPostCodeType.REGULAR)) + Assertions.assertThat(baseAddressDto.postalCode).isEqualTo(findValue(addressSaas.postCodes, SaasPostCodeType.REGULAR)) Assertions.assertThat(streetDto?.name).isEqualTo(findObject(addressSaas.thoroughfares, SaasThoroughfareType.STREET)?.name) Assertions.assertThat(streetDto?.houseNumber).isEqualTo(findObject(addressSaas.thoroughfares, SaasThoroughfareType.STREET)?.number) Assertions.assertThat(streetDto?.direction).isEqualTo(findObject(addressSaas.thoroughfares, SaasThoroughfareType.STREET)?.direction) diff --git a/bpdm-pool/src/test/kotlin/org/eclipse/tractusx/bpdm/pool/controller/AddressControllerSearchIT.kt b/bpdm-pool/src/test/kotlin/org/eclipse/tractusx/bpdm/pool/controller/AddressControllerSearchIT.kt index fce2c38ab..01e05676c 100644 --- a/bpdm-pool/src/test/kotlin/org/eclipse/tractusx/bpdm/pool/controller/AddressControllerSearchIT.kt +++ b/bpdm-pool/src/test/kotlin/org/eclipse/tractusx/bpdm/pool/controller/AddressControllerSearchIT.kt @@ -131,7 +131,7 @@ class AddressControllerSearchIT @Autowired constructor( ) val addressSearchRequest = AddressPartnerSearchRequest( - postCode = givenAddress1.physicalPostalAddress.baseAddress.postCode + postCode = givenAddress1.physicalPostalAddress.baseAddress.postalCode ) val pageResponse = poolClient.addresses().getAddresses(addressSearchRequest, PaginationRequest()) @@ -275,7 +275,7 @@ class AddressControllerSearchIT @Autowired constructor( val addressSearchRequest = AddressPartnerSearchRequest() addressSearchRequest.postalDeliveryPoint = RequestValues.addressPartnerCreate1.address.alternativePostalAddress!!.deliveryServiceNumber - addressSearchRequest.postCode = RequestValues.addressPartnerCreate1.address.physicalPostalAddress.baseAddress.postCode + addressSearchRequest.postCode = RequestValues.addressPartnerCreate1.address.physicalPostalAddress.baseAddress.postalCode val pageResponse = poolClient.addresses().getAddresses(addressSearchRequest, PaginationRequest()) assertPageEquals(pageResponse, expected) @@ -295,7 +295,7 @@ class AddressControllerSearchIT @Autowired constructor( val addressSearchRequest = AddressPartnerSearchRequest() - addressSearchRequest.postCode = RequestValues.addressPartnerCreate1.address.physicalPostalAddress.baseAddress.postCode + addressSearchRequest.postCode = RequestValues.addressPartnerCreate1.address.physicalPostalAddress.baseAddress.postalCode addressSearchRequest.administrativeArea = "someNonexistentValue" val pageResponse = poolClient.addresses().getAddresses(addressSearchRequest, PaginationRequest()) @@ -335,7 +335,7 @@ class AddressControllerSearchIT @Autowired constructor( ) val addressSearchRequest = AddressPartnerSearchRequest( - postCode = givenAddress3.physicalPostalAddress.baseAddress.postCode + postCode = givenAddress3.physicalPostalAddress.baseAddress.postalCode ) val pageResponse = poolClient.addresses().getAddresses(addressSearchRequest, PaginationRequest()) diff --git a/bpdm-pool/src/test/kotlin/org/eclipse/tractusx/bpdm/pool/controller/SuggestionControllerIT.kt b/bpdm-pool/src/test/kotlin/org/eclipse/tractusx/bpdm/pool/controller/SuggestionControllerIT.kt index 62fffbe63..455290150 100644 --- a/bpdm-pool/src/test/kotlin/org/eclipse/tractusx/bpdm/pool/controller/SuggestionControllerIT.kt +++ b/bpdm-pool/src/test/kotlin/org/eclipse/tractusx/bpdm/pool/controller/SuggestionControllerIT.kt @@ -117,7 +117,7 @@ class SuggestionControllerIT @Autowired constructor( expectedLegalEntityName ), Arguments.of( - expectedLegalAddress.physicalPostalAddress.baseAddress.postCode, + expectedLegalAddress.physicalPostalAddress.baseAddress.postalCode, EndpointValues.CATENA_SUGGESTION_ADDRESS_POST_CODE_PATH, expectedLegalEntityName ), @@ -154,7 +154,7 @@ class SuggestionControllerIT @Autowired constructor( nonlatinLegalAddress.physicalPostalAddress.areaPart.administrativeAreaLevel2, EndpointValues.CATENA_SUGGESTION_ADDRESS_ADMIN_AREA_PATH ), - Arguments.of(nonlatinLegalAddress.physicalPostalAddress.baseAddress.postCode, EndpointValues.CATENA_SUGGESTION_ADDRESS_POST_CODE_PATH), + Arguments.of(nonlatinLegalAddress.physicalPostalAddress.baseAddress.postalCode, EndpointValues.CATENA_SUGGESTION_ADDRESS_POST_CODE_PATH), Arguments.of(nonlatinLegalAddress.physicalPostalAddress.baseAddress.city, EndpointValues.CATENA_SUGGESTION_ADDRESS_LOCALITY_PATH), Arguments.of(nonlatinLegalAddress.physicalPostalAddress.street!!.name, EndpointValues.CATENA_SUGGESTION_ADDRESS_THOROUGHFARE_PATH), Arguments.of(nonlatinLegalAddress.physicalPostalAddress.building, EndpointValues.CATENA_SUGGESTION_ADDRESS_PREMISE_PATH), diff --git a/bpdm-pool/src/test/kotlin/org/eclipse/tractusx/bpdm/pool/util/RequestValues.kt b/bpdm-pool/src/test/kotlin/org/eclipse/tractusx/bpdm/pool/util/RequestValues.kt index b15b9d18e..f104335c4 100644 --- a/bpdm-pool/src/test/kotlin/org/eclipse/tractusx/bpdm/pool/util/RequestValues.kt +++ b/bpdm-pool/src/test/kotlin/org/eclipse/tractusx/bpdm/pool/util/RequestValues.kt @@ -91,7 +91,7 @@ object RequestValues { val version1 = AddressVersionDto(CommonValues.characterSet1, CommonValues.language0) val postalAddress1 = PhysicalPostalAddressDto( - companyPostCode = CommonValues.postCode2, + companyPostalCode = CommonValues.postCode2, industrialZone = CommonValues.industrialZone1, building = CommonValues.building1, floor = CommonValues.floor1, @@ -105,7 +105,7 @@ object RequestValues { baseAddress = BasePostalAddressDto( geographicCoordinates = null, country = CommonValues.country1, - postCode = CommonValues.postCode1, + postalCode = CommonValues.postCode1, city = CommonValues.city1, ) ) @@ -124,7 +124,7 @@ object RequestValues { baseAddress = BasePostalAddressDto( geographicCoordinates = null, country = CommonValues.country2, - postCode = CommonValues.postCode2, + postalCode = CommonValues.postCode2, city = CommonValues.city2, ) ) @@ -143,7 +143,7 @@ object RequestValues { baseAddress = BasePostalAddressDto( geographicCoordinates = null, country = CommonValues.country3, - postCode = CommonValues.postCode3, + postalCode = CommonValues.postCode3, city = CommonValues.city3, ) ) diff --git a/bpdm-pool/src/test/kotlin/org/eclipse/tractusx/bpdm/pool/util/ResponseValues.kt b/bpdm-pool/src/test/kotlin/org/eclipse/tractusx/bpdm/pool/util/ResponseValues.kt index 2b6c8c54d..ba9fb23ce 100644 --- a/bpdm-pool/src/test/kotlin/org/eclipse/tractusx/bpdm/pool/util/ResponseValues.kt +++ b/bpdm-pool/src/test/kotlin/org/eclipse/tractusx/bpdm/pool/util/ResponseValues.kt @@ -94,7 +94,7 @@ object ResponseValues { private val classification5 = ClassificationResponse(CommonValues.classification5, null, classificationType) private val address1 = PhysicalPostalAddressResponse( - companyPostCode = CommonValues.postCode2, + companyPostalCode = CommonValues.postCode2, industrialZone = CommonValues.industrialZone1, building = CommonValues.building1, floor = CommonValues.floor1, @@ -108,7 +108,7 @@ object ResponseValues { baseAddress = BasePostalAddressResponse( geographicCoordinates = null, country = country1, - postCode = CommonValues.postCode1, + postalCode = CommonValues.postCode1, city = CommonValues.city1, ) ) @@ -127,7 +127,7 @@ object ResponseValues { baseAddress = BasePostalAddressResponse( geographicCoordinates = null, country = country2, - postCode = CommonValues.postCode2, + postalCode = CommonValues.postCode2, city = CommonValues.city2, ) ) @@ -146,7 +146,7 @@ object ResponseValues { baseAddress = BasePostalAddressResponse( geographicCoordinates = null, country = country3, - postCode = CommonValues.postCode3, + postalCode = CommonValues.postCode3, city = CommonValues.city3, ) )