Merge branch 'master' of https://github.com/AY2324S1-CS2113-F11-3/tp

* 'master' of https://github.com/AY2324S1-CS2113-F11-3/tp:
  Resolve Codestyle Error
  Added some Test

# Conflicts:
#	src/main/java/seedu/duke/calendar/EventList.java

Author: Brian030601

data/flashcards/flashcard.txt

@@ -1 +1,2 @@
 2 | d | a | - | 2023-11-02T00:03:45.242754100 # MODERATE/2023-11-02T00:03:47.250188600 # EASY/2023-11-02T00:03:49.267332500 # HARD/2023-11-02T00:16:31.511531100 # MODERATE/2023-11-02T00:18:58.600168500 # MODERATE/2023-11-02T00:19:05.649443900 # MODERATE | -
+4 | Hello | Duke | - | - | -

docs/Diagrams/FlashcardStorage.puml

@@ -0,0 +1,5 @@
+@startuml
+activate FlashcardStorage
+
+
+@enduml

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

@@ -23,7 +23,7 @@ public CalendarManager(ArrayList<Event> events) {
         EventDirectory eventdirectory = new EventDirectory();
         eventdirectory.listEventFiles();
 
-        storage = new EventStorage("./data/events/event.txt");
+        storage = new EventStorage(eventdirectory.defaultDirectory());
 
         try{
             eventList = storage.loadEvents();

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

@@ -40,6 +40,7 @@ public void deleteEvent(String name) {
     public void deleteAllEvents() {
         eventList.clear();
     }
+
     @Override
     public String toString() {
         return "EventStorage{" +

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

@@ -16,12 +16,12 @@
  * One storage manages one file
  */
 public class EventStorage {
-    private static Logger flashlogger; // for logging
+    private static Logger logger; // for logging
     protected String path;
 
     public EventStorage(String path){
         this.path = path;
-        flashlogger = Logger.getLogger("flash");
+        logger = Logger.getLogger("flash");
     }
 
 
@@ -63,7 +63,7 @@ public EventList loadEvents() throws FileNotFoundException{
             eventList.addEvent(loadEvent(eventTokens));
         }
 
-        flashlogger.log(Level.INFO, String.format(
+        logger.log(Level.INFO, String.format(
                 "    There are currently %d events in the savefile",
                 eventList.getSize()));
         //System.out.println(String.format(
@@ -74,6 +74,11 @@ public EventList loadEvents() throws FileNotFoundException{
 
     }
 
+    /**
+     * saveEvents method
+     * save all events to file
+     * @param eventList
+     */
     public void saveEvents(ArrayList<Event> eventList) {
 
         try {
@@ -86,7 +91,8 @@ public void saveEvents(ArrayList<Event> eventList) {
             }
             fw.close();
         } catch (IOException e){
-            System.out.println("Failed to save.");
+            //System.out.println("Failed to save.");
+            logger.log(Level.WARNING, "problem: failed to save");
         }
     }
 

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

@@ -22,7 +22,7 @@ public FlashcardComponent() {
         FlashcardDirectory flashcarddirectory = new FlashcardDirectory();
         flashcarddirectory.listFlashcardFiles();
 
-        storage = new FlashcardStorage("./data/flashcards/flashcard.txt");
+        storage = new FlashcardStorage(flashcarddirectory.defaultDirectory());
         try {
             flashcardList = storage.loadFlashcards();
         } catch (FileNotFoundException e){
@@ -40,6 +40,19 @@ public FlashcardStorage getStorage(){
         return this.storage;
     }
 
+    public FlashcardList getFlashcardList(){
+        return this.flashcardList;
+    }
+
+    /**
+     * get FlashcardUi method
+     * for test
+     * @return
+     */
+    public FlashcardUi getUi(){
+        return ui;
+    }
+
     //@@author wendelinwemhoener
     public boolean isResponsible(String input) {
         FlashcardCommand command = parser.parseInput(input);

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

@@ -64,7 +64,12 @@ public FlashcardList loadFlashcards() throws FileNotFoundException{
 
     }
 
-    public void saveFlashcards(ArrayList<Flashcard> flashcardList) {
+    /**
+     * saveFlashcards method
+     * save all flashcard data to file
+     * @param flashcardList
+     */
+    public boolean saveFlashcards(ArrayList<Flashcard> flashcardList) {
 
         try {
             FileWriter fw = new FileWriter(path);
@@ -85,9 +90,11 @@ public void saveFlashcards(ArrayList<Flashcard> flashcardList) {
                         id, frontText, backText, reviews));
             }
             fw.close();
+            return true;
         } catch (IOException e){
             //System.out.println("Failed to save.");
             flashlogger.log(Level.WARNING, "problem: failed to save");
+            return false;
         }
     }
 

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

@@ -18,4 +18,13 @@ public FlashcardUi(FlashcardList flashcardList) {
     public void executeCommand(FlashcardCommand command) {
         command.execute(scanner, flashcardList);
     }
+
+    /**
+     * Set scanner method
+     * for using bytearrayinputstream in test
+     * @param scanner
+     */
+    public void setScanner(Scanner scanner){
+        this.scanner = scanner;
+    }
 }

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

@@ -4,8 +4,18 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
 import org.junit.jupiter.api.Test;
+import seedu.duke.calendar.CalendarManager;
+import seedu.duke.calendar.EventStorage;
 import seedu.duke.flashcard.FlashcardComponent;
+import seedu.duke.flashcard.FlashcardList;
 import seedu.duke.flashcard.FlashcardStorage;
+import seedu.duke.flashcard.FlashcardUi;
+
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Scanner;
 
 class DukeTest {
     @Test
@@ -38,6 +48,37 @@ public void testFlashcardStorage_isAvailable(){
         assertTrue(storage.isStorageAvailable());
     }
 
+    @Test
+    public void testEventStorage_isAvailable(){
+        CalendarManager calendarManager = new CalendarManager(new ArrayList<>());
+        EventStorage storage = calendarManager.getStorage();
+        assertTrue(storage.isStorageAvailable());
+    }
+
+    @Test
+    public void testFlashcardStorage_isSavingCorrectly(){
+        String input = "create flashcard\n";
+        input += "Hello\n";
+        input += "Duke\n";
+        InputStream in = new ByteArrayInputStream(input.getBytes());
+        System.setIn(in);
+
+        Scanner scanner = new Scanner(System.in);
+
+        FlashcardComponent flashcardComponent = new FlashcardComponent();
+        FlashcardStorage storage = flashcardComponent.getStorage();
+
+        FlashcardUi ui = flashcardComponent.getUi();
+        ui.setScanner(scanner);
+
+        flashcardComponent.processInput(scanner.nextLine());
+
+        FlashcardList flashcardList = flashcardComponent.getFlashcardList();
+
+        assertTrue(storage.saveFlashcards(flashcardList.getFlashcards()));
+    }
+
+
     @Test
     public void testCalendar() {
         assertTrue(true);