Merge pull request slabiak#25 from slabiak/develop

release 1.0.3
sportbug16 · Dec 23, 2020 · 24a7981 · 24a7981
2 parents 46be264 + 058a375
commit 24a7981
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.example.slabiak</groupId>
 	<artifactId>appointmentscheduler</artifactId>
-	<version>1.0.2</version>
+	<version>1.0.3</version>
 	<name>appointmentscheduler</name>
 	<description>Demo project for Spring Boot</description>
 

diff --git a/src/main/java/com/example/slabiak/appointmentscheduler/controller/AjaxController.java b/src/main/java/com/example/slabiak/appointmentscheduler/controller/AjaxController.java
@@ -2,7 +2,6 @@
 
 import com.example.slabiak.appointmentscheduler.entity.Appointment;
 import com.example.slabiak.appointmentscheduler.model.AppointmentRegisterForm;
-import com.example.slabiak.appointmentscheduler.model.TimePeroid;
 import com.example.slabiak.appointmentscheduler.security.CustomUserDetails;
 import com.example.slabiak.appointmentscheduler.service.AppointmentService;
 import com.example.slabiak.appointmentscheduler.service.NotificationService;
@@ -14,8 +13,8 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import java.time.LocalDate;
-import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @RequestMapping("/api")
 @RestController
@@ -44,18 +43,15 @@ else if (currentUser.hasRole("ROLE_ADMIN"))
     @GetMapping("/availableHours/{providerId}/{workId}/{date}")
     public List<AppointmentRegisterForm> getAvailableHours(@PathVariable("providerId") int providerId, @PathVariable("workId") int workId, @PathVariable("date") String date, @AuthenticationPrincipal CustomUserDetails currentUser) {
         LocalDate localDate = LocalDate.parse(date);
-        List<TimePeroid> peroids = appointmentService.getAvailableHours(providerId, currentUser.getId(), workId, localDate);
-        List<AppointmentRegisterForm> appointments = new ArrayList<>();
-        for (TimePeroid peroid : peroids) {
-            appointments.add(new AppointmentRegisterForm(workId, providerId, peroid.getStart().atDate(localDate), peroid.getEnd().atDate(localDate)));
-        }
-        return appointments;
+        return appointmentService.getAvailableHours(providerId, currentUser.getId(), workId, localDate)
+                .stream()
+                .map(timePeriod -> new AppointmentRegisterForm(workId, providerId, timePeriod.getStart().atDate(localDate), timePeriod.getEnd().atDate(localDate)))
+                .collect(Collectors.toList());
     }
 
     @GetMapping("/user/notifications")
     public int getUnreadNotificationsCount(@AuthenticationPrincipal CustomUserDetails currentUser) {
         return notificationService.getUnreadNotifications(currentUser.getId()).size();
     }
 
-
 }
diff --git a/src/main/resources/templates/appointments/listAppointments.html b/src/main/resources/templates/appointments/listAppointments.html
@@ -52,7 +52,7 @@
                 <th></th>
                 <th></th>
                 <th></th>
-                <th></th>
+                <th  sec:authorize="hasRole('ROLE_ADMIN')"></th>
             </tr>
             </tfoot>
         </table>