api_connect_nodejs 2.0.1 → 2.0.4

package/src/apiConnect.js

@@ -20,9 +20,6 @@ const {
   validateModifyTrade,
   validateCancelPlaceTrade,
   validatePlaceGtcGtdTrade,
-  validatePlaceCoverTrade,
-  validateModifyCoverTrade,
-  validateExitCoverTrade,
   validatePlaceAMOTrade,
   validateModifyAMOTrade,
   validateCancelAMOTrade,
@@ -36,6 +33,8 @@ const {
   validateOrderHistory,
   validatePositionSquareOff,
   validateMFOrderBook,
+  validateGetAMOStxatus,
+  validateConvertPositionEQ,
 } = require("../validations/apiConnectValidator");
 
 const {
@@ -62,7 +61,8 @@ class APIConnect {
     this.reqId = reqId;
     this.fileName = "data_" + apiKey + ".txt";
     this.__http.fileName = this.fileName;
-    this.feedObject = null;
+    this.feedObject = new Feed();
+    this.excsAndprdDpNm = [];
   }
 
   /**
@@ -79,49 +79,64 @@ class APIConnect {
           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;
+            this.__constants.prds = j.data.data.lgnData.prds;
+            this.excsAndprdDpNm = this.__constants.getProductsAndExchange(
+              this.__constants.prds
+            );
+            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)
-            .then((res) => {
-              this.__GetAuthorization(this.reqId)
-                .then((res) => {
-                  checkDone(res);
-                })
-                .catch((err) => reject(err));
+          this.__CheckUpdate().then(checkDone).catch(reject);
+          this.excsAndprdDpNm = this.__constants.getProductsAndExchange(
+            this.__constants.prds
+          );
+          this.__Instruments()
+          .then(async (res) => {
+              //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.feedObject = new Feed();
-      // this.__CheckUpdate().then(checkDone).catch(reject);
-      this.__Instruments()
-        .then((res) => {
-          //console.log("instrument then");
-          checkDone(res);
         })
         .catch((err) => {
-          reject();
+          delete this.feedObject;
+          reject(err)
         });
     });
   };
@@ -185,14 +200,14 @@ class APIConnect {
           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"
             );
           }
@@ -200,7 +215,7 @@ class APIConnect {
         } else {
           throw res;
         }
-      });
+      })
   };
 
   /**
@@ -360,12 +375,12 @@ class APIConnect {
   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;
   };
 
@@ -384,12 +399,12 @@ class APIConnect {
   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;
   };
 
@@ -407,12 +422,12 @@ class APIConnect {
   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;
   };
 
@@ -431,12 +446,12 @@ class APIConnect {
   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;
   };
   /**
@@ -821,7 +836,11 @@ class APIConnect {
    * @returns Promise that resolves to the details of single order
    */
   OrderDetails = (orderId, Exchange) => {
-    const validateResponse = validateOrderDetails(orderId, Exchange);
+    const validateResponse = validateOrderDetails(
+      orderId,
+      Exchange,
+      this.excsAndprdDpNm
+    );
     if (validateResponse.error) {
       log4js.debug(
         "OrderDetails validation error -" + validateResponse.error.details
@@ -915,15 +934,15 @@ class APIConnect {
    * Order placement refers to the function by which you as a user can place an order to respective exchanges. Order placement allows you to set various parameters like the symbol, action (buy, sell, stop loss buy, stop loss sell), product type, validity period and few other custom parameters and then finally place the order. Any order placed will first go through a risk validation in our internal systems and will then be sent to exchange. Usually any order successfully placed will have OrderID and ExchangeOrderID fields populated. If ExchangeOrderID is blank it usually means that the order has not been sent and accepted at respective exchange.
    * @param {string} Trading_Symbol Trading Symbol of the Scrip
    * @param {string} Exchange Exchange
-   * @param {'BUY' | 'SELL'} Action BUY | SELL
-   * @param {'DAY' | 'IOC' | 'EOS'} Duration DAY | IOC | EOS(for BSE)
-   * @param {'LIMIT' | 'MARKET' | 'STOP_LIMIT' | 'STOP_MARKET'} Order_Type LIMIT | MARKET | STOP_LIMIT | STOP_MARKET
+   * @param {string} Action BUY | SELL
+   * @param {string} Duration DAY | IOC | EOS(for BSE)
+   * @param {string} Order_Type LIMIT | MARKET | STOP_LIMIT | STOP_MARKET
    * @param {number} Quantity Quantity of the Scrip
    * @param {string} Streaming_Symbol companycode_exchange to be obtained from Contract file downloaded
    * @param {number} Limit_Price Limit price of the Scrip
    * @param {string} Disclosed_Quantity Quantity to be disclosed while order placement
    * @param {string} TriggerPrice Trigger Price applicable for SL/SL-M Orders
-   * @param {'CNC' | 'MIS' | 'NRML' | 'MTF'} ProductCode CNC | MIS | NRML | MTF
+   * @param {string} ProductCode CNC | MIS | NRML | MTF
    * @returns Promise that resolves/rejects to Place trade api response
    */
   PlaceTrade = (
@@ -937,10 +956,11 @@ class APIConnect {
     Limit_Price,
     Disclosed_Quantity = "0",
     TriggerPrice = "0",
-    ProductCode = "CNC"
+    ProductCode
   ) => {
     log4js.info("Inside PlaceTrade method");
-    const paramsObj = {
+
+    let paramsObj = {
       trdSym: Trading_Symbol,
       exc: Exchange,
       action: Action,
@@ -953,7 +973,7 @@ class APIConnect {
       trgPrc: TriggerPrice,
       prdCode: ProductCode,
     };
-    const validateResponse = validatePlaceTrade(paramsObj);
+    const validateResponse = validatePlaceTrade(paramsObj, this.excsAndprdDpNm);
     if (validateResponse.error) {
       log4js.debug(
         "PlaceTrade validation error -" + validateResponse.error.details
@@ -973,7 +993,7 @@ class APIConnect {
       mktPro: "",
       lmPrc: Limit_Price,
       trgPrc: TriggerPrice,
-      prdCode: ProductCode,
+      prdCode: this.__constants.getValidProductCode(this.fileName, Exchange, ProductCode),
       posSqr: "N",
       minQty: "0",
       ordSrc: "API",
@@ -997,90 +1017,6 @@ class APIConnect {
     }
   };
 
-  /**
-   * A Cover Order is an order type for intraday trades. A Cover Order lets you to place trades with very high leverage of up to 20 times the available limits (Cash/Stocks collateral limits)
-   *
-   * Pay a fraction of total order amount (10% or Rs. 20) to own the shares. In case it falls below the following price, sell it off to prevent me losing money from sharp price drops.
-   * @param {string} Trading_Symbol Trading Symbol of the Scrip
-   * @param {string} Exchange Exchange
-   * @param {'BUY' | 'SELL'} Action BUY | SELL
-   * @param {'DAY' | 'IOC' | 'EOS'} Duration DAY | IOC | EOS(for BSE)
-   * @param {'LIMIT' | 'MARKET' | 'STOP_LIMIT' | 'STOP_MARKET'} Order_Type LIMIT | MARKET | STOP_LIMIT | STOP_MARKET
-   * @param {number} Quantity Quantity of the Scrip
-   * @param {string} Streaming_Symbol companycode_exchange to be obtained from Contract file downloaded
-   * @param {number} Limit_Price Limit price of the Scrip
-   * @param {string} Disclosed_Quantity Quantity to be disclosed while order placement
-   * @param {string} TriggerPrice Trigger Price applicable for SL/SL-M Orders
-   * @param {'CNC' | 'MIS' | 'NRML' | 'MTF'} ProductCode CNC | MIS | NRML | MTF
-   * @returns Promise that resolves/rejects to Place Cover Order api response
-   */
-  PlaceCoverTrade = (
-    Trading_Symbol,
-    Exchange,
-    Action,
-    Duration,
-    Order_Type,
-    Quantity,
-    Streaming_Symbol,
-    Limit_Price,
-    Disclosed_Quantity = "0",
-    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,
-      exc: Exchange,
-      action: Action,
-      dur: Duration,
-      ordTyp: Order_Type,
-      qty: Quantity,
-      dscQty: Disclosed_Quantity,
-      sym: Streaming_Symbol,
-      mktPro: "",
-      lmPrc: Limit_Price,
-      trgPrc: TriggerPrice,
-      prdCode: ProductCode,
-      posSqr: "false",
-      minQty: "0",
-      ordSrc: "API",
-      vnCode: "",
-      rmk: "",
-      flQty: "0",
-    };
-
-    log4js.debug("PlaceCoverTrade Data :" + JSON.stringify(data));
-    const url = this.__config.PlaceCoverTradeURL(this.__constants.eqAccId);
-    log4js.debug("PlaceCoverTrade URLS -" + url);
-    var result = this.__http.PostMethod(url, data);
-    log4js.debug("PlaceCoverTrade Result :" + JSON.stringify(result));
-    return result;
-  };
 
   /**
    * Good Till Cancel (GTC) orders refers to orders where the validity period of the order is upto execution, cancellation by user or 90 days whichever comes first. This is a validity period used when you want to fire and forget an order and is usually an order placed with a limit price.
@@ -1090,13 +1026,13 @@ class APIConnect {
    * GTC order is active until the trade is executed or trader cancels the order. GTD orders remains active until a user specified date/7 days whichever is earlier or it has been filled or cancelled.
    * @param {string} Trading_Symbol Trading Symbol of the Scrip
    * @param {string} Exchange Exchange
-   * @param {'BUY' | 'SELL'} Action BUY | SELL
-   * @param {'GTC' | 'GTD'} Duration GTC | GTD
-   * @param {'LIMIT' | 'MARKET' | 'STOP_LIMIT' | 'STOP_MARKET'} Order_Type LIMIT | MARKET | STOP_LIMIT | STOP_MARKET
+   * @param {string} Action BUY | SELL
+   * @param {string} Duration GTC | GTD
+   * @param {string} Order_Type LIMIT | MARKET | STOP_LIMIT | STOP_MARKET
    * @param {number} Quantity Quantity of the Scrip
    * @param {number} Limit_Price Limit price of the Scrip
    * @param {string} streaming_symbol companycode_exchange to be obtained from Contract file downloaded
-   * @param {'CNC' | 'MIS' | 'NRML' | 'MTF'} Product_Code CNC | MIS | NRML | MTF
+   * @param {string} Product_Code CNC | MIS | NRML | MTF
    * @param {string} DTDays Date for GTD Orders in dd/MM/yyyy formaat
    * @returns Promise that resolves/rejects to Place GTC/GTD trade api response
    */
@@ -1125,7 +1061,10 @@ class APIConnect {
       prdCode: Product_Code,
       dtDays: DTDays,
     };
-    const validateResponse = validatePlaceGtcGtdTrade(paramsObj);
+    const validateResponse = validatePlaceGtcGtdTrade(
+      paramsObj,
+      this.excsAndprdDpNm
+    );
     if (validateResponse.error) {
       log4js.debug(
         "PlaceGtcGtdTrade validation error -" + validateResponse.error.details
@@ -1141,7 +1080,7 @@ class APIConnect {
       ordTyp: Order_Type,
       qty: Quantity,
       lmPrc: Limit_Price,
-      prdCode: Product_Code,
+      prdCode: this.__constants.getValidProductCode(this.fileName, Exchange, Product_Code),
       dtDays: DTDays,
       ordSrc: "API",
       vnCode: "",
@@ -1173,15 +1112,15 @@ class APIConnect {
    * Modify orders allows a user to change certain aspects of the order once it is placed. Depending on the execution state of the order (i.e. either completely open, partially open) there are various levels of modification allowed. As a user you can edit the product type, order quantity, order validity and certain other parameters. Please note that any modifications made to an order will be sent back to the risk system for validation before being submitted and there are chances that an already placed order may get rejected in case of a modification.
    * @param {string} Trading_Symbol Trading Symbol of the Scrip
    * @param {string} Exchange Exchange
-   * @param {'BUY' | 'SELL'} Action BUY | SELL
-   * @param {'DAY' | 'IOC' | 'EOS'} Duration DAY | IOC | EOS(for BSE)
-   * @param {'LIMIT' | 'MARKET' | 'STOP_LIMIT' | 'STOP_MARKET'} Order_Type LIMIT | MARKET | STOP_LIMIT | STOP_MARKET
+   * @param {string} Action BUY | SELL
+   * @param {string} Duration DAY | IOC | EOS(for BSE)
+   * @param {string} Order_Type LIMIT | MARKET | STOP_LIMIT | STOP_MARKET
    * @param {number} Quantity Quantity of the Scrip
    * @param {string} Streaming_Symbol companycode_exchange to be obtained from Contract file downloaded
    * @param {number} Limit_Price Limit price of the Scrip
    * @param {string} Disclosed_Quantity Quantity to be disclosed while order placement
    * @param {string} TriggerPrice Trigger Price applicable for SL/SL-M Orders
-   * @param {'CNC' | 'MIS' | 'NRML' | 'MTF'} ProductCode CNC | MIS | NRML | MTF
+   * @param {string} ProductCode CNC | MIS | NRML | MTF
    * @returns Promise that resolves/rejects to Modify Order api response
    */
   ModifyTrade = (
@@ -1196,7 +1135,7 @@ class APIConnect {
     Order_ID,
     Disclosed_Quantity = "0",
     TriggerPrice = "0",
-    ProductCode = "CNC"
+    ProductCode
   ) => {
     log4js.info("Inside ModifyTrade method");
     const paramsObj = {
@@ -1213,7 +1152,10 @@ class APIConnect {
       trgPrc: TriggerPrice,
       prdCode: ProductCode,
     };
-    const validateResponse = validateModifyTrade(paramsObj);
+    const validateResponse = validateModifyTrade(
+      paramsObj,
+      this.excsAndprdDpNm
+    );
     if (validateResponse.error) {
       log4js.debug(
         "ModifyTrade validation error -" + validateResponse.error.details
@@ -1233,7 +1175,7 @@ class APIConnect {
       mktPro: "",
       lmPrc: Limit_Price,
       trgPrc: TriggerPrice,
-      prdCode: ProductCode,
+      prdCode: this.__constants.getValidProductCode(this.fileName, Exchange, ProductCode),
       dtDays: "",
       nstOID: Order_ID,
       valid: false,
@@ -1254,94 +1196,12 @@ class APIConnect {
       return result;
     }
   };
-
-  /**
-   * Modify Cover Order
-   * @param {string} Trading_Symbol Trading Symbol of the Scrip
-   * @param {string} Exchange Exchange
-   * @param {'BUY' | 'SELL'} Action BUY | SELL
-   * @param {'DAY' | 'IOC' | 'EOS'} Duration DAY | IOC | EOS(for BSE)
-   * @param {'LIMIT' | 'MARKET' | 'STOP_LIMIT' | 'STOP_MARKET'} Order_Type LIMIT | MARKET | STOP_LIMIT | STOP_MARKET
-   * @param {number} Quantity Quantity of the Scrip
-   * @param {string} Streaming_Symbol companycode_exchange to be obtained from Contract file downloaded
-   * @param {number} Limit_Price Limit price of the Scrip
-   * @param {string} Disclosed_Quantity Quantity to be disclosed while order placement
-   * @param {string} TriggerPrice Trigger Price applicable for SL/SL-M Orders
-   * @param {'CNC' | 'MIS' | 'NRML' | 'MTF'} ProductCode CNC | MIS | NRML | MTF
-   * @returns Promise that resolves/rejects to Modify Cover Order api response
-   */
-  ModifyCoverTrade = (
-    Trading_Symbol,
-    Exchange,
-    Action,
-    Duration,
-    Order_Type,
-    Quantity,
-    Streaming_Symbol,
-    Limit_Price,
-    Order_ID,
-    Disclosed_Quantity = "0",
-    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 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 = 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);
-    var result = this.__http.PutMethod(url, data);
-    log4js.debug("ModifyCoverTrade Result :" + JSON.stringify(result));
-    return result;
-  };
-
   /**
    * An order can be cancelled, as long as on order is open or pending in the system.
    * @param {string} OrderId Nest OrderId
    * @param {string} Exchange Exchange
-   * @param {'LIMIT' | 'MARKET' | 'STOP_LIMIT' | 'STOP_MARKET'} Order_Type LIMIT | MARKET | STOP_LIMIT | STOP_MARKET
-   * @param {'CNC' | 'MIS' | 'NRML' | 'MTF'} ProductCode CNC | MIS | NRML | MTF
+   * @param {string'} Order_Type LIMIT | MARKET | STOP_LIMIT | STOP_MARKET
+   * @param {string} ProductCode CNC | MIS | NRML | MTF
    * @returns Promise that resolves/rejects to Cancel Trade api response
    */
   CancelTrade = (OrderId, Exchange, Order_Type, ProductCode) => {
@@ -1349,10 +1209,13 @@ class APIConnect {
     const data = {
       nstOID: OrderId,
       exc: Exchange,
-      prdCode: ProductCode,
+      prdCode: this.__constants.getValidProductCode(this.fileName, Exchange, ProductCode),
       ordTyp: Order_Type,
     };
-    const validateResponse = validateCancelPlaceTrade(data);
+    const validateResponse = validateCancelPlaceTrade(
+      data,
+      this.excsAndprdDpNm
+    );
     if (validateResponse.error) {
       log4js.debug(
         "CancelTrade validation error -" + validateResponse.error.details
@@ -1410,27 +1273,6 @@ class APIConnect {
     return result;
   };
 
-  /**
-   * This functionality allows you to completely exit a cover order which includes cancelling any unplaced orders and also completely squaring off any executed orders. For the orders which were executed it will usually modify the stop loss order leg and place it as a market order to ensure execution, while any non executed quantity order will get cancelled.
-   * @param {string} OrderId Nest OrderId
-   * @returns Promise that resolves/rejects to Exit Cover Trade api response
-   */
-  ExitCoverTrade = (OrderId) => {
-    log4js.info("Inside ExitCoverTrade method");
-    const validateResponse = validateExitCoverTrade(OrderId);
-    if (validateResponse.error) {
-      log4js.debug(
-        "ExitCoverTrade validation error -" + validateResponse.error.details
-      );
-      return Promise.reject(validateResponse.error.details);
-    }
-    const url = this.__config.ExitCoverTradeURL(this.__constants.eqAccId);
-    log4js.debug("ExitCoverTrade URLS -" + url);
-    var result = this.__http.PutMethod(url, { nstOID: OrderId });
-    log4js.debug("ExitCoverTrade Result :" + JSON.stringify(result));
-    return result;
-  };
-
   /**
    * Similar to Exit Cover order the functionality will ensure that any non executed open order will be cancelled. However for any orders which are executed it will automatically cancel one of the target or stop loss legs and modify the other leg to be placed as a market order. This will ensure that any executed orders will be squared off in position terms.
    * @param {string} Order_Id Mest OrderId
@@ -1502,7 +1344,10 @@ class APIConnect {
       trlSl: Trailing_Stop_Loss,
       trlSlVal: Trailing_Stop_Loss_Value,
     };
-    const validateResponse = validatePlaceBracketTrade(paramsObj);
+    const validateResponse = validatePlaceBracketTrade(
+      paramsObj,
+      this.excsAndprdDpNm
+    );
     if (validateResponse.error) {
       log4js.debug(
         "PlaceBracketTrade validation error -" + validateResponse.error.details
@@ -1539,15 +1384,8 @@ class APIConnect {
    * @param {Array<Order>} orderlist Array of Orders to be placed
    * @returns Promise that resolves/rejects to Place Basket Trade api response
    */
-  PlaceBasketTrade = (orderlist) => {
+  PlaceBasketTrade = async (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 }) => {
@@ -1564,6 +1402,17 @@ class APIConnect {
     if (isComm) {
       console.log("Basket Order not available for Commodity");
     }
+    const validateResponse = validatePlaceBasketTrade(lst, this.excsAndprdDpNm);
+    await Promise.all(
+      validateResponse.map((item) => {
+        if (item.error) {
+          log4js.debug(
+            "PlaceBasketTrade validation error -" + item.error.details
+          );
+          return Promise.reject(item.error.details);
+        }
+      })
+    );
     const url = this.__config.PlaceBasketTradeURL(this.__constants.eqAccId);
     log4js.debug("PlaceBasketTrade URLS -" + url);
     var result = this.__http.PostMethod(url, fd);
@@ -1592,19 +1441,33 @@ class APIConnect {
   };
 
   /**
-   * Get AMO status
+   * Get AMO Status
+   * @param {string} exchange Exchange value from Position book response.
    * @returns Promise that resolves/rejects to the Get AMO Status api response
    */
-  GetAMOStxatus = () => {
+  GetAMOStxatus = (exchange) => {
     log4js.info("Inside GetAMOStxatus method");
     const accTyp = this.__constants.Data.data.lgnData.accTyp;
+    if (accTyp == "CO" || accTyp == "COMEQ") {
+      const validateResponse = validateGetAMOStxatus(
+        exchange,
+        this.excsAndprdDpNm
+      );
+      if (validateResponse.error) {
+        log4js.debug(
+          " GetAMOStxatus validation error - " + validateResponse.error.details
+        );
+        return Promise.reject(validateResponse.error.details);
+      }
+    }
+
     const eqUrl =
       accTyp == "EQ" || accTyp == "COMEQ"
         ? this.__config.GetAMOFlag(this.__constants.eqAccId)
         : undefined;
     const commUrl =
       accTyp == "CO" || accTyp == "COMEQ"
-        ? this.__config.GetAMOFlag_comm(this.__constants.coAccId)
+        ? this.__config.GetAMOFlag_comm(exchange)
         : undefined;
     log4js.debug("GetAMOStxatus URLS - eq :" + eqUrl + " comm:" + commUrl);
     var result = this.__getEqCommData(eqUrl, commUrl);
@@ -1615,16 +1478,16 @@ class APIConnect {
   /**
    * After market order or AMO in short refers to orders which can be placed once the markets or exchanges are closed for trading. You can place AMO post market hours which will result in the order in question being placed automatically by 9:15 AM - 9:30 AM the next business day. AMO orders usually need to be limit orders in order to prevent inadvertent execution in case of adverse price movement in markets at beginning of day. AMO is a useful way to place your orders in case you do not have time to place orders during market hours.
    * @param {string} Trading_Symbol Trading Symbol of the Scrip
-   * @param {string} Exchange Exchange
-   * @param {'BUY' | 'SELL'} Action BUY | SELL
-   * @param {'DAY' | 'IOC' | 'EOS'} Duration DAY | IOC | EOS(for BSE)
-   * @param {'LIMIT' | 'MARKET' | 'STOP_LIMIT' | 'STOP_MARKET'} Order_Type LIMIT | MARKET | STOP_LIMIT | STOP_MARKET
+   * @param {string} Exchange Exchange value from Position book response.
+   * @param {string} Action BUY | SELL
+   * @param {string} Duration DAY | IOC | EOS(for BSE)
+   * @param {string} Order_Type LIMIT | MARKET | STOP_LIMIT | STOP_MARKET
    * @param {number} Quantity Quantity of the Scrip
    * @param {string} Streaming_Symbol companycode_exchange to be obtained from Contract file downloaded
    * @param {number} Limit_Price Limit price of Scrip
    * @param {string} Disclosed_Quantity Quantity to be disclosed while order_placement
    * @param {string} TriggerPrice Trigger Price applicable for SL/SL-M Orders
-   * @param {'CNC' | 'MIS' | 'NRML' | 'MTF'} ProductCode CNC | MIS | NRML | MTF
+   * @param {string} ProductCode CNC | MIS | NRML | MTF
    * @returns Promise that resolves/rejects to the Place AMO Trade api response
    */
   PlaceAMOTrade = (
@@ -1638,7 +1501,7 @@ class APIConnect {
     Limit_Price,
     Disclosed_Quantity = "0",
     TriggerPrice = "0",
-    ProductCode = "CNC"
+    ProductCode
   ) => {
     log4js.info("Inside PlaceAMOTrade method");
     const paramsObj = {
@@ -1649,12 +1512,15 @@ class APIConnect {
       ordTyp: Order_Type,
       qty: Quantity,
       sym: Streaming_Symbol,
-      Limit_Price,
+      lmPrc: Limit_Price,
       dscQty: Disclosed_Quantity,
       trgPrc: TriggerPrice,
       prdCode: ProductCode,
     };
-    const validateResponse = validatePlaceAMOTrade(paramsObj);
+    const validateResponse = validatePlaceAMOTrade(
+      paramsObj,
+      this.excsAndprdDpNm
+    );
     if (validateResponse.error) {
       log4js.debug(
         "PlaceAMOTrade validation error -" + validateResponse.error.details
@@ -1674,7 +1540,7 @@ class APIConnect {
       mktPro: "",
       lmPrc: Limit_Price,
       trgPrc: TriggerPrice,
-      prdCode: ProductCode,
+      prdCode: this.__constants.getValidProductCode(this.fileName, Exchange, ProductCode),
       posSqr: "false",
       minQty: "0",
       ordSrc: "API",
@@ -1701,17 +1567,17 @@ class APIConnect {
   /**
    * Modify After Market Order
    * @param {string} Trading_Symbol Trading Symbol of the Scrip
-   * @param {string} Exchange Exchange
-   * @param {'BUY' | 'SELL'} Action BUY | SELL
-   * @param {'DAY' | 'IOC' | 'EOS'} Duration DAY | IOC | EOS(for BSE)
-   * @param {'LIMIT' | 'MARKET' | 'STOP_LIMIT' | 'STOP_MARKET'} Order_Type LIMIT | MARKET | STOP_LIMIT | STOP_MARKET
+   * @param {string} Exchange Exchange value from Position book response.
+   * @param {string} Action BUY | SELL
+   * @param {string} Duration DAY | IOC | EOS(for BSE)
+   * @param {string} Order_Type LIMIT | MARKET | STOP_LIMIT | STOP_MARKET
    * @param {number} Quantity Quantity of the Scrip
    * @param {string} Streaming_Symbol companycode_exchange to be obtained from Contract file downloaded
    * @param {number} Limit_Price Limit price of Scrip
    * @param {string} Order_ID Nest Order Id
    * @param {string} Disclosed_Quantity Quantity to be disclosed while order_placement
    * @param {string} TriggerPrice Trigger Price applicable for SL/SL-M Orders
-   * @param {'CNC' | 'MIS' | 'NRML' | 'MTF'} ProductCode CNC | MIS | NRML | MTF
+   * @param {string} ProductCode Product Code of the trade
    * @returns Promise that resolves/rejects to the Place AMO Trade api response
    */
   ModifyAMOTrade = (
@@ -1726,7 +1592,7 @@ class APIConnect {
     Order_ID,
     Disclosed_Quantity = "0",
     TriggerPrice = "0",
-    ProductCode = "CNC"
+    ProductCode
   ) => {
     log4js.info("Inside ModifyAMOTrade method");
     const paramsObj = {
@@ -1743,7 +1609,10 @@ class APIConnect {
       trgPrc: TriggerPrice,
       prdCode: ProductCode,
     };
-    const validateResponse = validateModifyAMOTrade(paramsObj);
+    const validateResponse = validateModifyAMOTrade(
+      paramsObj,
+      this.excsAndprdDpNm
+    );
     if (validateResponse.error) {
       log4js.debug(
         "ModifyAMOTrade validation error -" + validateResponse.error.details
@@ -1763,7 +1632,7 @@ class APIConnect {
       mktPro: "",
       lmPrc: Limit_Price,
       trgPrc: TriggerPrice,
-      prdCode: ProductCode,
+      prdCode: this.__constants.getValidProductCode(this.fileName, Exchange, ProductCode),
       dtDays: "",
       nstOID: Order_ID,
     };
@@ -1796,11 +1665,11 @@ class APIConnect {
     const data = {
       nstOID: OrderId,
       exc: Exchange,
-      prdCode: Product_Code,
+      prdCode: this.__constants.getValidProductCode(this.fileName, Exchange, Product_Code),
       ordTyp: Order_Type,
     };
     log4js.info("Inside CancelAMOTrade method");
-    const validateResponse = validateCancelAMOTrade(data);
+    const validateResponse = validateCancelAMOTrade(data, this.excsAndprdDpNm);
     if (validateResponse.error) {
       log4js.debug(
         "CancelAMOTrade validation error -" + validateResponse.error.details
@@ -1828,14 +1697,23 @@ class APIConnect {
    * @param {Array<Order>} orderlist List of orders to be Squared Off.
    * @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);
-    }
+  PositionSquareOff = async (orderlist) => {
+    const validateResponse = validatePositionSquareOff(
+      orderlist,
+      this.excsAndprdDpNm
+    );
+    console.log("PositionSquareOff", validateResponse);
+    await Promise.all(
+      validateResponse.map((item) => {
+        if (item.error) {
+          log4js.debug(
+            "PositionSquareOff validation error -" + item.error.details
+          );
+          return Promise.reject(item.error.details);
+        }
+      })
+    );
+
     const lstEq = [];
     const lstComm = [];
     log4js.info("Inside PositionSquareOff method");
@@ -1848,19 +1726,9 @@ class APIConnect {
       order["ordSrc"] = "API";
       order["vnCode"] = "";
       order["rmk"] = "";
+      order["prdCode"] = this.__constants.getValidProductCode(this.fileName, order.exc, order.prdCode);
+      order["lmPrc"] = order.price;
       const data = order;
-      // remove GTCDate, rmk from order if present because we don't need to pass them in api
-      // const data = (data = {
-      // 	...order,
-      // 	flQty: "0",
-      // 	mktPro: "",
-      // 	dtDays: "",
-      // 	posSqr: "true",
-      // 	minQty: "0",
-      // 	ordSrc: "API",
-      // 	vnCode: "",
-      // 	rmk: ""
-      // });
 
       order.exc == "MCX" || order.exc == "NCDEX"
         ? lstComm.push(data)
@@ -1868,13 +1736,13 @@ class APIConnect {
     });
 
     const postEq = lstEq.length
-      ? this.__http.PostMethod(
+      ? await this.__http.PostMethod(
           this.__config.PositionSqOffURL(this.__constants.eqAccId),
           lstEq
         )
       : undefined;
     const postComm = lstComm.length
-      ? this.__http.PostMethod(
+      ? await this.__http.PostMethod(
           this.__config.PositionSqOffURL(this.__constants.coAccId),
           lstComm
         )
@@ -1888,7 +1756,72 @@ class APIConnect {
   };
 
   /**
-   * Converts your holding position from MIS to CNC and vice-versa
+   *  Convert a Position partially for Commodity
+   * @param {string}  streamingSymbol  companycode_exchange to be obtained from Contract file downloaded
+   * @param {string}  conversionType  Conversion type D-- Daywise and C–carry forward position
+   * @param {string}  quantity  Quantity to be converted.
+   * @param {string}  action  Transaction type 'BUY' and 'SELL - SELL .
+   * @param {string}  oldProductCode  Existing Product Code of the trade.
+   * @param {string}  newProductCode  New Product code of the trade.
+   * @param {string}  exchange  Exchange value from Position book response.
+   * @param {string}  tradingSymbol Trading Symbol of the Scrip
+   * @returns Promise that resolves/rejects to the Convert Position api response
+   */
+  ConvertPositionCOMM = (
+    streamingSymbol,
+    conversionType,
+    quantity,
+    action,
+    oldProductCode,
+    newProductCode,
+    exchange,
+    tradingSymbol
+  ) => {
+    log4js.info(`ConvertPositionCOMM method is called.`);
+    const data = {
+      sym: streamingSymbol,
+      cnvTyp: conversionType,
+      qty: quantity,
+      action: this.__constants.getAlternateActionName(action),
+      prdCode: this.__constants.getValidProductCode(this.fileName, exchange, oldProductCode),
+      prdCodeCh: this.__constants.getValidProductCode(this.fileName, exchange, newProductCode),
+      ordSrc: "API",
+      exc: exchange,
+      trdSym: tradingSymbol,
+    };
+    const validateResponse = validateConvertPositionCOMM(
+      data,
+      this.excsAndprdDpNm
+    );
+    if (validateResponse.error) {
+      log4js.debug(
+        `ConvertPositionCOMM validation error - ${validateResponse.error.details}`
+      );
+      return Promise.reject(validateResponse.error.details);
+    }
+    log4js.info(
+      `ConvertPositionCOMM method is called with data ${JSON.stringify(data)}`
+    );
+    if (exchange === "MCX" || exchange === "NCDEX") {
+      const url = this.__config.ConvertPositionURL_comm(
+        this.__constants.coAccId
+      );
+      log4js.debug(`ConvertPositionCOMM URLS: ${url}`);
+      var result = this.__http.PutMethod(url, data);
+      log4js.debug(`ConvertPositionCOMM Result : ${JSON.stringify(result)}`);
+      return result;
+    }
+    // else {
+    //   const url = this.__config.ConvertPositionURL(this.__constants.eqAccId);
+    //   log4js.debug(`ConvertPosition URLS: ${url}`);
+    //   var result = this.__http.PutMethod(url, data);
+    //   log4js.debug(`ConvertPosition Result : ${JSON.stringify(result)}`);
+    //   return result;
+    // }
+  };
+
+  /**
+   * Converts your holding position For Equity
    * @param {string} Order_Id Nest Order Id
    * @param {string} Fill_Id Fill Id of the trade obtained from Trade API
    * @param {string} New_Product_Code New Product code of the trade
@@ -1905,46 +1838,31 @@ class APIConnect {
     Exchange,
     orderType
   ) => {
-    log4js.info("Inside ConvertPosition method");
-
-    if (Exchange == "MCX" || Exchange == "NCDEX") {
-      const data = {
-        nstOID: Order_Id,
-        flID: Fill_Id,
-        prdCodeCh: New_Product_Code,
-        prdCode: Old_Product_Code,
-        exc: Exchange,
-        ordTyp: orderType,
-      };
-      log4js.debug("ConvertPosition Data :" + JSON.stringify(data));
-      const validateResponse = validateConvertPosition(data);
-      if (validateResponse.error) {
-        log4js.debug(
-          "ConvertPosition validation error -" + validateResponse.error.details
-        );
-        return Promise.reject(validateResponse.error.details);
-      }
-      const url = this.__config.ConvertPositionURL_comm(
-        this.__constants.coAccId
+    log4js.info(`ConvertPosition method is called.`);
+    const data = {
+      nstOID: Order_Id,
+      flID: Fill_Id,
+      prdCodeCh: this.__constants.getValidProductCode(this.fileName, Exchange, New_Product_Code),
+      prdCode: this.__constants.getValidProductCode(this.fileName, Exchange, Old_Product_Code),
+      exc: Exchange,
+      ordTyp: orderType
+    };
+    
+    const validateResponse = validateConvertPositionEQ(data, this.excsAndprdDpNm);
+    if (validateResponse.error) {
+      log4js.debug(
+        `ConvertPosition validation error - ${validateResponse.error.details}`
       );
-      log4js.debug("ConvertPosition URLS:" + url);
-      var result = this.__http.PutMethod(url, data);
-      log4js.debug("ConvertPosition Result :" + JSON.stringify(result));
-      return result;
-    } else {
-      const data = {
-        nstOID: Order_Id,
-        flID: Fill_Id,
-        prdCodeCh: New_Product_Code,
-        prdCode: Old_Product_Code,
-      };
-      log4js.debug("ConvertPosition Data :" + JSON.stringify(data));
-      const url = this.__config.ConvertPositionURL(this.__constants.eqAccId);
-      log4js.debug("ConvertPosition URLS:" + url);
-      var result = this.__http.PutMethod(url, data);
-      log4js.debug("ConvertPosition Result :" + JSON.stringify(result));
-      return result;
+      return Promise.reject(validateResponse.error.details);
     }
+    log4js.debug(
+      `ConvertPosition method error is called with data ${JSON.stringify(data)}`
+    );
+    const url = this.__config.ConvertPositionURL(this.__constants.eqAccId);
+    log4js.debug(`ConvertPosition URLS: ${url}`);
+    var result = this.__http.PutMethod(url, data);
+    log4js.debug(`ConvertPosition Result : ${JSON.stringify(result)}`);
+    return result;
   };
 
   // MF Methods start //
@@ -2421,4 +2339,4 @@ APIConnect.prototype.__http = new __Http(
   APIConnect.prototype.__config.baseurl
 );
 
-module.exports = { APIConnect };
+module.exports = { APIConnect, Order };