From 065970df41e7e30fd20c69292dac2136555611cf Mon Sep 17 00:00:00 2001
From: MelroseDigital <104215821+MelroseDigital@users.noreply.github.com>
Date: Mon, 23 May 2022 10:48:47 -0700
Subject: [PATCH 01/56] Initial commit

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..6dbfcc3
--- /dev/null
+++ b/README.md
@@ -0,0 +1,2 @@
+# Pi2a1000Places
+P1: Gourmet Pizza Restaurant API

From 21089a25af9b4c52fc8891d16f356280f497c175 Mon Sep 17 00:00:00 2001
From: MelroseDigital <104215821+MelroseDigital@users.noreply.github.com>
Date: Mon, 23 May 2022 10:51:50 -0700
Subject: [PATCH 02/56] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6dbfcc3..8c89500 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,2 @@
-# Pi2a1000Places
+# Pi2a1000Places_API_TM_RD
 P1: Gourmet Pizza Restaurant API

From c3339ef0d87b1462dd022fce938920df00603879 Mon Sep 17 00:00:00 2001
From: Maxwell Moord <maxwellmoord@gmail.com>
Date: Tue, 24 May 2022 19:37:57 -0400
Subject: [PATCH 03/56] Added models for each package

---
 .idea/workspace.xml                             | 17 ++++++++---------
 .../Pi2a1000Places/credit_card/CreditCard.java  |  4 ++++
 .../Pi2a1000Places/customer/Customer.java       |  4 ++++
 .../com/revature/Pi2a1000Places/menu/Menu.java  |  4 ++++
 .../revature/Pi2a1000Places/order/Order.java    |  4 ++++
 .../Pi2a1000Places/util/ConnectionFactory.java  |  4 ++++
 6 files changed, 28 insertions(+), 9 deletions(-)
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/credit_card/CreditCard.java
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/customer/Customer.java
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/menu/Menu.java
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/order/Order.java
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/util/ConnectionFactory.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e85607c..d83c502 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,20 +4,19 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="9d8719fb-82bf-4a6d-b706-f8376dbc2834" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/test/java/org/example/AppTest.java" afterDir="false" />
-    </list>
+    <list default="true" id="9d8719fb-82bf-4a6d-b706-f8376dbc2834" name="Changes" comment="" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Class" />
+      </list>
+    </option>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
diff --git a/src/main/java/com/revature/Pi2a1000Places/credit_card/CreditCard.java b/src/main/java/com/revature/Pi2a1000Places/credit_card/CreditCard.java
new file mode 100644
index 0000000..e7acf75
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/credit_card/CreditCard.java
@@ -0,0 +1,4 @@
+package com.revature.Pi2a1000Places.credit_card;
+
+public class CreditCard {
+}
diff --git a/src/main/java/com/revature/Pi2a1000Places/customer/Customer.java b/src/main/java/com/revature/Pi2a1000Places/customer/Customer.java
new file mode 100644
index 0000000..16c9aa2
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/customer/Customer.java
@@ -0,0 +1,4 @@
+package com.revature.Pi2a1000Places.customer;
+
+public class Customer {
+}
diff --git a/src/main/java/com/revature/Pi2a1000Places/menu/Menu.java b/src/main/java/com/revature/Pi2a1000Places/menu/Menu.java
new file mode 100644
index 0000000..b119848
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/menu/Menu.java
@@ -0,0 +1,4 @@
+package com.revature.Pi2a1000Places.menu;
+
+public class Menu {
+}
diff --git a/src/main/java/com/revature/Pi2a1000Places/order/Order.java b/src/main/java/com/revature/Pi2a1000Places/order/Order.java
new file mode 100644
index 0000000..40180ea
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/order/Order.java
@@ -0,0 +1,4 @@
+package com.revature.Pi2a1000Places.order;
+
+public class Order {
+}
diff --git a/src/main/java/com/revature/Pi2a1000Places/util/ConnectionFactory.java b/src/main/java/com/revature/Pi2a1000Places/util/ConnectionFactory.java
new file mode 100644
index 0000000..3b00536
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/util/ConnectionFactory.java
@@ -0,0 +1,4 @@
+package com.revature.Pi2a1000Places.util;
+
+public class ConnectionFactory {
+}

From b0e5056e7f2f4ce59b2d2403bbf719df9cd9e263 Mon Sep 17 00:00:00 2001
From: MelroseDigital <Tenyce.Melrose@gmail.com>
Date: Wed, 25 May 2022 13:52:55 -0700
Subject: [PATCH 04/56] New Branch TM_p1

---
 .../java/com/revature/pi/menus/Customer.java  |  4 +
 .../com/revature/pi/models/CreditCard.java    | 69 +++++++++++++++
 .../java/com/revature/pi/models/Customer.java | 86 +++++++++++++++++++
 .../java/com/revature/pi/models/Menu.java     | 19 ++++
 .../java/com/revature/pi/models/Order.java    |  6 ++
 5 files changed, 184 insertions(+)
 create mode 100644 src/main/java/com/revature/pi/menus/Customer.java
 create mode 100644 src/main/java/com/revature/pi/models/CreditCard.java
 create mode 100644 src/main/java/com/revature/pi/models/Customer.java
 create mode 100644 src/main/java/com/revature/pi/models/Menu.java
 create mode 100644 src/main/java/com/revature/pi/models/Order.java

