From adf3ec19052bbbdb42a5d9e320feb4e35b73ac95 Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Tue, 21 Nov 2023 15:59:01 +0100 Subject: [PATCH] OZG-4606 add email to grpc profile data --- .../src/main/proto/userprofile.model.proto | 1 + .../ozgcloud/user/userprofile/UserProfileMapper.java | 12 +++++++++++- .../user/userprofile/UserProfileMapperTest.java | 7 +++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/user-manager-interface/src/main/proto/userprofile.model.proto b/user-manager-interface/src/main/proto/userprofile.model.proto index f4e97598..8cadd28e 100644 --- a/user-manager-interface/src/main/proto/userprofile.model.proto +++ b/user-manager-interface/src/main/proto/userprofile.model.proto @@ -33,6 +33,7 @@ message GrpcUserProfile { string id = 1; string firstName = 2; string lastName = 3; + string email = 4; } diff --git a/user-manager-server/src/main/java/de/ozgcloud/user/userprofile/UserProfileMapper.java b/user-manager-server/src/main/java/de/ozgcloud/user/userprofile/UserProfileMapper.java index 8f16ad1b..c29c5e8d 100644 --- a/user-manager-server/src/main/java/de/ozgcloud/user/userprofile/UserProfileMapper.java +++ b/user-manager-server/src/main/java/de/ozgcloud/user/userprofile/UserProfileMapper.java @@ -25,16 +25,26 @@ package de.ozgcloud.user.userprofile; import org.bson.types.ObjectId; import org.mapstruct.Mapper; +import org.mapstruct.Mapping; import org.mapstruct.NullValueCheckStrategy; import org.mapstruct.ReportingPolicy; import de.ozgcloud.user.User; @Mapper(unmappedTargetPolicy = ReportingPolicy.WARN, // - unmappedSourcePolicy = ReportingPolicy.WARN, // nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS) interface UserProfileMapper { + @Mapping(target = "emailBytes", ignore = true) + @Mapping(target = "mergeFrom", ignore = true) + @Mapping(target = "clearField", ignore = true) + @Mapping(target = "clearOneof", ignore = true) + @Mapping(target = "mergeUnknownFields", ignore = true) + @Mapping(target = "firstNameBytes", ignore = true) + @Mapping(target = "idBytes", ignore = true) + @Mapping(target = "lastNameBytes", ignore = true) + @Mapping(target = "unknownFields", ignore = true) + @Mapping(target = "allFields", ignore = true) GrpcUserProfile mapTo(User userProfile); default String toString(ObjectId objectId) { diff --git a/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/UserProfileMapperTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/UserProfileMapperTest.java index c9002fa3..fa280033 100644 --- a/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/UserProfileMapperTest.java +++ b/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/UserProfileMapperTest.java @@ -56,6 +56,13 @@ class UserProfileMapperTest { assertThat(userProfile.getLastName()).isEqualTo(UserTestFactory.LAST_NAME); } + @Test + void shouldMapEMail() { + var userProfile = map(); + + assertThat(userProfile.getEmail()).isEqualTo(UserTestFactory.EMAIL); + } + @Test void shouldMapId() { var userProfile = map(); -- GitLab