Merge pull request elimu-ai#1331 from elimu-ai/fix-#1339-Handle-DataI…

…ntegrityViolationException-during-storybook-review

Fix elimu-ai#1339 handle data integrity violation exception during storybook review

src/main/java/ai/elimu/model/contributor/StoryBookPeerReviewEvent.java

@@ -2,6 +2,7 @@
 
 import ai.elimu.model.BaseEntity;
 import java.util.Calendar;
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.ManyToOne;
 import javax.persistence.Temporal;
@@ -36,6 +37,7 @@ public class StoryBookPeerReviewEvent extends BaseEntity {
      * Any additional explanations. This field is mandatory only if the 
      * {@link #storyBookContributionEvent} was <i>not</i> approved.
      */
+    @Column(length = 1000)
     private String comment;
 
     @NotNull

src/main/java/ai/elimu/web/content/peer_review/StoryBookPeerReviewEventCreateController.java

@@ -12,6 +12,7 @@
 import java.util.Calendar;
 import java.util.List;
 import javax.servlet.http.HttpSession;
+import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -55,7 +56,7 @@ public String handleSubmit(
         storyBookPeerReviewEvent.setContributor(contributor);
         storyBookPeerReviewEvent.setStoryBookContributionEvent(storyBookContributionEvent);
         storyBookPeerReviewEvent.setApproved(approved);
-        storyBookPeerReviewEvent.setComment(comment);
+        storyBookPeerReviewEvent.setComment(StringUtils.abbreviate(comment, 1000));
         storyBookPeerReviewEvent.setTime(Calendar.getInstance());
         storyBookPeerReviewEventDao.create(storyBookPeerReviewEvent);
 

src/main/resources/META-INF/jpa-schema-export.sql

@@ -479,7 +479,7 @@
     create table StoryBookPeerReviewEvent (
        id bigint generated by default as identity (start with 1),
         approved boolean,
-        comment varchar(255),
+        comment varchar(1000),
         time timestamp,
         contributor_id bigint,
         storyBookContributionEvent_id bigint,

src/main/resources/db/migration/2001201.sql

@@ -0,0 +1,4 @@
+# 2.1.201
+
+# Increase comment length from 255 to 1000
+ALTER TABLE StoryBookPeerReviewEvent MODIFY `comment` varchar(1000);

src/main/webapp/WEB-INF/jsp/content/storybook/edit.jsp

@@ -185,7 +185,7 @@
 
             <div id="peerReviewSubmitContainer" style="display: none;">
                 <label for="comment"><fmt:message key="comment" /></label>
-                <textarea id="comment" name="comment" class="materialize-textarea"></textarea>
+                <textarea id="comment" name="comment" class="materialize-textarea" maxlength="1000"></textarea>
 
                 <button class="btn waves-effect waves-light" type="submit">
                     <fmt:message key="submit" /> <i class="material-icons right">send</i>