Changeset f29cd58 for src/main/java

Timestamp:

01/15/24 00:11:01 (10 months ago)

Author:

gjoko kostadinov <gjokokostadinov@…>

Branches:

master

Children:

943857c

Parents:

e8999eb

Message:

Add services search functionality.

Location:

src/main/java/edu/gjoko/schedlr

Files:

• controllers/rest/ServiceApi.java (modified) (3 diffs)
• dto/ServiceDto.java (added)
• entity/Service.java (modified) (1 diff)
• mappers/ServiceDtoMapper.java (added)
• repositories/ServiceRepository.java (modified) (1 diff)
• services/ServicesService.java (modified) (3 diffs)

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

@@ -1 +1 @@
 package edu.gjoko.schedlr.controllers.rest;
 
+import edu.gjoko.schedlr.dto.ServiceDto;
 import edu.gjoko.schedlr.entity.Service;
+import edu.gjoko.schedlr.mappers.ServiceDtoMapper;
 import edu.gjoko.schedlr.services.ServicesService;
 import lombok.AllArgsConstructor;
@@ -18 +20 @@
 
     private ServicesService service;
+    private ServiceDtoMapper serviceDtoMapper;
     @PostMapping(path="/delete")
     public void saveBusiness(@RequestBody List<Service> serviceList) {
@@ -34 +37 @@
         service.saveOrUpdateServices(serviceList, ownerId);
     }
+
+    @GetMapping
+    public List<ServiceDto> searchServicesByKeyWord(@RequestParam(value = "searchKeyword", required = false) String searchKeyWord) {
+        return service.getServicesByKeyword(searchKeyWord)
+                .stream()
+                .map(serviceDtoMapper::serviceToServiceDto)
+                .toList();
+    }
 }

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

@@ -50 +50 @@
     private Business business;
 
+    @Column(name = "description")
+    private String description;
+
     @OneToMany(mappedBy="service")
     @JsonManagedReference(value = "serviceAppointments")

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

@@ -11 +11 @@
 @Repository
 public interface ServiceRepository extends JpaRepository<Service, Long> {
+
+    @Query(value = "select s from Service as s " +
+            " where (s.serviceType.name like CONCAT('%', :keyword, '%') " +
+            " or s.description like CONCAT('%', :keyword, '%'))" +
+            " and s.serviceStatus = 'ACTIVE'")
+    List<Service> getServicesByKeyword(String keyword);
 }

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

@@ -5 +5 @@
 import edu.gjoko.schedlr.entity.ServiceType;
 import edu.gjoko.schedlr.repositories.BusinessRepository;
-import edu.gjoko.schedlr.repositories.BusinessTypeRepository;
 import edu.gjoko.schedlr.repositories.ServiceRepository;
 import edu.gjoko.schedlr.repositories.ServiceTypeRepository;
@@ -29 +28 @@
     }
 
+    public List<edu.gjoko.schedlr.entity.Service> getServicesByKeyword(String keyword) {
+        return serviceRepository.getServicesByKeyword(keyword);
+    }
+
     public void saveOrUpdateServices(List<edu.gjoko.schedlr.entity.Service> serviceList, Long ownerId) {
         if (!CollectionUtils.isEmpty(serviceList)) {
@@ -38 +41 @@
                     found.setPrice(service.getPrice());
                     found.setServiceStatus(ServiceStatus.ACTIVE);
+                    found.setDescription(service.getDescription());
                     serviceRepository.save(found);
                 } else {