- Implementation of calendar into flashcard component to increment flashcard review count for calendar goal events

Author: Cheezeblokz

data/events/event.txt

@@ -1,4 +1,4 @@
 hello | 2023-12-20T12:30:30 | 2023-12-20T12:30:30 
 EC3333 | 2023-12-20T12:30:30 | 2023-12-20T12:30:40 
-Deadline | 2023-12-20T12:30:30 | 10 | 0 
-More Deadline | 2023-12-20T12:30:30 | 20 | 0 
+Deadline | 2023-12-20T12:30:30 | 10 | 1 
+More Deadline | 2023-12-20T12:30:30 | 20 | 1 

src/main/java/seedu/duke/Duke.java

@@ -2,6 +2,7 @@
 
 package seedu.duke;
 
+import seedu.duke.calendar.Calendar;
 import seedu.duke.calendar.CalendarManager;
 import seedu.duke.flashcard.FlashcardComponent;
 
@@ -16,8 +17,9 @@ public static void main(String[] args) {
     }
 
     private void run() {
-        FlashcardComponent fc = new FlashcardComponent();
-        CalendarManager cm = new CalendarManager(new ArrayList<>());
+        Calendar calendar = new Calendar();
+        FlashcardComponent fc = new FlashcardComponent(calendar);
+        CalendarManager cm = new CalendarManager(calendar, new ArrayList<>());
 
         Scanner scanner = new Scanner(System.in);
         String input;

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

@@ -9,7 +9,10 @@ public class Calendar {
      */
     EventList eventList;
 
-    public Calendar(EventList eventList) {
+    public Calendar() {
+    }
+
+    public void setEventList(EventList eventList) {
         this.eventList = eventList;
     }
 

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

@@ -25,7 +25,7 @@ public class CalendarManager {
      * @param events is used to initialize the EventList.
      */
 
-    public CalendarManager(ArrayList<Event> events) {
+    public CalendarManager(Calendar calendar, ArrayList<Event> events) {
 
         EventDirectory eventdirectory = new EventDirectory();
         eventdirectory.listEventFiles();
@@ -39,7 +39,8 @@ public CalendarManager(ArrayList<Event> events) {
             eventList = new EventList(events);
         }
 
-        calendar = new Calendar(eventList);
+        calendar.setEventList(eventList);
+        this.calendar = calendar;
         calendarUi = new CalendarUi(eventList);
         calendarCommandParser = new CalendarCommandParser();
         scanner = new Scanner(System.in);

src/main/java/seedu/duke/flashcard/FlashcardCommandParser.java

@@ -2,6 +2,7 @@
 
 package seedu.duke.flashcard;
 
+import seedu.duke.calendar.Calendar;
 import seedu.duke.flashcard.command.FlashcardCommand;
 import seedu.duke.flashcard.command.CreateFlashcardCommand;
 import seedu.duke.flashcard.command.ListFlashcardsCommand;
@@ -21,7 +22,7 @@ public class FlashcardCommandParser {
      * @param input The text inputted by the user.
      * @return The FlashcardCommand corresponding to input
      */
-    public FlashcardCommand parseInput(String input) {
+    public FlashcardCommand parseInput(String input, Calendar calendar) {
         assert input != null : "input is null";
 
         input = input.toLowerCase().strip();
@@ -31,7 +32,7 @@ public FlashcardCommand parseInput(String input) {
         } else if (input.equals("list flashcards")) {
             return new ListFlashcardsCommand();
         } else if (input.startsWith("review flashcards")) {
-            return new StartReviewCommand(input);
+            return new StartReviewCommand(input, calendar);
         } else if (input.equals("delete all flashcards")) {
             return new DeleteAllFlashcardsCommand();
         } else if (input.startsWith("delete flashcard")) {

src/main/java/seedu/duke/flashcard/FlashcardComponent.java

@@ -2,6 +2,7 @@
 
 package seedu.duke.flashcard;
 
+import seedu.duke.calendar.Calendar;
 import seedu.duke.flashcard.command.FlashcardCommand;
 import seedu.duke.flashcard.command.UnknownCommand;
 import seedu.duke.storage.FlashcardStorage;
@@ -18,9 +19,10 @@ public class FlashcardComponent {
     private FlashcardList flashcardList;
     private FlashcardUi ui;
     private FlashcardStorage storage;
+    private Calendar calendar;
 
     //@@author junhyeong0411
-    public FlashcardComponent() {
+    public FlashcardComponent(Calendar calendar) {
         parser = new FlashcardCommandParser();
 
         FlashcardDirectory flashcarddirectory = new FlashcardDirectory();
@@ -36,6 +38,7 @@ public FlashcardComponent() {
 
         Flashcard.calculateAndUpdateGlobalMaxId(flashcardList);
         ui = new FlashcardUi(flashcardList);
+        this.calendar = calendar;
     }
 
     public FlashcardStorage getStorage(){
@@ -63,7 +66,7 @@ public FlashcardUi getUi(){
      * @return Whether FlashcardComponent is responsible for handling the input.
      */
     public boolean isResponsible(String input) {
-        FlashcardCommand command = parser.parseInput(input);
+        FlashcardCommand command = parser.parseInput(input, calendar);
 
         if (command instanceof UnknownCommand) {
             return false;
@@ -78,7 +81,7 @@ public boolean isResponsible(String input) {
      * @param input The text inputted by the user.
      */
     public void processInput(String input) {
-        FlashcardCommand command = parser.parseInput(input);
+        FlashcardCommand command = parser.parseInput(input, calendar);
         assert !(command instanceof UnknownCommand) : "Command cannot be " +
                 "unknown";
 

src/main/java/seedu/duke/flashcard/command/StartReviewCommand.java

@@ -2,6 +2,7 @@
 
 package seedu.duke.flashcard.command;
 
+import seedu.duke.calendar.Calendar;
 import seedu.duke.flashcard.FlashcardList;
 import seedu.duke.flashcard.review.RandomReviewMode;
 import seedu.duke.flashcard.review.ReviewMode;
@@ -14,9 +15,11 @@
 public class StartReviewCommand extends DualFlashcardCommand {
     private final ArrayList<String> choices = new ArrayList<>(Arrays.asList(
             "a", "b"));
+    private Calendar calendar;
 
-    public StartReviewCommand(String input) {
+    public StartReviewCommand(String input, Calendar calendar) {
         this.input = input;
+        this.calendar = calendar;
         beginnerCommandLength = 2;
         expertCommandLength = 3;
         syntaxString = "review flashcards REVIEW_MODE";
@@ -70,7 +73,7 @@ private void startReview(Scanner scanner,
                              String choice) {
         ReviewMode reviewMode = createReviewMode(choice.toLowerCase(), flashcardList);
 
-        reviewMode.startReviewSession(scanner);
+        reviewMode.startReviewSession(scanner, calendar);
 
     }
 

src/main/java/seedu/duke/flashcard/review/ReviewMode.java

@@ -2,6 +2,7 @@
 
 package seedu.duke.flashcard.review;
 
+import seedu.duke.calendar.Calendar;
 import seedu.duke.flashcard.Flashcard;
 import seedu.duke.flashcard.FlashcardList;
 
@@ -18,7 +19,7 @@ public ReviewMode(FlashcardList flashcardList) {
 
     public abstract String getReviewModeName();
 
-    public void startReviewSession(Scanner scanner) {
+    public void startReviewSession(Scanner scanner, Calendar calendar) {
         System.out.println("    You have started a review session in "
                 + getReviewModeName() + System.lineSeparator());
 
@@ -45,6 +46,7 @@ public void startReviewSession(Scanner scanner) {
             if (getReviewModeName().equals("spaced repetition mode")) {
                 letUserRateReviewDifficulty(scanner, flashcardToReview);
             }
+            calendar.incrementFlashcardCount();
         }
 
         System.out.println("    Success! You have ended this review session.");

src/test/java/seedu/duke/DukeTest.java

@@ -4,6 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
 import org.junit.jupiter.api.Test;
+import seedu.duke.calendar.Calendar;
 import seedu.duke.calendar.CalendarManager;
 import seedu.duke.storage.EventStorage;
 import seedu.duke.flashcard.FlashcardComponent;
@@ -25,7 +26,7 @@ public void sampleTest() {
 
     @Test
     public void testFlashcardComponent_isResponsible_notResponsible() {
-        FlashcardComponent flashcardComponent = new FlashcardComponent();
+        FlashcardComponent flashcardComponent = new FlashcardComponent(new Calendar());
 
         assertFalse(flashcardComponent.isResponsible("dfdfdfdfdf"));
         assertFalse(flashcardComponent.isResponsible("help me"));
@@ -34,7 +35,7 @@ public void testFlashcardComponent_isResponsible_notResponsible() {
 
     @Test
     public void testFlashcardComponent_isResponsible_responsible() {
-        FlashcardComponent flashcardComponent = new FlashcardComponent();
+        FlashcardComponent flashcardComponent = new FlashcardComponent(new Calendar());
 
         assertTrue(flashcardComponent.isResponsible("create flashcard"));
         assertTrue(flashcardComponent.isResponsible("create flashcard  "));
@@ -43,14 +44,14 @@ public void testFlashcardComponent_isResponsible_responsible() {
 
     @Test
     public void testFlashcardStorage_isAvailable(){
-        FlashcardComponent flashcardComponent = new FlashcardComponent();
+        FlashcardComponent flashcardComponent = new FlashcardComponent(new Calendar());
         FlashcardStorage storage = flashcardComponent.getStorage();
         assertTrue(storage.isStorageAvailable());
     }
 
     @Test
     public void testEventStorage_isAvailable(){
-        CalendarManager calendarManager = new CalendarManager(new ArrayList<>());
+        CalendarManager calendarManager = new CalendarManager(new Calendar(), new ArrayList<>());
         EventStorage storage = calendarManager.getStorage();
         assertTrue(storage.isStorageAvailable());
     }
@@ -65,7 +66,7 @@ public void testFlashcardStorage_isSavingCorrectly(){
 
         Scanner scanner = new Scanner(System.in);
 
-        FlashcardComponent flashcardComponent = new FlashcardComponent();
+        FlashcardComponent flashcardComponent = new FlashcardComponent(new Calendar());
         FlashcardStorage storage = flashcardComponent.getStorage();
 
         FlashcardUi ui = flashcardComponent.getUi();