Merge branch 'master' into UserGuide

AY2324S2-CS2103T-W12-1 · Mar 20, 2024 · 12275f4 · 12275f4
2 parents 7aa97e4 + ea878c4
commit 12275f4
Show file tree

Hide file tree

Showing 10 changed files with 88 additions and 57 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -43,5 +43,3 @@ jobs:
         uses: codecov/codecov-action@v3
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-        with:
-          paths-ignore: "main/java/seedu/address/ui/**/*"
diff --git a/src/main/java/seedu/address/logic/parser/ParserUtil.java b/src/main/java/seedu/address/logic/parser/ParserUtil.java
@@ -175,21 +175,21 @@ public static Set<Tag> parseTags(Collection<String> tags) throws ParseException
      * Leading and trailing whitespaces will be trimmed.
      *
      * @param policyName the name
-     * @param policyID the id
+     * @param policyId the id
      * @return the policy
      * @throws ParseException if the given {@code policyName} or {@code policyId} is invalid.
      */
-    public static Policy parsePolicyInfo(String policyName, String policyID) throws ParseException {
-        requireNonNull(policyName, policyID);
+    public static Policy parsePolicyInfo(String policyName, String policyId) throws ParseException {
+        requireNonNull(policyName, policyId);
         String trimmedPolicyName = policyName.trim();
-        String trimmedPolicyID = policyID.trim();
+        String trimmedPolicyId = policyId.trim();
         if (!Policy.isValidName(trimmedPolicyName)) {
             throw new ParseException(Policy.MESSAGE_CONSTRAINTS_NAME);
         }
-        if (!Policy.isValidID(trimmedPolicyID)) {
+        if (!Policy.isValidId(trimmedPolicyId)) {
             throw new ParseException(Policy.MESSAGE_CONSTRAINTS_ID);
         }
-        return new Policy(trimmedPolicyName, trimmedPolicyID);
+        return new Policy(trimmedPolicyName, trimmedPolicyId);
     }
 
     /**
@@ -202,7 +202,7 @@ public static Policy parsePolicyInfo(String policyName, String policyID) throws
     public static String parsePolicyId(String policyId) throws ParseException {
         requireNonNull(policyId);
         String trimmedPolicyId = policyId.trim();
-        if (!Policy.isValidID(trimmedPolicyId)) {
+        if (!Policy.isValidId(trimmedPolicyId)) {
             throw new ParseException(Policy.MESSAGE_CONSTRAINTS_ID);
         }
         return trimmedPolicyId;

diff --git a/src/main/java/seedu/address/model/person/PolicyList.java b/src/main/java/seedu/address/model/person/PolicyList.java
@@ -70,7 +70,7 @@ public boolean hasConflictingPolicyId(Policy newPolicy) {
         assert newPolicy != null;
         boolean isConflicting = false;
         for (Policy p: policyList) {
-            if (p.hasSameID(newPolicy)) {
+            if (p.hasSameId(newPolicy)) {
                 isConflicting = true;
                 break;
             }

diff --git a/src/main/java/seedu/address/model/policy/Policy.java b/src/main/java/seedu/address/model/policy/Policy.java
@@ -32,23 +32,35 @@ public class Policy {
     /**
      * The Policy id.
      */
-    public final String policyID;
-    private final PolicyType type;
+    public final String policyId;
+    private final PolicyType policyType;
 
 
     /**
      * Instantiates a new Policy.
      *
      * @param policyName the policy name
-     * @param policyID   the policy id
+     * @param policyId   the policy id
      */
-    public Policy(String policyName, String policyID) {
-        requireNonNull(policyName, policyID);
+    public Policy(String policyName, String policyId) {
+        requireNonNull(policyName, policyId);
         checkArgument(isValidName(policyName), MESSAGE_CONSTRAINTS_NAME);
-        checkArgument(isValidID(policyID), MESSAGE_CONSTRAINTS_ID);
+        checkArgument(isValidId(policyId), MESSAGE_CONSTRAINTS_ID);
         this.policyName = policyName;
-        this.policyID = policyID;
-        this.type = PolicyType.DEFAULT;
+        this.policyId = policyId;
+        this.policyType = PolicyType.DEFAULT;
+    }
+
+    public String getPolicyId() {
+        return policyId;
+    }
+
+    public String getPolicyName() {
+        return policyName;
+    }
+
+    public PolicyType getPolicyType() {
+        return policyType;
     }
 
     /**
@@ -58,7 +70,7 @@ public Policy(String policyName, String policyID) {
      * @return the boolean
      */
     public boolean isID(String testID) {
-        return testID.equals(policyID);
+        return testID.equals(policyId);
     }
 
     /**
@@ -77,7 +89,7 @@ public static boolean isValidName(String test) {
      * @param test the test
      * @return the boolean
      */
-    public static boolean isValidID(String test) {
+    public static boolean isValidId(String test) {
         return test.matches(VALIDATION_ID_REGEX);
     }
 
@@ -87,12 +99,12 @@ public static boolean isValidID(String test) {
      * @param policy the policy
      * @return the boolean
      */
-    public boolean hasSameID(Policy policy) {
-        return policyID.equals(policy.policyID);
+    public boolean hasSameId(Policy policy) {
+        return policyId.equals(policy.policyId);
     }
     @Override
     public String toString() {
-        return "Name:" + policyName + ", Type:" + type + ", Policy ID:" + policyID;
+        return "Name:" + policyName + ", Type:" + policyType + ", Policy ID:" + policyId;
     }
 
     @Override
@@ -106,6 +118,6 @@ public boolean equals(Object obj) {
         }
 
         Policy policy = (Policy) obj;
-        return policyID.equals(policy.policyID) && policyName.equals(policy.policyName);
+        return policyId.equals(policy.policyId) && policyName.equals(policy.policyName);
     }
 }
diff --git a/src/main/java/seedu/address/storage/JsonAdaptedPolicy.java b/src/main/java/seedu/address/storage/JsonAdaptedPolicy.java
@@ -12,7 +12,7 @@
 class JsonAdaptedPolicy {
 
     private final String policyName;
-    private final String policyID;
+    private final String policyId;
 
     /**
      * Constructs a {@code JsonAdaptedPolicy} with the given {@code policyName, policyID}.
@@ -21,20 +21,20 @@ class JsonAdaptedPolicy {
     public JsonAdaptedPolicy(String policyDetails) {
         String[] args = policyDetails.split(",");
         this.policyName = args[0];
-        this.policyID = args[1];
+        this.policyId = args[1];
     }
 
     /**
      * Converts a given {@code Policy} into this class for Jackson use.
      */
     public JsonAdaptedPolicy(Policy source) {
         policyName = source.policyName;
-        policyID = source.policyID;
+        policyId = source.policyId;
     }
 
     @JsonValue
     public String getPolicyDetails() {
-        return policyName + "," + policyID;
+        return policyName + "," + policyId;
     }
 
     /**
@@ -46,10 +46,10 @@ public Policy toModelType() throws IllegalValueException {
         if (!Policy.isValidName(policyName)) {
             throw new IllegalValueException(Policy.MESSAGE_CONSTRAINTS_NAME);
         }
-        if (!Policy.isValidID(policyID)) {
+        if (!Policy.isValidId(policyId)) {
             throw new IllegalValueException(Policy.MESSAGE_CONSTRAINTS_ID);
         }
-        return new Policy(policyName, policyID);
+        return new Policy(policyName, policyId);
     }
 
 }
diff --git a/src/main/java/seedu/address/ui/ClientPolicyTable.java b/src/main/java/seedu/address/ui/ClientPolicyTable.java
@@ -1,10 +1,12 @@
 package seedu.address.ui;
 
 import javafx.fxml.FXML;
-// import javafx.scene.control.TableColumn;
-// import javafx.scene.control.TableView;
-// import javafx.scene.control.cell.PropertyValueFactory;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
+import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.scene.layout.Region;
+import seedu.address.model.person.PolicyList;
+import seedu.address.model.policy.Policy;
 
 
 /**
@@ -14,14 +16,14 @@ public class ClientPolicyTable extends UiPart<Region> {
 
     private static final String FXML = "ClientPolicyTable.fxml";
 
-    /*
     @FXML
     private TableView<Policy> policyTableView;
     @FXML
     private TableColumn<Policy, String> policyId;
     @FXML
     private TableColumn<Policy, String> policyName;
-    */
+    // @FXML
+    // private TableColumn<Policy, String> policyType;
 
     /**
      * Creates an empty {@code ClientPolicyTable}.
@@ -30,14 +32,15 @@ public ClientPolicyTable() {
         super(FXML);
     }
 
-    //    /**
-    //     * Creates a {@code ClientPolicyTable} with the given {@code }.
-    //     */
-    //    public ClientPolicyTable() {
-    //        // argument should be some kind of list? ObservableList maybe
-    //        super(FXML);
-    //        // policyId.setCellValueFactory(new PropertyValueFactory<Policy, String>("policyId"));
-    //        // policyTableView.setItems(xxx);
-    //    }
+    /**
+     * Creates a {@code ClientPolicyTable} with the given {@code policyList}.
+     */
+    public ClientPolicyTable(PolicyList policyList) {
+        super(FXML);
+        policyId.setCellValueFactory(new PropertyValueFactory<Policy, String>("policyId"));
+        policyName.setCellValueFactory(new PropertyValueFactory<Policy, String>("policyName"));
+        // policyType.setCellValueFactory(new PropertyValueFactory<Policy, String>("policyType"));
+        policyTableView.setItems(policyList.policyList);
+    }
 
 }
diff --git a/src/main/java/seedu/address/ui/ClientViewPanel.java b/src/main/java/seedu/address/ui/ClientViewPanel.java
@@ -1,6 +1,7 @@
 package seedu.address.ui;
 
 import seedu.address.model.person.Person;
+import seedu.address.model.person.PolicyList;
 
 /**
  * A UI Class that encapsulates {@code ClientDetailsCard} and {@code ClientPolicyTable}.
@@ -20,7 +21,7 @@ public ClientViewPanel(Person person) {
             this.clientPolicyTable = new ClientPolicyTable();
         } else {
             this.clientDetailsCard = new ClientDetailsCard(person);
-            this.clientPolicyTable = new ClientPolicyTable();
+            this.clientPolicyTable = new ClientPolicyTable(person.getPolicyList());
         }
     }
 
@@ -39,17 +40,18 @@ public void updateClientDetailsCard(Person person) {
         clientDetailsCard = new ClientDetailsCard(person);
     }
 
-    /*
-    public void updateClientPolicyTable(xxx) {
-        clientPolicyTable = new ClientPolicyTable(xxx);
-    }
+    /**
+     * Updates the {@code ClientPolicyTable} with new {@code ObservableList<Policy>}
      */
+    public void updateClientPolicyTable(PolicyList policyList) {
+        clientPolicyTable = new ClientPolicyTable(policyList);
+    }
 
     /**
      * Updates the {@code ClientViewPanel} with new {@code Person}.
      */
     public void updateClientViewPanel(Person person) {
         updateClientDetailsCard(person);
-        // updateClientPolicyTable(xxx);
+        updateClientPolicyTable(person.getPolicyList());
     }
 }
diff --git a/src/main/resources/view/ClientPolicyTable.fxml b/src/main/resources/view/ClientPolicyTable.fxml
@@ -11,6 +11,7 @@
     <columns>
         <TableColumn fx:id="policyId" editable="false" minWidth="80.0" prefWidth="100.0" reorderable="false" text="Policy ID" />
         <TableColumn fx:id="policyName" editable="false" minWidth="120.0" prefWidth="300.0" reorderable="false" text="Policy Name" />
+        <!-- <TableColumn fx:id="policyType" editable="false" minWidth="120.0" prefWidth="300.0" reorderable="false" text="Policy Type" /> -->
     </columns>
     <columnResizePolicy>
         <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />

diff --git a/src/test/java/seedu/address/model/person/PolicyListTest.java b/src/test/java/seedu/address/model/person/PolicyListTest.java
@@ -40,7 +40,7 @@ public void deletePolicy() {
                 .observableArrayList(expectedPolicyObservableList);
         actualPolicyObservableList.add(policy3);
         PolicyList actualPolicyList = new PolicyList(actualPolicyObservableList);
-        actualPolicyList.deletePolicy(policy3.policyID);
+        actualPolicyList.deletePolicy(policy3.policyId);
         assertEquals(actualPolicyList, expectedPolicyList);
     }
 
@@ -64,8 +64,8 @@ public void hasPolicy() {
         policyObservableList.add(policy3);
         PolicyList actualPolicyList = new PolicyList(policyObservableList);
 
-        assertTrue(actualPolicyList.hasPolicy(policy2.policyID));
-        assertFalse(actualPolicyList.hasPolicy(policy4.policyID));
+        assertTrue(actualPolicyList.hasPolicy(policy2.policyId));
+        assertFalse(actualPolicyList.hasPolicy(policy4.policyId));
     }
 
     @Test

diff --git a/src/test/java/seedu/address/model/policy/PolicyTest.java b/src/test/java/seedu/address/model/policy/PolicyTest.java
@@ -14,6 +14,21 @@ public class PolicyTest {
 
     private static final Policy policy = new Policy(VALID_NAME, VALID_ID);
 
+    @Test
+    public void getPolicyId() {
+        assertEquals(policy.getPolicyId(), VALID_ID);
+    }
+
+    @Test
+    public void getPolicyName() {
+        assertEquals(policy.getPolicyName(), VALID_NAME);
+    }
+
+    @Test
+    public void getPolicyType() {
+        assertEquals(policy.getPolicyType(), PolicyType.DEFAULT);
+    }
+
     @Test
     public void isIdTestTrue() {
         assertTrue(policy.isID(VALID_ID));
@@ -35,22 +50,22 @@ public void isValidNameTestFalse() {
 
     @Test
     public void isValidIdTestTrue() {
-        assertTrue(Policy.isValidID(VALID_ID));
+        assertTrue(Policy.isValidId(VALID_ID));
     }
 
     @Test
     public void isValidIdTestFalse() {
-        assertFalse(Policy.isValidID(INVALID_ID));
+        assertFalse(Policy.isValidId(INVALID_ID));
     }
 
     @Test
     public void hasSameIdTestTrue() {
-        assertTrue(policy.hasSameID(policy));
+        assertTrue(policy.hasSameId(policy));
     }
     @Test
     public void hasSameIdTestFalse() {
         Policy otherPolicy = new Policy("Health", "456");
-        assertFalse(policy.hasSameID(otherPolicy));
+        assertFalse(policy.hasSameId(otherPolicy));
     }
 
     @Test