diff --git a/src/main/java/com/revature/pi/menus/Customer.java b/src/main/java/com/revature/pi/menus/Customer.java
new file mode 100644
index 0000000..b47a2e5
--- /dev/null
+++ b/src/main/java/com/revature/pi/menus/Customer.java
@@ -0,0 +1,4 @@
+package com.revature.pi.menus;
+
+public class Customer {
+}
diff --git a/src/main/java/com/revature/pi/models/CreditCard.java b/src/main/java/com/revature/pi/models/CreditCard.java
new file mode 100644
index 0000000..c76f2e4
--- /dev/null
+++ b/src/main/java/com/revature/pi/models/CreditCard.java
@@ -0,0 +1,69 @@
+package com.revature.pi.models;
+
+public class CreditCard {
+
+    private String cardNumber;
+    private String cardName;
+    private String cvv;
+    private String expDate;
+    private String zip;
+    private String limit;
+    private String userName;
+
+
+    public CreditCard(String cardName, String cvv, String expDate, String zip, String limit, String userName) {
+        this.cardName = cardName;
+        this.cvv = cvv;
+        this.expDate = expDate;
+        this.zip = zip;
+        this.limit = limit;
+        this.userName = userName;
+
+    }
+
+    public String getCardName() {
+        return cardName;
+    }
+
+    public String getCvv() {
+        return cvv;
+    }
+
+    public String getExpDate() {
+        return expDate;
+    }
+
+    public String getZip() {
+        return zip;
+    }
+
+    public String getLimit() {
+        return limit;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setCardNumber(String cardName) {
+        this.cardName = cardName;
+    }
+
+    public void setCvv(String cvv) {
+        this.cvv = cvv;
+    }
+
+    public void setExpDate(String expDate) {
+        this.expDate = expDate;
+    }
+
+    public void setZip(String zip) {
+        this.zip = zip;
+    }
+
+    public void setLimit(String limit) {
+        this.limit = limit;
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/revature/pi/models/Customer.java b/src/main/java/com/revature/pi/models/Customer.java
new file mode 100644
index 0000000..3293d9a
--- /dev/null
+++ b/src/main/java/com/revature/pi/models/Customer.java
@@ -0,0 +1,86 @@
+package com.revature.pi.models;
+
+public class Customer {
+     {
+
+    }
+    //Customer-facing, experience API Layer
+    private String userName;
+    private String firstName;
+    private String lastName;
+    private String password;
+    private String balance;
+    //private String is_admin;
+    //Record as a String, convert to a Boolean later? Parse it? Lookup when and why?
+
+    public Customer(String userName, String firstName, String lastName, String password, String balance) {
+        this.userName = userName;
+        this.firstName = firstName;
+        this.lastName = lastName;
+        this.password = password;
+        this.balance = balance;
+        //this.is_admin= false;
+    }
+    //Getters & setters used for fetching and updating variable value.
+    public String getUserName() {
+        return userName;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public String getBalance() {
+        return balance;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public void setBalance(String balance) {
+        this.balance = balance;
+        {
+
+        }
+//        public String toFileString () {
+//            StringBuilder stringBuilder = new StringBuilder()
+//                    .append(userName).append(",")
+//                    .append(firstName).append(",")
+//                    .append(lastName).append(",")
+//                    .append(password).append(",")
+//                    .append(balance).append(",");
+//
+//            return stringBuilder.toString();
+//        }
+//        public String () {
+//            return "Customer{" +
+//                    ",email='" + userName + '\' +
+//            "firstName='" + firstName '\' +
+//            "lastName='" + lastName '\' +
+//            "password='" + password '\' +
+//            "balance='" + balance '\' +
+//            '}';
+        }
+
+    }
\ No newline at end of file
diff --git a/src/main/java/com/revature/pi/models/Menu.java b/src/main/java/com/revature/pi/models/Menu.java
new file mode 100644
index 0000000..99e4fed
--- /dev/null
+++ b/src/main/java/com/revature/pi/models/Menu.java
@@ -0,0 +1,19 @@
+package com.revature.pi.models;
+
+public class Menu {
+
+    private String itemName;
+    private String cost;
+    private String pizza1;
+    // private String pizza2;
+    private String addTopping;
+
+    public Menu(String itemName, String cost, String pizza1, String addTopping) {
+        this.itemName = itemName;
+        this.cost = cost;
+        this.pizza1 = pizza1;
+        //this.pizza2 = pizza2;
+        this.addTopping = addTopping;
+
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/revature/pi/models/Order.java b/src/main/java/com/revature/pi/models/Order.java
new file mode 100644
index 0000000..2750476
--- /dev/null
+++ b/src/main/java/com/revature/pi/models/Order.java
@@ -0,0 +1,6 @@
+package com.revature.pi.models;
+
+public class Order {
+
+
+}

From bf3dd08d8cf6a573df69e1d50fb8772b43a5fe8d Mon Sep 17 00:00:00 2001
From: MelroseDigital <Tenyce.Melrose@gmail.com>
Date: Wed, 25 May 2022 13:58:39 -0700
Subject: [PATCH 05/56] New Branch TM_p1

---
 src/main/java/com/revature/pi/daos/CreditCardDaos.java        | 4 ++++
 src/main/java/com/revature/pi/daos/CustomerDaos.java          | 4 ++++
 src/main/java/com/revature/pi/daos/MenuDaos.java              | 4 ++++
 src/main/java/com/revature/pi/daos/OrderDaos.java             | 4 ++++
 .../java/com/revature/pi/services/CreditCardServices.java     | 4 ++++
 src/main/java/com/revature/pi/services/CustomerServices.java  | 4 ++++
 src/main/java/com/revature/pi/services/MenuServices.java      | 4 ++++
 src/main/java/com/revature/pi/services/OrderServices.java     | 4 ++++
 8 files changed, 32 insertions(+)
 create mode 100644 src/main/java/com/revature/pi/daos/CreditCardDaos.java
 create mode 100644 src/main/java/com/revature/pi/daos/CustomerDaos.java
 create mode 100644 src/main/java/com/revature/pi/daos/MenuDaos.java
 create mode 100644 src/main/java/com/revature/pi/daos/OrderDaos.java
 create mode 100644 src/main/java/com/revature/pi/services/CreditCardServices.java
 create mode 100644 src/main/java/com/revature/pi/services/CustomerServices.java
 create mode 100644 src/main/java/com/revature/pi/services/MenuServices.java
 create mode 100644 src/main/java/com/revature/pi/services/OrderServices.java

diff --git a/src/main/java/com/revature/pi/daos/CreditCardDaos.java b/src/main/java/com/revature/pi/daos/CreditCardDaos.java
new file mode 100644
index 0000000..cd12a8f
--- /dev/null
+++ b/src/main/java/com/revature/pi/daos/CreditCardDaos.java
@@ -0,0 +1,4 @@
+package com.revature.pi.daos;
+
+public class CreditCardDaos {
+}
diff --git a/src/main/java/com/revature/pi/daos/CustomerDaos.java b/src/main/java/com/revature/pi/daos/CustomerDaos.java
new file mode 100644
index 0000000..5a110f2
--- /dev/null
+++ b/src/main/java/com/revature/pi/daos/CustomerDaos.java
@@ -0,0 +1,4 @@
+package com.revature.pi.daos;
+
+public class CustomerDaos {
+}
diff --git a/src/main/java/com/revature/pi/daos/MenuDaos.java b/src/main/java/com/revature/pi/daos/MenuDaos.java
new file mode 100644
index 0000000..56c5d45
--- /dev/null
+++ b/src/main/java/com/revature/pi/daos/MenuDaos.java
@@ -0,0 +1,4 @@
+package com.revature.pi.daos;
+
+public class MenuDaos {
+}
diff --git a/src/main/java/com/revature/pi/daos/OrderDaos.java b/src/main/java/com/revature/pi/daos/OrderDaos.java
new file mode 100644
index 0000000..0f2dfef
--- /dev/null
+++ b/src/main/java/com/revature/pi/daos/OrderDaos.java
@@ -0,0 +1,4 @@
+package com.revature.pi.daos;
+
+public class OrderDaos {
+}
diff --git a/src/main/java/com/revature/pi/services/CreditCardServices.java b/src/main/java/com/revature/pi/services/CreditCardServices.java
new file mode 100644
index 0000000..303a7a4
--- /dev/null
+++ b/src/main/java/com/revature/pi/services/CreditCardServices.java
@@ -0,0 +1,4 @@
+package com.revature.pi.services;
+
+public class CreditCardServices {
+}
diff --git a/src/main/java/com/revature/pi/services/CustomerServices.java b/src/main/java/com/revature/pi/services/CustomerServices.java
new file mode 100644
index 0000000..528e4d4
--- /dev/null
+++ b/src/main/java/com/revature/pi/services/CustomerServices.java
@@ -0,0 +1,4 @@
+package com.revature.pi.services;
+
+public class CustomerServices {
+}
diff --git a/src/main/java/com/revature/pi/services/MenuServices.java b/src/main/java/com/revature/pi/services/MenuServices.java
new file mode 100644
index 0000000..82eaf4b
--- /dev/null
+++ b/src/main/java/com/revature/pi/services/MenuServices.java
@@ -0,0 +1,4 @@
+package com.revature.pi.services;
+
+public class MenuServices {
+}
diff --git a/src/main/java/com/revature/pi/services/OrderServices.java b/src/main/java/com/revature/pi/services/OrderServices.java
new file mode 100644
index 0000000..422eecb
--- /dev/null
+++ b/src/main/java/com/revature/pi/services/OrderServices.java
@@ -0,0 +1,4 @@
+package com.revature.pi.services;
+
+public class OrderServices {
+}

From 6b83566d5a62534c5c89e87c5f5cc8a461cdcef2 Mon Sep 17 00:00:00 2001
From: Maxwell Moord <maxwellmoord@gmail.com>
Date: Wed, 25 May 2022 23:02:32 -0400
Subject: [PATCH 06/56] Updated something, not sure what

---
 .idea/workspace.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d83c502..bf3584b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="9d8719fb-82bf-4a6d-b706-f8376dbc2834" name="Changes" comment="" />
+    <list default="true" id="9d8719fb-82bf-4a6d-b706-f8376dbc2834" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />

From 1a762c8a1095150ac8b5221a4dd706aeae477ef6 Mon Sep 17 00:00:00 2001
From: MelroseDigital <Tenyce.Melrose@gmail.com>
Date: Wed, 25 May 2022 20:48:07 -0700
Subject: [PATCH 07/56] First Layer in Progress...

---
 .../java/com/revature/pi/daos/Crudable.java   | 17 ++++++++
 .../java/com/revature/pi/menus/Customer.java  |  4 --
 .../java/com/revature/pi/models/Customer.java | 43 +++++++++++--------
 .../com/revature/pi/services/Serviceable.java | 19 ++++++++
 .../java/com/revature/pi/util/MainDriver.java |  4 ++
 5 files changed, 64 insertions(+), 23 deletions(-)
 create mode 100644 src/main/java/com/revature/pi/daos/Crudable.java
 delete mode 100644 src/main/java/com/revature/pi/menus/Customer.java
 create mode 100644 src/main/java/com/revature/pi/services/Serviceable.java
 create mode 100644 src/main/java/com/revature/pi/util/MainDriver.java

diff --git a/src/main/java/com/revature/pi/daos/Crudable.java b/src/main/java/com/revature/pi/daos/Crudable.java
new file mode 100644
index 0000000..d6396c2
--- /dev/null
+++ b/src/main/java/com/revature/pi/daos/Crudable.java
@@ -0,0 +1,17 @@
+package com.revature.pi.daos;
+
+import java.io.IOException;
+import java.sql.SQLException;
+
+public interface Crudable<T> {
+
+
+    T create(T newCustomer) throws SQLException;
+
+    T[] findAll() throws IOException;
+    T findById(String id);
+
+    boolean update(T updatedObject);
+
+    boolean delete(String id);
+}
diff --git a/src/main/java/com/revature/pi/menus/Customer.java b/src/main/java/com/revature/pi/menus/Customer.java
deleted file mode 100644
index b47a2e5..0000000
--- a/src/main/java/com/revature/pi/menus/Customer.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.revature.pi.menus;
-
-public class Customer {
-}
diff --git a/src/main/java/com/revature/pi/models/Customer.java b/src/main/java/com/revature/pi/models/Customer.java
index 3293d9a..a660882 100644
--- a/src/main/java/com/revature/pi/models/Customer.java
+++ b/src/main/java/com/revature/pi/models/Customer.java
@@ -1,5 +1,6 @@
 package com.revature.pi.models;
 
+//import com.fasterxml.jackson.annotation.JsonIgnore;
 public class Customer {
      {
 
@@ -13,7 +14,7 @@ public class Customer {
     //private String is_admin;
     //Record as a String, convert to a Boolean later? Parse it? Lookup when and why?
 
-    public Customer(String userName, String firstName, String lastName, String password, String balance) {
+ {
         this.userName = userName;
         this.firstName = firstName;
         this.lastName = lastName;
@@ -21,6 +22,8 @@ public Customer(String userName, String firstName, String lastName, String passw
         this.balance = balance;
         //this.is_admin= false;
     }
+    public Customer(String userName, String firstName, String lastName, String password, String balance) {
+    }
     //Getters & setters used for fetching and updating variable value.
     public String getUserName() {
         return userName;
@@ -62,25 +65,27 @@ public void setBalance(String balance) {
         this.balance = balance;
         {
 
-        }
-//        public String toFileString () {
-//            StringBuilder stringBuilder = new StringBuilder()
-//                    .append(userName).append(",")
-//                    .append(firstName).append(",")
-//                    .append(lastName).append(",")
-//                    .append(password).append(",")
-//                    .append(balance).append(",");
-//
-//            return stringBuilder.toString();
-//        }
-//        public String () {
+//            @Override
+//            public String toString() {
 //            return "Customer{" +
-//                    ",email='" + userName + '\' +
-//            "firstName='" + firstName '\' +
-//            "lastName='" + lastName '\' +
-//            "password='" + password '\' +
-//            "balance='" + balance '\' +
-//            '}';
+//                    ",userName='" + userName + '\' +;
+//                    "firstName='" + firstName '\' +
+//                     "lastName='" + lastName '\' +
+//                    "password='" + password '\' +
+//                     "balance='" + balance '\' +
+//                    '}';
         }
+        }
+        public String toFileString () {
+            StringBuilder stringBuilder = new StringBuilder()
+                    .append(userName).append(",")
+                    .append(firstName).append(",")
+                    .append(lastName).append(",")
+                    .append(password).append(",")
+                    .append(balance).append(",");
+
+            return stringBuilder.toString();
+        }
+
 
     }
\ No newline at end of file
diff --git a/src/main/java/com/revature/pi/services/Serviceable.java b/src/main/java/com/revature/pi/services/Serviceable.java
new file mode 100644
index 0000000..557327e
--- /dev/null
+++ b/src/main/java/com/revature/pi/services/Serviceable.java
@@ -0,0 +1,19 @@
+package com.revature.pi.services;
+
+public interface Serviceable<T> {
+    //Create, Read, Update, Delete Functions.
+
+    T create(T newObject);
+
+    //
+    T[] readAll();
+    T readByUserName(String userName);
+
+    //
+    T update(T updatedObject);
+
+    //
+    boolean delete(String id);
+
+    boolean validateInput(T object);
+}
diff --git a/src/main/java/com/revature/pi/util/MainDriver.java b/src/main/java/com/revature/pi/util/MainDriver.java
new file mode 100644
index 0000000..82aad8b
--- /dev/null
+++ b/src/main/java/com/revature/pi/util/MainDriver.java
@@ -0,0 +1,4 @@
+package com.revature.pi.util;
+
+public class MainDriver {
+}

From a43da7c948e58b75d5babad842e9dbe8935b7596 Mon Sep 17 00:00:00 2001
From: Maxwell Moord <maxwellmoord@gmail.com>
Date: Thu, 26 May 2022 21:49:14 -0400
Subject: [PATCH 08/56] Added the model for customer

---
 .idea/workspace.xml                           | 15 ++++-
 .../Pi2a1000Places/customer/Customer.java     | 58 +++++++++++++++++++
 .../revature/Pi2a1000Places/order/Order.java  |  5 ++
 3 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/customer/Customer.java
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/order/Order.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 39b72bc..26d02d2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,15 +5,22 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="9d8719fb-82bf-4a6d-b706-f8376dbc2834" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/revature/Pi2a1000Places/customer/Customer.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/revature/Pi2a1000Places/order/Order.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/revature/Pi2a1000Places/util/ConnectionFactory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/revature/Pi2a1000Places/util/ConnectionFactory.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Class" />
+      </list>
+    </option>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
@@ -44,6 +51,10 @@
     </task>
     <servers />
   </component>
+  <component name="UnknownFeatures">
+    <option featureType="dependencySupport" implementationName="java:javax.persistence:javax.persistence-api" />
+    <option featureType="dependencySupport" implementationName="java:org.hibernate:hibernate-core" />
+  </component>
   <component name="Vcs.Log.Tabs.Properties">
     <option name="TAB_STATES">
       <map>
diff --git a/src/main/java/com/revature/Pi2a1000Places/customer/Customer.java b/src/main/java/com/revature/Pi2a1000Places/customer/Customer.java
new file mode 100644
index 0000000..fe7dedd
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/customer/Customer.java
@@ -0,0 +1,58 @@
+package com.revature.Pi2a1000Places.customer;
+
+public class Customer {
+
+    private String username;
+    private String fname;
+    private String lname;
+    private String password;
+    private String balance;
+
+    public Customer( String username, String password, String fname,String lname, String balance){
+        super();
+        this.fname = fname;
+        this.lname = lname;
+        this.balance = balance;
+        this.username = username;
+        this.password = password;
+    }
+
+    public Customer(){
+
+    }
+
+    //Getters And Setters
+    public String getFname(){return fname;}
+
+    public void setFname(String fname){this.fname = fname;}
+
+    public String getLname(){return lname;}
+
+    public void setLname(String lname){this.lname = lname;}
+
+    public String getBalance(){return balance;}
+
+    public void setBalance(String balance){this.balance = balance;}
+
+    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;}
+
+
+
+
+
+    @Override
+    public String toString() {
+        return "User Info{" +
+                "First Name ='" + fname + '\'' +
+                ", Last Name ='" + lname + '\'' +
+                '}';
+    }
+
+}
+
diff --git a/src/main/java/com/revature/Pi2a1000Places/order/Order.java b/src/main/java/com/revature/Pi2a1000Places/order/Order.java
new file mode 100644
index 0000000..974f3de
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/order/Order.java
@@ -0,0 +1,5 @@
+package com.revature.Pi2a1000Places.order;
+
+public class Order {
+    
+}

From fb670442849f1495fe9991c8d98f201647ccdae1 Mon Sep 17 00:00:00 2001
From: Maxwell Moord <maxwellmoord@gmail.com>
Date: Fri, 27 May 2022 14:26:43 -0400
Subject: [PATCH 09/56] added the ability to add a customer to the database,
 with authentication. Also added the files for Order to be implemented later

---
 .idea/workspace.xml                           | 37 ++++++-
 .../Pi2a1000Places/auth/AuthServlet.java      | 50 ++++++++++
 .../Pi2a1000Places/auth/LoginCreds.java       | 25 +++++
 .../Pi2a1000Places/customer/CustomerDao.java  | 96 +++++++++++++++++++
 .../customer/CustomerServices.java            | 67 +++++++++++++
 .../customer/CustomerServlet.java             | 47 +++++++++
 .../Pi2a1000Places/order/OrderDao.java        |  4 +
 .../Pi2a1000Places/order/OrderServices.java   |  4 +
 .../Pi2a1000Places/order/OrderServlet.java    |  4 +
 .../exceptions/AuthenticationException.java   |  8 ++
 .../exceptions/InvalidRequestException.java   |  7 ++
 .../ResourcePersistanceException.java         |  8 ++
 .../util/interfaces/Authable.java             | 19 ++++
 .../util/web/ContextLoaderListener.java       | 40 ++++++++
 src/main/webapp/WEB-INF/web.xml               | 11 +++
 src/main/webapp/index.html                    | 30 ++++++
 src/main/webapp/style.css                     | 17 ++++
 src/test/java/org/example/AppTest.java        | 20 ----
 18 files changed, 471 insertions(+), 23 deletions(-)
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/auth/AuthServlet.java
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/auth/LoginCreds.java
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/customer/CustomerDao.java
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/customer/CustomerServices.java
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/order/OrderDao.java
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/order/OrderServices.java
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/order/OrderServlet.java
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/util/exceptions/AuthenticationException.java
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/util/exceptions/InvalidRequestException.java
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/util/exceptions/ResourcePersistanceException.java
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/util/interfaces/Authable.java
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/util/web/ContextLoaderListener.java
 create mode 100644 src/main/webapp/WEB-INF/web.xml
 create mode 100644 src/main/webapp/index.html
 create mode 100644 src/main/webapp/style.css
 delete mode 100644 src/test/java/org/example/AppTest.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 26d02d2..80cc458 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,9 +5,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="9d8719fb-82bf-4a6d-b706-f8376dbc2834" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/revature/Pi2a1000Places/customer/Customer.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/revature/Pi2a1000Places/order/Order.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/revature/Pi2a1000Places/customer/CustomerDao.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServices.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/org/example/AppTest.java" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -17,6 +18,7 @@
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
+        <option value="Interface" />
         <option value="Class" />
       </list>
     </option>
@@ -28,7 +30,9 @@
     <option name="stateVersion" value="1" />
   </component>
   <component name="ProjectId" id="29dBO6Gd3ab6QP2PtknFypzbzxw" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
+    <ConfirmationsSetting value="1" id="Add" />
+  </component>
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
@@ -40,6 +44,33 @@
     &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;
   }
 }</component>
+  <component name="RunManager">
+    <configuration name="Pi2a1000Places [tomcat7:deploy]" type="MavenRunConfiguration" factoryName="Maven" nameIsGenerated="true">
+      <MavenSettings>
+        <option name="myGeneralSettings" />
+        <option name="myRunnerSettings" />
+        <option name="myRunnerParameters">
+          <MavenRunnerParameters>
+            <option name="profiles">
+              <set />
+            </option>
+            <option name="goals">
+              <list>
+                <option value="tomcat7:deploy" />
+              </list>
+            </option>
+            <option name="pomFileName" />
+            <option name="profilesMap">
+              <map />
+            </option>
+            <option name="resolveToWorkspace" value="false" />
+            <option name="workingDirPath" value="$PROJECT_DIR$" />
+          </MavenRunnerParameters>
+        </option>
+      </MavenSettings>
+      <method v="2" />
+    </configuration>
+  </component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
diff --git a/src/main/java/com/revature/Pi2a1000Places/auth/AuthServlet.java b/src/main/java/com/revature/Pi2a1000Places/auth/AuthServlet.java
new file mode 100644
index 0000000..58368be
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/auth/AuthServlet.java
@@ -0,0 +1,50 @@
+package com.revature.Pi2a1000Places.auth;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.revature.Pi2a1000Places.customer.Customer;
+import com.revature.Pi2a1000Places.customer.CustomerServices;
+import com.revature.Pi2a1000Places.util.exceptions.AuthenticationException;
+import com.revature.Pi2a1000Places.util.exceptions.InvalidRequestException;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+
+
+public class AuthServlet extends HttpServlet {
+
+    private final CustomerServices customerServices;
+
+    private final ObjectMapper mapper;
+
+    public AuthServlet(CustomerServices customerServices, ObjectMapper mapper){
+        this.customerServices = customerServices;
+        this.mapper = mapper;
+    }
+
+    @Override
+    protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+
+        try {
+
+            LoginCreds loginCreds = mapper.readValue(req.getInputStream(), LoginCreds.class);
+
+            Customer authCustomer = customerServices.authenticateCustomer(loginCreds.getUsername(), loginCreds.getPassword());
+
+            HttpSession httpSession = req.getSession(true);
+            httpSession.setAttribute("authCustomer", authCustomer);
+
+
+            resp.getWriter().write("You have successfully logged in!");
+        } catch (AuthenticationException | InvalidRequestException e){
+            resp.setStatus(404);
+            resp.getWriter().write(e.getMessage());
+        } catch (Exception e){
+            resp.setStatus(409);
+            resp.getWriter().write(e.getMessage());
+        }
+    }
+
+}
diff --git a/src/main/java/com/revature/Pi2a1000Places/auth/LoginCreds.java b/src/main/java/com/revature/Pi2a1000Places/auth/LoginCreds.java
new file mode 100644
index 0000000..3e1e50c
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/auth/LoginCreds.java
@@ -0,0 +1,25 @@
+package com.revature.Pi2a1000Places.auth;
+
+public class LoginCreds {
+
+    private static String username;
+    private static String password;
+
+    // JACKSON REQUIRES A NO ARG CONSTRUCTOR
+
+    public static String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public static String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+}
diff --git a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerDao.java b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerDao.java
new file mode 100644
index 0000000..d934e29
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerDao.java
@@ -0,0 +1,96 @@
+package com.revature.Pi2a1000Places.customer;
+
+import com.revature.Pi2a1000Places.util.ConnectionFactory;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class CustomerDao {
+
+    public static Customer create(Customer newUser) {
+
+        System.out.println("Here is the newUser as it enters our DAO layer: " + newUser); // What happens here? Java knows to invoke the toString() method when printing the object to the terminal
+
+        try (Connection conn = ConnectionFactory.getInstance().getConnection();) {
+
+            String sql = "insert into customer (username, fname, lname, password) values (?, ?, ?, ?)";
+
+            PreparedStatement ps = conn.prepareStatement(sql);
+
+
+            ps.setString(1, newUser.getUsername());
+            ps.setString(2, newUser.getFname());
+            ps.setString(3, newUser.getLname());
+            ps.setString(4, newUser.getPassword());
+
+            int checkInsert = ps.executeUpdate();
+
+            if (checkInsert == 0) {
+                throw new RuntimeException();
+            }
+
+        } catch (SQLException | RuntimeException e) {
+            e.printStackTrace();
+            return null;
+        }
+        return newUser;
+    }
+
+
+    public Boolean pullUsernames(String username) {
+        try (Connection conn = ConnectionFactory.getInstance().getConnection()) {
+            String sql = "select username from customer where username = ?";
+            PreparedStatement ps = conn.prepareStatement(sql);
+            ps.setString(1, username);
+
+            ResultSet rs = ps.executeQuery();
+
+            if (!rs.isBeforeFirst()) {
+                return false;
+            }
+            return true;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+
+    }
+
+
+
+    public Customer authenticateCustomer(String username, String password) {
+
+        try (Connection conn = ConnectionFactory.getInstance().getConnection()) {
+            String sql = "select * from customer where username = ? and password = ?";
+            PreparedStatement ps = conn.prepareStatement(sql);
+            ps.setString(1, username);
+            ps.setString(2, password);
+
+            ResultSet rs = ps.executeQuery();
+
+            if (!rs.next()) {
+                return null;
+            }
+
+            Customer customer = new Customer();
+
+
+            customer.setUsername(rs.getString("username"));
+            customer.setFname(rs.getString("fname"));
+            customer.setLname(rs.getString("lname"));
+            customer.setPassword(rs.getString("password"));
+
+
+            return customer;
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return null;
+        }
+
+
+    }
+
+}
diff --git a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServices.java b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServices.java
new file mode 100644
index 0000000..1c91a5c
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServices.java
@@ -0,0 +1,67 @@
+package com.revature.Pi2a1000Places.customer;
+
+import com.revature.Pi2a1000Places.util.exceptions.AuthenticationException;
+import com.revature.Pi2a1000Places.util.exceptions.InvalidRequestException;
+
+public class CustomerServices {
+
+    private CustomerDao customerDao = new CustomerDao();
+    private Customer customer = new Customer();
+
+    public CustomerServices(CustomerDao customerDao){this.customerDao = customerDao;}
+
+    public CustomerServices() {
+
+    }
+
+
+    //TODO:Exceptions to yell at the user
+    public boolean validateUserInput(Customer newUser) throws InvalidRequestException {
+        System.out.println("Validating User: " + newUser);
+        if(newUser == null) return false;
+        if(newUser.getFname() == null || newUser.getFname().trim().equals("")){
+            throw new InvalidRequestException("First Name cannot be blank");}
+        if(newUser.getLname() == null || newUser.getLname().trim().equals("")){
+            throw new InvalidRequestException("Last Name cannot be blank");}
+        if(newUser.getUsername() == null || newUser.getUsername().trim().equals("")){
+            throw new InvalidRequestException("Username cannot be blank");}
+        if(newUser.getPassword() == null || newUser.getPassword().trim().equals("")){
+            throw new InvalidRequestException("Password cannot be blank");}
+        System.out.println("The User Has been Validated");
+        if (verifyNewUsername(newUser.getUsername()) == true) {
+            throw new InvalidRequestException("That username has already been taken");
+        }else{
+            createNewUser(newUser);
+            return true;
+        }
+    }
+
+    public boolean verifyNewUsername(String username){
+        return customerDao.pullUsernames(username);
+    }
+
+
+    public Customer createNewUser(Customer newUser){
+        System.out.println("New user being created " + newUser);
+
+        return CustomerDao.create(newUser);
+    }
+
+
+    //Tells the authServlet that everything is good
+    public Customer authenticateCustomer(String username, String password){
+
+        if(password == null || password.trim().equals("") || password == null || password.trim().equals("")) {
+            throw new InvalidRequestException("Either username or password is an invalid entry. Please try logging in again");
+        }
+
+        Customer authenticatedCustomer = customerDao.authenticateCustomer(username, password);
+
+        if (authenticatedCustomer == null){
+            throw new AuthenticationException("Unauthenticated user, information provided was not consistent with our database.");
+        }
+
+        return customer;
+    }
+
+}
diff --git a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java
new file mode 100644
index 0000000..62c624b
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java
@@ -0,0 +1,47 @@
+package com.revature.Pi2a1000Places.customer;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.revature.Pi2a1000Places.util.exceptions.InvalidRequestException;
+import com.revature.Pi2a1000Places.util.interfaces.Authable;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class CustomerServlet extends HttpServlet implements Authable {
+
+    private final CustomerServices customerServices;
+    private final ObjectMapper mapper;
+
+    public CustomerServlet(CustomerServices customerServices, ObjectMapper mapper) {
+        this.customerServices = customerServices;
+        this.mapper = mapper;
+    }
+
+    @Override
+    protected void doOptions(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        super.doOptions(req, resp);
+        resp.addHeader("Access-Control-Allow-Origin", "*");
+        resp.addHeader("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE");
+        resp.addHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
+    }
+
+    @Override
+    protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        resp.addHeader("Access-Control-Allow-Origin", "*");
+        resp.addHeader("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE");
+        resp.addHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
+
+        Customer newUser = mapper.readValue(req.getInputStream(), Customer.class);
+        try {
+            customerServices.validateUserInput(newUser);
+        } catch (InvalidRequestException e) {
+            resp.setStatus(409);
+            resp.getWriter().write(e.getMessage());
+        } finally {
+            resp.getWriter().write("This user has been created " + newUser);
+        }
+    }
+}
diff --git a/src/main/java/com/revature/Pi2a1000Places/order/OrderDao.java b/src/main/java/com/revature/Pi2a1000Places/order/OrderDao.java
new file mode 100644
index 0000000..907bc2a
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/order/OrderDao.java
@@ -0,0 +1,4 @@
+package com.revature.Pi2a1000Places.order;
+
+public class OrderDao {
+}
diff --git a/src/main/java/com/revature/Pi2a1000Places/order/OrderServices.java b/src/main/java/com/revature/Pi2a1000Places/order/OrderServices.java
new file mode 100644
index 0000000..d7ead04
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/order/OrderServices.java
@@ -0,0 +1,4 @@
+package com.revature.Pi2a1000Places.order;
+
+public class OrderServices {
+}
diff --git a/src/main/java/com/revature/Pi2a1000Places/order/OrderServlet.java b/src/main/java/com/revature/Pi2a1000Places/order/OrderServlet.java
new file mode 100644
index 0000000..820e4b6
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/order/OrderServlet.java
@@ -0,0 +1,4 @@
+package com.revature.Pi2a1000Places.order;
+
+public class OrderServlet {
+}
diff --git a/src/main/java/com/revature/Pi2a1000Places/util/exceptions/AuthenticationException.java b/src/main/java/com/revature/Pi2a1000Places/util/exceptions/AuthenticationException.java
new file mode 100644
index 0000000..5b09e62
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/util/exceptions/AuthenticationException.java
@@ -0,0 +1,8 @@
+package com.revature.Pi2a1000Places.util.exceptions;
+
+public class AuthenticationException extends RuntimeException {
+
+    public AuthenticationException(String message) {
+        super(message);
+    }
+}
diff --git a/src/main/java/com/revature/Pi2a1000Places/util/exceptions/InvalidRequestException.java b/src/main/java/com/revature/Pi2a1000Places/util/exceptions/InvalidRequestException.java
new file mode 100644
index 0000000..b73cd02
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/util/exceptions/InvalidRequestException.java
@@ -0,0 +1,7 @@
+package com.revature.Pi2a1000Places.util.exceptions;
+
+public class InvalidRequestException extends RuntimeException{
+    public InvalidRequestException(String message) {
+        super(message);
+    }
+}
diff --git a/src/main/java/com/revature/Pi2a1000Places/util/exceptions/ResourcePersistanceException.java b/src/main/java/com/revature/Pi2a1000Places/util/exceptions/ResourcePersistanceException.java
new file mode 100644
index 0000000..fd01a3e
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/util/exceptions/ResourcePersistanceException.java
@@ -0,0 +1,8 @@
+package com.revature.Pi2a1000Places.util.exceptions;
+
+public class ResourcePersistanceException extends RuntimeException{
+
+    public ResourcePersistanceException(String message) {
+        super(message);
+    }
+}
diff --git a/src/main/java/com/revature/Pi2a1000Places/util/interfaces/Authable.java b/src/main/java/com/revature/Pi2a1000Places/util/interfaces/Authable.java
new file mode 100644
index 0000000..977fae4
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/util/interfaces/Authable.java
@@ -0,0 +1,19 @@
+package com.revature.Pi2a1000Places.util.interfaces;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+
+public interface Authable {
+
+    static boolean checkAuth(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        HttpSession httpSession = req.getSession();
+        if(httpSession.getAttribute("authCustomer") == null){
+            resp.getWriter().write("Unauthorized request - not log in as registered user");
+            resp.setStatus(401); // Unauthorized
+            return false;
+        }
+        return true;
+    }
+}
diff --git a/src/main/java/com/revature/Pi2a1000Places/util/web/ContextLoaderListener.java b/src/main/java/com/revature/Pi2a1000Places/util/web/ContextLoaderListener.java
new file mode 100644
index 0000000..24ac19a
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/util/web/ContextLoaderListener.java
@@ -0,0 +1,40 @@
+package com.revature.Pi2a1000Places.util.web;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.revature.Pi2a1000Places.auth.AuthServlet;
+import com.revature.Pi2a1000Places.customer.CustomerDao;
+import com.revature.Pi2a1000Places.customer.CustomerServices;
+import com.revature.Pi2a1000Places.customer.CustomerServlet;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.annotation.WebListener;
+
+@WebListener
+public class ContextLoaderListener implements ServletContextListener {
+
+    @Override
+    public void contextInitialized(ServletContextEvent sce) {
+        ObjectMapper mapper = new ObjectMapper();
+        CustomerDao customerDao = new CustomerDao();
+        CustomerServices customerServices = new CustomerServices();
+
+
+        AuthServlet authServlet = new AuthServlet(customerServices, mapper);
+        CustomerServlet customerServlet = new CustomerServlet(customerServices, mapper);
+
+
+        ServletContext context = sce.getServletContext();
+        context.addServlet("AuthServlet", authServlet).addMapping("/auth");
+        context.addServlet("CustomerServlet", customerServlet).addMapping("/customers/*");
+
+
+    }
+
+    @Override
+    public void contextDestroyed(ServletContextEvent sce) {
+        ServletContextListener.super.contextDestroyed(sce);
+    }
+}
+
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..7ec00d2
--- /dev/null
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,11 @@
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+             http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+         version="3.1">
+
+    <display-name>Hello, Servlets!</display-name>
+
+
+
+</web-app>
\ No newline at end of file
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
new file mode 100644
index 0000000..47a68a3
--- /dev/null
+++ b/src/main/webapp/index.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Document</title>
+    <link rel="stylesheet" href="style.css">
+</head>
+<body>
+    <h1 class="title">Maxwell’s Magnificent Minecraft Modpack Maker</h1>
+    <br> <br> <br>
+    <h2>User Story</h2>
+    <p class="large">  <br> <br>
+    As a user without an account I can ... <br> <br>
+    
+        See all the available mods <br>
+        Filter mods by who created them <br>
+        Register an account <br>
+    </p> <br>
+   <p class="large"> As a user with an account I can ... <br> <br>
+        Log in as a user <br>
+        Update a mod I own <br>
+        Create a mod that doesn't already exist <br>
+        Create a modpack <br>
+        Add mods to the modpack <br>
+    
+</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/style.css b/src/main/webapp/style.css
new file mode 100644
index 0000000..cd3d0d3
--- /dev/null
+++ b/src/main/webapp/style.css
@@ -0,0 +1,17 @@
+body{
+    text-align: center;
+    background-color: rgb(18, 18, 18);
+    color: white;
+    font-size: large;
+    font-family: 'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
+}
+.comic{
+    font-family: Comic Sans MS, Comic Sans, cursive;
+}
+.large{
+    font-size: x-large;
+}
+
+.title{
+    color: rgb(64,224,208)
+}
\ No newline at end of file
diff --git a/src/test/java/org/example/AppTest.java b/src/test/java/org/example/AppTest.java
deleted file mode 100644
index 6a1d2d7..0000000
--- a/src/test/java/org/example/AppTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.example;
-
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest 
-{
-    /**
-     * Rigorous Test :-)
-     */
-    @Test
-    public void shouldAnswerWithTrue()
-    {
-        assertTrue( true );
-    }
-}

From 831b294e609d575d45067f8da218da4de1283440 Mon Sep 17 00:00:00 2001
From: MelroseDigital <Tenyce.Melrose@gmail.com>
Date: Fri, 27 May 2022 13:04:54 -0700
Subject: [PATCH 10/56] First Layer in Progress...

---
 .../java/com/revature/pi/daos/Crudable.java   |  4 +-
 .../{CustomerDaos.java => CustomerDao.java}   |  2 +-
 .../com/revature/pi/models/CreditCard.java    | 37 ++++++++---
 .../java/com/revature/pi/models/Customer.java | 62 +++++++++----------
 .../java/com/revature/pi/models/Menu.java     | 31 +++++++++-
 .../java/com/revature/pi/models/Order.java    | 50 +++++++++++++++
 .../pi/services/CustomerServices.java         |  3 +
 .../com/revature/pi/services/Serviceable.java |  5 +-
 8 files changed, 150 insertions(+), 44 deletions(-)
 rename src/main/java/com/revature/pi/daos/{CustomerDaos.java => CustomerDao.java} (54%)

diff --git a/src/main/java/com/revature/pi/daos/Crudable.java b/src/main/java/com/revature/pi/daos/Crudable.java
index d6396c2..77d872a 100644
--- a/src/main/java/com/revature/pi/daos/Crudable.java
+++ b/src/main/java/com/revature/pi/daos/Crudable.java
@@ -4,9 +4,11 @@
 import java.sql.SQLException;
 
 public interface Crudable<T> {
+//CRUD: Create, Read, Update, Delete
 
+    T create(T newObject) throws SQLException;
+//check exception thrown. Necessary?
 
-    T create(T newCustomer) throws SQLException;
 
     T[] findAll() throws IOException;
     T findById(String id);
diff --git a/src/main/java/com/revature/pi/daos/CustomerDaos.java b/src/main/java/com/revature/pi/daos/CustomerDao.java
similarity index 54%
rename from src/main/java/com/revature/pi/daos/CustomerDaos.java
rename to src/main/java/com/revature/pi/daos/CustomerDao.java
index 5a110f2..bacb697 100644
--- a/src/main/java/com/revature/pi/daos/CustomerDaos.java
+++ b/src/main/java/com/revature/pi/daos/CustomerDao.java
@@ -1,4 +1,4 @@
 package com.revature.pi.daos;
 
-public class CustomerDaos {
+public class CustomerDao {
 }
diff --git a/src/main/java/com/revature/pi/models/CreditCard.java b/src/main/java/com/revature/pi/models/CreditCard.java
index c76f2e4..856362e 100644
--- a/src/main/java/com/revature/pi/models/CreditCard.java
+++ b/src/main/java/com/revature/pi/models/CreditCard.java
@@ -2,8 +2,8 @@
 
 public class CreditCard {
 
-    private String cardNumber;
-    private String cardName;
+    private String ccNumber;
+    private String ccName;
     private String cvv;
     private String expDate;
     private String zip;
@@ -11,8 +11,9 @@ public class CreditCard {
     private String userName;
 
 
-    public CreditCard(String cardName, String cvv, String expDate, String zip, String limit, String userName) {
-        this.cardName = cardName;
+    public CreditCard(String ccNumber, String ccName, String cvv, String expDate, String zip, String limit, String userName) {
+        this.ccNumber = ccNumber;
+        this.ccName = ccName;
         this.cvv = cvv;
         this.expDate = expDate;
         this.zip = zip;
@@ -21,8 +22,12 @@ public CreditCard(String cardName, String cvv, String expDate, String zip, Strin
 
     }
 
+    public String getCardNumber() {
+        return ccNumber;
+    }
+
     public String getCardName() {
-        return cardName;
+        return ccName;
     }
 
     public String getCvv() {
@@ -45,8 +50,12 @@ public String getUserName() {
         return userName;
     }
 
-    public void setCardNumber(String cardName) {
-        this.cardName = cardName;
+    public void setCcNumber(String ccNumber) {
+        this.ccNumber = ccNumber;
+    }
+
+    public void setCcName(String ccName) {
+        this.ccName = ccName;
     }
 
     public void setCvv(String cvv) {
@@ -63,7 +72,21 @@ public void setZip(String zip) {
 
     public void setLimit(String limit) {
         this.limit = limit;
+    }
+
+    public String setUserName(String userName) {
+        this.userName = userName;
         {
         }
+        StringBuilder mutableString = new StringBuilder();
+        mutableString
+                .append(ccNumber).append(",")
+                .append(ccName).append(",")
+                .append(cvv).append(",")
+                .append(expDate).append(",")
+                .append(zip).append(",")
+                .append(limit).append(",")
+                .append(userName);
+        return mutableString.toString();
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/revature/pi/models/Customer.java b/src/main/java/com/revature/pi/models/Customer.java
index a660882..3845c0c 100644
--- a/src/main/java/com/revature/pi/models/Customer.java
+++ b/src/main/java/com/revature/pi/models/Customer.java
@@ -2,28 +2,27 @@
 
 //import com.fasterxml.jackson.annotation.JsonIgnore;
 public class Customer {
-     {
 
-    }
     //Customer-facing, experience API Layer
     private String userName;
     private String firstName;
     private String lastName;
     private String password;
     private String balance;
+
     //private String is_admin;
     //Record as a String, convert to a Boolean later? Parse it? Lookup when and why?
+    public Customer(String userName, String firstName, String lastName, String password, String balance) {
 
- {
         this.userName = userName;
         this.firstName = firstName;
         this.lastName = lastName;
         this.password = password;
         this.balance = balance;
         //this.is_admin= false;
+
     }
-    public Customer(String userName, String firstName, String lastName, String password, String balance) {
-    }
+
     //Getters & setters used for fetching and updating variable value.
     public String getUserName() {
         return userName;
@@ -61,31 +60,30 @@ public void setPassword(String password) {
         this.password = password;
     }
 
-    public void setBalance(String balance) {
+    public String setBalance(String balance) {
         this.balance = balance;
-        {
-
-//            @Override
-//            public String toString() {
-//            return "Customer{" +
-//                    ",userName='" + userName + '\' +;
-//                    "firstName='" + firstName '\' +
-//                     "lastName='" + lastName '\' +
-//                    "password='" + password '\' +
-//                     "balance='" + balance '\' +
-//                    '}';
-        }
-        }
-        public String toFileString () {
-            StringBuilder stringBuilder = new StringBuilder()
-                    .append(userName).append(",")
-                    .append(firstName).append(",")
-                    .append(lastName).append(",")
-                    .append(password).append(",")
-                    .append(balance).append(",");
-
-            return stringBuilder.toString();
-        }
-
-
-    }
\ No newline at end of file
+        return balance;
+    }
+
+    String toFileString() {
+        StringBuilder mutableString = new StringBuilder()
+                .append(userName).append(",")
+                .append(firstName).append(",")
+                .append(lastName).append(",")
+                .append(password).append(",")
+                .append(balance).append(",");
+
+        return mutableString.toString();
+    }
+
+    //@Override
+    public String toString() {
+        return "Customer{" +
+                "username='" + userName + '\'' +
+                ", firstname='" + firstName + '\'' +
+                ", lastname='" + lastName + '\'' +
+                ", password='" + password + '\'' + ", balance='" + balance + '\'' +
+                '}';
+
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/revature/pi/models/Menu.java b/src/main/java/com/revature/pi/models/Menu.java
index 99e4fed..abad806 100644
--- a/src/main/java/com/revature/pi/models/Menu.java
+++ b/src/main/java/com/revature/pi/models/Menu.java
@@ -7,6 +7,7 @@ public class Menu {
     private String pizza1;
     // private String pizza2;
     private String addTopping;
+    //is_substitutable;
 
     public Menu(String itemName, String cost, String pizza1, String addTopping) {
         this.itemName = itemName;
@@ -14,6 +15,34 @@ public Menu(String itemName, String cost, String pizza1, String addTopping) {
         this.pizza1 = pizza1;
         //this.pizza2 = pizza2;
         this.addTopping = addTopping;
+        //is_substitutable;
 
     }
-}
\ No newline at end of file
+
+    public String getItemName() {
+        return itemName;
+    }
+    public String getCost() {
+        return cost;
+    }
+
+    public String getPizza1() {
+        return pizza1;
+    }
+
+    public String getAddTopping() {
+        return addTopping;
+    }
+
+    public void setItemName(String itemName) {
+        this.itemName = itemName;
+    }
+    public void setPizza1(String pizza1) {
+        this.pizza1 = pizza1;
+    }
+
+    public void setAddTopping(String addTopping) {
+        this.addTopping = addTopping;
+    }
+
+        }
diff --git a/src/main/java/com/revature/pi/models/Order.java b/src/main/java/com/revature/pi/models/Order.java
index 2750476..1774920 100644
--- a/src/main/java/com/revature/pi/models/Order.java
+++ b/src/main/java/com/revature/pi/models/Order.java
@@ -2,5 +2,55 @@
 
 public class Order {
 
+    private String id;
+    private String menuItem;
+    private String comment;
+    //private String isFavorite;
+    private String orderDate;
+    private String userName;
+
+    public Order(String id, String menuItem, String comment, String orderDate, String userName) {
+        this.id = id;
+        this.menuItem = menuItem;
+        this.comment = comment;
+        //this.isFavorite;
+        this.orderDate = orderDate;
+        this.userName = userName;
+
+    }
+
+    public String getId() {
+        return id;
+    }
+    public String getMenuItem() {
+        return menuItem;
+    }
+
+    public String getComment() {
+        return comment;
+    }
+
+    public String getOrderDate() {
+        return orderDate;
+    }
+    public String getUserName() {
+        return userName;
+    }
+    public void setId(String itemId) {
+        this.id = id;
+    }
+    public void setMenuItem(String menuItem) {
+        this.menuItem = menuItem;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+    public void setOrderDate(String orderDate) {
+        this.orderDate = orderDate;
+    }
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
 
 }
diff --git a/src/main/java/com/revature/pi/services/CustomerServices.java b/src/main/java/com/revature/pi/services/CustomerServices.java
index 528e4d4..4e291e4 100644
--- a/src/main/java/com/revature/pi/services/CustomerServices.java
+++ b/src/main/java/com/revature/pi/services/CustomerServices.java
@@ -1,4 +1,7 @@
 package com.revature.pi.services;
+import com.revature.pi.daos.CustomerDao;
 
 public class CustomerServices {
+
+
 }
diff --git a/src/main/java/com/revature/pi/services/Serviceable.java b/src/main/java/com/revature/pi/services/Serviceable.java
index 557327e..318548c 100644
--- a/src/main/java/com/revature/pi/services/Serviceable.java
+++ b/src/main/java/com/revature/pi/services/Serviceable.java
@@ -1,18 +1,19 @@
 package com.revature.pi.services;
 
 public interface Serviceable<T> {
-    //Create, Read, Update, Delete Functions.
+    //Create, Read, Update, Delete.
 
     T create(T newObject);
 
     //
     T[] readAll();
     T readByUserName(String userName);
+    // T readById(String id); Add instaed of RBU, or keep both?
 
     //
     T update(T updatedObject);
+    //public boolean update(T update Object);
 
-    //
     boolean delete(String id);
 
     boolean validateInput(T object);

From 47be3d4213cce661d6eea4f7b9df51dd46000e67 Mon Sep 17 00:00:00 2001
From: MelroseDigital <Tenyce.Melrose@gmail.com>
Date: Fri, 27 May 2022 13:09:08 -0700
Subject: [PATCH 11/56] Next Part

---
 .idea/.gitignore     |   3 ++
 .idea/Pi.iml         |  11 ++++
 .idea/misc.xml       |   6 +++
 .idea/modules.xml    |   8 +++
 .idea/uiDesigner.xml | 124 +++++++++++++++++++++++++++++++++++++++++++
 .idea/vcs.xml        |   6 +++
 6 files changed, 158 insertions(+)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/Pi.iml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/uiDesigner.xml
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..26d3352
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/.idea/Pi.iml b/.idea/Pi.iml
new file mode 100644
index 0000000..f76df2b
--- /dev/null
+++ b/.idea/Pi.iml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..5667ae8
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_18" default="true" project-jdk-name="temurin-18" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..b9a7949
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/Pi.iml" filepath="$PROJECT_DIR$/.idea/Pi.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 0000000..e96534f
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file

From 989c5e1d5a5c52dee6972dad0a5f52f1535b8396 Mon Sep 17 00:00:00 2001
From: MelroseDigital <Tenyce.Melrose@gmail.com>
Date: Fri, 27 May 2022 13:21:18 -0700
Subject: [PATCH 12/56] message

---
 .idea/workspace.xml | 130 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 130 insertions(+)
 create mode 100644 .idea/workspace.xml

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..1e65417
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="801c5874-8fff-4801-8d5a-c1797ab89ce9" name="Changes" comment="First Layer in Progress..." />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Interface" />
+        <option value="Class" />
+      </list>
+    </option>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$" value="main" />
+      </map>
+    </option>
+  </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
+  <component name="ProjectId" id="29cDxBavF0VELEujWrH6DZpFwOH" />
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
+    <ConfirmationsSetting value="2" id="Add" />
+  </component>
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showExcludedFiles" value="false" />
+    <option name="showLibraryContents" value="true" />
+    <option name="showVisibilityIcons" value="true" />
+  </component>
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;
+  }
+}</component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="801c5874-8fff-4801-8d5a-c1797ab89ce9" name="Changes" comment="" />
+      <created>1653403726714</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1653403726714</updated>
+    </task>
+    <task id="LOCAL-00001" summary="New Branch TM_p1">
+      <created>1653511975403</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1653511975403</updated>
+    </task>
+    <task id="LOCAL-00002" summary="New Branch TM_p1">
+      <created>1653512319245</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1653512319245</updated>
+    </task>
+    <task id="LOCAL-00003" summary="First Layer in Progress...">
+      <created>1653536887951</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1653536887951</updated>
+    </task>
+    <task id="LOCAL-00004" summary="First Layer in Progress...">
+      <created>1653681895143</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1653681895144</updated>
+    </task>
+    <option name="localTasksCounter" value="5" />
+    <servers />
+  </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State>
+              <option name="FILTERS">
+                <map>
+                  <entry key="branch">
+                    <value>
+                      <list>
+                        <option value="TM_p1" />
+                      </list>
+                    </value>
+                  </entry>
+                </map>
+              </option>
+            </State>
+          </value>
+        </entry>
+      </map>
+    </option>
+    <option name="RECENT_FILTERS">
+      <map>
+        <entry key="Branch">
+          <value>
+            <list>
+              <RecentGroup>
+                <option name="FILTER_VALUES">
+                  <option value="TM_p1" />
+                </option>
+              </RecentGroup>
+            </list>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="New Branch TM_p1" />
+    <MESSAGE value="First Layer in Progress..." />
+    <option name="LAST_COMMIT_MESSAGE" value="First Layer in Progress..." />
+  </component>
+</project>
\ No newline at end of file

From dde1dbb5bb9b94a60fdfc05fb88a72d8d6de3258 Mon Sep 17 00:00:00 2001
From: Maxwell Moord <maxwellmoord@gmail.com>
Date: Fri, 27 May 2022 16:27:00 -0400
Subject: [PATCH 13/56] Workspace.xml

---
 .idea/workspace.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 80cc458..9565792 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,10 +5,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="9d8719fb-82bf-4a6d-b706-f8376dbc2834" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/revature/Pi2a1000Places/customer/CustomerDao.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServices.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/org/example/AppTest.java" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

From 675bf5eaf662b64ee4f8ea40f974d0d97fad7aac Mon Sep 17 00:00:00 2001
From: MelroseDigital <Tenyce.Melrose@gmail.com>
Date: Fri, 27 May 2022 13:39:07 -0700
Subject: [PATCH 14/56] removed readme and workspace.xml

---
 .idea/workspace.xml | 217 --------------------------------------------
 README.md           |   6 --
 2 files changed, 223 deletions(-)
 delete mode 100644 .idea/workspace.xml
 delete mode 100644 README.md

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index c8c48ce..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="SELECTIVE" />
-  </component>
-  <component name="ChangeListManager">
-<<<<<<< HEAD
-    <list default="true" id="801c5874-8fff-4801-8d5a-c1797ab89ce9" name="Changes" comment="First Layer in Progress..." />
-=======
-    <list default="true" id="9d8719fb-82bf-4a6d-b706-f8376dbc2834" name="Changes" comment="">
-
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/revature/Pi2a1000Places/customer/CustomerDao.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServices.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/org/example/AppTest.java" beforeDir="false" />
-
-    </list>
->>>>>>> cd50102d9b8eaf795e8568aacbcdc034b9431c05
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-<<<<<<< HEAD
-        <option value="Interface" />
-=======
-
-        <option value="Interface" />
-
->>>>>>> cd50102d9b8eaf795e8568aacbcdc034b9431c05
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="Git.Settings">
-<<<<<<< HEAD
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="main" />
-      </map>
-    </option>
-=======
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
->>>>>>> cd50102d9b8eaf795e8568aacbcdc034b9431c05
-  </component>
-  <component name="MarkdownSettingsMigration">
-    <option name="stateVersion" value="1" />
-  </component>
-<<<<<<< HEAD
-  <component name="ProjectId" id="29cDxBavF0VELEujWrH6DZpFwOH" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
-    <ConfirmationsSetting value="2" id="Add" />
-  </component>
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showExcludedFiles" value="false" />
-    <option name="showLibraryContents" value="true" />
-    <option name="showVisibilityIcons" value="true" />
-=======
-  <component name="ProjectId" id="29dBO6Gd3ab6QP2PtknFypzbzxw" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
-    <ConfirmationsSetting value="1" id="Add" />
-  </component>
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
->>>>>>> cd50102d9b8eaf795e8568aacbcdc034b9431c05
-  </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-<<<<<<< HEAD
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;
-  }
-}</component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="801c5874-8fff-4801-8d5a-c1797ab89ce9" name="Changes" comment="" />
-      <created>1653403726714</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1653403726714</updated>
-    </task>
-    <task id="LOCAL-00001" summary="New Branch TM_p1">
-      <created>1653511975403</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1653511975403</updated>
-    </task>
-    <task id="LOCAL-00002" summary="New Branch TM_p1">
-      <created>1653512319245</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1653512319245</updated>
-    </task>
-    <task id="LOCAL-00003" summary="First Layer in Progress...">
-      <created>1653536887951</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1653536887951</updated>
-    </task>
-    <task id="LOCAL-00004" summary="First Layer in Progress...">
-      <created>1653681895143</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1653681895144</updated>
-    </task>
-    <option name="localTasksCounter" value="5" />
-    <servers />
-  </component>
-=======
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;
-  }
-}</component>
-  <component name="RunManager">
-    <configuration name="Pi2a1000Places [tomcat7:deploy]" type="MavenRunConfiguration" factoryName="Maven" nameIsGenerated="true">
-      <MavenSettings>
-        <option name="myGeneralSettings" />
-        <option name="myRunnerSettings" />
-        <option name="myRunnerParameters">
-          <MavenRunnerParameters>
-            <option name="profiles">
-              <set />
-            </option>
-            <option name="goals">
-              <list>
-                <option value="tomcat7:deploy" />
-              </list>
-            </option>
-            <option name="pomFileName" />
-            <option name="profilesMap">
-              <map />
-            </option>
-            <option name="resolveToWorkspace" value="false" />
-            <option name="workingDirPath" value="$PROJECT_DIR$" />
-          </MavenRunnerParameters>
-        </option>
-      </MavenSettings>
-      <method v="2" />
-    </configuration>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="9d8719fb-82bf-4a6d-b706-f8376dbc2834" name="Changes" comment="" />
-      <created>1653433046840</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1653433046840</updated>
-    </task>
-    <servers />
-  </component>
-  <component name="UnknownFeatures">
-    <option featureType="dependencySupport" implementationName="java:javax.persistence:javax.persistence-api" />
-    <option featureType="dependencySupport" implementationName="java:org.hibernate:hibernate-core" />
-  </component>
->>>>>>> cd50102d9b8eaf795e8568aacbcdc034b9431c05
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-<<<<<<< HEAD
-            <State>
-              <option name="FILTERS">
-                <map>
-                  <entry key="branch">
-                    <value>
-                      <list>
-                        <option value="TM_p1" />
-                      </list>
-                    </value>
-                  </entry>
-                </map>
-              </option>
-            </State>
-          </value>
-        </entry>
-      </map>
-    </option>
-    <option name="RECENT_FILTERS">
-      <map>
-        <entry key="Branch">
-          <value>
-            <list>
-              <RecentGroup>
-                <option name="FILTER_VALUES">
-                  <option value="TM_p1" />
-                </option>
-              </RecentGroup>
-            </list>
-=======
-            <State />
->>>>>>> cd50102d9b8eaf795e8568aacbcdc034b9431c05
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-<<<<<<< HEAD
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="New Branch TM_p1" />
-    <MESSAGE value="First Layer in Progress..." />
-    <option name="LAST_COMMIT_MESSAGE" value="First Layer in Progress..." />
-  </component>
-=======
->>>>>>> cd50102d9b8eaf795e8568aacbcdc034b9431c05
-</project>
\ No newline at end of file
diff --git a/README.md b/README.md
deleted file mode 100644
index 151d9fc..0000000
--- a/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-<<<<<<< HEAD
-# Pi2a1000Places_API_TM_RD
-P1: Gourmet Pizza Restaurant API
-=======
-This is maxwell moord's read me page, its not done
->>>>>>> cd50102d9b8eaf795e8568aacbcdc034b9431c05

From 53a2604151d0b2e14388a2cf58cb9f2f4a34f404 Mon Sep 17 00:00:00 2001
From: Maxwell Moord <maxwellmoord@gmail.com>
Date: Fri, 27 May 2022 17:02:48 -0400
Subject: [PATCH 15/56] Fixed file structure issue

---
 .../util}/Crudable.java                       |  0
 .../com/revature/pi/daos/CreditCardDaos.java  |  4 -
 .../com/revature/pi/daos/CustomerDao.java     |  4 -
 .../java/com/revature/pi/daos/MenuDaos.java   |  4 -
 .../java/com/revature/pi/daos/OrderDaos.java  |  4 -
 .../com/revature/pi/models/CreditCard.java    | 92 -------------------
 .../java/com/revature/pi/models/Customer.java | 89 ------------------
 .../java/com/revature/pi/models/Menu.java     | 48 ----------
 .../java/com/revature/pi/models/Order.java    | 56 -----------
 .../pi/services/CreditCardServices.java       |  4 -
 .../pi/services/CustomerServices.java         |  7 --
 .../revature/pi/services/MenuServices.java    |  4 -
 .../revature/pi/services/OrderServices.java   |  4 -
 .../com/revature/pi/services/Serviceable.java | 20 ----
 .../java/com/revature/pi/util/MainDriver.java |  4 -
 15 files changed, 344 deletions(-)
 rename src/main/java/com/revature/{pi/daos => Pi2a1000Places/util}/Crudable.java (100%)
 delete mode 100644 src/main/java/com/revature/pi/daos/CreditCardDaos.java
 delete mode 100644 src/main/java/com/revature/pi/daos/CustomerDao.java
 delete mode 100644 src/main/java/com/revature/pi/daos/MenuDaos.java
 delete mode 100644 src/main/java/com/revature/pi/daos/OrderDaos.java
 delete mode 100644 src/main/java/com/revature/pi/models/CreditCard.java
 delete mode 100644 src/main/java/com/revature/pi/models/Customer.java
 delete mode 100644 src/main/java/com/revature/pi/models/Menu.java
 delete mode 100644 src/main/java/com/revature/pi/models/Order.java
 delete mode 100644 src/main/java/com/revature/pi/services/CreditCardServices.java
 delete mode 100644 src/main/java/com/revature/pi/services/CustomerServices.java
 delete mode 100644 src/main/java/com/revature/pi/services/MenuServices.java
 delete mode 100644 src/main/java/com/revature/pi/services/OrderServices.java
 delete mode 100644 src/main/java/com/revature/pi/services/Serviceable.java
 delete mode 100644 src/main/java/com/revature/pi/util/MainDriver.java

diff --git a/src/main/java/com/revature/pi/daos/Crudable.java b/src/main/java/com/revature/Pi2a1000Places/util/Crudable.java
similarity index 100%
rename from src/main/java/com/revature/pi/daos/Crudable.java
rename to src/main/java/com/revature/Pi2a1000Places/util/Crudable.java
diff --git a/src/main/java/com/revature/pi/daos/CreditCardDaos.java b/src/main/java/com/revature/pi/daos/CreditCardDaos.java
deleted file mode 100644
index cd12a8f..0000000
--- a/src/main/java/com/revature/pi/daos/CreditCardDaos.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.revature.pi.daos;
-
-public class CreditCardDaos {
-}
diff --git a/src/main/java/com/revature/pi/daos/CustomerDao.java b/src/main/java/com/revature/pi/daos/CustomerDao.java
deleted file mode 100644
index bacb697..0000000
--- a/src/main/java/com/revature/pi/daos/CustomerDao.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.revature.pi.daos;
-
-public class CustomerDao {
-}
diff --git a/src/main/java/com/revature/pi/daos/MenuDaos.java b/src/main/java/com/revature/pi/daos/MenuDaos.java
deleted file mode 100644
index 56c5d45..0000000
--- a/src/main/java/com/revature/pi/daos/MenuDaos.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.revature.pi.daos;
-
-public class MenuDaos {
-}
diff --git a/src/main/java/com/revature/pi/daos/OrderDaos.java b/src/main/java/com/revature/pi/daos/OrderDaos.java
deleted file mode 100644
index 0f2dfef..0000000
--- a/src/main/java/com/revature/pi/daos/OrderDaos.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.revature.pi.daos;
-
-public class OrderDaos {
-}
diff --git a/src/main/java/com/revature/pi/models/CreditCard.java b/src/main/java/com/revature/pi/models/CreditCard.java
deleted file mode 100644
index 856362e..0000000
--- a/src/main/java/com/revature/pi/models/CreditCard.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.revature.pi.models;
-
-public class CreditCard {
-
-    private String ccNumber;
-    private String ccName;
-    private String cvv;
-    private String expDate;
-    private String zip;
-    private String limit;
-    private String userName;
-
-
-    public CreditCard(String ccNumber, String ccName, String cvv, String expDate, String zip, String limit, String userName) {
-        this.ccNumber = ccNumber;
-        this.ccName = ccName;
-        this.cvv = cvv;
-        this.expDate = expDate;
-        this.zip = zip;
-        this.limit = limit;
-        this.userName = userName;
-
-    }
-
-    public String getCardNumber() {
-        return ccNumber;
-    }
-
-    public String getCardName() {
-        return ccName;
-    }
-
-    public String getCvv() {
-        return cvv;
-    }
-
-    public String getExpDate() {
-        return expDate;
-    }
-
-    public String getZip() {
-        return zip;
-    }
-
-    public String getLimit() {
-        return limit;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setCcNumber(String ccNumber) {
-        this.ccNumber = ccNumber;
-    }
-
-    public void setCcName(String ccName) {
-        this.ccName = ccName;
-    }
-
-    public void setCvv(String cvv) {
-        this.cvv = cvv;
-    }
-
-    public void setExpDate(String expDate) {
-        this.expDate = expDate;
-    }
-
-    public void setZip(String zip) {
-        this.zip = zip;
-    }
-
-    public void setLimit(String limit) {
-        this.limit = limit;
-    }
-
-    public String setUserName(String userName) {
-        this.userName = userName;
-        {
-        }
-        StringBuilder mutableString = new StringBuilder();
-        mutableString
-                .append(ccNumber).append(",")
-                .append(ccName).append(",")
-                .append(cvv).append(",")
-                .append(expDate).append(",")
-                .append(zip).append(",")
-                .append(limit).append(",")
-                .append(userName);
-        return mutableString.toString();
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/revature/pi/models/Customer.java b/src/main/java/com/revature/pi/models/Customer.java
deleted file mode 100644
index 3845c0c..0000000
--- a/src/main/java/com/revature/pi/models/Customer.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.revature.pi.models;
-
-//import com.fasterxml.jackson.annotation.JsonIgnore;
-public class Customer {
-
-    //Customer-facing, experience API Layer
-    private String userName;
-    private String firstName;
-    private String lastName;
-    private String password;
-    private String balance;
-
-    //private String is_admin;
-    //Record as a String, convert to a Boolean later? Parse it? Lookup when and why?
-    public Customer(String userName, String firstName, String lastName, String password, String balance) {
-
-        this.userName = userName;
-        this.firstName = firstName;
-        this.lastName = lastName;
-        this.password = password;
-        this.balance = balance;
-        //this.is_admin= false;
-
-    }
-
-    //Getters & setters used for fetching and updating variable value.
-    public String getUserName() {
-        return userName;
-    }
-
-    public String getFirstName() {
-        return firstName;
-    }
-
-    public String getLastName() {
-        return lastName;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public String getBalance() {
-        return balance;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
-
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String setBalance(String balance) {
-        this.balance = balance;
-        return balance;
-    }
-
-    String toFileString() {
-        StringBuilder mutableString = new StringBuilder()
-                .append(userName).append(",")
-                .append(firstName).append(",")
-                .append(lastName).append(",")
-                .append(password).append(",")
-                .append(balance).append(",");
-
-        return mutableString.toString();
-    }
-
-    //@Override
-    public String toString() {
-        return "Customer{" +
-                "username='" + userName + '\'' +
-                ", firstname='" + firstName + '\'' +
-                ", lastname='" + lastName + '\'' +
-                ", password='" + password + '\'' + ", balance='" + balance + '\'' +
-                '}';
-
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/revature/pi/models/Menu.java b/src/main/java/com/revature/pi/models/Menu.java
deleted file mode 100644
index abad806..0000000
--- a/src/main/java/com/revature/pi/models/Menu.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.revature.pi.models;
-
-public class Menu {
-
-    private String itemName;
-    private String cost;
-    private String pizza1;
-    // private String pizza2;
-    private String addTopping;
-    //is_substitutable;
-
-    public Menu(String itemName, String cost, String pizza1, String addTopping) {
-        this.itemName = itemName;
-        this.cost = cost;
-        this.pizza1 = pizza1;
-        //this.pizza2 = pizza2;
-        this.addTopping = addTopping;
-        //is_substitutable;
-
-    }
-
-    public String getItemName() {
-        return itemName;
-    }
-    public String getCost() {
-        return cost;
-    }
-
-    public String getPizza1() {
-        return pizza1;
-    }
-
-    public String getAddTopping() {
-        return addTopping;
-    }
-
-    public void setItemName(String itemName) {
-        this.itemName = itemName;
-    }
-    public void setPizza1(String pizza1) {
-        this.pizza1 = pizza1;
-    }
-
-    public void setAddTopping(String addTopping) {
-        this.addTopping = addTopping;
-    }
-
-        }
diff --git a/src/main/java/com/revature/pi/models/Order.java b/src/main/java/com/revature/pi/models/Order.java
deleted file mode 100644
index 1774920..0000000
--- a/src/main/java/com/revature/pi/models/Order.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.revature.pi.models;
-
-public class Order {
-
-    private String id;
-    private String menuItem;
-    private String comment;
-    //private String isFavorite;
-    private String orderDate;
-    private String userName;
-
-    public Order(String id, String menuItem, String comment, String orderDate, String userName) {
-        this.id = id;
-        this.menuItem = menuItem;
-        this.comment = comment;
-        //this.isFavorite;
-        this.orderDate = orderDate;
-        this.userName = userName;
-
-    }
-
-    public String getId() {
-        return id;
-    }
-    public String getMenuItem() {
-        return menuItem;
-    }
-
-    public String getComment() {
-        return comment;
-    }
-
-    public String getOrderDate() {
-        return orderDate;
-    }
-    public String getUserName() {
-        return userName;
-    }
-    public void setId(String itemId) {
-        this.id = id;
-    }
-    public void setMenuItem(String menuItem) {
-        this.menuItem = menuItem;
-    }
-
-    public void setComment(String comment) {
-        this.comment = comment;
-    }
-    public void setOrderDate(String orderDate) {
-        this.orderDate = orderDate;
-    }
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-}
diff --git a/src/main/java/com/revature/pi/services/CreditCardServices.java b/src/main/java/com/revature/pi/services/CreditCardServices.java
deleted file mode 100644
index 303a7a4..0000000
--- a/src/main/java/com/revature/pi/services/CreditCardServices.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.revature.pi.services;
-
-public class CreditCardServices {
-}
diff --git a/src/main/java/com/revature/pi/services/CustomerServices.java b/src/main/java/com/revature/pi/services/CustomerServices.java
deleted file mode 100644
index 4e291e4..0000000
--- a/src/main/java/com/revature/pi/services/CustomerServices.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.revature.pi.services;
-import com.revature.pi.daos.CustomerDao;
-
-public class CustomerServices {
-
-
-}
diff --git a/src/main/java/com/revature/pi/services/MenuServices.java b/src/main/java/com/revature/pi/services/MenuServices.java
deleted file mode 100644
index 82eaf4b..0000000
--- a/src/main/java/com/revature/pi/services/MenuServices.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.revature.pi.services;
-
-public class MenuServices {
-}
diff --git a/src/main/java/com/revature/pi/services/OrderServices.java b/src/main/java/com/revature/pi/services/OrderServices.java
deleted file mode 100644
index 422eecb..0000000
--- a/src/main/java/com/revature/pi/services/OrderServices.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.revature.pi.services;
-
-public class OrderServices {
-}
diff --git a/src/main/java/com/revature/pi/services/Serviceable.java b/src/main/java/com/revature/pi/services/Serviceable.java
deleted file mode 100644
index 318548c..0000000
--- a/src/main/java/com/revature/pi/services/Serviceable.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.revature.pi.services;
-
-public interface Serviceable<T> {
-    //Create, Read, Update, Delete.
-
-    T create(T newObject);
-
-    //
-    T[] readAll();
-    T readByUserName(String userName);
-    // T readById(String id); Add instaed of RBU, or keep both?
-
-    //
-    T update(T updatedObject);
-    //public boolean update(T update Object);
-
-    boolean delete(String id);
-
-    boolean validateInput(T object);
-}
diff --git a/src/main/java/com/revature/pi/util/MainDriver.java b/src/main/java/com/revature/pi/util/MainDriver.java
deleted file mode 100644
index 82aad8b..0000000
--- a/src/main/java/com/revature/pi/util/MainDriver.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.revature.pi.util;
-
-public class MainDriver {
-}

From 27caaac86325f651a317e85b2203145edad60e16 Mon Sep 17 00:00:00 2001
From: MelroseDigital <Tenyce.Melrose@gmail.com>
Date: Sat, 28 May 2022 19:00:38 -0700
Subject: [PATCH 16/56] Credit Card Class Updates

---
 .idea/modules.xml                             |   8 --
 pom.xml                                       |   5 +
 .../credit_card/CreditCard.java               |   4 -
 .../creditcard}/CreditCard.java               |  79 ++++++-----
 .../creditcard/CreditCardDao.java             | 132 ++++++++++++++++++
 .../creditcard/CreditCardServices.java        |  50 +++++++
 .../creditcard/CreditCardServlet.java         | 127 +++++++++++++++++
 .../revature/Pi2a1000Places/menu/Menu.java    |   6 +-
 .../util/ConnectionFactory.java               |   9 +-
 .../Pi2a1000Places/util/Crudable.java         |  20 +++
 .../ResourcePersistanceException.java         |   8 --
 .../ResourcePersistenceException.java         |   8 ++
 .../Pi2a1000Places/util/logging/Logger.java   |  56 ++++++++
 .../com/revature/pi/daos/CreditCardDaos.java  |   4 -
 .../java/com/revature/pi/daos/Crudable.java   |  19 ---
 .../com/revature/pi/daos/CustomerDao.java     |   4 -
 .../java/com/revature/pi/daos/MenuDaos.java   |   4 -
 .../java/com/revature/pi/daos/OrderDaos.java  |   4 -
 .../java/com/revature/pi/models/Customer.java |  89 ------------
 .../java/com/revature/pi/models/Menu.java     |  48 -------
 .../java/com/revature/pi/models/Order.java    |  56 --------
 .../pi/services/CreditCardServices.java       |   4 -
 .../pi/services/CustomerServices.java         |   7 -
 .../revature/pi/services/MenuServices.java    |   4 -
 .../revature/pi/services/OrderServices.java   |   4 -
 .../com/revature/pi/services/Serviceable.java |  20 ---
 .../java/com/revature/pi/util/MainDriver.java |   4 -
 27 files changed, 448 insertions(+), 335 deletions(-)
 delete mode 100644 .idea/modules.xml
 delete mode 100644 src/main/java/com/revature/Pi2a1000Places/credit_card/CreditCard.java
 rename src/main/java/com/revature/{pi/models => Pi2a1000Places/creditcard}/CreditCard.java (69%)
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDao.java
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServices.java
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServlet.java
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/util/Crudable.java
 delete mode 100644 src/main/java/com/revature/Pi2a1000Places/util/exceptions/ResourcePersistanceException.java
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/util/exceptions/ResourcePersistenceException.java
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/util/logging/Logger.java
 delete mode 100644 src/main/java/com/revature/pi/daos/CreditCardDaos.java
 delete mode 100644 src/main/java/com/revature/pi/daos/Crudable.java
 delete mode 100644 src/main/java/com/revature/pi/daos/CustomerDao.java
 delete mode 100644 src/main/java/com/revature/pi/daos/MenuDaos.java
 delete mode 100644 src/main/java/com/revature/pi/daos/OrderDaos.java
 delete mode 100644 src/main/java/com/revature/pi/models/Customer.java
 delete mode 100644 src/main/java/com/revature/pi/models/Menu.java
 delete mode 100644 src/main/java/com/revature/pi/models/Order.java
 delete mode 100644 src/main/java/com/revature/pi/services/CreditCardServices.java
 delete mode 100644 src/main/java/com/revature/pi/services/CustomerServices.java
 delete mode 100644 src/main/java/com/revature/pi/services/MenuServices.java
 delete mode 100644 src/main/java/com/revature/pi/services/OrderServices.java
 delete mode 100644 src/main/java/com/revature/pi/services/Serviceable.java
 delete mode 100644 src/main/java/com/revature/pi/util/MainDriver.java

diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index b9a7949..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/Pi.iml" filepath="$PROJECT_DIR$/.idea/Pi.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 94caf7b..dd8ecef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,6 +85,11 @@
       <artifactId>hibernate-core</artifactId>
       <version>5.4.32.Final</version>
     </dependency>
+      <dependency>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+          <version>1.2.12</version>
+      </dependency>
 
 
   </dependencies>
diff --git a/src/main/java/com/revature/Pi2a1000Places/credit_card/CreditCard.java b/src/main/java/com/revature/Pi2a1000Places/credit_card/CreditCard.java
deleted file mode 100644
index e7acf75..0000000
--- a/src/main/java/com/revature/Pi2a1000Places/credit_card/CreditCard.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.revature.Pi2a1000Places.credit_card;
-
-public class CreditCard {
-}
diff --git a/src/main/java/com/revature/pi/models/CreditCard.java b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCard.java
similarity index 69%
rename from src/main/java/com/revature/pi/models/CreditCard.java
rename to src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCard.java
index 856362e..d2f4471 100644
--- a/src/main/java/com/revature/pi/models/CreditCard.java
+++ b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCard.java
@@ -1,4 +1,4 @@
-package com.revature.pi.models;
+package com.revature.Pi2a1000Places.creditcard;
 
 public class CreditCard {
 
@@ -22,71 +22,76 @@ public CreditCard(String ccNumber, String ccName, String cvv, String expDate, St
 
     }
 
-    public String getCardNumber() {
-        return ccNumber;
-    }
-
-    public String getCardName() {
-        return ccName;
-    }
-
-    public String getCvv() {
-        return cvv;
-    }
-
-    public String getExpDate() {
-        return expDate;
-    }
-
-    public String getZip() {
-        return zip;
-    }
+    public CreditCard() {
 
-    public String getLimit() {
-        return limit;
     }
 
-    public String getUserName() {
-        return userName;
+    public String getCcNumber() {
+        return ccNumber;
     }
 
     public void setCcNumber(String ccNumber) {
         this.ccNumber = ccNumber;
     }
 
+    public String getCcName() {
+        return ccName;
+    }
+
     public void setCcName(String ccName) {
         this.ccName = ccName;
     }
 
+    public String getCvv() {
+        return cvv;
+    }
+
     public void setCvv(String cvv) {
         this.cvv = cvv;
     }
 
+    public String getExpDate() {
+        return expDate;
+    }
+
     public void setExpDate(String expDate) {
         this.expDate = expDate;
     }
 
+    public String getZip() {
+        return zip;
+    }
+
     public void setZip(String zip) {
         this.zip = zip;
     }
 
+    public String getLimit() {
+        return limit;
+    }
+
     public void setLimit(String limit) {
         this.limit = limit;
     }
 
-    public String setUserName(String userName) {
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
         this.userName = userName;
-        {
-        }
-        StringBuilder mutableString = new StringBuilder();
-        mutableString
-                .append(ccNumber).append(",")
-                .append(ccName).append(",")
-                .append(cvv).append(",")
-                .append(expDate).append(",")
-                .append(zip).append(",")
-                .append(limit).append(",")
-                .append(userName);
-        return mutableString.toString();
+    }
+
+    @Override
+    public String toString() {
+        return "CreditCard{" +
+                "ccNumber='" + ccNumber + '\'' +
+                ", ccName='" + ccName + '\'' +
+                ", cvv='" + cvv + '\'' +
+                ", expDate='" + expDate + '\'' +
+                ", zip='" + zip + '\'' +
+                ", limit='" + limit + '\'' +
+                ", userName='" + userName + '\'' +
+                '}';
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDao.java b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDao.java
new file mode 100644
index 0000000..a0ae596
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDao.java
@@ -0,0 +1,132 @@
+package com.revature.Pi2a1000Places.creditcard;
+import com.revature.Pi2a1000Places.util.Crudable;
+import com.revature.Pi2a1000Places.util.exceptions.ResourcePersistenceException;
+import com.revature.Pi2a1000Places.util.ConnectionFactory;
+import com.revature.Pi2a1000Places.util.logging.Logger;
+import java.io.IOException;
+
+
+import java.io.*;
+import java.sql.*;
+
+    public class CreditCardDao implements Crudable {
+
+        private Logger logger = Logger.getLogger();
+
+        //      @Override
+        public CreditCard create(CreditCard newCreditCard) {
+            System.out.println("newCreditCard Entering Dao" + newCreditCard);
+
+            try (Connection conn = ConnectionFactory.getInstance().getConnection();) {
+                String sql = "insert into CreditCard (ccnumber, ccname, ccv, expdate, zip, limit, username) values (?, ?, ?, ?, ?)";
+
+                PreparedStatement ps = conn.prepareStatement(sql);
+
+                System.out.println(newCreditCard.getCcNumber());
+                System.out.println(newCreditCard.getUserName());
+
+                //String Index
+                ps.setString(1, newCreditCard.getCcNumber());
+                ps.setString(2, newCreditCard.getCcName());
+                ps.setString(3, newCreditCard.getCvv());
+                ps.setString(4, newCreditCard.getExpDate());
+                ps.setString(5, newCreditCard.getZip());
+                ps.setString(5, newCreditCard.getLimit());
+                ps.setString(5, newCreditCard.getUserName());
+
+                int checkInsert = ps.executeUpdate();
+
+                if (checkInsert == 0) {
+                    throw new ResourcePersistenceException("Credit Card Not Updated.");
+                }
+
+            } catch (SQLException e) {
+                e.printStackTrace();
+                return null;
+            }
+            return newCreditCard;
+        }
+
+        @Override
+        public Object create(Object newObject) throws SQLException {
+            return null;
+        }
+
+        @Override
+        public CreditCard[] findAll() throws IOException {
+            try (Connection conn = ConnectionFactory.getInstance().getConnection();) { // try with resources, because Connection extends the interface Auto-Closeable
+
+                String sql = "select * from CreditCard";
+                Statement s = conn.createStatement();
+                ResultSet rs = s.executeQuery(sql);
+
+                while (rs.next()) {
+                    CreditCard newCC = new CreditCard();
+
+                    newCC.setCcNumber(rs.getString("ccNumber")); // this column label MUST MATCH THE DB
+                    newCC.setCcName(rs.getString("ccName"));
+                    newCC.setCvv(rs.getString("cvv"));
+                    newCC.setExpDate(rs.getString("expDate"));
+                    newCC.setZip(rs.getString("zip"));
+                    newCC.setLimit(rs.getString("limit"));
+                    newCC.setUserName(rs.getString("userName"));
+
+                    System.out.println("Going to the next line for our following index.");
+                }
+            } catch (SQLException e) {
+                e.printStackTrace();
+                return null;
+            }
+
+
+//            try (Connection conn = ConnectionFactory.getInstance().getConnection();) {
+//
+//                String sql = "select * from creditCard where userName = ?";
+//
+//                PreparedStatement ps = conn.prepareStatement(sql);
+//                ResultSet rs = ps.executeQuery(); // remember dql, bc selects are the keywords
+//
+//                if (!rs.next()) {
+//                    throw new ResourcePersistenceException("Credit Card Not Found");
+//                }
+//
+//                CreditCard CreditCard = new CreditCard();
+//
+//                CreditCard.setCcNumber(rs.getString("ccNumber")); // this column label MUST MATCH THE DB
+//                CreditCard.setCcName(rs.getString("ccName"));
+//                CreditCard.setCvv(rs.getString("cvv"));
+//                CreditCard.setExpDate(rs.getString("expDate"));
+//                CreditCard.setZip(rs.getString("zip"));
+//                CreditCard.setLimit(rs.getString("limit"));
+//                CreditCard.setUserName(rs.getString("userName"));
+//
+//                //        return CreditCard;
+//
+//            } catch (SQLException e) {
+//                e.printStackTrace();
+//                return null;
+//            }
+//        }
+
+
+        @Override
+        public Object findById(String username) {
+            return null;
+        }
+
+        @Override
+        public boolean update(Object updatedObject) {
+            return false;
+        }
+
+        @Override
+        public boolean delete(String username) {
+            return false;
+        }
+    }
+//        Credit Card
+//    1   Add account     > Create
+//    2   Update account  > Update
+//    3   Delete a credit card to be saved to my account > Delete
+//    4   Pay off your balance with your credit card  > Update (to the limit)
+//4.5 (for credit card update and update limit see do get in trainer servlet )
\ No newline at end of file
diff --git a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServices.java b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServices.java
new file mode 100644
index 0000000..09195af
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServices.java
@@ -0,0 +1,50 @@
+package com.revature.Pi2a1000Places.creditcard;
+import com.revature.Pi2a1000Places.creditcard.CreditCardDao;
+
+import java.io.IOException;
+public class CreditCardServices {
+
+
+    private CreditCard cc = new CreditCard();
+    private CreditCardDao ccDao = new CreditCardDao();
+    //CreditCard Class is now = cc. CreditCardDao Class is now = ccDao.
+
+
+    public boolean create(CreditCard newCreditCard){
+        System.out.println("CreditCard trying to be registered: " + newCreditCard);
+        if(validateCreditCardInput(new CreditCard())){
+            System.out.println("User was not validated");
+            throw new RuntimeException();
+        }
+
+//            public void CreditCard;{
+//                System.out.println("Begin reading CreditCards in our file database.");
+//                CreditCard[] CreditCards = new CreditCard[0];
+//                try {
+//                    CreditCards = creditCardDao.findAll();
+//                    System.out.println("All CreditCards have been found here are the results: \n");
+//
+//                } catch (IOException | NullPointerException e) {
+//                    // e.printStackTrace();
+
+        CreditCard persistedCreditCard = ccDao.create(new CreditCard());
+
+        if(persistedCreditCard == null){
+            throw new RuntimeException();
+        }
+        System.out.println("CreditCard has been persisted: " + new CreditCard());
+        return true;
+    }
+
+    private boolean validateCreditCardInput(CreditCard cc) {
+        System.out.println("Validating CreditCard: " + cc);
+        if(cc == null) return false;
+        else if(cc.getCcNumber() == null || cc.getCcNumber().trim().equals("")) return false;
+        else if(cc.getCcName() == null || cc.getCcName().trim().equals("")) return false;
+        else if(cc.getCvv() == null || cc.getCvv().trim().equals("")) return false;
+        else if(cc.getExpDate() == null || cc.getExpDate().trim().equals("")) return false;
+        else if(cc.getZip() == null || cc.getZip().trim().equals("")) return false;
+        else if(cc.getLimit() == null || cc.getLimit().trim().equals("")) return false;
+        return cc.getUserName() != null || cc.getUserName().trim().equals("");
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServlet.java b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServlet.java
new file mode 100644
index 0000000..634681c
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServlet.java
@@ -0,0 +1,127 @@
+package com.revature.Pi2a1000Places.creditcard;
+
+public class CreditCardServlet {
+//
+//    public class PokemonServlet extends HttpServlet implements Authable {
+//
+//        private final PokemonServices pokemonServices;
+//        private final ObjectMapper mapper;
+//        private final ElementTypeServices elementTypeServices;
+//        private final AbilityServices abilityServices;
+//
+//        public PokemonServlet(PokemonServices pokemonServices, ObjectMapper mapper, ElementTypeServices elementTypeServices, AbilityServices abilityServices) {
+//            this.pokemonServices = pokemonServices;
+//            this.mapper = mapper;
+//            this.elementTypeServices = elementTypeServices;
+//            this.abilityServices = abilityServices;
+//        }
+//
+//        @Override
+//        protected void doOptions(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+//            super.doOptions(req, resp);
+//            resp.addHeader("Access-Control-Allow-Origin", "*");
+//            resp.addHeader("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE");
+//            resp.addHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
+//        }
+//
+//        @Override
+//        protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+//            resp.addHeader("Access-Control-Allow-Origin", "*");
+//            resp.addHeader("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE");
+//            resp.addHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
+//            if(req.getParameter("pokemonName") != null){
+//                Pokemon pokemon = pokemonServices.readById(req.getParameter("pokemonName"));
+//                String payload = mapper.writeValueAsString(pokemon);
+//                resp.getWriter().write(payload);
+//                return;
+//            }
+//
+//            List<Pokemon> pokemons = pokemonServices.readAll();
+//            String payload = mapper.writeValueAsString(pokemons);
+//
+//            resp.getWriter().write(payload);
+//
+//        }
+//
+//        @Override
+//        protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+//            resp.addHeader("Access-Control-Allow-Origin", "*");
+//            resp.addHeader("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE");
+//            resp.addHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
+//
+//            Pokemon newPokemon = new Pokemon();
+//            PokemonInitializer initPokemon = mapper.readValue(req.getInputStream(), PokemonInitializer.class); // from JSON to Java Object (Pokemon)
+//            try{
+//                ElementType elementType = elementTypeServices.readById(String.valueOf(initPokemon.getElementType()));
+//                Ability ability1 = abilityServices.readById(initPokemon.getAbility1());
+//                System.out.println(ability1);
+//                Ability ability2 = abilityServices.readById(initPokemon.getAbility2());
+//
+//                newPokemon.setPokemonName(initPokemon.getPokemonName());
+//                newPokemon.setAtk(initPokemon.getAtk());
+//                newPokemon.setHp(initPokemon.getHp());
+//                newPokemon.setElementType(elementType);
+//                newPokemon.setAbility1(ability1);
+//                newPokemon.setAbility2(ability2);
+//            }catch (Exception e){
+//                resp.getWriter().write(e.getMessage());
+//            }
+//
+//            System.out.println(newPokemon);
+//            Pokemon persistedPokemon = pokemonServices.create(newPokemon);
+//
+//            String payload = mapper.writeValueAsString(persistedPokemon); // Mapping from Java Object (Pokemon) to JSON
+//
+//
+//
+//            resp.getWriter().write("Persisted the provided pokemon as show below \n");
+//            resp.getWriter().write(payload);
+//            resp.setStatus(201);
+//        }
+//
+//        @Override
+//        protected void doPut(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+//            resp.addHeader("Access-Control-Allow-Origin", "*");
+//            resp.addHeader("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE");
+//            resp.addHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
+//            if(!checkAuth(req, resp)) return;
+//
+//            Pokemon pokemonUpdate = mapper.readValue(req.getInputStream(), Pokemon.class);
+//            Pokemon updatedPokemon = pokemonServices.update(pokemonUpdate);
+//
+//
+//            String payload = mapper.writeValueAsString(updatedPokemon);
+//            resp.getWriter().write(payload);
+//
+//        }
+//
+//        @Override
+//        protected void doDelete(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+//            resp.addHeader("Access-Control-Allow-Origin", "*");
+//            resp.addHeader("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE");
+//            resp.addHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
+//
+//            if(!checkAuth(req, resp)) return;
+//            if(req.getParameter("pokemonName") == null){
+//
+//                resp.getWriter().write("In order to delete, please provide your the pokemonName into the url with ?pokemonName=example-mander");
+//                resp.setStatus(401);
+//                return;
+//            }
+//            String pokemonName = req.getParameter("pokemonName");
+//
+//            try {
+//                pokemonServices.delete(pokemonName);
+//                resp.getWriter().write("Delete pokemon from the database");
+//            } catch (ResourcePersistanceException e){
+//                resp.getWriter().write(e.getMessage());
+//                resp.setStatus(404);
+//            } catch (Exception e){
+//                resp.getWriter().write(e.getMessage());
+//                resp.setStatus(500);
+//            }
+//        }
+//
+//    }
+//}
+}
\ No newline at end of file
diff --git a/src/main/java/com/revature/Pi2a1000Places/menu/Menu.java b/src/main/java/com/revature/Pi2a1000Places/menu/Menu.java
index b119848..0a8238c 100644
--- a/src/main/java/com/revature/Pi2a1000Places/menu/Menu.java
+++ b/src/main/java/com/revature/Pi2a1000Places/menu/Menu.java
@@ -1,4 +1,8 @@
 package com.revature.Pi2a1000Places.menu;
 
 public class Menu {
-}
+    public static class MenuServices {
+
+        }
+    }
+
diff --git a/src/main/java/com/revature/Pi2a1000Places/util/ConnectionFactory.java b/src/main/java/com/revature/Pi2a1000Places/util/ConnectionFactory.java
index b1e5f86..861befc 100644
--- a/src/main/java/com/revature/Pi2a1000Places/util/ConnectionFactory.java
+++ b/src/main/java/com/revature/Pi2a1000Places/util/ConnectionFactory.java
@@ -12,7 +12,7 @@ public class ConnectionFactory {
     private static final ConnectionFactory connectionFactory = new ConnectionFactory();
     private Properties prop = new Properties();
 
-    private ConnectionFactory(){
+    private ConnectionFactory() {
         try {
             ClassLoader loader = Thread.currentThread().getContextClassLoader();
             prop.load(loader.getResourceAsStream("db.properties"));
@@ -30,7 +30,7 @@ private ConnectionFactory(){
         }
     }
 
-    public static ConnectionFactory getInstance(){
+    public static ConnectionFactory getInstance() {
         return connectionFactory;
     }
 
@@ -44,9 +44,6 @@ public Connection getConnection() {
             throw new RuntimeException(e);
         }
         return conn;
-    }
-
-
-public class ConnectionFactory {
 
+    }
 }
diff --git a/src/main/java/com/revature/Pi2a1000Places/util/Crudable.java b/src/main/java/com/revature/Pi2a1000Places/util/Crudable.java
new file mode 100644
index 0000000..0fb6aaa
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/util/Crudable.java
@@ -0,0 +1,20 @@
+package com.revature.Pi2a1000Places.util;
+
+import com.sun.org.apache.xerces.internal.impl.dv.ValidatedInfo;
+
+import java.io.IOException;
+import java.sql.SQLException;
+
+public interface Crudable<T> {
+//CRUD: Create, Read, Update, Delete
+
+    T create(T newObject) throws SQLException;
+
+    //check exception thrown. Necessary?
+    default T[] findAll() throws IOException {
+        return null;
+    }
+    T findById(String username);
+                    boolean update(T updatedObject);
+                    boolean delete(String username);
+}                                      //or CreditCard?
diff --git a/src/main/java/com/revature/Pi2a1000Places/util/exceptions/ResourcePersistanceException.java b/src/main/java/com/revature/Pi2a1000Places/util/exceptions/ResourcePersistanceException.java
deleted file mode 100644
index fd01a3e..0000000
--- a/src/main/java/com/revature/Pi2a1000Places/util/exceptions/ResourcePersistanceException.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.revature.Pi2a1000Places.util.exceptions;
-
-public class ResourcePersistanceException extends RuntimeException{
-
-    public ResourcePersistanceException(String message) {
-        super(message);
-    }
-}
diff --git a/src/main/java/com/revature/Pi2a1000Places/util/exceptions/ResourcePersistenceException.java b/src/main/java/com/revature/Pi2a1000Places/util/exceptions/ResourcePersistenceException.java
new file mode 100644
index 0000000..cdb3a80
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/util/exceptions/ResourcePersistenceException.java
@@ -0,0 +1,8 @@
+package com.revature.Pi2a1000Places.util.exceptions;
+
+public class ResourcePersistenceException extends RuntimeException{
+
+    public ResourcePersistenceException(String message) {
+        super(message);
+    }
+}
diff --git a/src/main/java/com/revature/Pi2a1000Places/util/logging/Logger.java b/src/main/java/com/revature/Pi2a1000Places/util/logging/Logger.java
new file mode 100644
index 0000000..d6e4a6b
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/util/logging/Logger.java
@@ -0,0 +1,56 @@
+package com.revature.Pi2a1000Places.util.logging;
+
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.Writer;
+import java.net.URL;
+import java.time.LocalDateTime;
+
+public class Logger {
+
+    private static Logger logger;
+    private final boolean printToConsole;
+
+    private Logger(boolean printToConsole) {//So the singleton is because we're privatizing its constructor and there's only ever going to be a single instance of the logger.
+        this.printToConsole = printToConsole;
+    }
+
+    public static Logger getLogger(boolean printToConsole) {
+        // logger is being lazily instantiated
+        if (logger == null) {
+            logger = new Logger(printToConsole);
+        }
+
+        return logger;
+    }
+
+    public static Logger getLogger() {
+        // logger is being lazily instantiated
+        if (logger == null) {
+            logger = new Logger(true);
+        }
+
+        return logger;
+    }
+
+    public void log(String message) {
+        ClassLoader loader = Thread.currentThread().getContextClassLoader();
+        URL file = loader.getResource("pi2a1000.log");
+
+        try (Writer logWriter = new FileWriter(String.valueOf(file).split(":")[1], true);) {
+            logWriter.write(LocalDateTime.now().toString() + " LOG: " + message + "\n");
+
+            if (printToConsole) {
+                System.out.println(LocalDateTime.now().toString() + " LOG: " + message);
+            }
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+
+    }
+
+    public void info(String message) {
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/revature/pi/daos/CreditCardDaos.java b/src/main/java/com/revature/pi/daos/CreditCardDaos.java
deleted file mode 100644
index cd12a8f..0000000
--- a/src/main/java/com/revature/pi/daos/CreditCardDaos.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.revature.pi.daos;
-
-public class CreditCardDaos {
-}
diff --git a/src/main/java/com/revature/pi/daos/Crudable.java b/src/main/java/com/revature/pi/daos/Crudable.java
deleted file mode 100644
index 77d872a..0000000
--- a/src/main/java/com/revature/pi/daos/Crudable.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.revature.pi.daos;
-
-import java.io.IOException;
-import java.sql.SQLException;
-
-public interface Crudable<T> {
-//CRUD: Create, Read, Update, Delete
-
-    T create(T newObject) throws SQLException;
-//check exception thrown. Necessary?
-
-
-    T[] findAll() throws IOException;
-    T findById(String id);
-
-    boolean update(T updatedObject);
-
-    boolean delete(String id);
-}
diff --git a/src/main/java/com/revature/pi/daos/CustomerDao.java b/src/main/java/com/revature/pi/daos/CustomerDao.java
deleted file mode 100644
index bacb697..0000000
--- a/src/main/java/com/revature/pi/daos/CustomerDao.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.revature.pi.daos;
-
-public class CustomerDao {
-}
diff --git a/src/main/java/com/revature/pi/daos/MenuDaos.java b/src/main/java/com/revature/pi/daos/MenuDaos.java
deleted file mode 100644
index 56c5d45..0000000
--- a/src/main/java/com/revature/pi/daos/MenuDaos.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.revature.pi.daos;
-
-public class MenuDaos {
-}
diff --git a/src/main/java/com/revature/pi/daos/OrderDaos.java b/src/main/java/com/revature/pi/daos/OrderDaos.java
deleted file mode 100644
index 0f2dfef..0000000
--- a/src/main/java/com/revature/pi/daos/OrderDaos.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.revature.pi.daos;
-
-public class OrderDaos {
-}
diff --git a/src/main/java/com/revature/pi/models/Customer.java b/src/main/java/com/revature/pi/models/Customer.java
deleted file mode 100644
index 3845c0c..0000000
--- a/src/main/java/com/revature/pi/models/Customer.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.revature.pi.models;
-
-//import com.fasterxml.jackson.annotation.JsonIgnore;
-public class Customer {
-
-    //Customer-facing, experience API Layer
-    private String userName;
-    private String firstName;
-    private String lastName;
-    private String password;
-    private String balance;
-
-    //private String is_admin;
-    //Record as a String, convert to a Boolean later? Parse it? Lookup when and why?
-    public Customer(String userName, String firstName, String lastName, String password, String balance) {
-
-        this.userName = userName;
-        this.firstName = firstName;
-        this.lastName = lastName;
-        this.password = password;
-        this.balance = balance;
-        //this.is_admin= false;
-
-    }
-
-    //Getters & setters used for fetching and updating variable value.
-    public String getUserName() {
-        return userName;
-    }
-
-    public String getFirstName() {
-        return firstName;
-    }
-
-    public String getLastName() {
-        return lastName;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public String getBalance() {
-        return balance;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
-
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String setBalance(String balance) {
-        this.balance = balance;
-        return balance;
-    }
-
-    String toFileString() {
-        StringBuilder mutableString = new StringBuilder()
-                .append(userName).append(",")
-                .append(firstName).append(",")
-                .append(lastName).append(",")
-                .append(password).append(",")
-                .append(balance).append(",");
-
-        return mutableString.toString();
-    }
-
-    //@Override
-    public String toString() {
-        return "Customer{" +
-                "username='" + userName + '\'' +
-                ", firstname='" + firstName + '\'' +
-                ", lastname='" + lastName + '\'' +
-                ", password='" + password + '\'' + ", balance='" + balance + '\'' +
-                '}';
-
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/revature/pi/models/Menu.java b/src/main/java/com/revature/pi/models/Menu.java
deleted file mode 100644
index abad806..0000000
--- a/src/main/java/com/revature/pi/models/Menu.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.revature.pi.models;
-
-public class Menu {
-
-    private String itemName;
-    private String cost;
-    private String pizza1;
-    // private String pizza2;
-    private String addTopping;
-    //is_substitutable;
-
-    public Menu(String itemName, String cost, String pizza1, String addTopping) {
-        this.itemName = itemName;
-        this.cost = cost;
-        this.pizza1 = pizza1;
-        //this.pizza2 = pizza2;
-        this.addTopping = addTopping;
-        //is_substitutable;
-
-    }
-
-    public String getItemName() {
-        return itemName;
-    }
-    public String getCost() {
-        return cost;
-    }
-
-    public String getPizza1() {
-        return pizza1;
-    }
-
-    public String getAddTopping() {
-        return addTopping;
-    }
-
-    public void setItemName(String itemName) {
-        this.itemName = itemName;
-    }
-    public void setPizza1(String pizza1) {
-        this.pizza1 = pizza1;
-    }
-
-    public void setAddTopping(String addTopping) {
-        this.addTopping = addTopping;
-    }
-
-        }
diff --git a/src/main/java/com/revature/pi/models/Order.java b/src/main/java/com/revature/pi/models/Order.java
deleted file mode 100644
index 1774920..0000000
--- a/src/main/java/com/revature/pi/models/Order.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.revature.pi.models;
-
-public class Order {
-
-    private String id;
-    private String menuItem;
-    private String comment;
-    //private String isFavorite;
-    private String orderDate;
-    private String userName;
-
-    public Order(String id, String menuItem, String comment, String orderDate, String userName) {
-        this.id = id;
-        this.menuItem = menuItem;
-        this.comment = comment;
-        //this.isFavorite;
-        this.orderDate = orderDate;
-        this.userName = userName;
-
-    }
-
-    public String getId() {
-        return id;
-    }
-    public String getMenuItem() {
-        return menuItem;
-    }
-
-    public String getComment() {
-        return comment;
-    }
-
-    public String getOrderDate() {
-        return orderDate;
-    }
-    public String getUserName() {
-        return userName;
-    }
-    public void setId(String itemId) {
-        this.id = id;
-    }
-    public void setMenuItem(String menuItem) {
-        this.menuItem = menuItem;
-    }
-
-    public void setComment(String comment) {
-        this.comment = comment;
-    }
-    public void setOrderDate(String orderDate) {
-        this.orderDate = orderDate;
-    }
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-}
diff --git a/src/main/java/com/revature/pi/services/CreditCardServices.java b/src/main/java/com/revature/pi/services/CreditCardServices.java
deleted file mode 100644
index 303a7a4..0000000
--- a/src/main/java/com/revature/pi/services/CreditCardServices.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.revature.pi.services;
-
-public class CreditCardServices {
-}
diff --git a/src/main/java/com/revature/pi/services/CustomerServices.java b/src/main/java/com/revature/pi/services/CustomerServices.java
deleted file mode 100644
index 4e291e4..0000000
--- a/src/main/java/com/revature/pi/services/CustomerServices.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.revature.pi.services;
-import com.revature.pi.daos.CustomerDao;
-
-public class CustomerServices {
-
-
-}
diff --git a/src/main/java/com/revature/pi/services/MenuServices.java b/src/main/java/com/revature/pi/services/MenuServices.java
deleted file mode 100644
index 82eaf4b..0000000
--- a/src/main/java/com/revature/pi/services/MenuServices.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.revature.pi.services;
-
-public class MenuServices {
-}
diff --git a/src/main/java/com/revature/pi/services/OrderServices.java b/src/main/java/com/revature/pi/services/OrderServices.java
deleted file mode 100644
index 422eecb..0000000
--- a/src/main/java/com/revature/pi/services/OrderServices.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.revature.pi.services;
-
-public class OrderServices {
-}
diff --git a/src/main/java/com/revature/pi/services/Serviceable.java b/src/main/java/com/revature/pi/services/Serviceable.java
deleted file mode 100644
index 318548c..0000000
--- a/src/main/java/com/revature/pi/services/Serviceable.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.revature.pi.services;
-
-public interface Serviceable<T> {
-    //Create, Read, Update, Delete.
-
-    T create(T newObject);
-
-    //
-    T[] readAll();
-    T readByUserName(String userName);
-    // T readById(String id); Add instaed of RBU, or keep both?
-
-    //
-    T update(T updatedObject);
-    //public boolean update(T update Object);
-
-    boolean delete(String id);
-
-    boolean validateInput(T object);
-}
diff --git a/src/main/java/com/revature/pi/util/MainDriver.java b/src/main/java/com/revature/pi/util/MainDriver.java
deleted file mode 100644
index 82aad8b..0000000
--- a/src/main/java/com/revature/pi/util/MainDriver.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.revature.pi.util;
-
-public class MainDriver {
-}

From ed6732bf256694c17ba3e2e8826fe7a9d03329f3 Mon Sep 17 00:00:00 2001
From: MelroseDigital <Tenyce.Melrose@gmail.com>
Date: Sat, 28 May 2022 20:12:19 -0700
Subject: [PATCH 17/56] Credit Card Class Updates

---
 .../creditcard/CreditCardDao.java             | 71 +++++++++----------
 .../creditcard/CreditCardServices.java        | 35 +++++----
 2 files changed, 50 insertions(+), 56 deletions(-)

diff --git a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDao.java b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDao.java
index a0ae596..e9246cb 100644
--- a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDao.java
+++ b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDao.java
@@ -13,7 +13,7 @@ public class CreditCardDao implements Crudable {
 
         private Logger logger = Logger.getLogger();
 
-        //      @Override
+        // MVP a. Create - ADD Card
         public CreditCard create(CreditCard newCreditCard) {
             System.out.println("newCreditCard Entering Dao" + newCreditCard);
 
@@ -25,14 +25,14 @@ public CreditCard create(CreditCard newCreditCard) {
                 System.out.println(newCreditCard.getCcNumber());
                 System.out.println(newCreditCard.getUserName());
 
-                //String Index
+                // CC String Index
                 ps.setString(1, newCreditCard.getCcNumber());
                 ps.setString(2, newCreditCard.getCcName());
                 ps.setString(3, newCreditCard.getCvv());
                 ps.setString(4, newCreditCard.getExpDate());
                 ps.setString(5, newCreditCard.getZip());
-                ps.setString(5, newCreditCard.getLimit());
-                ps.setString(5, newCreditCard.getUserName());
+                ps.setString(6, newCreditCard.getLimit());
+                ps.setString(7, newCreditCard.getUserName());
 
                 int checkInsert = ps.executeUpdate();
 
@@ -51,10 +51,10 @@ public CreditCard create(CreditCard newCreditCard) {
         public Object create(Object newObject) throws SQLException {
             return null;
         }
-
+        // MVP b. Update Card
         @Override
         public CreditCard[] findAll() throws IOException {
-            try (Connection conn = ConnectionFactory.getInstance().getConnection();) { // try with resources, because Connection extends the interface Auto-Closeable
+            try (Connection conn = ConnectionFactory.getInstance().getConnection();) {
 
                 String sql = "select * from CreditCard";
                 Statement s = conn.createStatement();
@@ -78,36 +78,34 @@ public CreditCard[] findAll() throws IOException {
                 return null;
             }
 
+            //@Override
+            public Object findById(String username) {
+
+            try (Connection conn = ConnectionFactory.getInstance().getConnection();) {
+
+                String sql = "select * from creditCard where userName = ?";
+
+                PreparedStatement ps = conn.prepareStatement(sql);
+                ResultSet rs = ps.executeQuery();
+
+                if (!rs.next()) {
+                    throw new ResourcePersistenceException("Credit Card Not Found");
+                }
 
-//            try (Connection conn = ConnectionFactory.getInstance().getConnection();) {
-//
-//                String sql = "select * from creditCard where userName = ?";
-//
-//                PreparedStatement ps = conn.prepareStatement(sql);
-//                ResultSet rs = ps.executeQuery(); // remember dql, bc selects are the keywords
-//
-//                if (!rs.next()) {
-//                    throw new ResourcePersistenceException("Credit Card Not Found");
-//                }
-//
-//                CreditCard CreditCard = new CreditCard();
-//
-//                CreditCard.setCcNumber(rs.getString("ccNumber")); // this column label MUST MATCH THE DB
-//                CreditCard.setCcName(rs.getString("ccName"));
-//                CreditCard.setCvv(rs.getString("cvv"));
-//                CreditCard.setExpDate(rs.getString("expDate"));
-//                CreditCard.setZip(rs.getString("zip"));
-//                CreditCard.setLimit(rs.getString("limit"));
-//                CreditCard.setUserName(rs.getString("userName"));
-//
-//                //        return CreditCard;
-//
-//            } catch (SQLException e) {
-//                e.printStackTrace();
-//                return null;
-//            }
-//        }
+                CreditCard CreditCard = new CreditCard();
 
+                CreditCard.setCcNumber(rs.getString("ccNumber")); // this column label MUST MATCH THE DB
+                CreditCard.setCcName(rs.getString("ccName"));
+                CreditCard.setCvv(rs.getString("cvv"));
+                CreditCard.setExpDate(rs.getString("expDate"));
+                CreditCard.setZip(rs.getString("zip"));
+                CreditCard.setLimit(rs.getString("limit"));
+                CreditCard.setUserName(rs.getString("userName"));
+
+            } catch (SQLException e) {
+                e.printStackTrace();
+                return null;
+            } } }
 
         @Override
         public Object findById(String username) {
@@ -124,9 +122,6 @@ public boolean delete(String username) {
             return false;
         }
     }
-//        Credit Card
-//    1   Add account     > Create
-//    2   Update account  > Update
-//    3   Delete a credit card to be saved to my account > Delete
+
 //    4   Pay off your balance with your credit card  > Update (to the limit)
 //4.5 (for credit card update and update limit see do get in trainer servlet )
\ No newline at end of file
diff --git a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServices.java b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServices.java
index 09195af..fdeb41d 100644
--- a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServices.java
+++ b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServices.java
@@ -1,8 +1,8 @@
 package com.revature.Pi2a1000Places.creditcard;
-import com.revature.Pi2a1000Places.creditcard.CreditCardDao;
+import com.revature.Pi2a1000Places.util.exceptions.ResourcePersistenceException;
 
 import java.io.IOException;
-public class CreditCardServices {
+public class CreditCardServices extends CreditCardDao {
 
 
     private CreditCard cc = new CreditCard();
@@ -10,32 +10,31 @@ public class CreditCardServices {
     //CreditCard Class is now = cc. CreditCardDao Class is now = ccDao.
 
 
-    public boolean create(CreditCard newCreditCard){
-        System.out.println("CreditCard trying to be registered: " + newCreditCard);
-        if(validateCreditCardInput(new CreditCard())){
-            System.out.println("User was not validated");
+    public CreditCard create(CreditCard newCreditCard){
+        System.out.println("Adding Credit Card...: " + newCreditCard);
+        if(validateCreditCardInput(new CreditCard())) {
+            System.out.println("Credit Card Was Not Validated");
             throw new RuntimeException();
         }
 
-//            public void CreditCard;{
-//                System.out.println("Begin reading CreditCards in our file database.");
-//                CreditCard[] CreditCards = new CreditCard[0];
-//                try {
-//                    CreditCards = creditCardDao.findAll();
-//                    System.out.println("All CreditCards have been found here are the results: \n");
-//
-//                } catch (IOException | NullPointerException e) {
-//                    // e.printStackTrace();
-
         CreditCard persistedCreditCard = ccDao.create(new CreditCard());
 
         if(persistedCreditCard == null){
-            throw new RuntimeException();
+            throw new ResourcePersistenceException();
         }
-        System.out.println("CreditCard has been persisted: " + new CreditCard());
+        System.out.println("CreditCard Persisted: " + new CreditCard());
         return true;
     }
 
+        public CreditCard[] findAll() throws IOException {
+        return null;
+        }
+        public Object findById(String username) {
+        return null;
+        }
+        boolean delete(String username) {
+            return delete(String username);
+        }
     private boolean validateCreditCardInput(CreditCard cc) {
         System.out.println("Validating CreditCard: " + cc);
         if(cc == null) return false;

From e6d823b345c95822f479978226404f99ebc512d9 Mon Sep 17 00:00:00 2001
From: Maxwell Moord <maxwellmoord@gmail.com>
Date: Sun, 29 May 2022 17:41:08 -0400
Subject: [PATCH 18/56] Added the order model

---
 .../revature/Pi2a1000Places/order/Order.java  | 67 ++++++++++++++++++-
 1 file changed, 66 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/revature/Pi2a1000Places/order/Order.java b/src/main/java/com/revature/Pi2a1000Places/order/Order.java
index b62e837..c10a39d 100644
--- a/src/main/java/com/revature/Pi2a1000Places/order/Order.java
+++ b/src/main/java/com/revature/Pi2a1000Places/order/Order.java
@@ -2,4 +2,69 @@
 
 public class Order {
 
-}
+
+        private String id;
+        private String menuItem;
+        private String comment;
+        private String isFavorite;
+        private String orderDate;
+        private String customerUsername;
+
+
+        public Order( String id, String menuItem, String comment,String isFavorite, String orderDate, String customerUsername){
+            super();
+            this.id = id;
+            this.menuItem = menuItem;
+            this.comment = comment;
+            this.isFavorite = isFavorite;
+            this.orderDate = orderDate;
+            this.customerUsername = customerUsername;
+        }
+
+        public Order(){
+
+        }
+
+        //Getters And Setters
+        public String getId(){return id;}
+
+        public void setId(String id){this.id = id;}
+
+        public String getMenuItem(){return menuItem;}
+
+        public void setMenuItem(String menuItem){this.menuItem = menuItem;}
+
+        public String getComment(){return comment;}
+
+        public void setComment(String comment){this.comment = comment;}
+
+        public String getIsFavorite(){return isFavorite;}
+
+        public void setIsFavorite(String isFavorite){this.isFavorite = isFavorite;}
+
+        public String getOrderDate(){return orderDate;}
+
+        public void setOrderDate(String orderDate){this.orderDate = orderDate;}
+
+
+
+
+
+        @Override
+        public String toString() {
+            return "User Info{" +
+                    "Order ID ='" + id + '\'' +
+                    ", Menu Item ='" + menuItem + '\'' +
+                    ", Comment ='" + comment + '\'' +
+                    ", Favorite ='" + isFavorite + '\'' +
+                    ", Order Date ='" + orderDate + '\'' +
+                    '}';
+        }
+
+    }
+
+
+
+
+
+

From dfb60e0ac5e8ce1629178a3eeecdc070e7bef932 Mon Sep 17 00:00:00 2001
From: Maxwell Moord <maxwellmoord@gmail.com>
Date: Sun, 29 May 2022 19:30:28 -0400
Subject: [PATCH 19/56] Implemented basic order creation functionality

---
 .idea/vcs.xml                                 |  6 --
 .../revature/Pi2a1000Places/order/Order.java  |  4 ++
 .../Pi2a1000Places/order/OrderDao.java        | 60 +++++++++++++++++++
 .../Pi2a1000Places/order/OrderServices.java   | 26 ++++++++
 .../Pi2a1000Places/order/OrderServlet.java    | 57 +++++++++++++++++-
 .../util/ConnectionFactory.java               |  7 +--
 .../util/web/ContextLoaderListener.java       |  6 +-
 7 files changed, 154 insertions(+), 12 deletions(-)
 delete mode 100644 .idea/vcs.xml

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/com/revature/Pi2a1000Places/order/Order.java b/src/main/java/com/revature/Pi2a1000Places/order/Order.java
index c10a39d..e626f0d 100644
--- a/src/main/java/com/revature/Pi2a1000Places/order/Order.java
+++ b/src/main/java/com/revature/Pi2a1000Places/order/Order.java
@@ -46,6 +46,10 @@ public Order(){
 
         public void setOrderDate(String orderDate){this.orderDate = orderDate;}
 
+        public String getCustomerUsername(){return customerUsername;}
+
+        public void setCustomerUsername(String customerUsername){this.customerUsername = customerUsername;}
+
 
 
 
diff --git a/src/main/java/com/revature/Pi2a1000Places/order/OrderDao.java b/src/main/java/com/revature/Pi2a1000Places/order/OrderDao.java
index 907bc2a..3a8441a 100644
--- a/src/main/java/com/revature/Pi2a1000Places/order/OrderDao.java
+++ b/src/main/java/com/revature/Pi2a1000Places/order/OrderDao.java
@@ -1,4 +1,64 @@
 package com.revature.Pi2a1000Places.order;
 
+import com.revature.Pi2a1000Places.util.ConnectionFactory;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Random;
+
 public class OrderDao {
+
+
+    public Order createOrder(String username, String menuItem, int id, int date) {
+
+
+        System.out.println("Persisting Order");
+
+        Order order = new Order();
+        try (Connection conn = ConnectionFactory.getInstance().getConnection()) {
+            String sql = "insert into \"order\" values (?, ?, null, default, ?, ? );";
+            PreparedStatement ps = conn.prepareStatement(sql);
+            ps.setInt(1,id);
+            ps.setString(2, menuItem);
+            ps.setInt(3, date);
+            ps.setString(4, username);
+
+            int rs = ps.executeUpdate();
+            System.out.println(rs);
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return null;
+        }
+
+        try (Connection conn = ConnectionFactory.getInstance().getConnection();) {
+            String sql = "select * from \"order\" where customer_username = ? and menu_item = ?;";
+            PreparedStatement ps = conn.prepareStatement(sql);
+            ps.setString(1, username);
+            ps.setString(2, menuItem);
+
+            ResultSet rs = ps.executeQuery();
+
+            while (rs.next()) {
+
+
+                order.setId(rs.getString("id"));
+                order.setMenuItem(rs.getString("menu_item"));
+                order.setCustomerUsername(rs.getString("customer_username"));
+
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return null;
+        }
+
+        System.out.println("Order Persisted");
+        return order;
+    }
+    
+    
 }
diff --git a/src/main/java/com/revature/Pi2a1000Places/order/OrderServices.java b/src/main/java/com/revature/Pi2a1000Places/order/OrderServices.java
index d7ead04..cbf6aa5 100644
--- a/src/main/java/com/revature/Pi2a1000Places/order/OrderServices.java
+++ b/src/main/java/com/revature/Pi2a1000Places/order/OrderServices.java
@@ -1,4 +1,30 @@
 package com.revature.Pi2a1000Places.order;
 
+import com.revature.Pi2a1000Places.util.exceptions.InvalidRequestException;
+
+import java.util.Calendar;
+import java.util.Random;
+
 public class OrderServices {
+    
+    OrderDao orderDao = new OrderDao();
+    private final Calendar calendar = Calendar.getInstance();
+    
+    public Order createOrder(Order orderToCreate) {
+
+        System.out.println("Adding order");
+        Random random = new Random();
+        int id = Math.abs(random.nextInt());
+        int date = calendar.get(Calendar.DAY_OF_MONTH);
+
+        String menuItem = orderToCreate.getMenuItem();
+        String username = orderToCreate.getCustomerUsername();
+
+        if(username == null){throw new InvalidRequestException("Username cannot be null");
+        }else if(menuItem == null) {throw new InvalidRequestException("Menu Item cannot be null");
+        }else {
+            return orderDao.createOrder(username, menuItem, id, date);
+        }
+
+    }
 }
diff --git a/src/main/java/com/revature/Pi2a1000Places/order/OrderServlet.java b/src/main/java/com/revature/Pi2a1000Places/order/OrderServlet.java
index 820e4b6..0abadb3 100644
--- a/src/main/java/com/revature/Pi2a1000Places/order/OrderServlet.java
+++ b/src/main/java/com/revature/Pi2a1000Places/order/OrderServlet.java
@@ -1,4 +1,59 @@
 package com.revature.Pi2a1000Places.order;
 
-public class OrderServlet {
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.revature.Pi2a1000Places.order.*;
+import com.revature.Pi2a1000Places.auth.LoginCreds;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+import static com.revature.Pi2a1000Places.util.interfaces.Authable.checkAuth;
+
+public class OrderServlet extends HttpServlet {
+
+    private final OrderServices orderServices;
+    private final ObjectMapper mapper;
+
+
+
+    public OrderServlet(OrderServices orderServices, ObjectMapper mapper) {
+        this.orderServices = orderServices;
+        this.mapper = mapper;
+    }
+
+    @Override
+    protected void doOptions(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        super.doOptions(req, resp);
+        resp.addHeader("Access-Control-Allow-Origin", "*");
+        resp.addHeader("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE");
+        resp.addHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
+    }
+
+    @Override
+    protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+
+        resp.addHeader("Access-Control-Allow-Origin", "*");
+        resp.addHeader("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE");
+        resp.addHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
+
+       // if (checkAuth(req, resp)) {
+        System.out.println("Creating Order");
+            Order orderToCreate = mapper.readValue(req.getInputStream(), Order.class);
+            Order order = new Order();
+        System.out.println(LoginCreds.getUsername());
+            //if (orderToCreate.getCustomerUsername().equals(LoginCreds.getUsername())) {
+                //creating
+                order = orderServices.createOrder(orderToCreate);
+                String payload = mapper.writeValueAsString(order);
+                resp.getWriter().write(payload);
+            //}
+
+
+       // }
+    }
+
+
 }
diff --git a/src/main/java/com/revature/Pi2a1000Places/util/ConnectionFactory.java b/src/main/java/com/revature/Pi2a1000Places/util/ConnectionFactory.java
index b1e5f86..d690b17 100644
--- a/src/main/java/com/revature/Pi2a1000Places/util/ConnectionFactory.java
+++ b/src/main/java/com/revature/Pi2a1000Places/util/ConnectionFactory.java
@@ -12,7 +12,7 @@ public class ConnectionFactory {
     private static final ConnectionFactory connectionFactory = new ConnectionFactory();
     private Properties prop = new Properties();
 
-    private ConnectionFactory(){
+    private ConnectionFactory() {
         try {
             ClassLoader loader = Thread.currentThread().getContextClassLoader();
             prop.load(loader.getResourceAsStream("db.properties"));
@@ -30,7 +30,7 @@ private ConnectionFactory(){
         }
     }
 
-    public static ConnectionFactory getInstance(){
+    public static ConnectionFactory getInstance() {
         return connectionFactory;
     }
 
@@ -45,8 +45,7 @@ public Connection getConnection() {
         }
         return conn;
     }
+}
 
 
-public class ConnectionFactory {
 
-}
diff --git a/src/main/java/com/revature/Pi2a1000Places/util/web/ContextLoaderListener.java b/src/main/java/com/revature/Pi2a1000Places/util/web/ContextLoaderListener.java
index 24ac19a..6bc02bb 100644
--- a/src/main/java/com/revature/Pi2a1000Places/util/web/ContextLoaderListener.java
+++ b/src/main/java/com/revature/Pi2a1000Places/util/web/ContextLoaderListener.java
@@ -5,6 +5,8 @@
 import com.revature.Pi2a1000Places.customer.CustomerDao;
 import com.revature.Pi2a1000Places.customer.CustomerServices;
 import com.revature.Pi2a1000Places.customer.CustomerServlet;
+import com.revature.Pi2a1000Places.order.OrderServices;
+import com.revature.Pi2a1000Places.order.OrderServlet;
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
@@ -19,15 +21,17 @@ public void contextInitialized(ServletContextEvent sce) {
         ObjectMapper mapper = new ObjectMapper();
         CustomerDao customerDao = new CustomerDao();
         CustomerServices customerServices = new CustomerServices();
-
+        OrderServices orderServices = new OrderServices();
 
         AuthServlet authServlet = new AuthServlet(customerServices, mapper);
         CustomerServlet customerServlet = new CustomerServlet(customerServices, mapper);
+        OrderServlet orderServlet = new OrderServlet(orderServices, mapper);
 
 
         ServletContext context = sce.getServletContext();
         context.addServlet("AuthServlet", authServlet).addMapping("/auth");
         context.addServlet("CustomerServlet", customerServlet).addMapping("/customers/*");
+        context.addServlet("OrderServlet", orderServlet ).addMapping("/orders/*");
 
 
     }

From 6d50e75e458987154b8bb8aa785a6a585b5224ec Mon Sep 17 00:00:00 2001
From: MelroseDigital <Tenyce.Melrose@gmail.com>
Date: Sun, 29 May 2022 18:38:49 -0700
Subject: [PATCH 20/56] Dto...Heading into Testing

---
 .../Pi2a1000Places/creditcard/CreditCard.java |   6 +-
 .../creditcard/CreditCardDao.java             | 150 ++++++++++--------
 .../creditcard/CreditCardDto.java             |  15 ++
 .../creditcard/CreditCardServices.java        |  10 +-
 .../Pi2a1000Places/util/Crudable.java         |   2 -
 .../test/CreditCardServicesDaoTestSuite.java  |   4 +
 .../test/CreditCardServicesTestSuite.java     |   4 +
 7 files changed, 112 insertions(+), 79 deletions(-)
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDto.java
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/util/test/CreditCardServicesDaoTestSuite.java
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/util/test/CreditCardServicesTestSuite.java

diff --git a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCard.java b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCard.java
index d2f4471..5b4ca33 100644
--- a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCard.java
+++ b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCard.java
@@ -1,7 +1,7 @@
 package com.revature.Pi2a1000Places.creditcard;
 
 public class CreditCard {
-
+    //CC value setup - initializing
     private String ccNumber;
     private String ccName;
     private String cvv;
@@ -10,6 +10,8 @@ public class CreditCard {
     private String limit;
     private String userName;
 
+//Creating Constructors for the CC Class
+
 
     public CreditCard(String ccNumber, String ccName, String cvv, String expDate, String zip, String limit, String userName) {
         this.ccNumber = ccNumber;
@@ -19,13 +21,13 @@ public CreditCard(String ccNumber, String ccName, String cvv, String expDate, St
         this.zip = zip;
         this.limit = limit;
         this.userName = userName;
-
     }
 
     public CreditCard() {
 
     }
 
+    //Generate Getters/Setters
     public String getCcNumber() {
         return ccNumber;
     }
diff --git a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDao.java b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDao.java
index e9246cb..170a9b1 100644
--- a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDao.java
+++ b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDao.java
@@ -1,15 +1,14 @@
 package com.revature.Pi2a1000Places.creditcard;
-import com.revature.Pi2a1000Places.util.Crudable;
-import com.revature.Pi2a1000Places.util.exceptions.ResourcePersistenceException;
+
 import com.revature.Pi2a1000Places.util.ConnectionFactory;
+import com.revature.Pi2a1000Places.util.exceptions.ResourcePersistenceException;
 import com.revature.Pi2a1000Places.util.logging.Logger;
-import java.io.IOException;
-
 
-import java.io.*;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
 
-    public class CreditCardDao implements Crudable {
+    public class CreditCardDao {
 
         private Logger logger = Logger.getLogger();
 
@@ -47,78 +46,89 @@ public CreditCard create(CreditCard newCreditCard) {
             return newCreditCard;
         }
 
-        @Override
-        public Object create(Object newObject) throws SQLException {
+        //Read- NOT MVP!!!!
+
+//        public CreditCard[] findAll() throws IOException {
+//            try (Connection conn = ConnectionFactory.getInstance().getConnection();) {
+//
+//                String sql = "select * from CreditCard";
+//                Statement s = conn.createStatement();
+//                ResultSet rs = s.executeQuery(sql);
+//
+//                while (rs.next()) {
+//                    CreditCard newCC = new CreditCard();
+//
+//                    newCC.setCcNumber(rs.getString("ccNumber")); // this column label MUST MATCH THE DB
+//                    newCC.setCcName(rs.getString("ccName"));
+//                    newCC.setCvv(rs.getString("cvv"));
+//                    newCC.setExpDate(rs.getString("expDate"));
+//                    newCC.setZip(rs.getString("zip"));
+//                    newCC.setLimit(rs.getString("limit"));
+//                    newCC.setUserName(rs.getString("userName"));
+//
+//                    System.out.println("Going to the next line for our following index.");
+//                }
+//            } catch (SQLException e) {
+//                e.printStackTrace();
+//                return null;
+ //           }
+
+//            // NOT MVP!!!!!!
+//            public Object findById(String username) {
+//
+//            try (Connection conn = ConnectionFactory.getInstance().getConnection();) {
+//
+//                String sql = "select * from creditCard where userName = ?";
+//
+//                PreparedStatement ps = conn.prepareStatement(sql);
+//                ResultSet rs = ps.executeQuery();
+//
+//                if (!rs.next()) {
+//                    throw new ResourcePersistenceException("Credit Card Not Found");
+//                }
+//
+//                CreditCard CreditCard = new CreditCard();
+//
+//                CreditCard.setCcNumber(rs.getString("ccNumber")); // this column label MUST MATCH THE DB
+//                CreditCard.setCcName(rs.getString("ccName"));
+//                CreditCard.setCvv(rs.getString("cvv"));
+//                CreditCard.setExpDate(rs.getString("expDate"));
+//                CreditCard.setZip(rs.getString("zip"));
+//                CreditCard.setLimit(rs.getString("limit"));
+//                CreditCard.setUserName(rs.getString("userName"));
+//
+//            } catch (SQLException e) {
+//                e.printStackTrace();
+//                return null;
+//            } } }
+
+        // MVP b. Update - UPDATE Card
+        public CreditCard update(Object updatedObject) {
             return null;
         }
-        // MVP b. Update Card
-        @Override
-        public CreditCard[] findAll() throws IOException {
-            try (Connection conn = ConnectionFactory.getInstance().getConnection();) {
 
-                String sql = "select * from CreditCard";
-                Statement s = conn.createStatement();
-                ResultSet rs = s.executeQuery(sql);
+        //// MVP c. Delete - DELETE Card
+        public boolean deleteByCCNumber(String ccNumber) {
+            Connection conn = ConnectionFactory.getInstance().getConnection();
+            {
+                String sql = "delete from credit_card where cc_number = ?";
 
-                while (rs.next()) {
-                    CreditCard newCC = new CreditCard();
+                try {
+                    PreparedStatement ps = conn.prepareStatement(sql);
+                    ps.setString(1, ccNumber);
 
-                    newCC.setCcNumber(rs.getString("ccNumber")); // this column label MUST MATCH THE DB
-                    newCC.setCcName(rs.getString("ccName"));
-                    newCC.setCvv(rs.getString("cvv"));
-                    newCC.setExpDate(rs.getString("expDate"));
-                    newCC.setZip(rs.getString("zip"));
-                    newCC.setLimit(rs.getString("limit"));
-                    newCC.setUserName(rs.getString("userName"));
+                    int checkInsert = ps.executeUpdate();
 
-                    System.out.println("Going to the next line for our following index.");
-                }
-            } catch (SQLException e) {
-                e.printStackTrace();
-                return null;
-            }
+                    if (checkInsert == 0) {
+                        throw new RuntimeException();
+                    }
 
-            //@Override
-            public Object findById(String username) {
-
-            try (Connection conn = ConnectionFactory.getInstance().getConnection();) {
-
-                String sql = "select * from creditCard where userName = ?";
-
-                PreparedStatement ps = conn.prepareStatement(sql);
-                ResultSet rs = ps.executeQuery();
-
-                if (!rs.next()) {
-                    throw new ResourcePersistenceException("Credit Card Not Found");
+                    return true;
+                } catch (SQLException e) {
+                    e.printStackTrace();
                 }
 
-                CreditCard CreditCard = new CreditCard();
-
-                CreditCard.setCcNumber(rs.getString("ccNumber")); // this column label MUST MATCH THE DB
-                CreditCard.setCcName(rs.getString("ccName"));
-                CreditCard.setCvv(rs.getString("cvv"));
-                CreditCard.setExpDate(rs.getString("expDate"));
-                CreditCard.setZip(rs.getString("zip"));
-                CreditCard.setLimit(rs.getString("limit"));
-                CreditCard.setUserName(rs.getString("userName"));
-
-            } catch (SQLException e) {
-                e.printStackTrace();
-                return null;
-            } } }
-
-        @Override
-        public Object findById(String username) {
-            return null;
-        }
-
-        @Override
-        public boolean update(Object updatedObject) {
-            return false;
-        }
-
-        @Override
-        public boolean delete(String username) {
+            }
             return false;
         }
     }
diff --git a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDto.java b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDto.java
new file mode 100644
index 0000000..93cfbaa
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDto.java
@@ -0,0 +1,15 @@
+package com.revature.Pi2a1000Places.creditcard;
+
+public class CreditCardDto {
+    //Generate Pass-in values
+    private String ccNumber;
+
+
+    public String getCcNumber() {
+        return ccNumber;
+    }
+
+    public void setCcNumber(String ccNumber) {
+        this.ccNumber = ccNumber;
+    }
+}
diff --git a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServices.java b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServices.java
index fdeb41d..d7e847a 100644
--- a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServices.java
+++ b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServices.java
@@ -20,10 +20,10 @@ public CreditCard create(CreditCard newCreditCard){
         CreditCard persistedCreditCard = ccDao.create(new CreditCard());
 
         if(persistedCreditCard == null){
-            throw new ResourcePersistenceException();
+            throw new ResourcePersistenceException("Persisted");
         }
         System.out.println("CreditCard Persisted: " + new CreditCard());
-        return true;
+        return new CreditCard();
     }
 
         public CreditCard[] findAll() throws IOException {
@@ -32,9 +32,9 @@ public CreditCard[] findAll() throws IOException {
         public Object findById(String username) {
         return null;
         }
-        boolean delete(String username) {
-            return delete(String username);
-        }
+//        boolean delete(String username) {
+//            return delete(String username);
+//        }
     private boolean validateCreditCardInput(CreditCard cc) {
         System.out.println("Validating CreditCard: " + cc);
         if(cc == null) return false;
diff --git a/src/main/java/com/revature/Pi2a1000Places/util/Crudable.java b/src/main/java/com/revature/Pi2a1000Places/util/Crudable.java
index 0fb6aaa..1865cb2 100644
--- a/src/main/java/com/revature/Pi2a1000Places/util/Crudable.java
+++ b/src/main/java/com/revature/Pi2a1000Places/util/Crudable.java
@@ -1,7 +1,5 @@
 package com.revature.Pi2a1000Places.util;
 
-import com.sun.org.apache.xerces.internal.impl.dv.ValidatedInfo;
-
 import java.io.IOException;
 import java.sql.SQLException;
 
diff --git a/src/main/java/com/revature/Pi2a1000Places/util/test/CreditCardServicesDaoTestSuite.java b/src/main/java/com/revature/Pi2a1000Places/util/test/CreditCardServicesDaoTestSuite.java
new file mode 100644
index 0000000..66c80a2
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/util/test/CreditCardServicesDaoTestSuite.java
@@ -0,0 +1,4 @@
+package com.revature.Pi2a1000Places.util.test;
+
+public class CreditCardServicesDaoTestSuite {
+}
diff --git a/src/main/java/com/revature/Pi2a1000Places/util/test/CreditCardServicesTestSuite.java b/src/main/java/com/revature/Pi2a1000Places/util/test/CreditCardServicesTestSuite.java
new file mode 100644
index 0000000..eb5391b
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/util/test/CreditCardServicesTestSuite.java
@@ -0,0 +1,4 @@
+package com.revature.Pi2a1000Places.util.test;
+
+public class CreditCardServicesTestSuite {
+}

From b298669e878f6f9e9863fe438666744b0f3ccff2 Mon Sep 17 00:00:00 2001
From: RoLewis367 <104225081+RoLewis367@users.noreply.github.com>
Date: Mon, 30 May 2022 20:50:08 -0400
Subject: [PATCH 21/56] Add files via upload

Use these files for guidance to keep the project 1 requirements coded and included in program.
---
 .../Pi2a1000Places/ConfigHibernate.java       | 23 +++++++
 .../revature/Pi2a1000Places/Confighibrerante  | 31 ++++++++++
 .../Pi2a1000Places/Confighibrerante.java      | 31 ++++++++++
 .../revature/Pi2a1000Places/CreateStud.java   | 35 +++++++++++
 .../Pi2a1000Places/CrudHibernate.java         | 53 ++++++++++++++++
 .../com/revature/Pi2a1000Places/Cruds.java    | 25 ++++++++
 .../revature/Pi2a1000Places/DeleteStu.java    | 28 +++++++++
 .../revature/Pi2a1000Places/ReadStudent.java  | 34 +++++++++++
 .../revature/Pi2a1000Places/Restaurant.java   | 61 +++++++++++++++++++
 .../com/revature/Pi2a1000Places/Update.java   | 30 +++++++++
 .../Pi2a1000Places/UtilHiberante.java         | 23 +++++++
 .../revature/Pi2a1000Places/samplejava.iml    | 11 ++++
 12 files changed, 385 insertions(+)
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/ConfigHibernate.java
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/Confighibrerante
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/Confighibrerante.java
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/CreateStud.java
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/CrudHibernate.java
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/Cruds.java
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/DeleteStu.java
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/ReadStudent.java
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/Restaurant.java
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/Update.java
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/UtilHiberante.java
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/samplejava.iml

diff --git a/src/main/java/com/revature/Pi2a1000Places/ConfigHibernate.java b/src/main/java/com/revature/Pi2a1000Places/ConfigHibernate.java
new file mode 100644
index 0000000..25b96c4
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/ConfigHibernate.java
@@ -0,0 +1,23 @@
+package com.sdnext.hibernate.tutorial.utility;
+
+import org.hibernate.SessionFactory;
+import org.hibernate.cfg.AnnotationConfiguration;
+
+public class HibernateUtil 
+{
+ private static final SessionFactory sessionFactory;
+ static
+ {
+  try
+  {
+   sessionFactory = new AnnotationConfiguration().configure().buildSessionFactory();
+  }
+  catch(Throwable th){
+   System.err.println("Enitial SessionFactory creation failed"+th);
+   throw new ExceptionInInitializerError(th);
+  }
+   }
+   public static SessionFactory getSessionFactory(){
+    return sessionFactory;
+   }
+}
\ No newline at end of file
diff --git a/src/main/java/com/revature/Pi2a1000Places/Confighibrerante b/src/main/java/com/revature/Pi2a1000Places/Confighibrerante
new file mode 100644
index 0000000..60c9b93
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/Confighibrerante
@@ -0,0 +1,31 @@
+<hibernate-configuration> 
+ <session-factory> 
+  <!-- Database connection settings -->
+   <property name="connection.driver_class">com.mysql.jdbc.Driver</property> 
+   <property name="connection.url">jdbc:mysql://localhost:3306/hibernateDB2</property> 
+   <property name="connection.username">root</property> 
+   <property name="connection.password">root</property> 
+
+  <!-- JDBC connection pool (use the built-in) -->
+   <property name="connection.pool_size">1</property> 
+
+  <!-- SQL dialect -->
+   <property name="dialect">org.hibernate.dialect.MySQLDialect</property> 
+
+  <!-- Enable Hibernate's automatic session context management -->
+    <property name="current_session_context_class">thread</property> 
+  
+  <!-- Disable the second-level cache -->
+   <property name="cache.provider_class">org.hibernate.cache.NoCacheProvider</property> 
+
+  <!-- Echo all executed SQL to stdout -->
+   <property name="show_sql">true</property> 
+  
+  <!-- Drop and re-create the database schema on startup -->
+   <property name="hbm2ddl.auto">update</property> 
+    
+   <mapping class="com.sdnext.hibernate.tutorial.dto.Student">
+      
+  </mapping></session-factory> 
+ </hibernate-configuration>
+f
\ No newline at end of file
diff --git a/src/main/java/com/revature/Pi2a1000Places/Confighibrerante.java b/src/main/java/com/revature/Pi2a1000Places/Confighibrerante.java
new file mode 100644
index 0000000..60c9b93
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/Confighibrerante.java
@@ -0,0 +1,31 @@
+<hibernate-configuration> 
+ <session-factory> 
+  <!-- Database connection settings -->
+   <property name="connection.driver_class">com.mysql.jdbc.Driver</property> 
+   <property name="connection.url">jdbc:mysql://localhost:3306/hibernateDB2</property> 
+   <property name="connection.username">root</property> 
+   <property name="connection.password">root</property> 
+
+  <!-- JDBC connection pool (use the built-in) -->
+   <property name="connection.pool_size">1</property> 
+
+  <!-- SQL dialect -->
+   <property name="dialect">org.hibernate.dialect.MySQLDialect</property> 
+
+  <!-- Enable Hibernate's automatic session context management -->
+    <property name="current_session_context_class">thread</property> 
+  
+  <!-- Disable the second-level cache -->
+   <property name="cache.provider_class">org.hibernate.cache.NoCacheProvider</property> 
+
+  <!-- Echo all executed SQL to stdout -->
+   <property name="show_sql">true</property> 
+  
+  <!-- Drop and re-create the database schema on startup -->
+   <property name="hbm2ddl.auto">update</property> 
+    
+   <mapping class="com.sdnext.hibernate.tutorial.dto.Student">
+      
+  </mapping></session-factory> 
+ </hibernate-configuration>
+f
\ No newline at end of file
diff --git a/src/main/java/com/revature/Pi2a1000Places/CreateStud.java b/src/main/java/com/revature/Pi2a1000Places/CreateStud.java
new file mode 100644
index 0000000..f6288bb
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/CreateStud.java
@@ -0,0 +1,35 @@
+package com.sdnext.hibernate.tutorial;
+
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+
+import com.sdnext.hibernate.tutorial.dto.Student;
+import com.sdnext.hibernate.tutorial.utility.HibernateUtil;
+
+public class CreateStudent {
+
+ /**
+  * @param args
+  */
+ public static void main(String[] args) 
+ {
+  //Create student entity object
+  Student student = new Student();
+  student.setStudentName("Dinesh Rajput");
+  student.setRollNumber(01);
+  student.setCourse("MCA");
+  
+  //Create session factory object
+  SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
+  //getting session object from session factory
+  Session session = sessionFactory.openSession();
+  //getting transaction object from session object
+  session.beginTransaction();
+  
+  session.save(student);
+  System.out.println("Inserted Successfully");
+  session.getTransaction().commit();
+  session.close();
+  sessionFactory.close();
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/revature/Pi2a1000Places/CrudHibernate.java b/src/main/java/com/revature/Pi2a1000Places/CrudHibernate.java
new file mode 100644
index 0000000..0adda10
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/CrudHibernate.java
@@ -0,0 +1,53 @@
+package com.sdnext.hibernate.tutorial.dto;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+@Table(name="STUDENT")
+public class Student implements Serializable 
+{
+
+ /**
+  * serialVersionUID
+  */
+ private static final long serialVersionUID = 8633415090390966715L;
+ @Id
+ @Column(name="ID")
+ @GeneratedValue(strategy=GenerationType.AUTO)
+ private int id;
+ @Column(name="STUDENT_NAME")
+ private String studentName;
+ @Column(name="ROLL_NUMBER")
+ private int rollNumber;
+ @Column(name="COURSE")
+ private String course;
+ public int getId() {
+  return id;
+ }
+ public void setId(int id) {
+  this.id = id;
+ }
+ public String getStudentName() {
+  return studentName;
+ }
+ public void setStudentName(String studentName) {
+  this.studentName = studentName;
+ }
+ public int getRollNumber() {
+  return rollNumber;
+ }
+ public void setRollNumber(int rollNumber) {
+  this.rollNumber = rollNumber;
+ }
+ public String getCourse() {
+  return course;
+ }
+ public void setCourse(String course) {
+  this.course = course;
+ }
+}
diff --git a/src/main/java/com/revature/Pi2a1000Places/Cruds.java b/src/main/java/com/revature/Pi2a1000Places/Cruds.java
new file mode 100644
index 0000000..4086905
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/Cruds.java
@@ -0,0 +1,25 @@
+
+package com.revature.pokedex.daos;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+// This is another form of abstraction
+public interface Crudable<T> {
+
+    // public final int age = 16; we call a constant variable because by default it's final and cannot changed
+
+    // Create
+    T create(T newObject);
+
+    // Read
+    T[] findAll() throws IOException;
+    T findById(String id);
+
+    // Update
+    public boolean update(T updatedObj);
+
+    //Delete
+    boolean delete(String id);
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/revature/Pi2a1000Places/DeleteStu.java b/src/main/java/com/revature/Pi2a1000Places/DeleteStu.java
new file mode 100644
index 0000000..5d1c682
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/DeleteStu.java
@@ -0,0 +1,28 @@
+package com.sdnext.hibernate.tutorial;
+
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+
+import com.sdnext.hibernate.tutorial.dto.Student;
+import com.sdnext.hibernate.tutorial.utility.HibernateUtil;
+
+public class DeleteStudent {
+
+ /**
+  * @param args
+  */
+ public static void main(String[] args) 
+ {
+  //Create session factory object
+  SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
+  //getting session object from session factory
+  Session session = sessionFactory.openSession();
+  //getting transaction object from session object
+  session.beginTransaction();
+  Student student = (Student)session.load(Student.class, 4);
+  session.delete(student);
+  System.out.println("Deleted Successfully");
+  session.getTransaction().commit();
+     sessionFactory.close();
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/revature/Pi2a1000Places/ReadStudent.java b/src/main/java/com/revature/Pi2a1000Places/ReadStudent.java
new file mode 100644
index 0000000..eb0523f
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/ReadStudent.java
@@ -0,0 +1,34 @@
+package com.sdnext.hibernate.tutorial;
+
+import java.util.List;
+
+import org.hibernate.Query;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+
+import com.sdnext.hibernate.tutorial.dto.Student;
+import com.sdnext.hibernate.tutorial.utility.HibernateUtil;
+
+public class ReadStudent {
+
+ /**
+  * @param args
+  */
+ public static void main(String[] args) 
+ {
+  //Create session factory object
+  SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
+  //getting session object from session factory
+  Session session = sessionFactory.openSession();
+  //getting transaction object from session object
+  session.beginTransaction();
+  Query query = session.createQuery("from Student");
+  List students = query.list();
+  for(Student student : students)
+  {
+System.out.println("Roll Number: "+student.getRollNumber()+", Student Name: "+student.getStudentName()+", Course: "+student.getCourse());
+  }
+  session.getTransaction().commit();
+  sessionFactory.close();
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/revature/Pi2a1000Places/Restaurant.java b/src/main/java/com/revature/Pi2a1000Places/Restaurant.java
new file mode 100644
index 0000000..bad9491
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/Restaurant.java
@@ -0,0 +1,61 @@
+/*
+*
+*  Refactor the code into the Project1 code.
+*  This in only a general format of how the require functions must comply with.
+*
+*
+*
+*/
+
+packkage com.sdnext.hibernate.tutorial.dto;
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+@Table(name="STUDENT")
+public class Student implements Serializable 
+{
+
+ /**
+  * serialVersionUID
+  */
+ private static final long serialVersionUID = 8633415090390966715L;
+ @Id
+ @Column(name="ID")
+ @GeneratedValue(strategy=GenerationType.AUTO)
+ private int id;
+ @Column(name="STUDENT_NAME")
+ private String studentName;
+ @Column(name="ROLL_NUMBER")
+ private int rollNumber;
+ @Column(name="COURSE")
+ private String course;
+ public int getId() {
+  return id;
+ }
+ public void setId(int id) {
+  this.id = id;
+ }
+ public String getStudentName() {
+  return studentName;
+ }
+ public void setStudentName(String studentName) {
+  this.studentName = studentName;
+ }
+ public int getRollNumber() {
+  return rollNumber;
+ }
+ public void setRollNumber(int rollNumber) {
+  this.rollNumber = rollNumber;
+ }
+ public String getCourse() {
+  return course;
+ }
+ public void setCourse(String course) {
+  this.course = course;
+ }
+}
diff --git a/src/main/java/com/revature/Pi2a1000Places/Update.java b/src/main/java/com/revature/Pi2a1000Places/Update.java
new file mode 100644
index 0000000..a5a728a
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/Update.java
@@ -0,0 +1,30 @@
+package com.sdnext.hibernate.tutorial;
+
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+
+import com.sdnext.hibernate.tutorial.dto.Student;
+import com.sdnext.hibernate.tutorial.utility.HibernateUtil;
+
+public class UpdateStudent {
+
+ /**
+  * @param args
+  */
+ public static void main(String[] args) 
+ {
+  //Create session factory object
+  SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
+  //getting session object from session factory
+  Session session = sessionFactory.openSession();
+  //getting transaction object from session object
+  session.beginTransaction();
+  
+  Student student = (Student)session.get(Student.class, 2);
+  student.setStudentName("Sweety Rajput");
+  System.out.println("Updated Successfully");
+  session.getTransaction().commit();
+  sessionFactory.close();
+ }
+}
+
diff --git a/src/main/java/com/revature/Pi2a1000Places/UtilHiberante.java b/src/main/java/com/revature/Pi2a1000Places/UtilHiberante.java
new file mode 100644
index 0000000..25b96c4
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/UtilHiberante.java
@@ -0,0 +1,23 @@
+package com.sdnext.hibernate.tutorial.utility;
+
+import org.hibernate.SessionFactory;
+import org.hibernate.cfg.AnnotationConfiguration;
+
+public class HibernateUtil 
+{
+ private static final SessionFactory sessionFactory;
+ static
+ {
+  try
+  {
+   sessionFactory = new AnnotationConfiguration().configure().buildSessionFactory();
+  }
+  catch(Throwable th){
+   System.err.println("Enitial SessionFactory creation failed"+th);
+   throw new ExceptionInInitializerError(th);
+  }
+   }
+   public static SessionFactory getSessionFactory(){
+    return sessionFactory;
+   }
+}
\ No newline at end of file
diff --git a/src/main/java/com/revature/Pi2a1000Places/samplejava.iml b/src/main/java/com/revature/Pi2a1000Places/samplejava.iml
new file mode 100644
index 0000000..7758961
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/samplejava.iml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" packagePrefix="com.sdnext.hibernate.tutorial" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file

From 2c3149ef6cc5a333b8e12b6c2388c836309f86be Mon Sep 17 00:00:00 2001
From: MelroseDigital <Tenyce.Melrose@gmail.com>
Date: Wed, 1 Jun 2022 06:06:55 -0700
Subject: [PATCH 22/56] Testing in progress

---
 pom.xml                                       |  96 +++++++++-
 .../creditcard/CreditCardDao.java             |  95 ++--------
 .../creditcard/CreditCardDto.java             |  55 +++++-
 .../creditcard/CreditCardServices.java        |  96 +++++-----
 .../creditcard/CreditCardServlet.java         | 178 ++++++------------
 .../customer/CustomerServlet.java             |   3 +-
 .../util/ConnectionFactory.java               |   2 +-
 .../util/interfaces/Authable.java             |   5 +
 .../test/CreditCardServicesDaoTestSuite.java  |   4 -
 .../test/CreditCardServicesTestSuite.java     |   4 -
 .../testSuite/ConnectionFactoryTestSuite.java |  25 +++
 .../CreditCardDaoCreateMethodTestSuite.java   |  22 +++
 .../CreditCardDaoDeleteMethodTestSuite.java   |  22 +++
 .../CreditCardServicesDaoTestSuite.java       |  14 ++
 .../CreditCardServicesTestSuite.java          |   4 +
 15 files changed, 362 insertions(+), 263 deletions(-)
 delete mode 100644 src/main/java/com/revature/Pi2a1000Places/util/test/CreditCardServicesDaoTestSuite.java
 delete mode 100644 src/main/java/com/revature/Pi2a1000Places/util/test/CreditCardServicesTestSuite.java
 create mode 100644 src/test/java/testSuite/ConnectionFactoryTestSuite.java
 create mode 100644 src/test/java/testSuite/creditCard/CreditCardDaoCreateMethodTestSuite.java
 create mode 100644 src/test/java/testSuite/creditCard/CreditCardDaoDeleteMethodTestSuite.java
 create mode 100644 src/test/java/testSuite/creditCard/CreditCardServicesDaoTestSuite.java
 create mode 100644 src/test/java/testSuite/creditCard/CreditCardServicesTestSuite.java

diff --git a/pom.xml b/pom.xml
index dd8ecef..352d1fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,6 +14,7 @@
     <maven.compiler.target>8</maven.compiler.target>
   </properties>
 
+
   <build>
     <pluginManagement>
       <plugins>
@@ -24,7 +25,7 @@
           <configuration>
             <url>http://localhost:8080/manager/text</url>
             <server>LocalTomcat</server>
-            <path>/Pi2a1000Places</path>
+            <path>/PitoA1000Places</path>
             <update>true</update>
           </configuration>
         </plugin>
@@ -32,6 +33,80 @@
     </pluginManagement>
   </build>
 
+  <!--    <build>-->
+  <!--        <pluginManagement>-->
+  <!--            <plugins>-->
+  <!--                <plugin>-->
+  <!--                    <groupId>org.apache.tomcat.maven</groupId>-->
+  <!--                    <artifactId>tomcat7-maven-plugin</artifactId>-->
+  <!--                    <version>2.2</version>-->
+  <!--                    <configuration>-->
+  <!--                        <url>http://localhost:3000/manager/text</url>-->
+  <!--                        <server>LocalTomcat</server>-->
+  <!--                        <path>/PitoA1000Places</path>-->
+  <!--                        <update>true</update>-->
+  <!--                    </configuration>-->
+  <!--                </plugin>-->
+  <!--            </plugins>-->
+  <!--        </pluginManagement>-->
+  <!--    </build>-->
+
+
+
+
+  <!--    <build>-->
+  <!--        &lt;!&ndash; https://docs.microsoft.com/en-us/azure/app-service/app-service-web-get-started-java &ndash;&gt;-->
+  <!--        <plugins>-->
+  <!--            <plugin>-->
+  <!--                <artifactId>maven-compiler-plugin</artifactId>-->
+  <!--                <version>3.8.1</version>-->
+  <!--                <configuration>-->
+  <!--                    <source>1.8</source>-->
+  <!--                    <target>1.8</target>-->
+  <!--                </configuration>-->
+  <!--            </plugin>-->
+  <!--            &lt;!&ndash;************************************************* &ndash;&gt;-->
+  <!--            &lt;!&ndash; Deploy to Tomcat in App Service Windows &ndash;&gt;-->
+  <!--            &lt;!&ndash;************************************************* &ndash;&gt;-->
+  <!--            <plugin>-->
+  <!--                <groupId>com.microsoft.azure</groupId>-->
+  <!--                <artifactId>azure-webapp-maven-plugin</artifactId>-->
+  <!--                <version>2.2.0</version>-->
+  <!--                <configuration>-->
+  <!--                    &lt;!&ndash; Specify v2 schema &ndash;&gt;-->
+  <!--                    <schemaVersion>v2</schemaVersion>-->
+  <!--                    &lt;!&ndash; App information &ndash;&gt;-->
+  <!--                    &lt;!&ndash; SUBSCRIPTION_ID Unique ID for the subscription that deploys the app&ndash;&gt;-->
+  <!--                    <subscriptionId>9cc4b7e1-da29-4fd8-8ac8-1e56252688f4</subscriptionId>-->
+  <!--                    &lt;!&ndash; RESOURCEGROUP_NAME &ndash;&gt;-->
+  <!--                    <resourceGroup>sqldatabase</resourceGroup>-->
+  <!--                    &lt;!&ndash; WEBAPP_NAME &ndash;&gt;-->
+  <!--                    <appName>zahfosha</appName>-->
+  <!--                    &lt;!&ndash; REGION &ndash;&gt;-->
+  <!--                    <region>East US</region>-->
+  <!--                    &lt;!&ndash; Java Runtime Stack for App Service on Windows &ndash;&gt;-->
+  <!--                    <runtime>-->
+  <!--                        <os>windows</os>-->
+  <!--                        <javaVersion>1.8</javaVersion>-->
+  <!--                        <webContainer>tomcat 9.0</webContainer>-->
+  <!--                    </runtime>-->
+  <!--                    <deployment>-->
+  <!--                        <resources>-->
+  <!--                            <resource>-->
+  <!--                                <directory>${project.basedir}/target</directory>-->
+  <!--                                <includes>-->
+  <!--                                    <include>*.war</include>-->
+  <!--                                </includes>-->
+  <!--                            </resource>-->
+  <!--                        </resources>-->
+  <!--                    </deployment>-->
+  <!--                    &lt;!&ndash;          DO NOT REMOVE THE PRICING TIER ITS THE CHEAPEST&ndash;&gt;-->
+  <!--                    <pricingTier>B1</pricingTier>-->
+  <!--                </configuration>-->
+  <!--            </plugin>-->
+  <!--        </plugins>-->
+  <!--    </build>-->
+
   <dependencies>
     <!-- this is a comment -->
     <!-- https://mvnrepository.com/artifact/org.postgresql/postgresql -->
@@ -56,7 +131,6 @@
       <scope>test</scope>
     </dependency>
 
-
     <!-- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api -->
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -85,11 +159,19 @@
       <artifactId>hibernate-core</artifactId>
       <version>5.4.32.Final</version>
     </dependency>
-      <dependency>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-          <version>1.2.12</version>
-      </dependency>
+
+    <!-- https://mvnrepository.com/artifact/com.microsoft.sqlserver/mssql-jdbc -->
+    <dependency>
+      <groupId>com.microsoft.sqlserver</groupId>
+      <artifactId>mssql-jdbc</artifactId>
+      <version>10.2.1.jre8</version>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>5.8.2</version>
+      <scope>test</scope>
+    </dependency>
 
 
   </dependencies>
diff --git a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDao.java b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDao.java
index 170a9b1..832eef2 100644
--- a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDao.java
+++ b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDao.java
@@ -1,7 +1,6 @@
 package com.revature.Pi2a1000Places.creditcard;
 
 import com.revature.Pi2a1000Places.util.ConnectionFactory;
-import com.revature.Pi2a1000Places.util.exceptions.ResourcePersistenceException;
 import com.revature.Pi2a1000Places.util.logging.Logger;
 
 import java.sql.Connection;
@@ -13,97 +12,35 @@ public class CreditCardDao {
         private Logger logger = Logger.getLogger();
 
         // MVP a. Create - ADD Card
-        public CreditCard create(CreditCard newCreditCard) {
-            System.out.println("newCreditCard Entering Dao" + newCreditCard);
-
-            try (Connection conn = ConnectionFactory.getInstance().getConnection();) {
-                String sql = "insert into CreditCard (ccnumber, ccname, ccv, expdate, zip, limit, username) values (?, ?, ?, ?, ?)";
-
+        public CreditCard addCC(String ccNumber, String ccName, String cvv, String expDate, String zip, String limits, String customerUsername) {
+            try(Connection conn = ConnectionFactory.getInstance().getConnection();){
+                String sql = "insert into credit_card values (?, ?, ?, ?, ?, ?, ?)";
                 PreparedStatement ps = conn.prepareStatement(sql);
 
-                System.out.println(newCreditCard.getCcNumber());
-                System.out.println(newCreditCard.getUserName());
-
-                // CC String Index
-                ps.setString(1, newCreditCard.getCcNumber());
-                ps.setString(2, newCreditCard.getCcName());
-                ps.setString(3, newCreditCard.getCvv());
-                ps.setString(4, newCreditCard.getExpDate());
-                ps.setString(5, newCreditCard.getZip());
-                ps.setString(6, newCreditCard.getLimit());
-                ps.setString(7, newCreditCard.getUserName());
+                ps.setString(1,ccNumber);
+                ps.setString(2, ccName);
+                ps.setString(3, cvv);
+                ps.setString(4, expDate);
+                ps.setString(5, zip);
+                ps.setString(6, limits);
+                ps.setString(7, customerUsername);
 
                 int checkInsert = ps.executeUpdate();
 
-                if (checkInsert == 0) {
-                    throw new ResourcePersistenceException("Credit Card Not Updated.");
+                if (checkInsert == 0){
+                    throw new RuntimeException();
                 }
 
-            } catch (SQLException e) {
+            }catch (SQLException e){
                 e.printStackTrace();
                 return null;
             }
-            return newCreditCard;
+            return null;
         }
 
-        //Read- NOT MVP!!!!
-
-//        public CreditCard[] findAll() throws IOException {
-//            try (Connection conn = ConnectionFactory.getInstance().getConnection();) {
-//
-//                String sql = "select * from CreditCard";
-//                Statement s = conn.createStatement();
-//                ResultSet rs = s.executeQuery(sql);
-//
-//                while (rs.next()) {
-//                    CreditCard newCC = new CreditCard();
-//
-//                    newCC.setCcNumber(rs.getString("ccNumber")); // this column label MUST MATCH THE DB
-//                    newCC.setCcName(rs.getString("ccName"));
-//                    newCC.setCvv(rs.getString("cvv"));
-//                    newCC.setExpDate(rs.getString("expDate"));
-//                    newCC.setZip(rs.getString("zip"));
-//                    newCC.setLimit(rs.getString("limit"));
-//                    newCC.setUserName(rs.getString("userName"));
-//
-//                    System.out.println("Going to the next line for our following index.");
-//                }
-//            } catch (SQLException e) {
-//                e.printStackTrace();
-//                return null;
- //           }
-
-//            // NOT MVP!!!!!!
-//            public Object findById(String username) {
-//
-//            try (Connection conn = ConnectionFactory.getInstance().getConnection();) {
-//
-//                String sql = "select * from creditCard where userName = ?";
-//
-//                PreparedStatement ps = conn.prepareStatement(sql);
-//                ResultSet rs = ps.executeQuery();
-//
-//                if (!rs.next()) {
-//                    throw new ResourcePersistenceException("Credit Card Not Found");
-//                }
-//
-//                CreditCard CreditCard = new CreditCard();
-//
-//                CreditCard.setCcNumber(rs.getString("ccNumber")); // this column label MUST MATCH THE DB
-//                CreditCard.setCcName(rs.getString("ccName"));
-//                CreditCard.setCvv(rs.getString("cvv"));
-//                CreditCard.setExpDate(rs.getString("expDate"));
-//                CreditCard.setZip(rs.getString("zip"));
-//                CreditCard.setLimit(rs.getString("limit"));
-//                CreditCard.setUserName(rs.getString("userName"));
-//
-//            } catch (SQLException e) {
-//                e.printStackTrace();
-//                return null;
-//            } } }
 
         // MVP b. Update - UPDATE Card
-        public CreditCard update(Object updatedObject) {
+        public static CreditCard update(Object updatedObject) {
             return null;
         }
 
@@ -133,5 +70,5 @@ public boolean deleteByCCNumber(String ccNumber) {
         }
     }
 
-//    4   Pay off your balance with your credit card  > Update (to the limit)
+//    d.   Pay off your balance with your credit card  > Update (to the limit)
 //4.5 (for credit card update and update limit see do get in trainer servlet )
\ No newline at end of file
diff --git a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDto.java b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDto.java
index 93cfbaa..e5878f5 100644
--- a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDto.java
+++ b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDto.java
@@ -3,7 +3,12 @@
 public class CreditCardDto {
     //Generate Pass-in values
     private String ccNumber;
-
+    private String ccName;
+    private String cvv;
+    private String expDate;
+    private String zip;
+    private String limits;
+    private String customerUsername;
 
     public String getCcNumber() {
         return ccNumber;
@@ -12,4 +17,52 @@ public String getCcNumber() {
     public void setCcNumber(String ccNumber) {
         this.ccNumber = ccNumber;
     }
+
+    public String getCcName() {
+        return ccName;
+    }
+
+    public void setCcName(String ccName) {
+        this.ccName = ccName;
+    }
+
+    public String getCvv() {
+        return cvv;
+    }
+
+    public void setCvv(String cvv) {
+        this.cvv = cvv;
+    }
+
+    public String getExpDate() {
+        return expDate;
+    }
+
+    public void setExpDate(String expDate) {
+        this.expDate = expDate;
+    }
+
+    public String getZip() {
+        return zip;
+    }
+
+    public void setZip(String zip) {
+        this.zip = zip;
+    }
+
+    public String getLimits() {
+        return limits;
+    }
+
+    public void setLimits(String limits) {
+        this.limits = limits;
+    }
+
+    public String getCustomerUsername() {
+        return customerUsername;
+    }
+
+    public void setCustomerUsername(String customerUsername) {
+        this.customerUsername = customerUsername;
+    }
 }
diff --git a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServices.java b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServices.java
index d7e847a..9fedf4d 100644
--- a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServices.java
+++ b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServices.java
@@ -1,49 +1,49 @@
-package com.revature.Pi2a1000Places.creditcard;
-import com.revature.Pi2a1000Places.util.exceptions.ResourcePersistenceException;
-
-import java.io.IOException;
-public class CreditCardServices extends CreditCardDao {
-
-
-    private CreditCard cc = new CreditCard();
-    private CreditCardDao ccDao = new CreditCardDao();
-    //CreditCard Class is now = cc. CreditCardDao Class is now = ccDao.
-
-
-    public CreditCard create(CreditCard newCreditCard){
-        System.out.println("Adding Credit Card...: " + newCreditCard);
-        if(validateCreditCardInput(new CreditCard())) {
-            System.out.println("Credit Card Was Not Validated");
-            throw new RuntimeException();
-        }
-
-        CreditCard persistedCreditCard = ccDao.create(new CreditCard());
-
-        if(persistedCreditCard == null){
-            throw new ResourcePersistenceException("Persisted");
-        }
-        System.out.println("CreditCard Persisted: " + new CreditCard());
-        return new CreditCard();
-    }
-
-        public CreditCard[] findAll() throws IOException {
-        return null;
-        }
-        public Object findById(String username) {
-        return null;
-        }
-//        boolean delete(String username) {
-//            return delete(String username);
+//package com.revature.Pi2a1000Places.creditcard;
+//import com.revature.Pi2a1000Places.util.exceptions.ResourcePersistenceException;
+//
+//import java.io.IOException;
+//public class CreditCardServices extends CreditCardDao {
+//
+//
+//    private CreditCard cc = new CreditCard();
+//    private CreditCardDao ccDao = new CreditCardDao();
+//    //CreditCard Class is now = cc. CreditCardDao Class is now = ccDao.
+//
+//
+//    public CreditCard create(CreditCard newCreditCard){
+//        System.out.println("Adding Credit Card...: " + newCreditCard);
+//        if(validateCreditCardInput(new CreditCard())) {
+//            System.out.println("Credit Card Was Not Validated");
+//            throw new RuntimeException();
 //        }
-    private boolean validateCreditCardInput(CreditCard cc) {
-        System.out.println("Validating CreditCard: " + cc);
-        if(cc == null) return false;
-        else if(cc.getCcNumber() == null || cc.getCcNumber().trim().equals("")) return false;
-        else if(cc.getCcName() == null || cc.getCcName().trim().equals("")) return false;
-        else if(cc.getCvv() == null || cc.getCvv().trim().equals("")) return false;
-        else if(cc.getExpDate() == null || cc.getExpDate().trim().equals("")) return false;
-        else if(cc.getZip() == null || cc.getZip().trim().equals("")) return false;
-        else if(cc.getLimit() == null || cc.getLimit().trim().equals("")) return false;
-        return cc.getUserName() != null || cc.getUserName().trim().equals("");
-    }
-}
\ No newline at end of file
+//
+//        CreditCard persistedCreditCard = ccDao.addCC(new CreditCard());
+//
+//        if(persistedCreditCard == null){
+//            throw new ResourcePersistenceException("Persisted");
+//        }
+//        System.out.println("CreditCard Persisted: " + new CreditCard());
+//        return new CreditCard();
+//    }
+//
+//        public CreditCard[] findAll() throws IOException {
+//        return null;
+//        }
+//        public Object findById(String username) {
+//        return null;
+//        }
+////        boolean delete(String username) {
+////            return delete(String username);
+////        }
+//    private boolean validateCreditCardInput(CreditCard cc) {
+//        System.out.println("Validating CreditCard: " + cc);
+//        if(cc == null) return false;
+//        else if(cc.getCcNumber() == null || cc.getCcNumber().trim().equals("")) return false;
+//        else if(cc.getCcName() == null || cc.getCcName().trim().equals("")) return false;
+//        else if(cc.getCvv() == null || cc.getCvv().trim().equals("")) return false;
+//        else if(cc.getExpDate() == null || cc.getExpDate().trim().equals("")) return false;
+//        else if(cc.getZip() == null || cc.getZip().trim().equals("")) return false;
+//        else if(cc.getLimit() == null || cc.getLimit().trim().equals("")) return false;
+//        return cc.getUserName() != null || cc.getUserName().trim().equals("");
+//    }
+//}
\ No newline at end of file
diff --git a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServlet.java b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServlet.java
index 634681c..96b26ef 100644
--- a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServlet.java
+++ b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServlet.java
@@ -1,127 +1,71 @@
 package com.revature.Pi2a1000Places.creditcard;
 
-public class CreditCardServlet {
-//
-//    public class PokemonServlet extends HttpServlet implements Authable {
-//
-//        private final PokemonServices pokemonServices;
-//        private final ObjectMapper mapper;
-//        private final ElementTypeServices elementTypeServices;
-//        private final AbilityServices abilityServices;
-//
-//        public PokemonServlet(PokemonServices pokemonServices, ObjectMapper mapper, ElementTypeServices elementTypeServices, AbilityServices abilityServices) {
-//            this.pokemonServices = pokemonServices;
-//            this.mapper = mapper;
-//            this.elementTypeServices = elementTypeServices;
-//            this.abilityServices = abilityServices;
-//        }
-//
-//        @Override
-//        protected void doOptions(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-//            super.doOptions(req, resp);
-//            resp.addHeader("Access-Control-Allow-Origin", "*");
-//            resp.addHeader("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE");
-//            resp.addHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
-//        }
-//
-//        @Override
-//        protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-//            resp.addHeader("Access-Control-Allow-Origin", "*");
-//            resp.addHeader("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE");
-//            resp.addHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
-//            if(req.getParameter("pokemonName") != null){
-//                Pokemon pokemon = pokemonServices.readById(req.getParameter("pokemonName"));
-//                String payload = mapper.writeValueAsString(pokemon);
-//                resp.getWriter().write(payload);
-//                return;
-//            }
-//
-//            List<Pokemon> pokemons = pokemonServices.readAll();
-//            String payload = mapper.writeValueAsString(pokemons);
-//
-//            resp.getWriter().write(payload);
-//
-//        }
-//
-//        @Override
-//        protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-//            resp.addHeader("Access-Control-Allow-Origin", "*");
-//            resp.addHeader("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE");
-//            resp.addHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
-//
-//            Pokemon newPokemon = new Pokemon();
-//            PokemonInitializer initPokemon = mapper.readValue(req.getInputStream(), PokemonInitializer.class); // from JSON to Java Object (Pokemon)
-//            try{
-//                ElementType elementType = elementTypeServices.readById(String.valueOf(initPokemon.getElementType()));
-//                Ability ability1 = abilityServices.readById(initPokemon.getAbility1());
-//                System.out.println(ability1);
-//                Ability ability2 = abilityServices.readById(initPokemon.getAbility2());
-//
-//                newPokemon.setPokemonName(initPokemon.getPokemonName());
-//                newPokemon.setAtk(initPokemon.getAtk());
-//                newPokemon.setHp(initPokemon.getHp());
-//                newPokemon.setElementType(elementType);
-//                newPokemon.setAbility1(ability1);
-//                newPokemon.setAbility2(ability2);
-//            }catch (Exception e){
-//                resp.getWriter().write(e.getMessage());
-//            }
-//
-//            System.out.println(newPokemon);
-//            Pokemon persistedPokemon = pokemonServices.create(newPokemon);
-//
-//            String payload = mapper.writeValueAsString(persistedPokemon); // Mapping from Java Object (Pokemon) to JSON
-//
-//
-//
-//            resp.getWriter().write("Persisted the provided pokemon as show below \n");
-//            resp.getWriter().write(payload);
-//            resp.setStatus(201);
-//        }
-//
-//        @Override
-//        protected void doPut(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-//            resp.addHeader("Access-Control-Allow-Origin", "*");
-//            resp.addHeader("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE");
-//            resp.addHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
-//            if(!checkAuth(req, resp)) return;
-//
-//            Pokemon pokemonUpdate = mapper.readValue(req.getInputStream(), Pokemon.class);
-//            Pokemon updatedPokemon = pokemonServices.update(pokemonUpdate);
-//
-//
-//            String payload = mapper.writeValueAsString(updatedPokemon);
-//            resp.getWriter().write(payload);
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+
+public class CreditCardServlet extends HttpServlet {
+
+    private final CreditCardDao cDao;
+    private final ObjectMapper mapper;
+
+    public CreditCardServlet(CreditCardDao cDao, ObjectMapper mapper) {
+        this.cDao = cDao;
+        this.mapper = mapper;
+    }
+
+//    protected void doOptions(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+//        super.doOptions(req, resp);
+//        addHeads(req, resp);
+//    }
+
+//    //CREATE
+//    protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+////        addHeads(req, resp);
+//        CreditCardDto pass = mapper.readValue(req.getInputStream(), CreditCardDto.class);
 //
-//        }
+//        CreditCard firstResult = cDao.addCC(pass.getCcNumber(), pass.getCcName(), pass.getCvv(), pass.getExpDate(), pass.getZip(), pass.getLimits(), pass.getCustomerUsername());
+//        CreditCard theObject = cDao.followUpAddCC(pass.getCcNumber());
 //
-//        @Override
-//        protected void doDelete(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-//            resp.addHeader("Access-Control-Allow-Origin", "*");
-//            resp.addHeader("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE");
-//            resp.addHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
+//        String payload = mapper.writeValueAsString(theObject);
 //
-//            if(!checkAuth(req, resp)) return;
-//            if(req.getParameter("pokemonName") == null){
+//        resp.getWriter().write("Added the credit card, as seen below \n");
+//        resp.getWriter().write(payload);
+//        resp.setStatus(201);
+//    }
+
+    //UPDATE
+//    protected void doPut(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+////        addHeads(req, resp);
+//        CreditCardDTO pass = mapper.readValue(req.getInputStream(), CreditCardDTO.class);
 //
-//                resp.getWriter().write("In order to delete, please provide your the pokemonName into the url with ?pokemonName=example-mander");
-//                resp.setStatus(401);
-//                return;
-//            }
-//            String pokemonName = req.getParameter("pokemonName");
+//        CreditCardModel firstResult = cDao.updateCC(pass.getTableSelection(), pass.getNewCellName(), pass.getCcNumber());
+//        CreditCardModel theObject = cDao.followUPUpdateCC(pass.getCcNumber());
 //
-//            try {
-//                pokemonServices.delete(pokemonName);
-//                resp.getWriter().write("Delete pokemon from the database");
-//            } catch (ResourcePersistanceException e){
-//                resp.getWriter().write(e.getMessage());
-//                resp.setStatus(404);
-//            } catch (Exception e){
-//                resp.getWriter().write(e.getMessage());
-//                resp.setStatus(500);
-//            }
-//        }
+//        String payload = mapper.writeValueAsString(theObject);
 //
+//        resp.getWriter().write("Updated the credit card, as seen below \n");
+//        resp.getWriter().write(payload);
+//        resp.setStatus(201);
 //    }
-//}
+
+    //DELETE
+    protected void doDelete(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+//        addHeads(req, resp);
+        CreditCardDto pass = mapper.readValue(req.getInputStream(), CreditCardDto.class);
+
+        boolean deleteTrue = cDao.deleteByCCNumber(pass.getCcNumber());
+
+        String payload = mapper.writeValueAsString(deleteTrue);
+
+        resp.getWriter().write("Account was deleted, see true near bottom to verify \n");
+        resp.getWriter().write(payload);
+        resp.setStatus(201);
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java
index 62c624b..e445ee0 100644
--- a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java
+++ b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java
@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.revature.Pi2a1000Places.util.exceptions.InvalidRequestException;
-import com.revature.Pi2a1000Places.util.interfaces.Authable;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -10,7 +9,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
-public class CustomerServlet extends HttpServlet implements Authable {
+public class CustomerServlet extends HttpServlet {
 
     private final CustomerServices customerServices;
     private final ObjectMapper mapper;
diff --git a/src/main/java/com/revature/Pi2a1000Places/util/ConnectionFactory.java b/src/main/java/com/revature/Pi2a1000Places/util/ConnectionFactory.java
index 861befc..864a63d 100644
--- a/src/main/java/com/revature/Pi2a1000Places/util/ConnectionFactory.java
+++ b/src/main/java/com/revature/Pi2a1000Places/util/ConnectionFactory.java
@@ -1,12 +1,12 @@
 package com.revature.Pi2a1000Places.util;
 
-
 import java.io.IOException;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.util.Properties;
 
+
 public class ConnectionFactory {
 
     private static final ConnectionFactory connectionFactory = new ConnectionFactory();
diff --git a/src/main/java/com/revature/Pi2a1000Places/util/interfaces/Authable.java b/src/main/java/com/revature/Pi2a1000Places/util/interfaces/Authable.java
index 977fae4..634344f 100644
--- a/src/main/java/com/revature/Pi2a1000Places/util/interfaces/Authable.java
+++ b/src/main/java/com/revature/Pi2a1000Places/util/interfaces/Authable.java
@@ -1,5 +1,6 @@
 package com.revature.Pi2a1000Places.util.interfaces;
 
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
@@ -16,4 +17,8 @@ static boolean checkAuth(HttpServletRequest req, HttpServletResponse resp) throw
         }
         return true;
     }
+
+    void doPut(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException;
+
+    void doDelete(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException;
 }
diff --git a/src/main/java/com/revature/Pi2a1000Places/util/test/CreditCardServicesDaoTestSuite.java b/src/main/java/com/revature/Pi2a1000Places/util/test/CreditCardServicesDaoTestSuite.java
deleted file mode 100644
index 66c80a2..0000000
--- a/src/main/java/com/revature/Pi2a1000Places/util/test/CreditCardServicesDaoTestSuite.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.revature.Pi2a1000Places.util.test;
-
-public class CreditCardServicesDaoTestSuite {
-}
diff --git a/src/main/java/com/revature/Pi2a1000Places/util/test/CreditCardServicesTestSuite.java b/src/main/java/com/revature/Pi2a1000Places/util/test/CreditCardServicesTestSuite.java
deleted file mode 100644
index eb5391b..0000000
--- a/src/main/java/com/revature/Pi2a1000Places/util/test/CreditCardServicesTestSuite.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.revature.Pi2a1000Places.util.test;
-
-public class CreditCardServicesTestSuite {
-}
diff --git a/src/test/java/testSuite/ConnectionFactoryTestSuite.java b/src/test/java/testSuite/ConnectionFactoryTestSuite.java
new file mode 100644
index 0000000..03ed7c1
--- /dev/null
+++ b/src/test/java/testSuite/ConnectionFactoryTestSuite.java
@@ -0,0 +1,25 @@
+package testSuite;
+
+import com.revature.Pi2a1000Places.util.ConnectionFactory;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Assertions;
+
+import java.sql.Connection;
+
+public class ConnectionFactoryTestSuite {
+
+    @Test
+    public void test_getConnection_givenProvidedCredentials_returnValidConnection() {
+
+        try (Connection conn = ConnectionFactory.getInstance().getConnection()) {
+            System.out.println(conn);
+
+            Assertions.assertNotNull(conn);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+
+}
diff --git a/src/test/java/testSuite/creditCard/CreditCardDaoCreateMethodTestSuite.java b/src/test/java/testSuite/creditCard/CreditCardDaoCreateMethodTestSuite.java
new file mode 100644
index 0000000..ff6d23f
--- /dev/null
+++ b/src/test/java/testSuite/creditCard/CreditCardDaoCreateMethodTestSuite.java
@@ -0,0 +1,22 @@
+package testSuite.creditCard;
+
+import com.revature.Pi2a1000Places.creditcard.CreditCard;
+import com.revature.Pi2a1000Places.creditcard.CreditCardDao;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class CreditCardDaoCreateMethodTestSuite {
+
+    CreditCardDao ccDao;
+
+    @BeforeEach
+    public void testPrep() {
+        ccDao = new CreditCardDao();
+    }
+
+    @Test
+    public void ccDaoTestForCreateMethod_returnCreditCard(){
+        CreditCard newlyAddedCreditCard= ccDao.addCC("5555","1212", "Test", "333", "12/12/22", "94949", "test");
+        System.out.println(newlyAddedCreditCard);
+    }
+}
diff --git a/src/test/java/testSuite/creditCard/CreditCardDaoDeleteMethodTestSuite.java b/src/test/java/testSuite/creditCard/CreditCardDaoDeleteMethodTestSuite.java
new file mode 100644
index 0000000..6a5e5e5
--- /dev/null
+++ b/src/test/java/testSuite/creditCard/CreditCardDaoDeleteMethodTestSuite.java
@@ -0,0 +1,22 @@
+package testSuite.creditCard;
+
+import com.revature.Pi2a1000Places.creditcard.CreditCardDao;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class CreditCardDaoDeleteMethodTestSuite {
+
+    CreditCardDao ccDao;
+
+
+    @BeforeEach
+    public void testPrep(){ccDao= new CreditCardDao();
+
+    }
+    @Test
+    public void ccDaoTestForTheDeleteMethod_returnTrue(){
+        boolean result= ccDao.deleteByCCNumber("1111");
+        System.out.println(result);
+    }
+
+}
diff --git a/src/test/java/testSuite/creditCard/CreditCardServicesDaoTestSuite.java b/src/test/java/testSuite/creditCard/CreditCardServicesDaoTestSuite.java
new file mode 100644
index 0000000..3c3f383
--- /dev/null
+++ b/src/test/java/testSuite/creditCard/CreditCardServicesDaoTestSuite.java
@@ -0,0 +1,14 @@
+package testSuite.creditCard;
+
+//import com.revature.Pi2a1000Places.creditcard.CreditCardDao;
+//import com.revature.Pi2a1000Places.creditcard.CreditCardServices;
+//import org.junit.jupiter.api.Test;
+//
+//public class CreditCardServicesDaoTestSuite {
+//
+//    CreditCardServices sut = new CreditCardServices (new CreditCardDao);
+
+  //  @Test
+
+//    public void get test
+//}
\ No newline at end of file
diff --git a/src/test/java/testSuite/creditCard/CreditCardServicesTestSuite.java b/src/test/java/testSuite/creditCard/CreditCardServicesTestSuite.java
new file mode 100644
index 0000000..bf63066
--- /dev/null
+++ b/src/test/java/testSuite/creditCard/CreditCardServicesTestSuite.java
@@ -0,0 +1,4 @@
+package testSuite.creditCard;
+
+public class CreditCardServicesTestSuite {
+}

From 0d3b0ec9d38103d531cd0d7f56d6e73b2bcab962 Mon Sep 17 00:00:00 2001
From: Maxwell Moord <maxwellmoord@gmail.com>
Date: Wed, 1 Jun 2022 15:58:19 -0400
Subject: [PATCH 23/56] Started Customer Authentication

---
 .../com/revature/Pi2a1000Places/auth/AuthServlet.java     | 2 ++
 .../com/revature/Pi2a1000Places/customer/Customer.java    | 6 +++++-
 .../Pi2a1000Places/customer/CustomerServices.java         | 2 +-
 .../java/com/revature/Pi2a1000Places/order/Order.java     | 8 +++++++-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/revature/Pi2a1000Places/auth/AuthServlet.java b/src/main/java/com/revature/Pi2a1000Places/auth/AuthServlet.java
index 58368be..fe11c7b 100644
--- a/src/main/java/com/revature/Pi2a1000Places/auth/AuthServlet.java
+++ b/src/main/java/com/revature/Pi2a1000Places/auth/AuthServlet.java
@@ -33,6 +33,8 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws I
 
             Customer authCustomer = customerServices.authenticateCustomer(loginCreds.getUsername(), loginCreds.getPassword());
 
+
+
             HttpSession httpSession = req.getSession(true);
             httpSession.setAttribute("authCustomer", authCustomer);
 
diff --git a/src/main/java/com/revature/Pi2a1000Places/customer/Customer.java b/src/main/java/com/revature/Pi2a1000Places/customer/Customer.java
index b5237b2..fe6e3b1 100644
--- a/src/main/java/com/revature/Pi2a1000Places/customer/Customer.java
+++ b/src/main/java/com/revature/Pi2a1000Places/customer/Customer.java
@@ -1,8 +1,12 @@
 package com.revature.Pi2a1000Places.customer;
 
-public class Customer {
+import javax.persistence.*;
 
+@Entity
+@Table(name = "customer")
+public class Customer {
 
+    @Id
     private String username;
     private String fname;
     private String lname;
diff --git a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServices.java b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServices.java
index 1c91a5c..7bf03ff 100644
--- a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServices.java
+++ b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServices.java
@@ -61,7 +61,7 @@ public Customer authenticateCustomer(String username, String password){
             throw new AuthenticationException("Unauthenticated user, information provided was not consistent with our database.");
         }
 
-        return customer;
+        return authenticatedCustomer;
     }
 
 }
diff --git a/src/main/java/com/revature/Pi2a1000Places/order/Order.java b/src/main/java/com/revature/Pi2a1000Places/order/Order.java
index e626f0d..f0bbc09 100644
--- a/src/main/java/com/revature/Pi2a1000Places/order/Order.java
+++ b/src/main/java/com/revature/Pi2a1000Places/order/Order.java
@@ -1,8 +1,14 @@
 package com.revature.Pi2a1000Places.order;
 
-public class Order {
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
+@Entity
+@Table(name = "order")
+public class Order {
 
+        @Id
         private String id;
         private String menuItem;
         private String comment;

From 8f916a16ffd0aed20100efa7dcc83e25d61f60b0 Mon Sep 17 00:00:00 2001
From: Maxwell Moord <maxwellmoord@gmail.com>
Date: Wed, 1 Jun 2022 18:05:43 -0400
Subject: [PATCH 24/56] An attemot to get hibernate to work, Still getting
 Unable to locate persister exception

---
 .../Pi2a1000Places/customer/Customer.java     |  4 +-
 .../Pi2a1000Places/customer/CustomerDao.java  | 36 ++++++----
 .../customer/CustomerServices.java            |  1 +
 .../Pi2a1000Places/util/HibernateUtil.java    | 66 +++++++++++++++++++
 4 files changed, 93 insertions(+), 14 deletions(-)
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/util/HibernateUtil.java

diff --git a/src/main/java/com/revature/Pi2a1000Places/customer/Customer.java b/src/main/java/com/revature/Pi2a1000Places/customer/Customer.java
index fe6e3b1..5464cfb 100644
--- a/src/main/java/com/revature/Pi2a1000Places/customer/Customer.java
+++ b/src/main/java/com/revature/Pi2a1000Places/customer/Customer.java
@@ -6,8 +6,10 @@
 @Table(name = "customer")
 public class Customer {
 
-    @Id
+    @Id @GeneratedValue
+    @Column(name = "username")
     private String username;
+
     private String fname;
     private String lname;
     private String password;
diff --git a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerDao.java b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerDao.java
index d934e29..6b737da 100644
--- a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerDao.java
+++ b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerDao.java
@@ -1,7 +1,12 @@
 package com.revature.Pi2a1000Places.customer;
 
 import com.revature.Pi2a1000Places.util.ConnectionFactory;
+import com.revature.Pi2a1000Places.util.HibernateUtil;
+import org.hibernate.HibernateException;
+import org.hibernate.Session;
+import org.hibernate.Transaction;
 
+import java.io.IOException;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -40,20 +45,25 @@ public static Customer create(Customer newUser) {
 
 
     public Boolean pullUsernames(String username) {
-        try (Connection conn = ConnectionFactory.getInstance().getConnection()) {
-            String sql = "select username from customer where username = ?";
-            PreparedStatement ps = conn.prepareStatement(sql);
-            ps.setString(1, username);
-
-            ResultSet rs = ps.executeQuery();
-
-            if (!rs.isBeforeFirst()) {
-                return false;
-            }
-            return true;
-        } catch (SQLException e) {
+        try {
+            System.out.println("Before Hibernate");
+            Session session = HibernateUtil.getSession();
+            System.out.println("After Get Session");
+            Transaction transaction = session.beginTransaction();
+            System.out.println("After Transaction");
+            Customer customer = session.get(Customer.class, username);
+            System.out.println("After Session.get");
+            transaction.commit();
+            System.out.println("After Transaction Commit");
+            if(customer !=null){
+                return true;
+            }else return false;
+
+        } catch (HibernateException | IOException e) {
             e.printStackTrace();
-            return false;
+            return null;
+        } finally {
+            HibernateUtil.closeSession();
         }
 
     }
diff --git a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServices.java b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServices.java
index 7bf03ff..2081895 100644
--- a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServices.java
+++ b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServices.java
@@ -29,6 +29,7 @@ public boolean validateUserInput(Customer newUser) throws InvalidRequestExceptio
             throw new InvalidRequestException("Password cannot be blank");}
         System.out.println("The User Has been Validated");
         if (verifyNewUsername(newUser.getUsername()) == true) {
+            System.out.println("It worked dingus");
             throw new InvalidRequestException("That username has already been taken");
         }else{
             createNewUser(newUser);
diff --git a/src/main/java/com/revature/Pi2a1000Places/util/HibernateUtil.java b/src/main/java/com/revature/Pi2a1000Places/util/HibernateUtil.java
new file mode 100644
index 0000000..bf38fc4
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/util/HibernateUtil.java
@@ -0,0 +1,66 @@
+package com.revature.Pi2a1000Places.util;
+
+import com.revature.Pi2a1000Places.customer.Customer;
+import com.revature.Pi2a1000Places.credit_card.CreditCard;
+import com.revature.Pi2a1000Places.menu.Menu;
+import com.revature.Pi2a1000Places.order.Order;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.service.ServiceRegistry;
+
+import java.io.IOException;
+import java.util.Properties;
+
+public class HibernateUtil {
+
+    private static SessionFactory sessionFactory;
+    private static Session session;
+
+    public static Session getSession() throws IOException {
+        if(sessionFactory == null) {
+            Configuration configuration = new Configuration();
+            Properties props = new Properties();
+        
+            ClassLoader loader = Thread.currentThread().getContextClassLoader();
+            props.load(loader.getResourceAsStream("hibernate.properties"));
+           
+            configuration.setProperties(props);
+
+            configuration.addAnnotatedClass(Customer.class);
+            configuration.addAnnotatedClass(CreditCard.class);
+            configuration.addAnnotatedClass(Menu.class);
+            configuration.addAnnotatedClass(Order.class);
+
+            // ServiceRegistry
+            ServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder()
+                    .applySettings(configuration.getProperties()).build();
+
+            try {
+                sessionFactory = new MetadataSources( serviceRegistry ).buildMetadata().buildSessionFactory();
+            }
+            catch (Exception e) {
+                // The registry would be destroyed by the SessionFactory, but we had trouble building the SessionFactory
+                // so destroy it manually.
+                StandardServiceRegistryBuilder.destroy( serviceRegistry );
+            }
+
+
+        }
+
+        if(session == null) {
+            session = sessionFactory.openSession();
+        }
+
+        return session;
+    }
+
+    public static void closeSession() {
+        session.close();
+        session = null;
+
+    }
+}

From 4cc83ed8b838d19c848897724ab966006097a50c Mon Sep 17 00:00:00 2001
From: MelroseDigital <Tenyce.Melrose@gmail.com>
Date: Wed, 1 Jun 2022 22:35:49 -0700
Subject: [PATCH 25/56] Hibernate Updates

---
 .idea/Pi.iml                                  |  11 --
 .idea/misc.xml                                |   4 +-
 pom.xml                                       |  82 ++++++++-
 .../creditcard/CreditCardDao.java             | 165 +++++++++++-------
 .../creditcard/CreditCardServices.java        | 123 +++++++------
 .../creditcard/CreditCardServlet.java         |  13 +-
 .../util/ConnectionFactory.java               |  11 +-
 7 files changed, 273 insertions(+), 136 deletions(-)
 delete mode 100644 .idea/Pi.iml

diff --git a/.idea/Pi.iml b/.idea/Pi.iml
deleted file mode 100644
index f76df2b..0000000
--- a/.idea/Pi.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 060c8b7..c8b4141 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -9,7 +9,9 @@
     </option>
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="temurin-1.8" project-jdk-type="JavaSDK">
-
     <output url="file://$PROJECT_DIR$/out" />
   </component>
+  <component name="ProjectType">
+    <option name="id" value="jpab" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 352d1fb..9187e9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,6 +107,80 @@
   <!--        </plugins>-->
   <!--    </build>-->
 
+
+  <!--    <build>-->
+  <!--        <pluginManagement>-->
+  <!--            <plugins>-->
+  <!--                <plugin>-->
+  <!--                    <groupId>org.apache.tomcat.maven</groupId>-->
+  <!--                    <artifactId>tomcat7-maven-plugin</artifactId>-->
+  <!--                    <version>2.2</version>-->
+  <!--                    <configuration>-->
+  <!--                        <url>http://localhost:3000/manager/text</url>-->
+  <!--                        <server>LocalTomcat</server>-->
+  <!--                        <path>/PitoA1000Places</path>-->
+  <!--                        <update>true</update>-->
+  <!--                    </configuration>-->
+  <!--                </plugin>-->
+  <!--            </plugins>-->
+  <!--        </pluginManagement>-->
+  <!--    </build>-->
+
+
+
+  <!--    <build>-->
+  <!--        &lt;!&ndash; https://docs.microsoft.com/en-us/azure/app-service/app-service-web-get-started-java &ndash;&gt;-->
+  <!--        <plugins>-->
+  <!--            <plugin>-->
+  <!--                <artifactId>maven-compiler-plugin</artifactId>-->
+  <!--                <version>3.8.1</version>-->
+  <!--                <configuration>-->
+  <!--                    <source>1.8</source>-->
+  <!--                    <target>1.8</target>-->
+  <!--                </configuration>-->
+  <!--            </plugin>-->
+  <!--            &lt;!&ndash;************************************************* &ndash;&gt;-->
+  <!--            &lt;!&ndash; Deploy to Tomcat in App Service Windows &ndash;&gt;-->
+  <!--            &lt;!&ndash;************************************************* &ndash;&gt;-->
+  <!--            <plugin>-->
+  <!--                <groupId>com.microsoft.azure</groupId>-->
+  <!--                <artifactId>azure-webapp-maven-plugin</artifactId>-->
+  <!--                <version>2.2.0</version>-->
+  <!--                <configuration>-->
+  <!--                    &lt;!&ndash; Specify v2 schema &ndash;&gt;-->
+  <!--                    <schemaVersion>v2</schemaVersion>-->
+  <!--                    &lt;!&ndash; App information &ndash;&gt;-->
+  <!--                    &lt;!&ndash; SUBSCRIPTION_ID Unique ID for the subscription that deploys the app&ndash;&gt;-->
+  <!--                    <subscriptionId>9cc4b7e1-da29-4fd8-8ac8-1e56252688f4</subscriptionId>-->
+  <!--                    &lt;!&ndash; RESOURCEGROUP_NAME &ndash;&gt;-->
+  <!--                    <resourceGroup>sqldatabase</resourceGroup>-->
+  <!--                    &lt;!&ndash; WEBAPP_NAME &ndash;&gt;-->
+  <!--                    <appName>PitoA1000Places</appName>-->
+  <!--                    &lt;!&ndash; REGION &ndash;&gt;-->
+  <!--                    <region>East US</region>-->
+  <!--                    &lt;!&ndash; Java Runtime Stack for App Service on Windows &ndash;&gt;-->
+  <!--                    <runtime>-->
+  <!--                        <os>windows</os>-->
+  <!--                        <javaVersion>1.8</javaVersion>-->
+  <!--                        <webContainer>tomcat 9.0</webContainer>-->
+  <!--                    </runtime>-->
+  <!--                    <deployment>-->
+  <!--                        <resources>-->
+  <!--                            <resource>-->
+  <!--                                <directory>${project.basedir}/target</directory>-->
+  <!--                                <includes>-->
+  <!--                                    <include>*.war</include>-->
+  <!--                                </includes>-->
+  <!--                            </resource>-->
+  <!--                        </resources>-->
+  <!--                    </deployment>-->
+  <!--                    &lt;!&ndash;          DO NOT REMOVE THE PRICING TIER ITS THE CHEAPEST&ndash;&gt;-->
+  <!--                    <pricingTier>B1</pricingTier>-->
+  <!--                </configuration>-->
+  <!--            </plugin>-->
+  <!--        </plugins>-->
+  <!--    </build>-->
+
   <dependencies>
     <!-- this is a comment -->
     <!-- https://mvnrepository.com/artifact/org.postgresql/postgresql -->
@@ -173,7 +247,13 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>5.8.2</version>
+      <scope>test</scope>
+    </dependency>
 
-  </dependencies>
+</dependencies>
 
 </project>
\ No newline at end of file
diff --git a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDao.java b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDao.java
index 832eef2..c5fc31e 100644
--- a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDao.java
+++ b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDao.java
@@ -1,74 +1,119 @@
 package com.revature.Pi2a1000Places.creditcard;
 
-import com.revature.Pi2a1000Places.util.ConnectionFactory;
-import com.revature.Pi2a1000Places.util.logging.Logger;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
 
-    public class CreditCardDao {
 
-        private Logger logger = Logger.getLogger();
+public class CreditCardDao {
 
-        // MVP a. Create - ADD Card
-        public CreditCard addCC(String ccNumber, String ccName, String cvv, String expDate, String zip, String limits, String customerUsername) {
-            try(Connection conn = ConnectionFactory.getInstance().getConnection();){
-                String sql = "insert into credit_card values (?, ?, ?, ?, ?, ?, ?)";
-                PreparedStatement ps = conn.prepareStatement(sql);
+    public static void main(String[] args)
+    {
 
-                ps.setString(1,ccNumber);
-                ps.setString(2, ccName);
-                ps.setString(3, cvv);
-                ps.setString(4, expDate);
-                ps.setString(5, zip);
-                ps.setString(6, limits);
-                ps.setString(7, customerUsername);
+     //Create creditCard
+ CreditCard creditcard = new CreditCard();
+    creditcard.setCreditCardNumber("7878");
+    creditcard.setCreditCardName("Test");
+    creditcard.setCreditCardCvv("888");
+    creditcard.setCreditCardExpDate("12/12/28");
+    creditcard.setCreditCardZip("64646");
+    creditcard.setCreditCardLimit("55000");
+    creditcard.setCreditCardUserName("Name");
 
-                int checkInsert = ps.executeUpdate();
+ SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
+ Session session = sessionFactory.openSession();
+    session.beginTransaction();
 
-                if (checkInsert == 0){
-                    throw new RuntimeException();
-                }
+        session.save(CreditCard);
+        System.out.println("CC Added");
+        session.getTransaction().commit();
+        session.close();
+        sessionFactory.close();
+}
+    //Update creditCard
 
-            }catch (SQLException e){
-                e.printStackTrace();
-                return null;
-            }
-            return null;
-        }
+    {
 
+        SessionFactory sessionFactory = com.revature.Pi2a1000Places.util.ConnectionFactory();
+        Session session = sessionFactory.openSession();
+        session.beginTransaction();
 
-        // MVP b. Update - UPDATE Card
-        public static CreditCard update(Object updatedObject) {
-            return null;
-        }
-
-        //// MVP c. Delete - DELETE Card
-        public boolean deleteByCCNumber(String ccNumber) {
-            Connection conn = ConnectionFactory.getInstance().getConnection();
-            {
-                String sql = "delete from credit_card where cc_number = ?";
-
-                try {
-                    PreparedStatement ps = conn.prepareStatement(sql);
-                    ps.setString(1, ccNumber);
-
-                    int checkInsert = ps.executeUpdate();
-
-                    if (checkInsert == 0) {
-                        throw new RuntimeException();
-                    }
-
-                    return true;
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                }
-
-            }
-            return false;
-        }
+        com.revature.Pi2a1000Places.creditcard.CreditCard creditCard = com.revature.Pi2a1000Places.creditcard.CreditCardDao();
+        creditCard.setCcName() ("Test");
+        System.out.println("CC Updated");
+        session.getTransaction().commit();
+        sessionFactory.close();
     }
 
-//    d.   Pay off your balance with your credit card  > Update (to the limit)
-//4.5 (for credit card update and update limit see do get in trainer servlet )
\ No newline at end of file
+    //Delete creditCard
+//    SessionFactory sessionFactory = com.revature.Pi2a1000Places.util.ConnectionFactory();
+//    Session session = sessionFactory.openSession();
+//    session.beginTransaction();
+//    session.delete(creditCard);
+//    System.out.println("CC Deleted");
+//    session.getTransaction().commit();
+//    sessionFactory.close();
+}
+
+    // MVP a. Create - ADD Card
+//    public CreditCard addCC(String ccNumber, String ccName, String cvv, String expDate, String zip, String limits, String customerUsername) {
+//        try(Connection conn = ConnectionFactory.getInstance().getConnection();){
+//            String sql = "insert into credit_card values (?, ?, ?, ?, ?, ?, ?)";
+//            PreparedStatement ps = conn.prepareStatement(sql);
+//
+//            ps.setString(1,ccNumber);
+//            ps.setString(2, ccName);
+//            ps.setString(3, cvv);
+//            ps.setString(4, expDate);
+//            ps.setString(5, zip);
+//            ps.setString(6, limits);
+//            ps.setString(7, customerUsername);
+//
+//            int checkInsert = ps.executeUpdate();
+//
+//            if (checkInsert == 0){
+//                throw new RuntimeException();
+//            }
+//
+//        }catch (SQLException e){
+//            e.printStackTrace();
+//            return null;
+//        }
+//        return null;
+//    }
+//
+//
+//    // MVP b. Update - UPDATE Card
+//    public static CreditCard update(Object updatedObject) {
+//        return null;
+//    }
+//
+//    //// MVP c. Delete - DELETE Card
+//    public boolean deleteByCCNumber(String ccNumber) {
+//        Connection conn = ConnectionFactory.getInstance().getConnection();
+//        {
+//            String sql = "delete from credit_card where cc_number = ?";
+//
+//            try {
+//                PreparedStatement ps = conn.prepareStatement(sql);
+//                ps.setString(1, ccNumber);
+//
+//                int checkInsert = ps.executeUpdate();
+//
+//                if (checkInsert == 0) {
+//                    throw new RuntimeException();
+//                }
+//
+//                return true;
+//            } catch (SQLException e) {
+//                e.printStackTrace();
+//            }
+//
+//        }
+//        return false;
+//    }
+//}
+//
+////    d.   Pay off your balance with your credit card  > Update (to the limit)
+////4.5 (for credit card update and update limit see do get in trainer servlet )
+//}
diff --git a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServices.java b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServices.java
index 9fedf4d..bef5453 100644
--- a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServices.java
+++ b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServices.java
@@ -1,49 +1,74 @@
-//package com.revature.Pi2a1000Places.creditcard;
-//import com.revature.Pi2a1000Places.util.exceptions.ResourcePersistenceException;
-//
-//import java.io.IOException;
-//public class CreditCardServices extends CreditCardDao {
-//
-//
-//    private CreditCard cc = new CreditCard();
-//    private CreditCardDao ccDao = new CreditCardDao();
-//    //CreditCard Class is now = cc. CreditCardDao Class is now = ccDao.
-//
-//
-//    public CreditCard create(CreditCard newCreditCard){
-//        System.out.println("Adding Credit Card...: " + newCreditCard);
-//        if(validateCreditCardInput(new CreditCard())) {
-//            System.out.println("Credit Card Was Not Validated");
-//            throw new RuntimeException();
-//        }
-//
-//        CreditCard persistedCreditCard = ccDao.addCC(new CreditCard());
-//
-//        if(persistedCreditCard == null){
-//            throw new ResourcePersistenceException("Persisted");
-//        }
-//        System.out.println("CreditCard Persisted: " + new CreditCard());
-//        return new CreditCard();
-//    }
-//
-//        public CreditCard[] findAll() throws IOException {
-//        return null;
-//        }
-//        public Object findById(String username) {
-//        return null;
-//        }
-////        boolean delete(String username) {
-////            return delete(String username);
-////        }
-//    private boolean validateCreditCardInput(CreditCard cc) {
-//        System.out.println("Validating CreditCard: " + cc);
-//        if(cc == null) return false;
-//        else if(cc.getCcNumber() == null || cc.getCcNumber().trim().equals("")) return false;
-//        else if(cc.getCcName() == null || cc.getCcName().trim().equals("")) return false;
-//        else if(cc.getCvv() == null || cc.getCvv().trim().equals("")) return false;
-//        else if(cc.getExpDate() == null || cc.getExpDate().trim().equals("")) return false;
-//        else if(cc.getZip() == null || cc.getZip().trim().equals("")) return false;
-//        else if(cc.getLimit() == null || cc.getLimit().trim().equals("")) return false;
-//        return cc.getUserName() != null || cc.getUserName().trim().equals("");
-//    }
-//}
\ No newline at end of file
+package com.revature.Pi2a1000Places.creditcard;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+import java.io.Serializable;
+
+import javax.persistence.*;
+
+public class CreditCardServices {
+
+
+    @Id
+    @Column(name="CCNUMBER")
+    @GeneratedValue(strategy=GenerationType.AUTO)
+    private int ccNumber;
+
+    @Column(name="CCNAME")
+    private String ccName;
+    @Column(name="CVV")
+    private int cVv;
+    @Column(name="EXPDATE")
+    private String expDate;
+    @Column(name="ZIP")
+    private int zip;
+    @Column(name="LIMIT")
+    private String limit;
+    @Column(name="USERNAME")
+    private String userName;
+
+
+
+        public int getCCNumber() {
+        return ccNumber;
+    }
+        public void setCcNumber(int ccNumber) {
+        this.ccNumber = ccNumber;
+    }
+        public String getCCName() {
+        return ccName;
+    }
+
+    public int getCvV() {
+        return cVv;
+    }
+    public void setcVv(int cVv) {
+        this.cVv = cVv;
+    }
+    public String getExpDate() {
+        return expDate;
+    }
+    public void setExpDate(String expDate) {
+        this.expDate = expDate;
+    }
+    public int getZip() {
+        return zip;
+    }
+    public void setZip(int zip) {
+        this.zip = zip;
+    }
+
+    public String getLimit() {
+        return limit;
+    }
+    public void setLimit(String limit) {
+        this.limit = limit;
+    }
+    public String getUserName() {return userName;}
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+}
+
+
diff --git a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServlet.java b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServlet.java
index 96b26ef..82a5349 100644
--- a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServlet.java
+++ b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServlet.java
@@ -1,15 +1,7 @@
 package com.revature.Pi2a1000Places.creditcard;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+public class CreditCardServlet {
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-
-public class CreditCardServlet extends HttpServlet {
 
     private final CreditCardDao cDao;
     private final ObjectMapper mapper;
@@ -68,4 +60,5 @@ protected void doDelete(HttpServletRequest req, HttpServletResponse resp) throws
         resp.setStatus(201);
     }
 
-}
\ No newline at end of file
+
+}
diff --git a/src/main/java/com/revature/Pi2a1000Places/util/ConnectionFactory.java b/src/main/java/com/revature/Pi2a1000Places/util/ConnectionFactory.java
index 864a63d..b1e5f86 100644
--- a/src/main/java/com/revature/Pi2a1000Places/util/ConnectionFactory.java
+++ b/src/main/java/com/revature/Pi2a1000Places/util/ConnectionFactory.java
@@ -1,18 +1,18 @@
 package com.revature.Pi2a1000Places.util;
 
+
 import java.io.IOException;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.util.Properties;
 
-
 public class ConnectionFactory {
 
     private static final ConnectionFactory connectionFactory = new ConnectionFactory();
     private Properties prop = new Properties();
 
-    private ConnectionFactory() {
+    private ConnectionFactory(){
         try {
             ClassLoader loader = Thread.currentThread().getContextClassLoader();
             prop.load(loader.getResourceAsStream("db.properties"));
@@ -30,7 +30,7 @@ private ConnectionFactory() {
         }
     }
 
-    public static ConnectionFactory getInstance() {
+    public static ConnectionFactory getInstance(){
         return connectionFactory;
     }
 
@@ -44,6 +44,9 @@ public Connection getConnection() {
             throw new RuntimeException(e);
         }
         return conn;
-
     }
+
+
+public class ConnectionFactory {
+
 }

From d492bbe94c15de823acd2a074653650faa616526 Mon Sep 17 00:00:00 2001
From: Maxwell Moord <maxwellmoord@gmail.com>
Date: Thu, 2 Jun 2022 08:35:56 -0400
Subject: [PATCH 26/56] Made changes to the hibernate util, still not working

---
 .../java/com/revature/Pi2a1000Places/util/HibernateUtil.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/revature/Pi2a1000Places/util/HibernateUtil.java b/src/main/java/com/revature/Pi2a1000Places/util/HibernateUtil.java
index bf38fc4..bdb86ca 100644
--- a/src/main/java/com/revature/Pi2a1000Places/util/HibernateUtil.java
+++ b/src/main/java/com/revature/Pi2a1000Places/util/HibernateUtil.java
@@ -31,8 +31,9 @@ public static Session getSession() throws IOException {
             configuration.setProperties(props);
 
             configuration.addAnnotatedClass(Customer.class);
-            configuration.addAnnotatedClass(CreditCard.class);
-            configuration.addAnnotatedClass(Menu.class);
+
+            //configuration.addAnnotatedClass(CreditCard.class);
+            //configuration.addAnnotatedClass(Menu.class);
             configuration.addAnnotatedClass(Order.class);
 
             // ServiceRegistry

From d07f256bfb83545d0e6684b2d10f4846e3b6ee8d Mon Sep 17 00:00:00 2001
From: Maxwell Moord <maxwellmoord@gmail.com>
Date: Thu, 2 Jun 2022 10:57:51 -0400
Subject: [PATCH 27/56] Added the ability to Delete an Account, working on
 Updating Account

---
 .../Pi2a1000Places/customer/CustomerDao.java  | 34 +++++++++++++++++++
 .../customer/CustomerServices.java            | 11 ++++++
 .../customer/CustomerServlet.java             | 31 +++++++++++++++--
 .../Pi2a1000Places/order/OrderServlet.java    | 12 ++++---
 4 files changed, 81 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerDao.java b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerDao.java
index d934e29..11f3560 100644
--- a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerDao.java
+++ b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerDao.java
@@ -93,4 +93,38 @@ public Customer authenticateCustomer(String username, String password) {
 
     }
 
+    public String deleteCustomer(String username) {
+
+        try (Connection conn = ConnectionFactory.getInstance().getConnection();) {
+            String sql = "delete from \"order\" where customer_username = ?";
+            PreparedStatement ps = conn.prepareStatement(sql);
+            ps.setString(1, username);
+
+
+            int rs = ps.executeUpdate();
+            System.out.println(rs);
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return null;
+        }
+
+        try (Connection conn = ConnectionFactory.getInstance().getConnection();) {
+            String sql = "delete from customer where username = ?";
+            PreparedStatement ps = conn.prepareStatement(sql);
+            ps.setString(1, username);
+
+
+            int rs = ps.executeUpdate();
+            System.out.println(rs);
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return null;
+        }
+        String deletedAccount;
+        return deletedAccount = ("Account of " + username + " has been deleted \n");
+    }
+
+
 }
diff --git a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServices.java b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServices.java
index 7bf03ff..640dba8 100644
--- a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServices.java
+++ b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServices.java
@@ -64,4 +64,15 @@ public Customer authenticateCustomer(String username, String password){
         return authenticatedCustomer;
     }
 
+    public String deleteCustomer(Customer customerToDelete){
+        String fname = customerToDelete.getFname();
+        String lname = customerToDelete.getLname();
+        String username = customerToDelete.getUsername();
+        String password = customerToDelete.getPassword();
+        String deleteStatement = customerDao.deleteCustomer(username);
+
+
+        return deleteStatement ;
+    }
+
 }
diff --git a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java
index 62c624b..d5a6c00 100644
--- a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java
+++ b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java
@@ -1,6 +1,8 @@
 package com.revature.Pi2a1000Places.customer;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.revature.Pi2a1000Places.auth.LoginCreds;
+import com.revature.Pi2a1000Places.util.exceptions.AuthenticationException;
 import com.revature.Pi2a1000Places.util.exceptions.InvalidRequestException;
 import com.revature.Pi2a1000Places.util.interfaces.Authable;
 
@@ -33,15 +35,38 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S
         resp.addHeader("Access-Control-Allow-Origin", "*");
         resp.addHeader("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE");
         resp.addHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
-
         Customer newUser = mapper.readValue(req.getInputStream(), Customer.class);
+
+        if(!Authable.checkAuth(req, resp)){
         try {
+            resp.getWriter().write("\nAttempting to Create Account\n");
             customerServices.validateUserInput(newUser);
+            resp.getWriter().write("This user has been created " + newUser);
         } catch (InvalidRequestException e) {
             resp.setStatus(409);
             resp.getWriter().write(e.getMessage());
-        } finally {
-            resp.getWriter().write("This user has been created " + newUser);
+        }
+        } else if (Authable.checkAuth(req, resp)) {
+            resp.getWriter().write("This works");
+        }
+    }
+
+    @Override
+    protected void doDelete(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+
+        resp.addHeader("Access-Control-Allow-Origin", "*");
+        resp.addHeader("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE");
+        resp.addHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
+
+        if (Authable.checkAuth(req, resp)) {
+            Customer customerToDelete = mapper.readValue(req.getInputStream(), Customer.class);
+            Customer customer = new Customer();
+
+            if (customerToDelete.getUsername().equals(LoginCreds.getUsername()) && customerToDelete.getPassword().equals(LoginCreds.getPassword())) {
+                resp.getWriter().write( customerServices.deleteCustomer(customerToDelete));
+            }else{throw new AuthenticationException("The username and password of the current user does not match the one to be deleted");
+            }
         }
     }
+
 }
diff --git a/src/main/java/com/revature/Pi2a1000Places/order/OrderServlet.java b/src/main/java/com/revature/Pi2a1000Places/order/OrderServlet.java
index 0abadb3..413744f 100644
--- a/src/main/java/com/revature/Pi2a1000Places/order/OrderServlet.java
+++ b/src/main/java/com/revature/Pi2a1000Places/order/OrderServlet.java
@@ -1,8 +1,10 @@
 package com.revature.Pi2a1000Places.order;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.revature.Pi2a1000Places.customer.Customer;
 import com.revature.Pi2a1000Places.order.*;
 import com.revature.Pi2a1000Places.auth.LoginCreds;
+import com.revature.Pi2a1000Places.util.exceptions.AuthenticationException;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -39,21 +41,23 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S
         resp.addHeader("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE");
         resp.addHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
 
-       // if (checkAuth(req, resp)) {
+       if (checkAuth(req, resp)) {
         System.out.println("Creating Order");
             Order orderToCreate = mapper.readValue(req.getInputStream(), Order.class);
             Order order = new Order();
         System.out.println(LoginCreds.getUsername());
-            //if (orderToCreate.getCustomerUsername().equals(LoginCreds.getUsername())) {
+            if (orderToCreate.getCustomerUsername().equals(LoginCreds.getUsername())) {
                 //creating
                 order = orderServices.createOrder(orderToCreate);
                 String payload = mapper.writeValueAsString(order);
                 resp.getWriter().write(payload);
-            //}
+            }
 
 
-       // }
+        }
     }
 
 
+
+
 }

From 67e2c5a1b1a086f4f952e3e5327aed34b9347057 Mon Sep 17 00:00:00 2001
From: Maxwell Moord <maxwellmoord@gmail.com>
Date: Thu, 2 Jun 2022 14:56:29 -0400
Subject: [PATCH 28/56] Working Hibernate

---
 .../Pi2a1000Places/customer/Customer.java     |  5 +++-
 .../Pi2a1000Places/customer/CustomerDao.java  | 12 +++++-----
 .../Pi2a1000Places/util/HibernateUtil.java    | 23 ++++++++++---------
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/revature/Pi2a1000Places/customer/Customer.java b/src/main/java/com/revature/Pi2a1000Places/customer/Customer.java
index 5464cfb..0271da4 100644
--- a/src/main/java/com/revature/Pi2a1000Places/customer/Customer.java
+++ b/src/main/java/com/revature/Pi2a1000Places/customer/Customer.java
@@ -9,10 +9,13 @@ public class Customer {
     @Id @GeneratedValue
     @Column(name = "username")
     private String username;
-
+    @Column(name = "fname")
     private String fname;
+    @Column(name = "lname")
     private String lname;
+    @Column(name = "password")
     private String password;
+    @Column(name = "balance")
     private String balance;
 
     public Customer( String username, String password, String fname,String lname, String balance){
diff --git a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerDao.java b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerDao.java
index 6b737da..09e5ab9 100644
--- a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerDao.java
+++ b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerDao.java
@@ -46,15 +46,15 @@ public static Customer create(Customer newUser) {
 
     public Boolean pullUsernames(String username) {
         try {
-            System.out.println("Before Hibernate");
+            //System.out.println("Before Hibernate");
             Session session = HibernateUtil.getSession();
-            System.out.println("After Get Session");
+            //System.out.println("After Get Session");
             Transaction transaction = session.beginTransaction();
-            System.out.println("After Transaction");
-            Customer customer = session.get(Customer.class, username);
-            System.out.println("After Session.get");
+           // System.out.println("After Transaction");
+            Customer customer = session.get(Customer.class,username);
+            //System.out.println("After Session.get");
             transaction.commit();
-            System.out.println("After Transaction Commit");
+           // System.out.println("After Transaction Commit");
             if(customer !=null){
                 return true;
             }else return false;
diff --git a/src/main/java/com/revature/Pi2a1000Places/util/HibernateUtil.java b/src/main/java/com/revature/Pi2a1000Places/util/HibernateUtil.java
index bdb86ca..7ca258a 100644
--- a/src/main/java/com/revature/Pi2a1000Places/util/HibernateUtil.java
+++ b/src/main/java/com/revature/Pi2a1000Places/util/HibernateUtil.java
@@ -6,8 +6,6 @@
 import com.revature.Pi2a1000Places.order.Order;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
-import org.hibernate.boot.Metadata;
-import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.service.ServiceRegistry;
@@ -34,20 +32,14 @@ public static Session getSession() throws IOException {
 
             //configuration.addAnnotatedClass(CreditCard.class);
             //configuration.addAnnotatedClass(Menu.class);
-            configuration.addAnnotatedClass(Order.class);
+            //configuration.addAnnotatedClass(Order.class);
 
             // ServiceRegistry
             ServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder()
                     .applySettings(configuration.getProperties()).build();
 
-            try {
-                sessionFactory = new MetadataSources( serviceRegistry ).buildMetadata().buildSessionFactory();
-            }
-            catch (Exception e) {
-                // The registry would be destroyed by the SessionFactory, but we had trouble building the SessionFactory
-                // so destroy it manually.
-                StandardServiceRegistryBuilder.destroy( serviceRegistry );
-            }
+            sessionFactory = configuration.buildSessionFactory(serviceRegistry);
+
 
 
         }
@@ -65,3 +57,12 @@ public static void closeSession() {
 
     }
 }
+
+//        hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+//        hibernate.connection.driver_class=org.postgresql.Driver
+//        hibernate.connection.url=jdbc:postgresql://localhost:5432/postgres?currentSchema=restaurant
+//        hibernate.connection.username=postgres
+//        hibernate.connection.password=
+//        hibernate.show_sql=true
+//        #Create once and update thereafter
+//        hibernate.hbm2ddl.auto=update

From 2d6c4c5d8e74a0e7ffa401729e8cd1a9dea33336 Mon Sep 17 00:00:00 2001
From: MelroseDigital <Tenyce.Melrose@gmail.com>
Date: Thu, 2 Jun 2022 13:31:10 -0700
Subject: [PATCH 29/56] Hibernate Updates in Progress

---
 .../Pi2a1000Places/creditcard/CreditCard.java |  31 ++--
 .../creditcard/CreditCardDao.java             | 135 ++++++++++++------
 .../creditcard/CreditCardDto.java             |   2 +
 .../creditcard/CreditCardServices.java        |  70 ++++-----
 .../creditcard/CreditCardServlet.java         |  98 +++++++------
 .../Pi2a1000Places/util/Crudable.java         |  17 +--
 6 files changed, 198 insertions(+), 155 deletions(-)

diff --git a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCard.java b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCard.java
index 5b4ca33..f5f6717 100644
--- a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCard.java
+++ b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCard.java
@@ -4,16 +4,16 @@ public class CreditCard {
     //CC value setup - initializing
     private String ccNumber;
     private String ccName;
-    private String cvv;
+    private int cvv;
     private String expDate;
-    private String zip;
-    private String limit;
+    private int zip;
+    private int limit;
     private String userName;
 
 //Creating Constructors for the CC Class
 
 
-    public CreditCard(String ccNumber, String ccName, String cvv, String expDate, String zip, String limit, String userName) {
+    public CreditCard(String ccNumber, String ccName, int cvv, String expDate, int zip, int limit, String userName) {
         this.ccNumber = ccNumber;
         this.ccName = ccName;
         this.cvv = cvv;
@@ -28,27 +28,27 @@ public CreditCard() {
     }
 
     //Generate Getters/Setters
-    public String getCcNumber() {
+    public String getCCNumber() {
         return ccNumber;
     }
 
-    public void setCcNumber(String ccNumber) {
+    public void setCCNumber(String ccNumber) {
         this.ccNumber = ccNumber;
     }
 
-    public String getCcName() {
+    public String getCCName() {
         return ccName;
     }
 
-    public void setCcName(String ccName) {
+    public void setCCName(String ccName) {
         this.ccName = ccName;
     }
 
-    public String getCvv() {
+    public int getCvv() {
         return cvv;
     }
 
-    public void setCvv(String cvv) {
+    public void setCvv(int cvv) {
         this.cvv = cvv;
     }
 
@@ -60,19 +60,19 @@ public void setExpDate(String expDate) {
         this.expDate = expDate;
     }
 
-    public String getZip() {
+    public int getZip() {
         return zip;
     }
 
-    public void setZip(String zip) {
+    public void setZip(int zip) {
         this.zip = zip;
     }
 
-    public String getLimit() {
+    public int getLimit() {
         return limit;
     }
 
-    public void setLimit(String limit) {
+    public void setLimit(int limit) {
         this.limit = limit;
     }
 
@@ -96,4 +96,7 @@ public String toString() {
                 ", userName='" + userName + '\'' +
                 '}';
     }
+
+    public void setCCardNumber(String s) {
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDao.java b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDao.java
index c5fc31e..01d5816 100644
--- a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDao.java
+++ b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDao.java
@@ -1,61 +1,91 @@
 package com.revature.Pi2a1000Places.creditcard;
 
+import com.revature.Pi2a1000Places.creditcard.CreditCardServices;
+import com.revature.Pi2a1000Places.util.ConnectionFactory;
+import com.revature.Pi2a1000Places.util.HibernateUtil;
+import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
+import org.hibernate.Transaction;
 
+import com.revature.Pi2a1000Places.util.HibernateUtil;
 
+import java.io.IOException;
 
-public class CreditCardDao {
+public class CreditCardDao extends CreditCardServices {
+    //Create creditCard
+    public static CreditCard create(Object CreditCard) {
 
-    public static void main(String[] args)
-    {
-
-     //Create creditCard
- CreditCard creditcard = new CreditCard();
-    creditcard.setCreditCardNumber("7878");
-    creditcard.setCreditCardName("Test");
-    creditcard.setCreditCardCvv("888");
-    creditcard.setCreditCardExpDate("12/12/28");
-    creditcard.setCreditCardZip("64646");
-    creditcard.setCreditCardLimit("55000");
-    creditcard.setCreditCardUserName("Name");
-
- SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
- Session session = sessionFactory.openSession();
-    session.beginTransaction();
+    CreditCard creditcard = new CreditCard();
+    creditcard.setCCNumber("7878");
+    creditcard.setCCName("Test");
+    creditcard.setCvv(Integer.parseInt("888"));
+    creditcard.setExpDate("12/12/28");
+    creditcard.setZip(Integer.parseInt("64646"));
+    creditcard.setLimit(Integer.parseInt("55000"));
+    creditcard.setUserName("Name");
 
+    try {
+        SessionFactory sessionFactory = HibernateUtil.getSession().getSessionFactory();
+        Session session = sessionFactory.openSession();
+        session.beginTransaction();
         session.save(CreditCard);
-        System.out.println("CC Added");
+        return new CreditCard();
         session.getTransaction().commit();
+    }catch (HibernateException){
+    } catch (IOException e) {
+        throw new RuntimeException(e);
+    }
+        System.out.println("CC Added");
+        return null;
         session.close();
         sessionFactory.close();
-}
-    //Update creditCard
 
     {
 
-        SessionFactory sessionFactory = com.revature.Pi2a1000Places.util.ConnectionFactory();
-        Session session = sessionFactory.openSession();
-        session.beginTransaction();
+//        //Update creditCard
+//    public boolean update(CreditCard updatedCreditCard){
+//
+//        Session session;
+//        try {
+//            sessionFactory = HibernateUtil.getSession().getSessionFactory();
+//            session = sessionFactory.openSession();
+//            session.beginTransaction();
+//            session.update(creditcard);
+//            return updatedCreditCard;
+//            //creditCard.setCCName() ("Test")
+//            session.getTransaction().commit();
+//        } catch (HibernateException) {
+//        } catch (IOException e) {
+//            throw new RuntimeException(e);
+//
+//            System.out.println("CC Updated");
+//            return CreditCard;
+//            session.close();
+//            sessionFactory.close();
+//            //where does return statement go?
+
+        }
+
+        //Delete creditCard
+        public Boolean delete (String ccNumber){
+        try {
+            Session session = HibernateUtil.getSession();
+            Transaction transaction = session.beginTransaction();
+            CreditCard creditCard = session.load(CreditCard.class,"creditCard");
+                    session.delete(creditCard);
+            transaction.commit();
+        } catch (HibernateException | IOException e) {
+            System.out.println("CC Deleted");
+        } finally {
+            HibernateUtil.closeSession();
+        }
+        }
 
-        com.revature.Pi2a1000Places.creditcard.CreditCard creditCard = com.revature.Pi2a1000Places.creditcard.CreditCardDao();
-        creditCard.setCcName() ("Test");
-        System.out.println("CC Updated");
-        session.getTransaction().commit();
-        sessionFactory.close();
-    }
 
-    //Delete creditCard
-//    SessionFactory sessionFactory = com.revature.Pi2a1000Places.util.ConnectionFactory();
-//    Session session = sessionFactory.openSession();
-//    session.beginTransaction();
-//    session.delete(creditCard);
-//    System.out.println("CC Deleted");
-//    session.getTransaction().commit();
-//    sessionFactory.close();
 }
 
-    // MVP a. Create - ADD Card
+// MVP a. Create - ADD Card
 //    public CreditCard addCC(String ccNumber, String ccName, String cvv, String expDate, String zip, String limits, String customerUsername) {
 //        try(Connection conn = ConnectionFactory.getInstance().getConnection();){
 //            String sql = "insert into credit_card values (?, ?, ?, ?, ?, ?, ?)";
@@ -83,11 +113,6 @@ public static void main(String[] args)
 //    }
 //
 //
-//    // MVP b. Update - UPDATE Card
-//    public static CreditCard update(Object updatedObject) {
-//        return null;
-//    }
-//
 //    //// MVP c. Delete - DELETE Card
 //    public boolean deleteByCCNumber(String ccNumber) {
 //        Connection conn = ConnectionFactory.getInstance().getConnection();
@@ -117,3 +142,27 @@ public static void main(String[] args)
 ////    d.   Pay off your balance with your credit card  > Update (to the limit)
 ////4.5 (for credit card update and update limit see do get in trainer servlet )
 //}
+
+        public void update () {
+        }
+
+        public void update () {
+        }
+
+        public void update () {
+        }
+
+        public static void create () {
+        }
+
+        public static void createCC () {
+        }
+
+        public static void createCC () {
+        }
+
+        public static void createCC () {
+        }
+
+        public static void createCC () {
+        }
\ No newline at end of file
diff --git a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDto.java b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDto.java
index e5878f5..3e08c20 100644
--- a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDto.java
+++ b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDto.java
@@ -2,6 +2,8 @@
 
 public class CreditCardDto {
     //Generate Pass-in values
+
+
     private String ccNumber;
     private String ccName;
     private String cvv;
diff --git a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServices.java b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServices.java
index bef5453..75bb946 100644
--- a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServices.java
+++ b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServices.java
@@ -8,13 +8,36 @@
 import javax.persistence.*;
 
 public class CreditCardServices {
-
+    private final CreditCardDao creditCardDao;
 
     @Id
     @Column(name="CCNUMBER")
     @GeneratedValue(strategy=GenerationType.AUTO)
     private int ccNumber;
 
+    //@Override
+    public CreditCard create(CreditCard newCreditCard){
+        return creditCardDao.create(new CreditCard());
+    }
+    //@Override
+    public CreditCard update(CreditCard updatedCreditCard) {
+        if (creditCardDao.update(updatedCreditCard)) return null;
+
+        return updatedCreditCard;
+    }
+
+    //Override
+    public boolean delete() {
+        return delete(null);
+    }
+
+   // Override
+    public boolean delete(String ccNumber){
+
+        return true;
+    }
+
+
     @Column(name="CCNAME")
     private String ccName;
     @Column(name="CVV")
@@ -28,47 +51,4 @@ public class CreditCardServices {
     @Column(name="USERNAME")
     private String userName;
 
-
-
-        public int getCCNumber() {
-        return ccNumber;
-    }
-        public void setCcNumber(int ccNumber) {
-        this.ccNumber = ccNumber;
-    }
-        public String getCCName() {
-        return ccName;
-    }
-
-    public int getCvV() {
-        return cVv;
-    }
-    public void setcVv(int cVv) {
-        this.cVv = cVv;
-    }
-    public String getExpDate() {
-        return expDate;
-    }
-    public void setExpDate(String expDate) {
-        this.expDate = expDate;
-    }
-    public int getZip() {
-        return zip;
-    }
-    public void setZip(int zip) {
-        this.zip = zip;
-    }
-
-    public String getLimit() {
-        return limit;
-    }
-    public void setLimit(String limit) {
-        this.limit = limit;
-    }
-    public String getUserName() {return userName;}
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-}
-
-
+}
\ No newline at end of file
diff --git a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServlet.java b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServlet.java
index 82a5349..fe45961 100644
--- a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServlet.java
+++ b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServlet.java
@@ -1,61 +1,75 @@
 package com.revature.Pi2a1000Places.creditcard;
 
-public class CreditCardServlet {
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.revature.Pi2a1000Places.auth.LoginCreds;
 
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 
-    private final CreditCardDao cDao;
-    private final ObjectMapper mapper;
+public class CreditCardServlet extends HttpServlet{
+    Private final ObjectMapper mapper;
+    private final CreditCardDao creditCardDao;
 
-    public CreditCardServlet(CreditCardDao cDao, ObjectMapper mapper) {
-        this.cDao = cDao;
+    public CreditCardServlet(ObjectMapper mapper) {
         this.mapper = mapper;
     }
 
-//    protected void doOptions(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-//        super.doOptions(req, resp);
+    protected void doOptions(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        super.doOptions(req, resp);
+        resp.addHeader("Access-Control-Allow-Origin", "*");
+        resp.addHeader("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE");
+        resp.addHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
+
+    }
+
+    //CREATE
+    protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
 //        addHeads(req, resp);
-//    }
-
-//    //CREATE
-//    protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-////        addHeads(req, resp);
-//        CreditCardDto pass = mapper.readValue(req.getInputStream(), CreditCardDto.class);
-//
-//        CreditCard firstResult = cDao.addCC(pass.getCcNumber(), pass.getCcName(), pass.getCvv(), pass.getExpDate(), pass.getZip(), pass.getLimits(), pass.getCustomerUsername());
-//        CreditCard theObject = cDao.followUpAddCC(pass.getCcNumber());
-//
-//        String payload = mapper.writeValueAsString(theObject);
-//
-//        resp.getWriter().write("Added the credit card, as seen below \n");
-//        resp.getWriter().write(payload);
-//        resp.setStatus(201);
-//    }
-
-    //UPDATE
-//    protected void doPut(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-////        addHeads(req, resp);
-//        CreditCardDTO pass = mapper.readValue(req.getInputStream(), CreditCardDTO.class);
-//
-//        CreditCardModel firstResult = cDao.updateCC(pass.getTableSelection(), pass.getNewCellName(), pass.getCcNumber());
-//        CreditCardModel theObject = cDao.followUPUpdateCC(pass.getCcNumber());
-//
-//        String payload = mapper.writeValueAsString(theObject);
-//
-//        resp.getWriter().write("Updated the credit card, as seen below \n");
-//        resp.getWriter().write(payload);
-//        resp.setStatus(201);
-//    }
+        resp.addHeader("Access-Control-Allow-Origin", "*");
+        resp.addHeader("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE");
+        resp.addHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
+        CreditCardDto pass = mapper.readValue(req.getInputStream(), CreditCardDto.class);
+        CreditCard firstResult = CreditCardDao.createCC(pass.getCcNumber(), pass.getCcName(), pass.getCvv(), pass.getExpDate(), pass.getZip(), pass.getLimits(), pass.getCustomerUsername());
+        CreditCard theObject = CreditCardDao.followUpCreateCreditCard(pass.getCcNumber());
+
+        String payload = mapper.writeValueAsString(theObject);
+
+        resp.getWriter().write("Credit Card Added \n");
+        resp.getWriter().write(payload);
+        resp.setStatus(201);
+    }
+
+  //  UPDATE
+    protected void doPut(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        resp.addHeader("Access-Control-Allow-Origin", "*");
+        resp.addHeader("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE");
+        resp.addHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
+        CreditCardDto pass = mapper.readValue(req.getInputStream(), CreditCardDto.class);
+
+        CreditCard firstResult = creditCardDao.update(pass.getTableSelection(), pass.getNewCellName(), pass.getCcNumber());
+        CreditCard theObject = creditCardDao.update(pass.getCcNumber());
+
+        String payload = mapper.writeValueAsString(theObject);
+
+        resp.getWriter().write("Credit Card Updated \n");
+        resp.getWriter().write(payload);
+        resp.setStatus(201);
+    }
 
     //DELETE
     protected void doDelete(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-//        addHeads(req, resp);
-        CreditCardDto pass = mapper.readValue(req.getInputStream(), CreditCardDto.class);
+        resp.addHeader("Access-Control-Allow-Origin", "*");
+        resp.addHeader("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE");
+        resp.addHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");        CreditCardDto pass = mapper.readValue(req.getInputStream(), CreditCardDto.class);
 
-        boolean deleteTrue = cDao.deleteByCCNumber(pass.getCcNumber());
+        boolean deleteTrue = creditCardDao.delete(pass.getCcNumber());
 
         String payload = mapper.writeValueAsString(deleteTrue);
 
-        resp.getWriter().write("Account was deleted, see true near bottom to verify \n");
+        resp.getWriter().write("Credit Card deleted \n");
         resp.getWriter().write(payload);
         resp.setStatus(201);
     }
diff --git a/src/main/java/com/revature/Pi2a1000Places/util/Crudable.java b/src/main/java/com/revature/Pi2a1000Places/util/Crudable.java
index 1865cb2..d8a9a22 100644
--- a/src/main/java/com/revature/Pi2a1000Places/util/Crudable.java
+++ b/src/main/java/com/revature/Pi2a1000Places/util/Crudable.java
@@ -1,18 +1,13 @@
 package com.revature.Pi2a1000Places.util;
 
-import java.io.IOException;
-import java.sql.SQLException;
-
 public interface Crudable<T> {
 //CRUD: Create, Read, Update, Delete
 
-    T create(T newObject) throws SQLException;
+    T create(T newObject);
+
+    T readById(String userName);
 
-    //check exception thrown. Necessary?
-    default T[] findAll() throws IOException {
-        return null;
-    }
     T findById(String username);
-                    boolean update(T updatedObject);
-                    boolean delete(String username);
-}                                      //or CreditCard?
+    boolean update(T updatedObject);
+    boolean delete(String username);
+}         //or CreditCard?

From b84cec1830c415ce8a5da194ef30fbe1f7fa085a Mon Sep 17 00:00:00 2001
From: MelroseDigital <Tenyce.Melrose@gmail.com>
Date: Thu, 2 Jun 2022 13:32:25 -0700
Subject: [PATCH 30/56] Hibernate Updates in Progress

---
 .../Pi2a1000Places/util/HibernateUtil.java    | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/util/HibernateUtil.java

diff --git a/src/main/java/com/revature/Pi2a1000Places/util/HibernateUtil.java b/src/main/java/com/revature/Pi2a1000Places/util/HibernateUtil.java
new file mode 100644
index 0000000..5fc1a4c
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/util/HibernateUtil.java
@@ -0,0 +1,65 @@
+package com.revature.Pi2a1000Places.util;
+
+import com.revature.Pi2a1000Places.customer.Customer;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.service.ServiceRegistry;
+
+import java.io.IOException;
+import java.util.Properties;
+
+public class HibernateUtil {
+
+    private static SessionFactory sessionFactory;
+    private static Session session;
+
+    public static Session getSession() throws IOException {
+        if(sessionFactory == null) {
+            Configuration configuration = new Configuration();
+            Properties props = new Properties();
+
+            ClassLoader loader = Thread.currentThread().getContextClassLoader();
+            props.load(loader.getResourceAsStream("hibernate.properties"));
+
+            configuration.setProperties(props);
+
+            configuration.addAnnotatedClass(Customer.class);
+
+            configuration.addAnnotatedClass(CreditCard.class);
+            configuration.addAnnotatedClass(Menu.class);
+            configuration.addAnnotatedClass(Order.class);
+
+            // ServiceRegistry
+            ServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder()
+                    .applySettings(configuration.getProperties()).build();
+
+            sessionFactory = configuration.buildSessionFactory(serviceRegistry);
+
+
+
+        }
+
+        if(session == null) {
+            session = sessionFactory.openSession();
+        }
+
+        return session;
+    }
+
+    public static void closeSession() {
+        session.close();
+        session = null;
+
+    }
+}
+
+//        hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+//        hibernate.connection.driver_class=org.postgresql.Driver
+//        hibernate.connection.url=jdbc:postgresql://localhost:5432/postgres?currentSchema=restaurant
+//        hibernate.connection.username=postgres
+//        hibernate.connection.password=
+//        hibernate.show_sql=true
+//        #Create once and update thereafter
+//        hibernate.hbm2ddl.auto=update
\ No newline at end of file

From b789e74dd79805549b5a05d49f8385c0bf052b82 Mon Sep 17 00:00:00 2001
From: Maxwell Moord <maxwellmoord@gmail.com>
Date: Thu, 2 Jun 2022 16:33:13 -0400
Subject: [PATCH 31/56] Added hibernat util

---
 .../customer/CustomerServices.java            | 17 +++++
 .../customer/CustomerServlet.java             |  5 +-
 .../Pi2a1000Places/util/HibernateUtil.java    | 68 +++++++++++++++++++
 3 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/revature/Pi2a1000Places/util/HibernateUtil.java

diff --git a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServices.java b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServices.java
index 640dba8..9ea2b08 100644
--- a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServices.java
+++ b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServices.java
@@ -75,4 +75,21 @@ public String deleteCustomer(Customer customerToDelete){
         return deleteStatement ;
     }
 
+    public Customer updateCustomer(Customer customerToUpdate){
+        String customerName = customerToUpdate.getModName();
+        System.out.println("modName: " + modName);
+        String creatorName = customerToUpdate.getCreatorName();
+        System.out.println("creatorName: "+ creatorName);
+        String id = modToUpdate.getId();
+        System.out.println("Id: "+ id);
+        if(!verifyCreatorName(creatorName)){throw new InvalidRequestException("This creator doesn't exist");}
+        else if(!verifyId(id)){throw new InvalidRequestException("This id doesn't exist");}
+        else if(verifyModName(modName)){
+            throw new InvalidRequestException("This mod already exists " + modDao.findByModName(modName));
+        }
+        else{return modDao.updateMod(modName,creatorName,id);}
+
+    }
+
+
 }
diff --git a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java
index d5a6c00..238f448 100644
--- a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java
+++ b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java
@@ -47,7 +47,10 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S
             resp.getWriter().write(e.getMessage());
         }
         } else if (Authable.checkAuth(req, resp)) {
-            resp.getWriter().write("This works");
+            if (newUser.getUsername().equals(LoginCreds.getUsername()) && newUser.getPassword().equals(LoginCreds.getPassword())) {
+                resp.getWriter().write( customerServices.updateCustomer(newUser));
+            }else{throw new AuthenticationException("The username and password of the current user does not match the one to be deleted");
+            }
         }
     }
 
diff --git a/src/main/java/com/revature/Pi2a1000Places/util/HibernateUtil.java b/src/main/java/com/revature/Pi2a1000Places/util/HibernateUtil.java
new file mode 100644
index 0000000..57fcba6
--- /dev/null
+++ b/src/main/java/com/revature/Pi2a1000Places/util/HibernateUtil.java
@@ -0,0 +1,68 @@
+package com.revature.Pi2a1000Places.util;
+
+import com.revature.Pi2a1000Places.customer.Customer;
+import com.revature.Pi2a1000Places.credit_card.CreditCard;
+import com.revature.Pi2a1000Places.menu.Menu;
+import com.revature.Pi2a1000Places.order.Order;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.service.ServiceRegistry;
+
+import java.io.IOException;
+import java.util.Properties;
+
+public class HibernateUtil {
+
+    private static SessionFactory sessionFactory;
+    private static Session session;
+
+    public static Session getSession() throws IOException {
+        if(sessionFactory == null) {
+            Configuration configuration = new Configuration();
+            Properties props = new Properties();
+
+            ClassLoader loader = Thread.currentThread().getContextClassLoader();
+            props.load(loader.getResourceAsStream("hibernate.properties"));
+
+            configuration.setProperties(props);
+
+            configuration.addAnnotatedClass(Customer.class);
+
+            //configuration.addAnnotatedClass(CreditCard.class);
+            //configuration.addAnnotatedClass(Menu.class);
+            //configuration.addAnnotatedClass(Order.class);
+
+            // ServiceRegistry
+            ServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder()
+                    .applySettings(configuration.getProperties()).build();
+
+            sessionFactory = configuration.buildSessionFactory(serviceRegistry);
+
+
+
+        }
+
+        if(session == null) {
+            session = sessionFactory.openSession();
+        }
+
+        return session;
+    }
+
+    public static void closeSession() {
+        session.close();
+        session = null;
+
+    }
+}
+
+//        hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+//        hibernate.connection.driver_class=org.postgresql.Driver
+//        hibernate.connection.url=jdbc:postgresql://localhost:5432/postgres?currentSchema=restaurant
+//        hibernate.connection.username=postgres
+//        hibernate.connection.password=
+//        hibernate.show_sql=true
+//        #Create once and update thereafter
+//        hibernate.hbm2ddl.auto=update
\ No newline at end of file

From fd78706d31a76cfcd3ef9591277f5e30b1f0fac2 Mon Sep 17 00:00:00 2001
From: mmoord <92188851+mmoord@users.noreply.github.com>
Date: Thu, 2 Jun 2022 16:45:26 -0400
Subject: [PATCH 32/56] Accidentally pushed to main

---
 .../Pi2a1000Places/ConfigHibernate.java       | 23 -------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 src/main/java/com/revature/Pi2a1000Places/ConfigHibernate.java

diff --git a/src/main/java/com/revature/Pi2a1000Places/ConfigHibernate.java b/src/main/java/com/revature/Pi2a1000Places/ConfigHibernate.java
deleted file mode 100644
index 25b96c4..0000000
--- a/src/main/java/com/revature/Pi2a1000Places/ConfigHibernate.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.sdnext.hibernate.tutorial.utility;
-
-import org.hibernate.SessionFactory;
-import org.hibernate.cfg.AnnotationConfiguration;
-
-public class HibernateUtil 
-{
- private static final SessionFactory sessionFactory;
- static
- {
-  try
-  {
-   sessionFactory = new AnnotationConfiguration().configure().buildSessionFactory();
-  }
-  catch(Throwable th){
-   System.err.println("Enitial SessionFactory creation failed"+th);
-   throw new ExceptionInInitializerError(th);
-  }
-   }
-   public static SessionFactory getSessionFactory(){
-    return sessionFactory;
-   }
-}
\ No newline at end of file

From 79723eb74cfdf75f29f440bf731d0beec562afb7 Mon Sep 17 00:00:00 2001
From: mmoord <92188851+mmoord@users.noreply.github.com>
Date: Thu, 2 Jun 2022 16:47:02 -0400
Subject: [PATCH 33/56] accidentally pushed to main

---
 .../revature/Pi2a1000Places/Confighibrerante  | 31 -------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 src/main/java/com/revature/Pi2a1000Places/Confighibrerante

diff --git a/src/main/java/com/revature/Pi2a1000Places/Confighibrerante b/src/main/java/com/revature/Pi2a1000Places/Confighibrerante
deleted file mode 100644
index 60c9b93..0000000
--- a/src/main/java/com/revature/Pi2a1000Places/Confighibrerante
+++ /dev/null
@@ -1,31 +0,0 @@
-<hibernate-configuration> 
- <session-factory> 
-  <!-- Database connection settings -->
-   <property name="connection.driver_class">com.mysql.jdbc.Driver</property> 
-   <property name="connection.url">jdbc:mysql://localhost:3306/hibernateDB2</property> 
-   <property name="connection.username">root</property> 
-   <property name="connection.password">root</property> 
-
-  <!-- JDBC connection pool (use the built-in) -->
-   <property name="connection.pool_size">1</property> 
-
-  <!-- SQL dialect -->
-   <property name="dialect">org.hibernate.dialect.MySQLDialect</property> 
-
-  <!-- Enable Hibernate's automatic session context management -->
-    <property name="current_session_context_class">thread</property> 
-  
-  <!-- Disable the second-level cache -->
-   <property name="cache.provider_class">org.hibernate.cache.NoCacheProvider</property> 
-
-  <!-- Echo all executed SQL to stdout -->
-   <property name="show_sql">true</property> 
-  
-  <!-- Drop and re-create the database schema on startup -->
-   <property name="hbm2ddl.auto">update</property> 
-    
-   <mapping class="com.sdnext.hibernate.tutorial.dto.Student">
-      
-  </mapping></session-factory> 
- </hibernate-configuration>
-f
\ No newline at end of file

From a6567d06877f0a19389c5250529d5df42d8c6e44 Mon Sep 17 00:00:00 2001
From: mmoord <92188851+mmoord@users.noreply.github.com>
Date: Thu, 2 Jun 2022 16:47:14 -0400
Subject: [PATCH 34/56] accidentally pushed to main

---
 .../Pi2a1000Places/Confighibrerante.java      | 31 -------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 src/main/java/com/revature/Pi2a1000Places/Confighibrerante.java

diff --git a/src/main/java/com/revature/Pi2a1000Places/Confighibrerante.java b/src/main/java/com/revature/Pi2a1000Places/Confighibrerante.java
deleted file mode 100644
index 60c9b93..0000000
--- a/src/main/java/com/revature/Pi2a1000Places/Confighibrerante.java
+++ /dev/null
@@ -1,31 +0,0 @@
-<hibernate-configuration> 
- <session-factory> 
-  <!-- Database connection settings -->
-   <property name="connection.driver_class">com.mysql.jdbc.Driver</property> 
-   <property name="connection.url">jdbc:mysql://localhost:3306/hibernateDB2</property> 
-   <property name="connection.username">root</property> 
-   <property name="connection.password">root</property> 
-
-  <!-- JDBC connection pool (use the built-in) -->
-   <property name="connection.pool_size">1</property> 
-
-  <!-- SQL dialect -->
-   <property name="dialect">org.hibernate.dialect.MySQLDialect</property> 
-
-  <!-- Enable Hibernate's automatic session context management -->
-    <property name="current_session_context_class">thread</property> 
-  
-  <!-- Disable the second-level cache -->
-   <property name="cache.provider_class">org.hibernate.cache.NoCacheProvider</property> 
-
-  <!-- Echo all executed SQL to stdout -->
-   <property name="show_sql">true</property> 
-  
-  <!-- Drop and re-create the database schema on startup -->
-   <property name="hbm2ddl.auto">update</property> 
-    
-   <mapping class="com.sdnext.hibernate.tutorial.dto.Student">
-      
-  </mapping></session-factory> 
- </hibernate-configuration>
-f
\ No newline at end of file

From 0084547f56e05dfa4f821ed8f191a072483ed258 Mon Sep 17 00:00:00 2001
From: mmoord <92188851+mmoord@users.noreply.github.com>
Date: Thu, 2 Jun 2022 16:47:23 -0400
Subject: [PATCH 35/56] accidentally pushed to main

---
 .../revature/Pi2a1000Places/CreateStud.java   | 35 -------------------
 1 file changed, 35 deletions(-)
 delete mode 100644 src/main/java/com/revature/Pi2a1000Places/CreateStud.java

diff --git a/src/main/java/com/revature/Pi2a1000Places/CreateStud.java b/src/main/java/com/revature/Pi2a1000Places/CreateStud.java
deleted file mode 100644
index f6288bb..0000000
--- a/src/main/java/com/revature/Pi2a1000Places/CreateStud.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.sdnext.hibernate.tutorial;
-
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-
-import com.sdnext.hibernate.tutorial.dto.Student;
-import com.sdnext.hibernate.tutorial.utility.HibernateUtil;
-
-public class CreateStudent {
-
- /**
-  * @param args
-  */
- public static void main(String[] args) 
- {
-  //Create student entity object
-  Student student = new Student();
-  student.setStudentName("Dinesh Rajput");
-  student.setRollNumber(01);
-  student.setCourse("MCA");
-  
-  //Create session factory object
-  SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
-  //getting session object from session factory
-  Session session = sessionFactory.openSession();
-  //getting transaction object from session object
-  session.beginTransaction();
-  
-  session.save(student);
-  System.out.println("Inserted Successfully");
-  session.getTransaction().commit();
-  session.close();
-  sessionFactory.close();
- }
-}
\ No newline at end of file

From 94f2ced025ee5a334581416b97c81c13e2d5546a Mon Sep 17 00:00:00 2001
From: mmoord <92188851+mmoord@users.noreply.github.com>
Date: Thu, 2 Jun 2022 16:47:32 -0400
Subject: [PATCH 36/56] accidentally pushed to main

---
 .../Pi2a1000Places/CrudHibernate.java         | 53 -------------------
 1 file changed, 53 deletions(-)
 delete mode 100644 src/main/java/com/revature/Pi2a1000Places/CrudHibernate.java

diff --git a/src/main/java/com/revature/Pi2a1000Places/CrudHibernate.java b/src/main/java/com/revature/Pi2a1000Places/CrudHibernate.java
deleted file mode 100644
index 0adda10..0000000
--- a/src/main/java/com/revature/Pi2a1000Places/CrudHibernate.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.sdnext.hibernate.tutorial.dto;
-
-import java.io.Serializable;
-
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
-@Entity
-@Table(name="STUDENT")
-public class Student implements Serializable 
-{
-
- /**
-  * serialVersionUID
-  */
- private static final long serialVersionUID = 8633415090390966715L;
- @Id
- @Column(name="ID")
- @GeneratedValue(strategy=GenerationType.AUTO)
- private int id;
- @Column(name="STUDENT_NAME")
- private String studentName;
- @Column(name="ROLL_NUMBER")
- private int rollNumber;
- @Column(name="COURSE")
- private String course;
- public int getId() {
-  return id;
- }
- public void setId(int id) {
-  this.id = id;
- }
- public String getStudentName() {
-  return studentName;
- }
- public void setStudentName(String studentName) {
-  this.studentName = studentName;
- }
- public int getRollNumber() {
-  return rollNumber;
- }
- public void setRollNumber(int rollNumber) {
-  this.rollNumber = rollNumber;
- }
- public String getCourse() {
-  return course;
- }
- public void setCourse(String course) {
-  this.course = course;
- }
-}

From f3cfa8dffebf635bdd0c8f489ae453f494bda2ce Mon Sep 17 00:00:00 2001
From: mmoord <92188851+mmoord@users.noreply.github.com>
Date: Thu, 2 Jun 2022 16:47:42 -0400
Subject: [PATCH 37/56] accidentally pushed to main

---
 .../com/revature/Pi2a1000Places/Cruds.java    | 25 -------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 src/main/java/com/revature/Pi2a1000Places/Cruds.java

diff --git a/src/main/java/com/revature/Pi2a1000Places/Cruds.java b/src/main/java/com/revature/Pi2a1000Places/Cruds.java
deleted file mode 100644
index 4086905..0000000
--- a/src/main/java/com/revature/Pi2a1000Places/Cruds.java
+++ /dev/null
@@ -1,25 +0,0 @@
-
-package com.revature.pokedex.daos;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-
-// This is another form of abstraction
-public interface Crudable<T> {
-
-    // public final int age = 16; we call a constant variable because by default it's final and cannot changed
-
-    // Create
-    T create(T newObject);
-
-    // Read
-    T[] findAll() throws IOException;
-    T findById(String id);
-
-    // Update
-    public boolean update(T updatedObj);
-
-    //Delete
-    boolean delete(String id);
-
-}
\ No newline at end of file

From be71e6b8dcc863744ff5a647346f09a163ee9fe7 Mon Sep 17 00:00:00 2001
From: mmoord <92188851+mmoord@users.noreply.github.com>
Date: Thu, 2 Jun 2022 16:47:51 -0400
Subject: [PATCH 38/56] accidentally pushed to main

---
 .../revature/Pi2a1000Places/DeleteStu.java    | 28 -------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 src/main/java/com/revature/Pi2a1000Places/DeleteStu.java

diff --git a/src/main/java/com/revature/Pi2a1000Places/DeleteStu.java b/src/main/java/com/revature/Pi2a1000Places/DeleteStu.java
deleted file mode 100644
index 5d1c682..0000000
--- a/src/main/java/com/revature/Pi2a1000Places/DeleteStu.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.sdnext.hibernate.tutorial;
-
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-
-import com.sdnext.hibernate.tutorial.dto.Student;
-import com.sdnext.hibernate.tutorial.utility.HibernateUtil;
-
-public class DeleteStudent {
-
- /**
-  * @param args
-  */
- public static void main(String[] args) 
- {
-  //Create session factory object
-  SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
-  //getting session object from session factory
-  Session session = sessionFactory.openSession();
-  //getting transaction object from session object
-  session.beginTransaction();
-  Student student = (Student)session.load(Student.class, 4);
-  session.delete(student);
-  System.out.println("Deleted Successfully");
-  session.getTransaction().commit();
-     sessionFactory.close();
- }
-}
\ No newline at end of file

From 94e4e3239748b4f506987fec358502a096ac0fa9 Mon Sep 17 00:00:00 2001
From: mmoord <92188851+mmoord@users.noreply.github.com>
Date: Thu, 2 Jun 2022 16:48:00 -0400
Subject: [PATCH 39/56] accidentally pushed to main

---
 .../revature/Pi2a1000Places/ReadStudent.java  | 34 -------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 src/main/java/com/revature/Pi2a1000Places/ReadStudent.java

diff --git a/src/main/java/com/revature/Pi2a1000Places/ReadStudent.java b/src/main/java/com/revature/Pi2a1000Places/ReadStudent.java
deleted file mode 100644
index eb0523f..0000000
--- a/src/main/java/com/revature/Pi2a1000Places/ReadStudent.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.sdnext.hibernate.tutorial;
-
-import java.util.List;
-
-import org.hibernate.Query;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-
-import com.sdnext.hibernate.tutorial.dto.Student;
-import com.sdnext.hibernate.tutorial.utility.HibernateUtil;
-
-public class ReadStudent {
-
- /**
-  * @param args
-  */
- public static void main(String[] args) 
- {
-  //Create session factory object
-  SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
-  //getting session object from session factory
-  Session session = sessionFactory.openSession();
-  //getting transaction object from session object
-  session.beginTransaction();
-  Query query = session.createQuery("from Student");
-  List students = query.list();
-  for(Student student : students)
-  {
-System.out.println("Roll Number: "+student.getRollNumber()+", Student Name: "+student.getStudentName()+", Course: "+student.getCourse());
-  }
-  session.getTransaction().commit();
-  sessionFactory.close();
- }
-}
\ No newline at end of file

From fed331b64891216145dd8a9fe8058fdfdfc68743 Mon Sep 17 00:00:00 2001
From: mmoord <92188851+mmoord@users.noreply.github.com>
Date: Thu, 2 Jun 2022 16:48:15 -0400
Subject: [PATCH 40/56] accidentally pushed to main

---
 .../revature/Pi2a1000Places/Restaurant.java   | 61 -------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 src/main/java/com/revature/Pi2a1000Places/Restaurant.java

diff --git a/src/main/java/com/revature/Pi2a1000Places/Restaurant.java b/src/main/java/com/revature/Pi2a1000Places/Restaurant.java
deleted file mode 100644
index bad9491..0000000
--- a/src/main/java/com/revature/Pi2a1000Places/Restaurant.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-*
-*  Refactor the code into the Project1 code.
-*  This in only a general format of how the require functions must comply with.
-*
-*
-*
-*/
-
-packkage com.sdnext.hibernate.tutorial.dto;
-import java.io.Serializable;
-
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
-@Entity
-@Table(name="STUDENT")
-public class Student implements Serializable 
-{
-
- /**
-  * serialVersionUID
-  */
- private static final long serialVersionUID = 8633415090390966715L;
- @Id
- @Column(name="ID")
- @GeneratedValue(strategy=GenerationType.AUTO)
- private int id;
- @Column(name="STUDENT_NAME")
- private String studentName;
- @Column(name="ROLL_NUMBER")
- private int rollNumber;
- @Column(name="COURSE")
- private String course;
- public int getId() {
-  return id;
- }
- public void setId(int id) {
-  this.id = id;
- }
- public String getStudentName() {
-  return studentName;
- }
- public void setStudentName(String studentName) {
-  this.studentName = studentName;
- }
- public int getRollNumber() {
-  return rollNumber;
- }
- public void setRollNumber(int rollNumber) {
-  this.rollNumber = rollNumber;
- }
- public String getCourse() {
-  return course;
- }
- public void setCourse(String course) {
-  this.course = course;
- }
-}

From 6eccda22935fcffad2005b1c25e59fa1d0d55aac Mon Sep 17 00:00:00 2001
From: mmoord <92188851+mmoord@users.noreply.github.com>
Date: Thu, 2 Jun 2022 16:48:31 -0400
Subject: [PATCH 41/56] accidentally pushed to main

---
 .../com/revature/Pi2a1000Places/Update.java   | 30 -------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 src/main/java/com/revature/Pi2a1000Places/Update.java

diff --git a/src/main/java/com/revature/Pi2a1000Places/Update.java b/src/main/java/com/revature/Pi2a1000Places/Update.java
deleted file mode 100644
index a5a728a..0000000
--- a/src/main/java/com/revature/Pi2a1000Places/Update.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.sdnext.hibernate.tutorial;
-
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-
-import com.sdnext.hibernate.tutorial.dto.Student;
-import com.sdnext.hibernate.tutorial.utility.HibernateUtil;
-
-public class UpdateStudent {
-
- /**
-  * @param args
-  */
- public static void main(String[] args) 
- {
-  //Create session factory object
-  SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
-  //getting session object from session factory
-  Session session = sessionFactory.openSession();
-  //getting transaction object from session object
-  session.beginTransaction();
-  
-  Student student = (Student)session.get(Student.class, 2);
-  student.setStudentName("Sweety Rajput");
-  System.out.println("Updated Successfully");
-  session.getTransaction().commit();
-  sessionFactory.close();
- }
-}
-

From 0eee8b0483352f4a69f91e170d6aac8b41d17ee9 Mon Sep 17 00:00:00 2001
From: mmoord <92188851+mmoord@users.noreply.github.com>
Date: Thu, 2 Jun 2022 16:48:40 -0400
Subject: [PATCH 42/56] accidentally pushed to main

---
 .../Pi2a1000Places/UtilHiberante.java         | 23 -------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 src/main/java/com/revature/Pi2a1000Places/UtilHiberante.java

diff --git a/src/main/java/com/revature/Pi2a1000Places/UtilHiberante.java b/src/main/java/com/revature/Pi2a1000Places/UtilHiberante.java
deleted file mode 100644
index 25b96c4..0000000
--- a/src/main/java/com/revature/Pi2a1000Places/UtilHiberante.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.sdnext.hibernate.tutorial.utility;
-
-import org.hibernate.SessionFactory;
-import org.hibernate.cfg.AnnotationConfiguration;
-
-public class HibernateUtil 
-{
- private static final SessionFactory sessionFactory;
- static
- {
-  try
-  {
-   sessionFactory = new AnnotationConfiguration().configure().buildSessionFactory();
-  }
-  catch(Throwable th){
-   System.err.println("Enitial SessionFactory creation failed"+th);
-   throw new ExceptionInInitializerError(th);
-  }
-   }
-   public static SessionFactory getSessionFactory(){
-    return sessionFactory;
-   }
-}
\ No newline at end of file

From 237e90c1848fd264aa83f5b05e2cd3e218d6e847 Mon Sep 17 00:00:00 2001
From: mmoord <92188851+mmoord@users.noreply.github.com>
Date: Thu, 2 Jun 2022 16:48:48 -0400
Subject: [PATCH 43/56] accidentally pushed to main

---
 .../java/com/revature/Pi2a1000Places/samplejava.iml   | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 src/main/java/com/revature/Pi2a1000Places/samplejava.iml

diff --git a/src/main/java/com/revature/Pi2a1000Places/samplejava.iml b/src/main/java/com/revature/Pi2a1000Places/samplejava.iml
deleted file mode 100644
index 7758961..0000000
--- a/src/main/java/com/revature/Pi2a1000Places/samplejava.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" packagePrefix="com.sdnext.hibernate.tutorial" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file

From cd13340012b1c3985cea5899b3c35eef23bff5c9 Mon Sep 17 00:00:00 2001
From: mmoord <92188851+mmoord@users.noreply.github.com>
Date: Thu, 2 Jun 2022 16:48:57 -0400
Subject: [PATCH 44/56] accidentally pushed to main

---
 .../Pi2a1000Places/util/Crudable.java         | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 src/main/java/com/revature/Pi2a1000Places/util/Crudable.java

diff --git a/src/main/java/com/revature/Pi2a1000Places/util/Crudable.java b/src/main/java/com/revature/Pi2a1000Places/util/Crudable.java
deleted file mode 100644
index 77d872a..0000000
--- a/src/main/java/com/revature/Pi2a1000Places/util/Crudable.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.revature.pi.daos;
-
-import java.io.IOException;
-import java.sql.SQLException;
-
-public interface Crudable<T> {
-//CRUD: Create, Read, Update, Delete
-
-    T create(T newObject) throws SQLException;
-//check exception thrown. Necessary?
-
-
-    T[] findAll() throws IOException;
-    T findById(String id);
-
-    boolean update(T updatedObject);
-
-    boolean delete(String id);
-}

From 5570cae451083b8d25c4801c46e21e10078ae912 Mon Sep 17 00:00:00 2001
From: Maxwell Moord <maxwellmoord@gmail.com>
Date: Fri, 3 Jun 2022 09:31:47 -0400
Subject: [PATCH 45/56] Added the ability to Update Account

---
 .../Pi2a1000Places/customer/CustomerDao.java  | 64 +++++++++++++++----
 .../customer/CustomerServices.java            | 15 +----
 .../customer/CustomerServlet.java             | 14 +++-
 3 files changed, 63 insertions(+), 30 deletions(-)

diff --git a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerDao.java b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerDao.java
index 11f3560..07758c4 100644
--- a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerDao.java
+++ b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerDao.java
@@ -1,7 +1,12 @@
 package com.revature.Pi2a1000Places.customer;
 
 import com.revature.Pi2a1000Places.util.ConnectionFactory;
+import com.revature.Pi2a1000Places.util.HibernateUtil;
+import org.hibernate.HibernateException;
+import org.hibernate.Session;
+import org.hibernate.Transaction;
 
+import java.io.IOException;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -40,20 +45,25 @@ public static Customer create(Customer newUser) {
 
 
     public Boolean pullUsernames(String username) {
-        try (Connection conn = ConnectionFactory.getInstance().getConnection()) {
-            String sql = "select username from customer where username = ?";
-            PreparedStatement ps = conn.prepareStatement(sql);
-            ps.setString(1, username);
-
-            ResultSet rs = ps.executeQuery();
-
-            if (!rs.isBeforeFirst()) {
-                return false;
-            }
-            return true;
-        } catch (SQLException e) {
+        try {
+            //System.out.println("Before Hibernate");
+            Session session = HibernateUtil.getSession();
+            //System.out.println("After Get Session");
+            Transaction transaction = session.beginTransaction();
+            // System.out.println("After Transaction");
+            Customer customer = session.get(Customer.class,username);
+            //System.out.println("After Session.get");
+            transaction.commit();
+            // System.out.println("After Transaction Commit");
+            if(customer !=null){
+                return true;
+            }else return false;
+
+        } catch (HibernateException | IOException e) {
             e.printStackTrace();
-            return false;
+            return null;
+        } finally {
+            HibernateUtil.closeSession();
         }
 
     }
@@ -126,5 +136,31 @@ public String deleteCustomer(String username) {
         return deletedAccount = ("Account of " + username + " has been deleted \n");
     }
 
+    public Customer updateCustomer(Customer customerToUpdate){
+            String username = customerToUpdate.getUsername();
+
+        try {
+            Session session = HibernateUtil.getSession();
+
+            Transaction transaction = session.beginTransaction();
+            session.update(username, customerToUpdate);
+            transaction.commit();
+
+            session.beginTransaction();
+            Customer customer = session.get(Customer.class,username);
+            transaction.commit();
+
+        } catch (HibernateException | IOException e) {
+            e.printStackTrace();
+            return null;
+        } finally {
+            HibernateUtil.closeSession();
+        }
+        return customerToUpdate;
+    }
+
+
+    }
+
+
 
-}
diff --git a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServices.java b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServices.java
index 9ea2b08..1a56d07 100644
--- a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServices.java
+++ b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServices.java
@@ -76,20 +76,9 @@ public String deleteCustomer(Customer customerToDelete){
     }
 
     public Customer updateCustomer(Customer customerToUpdate){
-        String customerName = customerToUpdate.getModName();
-        System.out.println("modName: " + modName);
-        String creatorName = customerToUpdate.getCreatorName();
-        System.out.println("creatorName: "+ creatorName);
-        String id = modToUpdate.getId();
-        System.out.println("Id: "+ id);
-        if(!verifyCreatorName(creatorName)){throw new InvalidRequestException("This creator doesn't exist");}
-        else if(!verifyId(id)){throw new InvalidRequestException("This id doesn't exist");}
-        else if(verifyModName(modName)){
-            throw new InvalidRequestException("This mod already exists " + modDao.findByModName(modName));
-        }
-        else{return modDao.updateMod(modName,creatorName,id);}
+      return customerDao.updateCustomer(customerToUpdate);}
 
     }
 
 
-}
+
diff --git a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java
index 238f448..73dbac1 100644
--- a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java
+++ b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java
@@ -47,9 +47,17 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S
             resp.getWriter().write(e.getMessage());
         }
         } else if (Authable.checkAuth(req, resp)) {
-            if (newUser.getUsername().equals(LoginCreds.getUsername()) && newUser.getPassword().equals(LoginCreds.getPassword())) {
-                resp.getWriter().write( customerServices.updateCustomer(newUser));
-            }else{throw new AuthenticationException("The username and password of the current user does not match the one to be deleted");
+            try {
+                if (newUser.getUsername().equals(LoginCreds.getUsername()) && newUser.getPassword().equals(LoginCreds.getPassword())) {
+                    newUser = customerServices.updateCustomer(newUser);
+                    String payload = mapper.writeValueAsString(newUser);
+                    resp.getWriter().write(payload);
+                } else {
+                    throw new AuthenticationException("The username and password of the current user does not match the one to be deleted");
+                }
+            }catch (AuthenticationException e){
+                resp.setStatus(409);
+                resp.getWriter().write(e.getMessage());
             }
         }
     }

From f260ff9118ef13d5801175a8c7fc7f04d447fae9 Mon Sep 17 00:00:00 2001
From: Maxwell Moord <maxwellmoord@gmail.com>
Date: Fri, 3 Jun 2022 11:16:38 -0400
Subject: [PATCH 46/56] Made some changes to Customer Dao

---
 .../java/com/revature/Pi2a1000Places/customer/CustomerDao.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerDao.java b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerDao.java
index 07758c4..e2c3ea7 100644
--- a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerDao.java
+++ b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerDao.java
@@ -138,6 +138,7 @@ public String deleteCustomer(String username) {
 
     public Customer updateCustomer(Customer customerToUpdate){
             String username = customerToUpdate.getUsername();
+            String password = customerToUpdate.getPassword();
 
         try {
             Session session = HibernateUtil.getSession();

From dd8f169d1eb77f85e64d5d295002afd376a2f167 Mon Sep 17 00:00:00 2001
From: mmoord <92188851+mmoord@users.noreply.github.com>
Date: Fri, 3 Jun 2022 11:33:32 -0400
Subject: [PATCH 47/56] Update pom.xml

---
 pom.xml | 150 +-------------------------------------------------------
 1 file changed, 2 insertions(+), 148 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9187e9a..a3111b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,153 +33,7 @@
     </pluginManagement>
   </build>
 
-  <!--    <build>-->
-  <!--        <pluginManagement>-->
-  <!--            <plugins>-->
-  <!--                <plugin>-->
-  <!--                    <groupId>org.apache.tomcat.maven</groupId>-->
-  <!--                    <artifactId>tomcat7-maven-plugin</artifactId>-->
-  <!--                    <version>2.2</version>-->
-  <!--                    <configuration>-->
-  <!--                        <url>http://localhost:3000/manager/text</url>-->
-  <!--                        <server>LocalTomcat</server>-->
-  <!--                        <path>/PitoA1000Places</path>-->
-  <!--                        <update>true</update>-->
-  <!--                    </configuration>-->
-  <!--                </plugin>-->
-  <!--            </plugins>-->
-  <!--        </pluginManagement>-->
-  <!--    </build>-->
-
-
-
-
-  <!--    <build>-->
-  <!--        &lt;!&ndash; https://docs.microsoft.com/en-us/azure/app-service/app-service-web-get-started-java &ndash;&gt;-->
-  <!--        <plugins>-->
-  <!--            <plugin>-->
-  <!--                <artifactId>maven-compiler-plugin</artifactId>-->
-  <!--                <version>3.8.1</version>-->
-  <!--                <configuration>-->
-  <!--                    <source>1.8</source>-->
-  <!--                    <target>1.8</target>-->
-  <!--                </configuration>-->
-  <!--            </plugin>-->
-  <!--            &lt;!&ndash;************************************************* &ndash;&gt;-->
-  <!--            &lt;!&ndash; Deploy to Tomcat in App Service Windows &ndash;&gt;-->
-  <!--            &lt;!&ndash;************************************************* &ndash;&gt;-->
-  <!--            <plugin>-->
-  <!--                <groupId>com.microsoft.azure</groupId>-->
-  <!--                <artifactId>azure-webapp-maven-plugin</artifactId>-->
-  <!--                <version>2.2.0</version>-->
-  <!--                <configuration>-->
-  <!--                    &lt;!&ndash; Specify v2 schema &ndash;&gt;-->
-  <!--                    <schemaVersion>v2</schemaVersion>-->
-  <!--                    &lt;!&ndash; App information &ndash;&gt;-->
-  <!--                    &lt;!&ndash; SUBSCRIPTION_ID Unique ID for the subscription that deploys the app&ndash;&gt;-->
-  <!--                    <subscriptionId>9cc4b7e1-da29-4fd8-8ac8-1e56252688f4</subscriptionId>-->
-  <!--                    &lt;!&ndash; RESOURCEGROUP_NAME &ndash;&gt;-->
-  <!--                    <resourceGroup>sqldatabase</resourceGroup>-->
-  <!--                    &lt;!&ndash; WEBAPP_NAME &ndash;&gt;-->
-  <!--                    <appName>zahfosha</appName>-->
-  <!--                    &lt;!&ndash; REGION &ndash;&gt;-->
-  <!--                    <region>East US</region>-->
-  <!--                    &lt;!&ndash; Java Runtime Stack for App Service on Windows &ndash;&gt;-->
-  <!--                    <runtime>-->
-  <!--                        <os>windows</os>-->
-  <!--                        <javaVersion>1.8</javaVersion>-->
-  <!--                        <webContainer>tomcat 9.0</webContainer>-->
-  <!--                    </runtime>-->
-  <!--                    <deployment>-->
-  <!--                        <resources>-->
-  <!--                            <resource>-->
-  <!--                                <directory>${project.basedir}/target</directory>-->
-  <!--                                <includes>-->
-  <!--                                    <include>*.war</include>-->
-  <!--                                </includes>-->
-  <!--                            </resource>-->
-  <!--                        </resources>-->
-  <!--                    </deployment>-->
-  <!--                    &lt;!&ndash;          DO NOT REMOVE THE PRICING TIER ITS THE CHEAPEST&ndash;&gt;-->
-  <!--                    <pricingTier>B1</pricingTier>-->
-  <!--                </configuration>-->
-  <!--            </plugin>-->
-  <!--        </plugins>-->
-  <!--    </build>-->
-
-
-  <!--    <build>-->
-  <!--        <pluginManagement>-->
-  <!--            <plugins>-->
-  <!--                <plugin>-->
-  <!--                    <groupId>org.apache.tomcat.maven</groupId>-->
-  <!--                    <artifactId>tomcat7-maven-plugin</artifactId>-->
-  <!--                    <version>2.2</version>-->
-  <!--                    <configuration>-->
-  <!--                        <url>http://localhost:3000/manager/text</url>-->
-  <!--                        <server>LocalTomcat</server>-->
-  <!--                        <path>/PitoA1000Places</path>-->
-  <!--                        <update>true</update>-->
-  <!--                    </configuration>-->
-  <!--                </plugin>-->
-  <!--            </plugins>-->
-  <!--        </pluginManagement>-->
-  <!--    </build>-->
-
-
-
-  <!--    <build>-->
-  <!--        &lt;!&ndash; https://docs.microsoft.com/en-us/azure/app-service/app-service-web-get-started-java &ndash;&gt;-->
-  <!--        <plugins>-->
-  <!--            <plugin>-->
-  <!--                <artifactId>maven-compiler-plugin</artifactId>-->
-  <!--                <version>3.8.1</version>-->
-  <!--                <configuration>-->
-  <!--                    <source>1.8</source>-->
-  <!--                    <target>1.8</target>-->
-  <!--                </configuration>-->
-  <!--            </plugin>-->
-  <!--            &lt;!&ndash;************************************************* &ndash;&gt;-->
-  <!--            &lt;!&ndash; Deploy to Tomcat in App Service Windows &ndash;&gt;-->
-  <!--            &lt;!&ndash;************************************************* &ndash;&gt;-->
-  <!--            <plugin>-->
-  <!--                <groupId>com.microsoft.azure</groupId>-->
-  <!--                <artifactId>azure-webapp-maven-plugin</artifactId>-->
-  <!--                <version>2.2.0</version>-->
-  <!--                <configuration>-->
-  <!--                    &lt;!&ndash; Specify v2 schema &ndash;&gt;-->
-  <!--                    <schemaVersion>v2</schemaVersion>-->
-  <!--                    &lt;!&ndash; App information &ndash;&gt;-->
-  <!--                    &lt;!&ndash; SUBSCRIPTION_ID Unique ID for the subscription that deploys the app&ndash;&gt;-->
-  <!--                    <subscriptionId>9cc4b7e1-da29-4fd8-8ac8-1e56252688f4</subscriptionId>-->
-  <!--                    &lt;!&ndash; RESOURCEGROUP_NAME &ndash;&gt;-->
-  <!--                    <resourceGroup>sqldatabase</resourceGroup>-->
-  <!--                    &lt;!&ndash; WEBAPP_NAME &ndash;&gt;-->
-  <!--                    <appName>PitoA1000Places</appName>-->
-  <!--                    &lt;!&ndash; REGION &ndash;&gt;-->
-  <!--                    <region>East US</region>-->
-  <!--                    &lt;!&ndash; Java Runtime Stack for App Service on Windows &ndash;&gt;-->
-  <!--                    <runtime>-->
-  <!--                        <os>windows</os>-->
-  <!--                        <javaVersion>1.8</javaVersion>-->
-  <!--                        <webContainer>tomcat 9.0</webContainer>-->
-  <!--                    </runtime>-->
-  <!--                    <deployment>-->
-  <!--                        <resources>-->
-  <!--                            <resource>-->
-  <!--                                <directory>${project.basedir}/target</directory>-->
-  <!--                                <includes>-->
-  <!--                                    <include>*.war</include>-->
-  <!--                                </includes>-->
-  <!--                            </resource>-->
-  <!--                        </resources>-->
-  <!--                    </deployment>-->
-  <!--                    &lt;!&ndash;          DO NOT REMOVE THE PRICING TIER ITS THE CHEAPEST&ndash;&gt;-->
-  <!--                    <pricingTier>B1</pricingTier>-->
-  <!--                </configuration>-->
-  <!--            </plugin>-->
-  <!--        </plugins>-->
-  <!--    </build>-->
+ 
 
   <dependencies>
     <!-- this is a comment -->
@@ -256,4 +110,4 @@
 
 </dependencies>
 
-</project>
\ No newline at end of file
+</project>

From 4b98c5b3f0b4fc3cf00b100a518a825194a3723b Mon Sep 17 00:00:00 2001
From: mmoord <92188851+mmoord@users.noreply.github.com>
Date: Fri, 3 Jun 2022 11:35:04 -0400
Subject: [PATCH 48/56] Update CustomerServices.java

---
 .../com/revature/Pi2a1000Places/customer/CustomerServices.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServices.java b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServices.java
index 18a1878..c56bce4 100644
--- a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServices.java
+++ b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServices.java
@@ -29,7 +29,7 @@ public boolean validateUserInput(Customer newUser) throws InvalidRequestExceptio
             throw new InvalidRequestException("Password cannot be blank");}
         System.out.println("The User Has been Validated");
         if (verifyNewUsername(newUser.getUsername()) == true) {
-            System.out.println("It worked dingus");
+            
             throw new InvalidRequestException("That username has already been taken");
         }else{
             createNewUser(newUser);

From 3b87dd0c76f5cf230d3906799eeecf4a992cec60 Mon Sep 17 00:00:00 2001
From: mmoord <92188851+mmoord@users.noreply.github.com>
Date: Fri, 3 Jun 2022 11:36:01 -0400
Subject: [PATCH 49/56] Update CustomerServlet.java

---
 .../com/revature/Pi2a1000Places/customer/CustomerServlet.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java
index 947d696..8854e7e 100644
--- a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java
+++ b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java
@@ -11,7 +11,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
-public class CustomerServlet extends HttpServlet {
+public class CustomerServlet extends HttpServlet implements Authable {
 
     private final CustomerServices customerServices;
     private final ObjectMapper mapper;

From 58620b4cd931f5756374f6a1bf64fb18456f8999 Mon Sep 17 00:00:00 2001
From: mmoord <92188851+mmoord@users.noreply.github.com>
Date: Fri, 3 Jun 2022 11:36:30 -0400
Subject: [PATCH 50/56] Update CustomerServlet.java

---
 .../com/revature/Pi2a1000Places/customer/CustomerServlet.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java
index 8854e7e..4dd4204 100644
--- a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java
+++ b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java
@@ -4,6 +4,7 @@
 import com.revature.Pi2a1000Places.auth.LoginCreds;
 import com.revature.Pi2a1000Places.util.exceptions.AuthenticationException;
 import com.revature.Pi2a1000Places.util.exceptions.InvalidRequestException;
+import com.revature.Pi2a1000Places.util.interfaces.Authable
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;

From 9e633d521fc3d0a64d968ad8cc9dcc23d4783e57 Mon Sep 17 00:00:00 2001
From: mmoord <92188851+mmoord@users.noreply.github.com>
Date: Fri, 3 Jun 2022 11:36:55 -0400
Subject: [PATCH 51/56] Update CustomerServlet.java

---
 .../com/revature/Pi2a1000Places/customer/CustomerServlet.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java
index 4dd4204..73dbac1 100644
--- a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java
+++ b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java
@@ -4,7 +4,7 @@
 import com.revature.Pi2a1000Places.auth.LoginCreds;
 import com.revature.Pi2a1000Places.util.exceptions.AuthenticationException;
 import com.revature.Pi2a1000Places.util.exceptions.InvalidRequestException;
-import com.revature.Pi2a1000Places.util.interfaces.Authable
+import com.revature.Pi2a1000Places.util.interfaces.Authable;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;

From 63c3b8e77b586c641f13d0036c5e21887047162e Mon Sep 17 00:00:00 2001
From: MelroseDigital <104215821+MelroseDigital@users.noreply.github.com>
Date: Fri, 3 Jun 2022 09:05:18 -0700
Subject: [PATCH 52/56] Update CustomerServlet.java

---
 .../com/revature/Pi2a1000Places/customer/CustomerServlet.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java
index 73dbac1..c43a29e 100644
--- a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java
+++ b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java
@@ -12,7 +12,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
-public class CustomerServlet extends HttpServlet implements Authable {
+public class CustomerServlet extends HttpServlet {
 
     private final CustomerServices customerServices;
     private final ObjectMapper mapper;

From 5e62a8f45bd75dd0a34475cf93e289dabd8224f6 Mon Sep 17 00:00:00 2001
From: Maxwell Moord <maxwellmoord@gmail.com>
Date: Fri, 3 Jun 2022 12:07:24 -0400
Subject: [PATCH 53/56] Modified

---
 .../creditcard/CreditCardDao.java             | 214 +++++++++---------
 .../creditcard/CreditCardServices.java        | 108 ++++-----
 .../creditcard/CreditCardServlet.java         | 156 ++++++-------
 .../customer/CustomerServlet.java             |   2 +-
 .../Pi2a1000Places/util/HibernateUtil.java    |   2 +-
 .../CreditCardDaoCreateMethodTestSuite.java   |  44 ++--
 .../CreditCardDaoDeleteMethodTestSuite.java   |  44 ++--
 7 files changed, 285 insertions(+), 285 deletions(-)

diff --git a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDao.java b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDao.java
index 01d5816..0eb0255 100644
--- a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDao.java
+++ b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardDao.java
@@ -1,89 +1,89 @@
-package com.revature.Pi2a1000Places.creditcard;
-
-import com.revature.Pi2a1000Places.creditcard.CreditCardServices;
-import com.revature.Pi2a1000Places.util.ConnectionFactory;
-import com.revature.Pi2a1000Places.util.HibernateUtil;
-import org.hibernate.HibernateException;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.Transaction;
-
-import com.revature.Pi2a1000Places.util.HibernateUtil;
-
-import java.io.IOException;
-
-public class CreditCardDao extends CreditCardServices {
-    //Create creditCard
-    public static CreditCard create(Object CreditCard) {
-
-    CreditCard creditcard = new CreditCard();
-    creditcard.setCCNumber("7878");
-    creditcard.setCCName("Test");
-    creditcard.setCvv(Integer.parseInt("888"));
-    creditcard.setExpDate("12/12/28");
-    creditcard.setZip(Integer.parseInt("64646"));
-    creditcard.setLimit(Integer.parseInt("55000"));
-    creditcard.setUserName("Name");
-
-    try {
-        SessionFactory sessionFactory = HibernateUtil.getSession().getSessionFactory();
-        Session session = sessionFactory.openSession();
-        session.beginTransaction();
-        session.save(CreditCard);
-        return new CreditCard();
-        session.getTransaction().commit();
-    }catch (HibernateException){
-    } catch (IOException e) {
-        throw new RuntimeException(e);
-    }
-        System.out.println("CC Added");
-        return null;
-        session.close();
-        sessionFactory.close();
-
-    {
-
-//        //Update creditCard
-//    public boolean update(CreditCard updatedCreditCard){
+//package com.revature.Pi2a1000Places.creditcard;
+//
+//import com.revature.Pi2a1000Places.creditcard.CreditCardServices;
+//import com.revature.Pi2a1000Places.util.ConnectionFactory;
+//import com.revature.Pi2a1000Places.util.HibernateUtil;
+//import org.hibernate.HibernateException;
+//import org.hibernate.Session;
+//import org.hibernate.SessionFactory;
+//import org.hibernate.Transaction;
+//
+//import com.revature.Pi2a1000Places.util.HibernateUtil;
+//
+//import java.io.IOException;
+//
+//public class CreditCardDao extends CreditCardServices {
+//    //Create creditCard
+//    public static CreditCard create(Object CreditCard) {
+//
+//    CreditCard creditcard = new CreditCard();
+//    creditcard.setCCNumber("7878");
+//    creditcard.setCCName("Test");
+//    creditcard.setCvv(Integer.parseInt("888"));
+//    creditcard.setExpDate("12/12/28");
+//    creditcard.setZip(Integer.parseInt("64646"));
+//    creditcard.setLimit(Integer.parseInt("55000"));
+//    creditcard.setUserName("Name");
 //
-//        Session session;
+//    try {
+//        SessionFactory sessionFactory = HibernateUtil.getSession().getSessionFactory();
+//        Session session = sessionFactory.openSession();
+//        session.beginTransaction();
+//        session.save(CreditCard);
+//        return new CreditCard();
+//        session.getTransaction().commit();
+//    }catch (HibernateException){
+//    } catch (IOException e) {
+//        throw new RuntimeException(e);
+//    }
+//        System.out.println("CC Added");
+//        return null;
+//        session.close();
+//        sessionFactory.close();
+//
+//    {
+//
+////        //Update creditCard
+////    public boolean update(CreditCard updatedCreditCard){
+////
+////        Session session;
+////        try {
+////            sessionFactory = HibernateUtil.getSession().getSessionFactory();
+////            session = sessionFactory.openSession();
+////            session.beginTransaction();
+////            session.update(creditcard);
+////            return updatedCreditCard;
+////            //creditCard.setCCName() ("Test")
+////            session.getTransaction().commit();
+////        } catch (HibernateException) {
+////        } catch (IOException e) {
+////            throw new RuntimeException(e);
+////
+////            System.out.println("CC Updated");
+////            return CreditCard;
+////            session.close();
+////            sessionFactory.close();
+////            //where does return statement go?
+//
+//        }
+//
+//        //Delete creditCard
+//        public Boolean delete (String ccNumber){
 //        try {
-//            sessionFactory = HibernateUtil.getSession().getSessionFactory();
-//            session = sessionFactory.openSession();
-//            session.beginTransaction();
-//            session.update(creditcard);
-//            return updatedCreditCard;
-//            //creditCard.setCCName() ("Test")
-//            session.getTransaction().commit();
-//        } catch (HibernateException) {
-//        } catch (IOException e) {
-//            throw new RuntimeException(e);
-//
-//            System.out.println("CC Updated");
-//            return CreditCard;
-//            session.close();
-//            sessionFactory.close();
-//            //where does return statement go?
-
-        }
-
-        //Delete creditCard
-        public Boolean delete (String ccNumber){
-        try {
-            Session session = HibernateUtil.getSession();
-            Transaction transaction = session.beginTransaction();
-            CreditCard creditCard = session.load(CreditCard.class,"creditCard");
-                    session.delete(creditCard);
-            transaction.commit();
-        } catch (HibernateException | IOException e) {
-            System.out.println("CC Deleted");
-        } finally {
-            HibernateUtil.closeSession();
-        }
-        }
-
-
-}
+//            Session session = HibernateUtil.getSession();
+//            Transaction transaction = session.beginTransaction();
+//            CreditCard creditCard = session.load(CreditCard.class,"creditCard");
+//                    session.delete(creditCard);
+//            transaction.commit();
+//        } catch (HibernateException | IOException e) {
+//            System.out.println("CC Deleted");
+//        } finally {
+//            HibernateUtil.closeSession();
+//        }
+//        }
+//
+//
+//}
 
 // MVP a. Create - ADD Card
 //    public CreditCard addCC(String ccNumber, String ccName, String cvv, String expDate, String zip, String limits, String customerUsername) {
@@ -143,26 +143,26 @@ public Boolean delete (String ccNumber){
 ////4.5 (for credit card update and update limit see do get in trainer servlet )
 //}
 
-        public void update () {
-        }
-
-        public void update () {
-        }
-
-        public void update () {
-        }
-
-        public static void create () {
-        }
-
-        public static void createCC () {
-        }
-
-        public static void createCC () {
-        }
-
-        public static void createCC () {
-        }
-
-        public static void createCC () {
-        }
\ No newline at end of file
+//        public void update () {
+//        }
+//
+//        public void update () {
+//        }
+//
+//        public void update () {
+//        }
+//
+//        public static void create () {
+//        }
+//
+//        public static void createCC () {
+//        }
+//
+//        public static void createCC () {
+//        }
+//
+//        public static void createCC () {
+//        }
+//
+//        public static void createCC () {
+//        }
\ No newline at end of file
diff --git a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServices.java b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServices.java
index 75bb946..eb8f416 100644
--- a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServices.java
+++ b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServices.java
@@ -1,54 +1,54 @@
-package com.revature.Pi2a1000Places.creditcard;
-
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-import java.io.Serializable;
-
-import javax.persistence.*;
-
-public class CreditCardServices {
-    private final CreditCardDao creditCardDao;
-
-    @Id
-    @Column(name="CCNUMBER")
-    @GeneratedValue(strategy=GenerationType.AUTO)
-    private int ccNumber;
-
-    //@Override
-    public CreditCard create(CreditCard newCreditCard){
-        return creditCardDao.create(new CreditCard());
-    }
-    //@Override
-    public CreditCard update(CreditCard updatedCreditCard) {
-        if (creditCardDao.update(updatedCreditCard)) return null;
-
-        return updatedCreditCard;
-    }
-
-    //Override
-    public boolean delete() {
-        return delete(null);
-    }
-
-   // Override
-    public boolean delete(String ccNumber){
-
-        return true;
-    }
-
-
-    @Column(name="CCNAME")
-    private String ccName;
-    @Column(name="CVV")
-    private int cVv;
-    @Column(name="EXPDATE")
-    private String expDate;
-    @Column(name="ZIP")
-    private int zip;
-    @Column(name="LIMIT")
-    private String limit;
-    @Column(name="USERNAME")
-    private String userName;
-
-}
\ No newline at end of file
+//package com.revature.Pi2a1000Places.creditcard;
+//
+//import javax.persistence.Entity;
+//import javax.persistence.Table;
+//
+//import java.io.Serializable;
+//
+//import javax.persistence.*;
+//
+//public class CreditCardServices {
+//    private final CreditCardDao creditCardDao;
+//
+//    @Id
+//    @Column(name="CCNUMBER")
+//    @GeneratedValue(strategy=GenerationType.AUTO)
+//    private int ccNumber;
+//
+//    //@Override
+//    public CreditCard create(CreditCard newCreditCard){
+//        return creditCardDao.create(new CreditCard());
+//    }
+//    //@Override
+//    public CreditCard update(CreditCard updatedCreditCard) {
+//        if (creditCardDao.update(updatedCreditCard)) return null;
+//
+//        return updatedCreditCard;
+//    }
+//
+//    //Override
+//    public boolean delete() {
+//        return delete(null);
+//    }
+//
+//   // Override
+//    public boolean delete(String ccNumber){
+//
+//        return true;
+//    }
+//
+//
+//    @Column(name="CCNAME")
+//    private String ccName;
+//    @Column(name="CVV")
+//    private int cVv;
+//    @Column(name="EXPDATE")
+//    private String expDate;
+//    @Column(name="ZIP")
+//    private int zip;
+//    @Column(name="LIMIT")
+//    private String limit;
+//    @Column(name="USERNAME")
+//    private String userName;
+//
+//}
\ No newline at end of file
diff --git a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServlet.java b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServlet.java
index fe45961..aea895f 100644
--- a/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServlet.java
+++ b/src/main/java/com/revature/Pi2a1000Places/creditcard/CreditCardServlet.java
@@ -1,78 +1,78 @@
-package com.revature.Pi2a1000Places.creditcard;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.revature.Pi2a1000Places.auth.LoginCreds;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-public class CreditCardServlet extends HttpServlet{
-    Private final ObjectMapper mapper;
-    private final CreditCardDao creditCardDao;
-
-    public CreditCardServlet(ObjectMapper mapper) {
-        this.mapper = mapper;
-    }
-
-    protected void doOptions(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-        super.doOptions(req, resp);
-        resp.addHeader("Access-Control-Allow-Origin", "*");
-        resp.addHeader("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE");
-        resp.addHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
-
-    }
-
-    //CREATE
-    protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-//        addHeads(req, resp);
-        resp.addHeader("Access-Control-Allow-Origin", "*");
-        resp.addHeader("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE");
-        resp.addHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
-        CreditCardDto pass = mapper.readValue(req.getInputStream(), CreditCardDto.class);
-        CreditCard firstResult = CreditCardDao.createCC(pass.getCcNumber(), pass.getCcName(), pass.getCvv(), pass.getExpDate(), pass.getZip(), pass.getLimits(), pass.getCustomerUsername());
-        CreditCard theObject = CreditCardDao.followUpCreateCreditCard(pass.getCcNumber());
-
-        String payload = mapper.writeValueAsString(theObject);
-
-        resp.getWriter().write("Credit Card Added \n");
-        resp.getWriter().write(payload);
-        resp.setStatus(201);
-    }
-
-  //  UPDATE
-    protected void doPut(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-        resp.addHeader("Access-Control-Allow-Origin", "*");
-        resp.addHeader("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE");
-        resp.addHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
-        CreditCardDto pass = mapper.readValue(req.getInputStream(), CreditCardDto.class);
-
-        CreditCard firstResult = creditCardDao.update(pass.getTableSelection(), pass.getNewCellName(), pass.getCcNumber());
-        CreditCard theObject = creditCardDao.update(pass.getCcNumber());
-
-        String payload = mapper.writeValueAsString(theObject);
-
-        resp.getWriter().write("Credit Card Updated \n");
-        resp.getWriter().write(payload);
-        resp.setStatus(201);
-    }
-
-    //DELETE
-    protected void doDelete(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-        resp.addHeader("Access-Control-Allow-Origin", "*");
-        resp.addHeader("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE");
-        resp.addHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");        CreditCardDto pass = mapper.readValue(req.getInputStream(), CreditCardDto.class);
-
-        boolean deleteTrue = creditCardDao.delete(pass.getCcNumber());
-
-        String payload = mapper.writeValueAsString(deleteTrue);
-
-        resp.getWriter().write("Credit Card deleted \n");
-        resp.getWriter().write(payload);
-        resp.setStatus(201);
-    }
-
-
-}
+//package com.revature.Pi2a1000Places.creditcard;
+//
+//import com.fasterxml.jackson.databind.ObjectMapper;
+//import com.revature.Pi2a1000Places.auth.LoginCreds;
+//
+//import javax.servlet.ServletException;
+//import javax.servlet.http.HttpServlet;
+//import javax.servlet.http.HttpServletRequest;
+//import javax.servlet.http.HttpServletResponse;
+//import java.io.IOException;
+//
+//public class CreditCardServlet extends HttpServlet{
+//    Private final ObjectMapper mapper;
+//    private final CreditCardDao creditCardDao;
+//
+//    public CreditCardServlet(ObjectMapper mapper) {
+//        this.mapper = mapper;
+//    }
+//
+//    protected void doOptions(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+//        super.doOptions(req, resp);
+//        resp.addHeader("Access-Control-Allow-Origin", "*");
+//        resp.addHeader("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE");
+//        resp.addHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
+//
+//    }
+//
+//    //CREATE
+//    protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+////        addHeads(req, resp);
+//        resp.addHeader("Access-Control-Allow-Origin", "*");
+//        resp.addHeader("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE");
+//        resp.addHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
+//        CreditCardDto pass = mapper.readValue(req.getInputStream(), CreditCardDto.class);
+//        CreditCard firstResult = CreditCardDao.createCC(pass.getCcNumber(), pass.getCcName(), pass.getCvv(), pass.getExpDate(), pass.getZip(), pass.getLimits(), pass.getCustomerUsername());
+//        CreditCard theObject = CreditCardDao.followUpCreateCreditCard(pass.getCcNumber());
+//
+//        String payload = mapper.writeValueAsString(theObject);
+//
+//        resp.getWriter().write("Credit Card Added \n");
+//        resp.getWriter().write(payload);
+//        resp.setStatus(201);
+//    }
+//
+//  //  UPDATE
+//    protected void doPut(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+//        resp.addHeader("Access-Control-Allow-Origin", "*");
+//        resp.addHeader("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE");
+//        resp.addHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
+//        CreditCardDto pass = mapper.readValue(req.getInputStream(), CreditCardDto.class);
+//
+//        CreditCard firstResult = creditCardDao.update(pass.getTableSelection(), pass.getNewCellName(), pass.getCcNumber());
+//        CreditCard theObject = creditCardDao.update(pass.getCcNumber());
+//
+//        String payload = mapper.writeValueAsString(theObject);
+//
+//        resp.getWriter().write("Credit Card Updated \n");
+//        resp.getWriter().write(payload);
+//        resp.setStatus(201);
+//    }
+//
+//    //DELETE
+//    protected void doDelete(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+//        resp.addHeader("Access-Control-Allow-Origin", "*");
+//        resp.addHeader("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE");
+//        resp.addHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");        CreditCardDto pass = mapper.readValue(req.getInputStream(), CreditCardDto.class);
+//
+//        boolean deleteTrue = creditCardDao.delete(pass.getCcNumber());
+//
+//        String payload = mapper.writeValueAsString(deleteTrue);
+//
+//        resp.getWriter().write("Credit Card deleted \n");
+//        resp.getWriter().write(payload);
+//        resp.setStatus(201);
+//    }
+//
+//
+//}
diff --git a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java
index 73dbac1..c43a29e 100644
--- a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java
+++ b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java
@@ -12,7 +12,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
-public class CustomerServlet extends HttpServlet implements Authable {
+public class CustomerServlet extends HttpServlet {
 
     private final CustomerServices customerServices;
     private final ObjectMapper mapper;
diff --git a/src/main/java/com/revature/Pi2a1000Places/util/HibernateUtil.java b/src/main/java/com/revature/Pi2a1000Places/util/HibernateUtil.java
index 01c3ba5..9765bb1 100644
--- a/src/main/java/com/revature/Pi2a1000Places/util/HibernateUtil.java
+++ b/src/main/java/com/revature/Pi2a1000Places/util/HibernateUtil.java
@@ -1,7 +1,7 @@
 package com.revature.Pi2a1000Places.util;
 
 import com.revature.Pi2a1000Places.customer.Customer;
-import com.revature.Pi2a1000Places.credit_card.CreditCard;
+import com.revature.Pi2a1000Places.creditcard.CreditCard;
 import com.revature.Pi2a1000Places.menu.Menu;
 import com.revature.Pi2a1000Places.order.Order;
 
diff --git a/src/test/java/testSuite/creditCard/CreditCardDaoCreateMethodTestSuite.java b/src/test/java/testSuite/creditCard/CreditCardDaoCreateMethodTestSuite.java
index ff6d23f..3490b1c 100644
--- a/src/test/java/testSuite/creditCard/CreditCardDaoCreateMethodTestSuite.java
+++ b/src/test/java/testSuite/creditCard/CreditCardDaoCreateMethodTestSuite.java
@@ -1,22 +1,22 @@
-package testSuite.creditCard;
-
-import com.revature.Pi2a1000Places.creditcard.CreditCard;
-import com.revature.Pi2a1000Places.creditcard.CreditCardDao;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-public class CreditCardDaoCreateMethodTestSuite {
-
-    CreditCardDao ccDao;
-
-    @BeforeEach
-    public void testPrep() {
-        ccDao = new CreditCardDao();
-    }
-
-    @Test
-    public void ccDaoTestForCreateMethod_returnCreditCard(){
-        CreditCard newlyAddedCreditCard= ccDao.addCC("5555","1212", "Test", "333", "12/12/22", "94949", "test");
-        System.out.println(newlyAddedCreditCard);
-    }
-}
+//package testSuite.creditCard;
+//
+//import com.revature.Pi2a1000Places.creditcard.CreditCard;
+//import com.revature.Pi2a1000Places.creditcard.CreditCardDao;
+//import org.junit.jupiter.api.BeforeEach;
+//import org.junit.jupiter.api.Test;
+//
+//public class CreditCardDaoCreateMethodTestSuite {
+//
+//    CreditCardDao ccDao;
+//
+//    @BeforeEach
+//    public void testPrep() {
+//        ccDao = new CreditCardDao();
+//    }
+//
+//    @Test
+//    public void ccDaoTestForCreateMethod_returnCreditCard(){
+//        CreditCard newlyAddedCreditCard= ccDao.addCC("5555","1212", "Test", "333", "12/12/22", "94949", "test");
+//        System.out.println(newlyAddedCreditCard);
+//    }
+//}
diff --git a/src/test/java/testSuite/creditCard/CreditCardDaoDeleteMethodTestSuite.java b/src/test/java/testSuite/creditCard/CreditCardDaoDeleteMethodTestSuite.java
index 6a5e5e5..4641774 100644
--- a/src/test/java/testSuite/creditCard/CreditCardDaoDeleteMethodTestSuite.java
+++ b/src/test/java/testSuite/creditCard/CreditCardDaoDeleteMethodTestSuite.java
@@ -1,22 +1,22 @@
-package testSuite.creditCard;
-
-import com.revature.Pi2a1000Places.creditcard.CreditCardDao;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-public class CreditCardDaoDeleteMethodTestSuite {
-
-    CreditCardDao ccDao;
-
-
-    @BeforeEach
-    public void testPrep(){ccDao= new CreditCardDao();
-
-    }
-    @Test
-    public void ccDaoTestForTheDeleteMethod_returnTrue(){
-        boolean result= ccDao.deleteByCCNumber("1111");
-        System.out.println(result);
-    }
-
-}
+//package testSuite.creditCard;
+//
+//import com.revature.Pi2a1000Places.creditcard.CreditCardDao;
+//import org.junit.jupiter.api.BeforeEach;
+//import org.junit.jupiter.api.Test;
+//
+//public class CreditCardDaoDeleteMethodTestSuite {
+//
+//    CreditCardDao ccDao;
+//
+//
+//    @BeforeEach
+//    public void testPrep(){ccDao= new CreditCardDao();
+//
+//    }
+//    @Test
+//    public void ccDaoTestForTheDeleteMethod_returnTrue(){
+//        boolean result= ccDao.deleteByCCNumber("1111");
+//        System.out.println(result);
+//    }
+//
+//}

From 671a9ce75e3fb1ddbcd96437bc5aa058e5d5d4f5 Mon Sep 17 00:00:00 2001
From: Maxwell Moord <maxwellmoord@gmail.com>
Date: Sat, 4 Jun 2022 12:39:31 -0400
Subject: [PATCH 54/56] The path is Pi2a1000Places in tomcat

---
 pom.xml                                               |  2 +-
 .../com/revature/Pi2a1000Places/auth/AuthServlet.java | 11 +++++++++++
 .../Pi2a1000Places/customer/CustomerServlet.java      |  2 ++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a3111b6..488f681 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
           <configuration>
             <url>http://localhost:8080/manager/text</url>
             <server>LocalTomcat</server>
-            <path>/PitoA1000Places</path>
+            <path>/Pi2a1000Places</path>
             <update>true</update>
           </configuration>
         </plugin>
diff --git a/src/main/java/com/revature/Pi2a1000Places/auth/AuthServlet.java b/src/main/java/com/revature/Pi2a1000Places/auth/AuthServlet.java
index fe11c7b..c94ea8c 100644
--- a/src/main/java/com/revature/Pi2a1000Places/auth/AuthServlet.java
+++ b/src/main/java/com/revature/Pi2a1000Places/auth/AuthServlet.java
@@ -5,7 +5,9 @@
 import com.revature.Pi2a1000Places.customer.CustomerServices;
 import com.revature.Pi2a1000Places.util.exceptions.AuthenticationException;
 import com.revature.Pi2a1000Places.util.exceptions.InvalidRequestException;
+import com.revature.Pi2a1000Places.util.interfaces.Authable;
 
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -49,4 +51,13 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws I
         }
     }
 
+    @Override
+    protected void doDelete(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        resp.addHeader("Access-Control-Allow-Origin", "*");
+        resp.addHeader("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE");
+        resp.addHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
+        req.getSession().invalidate();
+        resp.getWriter().write("User has logged out!");
+    }
+
 }
diff --git a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java
index c43a29e..5d19fd2 100644
--- a/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java
+++ b/src/main/java/com/revature/Pi2a1000Places/customer/CustomerServlet.java
@@ -75,9 +75,11 @@ protected void doDelete(HttpServletRequest req, HttpServletResponse resp) throws
 
             if (customerToDelete.getUsername().equals(LoginCreds.getUsername()) && customerToDelete.getPassword().equals(LoginCreds.getPassword())) {
                 resp.getWriter().write( customerServices.deleteCustomer(customerToDelete));
+                req.getSession().invalidate();
             }else{throw new AuthenticationException("The username and password of the current user does not match the one to be deleted");
             }
         }
     }
 
+
 }

From bcbb76afa6270be2e7b59876149c2a484bd5d017 Mon Sep 17 00:00:00 2001
From: mmoord <92188851+mmoord@users.noreply.github.com>
Date: Tue, 7 Jun 2022 11:32:34 -0400
Subject: [PATCH 55/56] Create README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..d495c57
--- /dev/null
+++ b/README.md
@@ -0,0 +1,2 @@
+
+Our Gourmet Pizza Restaurant app was developed for a small restaurant that is looking to help streamline the ordering process for customers to help reduce costs. Customers can enjoy an seamless means to order directly with an account of their own at the restaurant in question, where Admins are capable of adding and updating the menu items. This RESTful application leverages a tomcat server to handle incoming requests to thoroughly tested services that must be persisted using Hibernate and Azure SQL services. This project includes a front-end that will be developed using ReactJS to handle user requests.

From 5145ca0791645c69b11801e0c263eac77142c269 Mon Sep 17 00:00:00 2001
From: mmoord <92188851+mmoord@users.noreply.github.com>
Date: Tue, 7 Jun 2022 11:37:29 -0400
Subject: [PATCH 56/56] Update README.md

---
 README.md | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/README.md b/README.md
index d495c57..3108a54 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,42 @@
+# Project 1: Pi 2 a 1000 Places
 
+# Desctiption
 Our Gourmet Pizza Restaurant app was developed for a small restaurant that is looking to help streamline the ordering process for customers to help reduce costs. Customers can enjoy an seamless means to order directly with an account of their own at the restaurant in question, where Admins are capable of adding and updating the menu items. This RESTful application leverages a tomcat server to handle incoming requests to thoroughly tested services that must be persisted using Hibernate and Azure SQL services. This project includes a front-end that will be developed using ReactJS to handle user requests.
+
+# User Stories
+
+## As A Admin:
+
+-   [ ] Add items to the menu
+-   [ ] Update items to the menu
+-   [ ] Delete items to the menu
+
+
+## As A: Customer
+
+-   [ ] View all items on the menu without needing to Register or Login
+-   [ ] Register/Update/Delete an account
+-   [ ] Add/Update/Delete a credit card to be saved to my account
+-   [ ] Make an order for a specific menu item
+-   [ ] Add a comment to the order to request a change, if it is substitutable
+-   [ ] Favorite an order
+-   [ ] View past orders by date
+-   [ ] Pay off your balance with your credit card
+
+
+## Tech Stack
+
+-   [ ] Java 8
+-   [ ] JUnit
+-   [ ] Mockito
+-   [ ] Apache Maven
+-   [ ] Hibernate
+-   [ ] Jackson library (for JSON marshalling/unmarshalling)
+-   [ ] Java EE Servlet API (v4.0+)
+-   [ ] Azure SQL
+-   [ ] Git SCM (on GitHub)
+
+## Collaborators
+- Maxwell Moord
+- Tenyce Melrose
+- Rodney Lewis