Merge https://github.com/BikJeun/OOTDFood

BikJeun · Apr 17, 2021 · 39e3042 · 39e3042
2 parents 1ce9269 + d9e8a60
commit 39e3042
Show file tree

Hide file tree

Showing 74 changed files with 129 additions and 104 deletions.
diff --git a/OTFood-ejb/nbproject/project.properties b/OTFood-ejb/nbproject/project.properties
@@ -25,7 +25,7 @@ j2ee.compile.on.save=true
 j2ee.deploy.on.save=true
 j2ee.platform=1.8
 j2ee.platform.classpath=${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/endorsed/grizzly-npn-bootstrap.jar:${j2ee.server.home}/modules/endorsed/jakarta.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jakarta.xml.bind-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
-j2ee.platform.classpath=${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/endorsed/grizzly-npn-bootstrap.jar:${j2ee.server.home}/modules/endorsed/jakarta.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jakarta.xml.bind-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
+j2ee.platform.classpath=
 j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
 j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
 j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar

diff --git a/OTFood-ejb/src/java/ejb/session/stateless/CreditCardEntitySessionBean.java b/OTFood-ejb/src/java/ejb/session/stateless/CreditCardEntitySessionBean.java
@@ -31,7 +31,7 @@
 
 /**
  *
- * @author Mitsuki
+ * @author Ong Bik Jeun
  */
 @Stateless
 public class CreditCardEntitySessionBean implements CreditCardEntitySessionBeanLocal {

diff --git a/OTFood-ejb/src/java/ejb/session/stateless/CreditCardEntitySessionBeanLocal.java b/OTFood-ejb/src/java/ejb/session/stateless/CreditCardEntitySessionBeanLocal.java
@@ -17,7 +17,7 @@
 
 /**
  *
- * @author Mitsuki
+ * @author Ong Bik Jeun
  */
 @Local
 public interface CreditCardEntitySessionBeanLocal {

diff --git a/OTFood-ejb/src/java/ejb/session/stateless/FaqSessionBean.java b/OTFood-ejb/src/java/ejb/session/stateless/FaqSessionBean.java
@@ -19,7 +19,7 @@
 
 /**
  *
- * @author Mitsuki
+ * @author Ong Bik Jeun
  */
 @Stateless
 public class FaqSessionBean implements FaqSessionBeanLocal {

diff --git a/OTFood-ejb/src/java/ejb/session/stateless/FaqSessionBeanLocal.java b/OTFood-ejb/src/java/ejb/session/stateless/FaqSessionBeanLocal.java
@@ -14,7 +14,7 @@
 
 /**
  *
- * @author Mitsuki
+ * @author Ong Bik Jeun
  */
 @Local
 public interface FaqSessionBeanLocal {

diff --git a/OTFood-ejb/src/java/ejb/session/stateless/MealEntitySessionBeanLocal.java b/OTFood-ejb/src/java/ejb/session/stateless/MealEntitySessionBeanLocal.java
@@ -27,7 +27,7 @@ public interface MealEntitySessionBeanLocal {
 
     public MealEntity retrieveMealById(Long mealId) throws MealNotFoundException;
 
-   public Long createNewMeal(MealEntity meal) throws InputDataValidationException, UnknownPersistenceException, MealExistsException;
+    public Long createNewMeal(MealEntity meal) throws InputDataValidationException, UnknownPersistenceException, MealExistsException;
 
     public List<MealEntity> retrieveTop5MealEntityByRating();
 

diff --git a/OTFood-ejb/src/java/ejb/session/stateless/OTUserEntitySessionBean.java b/OTFood-ejb/src/java/ejb/session/stateless/OTUserEntitySessionBean.java
@@ -29,7 +29,7 @@
 
 /**
  *
- * @author Mitsuki
+ * @author Ong Bik Jeun
  */
 @Stateless
 public class OTUserEntitySessionBean implements OTUserEntitySessionBeanLocal {

diff --git a/OTFood-ejb/src/java/ejb/session/stateless/OTUserEntitySessionBeanLocal.java b/OTFood-ejb/src/java/ejb/session/stateless/OTUserEntitySessionBeanLocal.java
@@ -17,7 +17,7 @@
 
 /**
  *
- * @author Mitsuki
+ * @author Ong Bik Jeun
  */
 @Local
 public interface OTUserEntitySessionBeanLocal {

diff --git a/OTFood-ejb/src/java/ejb/session/stateless/PromoSessionBean.java b/OTFood-ejb/src/java/ejb/session/stateless/PromoSessionBean.java
@@ -30,7 +30,7 @@
 
 /**
  *
- * @author Mitsuki
+ * @author Ong Bik Jeun
  */
 @Stateless
 public class PromoSessionBean implements PromoSessionBeanLocal {

diff --git a/OTFood-ejb/src/java/ejb/session/stateless/PromoSessionBeanLocal.java b/OTFood-ejb/src/java/ejb/session/stateless/PromoSessionBeanLocal.java
@@ -15,7 +15,7 @@
 
 /**
  *
- * @author Mitsuki
+ * @author Ong Bik Jeun
  */
 @Local
 public interface PromoSessionBeanLocal {

diff --git a/OTFood-ejb/src/java/ejb/session/stateless/StaffEntitySessionBean.java b/OTFood-ejb/src/java/ejb/session/stateless/StaffEntitySessionBean.java
@@ -29,7 +29,7 @@
 
 /**
  *
- * @author Mitsuki
+ * @author Ong Bik Jeun
  */
 @Stateless
 public class StaffEntitySessionBean implements StaffEntitySessionBeanLocal {
@@ -107,14 +107,14 @@ public StaffEntity staffLogin(String username, String password) throws InvalidLo
         try {
             StaffEntity staff = retrieveStaffByUsername(username);
             String passwordHash = CryptographicHelper.getInstance().byteArrayToHexString(CryptographicHelper.getInstance().doMD5Hashing(password + staff.getSalt()));
-
+            System.out.println(passwordHash);
             if (staff.getPassword().equals(passwordHash)) {
                 return staff;
             } else {
                 throw new InvalidLoginCredentialException("Username does not exist or invalid password");
             }
         } catch (StaffNotFoundException ex) {
-            throw new InvalidLoginCredentialException("Username does not exist or invalid password");
+            throw new InvalidLoginCredentialException("Staff not found: " + ex.getMessage());
         }
     }
 
@@ -130,7 +130,7 @@ public void updateStaff(StaffEntity staff) throws StaffNotFoundException, Update
                 if (staffToUpdate.getUsername().equals(staff.getUsername())) {
                     staffToUpdate.setFirstname(staff.getFirstname());
                     staffToUpdate.setLastName(staff.getLastName());
-                    staffToUpdate.setType(staff.getType());                
+                    staffToUpdate.setType(staff.getType());
                 } else {
                     throw new UpdateStaffException("Username of staff to be updated does not match exiting records");
                 }

diff --git a/OTFood-ejb/src/java/ejb/session/stateless/StaffEntitySessionBeanLocal.java b/OTFood-ejb/src/java/ejb/session/stateless/StaffEntitySessionBeanLocal.java
@@ -17,7 +17,7 @@
 
 /**
  *
- * @author Mitsuki
+ * @author Ong Bik Jeun
  */
 @Local
 public interface StaffEntitySessionBeanLocal {

diff --git a/OTFood-ejb/src/java/entity/FaqEntity.java b/OTFood-ejb/src/java/entity/FaqEntity.java
@@ -15,7 +15,7 @@
 
 /**
  *
- * @author Mitsuki
+ * @author Ong Bik Jeun
  */
 @Entity
 public class FaqEntity implements Serializable {

diff --git a/OTFood-ejb/src/java/util/exception/CardCreationException.java b/OTFood-ejb/src/java/util/exception/CardCreationException.java
@@ -7,7 +7,7 @@
 
 /**
  *
- * @author Mitsuki
+ * @author Ong Bik Jeun
  */
 public class CardCreationException extends Exception {
 

diff --git a/OTFood-ejb/src/java/util/exception/CreditCardExistException.java b/OTFood-ejb/src/java/util/exception/CreditCardExistException.java
@@ -7,7 +7,7 @@
 
 /**
  *
- * @author Mitsuki
+ * @author Ong Bik Jeun
  */
 public class CreditCardExistException extends Exception {
 

diff --git a/OTFood-ejb/src/java/util/exception/CreditCardNotFoundException.java b/OTFood-ejb/src/java/util/exception/CreditCardNotFoundException.java
@@ -7,7 +7,7 @@
 
 /**
  *
- * @author Mitsuki
+ * @author Ong Bik Jeun
  */
 public class CreditCardNotFoundException extends Exception {
 

diff --git a/OTFood-ejb/src/java/util/exception/FaqExistException.java b/OTFood-ejb/src/java/util/exception/FaqExistException.java
@@ -7,7 +7,7 @@
 
 /**
  *
- * @author Mitsuki
+ * @author Ong Bik Jeun
  */
 public class FaqExistException extends Exception {
 

diff --git a/OTFood-ejb/src/java/util/exception/InputDataValidationException.java b/OTFood-ejb/src/java/util/exception/InputDataValidationException.java
@@ -7,7 +7,7 @@
 
 /**
  *
- * @author Mitsuki
+ * @author Ong Bik Jeun
  */
 public class InputDataValidationException extends Exception {
 

diff --git a/OTFood-ejb/src/java/util/exception/InvalidLoginCredentialException.java b/OTFood-ejb/src/java/util/exception/InvalidLoginCredentialException.java
@@ -7,7 +7,7 @@
 
 /**
  *
- * @author Mitsuki
+ * @author Ong Bik Jeun
  */
 public class InvalidLoginCredentialException extends Exception {
 

diff --git a/OTFood-ejb/src/java/util/exception/PromoCodeExistException.java b/OTFood-ejb/src/java/util/exception/PromoCodeExistException.java
@@ -7,7 +7,7 @@
 
 /**
  *
- * @author Mitsuki
+ * @author Ong Bik Jeun
  */
 public class PromoCodeExistException extends Exception {
 

diff --git a/OTFood-ejb/src/java/util/exception/PromotionNotFoundException.java b/OTFood-ejb/src/java/util/exception/PromotionNotFoundException.java
@@ -7,7 +7,7 @@
 
 /**
  *
- * @author Mitsuki
+ * @author Ong Bik Jeun
  */
 public class PromotionNotFoundException extends Exception {
 

diff --git a/OTFood-ejb/src/java/util/exception/StaffNotFoundException.java b/OTFood-ejb/src/java/util/exception/StaffNotFoundException.java
@@ -7,7 +7,7 @@
 
 /**
  *
- * @author Mitsuki
+ * @author Ong Bik Jeun
  */
 public class StaffNotFoundException extends Exception {
 

diff --git a/OTFood-ejb/src/java/util/exception/StaffUsernameExistException.java b/OTFood-ejb/src/java/util/exception/StaffUsernameExistException.java
@@ -7,7 +7,7 @@
 
 /**
  *
- * @author Mitsuki
+ * @author Ong Bik Jeun
  */
 public class StaffUsernameExistException extends Exception {
 

diff --git a/OTFood-ejb/src/java/util/exception/UnknownPersistenceException.java b/OTFood-ejb/src/java/util/exception/UnknownPersistenceException.java
@@ -7,7 +7,7 @@
 
 /**
  *
- * @author Mitsuki
+ * @author Ong Bik Jeun
  */
 public class UnknownPersistenceException extends Exception {
 

diff --git a/OTFood-ejb/src/java/util/exception/UpdateDriverException.java b/OTFood-ejb/src/java/util/exception/UpdateDriverException.java
@@ -7,7 +7,7 @@
 
 /**
  *
- * @author Mitsuki
+ * @author Ong Bik Jeun
  */
 public class UpdateDriverException extends Exception {
 

diff --git a/OTFood-ejb/src/java/util/exception/UpdateIngredientException.java b/OTFood-ejb/src/java/util/exception/UpdateIngredientException.java
@@ -7,7 +7,7 @@
 
 /**
  *
- * @author Mitsuki
+ * @author Ong Bik Jeun
  */
 public class UpdateIngredientException extends Exception {
 

diff --git a/OTFood-ejb/src/java/util/exception/UpdateStaffException.java b/OTFood-ejb/src/java/util/exception/UpdateStaffException.java
@@ -7,7 +7,7 @@
 
 /**
  *
- * @author Mitsuki
+ * @author Ong Bik Jeun
  */
 public class UpdateStaffException extends Exception {
 

diff --git a/OTFood-ejb/src/java/util/exception/UpdateUserException.java b/OTFood-ejb/src/java/util/exception/UpdateUserException.java
@@ -7,7 +7,7 @@
 
 /**
  *
- * @author Mitsuki
+ * @author Ong Bik Jeun
  */
 public class UpdateUserException extends Exception {
 

diff --git a/OTFood-ejb/src/java/util/exception/UserExistException.java b/OTFood-ejb/src/java/util/exception/UserExistException.java
@@ -7,7 +7,7 @@
 
 /**
  *
- * @author Mitsuki
+ * @author Ong Bik Jeun
  */
 public class UserExistException extends Exception {
 

diff --git a/OTFood-ejb/src/java/util/exception/UserNotFoundException.java b/OTFood-ejb/src/java/util/exception/UserNotFoundException.java
@@ -7,7 +7,7 @@
 
 /**
  *
- * @author Mitsuki
+ * @author Ong Bik Jeun
  */
 public class UserNotFoundException extends Exception {
 

diff --git a/OTFood-war/src/java/jsf/managedbean/FaqManagedBean.java b/OTFood-war/src/java/jsf/managedbean/FaqManagedBean.java
@@ -16,7 +16,7 @@
 
 /**
  *
- * @author Mitsuki
+ * @author Ong Bik Jeun
  */
 @Named(value = "faqManagedBean")
 @RequestScoped

diff --git a/OTFood-war/src/java/jsf/managedbean/FooterManagedBean.java b/OTFood-war/src/java/jsf/managedbean/FooterManagedBean.java
@@ -13,7 +13,7 @@
 
 /**
  *
- * @author Mitsuki
+ * @author Ong Bik Jeun
  */
 @Named(value = "footerManagedBean")
 @RequestScoped

diff --git a/OTFood-war/src/java/jsf/managedbean/IndexManagedBean.java b/OTFood-war/src/java/jsf/managedbean/IndexManagedBean.java
@@ -10,12 +10,15 @@
 import ejb.session.stateless.ReviewEntitySessionBeanLocal;
 import entity.MealEntity;
 import entity.ReviewEntity;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.PostConstruct;
 import javax.ejb.EJB;
 import javax.inject.Named;
 import javax.enterprise.context.RequestScoped;
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
 
 /**
  *
@@ -30,25 +33,29 @@ public class IndexManagedBean {
 
     @EJB(name = "MealEntitySessionBeanLocal")
     private MealEntitySessionBeanLocal mealEntitySessionBeanLocal;
-      
+
     private List<MealEntity> top5Meals;
     private List<ReviewEntity> latestReviews;
     private List<RankingMeal> mealsWithRank;
-   
+
     public IndexManagedBean() {
         mealsWithRank = new ArrayList<>();
         top5Meals = new ArrayList<>();
         mealsWithRank = new ArrayList<>();
     }
-    
+
     @PostConstruct
     public void postConstruct() {
         top5Meals = mealEntitySessionBeanLocal.retrieveTop5MealEntityByRating();
         latestReviews = reviewEntitySessionBeanLocal.retrieveLatestReviews();
         for (int i = 0; i < top5Meals.size(); i++) {
-            mealsWithRank.add(new RankingMeal(top5Meals.get(i), i+1));
+            mealsWithRank.add(new RankingMeal(top5Meals.get(i), i + 1));
         }
-
+
+    }
+
+    public void redirectToBentoPage(ActionEvent event) throws IOException {
+        FacesContext.getCurrentInstance().getExternalContext().redirect(FacesContext.getCurrentInstance().getExternalContext().getRequestContextPath() + "/userPages/bento.xhtml");
     }
 
     public List<MealEntity> getTop5Meals() {
@@ -73,6 +80,6 @@ public List<ReviewEntity> getLatestReviews() {
 
     public void setLatestReviews(List<ReviewEntity> latestReviews) {
         this.latestReviews = latestReviews;
-    }  
-        
-}
+    }
+
+}
diff --git a/OTFood-war/src/java/jsf/managedbean/LoginManagedBean.java b/OTFood-war/src/java/jsf/managedbean/LoginManagedBean.java
@@ -23,7 +23,7 @@
 
 /**
  *
- * @author Mitsuki
+ * @author Ong Bik Jeun
  */
 @Named(value = "loginManagedBean")
 @RequestScoped
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,7 @@ @@
     /**
      *
-     * @author Mitsuki
+     * @author Ong Bik Jeun
      */
     @Local
     public interface CreditCardEntitySessionBeanLocal {
@@ Expand Down @@