Merge branch 'develop' into feature-2814/slack-pulse-survey-integration

Author: ocielliottc

.github/workflows/jekyll.yml

@@ -34,7 +34,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Setup Ruby
-        uses: ruby/setup-ruby@8575951200e472d5f2d95c625da0c7bec8217c42 # v1.161.0
+        uses: ruby/setup-ruby@v1
         with:
           working-directory: docs
           ruby-version: '3.3' # Not needed with a .ruby-version file

server/build.gradle

@@ -7,7 +7,7 @@ plugins {
     id "jacoco"
 }
 
-version "0.8.11"
+version "0.8.12"
 group "com.objectcomputing.checkins"
 
 repositories {

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

@@ -54,16 +54,16 @@ public class VolunteeringEvent {
 
     @Column(name = "hours")
     @Schema(description = "number of hours spent volunteering")
-    @TypeDef(type = DataType.INTEGER)
-    private int hours;
+    @TypeDef(type = DataType.DOUBLE)
+    private double hours;
 
     @Nullable
     @Column(name = "notes")
     @TypeDef(type = DataType.STRING)
     @Schema(description = "notes about the volunteering event")
     private String notes;
 
-    public VolunteeringEvent(UUID relationshipId, LocalDate eventDate, int hours, String notes) {
+    public VolunteeringEvent(UUID relationshipId, LocalDate eventDate, double hours, String notes) {
         this(null, relationshipId, eventDate, hours, notes);
     }
 
@@ -79,4 +79,4 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(id, relationshipId, eventDate, hours, notes);
     }
-}
+}

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

@@ -29,9 +29,9 @@ public class VolunteeringEventDTO {
 
     @NotNull
     @Schema(description = "number of hours spent volunteering")
-    private Integer hours;
+    private Double hours;
 
     @Nullable
     @Schema(description = "notes about the volunteering event")
     private String notes;
-}
+}

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

@@ -0,0 +1,2 @@
+ALTER TABLE volunteering_event
+ALTER COLUMN hours TYPE float;

server/src/test/java/com/objectcomputing/checkins/services/fixture/VolunteeringFixture.java

@@ -41,7 +41,7 @@ default VolunteeringRelationship createVolunteeringRelationship(UUID memberId, U
         return getVolunteeringRelationshipRepository().save(new VolunteeringRelationship(memberId, organizationId, startDate, endDate, active));
     }
 
-    default VolunteeringEvent createVolunteeringEvent(UUID relationshipId, LocalDate now, int i, String notes) {
+    default VolunteeringEvent createVolunteeringEvent(UUID relationshipId, LocalDate now, double i, String notes) {
         return getVolunteeringEventRepository().save(new VolunteeringEvent(relationshipId, now, i, notes));
     }
 }

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

@@ -1,6 +1,6 @@
 {
   "name": "web-ui",
-  "version": "0.8.11",
+  "version": "0.8.12",
   "private": true,
   "type": "module",
   "dependencies": {