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

Timestamp:

05/06/25 00:44:02 (2 weeks ago)

Author:

Aleksandar Panovski <apano77@…>

Branches:

main

Children:

e48199a

Parents:

142c0f8

Message:

Normalization needed to continue, till here done

Location:

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

Files:

• CustomerServiceImpl.java (deleted)
• ReservationHistoryServiceImpl.java (modified) (1 diff)
• ReservationImpl.java (modified) (4 diffs)
• RestaurantServiceImpl.java (modified) (1 diff)
• TableServiceImpl.java (modified) (1 diff)
• UserServiceImpl.java (modified) (3 diffs)

src/main/java/com/example/rezevirajmasa/demo/service/impl/ReservationHistoryServiceImpl.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;

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

@@ -2 +2 @@
 
 import com.example.rezevirajmasa.demo.dto.ReservationDTO;
-import com.example.rezevirajmasa.demo.dto.RestaurantDTO;
-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;
-import com.example.rezevirajmasa.demo.repository.CustomerRepository;
 import com.example.rezevirajmasa.demo.repository.ReservationRepository;
-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.RestaurantService;
 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;
-import java.math.BigDecimal;
+
 import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
@@ -91 +76 @@
             reservation.setSpecialRequests(reservationDTO.getSpecialRequests());
             reservation.setPartySize(reservationDTO.getPartySize());
-            reservation.setStatus(reservationDTO.getStatus() != null ? reservationDTO.getStatus() : "Pending");
+            reservation.setReservationStatus(reservationDTO.getStatus() != null ? reservationDTO.getStatus() : "Pending");
             reservation.setPaymentStatus(reservationDTO.getPaymentStatus() != null ? reservationDTO.getPaymentStatus() : "Unpaid");
             reservation.setUser(user);
@@ -99 +84 @@
             for (PreorderedItem dtoItem : reservationDTO.getPreOrderedItems()) {
                 PreorderedItem item = new PreorderedItem();
-                item.setName(dtoItem.getName());
+                item.setPreorderedItemName(dtoItem.getPreorderedItemName());
                 item.setQuantity(dtoItem.getQuantity());
                 item.setPrice(dtoItem.getPrice());
@@ -144 +129 @@
         existingReservation.setPartySize(reservationDTO.getPartySize());
         existingReservation.setSpecialRequests(reservationDTO.getSpecialRequests());
-        existingReservation.setStatus(reservationDTO.getStatus() != null ? reservationDTO.getStatus() : existingReservation.getStatus());
+        existingReservation.setReservationStatus(reservationDTO.getStatus() != null ? reservationDTO.getStatus() : existingReservation.getReservationStatus());
         existingReservation.setPaymentStatus(reservationDTO.getPaymentStatus() != null ? reservationDTO.getPaymentStatus() : existingReservation.getPaymentStatus());
 

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

@@ -104 +104 @@
                 TableEntity table = new TableEntity();
                 table.setCapacity(tableCapacities.get(i));
-                table.setLocation(tableLocations.get(i));
+                table.setTableLocation(tableLocations.get(i));
                 table.setSmokingArea(tableSmokingAreas.get(i).equalsIgnoreCase("on"));
                 table.setDescription(tableDescriptions.get(i));

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

@@ -76 +76 @@
             TableEntity table = new TableEntity();
             table.setCapacity(tableCapacities.get(i));
-            table.setLocation(tableLocations.get(i));
+            table.setTableLocation(tableLocations.get(i));
             table.setSmokingArea(Boolean.valueOf(tableSmokingAreas.get(i)));
             table.setDescription(tableDescriptions.get(i));

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

@@ -16 +16 @@
 import org.openqa.selenium.InvalidArgumentException;
 import org.springframework.http.HttpStatus;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
@@ -25 +28 @@
 @RequiredArgsConstructor
 @Service
-public class UserServiceImpl implements UserService {
+public class UserServiceImpl implements UserService, UserDetailsService {
     private final UserRepository userRepository;
     private final UserMapperImpl userMapper;
@@ -78 +81 @@
         return userRepository.findById(userId).orElseThrow(()->new InvalidArgumentException("Invalid user Id"));
     }
+
+    @Override
+    public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException {
+        User user = userRepository.findByEmail(email)
+                .orElseThrow(()-> new UsernameNotFoundException("User not found"));
+        return org.springframework.security.core.userdetails.User
+                .withUsername(user.getEmail())
+                .password(user.getPassword())
+                .authorities(user.getRole().name()) // adjust if needed
+                .build();
+    }
 }