Get the basket bean directly from session scope

[pizzaservice-war.git] / src / java / org / mxchange / pizzaapplication / filter / servlet / basket / BasketItemAddedFilter.java

diff --git a/src/java/org/mxchange/pizzaapplication/filter/servlet/basket/BasketItemAddedFilter.java b/src/java/org/mxchange/pizzaapplication/filter/servlet/basket/BasketItemAddedFilter.java
index 13209def9bcf44f1a7803cd929c1dc03a53616b6..66089c88c7a743bcc878954ad92cdbd7bad04f41 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/filter/servlet/basket/BasketItemAddedFilter.java
+++ b/src/java/org/mxchange/pizzaapplication/filter/servlet/basket/BasketItemAddedFilter.java
@@ -26,12 +26,12 @@ import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import org.mxchange.jcore.exceptions.BadTokenException;
 import org.mxchange.jcore.exceptions.CorruptedDatabaseFileException;
 import org.mxchange.jshop.beans.basket.BasketBean;
 import org.mxchange.jshop.item.AddableBasketItem;
-import org.mxchange.pizzaapplication.beans.controller.PizzaBean;
 import org.mxchange.pizzaapplication.filter.servlet.BaseServletFilter;
 
 /**
@@ -71,10 +71,10 @@ public class BasketItemAddedFilter extends BaseServletFilter implements Filter {
                // item should not be null
                if (null == object) {
                        // item is null
-                       throw new NullPointerException("item is null"); //NOI18N
+                       throw new NullPointerException("object is null"); //NOI18N
                } else if (!(object instanceof AddableBasketItem)) {
                        // Not right instance
-                       throw new IllegalArgumentException("item does not implement AddableBasketItem"); //NOI18N
+                       throw new IllegalArgumentException("object does not implement AddableBasketItem"); //NOI18N
                }
 
                // Now it is secure to cast
@@ -83,11 +83,12 @@ public class BasketItemAddedFilter extends BaseServletFilter implements Filter {
                // Debug message
                this.getLogger().debug(MessageFormat.format("item.id={0},item.itemId={1},item.itemType={2},item.amount={3}", item.getId(), item.getItemId(), item.getItemType(), item.getAmount())); //NOI18N
 
-               // Init instance
-               BasketBean basket;
                try {
+                       // Cast to servlet request
+                       HttpServletRequest servletRequest = (HttpServletRequest) request;
+
                        // Get session instance
-                       HttpSession session = ((HttpServletRequest) request).getSession();
+                       HttpSession session = servletRequest.getSession();
 
                        // Debug message
                        this.getLogger().debug(MessageFormat.format("session={0}", session)); //NOI18N
@@ -98,17 +99,11 @@ public class BasketItemAddedFilter extends BaseServletFilter implements Filter {
                                throw new NullPointerException("session is null"); //NOI18N
                        }
 
-                       // Get man controller
-                       PizzaBean bean = (PizzaBean) session.getAttribute("controller"); //NOI18N
-
-                       // Debug message
-                       this.getLogger().debug("bean=" + bean);
-
                        // Get basket instance
-                       basket = bean.getBasket();
+                       BasketBean basket = (BasketBean) session.getAttribute("basket"); //NOI18N
 
                        // Debug message
-                       this.getLogger().debug("basket=" + basket);
+                       this.getLogger().debug(MessageFormat.format("basket={0}", basket)); //NOI18N
 
                        // Is the item already added?
                        if (item.getItemId() == null) {
@@ -119,7 +114,7 @@ public class BasketItemAddedFilter extends BaseServletFilter implements Filter {
                                throw new NullPointerException(MessageFormat.format("item type of item={0} is null", item)); //NOI18N
                        } else if ((item.getAmount() == null) || (item.getAmount() == 0)) {
                                // Debug message
-                               this.getLogger().debug(MessageFormat.format("Amount for item {0} is null", item)); //NOI18N
+                               this.getLogger().debug(MessageFormat.format("Amount for item {0} is null - EXIT!", item)); //NOI18N
 
                                // Amount is not entered
                                return;
@@ -130,6 +125,15 @@ public class BasketItemAddedFilter extends BaseServletFilter implements Filter {
 
                        // Register item with it
                        basket.addItem(item);
+
+                       // Is amount null or zero?
+                       if ((item.getAmount() == null) || (item.getAmount() == 0)) {
+                               // Then redirect to added=0
+                               ((HttpServletResponse) response).sendRedirect(servletRequest.getContextPath() + "/?add=0"); //NOI18N
+                       } else {
+                               // Redirect to proper URL
+                               ((HttpServletResponse) response).sendRedirect(servletRequest.getContextPath() + "/?add=1"); //NOI18N
+                       }
                } catch (final SQLException | BadTokenException | CorruptedDatabaseFileException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) {
                        // Continue to throw
                        throw new ServletException(ex);