Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SELC-6064] feat: added origin IPA for pa/import api #499

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

[SELC-6064] feat: added origin IPA for pa/import api #499

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ee83c8c
[SELC-6064] feat: added origin IPA for import/pa api
empassaro Nov 25, 2024
9f10fde
[SELC-6064] fix: junit
empassaro Nov 25, 2024
8afc699
[SELC-6064] fix: sonar smells
empassaro Nov 26, 2024
f29805c
[SELC-6064] fix: added origin mapping via annotation
empassaro Nov 26, 2024
16633f5
[SELC-6064] fix: coverage junit
empassaro Nov 26, 2024
dbb61b0
[SELC-6064] fix: mapping origin ipa if absent
empassaro Nov 27, 2024
7aa775c
[SELC-6064] fix: new mapping implementation
empassaro Nov 27, 2024
9b98a64
[SELC-6064] fix: sonar coverage
empassaro Nov 27, 2024
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
13 changes: 9 additions & 4 deletions src/main/java/it/pagopa/selfcare/external_api/mapper/OnboardingMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;

@Mapper(componentModel = "spring")
public interface OnboardingMapper {
Expand Down Expand Up @@ -53,7 +52,13 @@ public interface OnboardingMapper {
target = "contractImported.activatedAt",
source = "contractImported.activatedAt",
qualifiedByName = "convertDate")
OnboardingImportRequest toOnboardingImportRequest(OnboardingData onboardingData);
OnboardingImportRequest mapToOnboardingImportRequest(OnboardingData onboardingData);

default OnboardingImportRequest toOnboardingImportRequest(OnboardingData onboardingData) {
OnboardingImportRequest onboardingImportRequest = mapToOnboardingImportRequest(onboardingData);
onboardingImportRequest.getInstitution().setOrigin(Origin.IPA);
andrea-putzu marked this conversation as resolved.
Show resolved Hide resolved
return onboardingImportRequest;
}

GeographicTaxonomyDto toGeographicTaxonomyDto(GeographicTaxonomy geographicTaxonomy);

Expand Down Expand Up @@ -91,7 +96,7 @@ default InstitutionBaseRequest toInstitutionBase(OnboardingData onboardingData)
geotaxes ->
geotaxes.stream()
.map(this::toGeographicTaxonomyDto)
.collect(Collectors.toList()))
.toList())
.orElse(null));
institution.rea(onboardingData.getInstitutionUpdate().getRea());
institution.shareCapital(onboardingData.getInstitutionUpdate().getShareCapital());
Expand Down Expand Up @@ -133,7 +138,7 @@ default InstitutionPspRequest toInstitutionPsp(OnboardingData onboardingData) {
geotaxes ->
geotaxes.stream()
.map(this::toGeographicTaxonomyDto)
.collect(Collectors.toList()))
.toList())
.orElse(null));
institutionPsp.rea(onboardingData.getInstitutionUpdate().getRea());
institutionPsp.shareCapital(onboardingData.getInstitutionUpdate().getShareCapital());
Expand Down
3 changes: 2 additions & 1 deletion src/test/java/it/pagopa/selfcare/external_api/service/OnboardingServiceImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ public void setUp() {
void oldContractOnboardingTest() {
OnboardingData onboardingData = new OnboardingData();
onboardingData.setInstitutionExternalId("externalId");
onboardingData.setInstitutionUpdate(new InstitutionUpdate());
Assertions.assertDoesNotThrow(() -> onboardingService.oldContractOnboardingV2(onboardingData));
}

Expand Down Expand Up @@ -147,6 +148,6 @@ void onboardingUsers_happyPath() throws Exception {
List<RelationshipInfo> result =
onboardingService.onboardingUsers(onboardingUsersRequest, "userName", "surname");

assertEquals(result.size(), 2);
assertEquals(2, result.size());
}
}
Loading