Changeset 5168b2e

Timestamp:

01/09/23 13:35:57 (2 years ago)

Author:

DarkoSasanski <darko.sasanski@…>

Branches:

main

Children:

aad0fb3

Parents:

f7b963f

Message:

Implemented adding new worker at location

Location:

FullyStocked/src/main

Files:

• java/com/bazi/fullystocked/Services/Implementations/ArticlesServiceImpl.java (modified) (2 diffs)
• java/com/bazi/fullystocked/Services/Implementations/WorkersServiceImpl.java (modified) (2 diffs)
• java/com/bazi/fullystocked/Services/WorkersService.java (modified) (1 diff)
• java/com/bazi/fullystocked/Web/Controller/ManagerController.java (modified) (2 diffs)
• resources/templates/noLocWorkers.html (added)

FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/ArticlesServiceImpl.java

@@ -38 +38 @@
             throw new InvalidArgumentsException();
         }
-        return Optional.of(articlesRepository.save(new Articles(description, articlename, maxquantityperlocation)));
+        return Optional.of(articlesRepository.saveAndFlush(new Articles(description, articlename, maxquantityperlocation)));
     }
 
@@ -48 +48 @@
             throw new InvalidArgumentsException();
         }
-        return Optional.of(articlesRepository.save(new Articles(description, articlename, imageurl, maxquantityperlocation)));
+        return Optional.of(articlesRepository.saveAndFlush(new Articles(description, articlename, imageurl, maxquantityperlocation)));
     }
 

FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/WorkersServiceImpl.java

@@ -9 +9 @@
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Optional;
 
@@ -26 +27 @@
         Locations location=locationsRepository.findById(locationId).orElseThrow(InvalidArgumentsException::new);
         worker.setLocation(location);
-        return Optional.of(worker);
+        return Optional.of(workersRepository.save(worker));
+    }
+
+    @Override
+    public List<Workers> findAllWithNoLocation() {
+        return workersRepository.findAllByLocationIsNull();
     }
 }

FullyStocked/src/main/java/com/bazi/fullystocked/Services/WorkersService.java

@@ -6 +6 @@
 public interface WorkersService {
     Optional<Workers> assignLocation(Integer workerId, Integer locationId);
+    List<Workers> findAllWithNoLocation();
 }

FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/ManagerController.java

@@ -1 +1 @@
 package com.bazi.fullystocked.Web.Controller;
 
+import com.bazi.fullystocked.Services.LocationsService;
+import com.bazi.fullystocked.Services.WorkersService;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 @Controller
 @RequestMapping(value ="/manager")
 public class ManagerController {
+    private final WorkersService workersService;
+    private final LocationsService locationsService;
+
+    public ManagerController(WorkersService workersService, LocationsService locationsService) {
+        this.workersService = workersService;
+        this.locationsService = locationsService;
+    }
+
     @GetMapping
     public String getManagerPage()
@@ -14 +27 @@
         return "homeManager";
     }
+
+    @GetMapping("/noLocWorkers")
+    public String listWorkersWithNullLocation(Model model)
+    {
+        model.addAttribute("workers", workersService.findAllWithNoLocation());
+        model.addAttribute("locations", locationsService.findAll());
+        return "noLocWorkers";
+    }
+    @PostMapping("/noLocWorkers/add")
+    public String addWorkerToLocation(@RequestParam Integer workerId, @RequestParam Integer locationId)
+    {
+        try{
+            workersService.assignLocation(workerId, locationId);
+            return "redirect:/manager/noLocWorkers";
+        }
+        catch (Exception e)
+        {
+            return "redirect:/manager/noLocWorkers?error="+e.getMessage();
+        }
+    }
 }