Changeset 1413ee2 for src/main/java/edu/gjoko

Timestamp:

01/03/24 00:00:07 (11 months ago)

Author:

gjoko kostadinov <gjokokostadinov@…>

Branches:

master

Children:

53765dd

Parents:

77205be

Message:

Add all bug fixes.

Location:

src/main/java/edu/gjoko/schedlr

Files:

• controllers/RegisterController.java (modified) (1 diff)
• controllers/rest/AdminApi.java (added)
• controllers/rest/BusinessApi.java (modified) (1 diff)
• controllers/rest/CustomerApi.java (modified) (1 diff)
• controllers/rest/ServiceApi.java (added)
• entity/Service.java (modified) (1 diff)
• entity/ServiceStatus.java (added)
• repositories/BusinessRepository.java (modified) (1 diff)
• repositories/ServiceRepository.java (modified) (1 diff)
• repositories/ServiceTypeRepository.java (modified) (1 diff)
• services/BusinessService.java (modified) (4 diffs)
• services/ServicesService.java (added)
• services/StakeholderService.java (modified) (2 diffs)

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

@@ -3 +3 @@
 import edu.gjoko.schedlr.entity.Stakeholder;
 import edu.gjoko.schedlr.services.StakeholderService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;

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

@@ -27 +27 @@
 
     @PatchMapping
-    public void updateBusinesses(@RequestBody List<Business> businessList) {
-        businessService.updateBusinesses(businessList);
+    public void updateBusinesses(@RequestBody List<Business> businessList, HttpServletRequest request) {
+        Long businessOwnerId = (long) request.getSession(true).getAttribute("stakeholderId");
+        businessService.updateBusinesses(businessList, businessOwnerId);
     }
 

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

@@ -24 +24 @@
 
     @PatchMapping
-    public void updateCustomer(@RequestBody Stakeholder stakeholder) {
-        stakeholderService.saveOrUpdateStakeholder(stakeholder);
+    public void updateCustomer(@RequestBody Stakeholder stakeholder, HttpServletRequest request) {
+        Long customerId = (long) request.getSession(true).getAttribute("stakeholderId");
+        stakeholderService.saveOrUpdateStakeholder(stakeholder, customerId);
     }
 }

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

@@ -54 +54 @@
     private List<Appointment> appointments;
 
+    @Column(name = "service_status")
+    @Enumerated(EnumType.STRING)
+    private ServiceStatus serviceStatus;
+
     @Column(name = "created")
     @CreatedDate

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

@@ -16 +16 @@
     Business findBusinessByOwner(Stakeholder owner);
 
-    List<Business> findBusinessesByBusinessTypeAndBusinessStatus(BusinessType businessType, BusinessStatus businessStatus);
-
+    Business findBusinessesByOwner_Id(Long ownerId);
     List<Business> findBusinessesByBusinessStatusAndBusinessType_Id(BusinessStatus businessStatus, Long id);
 }

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

@@ -1 +1 @@
 package edu.gjoko.schedlr.repositories;
 
-import edu.gjoko.schedlr.entity.Business;
 import edu.gjoko.schedlr.entity.Service;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
+
+import java.util.List;
 
 @Repository

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

@@ -4 +4 @@
 import edu.gjoko.schedlr.entity.ServiceType;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 

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

@@ -1 +1 @@
 package edu.gjoko.schedlr.services;
 
-import edu.gjoko.schedlr.entity.*;
-import edu.gjoko.schedlr.repositories.*;
+import edu.gjoko.schedlr.entity.Business;
+import edu.gjoko.schedlr.entity.Stakeholder;
+import edu.gjoko.schedlr.entity.StakeholderType;
+import edu.gjoko.schedlr.repositories.BusinessRepository;
 import lombok.AllArgsConstructor;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
 import java.util.List;
@@ -18 +19 @@
 
     private final BusinessRepository businessRepository;
-    private final ServiceTypeRepository serviceTypeRepository;
-    private final ServiceRepository serviceRepository;
+    private final ServicesService servicesService;
     private final StakeholderService stakeholderService;
-
-    private final StakeholderRepository stakeholderRepository;
     private BCryptPasswordEncoder bCryptPasswordEncoder;
 
     public void saveBusiness(Business business) {
-        saveNewServiceTypes(business);
+        servicesService.saveNewServiceTypes(business);
         business.getOwner().setStakeholderType(StakeholderType.BUSINESS_OWNER);
         business.getOwner().setPassword(bCryptPasswordEncoder.encode(business.getOwner().getPassword()));
@@ -33 +31 @@
     }
 
