Change oid field to optional

AY2324S1-CS2103T-W08-3 · Oct 18, 2023 · 2029b22 · 2029b22
1 parent 8ca3b9a
commit 2029b22
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/src/main/java/seedu/address/model/person/Recruiter.java b/src/main/java/seedu/address/model/person/Recruiter.java
@@ -1,6 +1,7 @@
 package seedu.address.model.person;
 
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 
 import seedu.address.commons.util.ToStringBuilder;
@@ -12,17 +13,17 @@
  */
 public class Recruiter extends Contact {
 
-    private final Id oid;
+    private final Optional<Id> oid;
 
     /**
      * Every field except oid must be present and not null.
      */
     public Recruiter(Name name, Id id, Phone phone, Email email, Url url, Address address, Set<Tag> tags, Id oid) {
         super(name, id, phone, email, url, address, tags);
-        this.oid = oid;
+        this.oid = Optional.ofNullable(oid);
     }
 
-    public Id getOrganizationId() {
+    public Optional<Id> getOrganizationId() {
         return oid;
     }
 

diff --git a/src/main/java/seedu/address/storage/JsonAdaptedContact.java b/src/main/java/seedu/address/storage/JsonAdaptedContact.java
@@ -78,10 +78,12 @@ public JsonAdaptedContact(Contact source) {
             position = ((Organization) source).getPosition().jobPosition;
             oid = "";
         } else if (source.getType() == Type.RECRUITER) {
+            Recruiter recruiter = (Recruiter) source;
             status = "";
             position = "";
-            Id tmp = ((Recruiter) source).getOrganizationId();
-            oid = tmp == null ? null : tmp.value;
+            oid = recruiter.getOrganizationId()
+                    .map(oid -> oid.value)
+                    .orElse(null);
         }
 
         type = source.getType().toString();

diff --git a/src/main/java/seedu/address/ui/ContactCard.java b/src/main/java/seedu/address/ui/ContactCard.java
@@ -1,6 +1,7 @@
 package seedu.address.ui;
 
 import java.util.Comparator;
+import java.util.Optional;
 import java.util.function.Supplier;
 
 import javafx.fxml.FXML;
@@ -97,14 +98,14 @@ public ContactCard(Contact contact, int displayedIndex) {
         case RECRUITER: {
             Recruiter recruiter = (Recruiter) contact;
 
-            final Id linkedOrgId = recruiter.getOrganizationId();
+            final Optional<Id> linkedOrgId = recruiter.getOrganizationId();
 
             setVboxInnerLabelText(
-                    linkedParentOrganization, () -> linkedOrgId == null
-                            ? null
-                            : String.format(
-                                    "from %s (%s)", "organization" /* TODO: Use org name instead */, linkedOrgId.value
-                            )
+                    linkedParentOrganization, () -> linkedOrgId.map(oid ->
+                        String.format(
+                            "from %s (%s)", "organization" /* TODO: Use org name instead */, oid.value
+                        ))
+                    .orElse(null)
             );
             cardPaneInnerVbox.getChildren().removeAll(status, position);
             break;