Changeset 98f448a for sources/app/src/main/java/parkup/services/WorkerService.java

Timestamp:

02/02/22 19:35:14 (3 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

80ddcae, c71fa06

Parents:

df4089c

Message:

parkingZone and parkingSession services fix

File:

• sources/app/src/main/java/parkup/services/WorkerService.java (modified) (3 diffs)

sources/app/src/main/java/parkup/services/WorkerService.java

@@ -31 +31 @@
     }
 
-    public List<WorkerDemo> getWorkers() {
-        return this.workerRepository.findAll().stream().map(WorkerDemo::new).collect(Collectors.toList());
+    public List<Worker> getWorkers() {
+        return this.workerRepository.findAll();
     }
 
     public WorkerDemoParkingZones findById(int workerId) {
         Worker worker = this.workerRepository.findByWorkerId(workerId);
-        WorkerDemoParkingZones workerToReturn = new WorkerDemoParkingZones(worker);
-        return workerToReturn;
+        return new WorkerDemoParkingZones(worker);
     }
 
@@ -103 +102 @@
         Optional<Worker> workerOpt = Optional.ofNullable(this.workerRepository.findByWorkerId(workerId));
         if (workerOpt.isPresent()) {
-
             if (email != null && email.length() > 1 && email.contains("@") ) {
                 List<String> emails = workerRepository.findAll().stream().map(Worker::getEmail).collect(Collectors.toList());
@@ -117 +115 @@
                 workerOpt.get().setPassword(bCryptPasswordEncoder.encode(password));
             }
-            workerOpt.get().setLocked(locked);
+            workerOpt.get().setAccount(locked);
 
             if (firstName != null && firstName.length() > 1 && !Objects.equals(workerOpt.get().getFirstName(), firstName)) {