fix betreft email voor invite en logging van gebruiker info
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user