Fixes

Author: thelenw

server/src/main/java/com/objectcomputing/checkins/services/volunteering/VolunteeringRelationshipRepository.java

@@ -21,7 +21,7 @@ JOIN volunteering_organization AS org USING(organization_id)
               AND rel.member_id = :memberId
               AND (rel.is_active = TRUE OR :includeDeactivated = TRUE)
               AND (org.is_active = TRUE OR :includeDeactivated = TRUE)
-            ORDER BY rel.start_date, org.name""", nativeQuery = true)
+            ORDER BY org.name""", nativeQuery = true)
     List<VolunteeringRelationship> findByMemberIdAndOrganizationId(UUID memberId, UUID organizationId, boolean includeDeactivated);
 
     @Query(value = """
@@ -31,7 +31,7 @@ JOIN volunteering_organization AS org USING(organization_id)
             WHERE rel.member_id = :memberId
               AND (rel.is_active = TRUE OR :includeDeactivated = TRUE)
               AND (org.is_active = TRUE OR :includeDeactivated = TRUE)
-            ORDER BY rel.start_date, org.name""", nativeQuery = true)
+            ORDER BY org.name""", nativeQuery = true)
     List<VolunteeringRelationship> findByMemberId(UUID memberId, boolean includeDeactivated);
 
     @Query(value = """
@@ -41,7 +41,7 @@ JOIN volunteering_organization AS org USING(organization_id)
             WHERE rel.organization_id = :organizationId
               AND (rel.is_active = TRUE OR :includeDeactivated = TRUE)
               AND (org.is_active = TRUE OR :includeDeactivated = TRUE)
-            ORDER BY rel.start_date, org.name""", nativeQuery = true)
+            ORDER BY org.name""", nativeQuery = true)
     List<VolunteeringRelationship> findByOrganizationId(UUID organizationId, boolean includeDeactivated);
 
     @Query(value = """

server/src/test/java/com/objectcomputing/checkins/services/reviews/ReviewAssignmentControllerTest.java

@@ -147,7 +147,7 @@ void testGETFindAssignmentsByPeriodIdDefaultAssignments() {
         final HttpResponse<Set<ReviewAssignment>> response = client.toBlocking().exchange(request, Argument.setOf(ReviewAssignment.class));
 
         assertNotNull(response.body());
-        assertEquals(2, Objects.requireNonNull(response.body()).size());
+        assertEquals(3, Objects.requireNonNull(response.body()).size());
         assertTrue(response.body().stream().anyMatch(ra -> ra.getRevieweeId().equals(memberOne.getId())));
         assertTrue(response.body().stream().anyMatch(ra -> ra.getRevieweeId().equals(memberTwo.getId())));
         assertTrue(response.body().stream().anyMatch(ra -> ra.getRevieweeId().equals(memberThree.getId())));

server/src/test/java/com/objectcomputing/checkins/services/volunteering/VolunteeringRelationshipControllerTest.java

@@ -227,10 +227,11 @@ void canListAndFilterRelationships() {
         VolunteeringRelationship timFoodbankInactive = createVolunteeringRelationship(tim.getId(), foodbank.getId(), LocalDate.now().minusDays(3), null, false);
         VolunteeringRelationship sarahFoodbank = createVolunteeringRelationship(sarah.getId(), foodbank.getId(), LocalDate.now().minusDays(10), LocalDate.now());
 
-        // Can find all relationships in correct order
+        // Can find all relationships in alphabetical order by organization name
         List<VolunteeringRelationship> allRelationships = relationshipClient.list(memberAuth, null, null, null);
         assertEquals(3, allRelationships.size());
-        assertEquals(List.of(sarahFoodbank.getId(), sarahLiftForLife.getId(), timLiftForLife.getId()), allRelationships.stream().map(VolunteeringRelationship::getId).toList());
+        assertEquals(List.of(sarahLiftForLife.getId(), timLiftForLife.getId(), sarahFoodbank.getId()), 
+             allRelationships.stream().map(VolunteeringRelationship::getId).toList());
 
         // Can include inactive relationships
         List<VolunteeringRelationship> allWithInactiveRelationships = relationshipClient.list(memberAuth, null, null, true);