Rename email field in FcmUserDto

RADAR-base · Jul 19, 2024 · 20f1cc6 · 20f1cc6
1 parent d0a2a97
commit 20f1cc6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/src/main/java/org/radarbase/appserver/converter/UserConverter.java b/src/main/java/org/radarbase/appserver/converter/UserConverter.java
@@ -22,8 +22,7 @@
 package org.radarbase.appserver.converter;
 
 import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
+
 import org.radarbase.appserver.dto.fcm.FcmUserDto;
 import org.radarbase.appserver.entity.User;
 import org.radarbase.appserver.entity.UserMetrics;
@@ -54,7 +53,7 @@ public User dtoToEntity(FcmUserDto fcmUserDto) {
     return new User()
         .setFcmToken(fcmUserDto.getFcmToken())
         .setSubjectId(fcmUserDto.getSubjectId())
-        .setEmailAddress(fcmUserDto.getEmailAddress())
+        .setEmailAddress(fcmUserDto.getEmail())
         .setUserMetrics(getValidUserMetrics(fcmUserDto))
         .setEnrolmentDate(fcmUserDto.getEnrolmentDate())
         .setTimezone(fcmUserDto.getTimezone())

diff --git a/src/main/java/org/radarbase/appserver/dto/fcm/FcmUserDto.java b/src/main/java/org/radarbase/appserver/dto/fcm/FcmUserDto.java
@@ -60,7 +60,7 @@ public class FcmUserDto implements Serializable {
 
   @Email
   // Email address of the user (optional, needed when sending notifications via email)
-  private String emailAddress;
+  private String email;
 
   // The most recent time when the app was opened
   private Instant lastOpened;
@@ -93,7 +93,7 @@ public FcmUserDto(User user) {
     this.id = user.getId();
     this.projectId = user.getProject().getProjectId();
     this.subjectId = user.getSubjectId();
-    this.emailAddress = user.getEmailAddress();
+    this.email = user.getEmailAddress();
     if (user.getUsermetrics() != null) {
       this.lastOpened = user.getUsermetrics().getLastOpened();
       this.lastDelivered = user.getUsermetrics().getLastDelivered();
@@ -136,8 +136,8 @@ public FcmUserDto setSubjectId(String subjectId) {
     return this;
   }
 
-  public FcmUserDto setEmailAddress(String emailAddress) {
-      this.emailAddress = emailAddress;
+  public FcmUserDto setEmail(String email) {
+      this.email = email;
       return this;
   }
 

diff --git a/src/main/java/org/radarbase/appserver/service/UserService.java b/src/main/java/org/radarbase/appserver/service/UserService.java
@@ -28,7 +28,6 @@
 import org.radarbase.appserver.converter.UserConverter;
 import org.radarbase.appserver.dto.fcm.FcmUserDto;
 import org.radarbase.appserver.dto.fcm.FcmUsers;
-import org.radarbase.appserver.dto.questionnaire.Schedule;
 import org.radarbase.appserver.entity.Project;
 import org.radarbase.appserver.entity.User;
 import org.radarbase.appserver.exception.InvalidUserDetailsException;
@@ -156,7 +155,7 @@ public FcmUserDto saveUserInProject(FcmUserDto userDto) {
               + ". Please use Update endpoint if need to update the user");
     }
 
-    if (sendEmailNotifications && (userDto.getEmailAddress() == null || userDto.getEmailAddress().isEmpty())) {
+    if (sendEmailNotifications && (userDto.getEmail() == null || userDto.getEmail().isEmpty())) {
       log.warn("No email address was provided for new subject '{}'. The option to send notifications via email " +
           "('radar.notification.email.enabled') will not work for this subject. Consider to provide a valid email " +
           "address for subject '{}'.", userDto.getSubjectId());