Cleans up rebase

tair · Mar 31, 2020 · 3f58469 · 3f58469
1 parent 24dc257
commit 3f58469
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 5 deletions.
diff --git a/src/utils/__tests__/february/tair.gaf → src/__tests__/february/tair.gaf b/src/utils/__tests__/february/tair.gaf → src/__tests__/february/tair.gaf
diff --git a/src/utils/__tests__/february/tair.gaf.gz → src/__tests__/february/tair.gaf.gz b/src/utils/__tests__/february/tair.gaf.gz → src/__tests__/february/tair.gaf.gz
diff --git a/src/utils/__tests__/january/tair.gaf → src/__tests__/january/tair.gaf b/src/utils/__tests__/january/tair.gaf → src/__tests__/january/tair.gaf
diff --git a/src/utils/__tests__/january/tair.gaf.gz → src/__tests__/january/tair.gaf.gz b/src/utils/__tests__/january/tair.gaf.gz → src/__tests__/january/tair.gaf.gz
diff --git a/src/utils/__tests__/test_data_fetcher.ts → src/__tests__/test_data_fetcher.ts b/src/utils/__tests__/test_data_fetcher.ts → src/__tests__/test_data_fetcher.ts
diff --git a/src/utils/data_fetcher.ts → src/data_fetcher.ts b/src/utils/data_fetcher.ts → src/data_fetcher.ts
@@ -1,6 +1,6 @@
 import {readFileSync} from "fs";
 import {resolve} from "path";
-import {ingestData, StructuredData, UnstructuredText} from "../utils/ingest";
+import {ingestData, StructuredData, UnstructuredText} from "./ingest";
 
 let mostRecentDataset: StructuredData;
 

diff --git a/src/index.ts b/src/index.ts
@@ -4,8 +4,7 @@ import {V1Service} from "./services/v1";
 import {resolve} from "path";
 import cors from "cors";
 import compression from "compression";
-import { app } from './server';
-import { updateData, startPeriodicallyCalling, getTomorrowMorning } from './utils/data_fetcher';
+import { updateData, startPeriodicallyCalling, getTomorrowMorning } from './data_fetcher';
 
 updateData();
 const default_interval: string = (1000 * 60 * 60 * 24).toString();

diff --git a/tests/data-download/index.ts b/tests/data-download/index.ts
@@ -1,6 +1,6 @@
 import express from "express";
-import { StructuredData } from "../../src/utils/ingest";
-import { getDataset } from "../../src/utils/data_fetcher";
+import { StructuredData } from "../../src/ingest";
+import { getDataset } from "../../src/data_fetcher";
 
 const serveFile = (filename: string, callback?: () => any) => {
   const app = express();