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

[SELC-6087] Fix: findMailUuidAndUpdateUserRegistry method to retrieve workContact id #235

Merged
merged 6 commits into from
Nov 29, 2024
Merged

[SELC-6087] Fix: findMailUuidAndUpdateUserRegistry method to retrieve workContact id #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ba512f4
[SELC-6087] Updated api updateUserRegistryAndSendNotification to allo…
flaminiaScarciofolo Nov 27, 2024
4fe637b
[SELC-6087] Restore CertificationEnum in UserDataResponse, refactor m…
flaminiaScarciofolo Nov 28, 2024
29ab937
Merge branch 'main' into feature/SELC-6087
flaminiaScarciofolo Nov 28, 2024
02e128d
[SELC-6087] merge main in feature branch
flaminiaScarciofolo Nov 28, 2024
ad4e2db
Merge branch 'main' into feature/SELC-6087
flaminiaScarciofolo Nov 29, 2024
993de8e
[SELC-6087] fix findMailUuidAndUpdateUserRegistry method to retrieve …
flaminiaScarciofolo Nov 29, 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
2 changes: 1 addition & 1 deletion apps/user-ms/src/main/docs/openapi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1632,7 +1632,7 @@
"type" : "string"
},
"mobilePhone" : {
"pattern" : "^\\+?[0-9]{9,15}$",
"pattern" : "^\\+?[0-9]{7,15}$",
"type" : "string"
}
}
Expand Down
2 changes: 1 addition & 1 deletion apps/user-ms/src/main/docs/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1191,7 +1191,7 @@ components:
email:
type: string
mobilePhone:
pattern: "^\\+?[0-9]{9,15}$"
pattern: "^\\+?[0-9]{7,15}$"
type: string
User:
required:
Expand Down
10 changes: 9 additions & 1 deletion apps/user-ms/src/main/java/it/pagopa/selfcare/user/mapper/UserMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,15 @@
import org.mapstruct.Mapping;
import org.mapstruct.Named;
import org.mapstruct.factory.Mappers;
import org.openapi.quarkus.user_registry_json.model.*;
import org.openapi.quarkus.user_registry_json.model.BirthDateCertifiableSchema;
import org.openapi.quarkus.user_registry_json.model.EmailCertifiableSchema;
import org.openapi.quarkus.user_registry_json.model.FamilyNameCertifiableSchema;
import org.openapi.quarkus.user_registry_json.model.MobilePhoneCertifiableSchema;
import org.openapi.quarkus.user_registry_json.model.MutableUserFieldsDto;
import org.openapi.quarkus.user_registry_json.model.NameCertifiableSchema;
import org.openapi.quarkus.user_registry_json.model.SaveUserDto;
import org.openapi.quarkus.user_registry_json.model.UserResource;
import org.openapi.quarkus.user_registry_json.model.WorkContactResource;

import java.time.LocalDate;
import java.util.*;
Expand Down
2 changes: 1 addition & 1 deletion apps/user-ms/src/main/java/it/pagopa/selfcare/user/model/UpdateUserRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ public class UpdateUserRequest {
private String name;
private String familyName;
private String email;
@Pattern(regexp = "^\\+?[0-9]{9,15}$", message = "Il numero di telefono non è valido")
@Pattern(regexp = "^\\+?[0-9]{7,15}$", message = "Il numero di telefono non è valido")
private String mobilePhone;
}
7 changes: 4 additions & 3 deletions apps/user-ms/src/main/java/it/pagopa/selfcare/user/service/UserRegistryServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,12 @@ private Uni<String> findMailUuidAndUpdateUserRegistry(UserResource userResource,
.filter(stringWorkContactResourceEntry -> existsWorkContactResourceForPhoneAndMail(stringWorkContactResourceEntry, emailToCompare, mobilePhoneToCompare))
.findFirst()
.map(Map.Entry::getKey))
.orElse(null);
.orElse(idContacts);


return updateUsingPATCH(userResource.getId().toString(),
userMapper.toMutableUserFieldsDto(userDto, userResource, idContacts))
.replaceWith(StringUtils.isBlank(existedUserMailUuid) ? idContacts : existedUserMailUuid);
userMapper.toMutableUserFieldsDto(userDto, userResource, existedUserMailUuid))
.replaceWith(existedUserMailUuid);
}

private static boolean existsWorkContactResourceForPhoneAndMail(Map.Entry<String, WorkContactResource> stringWorkContactResourceEntry, String emailToCompare, String mobilePhoneToCompare) {
Expand Down
Loading