Skip to content

Commit 17dc7ed

Browse files
isanortisanort
authored
Merge pull request #158 from Femcoders-SleepUp/refactor/tests
Refactor/tests
2 parents df288ae + 6b2b999 commit 17dc7ed

23 files changed

Lines changed: 618 additions & 918 deletions

‎src/main/java/com/SleepUp/SU/accommodation/filter/AccommodationSpecification.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ public static Specification<Accommodation> noBookingOverlap(LocalDate newStartDa
6262
return null;
6363
}
6464

65-
assert query != null;
6665
Subquery<Long> subquery = query.subquery(Long.class);
6766
Root<Reservation> reservationRoot = subquery.from(Reservation.class);
6867
subquery.select(cb.count(reservationRoot));

‎src/main/java/com/SleepUp/SU/auth/AuthService.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import com.SleepUp.SU.user.dto.UserResponse;
1212
import com.SleepUp.SU.user.role.Role;
1313
import com.SleepUp.SU.utils.dto.ApiMessageDto;
14+
import com.SleepUp.SU.utils.email.EmailService;
1415
import com.SleepUp.SU.utils.email.EmailServiceHelper;
1516
import jakarta.mail.MessagingException;
1617
import jakarta.transaction.Transactional;
@@ -37,13 +38,13 @@ public class AuthService {
3738
private final JwtService jwtService;
3839
private final AuthenticationManager authenticationManager;
3940
private final UserServiceHelper userServiceHelper;
40-
private final EmailServiceHelper emailServiceHelper;
41+
private final EmailService emailService;
4142

4243

4344
@Transactional
4445
public UserResponse register(UserRequest request) throws MessagingException {
4546
User savedUser = userServiceHelper.createUser(request, Role.USER);
46-
emailServiceHelper.sendWelcomeEmail(savedUser);
47+
emailService.sendWelcomeEmail(savedUser);
4748
return userMapper.toResponse(savedUser);
4849
}
4950

‎src/main/java/com/SleepUp/SU/exceptions/ErrorResponse.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,4 @@ public record ErrorResponse
1818
public ErrorResponse (HttpStatus status, Object message, HttpServletRequest req){
1919
this(ZonedDateTime.now(ZoneOffset.UTC), status.value(), status.getReasonPhrase(), message, req.getRequestURI());
2020
}
21-
22-
public ErrorResponse (HttpStatus status, String error, Object message, HttpServletRequest req){
23-
this(ZonedDateTime.now(ZoneOffset.UTC), status.value(), error, message, req.getRequestURI());
24-
}
2521
}

