Changeset 9050790 for src/main/java/edu/gjoko

Timestamp:

03/13/23 23:30:41 (21 months ago)

Author:

Gjoko Kostadinov <gjoko.kostadinov@…>

Branches:

master

Children:

8bcd64c

Parents:

46fd0c7

Message:

Add admin functionality for activating or deactivating companies

Location:

src/main/java/edu/gjoko/schedlr

Files:

• config/AppFilter.java (modified) (1 diff)
• controllers/rest/BusinessController.java (modified) (1 diff)
• entity/BusinessStatus.java (modified) (1 diff)
• services/BusinessService.java (modified) (3 diffs)

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

@@ -24 +24 @@
         HttpSession session = httpServletRequest.getSession(false);
 
-        if(httpServletRequest.getRequestURI().endsWith(".js") || httpServletRequest.getRequestURI().endsWith(".css")) {
+        if(httpServletRequest.getRequestURI().endsWith(".js")
+                || httpServletRequest.getRequestURI().endsWith(".css")
+                || httpServletRequest.getRequestURI().startsWith("/api")) {
             filterChain.doFilter(servletRequest, servletResponse);
             return;

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

@@ -21 +21 @@
 
     @GetMapping
-    public List<Business> getNewBusinesses() {
-        return businessService.getNewBusiness();
+    public List<Business> findAll() {
+        return businessService.findAll();
     }
 
     @PatchMapping
-    public void activateBusinesses(@RequestBody List<Business> businessList) {
-        businessService.activateBusinesses(businessList);
+    public void updateBusinesses(@RequestBody List<Business> businessList) {
+        businessService.updateBusinesses(businessList);
     }
 }

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

@@ -4 +4 @@
     NEW,
     ACTIVE,
-    BLOCKED
+    DEACTIVATED
 }

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

@@ -2 +2 @@
 
 import edu.gjoko.schedlr.entity.Business;
-import edu.gjoko.schedlr.entity.BusinessStatus;
 import edu.gjoko.schedlr.entity.ServiceType;
 import edu.gjoko.schedlr.entity.StakeholderType;
@@ -11 +10 @@
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 import static edu.gjoko.schedlr.entity.BusinessStatus.ACTIVE;
@@ -32 +30 @@
     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));
-                }
-            });
+                .stream()
+                .forEach(service -> {
+                    if (service.getServiceType().getId() == null) {
+                        ServiceType serviceType = service.getServiceType();
+                        serviceType.setBusinessType(business.getBusinessType());
+                        service.setServiceType(serviceTypeRepository.save(serviceType));
+                    }
+                });
     }
 
-    public List<Business> getNewBusiness() {
-        return businessRepository.findBusinessesByBusinessStatus(NEW);
+    public List<Business> findAll() {
+        return businessRepository.findAll();
     }
 
-    public void activateBusinesses(List<Business> businessList) {
+    public void updateBusinesses(List<Business> businessList) {
         businessList
                 .stream()
                 .forEach(business -> {
-                    business.setBusinessStatus(ACTIVE);
                     businessRepository.save(business);
                 });