Changeset 950fa0d for src/main/java/edu

Timestamp:

05/24/23 23:18:47 (18 months ago)

Author:

Gjoko Kostadinov <gjoko.kostadinov@…>

Branches:

master

Children:

77205be

Parents:

8bcd64c

Message:

Periodic update

Location:

src/main/java/edu/gjoko/schedlr

Files:

• config/AppFilter.java (modified) (2 diffs)
• config/AppSecurityConfig.java (modified) (3 diffs)
• controllers/rest/AppointmentController.java (added)
• controllers/rest/BusinessController.java (modified) (2 diffs)
• controllers/rest/NomenclatureController.java (moved) (moved from src/main/java/edu/gjoko/schedlr/controllers/rest/NomenclaturesController.java ) (2 diffs)
• controllers/rest/UserController.java (added)
• entity/Appointment.java (modified) (2 diffs)
• entity/Business.java (modified) (1 diff)
• entity/Service.java (modified) (1 diff)
• entity/ServiceType.java (modified) (1 diff)
• entity/Stakeholder.java (modified) (1 diff)
• exceptions/BlockingTimeException.java (added)
• repositories/AppointmentRepository.java (added)
• repositories/BusinessRepository.java (modified) (2 diffs)
• repositories/ServiceRepository.java (added)
• services/AppointmentsService.java (added)
• services/BusinessService.java (modified) (5 diffs)
• services/PostgresUserDetailsService.java (modified) (4 diffs)
• services/StakeholderService.java (modified) (1 diff)

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

@@ -10 +10 @@
 import org.springframework.web.filter.GenericFilterBean;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import javax.servlet.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -75 +72 @@
                             break;
                     }
