Undo date approved changes for private kudos and fixed the method that retrieves kudos for receiver. Updated UI to not show pending for private kudos.

Author: ocielliottc

server/src/main/java/com/objectcomputing/checkins/services/kudos/KudosServicesImpl.java

@@ -121,12 +121,6 @@ public Kudos save(KudosCreateDTO kudosDTO) {
             kudosRecipientServices.save(kudosRecipient);
         }
 
-        if (!savedKudos.getPubliclyVisible()) {
-            // Private kudos do not need to be approved by another party.
-            savedKudos.setDateApproved(LocalDate.now());
-            savedKudos = kudosRepository.update(savedKudos);
-        }
-
         sendNotification(savedKudos, NotificationType.creation);
         return savedKudos;
     }
@@ -176,16 +170,14 @@ public Kudos update(KudosUpdateDTO kudos) {
         boolean existingPublic = existingKudos.getPubliclyVisible();
         boolean proposedPublic = kudos.getPubliclyVisible();
         if (existingPublic && !proposedPublic) {
-            // TODO: Somehow find and remove the Slack Kudos that the Check-Ins
+            // TODO: Search for and remove the Slack Kudos that the Check-Ins
             //       Integration posted.
-            existingKudos.setDateApproved(LocalDate.now());
-        } else if (!existingPublic && proposedPublic) {
-            // Clear the date approved when going from private to public.
             existingKudos.setDateApproved(null);
-        }
-        if (proposedPublic &&
-            !originalMessage.equals(existingKudos.getMessage())) {
-            // If public and the text changed, require approval again.
+        } else if ((!existingPublic && proposedPublic) ||
+                   (proposedPublic &&
+                    !originalMessage.equals(existingKudos.getMessage()))) {
+            // Clear the date approved when going from private to public or
+            // if public and the text changed, require approval again.
             existingKudos.setDateApproved(null);
         }
 
@@ -336,7 +328,8 @@ private List<KudosResponseDTO> findAllToMember(UUID memberId) {
             Kudos relatedKudos = kudosRepository.findById(kudosId).orElseThrow(() ->
                     new NotFoundException(KUDOS_DOES_NOT_EXIST_MSG.formatted(kudosId)));
 
-            if (relatedKudos.getDateApproved() != null) {
+            if (!relatedKudos.getPubliclyVisible() ||
+                relatedKudos.getDateApproved() != null) {
                 kudosList.add(constructKudosResponseDTO(relatedKudos));
             }
         });

server/src/test/java/com/objectcomputing/checkins/services/kudos/KudosControllerTest.java

@@ -138,9 +138,7 @@ Kudos testCreateKudos(boolean supplyTeam, boolean publiclyVisible) {
         assertEquals(senderId, kudos.getSenderId());
         assertEquals(supplyTeam ? teamId : null, kudos.getTeamId());
         assertEquals(LocalDate.now(), kudos.getDateCreated());
-        if (publiclyVisible) {
-            assertNull(kudos.getDateApproved());
-        }
+        assertNull(kudos.getDateApproved());
 
         List<KudosRecipient> kudosRecipients = findKudosRecipientByKudosId(kudos.getId());
         assertEquals(1, kudosRecipients.size());
@@ -611,14 +609,7 @@ void testUpdateKudos(boolean supplyTeam, boolean publiclyVisible) {
         final Kudos updated = response.body();
         assertEquals(message, updated.getMessage());
         assertEquals(visible, updated.getPubliclyVisible());
-
-        if (visible) {
-            // Public kudos should not be approved.
-            assertNull(updated.getDateApproved());
-        } else {
-            // Private kudos should be approved.
-            assertNotNull(updated.getDateApproved());
-        }
+        assertNull(updated.getDateApproved());
 
         final List<KudosRecipient> kudosRecipients =
                     findKudosRecipientByKudosId(updated.getId());

web-ui/src/components/kudos_card/KudosCard.jsx

@@ -194,69 +194,71 @@ const KudosCard = ({ kudos, includeActions, includeEdit, onKudosAction }) => {
     const actions = [];
     if (includeActions) {
       actions.push(
-          <Tooltip key="approve" arrow title="Approve">
-            <Button
-              variant="outlined"
-              color="success"
-              size="small"
-              onClick={approveKudosCallback}
-            >
-              <CheckIcon />
-            </Button>
-          </Tooltip>
+        <Tooltip key="approve" arrow title="Approve">
+          <Button
+            variant="outlined"
+            color="success"
+            size="small"
+            onClick={approveKudosCallback}
+          >
+            <CheckIcon />
+          </Button>
+        </Tooltip>
       );
     } else if (dateApproved) {
       info.push(
-          <Typography key="received" color="green" variant="body2">
-            Received{" "}
-            {dateApproved ? dateUtils.format(dateApproved, "MM/dd/yyyy") : ""}
-          </Typography>
+        <Typography key="received" color="green" variant="body2">
+          Received{" "}
+          {dateApproved ? dateUtils.format(dateApproved, "MM/dd/yyyy") : ""}
+        </Typography>
       );
     } else {
       const dateCreated = new Date(kudos.dateCreated.join("/"));
-      info.push(
+      if (kudos.publiclyVisible) {
+        info.push(
           <Typography key="pending" color="orange" variant="body2">
             Pending
           </Typography>
-      );
+        );
+      }
       info.push(
-          <Typography key="created" variant="body2" color="gray" fontSize="10px">
-            Created {dateUtils.format(dateCreated, "MM/dd/yyyy")}
-          </Typography>
+        <Typography key="created" variant="body2" color="gray" fontSize="10px">
+          Created {dateUtils.format(dateCreated, "MM/dd/yyyy")}
+        </Typography>
       );
     }
     if (includeEdit) {
       actions.push(
-          <Tooltip key="edit" arrow title="Edit">
-            <Button
-              variant="outlined"
-              size="small"
-              onClick={(event) => {
-                event.stopPropagation();
-                reloadKudosValues();
-                setEditDialogOpen(true);
-              }}
-            >
-              <EditIcon />
-            </Button>
-          </Tooltip>
+        <Tooltip key="edit" arrow title="Edit">
+          <Button
+            variant="outlined"
+            size="small"
+            onClick={(event) => {
+              event.stopPropagation();
+              reloadKudosValues();
+              setEditDialogOpen(true);
+            }}
+          >
+            <EditIcon />
+          </Button>
+        </Tooltip>
       );
     }
     if (includeActions || includeEdit) {
       actions.push(
-          <Tooltip key="delete" arrow title="Delete">
-            <Button
-              variant="outlined"
-              color="error"
-              size="small"
-              onClick={(event) => {
-                event.stopPropagation();
-                setDeleteDialogOpen(true);
-              }}
-            >
-              <CloseIcon />
-            </Button>
-          </Tooltip>
+        <Tooltip key="delete" arrow title="Delete">
+          <Button
+            variant="outlined"
+            color="error"
+            size="small"
+            onClick={(event) => {
+              event.stopPropagation();
+              setDeleteDialogOpen(true);
+            }}
+          >
+            <CloseIcon />
+          </Button>
+        </Tooltip>
       );
     }
     return <>