Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Changelog
All notable changes to this project will be documented in this file.

## [10.4.0]
### Changed
- Upgrade `customer-profile-api` version from `1.17.1` to `2.6.0`.

## [10.3.0]
### Changed
- Upgrade `investment-service-api` version from `1.4.1` to `1.6.0`; regenerate API clients and fix all compilation errors in production and test sources.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,28 @@
package com.backbase.stream.mapper;

import com.backbase.customerprofile.api.integration.v1.model.PartyUpsertDto;
import com.backbase.customerprofile.api.integration.v1.model.PostalAddressDto;
import com.backbase.stream.legalentity.model.Party;
import com.backbase.stream.legalentity.model.PartyPostalAddress;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.MappingConstants;
import org.mapstruct.ValueMapping;

@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
public interface PartyMapper {

@Mapping(target = "additions", source = "customFields")
PartyUpsertDto partyToPartyUpsertDto(Party party);

@ValueMapping(source = "BUSINESS", target = "BUSINESS")
@ValueMapping(source = "CORRESPONDENCE", target = "CORRESPONDENCE")
@ValueMapping(source = "DELIVERY_TO", target = "DELIVERYTO")
@ValueMapping(source = "MAIL_TO", target = "MAILTO")
@ValueMapping(source = "PO_BOX", target = "PO_BOX")
@ValueMapping(source = "POSTAL", target = "POSTAL")
@ValueMapping(source = "RESIDENTIAL", target = "RESIDENTIAL")
@ValueMapping(source = "STATEMENT", target = "STATEMENT")
PostalAddressDto.TypeEnum mapPostalAddressType(PartyPostalAddress.TypeEnum partyPostalAddress);

}
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,18 @@
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;

import com.backbase.customerprofile.api.integration.v1.model.PostalAddressDto;
import com.backbase.stream.legalentity.model.Party;
import com.backbase.stream.legalentity.model.PartyPostalAddress;
import com.navercorp.fixturemonkey.FixtureMonkey;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.stream.Stream;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;

Expand Down Expand Up @@ -118,6 +124,7 @@ void shouldMapPopulatedCollections() {
var party = fixtureMonkey.giveMeBuilder(Party.class)
.size("phoneNumbers", 2)
.size("postalAddresses", 1)
.set("postalAddresses[0].type", PartyPostalAddress.TypeEnum.BUSINESS)
.size("customFields", 3)
.size("partyPartyRelationships", 1)
.sample();
Expand All @@ -129,6 +136,7 @@ void shouldMapPopulatedCollections() {

assertNotNull(resultDto.getPostalAddresses());
assertEquals(1, resultDto.getPostalAddresses().size());
assertEquals(PostalAddressDto.TypeEnum.BUSINESS, resultDto.getPostalAddresses().getFirst().getType());

assertNotNull(resultDto.getAdditions());
assertEquals(3, resultDto.getAdditions().size());
Expand Down Expand Up @@ -199,4 +207,24 @@ void shouldMapNullCollections() {
assertTrue(resultDto.getElectronicAddresses().getUrls().isEmpty());
}

@ParameterizedTest
@DisplayName("Should map address type correctly")
@MethodSource("addressTypes")
void shouldMapAddressType(PostalAddressDto.TypeEnum expectedType, PartyPostalAddress.TypeEnum actualType) {
var mapped = partyMapper.mapPostalAddressType(actualType);
assertEquals(expectedType, mapped);
}

private static Stream<Arguments> addressTypes() {
return Stream.of(
Arguments.of(PostalAddressDto.TypeEnum.BUSINESS, PartyPostalAddress.TypeEnum.BUSINESS),
Arguments.of(PostalAddressDto.TypeEnum.CORRESPONDENCE, PartyPostalAddress.TypeEnum.CORRESPONDENCE),
Arguments.of(PostalAddressDto.TypeEnum.DELIVERYTO, PartyPostalAddress.TypeEnum.DELIVERY_TO),
Arguments.of(PostalAddressDto.TypeEnum.MAILTO, PartyPostalAddress.TypeEnum.MAIL_TO),
Arguments.of(PostalAddressDto.TypeEnum.PO_BOX, PartyPostalAddress.TypeEnum.PO_BOX),
Arguments.of(PostalAddressDto.TypeEnum.POSTAL, PartyPostalAddress.TypeEnum.POSTAL),
Arguments.of(PostalAddressDto.TypeEnum.RESIDENTIAL, PartyPostalAddress.TypeEnum.RESIDENTIAL),
Arguments.of(PostalAddressDto.TypeEnum.STATEMENT, PartyPostalAddress.TypeEnum.STATEMENT)
);
}
}
2 changes: 1 addition & 1 deletion stream-dbs-clients/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@
<artifactItem>
<groupId>com.backbase.flow.customer-profile.api</groupId>
<artifactId>customer-profile</artifactId>
<version>1.17.1</version>
<version>2.6.0</version>
<classifier>api</classifier>
<type>zip</type>
<outputDirectory>${project.build.directory}/yaml</outputDirectory>
Expand Down
Loading