resolving comment and conflicts

Author: brett-onions

src/config/config.ts

@@ -23,7 +23,6 @@ export const getConfig = () => {
     trustSelfSigned: process.env.TRUST_SELF_SIGNED === 'false' ? false : true,
     runningMode: process.env.MODE || '',
     bodySizeLimit: process.env.BODY_SIZE_LIMIT || '50mb',
-    createSampleTable: process.env.CREATE_SAMPLE_TABLE === 'true' ? true : false,
     minio: {
       endPoint: process.env.MINIO_ENDPOINT || 'localhost',
       port: process.env.MINIO_PORT ? parseInt(process.env.MINIO_PORT) : 9000,

src/index.ts

@@ -6,13 +6,11 @@ import routes from './routes/index';
 import { setupMediator } from './openhim/openhim';
 import {
   createMinioBucketListeners,
-} from './utils/minio';
+} from './utils/minioClient';
 
 const app = express();
 
-const prefix = getConfig().runningMode === 'testing' ? '/' : '/climate';
-
-app.use(prefix, routes);
+app.use('/', routes);
 
 createMinioBucketListeners();
 

src/routes/index.ts

@@ -6,7 +6,7 @@ import logger from '../logger';
 import fs from 'fs/promises';
 import path from 'path';
 import e from 'express';
-import { uploadToMinio } from '../utils/minio';
+import { uploadToMinio } from '../utils/minioClient';
 
 // Constants
 const VALID_MIME_TYPES = ['text/csv', 'application/json'] as const;

src/utils/file-validators.ts

@@ -11,8 +11,10 @@ export function validateJsonFile(file: Buffer) {
 export function getCsvHeaders(file: Buffer) {
   //convert the buffer to a string
   const csv = file.toString();
+  //check if the new line character is \n or \r\n
+  const newLineChar = csv.includes('\r\n') ? '\r\n' : '\n';
   //get the first line of the csv file
-  const firstLine = csv.split('\n')[0];
+  const firstLine = csv.split(newLineChar)[0];
   //split the first line by commas
   const columns = firstLine.split(',');