Changeset a436340 for src/main/java/edu/gjoko

Timestamp:

02/05/23 19:55:10 (22 months ago)

Author:

Gjoko Kostadinov <gjoko.kostadinov@…>

Branches:

master

Children:

2b0a4db

Parents:

cc52b09

Message:

Adding customer registration

Location:

src/main/java/edu/gjoko/schedlr

Files:

• config/AppSecurityConfig.java (modified) (2 diffs)
• controllers/HomePageController.java (modified) (2 diffs)
• controllers/LoginController.java (modified) (1 diff)
• controllers/RegisterController.java (modified) (1 diff)
• controllers/rest/EventsController.java (deleted)
• controllers/rest/NomenclaturesController.java (added)
• entity/Business.java (modified) (4 diffs)
• entity/BusinessType.java (modified) (1 diff)
• entity/Search.java (deleted)
• entity/Service.java (modified) (2 diffs)
• entity/ServiceType.java (added)
• repositories/BusinessTypeRepository.java (added)
• repositories/ServiceTypeRepository.java (added)
• services/NomenclaturesService.java (added)
• services/StakeholderService.java (modified) (2 diffs)

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

@@ -45 +45 @@
         http.csrf()
                 .disable()
-                .authorizeRequests()
-                .antMatchers("/login").permitAll()
-                .antMatchers("/register_customer").permitAll()
-                .antMatchers("/register_business").permitAll()
-                .antMatchers("/homepage").permitAll()
-                .antMatchers("/css/**").permitAll()
-                .antMatchers("/js/**").permitAll()
-                .antMatchers("/anonymous*").anonymous()
-                .anyRequest()
-                .fullyAuthenticated()
-                .and()
                 .httpBasic()
                 .authenticationEntryPoint(new AppAuthenticationEntryPoint())
@@ -64 +53 @@
                 .loginProcessingUrl("/login")
                 .successHandler(authenticationSuccessHandler)
-                .defaultSuccessUrl("/homepage");
+                .defaultSuccessUrl("/homepage")
+                .and()
+                .authorizeRequests()
+                .antMatchers("/login").permitAll()
+                .antMatchers("/register_customer").permitAll()
+                .antMatchers("/register_business").permitAll()
+                .antMatchers("/api/nomenclatures/*").permitAll()
+                .antMatchers("/homepage").permitAll()
+                .antMatchers("/css/**").permitAll()
+                .antMatchers("/js/**").permitAll()
+                .antMatchers("/anonymous*").anonymous()
+                .anyRequest()
+                .fullyAuthenticated();
     }
 }

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

@@ -1 +1 @@
 package edu.gjoko.schedlr.controllers;
 
-import edu.gjoko.schedlr.entity.Search;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
+
+import java.security.Principal;
 
 @Controller
@@ -12 +12 @@
 
     @GetMapping(name = "/homepage")
-    public String getHomePageTemplate(Model model, @ModelAttribute("search")Search search ) {
-        model.addAttribute("search", search);
+    public String getHomePageTemplate(Model model, Principal principal) {
+        System.out.println(principal);
         return "homepage";
     }
 
     @PostMapping(name = "/homepage")
-    public String postHomePageTemplate(Model model, @ModelAttribute("search")Search search) {
-        model.addAttribute("search", search);
+    public String postHomePageTemplate(Model model) {
         return "homepage";
     }

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

@@ -12 +12 @@
 
     @GetMapping(path = "/login")
-    public String getMapping(Model model) {
-        model.addAttribute("stakeholder", new Stakeholder());
+    public String getMapping(@ModelAttribute Stakeholder customer, Model model) {
         return "login";
     }

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

@@ -29 +29 @@
     public String registerCustomer(@ModelAttribute Stakeholder customer, Model model) {
         Stakeholder user = stakeholderService.saveStakeholder(customer);
-        model.addAttribute("user", user);
-        return "redirect:homepage";
+        return "redirect:login";
     }
 

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

@@ -1 +1 @@
 package edu.gjoko.schedlr.entity;
 
+import com.fasterxml.jackson.annotation.JsonManagedReference;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -25 +26 @@
     private String name;
 
-    @Column(name = "business_type")
-    @Enumerated(EnumType.STRING)
+    @OneToOne
+    @JoinColumn(name = "business_type_id", referencedColumnName = "id")
     private BusinessType businessType;
 
@@ -39 +40 @@
     private Stakeholder owner;
 
+    @OneToMany(mappedBy = "business")
+    @JsonManagedReference
+    private List<Service> services;
+
     @Column(name = "created")
     private LocalDateTime created;
@@ -45 +50 @@
     private LocalDateTime modified;
 
-    @OneToMany(mappedBy = "business")
-    private List<Service> services;
+
 }

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

@@ -1 +1 @@
 package edu.gjoko.schedlr.entity;
 
-public enum BusinessType {
-    TAILOR,
-    NAIL_SALON,
-    MASSAGE_PARLOR,
-    MAKEUP_STUDIO,
-    HAIRDRESSER,
-    BARBER
+import com.fasterxml.jackson.annotation.JsonIgnore;
+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.*;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Entity
+@EntityListeners(AuditingEntityListener.class)
+@Table(name = "business_type")
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class BusinessType {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE)
+    @JsonProperty("value")
+    private Long id;
+
+    @Column(name = "name")
+    @JsonProperty("text")
+    private String name;
+
+    @OneToMany(mappedBy="businessType")
+    @JsonManagedReference
+    private List<ServiceType> serviceTypes;
+
+    @Column(name = "created")
+    @CreatedDate
+    @JsonIgnore
+    private LocalDateTime created;
+
+    @Column(name = "modified")
+    @LastModifiedDate
+    @JsonIgnore
+    private LocalDateTime modified;
 }

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

@@ -1 +1 @@
 package edu.gjoko.schedlr.entity;
 
+import com.fasterxml.jackson.annotation.JsonBackReference;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -35 +36 @@
     private Float price;
 
+    @OneToOne
+    @JoinColumn(name = "service_type_id", referencedColumnName = "id")
+    private ServiceType serviceType;
+
     @ManyToOne
-    @JoinColumn(name = "business_id")
+    @JoinColumn(name="business_fk")
+    @JsonBackReference
     private Business business;
 

src/main/java/edu/gjoko/schedlr/services/StakeholderService.java

@@ -4 +4 @@
 import edu.gjoko.schedlr.entity.StakeholderType;
 import edu.gjoko.schedlr.repositories.StakeholderRepository;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 
@@ -10 +11 @@
 
     private StakeholderRepository stakeholderRepository;
+    private BCryptPasswordEncoder bCryptPasswordEncoder;
 
-    public StakeholderService(StakeholderRepository stakeholderRepository) {
+    public StakeholderService(StakeholderRepository stakeholderRepository,
+                              BCryptPasswordEncoder bCryptPasswordEncoder) {
         this.stakeholderRepository = stakeholderRepository;
+        this.bCryptPasswordEncoder = bCryptPasswordEncoder;
     }
 
     public Stakeholder saveStakeholder(Stakeholder stakeholder) {
+        stakeholder.setPassword(bCryptPasswordEncoder.encode(stakeholder.getPassword()));
         stakeholder.setStakeholderType(StakeholderType.CUSTOMER);
         return stakeholderRepository.save(stakeholder);