‎src/main/java/com/SleepUp/SU/reservation/accommodationOwner/ReservationOwnerServiceImpl.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import com.SleepUp.SU.reservation.status.BookingStatus;
1010
import com.SleepUp.SU.reservation.utils.ReservationServiceHelper;
1111
import com.SleepUp.SU.utils.EntityUtil;
12-
import com.SleepUp.SU.utils.email.EmailServiceHelper;
12+
import com.SleepUp.SU.utils.email.EmailService;
1313
import jakarta.transaction.Transactional;
1414
import lombok.RequiredArgsConstructor;
1515
import org.springframework.stereotype.Service;
@@ -25,7 +25,7 @@ public class ReservationOwnerServiceImpl implements ReservationOwnerService{
2525
private final EntityUtil entityUtil;
2626
private final ReservationMapper reservationMapper;
2727
private final ReservationServiceHelper reservationServiceHelper;
28-
private final EmailServiceHelper emailServiceHelper;
28+
private final EmailService emailService;
2929

3030
@Override
3131
public List<ReservationResponseSummary> getReservationsForMyAccommodation(Long accommodationId) {
@@ -41,8 +41,8 @@ public ReservationResponseDetail updateStatus(Long id, ReservationAuthRequest re
4141

4242
BigDecimal amount = isExisting.getTotalPrice();
4343

44-
if (reservationAuthRequest.bookingStatus().equals(BookingStatus.CONFIRMED)){emailServiceHelper.sendReservationConfirmationEmail(isExisting, amount);}
45-
if (reservationAuthRequest.bookingStatus().equals(BookingStatus.CANCELLED)){emailServiceHelper.sendCancellationByOwnerNotificationEmail(isExisting);}
44+
if (reservationAuthRequest.bookingStatus().equals(BookingStatus.CONFIRMED)){emailService.sendGuestReservationConfirmationEmail(isExisting, amount);}
45+
if (reservationAuthRequest.bookingStatus().equals(BookingStatus.CANCELLED)){emailService.sendCancellationByOwnerNotificationEmail(isExisting);}
4646

4747
return reservationMapper.toDetail(isExisting);
4848
}

‎src/main/java/com/SleepUp/SU/reservation/reservationGuest/ReservationGuestServiceImpl.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import com.SleepUp.SU.reservation.utils.ReservationServiceHelper;
99
import com.SleepUp.SU.user.entity.User;
1010
import com.SleepUp.SU.utils.dto.ApiMessageDto;
11-
import com.SleepUp.SU.utils.email.EmailServiceHelper;
11+
import com.SleepUp.SU.utils.email.EmailService;
1212
import lombok.RequiredArgsConstructor;
1313
import org.springframework.stereotype.Service;
1414
import org.springframework.transaction.annotation.Transactional;
@@ -20,7 +20,7 @@ public class ReservationGuestServiceImpl implements ReservationGuestService {
2020
private final ReservationRepository reservationRepository;
2121
private final ReservationMapper reservationMapper;
2222
private final ReservationServiceHelper reservationServiceHelper;
23-
private final EmailServiceHelper emailServiceHelper;
23+
private final EmailService emailService;
2424
private final ReservationService reservationService;
2525

2626
@Override
@@ -60,8 +60,8 @@ public ApiMessageDto cancelReservation(Long reservationId) {
6060
reservation.setBookingStatus(BookingStatus.CANCELLED);
6161
Reservation savedReservation = reservationRepository.save(reservation);
6262

63-
emailServiceHelper.sendCancellationConfirmationEmail(reservation);
64-
emailServiceHelper.sendCancellationNotificationToOwnerEmail(reservation);
63+
emailService.sendCancellationConfirmationEmail(reservation);
64+
emailService.sendCancellationNotificationToOwnerEmail(reservation);
6565

6666
String message = String.format(
6767
"Your reservation in %s from %s to %s has been cancelled",

‎src/main/java/com/SleepUp/SU/reservation/service/ReservationService.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.SleepUp.SU.reservation.dto.ReservationResponseSummary;
66
import com.SleepUp.SU.reservation.reservationTime.ReservationTime;
77
import com.SleepUp.SU.user.entity.User;
8+
import jakarta.mail.MessagingException;
89

910
import java.util.List;
1011

‎src/main/java/com/SleepUp/SU/reservation/service/ReservationServiceImpl.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,18 @@
44
import com.SleepUp.SU.accommodation.utils.AccommodationServiceHelper;
55
import com.SleepUp.SU.reservation.dto.*;
66
import com.SleepUp.SU.reservation.entity.Reservation;
7-
import com.SleepUp.SU.reservation.exceptions.ReservationAccommodationOwnerException;
87
import com.SleepUp.SU.reservation.repository.ReservationRepository;
98
import com.SleepUp.SU.reservation.reservationTime.ReservationTime;
109
import com.SleepUp.SU.reservation.status.BookingStatus;
1110
import com.SleepUp.SU.reservation.utils.ReservationServiceHelper;
1211
import com.SleepUp.SU.user.entity.User;
13-
import com.SleepUp.SU.utils.email.EmailServiceHelper;
12+
import com.SleepUp.SU.utils.email.EmailService;
1413
import com.SleepUp.SU.utils.EntityUtil;
14+
import jakarta.mail.MessagingException;
1515
import lombok.RequiredArgsConstructor;
1616
import org.springframework.stereotype.Service;
1717

18-
import java.math.BigDecimal;
1918
import java.time.LocalDate;
20-
import java.time.temporal.ChronoUnit;
2119
import java.util.List;
2220

2321
@Service
@@ -27,7 +25,7 @@ public class ReservationServiceImpl implements ReservationService{
2725
private final ReservationRepository reservationRepository;
2826
private final ReservationMapper reservationMapper;
2927
private final ReservationServiceHelper reservationServiceHelper;
30-
private final EmailServiceHelper emailServiceHelper;
28+
private final EmailService emailService;
3129
private final AccommodationServiceHelper accommodationServiceHelper;
3230
private final EntityUtil entityUtil;
3331

@@ -49,7 +47,7 @@ public List<ReservationResponseSummary> getMyReservations(Long userId, Reservati
4947
}
5048

5149
@Override
52-
public ReservationResponseDetail createReservation(ReservationRequest reservationRequest, User user, Long accommodationId){
50+
public ReservationResponseDetail createReservation(ReservationRequest reservationRequest, User user, Long accommodationId) {
5351
reservationServiceHelper.validateReservationDates(reservationRequest);
5452
Accommodation accommodation = accommodationServiceHelper.getAccommodationEntityById(accommodationId);
5553

@@ -65,7 +63,7 @@ public ReservationResponseDetail createReservation(ReservationRequest reservatio
6563

6664
Reservation savedReservation = reservationRepository.save(newReservation);
6765

68-
emailServiceHelper.sendOwnerReservedNotification(savedReservation);
66+
emailService.sendOwnerReservedNotification(savedReservation);
6967
return reservationMapper.toDetail(savedReservation);
7068
}
7169

‎src/main/java/com/SleepUp/SU/user/admin/UserAdminServiceImpl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import com.SleepUp.SU.user.dto.UserMapper;
1616
import com.SleepUp.SU.user.dto.UserResponse;
1717
import com.SleepUp.SU.utils.EntityUtil;
18-
import com.SleepUp.SU.utils.email.EmailServiceHelper;
18+
import com.SleepUp.SU.utils.email.EmailService;
1919
import com.SleepUp.SU.utils.exceptions.UserNotFoundByIdException;
2020
import com.SleepUp.SU.utils.exceptions.UserNotFoundByUsernameException;
2121
import lombok.RequiredArgsConstructor;
@@ -37,7 +37,7 @@ public class UserAdminServiceImpl implements UserAdminService, UserDetailsServic
3737
private final UserServiceHelper userServiceHelper;
3838
private final AccommodationRepository accommodationRepository;
3939
private final ReservationRepository reservationRepository;
40-
private final EmailServiceHelper emailServiceHelper;
40+
private final EmailService emailService;
4141

4242
@Override
4343
public List<UserResponse> getAllUsers() {
@@ -52,7 +52,7 @@ public UserResponse getUserById(Long userId) {
5252
@Override
5353
public UserResponse createUser(UserRequest userRequest, Role role) {
5454
User savedUser = userServiceHelper.createUser(userRequest, role);
55-
emailServiceHelper.sendWelcomeEmail(savedUser);
55+
emailService.sendWelcomeEmail(savedUser);
5656
return userMapper.toResponse(savedUser);
5757
}
5858

‎src/main/java/com/SleepUp/SU/utils/Schedule/ReservationReminderTask.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.SleepUp.SU.reservation.entity.Reservation;
44
import com.SleepUp.SU.reservation.repository.ReservationRepository;
5+
import com.SleepUp.SU.utils.email.EmailService;
56
import com.SleepUp.SU.utils.email.EmailServiceHelper;
67
import lombok.RequiredArgsConstructor;
78
import org.slf4j.Logger;
@@ -22,6 +23,7 @@ public class ReservationReminderTask {
2223
private static final int REMINDER_DAYS_BEFORE = 3;
2324

2425
private final ReservationRepository reservationRepository;
26+
private final EmailService emailService;
2527
private final EmailServiceHelper emailServiceHelper;
2628

2729
@Scheduled(cron = "0 0 8 * * *")
@@ -49,11 +51,11 @@ public void sendReservationReminders() {
4951
if (emailServiceHelper.canSendReservationEmails(
5052
reservation)) {
5153

52-
emailServiceHelper.sendReservationReminders(
54+
emailService.sendGuestReservationReminderEmail(
5355
reservation
5456
);
5557

56-
emailServiceHelper.sendOwnerReservationReminderEmail(
58+
emailService.sendOwnerReservationReminderEmail(
5759
reservation);
5860

5961
successCount++;

‎src/main/java/com/SleepUp/SU/utils/email/EmailService.java‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,24 @@
22

33
import com.SleepUp.SU.reservation.entity.Reservation;
44
import com.SleepUp.SU.user.entity.User;
5-
import jakarta.mail.MessagingException;
6-
import org.springframework.stereotype.Service;
75

86
import java.math.BigDecimal;
97

10-
@Service
118
public interface EmailService {
12-
void sendWelcomeEmail(User user) throws MessagingException;
139

14-
void sendOwnerReservedNotification(Reservation reservation) throws MessagingException;
10+
void sendWelcomeEmail(User user);
1511

16-
void sendGuestReservationConfirmationEmail(Reservation reservation, BigDecimal discountAmount) throws MessagingException;
12+
void sendOwnerReservedNotification(Reservation reservation);
1713

18-
void sendGuestReservationReminderEmail(Reservation reservation) throws MessagingException;
14+
void sendGuestReservationConfirmationEmail(Reservation reservation, BigDecimal discountAmount);
1915

20-
void sendOwnerReservationReminderEmail(Reservation reservation) throws MessagingException;
16+
void sendGuestReservationReminderEmail(Reservation reservation);
2117

22-
void sendCancellationConfirmationEmail(Reservation reservation) throws MessagingException;
18+
void sendOwnerReservationReminderEmail(Reservation reservation);
2319

24-
void sendCancellationByOwnerNotificationEmail(Reservation reservation) throws MessagingException;
20+
void sendCancellationConfirmationEmail(Reservation reservation);
2521

26-
void sendCancellationNotificationToOwnerEmail(Reservation reservation) throws MessagingException;
22+
void sendCancellationByOwnerNotificationEmail(Reservation reservation);
23+
24+
void sendCancellationNotificationToOwnerEmail(Reservation reservation);
2725
}

0 commit comments

Comments
 (0)