remove minify

HipoFinance · Mar 5, 2024 · 67bed2d · 67bed2d
1 parent 66988ef
commit 67bed2d
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 171 deletions.
diff --git a/scripts/createMedianProtocol.js b/scripts/createMedianProtocol.js
@@ -9,10 +9,7 @@ const pgp = require('pg-promise')({
 pgp.pg.types.setTypeParser(20, parseInt);
 pgp.pg.types.setTypeParser(1700, parseFloat);
 
-const minify = require('pg-minify');
-
-const query = minify(
-  `
+const query = `
 INSERT INTO
 median_project (timestamp, project, "medianAPY", "uniquePools")
 WITH daily_data AS (
@@ -34,9 +31,7 @@ SELECT
 FROM daily_data
 GROUP BY timestamp
 ORDER BY timestamp;
-  `,
-  { compress: true }
-);
+  `;
 
 (async () => {
   const projects = fs

diff --git a/src/api/controllers/config.js b/src/api/controllers/config.js
@@ -1,21 +1,17 @@
 const validator = require('validator');
-const minify = require('pg-minify');
 
 const AppError = require('../../utils/appError');
 const { conn } = require('../db');
 
 // get pool urls
 const getUrl = async (req, res) => {
-  const query = minify(
-    `
+  const query = `
     SELECT
         config_id,
         url
     FROM
         config
-    `,
-    { compress: true }
-  );
+    `;
 
   const response = await conn.query(query);
 
@@ -33,18 +29,14 @@ const getUrl = async (req, res) => {
 // get unique pool values
 // (used during adapter testing to check if a pool field is already in the DB)
 const getDistinctID = async (req, res) => {
-  const query = minify(
-    `
+  const query = `
     SELECT
         DISTINCT(pool),
         config_id,
         project
     FROM
         config
-    `,
-    { compress: true }
-  );
-
+    `;
   const response = await conn.query(query);
 
   if (!response) {
@@ -63,36 +55,29 @@ const getConfigPool = async (req, res) => {
     ids.length;
   if (!valid) return { status: 'invalid uuid parameter' };
 
-  const query = minify(
-    `
+  const query = `
     SELECT
       *
     FROM
         config
     WHERE
         config_id IN ($<configIDs:csv>)
-    `,
-    { compress: true }
-  );
-
+    `;
   const response = await conn.query(query, { configIDs: ids });
 
   if (!response) {
     return new AppError(`Couldn't get data`, 404);
   }
 
-  res
-    .status(200)
-    .json({
-      status: 'success',
-      data: response,
-    });
+  res.status(200).json({
+    status: 'success',
+    data: response,
+  });
 };
 
 // for calc liq on main protocol dashboard
 const getAllPools = async (req, res) => {
-  const query = minify(
-    `
+  const query = `
     SELECT
         config_id,
         symbol,
@@ -101,9 +86,7 @@ const getAllPools = async (req, res) => {
         "underlyingTokens"
     FROM
         config
-    `,
-    { compress: true }
-  );
+    `;
 
   const response = await conn.query(query);
 

diff --git a/src/api/controllers/lsd.js b/src/api/controllers/lsd.js
@@ -5,8 +5,7 @@ const AppError = require('../../utils/appError');
 const { conn } = require('../db');
 
 const getLsd = async (req, res) => {
-  const query = minify(
-    `
+  const query = `
   SELECT
     DISTINCT ON (address)
     name,
@@ -22,10 +21,7 @@ const getLsd = async (req, res) => {
   ORDER BY
     address,
     timestamp DESC
-      `,
-    { compress: true }
-  );
-
+      `;
   const response = await conn.query(query);
 
   if (!response) {

diff --git a/src/api/controllers/median.js b/src/api/controllers/median.js
@@ -1,11 +1,8 @@
-const minify = require('pg-minify');
-
 const AppError = require('../../utils/appError');
 const { conn } = require('../db');
 
 const getMedian = async (req, res) => {
-  const query = minify(
-    `
+  const query = `
     SELECT
         timestamp,
         "uniquePools",
@@ -14,9 +11,7 @@ const getMedian = async (req, res) => {
         median
     ORDER BY
         timestamp ASC
-    `,
-    { compress: true }
-  );
+    `;
 
   const response = await conn.query(query);
 
@@ -29,8 +24,7 @@ const getMedian = async (req, res) => {
 
 const getMedianProject = async (req, res) => {
   const project = req.params.project;
-  const query = minify(
-    `
+  const query = `
     SELECT
         timestamp,
         "medianAPY",
@@ -41,10 +35,7 @@ const getMedianProject = async (req, res) => {
         project = $<project>
     ORDER BY
         timestamp ASC
-    `,
-    { compress: true }
-  );
-
+    `;
   const response = await conn.query(query, { project });
 
   if (!response) {

diff --git a/src/api/controllers/perp.js b/src/api/controllers/perp.js
@@ -1,13 +1,11 @@
 const validator = require('validator');
-const minify = require('pg-minify');
 
 const AppError = require('../../utils/appError');
 const { conn } = require('../db');
 
 // get latest data for each unique perp
 const getPerp = async (req, res) => {
-  const query = minify(
-    `
+  const query = `
     SELECT
         perp_id,
         "timestamp",
@@ -96,9 +94,7 @@ const getPerp = async (req, res) => {
                 AND weeklyStats.market = monthlyStats.market
         ) AS stats ON stats.marketplace = main.marketplace
         AND stats.market = main.market
-    `,
-    { compress: true }
-  );
+    `;
 
   const response = await conn.query(query, {
     age: 3, // last 3 hours

diff --git a/src/api/controllers/yield.js b/src/api/controllers/yield.js
@@ -1,5 +1,4 @@
 const validator = require('validator');
-const minify = require('pg-minify');
 
 const AppError = require('../../utils/appError');
 const { conn } = require('../db');
@@ -9,9 +8,7 @@ const getYieldHistory = async (req, res) => {
   if (!validator.isUUID(configID))
     return res.status(400).json('invalid configID!');
 
-
-    const query = minify(
-      `
+  const query = `
           SELECT
               timestamp,
               "tvlUsd",
@@ -36,31 +33,26 @@ const getYieldHistory = async (req, res) => {
               AND "configID" = $<configIDValue>
           ORDER BY
               timestamp ASC
-        `,
-      { compress: true }
-    );
+        `;
 
   const response = await conn.query(query, { configIDValue: configID });
 
   if (!response) {
     return new AppError(`Couldn't get data`, 404);
   }
 
-  res
-    .status(200)
-    .json({
-      status: 'success',
-      data: response,
-    });
+  res.status(200).json({
+    status: 'success',
+    data: response,
+  });
 };
 
 const getYieldHistoryHourly = async (req, res) => {
   const configID = req.params.pool;
   if (!validator.isUUID(configID))
     return res.status(400).json('invalid configID!');
 
-    const query = minify(
-      `
+  const query = `
           SELECT
               timestamp,
               "tvlUsd",
@@ -75,11 +67,8 @@ const getYieldHistoryHourly = async (req, res) => {
               "configID" = $<configIDValue>
           ORDER BY
               timestamp ASC
-        `,
-      { compress: true }
-    );
-
-    const response =  await conn.query(query, { configIDValue: configID });
+        `;
+  const response = await conn.query(query, { configIDValue: configID });
 
   if (!response) {
     return new AppError(`Couldn't get data`, 404);
@@ -96,8 +85,7 @@ const getYieldLendBorrowHistory = async (req, res) => {
   if (!validator.isUUID(configID))
     return res.status(400).json('invalid configID!');
 
-    const query = minify(
-      `
+  const query = `
       SELECT
           timestamp,
           "totalSupplyUsd",
@@ -123,22 +111,17 @@ const getYieldLendBorrowHistory = async (req, res) => {
           AND "configID" = $<configIDValue>
       ORDER BY
           timestamp ASC
-    `,
-      { compress: true }
-    );
-
-    const response =  await conn.query(query, { configIDValue: configID });
+    `;
+  const response = await conn.query(query, { configIDValue: configID });
 
   if (!response) {
     return new AppError(`Couldn't get data`, 404);
   }
 
-  res
-    .status(200)
-    .json({
-      status: 'success',
-      data: response,
-    });
+  res.status(200).json({
+    status: 'success',
+    data: response,
+  });
 };
 
 module.exports = {

diff --git a/src/handlers/triggerMedianProject.js b/src/handlers/triggerMedianProject.js
@@ -1,5 +1,3 @@
-const minify = require('pg-minify');
-
 const { pgp, connect } = require('../utils/dbConnection');
 
 module.exports.handler = async () => {
@@ -9,8 +7,7 @@ module.exports.handler = async () => {
 const main = async () => {
   const conn = await connect();
 
-  const query = minify(
-    `
+  const query = `
 INSERT INTO
     median_project (timestamp, project, "medianAPY", "uniquePools")
 WITH today AS (
@@ -46,9 +43,7 @@ FROM
 GROUP BY
     project
 
-    `,
-    { compress: true }
-  );
+    `;
 
   const response = await conn.query(query);
 

diff --git a/src/queries/config.js b/src/queries/config.js
@@ -1,5 +1,3 @@
-const minify = require('pg-minify');
-
 const { pgp, connect } = require('../utils/dbConnection');
 
 const tableName = 'config';
@@ -22,18 +20,15 @@ const getDistinctProjects = async () => {
 const getConfigProject = async (project) => {
   const conn = await connect();
 
-  const query = minify(
-    `
+  const query = `
     SELECT
         config_id,
         pool
     FROM
         $<table:name>
     WHERE
         project = $<project>
-    `,
-    { compress: true }
-  );
+    `;
 
   const response = await conn.query(query, { table: tableName, project });