api_connect_nodejs 1.0.1 → 2.0.2

package/src/{edelconnect.js → apiConnect.js}

@@ -2,15 +2,18 @@ const fs = require("fs");
 const readline = require("readline");
 const log4js = require("./logger.js");
 const Order = require("./order");
-const Feed = require("./feed");
 const Chart = require("./chart");
 const LiveNews = require("./liveNews");
 const Watchlist = require("./watchlist");
 const ResearchCalls = require("./researchCalls");
-const __Constants = require("./edelweissApiUtils");
+const __Constants = require("./apiUtils");
 const __Config = require("./config");
 const __Http = require("./http");
 const pkgJson = require("../package.json");
+const Feed = require("./feed/feed");
+const QuotesFeed = require("./feed/quotesFeed");
+const OrdersFeed = require("./feed/ordersFeed");
+const LiveNewsFeed = require("./feed/liveNewsFeed");
 
 const {
   validatePlaceTrade,
@@ -33,19 +36,19 @@ const {
   validateOrderHistory,
   validatePositionSquareOff,
   validateMFOrderBook,
-} = require("../validations/edelconnectValidator");
+} = require("../validations/apiConnectValidator");
 
 const {
   validateLiveNewsParams,
   validateNewsForResultsAndStocksParams,
   validateLatestCorporateActions,
 } = require("../validations/liveNewsValidator");
