SIMSBIOHUB-396: Change column header getter func

api/src/services/observation-service.ts

@@ -23,10 +23,10 @@ import { DBService } from './db-service';
 
 const defaultLog = getLogger('services/observation-service');
 
-const observationCSVColumnValidator = {
+const observationCSVColumnValidator: IXLSXCSVValidator = {
   columnNames: ['SPECIES_TAXONOMIC_ID', 'COUNT', 'DATE', 'TIME', 'LATITUDE', 'LONGITUDE'],
   columnTypes: ['number', 'number', 'date', 'string', 'number', 'number'],
-  aliases: {
+  columnAliases: {
     'LATITUDE': ['LAT'],
     'LONGITUDE': ['LON', 'LONG', 'LNG']
   }

api/src/utils/xlsx-utils/worksheet-utils.test.ts

@@ -1,7 +1,33 @@
+import xlsx from 'xlsx';
+import { expect } from 'chai';
+import { describe } from 'mocha';
+import sinon from 'sinon'
 
+import * as worksheet_utils from "./worksheet-utils";
 
-describe('worksheet utils', () => {
+
+describe.only('worksheet utils', () => {
   describe('validateWorksheetHeaders', () => {
-    //
+    it('should validate aliases', () => {
+      const observationCSVColumnValidator: worksheet_utils.IXLSXCSVValidator = {
+        columnNames: ['SPECIES_TAXONOMIC_ID', 'COUNT', 'DATE', 'TIME', 'LATITUDE', 'LONGITUDE'],
+        columnTypes: ['number', 'number', 'date', 'string', 'number', 'number'],
+        columnAliases: {
+          'LATITUDE': ['LAT'],
+          'LONGITUDE': ['LON', 'LONG', 'LNG']
+        }
+      };
+
+      const mockWorksheet = {} as unknown as xlsx.WorkSheet
+
+      const getWorksheetHeaderssStub = sinon.stub(worksheet_utils, 'getWorksheetHeaders').returns([
+        'SPECIES_TAXONOMIC_ID', 'COUNT', 'DATE', 'TIME', 'LAT', 'LON'
+      ]);
+
+      const result = worksheet_utils.validateWorksheetHeaders(mockWorksheet, observationCSVColumnValidator);
+
+      // expect(getWorksheetHeaderssStub).to.be.calledOnceWith({})
+      expect(result).to.equal(true);
+    })
   });
 });

api/src/utils/xlsx-utils/worksheet-utils.ts

@@ -1,7 +1,7 @@
 import moment from 'moment';
 import xlsx, { CellObject } from 'xlsx';
 import { MediaFile } from '../media/media-file';
-import { safeToLowerCase, safeTrim } from '../string-utils';
+import { safeToLowerCase } from '../string-utils';
 import { replaceCellDates, trimCellWhitespace } from './cell-utils';
 
 export interface IXLSXCSVValidator {
@@ -40,7 +40,7 @@ export function constructWorksheets(workbook: xlsx.WorkBook): xlsx.WorkSheet {
 }
 
 /**
- * Get the headers for the given worksheet.
+ * Get the headers for the given worksheet, then transforms them to uppercase.
  *
  * @export
  * @param {xlsx.WorkSheet} worksheet
@@ -60,11 +60,14 @@ export function getWorksheetHeaders(worksheet: xlsx.WorkSheet): string[] {
     range: customRange
   });
 
-  let headers = [];
+  let headers: string[] = [];
 
   if (aoaHeaders.length > 0) {
     // Parse the headers array from the array of arrays produced by calling `xlsx.utils.sheet_to_json`
-    headers = aoaHeaders[0].map(safeTrim);
+    headers = aoaHeaders[0]
+      .map(String)
+      .filter(Boolean)
+      .map((header) => header.trim().toUpperCase());
   }
 
   return headers;