Changeset 34aa6cc

Timestamp:

01/24/25 01:38:15 (3 months ago)

Author:

Nikola Jordanoski <nikolaj_koko@…>

Branches:

master

Children:

b09655a

Parents:

ff641e1

Message:

Removed unnecessary entity, added initial Customer controller

Location:

ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo

Files:

• bootstrap/DataHolder.java (modified) (4 diffs)
• config/WebSecurityConfig.java (modified) (2 diffs)
• model/RegisterRequest.java (deleted)
• model/enumerations/Role.java (modified) (1 diff)
• service/impl/AuthServiceImpl.java (modified) (6 diffs)
• service/impl/CustomerServiceImpl.java (modified) (1 diff)
• service/intf/CustomerService.java (modified) (1 diff)
• web/AuthController.java (modified) (1 diff)
• web/CustomerController.java (added)

ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/bootstrap/DataHolder.java

@@ -40 +40 @@
     public void init() {
         // Admin
-        admin = new Admin("admin", passwordEncoder.encode("admin"), Role.ADMIN);
+        admin = new Admin("admin", passwordEncoder.encode("admin"), Role.ROLE_ADMIN);
         adminRepository.save(admin);
 
@@ -51 +51 @@
                     passwordEncoder.encode("password" + i),
                     "Phone" + i,
-                    Role.CUSTOMER
+                    Role.ROLE_CUSTOMER
             );
             customers.add(customer);
@@ -65 +65 @@
                     "Password" + i,
                     "PhoneNumber" + i,
-                    Role.LOCAL_WORKER
+                    Role.ROLE_LOCAL_WORKER
             );
             workers.add(localWorker);
@@ -79 +79 @@
                     "Password" + i,
                     "PhoneNumber" + i,
-                    Role.LOCAL_MANAGER
+                    Role.ROLE_LOCAL_MANAGER
             );
             managers.add(manager);

ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/config/WebSecurityConfig.java

@@ -2 +2 @@
 
 import mk.ukim.finki.it.reservengo.config.filter.JWTAuthenticationFilter;
+import mk.ukim.finki.it.reservengo.model.enumerations.Role;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -41 +42 @@
                                 "/favicon.ico")
                         .permitAll()
+                        .requestMatchers("/api/customer/**").hasRole("CUSTOMER")
                         .anyRequest()
                         .authenticated()

ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/model/enumerations/Role.java

@@ -2 +2 @@
 
 public enum Role {
-    ADMIN,
-    CUSTOMER,
-    LOCAL_MANAGER,
-    LOCAL_WORKER
+    ROLE_ADMIN,
+    ROLE_CUSTOMER,
+    ROLE_LOCAL_MANAGER,
+    ROLE_LOCAL_WORKER
 }

ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/impl/AuthServiceImpl.java

@@ -37 +37 @@
     @Override
     public JWTAuthenticationResponse registerCustomer(String firstName, String lastName, String email, String password, String phoneNumber) {
-        Customer customer = new Customer(firstName, lastName, email, passwordEncoder.encode(password), phoneNumber, Role.CUSTOMER);
+        Customer customer = new Customer(firstName, lastName, email, passwordEncoder.encode(password), phoneNumber, Role.ROLE_CUSTOMER);
         customerRepository.save(customer);
         String jwt = jwtService.generateTokenNoClaims(customer);
@@ -50 +50 @@
                 customer.getEmail(),
                 customer.getPhoneNumber(),
-                Role.CUSTOMER,
+                Role.ROLE_CUSTOMER,
                 jwt);
     }
@@ -56 +56 @@
     @Override
     public JWTAuthenticationResponse registerLocalWorker(String firstName, String lastName, String email, String password, String phoneNumber) {
-        LocalWorker localWorker = new LocalWorker(firstName, lastName, email, passwordEncoder.encode(password), phoneNumber, Role.LOCAL_WORKER);
+        LocalWorker localWorker = new LocalWorker(firstName, lastName, email, passwordEncoder.encode(password), phoneNumber, Role.ROLE_LOCAL_WORKER);
         localWorkerRepository.save(localWorker);
         String jwt = jwtService.generateTokenNoClaims(localWorker);
@@ -66 +66 @@
                 localWorker.getEmail(),
                 localWorker.getPhoneNumber(),
-                Role.LOCAL_WORKER,
+                Role.ROLE_LOCAL_WORKER,
                 jwt);
     }
@@ -72 +72 @@
     @Override
     public JWTAuthenticationResponse registerLocalManager(String firstName, String lastName, String email, String password, String phoneNumber) {
-        LocalManager localManager = new LocalManager(firstName, lastName, email, passwordEncoder.encode(password), phoneNumber, Role.LOCAL_MANAGER);
+        LocalManager localManager = new LocalManager(firstName, lastName, email, passwordEncoder.encode(password), phoneNumber, Role.ROLE_LOCAL_MANAGER);
         localManagerRepository.save(localManager);
         String jwt = jwtService.generateTokenNoClaims(localManager);
@@ -82 +82 @@
                 localManager.getEmail(),
                 localManager.getPhoneNumber(),
-                Role.LOCAL_MANAGER,
+                Role.ROLE_LOCAL_MANAGER,
                 jwt);
     }

ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/impl/CustomerServiceImpl.java

@@ -1 +1 @@
 package mk.ukim.finki.it.reservengo.service.impl;
 
-import mk.ukim.finki.it.reservengo.service.intf.AdminService;
+import mk.ukim.finki.it.reservengo.model.Customer;
+import mk.ukim.finki.it.reservengo.repository.CustomerRepository;
+import mk.ukim.finki.it.reservengo.service.intf.CustomerService;
 import org.springframework.stereotype.Service;
 
 @Service
-public class CustomerServiceImpl implements AdminService {
+public class CustomerServiceImpl implements CustomerService {
+    private final CustomerRepository customerRepository;
+
+    public CustomerServiceImpl(CustomerRepository customerRepository) {
+        this.customerRepository = customerRepository;
+    }
+
+    @Override
+    public Customer getCustomerProfile(Long id) {
+        return customerRepository.findById(id).orElseThrow(RuntimeException::new);
+    }
 }

ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/intf/CustomerService.java

@@ -1 +1 @@
 package mk.ukim.finki.it.reservengo.service.intf;
 
+import mk.ukim.finki.it.reservengo.model.Customer;
+
 public interface CustomerService {
+    Customer getCustomerProfile(Long id);
 }

ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/web/AuthController.java

@@ -2 +2 @@
 
 import mk.ukim.finki.it.reservengo.model.JWTAuthenticationResponse;
-import mk.ukim.finki.it.reservengo.model.RegisterRequest;
 import mk.ukim.finki.it.reservengo.service.intf.AuthService;
 import org.springframework.http.HttpStatus;