Merge pull request #98 from CSC207-2022F-UofT/97-reading-commas-in-csv-1

97 reading commas in csv

Author: anthony-chen-ca

src/data/FlashcardSets.csv

@@ -1,4 +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
+"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

@@ -1,17 +1,17 @@
 term,definition,creationDate,flashcardId,belongsToId
-test card 1,the first test card,2022-11-13T15:32:26.666982800,0,0
-test card 2,the second test card,2022-11-13T15:32:27.666982800,1,0
-test card 3,the third test card,2022-11-13T15:32:28.666982800,2,0
-alphabetical order checker,to test if alphabetical order is working,2022-11-13T15:32:29.666982800,3,0
-Term A,Definition A,2022-11-13T15:32:26.666982800,10,2
-Term B,Definition B,2022-11-13T15:32:27.666982800,11,2
-Term C,Definition C,2022-11-13T15:32:28.666982800,12,2
-Term D,Definition D,2022-11-13T15:32:29.666982800,13,2
-Term E,Definition E,2022-11-13T15:32:29.666982800,14,2
-Term F,Definition F,2022-11-13T15:32:29.666982800,15,2
-Term G,Definition G,2022-11-13T15:32:29.666982800,16,2
-Term H,Definition H,2022-11-13T15:32:29.666982800,17,2
-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
+"test card 1","the first test card",2022-11-13T15:32:26.666982800,0,0
+"test card 2","the second test card",2022-11-13T15:32:27.666982800,1,0
+"test card 3","the third test card",2022-11-13T15:32:28.666982800,2,0
+"alphabetical order checker","to test if alphabetical order is working",2022-11-13T15:32:29.666982800,3,0
+"Term A","Definition A",2022-11-13T15:32:26.666982800,10,2
+"Term B","Definition B",2022-11-13T15:32:27.666982800,11,2
+"Term C","Definition C",2022-11-13T15:32:28.666982800,12,2
+"Term D","Definition D",2022-11-13T15:32:29.666982800,13,2
+"Term E","Definition E",2022-11-13T15:32:29.666982800,14,2
+"Term F","Definition F",2022-11-13T15:32:29.666982800,15,2
+"Term G","Definition G",2022-11-13T15:32:29.666982800,16,2
+"Term H","Definition H",2022-11-13T15:32:29.666982800,17,2
+"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

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(",");