Merge pull request AY2425S1-CS2103T-T11-2#281 from currynia/branch-ug

Update assignment json to handle null values

src/main/java/seedu/address/MainApp.java

@@ -97,7 +97,6 @@ private Model initModelManager(Storage storage, ReadOnlyUserPrefs userPrefs) {
             logger.warning("Data file at " + storage.getAddressBookFilePath() + " could not be loaded."
                     + " Will be starting with an empty AddressBook.");
             initialData = new AddressBook();
-            e.printStackTrace();
         }
 
         try {
@@ -109,7 +108,7 @@ private Model initModelManager(Storage storage, ReadOnlyUserPrefs userPrefs) {
             predefinedAssignments = readAssignmentOptional
                     .orElseGet(SampleAssignmentsUtil::getSamplePredefinedAssignments);
         } catch (DataLoadingException e) {
-            logger.warning("Data file at " + storage.getAddressBookFilePath() + " could not be loaded."
+            logger.warning("Data file at " + storage.getAssignmentFilePath() + " could not be loaded."
                     + " Will be starting with an empty predefined assignments data.");
             predefinedAssignments = new PredefinedAssignmentsData();
         }

src/main/java/seedu/address/storage/assignment/JsonAdaptedPredefinedAssignment.java

@@ -26,4 +26,8 @@ public PredefinedAssignment toModelType() {
     public String getName() {
         return name;
     }
+
+    public Float getMaxScore() {
+        return maxScore;
+    }
 }

src/main/java/seedu/address/storage/assignment/JsonSerializablePredefinedAssignmentData.java

@@ -15,6 +15,7 @@
 class JsonSerializablePredefinedAssignmentData {
     private static final String DUPLICATE_PREDEFINED_ASSIGNMENT =
             "Predefined assignments list contains duplicate assignment(s).";
+    private static final String MISSING_VALUES = "Assignment is missing assignmentName and/or maxScore.";
     private final List<JsonAdaptedPredefinedAssignment> assignments = new ArrayList<>();
 
     /**
@@ -40,11 +41,18 @@ public PredefinedAssignmentsData toModelType() throws IllegalValueException {
             if (predefinedAssignmentsData.hasAssignment(assignmentName)) {
                 throw new IllegalValueException(DUPLICATE_PREDEFINED_ASSIGNMENT);
             }
+            if (isFieldNull(jsonAdaptedPredefinedAssignment)) {
+                throw new IllegalValueException(MISSING_VALUES);
+            }
             predefinedAssignmentsData.addPredefinedAssignment(jsonAdaptedPredefinedAssignment.toModelType());
         }
         return predefinedAssignmentsData;
     }
 
+    private boolean isFieldNull(JsonAdaptedPredefinedAssignment assignment) {
+        return assignment.getName() == null || assignment.getMaxScore() == null;
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (obj instanceof JsonSerializablePredefinedAssignmentData other) {

src/test/data/AssignmentTest/MissingName.json

@@ -0,0 +1,19 @@
+{
+  "assignments" : [
+    {
+      "name": "Ex01",
+      "maxScore": 5
+    },{
+      "name": "Ex02",
+      "maxScore": 5
+    },{
+      "name": "Ex03",
+      "maxScore": 5
+    },{
+      "name": "Ex04",
+      "maxScore": 5
+    },{
+      "maxScore": 1
+    }
+  ]
+}

src/test/data/AssignmentTest/MissingScore.json

@@ -0,0 +1,19 @@
+{
+  "assignments" : [
+    {
+      "name": "Ex01",
+      "maxScore": 5
+    },{
+      "name": "Ex02",
+      "maxScore": 5
+    },{
+      "name": "Ex03",
+      "maxScore": 5
+    },{
+      "name": "Ex04",
+      "maxScore": 5
+    },{
+      "name" : "abc"
+    }
+  ]
+}

src/test/java/seedu/address/storage/assignment/JsonPredefinedAssignmentDataStorageTest.java

@@ -28,4 +28,22 @@ void testReadAssignment() {
                         "AssignmentTest", "PredefinedAssignmentDuplicate.json"));
         assertThrows(DataLoadingException.class, test::readAssignment);
     }
+
+    @Test
+    void testScoreMissing() {
+        JsonPredefinedAssignmentDataStorage test = new JsonPredefinedAssignmentDataStorage(
+                Paths.get(
+                        "src", "test", "data",
+                        "AssignmentTest", "MissingScore.json"));
+        assertThrows(DataLoadingException.class, test::readAssignment);
+    }
+
+    @Test
+    void testNameMissing() {
+        JsonPredefinedAssignmentDataStorage test = new JsonPredefinedAssignmentDataStorage(
+                Paths.get(
+                        "src", "test", "data",
+                        "AssignmentTest", "MissingName.json"));
+        assertThrows(DataLoadingException.class, test::readAssignment);
+    }
 }