Fix issue 143 and 144

src/main/java/seedu/address/logic/commands/EditCommand.java

@@ -48,6 +48,7 @@
 import seedu.address.model.contact.Type;
 import seedu.address.model.contact.Url;
 import seedu.address.model.jobapplication.ApplicationStage;
+import seedu.address.model.jobapplication.JobApplication;
 import seedu.address.model.jobapplication.JobStatus;
 import seedu.address.model.tag.Tag;
 
@@ -254,8 +255,12 @@ private static Contact createEditedContact(Model model, Contact contactToEdit,
 
         // TODO: Refactor into two methods to handle the two cases.
         if (contactToEdit.getType() == Type.ORGANIZATION) {
+            Organization org = (Organization) contactToEdit;
+            List<JobApplication> applications = Arrays.asList(org.getJobApplications());
+
             return new Organization(updatedName, updatedId, updatedPhone, updatedEmail,
-                    updatedUrl, updatedAddress, updatedTags);
+                    updatedUrl, updatedAddress, updatedTags, applications);
+
         } else if (contactToEdit.getType() == Type.RECRUITER) {
             Optional<Id> updatedOid = editContactDescriptor
                     .getOrganizationId()

src/main/java/seedu/address/model/ModelManager.java

@@ -18,6 +18,7 @@
 import seedu.address.commons.core.GuiSettings;
 import seedu.address.commons.core.LogsCenter;
 import seedu.address.commons.core.index.Index;
+import seedu.address.commons.exceptions.IllegalOperationException;
 import seedu.address.commons.exceptions.IllegalValueException;
 import seedu.address.logic.Messages;
 import seedu.address.model.contact.Contact;
@@ -56,11 +57,8 @@
         this.sortedContacts = new SortedList<>(this.addressBook.getContactList());
         this.filteredContacts = new FilteredList<>(sortedContacts);
         this.displayedContacts = filteredContacts;
-        ObservableList<JobApplication> applicationList = FXCollections.observableArrayList(filteredContacts.stream()
-                .filter(c -> c.getType() == Type.ORGANIZATION)
-                .flatMap(c -> Arrays.stream(((Organization) c).getJobApplications()))
-                .sorted(JobApplication.LAST_UPDATED_COMPARATOR)
-                .collect(Collectors.toList()));
+        ObservableList<JobApplication> applicationList =
+                FXCollections.observableArrayList(extractApplicationsFromContacts(filteredContacts));
         this.jobApplicationList = new JobApplicationList(applicationList);
         this.sortedApplications = new SortedList<>(applicationList);
         this.filteredApplications = new FilteredList<>(this.sortedApplications, s->true);
@@ -111,6 +109,7 @@
     @Override
     public void setAddressBook(ReadOnlyAddressBook addressBook) {
         this.addressBook.resetData(addressBook);
+        this.jobApplicationList.setAll(extractApplicationsFromContacts(addressBook.getContactList()));
     }
 
     @Override
@@ -146,6 +145,18 @@
         requireAllNonNull(target, editedContact);
 
         addressBook.setContact(target, editedContact);
+
+        if (target.getType() != Type.ORGANIZATION || editedContact.getType() != Type.ORGANIZATION) {
+            // guard clause
+            return;
+        }
+        if (target.getName().equals(editedContact.getName()) && target.getId().equals(editedContact.getId())) {
+            // guard clause
+            return;
+        }
+
+        updateApplicationNames((Organization) editedContact, (Organization) target);
+
     }
 
     @Override
@@ -184,14 +195,19 @@
     public void replaceApplication(Index index, JobApplication newApplication) throws IllegalValueException {
         JobApplication oldApplication = jobApplicationList.get(index.getZeroBased());
 
-        jobApplicationList.set(index.getZeroBased(), newApplication);
         Contact contact = getContactById(newApplication.getOrganizationId());
         if (contact == null || contact.getType() != Type.ORGANIZATION) {
-            throw new IllegalValueException("Id field is invalid!");
+            throw new IllegalValueException("Id field is invalid!"); // TODO: Should I change this?
         }
+
         Organization organization = (Organization) contact;
-        organization.replaceJobApplication(oldApplication, newApplication);
+        try {
+            organization.replaceJobApplication(oldApplication, newApplication);
+        } catch (IllegalOperationException e) {
+            throw new IllegalValueException(e.getMessage());
+        }
 
+        jobApplicationList.set(index.getZeroBased(), newApplication);
 
     }
 
@@ -265,4 +281,27 @@
                 && filteredContacts.equals(otherModelManager.filteredContacts);
     }
 
