From a7b382b236b16130d24929442ecf6892c086339b Mon Sep 17 00:00:00 2001 From: gopi17701 <41270090+gopi17701@users.noreply.github.com> Date: Sun, 15 Jul 2018 15:05:57 -0400 Subject: [PATCH] Add files via upload Initial commit for Astute Web Services and MySQL Database Schema and sample data --- AstuteSystem/ProjectPlan.xlsx | Bin 0 -> 20734 bytes AstuteSystem/astutesystem.iml | 86 ++ AstuteSystem/db.config | 6 + AstuteSystem/deployAstuteWar.bat | 2 + AstuteSystem/hours.txt | 10 + AstuteSystem/package.json | 18 + AstuteSystem/pom.xml | 132 +++ AstuteSystem/sql/astute.sql | 410 +++++++++ .../java/com/astute/common/Constants.java | 9 + .../main/java/com/astute/common/Utility.java | 29 + .../src/main/java/com/astute/dao/DAO.java | 148 +++ .../src/main/java/com/astute/dao/SqlDAO.java | 839 ++++++++++++++++++ .../astute/exceptions/AstuteException.java | 24 + .../astute/exceptions/DatabaseException.java | 7 + .../java/com/astute/filter/CORSFilter.java | 22 + .../java/com/astute/helpers/JsonHelper.java | 84 ++ .../java/com/astute/model/ChangeOrder.java | 59 ++ .../main/java/com/astute/model/Customer.java | 129 +++ .../com/astute/model/GeneratedInvoice.java | 71 ++ .../main/java/com/astute/model/Invoice.java | 91 ++ .../java/com/astute/model/InvoiceDetail.java | 88 ++ .../src/main/java/com/astute/model/PO.java | 67 ++ .../main/java/com/astute/model/PODetail.java | 78 ++ .../src/main/java/com/astute/model/User.java | 37 + .../provider/GeneralExceptionMapper.java | 18 + .../astute/provider/JacksonJsonProvider.java | 26 + .../astute/provider/RFC3339DateFormat.java | 20 + .../provider/RuntimeExceptionMapper.java | 16 + .../WebApplicationExceptionMapper.java | 16 + .../astute/requests/ChangeOrderRequest.java | 51 ++ .../com/astute/requests/CustomerRequest.java | 114 +++ .../astute/requests/InvoiceDetailRequest.java | 77 ++ .../astute/requests/InvoiceMasterRequest.java | 90 ++ .../com/astute/requests/LoginRequest.java | 22 + .../com/astute/requests/PODetailRequest.java | 80 ++ .../com/astute/requests/POMasterRequest.java | 55 ++ .../com/astute/resources/AuthResource.java | 32 + .../astute/resources/ChangeOrderResource.java | 42 + .../astute/resources/CustomerResource.java | 45 + .../com/astute/resources/InvoiceResource.java | 84 ++ .../java/com/astute/resources/POResource.java | 75 ++ .../java/com/astute/response/ApiResponse.java | 67 ++ .../java/com/astute/service/AuthService.java | 31 + .../astute/service/ChangeOrderService.java | 33 + .../com/astute/service/CustomerService.java | 32 + .../com/astute/service/InvoiceService.java | 63 ++ .../java/com/astute/service/POService.java | 52 ++ .../main/java/com/astute/service/Service.java | 11 + .../com/astute/servlets/StartupServlet.java | 21 + AstuteSystem/src/main/webapp/WEB-INF/web.xml | 27 + AstuteSystem/src/main/webapp/css/nav.css | 54 ++ AstuteSystem/src/main/webapp/css/theme.css | 122 +++ .../src/main/webapp/doc/user-guide.jsp | 105 +++ AstuteSystem/src/main/webapp/images/logo.png | Bin 0 -> 4208 bytes .../src/main/webapp/images/nist-logo.svg | 18 + AstuteSystem/src/main/webapp/index.html | 3 + .../target/astutesystem/META-INF/MANIFEST.MF | 5 + .../classes/com/astute/common/Constants.class | Bin 0 -> 380 bytes .../classes/com/astute/common/Utility.class | Bin 0 -> 1556 bytes .../WEB-INF/classes/com/astute/dao/DAO.class | Bin 0 -> 5214 bytes .../classes/com/astute/dao/SqlDAO.class | Bin 0 -> 28091 bytes .../astute/exceptions/AstuteException.class | Bin 0 -> 907 bytes .../astute/exceptions/DatabaseException.class | Bin 0 -> 424 bytes .../com/astute/filter/CORSFilter.class | Bin 0 -> 1302 bytes .../com/astute/helpers/JsonHelper.class | Bin 0 -> 293 bytes .../com/astute/model/ChangeOrder.class | Bin 0 -> 1708 bytes .../classes/com/astute/model/Customer.class | Bin 0 -> 3005 bytes .../com/astute/model/GeneratedInvoice.class | Bin 0 -> 2601 bytes .../classes/com/astute/model/Invoice.class | Bin 0 -> 2399 bytes .../com/astute/model/InvoiceDetail.class | Bin 0 -> 2206 bytes .../WEB-INF/classes/com/astute/model/PO.class | Bin 0 -> 1737 bytes .../classes/com/astute/model/PODetail.class | Bin 0 -> 2061 bytes .../classes/com/astute/model/User.class | Bin 0 -> 1036 bytes .../provider/GeneralExceptionMapper.class | Bin 0 -> 1013 bytes .../astute/provider/JacksonJsonProvider.class | Bin 0 -> 1632 bytes .../astute/provider/RFC3339DateFormat.class | Bin 0 -> 913 bytes .../provider/RuntimeExceptionMapper.class | Bin 0 -> 1050 bytes .../WebApplicationExceptionMapper.class | Bin 0 -> 1166 bytes .../astute/requests/ChangeOrderRequest.class | Bin 0 -> 1558 bytes .../com/astute/requests/CustomerRequest.class | Bin 0 -> 2654 bytes .../requests/InvoiceDetailRequest.class | Bin 0 -> 2024 bytes .../requests/InvoiceMasterRequest.class | Bin 0 -> 2364 bytes .../com/astute/requests/LoginRequest.class | Bin 0 -> 757 bytes .../com/astute/requests/PODetailRequest.class | Bin 0 -> 2086 bytes .../com/astute/requests/POMasterRequest.class | Bin 0 -> 1555 bytes .../com/astute/resources/AuthResource.class | Bin 0 -> 1371 bytes .../resources/ChangeOrderResource.class | Bin 0 -> 2458 bytes .../astute/resources/CustomerResource.class | Bin 0 -> 2727 bytes .../astute/resources/InvoiceResource.class | Bin 0 -> 4255 bytes .../com/astute/resources/POResource.class | Bin 0 -> 3815 bytes .../com/astute/response/ApiResponse.class | Bin 0 -> 2406 bytes .../com/astute/service/AuthService.class | Bin 0 -> 1650 bytes .../astute/service/ChangeOrderService.class | Bin 0 -> 1260 bytes .../com/astute/service/CustomerService.class | Bin 0 -> 1529 bytes AstuteSystem/target/astutesystem/css/nav.css | 54 ++ .../target/astutesystem/css/theme.css | 122 +++ .../target/astutesystem/doc/user-guide.jsp | 105 +++ .../target/astutesystem/images/logo.png | Bin 0 -> 4208 bytes .../target/astutesystem/images/nist-logo.svg | 18 + AstuteSystem/target/astutesystem/index.html | 3 + 100 files changed, 4255 insertions(+) create mode 100644 AstuteSystem/ProjectPlan.xlsx create mode 100644 AstuteSystem/astutesystem.iml create mode 100644 AstuteSystem/db.config create mode 100644 AstuteSystem/deployAstuteWar.bat create mode 100644 AstuteSystem/hours.txt create mode 100644 AstuteSystem/package.json create mode 100644 AstuteSystem/pom.xml create mode 100644 AstuteSystem/sql/astute.sql create mode 100644 AstuteSystem/src/main/java/com/astute/common/Constants.java create mode 100644 AstuteSystem/src/main/java/com/astute/common/Utility.java create mode 100644 AstuteSystem/src/main/java/com/astute/dao/DAO.java create mode 100644 AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java create mode 100644 AstuteSystem/src/main/java/com/astute/exceptions/AstuteException.java create mode 100644 AstuteSystem/src/main/java/com/astute/exceptions/DatabaseException.java create mode 100644 AstuteSystem/src/main/java/com/astute/filter/CORSFilter.java create mode 100644 AstuteSystem/src/main/java/com/astute/helpers/JsonHelper.java create mode 100644 AstuteSystem/src/main/java/com/astute/model/ChangeOrder.java create mode 100644 AstuteSystem/src/main/java/com/astute/model/Customer.java create mode 100644 AstuteSystem/src/main/java/com/astute/model/GeneratedInvoice.java create mode 100644 AstuteSystem/src/main/java/com/astute/model/Invoice.java create mode 100644 AstuteSystem/src/main/java/com/astute/model/InvoiceDetail.java create mode 100644 AstuteSystem/src/main/java/com/astute/model/PO.java create mode 100644 AstuteSystem/src/main/java/com/astute/model/PODetail.java create mode 100644 AstuteSystem/src/main/java/com/astute/model/User.java create mode 100644 AstuteSystem/src/main/java/com/astute/provider/GeneralExceptionMapper.java create mode 100644 AstuteSystem/src/main/java/com/astute/provider/JacksonJsonProvider.java create mode 100644 AstuteSystem/src/main/java/com/astute/provider/RFC3339DateFormat.java create mode 100644 AstuteSystem/src/main/java/com/astute/provider/RuntimeExceptionMapper.java create mode 100644 AstuteSystem/src/main/java/com/astute/provider/WebApplicationExceptionMapper.java create mode 100644 AstuteSystem/src/main/java/com/astute/requests/ChangeOrderRequest.java create mode 100644 AstuteSystem/src/main/java/com/astute/requests/CustomerRequest.java create mode 100644 AstuteSystem/src/main/java/com/astute/requests/InvoiceDetailRequest.java create mode 100644 AstuteSystem/src/main/java/com/astute/requests/InvoiceMasterRequest.java create mode 100644 AstuteSystem/src/main/java/com/astute/requests/LoginRequest.java create mode 100644 AstuteSystem/src/main/java/com/astute/requests/PODetailRequest.java create mode 100644 AstuteSystem/src/main/java/com/astute/requests/POMasterRequest.java create mode 100644 AstuteSystem/src/main/java/com/astute/resources/AuthResource.java create mode 100644 AstuteSystem/src/main/java/com/astute/resources/ChangeOrderResource.java create mode 100644 AstuteSystem/src/main/java/com/astute/resources/CustomerResource.java create mode 100644 AstuteSystem/src/main/java/com/astute/resources/InvoiceResource.java create mode 100644 AstuteSystem/src/main/java/com/astute/resources/POResource.java create mode 100644 AstuteSystem/src/main/java/com/astute/response/ApiResponse.java create mode 100644 AstuteSystem/src/main/java/com/astute/service/AuthService.java create mode 100644 AstuteSystem/src/main/java/com/astute/service/ChangeOrderService.java create mode 100644 AstuteSystem/src/main/java/com/astute/service/CustomerService.java create mode 100644 AstuteSystem/src/main/java/com/astute/service/InvoiceService.java create mode 100644 AstuteSystem/src/main/java/com/astute/service/POService.java create mode 100644 AstuteSystem/src/main/java/com/astute/service/Service.java create mode 100644 AstuteSystem/src/main/java/com/astute/servlets/StartupServlet.java create mode 100644 AstuteSystem/src/main/webapp/WEB-INF/web.xml create mode 100644 AstuteSystem/src/main/webapp/css/nav.css create mode 100644 AstuteSystem/src/main/webapp/css/theme.css create mode 100644 AstuteSystem/src/main/webapp/doc/user-guide.jsp create mode 100644 AstuteSystem/src/main/webapp/images/logo.png create mode 100644 AstuteSystem/src/main/webapp/images/nist-logo.svg create mode 100644 AstuteSystem/src/main/webapp/index.html create mode 100644 AstuteSystem/target/astutesystem/META-INF/MANIFEST.MF create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/common/Constants.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/common/Utility.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/dao/DAO.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/dao/SqlDAO.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/exceptions/AstuteException.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/exceptions/DatabaseException.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/filter/CORSFilter.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/helpers/JsonHelper.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/ChangeOrder.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/Customer.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/GeneratedInvoice.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/Invoice.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/InvoiceDetail.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/PO.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/PODetail.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/User.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/GeneralExceptionMapper.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/JacksonJsonProvider.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/RFC3339DateFormat.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/RuntimeExceptionMapper.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/WebApplicationExceptionMapper.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/ChangeOrderRequest.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/CustomerRequest.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/InvoiceDetailRequest.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/InvoiceMasterRequest.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/LoginRequest.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/PODetailRequest.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/POMasterRequest.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/AuthResource.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/ChangeOrderResource.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/CustomerResource.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/InvoiceResource.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/POResource.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/response/ApiResponse.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/service/AuthService.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/service/ChangeOrderService.class create mode 100644 AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/service/CustomerService.class create mode 100644 AstuteSystem/target/astutesystem/css/nav.css create mode 100644 AstuteSystem/target/astutesystem/css/theme.css create mode 100644 AstuteSystem/target/astutesystem/doc/user-guide.jsp create mode 100644 AstuteSystem/target/astutesystem/images/logo.png create mode 100644 AstuteSystem/target/astutesystem/images/nist-logo.svg create mode 100644 AstuteSystem/target/astutesystem/index.html diff --git a/AstuteSystem/ProjectPlan.xlsx b/AstuteSystem/ProjectPlan.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..94fc4f5c10036538ef00d988df0d0836848c48c2 GIT binary patch literal 20734 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 MgL^$)00`*+0ALlrBLDyZ literal 0 HcmV?d00001 diff --git a/AstuteSystem/astutesystem.iml b/AstuteSystem/astutesystem.iml new file mode 100644 index 0000000..c44636d --- /dev/null +++ b/AstuteSystem/astutesystem.iml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/AstuteSystem/db.config b/AstuteSystem/db.config new file mode 100644 index 0000000..dfdfd8a --- /dev/null +++ b/AstuteSystem/db.config @@ -0,0 +1,6 @@ +database=sql +host=localhost +port=3306 +username=root +password=password +schema=astute diff --git a/AstuteSystem/deployAstuteWar.bat b/AstuteSystem/deployAstuteWar.bat new file mode 100644 index 0000000..8086412 --- /dev/null +++ b/AstuteSystem/deployAstuteWar.bat @@ -0,0 +1,2 @@ +mvn install +mvn tomcat7:deploy diff --git a/AstuteSystem/hours.txt b/AstuteSystem/hours.txt new file mode 100644 index 0000000..dd34ec0 --- /dev/null +++ b/AstuteSystem/hours.txt @@ -0,0 +1,10 @@ +Date-Desc-hours-Who +1. 1/22/18=Kick off meating-1 hr-Gopi-Akash +2. 1/24/18-Design meeting-1.5 hrs-Gopi +3. 1/25/18-DB Design-2 hrs-Gopi +4. 1/26/18-DB Design-3 hrs-Gopi +5. 1/27/18-DB Design meeting-1 hr-Gopi +6. 1/28/18-Web sevices design- 1hr - Gopi-Akash +7. 1/28/18-Web services development - 2 hrs - Gopi +8. 2/2/18-Web services development - 6 hrs - Gopi +9. 2/3/18-Web services development - 2 hrs - Gopi diff --git a/AstuteSystem/package.json b/AstuteSystem/package.json new file mode 100644 index 0000000..8083709 --- /dev/null +++ b/AstuteSystem/package.json @@ -0,0 +1,18 @@ +{ + "name": "astutesystem", + "version": "1.0.0", + "private": true, + "description": "", + "keywords": [], + "author": "", + "license": "", + "main": "app.js", + "dependencies": { + "connect": "^3.3.5", + "swagger-connect": "^0.1.0" + }, + "devDependencies": { + "should": "^7.1.0", + "supertest": "^1.0.0" + } +} \ No newline at end of file diff --git a/AstuteSystem/pom.xml b/AstuteSystem/pom.xml new file mode 100644 index 0000000..7f66e5d --- /dev/null +++ b/AstuteSystem/pom.xml @@ -0,0 +1,132 @@ + + + 4.0.0 + + com.astute + astutesystem + war + 0.0.1-SNAPSHOT + astutesystem + + + astutesystem + + + org.apache.maven.plugins + maven-compiler-plugin + 2.5.1 + true + + 1.8 + 1.8 + + + + org.apache.tomcat.maven + tomcat7-maven-plugin + 2.2 + + http://localhost:8080/manager/text + TomcatServer + /astutesystem + admin + password + + + + + + + + + org.glassfish.jersey + jersey-bom + ${jersey.version} + pom + import + + + + + + + + commons-io + commons-io + 2.6 + + + + commons-fileupload + commons-fileupload + 1.3.3 + + + + org.glassfish.jersey.containers + jersey-container-jetty-servlet + 2.22.1 + + + com.google.code.gson + gson + 2.8.0 + + + mysql + mysql-connector-java + 6.0.6 + + + junit + junit + 4.12 + + + javax.servlet + javax.servlet-api + 3.1.0 + + + org.jgrapht + jgrapht-core + 1.0.1 + + + org.glassfish.jersey.media + jersey-media-multipart + 2.17 + + + com.fasterxml.jackson.core + jackson-annotations + 2.4.1 + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + 2.4.1 + + + com.fasterxml.jackson.datatype + jackson-datatype-joda + 2.4.0 + + + + io.swagger + swagger-jersey2-jaxrs + 1.5.0 + + + com.github.jsqlparser + jsqlparser + 0.9 + + + + 2.16 + UTF-8 + + diff --git a/AstuteSystem/sql/astute.sql b/AstuteSystem/sql/astute.sql new file mode 100644 index 0000000..24c1bef --- /dev/null +++ b/AstuteSystem/sql/astute.sql @@ -0,0 +1,410 @@ +-- -------------------------------------------------------- +-- Host: 127.0.0.1 +-- Server version: 5.7.12-log - MySQL Community Server (GPL) +-- Server OS: Win64 +-- HeidiSQL Version: 9.4.0.5125 +-- -------------------------------------------------------- + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET NAMES utf8 */; +/*!50503 SET NAMES utf8mb4 */; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; + + +-- Dumping database structure for astute +DROP DATABASE IF EXISTS `astute`; +CREATE DATABASE IF NOT EXISTS `astute` /*!40100 DEFAULT CHARACTER SET utf8 */; +USE `astute`; + +-- Dumping structure for table astute.change_order +CREATE TABLE IF NOT EXISTS `change_order` ( + `PO_num` varchar(20) NOT NULL, + `change_order_num` int(20) NOT NULL, + `change_order_date` date DEFAULT NULL, + `change_order_amt` double NOT NULL, + `description` varchar(500) DEFAULT NULL, + PRIMARY KEY (`PO_num`,`change_order_num`), + CONSTRAINT `fk_PO_CO_POnum` FOREIGN KEY (`PO_num`) REFERENCES `po` (`PO_num`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- Dumping data for table astute.change_order: ~0 rows (approximately) +/*!40000 ALTER TABLE `change_order` DISABLE KEYS */; +/*!40000 ALTER TABLE `change_order` ENABLE KEYS */; + +-- Dumping structure for function astute.create_customer_fun +DELIMITER // +CREATE DEFINER=`root`@`localhost` FUNCTION `create_customer_fun`(customerName varchar(100), billToDept varchar(100), add1In varchar(100), add2In varchar(100), cityIn varchar(50), stateIn varchar(20), zipIn int(5), zipLast4In int(4), emailIn varchar(50), phoneIn int(10), faxIn int(10)) RETURNS int(11) +BEGIN +DECLARE last_inserted_id int(11); +INSERT INTO customer (customer_name, bill_to_dept, add1, add2, city, state ,zip, zip_last_4, email, phone, fax) +VALUES (customerName, billToDept, add1In, add2In, cityIn, stateIn, zipIn, ziplast4In, emailIn, phoneIn, faxIn); +SELECT LAST_INSERT_ID() into last_inserted_id; +return last_inserted_id; +END// +DELIMITER ; + +-- Dumping structure for procedure astute.create_invoice +DELIMITER // +CREATE DEFINER=`root`@`localhost` PROCEDURE `create_invoice`(invNo varchar(20),invDate date,PONo varchar(20),changeOrderNum varchar(20),paymentStatus int,billAmt double,specialNotes varchar(500), certClause Varchar(500),pmtReceivedDate date) +BEGIN +INSERT INTO invoice (inv_no,inv_date,PO_num,change_order_num,pmt_status,bill_amt,special_notes,certifcation,pmt_received_date) +VALUES (invNo, invDate, PONo, changeOrderNum, paymentStatus, billAmt, specialNotes, certClause, pmtReceivedDate); +END// +DELIMITER ; + +-- Dumping structure for procedure astute.create_invoice_detail +DELIMITER // +CREATE DEFINER=`root`@`localhost` PROCEDURE `create_invoice_detail`(invoiceNum varchar(20), lineItemNum int, POLineItemNum varchar(20), serviceTypeId int, description varchar(500), percentCompletion double, hours double, amount double) +BEGIN +INSERT INTO INVOICE_DETAIL (inv_num, line_item_num, PO_line_item_num, service_type_id, description, percent_completion, hours,amt) +VALUES (invoiceNum, lineItemNum, POLineItemNum, serviceTypeId, description, percentCompletion, hours, amount); +END// +DELIMITER ; + +-- Dumping structure for procedure astute.create_po +DELIMITER // +CREATE DEFINER=`root`@`localhost` PROCEDURE `create_po`(PONum varchar(40), contractNum varchar(20), PODate date, contractAmt double(10,2), customerid int) +BEGIN +INSERT INTO PO (PO_num, contract_num, PO_date, contract_amt, customer_id) +VALUES (PONum, contractNum, PODate, contractAmt, customerId); +END// +DELIMITER ; + +-- Dumping structure for procedure astute.create_po_detail +DELIMITER // +CREATE DEFINER=`root`@`localhost` PROCEDURE `create_po_detail`(PONum varchar(40), lineItemNo int, servicedesc varchar(500), feetypeid int(11), quantity double, servicetypeid int(1), schedule_in varchar(20), deliverby date) +BEGIN +INSERT INTO PO_DETAIL (PO_num,line_item_no,service_desc,fee_type_id,qty,service_type_id,schedule,deliver_by) +VALUES (POnum,lineitemno,servicedesc,feetypeid,quantity,servicetypeid,schedule_in,deliverby); +END// +DELIMITER ; + +-- Dumping structure for table astute.customer +CREATE TABLE IF NOT EXISTS `customer` ( + `customer_id` int(5) NOT NULL AUTO_INCREMENT, + `customer_name` varchar(100) DEFAULT NULL, + `bill_to_dept` varchar(50) DEFAULT NULL, + `add1` varchar(50) DEFAULT NULL, + `add2` varchar(50) DEFAULT NULL, + `city` varchar(50) DEFAULT NULL, + `state` varchar(2) DEFAULT NULL, + `zip` int(5) DEFAULT NULL, + `zip_last_4` int(4) DEFAULT NULL, + `email` varchar(50) DEFAULT NULL, + `phone` bigint(11) DEFAULT NULL, + `fax` int(10) DEFAULT NULL, + PRIMARY KEY (`customer_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- Dumping data for table astute.customer: ~2 rows (approximately) +/*!40000 ALTER TABLE `customer` DISABLE KEYS */; +INSERT INTO `customer` (`customer_id`, `customer_name`, `bill_to_dept`, `add1`, `add2`, `city`, `state`, `zip`, `zip_last_4`, `email`, `phone`, `fax`) VALUES + (1, 'test1233', 'test123', 'test123', 'null', 'test123', 'md', 20874, 0, 'null', 0, 0), + (2, 'test123', 'test123', 'test123', NULL, 'test123', 'md', 20874, 0, NULL, 0, 0); +/*!40000 ALTER TABLE `customer` ENABLE KEYS */; + +-- Dumping structure for table astute.fee_type +CREATE TABLE IF NOT EXISTS `fee_type` ( + `fee_type_id` int(11) NOT NULL, + `fee_type_desc` varchar(40) NOT NULL, + PRIMARY KEY (`fee_type_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- Dumping data for table astute.fee_type: ~2 rows (approximately) +/*!40000 ALTER TABLE `fee_type` DISABLE KEYS */; +INSERT INTO `fee_type` (`fee_type_id`, `fee_type_desc`) VALUES + (1, 'Fixed fee'), + (2, 'Hourly'); +/*!40000 ALTER TABLE `fee_type` ENABLE KEYS */; + +-- Dumping structure for function astute.generate_inv_number +DELIMITER // +CREATE DEFINER=`root`@`localhost` FUNCTION `generate_inv_number`(po_num_in varchar(20)) RETURNS varchar(20) CHARSET utf8 +BEGIN + DECLARE customer_id_in int; + DECLARE customer_code varchar(4); + DECLARE po_count int; + DECLARE inv_count int; + DECLARE inv_number varchar(20); + + SELECT customer_id + INTO customer_id_in + FROM po + WHERE po.po_num = po_num_in; + + SELECT substr(customer.customer_name, 1, 4) + INTO customer_code + FROM customer + WHERE customer_id = customer_id_in; + + SELECT count(*) + INTO po_count + FROM po + WHERE customer_id = customer_id_in; + + SELECT count(*) + INTO inv_count + FROM invoice + WHERE invoice.PO_num in (SELECT po_num FROM po WHERE po.customer_id = customer_id_in); + SELECT concat(customer_code, '-',LPAD(po_count, 2, '0'), '_',date_format(now(),'%y'), date_format(now(),'%m'), '_', LPAD(inv_count, 2, '0')) INTO inv_number; + RETURN inv_number; + +END// +DELIMITER ; + +-- Dumping structure for function astute.get_previously_billed_amt +DELIMITER // +CREATE DEFINER=`root`@`localhost` FUNCTION `get_previously_billed_amt`(po_no varchar(20)) RETURNS double(10,2) +BEGIN + declare billed_amt double(10,2); + SELECT sum(bill_amt) INTO billed_amt FROM invoice WHERE invoice.PO_num = po_no; + return billed_amt; +END// +DELIMITER ; + +-- Dumping structure for function astute.get_remaining_qty_fun +DELIMITER // +CREATE DEFINER=`root`@`localhost` FUNCTION `get_remaining_qty_fun`(po_num_in varchar(20), item_no_in int) RETURNS double +BEGIN +DECLARE remaining_qty double; +select po_detail.qty - sum(amt) into remaining_qty from invoice_detail, po_detail +where invoice_detail.inv_num in (select inv_num from invoice where invoice.PO_num = po_num_in) +and invoice_detail.line_item_num = item_no_in +and invoice_detail.line_item_num = po_detail.line_item_no; +return remaining_qty; +END// +DELIMITER ; + +-- Dumping structure for table astute.invoice +CREATE TABLE IF NOT EXISTS `invoice` ( + `inv_no` varchar(20) NOT NULL, + `inv_date` date NOT NULL, + `PO_num` varchar(40) NOT NULL, + `change_order_num` varchar(20) DEFAULT NULL, + `bill_amt` double NOT NULL, + `special_notes` varchar(500) DEFAULT NULL, + `certification` varchar(500) DEFAULT 'Certified that the above items and rates are in accordance with the contractual agreement as verified by the undersigned.', + `inv_status` int(2) DEFAULT '1', + `pmt_status` int(11) NOT NULL DEFAULT '1', + PRIMARY KEY (`inv_no`), + KEY `fk_InvMaster_POnum` (`PO_num`), + CONSTRAINT `fk_InvMaster_POnum` FOREIGN KEY (`PO_num`) REFERENCES `po` (`PO_num`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- Dumping data for table astute.invoice: ~2 rows (approximately) +/*!40000 ALTER TABLE `invoice` DISABLE KEYS */; +INSERT INTO `invoice` (`inv_no`, `inv_date`, `PO_num`, `change_order_num`, `bill_amt`, `special_notes`, `certification`, `inv_status`, `pmt_status`) VALUES + ('123', '2018-01-01', 'EP2649247', 'test', 5000, 'asdf', 'Certified that the above items and rates are in accordance with the contractual agreement as verified by the undersigned.', 1, 1), + ('NVCC-01_1712_21', '2017-12-28', 'EP2649247', NULL, 16854, '1. Completion of Phase 1 - Preliminaries\r\n2. Invoice not submitted to NVCC. For submitted invoice, see Excel copy\r\n', 'Certified that the above items and rates are in accordance with the contractual agreement as verified by the undersigned.', 1, 1); +/*!40000 ALTER TABLE `invoice` ENABLE KEYS */; + +-- Dumping structure for table astute.invoice_detail +CREATE TABLE IF NOT EXISTS `invoice_detail` ( + `inv_num` varchar(20) NOT NULL, + `line_item_num` int(11) NOT NULL, + `PO_line_item_num` int(11) DEFAULT NULL, + `service_type_id` int(11) DEFAULT NULL, + `description` varchar(500) DEFAULT NULL, + `percent_completion` double DEFAULT NULL, + `hours` double DEFAULT NULL, + `amt` double DEFAULT NULL, + `fee_type_id` int(11) DEFAULT NULL, + PRIMARY KEY (`inv_num`,`line_item_num`), + KEY `fk_InvDetail_FeeType` (`fee_type_id`), + CONSTRAINT `fk_InvDetail_FeeType` FOREIGN KEY (`fee_type_id`) REFERENCES `fee_type` (`fee_type_id`), + CONSTRAINT `fk_InvDetail_InvNum` FOREIGN KEY (`inv_num`) REFERENCES `invoice` (`inv_no`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- Dumping data for table astute.invoice_detail: ~7 rows (approximately) +/*!40000 ALTER TABLE `invoice_detail` DISABLE KEYS */; +INSERT INTO `invoice_detail` (`inv_num`, `line_item_num`, `PO_line_item_num`, `service_type_id`, `description`, `percent_completion`, `hours`, `amt`, `fee_type_id`) VALUES + ('123', 1, NULL, 1, 'tese', 100, 34543, 345435, 1), + ('NVCC-01_1712_21', 1, 1, NULL, 'test', NULL, NULL, 14953, 1), + ('NVCC-01_1712_21', 2, 3, NULL, 'Additional Services: Third Party Utility Verification', NULL, NULL, 1500, 1), + ('NVCC-01_1712_21', 3, 3, NULL, 'Additional Services: Field Investigatoin Travel', NULL, NULL, 321, 1), + ('NVCC-01_1712_21', 4, 4, NULL, 'Reimbursable Expense: Printing and parking', NULL, NULL, 80, 1), + ('NVCC-01_1712_21', 10, 1, 0, 'Design Phase Service _Prelimanary', 0, 0, 14953, 1), + ('NVCC-01_1712_21', 11, 1, 0, 'Design Phase Service _Prelimanary', 0, 0, 14953, 1); +/*!40000 ALTER TABLE `invoice_detail` ENABLE KEYS */; + +-- Dumping structure for table astute.invoice_notes +CREATE TABLE IF NOT EXISTS `invoice_notes` ( + `inv_no` varchar(20) NOT NULL, + `inv_note` varchar(500) NOT NULL, + PRIMARY KEY (`inv_no`), + CONSTRAINT `fk_inv_notes_inv_no` FOREIGN KEY (`inv_no`) REFERENCES `invoice` (`inv_no`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- Dumping data for table astute.invoice_notes: ~0 rows (approximately) +/*!40000 ALTER TABLE `invoice_notes` DISABLE KEYS */; +/*!40000 ALTER TABLE `invoice_notes` ENABLE KEYS */; + +-- Dumping structure for table astute.invoice_payment +CREATE TABLE IF NOT EXISTS `invoice_payment` ( + `inv_no` varchar(20) NOT NULL, + `invoice_payment_type` int(11) NOT NULL, + `invoice_amount` double NOT NULL, + `payment_date` date NOT NULL, + PRIMARY KEY (`inv_no`), + KEY `fk_pinv_pmt_type` (`invoice_payment_type`), + CONSTRAINT `fk_inv_pmt_inv_no` FOREIGN KEY (`inv_no`) REFERENCES `invoice` (`inv_no`), + CONSTRAINT `fk_pinv_pmt_type` FOREIGN KEY (`invoice_payment_type`) REFERENCES `payment_type` (`payment_type_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- Dumping data for table astute.invoice_payment: ~0 rows (approximately) +/*!40000 ALTER TABLE `invoice_payment` DISABLE KEYS */; +/*!40000 ALTER TABLE `invoice_payment` ENABLE KEYS */; + +-- Dumping structure for table astute.invoice_status +CREATE TABLE IF NOT EXISTS `invoice_status` ( + `inv_status_id` int(11) NOT NULL, + `inv_status_desc` varchar(20) NOT NULL, + PRIMARY KEY (`inv_status_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- Dumping data for table astute.invoice_status: ~3 rows (approximately) +/*!40000 ALTER TABLE `invoice_status` DISABLE KEYS */; +INSERT INTO `invoice_status` (`inv_status_id`, `inv_status_desc`) VALUES + (1, 'Draft'), + (2, 'Submitted'), + (3, 'Void'); +/*!40000 ALTER TABLE `invoice_status` ENABLE KEYS */; + +-- Dumping structure for table astute.payment_status +CREATE TABLE IF NOT EXISTS `payment_status` ( + `payment_status_id` int(11) NOT NULL, + `payment_status_desc` varchar(20) NOT NULL, + PRIMARY KEY (`payment_status_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- Dumping data for table astute.payment_status: ~3 rows (approximately) +/*!40000 ALTER TABLE `payment_status` DISABLE KEYS */; +INSERT INTO `payment_status` (`payment_status_id`, `payment_status_desc`) VALUES + (1, 'Outstanding'), + (2, 'Partially paid'), + (3, 'Paid'); +/*!40000 ALTER TABLE `payment_status` ENABLE KEYS */; + +-- Dumping structure for table astute.payment_type +CREATE TABLE IF NOT EXISTS `payment_type` ( + `payment_type_id` int(11) NOT NULL, + `payment_type_name` varchar(20) NOT NULL, + PRIMARY KEY (`payment_type_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- Dumping data for table astute.payment_type: ~3 rows (approximately) +/*!40000 ALTER TABLE `payment_type` DISABLE KEYS */; +INSERT INTO `payment_type` (`payment_type_id`, `payment_type_name`) VALUES + (1, 'Credit Card'), + (2, 'Check'), + (3, 'ACH'); +/*!40000 ALTER TABLE `payment_type` ENABLE KEYS */; + +-- Dumping structure for table astute.po +CREATE TABLE IF NOT EXISTS `po` ( + `PO_num` varchar(40) NOT NULL COMMENT 'Alpha numeric, auto generated in frontend', + `contract_num` varchar(20) DEFAULT NULL, + `PO_date` date DEFAULT NULL, + `contract_amt` double(10,2) DEFAULT NULL, + `customer_id` int(11) NOT NULL, + PRIMARY KEY (`PO_num`), + KEY `ind_pomaster_contractno` (`contract_num`), + KEY `ind_pomaster_podate` (`PO_date`), + KEY `po_customer_id` (`customer_id`), + CONSTRAINT `po_customer_id` FOREIGN KEY (`customer_id`) REFERENCES `customer` (`customer_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- Dumping data for table astute.po: ~1 rows (approximately) +/*!40000 ALTER TABLE `po` DISABLE KEYS */; +INSERT INTO `po` (`PO_num`, `contract_num`, `PO_date`, `contract_amt`, `customer_id`) VALUES + ('EP2649247', 'TEST123', '2017-10-13', 30000.00, 1); +/*!40000 ALTER TABLE `po` ENABLE KEYS */; + +-- Dumping structure for table astute.po_detail +CREATE TABLE IF NOT EXISTS `po_detail` ( + `PO_num` varchar(40) NOT NULL, + `line_item_no` int(11) NOT NULL, + `service_desc` varchar(500) DEFAULT NULL, + `fee_type_id` int(11) DEFAULT '1' COMMENT '1-fixed fee, 2-hourly', + `qty` double DEFAULT NULL, + `service_type_id` int(1) DEFAULT '1' COMMENT '1-studies, 2-supplemental service, 3-out of pocket, 4-reimbursement, 5-', + `schedule` varchar(20) DEFAULT NULL, + `deliver_by` date DEFAULT NULL, + PRIMARY KEY (`PO_num`,`line_item_no`), + KEY `fk_PODetail_ServType` (`service_type_id`), + CONSTRAINT `fk_PODetail_POnum` FOREIGN KEY (`PO_num`) REFERENCES `po` (`PO_num`), + CONSTRAINT `fk_PODetail_ServType` FOREIGN KEY (`service_type_id`) REFERENCES `service_type` (`service_type_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- Dumping data for table astute.po_detail: ~5 rows (approximately) +/*!40000 ALTER TABLE `po_detail` DISABLE KEYS */; +INSERT INTO `po_detail` (`PO_num`, `line_item_no`, `service_desc`, `fee_type_id`, `qty`, `service_type_id`, `schedule`, `deliver_by`) VALUES + ('EP2649247', 1, 'test', 2, 38073, 1, NULL, NULL), + ('EP2649247', 2, 'test', 2, 16345, 1, NULL, NULL), + ('EP2649247', 3, 'test', 2, 4642, 2, NULL, NULL), + ('EP2649247', 4, 'test', 2, 880, 4, NULL, NULL), + ('EP2649247', 6, 'test', 2, 456, 1, 'dfgr', NULL); +/*!40000 ALTER TABLE `po_detail` ENABLE KEYS */; + +-- Dumping structure for table astute.service_type +CREATE TABLE IF NOT EXISTS `service_type` ( + `service_type_id` int(11) NOT NULL, + `desc` varchar(40) NOT NULL, + PRIMARY KEY (`service_type_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- Dumping data for table astute.service_type: ~5 rows (approximately) +/*!40000 ALTER TABLE `service_type` DISABLE KEYS */; +INSERT INTO `service_type` (`service_type_id`, `desc`) VALUES + (1, 'study'), + (2, 'design'), + (3, 'Peer review'), + (4, 'cost estimation'), + (5, 'forensic investigation'); +/*!40000 ALTER TABLE `service_type` ENABLE KEYS */; + +-- Dumping structure for table astute.session +CREATE TABLE IF NOT EXISTS `session` ( + `session_id` varchar(500) NOT NULL, + `user_id` int(11) NOT NULL, + `session_start_date` date DEFAULT NULL, + `session_end_date` date DEFAULT NULL, + PRIMARY KEY (`session_id`), + KEY `fk_session_user_id` (`user_id`), + CONSTRAINT `fk_session_user_id` FOREIGN KEY (`user_id`) REFERENCES `user` (`user_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- Dumping data for table astute.session: ~3 rows (approximately) +/*!40000 ALTER TABLE `session` DISABLE KEYS */; +INSERT INTO `session` (`session_id`, `user_id`, `session_start_date`, `session_end_date`) VALUES + ('745de7a0e6c1480398ca36116512bc06', 1, NULL, NULL), + ('985874e08cb74fa08419f8883f3eeff7', 1, NULL, NULL), + ('a4b6bde153004b7ba17220f5ba2bb323', 1, NULL, NULL); +/*!40000 ALTER TABLE `session` ENABLE KEYS */; + +-- Dumping structure for table astute.user +CREATE TABLE IF NOT EXISTS `user` ( + `user_id` int(5) NOT NULL, + `username` varchar(20) DEFAULT NULL, + `password` varchar(20) DEFAULT NULL, + `first_name` varchar(20) DEFAULT NULL, + `middle_name` varchar(20) DEFAULT NULL, + `last_name` varchar(20) DEFAULT NULL, + `role` varchar(20) DEFAULT NULL, + `email` varchar(40) DEFAULT NULL, + `office_phone_ext` int(3) DEFAULT NULL, + `cell_phone` bigint(20) DEFAULT NULL, + PRIMARY KEY (`user_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- Dumping data for table astute.user: ~2 rows (approximately) +/*!40000 ALTER TABLE `user` DISABLE KEYS */; +INSERT INTO `user` (`user_id`, `username`, `password`, `first_name`, `middle_name`, `last_name`, `role`, `email`, `office_phone_ext`, `cell_phone`) VALUES + (1, 'sparikh', 'sparikh', 'Saurin', NULL, 'Parikh', 'Owner', 'sparikh@Astuteng.com', 2024002004, 3014616485), + (2, 'humarethiya', 'humarethiya', 'Haresh', NULL, 'Umaretiya', 'Owner', 'Humaretiya@astuteng.com', 2024002004, 0); +/*!40000 ALTER TABLE `user` ENABLE KEYS */; + +/*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */; +/*!40014 SET FOREIGN_KEY_CHECKS=IF(@OLD_FOREIGN_KEY_CHECKS IS NULL, 1, @OLD_FOREIGN_KEY_CHECKS) */; +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; diff --git a/AstuteSystem/src/main/java/com/astute/common/Constants.java b/AstuteSystem/src/main/java/com/astute/common/Constants.java new file mode 100644 index 0000000..13bf1c8 --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/common/Constants.java @@ -0,0 +1,9 @@ +package com.astute.common; + +public class Constants { + //error codes + //web services + + public static final int ERR_CONFIGURATION = 6014; + public static final int SUCCESS = 9000; +} diff --git a/AstuteSystem/src/main/java/com/astute/common/Utility.java b/AstuteSystem/src/main/java/com/astute/common/Utility.java new file mode 100644 index 0000000..39a99ed --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/common/Utility.java @@ -0,0 +1,29 @@ +package com.astute.common; + +import java.util.HashSet; + +/** + * Created by Gopi on 9/7/2017. + */ +public class Utility { + public Utility() { + } + + public static String setToString(HashSet inValue, String separator){ + String values = ""; + for(String value : inValue) { + values += value + separator; + } + values = values.substring(0, values.length()-1); + return values; + } + + public static String arrayToString(String[] inValue, String separator){ + String values = ""; + for(String value : inValue) { + values += value + separator; + } + values = values.substring(0, values.length()-1); + return values; + } +} diff --git a/AstuteSystem/src/main/java/com/astute/dao/DAO.java b/AstuteSystem/src/main/java/com/astute/dao/DAO.java new file mode 100644 index 0000000..9edaf72 --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/dao/DAO.java @@ -0,0 +1,148 @@ +package com.astute.dao; + +import com.astute.exceptions.AstuteException; +import com.astute.exceptions.AstuteException; +import com.astute.model.*; + +import java.io.*; +import java.sql.*; +import java.sql.Date; +import java.util.*; + +public abstract class DAO { + public static DAO dao; + + static String database; + static String host; + static int port; + static String username; + static String password; + static String schema; + static int interval = 30; + + /** + * @return The static instance of the DaoHelper + */ + public static DAO getDao() throws AstuteException { + if (dao == null) { + throw new AstuteException(0,"Review db.config file."); + } + return dao; + } + + public static String getDatabase() { + return database; + } + + /** + * This method is called from the StartupServlet, with the properties being read from pm.conf + * + * @param + * @throws AstuteException + */ + public static void init() throws AstuteException { + try { + File configDir = new File(System.getProperty("catalina.base"), "conf"); + File configFile = new File(configDir, "db.config"); + InputStream stream = new FileInputStream(configFile); + Properties props = new Properties(); + props.load(stream); + +// Properties props = new Properties(); +// InputStream input = new FileInputStream("db.config"); + + // load a properties file +// props.load(input); + + //get properties + database = props.getProperty("database"); + host = props.getProperty("host"); + port = Integer.parseInt(props.getProperty("port")); + schema = props.getProperty("schema"); + username = props.getProperty("username"); + password = props.getProperty("password"); + System.out.println("============================================="); + System.out.println("host is " + host); + System.out.println("port is " + port); + System.out.println("schema is " + schema); + System.out.println("username is " + username); + System.out.println("password is " + password); + System.out.println("============================================="); + dao = new SqlDAO(); + } catch (IOException e) { + e.printStackTrace(); + } + } + + public Connection conn; + + public DAO() throws AstuteException { + //connect to database + connect(); + } + + /** + * Abstract method to establish a connection to the database + * + * @throws AstuteException if the database is not running or if there are any other connection issues + */ + public abstract void connect() throws AstuteException; + + public abstract List getPOMaster(String PONum, String contractNum, java.sql.Date PODate) throws AstuteException; + + public abstract List getPODetail(String PONum, int lineItemNo) throws AstuteException; + + public abstract void updatePOMaster(String PONum, String contractNum, java.sql.Date PODate, Double contractAmt) throws AstuteException; + + public abstract void updatePODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, int serviceTypeId, String schedule, java.sql.Date deiverBy) throws AstuteException; + + public abstract void createPOMaster(String PONum, String contractNum, java.sql.Date PODate, Double contractAmt, int customerId) throws AstuteException; + + public abstract void createPODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, int serviceTypeId, String schedule, java.sql.Date deiverBy) throws AstuteException; + + + public abstract List getInvoiceMaster(String invoiceNumber, int pmtStatus) throws AstuteException; + + public abstract List getInvoiceDetail(String invoiceNum, int lineItemNo) throws AstuteException; + + public abstract void updateInvoiceMaster(String invoiceNum, java.sql.Date invoiceDate, String PONum, String changeOrderNum, int pmtStatus, Double billAmt, String specialNotes, String certification) throws AstuteException; + + public abstract void updateInvoiceDetail(String invoiceNum, int lineItemNum, int POLineItemNum, int serviceTypeId, String desc, double percentCompletion, double hours, double amount) throws AstuteException; + + public abstract void createInvoiceMaster(String invoiceNum, java.sql.Date invoiceDate, String PONum, String changeOrderNum, int pmtStatus, Double billAmt, String specialNotes, String certification) throws AstuteException; + + public abstract void createInvoiceDetail(String invoiceNum, int lineItemNum, int POLineItemNum, int serviceTypeId, String desc, double percentCompletion, double hours, double amount) throws AstuteException; + + public abstract String generateInvoiceNumber(String poNum) throws AstuteException; + + public abstract GeneratedInvoice getGeneratedInvoice(String invoiceNumber)throws AstuteException; + + + public abstract List getCustomers(int customerId) throws AstuteException; + + public abstract int createCustomer(String customerName, String billToDept, String add1, String add2, String city, String state, int zip, int ziplast4, String email, int phone, int fax) throws AstuteException; + + public abstract void updateCustomer(int customerId, String customerName, String billToDept, String add1, String add2, String city, String state, int zip, int ziplast4, String email, int phone, int fax) throws AstuteException; + + // User and session method implementation + + public abstract ResultSet executeQuery(String sessionId, String sql) throws AstuteException ; + + public abstract User getUser(String username) throws AstuteException ; + + public abstract void createSession(int userId, String sessionId) throws AstuteException; + + public abstract void deleteSession(String sessionId); + + public abstract String getSessionUsername(String sessionId) throws AstuteException; + + public abstract String login(String username, String password) throws AstuteException; + + public abstract List getChangeOrders(String poNum) throws AstuteException; + + public abstract void updateChangeOrder(String poNum, int changeOrderNum, double changeOrderAmt, Date changeOrderDate, String description) throws AstuteException; + + public abstract int createChangeOrder(String poNum, int changeOrderNum, double changeOrderAmt, Date changeOrderDate, String description) throws AstuteException; + + +} \ No newline at end of file diff --git a/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java b/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java new file mode 100644 index 0000000..9b23762 --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/dao/SqlDAO.java @@ -0,0 +1,839 @@ +package com.astute.dao; + +import com.astute.exceptions.AstuteException; +import com.astute.exceptions.AstuteException; + +import com.astute.model.*; + +import javax.crypto.SecretKeyFactory; +import javax.crypto.spec.PBEKeySpec; +import java.math.BigInteger; +import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; +import java.security.spec.InvalidKeySpecException; +import java.sql.*; +import java.util.ArrayList; + +import java.util.List; +import java.util.UUID; + +import static com.astute.exceptions.AstuteException.DB_ERROR; + +public class SqlDAO extends DAO { + + public SqlDAO() throws AstuteException { + } + + @Override + public void connect() throws AstuteException { + try { + Class.forName("com.mysql.cj.jdbc.Driver"); + conn = DriverManager.getConnection("jdbc:mysql://" + host + ":" + port + "/" + schema, username, password); + System.out.println("Connected to MySQL"); + } catch (Exception e) { + throw new AstuteException(e.hashCode(), e.getMessage()); + } + } + + public List getPOMaster(String PONum, String contractNum, Date PODate) throws AstuteException { + try { + List pos = new ArrayList<>(); + Statement stmt = conn.createStatement(); + String sql = "SELECT PO_num, contract_num, PO_date, customer_id, contract_amt FROM PO "; + if (PONum != null) { + sql += "WHERE UPPER(PO_num) = '" + PONum.toUpperCase() + "'"; + } else if (contractNum != null) { + sql += "WHERE UPPER(contract_num) = '" + contractNum.toUpperCase()+ "'"; + } else if (PODate != null) { + sql += "WHERE PO_date = STR_TO_DATE(" + PODate + ", '%Y-%m-%d')"; + } + + ResultSet rs = stmt.executeQuery(sql); + while (rs.next()) { + String poNum = rs.getString(1); + String cntrctNum = rs.getString(2); + Date poDate = rs.getDate(3); + Integer customerId = rs.getInt(4); + Double contractAmt = rs.getDouble(5); + PO po = new PO(poNum, cntrctNum, poDate, customerId, contractAmt); + pos.add(po); + } + return pos; + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public List getPODetail(String PONum, int lineItemNo) throws AstuteException { + try { + List poDetails = new ArrayList<>(); + Statement stmt = conn.createStatement(); + String whereClause = " WHERE "; + boolean whereClauseCriteria = false; + String sql = "SELECT PO_num, line_item_no, service_desc, fee_type_id, qty, service_type_id, get_remaining_qty(PO_num, line_item_no) as get_remaining_qty FROM PO_DETAIL "; + if (PONum != null) { + whereClause = whereClause + " UPPER(PO_num) = '" + PONum.toUpperCase() + "'"; + whereClauseCriteria = true; + } + if (lineItemNo > 0) { + if (whereClauseCriteria) { + whereClause += " AND "; + } + whereClause = whereClause + " line_item_no = " + lineItemNo; + } + sql += whereClause; + System.out.println(sql); + ResultSet rs = stmt.executeQuery(sql); + while (rs.next()) { + String poNum = rs.getString(1); + int lineItemNum = rs.getInt(2); + String serviceDesc = rs.getString(3); + int feeTypeId = rs.getInt(4); + Double qty = rs.getDouble(5); + int serviceTypeId = rs.getInt(6); + double remainingQty = rs.getInt(7); + PODetail poDetail = new PODetail(poNum, lineItemNum, serviceDesc, feeTypeId, qty, serviceTypeId, remainingQty); + poDetails.add(poDetail); + } + return poDetails; + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public void updatePOMaster(String PONum, String contractNum, Date PODate, Double contractAmt) throws AstuteException { + try { + String sql = "UPDATE PO "; + String updateClause = " SET "; + String whereClause = ""; + if (PONum == null || PONum.isEmpty()) { + throw new AstuteException(0, "PO Number null."); + } else { + whereClause = " WHERE UPPER(PO_num) ='" + PONum.toUpperCase() + "'"; + } + + if (contractNum != null && !contractNum.isEmpty()) { + updateClause = updateClause + " contract_num = '" + contractNum.toUpperCase() + "',"; + } + if (PODate != null) { + updateClause = updateClause + " PO_Date = STR_TO_DATE(" + PODate + ", '%Y-%m-%d')" + ","; + } + if (contractAmt != null && contractAmt > 0) { + updateClause = updateClause + " contract_amt = " + contractAmt; + } + if (!updateClause.equalsIgnoreCase(" SET ")) { + sql = sql + trimLastCharacter(updateClause, ",") + whereClause; + + } else { + System.out.println(updateClause); + throw new AstuteException(0, "No values to update."); + } + System.out.println(sql); + Statement stmt = conn.createStatement(); + stmt.executeUpdate(sql); + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public String trimLastCharacter(String sql, String character) { + sql = sql.trim(); + if (sql.endsWith(character)) { + sql = sql.substring(0, sql.length() - 1); + } + return sql; + + } + + public void updatePODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, int serviceTypeId, String schedule, Date deiverBy) throws AstuteException { + try { + String sql = "UPDATE PO_DETAIL "; + String updateClause = " SET "; + String whereClause = " WHERE UPPER(PO_num) = '" + POnum.toUpperCase() + "' AND line_item_no = " + lineItemNo; + if (POnum == null || POnum.isEmpty() || lineItemNo < 0) { + throw new AstuteException(0, "PO Number should not be null and line item number must be greater than 0."); + } else { + whereClause = " WHERE UPPER(PO_num) = '" + POnum.toUpperCase() + "' AND line_item_no = " + lineItemNo; + } + if (lineItemNo < 0) { + throw new AstuteException(0, "Line item Number must be greater than 0."); + } + if (serviceDesc != null && !serviceDesc.isEmpty()) { + updateClause += " service_desc = '" + serviceDesc + "',"; + } + if (feeTypeId > 0) { + updateClause += " fee_type_id = " + feeTypeId + ","; + } + if (qty != null && qty > 0) { + updateClause += " qty = " + qty + ","; + } + if (serviceTypeId > 0) { + updateClause += " service_type_id = " + serviceTypeId + ","; + } + if (schedule != null && !schedule.isEmpty()) { + updateClause += " schedule = '" + schedule + "',"; + } + if (deiverBy != null) { + updateClause += " deiver_by = " + deiverBy; + } + + if (!updateClause.equalsIgnoreCase(" SET ")) { + sql = sql + trimLastCharacter(updateClause, ",") + whereClause; + + } else { + throw new AstuteException(0, "No values to update."); + } + System.out.println(sql); + Statement stmt = conn.createStatement(); + stmt.executeUpdate(sql); + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public void createPOMaster(String PONum, String contractNum, Date PODate, Double contractAmt, int customerId) throws AstuteException { + try { + System.out.println("Calling create_PO Procedure"); + System.out.println("PONum is " + PONum); + CallableStatement stmt = conn.prepareCall("{call create_PO(?,?,?,?)}"); + stmt.setString(1, PONum); + stmt.setString(2, contractNum); + stmt.setDate(3, PODate); + stmt.setDouble(4, contractAmt); + stmt.setInt(5, customerId); + stmt.executeUpdate(); + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public void createPODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, int serviceTypeId, String schedule, Date deiverBy) throws AstuteException { + try { + System.out.println("Calling create_po_detail Procedure"); + System.out.println("POnum is " + POnum); + CallableStatement stmt = conn.prepareCall("{call create_po_detail(?,?,?,?,?,?,?,?)}"); + stmt.setString(1, POnum); + stmt.setInt(2, lineItemNo); + stmt.setString(3, serviceDesc); + stmt.setInt(4, feeTypeId); + stmt.setDouble(5, qty); + stmt.setInt(6, serviceTypeId); + stmt.setString(7, schedule); + stmt.setDate(8, deiverBy); + stmt.executeUpdate(); + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public Double getPreviouslyBilledAmount(String poNum) throws AstuteException { + try { + Double billedAmt = new Double(0); + Statement stmt = conn.createStatement(); + String sql = "SELECT sum(bill_amt) FROM invoice WHERE invoice.PO_num = '" + poNum + "'"; + ResultSet rs = stmt.executeQuery(sql); + while (rs.next()) { + billedAmt = rs.getDouble(1); + } + return billedAmt; + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public String generateInvoiceNumber(String poNum) throws AstuteException { + try { + String generatedInvoiceNumber; + System.out.println("Calling generate_inv_number DB function"); + System.out.println("poNum is " + poNum); + CallableStatement stmt = conn.prepareCall("{? = call generate_inv_number(?)}"); + stmt.registerOutParameter(1, Types.VARCHAR); + + stmt.setString(2, poNum); + stmt.execute(); + generatedInvoiceNumber = stmt.getString(1); + return generatedInvoiceNumber; + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + public GeneratedInvoice getGeneratedInvoice(String invoiceNumber) throws AstuteException{ + GeneratedInvoice generatedInvoice = null; + Invoice invoice = getInvoiceMaster(invoiceNumber, 0).get(0); + String PONo = invoice.getPoNum(); + List invoiceDetail = getInvoiceDetail(invoiceNumber, 0); + PO po = getPOMaster(PONo, null, null).get(0); + Integer customerId = po.getCustomerId(); + Customer customer = getCustomers(customerId).get(0); + Double previouslyBilledAmt = getPreviouslyBilledAmount(PONo); + Double toBeBilledAmt = po.getContractAmt() - previouslyBilledAmt - invoice.getBillAmt(); + generatedInvoice = new GeneratedInvoice(invoice, invoiceDetail, po, customer, previouslyBilledAmt, toBeBilledAmt ); + return generatedInvoice; + } + + + public List getInvoiceMaster(String invoiceNumber, int pmtStatus)throws AstuteException { + try { + List invoices = new ArrayList<>(); + Statement stmt = conn.createStatement(); + String whereClause = " WHERE "; + boolean whereClauseIndicator = false; + String sql = "SELECT inv_no, inv_date, PO_num, change_order_num, pmt_status, bill_amt, special_notes, certification FROM INVOICE "; + if (invoiceNumber != null) { + whereClause = whereClause + " UPPER(inv_no) = '"+ invoiceNumber.toUpperCase() +"'"; + whereClauseIndicator = true; + } + if (pmtStatus > 0) { + if (whereClauseIndicator) { + whereClause += " AND "; + } + whereClause = whereClause + " pmt_status = "+ pmtStatus; + } + if (!whereClause.equals(" WHERE ")) { + + sql += whereClause; + } + System.out.println(sql); + ResultSet rs = stmt.executeQuery(sql); + while (rs.next()) { + String invNo = rs.getString(1); + Date invdDate = rs.getDate(2); + String PONo = rs.getString(3); + String changeOrderNum = rs.getString(4); + int paymentStatus = rs.getInt(5); + Double billAmt = rs.getDouble(6); + String specialNotes = rs.getString(7); + String certification = rs.getString(8); + Invoice invoice = new Invoice(invNo, invdDate, PONo, changeOrderNum, paymentStatus, billAmt, specialNotes, certification); + invoices.add(invoice); + } + return invoices; + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public List getInvoiceDetail(String invoiceNum, int lineItemNo)throws AstuteException { + try { + List services = new ArrayList<>(); + Statement stmt = conn.createStatement(); + String sql = "SELECT inv_num, line_item_num, PO_line_item_num, service_type_id, description, percent_completion, hours,amt FROM INVOICE_DETAIL "; + + String whereClause = " WHERE "; + boolean whereClauseIndicator = false; + if (invoiceNum != null) { + whereClause = whereClause + " UPPER(inv_num) = '"+ invoiceNum.toUpperCase() +"'"; + whereClauseIndicator = true; + } + if (lineItemNo > 0) { + if (whereClauseIndicator) { + whereClause += " AND "; + } + whereClause = whereClause + " line_item_num = "+ lineItemNo; + } + + sql += whereClause; + ResultSet rs = stmt.executeQuery(sql); + while (rs.next()) { + String invNo = rs.getString(1); + int lineItemNum = rs.getInt(2); + int POLineItemNum = rs.getInt(3); + int serviceTypeId = rs.getInt(4); + String desc = rs.getString(5); + Double percentCompletion = rs.getDouble(6); + Double hours = rs.getDouble(7); + Double amount = rs.getDouble(8); + InvoiceDetail service = new InvoiceDetail(invNo, lineItemNum, POLineItemNum, serviceTypeId, desc, percentCompletion, hours, amount); + services.add(service); + } + return services; + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public void updateInvoiceMaster(String invoiceNum, Date invoiceDate, String PONum, String changeOrderNum, int pmtStatus, Double billAmt, String specialNotes, String certification)throws AstuteException { + try { + String sql = "UPDATE INVOICE "; + String updateClause = " SET "; + String whereClause = ""; + if (invoiceNum == null || invoiceNum.isEmpty()) { + throw new AstuteException(0, "Invoice Number can't be null."); + } else { + whereClause = " WHERE UPPER(inv_no) ='" + invoiceNum.toUpperCase() + "'"; + } + + if (invoiceDate != null ) { + updateClause = updateClause + " inv_date = " + invoiceDate + ","; + } + if (PONum == null || PONum.isEmpty()) { + updateClause = updateClause + " PO_num = '" + PONum + "',"; + } + if (changeOrderNum == null || changeOrderNum.isEmpty()) { + updateClause = updateClause + " change_order_num = '" + changeOrderNum + "',"; + } + if (pmtStatus > 0 ) { + updateClause = updateClause + " pmt_status = " + pmtStatus + ","; + } + if (billAmt > 0) { + updateClause = updateClause + " bill_amt = " + billAmt + ","; + } + if (specialNotes == null || specialNotes.isEmpty()) { + updateClause = updateClause + " special_notes = '" + specialNotes + "',"; + } + if (certification == null || certification.isEmpty()) { + updateClause = updateClause + " certification = '" + certification + "',"; + } + + if (!updateClause.equalsIgnoreCase(" SET ")) { + sql = sql + trimLastCharacter(updateClause,",") + whereClause; + + } else { + System.out.println(updateClause); + throw new AstuteException(0, "No values to update."); + } + System.out.println(sql); + Statement stmt = conn.createStatement(); + stmt.executeUpdate(sql); + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public void updateInvoiceDetail(String invoiceNum, int lineItemNum, int POLineItemNum, int serviceTypeId, String desc, double percentCompletion, double hours, double amount)throws AstuteException { + try { + String sql = "UPDATE INVOICE_DETAIL "; + String updateClause = " SET "; + String whereClause = ""; + if(invoiceNum == null || invoiceNum.isEmpty() || lineItemNum < 0) { + throw new AstuteException(0, "PO Number should not be null and line item number must be greater than 0."); + } else { + whereClause = " WHERE UPPER(inv_num) = '" + invoiceNum.toUpperCase() + "' AND line_item_num = " + lineItemNum; + } + if(POLineItemNum >0) { + updateClause += " PO_line_item_num = " + POLineItemNum + ","; + } + if(serviceTypeId >0) { + updateClause += " service_type_id = " + serviceTypeId + ","; + } + if(desc != null && !desc.isEmpty()) { + updateClause += " description = '" + desc + "',"; + } + if(percentCompletion >0) { + updateClause += " percent_completion = " + percentCompletion + ","; + } + if(hours > 0) { + updateClause += " hours = " + hours + ","; + } + if(amount >0) { + updateClause += " amt = " + amount + ","; + } + + if (!updateClause.equalsIgnoreCase(" SET ")) { + sql = sql + trimLastCharacter(updateClause,",") + whereClause; + + } else { + throw new AstuteException(0, "No values to update."); + } + System.out.println(sql); + Statement stmt = conn.createStatement(); + stmt.executeUpdate(sql); + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + public void createInvoiceMaster(String invoiceNum, Date invoiceDate, String PONum, String changeOrderNum, int pmtStatus, Double billAmt, String specialNotes, String certification)throws AstuteException { + try { + System.out.println("Calling create_invoice Procedure"); + System.out.println("invoiceNum is "+invoiceNum); + CallableStatement stmt = conn.prepareCall("{call create_invoice(?,?,?,?,?,?,?,?,?)}"); + stmt.setString(1, invoiceNum); + stmt.setDate(2, invoiceDate); + stmt.setString(3, PONum); + stmt.setString(4, changeOrderNum); + stmt.setInt(5, pmtStatus); + stmt.setDouble(6, billAmt); + stmt.setString(7, specialNotes); + stmt.setString(8, certification); + stmt.executeUpdate(); + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + + public void createInvoiceDetail(String invoiceNum, int lineItemNum, int POLineItemNum, int serviceTypeId, String desc, double percentCompletion, double hours, double amount)throws AstuteException { + try { + System.out.println("Calling create_invoice_detail Procedure"); + System.out.println("invoiceNum is "+invoiceNum); + CallableStatement stmt = conn.prepareCall("{call create_invoice_detail(?,?,?,?,?,?,?,?)}"); + stmt.setString(1, invoiceNum); + stmt.setInt(2, lineItemNum); + stmt.setInt(3, POLineItemNum); + stmt.setInt(4, serviceTypeId); + stmt.setString(5, desc); + stmt.setDouble(6, percentCompletion); + stmt.setDouble(7, hours); + stmt.setDouble(8, amount); + stmt.executeUpdate(); + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public List getCustomers(int customerId) throws AstuteException { + try { + List customers = new ArrayList<>(); + Statement stmt = conn.createStatement(); + String sql = "SELECT customer_id, customer_name, bill_to_dept, add1, add2, city, state ,zip, zip_last_4, email, phone, fax FROM customer "; + if (customerId > 0) { + sql += " WHERE customer_id = " + customerId; + } + ResultSet rs = stmt.executeQuery(sql); + while (rs.next()) { + int customerID = rs.getInt(1); + String customerName = rs.getString(2); + String billToDept = rs.getString(3); + String add1 = rs.getString(4); + String add2 = rs.getString(5); + String city = rs.getString(6); + String state = rs.getString(7); + int zip = rs.getInt(8); + int ziplast4 = rs.getInt(9); + String email = rs.getString(10); + int phone = rs.getInt(11); + int fax = rs.getInt(12); + Customer customer = new Customer(customerID, customerName,billToDept, add1, add2, city, state, zip, ziplast4, email, phone, fax); + customers.add(customer); + } + return customers; + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } +} + + public int createCustomer(String customerName, String billToDept, String add1, String add2, String city, String state, int zip, int ziplast4, String email, int phone, int fax) throws AstuteException { + try { + CallableStatement stmt = conn.prepareCall("{? = call create_customer_fun(?,?,?,?,?,?,?,?,?,?,?,?)}"); + stmt.registerOutParameter(1, Types.INTEGER); + stmt.setString(2, customerName); + stmt.setString(3, billToDept); + stmt.setString(4, add1); + stmt.setString(5, add2); + stmt.setString(6, city); + stmt.setString(7, state); + stmt.setInt(8, zip); + stmt.setInt(9, ziplast4); + stmt.setString(10, email); + stmt.setInt(11, phone); + stmt.setInt(12, fax); + stmt.executeUpdate(); + int customerId = stmt.getInt(1); + return customerId; + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + public void updateCustomer( int customerId, String customerName, String billToDept, String add1, String + add2, String city, String state, int zip, int ziplast4, String email,int phone, int fax) throws + AstuteException { + try { + String sql = "UPDATE CUSTOMER "; + String updateClause = " SET "; + String whereClause = ""; + if (customerId <= 0) { + throw new AstuteException(0, "CustomerId can't be null."); + } else { + whereClause = " WHERE customer_id =" + customerId; + } + +// if (customerName != null && !customerName.isEmpty()) { + updateClause = updateClause + " customer_name = '" + customerName + "',"; +// } +// if (billToDept != null && !billToDept.isEmpty()) { + updateClause = updateClause + " bill_to_dept = '" + billToDept + "',"; +// } +// if (add1 != null && !add1.isEmpty()) { + updateClause = updateClause + " add1 = '" + add1 + "',"; +// } +// if (add2 != null && !add2.isEmpty()) { + updateClause = updateClause + " add2 = '" + add2 + "',"; +// } +// if (city != null || city.isEmpty()) { + updateClause = updateClause + " city = '" + city + "',"; +// } +// if (state == null || state.isEmpty()) { + updateClause = updateClause + " state = '" + state + "',"; +// } +// if (zip > 0) { + updateClause = updateClause + " zip = " + zip + ","; +// } +// if (ziplast4 > 0) { + updateClause = updateClause + " zip_last_4 = " + ziplast4 + ","; +// } +// if (email == null || email.isEmpty()) { + updateClause = updateClause + " email = '" + email + "',"; +// } +// if (phone > 0) { + updateClause = updateClause + " phone = " + phone + ","; +// } +// if (fax > 0) { + updateClause = updateClause + " fax = " + fax + ","; +// } + if (!updateClause.equalsIgnoreCase(" SET ")) { + sql = sql + trimLastCharacter(updateClause, ",") + whereClause; + + } else { + System.out.println(updateClause); + throw new AstuteException(0, "No values to update."); + } + System.out.println(sql); + Statement stmt = conn.createStatement(); + stmt.executeUpdate(sql); + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + // user and session methods + public ResultSet executeQuery(String sessionId, String sql) throws AstuteException { + String username = getSessionUsername(sessionId); + + Statement stmt = null; + try { + stmt = conn.createStatement(); + return stmt.executeQuery("/*user=" + username + "*/ " + sql); + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public User getUser(String username) throws AstuteException { + String sql = "select user_id, username, password from user where username='" + username + "'"; + + try { + Statement stmt = conn.createStatement(); + ResultSet resultSet = stmt.executeQuery(sql); + + User user = null; + if(resultSet.next()) { + user = new User(resultSet.getInt(1), resultSet.getString(2), resultSet.getString(3)); + } +// conn.close(); + + return user; + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public void createSession(int userId, String sessionId) throws AstuteException { + try { + String sql = "insert into session (user_id, session_id) values (" + userId + ", '" + sessionId + "')"; + + Statement stmt = conn.createStatement(); + stmt.execute(sql); + + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + public void deleteSession(String sessionId) { + } + + public String getSessionUsername(String sessionId) throws AstuteException { + try { + String sql = "select username from users join sessions on users.user_id = sessions.user_id where sessions.session_id = '" + sessionId + "'"; + + Statement stmt = conn.createStatement(); + ResultSet resultSet = stmt.executeQuery(sql); + resultSet.next(); + String sessionUserName = resultSet.getString(1); + + conn.close(); + + return sessionUserName; + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + + public List getChangeOrders(String poNum) throws AstuteException { + try { + List changeOrders = new ArrayList(); + Statement stmt = conn.createStatement(); + String sql = "SELECT PO_num, change_order_num, change_order_date, change_order_amt, description FROM change_order; "; + if (poNum != null) { + sql += " WHERE po_num = '" + poNum + "'"; + } + ResultSet rs = stmt.executeQuery(sql); + while (rs.next()) { + String PONum = rs.getString(1); + int changeOrderNum = rs.getInt(2); + Date changeOrderDate = rs.getDate(3); + Double changeOrderAmt = rs.getDouble(4); + String description = rs.getString(5); + ChangeOrder changeOrder = new ChangeOrder(changeOrderNum, PONum, changeOrderDate, changeOrderAmt, description); + changeOrders.add(changeOrder); + } + return changeOrders; + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + }; + + public void updateChangeOrder(String poNum, int changeOrderNum, double changeOrderAmt, Date changeOrderDate, String description) throws AstuteException { + try { + String sql = "UPDATE CHANGE_ORDER "; + String updateClause = " SET "; + String whereClause = ""; + if (poNum == null || poNum.isEmpty() || changeOrderNum <=0 ) { + throw new AstuteException(DB_ERROR,"PO Number can't be null and Change Order Number should be a positive number! "); + } else { + whereClause = " WHERE UPPER(PO_num) ='" + poNum.toUpperCase() + "' and change_order_num = " + changeOrderNum; + } + + updateClause = updateClause + " changeOrderAmt = " + changeOrderAmt ; + if (changeOrderDate != null) { + updateClause = updateClause + ", changeOrderDate = STR_TO_DATE(" + changeOrderDate + ", '%Y-%m-%d')" + ","; + } + if (description != null) { + updateClause = updateClause + ", description = '" + description + "'"; + } + sql = sql + updateClause + whereClause; + System.out.println(sql); + Statement stmt = conn.createStatement(); + stmt.executeUpdate(sql); + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + + } + + public int createChangeOrder(String poNum, int changeOrderNum, double changeOrderAmt, Date changeOrderDate, String description) throws AstuteException{ + try { + String dateString = "STR_TO_DATE(" + changeOrderDate + ", '%Y-%m-%d')"; + String sql = "insert into change_order (po_num, change_order_num, change_order_amt, change_order_date, description) values ('" + poNum + "', " + changeOrderNum + ", " + changeOrderAmt + ", " + dateString + ", '" + description + "')"; + Statement stmt = conn.createStatement(); + stmt.execute(sql); + return changeOrderNum; + } catch (SQLException e) { + e.printStackTrace(); + throw new AstuteException(DB_ERROR,e.getMessage()); + } + } + + + public String login(String username, String password) throws AstuteException{ + User user = dao.getUser(username); + boolean check = false; + if (password.equals(user.getPassword())) { + check = true; + } +// try { +// check = checkPasswordHash(user.getPassword(), password); +// } catch (NoSuchAlgorithmException e) { +// +// } catch (InvalidKeySpecException e) { +// +// } + if(check) { + //create session + String sessionId = UUID.randomUUID().toString().replaceAll("-", ""); + + dao.createSession(user.getUserId(), sessionId); + + return sessionId; + }else{ + return null; //"Username or password was not correct"; + } + } + + private String generatePasswordHash(String password) throws InvalidKeySpecException, NoSuchAlgorithmException { + int iterations = 100; + char[] chars = password.toCharArray(); + SecureRandom sr = SecureRandom.getInstance("SHA1PRNG"); + byte[] salt = new byte[16]; + sr.nextBytes(salt); + + PBEKeySpec spec = new PBEKeySpec(chars, salt, iterations, 64 * 8); + SecretKeyFactory skf = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1"); + byte[] hash = skf.generateSecret(spec).getEncoded(); + return iterations /*+ PM_FIELD_DELIM*/ + toHex(salt) + /*PM_FIELD_DELIM +*/ toHex(hash); + } + + private boolean checkPasswordHash(String stored, String toCheck) throws NoSuchAlgorithmException, InvalidKeySpecException{ + String part0 = stored.substring(0, 3); + String part1 = stored.substring(3, 35); + String part2 = stored.substring(35); + //String[] parts = stored.split(PM_FIELD_DELIM); + int iterations = Integer.parseInt(part0); + byte[] salt = fromHex(part1); + byte[] hash = fromHex(part2); + + PBEKeySpec spec = new PBEKeySpec(toCheck.toCharArray(), salt, iterations, hash.length * 8); + SecretKeyFactory skf = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1"); + byte[] testHash = skf.generateSecret(spec).getEncoded(); + + String x = toHex(testHash); + + int diff = hash.length ^ testHash.length; + for(int i = 0; i < hash.length && i < testHash.length; i++) + { + diff |= hash[i] ^ testHash[i]; + if(hash[i] != testHash[i]){ + int cx = 0; + } + } + return diff == 0; + } + + private static byte[] fromHex(String hex) throws NoSuchAlgorithmException + { + byte[] bytes = new byte[hex.length() / 2]; + for(int i = 0; i 0) + { + return String.format("%0" +paddingLength + "d", 0) + hex; + }else{ + return hex; + } + } + + } diff --git a/AstuteSystem/src/main/java/com/astute/exceptions/AstuteException.java b/AstuteSystem/src/main/java/com/astute/exceptions/AstuteException.java new file mode 100644 index 0000000..04fe77b --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/exceptions/AstuteException.java @@ -0,0 +1,24 @@ +package com.astute.exceptions; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(value = {"stackTrace", "cause", "localizedMessage", "suppressed"}) +public class AstuteException extends Exception { + private static final long serialVersionUID = 1L; + public static final int SUCCESS = 200; + public static final int CLIENT_ERROR = 400; + public static final int SERVER_ERROR = 500; + public static final int DB_ERROR = 600; + + + private int code; + + public AstuteException(int code, String msg) { + super(msg); + this.code = code; + } + + public int getErrorCode() { + return code; + } +} diff --git a/AstuteSystem/src/main/java/com/astute/exceptions/DatabaseException.java b/AstuteSystem/src/main/java/com/astute/exceptions/DatabaseException.java new file mode 100644 index 0000000..6d8115f --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/exceptions/DatabaseException.java @@ -0,0 +1,7 @@ +package com.astute.exceptions; + +public class DatabaseException extends AstuteException { + public DatabaseException(int code, String msg) { + super(code, msg); + } +} diff --git a/AstuteSystem/src/main/java/com/astute/filter/CORSFilter.java b/AstuteSystem/src/main/java/com/astute/filter/CORSFilter.java new file mode 100644 index 0000000..3fd7596 --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/filter/CORSFilter.java @@ -0,0 +1,22 @@ +package com.astute.filter; + +import javax.ws.rs.container.ContainerRequestContext; +import javax.ws.rs.container.ContainerResponseContext; +import javax.ws.rs.container.ContainerResponseFilter; +import javax.ws.rs.ext.Provider; +import java.io.IOException; + +@Provider +public class CORSFilter implements ContainerResponseFilter { + + @Override + public void filter(ContainerRequestContext request, + ContainerResponseContext response) throws IOException { + response.getHeaders().add("Access-Control-Allow-Origin", "*"); + response.getHeaders().add("Access-Control-Allow-Headers", + "origin, content-type, accept, authorization"); + response.getHeaders().add("Access-Control-Allow-Credentials", "true"); + response.getHeaders().add("Access-Control-Allow-Methods", + "GET, POST, PUT, DELETE, OPTIONS, HEAD"); + } +} \ No newline at end of file diff --git a/AstuteSystem/src/main/java/com/astute/helpers/JsonHelper.java b/AstuteSystem/src/main/java/com/astute/helpers/JsonHelper.java new file mode 100644 index 0000000..572963c --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/helpers/JsonHelper.java @@ -0,0 +1,84 @@ +package com.astute.helpers; + +public class JsonHelper { + +// public static Node getNodeFromJson(String json){ +// return new Gson().fromJson(json, Node.class); +// } +// +// public static HashSet getOpsFromJson(String json) { +// HashSet ops = new HashSet<>(); +// String[] opsArr = json.replaceAll("[\\[\\]\"]", "").split(","); +// if(!opsArr[0].isEmpty()){ +// ops.addAll(Arrays.asList(opsArr)); +// } +// return ops; +// } +// +// public static List toList(String json){ +// List ids = new ArrayList<>(); +// String[] idArr = json.replaceAll("[\\[\\]]", "").split(","); +// if(!idArr[0].isEmpty()){ +// for(String id : idArr) { +// ids.add(Long.valueOf(id)); +// } +// } +// return ids; +// } +// +// public static Association getAssociationFromJson(String json) { +// return new Gson().fromJson(json, Association.class); +// } +// +// public static String toJson(Object o, boolean pretty){ +// String s = new Gson().toJson(o); +// Gson gson; +// if(pretty) { +// gson = new GsonBuilder().setPrettyPrinting().create(); +// }else{ +// gson = new GsonBuilder().create(); +// } +// JsonParser jp = new JsonParser(); +// JsonElement je = jp.parse(s); +// return gson.toJson(je); +// } +// +// public static List getPropertiesFromJson(String json) { +// List props = new ArrayList<>(); +// JsonElement je = new JsonParser().parse(json); +// JsonObject jo = je.getAsJsonObject(); +// Set> entries = jo.entrySet(); +// +// for(Map.Entry prop : entries){ +// if(prop.getKey().equals("name") || prop.getKey().equals("type") || prop.getKey().equals("id")){ +// continue; +// } +// try { +// Property property = new Property(prop.getKey(), StringUtils.strip(prop.getValue().toString(), "\"")); +// props.add(property); +// } +// catch (InvalidPropertyException e) { +// e.printStackTrace(); +// } +// } +// return props; +// } +// +// public static ProhibitionSubject getProhibitionSubject(String json) { +// return new Gson().fromJson(json, ProhibitionSubject.class); +// } +// +// public static Prohibition getProhibition(String json) { +// return new Gson().fromJson(json, Prohibition.class); +// } +// +// public static List getProhibitionResources(String json) { +// json = json.replaceAll("[\\[\\]]", "").replaceAll("\\},\\{", "}|{"); +// String[] jsonArr = json.split("\\|"); +// List drs = new ArrayList<>(); +// for(String j : jsonArr){ +// drs.add(new Gson().fromJson(j, ProhibitionRes.class)); +// } +// return drs; +// } +} diff --git a/AstuteSystem/src/main/java/com/astute/model/ChangeOrder.java b/AstuteSystem/src/main/java/com/astute/model/ChangeOrder.java new file mode 100644 index 0000000..84e3e61 --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/model/ChangeOrder.java @@ -0,0 +1,59 @@ +package com.astute.model; + +import java.sql.Date; + +public class ChangeOrder { + int changeOrderNum; + String poNum; + Date changeOrderDate; + Double changeOrderAmt; + String description; + + public ChangeOrder(int changeOrderNum, String poNum, Date changeOrderDate, Double changeOrderAmt, String description) { + this.changeOrderNum = changeOrderNum; + this.poNum = poNum; + this.changeOrderDate = changeOrderDate; + this.changeOrderAmt = changeOrderAmt; + this.description = description; + } + + public int getChangeOrderNum() { + return changeOrderNum; + } + + public void setChangeOrderNum(int changeOrderNum) { + this.changeOrderNum = changeOrderNum; + } + + public String getPoNum() { + return poNum; + } + + public void setPoNum(String poNum) { + this.poNum = poNum; + } + + public Date getChangeOrderDate() { + return changeOrderDate; + } + + public void setChangeOrderDate(Date changeOrderDate) { + this.changeOrderDate = changeOrderDate; + } + + public Double getChangeOrderAmt() { + return changeOrderAmt; + } + + public void setChangeOrderAmt(Double changeOrderAmt) { + this.changeOrderAmt = changeOrderAmt; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } +} diff --git a/AstuteSystem/src/main/java/com/astute/model/Customer.java b/AstuteSystem/src/main/java/com/astute/model/Customer.java new file mode 100644 index 0000000..d8cb062 --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/model/Customer.java @@ -0,0 +1,129 @@ +package com.astute.model; + +import java.util.Date; + +public class Customer { + int customerId; + String customerName; + String billToDept; + String add1; + String add2; + String city; + String state; + int zip; + int ziplast4; + String email; + int phone; + int fax; + + public Customer(int customerId, String customerName, String billToDept, String add1, String add2, String city, String state, int zip, int ziplast4, String email, int phone, int fax) { + this.customerId = customerId; + this.customerName = customerName; + this.billToDept = billToDept; + this.add1 = add1; + this.add2 = add2; + this.city = city; + this.state = state; + this.zip = zip; + this.ziplast4 = ziplast4; + this.email = email; + this.phone = phone; + this.fax = fax; + } + + public int getCustomerId() { + return customerId; + } + + public void setCustomerId(int customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getBillToDept() { + return billToDept; + } + + public void setBillToDept(String billToDept) { + this.billToDept = billToDept; + } + + public String getAdd1() { + return add1; + } + + public void setAdd1(String add1) { + this.add1 = add1; + } + + public String getAdd2() { + return add2; + } + + public void setAdd2(String add2) { + this.add2 = add2; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public int getZip() { + return zip; + } + + public void setZip(int zip) { + this.zip = zip; + } + + public int getZiplast4() { + return ziplast4; + } + + public void setZiplast4(int ziplast4) { + this.ziplast4 = ziplast4; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public int getPhone() { + return phone; + } + + public void setPhone(int phone) { + this.phone = phone; + } + + public int getFax() { + return fax; + } + + public void setFax(int fax) { + this.fax = fax; + } +} diff --git a/AstuteSystem/src/main/java/com/astute/model/GeneratedInvoice.java b/AstuteSystem/src/main/java/com/astute/model/GeneratedInvoice.java new file mode 100644 index 0000000..e42773d --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/model/GeneratedInvoice.java @@ -0,0 +1,71 @@ +package com.astute.model; + +import java.util.List; + +public class GeneratedInvoice { + + Invoice invoice; + List invoiceDetail; + PO po; + Customer customer; + Double previouslyPaidAmt; + Double balanceToBeBilled; + + + public GeneratedInvoice(Invoice invoice, List invoiceDetail, PO po, Customer customer, Double previouslyPaidAmt, Double balanceToBeBilled) { + this.invoice = invoice; + this.invoiceDetail = invoiceDetail; + this.po = po; + this.customer = customer; + this.previouslyPaidAmt = previouslyPaidAmt; + this.balanceToBeBilled = balanceToBeBilled; + } + + public Invoice getInvoice() { + return invoice; + } + + public void setInvoice(Invoice invoice) { + this.invoice = invoice; + } + + public List getInvoiceDetail() { + return invoiceDetail; + } + + public void setInvoiceDetail(List invoiceDetail) { + this.invoiceDetail = invoiceDetail; + } + + public PO getPo() { + return po; + } + + public void setPo(PO po) { + this.po = po; + } + + public Customer getCustomer() { + return customer; + } + + public void setCustomer(Customer customer) { + this.customer = customer; + } + + public Double getPreviouslyPaidAmt() { + return previouslyPaidAmt; + } + + public void setPreviouslyPaidAmt(Double previouslyPaidAmt) { + this.previouslyPaidAmt = previouslyPaidAmt; + } + + public Double getBalanceToBeBilled() { + return balanceToBeBilled; + } + + public void setBalanceToBeBilled(Double balanceToBeBilled) { + this.balanceToBeBilled = balanceToBeBilled; + } +} diff --git a/AstuteSystem/src/main/java/com/astute/model/Invoice.java b/AstuteSystem/src/main/java/com/astute/model/Invoice.java new file mode 100644 index 0000000..0cc149d --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/model/Invoice.java @@ -0,0 +1,91 @@ +package com.astute.model; + +import java.util.Date; + +public class Invoice { + String invoiceNumber; + Date invoiceDate; + String poNum; + String changeOrderNum; + int pmtStatus; + Double billAmt; + String specialNotes; + String certification; + + public Invoice(String invoiceNumber, Date invoiceDate, String poNum, String changeOrderNum, int pmtStatus, Double billAmt, String specialNotes, String certification) { + this.invoiceNumber = invoiceNumber; + this.invoiceDate = invoiceDate; + this.poNum = poNum; + this.changeOrderNum = changeOrderNum; + this.pmtStatus = pmtStatus; + this.billAmt = billAmt; + this.specialNotes = specialNotes; + this.certification = certification; + } + + public String getInvoiceNumber() { + + return invoiceNumber; + } + + public void setInvoiceNumber(String invoiceNumber) { + this.invoiceNumber = invoiceNumber; + } + + public Date getInvoiceDate() { + return invoiceDate; + } + + public void setInvoiceDate(Date invoiceDate) { + this.invoiceDate = invoiceDate; + } + + public String getPoNum() { + return poNum; + } + + public void setPoNum(String poNum) { + this.poNum = poNum; + } + + public String getChangeOrderNum() { + return changeOrderNum; + } + + public void setChangeOrderNum(String changeOrderNum) { + this.changeOrderNum = changeOrderNum; + } + + public int getPmtStatus() { + return pmtStatus; + } + + public void setPmtStatus(int pmtStatus) { + this.pmtStatus = pmtStatus; + } + + public Double getBillAmt() { + return billAmt; + } + + public void setBillAmt(Double billAmt) { + this.billAmt = billAmt; + } + + public String getSpecialNotes() { + return specialNotes; + } + + public void setSpecialNotes(String specialNotes) { + this.specialNotes = specialNotes; + } + + public String getCertification() { + return certification; + } + + public void setCertification(String certification) { + this.certification = certification; + } + +} diff --git a/AstuteSystem/src/main/java/com/astute/model/InvoiceDetail.java b/AstuteSystem/src/main/java/com/astute/model/InvoiceDetail.java new file mode 100644 index 0000000..4de9092 --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/model/InvoiceDetail.java @@ -0,0 +1,88 @@ +package com.astute.model; + +public class InvoiceDetail { + String invoiceNum; + int lineItemNum; + int poLineItemNum; + int serviceTypeId; + String desc; + double percentCompletion; + double hours; + double anount; + public InvoiceDetail(String invoiceNum, int lineItemNum, int poLineItemNum, int serviceTypeId, String desc, double percentCompletion, double hours, double anount) { + this.invoiceNum = invoiceNum; + this.lineItemNum = lineItemNum; + this.poLineItemNum = poLineItemNum; + this.serviceTypeId = serviceTypeId; + this.desc = desc; + this.percentCompletion = percentCompletion; + this.hours = hours; + this.anount = anount; + } + + public String getInvoiceNum() { + return invoiceNum; + } + + public void setInvoiceNum(String invoiceNum) { + this.invoiceNum = invoiceNum; + } + + public int getLineItemNum() { + return lineItemNum; + } + + public void setLineItemNum(int lineItemNum) { + this.lineItemNum = lineItemNum; + } + + public int getPoLineItemNum() { + return poLineItemNum; + } + + public void setPoLineItemNum(int poLineItemNum) { + this.poLineItemNum = poLineItemNum; + } + + public int getServiceTypeId() { + return serviceTypeId; + } + + public void setServiceTypeId(int serviceTypeId) { + this.serviceTypeId = serviceTypeId; + } + + public String getDesc() { + return desc; + } + + public void setDesc(String desc) { + this.desc = desc; + } + + public double getPercentCompletion() { + return percentCompletion; + } + + public void setPercentCompletion(double percentCompletion) { + this.percentCompletion = percentCompletion; + } + + public double getHours() { + return hours; + } + + public void setHours(double hours) { + this.hours = hours; + } + + public double getAnount() { + return anount; + } + + public void setAnount(double anount) { + this.anount = anount; + } + + +} \ No newline at end of file diff --git a/AstuteSystem/src/main/java/com/astute/model/PO.java b/AstuteSystem/src/main/java/com/astute/model/PO.java new file mode 100644 index 0000000..652d66d --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/model/PO.java @@ -0,0 +1,67 @@ +package com.astute.model; + +import java.io.Serializable; +import java.util.Date; + + +public class PO implements Serializable{ + + private String contractNum; + private Date PODate; + private Double contractAmt; + private Integer customerId; + + public PO(String PONum, String contractNum, Date PODate, Integer customerId, Double contractAmt) { + this.PONum = PONum; + this.contractNum = contractNum; + this.PODate = PODate; + this.customerId = customerId; + this.contractAmt = contractAmt; + + } + + private String PONum; + + public String getPONum() { + return PONum; + } + + public void setPONum(String PONum) { + this.PONum = PONum; + } + + public String getContractNum() { + return contractNum; + } + + public void setContractNum(String contractNum) { + this.contractNum = contractNum; + } + + public Date getPODate() { + return PODate; + } + + public void setPODate(Date PODate) { + this.PODate = PODate; + } + + public Double getContractAmt() { + return contractAmt; + } + + public void setContractAmt(Double contractAmt) { + this.contractAmt = contractAmt; + } + + public Integer getCustomerId() { + return customerId; + } + + public void setCustomerId(Integer customerId) { + this.customerId = customerId; + } + + + +} \ No newline at end of file diff --git a/AstuteSystem/src/main/java/com/astute/model/PODetail.java b/AstuteSystem/src/main/java/com/astute/model/PODetail.java new file mode 100644 index 0000000..48985be --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/model/PODetail.java @@ -0,0 +1,78 @@ +package com.astute.model; + +import java.io.Serializable; +import java.util.Date; + +public class PODetail implements Serializable{ + String POnum; + int lineItemNo; + String serviceDesc; + int feeTypeId; + Double qty; + int serviceTypeId; + Double remainingQty; + + public PODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, int serviceTypeId, Double remainingQty) { + this.POnum = POnum; + this.lineItemNo = lineItemNo; + this.serviceDesc = serviceDesc; + this.feeTypeId = feeTypeId; + this.qty = qty; + this.serviceTypeId = serviceTypeId; + this.remainingQty = remainingQty; + } + + public String getPOnum() { + return POnum; + } + + public void setPOnum(String POnum) { + this.POnum = POnum; + } + + public int getLineItemNo() { + return lineItemNo; + } + + public void setLineItemNo(int lineItemNo) { + this.lineItemNo = lineItemNo; + } + + public String getServiceDesc() { + return serviceDesc; + } + + public void setServiceDesc(String serviceDesc) { + this.serviceDesc = serviceDesc; + } + + public int getFeeTypeId() { + return feeTypeId; + } + + public void setFeeTypeId(int feeTypeId) { + this.feeTypeId = feeTypeId; + } + + public Double getQty() { + return qty; + } + + public void setQty(Double qty) { + this.qty = qty; + } + + public int getServiceTypeId() { + return serviceTypeId; + } + + public void setServiceTypeId(int serviceTypeId) { + this.serviceTypeId = serviceTypeId; + } + + public Double getRemainingQty() {return remainingQty; } + + public void setRemainingQty(Double remainingQty) { this.remainingQty = remainingQty;} + +} + diff --git a/AstuteSystem/src/main/java/com/astute/model/User.java b/AstuteSystem/src/main/java/com/astute/model/User.java new file mode 100644 index 0000000..b9ceb75 --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/model/User.java @@ -0,0 +1,37 @@ +package com.astute.model; + +public class User { + int userId; + String username; + String password; + + public User(int userId, String username, String password) { + this.userId = userId; + this.username = username; + this.password = password; + } + + public int getUserId() { + return userId; + } + + public void setUserId(int userId) { + this.userId = userId; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } +} diff --git a/AstuteSystem/src/main/java/com/astute/provider/GeneralExceptionMapper.java b/AstuteSystem/src/main/java/com/astute/provider/GeneralExceptionMapper.java new file mode 100644 index 0000000..d51f259 --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/provider/GeneralExceptionMapper.java @@ -0,0 +1,18 @@ +package com.astute.provider; + +import com.astute.response.ApiResponse; +import com.astute.response.ApiResponse; + +import javax.ws.rs.NotFoundException; +import javax.ws.rs.core.Response; +import javax.ws.rs.ext.ExceptionMapper; +import javax.ws.rs.ext.Provider; + +@Provider +public class GeneralExceptionMapper implements ExceptionMapper { + @Override + public Response toResponse(Exception e) { + e.printStackTrace(); + return new ApiResponse(e).toResponse(); + } +} diff --git a/AstuteSystem/src/main/java/com/astute/provider/JacksonJsonProvider.java b/AstuteSystem/src/main/java/com/astute/provider/JacksonJsonProvider.java new file mode 100644 index 0000000..510f512 --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/provider/JacksonJsonProvider.java @@ -0,0 +1,26 @@ +package com.astute.provider; + +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.datatype.joda.JodaModule; +import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; + +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.ext.Provider; + +@Provider +@Produces({MediaType.APPLICATION_JSON}) +public class JacksonJsonProvider extends JacksonJaxbJsonProvider { + + public JacksonJsonProvider() { + ObjectMapper objectMapper = new ObjectMapper() + .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) + .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) + .registerModule(new JodaModule()) + .setDateFormat(new RFC3339DateFormat()); + + setMapper(objectMapper); + } +} diff --git a/AstuteSystem/src/main/java/com/astute/provider/RFC3339DateFormat.java b/AstuteSystem/src/main/java/com/astute/provider/RFC3339DateFormat.java new file mode 100644 index 0000000..6c4915d --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/provider/RFC3339DateFormat.java @@ -0,0 +1,20 @@ +package com.astute.provider; + +import com.fasterxml.jackson.databind.util.ISO8601DateFormat; +import com.fasterxml.jackson.databind.util.ISO8601Utils; + +import java.text.FieldPosition; +import java.util.Date; + +public class RFC3339DateFormat extends ISO8601DateFormat { + + // Same as ISO8601DateFormat but serializing milliseconds. + @Override + public StringBuffer format(Date date, StringBuffer toAppendTo, + FieldPosition fieldPosition) { + String value = ISO8601Utils.format(date, true); + toAppendTo.append(value); + return toAppendTo; + } + +} \ No newline at end of file diff --git a/AstuteSystem/src/main/java/com/astute/provider/RuntimeExceptionMapper.java b/AstuteSystem/src/main/java/com/astute/provider/RuntimeExceptionMapper.java new file mode 100644 index 0000000..067fdf7 --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/provider/RuntimeExceptionMapper.java @@ -0,0 +1,16 @@ +package com.astute.provider; + +import com.astute.response.ApiResponse; +import com.astute.response.ApiResponse; + +import javax.ws.rs.core.Response; +import javax.ws.rs.ext.ExceptionMapper; + +public class RuntimeExceptionMapper implements ExceptionMapper { + @Override + public Response toResponse(RuntimeException e) { + e.printStackTrace(); + return new ApiResponse(e.hashCode(), e.getMessage()).toResponse(); + } +} + diff --git a/AstuteSystem/src/main/java/com/astute/provider/WebApplicationExceptionMapper.java b/AstuteSystem/src/main/java/com/astute/provider/WebApplicationExceptionMapper.java new file mode 100644 index 0000000..07121dc --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/provider/WebApplicationExceptionMapper.java @@ -0,0 +1,16 @@ +package com.astute.provider; + +import com.astute.response.ApiResponse; +import com.astute.response.ApiResponse; + +import javax.ws.rs.WebApplicationException; +import javax.ws.rs.core.Response; +import javax.ws.rs.ext.ExceptionMapper; + +public class WebApplicationExceptionMapper implements ExceptionMapper { + @Override + public Response toResponse(WebApplicationException e) { + e.printStackTrace(); + return new ApiResponse(e.getResponse().getStatus(), e.getMessage()).toResponse(); + } +} diff --git a/AstuteSystem/src/main/java/com/astute/requests/ChangeOrderRequest.java b/AstuteSystem/src/main/java/com/astute/requests/ChangeOrderRequest.java new file mode 100644 index 0000000..00cd432 --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/requests/ChangeOrderRequest.java @@ -0,0 +1,51 @@ +package com.astute.requests; + +import java.sql.Date; + +public class ChangeOrderRequest { + int changeOrderNum; + String poNum; + Date changeOrderDate; + Double changeOrderAmt; + String description; + + public int getChangeOrderNum() { + return changeOrderNum; + } + + public void setChangeOrderNum(int changeOrderNum) { + this.changeOrderNum = changeOrderNum; + } + + public String getPoNum() { + return poNum; + } + + public void setPoNum(String poNum) { + this.poNum = poNum; + } + + public Date getChangeOrderDate() { + return changeOrderDate; + } + + public void setChangeOrderDate(Date changeOrderDate) { + this.changeOrderDate = changeOrderDate; + } + + public Double getChangeOrderAmt() { + return changeOrderAmt; + } + + public void setChangeOrderAmt(Double changeOrderAmt) { + this.changeOrderAmt = changeOrderAmt; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } +} diff --git a/AstuteSystem/src/main/java/com/astute/requests/CustomerRequest.java b/AstuteSystem/src/main/java/com/astute/requests/CustomerRequest.java new file mode 100644 index 0000000..211541f --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/requests/CustomerRequest.java @@ -0,0 +1,114 @@ +package com.astute.requests; + +import java.sql.Date; + +public class CustomerRequest { + int customerId; + String customerName; + String billToDept; + String add1; + String add2; + String city; + String state; + int zip; + int ziplast4; + String email; + int phone; + int fax; + + public int getCustomerId() { + return customerId; + } + + public void setCustomerId(int customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getBillToDept() { + return billToDept; + } + + public void setBillToDept(String billToDept) { + this.billToDept = billToDept; + } + + public String getAdd1() { + return add1; + } + + public void setAdd1(String add1) { + this.add1 = add1; + } + + public String getAdd2() { + return add2; + } + + public void setAdd2(String add2) { + this.add2 = add2; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public int getZip() { + return zip; + } + + public void setZip(int zip) { + this.zip = zip; + } + + public int getZiplast4() { + return ziplast4; + } + + public void setZiplast4(int ziplast4) { + this.ziplast4 = ziplast4; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public int getPhone() { + return phone; + } + + public void setPhone(int phone) { + this.phone = phone; + } + + public int getFax() { + return fax; + } + + public void setFax(int fax) { + this.fax = fax; + } +} diff --git a/AstuteSystem/src/main/java/com/astute/requests/InvoiceDetailRequest.java b/AstuteSystem/src/main/java/com/astute/requests/InvoiceDetailRequest.java new file mode 100644 index 0000000..8ab670a --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/requests/InvoiceDetailRequest.java @@ -0,0 +1,77 @@ +package com.astute.requests; + +public class InvoiceDetailRequest { + String invoiceNum; + int lineItemNum; + int poLineItemNum; + int serviceTypeId; + String desc; + double percentCompletion; + double hours; + + public String getInvoiceNum() { + return invoiceNum; + } + + public void setInvoiceNum(String invoiceNum) { + this.invoiceNum = invoiceNum; + } + + public int getLineItemNum() { + return lineItemNum; + } + + public void setLineItemNum(int lineItemNum) { + this.lineItemNum = lineItemNum; + } + + public int getPoLineItemNum() { + return poLineItemNum; + } + + public void setPoLineItemNum(int poLineItemNum) { + this.poLineItemNum = poLineItemNum; + } + + public int getServiceTypeId() { + return serviceTypeId; + } + + public void setServiceTypeId(int serviceTypeId) { + this.serviceTypeId = serviceTypeId; + } + + public String getDesc() { + return desc; + } + + public void setDesc(String desc) { + this.desc = desc; + } + + public double getPercentCompletion() { + return percentCompletion; + } + + public void setPercentCompletion(double percentCompletion) { + this.percentCompletion = percentCompletion; + } + + public double getHours() { + return hours; + } + + public void setHours(double hours) { + this.hours = hours; + } + + public double getAnount() { + return anount; + } + + public void setAnount(double anount) { + this.anount = anount; + } + + double anount; +} \ No newline at end of file diff --git a/AstuteSystem/src/main/java/com/astute/requests/InvoiceMasterRequest.java b/AstuteSystem/src/main/java/com/astute/requests/InvoiceMasterRequest.java new file mode 100644 index 0000000..9360669 --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/requests/InvoiceMasterRequest.java @@ -0,0 +1,90 @@ +package com.astute.requests; + +import java.sql.Date; + +public class InvoiceMasterRequest { + String invoiceNumber; + Date invoiceDate; + String poNum; + String changeOrderNum; + + public String getInvoiceNumber() { + + return invoiceNumber; + } + + public void setInvoiceNumber(String invoiceNumber) { + this.invoiceNumber = invoiceNumber; + } + + public Date getInvoiceDate() { + return invoiceDate; + } + + public void setInvoiceDate(Date invoiceDate) { + this.invoiceDate = invoiceDate; + } + + public String getPoNum() { + return poNum; + } + + public void setPoNum(String poNum) { + this.poNum = poNum; + } + + public String getChangeOrderNum() { + return changeOrderNum; + } + + public void setChangeOrderNum(String changeOrderNum) { + this.changeOrderNum = changeOrderNum; + } + + public int getPmtStatus() { + return pmtStatus; + } + + public void setPmtStatus(int pmtStatus) { + this.pmtStatus = pmtStatus; + } + + public Double getBillAmt() { + return billAmt; + } + + public void setBillAmt(Double billAmt) { + this.billAmt = billAmt; + } + + public String getSpecialNotes() { + return specialNotes; + } + + public void setSpecialNotes(String specialNotes) { + this.specialNotes = specialNotes; + } + + public String getCertification() { + return certification; + } + + public void setCertification(String certification) { + this.certification = certification; + } + + int pmtStatus; + Double billAmt; + String specialNotes; + String certification; + + public Date getPmtReceivedDate() { + return pmtReceivedDate; + } + + public void setPmtReceivedDate(Date pmtReceivedDate) { + this.pmtReceivedDate = pmtReceivedDate; + } + + Date pmtReceivedDate; +} diff --git a/AstuteSystem/src/main/java/com/astute/requests/LoginRequest.java b/AstuteSystem/src/main/java/com/astute/requests/LoginRequest.java new file mode 100644 index 0000000..153fb9d --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/requests/LoginRequest.java @@ -0,0 +1,22 @@ +package com.astute.requests; + +public class LoginRequest { + private String username; + private String password; + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } +} diff --git a/AstuteSystem/src/main/java/com/astute/requests/PODetailRequest.java b/AstuteSystem/src/main/java/com/astute/requests/PODetailRequest.java new file mode 100644 index 0000000..06bfc67 --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/requests/PODetailRequest.java @@ -0,0 +1,80 @@ +package com.astute.requests; + +import java.sql.Date; + +public class PODetailRequest { + String PONum; + int lineItemNo; + + public String getPONum() { + + return PONum; + } + + public void setPONum(String PONum) { + this.PONum = PONum; + } + + public int getLineItemNo() { + return lineItemNo; + } + + public void setLineItemNo(int lineItemNo) { + this.lineItemNo = lineItemNo; + } + + public String getServiceDesc() { + return serviceDesc; + } + + public void setServiceDesc(String serviceDesc) { + this.serviceDesc = serviceDesc; + } + + public int getFeeTypeId() { + return feeTypeId; + } + + public void setFeeTypeId(int feeTypeId) { + this.feeTypeId = feeTypeId; + } + + public Double getQty() { + return qty; + } + + public void setQty(Double qty) { + this.qty = qty; + } + + public int getServiceTypeId() { + return serviceTypeId; + } + + public void setServiceTypeId(int serviceTypeId) { + this.serviceTypeId = serviceTypeId; + } + + public String getSchedule() { + return schedule; + } + + public void setSchedule(String schedule) { + this.schedule = schedule; + } + + public Date getDeliverBy() { + return deliverBy; + } + + public void setDeliverBy(Date deliverBy) { + this.deliverBy = deliverBy; + } + + String serviceDesc; + int feeTypeId; + Double qty; + int serviceTypeId; + String schedule; + Date deliverBy; +} diff --git a/AstuteSystem/src/main/java/com/astute/requests/POMasterRequest.java b/AstuteSystem/src/main/java/com/astute/requests/POMasterRequest.java new file mode 100644 index 0000000..a688d25 --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/requests/POMasterRequest.java @@ -0,0 +1,55 @@ +package com.astute.requests; + +import java.sql.Date; + +public class POMasterRequest { + + private String PONum; + private String contractNum; + + public Integer getCustomerId() { + return customerId; + } + + public void setCustomerId(Integer customerId) { + this.customerId = customerId; + } + + private Date PODate; + private Double contractAmt; + private Integer customerId; + + public String getPONum() { + return PONum; + } + + public void setPONum(String PONum) { + this.PONum = PONum; + } + + public String getContractNum() { + return contractNum; + } + + public void setContractNum(String contractNum) { + this.contractNum = contractNum; + } + + public Date getPODate() { + return PODate; + } + + public void setPODate(Date PODate) { + this.PODate = PODate; + } + + public Double getContractAmt() { + return contractAmt; + } + + public void setContractAmt(Double contractAmt) { + this.contractAmt = contractAmt; + } + + +} diff --git a/AstuteSystem/src/main/java/com/astute/resources/AuthResource.java b/AstuteSystem/src/main/java/com/astute/resources/AuthResource.java new file mode 100644 index 0000000..8b4b39d --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/resources/AuthResource.java @@ -0,0 +1,32 @@ +package com.astute.resources; + +import com.astute.requests.LoginRequest; +import com.astute.response.ApiResponse; +import com.astute.service.AuthService; + +import javax.ws.rs.*; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; +import java.sql.SQLException; + +@Path("auth") +@Produces(MediaType.APPLICATION_JSON) +@Consumes(MediaType.APPLICATION_JSON) +public class AuthResource { + + private com.astute.service.AuthService service = new AuthService(); + + public AuthResource() { + + } + + @POST + public Response login(LoginRequest request) throws SQLException, Exception { + String sessionId = service.login(request.getUsername(), request.getPassword()); + if (sessionId != null) { + return new ApiResponse(sessionId).toResponse(); + } else { + return new ApiResponse(ApiResponse.ACCESS_DENIED).toResponse(); + } + } +} \ No newline at end of file diff --git a/AstuteSystem/src/main/java/com/astute/resources/ChangeOrderResource.java b/AstuteSystem/src/main/java/com/astute/resources/ChangeOrderResource.java new file mode 100644 index 0000000..cb68b66 --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/resources/ChangeOrderResource.java @@ -0,0 +1,42 @@ +package com.astute.resources; + +import com.astute.requests.ChangeOrderRequest; +import com.astute.response.ApiResponse; +import com.astute.service.ChangeOrderService; + +import javax.ws.rs.*; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; +import java.sql.SQLException; + +@Path("/changeOrder") +@Consumes(MediaType.APPLICATION_JSON) +@Produces(MediaType.APPLICATION_JSON) +public class ChangeOrderResource { + + private com.astute.service.ChangeOrderService service = new ChangeOrderService(); + + public ChangeOrderResource() { + } + + @GET + public Response getChangeOrders(@QueryParam("poNum") String poNum) + throws SQLException, Exception { + return new ApiResponse(service.getChangeOrders(poNum)).toResponse(); + } + + @Path("/{PONum}/{changeOrderNum}") + @PUT + public Response updateChangeOrder(ChangeOrderRequest request, @PathParam("PONum") String PONum, @PathParam("changeOrderNum") int changeOrderNum) + throws SQLException, Exception { + service.updateChangeOrder(PONum,changeOrderNum, request.getChangeOrderAmt(), request.getChangeOrderDate(), request.getDescription()); + return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse(); + } + + @POST + public Response createChangeOrder(ChangeOrderRequest request) + throws SQLException, Exception { + return new ApiResponse(service.createChangeOrder(request.getPoNum(), request.getChangeOrderNum(), request.getChangeOrderAmt(), + request.getChangeOrderDate(), request.getDescription())).toResponse(); + } +} diff --git a/AstuteSystem/src/main/java/com/astute/resources/CustomerResource.java b/AstuteSystem/src/main/java/com/astute/resources/CustomerResource.java new file mode 100644 index 0000000..17bf839 --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/resources/CustomerResource.java @@ -0,0 +1,45 @@ +package com.astute.resources; + +import com.astute.requests.CustomerRequest; +import com.astute.response.ApiResponse; +import com.astute.service.CustomerService; + +import javax.ws.rs.*; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; +import java.sql.SQLException; + +@Path("/customer") +@Consumes(MediaType.APPLICATION_JSON) +@Produces(MediaType.APPLICATION_JSON) +public class CustomerResource { + + private com.astute.service.CustomerService service = new CustomerService(); + + public CustomerResource() { + } + + @GET + public Response getCustomers(@QueryParam("customerId") int customerId) + throws SQLException, Exception { + return new ApiResponse(service.getCustomers(customerId)).toResponse(); + } + + @Path("/{customerId}") + @PUT + public Response updateCustomer(@PathParam("customerId") int customerId, CustomerRequest request) + throws SQLException, Exception { + System.out.println("in updateCustomer()"); + service.updateCustomer(customerId, request.getCustomerName(), request.getBillToDept(), request.getAdd1(), + request.getAdd2(), request.getCity(), request.getState(), request.getZip(), request.getZiplast4(), request.getEmail(), request.getPhone(), request.getFax()); + return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse(); + } + + @POST + public Response createCustomer(CustomerRequest request) + throws SQLException, Exception { + System.out.println("in AstuteSyste createCustomer()"); + return new ApiResponse(service.createCustomer(request.getCustomerName(), request.getBillToDept(), request.getAdd1(), + request.getAdd2(), request.getCity(), request.getState(), request.getZip(), request.getZiplast4(), request.getEmail(), request.getPhone(), request.getFax())).toResponse(); + } +} diff --git a/AstuteSystem/src/main/java/com/astute/resources/InvoiceResource.java b/AstuteSystem/src/main/java/com/astute/resources/InvoiceResource.java new file mode 100644 index 0000000..be5acc0 --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/resources/InvoiceResource.java @@ -0,0 +1,84 @@ +package com.astute.resources; + +import com.astute.exceptions.*; +import com.astute.requests.*; +import com.astute.response.ApiResponse; +import com.astute.service.InvoiceService; + +import javax.ws.rs.*; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; +import java.sql.Date; +import java.sql.SQLException; + +@Path("/invoice") +@Consumes(MediaType.APPLICATION_JSON) +@Produces(MediaType.APPLICATION_JSON) +public class InvoiceResource { + + private com.astute.service.InvoiceService service = new InvoiceService(); + + public InvoiceResource() { + } + + @GET + public Response getInvoiceMaster(@QueryParam("invoiceNumber") String invoiceNumber, @QueryParam("pmtStatus") int pmtStatus) + throws SQLException, Exception { + return new ApiResponse(service.getInvoiceMaster(invoiceNumber, pmtStatus)).toResponse(); + } + + @Path("/detail") + @GET + public Response getInvoiceDetail(@QueryParam("invoiceNumber") String invoiceNumber, @QueryParam("lineItemNo") int lineItemNo) + throws SQLException, Exception { + + return new ApiResponse(service.getInvoiceDetail(invoiceNumber,lineItemNo)).toResponse(); + } + + @Path("/{InvoiceNum}") + @PUT + public Response updateInvoiceMaster(@PathParam("InvoiceNum") String InvoiceNum, InvoiceMasterRequest request) + throws SQLException, Exception { + service.updateInvoiceMaster(InvoiceNum, request.getInvoiceDate(), request.getPoNum(), request.getChangeOrderNum(), + request.getPmtStatus(), request.getBillAmt(), request.getSpecialNotes(), request.getCertification()); + return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse(); + } + + @Path("/detail/{InvoiceNum}/{lineItemNum}") + @PUT + public Response updateInvoiceDetail(@PathParam("InvoiceNum") String InvoiceNum, @PathParam("lineItemNum") int lineItemNum, InvoiceDetailRequest request) + throws DatabaseException, Exception { + service.updateInvoiceDetail(InvoiceNum, lineItemNum, request.getPoLineItemNum(), request.getServiceTypeId(), + request.getDesc(), request.getPercentCompletion(), request.getHours(), request.getAnount()); + return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse(); + } + @POST + public Response createInvoiceMaster(InvoiceMasterRequest request) + throws DatabaseException, Exception { + service.createInvoiceMaster(request.getInvoiceNumber(), request.getInvoiceDate(), request.getPoNum(), request.getChangeOrderNum(), + request.getPmtStatus(), request.getBillAmt(), request.getSpecialNotes(), request.getCertification()); + return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse(); + } + @Path("/detail") + @POST + public Response createInvoiceDetail(InvoiceDetailRequest request) + throws SQLException, Exception { + service.createInvoiceDetail(request.getInvoiceNum(), request.getLineItemNum(), request.getPoLineItemNum(), request.getServiceTypeId(), + request.getDesc(), request.getPercentCompletion(), request.getHours(), request.getAnount()); + return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse(); + } + + @Path("/generatedInvoice/{InvoiceNum}") + @GET + public Response getGeneratedInvoice(@PathParam("InvoiceNum") String InvoiceNum) throws SQLException, Exception { + + return new ApiResponse(service.getGeneratedInvoice(InvoiceNum)).toResponse(); + } + + @Path("/generateInvoiceNumber/{PONum}") + @GET + public Response generateInvoiceNumber(@PathParam("PONum") String PONum) throws SQLException, Exception { + + return new ApiResponse(service.generateInvoiceNumber(PONum)).toResponse(); + } +} diff --git a/AstuteSystem/src/main/java/com/astute/resources/POResource.java b/AstuteSystem/src/main/java/com/astute/resources/POResource.java new file mode 100644 index 0000000..ac831e0 --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/resources/POResource.java @@ -0,0 +1,75 @@ +package com.astute.resources; + +import javax.ws.rs.*; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; + +import com.astute.exceptions.*; +import com.astute.requests.*; +import com.astute.response.*; +import com.astute.service.*; + +import java.sql.Date; +import java.sql.SQLException; + +@Path("/po") +@Consumes(MediaType.APPLICATION_JSON) +@Produces(MediaType.APPLICATION_JSON) +public class POResource { + + private POService POService = new POService(); + + public POResource() { + } + + @GET + public Response getPOMaster( + @QueryParam("PONum") String PONum, + @QueryParam("ContractNum") String contractNum, + @QueryParam("PODate") Date PODate) + throws SQLException, Exception { + return new ApiResponse(POService.getPOMaster(PONum, contractNum, PODate)).toResponse(); + } + + @Path("/detail") + @GET + public Response getPODetail(@QueryParam("PONum") String PONum, @QueryParam("lineItemNo") int lineItemNo) + throws SQLException, Exception { + return new ApiResponse(POService.getPODetail(PONum, lineItemNo)).toResponse(); + } + + @Path("/{PONum}") + @PUT + public Response updatePOMaster(@PathParam("PONum") String PONum, POMasterRequest request) + throws SQLException, Exception { + POService.updatePOMaster(PONum, request.getContractNum(), request.getPODate(), request.getContractAmt()); + return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse(); + } + + @Path("/detail/{PONum}/{lineItemNo}") + @PUT + public Response updatePODetail(@PathParam("PONum") String PONum, @PathParam("lineItemNo") int lineItemNo, PODetailRequest request) + throws SQLException, Exception { + POService.updatePODetail(PONum, lineItemNo, request.getServiceDesc(), request.getFeeTypeId(), + request.getQty(), request.getServiceTypeId(), request.getSchedule(), request.getDeliverBy()); + return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse(); + } + + @POST + public Response createPOMaster(POMasterRequest request) + throws SQLException, Exception { + System.out.println(request.getPONum()); + POService.createPOMaster(request.getPONum(), request.getContractNum(), request.getPODate(), request.getContractAmt(), request.getCustomerId()); + return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse(); + } + @Path("/detail") + @POST + public Response createPODetail(PODetailRequest request) + throws SQLException, Exception { + POService.createPODetail(request.getPONum(), request.getLineItemNo(), request.getServiceDesc(), request.getFeeTypeId(), + request.getQty(), request.getServiceTypeId(), request.getSchedule(), request.getDeliverBy()); + return new ApiResponse(ApiResponse.UPDATE_ACCESS_SUCESS).toResponse(); + } +} + + diff --git a/AstuteSystem/src/main/java/com/astute/response/ApiResponse.java b/AstuteSystem/src/main/java/com/astute/response/ApiResponse.java new file mode 100644 index 0000000..dbe47f1 --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/response/ApiResponse.java @@ -0,0 +1,67 @@ +package com.astute.response; + +import javax.ws.rs.core.Response; + +import static com.astute.common.Constants.SUCCESS; + +public class ApiResponse { + private Integer code = null; + private String message = null; + private Object entity = null; + + public static final String GRANT_ACCESS_SUCCESS = "Access successfully granted"; + public static final String UPDATE_ACCESS_SUCESS = "Successfully updated access"; + public static final String ACCESS_DENIED = "Logon failed"; + + + private static final String SUCCESS_MSG = "Success"; + + public ApiResponse() { + } + + public ApiResponse(Object entity) { + this.code = SUCCESS; + this.message = SUCCESS_MSG; + this.entity = entity; + } + + public ApiResponse(int code, String message) { + this.code = code; + this.message = message; + } + + public ApiResponse(Exception exception) { + this.code = exception.hashCode(); + this.message = exception.toString(); + } + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public Object getEntity() { + return entity; + } + + public void setEntity(Object entity) { + this.entity = entity; + } + + public Response toResponse() { + return Response.ok() + .entity(this) + .build(); + } +} diff --git a/AstuteSystem/src/main/java/com/astute/service/AuthService.java b/AstuteSystem/src/main/java/com/astute/service/AuthService.java new file mode 100644 index 0000000..d194bc1 --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/service/AuthService.java @@ -0,0 +1,31 @@ +package com.astute.service; + + +import com.astute.exceptions.AstuteException; + +import java.sql.SQLException; + +import static com.astute.dao.DAO.getDao; + +public class AuthService extends Service{ + public AuthService(){ + super(); + } + + public String login(String username, String password) + throws AstuteException { + return getDao().login(username,password); + } + + public void updateCustomer( int customerId, String customerName, String billToDept, String add1, String add2, String city, String state, int zip, int ziplast4, String email, int phone, int fax) + throws AstuteException { + getDao().updateCustomer(customerId, customerName,billToDept, add1, add2, city, state, zip, ziplast4, email, phone, fax); + } + + + public void createCustomer(String customerName, String billToDept, String add1, String add2, String city, String state, int zip, int ziplast4, String email, int phone, int fax) + throws AstuteException { + getDao().createCustomer(customerName,billToDept, add1, add2, city, state, zip, ziplast4, email, phone, fax); + } + +} diff --git a/AstuteSystem/src/main/java/com/astute/service/ChangeOrderService.java b/AstuteSystem/src/main/java/com/astute/service/ChangeOrderService.java new file mode 100644 index 0000000..b021995 --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/service/ChangeOrderService.java @@ -0,0 +1,33 @@ +package com.astute.service; + +import com.astute.exceptions.AstuteException; +import com.astute.model.*; + +import java.sql.Date; +import java.sql.SQLException; +import java.util.List; + +import static com.astute.dao.DAO.getDao; + +public class ChangeOrderService extends Service{ + public ChangeOrderService(){ + super(); + } + + public List getChangeOrders(String poNum) + throws AstuteException { + return getDao().getChangeOrders(poNum); + } + + public void updateChangeOrder(String poNum, int changeOrderNum, double changeOrderAmt, Date changeOrderDate, String description) + throws AstuteException { + getDao().updateChangeOrder(poNum, changeOrderNum, changeOrderAmt, changeOrderDate, description); + } + + + public int createChangeOrder(String poNum, int changeOrderNum, double changeOrderAmt, Date changeOrderDate, String description) + throws AstuteException { + return getDao().createChangeOrder(poNum, changeOrderNum, changeOrderAmt, changeOrderDate, description); + } + +} diff --git a/AstuteSystem/src/main/java/com/astute/service/CustomerService.java b/AstuteSystem/src/main/java/com/astute/service/CustomerService.java new file mode 100644 index 0000000..a4a356b --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/service/CustomerService.java @@ -0,0 +1,32 @@ +package com.astute.service; + +import com.astute.exceptions.AstuteException; +import com.astute.model.Customer; + +import java.sql.SQLException; +import java.util.List; + +import static com.astute.dao.DAO.getDao; + +public class CustomerService extends Service{ + public CustomerService(){ + super(); + } + + public List getCustomers(int customerId) + throws AstuteException { + return getDao().getCustomers(customerId); + } + + public void updateCustomer( int customerId, String customerName, String billToDept, String add1, String add2, String city, String state, int zip, int ziplast4, String email, int phone, int fax) + throws AstuteException { + getDao().updateCustomer(customerId, customerName,billToDept, add1, add2, city, state, zip, ziplast4, email, phone, fax); + } + + + public int createCustomer(String customerName, String billToDept, String add1, String add2, String city, String state, int zip, int ziplast4, String email, int phone, int fax) + throws AstuteException { + return getDao().createCustomer(customerName,billToDept, add1, add2, city, state, zip, ziplast4, email, phone, fax); + } + +} diff --git a/AstuteSystem/src/main/java/com/astute/service/InvoiceService.java b/AstuteSystem/src/main/java/com/astute/service/InvoiceService.java new file mode 100644 index 0000000..175bb5a --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/service/InvoiceService.java @@ -0,0 +1,63 @@ +package com.astute.service; + +import com.astute.exceptions.*; +import com.astute.model.*; + +import java.sql.Date; +import java.sql.SQLException; +import java.util.List; + +import static com.astute.dao.DAO.getDao; + +public class InvoiceService extends Service{ + public InvoiceService(){ + super(); + } + + public List getInvoiceMaster(String invoiceNumber, int pmtStatus) + throws AstuteException { + return getDao().getInvoiceMaster(invoiceNumber, pmtStatus); + } + + public List getInvoiceDetail(String invoiceNumber, int lineItemNo) + throws AstuteException { + return getDao().getInvoiceDetail(invoiceNumber, lineItemNo); + } + + public void updateInvoiceMaster(String invoiceNum, Date invoiceDate, String PONum, String changeOrderNum, + int pmtStatus, Double billAmt, String specialNotes, String certification) + throws AstuteException { + getDao().updateInvoiceMaster(invoiceNum, invoiceDate, PONum, changeOrderNum, pmtStatus, billAmt, specialNotes, certification); + } + + + public void updateInvoiceDetail(String invoiceNum, int lineItemNum, int POLineItemNum, int serviceTypeId, String desc, + double percentCompletion, double hours, double amount) + throws AstuteException { + getDao().updateInvoiceDetail(invoiceNum, lineItemNum, POLineItemNum, serviceTypeId, desc, + percentCompletion, hours, amount); + } + + public void createInvoiceMaster(String invoiceNum, Date invoiceDate, String PONum, String changeOrderNum, + int pmtStatus, Double billAmt, String specialNotes, String certification) + throws AstuteException { + getDao().createInvoiceMaster(invoiceNum, invoiceDate, PONum, changeOrderNum, pmtStatus, billAmt, specialNotes, certification); + } + + public void createInvoiceDetail(String invoiceNum, int lineItemNum, int POLineItemNum, int serviceTypeId, String desc, + double percentCompletion, double hours, double amount) + throws AstuteException { + getDao().createInvoiceDetail(invoiceNum, lineItemNum, POLineItemNum, serviceTypeId, desc, + percentCompletion, hours, amount); + } + + public GeneratedInvoice getGeneratedInvoice(String invoiceNumber) + throws AstuteException { + return getDao().getGeneratedInvoice(invoiceNumber); + } + + public String generateInvoiceNumber(String poNum) + throws AstuteException { + return getDao().generateInvoiceNumber(poNum); + } +} diff --git a/AstuteSystem/src/main/java/com/astute/service/POService.java b/AstuteSystem/src/main/java/com/astute/service/POService.java new file mode 100644 index 0000000..cc7d564 --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/service/POService.java @@ -0,0 +1,52 @@ +package com.astute.service; + +import com.astute.exceptions.*; +import com.astute.model.PO; +import com.astute.model.PODetail; + +import java.sql.Date; +import java.sql.SQLException; +import java.util.List; + +import static com.astute.dao.DAO.getDao; + +public class POService extends Service{ + public POService(){ + super(); + } + + public List getPOMaster(String PONum, String contractNum, Date PODate) + throws AstuteException { + return getDao().getPOMaster(PONum, contractNum, PODate); + } + + public List getPODetail(String PONum, int lineItemNo) + throws AstuteException { + return getDao().getPODetail(PONum,lineItemNo); + + } + + + public void updatePOMaster(String PONum, String contractNum, Date PODate, Double contractAmt) + throws AstuteException { + getDao().updatePOMaster(PONum, contractNum, PODate, contractAmt); + } + + public void updatePODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, int serviceTypeId, String schedule, Date deiverBy) + throws AstuteException { + getDao().updatePODetail(POnum, lineItemNo, serviceDesc, feeTypeId, qty, serviceTypeId, schedule, deiverBy); + } + + public void createPOMaster(String PONum, String contractNum, Date PODate, Double contractAmt, Integer customerId) + throws AstuteException { + getDao().createPOMaster(PONum, contractNum, PODate, contractAmt, customerId); + } + + public void createPODetail(String POnum, int lineItemNo, String serviceDesc, int feeTypeId, Double qty, int serviceTypeId, String schedule, Date deiverBy) + throws AstuteException { + getDao().createPODetail(POnum, lineItemNo, serviceDesc, feeTypeId, qty, serviceTypeId, schedule, deiverBy); + } + + + +} diff --git a/AstuteSystem/src/main/java/com/astute/service/Service.java b/AstuteSystem/src/main/java/com/astute/service/Service.java new file mode 100644 index 0000000..ca80e68 --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/service/Service.java @@ -0,0 +1,11 @@ +package com.astute.service; + +import com.astute.exceptions.*; + +import static com.astute.dao.DAO.getDao; + +public class Service { + + public Service() { + } +} diff --git a/AstuteSystem/src/main/java/com/astute/servlets/StartupServlet.java b/AstuteSystem/src/main/java/com/astute/servlets/StartupServlet.java new file mode 100644 index 0000000..afdfd74 --- /dev/null +++ b/AstuteSystem/src/main/java/com/astute/servlets/StartupServlet.java @@ -0,0 +1,21 @@ +package com.astute.servlets; + +import com.astute.exceptions.AstuteException; +import com.astute.exceptions.DatabaseException; +import com.astute.dao.DAO; + +import javax.servlet.http.HttpServlet; + +public class StartupServlet extends HttpServlet { + + @Override + public void init() { + try { + DAO.init(); + } + catch (AstuteException e) { + e.printStackTrace(); + } + + } +} diff --git a/AstuteSystem/src/main/webapp/WEB-INF/web.xml b/AstuteSystem/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000..8ec0ce5 --- /dev/null +++ b/AstuteSystem/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,27 @@ + + + + + Jersey Web Application + org.glassfish.jersey.servlet.ServletContainer + + jersey.config.server.provider.packages + com.astute + + 1 + + + Jersey Web Application + /* + + + startup + com.astute.servlets.StartupServlet + 2 + + + startup + /startup/* + + diff --git a/AstuteSystem/src/main/webapp/css/nav.css b/AstuteSystem/src/main/webapp/css/nav.css new file mode 100644 index 0000000..58ed605 --- /dev/null +++ b/AstuteSystem/src/main/webapp/css/nav.css @@ -0,0 +1,54 @@ +body {margin:0;} + +.header ul { + list-style-type: none; + margin: 0; + padding: 0; + overflow: hidden; + background-color: #333; + position: fixed; + top: 0; + width: 100%; +} + +.header li { + float: left; +} + +.header li a { + display: block; + color: white; + text-align: center; + padding: 14px 16px; + text-decoration: none; +} + +.header li a:hover:not(.active) { + background-color: #111; +} + +.pmactive { + background-color: var(--pm-blue); +} + +.content{ + margin: 55px 0 0 0; +} + +.footer{ + position: fixed; + top: 45px; + width: 100%; +} + +.error{ + color: white; + background: #f44336; + cursor: pointer; +} + +.success{ + color: white; + background: #4CAF50; + cursor: pointer; +} \ No newline at end of file diff --git a/AstuteSystem/src/main/webapp/css/theme.css b/AstuteSystem/src/main/webapp/css/theme.css new file mode 100644 index 0000000..d3d5552 --- /dev/null +++ b/AstuteSystem/src/main/webapp/css/theme.css @@ -0,0 +1,122 @@ +:root{ + --pm-background-color: lightgrey; + --pm-blue: #5998ff; + --pm-green: #4CAF50; + --pm-dark-blue: #2e79f4; + --pm-dark-green: #4c9450; + --pm-button-hover-shadow: 0 0 8px rgba(0, 0, 0, 0.6); + --pm-button-active-shadow: none; + --pm-font: "Roboto", sans-serif; +} + +*{ + font-family: var(--pm-font); +} + +.card { + box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2); + transition: 0.3s; + padding: 5px; + background: white; +} + +body { + background: lightgrey; +} + +/* BUTTONS */ +.green-btn { + text-transform: uppercase; + outline: 0; + background: var(--pm-green); + width: 100%; + border: 0; + padding: 15px; + color: white; + font-size: 14px; + cursor: pointer; +} +.green-btn:hover{ + box-shadow: 0 0 8px rgba(0, 0, 0, 0.6); +} +.green-btn:active{ + box-shadow:none; + background: var(--pm-dark-green); +} + +.blue-btn { + text-transform: uppercase; + outline: 0; + background: var(--pm-blue); + width: 100%; + border: 0; + padding: 15px; + color: white; + font-size: 14px; + cursor: pointer; +} + +.blue-btn:hover{ + box-shadow: 0 0 8px rgba(0, 0, 0, 0.6); +} + +.blue-btn:active{ + box-shadow:none; + background: var(--pm-dark-blue); +} + +.expand input { + background: #eee; + padding: 10px; + border: none; +} + +.expand:after { + display: block; + content: ""; + border-bottom: 3px solid var(--pm-dark-blue); + transform: scaleX(0); + transition: transform 0.5s; + transform-origin: 0% 50%; +} + +.expand:hover:after { + transform: scaleX(1); +} + +/* TEXT INPUT */ +.blue-txt { + background: white; + width: 100%; + border:0; + border-bottom: solid var(--pm-blue); + padding: 15px; + box-sizing: border-box; + font-size: 14px; +} +.green-txt { + background: white; + width: 100%; + border:0; + border-bottom: solid var(--pm-green); + padding: 15px; + box-sizing: border-box; + font-size: 14px; +} +.blue-txt:focus{ + border-bottom: solid var(--pm-dark-blue); +} +.green-txt:focus{ + border-bottom: solid var(--pm-dark-green); +} +.blue-txt, .green-txt{ + outline: none; +} +.blue-txt, .green-txt{ + outline: none; +} + +form label{ + margin-top: 5%; +} + diff --git a/AstuteSystem/src/main/webapp/doc/user-guide.jsp b/AstuteSystem/src/main/webapp/doc/user-guide.jsp new file mode 100644 index 0000000..2592a79 --- /dev/null +++ b/AstuteSystem/src/main/webapp/doc/user-guide.jsp @@ -0,0 +1,105 @@ + + + + PM User Guide + + + + +
+

Policy Machine Overview

+

Click here for the Policy Machine User Guide

+
+ +
+

Policy Machine Entities

+

Nodes

+
+
Policy Class
+
+
A Policy Class node is the base node for any policy. For example, the Role Based Access Control policy will have a Policy Class node called RBAC in which the policy is contained.
+
+
Object Attribute
+
+
An Object Attribure node is a container that can hold other Object Attrbibutes or objects, and are often the target of the policies that are defined by the Policy Class they are assigned to. + For example, in a Multiple Layer Security (MLS) Policy Class, there may be an Object Attribute labeled "Top Secret". The nodes (Object Attributes or Objects) that are then assigned to this Object + Attribute might be subjected to the policies defined by the MLS policy class on "Top Secret".
+
+
Object
+
+
An Object is a representation of data, whether the data is on a file system or in a schema.
+
+
User Attribute
+
+
A User Attribute node is a collection of one or many users.
+
+
User
+
+
A User node is a representation of a User of the Policy Machine.
+
+
Operation Set
+
+
An Operation Set node is a collection of Operations. This set is then used to connect a User Attribute to an Object Attribute, creating an association relationship in which the users that belong to the + User Attribute are granted the rights in the Operation set on the Object Attribute. For example, if there is an Object Attribute called "Medical Records" and a User Attribute called "Doctors" and we want to give + doctors the permission to read and write, we would create the association: "Doctor" ---> Operation Set{read, write} ---> "Medical Records".
+
+
+ +

Deny Constraints

+

While Policies can be defined on tables and columns, there is still a need to restrict access at the record field level. For example, consider a table called "Employee Record" with the columns: Name, Phone Number, Salary and a User Bob. + The Name and Phone Number fields may be public information available to everyone, however, the Salary field is private data and Bob can only read his own salary, no one elses. We can use a deny constraint to deny + Bob the ability to read the column "Salary" instersected with the complement of his own Record. This would lead to Bob only being able to read the Salary field of his own record.

+

Assignments

+

Assignments are fundamental to the Policy Machine because they are how Policies are created and enforced.

+

Operations

+

Brief explanation of different kinds (class) of Operations. Describe resource vs admin

+

Policy Scripts

+ Policy Scripts are another means of defining policies in the Policy Machine. For example, we can write a script that when a User is created, an Object Attribute called User Home is also created. We can then grant the new User the permissions + read and write on that Object Attribute. This is just one example of using Policy Scripts. An in-depth documentation with example scripts is available here. +
+
+

Examples

+

Examples and use cases of Policy Machine calls

+
+
+

Policy Machine API

+
+ + + diff --git a/AstuteSystem/src/main/webapp/images/logo.png b/AstuteSystem/src/main/webapp/images/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..a4b9d99810488943e91f08c398752500538ef729 GIT binary patch literal 4208 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 + + + + + + + + + + diff --git a/AstuteSystem/src/main/webapp/index.html b/AstuteSystem/src/main/webapp/index.html new file mode 100644 index 0000000..adf7ac4 --- /dev/null +++ b/AstuteSystem/src/main/webapp/index.html @@ -0,0 +1,3 @@ +Welcome + +Astute LLC \ No newline at end of file diff --git a/AstuteSystem/target/astutesystem/META-INF/MANIFEST.MF b/AstuteSystem/target/astutesystem/META-INF/MANIFEST.MF new file mode 100644 index 0000000..07f7fbf --- /dev/null +++ b/AstuteSystem/target/astutesystem/META-INF/MANIFEST.MF @@ -0,0 +1,5 @@ +Manifest-Version: 1.0 +Built-By: gnk5 +Created-By: IntelliJ IDEA +Build-Jdk: 1.8.0_171 + diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/common/Constants.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/common/Constants.class new file mode 100644 index 0000000000000000000000000000000000000000..18e7487542264ab1290c7a003cecee75b2ff8d73 GIT binary patch literal 380 zcmaKo%}T>S6ot=ilSb2D>mMR6#7%YKY}_e=gjNcng{19PCUMY|Bm>RFrSIfQaNz^^ zP~vS+apmT4zjN=LnYkaIZ|?vuu;-$VZ3jCJb_rXVYO!nx-S!;tZ0KxkYgd19^!^}*?aV0rpp5xRbot4WzfYBiHl%1+0JC=U0f2}P?xJ%jgoax=eKjdluxn+7fr(9 zKM921dQzk^e-P7XsbYg;)OZ76J%9xp{E>O!I?`rs Vuni9Eu(qn&Mi)IM-Y#nm{VzQwO`ZS% literal 0 HcmV?d00001 diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/common/Utility.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/common/Utility.class new file mode 100644 index 0000000000000000000000000000000000000000..39a408510612fdd62cc1a0bbd14ce431b30217de GIT binary patch literal 1556 zcmZ`(OH&g;5dJ3FWJ6d4LBiAbgYXEEhoA&eK~XG%hbUF*X$V`e7&fWRhLXE~!mAgq zdVx}_EInD}*@HjDvP$ur&4PiANo{v;PfySHb@%MIKOa5;7{|jnPGB&Gp*T_)ZbTYa zl^D@6s$(n;9fL}YD{(E3C?=Gc)Nx(M4T0#iWn1oyKsedIETGL5S51NDMawpqDw`{& z^H{DF=xJRn=4D}7I+l9(otnFDl?8eh^To}yEV~ugOw-&f+UX~*Rj}Ocj6h@AbRQRU zu4CD20ymP28*)pgD_l=MkmdE9>1L{~g0$Dt)woQ5&?OMrl7)(g#Y<5eFQ8lYa&@__ z&ItkyWwRt5=@uQ5_7V|!;wY=_(gCx+V2ylNlYArIKl{3Z(oF*G^=x+&*h=jJb#R;b>}q`kA_5+H3B*hl4d~C|6d>{tZeb z7Z!raGdPbXehJhs4BlY0P@d%57&Y64$iN=NI~pOhQpTx)257X}Xc^TYoI<-6^D_iu4ij}R@s1PmBoCb9ssc2?xL$Pf-$jeZqZ>Wc%Ic+$wc-4n zrWL{&daDFf)LFir<8uO`--ziruj9fm4C5kwAzUKq%ecb*irg3G)~P*mOQ}y2T6iMT z9%B(ynFI3TC|ikvEgg55`5 fkK8$WyAj$a!>Ep=$A^@Xf?fT|G70oEB7}jzgt2Ga literal 0 HcmV?d00001 diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/dao/DAO.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/dao/DAO.class new file mode 100644 index 0000000000000000000000000000000000000000..696703338817de66d7877a1646b338231b12de84 GIT binary patch literal 5214 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 literal 0 HcmV?d00001 diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/exceptions/DatabaseException.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/exceptions/DatabaseException.class new file mode 100644 index 0000000000000000000000000000000000000000..04bcb1caea0ccb9785eb5fecacb9322c297f6981 GIT binary patch literal 424 zcma)2O-sW-5Pg%ztj4OfN-tjYAX<^;;;kZx9}oy$D!p&w5?7L}BpdN>c@lc?2l%7J z+4^y*2WMb*=FQuA!@PgY-T<6nJ46SY0)2rkLU5`pZO;gU!#H`6PckZGl}8g>>na}) zrv(4P+$q9FqAPXNmZ_?5Wm+)OPfR9@sjRiDzd_&L>xM8)GE+vfv8`2+dd}3N)uw8q zOKD{)8+G*qjaeX@3s6kxluhmiFDya`C#J14b*-KBU}4V4ed)r-65-&V+JybTndkGp ze|N+lJieJTVrLDG0ar1j4i`r|$FHClPCW>YA-`Z+z`o4c?iUR!+;JwbiY^av*&5cF K%?IYnL+=v+KW1G3 literal 0 HcmV?d00001 diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/filter/CORSFilter.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/filter/CORSFilter.class new file mode 100644 index 0000000000000000000000000000000000000000..7fc8a04a71a000adaeb401589fea03112cbd1881 GIT binary patch literal 1302 zcmah}ZBx@g5Ppsp5=#{>Nj$AqLN7eN1lzs64v ze((qQqZ~I0ZygyrnYr8D>^{%l?%w_R`|CG=mw1=KZ9E>tES~6?)A4i=^T_Kc=vdIP zsKeAz)Ul+&(y*-I8N5A>}uqFHkZ#iViRXv+KP43G` zKQpG)z6=B@^(%U`gcy1uh{i8EzeuBYZ^$zc1W6*t(05UB14({e=$W%^j(NU5z z((s)0x)=JkpgKe~y)4O6R0M{x-OyF?P&8#Asi-B_^%Rez8OFQVsT9_Z?;Xju@K>@J z!mx%HS?c&JhKZ7Giy$aQCGb6`SaKZixLEV$o^%=5f`->wyun+B$!k3~1SeE#*-F_SCOWhpc CS6vGL literal 0 HcmV?d00001 diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/helpers/JsonHelper.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/helpers/JsonHelper.class new file mode 100644 index 0000000000000000000000000000000000000000..0832c277f52a1a6a644b45a85badc9978da3709f GIT binary patch literal 293 zcmaJ+O-sW-5Pg&8L(|j*?^1eG58X>|Enb8o676PDG%w{* zMsVQ~ZvG7+B>k?aWc@B)vr^?2GdTQ8U&PHJj6N$dXu!Mw1bwjKAYk;_1|M87Mg#Y7 MiI5dx%;+Hc0XEM-j{pDw literal 0 HcmV?d00001 diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/ChangeOrder.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/ChangeOrder.class new file mode 100644 index 0000000000000000000000000000000000000000..d919be9f2134817e355969f2cab14d3e4a9e67ee GIT binary patch literal 1708 zcmaKr+fEZv6o&uZ&J-wPq2-|EC@R_xhY% zW8#Gm;6oYzwP%Fsbnv2k?^*NDzrMBB?(aW8e*xIR^E^heF@_Or%HqiKRF*ASwny-6 z1Um|a`i0v%_l`PeUguq}si0~K=2cstONW>4C)a6E;T#7YzjgjfVIua$fg5;?gtG3( zh9d!L;;wI+fkNErpxrxdh-&=I>()E|Rp7T<3c1&Q%MbPxYL(h>-b9L+AhL@^BGl@M zg0bH|(}aG@V@ao8=Yz}S0@SX%jT5)y%X1Vof(yT^uyj~&HyyVd^a9Um(xBn&-*k!K z#d9x+MRc#Sl`1<|><+&%Dm6hFTb@6x#wx590GJkZ2%~KW_Irb?>b&^O%hFb5m}e zg%Wlxj3IAf9F~PUC|H=lq=h0Zg@ymkh<-OW_vrM}tMd+WLMK?^qgs;XbZIw56dh1g^FPiBMGva3i1$-(m;$PNR=S= zEg&*30a?Z46c95BvXKh%1eG)pGYPUqknLMQ1ccQ2d z`e6BKe9$VVsPe%N;D@sO|9d8~c6uIt*mF*w>C3PGr@QyBzyJ7CL>8n|mMLkK!Pt`N)$Xw0#76f+zuCtGy=E(s7phfv{P3Vj zwX=;`=v^KEH=Apy^`|B}$CWtIm^~~62q(tJ9czul{kSEre`lg_TzRrx!1vp#mIZuC zqBw`bCOJk#Q&nazj*7^2;*uAUOhOykr#t{Qaw@3AndC53;&jsD9QWeW!8r~>WH;io z!fX<9<`s2vkW)dqGu$6_{gr@4svhWkk*C*@cjOaCj><7dj>~I~oS>=EoTPc3<_(%U zySzy=&E{K--j-vQ)Kd#<$qf4>g-D8Str$tkt(77vyY+G;6}MK2#Bpm*B-P(ATL$|PxrRLn7;@0C z1PPB&K?qofey3p1K)pGLHxKO=A>9pdweY14viC6ZrgWNKD6WLZWzmln}vga_Sp=LN4_xg9+cCu|tX2nhBngq%I zib*Fy=8Pb7a{ds=97?T&Gy!rc1%#?ofeS{EoDOou2y)R3lG8yJ0dh43gheMv(+HB+ zL6(dlm&_n}9polJZl!?m%n@YX2x99XEhETfGl;E&+y}^m6c8SHf?P3z6m*bBMvw(F zNI?f#2gpVW2yYxgJ}`n5b&!q`bx(ARie)$~s8b2y)E~Qr1Cs0J56`!sm`4OUBYv^wNA~1i5Z5O+^P80%R`* zgs&|@ZWtADbVbHSkY%$Xjt=q-KwhMP@UbVzO(RHE2l?Iza?1=d@lO~(@jn3M#}p9$ M*AV2kddu(p1E}eAc>n+a literal 0 HcmV?d00001 diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/GeneratedInvoice.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/GeneratedInvoice.class new file mode 100644 index 0000000000000000000000000000000000000000..2cb1924322c7f37997bb6421ac354a2389f26d6a GIT binary patch literal 2601 zcmb`HTT|0O6vzMDHmNO95n8YyC|~KZ{>L zXY4q`gCD>T<#^5}p(RNj9(>5|=IqJ;{La}u`TghQ7l1`<<&nd)94=smhgBZdc&PF4 zoQD@#tY@(ykhPn~u3eV`6WevSQMKA$$CK5DyDy#UTYqmw;9}smB|Xb_1ctW{tz)a& z@ocBMZMQvg$$hX7nwHmTk=Db=_Ub@wUvQ;H0;wZcpcwbuc~6@c>YcXdHe^d+GVZb& zY?9-Zqn13j-A>#2ykpt>>kUs}#K&>0=0SDK?d&;{9rr9U)a6HaLvGlPBliXLRl8|> zHGwbXc#yCfk=$0|o|_;;v_#*=EI z`bZ-L_PCl*336bOArc8MtH4x}RJcuTG(>{otH5-EY`Ck$3rraA&_YnnS zDYBX=IL+)kj;rKbqPG*8voz0|KOxL}U8KypF4E?F7a6mZ=|VG0S{J%m(!0ohC(kq{ zXuL@rplBJ2mZNx=RJ2jjEZ{oDxkIT=lE)ig9oH~LZxlyS3$dIJBNWO>`APGw4R`79+ zyctMWh2UiUuk*?}ML5$+Va)eBO-c`v61Yu?`-SZXNk>6u5uBF~~zaN&wNLAWsuP7O|8BqDMj22&6Uu ngs(hvAdizlRPXj*=a&TXY5)j#9D_VjE%5X&j(Q9c literal 0 HcmV?d00001 diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/Invoice.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/Invoice.class new file mode 100644 index 0000000000000000000000000000000000000000..f9f0e07e98dd11d338385d1ff185c8305d1ad2f2 GIT binary patch literal 2399 zcmZ{kTTc^F5XWcR?UkkFE(H`&(RR5M6crSao5m)@OCUrOUzTNsC2g0KEzf=+A2hKs z@xc$^lb^`=pR)^X4`)L-=j z1uq-CY^G={McW$ny7ddswVgN3+M(0XXkho$y0FSstA1SG^BZpc_?bpMq0^4#I~w%` zE=}L9me~S_#F>Wx8s+R0Ty)+xj+}-tWX@{-o^SchbB(l$MyW%$THUPq-HCR*=3$lN z80Tk>?ON40p6}pBukAE^_p@tTzU$RBO0Kze*I(D@OYu6UOcmwPDXr4s6hd@ZLjBh* zr2~!hZSM%h$nU!Kuz33xM6fW=wyFnK!{zVLsQV`_1dZ+5Uaf4M`%T{|*ASput_1am z_`YMu55F$EF;pyF&koP?Yo5c3iZEub9W?0Pz-7qJ{^i;M1Fyj_T-%9*r4j61(CIX8 zgvWkZx23-KoDZA%28@BVx%8j_3^2nmjN0y zXo!Xl8sX0y)T_~G)Ci!j?YH;#@YJ#KOi-l*n#POm!6Q%O7iq8(XA(P-i5>aGj+A0Y zRvPCJg zkZMudETmhM`HovL8pmpajliNqb_VftEE+!r=$-__45ZIO`4aL@!1Gg(k#5p0d?B|` zq=^%2iis1eii;EL(#476Cd7%gCB=!=rNoK#rJ-w*rb2aP>>M{?{-D@590K5^Fir>< zBX9^|G!*(aEL@s(cr!{;l%*{SX1yUuHyyX> zcyP9C$M&`bEoQp`ip64guuv%Ej!|gOJ+%Z4Fb(KVtoo68QbA<6*62(dRp2vbKep=- zES$|j#(uos5!SLrP9H@2L8rolNDYRNb=avpX9Yr0WEJFTMDeHZrFsAEqX85SC(V_* z|J1Tl@EBg*_fIc|#I_qpbhmw$afGk@#3544)@xfHNr%WwJZMR}MY~B#QYuOPG?1i0 zHbZQNIW|J+B#p8eqqLwq|35bfcRjuDPA;r6Mhi_H(>)A)AMQvDKNN!{t|wQNlq;&r z6@}%B+HysCxq<-e5D746V8`+Fo5I+SXw~>m!kBMS$e3(V*qCaOW{heriWuXO7U@Pt zZ&B39#99W#zDngBM@R7weCWOSv<|7_6mfUK;{Qzp(0Jv z6jt`QBOyJ0HzYmoDl9$jOOqaV7LgwJrb~~zV^vmJVUR#%RQ0>dW95A##y1Lmf#U<~ zGMJGtNk5?tgR2Fp{g=0q%_zE*<+|O3j7|b%O71Y`XZ>qOZ?_}pK0RpfbrU4~DF8C9 z1et+uL68X?O%P-TAhSI{SWQ;op%O$3f@GB-b7~MR2(kc>#U3Dhm<*Ctf<%HK%Sw=( z8YB_~Sp&#=4-lRu1~HT~q6cSWLkTjko)J9=vIUUmJwSMr8Ds&PT@7mpoUExIv>dm02O0OVB<5WYzavaAG&1wr|awp3+GE?~Yt_Nb&J#zZ9wavbkOiQY^Z3Q{I)#L`G-lDmR} zR0$o*k<8>iDI)td%{%T`TwD50QOD{y&(yK*Rz_TMfJQw~Fwe=v{8r*s7`ZWF@xmVj zj(h5HGjgrw9*?7eGL8%^Va`C27X$MK7IDi!2@5n+DSe?~olJ7`>c(|wJeQ@(^Q{Y) z8r<=|giX)Z>X&#x-$fo&MQF&d41Gr#R+2mE$el#xPAs&~k$)M>v{vZfSMt|s-!Okd zF}H`vm^(vc&D|kXb5$KeGgq}C^zSml3a#s;3CcmG=mkosMA6HX=PIpLig}xE8(~b` zAuInjxDKSqC#KBE6LV(ei3wGCVrGpz*Kn6sCbVehmzwzlnQwH+fH8DwT$6G}=n%;% zxQF{>;l~Z~W-(o+Hc6r=t?MLJl@V4#uQ9M50V|Yl8b~$?vY84}O$W&)LAD6w$qW## z7gu0|y8VAe)FgdzcF~}o4P65%AAp5BxTa;%?Yhv>iw&svP qj%I-Hj4((I^%M{-3Gylx#Kd+Qh?cBKgFxQS0O7G^kR3UdyZ-=+k{liY literal 0 HcmV?d00001 diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/PODetail.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/PODetail.class new file mode 100644 index 0000000000000000000000000000000000000000..80a5615e1035aed642268f224df3e1f59a70450b GIT binary patch literal 2061 zcmaKsZ%-3J5XNWQ>m98}TY;hl6h(n@2&agkfF)6aX(WI^cz=`?kMxhWR}%b8zR<+R z#27z-AIkX5_Db91YMRW>&CSjJ=9%68`TO%X5iQeZf)eyJPH|dh^Nh_3n^iW?*}P!0 zX3)Ap8wR};6x-jcG|Ga8cFvs($1XXQGyBl1xs|hZL5Y%Ekp)kdcdLR#LC}r5tX;T8 zxh3mGLGkxe9$kKvg;PP%Pu^v3m91*yq$E*g(Eq5NYSv`gaVyy39e<;5!1wZkc5~Mm z3jYuJdvs^{p}Av0+Ux466qMRQ7rTw}iL4ztKw`{l(J37}HJ6|LpyqvW>w?C2iq*31 z)V+o$?J^3K?ESqh={ar*y$qa5&sS_DH+LNl8TG4-Oh`k_HHae2)K)f{n}fEHsVA!C z3Y?ro@?p2?N#ykeOk`|#CSl@z*Q1WNO6OkQtLf-SSMPghyHref0NN8wcM#g46tWI_ z=9)rMZzOS8ZPbc#+vOPywpCr^gJ;qx}Cul^4+^P-9T&LuIZk+%~eoXgq7ZQY1O$P1{_J$?iUacTdDP6tO0n6txzbq*)oQNii!MYm#nd^d=cr)@ahe zH{?es3p)cIuBf5=IGRs#@AzfW{v^7e#!mCtYYbTjt$k>mCh&wE6~9m(cMwq?_YhSc zccCedYsQqvo#@KrUJUebhwl2F*jTw*%=%7|uW(w3x(bdd1hbXkBM2bgLxg3>Bbxzq zB|)dbgo@t9_LHi@Xe;Zg3Egi(U^G*Ht!|L$mjK9AD98hPcnxG6V+exG0A#ig2y4g+ zOou9>1r@PEL1w}g(Sjh00I~ak@CX@XHdK*VP?4ojkX*PTu^`9_Kvw&J@Cjm&IkI4R z%-y5WgNm$$g3RNfhMW;S2$BcLW*-nfzznhws)!L(EtAIL8#DgXcg literal 0 HcmV?d00001 diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/User.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/model/User.class new file mode 100644 index 0000000000000000000000000000000000000000..b2eecd358afc8e0e54e997cb00f85630121c67d8 GIT binary patch literal 1036 zcmZ{iPjAye5XIj*uG6HZDNWh}DU{L{Ip&Wq+(5k`Aw`M+sgS#qTESHkSGEIRiUUYQ zNF4Y8d?>`5UDH%?ddTd~`0bnD&gReGU%vsoz~ed`9MrIehY}7YJgVZTiem+5mPKjz zTtRge)+L#SlSpB^cM*OLgK;<=1!s90Pe(8L{W8q5FG)(d^D3Uk`Kf~Eb<5InrPEii zUnl3ZZuH`5^maBGMCpfcFxJhIVL0xGX)JkBwDV7Krm)u=CX*n{@>w1Q6B>+zkEA3` zZ4~9Q75a+TA%87fRBW#+JvR!GxmC;Sl+h?E&Kc2;SJwQudVe(lIkU*>XUQxbMsH%d zPEDwu%lurpIB`+Mx{Dg>E;dkC*jafag{{TN-wiIJVXp7h#~~lg;Zs)lqZK2>O|LZM zT7_b#Ta25`#;{;>ZTUZ;{PrA{|8$Ou|7;HXJL?u2jJtFN-E4Y^+a}?fblGCnH|KF1 z+sx>s`zpN?t)+L;yTYDLem9*1uA*A=f57_6jcMiRVnbWIMo?ID7z8ngPpKATMTiRjQsIK6g0*?O`+$p@SgH*mPf$XgWxr=)xkS845GDw>s`!|5dY-9rMl_2&q e$iYgG{na4Xp3Y3+%F1>XEVlMyt@X;qxQY5k(}Wl=F=$O8Bt8z?Njnv0H?u>_pQSG} z(Zu-dAJy~>EP{&mWzNo-bAJ2HH|OX1*Y5zHqv9fmO&3|*cCh6ljXQSPc5v6l72I=h z-@yY14;ivMQc1JRkS>+m44D_OO0cG!u>8+ zhyJhHT6vTm_@}Y2V?PMB@FzV)VAQxgx9<;N>qv*ER`4ajTvHw@Zu*+QZ)d=JonsN0 z+HYdSz)XdXFSRq%GQGpDy=yb<>p;Ac*29hYmOQZrFs$wOm61Ksma!zob)`bXt#Rb= z`dO@^hsL!azQgfB+4`hdMrns@J#Ti+-1eM0k(N9;gHj3-m JplIuF0T+%``*Q#Q literal 0 HcmV?d00001 diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/JacksonJsonProvider.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/JacksonJsonProvider.class new file mode 100644 index 0000000000000000000000000000000000000000..5c5c522f8cfb61e637f3176d2cdc0850837da935 GIT binary patch literal 1632 zcmbVMTTc@~6#k|ZmX_rrA_6K}6lu9FQVB^nLm>XM5WW zvQestvYq7hx-c1*+Ny`7E6irCs#H2kipp(X(sWfxU%F1}{+!V;%Oa*ZoF-gMELZpu zXPC@3bX%*5f@W#NH=^r?&27!liSAUwxzkiWTZ(BZqG>Ca_>EsVqyx2478Y6VJ>t~{ z866?!Rju3xQ!3<~j9VCGSa4!+O-CfG$ascT8DXqRSeNk}8;-Eau>5Zv`%7IY6+`99 zJ`G8tRuwX~@Pc91Ed$xuZa5s?+T*r}8D@>!GPbcJ<0UBHb8Z?g0cF^9XH?-$3ZD~! z^HlR@>2kUm*4vbNs+h^9Gtq25 z9?daqbgLP6RLY^GYF4M54}<>+(y8@p=9x@}yF?)8>i^_HHlB|b_agadt{BM`^YLUf zmyaYfbR~bKL4^tkPzM62Q*L9$;08LN0J<*RSvf9-H5$%ga+4C&um=9{gaI-tmBQ7Q;HIk1L zJyn5B`0LJ2tJQk=To~EW$w-(sRSPqZ;r&K;D5ip^Mn&AFwDWT$;sf3@iHZ-NrC}(O zS=`7&!#hew!7DvcM(Mb{c^rbe2#ArvKU#yqGy3UxEaPBLGprrYPz~p6G1T+azdVDX zG!;>rNtCrT*8+9y^>msHWJg&MYYUp(v5*SNa9v!jpo(=D*DAP<8w`zqQkCJJ%?n9> znH-KHJ`{tG6CHEXK=f4{@?00)+Ls+sL|sY&Sk7?zX4qx=BNMw literal 0 HcmV?d00001 diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/RuntimeExceptionMapper.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/RuntimeExceptionMapper.class new file mode 100644 index 0000000000000000000000000000000000000000..7aa11ef75ec53307f5b4c48efd5a7f2a891a5389 GIT binary patch literal 1050 zcmah|T~8B16g|_HZo4c{5vuYb;%7gQHR_8gAt6Q+k|L2dBtA};NxRtYZf2*@pQSG) z(Zu-dk22ob-G-&8Jj}gw@7#0t&Y8Qvet-J`;5A;Dn8mt@0`42w(7^*8Y?{d8p*D{U zJT_tCiGimEo*AexH6x+Kq-5jiK}CRO`7;wFj(}HWXY4HWEUv1$usgZwF|JXw8@}EHXkL6xJ7#_F2EvgQ$)RC znXCpMB1iSWo%$G=@5p{4pQAN%f&3W87dndR%&5$w^0|nz9K#YyB0!lIEA0{a-GuxV f)oAi!t^N~*F^ZRT*SjkwR2kfhKDvU{$glkYolOL3 literal 0 HcmV?d00001 diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/WebApplicationExceptionMapper.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/provider/WebApplicationExceptionMapper.class new file mode 100644 index 0000000000000000000000000000000000000000..b11d102f7690f5930bac24f1e15db38f79bcf023 GIT binary patch literal 1166 zcma)5T~8B16g|@x)-DUJh*eZXK(rs)6^c(KB-Lm_QZS)SjlNBnNm(qro7pM!XX#5x zG%-H=ql|aD+t{jAUgpl;J@=eD=gxfp@%bx&9XvN-;l7D9Rt-GRam~a!HuUbHi6l1l z^2oqr6LZKLC>SUjC^5|Lx}K}{7?Sxyiy`&WKNbv`y6cI<-dS77CU18svsm{X-feN| z>hCz2QYUW6P^mlqnaxAhQ^F3Uf9@U&X}=ZiS`c(yhb!0jUiBRj=*DeMskF)||BoIp(Jfw0?=pxxzO$8MfT|3aVZ zKLY87+wr*SNfLTL6pHHKv`>YjsuR+puk7Cry*mMz*4v);rs4ObBVN1O`t>Qu$jP$y z&B6jQ7M>u(usSvj85?ZZ0(WGTg{LSRuq`~pmW6FpboGvfn#2s~&WEPt4p}nS5o&ZEhL!xk@5S=C!o;OvND~t=s~+8B zdIJ08J!K9=81fDYEydJP%MC@1bZ9=g{QlVZ<8+~gHF{kZ80P6!CMnWXXwA}>O_5QY zDPDqoqD=zVX`LM=O)S!07ZLzButbq*lWEn(M@SJKxKkP+@de3u6jKAtP?)`hF~GHt z^fzKOhsb%VSQxVAqRN<+IB*NM!Ll{tUyk`Jgwg!zV(A;w1DL<){%kNEQzeK>i{8b( HVO;qMhw3ZP literal 0 HcmV?d00001 diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/ChangeOrderRequest.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/ChangeOrderRequest.class new file mode 100644 index 0000000000000000000000000000000000000000..ab192734b6c3f963d4e135e0c031ddd987f53253 GIT binary patch literal 1558 zcma))ZBNrs6vzK}&x|ryVIUytP;eVU1@V=J#ITr<5HMnR-*wF>*;Z&fKb0>uk(l_x z58#I~o^xAS+ubF;=(+cvo`>Ig`2FYSF93&lT}BDJGbmz@g~8$_i+vUcMZ7BFP@rO6 znZura?saYNY%~xMCj$8!SKjs0YxA>d^vS}w2s~%ldm}I(^JtraO`6cmzwH~WAe(s9 zcY{D69;xk)I(@d9?b^QOIX8jh4h0HtouLyP31l11OM%?6+m*4Mp-nIy+xuja8;5c& zvwvxN4!?_AqffI97RiS|8DAH^pLP9aaqB2P*rPs%0#(gd&wfhBqw zbP782tsfBI=#oK=WFb^yneJM2U%>-<39Mp`WYYONGG9{8b4urRJdB)=C{>12wbt*D z8K*8wZIvq0WrXF>3SoLi<2spo1CJCS*{>;(niAwOo=kx3+##C=StXFQDInZv2B~9H z0g_9DY$!pV;+YC0mjZ1tAWh|H e3TcpCB}hv>nnD_6pFj?#fbgy}$c|iw7k>d=!2MtV literal 0 HcmV?d00001 diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/CustomerRequest.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/CustomerRequest.class new file mode 100644 index 0000000000000000000000000000000000000000..17a60676316dd8235650ec254e9d43ddb112040a GIT binary patch literal 2654 zcma*oTT|0O6bJAV=#3IAARq`T2x<#R0Z~B_xl6TjA4VM?3~huky+E5f>SyvnXJnl5 z!4KevaytRSo+JVRJR$RIpN zc!7{bc!{u%uo0!rC~X-O&(*4KxoB51d4r6MLFQRu-74A!wP%m44_3Nhl@8K7ZpA4b zJmx|BPNA?{Ubc^2gF;q5KjEcGPC3W@WKg*3S}qT7{OlYX6ysR1s_qn@u#1*c;Cy^o zE}_GF>!U%DS*PT1`RReiK(-RU61P)rjwuYn7b6 z>R`J%&eqvq{V_aCCS9i+Cbd$VN$qsmqz;5mgf4_D2;B%h=yDaI7l(alU86RG2LEHH z4Qf4qayRym?3_yj{NyM21v2@^^K&E+RAzV?Q6IIUAhA!#~LQ#*GH15JkKq-Q>3Ew+Cs6kN9b(+Z_A3eLna*HGJVh{ooF9 z@EuC}gXg$+1CNOe_nuP2`P6Y$?WQnGF@2ZUi@fPU!}>s-qG18j_*H}SiI5Q*y#N_G zrA8gn&yaxt2sQ|iyCNi{Lxx1im<$Q&kR(G=0T4VPfTTr8Sci;?kZ~Cj)*<5znFxU3 z5d~yIghX`6ln9xWArT!i&5)S@2;LDu?un474w)4pQ!*r~L*^N>5CFkT3dnsC64N2e zBIJP#iRq9vhGYUD_(}lsP<(xx^w&2lLZ;={w@HU=GGr?Ng3lBnGa@9eLv}^TBN-Cc zA+H$nIsk(2Bp{E)t!dV`=B)^smA9r@hrDBm6#&798jvUAikSL}6AWua|iw-G>ka-!>qC<`uauNW+Ulkw=>RZ0}7ZZ~uD^-qq`s#P4LHCJ+-} z_yPP-#{b;aV7GgTX*#nvH?#Ab+1dN``^QfrTBF?z4bkH?W#|curz|#DY_iy5vCU$K zMI}kklJs0q#wXXd$CZkqNw2>6 z%8y;y@jB&NP+V1drq%oqSW!~;M0&kfeo^^CQCB(Y>T??}40It7?MRet%!tOED$kRrR}_#LHln=lus;4=6N0&zS~a#tKzNOCj`i za5^bC_LgZ_cY9}*hWYP0vk%vXd}Zb-H1YL0N-_X~dvW7C9DUY`aEz zgT`4*P+m~se-9F!yc*YcM`yC((JW?r2-hKnKN3O`=kztw`Wl&ijpV*YeqRH@*PwvT zkzj7fNj#OI1$4ahoy0dRA~Xe=@QqQL#@YxR=qAnJNzg624cQ-jL6NUYa8?_92bBcD z6{L!As?y>mMXpk3d~1&4XdN&cr0f~NAK*qHo_h^0qWcre#D##>2 zrb0mY02t)H79^&E%xFOt^dK=6WELQEAs{>f3{ud7#8r@aEl5!h5?4Wr04arl@CY(U zNjoD6bw-x7AdC7LNvI$z09g$I;XA+}4`>N87}f|@Jn0vd{G!arx)x;FzaAW1p(uVl ztP7WvR6#ZXvKa!xmykgoYC%#e$c`3dMGulvL3RQ1A_RoL0t~XM1xc$QFSQ_#^dM;! Tqy~^TAt3x2Vvsfe4A%bu@`4rH literal 0 HcmV?d00001 diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/InvoiceMasterRequest.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/InvoiceMasterRequest.class new file mode 100644 index 0000000000000000000000000000000000000000..5ef8705bb3c6082ce750a3b1961c169dbd8dc89d GIT binary patch literal 2364 zcma)-TT|0e5P&zOcT#%cqJXHNXj_Dcipo`?fYw29sDsaGIKpAt2GUc0l@B^2uC8R&;K60ba7TfK$o6OOmv~yyfn?}p*92pJa@Xpb)2K~O%rYV>PdC#SL)-uR| z&l9IM#%nNO9b+8Za}Jr~8ZxJC(GaHSbv4lH8l;-M)mm?haGg!N*KAQ9y?e?mZnk!9 z!7w6cF-P#v+%g5XJ6IUA?K6w_z7g+7{?nX1{A z**Y*CPWQesE{-`?sqR>I+c3MLCz#=|vmWb;u2J{e@*eHX+4rnSSU6(Be{|Wgp>jpl zvqJZp=WzMDBVi8&Nxj!9UZ(t~#{)q=&#B~RyYit_X-xIO8%7!f{L3O*Ytm?n_*k~- z6dg@1&!wk3JYMfb&yz&XXyzfGZ@|dU*8hakY!WQa!ExZfV zUddGQ=))UQ^610HY{Tw37Te~u8>6aG&(SH+VGPD~$iaXPc_`>mq^lB%K^W3u7)Ers zLAN(aj6y+!^8YRq?ox2l_L?Wm5-^D;Q^ymX!5>yd2~^nCSliWD-qlFpYJ_k#a=02% zT#YoS2SKBkKzR%A4AdIxMD+(~-|!*^6DX6O5pLtP?qA=5yLhJ|(iF;Y@OOxP#fSd} z=aj+s;JzQchTbuZNmgerAQqI)y4E5ju&q>n#Pb5LJfTq^hE{Ln-e_@{6=1vq}&H9{a(;j*MSGQU;kvkS7r!bQTC?9zCvuq~wk)C_$d$ zAE_4{fZ(#GWROJ!S&9Im!$=?t%F(1{kX0qfbM`n$i5O}Nqu~?GROgfe2M^}?;(LKyIZ;P7aP4^jsO4v literal 0 HcmV?d00001 diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/LoginRequest.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/requests/LoginRequest.class new file mode 100644 index 0000000000000000000000000000000000000000..1c287bb1fb889b91e0b60cb08e52ccfad0c4f7f0 GIT binary patch literal 757 zcmaix%TB^j5QhH)w1raTBH%qySAdD#xYMvPan-01Wq&9qwFX-4MPEx3jfo2%z=tx< zDFhH}Oq1!E>HPD5XZrc|{sG_++d34i6_CTa3>z9YHEc2D<4^=19|?x4b;}>PIpm&W zcB8=coFn>v$HVZ^4+aeCvFo`}hauZ+^%!y|{(w{^%k{)rJnDzU0m~^06q|Br@lhyVc*mKfmP*js*7E5$C#tm3Ti83-nh2l@~3o=g&;(V&O zij|4DldzFhd;b-gnYB)JX{wN3+BcG1o!Cn>c^^q#O9ja;f|OH1>ggcaMUWbS)c*jH L3zZ;^o*a-pnRG#^g2apdc$Uw%^I7xY}VOqu-Rnu zEla}j$M`oPhRX*1c`#6j4P{Gc2VY~ zTNIS~EalPl7g;C?>bmr8mcwG&6;lp8w#(TAztDyOkDZpp2A;Pq<9Pa!MGx~fWsk$%e;%R@9y3613!qV& z-WEb*E5lyRf}sK0Rt%VLRj{uiTw4tpy3M6OP_F60AnC(Oty+{jHWzbHsm%iSr9q=~ z#~_2c4eFt+LA^Zd<5@oq7&OSUA>JFN5kXV`QFFY1tK;`i&SlY~N!*MKE>jXeM44p z0qOdxfDC9srs?r5kg*%;Qb9%lGTH%z3&0>VT1BF&B4b*RoL-Tr3Nj9mi4Gv#0Sq#$ zRV1b=GNlEX(<>5FL1qAw>j1(n$RP9d1Xk^lxT?s!7UU@{1i_&miK`$cKo&cI@Eu?f zQ>#cqRb)vEvZz-ip@J*}WTgWLUqS|XrtOiWs>rGqb>Kxf~zD}?G4Wb5(tS4 z9)O2J%&bjon~lWH?C$vA`9JT>uirm@0@%mP8Y*~NMH#ysY!1&jJm>JDjJ-1U1&U|A zcaxF8;>nfs$+3sdcwnEaz#9)<3DjMGtOCbXT2eae9XU!0%thMpdT4VZDSR_h=~_qr zq(5Xy&7FkGAIaeOQeY|Jc05*cAOn(=UVCFt9SG#xoeP1&p?|5}ys;#Jz6?G%REz8T zt~0!F0*}vevYyK<;#foOKN-W?avrLtI^I5h}CaT&d>chfcpF}6B+9dkE z7`xnj&RXbhrD<>am2}p+6mu-&g0*vh61eiM$E|5(UV4|O%EBU+EX-rULKQU&bq*G0 zEX-m~p!FXu6PUjp&|d#ax(XXK$Q2s)B63`pb~!GsSE{a8GSDlT(^>~j50)r4=w#C> zXf1ZXLwwP)CdE>e#4_!zc)x->bP~9Wdlb``zasZJbGdH3yo$B>@&S?N*s8nz4Y^zE zn$FJAAI<9u%aIC^J)`k|F!g;rFo5K+;IkJk>cOh6tf^(MvzTBi7%&GQ_O;F6UfdK5FR-O*+Sa@Qp$qZ aMvxA=CXiAVWRF1hr-1OxGsw1{%AG%sWBR-R literal 0 HcmV?d00001 diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/AuthResource.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/AuthResource.class new file mode 100644 index 0000000000000000000000000000000000000000..d7936813236550dba12dba2bbeae576d5e21c94e GIT binary patch literal 1371 zcmah}YflqV5IvU`wv_UIC?HV4M|rLfR1^dOH8ClI6iJAmF3Spw?QYq-3;Y59k0uI< zB!2XRzsVTS-L^u7=!Z^cX3sfu@67D}`1SQ0fGIpnq7mZ;CX%SZcs){>Ov1!%ZSLsY zT?6-$NMK5v`w2WS@X)}tfT3*vz_DzBbk_0;rc^-~*k(CvE`-5uu7sEosGD_MCzun6 zWkxmx;!EB(iOpHZwO@sWE!$t0TX|;MvYsXL8`5`lTu#P=T}KHFpD*Lv$_stVR#Bm~ za>Potd2h#Y1?Dr=@cqzMfikoD>6#ryGb7nOc_5F>LuLBPv^?K7sZ{h_WmC!UOE7_< z|4RwfD_beYb6;-jYiMCJFWnt87x<35L%qgaAg%YyvKU>E0pwpY3_sSk01C4*hEY7b;S zBq1(I5a_Dv#H#OYhwLqJEwWh5J63c8b5D8fY&CX?XAcX+rqF^`f&PE*LJCc2HZYsQ z6U?PBugw)a6&N_j<8Y%PmW`89sQtEvazH|iB|wQdZ8s0t!$Q4Cqc19$ zE{T>4Ql6L|7H;A5UR>j)`p8Q_{6yM7KL!}pF`H%sh9aLI9RAnfdSq`z*pNfic&%mjZGjFi}kf^F0hzn!#=Q`PXCk6 zSa9r&KfoX5_}$%vWW&HPPA2zp_S|#6^X)n3?mz$j^*4YIQAuJ1iyA&pq6>@txQZ_{ zEUC@?Bzmx{hFlUWc#y;@zErC%LnSFBQN+524Gkp$&6DntZApRK zdCRF9rsoH~G#XN4dEcz<$%0#!ZYfgC3iRHyYqq~A(4C&$5=bmNWu70*+co(xsP0I2 z)7+_0GMslTv$AEnw%Rv@34h=A1TyX3Tb(M<@_$O@f=R zp=kR1jBdhs9-et&JddAw(aC1K) z%?Gwh>G8Jr(oE0=l~4k@(H5D&SS*5NW>!#@9_8Bj!}#WOtmSqtitR!mg;u15_G(YEoJyy9gnfC;X55q@V$l~bo_{)bo>lc z#||tV8I%RCmja7eyxpKuc{Uy8W_j8SWjdtN+r^%aJJ{D?>o~wKOreU^0Di ze%y-1b#4_hrQ;22smicM8pflZm2(1i6_pOHs3Mubm2&uSD{2UAvN={&++vO;KsQa3 ziYz6fy#Xrbq-VKy*v~rsHhQJN-F8A6(zRUFKTge^Z6}JeKDsDI-Lxanun7<_+ra;| z&!edpC2KWb?n#&TRM;L1yDXM;qoqYeHZ-z$ix=YvFHFHZj-|j=f@@X~#|iH4qnj&W zD02dld4;a+6Lh~s;&;lr@H)ox}ZXu z|5=aPyf!h{aDNDmD_};so}Z-i{$nILUEyCp#%l`J@IWUZ^#uT$8mDU&UnVkg3Tg)P zc!!Q?7z@-<+A}clF1hIhI>@K*McCfQ2UJvuClrT*pDiKgh1SyG@(wzbt literal 0 HcmV?d00001 diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/CustomerResource.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/CustomerResource.class new file mode 100644 index 0000000000000000000000000000000000000000..92fd5683148fcca9f317e5c2c8872798b68d5cc8 GIT binary patch literal 2727 zcmc&$ZFkgE5Pohc&2~xOU!Y*2P>^jwB3NHr(NYRT*LKU6D&SkXduda%$Siij^q zzx&C*p&l(BImaL1kMj83B-?H(R=#-rFq3;HGjr#enLEiJfByD6fC+q^$1pByn9ZXF zm)r3Su4uTbHrMjl4^y$X+VM7uIlPm{9Om;VVL`F$ij@^xRP2UgONza#*n5iIRP2^w zx0TEHbNC>K57qLcJU)h{VOc{(KntY5Zdath$zsK;8CDQRp)^vdF%t!$SCf7@(V7%! zo3dRyyeP1*Ft#MnI^$Jo+*Pz)ITzKIrN3w`JCyVmy^7^5S-!3IsjxL%wF80E%}4n% z@FKq=gYCnvrxKo~ugI_w0}YQB%(3E{wQg+~_X5KYjEd(=gZg#P4J7sRl{8?pDj-Y> zW;ZIb9@>1bp{jwA4PB4i(5}fPJFpqrwCj4I6>A9eWV~OUU8K(wS^bjbTQwOK-qHs>K0OzsU?^JT0iaO$bNsnRs3 zuw;d+jIzVHzmvNMyE9R`p)zssZ-xzwofThZuw5!VRWN%)+ZE`1Sp|_V$L(^(R$VsG z$Y!Hw&M9aD?M4HPz+fio8FoTclL0+-TlKnQSK`_mYk}wP)-Cy7HDYH@>KMUscEZ2k z5FJNxOyF3PCL26%Ph+}nH(FK4Y1~m>S9Gkx*084I6F35WwmXvTlfsyWnhqD9hPsZs z@O1==g^ERrtt)mxDz?fW_nC@#ENB%nMY5@ z*T1|OgmNTX(!!XINj%i>g^n-r6}v49@gMFmv#cs&IF`F&%rCFWO313kqTsG$loyKI z7nI<4RGX!ZOK(J>?HENn2wA*=LR{8n$CGLxuJP0)!mOA>w62sK_D?1%TG{SO9MxzhSx>&_oT5$BZjM7npg#qWz)T(T zvQqJq?Kq3xWezt6!2NW!dVYI#Az97X;if>2Z_6BU^w-AaExR61Z%)Sp$=2c2pGfp( zYnIJ6R3@cW&rMCPSQ`T0a$M~cD2?U6lbBC9%`{bsziBT0{}l(b*Rzui(+%Z{^qKW| z*w5eLDA{h?xc5_yNgU^wewcp%g5P4!3a(nY=6oSP!QCb7;|k~=e*`i97%ev+Vc#!k z{gJX3jFNX!1L&h&54zBglicZv4Nl=%?)ZsCf$x>St9-U7{m0mUbNpwt9@#?MBWPR5 z{XlWzvMn|rid_vR>ZvPr&=|(~{tUI-`0gy8!?}1ZVDR}oN$1xV=Sdd=Y735=iS+pI z(GiDh{)G14{1y(xA)MWUPU;|alDbIUq#jZ)sgKl88XygB;h+k=_t5U32lTIFpwM05bncxhZqHC4d z?^pLvA&`bh&Mf;;>xj_gKun281>&N1=BjC6|6 vSw64vsn8`QGMmsTOiwP+>(p<-#hAYl7jBdQQlxKUT7kO_5wP)QcGiCZ&kV)u literal 0 HcmV?d00001 diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/InvoiceResource.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/resources/InvoiceResource.class new file mode 100644 index 0000000000000000000000000000000000000000..6c644c63f5bab5464759a7fee95eb6ebf7acb7a9 GIT binary patch literal 4255 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 literal 0 HcmV?d00001 diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/response/ApiResponse.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/response/ApiResponse.class new file mode 100644 index 0000000000000000000000000000000000000000..ddae3eefb512e8dbe41ad5ddf6bf0262e30d3987 GIT binary patch literal 2406 zcmaJ@Yg5}s6g@J2$U+I>5dtBA4YU|TqqIp&TWE-59O{-wih;h%2qTPABQchog#XkJ z?MzEE{m>uKAJyquX>H3Mr{kHG?%uoSocmaf|M~Z?zX3eLaSESm7{Xc_DXfd-GqF6@ zuz@Ej6jVGF?xKcGl*HyU4O{qJLm6L)<;xVd6~wFVsik0a`-S<^H0q{PGs=!{)vU&v zg4BiOd1j6Nk%+(IH*BXychYiv+rR4e?w!1_sy@AATlCDQRuWs4HlZO8T>D;UTv z9Wk3?kj>Dx?O40bixaDHV4l~__?Fig*H`j*kKyh{qS zjKZb8FW;HW?Odb)GDSf+o-0QjvNFP5=5rj?@t6#JH zFdrsIxRlqjd;tjDT34Pk;X&qn64}$V$%dF$zFEjw7Z!mPAf$7-BxK7 zOiSL^#w*Wgct+K2SVqgu%4rq1*{E92Y|(~Wk*eMo6Q^J*QhdH%xQ@}95KqSpW_8@c zu#ORo>KMcA6rSt&3i}FXBPaW{jTNgjt5p_AM+GY>9OyX2106@g_*%y|_&$Xn1nQ4E ze!?pCb#6hJIrS9+h>RCPoi*$At4yuI0k%%*l?>r_^YYZ>cE${jDA2dvn(JiFOeW9Z z;SRdIW0d$(T!X!{V3eXA?A${2-1N@FK^W~Iv?oP@>bqex`D)9HrC?IT_U(#-nESJW zp;nikHtqVU)u7(8<5-Pi-Sj+*7vsJEYwbeMX|{Ult&F|F3O1s5qjjNz0q!fg7l3Su z6CoQ}e)ER-K};bg28C}iF)P87QlA!wUA%YH4Al0-qrL|tbnG_12H zYq8i*#PT)LQU_nPK2owhQsxLf&kPqLRak6GS!5mZBv!DD6)E6@zy{R(?-;no;4c&! zqf{VC4=BCUOjRQB&fva0Uyuo;^Ri@}YH4(VR4U0jO-Z-qq-A9k74h*njX(PaID;ngw3Jjfk{C YnPChcGb)Bp@ExBT;mZ7v^ld!-AA{_~TL1t6 literal 0 HcmV?d00001 diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/service/AuthService.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/service/AuthService.class new file mode 100644 index 0000000000000000000000000000000000000000..780a797e214163980ff4c761c5f6d888488620e7 GIT binary patch literal 1650 zcmd6nO>fgc5Qg7P^Xa-@ffQ1w&;o^|Uxv0Iq#~rM1r#YNhgRk6Iwm!8>?n3h=^6Mv zaA^?-4jlPWh<7(8N}HtfciOwwzDG^I7TA`zXSH3qj+M#izzqdv zYIe{xtuX3Dju|@bL)Ui9jZSp1)0Ni+QeMz-eSyd2+8gW8GCj+0m^)G1^&9Jhn#!O` zAlsp9-)gF02ApueWrg9}pj{Wxo*mgvD{=!r%;15*Xs1=TB4@J`MnThQ3w$hB2e0^d zn(76&RjV@JnjObfW!R!Bp#N5ED^hLW^}O9+i!>~bRj-pqPAi;jH+sj+h7r+Nzhk$> zByjXti8XFGP0RH-w+;ed8oaiSmlk!8tX53h|jj0>d0N z&VWwi5sp$)MqG_@#V-WLX(1iFzz`oG_XUZC#S;vD;-c#$tqx5n2Qyux*a6KkfxOz! z;R>Y$uJW9Wt-wEP8@vC`6C>Oy(Y>*_R7@6A#dI-K$QE)%tuS2BPmnwx_9P6Rmtnu} zp6%UQ!gUnYttCvUTj`nBc@`2R)>zeM|)s~!jUyH z6ppN(!2r5ohQg6x1|*IIGazv!n4xean87ybf*FuF63kFI63kFI!)I{rQJ+Bh7gZZ( AZ~y=R literal 0 HcmV?d00001 diff --git a/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/service/ChangeOrderService.class b/AstuteSystem/target/astutesystem/WEB-INF/classes/com/astute/service/ChangeOrderService.class new file mode 100644 index 0000000000000000000000000000000000000000..cbeea9cd544b9ebbdb535b0982271359be52c929 GIT binary patch literal 1260 zcmb`G&u-H|5XQf4{H*A)-N z0WJk`-~o6j#O&G%F3q8b`mj45e>3yj+41i`KYsyugI5+R*s-vS=X%-GOH(hc3ic~F zU?_KFAXS&4&}^MD6pzB8V5s$FAU-7HGZB5{XFhqB`=Q7EQyxkEo;i!^T*eH0eJ>n4 zJXVPkPAsBJ=?UlPoChOu5)DN(NL_8pI}$4Qfns->{R@7{9iPa_CtaqP1F;OxM;tF0cEDYo*;3|oT+r35pPM&{E4e;~y?Jm_{N+v_D zM2?-|?TpmNZVDKG@*S4~+BbQ1o2%Zx?wE72X7#f9TxMyXN0Lh*mfHOksB zRl0OYO`TF|E3Klf2G$Kj6_2n%?ArGjn`eKR}+3U(+e2-xx(1YDJn5YVJagNqXO!*ncTrk$pp5@fCZH7?Wz z8W%2H`bQbRbNfgUj4Nkx@0oMIbLafdIrH<^x9MS)IF~z4!a@h3h)x!Vt6z}+2u_&cCdgRA;O&46(W-u!jZxo`fka%q8mDf;6aP`@kT^_hK+w-|M&V#xLUfGu{htqU#l;d6Q|FPe``7hOw zwwHr;({W#TGJMm$c6EnoQ%YkXfn*%p26nJ(U>p+$W^v!ZGFB88|2>il<{hH$ClrylzUe0Uf;+>GSN&d6Hh17$xJFek~Xdp z`7`HP%rRbae%p!de>2 + + + PM User Guide + + + + +
+

Policy Machine Overview

+

Click here for the Policy Machine User Guide

+
+ +
+

Policy Machine Entities

+

Nodes

+
+
Policy Class
+
+
A Policy Class node is the base node for any policy. For example, the Role Based Access Control policy will have a Policy Class node called RBAC in which the policy is contained.
+
+
Object Attribute
+
+
An Object Attribure node is a container that can hold other Object Attrbibutes or objects, and are often the target of the policies that are defined by the Policy Class they are assigned to. + For example, in a Multiple Layer Security (MLS) Policy Class, there may be an Object Attribute labeled "Top Secret". The nodes (Object Attributes or Objects) that are then assigned to this Object + Attribute might be subjected to the policies defined by the MLS policy class on "Top Secret".
+
+
Object
+
+
An Object is a representation of data, whether the data is on a file system or in a schema.
+
+
User Attribute
+
+
A User Attribute node is a collection of one or many users.
+
+
User
+
+
A User node is a representation of a User of the Policy Machine.
+
+
Operation Set
+
+
An Operation Set node is a collection of Operations. This set is then used to connect a User Attribute to an Object Attribute, creating an association relationship in which the users that belong to the + User Attribute are granted the rights in the Operation set on the Object Attribute. For example, if there is an Object Attribute called "Medical Records" and a User Attribute called "Doctors" and we want to give + doctors the permission to read and write, we would create the association: "Doctor" ---> Operation Set{read, write} ---> "Medical Records".
+
+
+ +

Deny Constraints

+

While Policies can be defined on tables and columns, there is still a need to restrict access at the record field level. For example, consider a table called "Employee Record" with the columns: Name, Phone Number, Salary and a User Bob. + The Name and Phone Number fields may be public information available to everyone, however, the Salary field is private data and Bob can only read his own salary, no one elses. We can use a deny constraint to deny + Bob the ability to read the column "Salary" instersected with the complement of his own Record. This would lead to Bob only being able to read the Salary field of his own record.

+

Assignments

+

Assignments are fundamental to the Policy Machine because they are how Policies are created and enforced.

+

Operations

+

Brief explanation of different kinds (class) of Operations. Describe resource vs admin

+

Policy Scripts

+ Policy Scripts are another means of defining policies in the Policy Machine. For example, we can write a script that when a User is created, an Object Attribute called User Home is also created. We can then grant the new User the permissions + read and write on that Object Attribute. This is just one example of using Policy Scripts. An in-depth documentation with example scripts is available here. +
+
+

Examples

+

Examples and use cases of Policy Machine calls

+
+
+

Policy Machine API

+
+ + + diff --git a/AstuteSystem/target/astutesystem/images/logo.png b/AstuteSystem/target/astutesystem/images/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..a4b9d99810488943e91f08c398752500538ef729 GIT binary patch literal 4208 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 + + + + + + + + + + diff --git a/AstuteSystem/target/astutesystem/index.html b/AstuteSystem/target/astutesystem/index.html new file mode 100644 index 0000000..adf7ac4 --- /dev/null +++ b/AstuteSystem/target/astutesystem/index.html @@ -0,0 +1,3 @@ +Welcome + +Astute LLC \ No newline at end of file