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 @@
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/revature/cmChicken/util/exceptions/ResourcePersistanceException.java b/src/main/java/com/revature/cmChicken/util/exceptions/ResourcePersistanceException.java
deleted file mode 100644
index 16f404e..0000000
--- a/src/main/java/com/revature/cmChicken/util/exceptions/ResourcePersistanceException.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.revature.cmChicken.util.exceptions;
-
-public class ResourcePersistanceException extends RuntimeException{
-
- public ResourcePersistanceException(String message) {
- super(message);
- }
-}
diff --git a/src/main/java/com/revature/cmchicken/credit_card/CreditCard.java b/src/main/java/com/revature/cmchicken/credit_card/CreditCard.java
new file mode 100644
index 0000000..006566c
--- /dev/null
+++ b/src/main/java/com/revature/cmchicken/credit_card/CreditCard.java
@@ -0,0 +1,90 @@
+package com.revature.cmchicken.credit_card;
+
+public class CreditCard {
+ private String cc_number;
+ private String cc_name;
+ private int cvv;
+ private String exp_date;
+ private int zip;
+ private int limit;
+ private String user_name;
+
+ public CreditCard(String cc_number, String cc_name, int cvv, String exp_date, int zip, int limit, String user_name) {
+ super();
+ this.cc_number = cc_number;
+ this.cc_name = cc_name;
+ this.cvv = cvv;
+ this.exp_date = exp_date;
+ this.zip = zip;
+ this.limit = limit;
+ this.user_name = user_name;
+ }
+
+ public String getCc_number() {
+ return cc_number;
+ }
+
+ public void setCc_number(String cc_number) {
+ this.cc_number = cc_number;
+ }
+
+ public String getCc_name() {
+ return cc_name;
+ }
+
+ public void setCc_name(String cc_name) {
+ this.cc_name = cc_name;
+ }
+
+ public int getCvv() {
+ return cvv;
+ }
+
+ public void setCvv(int cvv) {
+ this.cvv = cvv;
+ }
+
+ public String getExp_date() {
+ return exp_date;
+ }
+
+ public void setExp_date(String exp_date) {
+ this.exp_date = exp_date;
+ }
+
+ public int getZip() {
+ return zip;
+ }
+
+ public void setZip(int zip) {
+ this.zip = zip;
+ }
+
+ public int getLimit() {
+ return limit;
+ }
+
+ public void setLimit(int limit) {
+ this.limit = limit;
+ }
+
+ public String getUser_name() {
+ return user_name;
+ }
+
+ public void setUser_name(String user_name) {
+ this.user_name = user_name;
+ }
+
+ public String toString() {
+ return "CreditCard{" +
+ "cc_number='" + cc_number + '\'' +
+ ", cc_name='" + cc_name + '\'' +
+ ", cvv='" + cvv + '\'' +
+ ", exp_date='" + exp_date + '\'' +
+ ", zip='" + zip + '\'' +
+ ", limit='" + limit + '\'' +
+ ", user_name='" + user_name + '\'' +
+ '}';
+ }
+}
diff --git a/src/main/java/com/revature/cmchicken/credit_card/CreditCardDao.java b/src/main/java/com/revature/cmchicken/credit_card/CreditCardDao.java
new file mode 100644
index 0000000..91ef59e
--- /dev/null
+++ b/src/main/java/com/revature/cmchicken/credit_card/CreditCardDao.java
@@ -0,0 +1,100 @@
+package com.revature.cmchicken.credit_card;
+
+import com.revature.cmchicken.util.HibernateUtil;
+import com.revature.cmchicken.util.interfaces.Crudable;
+import org.hibernate.HibernateException;
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class CreditCardDao implements Crudable {
+
+ @Override
+ public CreditCard create(CreditCard newCreditCard) {
+
+
+ try {
+ Session session = HibernateUtil.getSession();
+ Transaction transaction = session.beginTransaction();
+ session.save(newCreditCard);
+ return newCreditCard;
+
+
+ } catch (HibernateException | IOException e) {
+ e.printStackTrace();
+ return null;
+ } finally {
+ HibernateUtil.closeSession();
+ }
+ }
+
+ @Override
+ public List findAll() throws IOException {
+
+
+ try {
+ Session session = HibernateUtil.getSession();
+ Transaction transaction = session.beginTransaction();
+ ArrayList creditCard = (ArrayList) session.createQuery("FROM CreditCard").list();
+ return creditCard;
+ } catch (HibernateException | IOException e) {
+ e.printStackTrace();
+ return null;
+ } finally {
+ HibernateUtil.closeSession();
+ }
+ }
+
+ @Override
+ public CreditCard findById(String user_name) {
+
+
+ try {
+ Session session = HibernateUtil.getSession();
+ Transaction transaction = session.beginTransaction();
+ CreditCard credit = session.get(CreditCard.class,user_name );
+ return credit;
+ }catch (HibernateException | IOException e) {
+ e.printStackTrace();
+ return null;
+ }finally {
+ HibernateUtil.closeSession();
+ }
+ }
+
+ @Override
+ public boolean update(CreditCard updatedCreditCard) {
+ try {
+ Session session = HibernateUtil.getSession();
+ Transaction transaction = session.beginTransaction();
+ session.merge(updatedCreditCard);
+ transaction.commit();
+ return true;
+ } catch (HibernateException | IOException e) {
+ e.printStackTrace();
+ return false;
+ } finally {
+ HibernateUtil.closeSession();
+ }
+ }
+
+ @Override
+ public boolean delete(String user_name) {
+
+ try {
+ Session session = HibernateUtil.getSession();
+ Transaction transaction = session.beginTransaction();
+ session.remove(user_name);
+ transaction.commit();
+ return true;
+ } catch (HibernateException | IOException e) {
+ e.printStackTrace();
+ return false;
+ } finally {
+ HibernateUtil.closeSession();
+ }
+ }
+}
diff --git a/src/main/java/com/revature/cmchicken/credit_card/CreditCardServices.java b/src/main/java/com/revature/cmchicken/credit_card/CreditCardServices.java
new file mode 100644
index 0000000..a2d90a7
--- /dev/null
+++ b/src/main/java/com/revature/cmchicken/credit_card/CreditCardServices.java
@@ -0,0 +1,81 @@
+package com.revature.cmchicken.credit_card;
+
+import com.revature.cmchicken.util.exceptions.InvalidRequestException;
+import com.revature.cmchicken.util.exceptions.ResourcePersistenceException;
+import com.revature.cmchicken.util.interfaces.Serviceable;
+import com.revature.cmchicken.util.logging.Logger;
+
+import java.io.IOException;
+import java.util.List;
+
+public class CreditCardServices implements Serviceable {
+
+ private CreditCardDao creditCardDao;
+ private Logger logger = Logger.getLogger();
+ public CreditCardServices(CreditCardDao creditCardDao) {this.creditCardDao = creditCardDao; }
+
+
+ @Override
+ public CreditCard create(CreditCard newCreditCard) {
+ if (!validateCreditCard (newCreditCard)){
+ throw new InvalidRequestException("Credit card input was not validated, either empty Strings or null values");
+ }
+ CreditCard persistedCreditCard = creditCardDao.create(newCreditCard);
+ if(persistedCreditCard == null){
+ throw new ResourcePersistenceException("Credit card was not persisted to the database");
+ }
+ return newCreditCard;
+ }
+
+ @Override
+ public List readAll() throws IOException {
+ List creditCard = creditCardDao.findAll();
+ return creditCard;
+ }
+
+ @Override
+ public CreditCard readById(String user_name) {
+ CreditCard creditCard = creditCardDao.findById(user_name);
+ return creditCard;
+ }
+
+ @Override
+ public CreditCard update(CreditCard updatedCreditCard) {
+ if(!creditCardDao.update((updatedCreditCard))){
+ return null;
+ }
+ return updatedCreditCard;
+
+ }
+
+ @Override
+ public boolean delete(String creditCard ) {
+ return creditCardDao.delete(creditCard);
+ }
+
+ @Override
+ public boolean validateInput(CreditCard object) {
+ return false;
+ }
+
+ private boolean validateCreditCard(CreditCard newCreditCard) {
+ if(newCreditCard == null ) return false;
+ if(newCreditCard.getCc_number() == null || newCreditCard.getCc_number().trim().equals((""))) return false;
+ if (newCreditCard.getCc_name() == null || newCreditCard.getCc_name().trim().equals(("")))return false;
+ if (newCreditCard.getCvv() == 0) return false;
+ if (newCreditCard.getExp_date() == null || newCreditCard.getExp_date().trim().equals(("")))return false;
+ if (newCreditCard.getZip() == 0) return false;
+ if (newCreditCard.getLimit() == 0) return false;
+ if (newCreditCard.getUser_name() == null || newCreditCard.getUser_name().trim().equals(("")))return false;
+
+ return true;
+ }
+
+ public CreditCard CreateCreditCard(CreditCard newCreditCard) {
+ return newCreditCard;
+ }
+
+ public CreditCard readByID(String creditCard) {
+ return null;
+ }
+}
diff --git a/src/main/java/com/revature/cmchicken/credit_card/CreditCardServlets.java b/src/main/java/com/revature/cmchicken/credit_card/CreditCardServlets.java
new file mode 100644
index 0000000..4adf9a9
--- /dev/null
+++ b/src/main/java/com/revature/cmchicken/credit_card/CreditCardServlets.java
@@ -0,0 +1,99 @@
+package com.revature.cmchicken.credit_card;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.revature.cmchicken.util.exceptions.ResourcePersistenceException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+public class CreditCardServlets extends HttpServlet {
+
+ private final CreditCardServices creditCardServices;
+ private final ObjectMapper mapper;
+
+ public CreditCardServlets(CreditCardServices creditCardServices, ObjectMapper mapper) {
+ this.creditCardServices = creditCardServices;
+ this.mapper = mapper;
+ }
+
+ @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) {
+ CreditCard creditCard = creditCardServices.readByID(req.getParameter("creditCard"));
+ String payload = mapper.writeValueAsString(creditCard);
+ resp.getWriter().write(payload);
+ return;
+ }
+
+ List creditCardData = creditCardServices.readAll();
+ String payload = mapper.writeValueAsString(creditCardData);
+
+ 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");
+ CreditCard newCreditCard = mapper.readValue(req.getInputStream(), CreditCard.class); // from JSON to Java Object (Pokemon)
+ CreditCard persistedCreditCard = creditCardServices.CreateCreditCard(newCreditCard);
+
+ String payload = mapper.writeValueAsString(persistedCreditCard); // Mapping from Java Object (Pokemon) to JSON
+
+
+
+ resp.getWriter().write("Sample output \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;
+
+ CreditCard creditCardUpdate = mapper.readValue(req.getInputStream(), CreditCard.class);
+ CreditCard updatedCreditCard = creditCardServices.update(creditCardUpdate);
+
+
+ String payload = mapper.writeValueAsString(updatedCreditCard);
+ 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");
+//TODO: implement checkAuth
+ //if(!checkAuth(req, resp)) return;
+ if(req.getParameter("creditCard") == null){
+
+ resp.getWriter().write("Sample output");
+ resp.setStatus(401);
+ return;
+ }
+ String menuItem = req.getParameter("creditCard");
+
+ try {
+ creditCardServices.delete("username");
+ resp.getWriter().write("Delete credit card from the database");
+ } catch (ResourcePersistenceException e){
+ resp.getWriter().write(e.getMessage());
+ resp.setStatus(404);
+ } catch (Exception e){
+ resp.getWriter().write(e.getMessage());
+ resp.setStatus(500);
+ }
+ }
+}
diff --git a/src/main/java/com/revature/cmChicken/customer/Customer.java b/src/main/java/com/revature/cmchicken/customer/Customer.java
similarity index 97%
rename from src/main/java/com/revature/cmChicken/customer/Customer.java
rename to src/main/java/com/revature/cmchicken/customer/Customer.java
index 5b59184..558f3e1 100644
--- a/src/main/java/com/revature/cmChicken/customer/Customer.java
+++ b/src/main/java/com/revature/cmchicken/customer/Customer.java
@@ -1,4 +1,4 @@
-package com.revature.cmChicken.customer;
+package com.revature.cmchicken.customer;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/com/revature/cmChicken/customer/CustomerDao.java b/src/main/java/com/revature/cmchicken/customer/CustomerDao.java
similarity index 96%
rename from src/main/java/com/revature/cmChicken/customer/CustomerDao.java
rename to src/main/java/com/revature/cmchicken/customer/CustomerDao.java
index 25252b2..e93c0b4 100644
--- a/src/main/java/com/revature/cmChicken/customer/CustomerDao.java
+++ b/src/main/java/com/revature/cmchicken/customer/CustomerDao.java
@@ -1,7 +1,7 @@
-package com.revature.cmChicken.customer;
+package com.revature.cmchicken.customer;
-import com.revature.cmChicken.util.HibernateUtil;
-import com.revature.cmChicken.util.interfaces.Crudable;
+import com.revature.cmchicken.util.HibernateUtil;
+import com.revature.cmchicken.util.interfaces.Crudable;
import org.hibernate.HibernateException;
import org.hibernate.query.Query;
diff --git a/src/main/java/com/revature/cmChicken/customer/CustomerService.java b/src/main/java/com/revature/cmchicken/customer/CustomerService.java
similarity index 84%
rename from src/main/java/com/revature/cmChicken/customer/CustomerService.java
rename to src/main/java/com/revature/cmchicken/customer/CustomerService.java
index 3c9bcbe..23cb20d 100644
--- a/src/main/java/com/revature/cmChicken/customer/CustomerService.java
+++ b/src/main/java/com/revature/cmchicken/customer/CustomerService.java
@@ -1,10 +1,10 @@
-package com.revature.cmChicken.customer;
+package com.revature.cmchicken.customer;
-import com.revature.cmChicken.util.exceptions.AuthenticationException;
-import com.revature.cmChicken.util.exceptions.InvalidRequestException;
-import com.revature.cmChicken.util.exceptions.ResourcePersistanceException;
-import com.revature.cmChicken.util.interfaces.Serviceable;
-import com.revature.cmChicken.util.logging.Logger;
+import com.revature.cmchicken.util.exceptions.AuthenticationException;
+import com.revature.cmchicken.util.exceptions.InvalidRequestException;
+import com.revature.cmchicken.util.exceptions.ResourcePersistenceException;
+import com.revature.cmchicken.util.interfaces.Serviceable;
+import com.revature.cmchicken.util.logging.Logger;
import java.util.List;
@@ -15,6 +15,10 @@ public class CustomerService implements Serviceable {
private Logger logger = Logger.getLogger();
+ public CustomerService(CustomerDao customerDao) {
+
+ }
+
public boolean validateUserNameNotUsed(String username){
return customerDao.checkUserName(username);
@@ -32,7 +36,7 @@ public Customer create(Customer newCustomer) {
Customer persistedCustomer = customerDao.create(newCustomer);
if(persistedCustomer == null){
- throw new ResourcePersistanceException("Customer was not persisted to the database upon registration");
+ throw new ResourcePersistenceException("Customer was not persisted to the database upon registration");
}
logger.info("Customer has been peristed: " + newCustomer);
return persistedCustomer;
diff --git a/src/main/java/com/revature/cmChicken/customer/CustomerServlet.java b/src/main/java/com/revature/cmchicken/customer/CustomerServlet.java
similarity index 83%
rename from src/main/java/com/revature/cmChicken/customer/CustomerServlet.java
rename to src/main/java/com/revature/cmchicken/customer/CustomerServlet.java
index 954de41..a8f8b8a 100644
--- a/src/main/java/com/revature/cmChicken/customer/CustomerServlet.java
+++ b/src/main/java/com/revature/cmchicken/customer/CustomerServlet.java
@@ -1,9 +1,9 @@
-package com.revature.cmChicken.customer;
+package com.revature.cmchicken.customer;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.revature.cmChicken.util.interfaces.Authable;
-import com.revature.cmChicken.util.logging.Logger;
+import com.revature.cmchicken.util.interfaces.Authable;
+import com.revature.cmchicken.util.logging.Logger;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -11,13 +11,13 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
-import static com.revature.cmChicken.util.interfaces.Authable.checkAuth;
+import static com.revature.cmchicken.util.interfaces.Authable.checkAuth;
public class CustomerServlet extends HttpServlet implements Authable {
private final CustomerService customerService;
private final ObjectMapper mapper;
- private final Logger logger = logger.getLogger();
+ // private final Logger logger = logger.getLogger();
public CustomerServlet(CustomerService customerService, ObjectMapper mapper){
this.customerService = customerService;
diff --git a/src/main/java/com/revature/cmchicken/menu/Menu.java b/src/main/java/com/revature/cmchicken/menu/Menu.java
new file mode 100644
index 0000000..90aafb3
--- /dev/null
+++ b/src/main/java/com/revature/cmchicken/menu/Menu.java
@@ -0,0 +1,54 @@
+package com.revature.cmchicken.menu;
+
+public class Menu {
+ private String item_name;
+ private int cost;
+ private String protein;
+ private boolean is_substitutable;
+
+
+ public Menu() {
+ }
+
+ @Override
+ public String toString() {
+ return "Menu{" +
+ "item_name='" + item_name + '\'' +
+ ", cost=" + cost +
+ ", protein=" + protein +
+ ", is_substitutable=" + is_substitutable +
+ '}';
+ }
+
+ public String getItem_name() {
+ return item_name;
+ }
+
+ public void setItem_name(String item_name) {
+ this.item_name = item_name;
+ }
+
+ public int getCost() {
+ return cost;
+ }
+
+ public void setCost(int cost) {
+ this.cost = cost;
+ }
+
+ public String getProtein() {
+ return protein;
+ }
+
+ public void setProtein(String protein) {
+ this.protein = protein;
+ }
+
+ public boolean getIs_substitutable() {
+ return is_substitutable;
+ }
+
+ public void setIs_substitutable(boolean is_substitutable) {
+ this.is_substitutable = is_substitutable;
+ }
+}
diff --git a/src/main/java/com/revature/cmchicken/menu/MenuDao.java b/src/main/java/com/revature/cmchicken/menu/MenuDao.java
new file mode 100644
index 0000000..5ae3edf
--- /dev/null
+++ b/src/main/java/com/revature/cmchicken/menu/MenuDao.java
@@ -0,0 +1,99 @@
+package com.revature.cmchicken.menu;
+
+import com.revature.cmchicken.util.HibernateUtil;
+import com.revature.cmchicken.util.interfaces.Crudable;
+import org.hibernate.HibernateException;
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+
+import java.io.IOException;
+import java.util.List;
+
+public class MenuDao implements Crudable