Fix up use of db getters and tests

Signed-off-by: Steve Cassidy <[email protected]>
FAIMS · Nov 8, 2023 · bbbfd37 · bbbfd37
1 parent bc06878
commit bbbfd37
Show file tree

Hide file tree

Showing 7 changed files with 186 additions and 105 deletions.
diff --git a/src/api/routes.ts b/src/api/routes.ts
@@ -168,12 +168,18 @@ api.get(
 
 // export current versions of all records in this notebook as csv
 api.get(
-  '/notebooks/:id/:viewid.csv',
+  '/notebooks/:id/:viewID.csv',
   requireAuthenticationAPI,
   async (req, res) => {
     if (req.user && userHasPermission(req.user, req.params.id, 'read')) {
-      res.setHeader('Content-Type', 'text/csv');
-      streamNotebookRecordsAsCSV(req.params.id, req.params.viewid, res);
+      try {
+        res.setHeader('Content-Type', 'text/csv');
+        streamNotebookRecordsAsCSV(req.params.id, req.params.viewID, res);
+      } catch (err) {
+        console.log('Error streaming CSV', err);
+        res.json({error: 'error creating CSV'});
+        res.status(500).end();
+      }
     } else {
       res.json({error: 'notebook not found'});
       res.status(404).end();

diff --git a/src/buildconfig.ts b/src/buildconfig.ts
@@ -88,7 +88,7 @@ function is_testing() {
 
 function couchdb_internal_url(): string {
   let couchdb = process.env.COUCHDB_INTERNAL_URL;
-  const couchdbDefault = 'http://localhost:5984/';
+  const couchdbDefault = 'http://localhost:5984';
   if (couchdb === '' || couchdb === undefined) {
     console.log('COUCHDB_INTERNAL_URL not set, using default');
     return couchdbDefault;
@@ -103,7 +103,7 @@ function couchdb_internal_url(): string {
 
 function couchdb_public_url(): string {
   let couchdb = process.env.COUCHDB_PUBLIC_URL;
-  const couchdbDefault = 'http://localhost:5984/';
+  const couchdbDefault = 'http://localhost:5984';
   if (couchdb === '' || couchdb === undefined) {
     console.log('COUCHDB_PUBLIC_URL not set, using default');
     return couchdbDefault;

diff --git a/src/couchdb/index.ts b/src/couchdb/index.ts
@@ -60,7 +60,7 @@ export const getDirectoryDB = (): PouchDB.Database | undefined => {
   if (!_directoryDB) {
     const pouch_options = pouchOptions();
 
-    const directorydb = COUCHDB_INTERNAL_URL + DIRECTORY_DB_NAME;
+    const directorydb = COUCHDB_INTERNAL_URL + '/' + DIRECTORY_DB_NAME;
     try {
       _directoryDB = new PouchDB(directorydb, pouch_options);
     } catch (error) {
@@ -82,7 +82,7 @@ export const getUsersDB = (): PouchDB.Database | undefined => {
   if (!_usersDB) {
     const pouch_options = pouchOptions();
 
-    const dbName = COUCHDB_INTERNAL_URL + PEOPLE_DB_NAME;
+    const dbName = COUCHDB_INTERNAL_URL + '/' + PEOPLE_DB_NAME;
     _usersDB = new PouchDB(dbName, pouch_options);
   }
 
@@ -92,7 +92,7 @@ export const getUsersDB = (): PouchDB.Database | undefined => {
 export const getProjectsDB = (): PouchDB.Database | undefined => {
   if (!_projectsDB) {
     const pouch_options = pouchOptions();
-    const dbName = COUCHDB_INTERNAL_URL + PROJECTS_DB_NAME;
+    const dbName = COUCHDB_INTERNAL_URL + '/' + PROJECTS_DB_NAME;
     try {
       _projectsDB = new PouchDB(dbName, pouch_options);
     } catch (error) {
@@ -105,7 +105,7 @@ export const getProjectsDB = (): PouchDB.Database | undefined => {
 export const getInvitesDB = (): PouchDB.Database | undefined => {
   if (!_invitesDB) {
     const pouch_options = pouchOptions();
-    const dbName = COUCHDB_INTERNAL_URL + INVITE_DB_NAME;
+    const dbName = COUCHDB_INTERNAL_URL + '/' + INVITE_DB_NAME;
     try {
       _invitesDB = new PouchDB(dbName, pouch_options);
     } catch (error) {
@@ -115,21 +115,6 @@ export const getInvitesDB = (): PouchDB.Database | undefined => {
   return _invitesDB;
 };
 
-export const createProjectDB = (
-  dbName: string
-): PouchDB.Database | undefined => {
-  const pouch_options = pouchOptions();
-
-  try {
-    const db = new PouchDB(COUCHDB_INTERNAL_URL + dbName, pouch_options);
-    return db;
-  } catch (error) {
-    console.error('error creating project database');
-    console.error(error);
-  }
-  return undefined;
-};
-
 export const getProjectMetaDB = async (
   projectID: ProjectID
 ): Promise<PouchDB.Database | undefined> => {
@@ -140,7 +125,8 @@ export const getProjectMetaDB = async (
         projectID
       )) as unknown as ProjectObject;
       if (projectDoc.metadata_db) {
-        const dbname = COUCHDB_INTERNAL_URL + projectDoc.metadata_db.db_name;
+        const dbname =
+          COUCHDB_INTERNAL_URL + '/' + projectDoc.metadata_db.db_name;
         const pouch_options = pouchOptions();
 
         if (LOCAL_COUCHDB_AUTH !== undefined) {
@@ -166,7 +152,7 @@ export const getProjectDataDB = async (
         projectID
       )) as unknown as ProjectObject;
       if (projectDoc.data_db) {
-        const dbname = COUCHDB_INTERNAL_URL + projectDoc.data_db.db_name;
+        const dbname = COUCHDB_INTERNAL_URL + '/' + projectDoc.data_db.db_name;
         const pouch_options = pouchOptions();
 
         if (LOCAL_COUCHDB_AUTH !== undefined) {