Merge 96c6c46 into cac2c66

src/main/java/loanbook/model/loan/Loan.java

@@ -49,6 +49,7 @@ public Loan(Name name,
                 Set<Tag> tags) {
 
         requireAllNonNull(name, nric, phone, email, bike, rate, startTime, loanStatus, tags);
+
         this.name = name;
         this.nric = nric;
         this.phone = phone;

src/main/java/loanbook/ui/LoanCard.java

@@ -1,18 +1,22 @@
 package loanbook.ui;
 
+import java.util.HashSet;
+
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
 import javafx.scene.layout.FlowPane;
 import loanbook.model.loan.Loan;
+import loanbook.model.tag.Tag;
 
 /**
  * An UI component that displays information of a {@code Loan}.
  */
 public class LoanCard extends ListCard<Loan> {
 
     private static final String FXML = "LoanListCard.fxml";
+    private static final String[] LOANSTATUS_TAG_COLOR_STYLES = {"red", "green", "orange"};
     private static final String[] TAG_COLOR_STYLES =
-        {"teal", "red", "yellow", "blue", "orange", "brown", "green", "pink", "black", "grey"};
+        {"teal", "yellow", "blue", "brown", "pink", "black", "grey"};
 
     @FXML
     private Label name;
@@ -53,14 +57,26 @@ public LoanCard(Loan loan, int displayedIndex) {
     private String getTagColorStyleFor(String tagName) {
         // we use the hash code of the tag name to generate a random color, so that the color remain consistent
         // between different runs of the program while still making it random enough between tags.
-        return TAG_COLOR_STYLES[Math.abs(tagName.hashCode()) % TAG_COLOR_STYLES.length];
+        switch (tagName) {
+        case "Ongoing":
+            return LOANSTATUS_TAG_COLOR_STYLES[2];
+        case "Returned":
+            return LOANSTATUS_TAG_COLOR_STYLES[1];
+        case "Deleted":
+            return LOANSTATUS_TAG_COLOR_STYLES[0];
+        default:
+            // All user defined tags are set to brown colour.
+            return TAG_COLOR_STYLES[3];
+        }
     }
 
     /**
      * Creates the tag labels for {@code loan}.
      */
     private void initTags(Loan loan) {
-        loan.getTags().forEach(tag -> {
+        HashSet<Tag> currentTags = new HashSet<>(loan.getTags());
+        currentTags.add(new Tag(loan.getLoanStatus().toString()));
+        currentTags.forEach(tag -> {
             Label tagLabel = new Label(tag.value);
             tagLabel.getStyleClass().add(getTagColorStyleFor(tag.value));
             tags.getChildren().add(tagLabel);

src/test/java/guitests/guihandles/LoanCardHandle.java

@@ -3,8 +3,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import com.google.common.collect.ImmutableMultiset;
-
 import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.layout.Region;
@@ -113,9 +111,6 @@ && getPhone().equals(loan.getPhone().getCensored())
                 && getEmail().equals(loan.getEmail().getCensored())
                 && getBike().equals(loan.getBike().getName().value)
                 && getLoanRate().equals(loan.getLoanRate().toString())
-                && getLoanStartTime().equals(loan.getLoanStartTime().toString())
-                && ImmutableMultiset.copyOf(getTags()).equals(ImmutableMultiset.copyOf(loan.getTags().stream()
-                        .map(tag -> tag.value)
-                        .collect(Collectors.toList())));
+                && getLoanStartTime().equals(loan.getLoanStartTime().toString());
     }
 }

src/test/java/loanbook/ui/testutil/GuiTestAssert.java

@@ -3,6 +3,7 @@
 import static org.junit.Assert.assertEquals;
 
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -12,6 +13,7 @@
 import guitests.guihandles.ResultDisplayHandle;
 import loanbook.model.bike.Bike;
 import loanbook.model.loan.Loan;
+import loanbook.model.tag.Tag;
 import loanbook.ui.LoanCard;
 
 /**
@@ -76,19 +78,22 @@ public static void assertCardDisplaysLoan(Loan expectedLoan, LoanCardHandle actu
      */
     private static String getTagColorStyleFor(String tagName) {
         switch (tagName) {
-        case "classmates":
+        case "tag1":
         case "owesMoney":
-            return "teal";
         case "colleagues":
+        case "classmates":
         case "neighbours":
-            return "yellow";
         case "family":
         case "friend":
-            return "orange";
         case "friends":
-            return "brown";
         case "husband":
-            return "grey";
+            return "brown";
+        case "Ongoing":
+            return "orange";
+        case "Returned":
+            return "green";
+        case "Deleted":
+            return "red";
         default:
             throw new AssertionError(tagName + " does not have a color assigned.");
         }
@@ -97,9 +102,12 @@ private static String getTagColorStyleFor(String tagName) {
     /**
      * Asserts that the tags in {@code actualCard} matches all the tags in {@code expectedPerson} with the correct
      * color.
+     *
      */
     private static void assertTagsEqual(Loan expectedLoan, LoanCardHandle actualCard) {
-        List<String> expectedTags = expectedLoan.getTags().stream()
+        HashSet<Tag> newTags = new HashSet<>(expectedLoan.getTags());
+        newTags.add(new Tag(expectedLoan.getLoanStatus().toString()));
+        List<String> expectedTags = newTags.stream()
                 .map(tag -> tag.value).collect(Collectors.toList());
         assertEquals(expectedTags, actualCard.getTags());
         expectedTags.forEach(tag -> assertEquals(