Most functional was done!

Author: xPressed

src/main/java/ru/xpressed/javatemplatescoursework/controller/AccountController.java

@@ -0,0 +1,80 @@
+package ru.xpressed.javatemplatescoursework.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import ru.xpressed.javatemplatescoursework.entity.Customer;
+import ru.xpressed.javatemplatescoursework.entity.Order;
+import ru.xpressed.javatemplatescoursework.repository.CustomerRepository;
+import ru.xpressed.javatemplatescoursework.repository.OrderRepository;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Controller
+public class AccountController {
+    @Autowired
+    CustomerRepository customerRepository;
+
+    @Autowired
+    OrderRepository orderRepository;
+
+    @GetMapping("/account")
+    public String showAccountPage(HttpServletRequest request, Model model) {
+        model.addAttribute("username", request.getUserPrincipal().getName());
+        model.addAttribute("linkOutOrUp", "/logout");
+        model.addAttribute("textOutOrUp", "LogOut");
+        model.addAttribute("linkInOrAccount", "/account");
+        model.addAttribute("textInOrAccount", "Account");
+        model.addAttribute("welcome", "Welcome back, " + request.getUserPrincipal().getName() + "! How's your day?");
+        model.addAttribute("date", new SimpleDateFormat("dd.MM.y").format(new Date()));
+
+        Customer customer = customerRepository.findByUsername(request.getUserPrincipal().getName());
+
+        for (Order order : customer.orders) {
+            if (new Date().compareTo(order.getArrivalDate()) >= 0) {
+                order.setBtn(1);
+            } else {
+                order.setBtn(0);
+            }
+        }
+
+        model.addAttribute("orders", customer.getOrders());
+
+        return "account";
+    }
+
+    @GetMapping("/account/{id}")
+    public String deleteOrder(@PathVariable int id, HttpServletRequest request, Model model) {
+        model.addAttribute("username", request.getUserPrincipal().getName());
+        model.addAttribute("linkOutOrUp", "/logout");
+        model.addAttribute("textOutOrUp", "LogOut");
+        model.addAttribute("linkInOrAccount", "/account");
+        model.addAttribute("textInOrAccount", "Account");
+        model.addAttribute("welcome", "Welcome back, " + request.getUserPrincipal().getName() + "! How's your day?");
+        model.addAttribute("date", new SimpleDateFormat("dd.MM.y").format(new Date()));
+
+        Customer customer = customerRepository.findByUsername(request.getUserPrincipal().getName());
+        if (orderRepository.findById(id).isPresent()) {
+            customer.orders.remove(orderRepository.getById(id));
+            orderRepository.deleteById(id);
+        }
+        customerRepository.save(customer);
+
+        for (Order order : customer.orders) {
+            if (new Date().compareTo(order.getArrivalDate()) >= 0) {
+                order.setBtn(1);
+            } else {
+                order.setBtn(0);
+            }
+        }
+
+        model.addAttribute("orders", customer.getOrders());
+
+        return "account";
+    }
+}

src/main/java/ru/xpressed/javatemplatescoursework/controller/IndexController.java

@@ -1,6 +1,5 @@
 package ru.xpressed.javatemplatescoursework.controller;
 
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/ru/xpressed/javatemplatescoursework/controller/LogoutController.java

@@ -17,6 +17,6 @@ public String executeLogout(HttpServletRequest request, HttpServletResponse resp
         if (authentication != null) {
             new SecurityContextLogoutHandler().logout(request, response, authentication);
         }
-        return "redirect:/login?logout";
+        return "redirect:/index?logout";
     }
 }

src/main/java/ru/xpressed/javatemplatescoursework/controller/OrderController.java

