Changeset 46fd0c7 for src/main/java/edu/gjoko

Timestamp:

03/13/23 00:58:07 (21 months ago)

Author:

Gjoko Kostadinov <gjoko.kostadinov@…>

Branches:

master

Children:

9050790

Parents:

2b0a4db

Message:

Add admin page initial work.

Location:

src/main/java/edu/gjoko/schedlr

Files:

• config/AppFilter.java (modified) (3 diffs)
• config/AppSecurityConfig.java (modified) (1 diff)
• config/MvcConfig.java (modified) (2 diffs)
• controllers/AdminController.java (added)
• controllers/HomePageController.java (modified) (2 diffs)
• controllers/RegisterController.java (modified) (4 diffs)
• controllers/rest/BusinessController.java (added)
• entity/Appointment.java (modified) (3 diffs)
• entity/Business.java (modified) (3 diffs)
• entity/BusinessStatus.java (added)
• entity/Service.java (modified) (2 diffs)
• repositories/BusinessRepository.java (added)
• repositories/BusinessTypeRepository.java (modified) (1 diff)
• services/BusinessService.java (added)

src/main/java/edu/gjoko/schedlr/config/AppFilter.java

@@ -4 +4 @@
 import org.springframework.security.core.context.SecurityContextImpl;
 import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.util.StringUtils;
 import org.springframework.web.filter.GenericFilterBean;
 
@@ -23 +24 @@
         HttpSession session = httpServletRequest.getSession(false);
 
