Adjusted Kudos page to use new public kudos API

Author: mkimberlin

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

@@ -64,6 +64,7 @@ public interface KudosRepository extends CrudRepository<Kudos, UUID> {
                 FROM kudos
                 WHERE publiclyVisible IS TRUE
                   AND (CAST(:since as date) IS NULL OR dateapproved >= :since) 
+                  AND dateapproved IS NOT NULL
                 ORDER BY datecreated DESC""", nativeQuery = true)
         List<Kudos> getPublic(@Nullable LocalDate since);
 }

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

@@ -728,4 +728,28 @@ void testGetPublicKudosSince() {
         assertEquals(2, body.size());
         assertEquals(List.of(kudos.getId(), kudos3.getId()), List.of(body.get(0).getId(), body.get(1).getId()));
     }
+
+    @Test
+    void testGetsOnlyApprovedPublicKudos() {
+        UUID recipientId = recipientMembers.getFirst().getId();
+        MemberProfile bob = memberWithoutBoss("bob");
+        UUID someOtherRecipientId = bob.getId();
+
+        Kudos kudos = createApprovedKudos(senderId);
+        Kudos kudos2 = createApprovedKudos(senderId);
+        Kudos kudos3 = createApprovedKudos(senderId);
+        Kudos kudos4= createPublicKudos(senderId);
+        createKudosRecipient(kudos.getId(), recipientId);
+        createKudosRecipient(kudos2.getId(), recipientId);
+        createKudosRecipient(kudos3.getId(), someOtherRecipientId);
+        createKudosRecipient(kudos4.getId(), someOtherRecipientId);
+
+        MutableHttpRequest<Object> request = HttpRequest.GET("/public").basicAuth(bob.getWorkEmail(), MEMBER_ROLE);
+        final HttpResponse<List<KudosResponseDTO>> response = client.exchange(request, Argument.listOf(KudosResponseDTO.class));
+
+        assertEquals(OK, response.getStatus());
+        List<KudosResponseDTO> body = response.body();
+        assertEquals(3, body.size());
+        assertEquals(List.of(kudos.getId(), kudos2.getId(), kudos3.getId()), List.of(body.get(0).getId(), body.get(1).getId(), body.get(2).getId()));
+    }
 }

web-ui/src/api/kudos.js

@@ -46,6 +46,17 @@ export const getRecentKudos = async cookie => {
   });
 };
 
+export const getPublicKudos = async (cookie, since) => {
+  return resolve({
+    url: `${kudosUrl}/public`,
+    params: {
+      since
+    },
+    responseType: 'json',
+    headers: { 'X-CSRF-Header': cookie, Accept: 'application/json' }
+  });
+};
+
 export const getAllKudos = async (cookie, isPending) => {
   return resolve({
     url: kudosUrl,

web-ui/src/pages/KudosPage.jsx

@@ -12,7 +12,7 @@ import {
   selectCurrentUser,
   selectHasCreateKudosPermission
 } from '../context/selectors';
-import { getReceivedKudos, getSentKudos, getAllKudos } from '../api/kudos';
+import { getReceivedKudos, getSentKudos, getPublicKudos } from '../api/kudos';
 import { UPDATE_TOAST } from '../context/actions';
 import KudosCard from '../components/kudos_card/KudosCard';
 
@@ -81,8 +81,9 @@ const KudosPage = () => {
   const [publicKudosLoading, setPublicKudosLoading] = useState(true);
   const [dateRange, setDateRange] = useState(DateRange.THREE_MONTHS);
 
-  const isInRange = requestDate => {
+  const getOldestDate = useCallback(() => {
     const oldestDate = new Date();
+    oldestDate.setHours(0, 0, 0, 0);
     switch (dateRange) {
       case DateRange.SIX_MONTHS:
         oldestDate.setMonth(oldestDate.getMonth() - 6);
@@ -96,6 +97,11 @@ const KudosPage = () => {
       default:
         oldestDate.setMonth(oldestDate.getMonth() - 3);
     }
+    return oldestDate;
+  }, [dateRange]);
+
+  const isInRange = requestDate => {
+    const oldestDate = getOldestDate();
 
     if (Array.isArray(requestDate)) {
       requestDate = new Date(requestDate.join('/'));
@@ -124,10 +130,11 @@ const KudosPage = () => {
 
   const loadPublicKudos = useCallback(async () => {
     setPublicKudosLoading(true);
-    const res = await getAllKudos(csrf);
+    const oldestDate = getOldestDate();
+    const res = await getPublicKudos(csrf, oldestDate === true ? undefined : oldestDate?.toISOString().split('T')[0]);
     if (res?.payload?.data && !res.error) {
       setPublicKudosLoading(false);
-      return res.payload.data.filter(k => isInRange(k.dateCreated));
+      return res.payload.data;
     }
   }, [csrf, dispatch, currentUser.id, dateRange]);