Merge pull request nus-cs2103-AY2021S1#71 from T-Fang/Update-Participation-Class

Update Participation class and create corresponding methods in Project

Author: GeNiaaz

docs/team/T-Fang.md

@@ -13,11 +13,19 @@ Taskmania (based off AB3) is a **desktop app for a project leader to manage team
 Given below are my contributions to the project.
 
 * **Model modification**: Added basic dependencies of Participation.
-  * What it means: basic management of participations.
+  * What it means: basic management of Participation.
   * What changes made: 
     * added dependencies of it in and related collections;
     * added related test cases.
 
+* **Model modification**: Update Participation class and create corresponding methods in Project. (Pull request: Pull request [\#71](https://github.com/AY2021S1-CS2103T-W10-3/tp/pull/71))
+  * What it means: Participation class is updated after creation of Meeting class and Task class
+  * What changes made: 
+    * avoided cyclic dependencies between Participation class and Meeting class
+      * Meeting class no longer keeps track of its assignees.
+      * Added methods in Participation and Project to get assignees of a specific meeting. 
+    * Added more methods in Participation.
+
 * **New Feature**: 
 
 * **Code contributed**: [RepoSense link](https://nus-cs2103-ay2021s1.github.io/tp-dashboard/#breakdown=true&search=&sort=groupTitle&sortWithin=title&since=2020-08-14&timeframe=commit&mergegroup=&groupSelect=groupByRepos&checkedFileTypes=docs~functional-code~test-code~other&tabOpen=true&tabType=authorship&zFR=false&tabAuthor=T-Fang&tabRepo=AY2021S1-CS2103T-W10-3%2Ftp%5Bmaster%5D&authorshipIsMergeGroup=false&authorshipFileTypes=docs~functional-code~test-code)
@@ -29,8 +37,9 @@ Given below are my contributions to the project.
 * **Documentation**:
   * User Guide:
     * Added documentation for basic task-related features.
+    * Came up with the first draft of feature list.
   * Developer Guide:
-    * Wrote first draft of non-functional requirements.
+    * Wrote first draft of non-functional requirements. (Pull Request [\#54](https://github.com/AY2021S1-CS2103T-W10-3/tp/pull/54))
 
 * **Community**:
   * Updated `README.md` for team repository.

src/main/java/seedu/address/model/meeting/Meeting.java

@@ -2,9 +2,6 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.temporal.Temporal;
-import java.util.ArrayList;
-
-import seedu.address.model.person.Person;
 
 public class Meeting {
     private String name;
@@ -17,7 +14,6 @@ public class Meeting {
     private LocalDate endDate;
     private String note;
     private boolean isDone;
-    private ArrayList<Person> attendees = new ArrayList<>();
 
     /**
      * Constructor for meeting.
@@ -36,17 +32,10 @@ public void done() {
         isDone = true;
     }
 
-    public ArrayList<Person> getAttendees() {
-        return attendees;
-    }
-
     public String getName() {
         return name;
     }
 
-    public void addAttendee(Person person) {
-        attendees.add(person);
-    }
 
     public String getDescription() {
         return description;

src/main/java/seedu/address/model/project/Participation.java

@@ -33,19 +33,65 @@ public Participation(Person person, Project project) {
     }
 
     /**
-     * indicates attendance for the meeting
+     * Alternative constructor that allows specifying the role of the person
+     */
+    public Participation(Person person, Project project, Role role) {
+        this.person = person;
+        this.project = project;
+        this.role = role;
+        tasks = new HashSet<>();
+        meetings = new HashSet<>();
+    }
+    public void changeRole(Role role) {
+        this.role = role;
+    }
+    /**
+     * Indicates attendance for the meeting.
      *
      * @param meeting meeting to attend
      */
     public void attends(Meeting meeting) {
-        meeting.addAttendee(person);
         meetings.add(meeting);
-        project.getMeetings().add(meeting);
+        project.addMeeting(meeting);
     }
 
-    enum Role {
-        LEADER, MEMBER;
+    /**
+     * Assigns task to the person
+     * @param task  task to be assigned
+     */
+    public void addTask(Task task) {
+        tasks.add(task);
+        project.addTask(task);
     }
+    /**
+     * Checks whether the person is an attendee of the meeting.
+     * @param meeting   meeting to check
+     * @return  true if the person is an attendee of the meeting, and false otherwise
+     */
+    public boolean isAttendeeOf(Meeting meeting) {
+        return meetings.contains(meeting);
+    }
+
+    /**
+     * Checks whether the person has the given task.
+     * @param task  the task to check
+     * @return  true if the person is assigned to do the task, and false otherwise.
+     */
+    public boolean hasTask(Task task) {
+        return tasks.contains(task);
+    }
+    public Person getPerson() {
+        return person;
+    }
+    public Project getProject() {
+        return project;
+    }
+    public Role getRole() {
+        return role;
+    }
+}
 
+enum Role {
+    LEADER, MEMBER;
 }
 

src/main/java/seedu/address/model/project/Project.java

@@ -5,6 +5,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 
@@ -66,7 +67,23 @@ public Address getAddress() {
     public Set<Meeting> getMeetings() {
         return meetings;
     }
+    public boolean addMeeting(Meeting meeting) {
+        return meetings.add(meeting);
+    }
+    public boolean addTask(Task task) {
+        return tasks.add(task);
+    }
 
+    /**
+     * Gets all attendees of a specific meeting
+     */
+    public Set<Person> getAttendeesOfMeeting(Meeting meeting) {
+        HashSet<Person> attendees = new HashSet<Person>();
+        for (Map.Entry<PersonName, Participation> entry: listOfParticipations.entrySet()) {
+            attendees.add(entry.getValue().getPerson());
+        }
+        return attendees;
+    }
     /**
      * Returns an immutable tag set, which throws {@code UnsupportedOperationException}
      * if modification is attempted.