fix betreft email voor invite en logging van gebruiker info

pom.xml

@@ -101,6 +101,7 @@
                 <directory>src/main/resources</directory>
                 <includes>
                     <include>**/*</include>
+                    <include>templates/*</include>
                 </includes>
             </resource>
         </resources>

src/main/java/nl/veenm/paypoint/resource/AppointmentResource.java

@@ -32,9 +32,7 @@ public class AppointmentResource {
     @Produces(MediaType.APPLICATION_JSON)
     @Path("/date")
     public List<AppointmentDTO> 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);
     }
 

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) {

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);
     }
 }

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

@@ -60,12 +60,8 @@ public class AppointmentService {
     public List<AppointmentDTO> 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<Long> 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);

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

@@ -37,19 +37,23 @@ public class CompanyService {
     }
 
     @Transactional
-    public void linkCompany(Long userId, String token) {
+    public void linkCompanyWithInvite(Long userId, String token) {
-        AppUser user = userRepository.findById(userId);
         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);
-
     }
 }