Fixed admin deletion, added in gateway to constructor of DeletionScreen, close windows after moving on to next steps of search, added error message for empty database.

Author: winstonc03

src/main/java/MainPage/FlashcardSetDataPanel.java

@@ -54,7 +54,7 @@ public FlashcardSetDataPanel(String title, String description,
             DelFlashcardSetOutputBoundary presenter = new DelFlashcardSetPresenter();
             DelFlashcardSetInputBoundary interactor = new DelFlashcardSetInteractor(gateway, presenter);
             DelFlashcardSetController controller = new DelFlashcardSetController(interactor);
-            new DeletionScreen(flashcardSetId, controller, user);
+            new DeletionScreen(flashcardSetId, controller, user, gateway);
         });
 
         this.add(buttons);

src/main/java/delete_flashcardset_use_case/DeletionScreen.java

@@ -1,12 +1,16 @@
 package delete_flashcardset_use_case;
 
 
+import dataAccess.DBGateway;
+import entityRequestModels.CommonUserDsRequestModel;
 import login_and_signup_use_case.UserLoginResponseModel;
 
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Objects;
 
 // Frameworks/Drivers (Blue) layer
@@ -23,6 +27,7 @@ public class DeletionScreen extends JFrame implements ActionListener {
      * The controller
      */
     DelFlashcardSetController controller;
+    DBGateway gateway;
 
 //    /**
 //     * The application
@@ -32,10 +37,12 @@ public class DeletionScreen extends JFrame implements ActionListener {
     /**
      * A window with a title and a JButton.
      */
-    public DeletionScreen(int flashcardSetID, DelFlashcardSetController controller, UserLoginResponseModel user) {
+    public DeletionScreen(int flashcardSetID, DelFlashcardSetController controller, UserLoginResponseModel user,
+                          DBGateway gateway) {
         this.user=user;
         this.flashcardSetID = flashcardSetID;
         this.controller = controller;
+        this.gateway = gateway;
 
         JLabel name = new JLabel("Flashcard Set Deletion Screen");
         name.setAlignmentX(Component.CENTER_ALIGNMENT);
@@ -80,7 +87,16 @@ public void actionPerformed(ActionEvent evt) {
 //                int id = Integer.parseInt(flashcardSetID.getText());  // check input is an integer
 
             // Ask for confirmation
-            String title = user.getFlashcardSets().get(flashcardSetID)[0];
+            String title;
+            // Admin deletion
+            if (user.getFlashcardSets().get(flashcardSetID) == null){
+                title =  gateway.getFlashcardSet(flashcardSetID).getTitle();
+            }
+            else{
+                // User deletion
+                title = user.getFlashcardSets().get(flashcardSetID)[0];
+            }
+
 
             int confirmation = JOptionPane.showConfirmDialog(this,
                     "Delete " + title + "?",

src/main/java/search_use_case/ResultsScreen.java

@@ -88,7 +88,8 @@ public ResultsScreen(SearchResponseModel responseModel, DBGateway gateway, UserL
                 DelFlashcardSetInputBoundary interactor = new DelFlashcardSetInteractor(gateway, presenter);
                 DelFlashcardSetController controller = new DelFlashcardSetController(interactor);
                 new DeletionScreen(responseModel.getResult_set().get(tempX)
-                        .getFlashcardSetId(), controller, user);
+                        .getFlashcardSetId(), controller, user, gateway);
+                this.dispose();
             });
 
             // add elements to the GridLayout

src/main/java/search_use_case/SearchInteractor.java

@@ -90,15 +90,15 @@ public SearchResponseModel create(SearchRequestModel requestModel) throws IOExce
             SearchResponseModel searchResponseModel = new SearchResponseModel(result_set);
             return presenter.prepareSuccessView(searchResponseModel);
         }
+        if (tags.size() > 0 && !input.equals("")){
+            return presenter.prepareFailView("There are currently no FlashcardSets in the database.");
+        }
         // User chooses no tags
         if (tags.size() == 0){
             return presenter.prepareFailView("Please select at least 1 tag.");
         }
         // User provides no input
-        if (input.equals("")){
-            return presenter.prepareFailView("Please enter a keyword to search.");
-        }
+        return presenter.prepareFailView("Please enter a keyword to search.");
         // User search unsuccessful
-        return presenter.prepareFailView("No Flashcard Sets matched your search criteria, please try again.");
     }
 }

src/main/java/search_use_case/SearchScreen.java

@@ -64,6 +64,7 @@ public SearchScreen(SearchController search_controller, DBGateway gateway, UserL
                 SearchRequestModel requestModel = new SearchRequestModel(s1, selected_tags, curr_user);
                 new ResultsScreen(search_controller.create(requestModel),
                         gateway, curr_user);
+                this.dispose();
             }
             catch (Exception x){
                 JOptionPane.showMessageDialog(this, x.getMessage());
@@ -80,6 +81,7 @@ public SearchScreen(SearchController search_controller, DBGateway gateway, UserL
                         selected_tags, curr_user);
                 new ResultsScreen(search_controller.create(requestModel),
                         gateway, curr_user);
+                this.dispose();
             }
             catch (Exception x){
                 JOptionPane.showMessageDialog(this, x.getMessage());