Changeset 8bcd64c for src/main/java/edu/gjoko/schedlr/services

Timestamp:

04/19/23 21:19:08 (15 months ago)

Author:

Gjoko Kostadinov <gjoko.kostadinov@…>

Branches:

master

Children:

950fa0d

Parents:

9050790

Message:

Add admin functionality and business admin functionality.

Location:

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

Files:

• BusinessService.java (modified) (3 diffs)
• PostgresUserDetailsService.java (modified) (4 diffs)

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

@@ -3 +3 @@
 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.repositories.BusinessRepository;
 import edu.gjoko.schedlr.repositories.ServiceTypeRepository;
 import lombok.AllArgsConstructor;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 
-import static edu.gjoko.schedlr.entity.BusinessStatus.ACTIVE;
 import static edu.gjoko.schedlr.entity.BusinessStatus.NEW;
 
@@ -20 +21 @@
     private final BusinessRepository businessRepository;
     private final ServiceTypeRepository serviceTypeRepository;
+    private BCryptPasswordEncoder bCryptPasswordEncoder;
 
     public void saveBusiness(Business business) {
         saveNewServiceTypes(business);
         business.getOwner().setStakeholderType(StakeholderType.BUSINESS_OWNER);
+        business.getOwner().setPassword(bCryptPasswordEncoder.encode(business.getOwner().getPassword()));
         business.setBusinessStatus(NEW);
         businessRepository.save(business);
@@ -52 +55 @@
     }
 
+    public Business findByOwner(Long ownerId) {
+        var owner = new Stakeholder();
+        owner.setId(ownerId);
+        return businessRepository.findBusinessByOwner(owner);
+    }
 }

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

@@ -1 +1 @@
 package edu.gjoko.schedlr.services;
 
+import edu.gjoko.schedlr.entity.Business;
+import edu.gjoko.schedlr.entity.BusinessStatus;
 import edu.gjoko.schedlr.entity.Stakeholder;
+import edu.gjoko.schedlr.entity.StakeholderType;
+import edu.gjoko.schedlr.repositories.BusinessRepository;
 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;
@@ -16 +22 @@
 
 @Service
+@RequiredArgsConstructor
 public class PostgresUserDetailsService implements UserDetailsService {
 
@@ -21 +28 @@
     private final BCryptPasswordEncoder bCryptPasswordEncoder;
 
-    public PostgresUserDetailsService(StakeholderRepository stakeholderRepository,
-                                      BCryptPasswordEncoder bCryptPasswordEncoder) {
-        this.stakeholderRepository = stakeholderRepository;
-        this.bCryptPasswordEncoder = bCryptPasswordEncoder;
-    }
+    private final BusinessRepository businessRepository;
 
     @Override
@@ -33 +36 @@
             throw new UsernameNotFoundException("Non existing user");
         }
+
+        if(user.getStakeholderType() == StakeholderType.BUSINESS_OWNER) {
+            Business business = businessRepository.findBusinessByOwner(user);
+            if (business.getBusinessStatus() != BusinessStatus.ACTIVE) {
+                throw new SecurityException("User not approved by admin");
+            }
+        }
         Set<GrantedAuthority> grantedAuthorities = new HashSet<>();
         grantedAuthorities.add(new SimpleGrantedAuthority(user.getStakeholderType().name()));
+
         return new User(user.getUsername(), user.getPassword(), grantedAuthorities);
     }
+
+    public Long loadStakeholderId(String username) {
+        return stakeholderRepository.findStakeholderByUsername(username).getId();
+    }
 }