Index: src/main/java/mk/ukim/finki/db/distributorapp/_security/SecurityConfig.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/_security/SecurityConfig.java (revision 1a2f5a57063d62be028109c190df02ed87e83903) +++ src/main/java/mk/ukim/finki/db/distributorapp/_security/SecurityConfig.java (revision 863e8b9c1fc20326aadeb06267714f3f30705170) @@ -56,5 +56,5 @@ .requestMatchers("/customer/**", "/api/customer/**").hasAnyRole("CUSTOMER", "ADMIN") .requestMatchers("/manager/**", "/api/manager/**").hasAnyRole("MANAGER", "ADMIN") - .requestMatchers("/driver/**", "/api/driver/**").hasAnyRole("DRIVER", "ADMIN") + .requestMatchers("/driver/**", "/api/driver/**").hasAnyRole("DRIVER", "MANAGER", "ADMIN") .requestMatchers("/api/images/upload").hasAnyRole("CUSTOMER","DRIVER","MANAGER","ADMIN") .anyRequest() Index: src/main/java/mk/ukim/finki/db/distributorapp/_web/api/RestArticleController.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/_web/api/RestArticleController.java (revision 1a2f5a57063d62be028109c190df02ed87e83903) +++ src/main/java/mk/ukim/finki/db/distributorapp/_web/api/RestArticleController.java (revision 863e8b9c1fc20326aadeb06267714f3f30705170) @@ -9,5 +9,9 @@ import org.springframework.hateoas.EntityModel; import org.springframework.hateoas.PagedModel; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; + +import java.util.List; @RestController @@ -31,3 +35,11 @@ return assembler.toModel(res); } + + @GetMapping("/mobile/customer/articles") + @PreAuthorize("hasAnyRole('CUSTOMER')") + public ResponseEntity> getArticles() { + List articles = this.articleService.getAllArticles(); + return ResponseEntity.ok().body(articles); + } + } Index: src/main/java/mk/ukim/finki/db/distributorapp/_web/api/RestCustomerController.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/_web/api/RestCustomerController.java (revision 1a2f5a57063d62be028109c190df02ed87e83903) +++ src/main/java/mk/ukim/finki/db/distributorapp/_web/api/RestCustomerController.java (revision 863e8b9c1fc20326aadeb06267714f3f30705170) @@ -29,5 +29,5 @@ @RestController @RequiredArgsConstructor -@RequestMapping("api/customer") +@RequestMapping("/api/customer") @CrossOrigin(origins = "*") public class RestCustomerController { @@ -52,23 +52,4 @@ dashboard.setProFormas(userProFormas); return ResponseEntity.ok(dashboard); - } - - @GetMapping("/articles") - @PreAuthorize("hasAnyRole('CUSTOMER')") - public ResponseEntity> getArticles() { - List articles = this.articleService.getAllArticles(); - return ResponseEntity.ok().body(articles); - } - - @PostMapping("/create-order") - @PreAuthorize("hasAnyRole('CUSTOMER')") - public ResponseEntity createOrder(@RequestBody AndroidCreateOrderDto order){ - // todo: implement creating order via api and try to unify the code for both android and angular. - UserDto user = this.userService.findUserDtoByEmail(order.getUserEmail()); - WarehouseDto wh = this.warehouseService.findByUserId(user.getCityId()); - ArticleDto article = this.articleService.findById(order.getArticleId(), wh.getId()); - CreateOrderDto orderDto = new CreateOrderDto(); - orderDto.setProForma(order.getProForma()); - return ResponseEntity.ok(new OrderSimpleDto()); } Index: src/main/java/mk/ukim/finki/db/distributorapp/_web/api/RestDeliveryController.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/_web/api/RestDeliveryController.java (revision 1a2f5a57063d62be028109c190df02ed87e83903) +++ src/main/java/mk/ukim/finki/db/distributorapp/_web/api/RestDeliveryController.java (revision 863e8b9c1fc20326aadeb06267714f3f30705170) @@ -7,5 +7,8 @@ import mk.ukim.finki.db.distributorapp.delivery.dto.DeliveryDto; import mk.ukim.finki.db.distributorapp.delivery.dto.DeliveryFullDto; +import mk.ukim.finki.db.distributorapp.delivery.dto.DeliverySimpleDto; import mk.ukim.finki.db.distributorapp.delivery.dto.DeliveryWithOrdersDto; +import mk.ukim.finki.db.distributorapp.driver.DriverService; +import mk.ukim.finki.db.distributorapp.driver.dto.DriverDto; import mk.ukim.finki.db.distributorapp.order.OrdersService; import mk.ukim.finki.db.distributorapp.order.dto.OrdersDeliveryDto; @@ -15,4 +18,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.web.bind.annotation.*; @@ -28,6 +33,7 @@ private final OrdersService ordersService; private final UserService userService; + private final DriverService driverService; - @GetMapping("/delivery-with-orders/{deliveryId}") + @GetMapping("/driver/delivery-with-orders/{deliveryId}") @PreAuthorize("hasAnyRole('DRIVER','ADMIN')") public ResponseEntity getDeliveryWithOrder(@PathVariable Long deliveryId) { @@ -40,5 +46,5 @@ } - @GetMapping("/customer-current-deliveries") + @GetMapping("/customer/current-deliveries") @PreAuthorize("hasAnyRole('CUSTOMER')") public ResponseEntity> getCurrentDeliveries(Principal principal) { @@ -48,3 +54,34 @@ return ResponseEntity.ok(result); } + + @GetMapping("/driver/newDeliveries") + @PreAuthorize("hasAnyRole('DRIVER')") + public ResponseEntity getNewDeliveries(){ + Authentication auth = SecurityContextHolder.getContext().getAuthentication(); + String email = auth.getPrincipal().toString(); + + UserDto user = this.userService.findUserDtoByEmail(email); + + if(user == null){ + return ResponseEntity.badRequest().body("User not found"); + } + + DriverDto driver = this.driverService.findById(user.getId()); + if(driver == null){ + return ResponseEntity.badRequest().body("Driver not found"); + } + + List deliveries = this.driverService.getNewAssignedDeliveries(driver.getId()); + + return ResponseEntity.ok().body(deliveries); + } + + @GetMapping("/manager/active-deliveries") + @PreAuthorize("hasAnyRole('MANAGER')") + public ResponseEntity> getActiveDeliveries(Principal principal){ + String email = principal.getName(); + UserDto user = this.userService.findUserDtoByEmail(email); + List result = this.deliveryService.getCurrentDeliveriesByManager(user.getId()); + return ResponseEntity.ok(result); + } } Index: src/main/java/mk/ukim/finki/db/distributorapp/_web/api/RestDriverController.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/_web/api/RestDriverController.java (revision 1a2f5a57063d62be028109c190df02ed87e83903) +++ src/main/java/mk/ukim/finki/db/distributorapp/_web/api/RestDriverController.java (revision 863e8b9c1fc20326aadeb06267714f3f30705170) @@ -8,4 +8,5 @@ import mk.ukim.finki.db.distributorapp.users.dto.UserDto; import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; @@ -19,5 +20,5 @@ @RestController @RequiredArgsConstructor -@RequestMapping("api/driver") +@RequestMapping("/api/driver") @CrossOrigin(origins = "*") public class RestDriverController { @@ -27,4 +28,5 @@ @GetMapping("/newDeliveries") + @PreAuthorize("hasAnyRole('MANAGER')") public ResponseEntity getNewDeliveries(){ Authentication auth = SecurityContextHolder.getContext().getAuthentication(); @@ -46,3 +48,21 @@ return ResponseEntity.ok().body(deliveries); } + + @GetMapping("/manager/list-all") + @PreAuthorize("hasAnyRole('MANAGER')") + public ResponseEntity listAllDriversForManager(){ + Authentication auth = SecurityContextHolder.getContext().getAuthentication(); + String email = auth.getPrincipal().toString(); + + UserDto user = this.userService.findUserDtoByEmail(email); + + if(user == null){ + return ResponseEntity.badRequest().body("User not found"); + } + + List drivers = this.driverService.listAllDriversForManager(user.getId()); + + return ResponseEntity.ok().body(drivers); + } + } Index: src/main/java/mk/ukim/finki/db/distributorapp/_web/api/RestManagerController.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/_web/api/RestManagerController.java (revision 1a2f5a57063d62be028109c190df02ed87e83903) +++ src/main/java/mk/ukim/finki/db/distributorapp/_web/api/RestManagerController.java (revision 863e8b9c1fc20326aadeb06267714f3f30705170) @@ -56,13 +56,4 @@ } - @GetMapping("/vehicles") - @PreAuthorize("hasAnyRole('MANAGER')") - public ResponseEntity> getManagerVehicles(Principal principal) { - String userEmail = principal.getName(); - UserDto user = this.userService.findUserDtoByEmail(userEmail); - List vehicles = this.vehicleService.getBasicVehiclesByManagerId(user.getId()); - return ResponseEntity.ok(vehicles); - } - @PostMapping("/create-delivery") @PreAuthorize("hasAnyRole('MANAGER')") @@ -76,3 +67,17 @@ return ResponseEntity.ok(createdDelivery.getDeliveryId()); } + + @GetMapping("/finances/monthly-report" ) + @PreAuthorize("hasAnyRole('MANAGER')") + public ResponseEntity getManagerDashboardMonthlyReport(Principal principal){ + // TODO: Implement this method + return null; + } + + @GetMapping("/finances/quarterly-report") + @PreAuthorize("hasAnyRole('MANAGER')") + public ResponseEntity getManagerDashboardQuarterlyReport(Principal principal){ + // TODO: Implement this method + return null; + } } Index: src/main/java/mk/ukim/finki/db/distributorapp/_web/api/RestOrderController.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/_web/api/RestOrderController.java (revision 1a2f5a57063d62be028109c190df02ed87e83903) +++ src/main/java/mk/ukim/finki/db/distributorapp/_web/api/RestOrderController.java (revision 863e8b9c1fc20326aadeb06267714f3f30705170) @@ -9,4 +9,5 @@ import mk.ukim.finki.db.distributorapp.customer.dto.CustomerDto; import mk.ukim.finki.db.distributorapp.order.OrdersService; +import mk.ukim.finki.db.distributorapp.order.dto.AndroidCreateOrderDto; import mk.ukim.finki.db.distributorapp.order.dto.CreateOrderDto; import mk.ukim.finki.db.distributorapp.order.dto.OrderSimpleDto; @@ -35,4 +36,5 @@ private final ArticleService articleService; + // ------------------- WEB ------------------- @PostMapping("/create") @PreAuthorize("hasAnyRole('CUSTOMER','ADMIN')") @@ -64,5 +66,5 @@ } - @GetMapping("/{orderId}") + @GetMapping("/customer/{orderId}") @PreAuthorize("hasAnyRole('CUSTOMER', 'ADMIN')") public ResponseEntity getOrder(@PathVariable Long orderId) { @@ -76,5 +78,5 @@ } - @GetMapping("/customer-current-orders") + @GetMapping("/customer/current-orders") @PreAuthorize("hasAnyRole('CUSTOMER')") public ResponseEntity> getCurrentOrders(Principal principal) { @@ -84,3 +86,26 @@ return ResponseEntity.ok(result); } + + @GetMapping("/manager/unassigned-orders") + @PreAuthorize("hasAnyRole('MANAGER')") + public ResponseEntity> getManagerUnassignedOrders(Principal principal) { + String userEmail = principal.getName(); + UserDto user = this.userService.findUserDtoByEmail(userEmail); + List newOrders = this.ordersService.getNewOrdersByManager(user.getId()); + return ResponseEntity.ok(newOrders); + } + + // ------------------- MOBILE ANDROID ------------------ + @PostMapping("/mobile/customer/create-order") + @PreAuthorize("hasAnyRole('CUSTOMER')") + public ResponseEntity createOrder(@RequestBody AndroidCreateOrderDto order){ + // todo: implement creating order via api and try to unify the code for both android and angular. + UserDto user = this.userService.findUserDtoByEmail(order.getUserEmail()); + WarehouseDto wh = this.warehouseService.findByUserId(user.getCityId()); + ArticleDto article = this.articleService.findById(order.getArticleId(), wh.getId()); + CreateOrderDto orderDto = new CreateOrderDto(); + orderDto.setProForma(order.getProForma()); + return ResponseEntity.ok(new OrderSimpleDto()); + } + } Index: src/main/java/mk/ukim/finki/db/distributorapp/_web/api/RestProFormaController.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/_web/api/RestProFormaController.java (revision 863e8b9c1fc20326aadeb06267714f3f30705170) +++ src/main/java/mk/ukim/finki/db/distributorapp/_web/api/RestProFormaController.java (revision 863e8b9c1fc20326aadeb06267714f3f30705170) @@ -0,0 +1,29 @@ +package mk.ukim.finki.db.distributorapp._web.api; + +import lombok.RequiredArgsConstructor; +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.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.security.Principal; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/pro-forma") +@CrossOrigin(origins = "*") +public class RestProFormaController { + private final ProFormaService proFormaService; + + @GetMapping("/manager/all") + @PreAuthorize("hasAnyRole('MANAGER')") + public ResponseEntity getAllManagerProFormas(Principal principal) { + // TODO: Implement this method + return null; + } + +} Index: src/main/java/mk/ukim/finki/db/distributorapp/_web/api/RestVehicleController.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/_web/api/RestVehicleController.java (revision 1a2f5a57063d62be028109c190df02ed87e83903) +++ src/main/java/mk/ukim/finki/db/distributorapp/_web/api/RestVehicleController.java (revision 863e8b9c1fc20326aadeb06267714f3f30705170) @@ -2,4 +2,6 @@ import lombok.RequiredArgsConstructor; +import mk.ukim.finki.db.distributorapp.users.UserService; +import mk.ukim.finki.db.distributorapp.users.dto.UserDto; import mk.ukim.finki.db.distributorapp.vehicle.VehicleService; import mk.ukim.finki.db.distributorapp.vehicle.dto.VehicleBasicDto; @@ -11,4 +13,5 @@ import org.springframework.web.bind.annotation.*; +import java.security.Principal; import java.util.List; @@ -20,4 +23,5 @@ private final VehicleService vehicleService; private final WarehouseService warehouseService; + private final UserService userService; @GetMapping("/find-by-city") @@ -34,3 +38,12 @@ return null; } + + @GetMapping("/manager/vehicles") + @PreAuthorize("hasAnyRole('MANAGER')") + public ResponseEntity> getManagerVehicles(Principal principal) { + String userEmail = principal.getName(); + UserDto user = this.userService.findUserDtoByEmail(userEmail); + List vehicles = this.vehicleService.getBasicVehiclesByManagerId(user.getId()); + return ResponseEntity.ok(vehicles); + } } Index: src/main/java/mk/ukim/finki/db/distributorapp/discount/Discount.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/discount/Discount.java (revision 863e8b9c1fc20326aadeb06267714f3f30705170) +++ src/main/java/mk/ukim/finki/db/distributorapp/discount/Discount.java (revision 863e8b9c1fc20326aadeb06267714f3f30705170) @@ -0,0 +1,21 @@ +package mk.ukim.finki.db.distributorapp.discount; + +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import mk.ukim.finki.db.distributorapp.proForma.ProForma; + +@Entity +@Data +public class Discount { + @Id + @GeneratedValue(strategy= GenerationType.IDENTITY) + private Long discountId; + + @NotNull + @Column(name = "dsc_amount", nullable = false) + private Integer discountAmount; + + @OneToOne(mappedBy="discount") + private ProForma proForma; +} Index: src/main/java/mk/ukim/finki/db/distributorapp/discount/DiscountRepository.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/discount/DiscountRepository.java (revision 863e8b9c1fc20326aadeb06267714f3f30705170) +++ src/main/java/mk/ukim/finki/db/distributorapp/discount/DiscountRepository.java (revision 863e8b9c1fc20326aadeb06267714f3f30705170) @@ -0,0 +1,48 @@ +package mk.ukim.finki.db.distributorapp.discount; + +import jakarta.transaction.Transactional; +import jakarta.validation.constraints.NotNull; +import lombok.NonNull; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; + +@Repository +public interface DiscountRepository extends JpaRepository { + + @Modifying + @Transactional + @Query(nativeQuery = true, + value = """ + insert into discount(dsc_amount) + values (:discountAmount) + """) + Integer create( + @NotNull @Param("discountAmount") Integer discountAmount); + + @Modifying + @Transactional + @Query( + nativeQuery = true, + value = """ + update discount + set dsc_amount=:discountAmount + where dsc_id=:id + """) + Integer edit( + @NotNull @Param("id") Long id, + @NotNull @Param("discountAmount") Integer discountAmount + ); + + @Modifying + @Transactional + @Query( + nativeQuery = true, + value = """ + delete from discount where dsc_id=:dsc_id + """ + ) + void delete(@NonNull @Param("dsc_id") Long id); +} Index: src/main/java/mk/ukim/finki/db/distributorapp/discount/DiscountService.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/discount/DiscountService.java (revision 863e8b9c1fc20326aadeb06267714f3f30705170) +++ src/main/java/mk/ukim/finki/db/distributorapp/discount/DiscountService.java (revision 863e8b9c1fc20326aadeb06267714f3f30705170) @@ -0,0 +1,10 @@ +package mk.ukim.finki.db.distributorapp.discount; + +import mk.ukim.finki.db.distributorapp.discount.dto.DiscountDto; +import org.springframework.stereotype.Service; + +public interface DiscountService { + Integer create(DiscountDto discountDto); + Integer edit(DiscountDto discountDto); + void deleteById(Long id); +} Index: src/main/java/mk/ukim/finki/db/distributorapp/discount/dto/DiscountDto.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/discount/dto/DiscountDto.java (revision 863e8b9c1fc20326aadeb06267714f3f30705170) +++ src/main/java/mk/ukim/finki/db/distributorapp/discount/dto/DiscountDto.java (revision 863e8b9c1fc20326aadeb06267714f3f30705170) @@ -0,0 +1,13 @@ +package mk.ukim.finki.db.distributorapp.discount.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class DiscountDto { + private Long discountId; + private Integer discountAmount; +} Index: src/main/java/mk/ukim/finki/db/distributorapp/driver/DriverRepository.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/driver/DriverRepository.java (revision 1a2f5a57063d62be028109c190df02ed87e83903) +++ src/main/java/mk/ukim/finki/db/distributorapp/driver/DriverRepository.java (revision 863e8b9c1fc20326aadeb06267714f3f30705170) @@ -117,3 +117,22 @@ ) List getOngoingDeliveries(@NonNull Long driverId); + + @Query( + nativeQuery = true, + value = """ + select d.user_id as id, + u.user_name as name, + u.user_email as email, + u.user_mobile as phone, + u.user_image as image, + d.veh_id as vehId + from driver d + join users u on d.user_id = u.user_id + join vehicle v on d.veh_id = v.veh_id + join warehouse wh on v.wh_id=wh.wh_id + join manager m on wh.wh_id = m.wh_id + where m.user_id = :id + """ + ) + List listAllDriversForManager(Long id); } Index: src/main/java/mk/ukim/finki/db/distributorapp/driver/DriverService.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/driver/DriverService.java (revision 1a2f5a57063d62be028109c190df02ed87e83903) +++ src/main/java/mk/ukim/finki/db/distributorapp/driver/DriverService.java (revision 863e8b9c1fc20326aadeb06267714f3f30705170) @@ -27,3 +27,5 @@ void endDelivery(DeliveryEndDto delivery); + + List listAllDriversForManager(Long id); } Index: src/main/java/mk/ukim/finki/db/distributorapp/driver/DriverServiceImpl.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/driver/DriverServiceImpl.java (revision 1a2f5a57063d62be028109c190df02ed87e83903) +++ src/main/java/mk/ukim/finki/db/distributorapp/driver/DriverServiceImpl.java (revision 863e8b9c1fc20326aadeb06267714f3f30705170) @@ -84,3 +84,8 @@ this.deliveryService.edit(deliveryDto); } + + @Override + public List listAllDriversForManager(Long id) { + return this.driverRepository.listAllDriversForManager(id); + } } Index: src/main/java/mk/ukim/finki/db/distributorapp/manager/dto/ManagerDto.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/manager/dto/ManagerDto.java (revision 1a2f5a57063d62be028109c190df02ed87e83903) +++ src/main/java/mk/ukim/finki/db/distributorapp/manager/dto/ManagerDto.java (revision 863e8b9c1fc20326aadeb06267714f3f30705170) Index: src/main/java/mk/ukim/finki/db/distributorapp/price/PriceRepository.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/price/PriceRepository.java (revision 1a2f5a57063d62be028109c190df02ed87e83903) +++ src/main/java/mk/ukim/finki/db/distributorapp/price/PriceRepository.java (revision 863e8b9c1fc20326aadeb06267714f3f30705170) @@ -5,4 +5,5 @@ import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; +import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; @@ -10,4 +11,5 @@ import java.time.LocalDateTime; +@Repository public interface PriceRepository extends JpaRepository { @Modifying Index: src/main/java/mk/ukim/finki/db/distributorapp/proForma/ProForma.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/proForma/ProForma.java (revision 1a2f5a57063d62be028109c190df02ed87e83903) +++ src/main/java/mk/ukim/finki/db/distributorapp/proForma/ProForma.java (revision 863e8b9c1fc20326aadeb06267714f3f30705170) @@ -4,4 +4,5 @@ import jakarta.validation.constraints.NotNull; import lombok.Data; +import mk.ukim.finki.db.distributorapp.discount.Discount; import mk.ukim.finki.db.distributorapp.proFormaStatus.ProFormaStatus; import mk.ukim.finki.db.distributorapp.order.Orders; @@ -27,4 +28,8 @@ @NotNull + @Column(name = "pf_total", nullable = false) + private Double total; + + @NotNull @ManyToOne(fetch = FetchType.LAZY, optional = false) @JoinColumn(name = "pf_status_id", nullable = false) @@ -33,3 +38,7 @@ @OneToOne(mappedBy = "proForma") private Orders order; + + @OneToOne + @JoinColumn(name = "pf_discount") + private Discount discount; } Index: src/main/java/mk/ukim/finki/db/distributorapp/proForma/ProFormaRepository.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/proForma/ProFormaRepository.java (revision 1a2f5a57063d62be028109c190df02ed87e83903) +++ src/main/java/mk/ukim/finki/db/distributorapp/proForma/ProFormaRepository.java (revision 863e8b9c1fc20326aadeb06267714f3f30705170) @@ -16,15 +16,19 @@ value = """ select pf.pf_id as id, - pf.pf_deadline as pfDeadline, - pf.pf_date_created as pfDateCreated, - pf.pf_status_id as statusId, + pf_deadline as pfDeadline, + pf_date_created as pfDateCreated, + pf_total as pfTotal, + dsc.dsc_id as discountId, + dsc.dsc_amount as discountAmount, + pfs.pf_status_id as statusId, pfs.pf_status_name as statusName, o.ord_id as ordId, - o.cust_id as customerId, + 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 discount dsc on pf.pf_discount = dsc.dsc_id + 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 @@ -76,4 +80,7 @@ pf_deadline as pfDeadline, pf_date_created as pfDateCreated, + pf_total as pfTotal, + dsc.dsc_id as discountId, + dsc.dsc_amount as discountAmount, pfs.pf_status_id as statusId, pfs.pf_status_name as statusName, @@ -84,4 +91,5 @@ u.user_mobile as customerPhone from pro_forma pf + join discount dsc on pf.pf_discount = dsc.dsc_id join pro_forma_status pfs on pf.pf_status_id=pfs.pf_status_id join orders o on pf.pf_id = o.pf_id Index: src/main/java/mk/ukim/finki/db/distributorapp/proForma/dto/ProFormaDto.java =================================================================== --- src/main/java/mk/ukim/finki/db/distributorapp/proForma/dto/ProFormaDto.java (revision 1a2f5a57063d62be028109c190df02ed87e83903) +++ src/main/java/mk/ukim/finki/db/distributorapp/proForma/dto/ProFormaDto.java (revision 863e8b9c1fc20326aadeb06267714f3f30705170) @@ -14,4 +14,7 @@ private LocalDate pfDeadline; private LocalDate pfDateCreated; + private Double pfTotal; + private Long discountId; + private Integer discountAmount; private Short statusId; private String statusName; Index: src/main/resources/application.properties =================================================================== --- src/main/resources/application.properties (revision 1a2f5a57063d62be028109c190df02ed87e83903) +++ src/main/resources/application.properties (revision 863e8b9c1fc20326aadeb06267714f3f30705170) @@ -1,3 +1,3 @@ spring.application.name=DistributorApp -spring.profiles.active=local +spring.profiles.active=prod