api_connect_nodejs 2.0.5 → 2.0.6

package/conf/settings.ini

@@ -9,7 +9,7 @@ BasePathContent = https://nc.nuvamawealth.com/edelmw-content/content/
 EquityContractURL = https://nc.nuvamawealth.com/app/toccontracts/instruments.zip
 MFContractURL = https://nc.nuvamawealth.com/app/toccontracts/mfInstruments.zip
 
-ApiIdKey = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhcHAiOjAsImZmIjoiVyIsImJkIjoid2ViLXBjIiwibmJmIjoxNjkwNTQxNTQ5LCJzcmMiOiJlbXRtdyIsImF2IjoiMi4wLjUiLCJhcHBpZCI6IjQ5ZTJhNjU1MzAyZTYyM2NhZGEwMTQ2NWRkZTZiODgyIiwiaXNzIjoiZW10IiwiZXhwIjoxNjkwNTY5MDAwLCJpYXQiOjE2OTA1NDE4NDl9.n4N2-F5TWQoizi87_Tv7DyNxdizAa0IKdIS0RqZ4l1w
+ApiIdKey = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhcHAiOjAsImZmIjoiVyIsImJkIjoid2ViLXBjIiwibmJmIjoxNjk4OTk0MTM1LCJzcmMiOiJlbXRtdyIsImF2IjoiMi4wLjYiLCJhcHBpZCI6IjhjZmE0MGJiYmUxMjQ5MGM2YzhjYzMwOWNlZmViZGQzIiwiaXNzIjoiZW10IiwiZXhwIjoxNjk5MDM2MjAwLCJpYXQiOjE2OTg5OTQ0MzV9.rwTusEQqt0VuYlW1-MSsixJm3RJGQTj2AFt8e_GsY3o
 TlsVersion = 1.2
 LogLevel = All
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api_connect_nodejs",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "Command to run :",
   "main": "index.js",
   "directories": {
@@ -8,6 +8,7 @@
   },
   "dependencies": {
     "@joi/date": "^2.1.0",
+    "api_connect_nodejs": "file:api_connect_nodejs-2.0.6.tgz",
     "chai": "^4.3.6",
     "csv-parser": "^3.0.0",
     "csv-writer": "^1.6.0",

package/src/apiConnect.js

@@ -112,6 +112,7 @@ class APIConnect {
             this.__constants.AppIdKey = j.appidkey;
             this.__constants.profileId = j.data.data.lgnData.accs.prfId;
             this.__constants.prds = j.data.data.lgnData.prds;
+            this.__constants.accs = j.data.data.lgnData.accs;
             this.excsAndprdDpNm = this.__constants.getProductsAndExchange(
               this.__constants.prds
             );
@@ -1037,17 +1038,20 @@ class APIConnect {
       rmk: "",
       flQty: true,
     };
-    log4js.debug("PlaceTrade Data :" + JSON.stringify(data));
+    
     if (Exchange == "MCX" || Exchange == "NCDEX") {
+      log4js.debug("PlaceTrade Data :" + JSON.stringify(data));
       const url = this.__config.PlaceTradeURL_comm(this.__constants.coAccId);
       log4js.debug("PlaceTrade URL -" + url);
       var result = this.__http.PostMethod(url, data);
       log4js.debug("PlaceTrade Result :" + JSON.stringify(result));
       return result;
     } else {
+      const upadatedData = this.__checkDependentAndUpdateData(data);
       const url = this.__config.PlaceTradeURL(this.__constants.eqAccId);
       log4js.debug("PlaceTrade URL -" + url);
-      var result = this.__http.PostMethod(url, data);
+      log4js.debug("PlaceTrade Data :" + JSON.stringify(upadatedData));
+      var result = this.__http.PostMethod(url, upadatedData);
       log4js.debug("PlaceTrade Result :" + JSON.stringify(result));
       return result;
     }
@@ -1157,6 +1161,7 @@ class APIConnect {
    * @param {string} Disclosed_Quantity Quantity to be disclosed while order placement
    * @param {string} TriggerPrice Trigger Price applicable for SL/SL-M Orders
    * @param {string} ProductCode CNC | MIS | NRML | MTF
+   * @param {string} CurrentQuantity
    * @returns Promise that resolves/rejects to Modify Order api response
    */
   ModifyTrade = (
@@ -1171,7 +1176,8 @@ class APIConnect {
     Order_ID,
     Disclosed_Quantity = "0",
     TriggerPrice = "0",
-    ProductCode
+    ProductCode,
+    CurrentQuantity = "0"
   ) => {
     log4js.info("Inside ModifyTrade method");
     const paramsObj = {
@@ -1187,6 +1193,7 @@ class APIConnect {
       dscQty: Disclosed_Quantity,
       trgPrc: TriggerPrice,
       prdCode: ProductCode,
+      curQty: CurrentQuantity,
     };
     const validateResponse = validateModifyTrade(
       paramsObj,
@@ -1217,17 +1224,20 @@ class APIConnect {
       valid: false,
     };
 
-    log4js.debug("ModifyTrade Data :" + JSON.stringify(data));
     if (Exchange == "MCX" || Exchange == "NCDEX") {
       const url = this.__config.ModifyTradeURL_comm(this.__constants.coAccId);
       log4js.debug("ModifyTrade URLS -" + url);
+      log4js.debug("ModifyTrade Data :" + JSON.stringify(data));
       var result = this.__http.PutMethod(url, data);
       log4js.debug("ModifyTrade Result :" + JSON.stringify(result));
       return result;
     } else {
+      data.curQty = CurrentQuantity;
+      const upadatedData = this.__checkDependentAndUpdateData(data);
       const url = this.__config.ModifyTradeURL(this.__constants.eqAccId);
       log4js.debug("ModifyTrade URLS -" + url);
-      var result = this.__http.PutMethod(url, data);
+      log4js.debug("ModifyTrade Data :" + JSON.stringify(upadatedData));
+      var result = this.__http.PutMethod(url, upadatedData);
       log4js.debug("ModifyTrade Result :" + JSON.stringify(result));
       return result;
     }
@@ -1238,9 +1248,20 @@ class APIConnect {
    * @param {string} Exchange Exchange
    * @param {string'} Order_Type LIMIT | MARKET | STOP_LIMIT | STOP_MARKET
    * @param {string} ProductCode CNC | MIS | NRML | MTF
+   * @param {string} CurrentQuantity
    * @returns Promise that resolves/rejects to Cancel Trade api response
    */
-  CancelTrade = (OrderId, Exchange, Order_Type, ProductCode) => {
+  CancelTrade = (
+    OrderId,
+    Exchange,
+    Order_Type,
+    ProductCode,
+    CurrentQuantity = "0",
+    FillQuantity = "0",
+    Trading_Symbol,
+    Action,
+    Streaming_Symbol,
+    ) => {
     log4js.info("Inside CancelTrade method");
     const data = {
       nstOID: OrderId,
@@ -1248,27 +1269,49 @@ class APIConnect {
       prdCode: this.__constants.getValidProductCode(this.fileName, Exchange, ProductCode),
       ordTyp: Order_Type,
     };
-    const validateResponse = validateCancelPlaceTrade(
-      data,
-      this.excsAndprdDpNm
-    );
-    if (validateResponse.error) {
-      log4js.debug(
-        "CancelTrade validation error -" + validateResponse.error.details
-      );
-      return Promise.reject(validateResponse.error.details);
-    }
-    log4js.debug("CancelTrade Data :" + JSON.stringify(data));
+    
     if (Exchange == "MCX" || Exchange == "NCDEX") {
+      const validateResponse = validateCancelPlaceTrade(
+        data,
+        this.excsAndprdDpNm
+      );
+      if (validateResponse.error) {
+        log4js.debug(
+          "CancelTrade validation error -" + validateResponse.error.details
+        );
+        return Promise.reject(validateResponse.error.details);
+      }
+      log4js.debug("CancelTrade Data :" + JSON.stringify(data));
+
       const url = this.__config.CancelTradeURL_comm(this.__constants.coAccId);
       log4js.debug("CancelTrade URLS -" + url);
       var result = this.__http.PutMethod(url, data);
       log4js.debug("CancelTrade Result :" + JSON.stringify(result));
       return result;
     } else {
+
+      data.curQty = CurrentQuantity;
+      data.flQty = FillQuantity;
+      data.trdSym = Trading_Symbol;
+      data.action = Action;
+      data.sym = Streaming_Symbol;
+
+      const validateResponse = validateCancelPlaceTradeV1(
+        data,
+        this.excsAndprdDpNm
+      );
+      if (validateResponse.error) {
+        log4js.debug(
+          "CancelTrade validation error -" + validateResponse.error.details
+        );
+        return Promise.reject(validateResponse.error.details);
+      }
+
+      const upadatedData = this.__checkDependentAndUpdateData(data);    
       const url = this.__config.CancelTradeURL(this.__constants.eqAccId);
       log4js.debug("CancelTrade URLS -" + url);
-      var result = this.__http.PutMethod(url, data);
+      log4js.debug("CancelTrade Data :" + JSON.stringify(upadatedData));
+      var result = this.__http.PutMethod(url, upadatedData);
       log4js.debug("CancelTrade Result :" + JSON.stringify(result));
       return result;
     }
@@ -1584,17 +1627,19 @@ class APIConnect {
       rmk: "",
     };
 
-    log4js.debug("PlaceAMOTrade Data :" + JSON.stringify(data));
     if (Exchange == "MCX" || Exchange == "NCDEX") {
       const url = this.__config.PlaceAMOTrade_comm(this.__constants.coAccId);
       log4js.debug("PlaceAMOTrade URLS -" + url);
+      log4js.debug("PlaceAMOTrade Data :" + JSON.stringify(data));
       var result = this.__http.PostMethod(url, data);
       log4js.debug("PlaceAMOTrade Result :" + JSON.stringify(result));
       return result;
     } else {
+      const upadatedData = this.__checkDependentAndUpdateData(data);
       const url = this.__config.PlaceAMOTrade(this.__constants.eqAccId);
       log4js.debug("PlaceAMOTrade URLS -" + url);
-      var result = this.__http.PostMethod(url, data);
+      log4js.debug("PlaceAMOTrade Data :" + JSON.stringify(upadatedData));
+      var result = this.__http.PostMethod(url, upadatedData);
       log4js.debug("PlaceAMOTrade Result :" + JSON.stringify(result));
       return result;
     }
@@ -1614,6 +1659,7 @@ class APIConnect {
    * @param {string} Disclosed_Quantity Quantity to be disclosed while order_placement
    * @param {string} TriggerPrice Trigger Price applicable for SL/SL-M Orders
    * @param {string} ProductCode Product Code of the trade
+   * @param {string} CurrentQuantity
    * @returns Promise that resolves/rejects to the Place AMO Trade api response
    */
   ModifyAMOTrade = (
@@ -1628,7 +1674,8 @@ class APIConnect {
     Order_ID,
     Disclosed_Quantity = "0",
     TriggerPrice = "0",
-    ProductCode
+    ProductCode,
+    CurrentQuantity = "0"
   ) => {
     log4js.info("Inside ModifyAMOTrade method");
     const paramsObj = {
@@ -1644,6 +1691,7 @@ class APIConnect {
       dscQty: Disclosed_Quantity,
       trgPrc: TriggerPrice,
       prdCode: ProductCode,
+      curQty: CurrentQuantity,
     };
     const validateResponse = validateModifyAMOTrade(
       paramsObj,
@@ -1673,17 +1721,20 @@ class APIConnect {
       nstOID: Order_ID,
     };
 
-    log4js.debug("ModifyAMOTrade Data :" + JSON.stringify(data));
     if (Exchange == "MCX" || Exchange == "NCDEX") {
       const url = this.__config.ModifyAMOTrade_comm(this.__constants.coAccId);
       log4js.debug("ModifyAMOTrade URLS" + url);
+      log4js.debug("ModifyAMOTrade Data :" + JSON.stringify(data));
       var result = this.__http.PutMethod(url, data);
       log4js.debug("ModifyAMOTrade Result :" + JSON.stringify(result));
       return result;
     } else {
+      data.curQty = CurrentQuantity;
+      const upadatedData = this.__checkDependentAndUpdateData(data);
       const url = this.__config.ModifyAMOTrade(this.__constants.eqAccId);
       log4js.debug("ModifyAMOTrade URLS" + url);
-      var result = this.__http.PutMethod(url, data);
+      log4js.debug("ModifyAMOTrade Data :" + JSON.stringify(upadatedData));
+      var result = this.__http.PutMethod(url, upadatedData);
       log4js.debug("ModifyAMOTrade Result :" + JSON.stringify(result));
       return result;
     }
@@ -1695,34 +1746,65 @@ class APIConnect {
    * @param {string} Exchange Exchange
    * @param {'LIMIT' | 'MARKET' | 'STOP_LIMIT' | 'STOP_MARKET'} Order_Type LIMIT | MARKET | STOP_LIMIT | STOP_MARKET
    * @param {'CNC' | 'MIS' | 'NRML' | 'MTF'} Product_Code CNC | MIS | NRML | MTF
+   * @param {string} CurrentQuantity
    * @returns Promise that resolves/rejects to the Cancel AMO Trade api response
    */
-  CancelAMOTrade = (OrderId, Exchange, Order_Type, Product_Code) => {
+  CancelAMOTrade = (
+    OrderId, 
+    Exchange, 
+    Order_Type, 
+    Product_Code,
+    CurrentQuantity = "0",
+    FillQuantity = "0",
+    Trading_Symbol,
+    Action,
+    Streaming_Symbol,
+    ) => {
     const data = {
       nstOID: OrderId,
       exc: Exchange,
       prdCode: this.__constants.getValidProductCode(this.fileName, Exchange, Product_Code),
       ordTyp: Order_Type,
+      curQty: CurrentQuantity,
     };
     log4js.info("Inside CancelAMOTrade method");
-    const validateResponse = validateCancelAMOTrade(data, this.excsAndprdDpNm);
-    if (validateResponse.error) {
-      log4js.debug(
-        "CancelAMOTrade validation error -" + validateResponse.error.details
-      );
-      return Promise.reject(validateResponse.error.details);
-    }
-    log4js.debug("CancelAMOTrade Data :" + JSON.stringify(data));
+    
     if (Exchange == "MCX" || Exchange == "NCDEX") {
+      const validateResponse = validateCancelAMOTrade(data, this.excsAndprdDpNm);
+      if (validateResponse.error) {
+        log4js.debug(
+          "CancelAMOTrade validation error -" + validateResponse.error.details
+        );
+        return Promise.reject(validateResponse.error.details);
+      }
+      log4js.debug("CancelAMOTrade Data :" + JSON.stringify(data));
+
       const url = this.__config.CancelAMOTrade_comm(this.__constants.coAccId);
       log4js.debug("CancelAMOTrade URLS -" + url);
       var result = this.__http.PutMethod(url, data);
       log4js.debug("CancelAMOTrade Result :" + JSON.stringify(result));
       return result;
     } else {
+
+      data.curQty = CurrentQuantity;
+      data.flQty = FillQuantity;
+      data.trdSym = Trading_Symbol;
+      data.action = Action;
+      data.sym = Streaming_Symbol;
+
+      const validateResponse = validateCancelAMOTradeV1(data, this.excsAndprdDpNm);
+      if (validateResponse.error) {
+        log4js.debug(
+          "CancelAMOTrade validation error -" + validateResponse.error.details
+        );
+        return Promise.reject(validateResponse.error.details);
+      }
+
+      const upadatedData = this.__checkDependentAndUpdateData(data);
       const url = this.__config.CancelAMOTrade(this.__constants.eqAccId);
       log4js.debug("CancelAMOTrade URLS -" + url);
-      var result = this.__http.PutMethod(url, data);
+      log4js.debug("CancelAMOTrade Data :" + JSON.stringify(upadatedData));
+      var result = this.__http.PutMethod(url, upadatedData);
       log4js.debug("CancelAMOTrade Result :" + JSON.stringify(result));
       return result;
     }
@@ -1738,7 +1820,6 @@ class APIConnect {
       orderlist,
       this.excsAndprdDpNm
     );
-    console.log("PositionSquareOff", validateResponse);
     await Promise.all(
       validateResponse.map((item) => {
         if (item.error) {
@@ -1766,29 +1847,37 @@ class APIConnect {
       order["lmPrc"] = order.price;
       const data = order;
 
-      order.exc == "MCX" || order.exc == "NCDEX"
-        ? lstComm.push(data)
-        : lstEq.push(data);
+      if(order.exc == "MCX" || order.exc == "NCDEX") {
+         lstComm.push(data)
+      }else {
+        const upadatedData = this.__checkDependentAndUpdateData(data);
+        {lstEq.push(upadatedData)};
+      }
     });
 
-    const postEq = lstEq.length
-      ? await this.__http.PostMethod(
-          this.__config.PositionSqOffURL(this.__constants.eqAccId),
-          lstEq
-        )
-      : undefined;
-    const postComm = lstComm.length
-      ? await this.__http.PostMethod(
-          this.__config.PositionSqOffURL(this.__constants.coAccId),
-          lstComm
-        )
-      : undefined;
-    var result = Promise.all([postEq, postComm]).then(([eq, comm]) => ({
-      eq,
-      comm,
-    }));
-    log4js.debug("PositionSquareOff Result :" + JSON.stringify(result));
-    return result;
+    const dataEq = {
+      sqrLst: lstEq
+    };
+    if(Object.keys(dataEq).length > 0) {
+      const postComm = ""
+      const postEq = this.__http.PostMethod(this.__config.PositionSqOffV1URL(this.__constants.eqAccId),dataEq)
+      var result = Promise.all([postEq, postComm]).then(([eq, comm]) => ({
+        eq,
+        comm,
+      }));
+      log4js.debug("PositionSquareOff Result :" + JSON.stringify(result));
+      return result;
+    } else if(Object.keys(lstComm).length > 0) {
+      const postEq = ""
+      const postComm = this.__http.PostMethod(this.__config.PositionSqOffURL(this.__constants.coAccId),lstComm)
+      var result = Promise.all([postEq, postComm]).then(([eq, comm]) => ({
+        eq,
+        comm,
+      }));
+      log4js.debug("PositionSquareOff Result :" + JSON.stringify(result));
+      return result;
+    }
+    return "";
   };
 
   /**
@@ -2287,6 +2376,7 @@ class APIConnect {
           this.__constants.coAccId = res.data.lgnData.accs.coAccID;
         }
         this.__constants.JSession = res.data.auth;
+        this.__constants.accs = res.data.lgnData.accs;
         return res;
       })
       .then((res) => {
@@ -2385,6 +2475,20 @@ class APIConnect {
 
     return response;
   };
+
+  //CheckDependentAndUpdateData
+  /**
+   *
+   * @param {map}   CheckDependentAndUpdateData = (reqBodyData) => {
+   * @returns map
+   */
+  __checkDependentAndUpdateData(reqBodyData) {
+    let accountDataMap = this.__constants.accs;
+    if(accountDataMap.hasOwnProperty("empOrDependent")) {
+      reqBodyData.empOrDependent = accountDataMap.empOrDependent;
+    }
+    return reqBodyData;
+  }
 }
 
 APIConnect.prototype.__constants = new __Constants();

package/src/config.js

@@ -133,7 +133,7 @@ class __Config {
   };
 
   PlaceTradeURL = function (userid) {
-    return this.baseurleq + "trade/placetrade/" + userid;
+    return this.baseurleq + "trade/placetrade/v1/" + userid;
   };
 
   PlaceTradeURL_comm = function (userid) {
@@ -193,7 +193,7 @@ class __Config {
   };
 
   ModifyTradeURL = function (userid) {
-    return this.baseurleq + "trade/modifytrade/" + userid;
+    return this.baseurleq + "trade/modifytrade/v1/" + userid;
   };
 
   ModifyTradeURL_comm = function (userid) {
@@ -237,6 +237,10 @@ class __Config {
     return this.baseurleq + "trade/position/sqroff/" + userid;
   };
 
+  PositionSqOffV1URL = function (userid) {
+    return this.baseurleq + "trade/position/sqroff/v1/" + userid;
+  };
+
   ConvertPositionURL = function (userid) {
     return this.baseurleq + "trade/convertposition/v1/" + userid;
   };
@@ -246,7 +250,7 @@ class __Config {
   };
 
   PlaceAMOTrade = function (userid) {
-    return this.baseurleq + "trade/amo/placetrade/" + userid;
+    return this.baseurleq + "trade/amo/placetrade/v1/" + userid;
   };
 
   PlaceAMOTrade_comm = function (userid) {
@@ -254,7 +258,7 @@ class __Config {
   };
 
   ModifyAMOTrade = function (userid) {
-    return this.baseurleq + "trade/amo/modifytrade/" + userid;
+    return this.baseurleq + "trade/amo/modifytrade/v1/" + userid;
   };
 
   ModifyAMOTrade_comm = function (userid) {

package/validations/apiConnectValidator.js

@@ -72,6 +72,7 @@ validateModifyTrade = (object, prds) => {
       // .valid(...prdName)
       .required(),
     nstOID: Joi.string().required(),
+    curQty: Joi.string().required(),
   }).options({ abortEarly: false });
 
   return modifyTradeSchema.validate(object);
@@ -98,6 +99,34 @@ validateCancelPlaceTrade = (object, prds) => {
   return cancelPlaceTradeSchema.validate(object);
 };
 
+validateCancelPlaceTradeV1 = (object, prds) => {
+  // let prdName = [];
+  // if (prds.exc.includes(object.exc)) {
+  //   prdName = prds.prd[object.exc];
+  // }
+  const cancelPlaceTradeSchema = Joi.object({
+    nstOID: Joi.string().required(),
+    exc: Joi.string()
+      .valid(...prds.exc)
+      .required(),
+    ordTyp: Joi.string()
+      .valid(...orderTypeArray)
+      .required(),
+    prdCode: Joi.string()
+      // .valid(...prdName)
+      .required(),
+    curQty: Joi.string().required(),
+    flQty: Joi.string().required(),
+    trdSym: Joi.string().required(),
+    action: Joi.string()
+      .valid(...actionTypeArray)
+      .required(),
+    sym: Joi.string().required(),
+  }).options({ abortEarly: false });
+
+  return cancelPlaceTradeSchema.validate(object);
+};
+
 validatePlaceGtcGtdTrade = (object, prds) => {
   // let prdName = [];
   // if (prds.exc.includes(object.exc)) {
@@ -188,6 +217,7 @@ validateModifyAMOTrade = (object, prds) => {
       .required(),
     nstOID: Joi.string().required(),
     sym: Joi.string().required(),
+    curQty: Joi.string().required(),
   }).options({ abortEarly: false });
 
   return modifyAMOTradeSchema.validate(object);
@@ -214,6 +244,34 @@ validateCancelAMOTrade = (object, prds) => {
   return cancelAMOTradeSchema.validate(object);
 };
 
+validateCancelAMOTradeV1 = (object, prds) => {
+  // let prdName = [];
+  // if (prds.exc.includes(object.exc)) {
+  //  prdName = prds.prd[object.exc];
+  // }
+   const cancelAMOTradeSchema = Joi.object({
+     nstOID: Joi.string().required(),
+     exc: Joi.string()
+       .valid(...prds.exc)
+       .required(),
+     ordTyp: Joi.string()
+       .valid(...orderTypeArray)
+       .required(),
+     prdCode: Joi.string()
+ //      .valid(...prdName)
+       .required(),
+     curQty: Joi.string().required(),
+     flQty: Joi.string().required(),
+     trdSym: Joi.string().required(),
+     action: Joi.string()
+         .valid(...actionTypeArray)
+         .required(),
+     sym: Joi.string().required(),
+   }).options({ abortEarly: false });
+ 
+   return cancelAMOTradeSchema.validate(object);
+ };
+
 validateConvertPositionCOMM = (object, prds) => {
  // let prdName = [];
  // if (prds.exc.includes(object.exc)) {