Resolving Endpoint Regression and Codebase Refinement (#21)

* Fix swagger overriding other routes * Add basic tests for choices routes * Remove node_modules from source * Simplify testing CI pipeline * Flesh out swagger & refactor choices tests * Add daos tests * Add poll tests * Add swagger test * Slight refactor of imports for consistency * Add tokens tests * logic for xtz weighted polls * fixes requested * last PR fix --------- Co-authored-by: fabiolalombardim <[email protected]> Co-authored-by: fabiolalombardim <[email protected]>
dOrgTech · Feb 9, 2024 · 2c219f7 · 2c219f7
1 parent e466bc4
commit 2c219f7
Show file tree

Hide file tree

Showing 1,104 changed files with 2,647 additions and 234,516 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -0,0 +1,17 @@
+name: API tests
+
+on:
+  push:
+    branches:
+      - '**'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
+      with:
+        node-version: 21
+    - run: yarn install
+    - run: yarn test
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+node
diff --git a/components/choices/index.js b/components/choices/index.js
@@ -94,7 +94,8 @@ const updateChoiceById = async (req, response) => {
       dao.daoContract,
       token.tokenID,
       block,
-      address
+      address,
+      poll.isXTZ
     );
 
     if (!total) {
@@ -151,9 +152,6 @@ const updateChoiceById = async (req, response) => {
             try {
               await session.withTransaction(async () => {
                 const coll1 = db_connect.collection("Choices");
-                const coll2 = db_connect.collection("Polls");
-
-                // await coll2.updateOne({_id: poll._id},  { $set: { "votes" : values.length }})
                 // Important:: You must pass the session to the operations
                 await coll1.updateOne(
                   { _id: ObjectId(oldVote._id) },
@@ -199,8 +197,6 @@ const updateChoiceById = async (req, response) => {
               await session
                 .withTransaction(async () => {
                   const coll1 = db_connect.collection("Choices");
-                  const coll2 = db_connect.collection("Polls");
-
                   await coll1.updateOne(
                     {
                       _id: choice._id,

diff --git a/components/polls/index.js b/components/polls/index.js
@@ -62,6 +62,7 @@ const addPoll = async (req, response) => {
       externalLink,
       endTime,
       votingStrategy,
+      isXTZ
     } = values;
 
     const author = getPkhfromPk(publicKey);
@@ -158,6 +159,7 @@ const addPoll = async (req, response) => {
       choices: choicesPoll,
       author,
       votingStrategy,
+      isXTZ
     };
 
     let data = {

diff --git a/components/tokens/index.js b/components/tokens/index.js
@@ -75,10 +75,21 @@ const getVotingPowerAtLevel = async (req, response) => {
       daoContract,
       tokenID,
       level,
-      userAddress
+      userAddress,
+      isXTZ = false
     );
 
-    response.json({ votingWeight });
+    const votingXTZWeight = await getUserTotalVotingPowerAtReferenceBlock(
+      network,
+      address,
+      daoContract,
+      tokenID,
+      level,
+      userAddress,
+      isXTZ = true
+    );
+
+    response.json({ votingWeight, votingXTZWeight });
   } catch (error) {
     console.log("error: ", error);
     response.status(400).send({

diff --git a/db/conn.js b/db/conn.js
@@ -1,6 +1,6 @@
 const { MongoClient } = require("mongodb");
 
-const dbURI = process.env.ATLAS_URI;
+const dbURI = process.env.NODE_ENV === 'test' ? process.env.TEST_MONGO_URI : process.env.ATLAS_URI;
 
 const client = new MongoClient(dbURI, {
   useNewUrlParser: true,
@@ -30,4 +30,4 @@ module.exports = {
   connectToServer,
   getDb,
   getClient,
-};
+};
diff --git a/globalTestSetup.js b/globalTestSetup.js
@@ -0,0 +1,9 @@
+const { MongoMemoryServer } = require('mongodb-memory-server');
+
+module.exports = async () => {
+  const mongoServer = await MongoMemoryServer.create();
+  process.env.TEST_MONGO_URI = mongoServer.getUri();
+
+  // Store the MongoMemoryServer instance in a global variable
+  global.__MONGOSERVER__ = mongoServer;
+};
diff --git a/globalTestTeardown.js b/globalTestTeardown.js
@@ -0,0 +1,5 @@
+module.exports = async () => {
+  if (global.__MONGOSERVER__) {
+    await global.__MONGOSERVER__.stop();
+  }
+};
diff --git a/node_modules/@types/node/README.md b/node_modules/@types/node/README.md
diff --git a/node_modules/@types/node/assert/strict.d.ts b/node_modules/@types/node/assert/strict.d.ts