Merge pull request #49 from folio-org/MODEUSCNT-13

MODEUSCNT-13

Author: alb3rtino

mod-erm-usage-counter50/src/main/java/org/olf/erm/usage/counter50/csv/mapper/MapperFactory.java

@@ -1,6 +1,8 @@
 package org.olf.erm.usage.counter50.csv.mapper;
 
+import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.StringReader;
 import org.olf.erm.usage.counter50.csv.mapper.csv2report.CsvToReportMapper;
 import org.olf.erm.usage.counter50.csv.mapper.csv2report.DRCsvToReport;
 import org.olf.erm.usage.counter50.csv.mapper.csv2report.IRCsvToReport;
@@ -61,18 +63,24 @@ public static ReportToCsvMapper createReportToCsvMapper(Object report) throws Ma
 
   public static CsvToReportMapper createCsvToReportMapper(String csvReport) throws MapperException {
     try {
-      if (csvReport.startsWith("Report_Name,Title Master Report")) {
+      BufferedReader br = new BufferedReader(new StringReader(csvReport));
+      String firstLine = br.readLine();
+      if (firstLine == null) {
+        throw new MapperException("Cant read first line.");
+      }
+
+      if (firstLine.contains("Title Master Report")) {
         return new TRCsvToReport(csvReport);
-      } else if (csvReport.startsWith("Report_Name,Item Master Report")) {
+      } else if (firstLine.contains("Item Master Report")) {
         return new IRCsvToReport(csvReport);
-      } else if (csvReport.startsWith("Report_Name,Platform Master Report")) {
+      } else if (firstLine.contains("Platform Master Report")) {
         return new PRCsvToReport(csvReport);
-      } else if (csvReport.startsWith("Report_Name,Database Master Report")) {
+      } else if (firstLine.contains("Database Master Report")) {
         return new DRCsvToReport(csvReport);
       } else {
         throw new MapperException("Cannot create CsvToReportMapper. Report has unknown name.");
       }
-    } catch (IOException | MapperException e) {
+    } catch (IOException e) {
       throw new MapperException("Cannot create CsvToReportMapper. " + e.getCause());
     }
   }

mod-erm-usage-counter50/src/test/java/org/olf/erm/usage/counter50/csv/mapper/MapperTest.java

@@ -1,6 +1,7 @@
 package org.olf.erm.usage.counter50.csv.mapper;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import com.google.common.io.Resources;
 import java.io.IOException;
@@ -20,6 +21,7 @@
 import org.olf.erm.usage.counter50.Counter5Utils;
 import org.olf.erm.usage.counter50.Counter5Utils.Counter5UtilsException;
 import org.olf.erm.usage.counter50.csv.mapper.csv2report.CsvToReportMapper;
+import org.olf.erm.usage.counter50.csv.mapper.csv2report.TRCsvToReport;
 
 @RunWith(Enclosed.class)
 public class MapperTest {
@@ -111,4 +113,34 @@ private void assertThatMetricTypesAreEqual(String expectedLine, List<String> act
       }
     }
   }
+
+  public static class MapperFactoryTest {
+
+    @Test
+    public void testCsvWithQuotes() throws IOException, MapperException {
+      String inputStr =
+          Resources.toString(
+              Resources.getResource("reports/TR_withquotes.csv"), StandardCharsets.UTF_8);
+      CsvToReportMapper result = MapperFactory.createCsvToReportMapper(inputStr);
+      assertThat(result).isInstanceOf(TRCsvToReport.class);
+    }
+
+    @Test
+    public void testCsvWithNoContent() {
+      String inputStr = "";
+      assertThatThrownBy(() -> MapperFactory.createCsvToReportMapper(inputStr))
+          .isInstanceOf(MapperException.class)
+          .hasMessageContaining("Cant read first line");
+    }
+
+    @Test
+    public void testCsvWithUnknownReport() throws IOException {
+      String inputStr =
+          Resources.toString(
+              Resources.getResource("reports/TRB1_merged.csv"), StandardCharsets.UTF_8);
+      assertThatThrownBy(() -> MapperFactory.createCsvToReportMapper(inputStr))
+          .isInstanceOf(MapperException.class)
+          .hasMessageContaining("unknown name");
+    }
+  }
 }

mod-erm-usage-counter50/src/test/resources/reports/TR_withquotes.csv

@@ -0,0 +1,17 @@
+"Report_Name","Title Master Report"
+"Report_ID","TR"
+"Release","5"
+"Institution_Name","Library"
+"Institution_ID","Proprietary=SPIE:id"
+"Metric_Types",""
+"Report_Filters",""
+"Report_Attributes",""
+"Exceptions",""
+"Reporting_Period","Begin_Date=2020-01-01; End_Date=2020-12-31"
+"Created","2021-06-24T07:54:40Z"
+"Created_By","Scholarly iQ for SPIE"
+
+"Title","Publisher","Publisher_ID","Platform","DOI","Proprietary_ID","ISBN","Print_ISSN","Online_ISSN","URI","Data_Type","Section_Type","YOP","Access_Type","Access_Method","Metric_Type","Reporting_Period_Total","Jan-2020","Feb-2020","Mar-2020","Apr-2020","May-2020","Jun-2020","Jul-2020","Aug-2020","Sep-2020","Oct-2020","Nov-2020","Dec-2020"
+"3D Printing of Optics","SPIE","SPIE:84645379-E915-E911-8138-005056BE4D05","SPIE","10.1117/3.2324763","SPIE:SL39","978-1-5106-1998-2","","","","","","","","","Total_Item_Investigations","9","5","0","4","0","0","0","0","0","0","0","0","0"
+"3D Printing of Optics","SPIE","SPIE:84645379-E915-E911-8138-005056BE4D05","SPIE","10.1117/3.2324763","SPIE:SL39","978-1-5106-1998-2","","","","","","","","","Total_Item_Requests","3","2","0","1","0","0","0","0","0","0","0","0","0"
+"3D Printing of Optics","SPIE","SPIE:84645379-E915-E911-8138-005056BE4D05","SPIE","10.1117/3.2324763","SPIE:SL39","978-1-5106-1998-2","","","","","","","","","Unique_Item_Investigations","5","2","0","3","0","0","0","0","0","0","0","0","0"