Revert "Merge pull request #306 from RENCI/vg1"

This reverts commit ed56620, reversing changes made to d15371f.
RENCI · Feb 17, 2023 · 4e23a8b · 4e23a8b
1 parent f996403
commit 4e23a8b
Show file tree

Hide file tree

Showing 15 changed files with 2,705 additions and 174 deletions.
diff --git a/api/Dockerfile b/api/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16
+FROM node:13.14.0
 
 RUN apt-get update && apt-get install -y nano tree tzdata
 

diff --git a/api/controllers/ctsas.js b/api/controllers/ctsas.js
@@ -1,5 +1,4 @@
 const db = require('../config/database')
-const {ParameterizedQuery: PQ} = require("pg-promise");
 
 exports.list = (req, res) => {
     const query = `SELECT * FROM "CTSAs";`
@@ -19,42 +18,3 @@ exports.list = (req, res) => {
         })
 }
 
-
-
-exports.removeCTSA = (req, res) => {
-    const body = req.body
-    const ctsaId = body.ctsaId
-    const move1 = new PQ({
-        text: `INSERT into removeditems (created, tablename, item)
-                                         SELECT current_timestamp, 'CTSAs',  to_jsonb(rows) FROM
-                                            (select * from "CTSAs" as ss where ss."ctsaId"=$1) rows;`,
-        values: [ctsaId]
-    })
-
-    const del1 = new PQ({
-        text: `DELETE from "CTSAs" as t where t."ctsaId" = $1;`,
-        values: [ctsaId]
-    })
-
-    let sites = 0
-
-    let q = db.any(new PQ({text: 'SELECT COUNT("ctsaId") FROM "Sites" where "ctsaId"=$1;', values:[body.ctsaId]}))
-        .then(data => sites = +data[0].count)
-        .then(d => {
-            if(sites < 1) {
-                db.any(move1)
-                    .then(r=> db.any(del1)
-                        .then(r => res.status(200).send('OK')))
-            }
-            else {
-                res.status(200).send('NOT REMOVED')
-            }
-        })
-        .catch(error => {
-            console.log('ERROR:', error)
-            res.status(500).send('There was an error fetching data.')
-        })
-
-}
-
-
diff --git a/api/controllers/sites.js b/api/controllers/sites.js
@@ -1,5 +1,4 @@
 const db = require('../config/database')
-const {ParameterizedQuery: PQ} = require('pg-promise');
 
 exports.list = (req, res) => {
     const query = `SELECT * FROM "Sites";`
@@ -19,45 +18,3 @@ exports.list = (req, res) => {
             res.status(500).send('There was an error fetching data.')
         })
 }
-
-exports.removeSite = (req, res) => {
-    const body = req.body
-    let paramaters = [body.ctsaId, body.siteId, body.siteName];
-
-    const move1 = new PQ({
-        text: `INSERT into removeditems (created, tablename, item)
-                                         SELECT current_timestamp, 'StudySites',  to_jsonb(rows) FROM 
-                                            (select * from "StudySites" as ss where ss."ctsaId"=$1 and ss."siteId"=$2 and ss."siteName"=$3) rows;`,
-        values: paramaters
-    })
-
-    const move2 = new PQ({
-        text: `INSERT into removeditems (created, tablename, item)
-                                         SELECT current_timestamp, 'Sites',  to_jsonb(rows) FROM 
-                                            (select * from "Sites" as s where s."ctsaId"=$1 and s."siteId"=$2  and s."siteName"=$3) rows;`,
-        values: paramaters
-    })
-
-    const del1 = new PQ({
-        text: `DELETE from "StudySites" as ss where ss."ctsaId" = $1 and ss."siteId"=$2  and ss."siteName"=$3;`,
-        values: paramaters
-    })
-
-    const del2 = new PQ({
-        text: `DELETE from "Sites" as s where s."ctsaId" = $1 and s."siteId"=$2  and s."siteName"=$3;`,
-        values: paramaters
-    })
-
-    const r = db.any(move1)
-                    .then(r => db.any(move2)
-                        .then(r=> db.any(del1))
-                        .then(r=> db.any(del2)
-                            .then(r => res.status(200).send('OK'))))
-        .catch(error => {
-            console.log('ERROR:', error)
-            res.status(500).send('There was an error fetching data.')
-        })
-    Promise.all([r])
-}
-
-