Added approver relation

app/Dockerfile

@@ -0,0 +1,9 @@
+FROM iron/node:4.2-dev
+
+WORKDIR /app
+COPY ./ /app
+
+RUN npm install
+RUN npm run build
+
+CMD /bin/bash -c "exit 0;"

docker-compose.yml

@@ -4,16 +4,17 @@ gateway:
   ports:
     - "80:80"
   volumes:
-    - "./app/dist:/usr/share/nginx/html"
+    - ./app/dist:/usr/share/nginx/html
+  links:
+    - pgapi
+    - server
 
 pgapi:
   build: ./services/postgrest
   dockerfile: Dockerfile.interface
   restart: always
   links:
     - db
-  ports:
-    - "9999:3000"
 
 db:
   build: ./services/postgrest
@@ -29,5 +30,8 @@ db:
 
 server:
   build: ./server
-  ports:
-    - "8080:3000"
+
+static:
+  build: ./app
+  volumes:
+    - statics:/src/dist

server/utils/index.js

@@ -9,12 +9,14 @@ const pool = pg.Pool('postgres://admin:alpine@192.168.99.100/projects');
 module.exports = {
   createRequest (r) {
 
-    let approverid = 1;
-
     return pool.query(sql`
-      WITH approval AS (
-        INSERT INTO approval_status(approved_by) VALUES (${approverid}) RETURNING id
-      ) INSERT INTO public.requests(project, requester, part, unit_price, quantity, link, purpose, approval)
+      WITH
+      approvers AS (
+        SELECT approver_id as id FROM defaultapprovers WHERE project_id=${r.project} LIMIT 1
+      ),
+      approval AS (
+        INSERT INTO approval_status(approved_by) VALUES ((select id from approvers)) RETURNING id
+      ) INSERT INTO requests(project, requester, part, unit_price, quantity, link, purpose, approval)
         VALUES (${r.project}, 1, ${r.part}, ${r.unit_price}, ${r.quantity}, ${r.link}, ${r.purpose}, (select id from approval))
         RETURNING id;
     `)
@@ -23,10 +25,11 @@ module.exports = {
     })
     .catch(err => {
       if (err.message.indexOf("requests_project_fkey") > 0) {
-        let err  = new Error("Project does not exist")
+        let err  = new Error("Project does not exist");
         err.status = 412;
         throw err;
       }
+      throw err;
     });
   }
 }

services/nginx/conf/conf.d/default.conf

@@ -5,11 +5,11 @@ server {
     root /usr/share/nginx/html;
 
     location /r/ {
-      # limit_except GET OPTIONS {
-      #   deny all;
-      # }
-      # TODO: link to actual backends
-      proxy_pass http://192.168.99.100:9999/;
+      proxy_pass http://pgapi:3000/;
+    }
+
+    location /s/ {
+      proxy_pass http://server:3000/;
     }
 
 }

services/postgrest/init.sql

@@ -18,6 +18,19 @@ CREATE TABLE projects
   created date NOT NULL default CURRENT_DATE
 );
 
+CREATE TABLE public.account_manager_for_project
+(
+  projectid integer,
+  accountid integer,
+  id serial PRIMARY KEY,
+  CONSTRAINT account_manager_for_project_accountid_fkey FOREIGN KEY (accountid)
+      REFERENCES public.accounts (id) MATCH SIMPLE
+      ON UPDATE NO ACTION ON DELETE NO ACTION,
+  CONSTRAINT account_manager_for_project_projectid_fkey FOREIGN KEY (projectid)
+      REFERENCES public.projects (id) MATCH SIMPLE
+      ON UPDATE NO ACTION ON DELETE NO ACTION
+);
+
 CREATE TABLE approval_status
 (
   id serial PRIMARY KEY,

services/postgrest/scratch.sql

@@ -0,0 +1,10 @@
+WITH
+approvers AS (
+	SELECT approver_id as id FROM defaultapprovers WHERE project_id=1
+),
+approval AS (
+	INSERT INTO approval_status(approved_by) VALUES ((select id from approvers)) RETURNING id
+) 
+INSERT INTO requests(project, requester, part, unit_price, quantity, link, purpose, approval)
+VALUES (1, 1, "Part", 0.01, 5, "http://google.com", "Blah Blah", (select id from approval))
+RETURNING id;

services/postgrest/views.sql

@@ -24,4 +24,14 @@ select
   left join purchase on requests.purchase=purchase.id
 ;
 
+CREATE VIEW defaultapprovers AS
+select
+  	accounts.id as approver_id,
+  	projects.id as project_id
+  from account_manager_for_project
+	join accounts on
+		accounts.id=account_manager_for_project.accountid
+	join projects on
+		projects.id=account_manager_for_project.projectid
+;
 COMMIT;