-                    if(page != null && !page.trim().isEmpty()) {
+                    if(page != null && !page.trim().isEmpty() && !DispatcherType.ERROR.equals(servletRequest.getDispatcherType())) {
                         servletRequest.getRequestDispatcher(page).forward(servletRequest, servletResponse);
                         return;

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

@@ -10 +10 @@
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.config.core.GrantedAuthorityDefaults;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.web.access.AccessDeniedHandler;
 import org.springframework.security.web.authentication.AuthenticationFailureHandler;
 import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
+import org.springframework.security.web.authentication.logout.HeaderWriterLogoutHandler;
+import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
 import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
+import org.springframework.security.web.header.writers.ClearSiteDataHeaderWriter;
+
+import static org.springframework.security.web.header.writers.ClearSiteDataHeaderWriter.Directive.*;
 
 @Configuration
@@ -21 +24 @@
 @AllArgsConstructor
 public class AppSecurityConfig extends WebSecurityConfigurerAdapter {
+
+    private static final ClearSiteDataHeaderWriter.Directive[] SOURCE =
+            {CACHE, COOKIES, STORAGE, EXECUTION_CONTEXTS};
 
     private final PostgresUserDetailsService userDetailsService;
@@ -55 +61 @@
                 .defaultSuccessUrl("/homepage")
                 .and()
+                .logout(logout -> logout
+                        .logoutUrl("/logout")
+                        .logoutSuccessUrl("/login")
+                        .addLogoutHandler(new SecurityContextLogoutHandler())
+                        .addLogoutHandler(new HeaderWriterLogoutHandler(new ClearSiteDataHeaderWriter(SOURCE))))
                 .authorizeRequests()
                 .antMatchers("/login").permitAll()
+                .antMatchers("/logout").permitAll()
                 .antMatchers("/register_customer").permitAll()
                 .antMatchers("/register_business").permitAll()
                 .antMatchers("/api/nomenclatures/*").permitAll()
+                .antMatchers("/api/user/me").permitAll()
                 .antMatchers("/api/business").permitAll()
+                .antMatchers("/api/appointment").permitAll()
                 .antMatchers("/homepage").permitAll()
                 .antMatchers("/css/**").permitAll()

src/main/java/edu/gjoko/schedlr/controllers/rest/BusinessController.java

@@ -2 +2 @@
 
 import edu.gjoko.schedlr.entity.Business;
+import edu.gjoko.schedlr.entity.BusinessType;
 import edu.gjoko.schedlr.services.BusinessService;
 import lombok.AllArgsConstructor;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.*;
 
@@ -38 +37 @@
         return businessService.findByOwner(businessOwnerId);
     }
+
+    @GetMapping(path = "/{businessTypeId}")
+    public List<Business> getBusinessesByBusinessType(@PathVariable("businessTypeId") Long id) {
+        BusinessType businessType = new BusinessType();
+        businessType.setId(id);
+        return businessService.findByBusinessTypeAndActiveStatus(businessType);
+    }
 }

src/main/java/edu/gjoko/schedlr/controllers/rest/NomenclatureController.java

@@ -2 +2 @@
 
 import edu.gjoko.schedlr.entity.BusinessType;
-import edu.gjoko.schedlr.repositories.BusinessTypeRepository;
 import edu.gjoko.schedlr.services.NomenclaturesService;
 import lombok.AllArgsConstructor;
@@ -14 +13 @@
 @RequestMapping("api/nomenclatures")
 @AllArgsConstructor
-public class NomenclaturesController {
+public class NomenclatureController {
 
     private final NomenclaturesService nomenclaturesService;

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

@@ -24 +24 @@
     private Long id;
 
-    @Column(name = "start_type")
+    @Column(name = "start_time")
     private LocalDateTime startTime;
 
@@ -30 +30 @@
     private LocalDateTime endTime;
 
-    @Column(name = "price")
-    private Float price;
+    @OneToOne
+    @JoinColumn(name = "customer_id", referencedColumnName = "id")
+    private Stakeholder customer;
+
+    @ManyToOne
+    @JoinColumn(name = "business_id")
+    private Business business;
+
+    @ManyToOne
+    @JoinColumn(name = "service_id")
+    private Service service;
 
     @Column(name = "created")

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

@@ -37 +37 @@
     private BusinessType businessType;
 
-    @ManyToOne(cascade = CascadeType.PERSIST)
+    @ManyToOne()
     @JoinColumn(name = "owner_id", referencedColumnName = "id", nullable = false)
     @JsonProperty("owner")

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

@@ -33 +33 @@
     private Integer price;
 
-    @OneToOne(cascade = CascadeType.MERGE)
+    @OneToOne(cascade = CascadeType.PERSIST)
     @JoinColumn(name = "service_type_id", referencedColumnName = "id")
     private ServiceType serviceType;
 
     @ManyToOne
-    @JoinColumn(name = "business_fk")
+    @JoinColumn(name = "business_id")
     @JsonBackReference
     private Business business;

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

@@ -30 +30 @@
     private String name;
 
-
     @ManyToOne
     @JoinColumn(name = "business_type_id")

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

@@ -43 +43 @@
 
     @Column(name = "password")
-    @JsonIgnore
     private String password;
 

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

@@ -3 +3 @@
 import edu.gjoko.schedlr.entity.Business;
 import edu.gjoko.schedlr.entity.BusinessStatus;
+import edu.gjoko.schedlr.entity.BusinessType;
 import edu.gjoko.schedlr.entity.Stakeholder;
+import org.hibernate.Session;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
@@ -12 +14 @@
 public interface BusinessRepository extends JpaRepository<Business, Long> {
 
-    List<Business> findBusinessesByBusinessStatus(BusinessStatus status);
+    Business findBusinessByOwner(Stakeholder owner);
 
-    Business findBusinessByOwner(Stakeholder owner);
+    List<Business> findBusinessesByBusinessTypeAndBusinessStatus(BusinessType businessType, BusinessStatus businessStatus);
 }

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

@@ -1 +1 @@
 package edu.gjoko.schedlr.services;
 
-import edu.gjoko.schedlr.entity.Business;
-import edu.gjoko.schedlr.entity.ServiceType;
-import edu.gjoko.schedlr.entity.Stakeholder;
-import edu.gjoko.schedlr.entity.StakeholderType;
+import edu.gjoko.schedlr.entity.*;
 import edu.gjoko.schedlr.repositories.BusinessRepository;
+import edu.gjoko.schedlr.repositories.ServiceRepository;
 import edu.gjoko.schedlr.repositories.ServiceTypeRepository;
+import edu.gjoko.schedlr.repositories.StakeholderRepository;
 import lombok.AllArgsConstructor;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
@@ -13 +12 @@
 import java.util.List;
 
+import static edu.gjoko.schedlr.entity.BusinessStatus.ACTIVE;
 import static edu.gjoko.schedlr.entity.BusinessStatus.NEW;
 
@@ -21 +21 @@
     private final BusinessRepository businessRepository;
     private final ServiceTypeRepository serviceTypeRepository;
+    private final ServiceRepository serviceRepository;
+
+    private final StakeholderRepository stakeholderRepository;
     private BCryptPasswordEncoder bCryptPasswordEncoder;
 
@@ -51 +54 @@
                 .stream()
                 .forEach(business -> {
+                    stakeholderRepository.save(business.getOwner());
+                    serviceRepository.saveAll(business.getServices());
                     businessRepository.save(business);
                 });
@@ -60 +65 @@
         return businessRepository.findBusinessByOwner(owner);
     }
+
+    public List<Business> findByBusinessTypeAndActiveStatus(BusinessType businessType) {
+        return businessRepository.findBusinessesByBusinessTypeAndBusinessStatus(businessType, ACTIVE);
+    }
 }

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

@@ -8 +8 @@
 import edu.gjoko.schedlr.repositories.StakeholderRepository;
 import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
@@ -15 +14 @@
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 
@@ -26 +24 @@
 
     private final StakeholderRepository stakeholderRepository;
-    private final BCryptPasswordEncoder bCryptPasswordEncoder;
-
     private final BusinessRepository businessRepository;
 
@@ -33 +29 @@
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
         Stakeholder user = stakeholderRepository.findStakeholderByUsername(username);
-        if(user == null) {
+        if (user == null) {
             throw new UsernameNotFoundException("Non existing user");
         }
 
-        if(user.getStakeholderType() == StakeholderType.BUSINESS_OWNER) {
+        if (user.getStakeholderType() == StakeholderType.BUSINESS_OWNER) {
             Business business = businessRepository.findBusinessByOwner(user);
             if (business.getBusinessStatus() != BusinessStatus.ACTIVE) {

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

@@ -24 +24 @@
         return stakeholderRepository.save(stakeholder);
     }
+
+    public Stakeholder findById(Long id) {
+        return stakeholderRepository.findById(id).get();
+    }
 }