From 84b7df8a58da5a70052798fc755e04256c2e20b0 Mon Sep 17 00:00:00 2001
From: Hanming Zhu <hanming@huawen.com>
Date: Fri, 3 Apr 2020 11:27:38 +0800
Subject: [PATCH] fix: fix event comparison logic

---
 src/main/java/modulo/logic/parser/ParserUtil.java | 4 ++--
 src/main/java/modulo/model/event/Event.java       | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/modulo/logic/parser/ParserUtil.java b/src/main/java/modulo/logic/parser/ParserUtil.java
index 1f23b9b4724..77ff4080f2e 100644
--- a/src/main/java/modulo/logic/parser/ParserUtil.java
+++ b/src/main/java/modulo/logic/parser/ParserUtil.java
@@ -165,9 +165,9 @@ public static EventType parseEventType(String eventType) throws ParseException {
      */
     public static DisplayableType parseDisplayableType(String displayableType) throws ParseException {
         String cleanedDisplayableType = displayableType.toLowerCase().trim();
-        if (cleanedDisplayableType.equals("m") || cleanedDisplayableType.equals("module")) {
+        if (cleanedDisplayableType.equals("m") || cleanedDisplayableType.contains("module")) {
             return DisplayableType.MODULE;
-        } else if (cleanedDisplayableType.equals("e") || cleanedDisplayableType.equals("event")) {
+        } else if (cleanedDisplayableType.equals("e") || cleanedDisplayableType.contains("event")) {
             return DisplayableType.EVENT;
         }
         throw new ParseException(MESSAGE_INVALID_DISPLAYABLE_TYPE);
diff --git a/src/main/java/modulo/model/event/Event.java b/src/main/java/modulo/model/event/Event.java
index 7366df15c25..a9bb277110b 100644
--- a/src/main/java/modulo/model/event/Event.java
+++ b/src/main/java/modulo/model/event/Event.java
@@ -111,7 +111,6 @@ public void removeDeadline(Deadline deadline) {
 
     /**
      * Removes all deadlines from the list of deadlines.
-     *
      */
     public void removeAllDeadlines() {
         deadlines.clear();
@@ -143,6 +142,7 @@ public boolean isSameEvent(Event otherEvent) {
         return otherEvent != null
                 && otherEvent.getName().toString().toLowerCase().equals(getName().toString().toLowerCase())
                 && otherEvent.getParentModule().getModuleCode().equals(getParentModule().getModuleCode())
+                && otherEvent.getParentModule().getAcademicYear().equals(getParentModule().getAcademicYear())
                 && otherEvent.getEventType().equals(getEventType());
     }
 
@@ -158,7 +158,8 @@ public boolean isSameCategoryOfEvents(Event otherEvent) {
         }
 
         return otherEvent.getEventType().equals(getEventType())
-                && otherEvent.getParentModule().getModuleCode().equals(getParentModule().getModuleCode());
+                && otherEvent.getParentModule().getModuleCode().equals(getParentModule().getModuleCode())
+                && otherEvent.getParentModule().getAcademicYear().equals(getParentModule().getAcademicYear());
     }
 
     /**