Changeset 8ca35dc for src/main/java/com/example/rezevirajmasa/demo/service/impl

Timestamp:

01/19/25 23:18:37 (4 months ago)

Author:

Aleksandar Panovski <apano77@…>

Branches:

main

Children:

f5b256e

Parents:

db39d9e

Message:

Done with stupid timeslots

Location:

src/main/java/com/example/rezevirajmasa/demo/service/impl

Files:

• ReservationHistoryServiceImpl.java (modified) (3 diffs)
• ReservationImpl.java (modified) (9 diffs)
• RestaurantServiceImpl.java (modified) (1 diff)
• TokenService.java (added)
• UserServiceImpl.java (modified) (4 diffs)

src/main/java/com/example/rezevirajmasa/demo/service/impl/ReservationHistoryServiceImpl.java

@@ -4 +4 @@
 import com.example.rezevirajmasa.demo.model.Reservation;
 import com.example.rezevirajmasa.demo.model.Restaurant;
+import com.example.rezevirajmasa.demo.model.User;
 import com.example.rezevirajmasa.demo.repository.ReservationHistoryRepository;
 import com.example.rezevirajmasa.demo.service.ReservationHistoryService;
@@ -22 +23 @@
     public void moveReservationToHistory(Reservation reservation, String status, String cancellationReason) {
         Restaurant.ReservationHistory history = new Restaurant.ReservationHistory();
-        history.setCustomer(reservation.getCustomer());
+        history.setUser(reservation.getUser());
         history.setTable(reservation.getTable());
         history.setReservationDateTime(reservation.getReservationDateTime());
@@ -42 +43 @@
 
     @Override
-    public List<Restaurant.ReservationHistory> findByCustomer(Customer customer) {
-        return reservationHistoryRepository.findAllByCustomer(customer);
+    public List<Restaurant.ReservationHistory> findByUser(User user) {
+        return reservationHistoryRepository.findALlByUser(user);
     }
 
     @Override
     public void moveReservationsToPast(List<Restaurant.ReservationHistory> reservationsToMove) {
-        // Update the status of reservations to "Past"
         for (Restaurant.ReservationHistory reservation : reservationsToMove) {
             reservation.setStatus("Past");
         }
 
-        // Save the updated reservations
         reservationHistoryRepository.saveAll(reservationsToMove);
     }

src/main/java/com/example/rezevirajmasa/demo/service/impl/ReservationImpl.java

@@ -1 +1 @@
 package com.example.rezevirajmasa.demo.service.impl;
 
-import com.example.rezevirajmasa.demo.model.Customer;
-import com.example.rezevirajmasa.demo.model.Reservation;
-import com.example.rezevirajmasa.demo.model.Restaurant;
-import com.example.rezevirajmasa.demo.model.TableEntity;
+import com.example.rezevirajmasa.demo.dto.UserDto;
+import com.example.rezevirajmasa.demo.mappers.UserMapper;
+import com.example.rezevirajmasa.demo.model.*;
 import com.example.rezevirajmasa.demo.model.exceptions.InvalidReservationException;
 import com.example.rezevirajmasa.demo.model.exceptions.InvalidReservationIdException;
@@ -11 +10 @@
 import com.example.rezevirajmasa.demo.repository.RestaurantRepository;
 import com.example.rezevirajmasa.demo.repository.TableRepository;
+import com.example.rezevirajmasa.demo.service.ReservationHistoryService;
 import com.example.rezevirajmasa.demo.service.ReservationService;
+import com.example.rezevirajmasa.demo.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cglib.core.Local;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.swing.text.html.Option;
@@ -27 +34 @@
     private TableRepository tableRepository;
     @Autowired
-    private RestaurantRepository restaurantRepository;
+    private ReservationHistoryService reservationHistoryService;
+    private final UserMapper userMapper;
     @Autowired
-    private CustomerRepository customerRepository;
+    private UserService userService;
     @Autowired
     private ReservationRepository reservationRepository;
+
+    public ReservationImpl(UserMapper userMapper) {
+        this.userMapper = userMapper;
+    }
 
     @Override
@@ -39 +51 @@
 
     @Override
-    public void makeReservation(Customer customer, TableEntity table, Restaurant restaurant, LocalDateTime localDateTime, LocalDateTime checkInTime, int partySize, String specialRequests) {
+    public void makeReservation(User user, TableEntity table, Restaurant restaurant, LocalDateTime localDateTime, LocalDateTime checkInTime, int partySize, String specialRequests) {
         if (!table.isAvailable(checkInTime)) {
             // Handle unavailability (throw an exception, return a specific response, etc.)
@@ -46 +58 @@
 
         Reservation reservation =
-                new Reservation(customer, table, restaurant, LocalDateTime.now(), partySize, specialRequests, "Reserved", checkInTime, checkInTime.plusHours(2), null);
+                new Reservation(user, table, restaurant, LocalDateTime.now(), partySize, specialRequests, "Reserved", checkInTime, checkInTime.plusHours(2), null);
 
 //        // Update table status or perform additional logic if needed
@@ -56 +68 @@
 
     @Override
-    public Reservation makeReservationRest(Reservation reservation) {
+    public Reservation makeReservationRest(Reservation reservation, User user) {
         Optional<TableEntity> optionalTable = tableRepository.findById(reservation.getTable().getId());
-        if(optionalTable.isPresent()) {
+        if (optionalTable.isPresent()) {
             TableEntity table = optionalTable.get();
+
+            reservation.setUser(user);
 
             LocalDateTime startTime = reservation.getCheckInTime().minusHours(2);
@@ -67 +81 @@
                     x -> x.isAfter(startTime) && x.isBefore(endTime)
             );
-
+            reservation.setReservationDateTime(LocalDateTime.now());
             return reservationRepository.save(reservation);
         } else {
-            throw new InvalidReservationException("Unsuccessful reservation -> time slot not avalaible");
+            throw new InvalidReservationException("Unsuccessful reservation -> time slot not available");
         }
     }
+
 
     @Override
@@ -109 +124 @@
                 from = from.plusMinutes(15);
             }
+            reservationHistoryService.moveReservationToHistory(reservation, "Canceled", "Canceled by user");
             reservationRepository.delete(reservation);
-            return true; // Return true indicating successful cancellation
+            return true;
         } else {
-            return false; // Return false indicating reservation with the given ID not found
+            return false;
         }
     }
@@ -118 +134 @@
 
     @Override
-    public List<Reservation> findReservationByCustomer(Customer customer) {
-        return reservationRepository.findAllByCustomer(customer);
+    public List<Reservation> findReservationByUser(User user) {
+        LocalDateTime now = LocalDateTime.now();
+        return reservationRepository.findALlByUserAndCheckInTimeAfter(user, now);
+    }
+
+    @Override
+    public List<Reservation> findReservationsByUserPast(User user) {
+        LocalDateTime now = LocalDateTime.now();
+        return reservationRepository.findALlByUserAndCheckInTimeBefore(user, now);
     }
 

src/main/java/com/example/rezevirajmasa/demo/service/impl/RestaurantServiceImpl.java

@@ -175 +175 @@
                     .collect(Collectors.toList());
         } else {
-            List<Restaurant> restaurantList = restaurantRepository.findAllByNameLikeIgnoreCase(search);
+            String searchTerm = "%" + search + "%";
+            List<Restaurant> restaurantList = restaurantRepository.findAllByNameLikeIgnoreCase(searchTerm);
             if (restaurantList.isEmpty()) {
                 restaurantList = restaurantRepository.findAllByCuisineTypeContaining(search);

src/main/java/com/example/rezevirajmasa/demo/service/impl/UserServiceImpl.java

@@ -6 +6 @@
 import com.example.rezevirajmasa.demo.mappers.UserMapper;
 import com.example.rezevirajmasa.demo.mappers.UserMapperImpl;
+import com.example.rezevirajmasa.demo.model.MembershipLevel;
+import com.example.rezevirajmasa.demo.model.Role;
 import com.example.rezevirajmasa.demo.model.User;
 import com.example.rezevirajmasa.demo.model.exceptions.AppException;
@@ -12 +14 @@
 import lombok.RequiredArgsConstructor;
 import org.mapstruct.control.MappingControl;
+import org.openqa.selenium.InvalidArgumentException;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import java.nio.CharBuffer;
+import java.sql.Date;
+import java.time.LocalDate;
 import java.util.Optional;
 
@@ -30 +35 @@
     }
 
+    @Override
+    public User findByMail(String email) {
+        return userRepository.findByEmail(email).orElseThrow(() -> new AppException(("Unknown user"), HttpStatus.NOT_FOUND));
+    }
+
     public UserDto login(CredentialsDto credentialsDto) {
-        User user = userRepository.findByEmail(credentialsDto.getLogin())
+        User user = userRepository.findByEmail(credentialsDto.getEmail())
                 .orElseThrow(() -> new AppException("Unknown user", HttpStatus.NOT_FOUND));
 
@@ -51 +61 @@
         user.setPassword(passwordEncoder.encode(CharBuffer.wrap(userDto.getPassword())));
 
+        user.setFirstName(userDto.getFirstName());
+        user.setLastName(userDto.getLastName());
+        user.setAddress(userDto.getAddress());
+        user.setPhone(userDto.getPhone());
+        user.setMembershipLevel(MembershipLevel.valueOf(userDto.getMembershipLevel()));
+        user.setRegistrationDate(Date.valueOf(LocalDate.now()));
+        user.setRole(Role.ROLE_USER);
+
         User savedUser = userRepository.save(user);
 
-        return userMapper.toUserDto(user);
+        return userMapper.toUserDto(savedUser);
+    }
+
+    @Override
+    public User findUserById(Long userId) {
+        return userRepository.findById(userId).orElseThrow(()->new InvalidArgumentException("Invalid user Id"));
     }
 }