@@ -0,0 +1,66 @@
+package ru.xpressed.javatemplatescoursework.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import ru.xpressed.javatemplatescoursework.entity.Customer;
+import ru.xpressed.javatemplatescoursework.entity.Order;
+import ru.xpressed.javatemplatescoursework.repository.CustomerRepository;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import java.util.Date;
+
+@Controller
+public class OrderController {
+    @Autowired
+    CustomerRepository customerRepository;
+
+    @GetMapping("/order")
+    public String showOrderPage(HttpServletRequest request, Model model) {
+        model.addAttribute("order", new Order());
+
+        model.addAttribute("username", request.getUserPrincipal().getName());
+        model.addAttribute("linkOutOrUp", "/logout");
+        model.addAttribute("textOutOrUp", "LogOut");
+        model.addAttribute("linkInOrAccount", "/account");
+        model.addAttribute("textInOrAccount", "Account");
+
+        model.addAttribute("confirm", "false");
+        model.addAttribute("another", "true");
+
+        return "order";
+    }
+
+    @PostMapping("/order")
+    public String completeOrder(@Valid Order order, BindingResult bindingResult, Model model, HttpServletRequest request) {
+        model.addAttribute("username", request.getUserPrincipal().getName());
+        model.addAttribute("linkOutOrUp", "/logout");
+        model.addAttribute("textOutOrUp", "LogOut");
+        model.addAttribute("linkInOrAccount", "/account");
+        model.addAttribute("textInOrAccount", "Account");
+
+        if (bindingResult.hasErrors()) {
+            model.addAttribute("confirm", "false");
+            model.addAttribute("another", "true");
+            model.addAttribute(order);
+            return "order";
+        }
+
+        Customer customer = customerRepository.findByUsername(request.getUserPrincipal().getName());
+        order.setDeparture(new Date());
+        order.setCustomer(customer);
+
+        customer.orders.add(order);
+        customerRepository.save(customer);
+
+        model.addAttribute("confirm", "true");
+        model.addAttribute("another", "false");
+        model.addAttribute("message", "Order confirmed! Courier will be in an hour.");
+        return "order";
+    }
+}

src/main/java/ru/xpressed/javatemplatescoursework/entity/Customer.java

@@ -1,14 +1,14 @@
 package ru.xpressed.javatemplatescoursework.entity;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotEmpty;
-import java.util.Collection;
+import javax.validation.constraints.Pattern;
+import java.util.*;
 
 @Entity
 @Table(name = "user")
@@ -17,6 +17,7 @@
 public class Customer implements UserDetails {
     @Id
     @NotEmpty(message = "Username can not be empty!")
+    @Pattern(regexp = "^[a-zA-Z0-9]{3,15}$", message = "Only numbers and at least 3 and not more than 15 letters!")
     private String username;
 
     @NotEmpty(message = "Password can not be empty!")
@@ -26,6 +27,19 @@ public class Customer implements UserDetails {
     @NotEmpty(message = "Repeated password can not be empty!")
     private String repeated;
 
+    @OneToMany(cascade = CascadeType.ALL, mappedBy = "customer", fetch = FetchType.LAZY)
+    public List<Order> orders = new ArrayList<>();
+
+    @Override
+    public String toString() {
+        return "Customer{" +
+                "username='" + username + '\'' +
+                ", password='" + password + '\'' +
+                ", repeated='" + repeated + '\'' +
+                ", orders=" + orders +
+                '}';
+    }
+
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {
         return null;

src/main/java/ru/xpressed/javatemplatescoursework/entity/Order.java

@@ -0,0 +1,53 @@
+package ru.xpressed.javatemplatescoursework.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotEmpty;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+@Entity
+@Getter
+@Setter
+public class Order {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private int id;
+
+    @NotEmpty(message = "Loading point can not be empty!")
+    private String load;
+
+    @NotEmpty(message = "Destination point can not be empty!")
+    private String destination;
+
+    @NotEmpty(message = "Contact information can not be empty!")
+    private String contact;
+
+    private String info;
+
+    private SimpleDateFormat dateFormat = new SimpleDateFormat("dd.MM.y H:m");
+
+    private String departure;
+
+    private String arrival;
+
+    private Date arrivalDate;
+
+    private int btn;
+
+    public void setDeparture(Date departure) {
+        this.departure = dateFormat.format(departure);
+
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(departure);
+        cal.add(Calendar.MINUTE, 2);
+        this.arrivalDate = cal.getTime();
+        this.arrival = dateFormat.format(cal.getTime());
+    }
+
+    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.DETACH)
+    private Customer customer;
+}

src/main/java/ru/xpressed/javatemplatescoursework/repository/OrderRepository.java

@@ -0,0 +1,10 @@
+package ru.xpressed.javatemplatescoursework.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+import ru.xpressed.javatemplatescoursework.entity.Order;
+
+@Repository
+public interface OrderRepository extends JpaRepository<Order, Integer> {
+}
+

src/main/java/ru/xpressed/javatemplatescoursework/service/CustomerService.java

@@ -15,6 +15,11 @@ public class CustomerService implements UserDetailsService {
 
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
-        return customerRepository.findByUsername(username);
+        Customer customer = customerRepository.findByUsername(username);
+
+        if (customer == null)
+            throw new UsernameNotFoundException("User not found!");
+
+        return customer;
     }
 }