added lte on quey

MicroPyramid · Dec 22, 2021 · bc95fed · bc95fed
1 parent 4e0a003
commit bc95fed
Showing 1 changed file with 24 additions and 54 deletions.
diff --git a/controller/api.js b/controller/api.js
@@ -3,7 +3,7 @@ const { ApiToken, Code, User } = require('./../models/User')
 const db = require('../config/keys').MongoURI
 
 async function latestData(req, res, next) {
-  MongoClient.connect(db, { useUnifiedTopology: true }, function (err, dbo) {
+  MongoClient.connect(db, { useUnifiedTopology: true }, async function (err, dbo) {
     const db = dbo.db('theforexapi')
     const collection = db.collection('currency')
     fields = { base: 1, date: 1, _id: 0, rates: 1 }
@@ -20,7 +20,7 @@ async function latestData(req, res, next) {
         fields[symbol] = 1
       }
     }
-    const cursor = collection.find(query, { fields: fields }).sort({ date: -1 }).limit(1).toArray(function (err, result) {
+    const cursor = await collection.find(query, { fields: fields }).sort({ date: -1 }).limit(1).toArray(function (err, result) {
       if (err) throw err
       dbo.close()
       if (result[0]) {
@@ -39,28 +39,21 @@ async function latestData(req, res, next) {
   })
 }
 
-
 async function dateData(req, res, next) {
   dateParam = req.params.dateParam
-  date_obj = new Date(dateParam);
-  dateparam1 = date_obj.getFullYear() + "-" + ("0" + (date_obj.getMonth() + 1)).slice(-2) + "-" + (date_obj.getDate() < 10 ? '0' : '') + date_obj.getDate()
-  if (date_obj.getDay() == 6) {
-    console.log('satuarday')
-    date_obj.setDate(date_obj.getDate() - 1);
-    dateParam = date_obj.getFullYear() + "-" + ("0" + (date_obj.getMonth() + 1)).slice(-2) + "-" + date_obj.getDate()
-    dateparam1 = date_obj.getFullYear() + "-" + ("0" + (date_obj.getMonth() + 1)).slice(-2) + "-" + (date_obj.getDate() < 10 ? '0' : '') + date_obj.getDate()
-  }
-  if (date_obj.getDay() == 0) {
-    console.log('sunday')
-    date_obj.setDate(date_obj.getDate() - 2);
-    dateParam = date_obj.getFullYear() + "-" + ("0" + (date_obj.getMonth() + 1)).slice(-2) + "-" + date_obj.getDate()
-    dateparam1 = date_obj.getFullYear() + "-" + ("0" + (date_obj.getMonth() + 1)).slice(-2) + "-" + (date_obj.getDate() < 10 ? '0' : '') + date_obj.getDate()
+  dateParmsSplit = dateParam.split('-')
+  if(dateParmsSplit[1].length === 1) {
+    dateParmsSplit[1] = '0'+dateParmsSplit[1]
+  } 
+  if(dateParmsSplit[2].length === 1) {
+    dateParmsSplit[2] = '0'+dateParmsSplit[2]
   }
-  MongoClient.connect(db, function (err, dbo) {
+  dateParam = dateParmsSplit.join("-")
+  MongoClient.connect(db, async function (err, dbo) {
     const db = dbo.db('theforexapi')
     const collection = db.collection('currency')
     fields = { base: 1, date: 1, _id: 0, rates: 1 }
-    query = { base: 'EUR', "$or": [{date: dateParam}, {date: dateparam1}] }
+    query = { base: 'EUR', 'date': { $lte: dateParam } }
     if (req.query.base) {
       query.base = req.query.base.toUpperCase()
     }
@@ -72,50 +65,27 @@ async function dateData(req, res, next) {
         fields[symbol] = 1
       }
     }
-    const cursor = collection.find(query, { fields: fields }).sort({ date: -1 }).toArray(async function (err, result) {
+    const cursor = await collection.find(query, { fields: fields }).sort({ date: -1 }).toArray(async function (err, result) {
       if (err) {
         throw err
       }
-      if (result.length > 0) {
-        dbo.close()
-        res.writeHead(200, { 'Content-Type': 'application/json' })
-        res.write(JSON.stringify(result[0]))
-        res.end()
-      }
-      else {
-        index = 0
-        function getLastDateData() {
-          index = index + 1;
-          date_obj = new Date(dateParam);
-          date_obj.setDate(date_obj.getDate() - 1);
-          dateParam = date_obj.getFullYear() + "-" + ("0" + (date_obj.getMonth() + 1)).slice(-2) + "-" + date_obj.getDate()
-          dateparam1 = date_obj.getFullYear() + "-" + ("0" + (date_obj.getMonth() + 1)).slice(-2) + "-" + (date_obj.getDate() < 10 ? '0' : '') + date_obj.getDate()
-          query = { base: 'EUR', "$or": [{date: dateParam}, {date: dateparam1}] }
-          console.log(query)
-          const cursor = collection.find(query, { fields: fields }).sort({ date: -1 }).toArray(function (err, result) {
-            if (err) {
-              throw err
-            }
-            console.log(result)
-            if (result.length > 0) {
-              dbo.close()
-              res.writeHead(200, { 'Content-Type': 'application/json' })
-              res.write(JSON.stringify(result[0]))
-              res.end()
-              return
-            } else if (index === 100) {
-              res.writeHead(400, { 'Content-Type': 'text/json' })
-              res.write(JSON.stringify({ error: 'Invalid base or symbols' }))
-            } else {
-              getLastDateData()
-            }
-          })
+      if (result[0]) {
+        currency_keys = Object.keys(result[0]['rates'])
+        for (let key of currency_keys) {
+          result[0]['rates'][key] = parseFloat(result[0]['rates'][key])
         }
-        getLastDateData()
+        res.writeHead(200, { 'Content-Type': 'text/json' })
+        res.write(JSON.stringify(result[0]))
+      } else {
+        res.writeHead(400, { 'Content-Type': 'text/json' })
+        res.write(JSON.stringify({ error: 'Invalid base or symbols' }))
       }
+      res.end()
     })
   })
 
 }
 
+
+
 module.exports = { latestData, dateData }