Merge pull request #392 from icefoganalytics/test

Catalog changes

Author: datajohnson

.gitignore

@@ -85,6 +85,7 @@ ecosystem.config.js
 .yarn-integrity
 
 # dotenv environment variables file
+.envrc
 .env
 .env.test
 .env.development
@@ -120,3 +121,6 @@ dist
 
 # TernJS port file
 .tern-port
+
+# Other
+notes.md

bin/dev

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 
 class DevHelper
+  WAIT_FOR_PROCESS = 'wait_for_process'.freeze
+
   def self.call(*args)
     new.call(*args)
   end
@@ -17,7 +19,13 @@ class DevHelper
   def compose(*args, **kwargs)
     command = compose_command(*args, **kwargs)
     puts "Running: #{command}"
-    exec(command)
+
+    case kwargs[:execution_mode]
+    when WAIT_FOR_PROCESS
+      system(command)
+    else
+      exec(command)
+    end
   end
 
   def build(*args, **kwargs)
@@ -67,6 +75,14 @@ class DevHelper
     exit 0
   end
 
+  def web(*args, **kwargs)
+    run(*%w[web], *args, **kwargs)
+  end
+
+  def api(*args, **kwargs)
+    run(*%w[api], *args, **kwargs)
+  end
+
   def test(*args, **kwargs)
     run(*%w[test npm run test], *args, **kwargs)
   end

docker-compose.development.yaml

@@ -1,29 +1,63 @@
-version: "3.8"
-
 services:
-  db:
-    image: mcr.microsoft.com/mssql/server:2019-latest
+  web:
+    build:
+      context: ./src/web
+      dockerfile: development.Dockerfile
+    environment:
+      - NODE_ENV=development
+    tty: true
     ports:
-      - "1433:1433"
+      - "8080:8080"
+    volumes:
+      - ./src/web:/usr/src/web
+    depends_on:
+      - api
+      - db
+
+  api:
+    build:
+      context: ./src/api
+      dockerfile: development.Dockerfile
+    env_file:
+      - ./src/api/.env.development
+    environment:
+      NODE_ENV: development
+    tty: true
+    ports:
+      - "3000:3000"
+    volumes:
+      - ./src/api:/usr/src/api
+      - ./.gitignore:/usr/src/.gitignore
+    depends_on:
+      - db
+      - s3
+      - email
+      - converter
+
+  db:
+    image: mcr.microsoft.com/mssql/server:2019-CU32-GDR3-ubuntu-20.04
     user: root
     env_file:
       - db/sqlserver.env
       - db/sapassword.env
+    ports:
+      - "1433:1433"
     volumes:
-      - ./db/data:/var/opt/mssql/data
+      - db_data:/var/opt/mssql/data
       - ./db/log:/var/opt/mssql/log
       - ./db/backups:/var/opt/mssql/data/backups
+
   s3:
-      image: "minio/minio:latest"
-      ports:
-        - "9000:9000"
-        - "9090:9090"
-      environment:
-        MINIO_ROOT_USER: "root"
-        MINIO_ROOT_PASSWORD: "password"
-      volumes:
-        - "s3storage:/data/minio"
-      command: minio server /data/minio --console-address ":9090"
+    image: "minio/minio:latest"
+    ports:
+      - "9000:9000"
+      - "9090:9090"
+    environment:
+      MINIO_ROOT_USER: "root"
+      MINIO_ROOT_PASSWORD: "password"
+    volumes:
+      - "s3storage:/data/minio"
+    command: minio server /data/minio --console-address ":9090"
 
   email:
     image: marcopas/docker-mailslurper
@@ -38,4 +72,5 @@ services:
       - 5000:5000
 
 volumes:
+  db_data:
   s3storage:

src/api/config.ts

@@ -19,7 +19,8 @@ console.log(`LOADING ${NODE_ENV} CONFIG FROM ${path}`);
 
 export const API_PORT = parseInt(process.env.API_PORT || "3000");
 export const FRONTEND_URL = process.env.FRONTEND_URL || "";
-export const AUTH_REDIRECT = process.env.AUTH_REDIRECT || process.env.FRONTEND_URL || "";
+export const AUTH_REDIRECT =
+  process.env.AUTH_REDIRECT || process.env.FRONTEND_URL || "";
 
 export const DB_NAME = process.env.DB_NAME || "";
 export const DB_USER = process.env.DB_USER || "";
@@ -65,7 +66,10 @@ export const AWS_S3_REGION = process.env.AWS_S3_REGION || "us-west";
 export const AWS_S3_PATH = process.env.AWS_S3_PATH || "";
 
 export const AWS_S3_CONFIG = {
-  credentials: { accessKeyId: AWS_S3_ACCESS_KEY, secretAccessKey: AWS_S3_ACCESS_SECRET },
+  credentials: {
+    accessKeyId: AWS_S3_ACCESS_KEY,
+    secretAccessKey: AWS_S3_ACCESS_SECRET,
+  },
   endpoint: AWS_S3_ENDPOINT,
   forcePathStyle: true,
   region: AWS_S3_REGION,
@@ -80,11 +84,14 @@ export const RELEASE_TAG = process.env.RELEASE_TAG || "";
 export const AWS_LOGGING_ENABLED = process.env.AWS_LOGGING_ENABLED || "true";
 export const AWS_LOGGING_GROUP = process.env.AWS_LOGGING_GROUP || "SFA-TEST";
 export const AWS_LOGGING_STREAM = process.env.AWS_LOGGING_STREAM || "combined";
-export const AWS_LOGGING_REGION = process.env.AWS_LOGGING_REGION || "ca-central-1";
+export const AWS_LOGGING_REGION =
+  process.env.AWS_LOGGING_REGION || "ca-central-1";
 
 let ignoreThis = "AKIA2W5NG32L";
-export const AWS_LOGGING_ACCESS_ID = process.env.AWS_LOGGING_ACCESS_ID || `${ignoreThis}4BEHBDVN`;
+export const AWS_LOGGING_ACCESS_ID =
+  process.env.AWS_LOGGING_ACCESS_ID || `${ignoreThis}4BEHBDVN`;
 
 ignoreThis = "I/mxkv//XRfqxW9UNzx";
-export const AWS_LOGGING_ACCESS_KEY = process.env.AWS_LOGGING_ACCESS_KEY || `${ignoreThis}PDGWRySBloz5h7oWWYbqh`;
+export const AWS_LOGGING_ACCESS_KEY =
+  process.env.AWS_LOGGING_ACCESS_KEY || `${ignoreThis}PDGWRySBloz5h7oWWYbqh`;
 export const DEFAULT_LOG_LEVEL = process.env.DEFAULT_LOG_LEVEL || "debug";

src/api/routes/admin/child-care-ceiling-router.ts

@@ -0,0 +1,24 @@
+import express, { Request, Response } from "express";
+import knex from "knex";
+import { DB_CONFIG } from "../../config";
+
+const db = knex(DB_CONFIG);
+
+export const childCareCeilingRouter = express.Router();
+
+childCareCeilingRouter.get("/", async (req: Request, res: Response) => {
+  try {
+    const results = await db("sfa.child_care_ceiling")
+      .select("*")
+      .orderBy("sfa.child_care_ceiling.id");
+
+    if (results) {
+      return res.status(200).json({ success: true, data: [...results] });
+    } else {
+      return res.status(404).send();
+    }
+  } catch (error: any) {
+    console.log(error);
+    return res.status(404).send();
+  }
+});