Merge pull request #83 from icefoganalytics/test

Aug 8 Build

Author: datajohnson

README.md

@@ -250,7 +250,7 @@ You can boot the production environment locally via:
 5. Booting the development database.
 
    ```bash
-   dev db
+   dev up db
 
    # Or
    docker compose -f docker-compose.development.yaml up --remove-orphans db
@@ -264,6 +264,8 @@ You can boot the production environment locally via:
 
    > Note that you must always boot the production app after booting the database.
 
+7. Log in to the app at http://localhost:3000/dashboard.
+
 ### User Acceptance Testing (UAT)
 
 Jenkins pipeline [Jenkinsfile](./Jenkinsfile) builds and deploys.

docker-compose.development.yaml

@@ -10,6 +10,7 @@ services:
     environment:
       NODE_ENV: development
       DB_HOST: db
+      DB_DEFAULT_SCHEMA: sfa
       API_PORT: ${API_PORT:-3000}
       BASE_URL: "http://localhost:${API_PORT:-3000}"
     ports:

src/api/config.ts

@@ -26,6 +26,7 @@ export const DB_USER = process.env.DB_USER || "";
 export const DB_PASS = process.env.DB_PASS || "";
 export const DB_HOST = process.env.DB_HOST || "";
 export const DB_PORT = process.env.DB_PORT || "";
+export const DB_DEFAULT_SCHEMA = process.env.DB_DEFAULT_SCHEMA;
 
 export const BASE_URL = process.env.BASE_URL || "";
 export const CLIENT_ID = process.env.CLIENT_ID || "";
@@ -41,6 +42,7 @@ export const DB_CONFIG = {
     database: DB_NAME,
     port: parseInt(DB_PORT),
   },
+  defaultSchema: DB_DEFAULT_SCHEMA || 'dbo',
 };
 
 export const MAIL_FROM = process.env.MAIL_FROM || "sfa@yukon.ca";

src/api/db/db-client.ts

@@ -1,7 +1,38 @@
-import knex, { Knex } from "knex";
+import knex, { Knex } from "knex"
+import camelcaseKeys from "camelcase-keys"
+import { snakeCase } from "lodash"
 
-import { DB_CONFIG } from "../config";
+import { DB_CONFIG } from "@/config"
 
-const db =  knex(DB_CONFIG);
+const db = knex({
+  client: DB_CONFIG.client,
+  connection: DB_CONFIG.connection,
+  postProcessResponse: (result, queryContext) => {
+    if (Array.isArray(result)) {
+      // For SELECT queries
+      return result.map((row) => camelcaseKeys(row, { deep: true }))
+    } else {
+      // for INSERT/UPDATE/DELETE queries
+      return camelcaseKeys(result, { deep: true })
+    }
+  },
+  wrapIdentifier: (value, origImpl, queryContext) => origImpl(snakeCase(value)),
+})
 
-export default db;
+const dbWithSchema: Knex = new Proxy(db, {
+  apply: (target, thisArg, argumentsList) => {
+    return target(...argumentsList).withSchema(DB_CONFIG.defaultSchema)
+  },
+  get: (target, prop: keyof Knex) => {
+    if (typeof target[prop] === "function") {
+      if (prop === "withSchema") {
+        return (schema: string) => target[prop](schema) // format taken from src/api/node_modules/knex/types/index.d.ts
+      } else {
+        return (...args: any[]) => target[prop](...args).withSchema(DB_CONFIG.defaultSchema)
+      }
+    }
+    return target[prop]
+  },
+})
+
+export default dbWithSchema