setting uo of dstabase constants

Kneatrum · Aug 20, 2024 · 2730442 · 2730442
1 parent 522b51b
commit 2730442
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 21 deletions.
diff --git a/back-end/database/db_delete.js b/back-end/database/db_delete.js
@@ -1,16 +1,16 @@
 require('dotenv').config({ path: '../.env'});
 
-const {InfluxDB} = require('@influxdata/influxdb-client')
+const {InfluxDB} = require('@influxdata/influxdb-client');
 const { DeleteAPI } = require('@influxdata/influxdb-client-apis');
-const CONFIG = require('../../config.json');
 
 
-const dbHost = CONFIG.influxdb.host;
-const dbPort = CONFIG.influxdb.port;
+const dbHost = 'influxdb';
+const dbPort = 8086;
+
+const token = process.env.INFLUXDB_API_TOKEN
 
-const token = process.env.API_TOKEN
 const url = "http://" + dbHost + ":" + dbPort;
-const org = "kneatrum"
+const org = process.env.ORG_NAME
 
 const client = new InfluxDB({url, token})
 const deleteAPI = new DeleteAPI(client)

diff --git a/back-end/database/db_read.js b/back-end/database/db_read.js
@@ -1,18 +1,16 @@
 
-require('dotenv').config({ path: '../.env' });
+require('dotenv').config({ path: '../.env'});
 
 const {InfluxDB} = require('@influxdata/influxdb-client')
 const { measurements, devices, tags, fields} = require('../constants');
-const CONFIG = require('../../config.json');
 
-const dbHost = CONFIG.influxdb.host;
-const dbPort = CONFIG.influxdb.port;
+const dbHost = 'influxdb';
+const dbPort = 8086;
+const token = process.env.INFLUXDB_API_TOKEN;
 
-
-const token = process.env.API_TOKEN
 const url = "http://" + dbHost + ":" + dbPort;
-const org = "kneatrum"
-const bucket = "fitbit"
+const org = process.env.ORG_NAME
+const bucket = process.env.BUCKET_NAME
 
 const client = new InfluxDB({url, token})
 

diff --git a/back-end/database/db_write.js b/back-end/database/db_write.js
@@ -2,16 +2,14 @@
 require('dotenv').config({ path: '../.env' });
 
 const {InfluxDB, Point} = require('@influxdata/influxdb-client')
-const CONFIG = require('../../config.json');
 
-const dbHost = CONFIG.influxdb.host;
-const dbPort = CONFIG.influxdb.port;
+const dbHost = 'influxdb';
+const dbPort = 8086;
+const org = process.env.ORG_NAME;
+const bucket = process.env.BUCKET_NAME;
+const token = process.env.INFLUXDB_API_TOKEN
 
-const token = process.env.API_TOKEN
 const url = "http://" + dbHost + ":" + dbPort;
-let org = "kneatrum"
-let bucket = "fitbit"
-
 const client = new InfluxDB({url, token});
 
 let writeClient = client.getWriteApi(org, bucket, 'ns');