Merge pull request #2671 from objectcomputing/bugfix-2664/non-required-website

Make the website optional for volunteer organizations.

Author: mkimberlin

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

@@ -44,7 +44,6 @@ public class VolunteeringOrganization {
     private String description;
 
     @Column(name = "website")
-    @NotBlank
     @Schema(description = "website for the volunteering organization")
     private String website;
 
@@ -59,4 +58,4 @@ public VolunteeringOrganization(String name, String description, String website)
     public VolunteeringOrganization(String name, String description, String website, boolean active) {
         this(null, name, description, website, active);
     }
-}
+}

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

@@ -21,14 +21,13 @@ public class VolunteeringOrganizationDTO {
     @Schema(description = "description of the volunteering organization")
     private String description;
 
-    @NotBlank
     @Schema(description = "website for the volunteering organization")
     private String website;
 
     @Schema(description = "whether the Volunteering Organization is active")
     private Boolean active;
 
-    public VolunteeringOrganizationDTO(@NotBlank String name, @NotBlank String description, @NotBlank String website) {
+    public VolunteeringOrganizationDTO(@NotBlank String name, @NotBlank String description, String website) {
         this(name, description, website, true);
     }
 }

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

@@ -0,0 +1 @@
+ALTER TABLE volunteering_organization ALTER COLUMN website DROP NOT NULL

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

@@ -148,16 +148,4 @@ void testCreateOrganizationWithoutDescription() {
         String body = e.getResponse().getBody(String.class).get();
         assertTrue(body.contains("organization.description: must not be blank"), body + " should contain 'organization.description: must not be blank'");
     }
-
-    @Test
-    void testCreateOrganizationWithoutWebsite() {
-        MemberProfile memberProfile = createADefaultMemberProfile();
-        String adminAuth = auth(memberProfile.getWorkEmail(), ADMIN_ROLE);
-        VolunteeringOrganizationDTO org = new VolunteeringOrganizationDTO("name", "description", null);
-
-        HttpClientResponseException e = assertThrows(HttpClientResponseException.class, () -> organizationClient.createOrganization(adminAuth, org));
-        assertEquals(HttpStatus.BAD_REQUEST, e.getStatus());
-        String body = e.getResponse().getBody(String.class).get();
-        assertTrue(body.contains("organization.website: must not be blank"), body + " should contain 'organization.website: must not be blank'");
-    }
 }