From 5c659758b15b7c70856ae635d697401404b169e1 Mon Sep 17 00:00:00 2001
From: cv <34649812+cpvalente@users.noreply.github.com>
Date: Sun, 24 Oct 2021 20:50:24 +0200
Subject: [PATCH] refract: cleanup folder structure

rename data folder models to differentiate from directory of db
---
 server/src/app.js                               | 4 ++--
 server/src/controllers/eventsController.js      | 2 +-
 server/src/controllers/ontimeController.js      | 4 ++--
 server/src/{data => models}/dataModel.js        | 0
 server/src/{data => models}/eventsDefinition.js | 0
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename server/src/{data => models}/dataModel.js (100%)
 rename server/src/{data => models}/eventsDefinition.js (100%)

diff --git a/server/src/app.js b/server/src/app.js
index d34dcf6fd..62b5277f9 100644
--- a/server/src/app.js
+++ b/server/src/app.js
@@ -16,7 +16,7 @@ const __dirname = path.dirname(__filename);
 
 const env = process.env.NODE_ENV || 'prod';
 
-const file = path.join(__dirname, 'data/', config.database.filename);
+const file = path.join(__dirname, '../data/', config.database.filename);
 const adapter = new JSONFile(file);
 export const db = new Low(adapter);
 
@@ -25,7 +25,7 @@ import { Client } from 'node-osc';
 import express from 'express';
 import http from 'http';
 import cors from 'cors';
-import { dbModel } from './data/dataModel.js';
+import { dbModel } from './models/dataModel.js';
 import ua from 'universal-analytics';
 
 // Read data from JSON file, this will set db.data content
diff --git a/server/src/controllers/eventsController.js b/server/src/controllers/eventsController.js
index 2b1a35099..47fc27950 100644
--- a/server/src/controllers/eventsController.js
+++ b/server/src/controllers/eventsController.js
@@ -8,7 +8,7 @@ import {
   event as eventDef,
   delay as delayDef,
   block as blockDef,
-} from '../data/eventsDefinition.js';
+} from '../models/eventsDefinition.js';
 
 function _getEventsCount() {
   return Array.from(data.events).length;
diff --git a/server/src/controllers/ontimeController.js b/server/src/controllers/ontimeController.js
index f0d523d76..848cdf619 100644
--- a/server/src/controllers/ontimeController.js
+++ b/server/src/controllers/ontimeController.js
@@ -8,8 +8,8 @@ import {
   event as eventDef,
   delay as delayDef,
   block as blockDef,
-} from '../data/eventsDefinition.js';
-import { dbModel } from '../data/dataModel.js';
+} from '../models/eventsDefinition.js';
+import { dbModel } from '../models/dataModel.js';
 import { networkInterfaces } from 'os';
 
 const __filename = fileURLToPath(import.meta.url);
diff --git a/server/src/data/dataModel.js b/server/src/models/dataModel.js
similarity index 100%
rename from server/src/data/dataModel.js
rename to server/src/models/dataModel.js
diff --git a/server/src/data/eventsDefinition.js b/server/src/models/eventsDefinition.js
similarity index 100%
rename from server/src/data/eventsDefinition.js
rename to server/src/models/eventsDefinition.js