+    private void updateApplicationNames(Organization newOrg, Organization oldOrg) {
+        List<JobApplication> oldApplications = List.of(oldOrg.getJobApplications());
+        List<JobApplication> newApplications = List.of(newOrg.getJobApplications());
+
+        for (JobApplication newApplication: newApplications) {
+            for (JobApplication oldApplication: oldApplications) {
+                if (!newApplication.looseEquals(oldApplication)) {
+                    continue;
+                }
+                int index = jobApplicationList.indexOf(oldApplication);
+                jobApplicationList.set(index, newApplication);
+            }
+        }
+    }
+
+    private List<JobApplication> extractApplicationsFromContacts(List<Contact> contacts) {
+        return contacts.stream()
+                .filter(c -> c.getType() == Type.ORGANIZATION)
+                .flatMap(c -> Arrays.stream(((Organization) c).getJobApplications()))
+                .sorted(JobApplication.LAST_UPDATED_COMPARATOR)
+                .collect(Collectors.toList());
+    }
+
 }

src/main/java/seedu/address/model/contact/Organization.java

@@ -1,10 +1,13 @@
 package seedu.address.model.contact;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Collectors;
 
+import seedu.address.commons.exceptions.IllegalOperationException;
 import seedu.address.commons.util.ToStringBuilder;
 import seedu.address.model.jobapplication.JobApplication;
 import seedu.address.model.tag.Tag;
@@ -41,8 +44,15 @@
             Name name, Id id, Phone phone, Email email, Url url,
             Address address, Set<Tag> tags, List<JobApplication> jobApplications
     ) {
+        // TODO: Tech debt - undeprecate super
         super(name, id, phone, email, url, address, tags, null);
-        this.jobApplications.addAll(jobApplications);
+        // Ensure that the new job applications are modified correctly.
+        List<JobApplication> newApplications = jobApplications
+                .stream()
+                .map(a -> a.changeCompanyDetails(name, id))
+                .collect(Collectors.toList());
+
+        this.jobApplications.addAll(newApplications);
     }
 
     @Override
@@ -75,10 +85,13 @@
     /**
      * Replaces the old job application in the list with the new one.
      */
-    public void replaceJobApplication(JobApplication oldApplication, JobApplication newApplication) {
+    public void replaceJobApplication(JobApplication oldApplication, JobApplication newApplication) throws
+            IllegalOperationException {
         assert newApplication.getOrganizationId().equals(this.getId());
         assert newApplication.getOrganizationId().equals(oldApplication.getOrganizationId());
-
+        if (hasApplicationWithSameNameWithExclusion(newApplication, oldApplication)) {
+            throw new IllegalOperationException("Job Application with same name found. Set a different name");
+        }
         this.jobApplications.remove(oldApplication);
         this.jobApplications.add(newApplication);
     }
@@ -124,4 +137,19 @@
         return super.toStringBuilder();
     }
 
+    private boolean hasApplicationWithSameNameWithExclusion(JobApplication application,
+                                                    JobApplication... excludedApplications) {
+        List<JobApplication> applicationsExcludedList =
+                Arrays.stream(excludedApplications).collect(Collectors.toList());
+        for (JobApplication a: jobApplications) {
+            if (applicationsExcludedList.contains(a)) {
+                continue;
+            }
+            if (application.getJobTitle().equals(a.getJobTitle())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
 }

src/main/java/seedu/address/model/jobapplication/JobApplication.java

@@ -199,6 +199,24 @@ public Name getOrgName() {
         return orgName;
     }
 
+    /**
+     * Checks if the details of the job application is the same excluding org name and id and last updated time.
+     */
+    public boolean looseEquals(JobApplication other) {
+        return this.jobTitle.equals(other.jobTitle)
+                && this.jobDescription.equals(other.jobDescription)
+                && this.applicationStage.equals(other.applicationStage)
+                && this.status.equals(other.status);
+    }
+
+    /**
+     * Gives a new job application given change in company details.
+     */
+    public JobApplication changeCompanyDetails(Name orgName, Id oid) {
+        return new JobApplication(oid, orgName, this.jobTitle, this.jobDescription.orElse(null), this.deadline,
+                this.status, this.applicationStage, new LastUpdatedTime());
+    }
+
     @Override
     public int hashCode() {
         return Objects.hash(

src/main/java/seedu/address/model/jobapplication/JobApplicationList.java

@@ -1,6 +1,8 @@
 package seedu.address.model.jobapplication;
 
 
+import java.util.Collection;
+
 import javafx.collections.ObservableList;
 
 /**
@@ -51,4 +53,18 @@ public void set(int index, JobApplication jobApplication) {
     public JobApplication get(int index) {
         return applications.get(index);
     }
+
+    /**
+     * Gets the index of the application in the list. Returns -1 if not found.
+     */
+    public int indexOf(JobApplication application) {
+        return applications.indexOf(application);
+    }
+
+    /**
+     * Replaces all the applications in the list with the new applications
+     */
+    public void setAll(Collection<JobApplication> applications) {
+        this.applications.setAll(applications);
+    }
 }