Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/_security/SecurityConfig.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/_security/SecurityConfig.java (revision 6d2c66f787bea9804626034467a68deea985be88) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/_security/SecurityConfig.java (revision fb07bff097454b819b9e2bf33c8bbda3c28e04fe) @@ -5,4 +5,5 @@ import org.springframework.context.annotation.Configuration; import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.config.annotation.web.builders.HttpSecurity; @@ -15,4 +16,9 @@ import org.springframework.security.provisioning.InMemoryUserDetailsManager; import org.springframework.security.web.SecurityFilterChain; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.CorsConfigurationSource; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; + +import java.util.List; @Configuration @@ -31,10 +37,11 @@ ) + .cors(Customizer.withDefaults()) .authorizeHttpRequests(auth -> auth - .requestMatchers("/auth/**", "/api/auth/**", "/reset-password/**", "/css/**", "/js/**").permitAll() + .requestMatchers("/auth/**", "/api/**", "/reset-password/**", "/css/**", "/js/**").permitAll() .requestMatchers("/admin/**").hasRole("ADMIN") - .requestMatchers("/customer/**").hasAnyRole("CUSTOMER", "ADMIN") - .requestMatchers("/manager/**").hasAnyRole("MANAGER", "ADMIN") - .requestMatchers("/driver/**").hasAnyRole("DRIVER", "ADMIN") + .requestMatchers("/customer/**", "/api/customer/**").hasAnyRole("CUSTOMER", "ADMIN") + .requestMatchers("/manager/**", "/api/manager/**").hasAnyRole("MANAGER", "ADMIN") + .requestMatchers("/driver/**", "/api/driver/**").hasAnyRole("DRIVER", "ADMIN") .anyRequest() .authenticated() @@ -63,4 +70,17 @@ return http.build(); + } + + @Bean + public CorsConfigurationSource corsConfigurationSource() { + CorsConfiguration configuration = new CorsConfiguration(); + + configuration.setAllowedOrigins(List.of("https://10.0.2.2:8080")); + configuration.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "OPTIONS")); + configuration.setAllowedHeaders(List.of("*")); + configuration.setAllowCredentials(true); + UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + source.registerCorsConfiguration("/**", configuration); + return source; } Index: ckend/src/main/java/mk/ukim/finki/db/distributorapp/_web/REST/RestAuthController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/_web/REST/RestAuthController.java (revision 6d2c66f787bea9804626034467a68deea985be88) +++ (revision ) @@ -1,24 +1,0 @@ -package mk.ukim.finki.db.distributorapp._web.REST; - -import lombok.RequiredArgsConstructor; -import mk.ukim.finki.db.distributorapp._security.auth.AuthService; -import mk.ukim.finki.db.distributorapp._security.dto.LoginRequestDto; -import mk.ukim.finki.db.distributorapp.users.dto.UsersLoadingDto; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequiredArgsConstructor -@RequestMapping("/api/auth") -public class RestAuthController { - private final AuthService authService; - - @PostMapping("/login") - public ResponseEntity login(@RequestBody final LoginRequestDto user) { - UsersLoadingDto loggedUser = authService.login(user); - return ResponseEntity.ok(loggedUser); - } -} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/_web/rest/RestAuthController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/_web/rest/RestAuthController.java (revision fb07bff097454b819b9e2bf33c8bbda3c28e04fe) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/_web/rest/RestAuthController.java (revision fb07bff097454b819b9e2bf33c8bbda3c28e04fe) @@ -0,0 +1,24 @@ +package mk.ukim.finki.db.distributorapp._web.rest; + +import lombok.RequiredArgsConstructor; +import mk.ukim.finki.db.distributorapp._security.auth.AuthService; +import mk.ukim.finki.db.distributorapp._security.dto.LoginRequestDto; +import mk.ukim.finki.db.distributorapp.users.dto.UsersLoadingDto; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/auth") +public class RestAuthController { + private final AuthService authService; + + @PostMapping("/login") + public ResponseEntity login(@RequestBody final LoginRequestDto user) { + UsersLoadingDto loggedUser = authService.login(user); + return ResponseEntity.ok(loggedUser); + } +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/_web/rest/RestCustomerController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/_web/rest/RestCustomerController.java (revision fb07bff097454b819b9e2bf33c8bbda3c28e04fe) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/_web/rest/RestCustomerController.java (revision fb07bff097454b819b9e2bf33c8bbda3c28e04fe) @@ -0,0 +1,38 @@ +package mk.ukim.finki.db.distributorapp._web.rest; + +import lombok.RequiredArgsConstructor; +import mk.ukim.finki.db.distributorapp.customer.CustomerService; +import mk.ukim.finki.db.distributorapp.customer.dto.CustomerDashboardDto; +import mk.ukim.finki.db.distributorapp.delivery.DeliveryService; +import mk.ukim.finki.db.distributorapp.delivery.dto.DeliveryDto; +import mk.ukim.finki.db.distributorapp.order.OrdersService; +import mk.ukim.finki.db.distributorapp.order.dto.OrderSimpleDto; +import mk.ukim.finki.db.distributorapp.proForma.ProFormaService; +import mk.ukim.finki.db.distributorapp.proForma.dto.ProFormaDto; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequiredArgsConstructor +@RequestMapping("api/customer") +@CrossOrigin(origins = "*") +public class RestCustomerController { + private final CustomerService customerService; + private final OrdersService ordersService; + private final DeliveryService deliveryService; + private final ProFormaService proFormaService; + + @GetMapping("/{customerId}/dashboard") + public ResponseEntity getCustomerDashboard(@PathVariable("customerId") Long customerId) { + CustomerDashboardDto dashboard = new CustomerDashboardDto(); + List userOrders = this.ordersService.findSimpleOrdersByCustomer(customerId); + List userDeliveries = this.deliveryService.getCurrentDeliveriesByCustomer(customerId); + List userProFormas = this.proFormaService.getCurentProFormasByCustomer(customerId); + dashboard.setOrders(userOrders); + dashboard.setDeliveries(userDeliveries); + dashboard.setProFormas(userProFormas); + return ResponseEntity.ok(dashboard); + } +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/customer/dto/CustomerDashboardDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/customer/dto/CustomerDashboardDto.java (revision fb07bff097454b819b9e2bf33c8bbda3c28e04fe) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/customer/dto/CustomerDashboardDto.java (revision fb07bff097454b819b9e2bf33c8bbda3c28e04fe) @@ -0,0 +1,19 @@ +package mk.ukim.finki.db.distributorapp.customer.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import mk.ukim.finki.db.distributorapp.delivery.dto.DeliveryDto; +import mk.ukim.finki.db.distributorapp.order.dto.OrderSimpleDto; +import mk.ukim.finki.db.distributorapp.proForma.dto.ProFormaDto; + +import java.util.List; + +@AllArgsConstructor +@NoArgsConstructor +@Data +public class CustomerDashboardDto { + List orders; + List deliveries; + List proFormas; +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/proForma/ProFormaRepository.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/proForma/ProFormaRepository.java (revision 6d2c66f787bea9804626034467a68deea985be88) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/proForma/ProFormaRepository.java (revision fb07bff097454b819b9e2bf33c8bbda3c28e04fe) @@ -69,3 +69,26 @@ ) void delete(@NonNull Long id); + + @Query( + nativeQuery = true, + value = """ + select pf.pf_id as id, + pf_deadline as pfDeadline, + pf_date_created as pfDateCreated, + pfs.pf_status_id as statusId, + pfs.pf_status_name as statusName, + o.ord_id as ordId, + c.user_id as customerId, + c.cust_company_name as customerName, + u.user_email as customerEmail, + u.user_mobile as customerPhone + from pro_forma pf + join pro_forma_status pfs on pf.pf_status_id=pfs.pf_status_id + join orders o on pf.pf_id = o.pf_id + join customer c on o.cust_id = c.user_id + join users u on c.user_id = u.user_id + where c.user_id = ?1 + """ + ) + List getCurrentProFormasByCustomer(Long customerId); } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/proForma/ProFormaService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/proForma/ProFormaService.java (revision 6d2c66f787bea9804626034467a68deea985be88) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/proForma/ProFormaService.java (revision fb07bff097454b819b9e2bf33c8bbda3c28e04fe) @@ -16,3 +16,4 @@ void deleteById(Long id); + List getCurentProFormasByCustomer(Long customerId); } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/proForma/ProFormaServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/proForma/ProFormaServiceImpl.java (revision 6d2c66f787bea9804626034467a68deea985be88) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/proForma/ProFormaServiceImpl.java (revision fb07bff097454b819b9e2bf33c8bbda3c28e04fe) @@ -42,3 +42,8 @@ this.proFormaRepository.deleteById(id); } + + @Override + public List getCurentProFormasByCustomer(Long customerId) { + return this.proFormaRepository.getCurrentProFormasByCustomer(customerId); + } } Index: backend/src/main/resources/application-prod.properties =================================================================== --- backend/src/main/resources/application-prod.properties (revision 6d2c66f787bea9804626034467a68deea985be88) +++ backend/src/main/resources/application-prod.properties (revision fb07bff097454b819b9e2bf33c8bbda3c28e04fe) @@ -1,3 +1,3 @@ -server.port=8080 +server.port=8443 ## -------------------POSTGRESQL & JPA-------------------