Merge branch 'main' of https://github.com/CSC207-2022F-UofT/course-project-team-bbq into Anthony's_Branch

� Conflicts:
�	src/data/FlashcardSets.csv
�	src/data/Flashcards.csv

Author: anthony-chen-ca

src/data/FlashcardSets.csv

@@ -1,5 +1,4 @@
 title,description,isPrivate,flashcardSetId,ownerUsername,flashcardIds
-test set 1,for testing study use case,false,0,testUser,0,1,2,3
-empty test set,for testing study use case with empty set,true,1,testUser
-Long Test Set,Insert Generic Description,false,2,Anthony,10,11,12,13,14,15,16,17,18,19,20,21
-CSC207 Final Exam Prep,Prepare for the CSC207 final exam with this flashcard set.,false,3,csc207,22,23,24,25,26,27,28,29,30,31,32,33,34,35
+"test set 1","for testing study use case",false,0,testUser,0,1,2,3
+"empty test set","for testing study use case with empty set",true,1,testUser
+"Long Test Set","Insert Generic Description",false,2,Anthony,10,11,12,13,14,15,16,17,18,19,20,21

src/data/Flashcards.csv

@@ -15,17 +15,3 @@ Term I,Definition I,2022-11-13T15:32:29.666982800,18,2
 Term J,Definition J,2022-11-13T15:32:29.666982800,19,2
 Same Term,Same Definition,2022-11-13T15:32:29.666982800,20,2
 Same Term,Same Definition,2022-11-13T15:32:29.666982800,21,2
-Entity,A basic bit of data that we are storing in our program.,2022-12-03T21:52:27.507373800,22,3
-Factory,An object that knows how to make a class instance typically by calling a constructor.,2022-12-03T21:52:47.933762600,23,3
-Use case,Something a user wants to do with the program.,2022-12-03T21:53:04.556680900,24,3
-Input boundary,The public interface for calling the use case.,2022-12-03T21:53:17.541271200,25,3
-Interactor,The class that runs the use case (a subclass of the input boundary).,2022-12-03T21:53:34.172732200,26,3
-Repository,The persistence mechanism (a subclass of the gateway).,2022-12-03T21:53:49.101677400,27,3
-Gateway,The methods the repository needs to implement for the interactor to do its job.,2022-12-03T21:54:03.276713900,28,3
-Controller,The object that the UI asks to run a use case.,2022-12-03T21:54:14.308815800,29,3
-Presenter,The object that tells the UI what to do when a use case finishes.,2022-12-03T21:54:26.957394100,30,3
-Downcasting,Casting the type of a variable into its subclass.,2022-12-03T21:55:06.381100300,31,3
-Upcasting,Casting the type of a variable into its superclass.,2022-12-03T21:55:16.940754800,32,3
-Private,Can only be accessed by code within the same class.,2022-12-03T21:55:28.372671100,33,3
-Protected,Can only be accessed by code within the same class or within a class derived from the original.,2022-12-03T21:55:42.829787700,34,3
-Variable shadowing,The same variable name is used in two different scopes.,2022-12-03T21:56:00.916802500,35,3

src/main/java/frameworks_and_drivers/database/FlashcardDataAccess.java

@@ -37,9 +37,9 @@ public FlashcardDataAccess(String csvPath) throws IOException {
 
             String row;
             while ((row = reader.readLine()) != null) {
-                String[] col = row.split(",");
-                String term = String.valueOf(col[headers.get("term")]);
-                String definition = String.valueOf(col[headers.get("definition")]);
+                String[] col = row.split(",(?=([^\"]|\"[^\"]*\")*$)");
+                String term = String.valueOf(col[headers.get("term")]).replace("\"","");
+                String definition = String.valueOf(col[headers.get("definition")]).replace("\"","");
                 String creationDateText = String.valueOf(col[headers.get("creationDate")]);
                 LocalDateTime creationDate = LocalDateTime.parse(creationDateText);
                 int flashcardId = Integer.parseInt(col[headers.get("flashcardId")]);
@@ -64,7 +64,7 @@ private void save() {
 
             for (FlashcardDsRequestModel set : flashcards.values()) {
                 String line = String.
-                        format("%s,%s,%s,%s,%s", set.getTerm(), set.getDefinition(), set.getCreationDate(), set.getFlashcardId(),
+                        format("\"%s\",\"%s\",%s,%s,%s", set.getTerm(), set.getDefinition(), set.getCreationDate(), set.getFlashcardId(),
                                 set.getBelongsToId());
 
                 writer.write(line);

src/main/java/frameworks_and_drivers/database/FlashcardSetDataAccess.java

@@ -38,9 +38,9 @@ public FlashcardSetDataAccess(String csvPath) throws IOException {
 
             String row;
             while ((row = reader.readLine()) != null) {
-                String[] col = row.split(",");
-                String title = String.valueOf(col[headers.get("title")]);
-                String description = String.valueOf(col[headers.get("description")]);
+                String[] col = row.split(",(?=([^\"]|\"[^\"]*\")*$)");
+                String title = String.valueOf(col[headers.get("title")]).replace("\"","");
+                String description = String.valueOf(col[headers.get("description")]).replace("\"","");
                 boolean privacy = Boolean.parseBoolean(col[headers.get("isPrivate")]);
                 int id = Integer.parseInt(col[headers.get("flashcardSetId")]);
                 String ownerUsername = String.valueOf(col[headers.get("ownerUsername")]);
@@ -69,7 +69,7 @@ private void save() {
 
             for (FlashcardSetDsRequestModel set : flashcardSets.values()) {
                 StringBuilder line = new StringBuilder(String.
-                        format("%s,%s,%s,%s,%s", set.getTitle(), set.getDescription(), set.getIsPrivate(),
+                        format("\"%s\",\"%s\",%s,%s,%s", set.getTitle(), set.getDescription(), set.getIsPrivate(),
                                 set.getFlashcardSetId(), set.getOwnerUsername()));
                 for(int flashcardIds : set.getFlashcardIds()){
                     line.append(",");