+        if(httpServletRequest.getRequestURI().endsWith(".js") || httpServletRequest.getRequestURI().endsWith(".css")) {
+            filterChain.doFilter(servletRequest, servletResponse);
+            return;
+        }
         if(session != null) {
             Map<String, String> roleTargetUrlMap = new HashMap<>();
-            roleTargetUrlMap.put("ADMIN", "/date");
-            roleTargetUrlMap.put("CUSTOMER", "/number");
-            roleTargetUrlMap.put("BUSINESS_OWNER", "");
+            roleTargetUrlMap.put("ADMIN", "/admin");
+            roleTargetUrlMap.put("CUSTOMER", "/homepage");
+            roleTargetUrlMap.put("BUSINESS_OWNER", "/business_homepage");
             SecurityContextImpl sci = (SecurityContextImpl) session.getAttribute("SPRING_SECURITY_CONTEXT");
             if(sci != null) {
@@ -34 +39 @@
                 for (final GrantedAuthority grantedAuthority : authorities) {
                     String authorityName = grantedAuthority.getAuthority();
-                    if("DATE".equalsIgnoreCase(authorityName)) {
-                        servletRequest.getRequestDispatcher("date").forward(servletRequest, servletResponse);
-                        return;
-                    } else if("GUESS_NUMBER".equalsIgnoreCase(authorityName)) {
-                        try {
-                            servletRequest.getRequestDispatcher("number").forward(servletRequest, servletResponse);
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
-
+                    String page = "";
+                    switch (authorityName) {
+                        case "ADMIN":
+                            page = "/admin";
+                            break;
+                        case "CUSTOMER":
+                        case "BUSINESS_OWNER":
+                            page = "/homepage";
+                            break;
+                        default:
+                            break;
+                    }
+                    if(page != null && !page.trim().isEmpty()) {
+                        servletRequest.getRequestDispatcher(page).forward(servletRequest, servletResponse);
                         return;
                     }

src/main/java/edu/gjoko/schedlr/config/AppSecurityConfig.java

@@ -60 +60 @@
                 .antMatchers("/register_business").permitAll()
                 .antMatchers("/api/nomenclatures/*").permitAll()
+                .antMatchers("/api/business").permitAll()
                 .antMatchers("/homepage").permitAll()
                 .antMatchers("/css/**").permitAll()

src/main/java/edu/gjoko/schedlr/config/MvcConfig.java

@@ -2 +2 @@
 
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@@ -14 +15 @@
         registry.addViewController("/register_business").setViewName("register_business");
         registry.addViewController("/homepage").setViewName("homepage");
+        registry.addViewController("/admin").setViewName("admin");
     }
 
-
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("/resources/**")
+                .addResourceLocations("/resources/");
+    }
 }

src/main/java/edu/gjoko/schedlr/controllers/HomePageController.java

@@ -11 +11 @@
 public class HomePageController {
 
-    @GetMapping(name = "/homepage")
+    @GetMapping(path = "/homepage")
     public String getHomePageTemplate(Model model, Principal principal) {
         System.out.println(principal);
@@ -17 +17 @@
     }
 
-    @PostMapping(name = "/homepage")
+    @PostMapping(path = "/homepage")
     public String postHomePageTemplate(Model model) {
         return "homepage";

src/main/java/edu/gjoko/schedlr/controllers/RegisterController.java

@@ -20 +20 @@
     }
 
-    @GetMapping(value ="/register_customer")
+    @GetMapping(path ="/register_customer")
     public String getCustomerRegisterPage(Model model) {
         model.addAttribute("stakeholder", new Stakeholder());
@@ -26 +26 @@
     }
 
-    @PostMapping(value = "/register_customer")
+    @PostMapping(path = "/register_customer")
     public String registerCustomer(@ModelAttribute Stakeholder customer, Model model) {
         Stakeholder user = stakeholderService.saveStakeholder(customer);
@@ -32 +32 @@
     }
 
-    @GetMapping(value = "/register_business")
+    @GetMapping(path = "/register_business")
     public String getBusinessRegisterPage(Model model) {
         return "register_business";
@@ -39 +39 @@
     @PostMapping(value = "/register_business")
     public String registerBusiness(Model model) {
-        return "register_business";
+        return "redirect:login";
     }
 }

src/main/java/edu/gjoko/schedlr/entity/Appointment.java

@@ -5 +5 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import javax.persistence.*;
@@ -10 +12 @@
 
 @Entity
+@EntityListeners(AuditingEntityListener.class)
 @Table(name = "appointment")
 @Getter
@@ -31 +34 @@
 
     @Column(name = "created")
+    @LastModifiedDate
     private LocalDateTime created;
 
     @Column(name = "modified")
+    @LastModifiedDate
     private LocalDateTime modified;
 }

src/main/java/edu/gjoko/schedlr/entity/Business.java

@@ -2 +2 @@
 
 import com.fasterxml.jackson.annotation.JsonManagedReference;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import javax.persistence.*;
@@ -12 +16 @@
 
 @Entity
+@EntityListeners(AuditingEntityListener.class)
 @Table(name = "business")
 @Getter
@@ -23 +28 @@
     private Long id;
 
-    @Column(name = "name")
-    private String name;
+    @Column(name = "company_name")
+    private String companyName;
 
     @OneToOne
     @JoinColumn(name = "business_type_id", referencedColumnName = "id")
+    @JsonProperty("businessType")
     private BusinessType businessType;
 
-    @Column(name = "opening_time")
-    private LocalDateTime openingTime;
-
-    @Column(name = "closing_time")
-    private LocalDateTime closingTime;
-
-    @ManyToOne
+    @ManyToOne(cascade = CascadeType.PERSIST)
     @JoinColumn(name = "owner_id", referencedColumnName = "id", nullable = false)
+    @JsonProperty("owner")
     private Stakeholder owner;
 
-    @OneToMany(mappedBy = "business")
+    @OneToMany(mappedBy = "business", cascade = CascadeType.PERSIST)
     @JsonManagedReference
     private List<Service> services;
 
+    @Column(name = "business_status")
+    @Enumerated(EnumType.STRING)
+    private BusinessStatus businessStatus;
+
     @Column(name = "created")
+    @CreatedDate
     private LocalDateTime created;
 
     @Column(name = "modified")
+    @LastModifiedDate
     private LocalDateTime modified;
 

src/main/java/edu/gjoko/schedlr/entity/Service.java

@@ -11 +11 @@
 
 import javax.persistence.*;
-import java.sql.Timestamp;
 import java.time.LocalDateTime;
 
@@ -27 +26 @@
     private Long id;
 
-    @Column(name = "name")
-    private String name;
-
     @Column(name = "duration")
     private Integer duration;
 
-    @Column(name = "price")
-    private Float price;
-
-    @OneToOne
+    @OneToOne(cascade = CascadeType.MERGE)
     @JoinColumn(name = "service_type_id", referencedColumnName = "id")
     private ServiceType serviceType;
 
     @ManyToOne
-    @JoinColumn(name="business_fk")
+    @JoinColumn(name = "business_fk")
     @JsonBackReference
     private Business business;

src/main/java/edu/gjoko/schedlr/repositories/BusinessTypeRepository.java

@@ -2 +2 @@
 
 import edu.gjoko.schedlr.entity.BusinessType;
-import edu.gjoko.schedlr.entity.Stakeholder;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;