Merge pull request #161 from AY2122S1-CS2103T-W15-3/fix-description-bug

Fix empty description bug
AY2122S1-CS2103T-W15-3 · Oct 28, 2021 · 698e676 · 698e676
2 parents 6c9a7b3 + 0b66134
commit 698e676
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 4 deletions.
diff --git a/src/main/java/seedu/address/logic/parser/ParserUtil.java b/src/main/java/seedu/address/logic/parser/ParserUtil.java
@@ -215,10 +215,12 @@ public static EndDateTime parseEndDateTime(String endDateTime) throws ParseExcep
      * Leading and trailing whitespaces will be trimmed.
      *
      */
-    public static Description parseDescription(String description) {
+    public static Description parseDescription(String description) throws ParseException {
         requireNonNull(description);
         String trimmedDescription = description.trim();
-
+        if (!Description.isValidDescription(trimmedDescription)) {
+            throw new ParseException(Description.MESSAGE_CONSTRAINTS);
+        }
         return new Description(trimmedDescription);
     }
 

diff --git a/src/main/java/seedu/address/model/common/Address.java b/src/main/java/seedu/address/model/common/Address.java
@@ -35,7 +35,7 @@ public Address(String address) {
     }
 
     /**
-     * Returns true if a given string is a valid email.
+     * Returns true if a given string is a valid address.
      */
     public static boolean isValidAddress(String test) {
         return test.matches(VALIDATION_REGEX);

diff --git a/src/main/java/seedu/address/model/event/Description.java b/src/main/java/seedu/address/model/event/Description.java
@@ -1,6 +1,7 @@
 package seedu.address.model.event;
 
 import static java.util.Objects.requireNonNull;
+import static seedu.address.commons.util.AppUtil.checkArgument;
 
 import java.util.List;
 
@@ -12,6 +13,14 @@
  */
 public class Description {
 
+    public static final String MESSAGE_CONSTRAINTS = "Description can take any values, and it should not be blank";
+
+    /*
+     * The first character of the description must not be a whitespace,
+     * otherwise " " (a blank string) becomes a valid input.
+     */
+    public static final String VALIDATION_REGEX = "[^\\s].*";
+
     public final String value;
 
     /**
@@ -21,9 +30,17 @@ public class Description {
      */
     public Description(String remark) {
         requireNonNull(remark);
+        checkArgument(isValidDescription(remark), MESSAGE_CONSTRAINTS);
         value = remark;
     }
 
+    /**
+     * Returns true if a given string is a valid description.
+     */
+    public static boolean isValidDescription(String test) {
+        return test.matches(VALIDATION_REGEX);
+    }
+
     @Override
     public boolean equals(Object other) {
         return other == this // short circuit if same object

diff --git a/src/test/java/seedu/address/testutil/EventBuilder.java b/src/test/java/seedu/address/testutil/EventBuilder.java
@@ -20,7 +20,7 @@ public class EventBuilder {
     public static final String DEFAULT_NAME = "Midterms";
     public static final String DEFAULT_START_DATE_AND_TIME = "13-10-2021 21:00";
     public static final String DEFAULT_END_DATE_AND_TIME = "13-10-2021 23:00";
-    public static final String DEFAULT_DESCRIPTION = "";
+    public static final String DEFAULT_DESCRIPTION = "Important";
     public static final String DEFAULT_ADDRESS = "COM2, SR1, #02-11";
     public static final String DEFAULT_ZOOM_LINK = "https://nus-sg.zoom.us/j/0123456789?pwd=ABCDEFG";