Merge pull request #254 from AY2324S1-CS2103T-T10-3/revert-252-branch…

…-v1.4
AY2324S1-CS2103T-T10-3 · Nov 11, 2023 · 3f914c8 · 3f914c8
2 parents 4614e24 + 5f26e40
commit 3f914c8
Show file tree

Hide file tree

Showing 14 changed files with 107 additions and 1,813 deletions.
diff --git a/src/main/java/seedu/address/logic/commands/GroupRemarkCommand.java b/src/main/java/seedu/address/logic/commands/GroupRemarkCommand.java
@@ -66,6 +66,6 @@ public boolean equals(Object other) {
         // state check
         GroupRemarkCommand e = (GroupRemarkCommand) other;
         return groupRemark.equals(e.groupRemark)
-                && groupName.equals(e.groupName);
+                && groupRemark.equals(e.groupName);
     }
 }
diff --git a/src/main/java/seedu/address/logic/commands/ListTimeGroupCommand.java b/src/main/java/seedu/address/logic/commands/ListTimeGroupCommand.java
@@ -17,13 +17,7 @@ public class ListTimeGroupCommand extends ListTimeCommand {
             + "Please provide the group's full name as in the existing contactlist.";
     private final Group group;
 
-    /**
-     * Constructor of ListTimeGroupCommand
-     *
-     * @param group Group to list time for.
-     */
     public ListTimeGroupCommand(Group group) {
-        requireNonNull(group);
         this.group = group;
     }
     @Override

diff --git a/src/main/java/seedu/address/logic/commands/ListTimePersonCommand.java b/src/main/java/seedu/address/logic/commands/ListTimePersonCommand.java
@@ -17,13 +17,7 @@ public class ListTimePersonCommand extends ListTimeCommand {
             + "Please provide the person's full name as in the existing contactlist.";
     private final Name personName;
 
-    /**
-     * Constructor of ListTimePersonCommand
-     *
-     * @param personName Name of person to list time for.
-     */
     public ListTimePersonCommand(Name personName) {
-        requireNonNull(personName);
         this.personName = personName;
     }
 

diff --git a/src/main/java/seedu/address/logic/commands/UngroupPersonCommand.java b/src/main/java/seedu/address/logic/commands/UngroupPersonCommand.java
@@ -55,13 +55,12 @@ public boolean equals(Object other) {
             return true;
         }
 
-        if (!(other instanceof UngroupPersonCommand)) {
+        if (!(other instanceof GroupPersonCommand)) {
             return false;
         }
 
         UngroupPersonCommand otherUngroupPersonCommand = (UngroupPersonCommand) other;
-        return this.personName.equals(otherUngroupPersonCommand.personName)
-                && this.groupName.equals(otherUngroupPersonCommand.groupName);
+        return this.equals(otherUngroupPersonCommand);
 
     }
 

diff --git a/src/test/java/seedu/address/logic/commands/AddGroupMeetingTimeCommandTest.java b/src/test/java/seedu/address/logic/commands/AddGroupMeetingTimeCommandTest.java