Bug fixes

Author: imdkbj

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "cSpell.ignoreWords": [
+        "monthindex"
+    ]
+}

algo/validation/convertsymbol.js

@@ -5,12 +5,12 @@ class ConvertToSymbol extends StringUDF {
         super()
     }
 
-    insertYear = (scrip, scriptype) => {
+    insertYear = (scrip, scripType) => {
         var _year = 21;
 
-        let year_index = scriptype == 'FUT' ?  -2 :  -3;
-        let oldyear = scrip.slice(year_index, year_index + 1)[0]
-        let is_year = this.isNumeric(oldyear);
+        let year_index = scripType == 'FUT' ? -2 : -3;
+        let oldYear = scrip.slice(year_index, year_index + 1)[0]
+        let is_year = this.isNumeric(oldYear);
 
         if (is_year) return scrip;
 
@@ -51,24 +51,24 @@ class ConvertToSymbol extends StringUDF {
         let scrip = stringSymbol.toUpperCase().split(' ');
 
         //find fut/ce/pe
-        let scriptype = scrip[scrip.length - 1];
-        let isFO = scriptype == 'CE' || scriptype == 'PE' || scriptype == 'FUT';
+        let scripType = scrip[scrip.length - 1];
+        let isFO = scripType == 'CE' || scripType == 'PE' || scripType == 'FUT';
         if (!isFO) return stringSymbol;
         var ex;
         //insert year in ce/pe
-        scrip = this.insertYear(scrip, scriptype);
+        scrip = this.insertYear(scrip, scripType);
 
         //convert month as per weekly/monthly option
-        if (scriptype == 'CE' || scriptype == 'PE') {
+        if (scripType == 'CE' || scripType == 'PE') {
 
-            //isweekly
+            //is weekly
             if (this.isNumeric(scrip[1])) {
                 //YEAR MONTHINDEX DATE STRIKE CE/PE
                 //2021 1 07 14000 CE
                 var monthIndex = months.findIndex(element => element === scrip[2]);
-                ex = `${scrip[3]}${monthIndex}` + `0${scrip[1]}`.slice(-2) + `${scrip[4]}${scrip[5]}`;
+                ex = `${scrip[3]}${monthIndex}` + `0${scrip[1]}`.slice(-2) + `${Number(scrip[4])}${scrip[5]}`;
             } else {
-                ex = `${scrip[2]}${scrip[1]}${scrip[3]}${scrip[4]}`;
+                ex = `${scrip[2]}${scrip[1]}${Number(scrip[3])}${scrip[4]}`;
             }
         } else {
             ex = `${scrip[2]}${scrip[1]}FUT`;

api_calls/api_calls.js renamed to api_calls/axios_calls.js

@@ -2,7 +2,7 @@ const axios = require('axios');
 const qs = require('qs');
 const stringUDFs = require('../string_udf/stringUDF');
 
-class Calls extends stringUDFs {
+class AxiosCalls extends stringUDFs {
     constructor(baseURL, headers) {
         super()
         this.baseURL = baseURL;
@@ -52,4 +52,4 @@ class Calls extends stringUDFs {
     }
 }
 
-module.exports = Calls
+module.exports = AxiosCalls

example/bhav.js

@@ -0,0 +1,51 @@
+const node_udf = require('../index.js');
+// const { getLastNRecords, pushBhavData } = require('../firebase/api');
+
+const options = {
+    type: "json", // optional. if not specified, zip file will be downloaded. Valid TYPES: ['json', 'csv', 'zip']
+    dir: "" // optional. if not specified, files will be downloaded under NSE folder
+};
+
+const nodeUDF = new node_udf(options);
+
+const isTodayData = (data, bhavDate) => {
+    let { TIMESTAMP } = data[0];
+    return bhavDate.getDate() === new Date(TIMESTAMP).getDate();
+}
+
+const bhavCopyDownload = async (myDate, dbPath = '/cash') => {
+    let date = myDate == 0 || !myDate ? new Date() : myDate;
+    let year = date.getFullYear();
+    let month = date.toLocaleString('en-us', { month: 'short' }).toUpperCase();
+    let day = date.getDate();
+
+    let options = {
+        year: year,
+        month: month,
+        day: day
+    }
+
+    console.log(options);
+    try {
+        //check if data in db
+        // let data = await getLastNRecords(1, dbPath);
+
+
+        // if (await isTodayData(data[0], date)) {
+        //     return 'BhavCopy already updated for the day.'
+        // }
+        // console.log('here')
+
+        let isfo = dbPath === '/fo';
+        let bhavData = await nodeUDF.bhavdownload(options, isfo);
+        console.log('here1')
+        // pushBhavData(bhavData[0]);
+        return "BhavCopy downloaded for the day " + day + " " + month;
+    } catch (e) {
+        console.log(e)
+        return e;
+    }
+}
+
+
+bhavCopyDownload()

example/test.js

@@ -1,4 +1,4 @@
-const _udf = require('../node-udf.js');
+const _udf = require('../index');
 
 let udf = new _udf();
 
@@ -24,7 +24,7 @@ const insertInToArray = () => {
 }
 
 const convertToTradingSymbol = () => {
-    let output = udf.convertToTradingSymbol('CRUDEOIL OCT FUT');
+    let output = udf.convertToTradingSymbol('USDINR AUG 74.50 PE');
     console.log(output);
 }
 
@@ -73,4 +73,6 @@ Keep your token secure and store it safely, it can be used by anyone to control
 For a description of the Bot API, see this page: https://core.telegram.org/bots/api`;
 parseBOTToken = () => udf.parseBOTToken(msg)
 
-// parseBOTToken();
+// parseBOTToken();
+
+convertToTradingSymbol()

index.js

@@ -9,9 +9,9 @@ const Pushlog = require('./telegram/logs');
 const QuickTelegramFn = require('./telegram/quickfn');
 const BhavCopy = require('./public_api/bhavcopy');
 const Cache = require("./misc/cache");
-const ApiCalls = require('./api_calls/api_calls');
+const AxiosCalls = require('./api_calls/axios_calls');
 
-class UDF extends Many(StringUDF, Table, InputValidation, ConvertToSymbol, SqlUDF, BroadCastMessage, Pushlog, QuickTelegramFn, BhavCopy, Cache, ApiCalls) {
+class UDF extends Many(StringUDF, Table, InputValidation, ConvertToSymbol, SqlUDF, BroadCastMessage, Pushlog, QuickTelegramFn, BhavCopy, Cache, AxiosCalls) {
     constructor(params) {
         super(params)
         this.params = params;