From ce8e83c40ac9bb427e2087bea05c4df2f40d807d Mon Sep 17 00:00:00 2001 From: veenm Date: Sat, 19 Apr 2025 12:39:12 +0200 Subject: [PATCH] fix betreft email voor invite en logging van gebruiker info --- pom.xml | 1 + .../paypoint/resource/AppointmentResource.java | 2 -- .../veenm/paypoint/resource/AuthResource.java | 18 ------------------ .../paypoint/resource/CompanyResource.java | 8 +++++++- .../paypoint/service/AppointmentService.java | 4 ---- .../veenm/paypoint/service/CompanyService.java | 18 +++++++++++------- 6 files changed, 19 insertions(+), 32 deletions(-) diff --git a/pom.xml b/pom.xml index 8a04e85..29289a6 100644 --- a/pom.xml +++ b/pom.xml @@ -101,6 +101,7 @@ src/main/resources **/* + templates/* diff --git a/src/main/java/nl/veenm/paypoint/resource/AppointmentResource.java b/src/main/java/nl/veenm/paypoint/resource/AppointmentResource.java index c51dcf8..d6ecf54 100644 --- a/src/main/java/nl/veenm/paypoint/resource/AppointmentResource.java +++ b/src/main/java/nl/veenm/paypoint/resource/AppointmentResource.java @@ -32,9 +32,7 @@ public class AppointmentResource { @Produces(MediaType.APPLICATION_JSON) @Path("/date") public List getAppointmentsByDate(@QueryParam("start") String start) { - System.out.println("getting appointments from " + start); String user = jwt.getClaim("username"); - System.out.println("user " + user); return appointmentService.getAppointmentsByDate(start, user); } diff --git a/src/main/java/nl/veenm/paypoint/resource/AuthResource.java b/src/main/java/nl/veenm/paypoint/resource/AuthResource.java index 3cec84c..a476da0 100644 --- a/src/main/java/nl/veenm/paypoint/resource/AuthResource.java +++ b/src/main/java/nl/veenm/paypoint/resource/AuthResource.java @@ -26,24 +26,6 @@ public class AuthResource { return Response.ok().build(); } -// @POST -// @Path("/login") -// @PermitAll -// @Consumes(MediaType.APPLICATION_JSON) -// public Response login(AuthDTO user) { -// System.out.println(user); -// System.out.println("admin".equals(user.getUsername()) && "password".equals(user.getPassword())); -// if ("admin".equals(user.getUsername()) && "password".equals(user.getPassword())) { -// UserDTO userDTO = new UserDTO(); -// userDTO.setUsername(user.getUsername()); -// userDTO.setEmail("vanveenmel11@gmail.com"); -// userDTO.setFullName("Mel van Veen"); -// userDTO.setToken(tokenService.generateToken(user.getUsername())); -// return Response.ok(userDTO).build(); -// } -// return Response.status(Response.Status.UNAUTHORIZED).build(); -// } - @POST @Path("/login") public Response login(AppUser user) { diff --git a/src/main/java/nl/veenm/paypoint/resource/CompanyResource.java b/src/main/java/nl/veenm/paypoint/resource/CompanyResource.java index e5f0751..367acfa 100644 --- a/src/main/java/nl/veenm/paypoint/resource/CompanyResource.java +++ b/src/main/java/nl/veenm/paypoint/resource/CompanyResource.java @@ -35,6 +35,12 @@ public class CompanyResource { @POST @Path("/link") public void linkCompany(@QueryParam("user") Long userId, @QueryParam("token") String token) { - this.companyService.linkCompany(userId, token); + this.companyService.linkCompanyWithInvite(userId, token); + } + + @POST + @Path("/link/noInvite") + public void linkCompanyToNewUser(@QueryParam("user") Long userId, @QueryParam("company") Long companyId) { + this.companyService.linkCompany(userId, companyId); } } diff --git a/src/main/java/nl/veenm/paypoint/service/AppointmentService.java b/src/main/java/nl/veenm/paypoint/service/AppointmentService.java index aca3f13..033b2ba 100644 --- a/src/main/java/nl/veenm/paypoint/service/AppointmentService.java +++ b/src/main/java/nl/veenm/paypoint/service/AppointmentService.java @@ -60,12 +60,8 @@ public class AppointmentService { public List getAppointmentsByDate(String start, String username) { LocalDate date = LocalDate.parse(start); AppUser user = userRepository.findByUsername(username); - System.out.println("user " + user); AppUserDTO appUserDTO = AppUserMapper.toDTO(user); - System.out.println("appUserDTO " + appUserDTO); Set companies = appUserDTO.getCompanies().stream().map(UserCompanyDTO::getCompany).map(CompanyDTO::getId).collect(Collectors.toSet()); - System.out.println("companies " + companies); - LocalDateTime startOfDay = date.atStartOfDay(); LocalDateTime endOfDay = date.atTime(23, 59, 59); diff --git a/src/main/java/nl/veenm/paypoint/service/CompanyService.java b/src/main/java/nl/veenm/paypoint/service/CompanyService.java index a3cd69f..02d22d7 100644 --- a/src/main/java/nl/veenm/paypoint/service/CompanyService.java +++ b/src/main/java/nl/veenm/paypoint/service/CompanyService.java @@ -37,19 +37,23 @@ public class CompanyService { } @Transactional - public void linkCompany(Long userId, String token) { - AppUser user = userRepository.findById(userId); + public void linkCompanyWithInvite(Long userId, String token) { InviteEntity invite = inviteRepository.findByToken(token); - Company company = companyRepository.findById(invite.company_id); + linkCompany(userId, invite.company_id); + + invite.used = true; + inviteRepository.persist(invite); + } + + @Transactional + public void linkCompany(Long userId, Long companyId) { + AppUser user = userRepository.findById(userId); + Company company = companyRepository.findById(companyId); UserCompany userCompany = new UserCompany(); userCompany.setUser(user); userCompany.setCompany(company); userCompany.setAccessLevel(AccessLevel.USER); userCompanyRepository.persist(userCompany); - - invite.used = true; - inviteRepository.persist(invite); - } }