Merge pull request #60 from CSC207-2022F-UofT/refactor-feature-delete-flashcard-set

Refactored feature: Delete Flashcard Set so that the interactor uses …

Author: lucasprates74

src/main/java/delete_flashcardset_use_case/DelFlashcardSetInteractor.java

@@ -2,6 +2,7 @@
 
 // Use case (Red) layer
 
+import dataAccess.DBGateway;
 import dataAccess.IFlashcardDataAccess;
 import dataAccess.IFlashcardSetDataAccess;
 
@@ -19,12 +20,17 @@
 
 public class DelFlashcardSetInteractor implements DelFlashcardSetInputBoundary {
 
-
-
-    IFlashcardSetDataAccess flashcardSetDataAccess;
-    IFlashcardDataAccess flashcardDataAccess;  // for deleting flashcards associated with the flashcard set
+    DBGateway dbGateway;
+    IFlashcardSetDataAccess flashcardSetDataAccess;  // for testing
+    IFlashcardDataAccess flashcardDataAccess;  // for testing
     DelFlashcardSetOutputBoundary outputBoundary;
 
+    public DelFlashcardSetInteractor(DBGateway dbGateway, DelFlashcardSetOutputBoundary outputBoundary) {
+        this.dbGateway = dbGateway;
+        this.outputBoundary = outputBoundary;
+    }
+
+    // Alternative constructor for testing purposes
     public DelFlashcardSetInteractor(IFlashcardSetDataAccess flashcardSetDataAccess,
                                      IFlashcardDataAccess flashcardDataAccess,
                                      DelFlashcardSetOutputBoundary outputBoundary) {
@@ -36,16 +42,17 @@ public DelFlashcardSetInteractor(IFlashcardSetDataAccess flashcardSetDataAccess,
     @Override
     public DelFlashcardSetResponseModel delete(DelFlashcardSetRequestModel requestModel) {
 
-        if (flashcardSetDataAccess.getFlashcardSet(requestModel.getFlashcardSetId()) == null) {
+        if (dbGateway.getFlashcardSet(requestModel.getFlashcardSetId()) == null) {
             return outputBoundary.prepareFailView("Flashcard set #"
                     + requestModel.getFlashcardSetId() + " doesn't exist.");
         } else {
             // First delete all the flashcards associated with this flashcard set in Flashcards.csv
-            for (int id : flashcardSetDataAccess.getFlashcardSet(requestModel.getFlashcardSetId()).getFlashcardIds()) {
-                flashcardDataAccess.deleteFlashcard(id);
+            for (int id : dbGateway.getFlashcardSetGateway().getFlashcardSet(requestModel.getFlashcardSetId()).getFlashcardIds()) {
+                dbGateway.deleteFlashcard(requestModel.getFlashcardSetId(), id);
             }
             // Then delete the flashcard set in FlashcardSets.csv
-            flashcardSetDataAccess.deleteFlashcardSet(requestModel.getFlashcardSetId());
+            dbGateway.deleteFlashcardSet(dbGateway.getFlashcardSet(requestModel.getFlashcardSetId()).getOwnerUsername(),
+                    requestModel.getFlashcardSetId());
 
             return outputBoundary.prepareSuccessView("Flashcard set #" + requestModel.getFlashcardSetId()
                     + " has been deleted.");

src/main/java/delete_flashcardset_use_case/MainDeleteFlashcardSet.java

@@ -1,9 +1,7 @@
 package delete_flashcardset_use_case;
 
-import dataAccess.FlashcardDataAccess;
-import dataAccess.FlashcardSetDataAccess;
-import dataAccess.IFlashcardDataAccess;
-import dataAccess.IFlashcardSetDataAccess;
+import create_flashcardset_use_case.MainCreateFlashcardSet;
+import dataAccess.*;
 
 import javax.swing.*;
 import java.awt.*;
@@ -22,17 +20,9 @@ public static void main(String[] args) {
         application.add(screens);
 
         // Create the parts to plug into the Use Case+Entities engine
-        IFlashcardSetDataAccess flashcardSetRepo;
-        IFlashcardDataAccess flashcardRepo;
-        try {
-            flashcardSetRepo = new FlashcardSetDataAccess("src/data/FlashcardSets.csv");
-            flashcardRepo = new FlashcardDataAccess("src/data/Flashcards.csv");
-        } catch (IOException e) {
-            throw new RuntimeException("Could not create file.");
-        }
+        DBGateway dbGateway = MainCreateFlashcardSet.dbGatewaySetup();
         DelFlashcardSetOutputBoundary outputBoundary = new DelFlashcardSetPresenter();
-        DelFlashcardSetInputBoundary interactor = new DelFlashcardSetInteractor(flashcardSetRepo, flashcardRepo,
-                outputBoundary);
+        DelFlashcardSetInputBoundary interactor = new DelFlashcardSetInteractor(dbGateway, outputBoundary);
         DelFlashcardSetController controller = new DelFlashcardSetController(
                 interactor
         );

src/test/java/delete_flashcardset_use_case/DelFlashcardSetInteractorTest.java

@@ -167,7 +167,7 @@ public DelFlashcardSetResponseModel prepareFailView(String error) throws Flashca
         // Test part
         try {
             interactor.delete(inputData);  // invalid id should go immediately to catch block (i.e., pass test)
-            assert (false);  // if id exists, then this line is reached and test fails
+            assert(false);  // if id exists, then this line is reached and test fails
         } catch (FlashcardSetNotFound e) {
 
         }