Merge development into master for 1.3.2 release

src/main/java/org/eclipsefoundation/react/resources/OrganizationResource.java

@@ -153,19 +153,27 @@ public class OrganizationResource extends AbstractRESTResource {
     @RolesAllowed({ CR, DE, CRA, MA })
     @Path("{orgID:\\d+}")
     public Response update(@PathParam("orgID") String organizationID, OrganizationInfoUpdateRequest updateRequest) {
+        if (updateRequest.getDescription().length() > 700) {
+            return new org.eclipsefoundation.core.model.Error(400, "Organization description should not be over 700 characters").asResponse();
+        }
         // get ref and update the object
-        OrganizationInformation infoRef = eclipseDBDao.getReference(Integer.valueOf(organizationID),
-                OrganizationInformation.class);
-        if (infoRef == null) {
-            return Response.status(404).build();
+        MultivaluedMap<String, String> params = new MultivaluedMapImpl<>();
+        params.add(DefaultUrlParameterNames.ID.getName(), organizationID);
+        List<OrganizationInformation> infoRefs = eclipseDBDao
+                .get(new RDBMSQuery<>(wrap, filters.get(OrganizationInformation.class), params));
+        // if ref doesn't exist, create one
+        OrganizationInformation infoRef;
+        if (infoRefs.isEmpty()) {
+            infoRef = new OrganizationInformation();
+            infoRef.setOrganizationID(Integer.valueOf(organizationID));
+        } else {
+            infoRef = infoRefs.get(0);
         }
         infoRef.setCompanyUrl(updateRequest.getCompanyUrl());
         infoRef.setShortDescription(updateRequest.getDescription());
         infoRef.setLongDescription(updateRequest.getDescription());
 
-        // create the param map and update the org info
-        MultivaluedMap<String, String> params = new MultivaluedMapImpl<>();
-        params.add(DefaultUrlParameterNames.ID.getName(), organizationID);
+        // update the org info
         List<OrganizationInformation> updatedOrg = eclipseDBDao.add(
                 new RDBMSQuery<>(wrap, filters.get(OrganizationInformation.class), params), Arrays.asList(infoRef));
         if (updatedOrg.isEmpty()) {