fix betreft afspraken

src/main/java/nl/veenm/paypoint/service/AppointmentService.java

@@ -8,9 +8,11 @@ import nl.veenm.paypoint.domain.AppUser;
 import nl.veenm.paypoint.domain.Appointment;
 import nl.veenm.paypoint.domain.Company;
 import nl.veenm.paypoint.domain.dto.AppUserDTO;
+import nl.veenm.paypoint.domain.dto.AppointmentDTO;
 import nl.veenm.paypoint.domain.dto.CompanyDTO;
 import nl.veenm.paypoint.domain.dto.UserCompanyDTO;
 import nl.veenm.paypoint.domain.mapper.AppUserMapper;
+import nl.veenm.paypoint.domain.mapper.AppointmentMapper;
 import nl.veenm.paypoint.repository.AppointmentRepository;
 import nl.veenm.paypoint.repository.CompanyRepository;
 import nl.veenm.paypoint.repository.UserRepository;
@@ -45,17 +47,17 @@ public class AppointmentService {
     }
 
     @Transactional
-    public Appointment add(Appointment appointment, Long companyId, String username) {
+    public AppointmentDTO add(Appointment appointment, Long companyId, String username) {
         Company company = companyRepository.findById(companyId);
         AppUser user = userRepository.findByUsername(username);
         appointment.setCompany(company);
         appointmentRepository.persist(appointment);
         emailService.stuurBevestiging(appointment, user);
-        return appointment;
+        return AppointmentMapper.toDto(appointment);
     }
 
     @Transactional
-    public List<Appointment> getAppointmentsByDate(String start, String username) {
+    public List<AppointmentDTO> getAppointmentsByDate(String start, String username) {
         LocalDate date = LocalDate.parse(start);
         AppUser user = userRepository.findByUsername(username);
         System.out.println("user " + user);
@@ -69,8 +71,7 @@ public class AppointmentService {
         LocalDateTime endOfDay = date.atTime(23, 59, 59);
 
         List<Appointment> appointmentsForCompanies = appointmentRepository.findAppointmentsForCompanies(companies, startOfDay, endOfDay);
-        System.out.println(appointmentsForCompanies);
-        return appointmentsForCompanies;
+        return appointmentsForCompanies.stream().map(AppointmentMapper::toDto).toList();
     }
 
     @Transactional
@@ -80,7 +81,7 @@ public class AppointmentService {
     }
 
     @Transactional
-    public Appointment update(Appointment appointment) {
+    public AppointmentDTO update(AppointmentDTO appointment) {
         Appointment appointmentToUpdate = appointmentRepository.findById(appointment.getId());
         appointmentToUpdate.setTitle(appointment.getTitle());
         appointmentToUpdate.setStartDate(appointment.getStartDate());
@@ -93,12 +94,13 @@ public class AppointmentService {
         appointmentToUpdate.setDurationInMinutes(appointment.getDurationInMinutes());
         appointmentRepository.persist(appointmentToUpdate);
         emailService.stuurBewerking(appointmentToUpdate);
-        return appointmentToUpdate;
+        return AppointmentMapper.toDto(appointmentToUpdate);
     }
 
     @Transactional
-    public Appointment getAppointment(Long id) {
-        return appointmentRepository.findById(id);
+    public AppointmentDTO getAppointment(Long id) {
+        Appointment byId = appointmentRepository.findById(id);
+        return AppointmentMapper.toDto(byId);
     }
 
     @Transactional