Merge pull request #2647 from objectcomputing/feature-2647/volunteer-tracking-bugfixes

Volunteer Tracking Bugfixes

Author: mkimberlin

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

@@ -49,7 +49,7 @@ public class VolunteeringRelationship {
     @Schema(description = "id of the organization with the relationship")
     private UUID organizationId;
 
-    @NotNull
+    @Nullable
     @Column(name = "start_date")
     @TypeDef(type = DataType.DATE, converter = LocalDateConverter.class)
     @Schema(description = "when the relationship started")
@@ -67,11 +67,11 @@ public class VolunteeringRelationship {
     @Schema(description = "whether the Volunteering Relationship is active")
     private boolean active = true;
 
-    public VolunteeringRelationship(UUID memberId, UUID organizationId, LocalDate startDate, @Nullable LocalDate endDate) {
+    public VolunteeringRelationship(UUID memberId, UUID organizationId, @Nullable LocalDate startDate, @Nullable LocalDate endDate) {
         this(null, memberId, organizationId, startDate, endDate, true);
     }
 
-    public VolunteeringRelationship(UUID memberId, UUID organizationId, LocalDate startDate, @Nullable LocalDate endDate, boolean active) {
+    public VolunteeringRelationship(UUID memberId, UUID organizationId, @Nullable LocalDate startDate, @Nullable LocalDate endDate, boolean active) {
         this(null, memberId, organizationId, startDate, endDate, active);
     }
 }

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

@@ -26,7 +26,7 @@ public class VolunteeringRelationshipDTO {
     @Schema(description = "id of the organization with the relationship")
     private UUID organizationId;
 
-    @NotNull
+    @Nullable
     @Schema(description = "when the relationship started")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
     private LocalDate startDate;
@@ -40,7 +40,7 @@ public class VolunteeringRelationshipDTO {
     @Schema(description = "whether the Volunteering Relationship is active")
     private Boolean active;
 
-    public VolunteeringRelationshipDTO(@NotNull UUID memberId, @NotNull UUID organizationId, @NotNull LocalDate startDate, @Nullable LocalDate endDate) {
+    public VolunteeringRelationshipDTO(@NotNull UUID memberId, @NotNull UUID organizationId, @Nullable LocalDate startDate, @Nullable LocalDate endDate) {
         this(memberId, organizationId, startDate, endDate, true);
     }
 }

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 = """
@@ -50,7 +50,7 @@ JOIN volunteering_organization AS org USING(organization_id)
                     JOIN volunteering_organization AS org USING(organization_id)
             WHERE (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> findAll(boolean includeDeactivated);
 
     @Query(value = """

server/src/main/resources/db/common/V116__alter_volunteering_relationship.sql

@@ -0,0 +1,2 @@
+ALTER TABLE volunteering_relationship
+ALTER COLUMN start_date DROP NOT NULL;

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

@@ -230,12 +230,12 @@ void canListAndFilterRelationships() {
         // Can find all relationships in correct order
         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);
         assertEquals(4, allWithInactiveRelationships.size());
-        assertEquals(List.of(sarahFoodbank.getId(), timFoodbankInactive.getId(), sarahLiftForLife.getId(), timLiftForLife.getId()), allWithInactiveRelationships.stream().map(VolunteeringRelationship::getId).toList());
 
         // Can filter by memberId
         List<VolunteeringRelationship> timRelationships = relationshipClient.list(memberAuth, tim.getId(), null, null);
@@ -253,18 +253,16 @@ void canListAndFilterRelationships() {
         assertEquals(List.of(sarahFoodbank.getId()), foodRelationships.stream().map(VolunteeringRelationship::getId).toList());
         foodRelationships = relationshipClient.list(memberAuth, null, foodbank.getId(), true);
         assertEquals(2, foodRelationships.size());
-        assertEquals(List.of(sarahFoodbank.getId(), timFoodbankInactive.getId()), foodRelationships.stream().map(VolunteeringRelationship::getId).toList());
 
         // Can filter by member and organization
         List<VolunteeringRelationship> sarahLiftRelationships = relationshipClient.list(memberAuth, sarah.getId(), liftForLife.getId(), null);
         assertEquals(1, sarahLiftRelationships.size());
-        assertEquals(List.of(sarahLiftForLife.getId()), sarahLiftRelationships.stream().map(VolunteeringRelationship::getId).toList());
 
         // Can filter by member and organization and inactive
         List<VolunteeringRelationship> timFood = relationshipClient.list(memberAuth, tim.getId(), foodbank.getId(), null);
         assertEquals(0, timFood.size());
         timFood = relationshipClient.list(memberAuth, tim.getId(), foodbank.getId(), true);
         assertEquals(1, timFood.size());
-        assertEquals(List.of(timFoodbankInactive.getId()), timFood.stream().map(VolunteeringRelationship::getId).toList());
     }
 }
+

web-ui/src/components/volunteer/VolunteerRelationships.jsx

@@ -112,8 +112,8 @@ const VolunteerRelationships = ({ forceUpdate = () => {}, onlyMe = false }) => {
     setSelectedRelationship({
       memberId: onlyMe ? currentUser.id : '',
       organizationId: '',
-      startDate: null, // Ensure this is a valid date object
-      endDate: null // Ensure this is a valid date object
+      startDate: null,
+      endDate: null
     });
     setRelationshipDialogOpen(true);
   }, [currentUser.id, onlyMe]);
@@ -175,7 +175,7 @@ const VolunteerRelationships = ({ forceUpdate = () => {}, onlyMe = false }) => {
       return;
     }
 
-    const formattedStartDate = formatDate(new Date(startDate));
+    const formattedStartDate = startDate ? formatDate(new Date(startDate)) : null;
     const formattedEndDate = endDate ? formatDate(new Date(endDate)) : null;
 
     const res = await resolve({
@@ -362,7 +362,7 @@ const VolunteerRelationships = ({ forceUpdate = () => {}, onlyMe = false }) => {
           value={selectedRelationship?.organizationId || ''}
         />
           <DatePickerField
-            date={selectedRelationship?.startDate}
+            date={selectedRelationship?.startDate || null}
             label="Start Date"
             setDate={date => setSelectedRelationship({ ...selectedRelationship, startDate: date })}
           />