[CS2103T-W10-3] ComputingConnection

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

@@ -115,7 +115,8 @@ private static Person createEditedPerson(Person personToEdit, EditPersonDescript
         Set<Remark> updatedRemarks = editPersonDescriptor.getRemarks().orElse(personToEdit.getRemarks());
 
         return new Person(updatedName, updatedEmail, updatedFaculty, updatedMajor,
-                updatedSkills, updatedLanguages, updatedFrameworks, updatedTags, updatedRemarks);
+                updatedSkills, updatedLanguages, updatedFrameworks, updatedTags,
+                updatedRemarks, personToEdit.getInteractions());
     }
 
     @Override

src/main/java/seedu/address/model/interaction/Interaction.java

@@ -18,8 +18,9 @@ public class Interaction {
     public final LocalDate date;
 
     /**
-     * Constructs a {@code Tag}.
-     * @param tagName A valid tag name.
+     * Constructs a {@code Interaction}.
+     * @param description A valid interaction description.
+     * @param date A valid date string
      */
     public Interaction(String description, String date) {
         requireNonNull(description);
@@ -29,6 +30,17 @@ public Interaction(String description, String date) {
         this.description = description;
     }
 
+    /**
+     * Constructs a {@code Interaction}.
+     * @param description A valid interaction description.
+     */
+    public Interaction(String description) {
+        requireNonNull(description);
+        this.date = LocalDate.now();
+        this.description = description;
+    }
+
+
     /**
      * Returns true if a given string is a valid tag name.
      */

src/main/java/seedu/address/model/util/SampleDataUtil.java

@@ -6,6 +6,7 @@
 
 import seedu.address.model.AddressBook;
 import seedu.address.model.ReadOnlyAddressBook;
+import seedu.address.model.interaction.Interaction;
 import seedu.address.model.person.Email;
 import seedu.address.model.person.Faculty;
 import seedu.address.model.person.Major;
@@ -82,6 +83,15 @@ public static Set<Language> getLanguageSet(String... strings) {
                 .collect(Collectors.toSet());
     }
 
+    /**
+     * Returns a tag set containing the list of strings given.
+     */
+    public static Set<Interaction> getInteractionSet(String... description) {
+        return Arrays.stream(description)
+                .map(Interaction::new)
+                .collect(Collectors.toSet());
+    }
+
     /**
      * Returns a framework set containing the list of strings given.
      */

src/main/java/seedu/address/storage/JsonAdaptedInteractions.java

@@ -0,0 +1,46 @@
+package seedu.address.storage;
+
+import java.time.LocalDate;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import seedu.address.model.interaction.Interaction;
+
+/**
+ * Jackson-friendly version of {@link Interaction}.
+ */
+class JsonAdaptedInteractions {
+
+    public final String description;
+    public final LocalDate date;
+    /**
+     * Constructs a {@code JsonAdaptedInteraction} with the given
+     * {@code description} and {@code date}.
+     */
+    @JsonCreator
+    public JsonAdaptedInteractions(@JsonProperty("description") String description,
+                                    @JsonProperty("date") LocalDate date) {
+        this.description = description;
+        this.date = date;
+    }
+
+    /**
+     * Converts a given {@code Tag} into this class for Jackson use.
+     */
+    public JsonAdaptedInteractions(Interaction source) {
+        System.out.println("%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%");
+        this.description = source.description;
+        this.date = source.date;
+    }
+
+    /**
+     * Converts this Jackson-friendly adapted tag object into the model's {@code Tag} object.
+     *
+     * @throws IllegalValueException if there were any data constraints violated in the adapted tag.
+     */
+    public Interaction toModelType() {
+        System.out.println("INSIDE toModelTYPE@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
+        return new Interaction(description, date.toString());
+    }
+}

src/main/java/seedu/address/storage/JsonAdaptedPerson.java

@@ -10,6 +10,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import seedu.address.commons.exceptions.IllegalValueException;
+import seedu.address.model.interaction.Interaction;
 import seedu.address.model.person.Email;
 import seedu.address.model.person.Faculty;
 import seedu.address.model.person.Major;
@@ -38,6 +39,7 @@ class JsonAdaptedPerson {
     private final List<JsonAdaptedFramework> frameworks = new ArrayList<>();
     private final List<JsonAdaptedTag> tagged = new ArrayList<>();
     private final List<JsonAdaptedRemark> remarks = new ArrayList<>();
+    private final List<JsonAdaptedInteractions> interactions = new ArrayList<>();
 
     /**
      * Constructs a {@code JsonAdaptedPerson} with the given person details.
@@ -50,7 +52,8 @@ public JsonAdaptedPerson(@JsonProperty("name") String name, @JsonProperty("email
                              @JsonProperty("languages") List<JsonAdaptedLanguage> languages,
                              @JsonProperty("frameworks") List<JsonAdaptedFramework> frameworks,
                              @JsonProperty("tagged") List<JsonAdaptedTag> tagged,
-                             @JsonProperty("remarks") List<JsonAdaptedRemark> remarks) {
+                             @JsonProperty("remarks") List<JsonAdaptedRemark> remarks,
+                             @JsonProperty("interactions") List<JsonAdaptedInteractions> interactions) {
         this.name = name;
         this.email = email;
         this.faculty = faculty;
@@ -75,6 +78,10 @@ public JsonAdaptedPerson(@JsonProperty("name") String name, @JsonProperty("email
         if (remarks != null) {
             this.remarks.addAll(remarks);
         }
+
+        if (interactions != null) {
+            this.interactions.addAll(interactions);
+        }
     }
 
     /**
@@ -105,6 +112,10 @@ public JsonAdaptedPerson(Person source) {
         remarks.addAll(source.getRemarks().stream()
                 .map(JsonAdaptedRemark::new)
                 .collect(Collectors.toList()));
+
+        interactions.addAll(source.getInteractions().stream()
+                .map(JsonAdaptedInteractions::new)
+                .collect(Collectors.toList()));
     }
 
     /**
@@ -133,6 +144,12 @@ public Person toModelType() throws IllegalValueException {
             personTags.add(tag.toModelType());
         }
 
+        System.out.println(interactions);
+        final List<Interaction> personInteractions = new ArrayList<>();
+        for (JsonAdaptedInteractions interaction : interactions) {
+            personInteractions.add(interaction.toModelType());
+        }
+
         final List<Remark> personRemarks = new ArrayList<>();
         for (JsonAdaptedRemark remark : remarks) {
             personRemarks.add(remark.toModelType());
@@ -175,10 +192,10 @@ public Person toModelType() throws IllegalValueException {
         final Set<Framework> modelFrameworks = new HashSet<>(personFrameworks);
         final Set<Tag> modelTags = new HashSet<>(personTags);
         final Set<Remark> modelRemarks = new HashSet<>(personRemarks);
-
+        final Set<Interaction> modelInteractions = new HashSet<>(personInteractions);
 
         return new Person(modelName, modelEmail, modelFaculty, modelMajor,
-                modelSkills, modelLanguages, modelFrameworks, modelTags, modelRemarks);
+                modelSkills, modelLanguages, modelFrameworks, modelTags, modelRemarks, modelInteractions);
     }
 
 }

src/test/java/seedu/address/storage/JsonAdaptedPersonTest.java

@@ -55,31 +55,31 @@ public void toModelType_validPersonDetails_returnsPerson() throws Exception {
     public void toModelType_invalidName_throwsIllegalValueException() {
         JsonAdaptedPerson person =
                 new JsonAdaptedPerson(INVALID_NAME, VALID_EMAIL, VALID_FACULTY, VALID_MAJOR,
-                        VALID_SKILLS, VALID_LANGUAGES, VALID_FRAMEWORK, VALID_TAGS, VALID_REMARKS);
+                        VALID_SKILLS, VALID_LANGUAGES, VALID_FRAMEWORK, VALID_TAGS, VALID_REMARKS, null);
         String expectedMessage = Name.MESSAGE_CONSTRAINTS;
         assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
     }
 
     @Test
     public void toModelType_nullName_throwsIllegalValueException() {
         JsonAdaptedPerson person = new JsonAdaptedPerson(null, VALID_EMAIL, VALID_FACULTY, VALID_MAJOR,
-                VALID_SKILLS, VALID_LANGUAGES, VALID_FRAMEWORK, VALID_TAGS, VALID_REMARKS);
+                VALID_SKILLS, VALID_LANGUAGES, VALID_FRAMEWORK, VALID_TAGS, VALID_REMARKS, null);
         String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Name.class.getSimpleName());
         assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
     }
 
     @Test
     public void toModelType_invalidEmail_throwsIllegalValueException() {
         JsonAdaptedPerson person = new JsonAdaptedPerson(VALID_NAME, INVALID_EMAIL, VALID_FACULTY, VALID_MAJOR,
-                VALID_SKILLS, VALID_LANGUAGES, VALID_FRAMEWORK, VALID_TAGS, VALID_REMARKS);
+                VALID_SKILLS, VALID_LANGUAGES, VALID_FRAMEWORK, VALID_TAGS, VALID_REMARKS, null);
         String expectedMessage = Email.MESSAGE_CONSTRAINTS;
         assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
     }
 
     @Test
     public void toModelType_nullEmail_throwsIllegalValueException() {
         JsonAdaptedPerson person = new JsonAdaptedPerson(VALID_NAME, null, VALID_FACULTY, VALID_MAJOR,
-                VALID_SKILLS, VALID_LANGUAGES, VALID_FRAMEWORK, VALID_TAGS, VALID_REMARKS);
+                VALID_SKILLS, VALID_LANGUAGES, VALID_FRAMEWORK, VALID_TAGS, VALID_REMARKS, null);
         String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Email.class.getSimpleName());
         assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
     }
@@ -88,7 +88,7 @@ public void toModelType_nullEmail_throwsIllegalValueException() {
     public void toModelType_invalidFaculty_throwsIllegalValueException() {
         JsonAdaptedPerson person =
                 new JsonAdaptedPerson(VALID_NAME, VALID_EMAIL, INVALID_FACULTY, VALID_MAJOR,
-                        VALID_SKILLS, VALID_LANGUAGES, VALID_FRAMEWORK, VALID_TAGS, VALID_REMARKS);
+                        VALID_SKILLS, VALID_LANGUAGES, VALID_FRAMEWORK, VALID_TAGS, VALID_REMARKS, null);
         String expectedMessage = Faculty.MESSAGE_CONSTRAINTS;
         assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
     }
@@ -97,7 +97,7 @@ public void toModelType_invalidFaculty_throwsIllegalValueException() {
     public void toModelType_nullFaculty_throwsIllegalValueException() {
         JsonAdaptedPerson person =
                 new JsonAdaptedPerson(VALID_NAME, VALID_EMAIL, null, VALID_MAJOR,
-                        VALID_SKILLS, VALID_LANGUAGES, VALID_FRAMEWORK, VALID_TAGS, VALID_REMARKS);
+                        VALID_SKILLS, VALID_LANGUAGES, VALID_FRAMEWORK, VALID_TAGS, VALID_REMARKS, null);
         String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Faculty.class.getSimpleName());
         assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
     }
@@ -106,7 +106,7 @@ public void toModelType_nullFaculty_throwsIllegalValueException() {
     public void toModelType_invalidMajor_throwsIllegalValueException() {
         JsonAdaptedPerson person =
                 new JsonAdaptedPerson(VALID_NAME, VALID_EMAIL, VALID_FACULTY, INVALID_MAJOR,
-                        VALID_SKILLS, VALID_LANGUAGES, VALID_FRAMEWORK, VALID_TAGS, VALID_REMARKS);
+                        VALID_SKILLS, VALID_LANGUAGES, VALID_FRAMEWORK, VALID_TAGS, VALID_REMARKS, null);
         String expectedMessage = Major.MESSAGE_CONSTRAINTS;
         assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
     }
@@ -115,7 +115,7 @@ public void toModelType_invalidMajor_throwsIllegalValueException() {
     public void toModelType_nullMajor_throwsIllegalValueException() {
         JsonAdaptedPerson person =
                 new JsonAdaptedPerson(VALID_NAME, VALID_EMAIL, VALID_FACULTY, null,
-                        VALID_SKILLS, VALID_LANGUAGES, VALID_FRAMEWORK, VALID_TAGS, VALID_REMARKS);
+                        VALID_SKILLS, VALID_LANGUAGES, VALID_FRAMEWORK, VALID_TAGS, VALID_REMARKS, null);
         String expectedMessage = String.format(MISSING_FIELD_MESSAGE_FORMAT, Major.class.getSimpleName());
         assertThrows(IllegalValueException.class, expectedMessage, person::toModelType);
     }
@@ -126,7 +126,7 @@ public void toModelType_invalidTags_throwsIllegalValueException() {
         List<JsonAdaptedTag> invalidTags = new ArrayList<>(VALID_TAGS);
         invalidTags.add(new JsonAdaptedTag(INVALID_TAG));
         JsonAdaptedPerson person = new JsonAdaptedPerson(VALID_NAME, VALID_EMAIL, VALID_FACULTY, VALID_MAJOR,
-                VALID_SKILLS, VALID_LANGUAGES, VALID_FRAMEWORK, invalidTags, VALID_REMARKS);
+                VALID_SKILLS, VALID_LANGUAGES, VALID_FRAMEWORK, invalidTags, VALID_REMARKS, null);
         assertThrows(IllegalValueException.class, person::toModelType);
     }