diff --git a/JtProject/src/main/java/com/jtspringproject/JtSpringProject/HibernateConfiguration.java b/JtProject/src/main/java/com/jtspringproject/JtSpringProject/HibernateConfiguration.java index 1da3d1ed..e3e7cf04 100644 --- a/JtProject/src/main/java/com/jtspringproject/JtSpringProject/HibernateConfiguration.java +++ b/JtProject/src/main/java/com/jtspringproject/JtSpringProject/HibernateConfiguration.java @@ -1,9 +1,9 @@ package com.jtspringproject.JtSpringProject; - + import java.util.Properties; - + import javax.sql.DataSource; - + import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -11,34 +11,34 @@ import org.springframework.orm.hibernate5.HibernateTransactionManager; import org.springframework.orm.hibernate5.LocalSessionFactoryBean; import org.springframework.transaction.annotation.EnableTransactionManagement; - + @Configuration @EnableTransactionManagement public class HibernateConfiguration { @Value("${db.driver}") private String DRIVER; - + @Value("${db.password}") private String PASSWORD; - + @Value("${db.url}") private String URL; - + @Value("${db.username}") private String USERNAME; - + @Value("${hibernate.dialect}") private String DIALECT; - + @Value("${hibernate.show_sql}") private String SHOW_SQL; - + @Value("${hibernate.hbm2ddl.auto}") private String HBM2DDL_AUTO; - + @Value("${entitymanager.packagesToScan}") private String PACKAGES_TO_SCAN; - + @Bean public DataSource dataSource() { DriverManagerDataSource dataSource = new DriverManagerDataSource(); @@ -48,7 +48,7 @@ public DataSource dataSource() { dataSource.setPassword(PASSWORD); return dataSource; } - + @Bean public LocalSessionFactoryBean sessionFactory() { LocalSessionFactoryBean sessionFactory = new LocalSessionFactoryBean(); @@ -59,14 +59,14 @@ public LocalSessionFactoryBean sessionFactory() { hibernateProperties.put("hibernate.show_sql", SHOW_SQL); hibernateProperties.put("hibernate.hbm2ddl.auto", HBM2DDL_AUTO); sessionFactory.setHibernateProperties(hibernateProperties); - + return sessionFactory; } - + @Bean public HibernateTransactionManager transactionManager() { HibernateTransactionManager transactionManager = new HibernateTransactionManager(); transactionManager.setSessionFactory(sessionFactory().getObject()); return transactionManager; - } + } } diff --git a/JtProject/src/main/java/com/jtspringproject/JtSpringProject/JtSpringProjectApplication.java b/JtProject/src/main/java/com/jtspringproject/JtSpringProject/JtSpringProjectApplication.java index b2cf8716..9a54dc21 100644 --- a/JtProject/src/main/java/com/jtspringproject/JtSpringProject/JtSpringProjectApplication.java +++ b/JtProject/src/main/java/com/jtspringproject/JtSpringProject/JtSpringProjectApplication.java @@ -7,8 +7,8 @@ @SpringBootApplication(exclude = HibernateJpaAutoConfiguration.class) public class JtSpringProjectApplication { - public static void main(String[] args) { - SpringApplication.run(JtSpringProjectApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(JtSpringProjectApplication.class, args); + } } diff --git a/JtProject/src/main/java/com/jtspringproject/JtSpringProject/controller/AdminController.java b/JtProject/src/main/java/com/jtspringproject/JtSpringProject/controller/AdminController.java index 825bee35..e5bca7b2 100644 --- a/JtProject/src/main/java/com/jtspringproject/JtSpringProject/controller/AdminController.java +++ b/JtProject/src/main/java/com/jtspringproject/JtSpringProject/controller/AdminController.java @@ -27,263 +27,249 @@ @Controller @RequestMapping("/admin") public class AdminController { - - @Autowired - private userService userService; - @Autowired - private categoryService categoryService; - - @Autowired - private productService productService; - - int adminlogcheck = 0; - String usernameforclass = ""; - @RequestMapping(value = {"/","/logout"}) - public String returnIndex() { - adminlogcheck =0; - usernameforclass = ""; - return "userLogin"; - } - - - - @GetMapping("/index") - public String index(Model model) { - if(usernameforclass.equalsIgnoreCase("")) - return "userLogin"; - else { - model.addAttribute("username", usernameforclass); - return "index"; - } - - } - - - @GetMapping("login") - public String adminlogin() { - - return "adminlogin"; - } - @GetMapping("Dashboard") - public String adminHome(Model model) { - if(adminlogcheck==1) - return "adminHome"; - else - return "redirect:/admin/login"; - } - @GetMapping("/loginvalidate") - public String adminlog(Model model) { - - return "adminlogin"; - } - @RequestMapping(value = "loginvalidate", method = RequestMethod.POST) - public ModelAndView adminlogin( @RequestParam("username") String username, @RequestParam("password") String pass) { - - User user=this.userService.checkLogin(username, pass); - - if(user.getRole() != null && user.getRole().equals("ROLE_ADMIN")) { - ModelAndView mv = new ModelAndView("adminHome"); - adminlogcheck=1; - mv.addObject("admin", user); - return mv; - } - else { - ModelAndView mv = new ModelAndView("adminlogin"); - mv.addObject("msg", "Please enter correct username and password"); - return mv; - } - } - @GetMapping("categories") - public ModelAndView getcategory() { - if(adminlogcheck==0){ - ModelAndView mView = new ModelAndView("adminlogin"); - return mView; - } - else { - ModelAndView mView = new ModelAndView("categories"); - List categories = this.categoryService.getCategories(); - mView.addObject("categories", categories); - return mView; - } - } - @RequestMapping(value = "categories",method = RequestMethod.POST) - public String addCategory(@RequestParam("categoryname") String category_name) - { - System.out.println(category_name); - - Category category = this.categoryService.addCategory(category_name); - if(category.getName().equals(category_name)) { - return "redirect:categories"; - }else { - return "redirect:categories"; - } - } - - @GetMapping("categories/delete") - public ModelAndView removeCategoryDb(@RequestParam("id") int id) - { - this.categoryService.deleteCategory(id); - ModelAndView mView = new ModelAndView("forward:/categories"); - return mView; - } - - @GetMapping("categories/update") - public String updateCategory(@RequestParam("categoryid") int id, @RequestParam("categoryname") String categoryname) - { - Category category = this.categoryService.updateCategory(id, categoryname); - return "redirect:/admin/categories"; - } - - -// --------------------------Remaining -------------------- - @GetMapping("products") - public ModelAndView getproduct() { - if(adminlogcheck==0){ - ModelAndView mView = new ModelAndView("adminlogin"); - return mView; - } - else { - ModelAndView mView = new ModelAndView("products"); - - List products = this.productService.getProducts(); - - if (products.isEmpty()) { - mView.addObject("msg", "No products are available"); - } else { - mView.addObject("products", products); - } - return mView; - } - - } - @GetMapping("products/add") - public ModelAndView addProduct() { - ModelAndView mView = new ModelAndView("productsAdd"); - List categories = this.categoryService.getCategories(); - mView.addObject("categories",categories); - return mView; - } - - @RequestMapping(value = "products/add",method=RequestMethod.POST) - public String addProduct(@RequestParam("name") String name,@RequestParam("categoryid") int categoryId ,@RequestParam("price") int price,@RequestParam("weight") int weight, @RequestParam("quantity")int quantity,@RequestParam("description") String description,@RequestParam("productImage") String productImage) { - System.out.println(categoryId); - Category category = this.categoryService.getCategory(categoryId); - Product product = new Product(); - product.setId(categoryId); - product.setName(name); - product.setCategory(category); - product.setDescription(description); - product.setPrice(price); - product.setImage(productImage); - product.setWeight(weight); - product.setQuantity(quantity); - this.productService.addProduct(product); - return "redirect:/admin/products"; - } - - @GetMapping("products/update/{id}") - public ModelAndView updateproduct(@PathVariable("id") int id) { - - ModelAndView mView = new ModelAndView("productsUpdate"); - Product product = this.productService.getProduct(id); - List categories = this.categoryService.getCategories(); - - mView.addObject("categories",categories); - mView.addObject("product", product); - return mView; - } - - @RequestMapping(value = "products/update/{id}",method=RequestMethod.POST) - public String updateProduct(@PathVariable("id") int id ,@RequestParam("name") String name,@RequestParam("categoryid") int categoryId ,@RequestParam("price") int price,@RequestParam("weight") int weight, @RequestParam("quantity")int quantity,@RequestParam("description") String description,@RequestParam("productImage") String productImage) - { + + int adminlogcheck = 0; + String usernameforclass = ""; + @Autowired + private userService userService; + @Autowired + private categoryService categoryService; + @Autowired + private productService productService; + + @RequestMapping(value = {"/", "/logout"}) + public String returnIndex() { + adminlogcheck = 0; + usernameforclass = ""; + return "userLogin"; + } + + + @GetMapping("/index") + public String index(Model model) { + if (usernameforclass.equalsIgnoreCase("")) + return "userLogin"; + else { + model.addAttribute("username", usernameforclass); + return "index"; + } + + } + + + @GetMapping("login") + public String adminlogin() { + + return "adminlogin"; + } + + @GetMapping("Dashboard") + public String adminHome(Model model) { + if (adminlogcheck == 1) + return "adminHome"; + else + return "redirect:/admin/login"; + } + + @GetMapping("/loginvalidate") + public String adminlog(Model model) { + + return "adminlogin"; + } + + @RequestMapping(value = "loginvalidate", method = RequestMethod.POST) + public ModelAndView adminlogin(@RequestParam("username") String username, @RequestParam("password") String pass) { + + User user = this.userService.checkLogin(username, pass); + + if (user.getRole() != null && user.getRole().equals("ROLE_ADMIN")) { + ModelAndView mv = new ModelAndView("adminHome"); + adminlogcheck = 1; + mv.addObject("admin", user); + return mv; + } else { + ModelAndView mv = new ModelAndView("adminlogin"); + mv.addObject("msg", "Please enter correct username and password"); + return mv; + } + } + + @GetMapping("categories") + public ModelAndView getcategory() { + if (adminlogcheck == 0) { + ModelAndView mView = new ModelAndView("adminlogin"); + return mView; + } else { + ModelAndView mView = new ModelAndView("categories"); + List categories = this.categoryService.getCategories(); + mView.addObject("categories", categories); + return mView; + } + } + + @RequestMapping(value = "categories", method = RequestMethod.POST) + public String addCategory(@RequestParam("categoryname") String category_name) { + System.out.println(category_name); + + Category category = this.categoryService.addCategory(category_name); + if (category.getName().equals(category_name)) { + return "redirect:categories"; + } else { + return "redirect:categories"; + } + } + + @GetMapping("categories/delete") + public ModelAndView removeCategoryDb(@RequestParam("id") int id) { + this.categoryService.deleteCategory(id); + ModelAndView mView = new ModelAndView("forward:/categories"); + return mView; + } + + @GetMapping("categories/update") + public String updateCategory(@RequestParam("categoryid") int id, @RequestParam("categoryname") String categoryname) { + Category category = this.categoryService.updateCategory(id, categoryname); + return "redirect:/admin/categories"; + } + + + // --------------------------Remaining -------------------- + @GetMapping("products") + public ModelAndView getproduct() { + if (adminlogcheck == 0) { + ModelAndView mView = new ModelAndView("adminlogin"); + return mView; + } else { + ModelAndView mView = new ModelAndView("products"); + + List products = this.productService.getProducts(); + + if (products.isEmpty()) { + mView.addObject("msg", "No products are available"); + } else { + mView.addObject("products", products); + } + return mView; + } + + } + + @GetMapping("products/add") + public ModelAndView addProduct() { + ModelAndView mView = new ModelAndView("productsAdd"); + List categories = this.categoryService.getCategories(); + mView.addObject("categories", categories); + return mView; + } + + @RequestMapping(value = "products/add", method = RequestMethod.POST) + public String addProduct(@RequestParam("name") String name, @RequestParam("categoryid") int categoryId, @RequestParam("price") int price, @RequestParam("weight") int weight, @RequestParam("quantity") int quantity, @RequestParam("description") String description, @RequestParam("productImage") String productImage) { + System.out.println(categoryId); + Category category = this.categoryService.getCategory(categoryId); + Product product = new Product(); + product.setId(categoryId); + product.setName(name); + product.setCategory(category); + product.setDescription(description); + product.setPrice(price); + product.setImage(productImage); + product.setWeight(weight); + product.setQuantity(quantity); + this.productService.addProduct(product); + return "redirect:/admin/products"; + } + + @GetMapping("products/update/{id}") + public ModelAndView updateproduct(@PathVariable("id") int id) { + + ModelAndView mView = new ModelAndView("productsUpdate"); + Product product = this.productService.getProduct(id); + List categories = this.categoryService.getCategories(); + + mView.addObject("categories", categories); + mView.addObject("product", product); + return mView; + } + + @RequestMapping(value = "products/update/{id}", method = RequestMethod.POST) + public String updateProduct(@PathVariable("id") int id, @RequestParam("name") String name, @RequestParam("categoryid") int categoryId, @RequestParam("price") int price, @RequestParam("weight") int weight, @RequestParam("quantity") int quantity, @RequestParam("description") String description, @RequestParam("productImage") String productImage) { // this.productService.updateProduct(); - return "redirect:/admin/products"; - } - - @GetMapping("products/delete") - public String removeProduct(@RequestParam("id") int id) - { - this.productService.deleteProduct(id); - return "redirect:/admin/products"; - } - - @PostMapping("products") - public String postproduct() { - return "redirect:/admin/categories"; - } - - @GetMapping("customers") - public ModelAndView getCustomerDetail() { - if(adminlogcheck==0){ - ModelAndView mView = new ModelAndView("adminlogin"); - return mView; - } - else { - ModelAndView mView = new ModelAndView("displayCustomers"); - List users = this.userService.getUsers(); - mView.addObject("customers", users); - return mView; - } - } - - - @GetMapping("profileDisplay") - public String profileDisplay(Model model) { - String displayusername,displaypassword,displayemail,displayaddress; - try - { - Class.forName("com.mysql.jdbc.Driver"); - Connection con = DriverManager.getConnection("jdbc:mysql://localhost:3306/ecommjava","root",""); - PreparedStatement stmt = con.prepareStatement("select * from users where username = ?"+";"); - stmt.setString(1, usernameforclass); - ResultSet rst = stmt.executeQuery(); - - if(rst.next()) - { - int userid = rst.getInt(1); - displayusername = rst.getString(2); - displayemail = rst.getString(3); - displaypassword = rst.getString(4); - displayaddress = rst.getString(5); - model.addAttribute("userid",userid); - model.addAttribute("username",displayusername); - model.addAttribute("email",displayemail); - model.addAttribute("password",displaypassword); - model.addAttribute("address",displayaddress); - } - } - catch(Exception e) - { - System.out.println("Exception:"+e); - } - System.out.println("Hello"); - return "updateProfile"; - } - - @RequestMapping(value = "updateuser",method=RequestMethod.POST) - public String updateUserProfile(@RequestParam("userid") int userid,@RequestParam("username") String username, @RequestParam("email") String email, @RequestParam("password") String password, @RequestParam("address") String address) - - { - try - { - Class.forName("com.mysql.jdbc.Driver"); - Connection con = DriverManager.getConnection("jdbc:mysql://localhost:3306/ecommjava","root",""); - - PreparedStatement pst = con.prepareStatement("update users set username= ?,email = ?,password= ?, address= ? where uid = ?;"); - pst.setString(1, username); - pst.setString(2, email); - pst.setString(3, password); - pst.setString(4, address); - pst.setInt(5, userid); - int i = pst.executeUpdate(); - usernameforclass = username; - } - catch(Exception e) - { - System.out.println("Exception:"+e); - } - return "redirect:/index"; - } + return "redirect:/admin/products"; + } + + @GetMapping("products/delete") + public String removeProduct(@RequestParam("id") int id) { + this.productService.deleteProduct(id); + return "redirect:/admin/products"; + } + + @PostMapping("products") + public String postproduct() { + return "redirect:/admin/categories"; + } + + @GetMapping("customers") + public ModelAndView getCustomerDetail() { + if (adminlogcheck == 0) { + ModelAndView mView = new ModelAndView("adminlogin"); + return mView; + } else { + ModelAndView mView = new ModelAndView("displayCustomers"); + List users = this.userService.getUsers(); + mView.addObject("customers", users); + return mView; + } + } + + + @GetMapping("profileDisplay") + public String profileDisplay(Model model) { + String displayusername, displaypassword, displayemail, displayaddress; + try { + Class.forName("com.mysql.jdbc.Driver"); + Connection con = DriverManager.getConnection("jdbc:mysql://localhost:3306/ecommjava", "root", ""); + PreparedStatement stmt = con.prepareStatement("select * from users where username = ?" + ";"); + stmt.setString(1, usernameforclass); + ResultSet rst = stmt.executeQuery(); + + if (rst.next()) { + int userid = rst.getInt(1); + displayusername = rst.getString(2); + displayemail = rst.getString(3); + displaypassword = rst.getString(4); + displayaddress = rst.getString(5); + model.addAttribute("userid", userid); + model.addAttribute("username", displayusername); + model.addAttribute("email", displayemail); + model.addAttribute("password", displaypassword); + model.addAttribute("address", displayaddress); + } + } catch (Exception e) { + System.out.println("Exception:" + e); + } + System.out.println("Hello"); + return "updateProfile"; + } + + @RequestMapping(value = "updateuser", method = RequestMethod.POST) + public String updateUserProfile(@RequestParam("userid") int userid, @RequestParam("username") String username, @RequestParam("email") String email, @RequestParam("password") String password, @RequestParam("address") String address) { + try { + Class.forName("com.mysql.jdbc.Driver"); + Connection con = DriverManager.getConnection("jdbc:mysql://localhost:3306/ecommjava", "root", ""); + + PreparedStatement pst = con.prepareStatement("update users set username= ?,email = ?,password= ?, address= ? where uid = ?;"); + pst.setString(1, username); + pst.setString(2, email); + pst.setString(3, password); + pst.setString(4, address); + pst.setInt(5, userid); + int i = pst.executeUpdate(); + usernameforclass = username; + } catch (Exception e) { + System.out.println("Exception:" + e); + } + return "redirect:/index"; + } } diff --git a/JtProject/src/main/java/com/jtspringproject/JtSpringProject/controller/UserController.java b/JtProject/src/main/java/com/jtspringproject/JtSpringProject/controller/UserController.java index c5643bbb..0f9d7b3e 100644 --- a/JtProject/src/main/java/com/jtspringproject/JtSpringProject/controller/UserController.java +++ b/JtProject/src/main/java/com/jtspringproject/JtSpringProject/controller/UserController.java @@ -28,139 +28,134 @@ import com.jtspringproject.JtSpringProject.services.cartService; - @Controller -public class UserController{ - - @Autowired - private userService userService; - - @Autowired - private productService productService; - - @GetMapping("/register") - public String registerUser() - { - return "register"; - } - - @GetMapping("/buy") - public String buy() - { - return "buy"; - } - - - @GetMapping("/") - public String userlogin(Model model) { - - return "userLogin"; - } - @RequestMapping(value = "userloginvalidate", method = RequestMethod.POST) - public ModelAndView userlogin( @RequestParam("username") String username, @RequestParam("password") String pass,Model model,HttpServletResponse res) { - - System.out.println(pass); - User u = this.userService.checkLogin(username, pass); - System.out.println(u.getUsername()); - - if(username.equals(u.getUsername())) { - - res.addCookie(new Cookie("username", u.getUsername())); - ModelAndView mView = new ModelAndView("index"); - mView.addObject("user", u); - List products = this.productService.getProducts(); - - if (products.isEmpty()) { - mView.addObject("msg", "No products are available"); - } else { - mView.addObject("products", products); - } - return mView; - - }else { - ModelAndView mView = new ModelAndView("userLogin"); - mView.addObject("msg", "Please enter correct email and password"); - return mView; - } - - } - - - @GetMapping("/user/products") - public ModelAndView getproduct() { - - ModelAndView mView = new ModelAndView("uproduct"); - - List products = this.productService.getProducts(); - - if(products.isEmpty()) { - mView.addObject("msg","No products are available"); - }else { - mView.addObject("products",products); - } - - return mView; - } - @RequestMapping(value = "newuserregister", method = RequestMethod.POST) - public ModelAndView newUseRegister(@ModelAttribute User user) - { - // Check if username already exists in database - boolean exists = this.userService.checkUserExists(user.getUsername()); - - if(!exists) { - System.out.println(user.getEmail()); - user.setRole("ROLE_NORMAL"); - this.userService.addUser(user); - - System.out.println("New user created: " + user.getUsername()); - ModelAndView mView = new ModelAndView("userLogin"); - return mView; - } else { - System.out.println("New user not created - username taken: " + user.getUsername()); - ModelAndView mView = new ModelAndView("register"); - mView.addObject("msg", user.getUsername() + " is taken. Please choose a different username."); - return mView; - } - } - - - - //for Learning purpose of model - @GetMapping("/test") - public String Test(Model model) - { - System.out.println("test page"); - model.addAttribute("author","jay gajera"); - model.addAttribute("id",40); - - List friends = new ArrayList(); - model.addAttribute("f",friends); - friends.add("xyz"); - friends.add("abc"); - - return "test"; - } - - // for learning purpose of model and view ( how data is pass to view) - - @GetMapping("/test2") - public ModelAndView Test2() - { - System.out.println("test page"); - //create modelandview object - ModelAndView mv=new ModelAndView(); - mv.addObject("name","jay gajera 17"); - mv.addObject("id",40); - mv.setViewName("test2"); - - List list=new ArrayList(); - list.add(10); - list.add(25); - mv.addObject("marks",list); - return mv; - - - } +public class UserController { + + @Autowired + private userService userService; + + @Autowired + private productService productService; + + @GetMapping("/register") + public String registerUser() { + return "register"; + } + + @GetMapping("/buy") + public String buy() { + return "buy"; + } + + + @GetMapping("/") + public String userlogin(Model model) { + + return "userLogin"; + } + + @RequestMapping(value = "userloginvalidate", method = RequestMethod.POST) + public ModelAndView userlogin(@RequestParam("username") String username, @RequestParam("password") String pass, Model model, HttpServletResponse res) { + + System.out.println(pass); + User u = this.userService.checkLogin(username, pass); + System.out.println(u.getUsername()); + + if (username.equals(u.getUsername())) { + + res.addCookie(new Cookie("username", u.getUsername())); + ModelAndView mView = new ModelAndView("index"); + mView.addObject("user", u); + List products = this.productService.getProducts(); + + if (products.isEmpty()) { + mView.addObject("msg", "No products are available"); + } else { + mView.addObject("products", products); + } + return mView; + + } else { + ModelAndView mView = new ModelAndView("userLogin"); + mView.addObject("msg", "Please enter correct email and password"); + return mView; + } + + } + + + @GetMapping("/user/products") + public ModelAndView getproduct() { + + ModelAndView mView = new ModelAndView("uproduct"); + + List products = this.productService.getProducts(); + + if (products.isEmpty()) { + mView.addObject("msg", "No products are available"); + } else { + mView.addObject("products", products); + } + + return mView; + } + + @RequestMapping(value = "newuserregister", method = RequestMethod.POST) + public ModelAndView newUseRegister(@ModelAttribute User user) { + // Check if username already exists in database + boolean exists = this.userService.checkUserExists(user.getUsername()); + + if (!exists) { + System.out.println(user.getEmail()); + user.setRole("ROLE_NORMAL"); + this.userService.addUser(user); + + System.out.println("New user created: " + user.getUsername()); + ModelAndView mView = new ModelAndView("userLogin"); + return mView; + } else { + System.out.println("New user not created - username taken: " + user.getUsername()); + ModelAndView mView = new ModelAndView("register"); + mView.addObject("msg", user.getUsername() + " is taken. Please choose a different username."); + return mView; + } + } + + + //for Learning purpose of model + @GetMapping("/test") + public String Test(Model model) { + System.out.println("test page"); + model.addAttribute("author", "jay gajera"); + model.addAttribute("id", 40); + + List friends = new ArrayList(); + model.addAttribute("f", friends); + friends.add("xyz"); + friends.add("abc"); + + return "test"; + } + + // for learning purpose of model and view ( how data is pass to view) + + @GetMapping("/test2") + public ModelAndView Test2() { + System.out.println("test page"); + //create modelandview object + ModelAndView mv = new ModelAndView(); + mv.addObject("name", "jay gajera 17"); + mv.addObject("id", 40); + mv.setViewName("test2"); + + List list = new ArrayList(); + list.add(10); + list.add(25); + mv.addObject("marks", list); + return mv; + + + } // @GetMapping("carts") @@ -169,5 +164,5 @@ public ModelAndView Test2() // ModelAndView mv= new ModelAndView(); // Listcarts = cartService.getCarts(); // } - + } diff --git a/JtProject/src/main/java/com/jtspringproject/JtSpringProject/dao/cartDao.java b/JtProject/src/main/java/com/jtspringproject/JtSpringProject/dao/cartDao.java index e20ec0f5..c1a9aaba 100644 --- a/JtProject/src/main/java/com/jtspringproject/JtSpringProject/dao/cartDao.java +++ b/JtProject/src/main/java/com/jtspringproject/JtSpringProject/dao/cartDao.java @@ -1,4 +1,5 @@ package com.jtspringproject.JtSpringProject.dao; + import java.util.List; import com.jtspringproject.JtSpringProject.models.Cart; @@ -13,7 +14,9 @@ public class cartDao { @Autowired private SessionFactory sessionFactory; - public void setSessionFactory(SessionFactory sf){ this.sessionFactory =sf;} + public void setSessionFactory(SessionFactory sf) { + this.sessionFactory = sf; + } @Transactional public Cart addCart(Cart cart) { diff --git a/JtProject/src/main/java/com/jtspringproject/JtSpringProject/dao/categoryDao.java b/JtProject/src/main/java/com/jtspringproject/JtSpringProject/dao/categoryDao.java index 12ec41a9..26c96de7 100644 --- a/JtProject/src/main/java/com/jtspringproject/JtSpringProject/dao/categoryDao.java +++ b/JtProject/src/main/java/com/jtspringproject/JtSpringProject/dao/categoryDao.java @@ -12,50 +12,50 @@ @Repository public class categoryDao { - @Autowired - private SessionFactory sessionFactory; - - public void setSessionFactory(SessionFactory sf) { - this.sessionFactory = sf; - } - - @Transactional - public Category addCategory(String name) { - Category category = new Category(); - category.setName(name); - this.sessionFactory.getCurrentSession().saveOrUpdate(category); - return category; - } - - @Transactional - public List getCategories() { - return this.sessionFactory.getCurrentSession().createQuery("from CATEGORY").list(); - } - - @Transactional - public Boolean deletCategory(int id) { - - Session session = this.sessionFactory.getCurrentSession(); - Object persistanceInstance = session.load(Category.class, id); - - if (persistanceInstance != null) { - session.delete(persistanceInstance); - return true; - } - return false; - } - - @Transactional - public Category updateCategory(int id, String name) { - Category category = this.sessionFactory.getCurrentSession().get(Category.class, id); - category.setName(name); - - this.sessionFactory.getCurrentSession().update(category); - return category; - } - - @Transactional - public Category getCategory(int id) { - return this.sessionFactory.getCurrentSession().get(Category.class,id); - } + @Autowired + private SessionFactory sessionFactory; + + public void setSessionFactory(SessionFactory sf) { + this.sessionFactory = sf; + } + + @Transactional + public Category addCategory(String name) { + Category category = new Category(); + category.setName(name); + this.sessionFactory.getCurrentSession().saveOrUpdate(category); + return category; + } + + @Transactional + public List getCategories() { + return this.sessionFactory.getCurrentSession().createQuery("from CATEGORY").list(); + } + + @Transactional + public Boolean deletCategory(int id) { + + Session session = this.sessionFactory.getCurrentSession(); + Object persistanceInstance = session.load(Category.class, id); + + if (persistanceInstance != null) { + session.delete(persistanceInstance); + return true; + } + return false; + } + + @Transactional + public Category updateCategory(int id, String name) { + Category category = this.sessionFactory.getCurrentSession().get(Category.class, id); + category.setName(name); + + this.sessionFactory.getCurrentSession().update(category); + return category; + } + + @Transactional + public Category getCategory(int id) { + return this.sessionFactory.getCurrentSession().get(Category.class, id); + } } diff --git a/JtProject/src/main/java/com/jtspringproject/JtSpringProject/dao/productDao.java b/JtProject/src/main/java/com/jtspringproject/JtSpringProject/dao/productDao.java index b8199678..ae7d86f9 100644 --- a/JtProject/src/main/java/com/jtspringproject/JtSpringProject/dao/productDao.java +++ b/JtProject/src/main/java/com/jtspringproject/JtSpringProject/dao/productDao.java @@ -13,44 +13,45 @@ @Repository public class productDao { - @Autowired + @Autowired private SessionFactory sessionFactory; - - public void setSessionFactory(SessionFactory sf) { + + public void setSessionFactory(SessionFactory sf) { this.sessionFactory = sf; } - - @Transactional - public List getProducts(){ - return this.sessionFactory.getCurrentSession().createQuery("from PRODUCT").list(); - } - - @Transactional - public Product addProduct(Product product) { - this.sessionFactory.getCurrentSession().save(product); - return product; - } - - @Transactional - public Product getProduct(int id) { - return this.sessionFactory.getCurrentSession().get(Product.class, id); - } - - public Product updateProduct(Product product){ - this.sessionFactory.getCurrentSession().update(String.valueOf(Product.class),product); - return product; - } - @Transactional - public Boolean deletProduct(int id) { - - Session session = this.sessionFactory.getCurrentSession(); - Object persistanceInstance = session.load(Product.class, id); - - if (persistanceInstance != null) { - session.delete(persistanceInstance); - return true; - } - return false; - } + + @Transactional + public List getProducts() { + return this.sessionFactory.getCurrentSession().createQuery("from PRODUCT").list(); + } + + @Transactional + public Product addProduct(Product product) { + this.sessionFactory.getCurrentSession().save(product); + return product; + } + + @Transactional + public Product getProduct(int id) { + return this.sessionFactory.getCurrentSession().get(Product.class, id); + } + + public Product updateProduct(Product product) { + this.sessionFactory.getCurrentSession().update(String.valueOf(Product.class), product); + return product; + } + + @Transactional + public Boolean deletProduct(int id) { + + Session session = this.sessionFactory.getCurrentSession(); + Object persistanceInstance = session.load(Product.class, id); + + if (persistanceInstance != null) { + session.delete(persistanceInstance); + return true; + } + return false; + } } diff --git a/JtProject/src/main/java/com/jtspringproject/JtSpringProject/dao/userDao.java b/JtProject/src/main/java/com/jtspringproject/JtSpringProject/dao/userDao.java index f2478a97..51164046 100644 --- a/JtProject/src/main/java/com/jtspringproject/JtSpringProject/dao/userDao.java +++ b/JtProject/src/main/java/com/jtspringproject/JtSpringProject/dao/userDao.java @@ -17,54 +17,55 @@ @Repository public class userDao { - @Autowired + @Autowired private SessionFactory sessionFactory; - - public void setSessionFactory(SessionFactory sf) { + + public void setSessionFactory(SessionFactory sf) { this.sessionFactory = sf; } - @Transactional + + @Transactional public List getAllUser() { Session session = this.sessionFactory.getCurrentSession(); - List userList = session.createQuery("from CUSTOMER").list(); + List userList = session.createQuery("from CUSTOMER").list(); return userList; } - + @Transactional - public User saveUser(User user) { - this.sessionFactory.getCurrentSession().saveOrUpdate(user); - System.out.println("User added" + user.getId()); + public User saveUser(User user) { + this.sessionFactory.getCurrentSession().saveOrUpdate(user); + System.out.println("User added" + user.getId()); return user; - } - -// public User checkLogin() { + } + + // public User checkLogin() { // this.sessionFactory.getCurrentSession(). // } @Transactional - public User getUser(String username,String password) { - Query query = sessionFactory.getCurrentSession().createQuery("from CUSTOMER where username = :username"); - query.setParameter("username",username); - - try { - User user = (User) query.getSingleResult(); - System.out.println(user.getPassword()); - if(password.equals(user.getPassword())) { - return user; - }else { - return new User(); - } - }catch(Exception e){ - System.out.println(e.getMessage()); - User user = new User(); - return user; - } - + public User getUser(String username, String password) { + Query query = sessionFactory.getCurrentSession().createQuery("from CUSTOMER where username = :username"); + query.setParameter("username", username); + + try { + User user = (User) query.getSingleResult(); + System.out.println(user.getPassword()); + if (password.equals(user.getPassword())) { + return user; + } else { + return new User(); + } + } catch (Exception e) { + System.out.println(e.getMessage()); + User user = new User(); + return user; + } + } - @Transactional - public boolean userExists(String username) { - Query query = sessionFactory.getCurrentSession().createQuery("from CUSTOMER where username = :username"); - query.setParameter("username",username); - return !query.getResultList().isEmpty(); - } + @Transactional + public boolean userExists(String username) { + Query query = sessionFactory.getCurrentSession().createQuery("from CUSTOMER where username = :username"); + query.setParameter("username", username); + return !query.getResultList().isEmpty(); + } } diff --git a/JtProject/src/main/java/com/jtspringproject/JtSpringProject/models/Cart.java b/JtProject/src/main/java/com/jtspringproject/JtSpringProject/models/Cart.java index 4b6c5a9f..054cf606 100644 --- a/JtProject/src/main/java/com/jtspringproject/JtSpringProject/models/Cart.java +++ b/JtProject/src/main/java/com/jtspringproject/JtSpringProject/models/Cart.java @@ -5,7 +5,7 @@ import java.util.List; -@Entity(name="CART") +@Entity(name = "CART") public class Cart { @Id @@ -13,7 +13,7 @@ public class Cart { private int id; @ManyToOne - @JoinColumn(name="customer_id") + @JoinColumn(name = "customer_id") private User customer; @ManyToMany diff --git a/JtProject/src/main/java/com/jtspringproject/JtSpringProject/models/Category.java b/JtProject/src/main/java/com/jtspringproject/JtSpringProject/models/Category.java index 0dc73607..3c9ba4f1 100644 --- a/JtProject/src/main/java/com/jtspringproject/JtSpringProject/models/Category.java +++ b/JtProject/src/main/java/com/jtspringproject/JtSpringProject/models/Category.java @@ -6,29 +6,29 @@ import javax.persistence.GenerationType; import javax.persistence.Id; -@Entity(name="CATEGORY") +@Entity(name = "CATEGORY") public class Category { - @Id - @Column(name = "category_id") - @GeneratedValue(strategy=GenerationType.AUTO) - private int id; - - private String name; - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - + @Id + @Column(name = "category_id") + @GeneratedValue(strategy = GenerationType.AUTO) + private int id; + + private String name; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + } diff --git a/JtProject/src/main/java/com/jtspringproject/JtSpringProject/models/Product.java b/JtProject/src/main/java/com/jtspringproject/JtSpringProject/models/Product.java index 46ff4cf0..bee85f25 100644 --- a/JtProject/src/main/java/com/jtspringproject/JtSpringProject/models/Product.java +++ b/JtProject/src/main/java/com/jtspringproject/JtSpringProject/models/Product.java @@ -10,97 +10,95 @@ import javax.persistence.ManyToOne; import javax.persistence.OneToOne; -@Entity(name="PRODUCT") +@Entity(name = "PRODUCT") public class Product { - @Id - @Column(name = "product_id") - @GeneratedValue(strategy=GenerationType.AUTO) - private int id; - - private String name; - - private String image; - - @OneToOne(cascade = CascadeType.ALL) - @JoinColumn(name = "category_id",referencedColumnName = "category_id") - private Category category; - - private int quantity; - - private int price; - - private int weight; - - private String description; - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getImage() { - return image; - } - - public void setImage(String image) { - this.image = image; - } - - - public Category getCategory() { - return category; - } - - public void setCategory(Category category) { - this.category = category; - } - - public int getQuantity() { - return quantity; - } - - public void setQuantity(int quantity) { - this.quantity = quantity; - } - - public int getPrice() { - return price; - } - - public void setPrice(int price) { - this.price = price; - } - - public int getWeight() { - return weight; - } - - public void setWeight(int weight) { - this.weight = weight; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - @ManyToOne + @Id + @Column(name = "product_id") + @GeneratedValue(strategy = GenerationType.AUTO) + private int id; + + private String name; + + private String image; + + @OneToOne(cascade = CascadeType.ALL) + @JoinColumn(name = "category_id", referencedColumnName = "category_id") + private Category category; + + private int quantity; + + private int price; + + private int weight; + + private String description; + @ManyToOne @JoinColumn(name = "customer_id") private User customer; - - + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getImage() { + return image; + } + + public void setImage(String image) { + this.image = image; + } + + public Category getCategory() { + return category; + } + + public void setCategory(Category category) { + this.category = category; + } + + public int getQuantity() { + return quantity; + } + + public void setQuantity(int quantity) { + this.quantity = quantity; + } + + public int getPrice() { + return price; + } + + public void setPrice(int price) { + this.price = price; + } + + public int getWeight() { + return weight; + } + + public void setWeight(int weight) { + this.weight = weight; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + } diff --git a/JtProject/src/main/java/com/jtspringproject/JtSpringProject/models/User.java b/JtProject/src/main/java/com/jtspringproject/JtSpringProject/models/User.java index f65e9f28..e80ab615 100644 --- a/JtProject/src/main/java/com/jtspringproject/JtSpringProject/models/User.java +++ b/JtProject/src/main/java/com/jtspringproject/JtSpringProject/models/User.java @@ -1,4 +1,5 @@ package com.jtspringproject.JtSpringProject.models; + import java.util.List; import javax.persistence.CascadeType; @@ -10,74 +11,73 @@ import javax.persistence.OneToMany; import javax.persistence.Table; -@Entity(name="CUSTOMER") +@Entity(name = "CUSTOMER") @Table public class User { - @Id - @GeneratedValue(strategy=GenerationType.AUTO) - private int id; - - @Column(unique = true) - private String username; - - private String email; - - private String password; - - private String role; - - private String address; - - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getRole() { - return role; - } - - public void setRole(String role) { - this.role = role; - } - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private int id; + + @Column(unique = true) + private String username; + + private String email; + + private String password; + + private String role; + + private String address; + + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + } diff --git a/JtProject/src/main/java/com/jtspringproject/JtSpringProject/services/cartService.java b/JtProject/src/main/java/com/jtspringproject/JtSpringProject/services/cartService.java index f0b76fc9..ec617fc9 100644 --- a/JtProject/src/main/java/com/jtspringproject/JtSpringProject/services/cartService.java +++ b/JtProject/src/main/java/com/jtspringproject/JtSpringProject/services/cartService.java @@ -8,31 +8,12 @@ import java.util.List; -@Service -public class cartService { - @Autowired - private cartDao cartDao; - - public Cart addCart(Cart cart) - { - return cartDao.addCart(cart); - } -// public Cart getCart(int id) -// { -// return cartDao.getCart(id); -// } -public List getCarts(){ - return this.cartDao.getCarts(); -} - - public void updateCart(Cart cart){ - cartDao.updateCart(cart); - } - public void deleteCart(Cart cart) - { - cartDao.deleteCart(cart); - } +public Interface cartService { + public Cart addCart(Cart cart); + public List getCarts(); + public void updateCart(Cart cart); + public void deleteCart(Cart cart); } diff --git a/JtProject/src/main/java/com/jtspringproject/JtSpringProject/services/cartServiceImpl.java b/JtProject/src/main/java/com/jtspringproject/JtSpringProject/services/cartServiceImpl.java new file mode 100644 index 00000000..abc11f79 --- /dev/null +++ b/JtProject/src/main/java/com/jtspringproject/JtSpringProject/services/cartServiceImpl.java @@ -0,0 +1,32 @@ +package com.jtspringproject.JtSpringProject.services; + +import com.jtspringproject.JtSpringProject.dao.cartDao; +import com.jtspringproject.JtSpringProject.models.Cart; +import com.jtspringproject.JtSpringProject.models.Category; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class cartServiceImpl implements cartService { + @Autowired + private cartDao cartDao; + + public Cart addCart(Cart cart) { + return cartDao.addCart(cart); + } + public List getCarts() { + return this.cartDao.getCarts(); + } + + public void updateCart(Cart cart) { + cartDao.updateCart(cart); + } + + public void deleteCart(Cart cart) { + cartDao.deleteCart(cart); + } + + +} diff --git a/JtProject/src/main/java/com/jtspringproject/JtSpringProject/services/categoryService.java b/JtProject/src/main/java/com/jtspringproject/JtSpringProject/services/categoryService.java index d8bcb570..416f1a25 100644 --- a/JtProject/src/main/java/com/jtspringproject/JtSpringProject/services/categoryService.java +++ b/JtProject/src/main/java/com/jtspringproject/JtSpringProject/services/categoryService.java @@ -12,26 +12,26 @@ @Service public class categoryService { - @Autowired - private categoryDao categoryDao; - - public Category addCategory(String name) { - return this.categoryDao.addCategory(name); - } - - public List getCategories(){ - return this.categoryDao.getCategories(); - } - - public Boolean deleteCategory(int id) { - return this.categoryDao.deletCategory(id); - } - - public Category updateCategory(int id,String name) { - return this.categoryDao.updateCategory(id, name); - } - - public Category getCategory(int id) { - return this.categoryDao.getCategory(id); - } + @Autowired + private categoryDao categoryDao; + + public Category addCategory(String name) { + return this.categoryDao.addCategory(name); + } + + public List getCategories() { + return this.categoryDao.getCategories(); + } + + public Boolean deleteCategory(int id) { + return this.categoryDao.deletCategory(id); + } + + public Category updateCategory(int id, String name) { + return this.categoryDao.updateCategory(id, name); + } + + public Category getCategory(int id) { + return this.categoryDao.getCategory(id); + } } diff --git a/JtProject/src/main/java/com/jtspringproject/JtSpringProject/services/productService.java b/JtProject/src/main/java/com/jtspringproject/JtSpringProject/services/productService.java index 335b525f..2064c417 100644 --- a/JtProject/src/main/java/com/jtspringproject/JtSpringProject/services/productService.java +++ b/JtProject/src/main/java/com/jtspringproject/JtSpringProject/services/productService.java @@ -10,28 +10,29 @@ @Service public class productService { - @Autowired - private productDao productDao; - - public List getProducts(){ - return this.productDao.getProducts(); - } - - public Product addProduct(Product product) { - return this.productDao.addProduct(product); - } - - public Product getProduct(int id) { - return this.productDao.getProduct(id); - } - - public Product updateProduct(int id,Product product){ - product.setId(id); - return this.productDao.updateProduct(product); - } - public boolean deleteProduct(int id) { - return this.productDao.deletProduct(id); - } - - + @Autowired + private productDao productDao; + + public List getProducts() { + return this.productDao.getProducts(); + } + + public Product addProduct(Product product) { + return this.productDao.addProduct(product); + } + + public Product getProduct(int id) { + return this.productDao.getProduct(id); + } + + public Product updateProduct(int id, Product product) { + product.setId(id); + return this.productDao.updateProduct(product); + } + + public boolean deleteProduct(int id) { + return this.productDao.deletProduct(id); + } + + } diff --git a/JtProject/src/main/java/com/jtspringproject/JtSpringProject/services/userService.java b/JtProject/src/main/java/com/jtspringproject/JtSpringProject/services/userService.java index 7ae0b9c4..1cf13a04 100644 --- a/JtProject/src/main/java/com/jtspringproject/JtSpringProject/services/userService.java +++ b/JtProject/src/main/java/com/jtspringproject/JtSpringProject/services/userService.java @@ -1,6 +1,7 @@ package com.jtspringproject.JtSpringProject.services; import com.jtspringproject.JtSpringProject.models.*; + import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -11,22 +12,22 @@ @Service public class userService { - @Autowired - private userDao userDao; - - public List getUsers(){ - return this.userDao.getAllUser(); - } - - public User addUser(User user) { - return this.userDao.saveUser(user); - } - - public User checkLogin(String username,String password) { - return this.userDao.getUser(username, password); - } - - public boolean checkUserExists(String username) { - return this.userDao.userExists(username); - } + @Autowired + private userDao userDao; + + public List getUsers() { + return this.userDao.getAllUser(); + } + + public User addUser(User user) { + return this.userDao.saveUser(user); + } + + public User checkLogin(String username, String password) { + return this.userDao.getUser(username, password); + } + + public boolean checkUserExists(String username) { + return this.userDao.userExists(username); + } }