Changeset 53765dd for src/main/java/edu

Timestamp:

01/04/24 09:07:47 (6 months ago)

Author:

gjoko kostadinov <gjokokostadinov@…>

Branches:

master

Children:

e8999eb

Parents:

1413ee2

Message:

Fix bugs.

Location:

src/main/java/edu/gjoko/schedlr

Files:

• config/AppSecurityConfig.java (modified) (1 diff)
• controllers/LoginController.java (modified) (1 diff)
• controllers/rest/NomenclatureApi.java (modified) (2 diffs)
• entity/Service.java (modified) (1 diff)
• repositories/ServiceTypeRepository.java (modified) (1 diff)
• services/NomenclaturesService.java (modified) (2 diffs)

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

@@ -68 +68 @@
                 .antMatchers("/register_customer").permitAll()
                 .antMatchers("/register_business").permitAll()
-                .antMatchers("/api/nomenclatures/*").permitAll()
+                .antMatchers("/api/nomenclature/*").permitAll()
                 .antMatchers("/api/user/me").permitAll()
                 .antMatchers("/api/business").permitAll()

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

@@ -22 +22 @@
     @PostMapping(path = "/login")
     public String loginCustomer(@ModelAttribute Stakeholder customer, Model model) {
-        return "redirect:homepage";
+        return "redirect:login";
     }
 }

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

@@ -2 +2 @@
 
 import edu.gjoko.schedlr.entity.BusinessType;
+import edu.gjoko.schedlr.entity.ServiceType;
 import edu.gjoko.schedlr.services.NomenclaturesService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 @RestController
-@RequestMapping("api/nomenclatures")
+@RequestMapping("api/nomenclature")
 @AllArgsConstructor
 public class NomenclatureApi {
@@ -20 +23 @@
         return nomenclaturesService.getBusinessTypes();
     }
+
+    @GetMapping( "/serviceTypes/me")
+    public List<ServiceType> getServiceTypesForBusinessType( HttpServletRequest request) {
+        Long ownerId = (long) request.getSession(true).getAttribute("stakeholderId");
+        return nomenclaturesService.findAppropriateBusinessTypesForBusinessByOwnerId(ownerId);
+    }
 }

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

@@ -56 +56 @@
     @Column(name = "service_status")
     @Enumerated(EnumType.STRING)
-    private ServiceStatus serviceStatus;
+    private ServiceStatus serviceStatus = ServiceStatus.ACTIVE;
 
     @Column(name = "created")

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

@@ -1 +1 @@
 package edu.gjoko.schedlr.repositories;
 
-import edu.gjoko.schedlr.entity.BusinessType;
+import edu.gjoko.schedlr.entity.Service;
 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;
 
+import java.util.List;
+
 @Repository
 public interface ServiceTypeRepository extends JpaRepository<ServiceType, Long> {
+
+    List<ServiceType> findAllByBusinessType_Id(Long businessTypeId);
+
+    @Query(value = "select b.businessType.serviceTypes from Business as b " +
+            " where b.owner.id = :ownerId")
+    List<ServiceType> findAppropriateBusinessTypesForBusinessByOwnerId(Long ownerId);
 }

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

@@ -2 +2 @@
 
 import edu.gjoko.schedlr.entity.BusinessType;
+import edu.gjoko.schedlr.entity.ServiceType;
 import edu.gjoko.schedlr.repositories.BusinessTypeRepository;
 import edu.gjoko.schedlr.repositories.ServiceTypeRepository;
@@ -20 +21 @@
         return businessTypeRepository.findAll();
     }
+
+    public List<ServiceType> findAppropriateBusinessTypesForBusinessByOwnerId(Long ownerId) {
+        return serviceTypeRepository.findAppropriateBusinessTypesForBusinessByOwnerId(ownerId);
+    }
 }