Merge remote-tracking branch 'origin/feature-4-editing-flashcard-set' into feature-5-flashcard-creator-and-remover

Author: Junyu11111

gradlew

@@ -43,6 +43,22 @@ public void saveFlashcardID(int flashcardSetId, int flashcardId) {
         flashcardSets.put(flashcardSetId, newFlashcardSet);
     }
 
+    @Override
+    public void removeFlashcardId(int flashcardSetId, int flashcardId) {
+        FlashcardSetDsRequestModel oldFlashcardSet = flashcardSets.get(flashcardSetId);
+        String title = oldFlashcardSet.getTitle();
+        String description = oldFlashcardSet.getDescription();
+        boolean isPrivate = oldFlashcardSet.getIsPrivate();
+        List<Integer> flashcardIds = oldFlashcardSet.getFlashcardIds();
+        String owner = oldFlashcardSet.getOwnerUsername();
+
+        ArrayList<Integer> newFlashcardIds = new ArrayList<>(flashcardIds);
+        newFlashcardIds.remove(flashcardId);
+        FlashcardSetDsRequestModel newFlashcardSet = new FlashcardSetDsRequestModel(title, description, isPrivate, flashcardSetId, owner, newFlashcardIds);
+
+        flashcardSets.put(flashcardSetId, newFlashcardSet);
+    }
+
     @Override
     public void deleteFlashcardSet(int flashcardSetID) {
         flashcardSets.remove(flashcardSetID);

src/main/java/Editor/FlashcardSet/screens/InMemoryFlashcardSet.java

@@ -1,10 +1,13 @@
 import com.formdev.flatlaf.FlatIntelliJLaf;
 import com.formdev.flatlaf.FlatDarculaLaf;
 
+import loginAndSignupUseCase.loginAndSignupUseCaseScreens.WelcomeScreen;
 import quizUseCase.*;
 import dataAccess.*;
 import quizUseCase.screens.QuizSettingsScreen;
 
+import javax.swing.*;
+import java.awt.*;
 import java.io.IOException;
 
 /**
@@ -19,9 +22,20 @@ public static void main(String[] args) throws IOException {
         // DATABASE
         IFlashcardDataAccess flashcardGateway = new FlashcardDataAccess(DBGateway.getFlashcardPath());
         IFlashcardSetDataAccess flashcardSetGateway = new FlashcardSetDataAccess(DBGateway.getFlashcardSetPath());
-        // IUserDataAccess userGateway = new CommonUserDataAccess(DBGateway.getUserPath());
+        IUserDataAccess userGateway = new CommonUserDataAccess(DBGateway.getUserPath());
 
-        DBGateway gateway = new DBGateway(flashcardGateway, flashcardSetGateway, null);
+        DBGateway gateway = new DBGateway(flashcardGateway, flashcardSetGateway, userGateway);
+
+        //Welcome Screen
+        JFrame application = new JFrame("Welcome");
+        CardLayout cardLayout = new CardLayout();
+        JPanel screens = new JPanel(cardLayout);
+        application.add(screens);
+        WelcomeScreen welcome = new WelcomeScreen();
+        screens.add(welcome, "Welcome");
+        cardLayout.show(screens, "Welcome");
+        application.pack();
+        application.setVisible(true);
 
         // QUIZ SETTINGS USE CASE
         QuizOutputBoundary presenter = new QuizPresenter();

src/main/java/Main.java

@@ -1,11 +1,8 @@
 package dataAccess;
 
 import entityRequestModels.CommonUserDsRequestModel;
-import entityRequestModels.FlashcardDsRequestModel;
-import entityRequestModels.UserDsRequestModel;
 
 import java.io.*;
-import java.time.LocalDateTime;
 import java.util.*;
 
 public class CommonUserDataAccess implements IUserDataAccess{

src/main/java/dataAccess/CommonUserDataAccess.java

@@ -6,9 +6,6 @@
 // use case layer
 public interface IFlashcardSetDataAccess {
 
-
-
-
     FlashcardSetDsRequestModel getFlashcardSet(int flashcardSetId);
 
     String[] getTitleAndDescription(int flashcardSetId);
@@ -23,4 +20,5 @@ public interface IFlashcardSetDataAccess {
 
     int saveFlashcardSet(FlashcardSetDsRequestModel flashcardSet);
 
+
 }

src/main/java/dataAccess/IFlashcardSetDataAccess.java

@@ -1,8 +1,64 @@
 package entities;
 
-public class CommonUser extends User{
+import java.util.ArrayList;
 
-    public CommonUser(String username, String password){
-        super(username, password);
+public class CommonUser implements User{
+
+    private String username;
+
+    private String password;
+    private boolean isAdmin;
+    final String ADMIN_KEY = "BuiltDifferent";
+    final ArrayList<Integer> flashcardSetIds;
+
+    public CommonUser(String username, String password, boolean isAdmin){
+        this.username = username;
+        this.password = password;
+        this.isAdmin = isAdmin;
+        this.flashcardSetIds = new ArrayList<>();
+    }
+
+    @Override
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    @Override
+    public String getPassword() {
+        return password;
     }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    @Override
+    public boolean passwordIsValid() {
+        return password != null && password.length() > 5;
+    }
+
+    @Override
+    public boolean getIsAdmin() {
+        return isAdmin;
+    }
+
+    public void setIsAdmin(boolean isAdmin){
+        this.isAdmin = isAdmin;
+    }
+
+    @Override
+    public ArrayList<Integer> getFlashcardSetIds() {
+        return flashcardSetIds;
+    }
+
+    @Override
+    public boolean adminKeyValid(String adminKey) {
+        return adminKey.equals(ADMIN_KEY);
+    }
+
+
 }

src/main/java/entities/AdminUser.java

@@ -3,7 +3,7 @@
 public class CommonUserFactory implements UserFactory {
 
     @Override
-    public User create(String username, String password) {
-        return new CommonUser(username, password);
+    public User create(String username, String password, boolean isAdmin) {
+        return new CommonUser(username, password, isAdmin);
     }
 }

src/main/java/entities/AdminUserFactory.java

@@ -59,4 +59,4 @@ public void setIsPrivate(boolean aPrivate) {
     public void addFlashcard(Flashcard flashcard) {
         this.flashcards.add(flashcard);
     }
-}
+}