Merge pull request #1752 from kekey1/OCD-4753

OCD-4753: Save activity for created and deleted invitations
chpladmin · Dec 19, 2024 · ba98f88 · ba98f88
2 parents 12f22e5 + 02f4a3e
commit ba98f88
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 5 deletions.
diff --git a/chpl/chpl-api/src/main/java/gov/healthit/chpl/web/controller/UserManagementController.java b/chpl/chpl-api/src/main/java/gov/healthit/chpl/web/controller/UserManagementController.java
@@ -185,6 +185,8 @@ public CognitoUserInvitation inviteUser(@RequestBody CognitoUserInvitation invit
             case CognitoGroups.CHPL_CMS_STAFF:
                 createdInvitiation = cognitoInvitationManager.inviteCmsUser(invitation);
                 break;
+            default:
+                LOGGER.error("Invitation group name not handled: " + invitation.getGroupName());
         }
         return createdInvitiation;
     }

diff --git a/chpl/chpl-service/src/main/java/gov/healthit/chpl/domain/activity/ActivityConcept.java b/chpl/chpl-service/src/main/java/gov/healthit/chpl/domain/activity/ActivityConcept.java
@@ -13,6 +13,7 @@ public enum ActivityConcept implements Serializable {
     CORRECTIVE_ACTION_PLAN,
     DEVELOPER,
     FUNCTIONALITY_TESTED,
+    INVITATION,
     LISTING_UPLOAD,
     PENDING_CERTIFIED_PRODUCT,
     PENDING_SURVEILLANCE,

diff --git a/chpl/chpl-service/src/main/java/gov/healthit/chpl/user/cognito/CognitoUserManager.java b/chpl/chpl-service/src/main/java/gov/healthit/chpl/user/cognito/CognitoUserManager.java
@@ -133,7 +133,7 @@ public UUID createUser(CreateUserFromInvitationRequest userInfo)
             } else {
                 cognitoApiWrapper.addUserToGroup(userInfo.getUser().getEmail(), groupNameForEnvironment);
             }
-            cognitoInvitationManager.deleteToken(UUID.fromString(userInfo.getHash()));
+            cognitoInvitationManager.deleteInvitation(invitation);
             cognitoConfirmEmailEmailer.sendConfirmationEmail(credentials);
 
             User createdUser = cognitoApiWrapper.getUserNoCache(credentials.getCognitoId());
@@ -199,7 +199,7 @@ public User addOrganizationToUser(UUID invitationToken, String accessToken) thro
         }
 
         cognitoApiWrapper.addOrgToUser(originalUser, invitation.getOrganizationId());
-        cognitoInvitationManager.deleteToken(invitationToken);
+        cognitoInvitationManager.deleteInvitation(invitation);
 
         User updatedUser = cognitoApiWrapper.getUserNoCache(originalUser.getCognitoId());
         activityManager.addUserActivity(updatedUser.getCognitoId(),

diff --git a/...ice/src/main/java/gov/healthit/chpl/user/cognito/invitation/CognitoInvitationManager.java b/...ice/src/main/java/gov/healthit/chpl/user/cognito/invitation/CognitoInvitationManager.java
@@ -9,10 +9,13 @@
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
+import gov.healthit.chpl.domain.activity.ActivityConcept;
+import gov.healthit.chpl.exception.ActivityException;
 import gov.healthit.chpl.exception.UserCreationException;
 import gov.healthit.chpl.exception.UserPermissionRetrievalException;
 import gov.healthit.chpl.exception.UserRetrievalException;
 import gov.healthit.chpl.exception.ValidationException;
+import gov.healthit.chpl.manager.ActivityManager;
 import gov.healthit.chpl.service.InvitationEmailer;
 import lombok.extern.log4j.Log4j2;
 
@@ -23,14 +26,17 @@ public class CognitoInvitationManager {
     private CognitoUserInvitationDAO userInvitationDAO;
     private InvitationEmailer invitationEmailer;
     private CognitoInvitationValidator cognitoInvitationValidator;
+    private ActivityManager activityManager;
 
     @Autowired
     public CognitoInvitationManager(CognitoUserInvitationDAO userInvitationDAO, InvitationEmailer invitationEmailer,
-            CognitoInvitationValidator cognitoInvitationValidator) {
+            CognitoInvitationValidator cognitoInvitationValidator,
+            ActivityManager activityManager) {
 
         this.userInvitationDAO = userInvitationDAO;
         this.invitationEmailer = invitationEmailer;
         this.cognitoInvitationValidator = cognitoInvitationValidator;
+        this.activityManager = activityManager;
     }
 
     @Transactional
@@ -111,8 +117,15 @@ public CognitoUserInvitation inviteCmsUser(CognitoUserInvitation invitation)
     }
 
     @Transactional
-    public void deleteToken(UUID invitationToken) {
-        userInvitationDAO.deleteByToken(invitationToken);
+    public void deleteInvitation(CognitoUserInvitation invitation) {
+        userInvitationDAO.deleteByToken(invitation.getInvitationToken());
+
+        try {
+            activityManager.addActivity(ActivityConcept.INVITATION, invitation.getId(),
+                "Deleted invitation for " + invitation.getEmail(), invitation, null);
+        } catch (ActivityException ex) {
+            LOGGER.error("Could not write activity about creating an invitation for " + invitation.getEmail());
+        }
     }
 
     public CognitoUserInvitation getByToken(UUID invitationToken) {
@@ -124,6 +137,13 @@ private CognitoUserInvitation createUserInvitation(CognitoUserInvitation origInv
 
         CognitoUserInvitation invitation = userInvitationDAO.create(origInvitation);
 
+        try {
+            activityManager.addActivity(ActivityConcept.INVITATION, invitation.getId(),
+                "Created invitation for " + invitation.getEmail(), null, invitation);
+        } catch (ActivityException ex) {
+            LOGGER.error("Could not write activity about creating an invitation for " + invitation.getEmail());
+        }
+
         invitationEmailer.emailInvitedUser(invitation);
         return invitation;
     }