From 19df964461bcbafb9a41b6022a452da07258b71f Mon Sep 17 00:00:00 2001
From: slasher125 <74533329+slasher125@users.noreply.github.com>
Date: Fri, 25 Nov 2022 19:14:30 +0100
Subject: [PATCH] add 7d apy field for dexes (#455)

---
 migrations/1669374124328_add-apy7d-field.js | 5 +++++
 src/adaptors/test.js                        | 1 +
 src/controllers/yieldController.js          | 1 +
 src/handlers/triggerAdaptor.js              | 5 +++++
 4 files changed, 12 insertions(+)
 create mode 100644 migrations/1669374124328_add-apy7d-field.js

diff --git a/migrations/1669374124328_add-apy7d-field.js b/migrations/1669374124328_add-apy7d-field.js
new file mode 100644
index 0000000..bf3c2c0
--- /dev/null
+++ b/migrations/1669374124328_add-apy7d-field.js
@@ -0,0 +1,5 @@
+exports.up = (pgm) => {
+  pgm.addColumns('yield', {
+    apyBase7d: 'numeric',
+  });
+};
diff --git a/src/adaptors/test.js b/src/adaptors/test.js
index 1fbb7d0..4b104c7 100644
--- a/src/adaptors/test.js
+++ b/src/adaptors/test.js
@@ -30,6 +30,7 @@ describe(`Running ${process.env.npm_config_adapter} Test`, () => {
       'borrowable',
       'debtCeilingUsd',
       'mintedCoin',
+      'apyBase7d',
     ];
     const fields = [...Object.keys(baseFields), ...optionalFields, 'tvlUsd'];
     apy.forEach((pool) => {
diff --git a/src/controllers/yieldController.js b/src/controllers/yieldController.js
index dd5efe1..8816c88 100644
--- a/src/controllers/yieldController.js
+++ b/src/controllers/yieldController.js
@@ -355,6 +355,7 @@ const buildInsertYieldQuery = (payload) => {
     'apyBase',
     'apyReward',
     'il7d',
+    'apyBase7d',
     { name: 'apyBaseBorrow', def: null },
     { name: 'apyRewardBorrow', def: null },
     { name: 'totalSupplyUsd', def: null },
diff --git a/src/handlers/triggerAdaptor.js b/src/handlers/triggerAdaptor.js
index df197d2..f699231 100644
--- a/src/handlers/triggerAdaptor.js
+++ b/src/handlers/triggerAdaptor.js
@@ -68,6 +68,7 @@ const main = async (body) => {
     apyReward: strToNum(p.apyReward),
     apyBaseBorrow: strToNum(p.apyBaseBorrow),
     apyRewardBorrow: strToNum(p.apyRewardBorrow),
+    apyBase7d: strToNum(p.apyBase7d),
   }));
 
   // filter tvl to be btw lb-ub
@@ -87,6 +88,7 @@ const main = async (body) => {
     apyRewardBorrow: Number.isFinite(p.apyRewardBorrow)
       ? p.apyRewardBorrow
       : null,
+    apyBase7d: Number.isFinite(p.apyBase7d) ? p.apyBase7d : null,
   }));
 
   // remove pools where all 3 apy related fields are null
@@ -102,6 +104,7 @@ const main = async (body) => {
     apyReward: p.apyReward < 0 ? 0 : p.apyReward,
     apyBaseBorrow: p.apyBaseBorrow < 0 ? 0 : p.apyBaseBorrow,
     apyRewardBorrow: p.apyRewardBorrow < 0 ? 0 : p.apyRewardBorrow,
+    apyBase7d: p.apyBase7d < 0 ? 0 : p.apyBase7d,
   }));
 
   // derive final total apy field
@@ -311,6 +314,8 @@ const main = async (body) => {
       mintedCoin: p.mintedCoin ? utils.formatSymbol(p.mintedCoin) : null,
       poolMeta: p.poolMeta === undefined ? null : p.poolMeta,
       il7d: p.il7d ? +p.il7d.toFixed(precision) : null,
+      apyBase7d:
+        p.apyBase7d !== null ? +p.apyBase7d.toFixed(precision) : p.apyBase7d,
     };
   });