Feature 2363/email refactor

server/src/main/java/com/objectcomputing/checkins/services/guild/GuildController.java

@@ -62,32 +62,6 @@ public Mono<HttpResponse<GuildResponseDTO>> readGuild(@NotNull UUID id) {
                 .map(HttpResponse::ok);
     }
 
-    /**
-     * Get guild leader based on guild id
-     *
-     * @param id of guild
-     * @return {@link GuildResponseDTO guild leader matching id}
-     */
-
-    @Get("/leaders/{id}")
-    public Mono<HttpResponse<Set<MemberProfile>>> getGuildLeaders(@NotNull UUID id) {
-        return Mono.fromCallable(() -> {
-                    GuildResponseDTO guild = guildService.read(id);
-                    List<GuildMemberResponseDTO> members = guild.getGuildMembers();
-                    Set<MemberProfile> newLeaders = new HashSet<>();
-                    for (GuildMemberResponseDTO member : members) {
-                        if (member.isLead()) {
-                            MemberProfile memberProfile = profileServices.getById(member.getMemberId());
-                            if (memberProfile != null) {
-                                newLeaders.add(memberProfile);
-                            }
-                        }
-                    }
-                    return newLeaders;
-                })
-                .map(HttpResponse::ok);
-    }
-
     /**
      * Find guild(s) given a combination of the following parameters
      *

server/src/main/java/com/objectcomputing/checkins/services/guild/GuildServicesImpl.java

@@ -15,6 +15,8 @@
 import jakarta.inject.Named;
 import jakarta.inject.Singleton;
 import jakarta.validation.constraints.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.net.URL;
 import java.time.LocalDate;
@@ -36,6 +38,7 @@ public class GuildServicesImpl implements GuildServices {
     private final Environment environment;
     private final String webAddress;
     public static final String WEB_ADDRESS = "check-ins.web-address";
+    private static final Logger LOG = LoggerFactory.getLogger(GuildServicesImpl.class);;
 
     public GuildServicesImpl(GuildRepository guildsRepo,
                              GuildMemberRepository guildMemberRepo, GuildMemberHistoryRepository guildMemberHistoryRepository,
@@ -93,7 +96,18 @@ public GuildResponseDTO save(GuildCreateDTO guildDTO) {
             }
         }
 
-        return fromEntity(newGuildEntity, newMembers);
+        GuildResponseDTO guildResponse = fromEntity(newGuildEntity, newMembers);
+
+        Set<String> emailsOfNewGuildLeads = newMembers
+                .stream()
+                .filter(GuildMemberResponseDTO::isLead)
+                .map(lead -> memberProfileServices.getById(lead.getMemberId()).getWorkEmail())
+                .collect(Collectors.toSet());
+        if (!emailsOfNewGuildLeads.isEmpty()) {
+            emailGuildLeaders(emailsOfNewGuildLeads, newGuildEntity);
+        }
+
+        return guildResponse;
     }
 
     public GuildResponseDTO read(@NotNull UUID guildId) {
@@ -135,8 +149,10 @@ public GuildResponseDTO update(GuildUpdateDTO guildDTO) {
                     // track membership changes for email notification
                     List<MemberProfile> addedMembers = new ArrayList<>();
                     List<MemberProfile> removedMembers = new ArrayList<>();
+                    Set<GuildMember> guildLeaders = new HashSet<>(guildMemberServices.findByFields(guildDTO.getId(), null, true));
+
                     // emails of guild leads excluding the one making the change request
-                    Set<String> emailsOfGuildLeads = guildMemberServices.findByFields(guildDTO.getId(), null, true)
+                    Set<String> emailsOfGuildLeadsExcludingChanger = guildLeaders
                             .stream()
                             .filter(lead -> !lead.getMemberId().equals(currentUser.getId()))
                             .map(lead -> memberProfileServices.getById(lead.getMemberId()).getWorkEmail())
@@ -149,7 +165,7 @@ public GuildResponseDTO update(GuildUpdateDTO guildDTO) {
                     guildDTO.getGuildMembers().stream().forEach((updatedMember) -> {
                         Optional<GuildMember> first = existingGuildMembers.stream().filter((existing) -> existing.getMemberId().equals(updatedMember.getMemberId())).findFirst();
                         MemberProfile existingMember = memberProfileServices.getById(updatedMember.getMemberId());
-                        if(!first.isPresent()) {
+                        if(first.isEmpty()) {
                             newMembers.add(fromMemberEntity(guildMemberServices.save(fromMemberDTO(updatedMember, newGuildEntity.getId())), existingMember));
                             addedMembers.add(existingMember);
                         } else {
@@ -166,8 +182,22 @@ public GuildResponseDTO update(GuildUpdateDTO guildDTO) {
                     });
                     updated = fromEntity(newGuildEntity, newMembers);
 
-                    if (!emailsOfGuildLeads.isEmpty() && (!addedMembers.isEmpty() || !removedMembers.isEmpty())){
-                        sendGuildMemberChangeNotification(addedMembers, removedMembers, newGuildEntity.getName(), emailsOfGuildLeads);
+                    if (!emailsOfGuildLeadsExcludingChanger.isEmpty() && (!addedMembers.isEmpty() || !removedMembers.isEmpty())){
+                        sendGuildMemberChangeNotification(addedMembers, removedMembers, newGuildEntity.getName(), emailsOfGuildLeadsExcludingChanger);
+                    }
+
+                    // Calculate the new set of guild leaders
+                    Set<GuildMember> newGuildLeaders = new HashSet<>(guildMemberServices.findByFields(guildDTO.getId(), null, true));
+                    // Determine the newly added guild leaders
+                    newGuildLeaders.removeAll(guildLeaders);
+
+                    if (!newGuildLeaders.isEmpty()) {
+                        Set<String> emailsOfNewGuildLeads = newGuildLeaders.stream()
+                                .map(lead -> memberProfileServices.getById(lead.getMemberId()).getWorkEmail())
+                                .collect(Collectors.toSet());
+                        if (!emailsOfNewGuildLeads.isEmpty()) {
+                            emailGuildLeaders(emailsOfNewGuildLeads, newGuildEntity);
+                        }
                     }
 
                 } else {
@@ -295,4 +325,14 @@ private String constructEmailContent (List<MemberProfile> addedMembers, List<Mem
         emailHtml += "<a href=\"" + webAddress + "/guilds\">Click here</a> to view the changes in the Check-Ins app.";
         return emailHtml;
     }
+
+   public void emailGuildLeaders(Set<String> guildLeadersEmails, Guild guild) {
+        if (guild == null || guild.getName() == null || guild.getName().isEmpty()) {
+            LOG.warn("Guild name is missing or invalid");
+            return;
+        }
+       String subject = "You have been assigned as a guild leader of " + guild.getName();
+       String body = "Congratulations, you have been assigned as a guild leader of " + guild.getName();
+       emailSender.sendEmail(null, null, subject, body, guildLeadersEmails.toArray(new String[0]));
+    }
 }

server/src/main/java/com/objectcomputing/checkins/services/memberprofile/MemberProfileServicesImpl.java

@@ -4,6 +4,8 @@
 import com.objectcomputing.checkins.exceptions.BadArgException;
 import com.objectcomputing.checkins.exceptions.NotFoundException;
 import com.objectcomputing.checkins.exceptions.PermissionException;
+import com.objectcomputing.checkins.notifications.email.EmailSender;
+import com.objectcomputing.checkins.notifications.email.MailJetConfig;
 import com.objectcomputing.checkins.services.checkins.CheckInServices;
 import com.objectcomputing.checkins.services.member_skill.MemberSkillServices;
 import com.objectcomputing.checkins.services.memberprofile.currentuser.CurrentUserServices;
@@ -13,8 +15,11 @@
 import io.micronaut.cache.annotation.CacheConfig;
 import io.micronaut.cache.annotation.Cacheable;
 import io.micronaut.core.annotation.Nullable;
+import jakarta.inject.Named;
 import jakarta.inject.Singleton;
 import jakarta.validation.constraints.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.*;
 
@@ -23,26 +28,30 @@
 @Singleton
 @CacheConfig("member-cache")
 public class MemberProfileServicesImpl implements MemberProfileServices {
+    private static final Logger LOG = LoggerFactory.getLogger(MemberProfileServicesImpl.class);
 
     private final MemberProfileRepository memberProfileRepository;
     private final CurrentUserServices currentUserServices;
     private final RoleServices roleServices;
     private final CheckInServices checkInServices;
     private final MemberSkillServices memberSkillServices;
     private final TeamMemberServices teamMemberServices;
+    private final EmailSender emailSender;
 
     public MemberProfileServicesImpl(MemberProfileRepository memberProfileRepository,
                                      CurrentUserServices currentUserServices,
                                      RoleServices roleServices,
                                      CheckInServices checkInServices,
                                      MemberSkillServices memberSkillServices,
-                                     TeamMemberServices teamMemberServices) {
+                                     TeamMemberServices teamMemberServices,
+                                     @Named(MailJetConfig.HTML_FORMAT) EmailSender emailSender) {
         this.memberProfileRepository = memberProfileRepository;
         this.currentUserServices = currentUserServices;
         this.roleServices = roleServices;
         this.checkInServices = checkInServices;
         this.memberSkillServices = memberSkillServices;
         this.teamMemberServices = teamMemberServices;
+        this.emailSender = emailSender;
     }
 
     @Override
@@ -86,10 +95,60 @@ public MemberProfile saveProfile(MemberProfile memberProfile) {
         }
 
         if (memberProfile.getId() == null) {
-            return memberProfileRepository.save(memberProfile);
+            MemberProfile createdMemberProfile = memberProfileRepository.save(memberProfile);
+            emailAssignment(createdMemberProfile, true); // PDL
+            emailAssignment(createdMemberProfile, false); // Supervisor
+            return createdMemberProfile;
         }
 
-        return memberProfileRepository.update(memberProfile);
+        Optional<MemberProfile> existingProfileOpt = memberProfileRepository.findById(memberProfile.getId());
+        MemberProfile updatedMemberProfile = memberProfileRepository.update(memberProfile);
+        if (existingProfileOpt.isEmpty()) {
+            LOG.error(String.format("MemberProfile with id %s not found", memberProfile.getId()));
+        } else {
+            MemberProfile existingProfile = existingProfileOpt.get();
+
+            boolean pdlChanged = !Objects.equals(existingProfile.getPdlId(), memberProfile.getPdlId());
+            boolean supervisorChanged = !Objects.equals(existingProfile.getSupervisorid(), memberProfile.getSupervisorid());
+
+            if (pdlChanged) {
+                emailAssignment(updatedMemberProfile, true); // PDL
+            }
+            if (supervisorChanged) {
+                emailAssignment(updatedMemberProfile, false); // Supervisor
+            }
+        }
+
+        return updatedMemberProfile;
+    }
+
+    public void emailAssignment(MemberProfile member, boolean isPDL) {
+        UUID roleId = isPDL ? member.getPdlId() : member.getSupervisorid();
+        String role = isPDL ? "PDL" : "supervisor";
+        if (roleId != null) {
+            if (member.getLastName() != null && member.getFirstName() != null && member.getWorkEmail() != null) {
+                Optional<MemberProfile> roleProfileOptional = memberProfileRepository.findById(roleId);
+
+                if (roleProfileOptional.isPresent()) {
+                    MemberProfile roleProfile = roleProfileOptional.get();
+
+                    if (roleProfile.getWorkEmail() != null) {
+                        String subject = "You have been assigned as the " + role + " of " + member.getFirstName() + " " + member.getLastName();
+                        String body = member.getFirstName() + " " + member.getLastName() + " will now report to you as their " + role + ". Please engage with them: " + member.getWorkEmail();
+
+                        emailSender.sendEmail(null, null, subject, body, roleProfile.getWorkEmail());
+                    } else {
+                        LOG.warn("Unable to send email regarding {} {}'s {} update as the {} was unable to be pulled up correctly",
+                                member.getFirstName(), member.getLastName(), role, role);
+                    }
+                } else {
+                    LOG.warn("Unable to send email regarding {} {}'s {} update as the {} was not found",
+                            member.getFirstName(), member.getLastName(), role, role);
+                }
+            } else {
+                LOG.warn("Unable to send email regarding as member was not valid and missing required fields: {}", member);
+            }
+        }
     }
 
     @Override