Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bug with loading data when editing json file #296

Merged
merged 1 commit into from
Apr 11, 2024
Merged

Fix bug with loading data when editing json file #296

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions src/main/java/seedu/address/storage/JsonSerializableAddressBook.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;

import com.fasterxml.jackson.annotation.JsonCreator;
Expand All @@ -17,6 +19,8 @@
import seedu.address.model.person.Person;
import seedu.address.model.person.relationship.Relationship;
import seedu.address.model.person.relationship.RoleBasedRelationship;
import seedu.address.model.person.relationship.SiblingRelationship;
import seedu.address.model.person.relationship.SpousesRelationship;

/**
* An Immutable AddressBook that is serializable to JSON format.
Expand Down Expand Up @@ -64,6 +68,7 @@ public JsonSerializableAddressBook(ReadOnlyAddressBook source) {
*/
public AddressBook toModelType() throws IllegalValueException {
AddressBook addressBook = new AddressBook();
HashMap<UUID, String> personGenders = new HashMap<>();
for (JsonAdaptedPersonAttr jsonAdaptedPersonAttr : persons) {
Person person = jsonAdaptedPersonAttr.toModelType();
if (addressBook.hasPerson(person)) {
Expand Down Expand Up @@ -93,6 +98,46 @@ public AddressBook toModelType() throws IllegalValueException {
+ relationship.getRelationshipDescriptor() + " found");
}
}
if (relationship instanceof SiblingRelationship) {
SiblingRelationship siblingRelationship = (SiblingRelationship) relationship;
UUID person1Uuid = siblingRelationship.getPerson1();
UUID person2Uuid = siblingRelationship.getPerson2();
String rolePerson1 = siblingRelationship.getRole(person1Uuid);
String rolePerson2 = siblingRelationship.getRole(person2Uuid);

String person1Gender = rolePerson1.equals("brother") ? "male" : "female";
String person2Gender = rolePerson2.equals("brother") ? "male" : "female";

if (personGenders.containsKey(person1Uuid) && !personGenders.get(person1Uuid).equals(person1Gender)) {
throw new IllegalValueException("Inconsistent gender for person with UUID " + person1Uuid);
}
if (personGenders.containsKey(person2Uuid) && !personGenders.get(person2Uuid).equals(person2Gender)) {
throw new IllegalValueException("Inconsistent gender for person with UUID " + person2Uuid);
}

personGenders.put(person1Uuid, person1Gender);
personGenders.put(person2Uuid, person2Gender);
}
if (relationship instanceof SpousesRelationship) {
SpousesRelationship spousesRelationship = (SpousesRelationship) relationship;
UUID person1Uuid = spousesRelationship.getPerson1();
UUID person2Uuid = spousesRelationship.getPerson2();
String rolePerson1 = spousesRelationship.getRole(person1Uuid);
String rolePerson2 = spousesRelationship.getRole(person2Uuid);

String person1Gender = rolePerson1.equals("husband") ? "male" : "female";
String person2Gender = rolePerson2.equals("husband") ? "male" : "female";

if (personGenders.containsKey(person1Uuid) && !personGenders.get(person1Uuid).equals(person1Gender)) {
throw new IllegalValueException("Inconsistent gender for person with UUID " + person1Uuid);
}
if (personGenders.containsKey(person2Uuid) && !personGenders.get(person2Uuid).equals(person2Gender)) {
throw new IllegalValueException("Inconsistent gender for person with UUID " + person2Uuid);
}

personGenders.put(person1Uuid, person1Gender);
personGenders.put(person2Uuid, person2Gender);
}
if (addressBook.hasRelationship(relationship)) {
throw new IllegalValueException("Duplicate relationship found.");
}
Expand Down
Loading