-class EdelweissAPIConnect {
+class APIConnect {
   /**
-   * This is **EdelweissAPIConnect** class. Please initialise single instance of this per `api_key`.
-   * @param {string} apiKey API key provided by Edelweiss
-   * @param {string} password Password provided by Edelweiss
-   * @param {string} reqId Token to be collected post redirection from Login URL https://ewuat.edelbusiness.in/ewhtml/app/login?api_key=APIKEY
+   * This is **APIConnect** class. Please initialise single instance of this per `api_key`.
+   * @param {string} apiKey API key provided by APIConnect
+   * @param {string} password Password provided by APIConnect
+   * @param {string} reqId Token to be collected post redirection from Login URL using APIConnect credentials
    * @param {string} downloadContract If this is set to `True` then It will download all the contracts and return the records in dictionary `instruments`
    */
   constructor(apiKey, password, reqId, downloadContract) {
@@ -59,6 +62,7 @@ class EdelweissAPIConnect {
     this.reqId = reqId;
     this.fileName = "data_" + apiKey + ".txt";
     this.__http.fileName = this.fileName;
+    this.feedObject = null;
   }
 
   /**
@@ -75,49 +79,56 @@ class EdelweissAPIConnect {
           resolve(res);
         }
       };
+      const readFilePromise = new Promise((resolve, reject) => {
+        fs.readFile(this.fileName, "utf8", (err, data) => {
+          if (err) {
+            //var promises=[]
+            // if file doesn't exist, then generate it
+            // these two functions will fill the __constants and generate ${fileName}
+            // promises.push(this.__GenerateVendorSession(this.apiKey, this.password, this.reqId));
+            // promises.push(this.__GetAuthorization(this.reqId));
+            count++;
+            // Promise.all(promises).then(checkDone()).catch(reject());
+            this.__GenerateVendorSession(this.apiKey, this.password, this.reqId)
+              .then((res) => {
+                this.__GetAuthorization(this.reqId)
+                  .then((res) => {
+                    checkDone(res);
+                    resolve(true);
+                  })
+                  .catch((err) => reject(err));
+              })
+              .catch((err) => reject(err));
+          } else {
+            const j = JSON.parse(data);
+            this.__constants.VendorSession = j.vt;
+            this.__constants.JSession = j.auth;
+            this.__constants.eqAccId = j.eqaccid;
+            this.__constants.coAccId = j.coaccid;
+            this.__constants.Data = j.data;
+            this.__constants.AppIdKey = j.appidkey;
+            this.__constants.profileId = j.data.data.lgnData.accs.prfId;
+            count++;
+            checkDone();
+            resolve(true);
+          }
+        });
+      });
 
       // Check if ${fileName} exists
-      fs.readFile(this.fileName, "utf8", (err, data) => {
-        if (err) {
-          //var promises=[]
-          // if file doesn't exist, then generate it
-          // these two functions will fill the __constants and generate ${fileName}
-          // promises.push(this.__GenerateVendorSession(this.apiKey, this.password, this.reqId));
-          // promises.push(this.__GetAuthorization(this.reqId));
+      readFilePromise
+        .then((res) => {
           count++;
-          // Promise.all(promises).then(checkDone()).catch(reject());
-          this.__GenerateVendorSession(this.apiKey, this.password, this.reqId)
+          this.__CheckUpdate().then(checkDone).catch(reject);
+          this.feedObject = new Feed();
+          this.__Instruments()
             .then((res) => {
-              this.__GetAuthorization(this.reqId)
-                .then((res) => {
-                  checkDone(res);
-                })
-                .catch((err) => reject(err));
+              //console.log("instrument then");
+              checkDone(res);
             })
             .catch((err) => reject(err));
-        } else {
-          const j = JSON.parse(data);
-          this.__constants.VendorSession = j.vt;
-          this.__constants.JSession = j.auth;
-          this.__constants.eqAccId = j.eqaccid;
-          this.__constants.coAccId = j.coaccid;
-          this.__constants.Data = j.data;
-          this.__constants.AppIdKey = j.appidkey;
-          this.__constants.profileId = j.data.data.lgnData.accs.prfId;
-          count++;
-          checkDone();
-        }
-      });
-      count++;
-      // this.__CheckUpdate().then(checkDone).catch(reject);
-      this.__Instruments()
-        .then((res) => {
-          //console.log("instrument then");
-          checkDone(res);
         })
-        .catch((err) => {
-          reject();
-        });
+        .catch((err) => reject(err));
     });
   };
 
@@ -180,14 +191,14 @@ class EdelweissAPIConnect {
           if (res.data.msg === "MANDATORY") {
             console.log(
               "Mandatory Update. New version " +
-                rep.data.vsn +
+                res.data.vsn +
                 ". Update to new version to continue."
             );
             process.exit();
           } else if (res.data.msg === "OPTIONAL") {
             console.log(
               "New version " +
-                rep.data.vsn +
+                res.data.vsn +
                 " is available. Stay up to date for better experience"
             );
           }
@@ -195,7 +206,54 @@ class EdelweissAPIConnect {
         } else {
           throw res;
         }
-      });
+      })
+  };
+
+  /**
+   * Get LiveNewsStreaming Object
+   * @function initLiveNewsStreaming
+   * @returns LiveNewsStreaming Object, using this object you can call subsribe() and unsubsribe() methods.
+   */
+  initLiveNewsStreaming = () => {
+    let liveNewsFeedObj = {};
+    try {
+      liveNewsFeedObj = new LiveNewsFeed(this.feedObject);
+    } catch (error) {
+      console.log(error);
+    }
+    return liveNewsFeedObj;
+  };
+
+  /**
+   * Get QuotesStreaming Object
+   * @function initQuotesStreaming
+   * @returns QuotesStreaming Object, using this object you can call subsribe() and unsubsribe() methods.
+   */
+  initQuotesStreaming = () => {
+    let quoteFeedObj = {};
+    try {
+      quoteFeedObj = new QuotesFeed(this.feedObject);
+    } catch (error) {
+      console.log(error);
+    }
+    return quoteFeedObj;
+  };
+
+  /**
+   * Get OrdersStreaming Object
+   * @function initOrdersStreaming
+   * @param {string} accountId - accid Customer Account ID
+   * @param {string} userId - User ID
+   * @returns OrdersStreaming Object, using this object you can call subsribe() and unsubsribe() methods.
+   */
+  initOrdersStreaming = (accountId, userId) => {
+    let orderFeedObj = {};
+    try {
+      orderFeedObj = new OrdersFeed(this.feedObject, accountId, userId);
+    } catch (error) {
+      console.log(error);
+    }
+    return orderFeedObj;
   };
 
   /**
@@ -208,8 +266,8 @@ class EdelweissAPIConnect {
 
   /**
    * Generate Vendor Session
-   * @param {string} apiKey Key provided by edelweiss
-   * @param {string} password Password provided by edelweiss
+   * @param {string} apiKey Key provided by APIConnect
+   * @param {string} password Password provided by APIConnect
    * @returns Promise \
    * if resolved, then returns object in the form of `{msg: string, success: boolean}` \
    * if rejected, returns error
@@ -308,12 +366,12 @@ class EdelweissAPIConnect {
   addSymbolWatchlist = (groupName, symLst) => {
     let res = {};
     log4js.info("Inside addSymbolWatchlist method");
-    const liveNewsObj = new Watchlist(
+    const watchlistObj = new Watchlist(
       this.__http,
       this.__config,
       this.__constants
     );
-    res = liveNewsObj.addSymbolWatchlist(groupName, symLst);
+    res = watchlistObj.addSymbolWatchlist(groupName, symLst);
     return res;
   };
 
@@ -332,12 +390,12 @@ class EdelweissAPIConnect {
   deleteSymbolWatchlist = (groupName, symLst) => {
     let res = {};
     log4js.info("Inside deleteSymbolWatchlist method");
-    const liveNewsObj = new Watchlist(
+    const watchlistObj = new Watchlist(
       this.__http,
       this.__config,
       this.__constants
     );
-    res = liveNewsObj.deleteSymbolWatchlist(groupName, symLst);
+    res = watchlistObj.deleteSymbolWatchlist(groupName, symLst);
     return res;
   };
 
@@ -355,12 +413,12 @@ class EdelweissAPIConnect {
   deleteWatchlistGroups = (groups) => {
     let res = {};
     log4js.info("Inside deleteWatchlistGroups method");
-    const liveNewsObj = new Watchlist(
+    const watchlistObj = new Watchlist(
       this.__http,
       this.__config,
       this.__constants
     );
-    res = liveNewsObj.deleteWatchlistGroups(groups);
+    res = watchlistObj.deleteWatchlistGroups(groups);
     return res;
   };
 
@@ -379,12 +437,12 @@ class EdelweissAPIConnect {
   renameWatchlistGroup = (groupName, newGroupName) => {
     let res = {};
     log4js.info("renameWatchlistGroup method is called.");
-    const liveNewsObj = new Watchlist(
+    const watchlistObj = new Watchlist(
       this.__http,
       this.__config,
       this.__constants
     );
-    res = liveNewsObj.renameWatchlistGroup(groupName, newGroupName);
+    res = watchlistObj.renameWatchlistGroup(groupName, newGroupName);
     return res;
   };
   /**
@@ -514,12 +572,8 @@ class EdelweissAPIConnect {
           );
         } else {
           //If Holdings true then call equity Holdings
-          response = await liveNewsObj.getEqHoldings(
-            searchText,
-            pageNumber
-          );
+          response = await liveNewsObj.getEqHoldings(searchText, pageNumber);
         }
-        console.log;
         //Before Return filter response
         return await liveNewsObj.filterLiveNewsResponse(
           category,
@@ -568,10 +622,7 @@ class EdelweissAPIConnect {
       );
     } else {
       //If Holdings true then call equity Holding
-      response = await liveNewsObj.getEqHoldings(
-        searchText,
-        pageNumber
-      );
+      response = await liveNewsObj.getEqHoldings(searchText, pageNumber);
     }
 
     //Filter Response before return
@@ -894,6 +945,28 @@ class EdelweissAPIConnect {
     TriggerPrice = "0",
     ProductCode = "CNC"
   ) => {
+    log4js.info("Inside PlaceTrade method");
+    const paramsObj = {
+      trdSym: Trading_Symbol,
+      exc: Exchange,
+      action: Action,
+      dur: Duration,
+      ordTyp: Order_Type,
+      qty: Quantity,
+      sym: Streaming_Symbol,
+      lmPrc: Limit_Price,
+      dscQty: Disclosed_Quantity,
+      trgPrc: TriggerPrice,
+      prdCode: ProductCode,
+    };
+    const validateResponse = validatePlaceTrade(paramsObj);
+    if (validateResponse.error) {
+      log4js.debug(
+        "PlaceTrade validation error -" + validateResponse.error.details
+      );
+      return Promise.reject(validateResponse.error.details);
+    }
+
     const data = {
       trdSym: Trading_Symbol,
       exc: Exchange,
@@ -914,14 +987,6 @@ class EdelweissAPIConnect {
       rmk: "",
       flQty: true,
     };
-    const validateResponse = validatePlaceTrade(data);
-    if (validateResponse.error) {
-      log4js.debug(
-        "PlaceTrade validation error -" + validateResponse.error.details
-      );
-      return Promise.reject(validateResponse.error.details);
-    }
-    log4js.info("Inside PlaceTrade method");
     log4js.debug("PlaceTrade Data :" + JSON.stringify(data));
     if (Exchange == "MCX" || Exchange == "NCDEX") {
       const url = this.__config.PlaceTradeURL_comm(this.__constants.coAccId);
@@ -968,10 +1033,31 @@ class EdelweissAPIConnect {
     TriggerPrice = "0",
     ProductCode = "CNC"
   ) => {
+    log4js.info("Inside PlaceCoverTrade method");
     if (Exchange == "MCX" || Exchange == "NCDEX") {
       console.log("Operation invalid for commodities");
       return Promise.reject(new Error("Operation invalid for commodities"));
     }
+    const paramsObj = {
+      trdSym: Trading_Symbol,
+      exc: Exchange,
+      action: Action,
+      dur: Duration,
+      ordTyp: Order_Type,
+      qty: Quantity,
+      sym: Streaming_Symbol,
+      lmPrc: Limit_Price,
+      dscQty: Disclosed_Quantity,
+      trgPrc: TriggerPrice,
+      prdCode: ProductCode,
+    };
+    const validateResponse = validatePlaceCoverTrade(paramsObj);
+    if (validateResponse.error) {
+      log4js.debug(
+        "PlaceCoverTrade validation error -" + validateResponse.error.details
+      );
+      return Promise.reject(validateResponse.error.details);
+    }
 
     const data = {
       trdSym: Trading_Symbol,
@@ -993,14 +1079,7 @@ class EdelweissAPIConnect {
       rmk: "",
       flQty: "0",
     };
-    log4js.info("Inside PlaceCoverTrade method");
-    const validateResponse = validatePlaceCoverTrade(data);
-    if (validateResponse.error) {
-      log4js.debug(
-        "PlaceCoverTrade validation error -" + validateResponse.error.details
-      );
-      return Promise.reject(validateResponse.error.details);
-    }
+
     log4js.debug("PlaceCoverTrade Data :" + JSON.stringify(data));
     const url = this.__config.PlaceCoverTradeURL(this.__constants.eqAccId);
     log4js.debug("PlaceCoverTrade URLS -" + url);
@@ -1039,6 +1118,27 @@ class EdelweissAPIConnect {
     Product_Code,
     DTDays
   ) => {
+    log4js.info("Inside PlaceGtcGtdTrade method");
+    const paramsObj = {
+      trdSym: Trading_Symbol,
+      exc: Exchange,
+      action: Action,
+      dur: Duration,
+      ordTyp: Order_Type,
+      qty: Quantity,
+      lmPrc: Limit_Price,
+      sym: streaming_symbol,
+      prdCode: Product_Code,
+      dtDays: DTDays,
+    };
+    const validateResponse = validatePlaceGtcGtdTrade(paramsObj);
+    if (validateResponse.error) {
+      log4js.debug(
+        "PlaceGtcGtdTrade validation error -" + validateResponse.error.details
+      );
+      return Promise.reject(validateResponse.error.details);
+    }
+
     const data = {
       trdSym: Trading_Symbol,
       exc: Exchange,
@@ -1059,14 +1159,6 @@ class EdelweissAPIConnect {
       sym: streaming_symbol,
       brk: "",
     };
-    log4js.info("Inside PlaceGtcGtdTrade method");
-    const validateResponse = validatePlaceGtcGtdTrade(data);
-    if (validateResponse.error) {
-      log4js.debug(
-        "PlaceGtcGtdTrade validation error -" + validateResponse.error.details
-      );
-      return Promise.reject(validateResponse.error.details);
-    }
     log4js.debug("PlaceGtcGtdTrade Data :" + JSON.stringify(data));
     if (Exchange == "MCX" || Exchange == "NCDEX") {
       const url = this.__config.PlaceTradeURL_comm(this.__constants.coAccId);
@@ -1112,6 +1204,28 @@ class EdelweissAPIConnect {
     TriggerPrice = "0",
     ProductCode = "CNC"
   ) => {
+    log4js.info("Inside ModifyTrade method");
+    const paramsObj = {
+      trdSym: Trading_Symbol,
+      exc: Exchange,
+      action: Action,
+      dur: Duration,
+      ordTyp: Order_Type,
+      qty: Quantity,
+      sym: Streaming_Symbol,
+      lmPrc: Limit_Price,
+      nstOID: Order_ID,
+      dscQty: Disclosed_Quantity,
+      trgPrc: TriggerPrice,
+      prdCode: ProductCode,
+    };
+    const validateResponse = validateModifyTrade(paramsObj);
+    if (validateResponse.error) {
+      log4js.debug(
+        "ModifyTrade validation error -" + validateResponse.error.details
+      );
+      return Promise.reject(validateResponse.error.details);
+    }
     const data = {
       trdSym: Trading_Symbol,
       exc: Exchange,
@@ -1130,14 +1244,7 @@ class EdelweissAPIConnect {
       nstOID: Order_ID,
       valid: false,
     };
-    log4js.info("Inside ModifyTrade method");
-    const validateResponse = validateModifyTrade(data);
-    if (validateResponse.error) {
-      log4js.debug(
-        "ModifyTrade validation error -" + validateResponse.error.details
-      );
-      return Promise.reject(validateResponse.error.details);
-    }
+
     log4js.debug("ModifyTrade Data :" + JSON.stringify(data));
     if (Exchange == "MCX" || Exchange == "NCDEX") {
       const url = this.__config.ModifyTradeURL_comm(this.__constants.coAccId);
@@ -1183,36 +1290,50 @@ class EdelweissAPIConnect {
     TriggerPrice = "0",
     ProductCode = "CNC"
   ) => {
+    log4js.info("Inside ModifyCoverTrade method");
     if (Exchange == "MCX" || Exchange == "NCDEX") {
       console.log("Operation invalid for commodities");
       return Promise.reject(new Error("Operation invalid for commodities"));
     }
-
-    const data = {
+    const paramsObj = {
       trdSym: Trading_Symbol,
       exc: Exchange,
       action: Action,
       dur: Duration,
-      flQty: "0",
       ordTyp: Order_Type,
       qty: Quantity,
-      dscQty: Disclosed_Quantity,
       sym: Streaming_Symbol,
-      mktPro: "",
       lmPrc: Limit_Price,
+      nstOID: Order_ID,
+      dscQty: Disclosed_Quantity,
       trgPrc: TriggerPrice,
       prdCode: ProductCode,
-      dtDays: "",
-      nstOID: Order_ID,
     };
-    log4js.info("Inside ModifyCoverTrade method");
-    const validateResponse = validateModifyCoverTrade(data);
+    const validateResponse = validateModifyCoverTrade(paramsObj);
     if (validateResponse.error) {
       log4js.debug(
         "ModifyCoverTrade validation error -" + validateResponse.error.details
       );
       return Promise.reject(validateResponse.error.details);
     }
+    const data = {
+      trdSym: Trading_Symbol,
+      exc: Exchange,
+      action: Action,
+      dur: Duration,
+      flQty: "0",
+      ordTyp: Order_Type,
+      qty: Quantity,
+      dscQty: Disclosed_Quantity,
+      sym: Streaming_Symbol,
+      mktPro: "",
+      lmPrc: Limit_Price,
+      trgPrc: TriggerPrice,
+      prdCode: ProductCode,
+      dtDays: "",
+      nstOID: Order_ID,
+    };
+
     log4js.debug("ModifyCoverTrade Data :" + JSON.stringify(data));
     const url = this.__config.ModifyCoverTradeURL(this.__constants.eqAccId);
     log4js.debug("ModifyCoverTrade URLS -" + url);
@@ -1230,13 +1351,13 @@ class EdelweissAPIConnect {
    * @returns Promise that resolves/rejects to Cancel Trade api response
    */
   CancelTrade = (OrderId, Exchange, Order_Type, ProductCode) => {
+    log4js.info("Inside CancelTrade method");
     const data = {
       nstOID: OrderId,
       exc: Exchange,
       prdCode: ProductCode,
       ordTyp: Order_Type,
     };
-    log4js.info("Inside CancelTrade method");
     const validateResponse = validateCancelPlaceTrade(data);
     if (validateResponse.error) {
       log4js.debug(
@@ -1277,7 +1398,7 @@ class EdelweissAPIConnect {
    */
   MFOrderBook = (fromDate, toDate) => {
     log4js.info("Inside MFOrderBook method");
-    const validateResponse = validateMFOrderBook(data);
+    const validateResponse = validateMFOrderBook(fromDate, toDate);
     if (validateResponse.error) {
       log4js.debug(
         "MFOrderBook validation error -" + validateResponse.error.details
@@ -1302,7 +1423,7 @@ class EdelweissAPIConnect {
    */
   ExitCoverTrade = (OrderId) => {
     log4js.info("Inside ExitCoverTrade method");
-    const validateResponse = validateExitCoverTrade(data);
+    const validateResponse = validateExitCoverTrade(OrderId);
     if (validateResponse.error) {
       log4js.debug(
         "ExitCoverTrade validation error -" + validateResponse.error.details
@@ -1325,6 +1446,7 @@ class EdelweissAPIConnect {
    */
   ExitBracketTrade = (Order_Id, Syom_Id, Status) => {
     log4js.info("Inside ExitBracketTrade method");
+    const data = { nstOrdNo: Order_Id, syomID: Syom_Id, sts: Status };
     const validateResponse = validateExitBracketTrade(data);
     if (validateResponse.error) {
       log4js.debug(
@@ -1332,7 +1454,6 @@ class EdelweissAPIConnect {
       );
       return Promise.reject(validateResponse.error.details);
     }
-    const data = { nstOrdNo: Order_Id, syomID: Syom_Id, sts: Status };
     log4js.debug("ExitBracketTrade Data :" + JSON.stringify(data));
     const url = this.__config.ExitBracketTradeURL(this.__constants.eqAccId);
     log4js.debug("ExitBracketTrade URLS -" + url);
@@ -1369,12 +1490,12 @@ class EdelweissAPIConnect {
     Trailing_Stop_Loss = "Y",
     Trailing_Stop_Loss_Value = "1"
   ) => {
+    log4js.info("Inside PlaceBracketTrade method");
     if (Exchange == "MCX" || Exchange == "NCDEX") {
       console.log("Operation invalid for commodities");
       return Promise.reject(new Error("Operation invalid for commodities"));
     }
-
-    const data = {
+    const paramsObj = {
       exc: Exchange,
       sym: Streaming_Symbol,
       trnsTyp: Transaction_Type,
@@ -1382,23 +1503,36 @@ class EdelweissAPIConnect {
       dur: Duration,
       dsQty: Disclosed_Quantity,
       prc: Limit_Price,
-      trdBsdOn: "LTP",
-      sqOffBsdOn: "Absolute",
       sqOffVal: Target,
-      slBsdOn: "Absolute",
       slVal: StopLoss,
       trlSl: Trailing_Stop_Loss,
       trlSlVal: Trailing_Stop_Loss_Value,
-      ordSrc: "API",
     };
-    log4js.info("Inside PlaceBracketTrade method");
-    const validateResponse = validatePlaceBracketTrade(data);
+    const validateResponse = validatePlaceBracketTrade(paramsObj);
     if (validateResponse.error) {
       log4js.debug(
         "PlaceBracketTrade validation error -" + validateResponse.error.details
       );
       return Promise.reject(validateResponse.error.details);
     }
+    const data = {
+      exc: Exchange,
+      sym: Streaming_Symbol,
+      trnsTyp: Transaction_Type,
+      qty: Quantity,
+      dur: Duration,
+      dsQty: Disclosed_Quantity,
+      prc: Limit_Price,
+      trdBsdOn: "LTP",
+      sqOffBsdOn: "Absolute",
+      sqOffVal: Target,
+      slBsdOn: "Absolute",
+      slVal: StopLoss,
+      trlSl: Trailing_Stop_Loss,
+      trlSlVal: Trailing_Stop_Loss_Value,
+      ordSrc: "API",
+    };
+
     log4js.debug("PlaceBracketTrade Data :" + JSON.stringify(data));
     const url = this.__config.PlaceBracketTradeURL(this.__constants.eqAccId);
     log4js.debug("PlaceBracketTrade URLS -" + url);
@@ -1413,6 +1547,13 @@ class EdelweissAPIConnect {
    */
   PlaceBasketTrade = (orderlist) => {
     log4js.info("Inside PlaceBasketTrade method");
+    const validateResponse = validatePlaceBasketTrade(orderlist);
+    if (validateResponse.error) {
+      log4js.debug(
+        "PlaceBasketTrade validation error -" + validateResponse.error.details
+      );
+      return Promise.reject(validateResponse.error.details);
+    }
     let isComm = false;
     const lst = [];
     orderlist.forEach(({ sym, GTDDate, rmk, ...order }) => {
@@ -1425,14 +1566,6 @@ class EdelweissAPIConnect {
       lst.push(data);
     });
 
-    const validateResponse = validatePlaceBasketTrade(orderlist);
-    if (validateResponse.error) {
-      log4js.debug(
-        "PlaceBasketTrade validation error -" + validateResponse.error.details
-      );
-      return Promise.reject(validateResponse.error.details);
-    }
-
     const fd = { ordLst: lst, ordSrc: "API" };
     if (isComm) {
       console.log("Basket Order not available for Commodity");
@@ -1513,6 +1646,27 @@ class EdelweissAPIConnect {
     TriggerPrice = "0",
     ProductCode = "CNC"
   ) => {
+    log4js.info("Inside PlaceAMOTrade method");
+    const paramsObj = {
+      trdSym: Trading_Symbol,
+      exc: Exchange,
+      action: Action,
+      dur: Duration,
+      ordTyp: Order_Type,
+      qty: Quantity,
+      sym: Streaming_Symbol,
+      Limit_Price,
+      dscQty: Disclosed_Quantity,
+      trgPrc: TriggerPrice,
+      prdCode: ProductCode,
+    };
+    const validateResponse = validatePlaceAMOTrade(paramsObj);
+    if (validateResponse.error) {
+      log4js.debug(
+        "PlaceAMOTrade validation error -" + validateResponse.error.details
+      );
+      return Promise.reject(validateResponse.error.details);
+    }
     const data = {
       trdSym: Trading_Symbol,
       exc: Exchange,
@@ -1533,14 +1687,7 @@ class EdelweissAPIConnect {
       vnCode: "",
       rmk: "",
     };
-    log4js.info("Inside PlaceAMOTrade method");
-    const validateResponse = validatePlaceAMOTrade(data);
-    if (validateResponse.error) {
-      log4js.debug(
-        "PlaceAMOTrade validation error -" + validateResponse.error.details
-      );
-      return Promise.reject(validateResponse.error.details);
-    }
+
     log4js.debug("PlaceAMOTrade Data :" + JSON.stringify(data));
     if (Exchange == "MCX" || Exchange == "NCDEX") {
       const url = this.__config.PlaceAMOTrade_comm(this.__constants.coAccId);
@@ -1587,31 +1734,46 @@ class EdelweissAPIConnect {
     TriggerPrice = "0",
     ProductCode = "CNC"
   ) => {
-    const data = {
+    log4js.info("Inside ModifyAMOTrade method");
+    const paramsObj = {
       trdSym: Trading_Symbol,
       exc: Exchange,
       action: Action,
       dur: Duration,
-      flQty: "0",
       ordTyp: Order_Type,
       qty: Quantity,
-      dscQty: Disclosed_Quantity,
       sym: Streaming_Symbol,
-      mktPro: "",
       lmPrc: Limit_Price,
+      nstOID: Order_ID,
+      dscQty: Disclosed_Quantity,
       trgPrc: TriggerPrice,
       prdCode: ProductCode,
-      dtDays: "",
-      nstOID: Order_ID,
     };
-    log4js.info("Inside ModifyAMOTrade method");
-    const validateResponse = validateModifyAMOTrade(data);
+    const validateResponse = validateModifyAMOTrade(paramsObj);
     if (validateResponse.error) {
       log4js.debug(
         "ModifyAMOTrade validation error -" + validateResponse.error.details
       );
       return Promise.reject(validateResponse.error.details);
     }
+    const data = {
+      trdSym: Trading_Symbol,
+      exc: Exchange,
+      action: Action,
+      dur: Duration,
+      flQty: "0",
+      ordTyp: Order_Type,
+      qty: Quantity,
+      dscQty: Disclosed_Quantity,
+      sym: Streaming_Symbol,
+      mktPro: "",
+      lmPrc: Limit_Price,
+      trgPrc: TriggerPrice,
+      prdCode: ProductCode,
+      dtDays: "",
+      nstOID: Order_ID,
+    };
+
     log4js.debug("ModifyAMOTrade Data :" + JSON.stringify(data));
     if (Exchange == "MCX" || Exchange == "NCDEX") {
       const url = this.__config.ModifyAMOTrade_comm(this.__constants.coAccId);
@@ -1673,6 +1835,13 @@ class EdelweissAPIConnect {
    * @returns Promise that resolves/rejects to the Position Square Off api response
    */
   PositionSquareOff = (orderlist) => {
+    const validateResponse = validatePositionSquareOff(orderlist);
+    if (validateResponse.error) {
+      log4js.debug(
+        "PositionSquareOff validation error -" + validateResponse.error.details
+      );
+      return Promise.reject(validateResponse.error.details);
+    }
     const lstEq = [];
     const lstComm = [];
     log4js.info("Inside PositionSquareOff method");
@@ -1703,13 +1872,7 @@ class EdelweissAPIConnect {
         ? lstComm.push(data)
         : lstEq.push(data);
     });
-    const validateResponse = validatePositionSquareOff(data);
-    if (validateResponse.error) {
-      log4js.debug(
-        "PositionSquareOff validation error -" + validateResponse.error.details
-      );
-      return Promise.reject(validateResponse.error.details);
-    }
+
     const postEq = lstEq.length
       ? this.__http.PostMethod(
           this.__config.PositionSqOffURL(this.__constants.eqAccId),
@@ -1828,6 +1991,31 @@ class EdelweissAPIConnect {
     Scheme_Plan,
     Scheme_Code
   ) => {
+    const paramsObj = {
+      token: Token,
+      isin: ISIN_Code,
+      txnTyp: Transaction_Type,
+      clientCode: Client_Code,
+      qty: Quantity,
+      amt: Amount,
+      reInvFlg: ReInv_Flag,
+      folioNo: Folio_Number,
+      schemeName: Scheme_Name,
+      strtDt: Start_Date,
+      endDt: End_Date,
+      sipFrq: SIP_Frequency,
+      gfot: Generate_First_Order_Today,
+      schemePlan: Scheme_Plan,
+      schemeCode: Scheme_Code,
+    };
+    log4js.info("Inside PlaceMF method");
+    const validateResponse = validatePlaceMF(paramsObj);
+    if (validateResponse.error) {
+      log4js.debug(
+        "PlaceMF validation error -" + validateResponse.error.details
+      );
+      return Promise.reject(validateResponse.error.details);
+    }
     const data = {
       currentOrdSts: "",
       token: Token,
@@ -1863,14 +2051,7 @@ class EdelweissAPIConnect {
       euinflag: "N",
       physicalFlag: "D",
     };
-    log4js.info("Inside PlaceMF method");
-    const validateResponse = validatePlaceMF(data);
-    if (validateResponse.error) {
-      log4js.debug(
-        "PlaceMF validation error -" + validateResponse.error.details
-      );
-      return Promise.reject(validateResponse.error.details);
-    }
+
     log4js.debug("PlaceMF Data :" + JSON.stringify(data));
     const url = this.__config.PlaceMFURL(this.__constants.eqAccId);
     log4js.debug("PlaceMF URLS -" + url);
@@ -1917,6 +2098,32 @@ class EdelweissAPIConnect {
     Scheme_Code,
     Transaction_Id
   ) => {
+    log4js.info("Inside ModifyMF method");
+    const paramsObj = {
+      token: Token,
+      isin: ISIN_Code,
+      txnTyp: Transaction_Type,
+      clientCode: Client_Code,
+      qty: Quantity,
+      amt: Amount,
+      reInvFlg: ReInv_Flag,
+      folioNo: Folio_Number,
+      schemeName: Scheme_Name,
+      strtDt: Start_Date,
+      endDt: End_Date,
+      sipFrq: SIP_Frequency,
+      gfot: Generate_First_Order_Today,
+      schemePlan: Scheme_Plan,
+      schemeCode: Scheme_Code,
+      txnId: Transaction_Id,
+    };
+    const validateResponse = validateModifyMF(paramsObj);
+    if (validateResponse.error) {
+      log4js.debug(
+        "ModifyMF validation error -" + validateResponse.error.details
+      );
+      return Promise.reject(validateResponse.error.details);
+    }
     const data = {
       currentOrdSts: "ACCEPTED",
       token: Token,
@@ -1952,14 +2159,7 @@ class EdelweissAPIConnect {
       euinflag: "N",
       physicalFlag: "D",
     };
-    log4js.info("Inside ModifyMF method");
-    const validateResponse = validateModifyMF(data);
-    if (validateResponse.error) {
-      log4js.debug(
-        "ModifyMF validation error -" + validateResponse.error.details
-      );
-      return Promise.reject(validateResponse.error.details);
-    }
+
     log4js.debug("ModifyMF Data :" + JSON.stringify(data));
     const url = this.__config.ModifyMFURL(this.__constants.eqAccId);
     log4js.debug("ModifyMF URLS -" + url);
@@ -2006,6 +2206,32 @@ class EdelweissAPIConnect {
     Scheme_Code,
     Transaction_Id
   ) => {
+    log4js.info("Inside CancelMF method");
+    const paramsObj = {
+      token: Token,
+      isin: ISIN_Code,
+      txnTyp: Transaction_Type,
+      clientCode: Client_Code,
+      qty: Quantity,
+      amt: Amount,
+      reInvFlg: ReInv_Flag,
+      folioNo: Folio_Number,
+      schemeName: Scheme_Name,
+      strtDt: Start_Date,
+      endDt: End_Date,
+      sipFrq: SIP_Frequency,
+      gfot: Generate_First_Order_Today,
+      schemePlan: Scheme_Plan,
+      schemeCode: Scheme_Code,
+      txnId: Transaction_Id,
+    };
+    const validateResponse = validateCancelMF(paramsObj);
+    if (validateResponse.error) {
+      log4js.debug(
+        "CancelMF validation error -" + validateResponse.error.details
+      );
+      return Promise.reject(validateResponse.error.details);
+    }
     const data = {
       currentOrdSts: "ACCEPTED",
       token: Token,
@@ -2041,14 +2267,7 @@ class EdelweissAPIConnect {
       euinflag: "N",
       physicalFlag: "D",
     };
-    log4js.info("Inside CancelMF method");
-    const validateResponse = validateCancelMF(data);
-    if (validateResponse.error) {
-      log4js.debug(
-        "CancelMF validation error -" + validateResponse.error.details
-      );
-      return Promise.reject(validateResponse.error.details);
-    }
+
     log4js.debug("CancelMF Data :" + JSON.stringify(data));
     const url = this.__config.CancelMFURL(this.__constants.eqAccId);
     log4js.debug("CancelMF URLS -" + url);
@@ -2074,8 +2293,8 @@ class EdelweissAPIConnect {
 
   /**
    * Login function
-   * @param {string} source apiKey provided by edelweiss
-   * @param {string} password password provided by edelweiss
+   * @param {string} source apiKey provided by APIConnect
+   * @param {string} password password provided by APIConnect
    * @returns Promise \
    * if resolved, then returns object in the form of `{msg: string, success: boolean}` \
    * if rejected, returns error
@@ -2201,11 +2420,11 @@ class EdelweissAPIConnect {
   }
 }
 
-EdelweissAPIConnect.prototype.__constants = new __Constants();
-EdelweissAPIConnect.prototype.__config = new __Config();
-EdelweissAPIConnect.prototype.__http = new __Http(
-  EdelweissAPIConnect.prototype.__constants,
-  EdelweissAPIConnect.prototype.__config.baseurl
+APIConnect.prototype.__constants = new __Constants();
+APIConnect.prototype.__config = new __Config();
+APIConnect.prototype.__http = new __Http(
+  APIConnect.prototype.__constants,
+  APIConnect.prototype.__config.baseurl
 );
 
-module.exports = { EdelweissAPIConnect, Feed };
+module.exports = { APIConnect };