Skip to content

Commit 737fcd5

Browse files
committed
Fix Delete Event Bug
1 parent d798070 commit 737fcd5

File tree

7 files changed

+23
-66
lines changed

7 files changed

+23
-66
lines changed

data/events/event.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
submit v1.0 | 2023-10-29T23:59:59 | 2023-10-30T23:59:59
2-
eat dinner | 2023-12-20T19:00 | 2023-12-20T20:00
3-
Do HW | 2023-12-20T12:30:30 | 2023-12-20T12:30:30
1+
Plan Trip | 2023-12-20T12:30:30 | 2023-12-20T12:30:30

src/main/java/seedu/duke/calendar/CalendarCommandParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public EventCommand parseInput(String input) {
1515
assert input != null : "input is null";
1616

1717
if (input.startsWith("add event")) {
18-
return new AddEventCommand(input);
18+
return new AddEventCommand();
1919
} else if (input.startsWith("delete event")) {
2020
return new DeleteEventCommand();
2121
} else if (input.startsWith("list events")) {

src/main/java/seedu/duke/calendar/EventList.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,15 @@ public void findEvent(String keyword) {
3333
}
3434
}
3535

36-
public void deleteEvent(String name) {
37-
eventList.removeIf(event -> event.getName().equals(name));
36+
public int deleteEvent(String name) {
37+
int size = eventList.size();
38+
if (size > 0) {
39+
eventList.removeIf(event -> event.getName().equals(name));
40+
} else {
41+
System.out.println("The Calendar is empty");
42+
}
43+
44+
return size;
3845
}
3946

4047
public void deleteAllEvents() {

src/main/java/seedu/duke/calendar/command/AddEventCommand.java

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,8 @@
88
import java.util.Scanner;
99
import java.time.LocalDateTime;
1010

11-
public class AddEventCommand extends DualEventCommand {
12-
13-
public AddEventCommand(String input) {
14-
this.input = input;
15-
beginnerCommandLength = 2;
16-
expertCommandLength = 5;
17-
syntaxString = "add event EVENT_NAME EVENT_START_DATE (in format yyyy-mm-ddThh:mm:ss) EVENT_END_DATE (in format yyyy-mm-ddThh:mm:ss)";
18-
}
19-
20-
@Override
21-
protected void executeBeginnerMode(Scanner scanner, EventList eventList) {
11+
public class AddEventCommand extends EventCommand {
12+
public void execute(Scanner scanner, EventList eventList) {
2213
System.out.print("What's the event?: ");
2314
String eventName = scanner.nextLine();
2415
System.out.print("When does it start? (yyyy-mm-ddThh:mm:ss) (eg. 2023-12-20T12:30:30): ");
@@ -32,20 +23,4 @@ protected void executeBeginnerMode(Scanner scanner, EventList eventList) {
3223

3324
System.out.println(event + " has been added to your Calendar");
3425
}
35-
36-
//@@author Cheezeblokz
37-
@Override
38-
protected void executeExpertMode(Scanner scanner, EventList eventList) {
39-
40-
String[] commandParts = input.split(" ");
41-
String eventName = commandParts[2];
42-
LocalDateTime startTime = LocalDateTime.parse(commandParts[3]);
43-
LocalDateTime endTime = LocalDateTime.parse(commandParts[4]);
44-
45-
Event event = new Event(eventName, startTime, endTime);
46-
47-
eventList.addEvent(event);
48-
49-
System.out.println(event + " has been added to your Calendar");
50-
}
5126
}

src/main/java/seedu/duke/calendar/command/DeleteEventCommand.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,22 @@
33
package seedu.duke.calendar.command;
44

55
import seedu.duke.calendar.EventList;
6+
import seedu.duke.calendar.Event;
67

78
import java.util.Scanner;
89

910
public class DeleteEventCommand extends EventCommand{
1011
public void execute(Scanner scanner, EventList eventList) {
12+
int size;
13+
1114
System.out.print("Enter the event name: ");
1215
String eventName = scanner.nextLine();
1316

14-
eventList.deleteEvent(eventName);
15-
System.out.println(eventName + " has been deleted from your Calendar!");
17+
size = eventList.deleteEvent(eventName);
18+
if (size > eventList.getSize()) {
19+
System.out.println(" " + eventName + " has been deleted from your Calendar!");
20+
} else if (size != 0 && size == eventList.getSize()) {
21+
System.out.println(" " + eventName + " doesn't exist in your Calendar!");
22+
}
1623
}
1724
}

src/main/java/seedu/duke/calendar/command/DualEventCommand.java

Lines changed: 0 additions & 30 deletions
This file was deleted.

src/main/java/seedu/duke/calendar/command/ListCalendarEventsCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public void execute(Scanner scanner, EventList eventList) {
1919
printLine();
2020
}
2121
} else {
22-
System.out.println(" There is no event in your Calendar");
22+
System.out.println(" The Calendar is empty");
2323
}
2424
}
2525

0 commit comments

Comments
 (0)