Adds date validation

Author: mohamed-mehany

.pnp.cjs

@@ -28,6 +28,7 @@
     "start": "yarn server:dist"
   },
   "devDependencies": {
+    "@types/async-retry": "^1",
     "@types/crypto-js": "^4",
     "@types/jest": "27.5.2",
     "@types/node": "16.18.119",
@@ -36,6 +37,7 @@
   },
   "dependencies": {
     "@chainlink/external-adapter-framework": "2.6.0",
+    "async-retry": "^1.3.3",
     "crypto-js": "^4.2.0",
     "dayjs": "^1.11.13",
     "tslib": "2.4.1",

packages/sources/nav-libre/package.json

@@ -4,7 +4,7 @@ import { v4 as uuidv4 } from 'uuid'
 /**
  * Generate the necessary headers for calling the NAV API with a 5-minute-valid signature.
  */
-export const getNavRequestHeaders = (
+export const getRequestHeaders = (
   method: string,
   path: string,
   body: string,

packages/sources/nav-libre/src/transport/authentication.ts

@@ -0,0 +1,47 @@
+import { Requester } from '@chainlink/external-adapter-framework/util/requester'
+import { AdapterError } from '@chainlink/external-adapter-framework/validation/error'
+import { getRequestHeaders } from './authentication'
+interface Response {
+  FundName: string
+  GlobalFundID: number
+  FundEndDate: string
+  FundDailyAccountingStartDate: string
+  FundDailyAccountingLastAvailableDate: string
+  FundOfficialAccountingLastAvailableDate: string
+  PortfolioLastAvailableDate: string
+}
+
+export const getFund = async (
+  globalFundID: number,
+  url: string,
+  apiKey: string,
+  secret: string,
+  requester: Requester,
+) => {
+  const method = 'GET'
+  const query = `globalFundID=${globalFundID}`
+  const path = '/navapigateway/api/v1/FundAccountingData/GetAccountingDataDates'
+  const requestConfig = {
+    baseURL: url,
+    url: path,
+    method: method,
+    headers: getRequestHeaders(method, path + '?' + query, '', apiKey, secret),
+  }
+
+  const sourceResponse = await requester.request<Response[]>(
+    JSON.stringify(requestConfig),
+    requestConfig,
+  )
+
+  if (sourceResponse.response.data.length == 0) {
+    throw new AdapterError({
+      statusCode: 400,
+      message: `No fund found`,
+    })
+  }
+
+  const response = sourceResponse.response.data[0]
+  console.log(response)
+
+  return [response.GlobalFundID.toString(), response.FundDailyAccountingLastAvailableDate + 'Z']
+}

packages/sources/nav-libre/src/transport/fund.ts

@@ -1,7 +1,7 @@
 import { HttpTransport } from '@chainlink/external-adapter-framework/transports'
 import dayjs from 'dayjs'
 import { BaseEndpointTypes } from '../endpoint/nav'
-import { getNavRequestHeaders } from './authentication'
+import { getRequestHeaders } from './authentication'
 
 export interface ResponseSchema {
   Data: {
@@ -50,14 +50,23 @@ export const httpTransport = new HttpTransport<HttpTransportTypes>({
         throw new Error('toDate must be in MM-DD-YYYY format')
       }
 
+      const response = await getFund(
+        getFund,
+        param.globalFundID,
+        config.API_ENDPOINT,
+        config.API_KEY,
+        config.SECRET_KEY,
+        this.requestor,
+      )
+
       const method = 'GET'
       const path =
         '/navapigateway/api/v1/FundAccountingData/GetOfficialNAVAndPerformanceReturnsForFund'
       const query = `globalFundID=${param.globalFundID}&fromDate=${fromDate}&toDate=${toDate}`
       // Body is empy for GET
       const body = ''
 
-      const headers = getNavRequestHeaders(
+      const headers = getRequestHeaders(
         method,
         path + '?' + query,
         body,
@@ -114,3 +123,33 @@ export const httpTransport = new HttpTransport<HttpTransportTypes>({
     }))
   },
 })
+
+// async function callFunction<T extends unknown[], R>(
+//   func: (...args: T) => Promise<R>,
+//   maxRetry: number,
+//   ...args: T
+// ): Promise<R> {
+//   return retry(
+//     async (bail, attempt) => {
+//       try {
+//         return await func(...args)
+//       } catch (err) {
+//         if (attempt >= maxRetry) {
+//           // give up and bubble the error
+//           bail(err)
+//           return // unreachable, but satisfies TS
+//         }
+//         // otherwise throw to trigger another retry
+//         throw err
+//       }
+//     },
+//     {
+//       retries: maxRetry,
+//       minTimeout: 10000,
+//       maxTimeout: 10000,
+//       onRetry: (err, attempt) => {
+//         logger.info(`${maxRetry - attempt} retries remaining, sleeping for 10000ms...`)
+//       },
+//     },
+//   )
+// }

packages/sources/nav-libre/src/transport/nav.ts

@@ -5000,9 +5000,11 @@ __metadata:
   resolution: "@chainlink/nav-libre-adapter@workspace:packages/sources/nav-libre"
   dependencies:
     "@chainlink/external-adapter-framework": "npm:2.6.0"
+    "@types/async-retry": "npm:^1"
     "@types/crypto-js": "npm:^4"
     "@types/jest": "npm:27.5.2"
     "@types/node": "npm:16.18.119"
+    async-retry: "npm:^1.3.3"
     crypto-js: "npm:^4.2.0"
     dayjs: "npm:^1.11.13"
     nock: "npm:13.5.5"
@@ -12359,6 +12361,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/async-retry@npm:^1":
+  version: 1.4.9
+  resolution: "@types/async-retry@npm:1.4.9"
+  dependencies:
+    "@types/retry": "npm:*"
+  checksum: 10/9cbfe8fb9a6c3559c7084b359edb7b6bae30e16e023eb959e58362b799fc5a9450961e77d994b86526c8de45815eed02c081a104712fb6f2f55ef4cba7263601
+  languageName: node
+  linkType: hard
+
 "@types/babel__core@npm:7.20.5, @types/babel__core@npm:^7.1.14":
   version: 7.20.5
   resolution: "@types/babel__core@npm:7.20.5"
@@ -13004,6 +13015,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/retry@npm:*":
+  version: 0.12.5
+  resolution: "@types/retry@npm:0.12.5"
+  checksum: 10/3fb6bf91835ca0eb2987567d6977585235a7567f8aeb38b34a8bb7bbee57ac050ed6f04b9998cda29701b8c893f5dfe315869bc54ac17e536c9235637fe351a2
+  languageName: node
+  linkType: hard
+
 "@types/retry@npm:0.12.0":
   version: 0.12.0
   resolution: "@types/retry@npm:0.12.0"
@@ -14206,6 +14224,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"async-retry@npm:^1.3.3":
+  version: 1.3.3
+  resolution: "async-retry@npm:1.3.3"
+  dependencies:
+    retry: "npm:0.13.1"
+  checksum: 10/38a7152ff7265a9321ea214b9c69e8224ab1febbdec98efbbde6e562f17ff68405569b796b1c5271f354aef8783665d29953f051f68c1fc45306e61aec82fdc4
+  languageName: node
+  linkType: hard
+
 "async@npm:^3.2.2, async@npm:^3.2.3, async@npm:^3.2.4":
   version: 3.2.6
   resolution: "async@npm:3.2.6"
@@ -29177,20 +29204,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"retry@npm:0.13.1, retry@npm:^0.13.1":
+  version: 0.13.1
+  resolution: "retry@npm:0.13.1"
+  checksum: 10/6125ec2e06d6e47e9201539c887defba4e47f63471db304c59e4b82fc63c8e89ca06a77e9d34939a9a42a76f00774b2f46c0d4a4cbb3e287268bd018ed69426d
+  languageName: node
+  linkType: hard
+
 "retry@npm:^0.12.0":
   version: 0.12.0
   resolution: "retry@npm:0.12.0"
   checksum: 10/1f914879f97e7ee931ad05fe3afa629bd55270fc6cf1c1e589b6a99fab96d15daad0fa1a52a00c729ec0078045fe3e399bd4fd0c93bcc906957bdc17f89cb8e6
   languageName: node
   linkType: hard
 
-"retry@npm:^0.13.1":
-  version: 0.13.1
-  resolution: "retry@npm:0.13.1"
-  checksum: 10/6125ec2e06d6e47e9201539c887defba4e47f63471db304c59e4b82fc63c8e89ca06a77e9d34939a9a42a76f00774b2f46c0d4a4cbb3e287268bd018ed69426d
-  languageName: node
-  linkType: hard
-
 "reusify@npm:^1.0.4":
   version: 1.0.4
   resolution: "reusify@npm:1.0.4"