-    public void saveNewServiceTypes(Business business) {
-        business.getServices()
-                .stream()
-                .forEach(service -> {
-                    if (service.getServiceType().getId() == null) {
-                        ServiceType serviceType = service.getServiceType();
-                        serviceType.setBusinessType(business.getBusinessType());
-                        service.setServiceType(serviceTypeRepository.save(serviceType));
-                    }
-                });
-    }
-
     public List<Business> findAll() {
         return businessRepository.findAll();
     }
 
-    public void updateBusinesses(List<Business> businessList) {
+    public void updateBusinesses(List<Business> businessList, Long businessOwnerId) {
         businessList
                 .stream()
                 .forEach(business -> {
-                    stakeholderService.saveOrUpdateStakeholder(business.getOwner());
-                    saveOrUpdateServices(business.getServices());
-                    saveOrUpdateBusiness(business);
+                    stakeholderService.saveOrUpdateStakeholder(business.getOwner(), businessOwnerId);
+                });
+    }
+
+    public void updateBusinessStatuses(List<Business> businessList) {
+        businessList
+                .stream()
+                .forEach(business -> {
+                    Business business1 = businessRepository.findById(business.getId()).get();
+                    business1.setBusinessStatus(business.getBusinessStatus());
+                    businessRepository.save(business1);
                 });
     }
@@ -68 +62 @@
         return businessRepository.findBusinessesByBusinessStatusAndBusinessType_Id(ACTIVE, businessTypeId);
     }
-
-
-
-    private void saveOrUpdateBusiness(Business business) {
-        if (business.getId() != null) {
-            var foundBusinessEntity = businessRepository.findById(business.getId());
-            business.setCreated(foundBusinessEntity.get().getCreated());
-        }
-        businessRepository.save(business);
-    }
-
-    private void saveOrUpdateServices(List<edu.gjoko.schedlr.entity.Service> serviceList) {
-        if (!CollectionUtils.isEmpty(serviceList)) {
-            serviceList.forEach( service -> {
-                if (service.getId() != null) {
-                    var found = serviceRepository.findById(service.getId());
-                    service.setCreated(found.get().getCreated());
-                }
-            });
-            serviceRepository.saveAll(serviceList);
-        }
-    }
 }

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

@@ -4 +4 @@
 import edu.gjoko.schedlr.entity.StakeholderType;
 import edu.gjoko.schedlr.repositories.StakeholderRepository;
+import lombok.RequiredArgsConstructor;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 
-import java.util.Optional;
-
 @Service
+@RequiredArgsConstructor
 public class StakeholderService {
 
-    private StakeholderRepository stakeholderRepository;
-    private BCryptPasswordEncoder bCryptPasswordEncoder;
+    private final StakeholderRepository stakeholderRepository;
+    private final BCryptPasswordEncoder bCryptPasswordEncoder;
 
-    public StakeholderService(StakeholderRepository stakeholderRepository,
-                              BCryptPasswordEncoder bCryptPasswordEncoder) {
-        this.stakeholderRepository = stakeholderRepository;
-        this.bCryptPasswordEncoder = bCryptPasswordEncoder;
-    }
-
-    public Stakeholder saveStakeholder(Stakeholder stakeholder) {
+    public void saveStakeholder(Stakeholder stakeholder) {
         stakeholder.setPassword(bCryptPasswordEncoder.encode(stakeholder.getPassword()));
         stakeholder.setStakeholderType(StakeholderType.CUSTOMER);
-        return stakeholderRepository.save(stakeholder);
+        stakeholderRepository.save(stakeholder);
     }
 
@@ -31 +25 @@
     }
 
-    public void saveOrUpdateStakeholder(Stakeholder stakeholder) {
-        if (stakeholder.getId() != null) {
-            var found = stakeholderRepository.findById(stakeholder.getId()).get();
-            found.setFirstName(stakeholder.getFirstName());
-            found.setLastName(stakeholder.getLastName());
-            found.setPhoneNumber(stakeholder.getPhoneNumber());
-            found.setEmail(stakeholder.getEmail());
-            found.setUsername(stakeholder.getUsername());
-            stakeholderRepository.save(found);
-        }
+    public void saveOrUpdateStakeholder(Stakeholder stakeholder, Long businessOwnerId) {
+        var found = stakeholderRepository.findById(businessOwnerId).get();
+        found.setFirstName(stakeholder.getFirstName());
+        found.setLastName(stakeholder.getLastName());
+        found.setPhoneNumber(stakeholder.getPhoneNumber());
+        found.setEmail(stakeholder.getEmail());
+        found.setUsername(stakeholder.getUsername());
+        stakeholderRepository.save(found);
     }
 }