Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Production #178

Merged
merged 10 commits into from
Nov 12, 2024
Merged

Production #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0068e4d
[TriNT][PBS-106] ref: ref entity assignment
ThanhTriIsCoding Nov 12, 2024
2ee2dd9
[TriNT][PBS-106] ref: ref mapper assignment
ThanhTriIsCoding Nov 12, 2024
2d22855
Merge branch 'develop' of https://github.com/Hoang-Nguyen-Huy/pod-boo…
ThanhTriIsCoding Nov 12, 2024
700e2c3
ref: ref query findStaffForMatchingOrder
ThanhTriIsCoding Nov 12, 2024
34c2bc3
ref: ref query findStaffForMatchingOrder
ThanhTriIsCoding Nov 12, 2024
e938cff
[PBS-108][HoangHN] refactor: calculate revenue
Hoang-Nguyen-Huy Nov 12, 2024
e45b42b
ref: ref query findStaffForMatchingOrder & assignOrdersToStaff
ThanhTriIsCoding Nov 12, 2024
f8274fc
Merge pull request #175 from Hoang-Nguyen-Huy/PBS-106-CRUD-Assignment
nguyenhcp2004 Nov 12, 2024
8793213
Merge pull request #176 from Hoang-Nguyen-Huy/PBS-108-Deploy
nguyenhcp2004 Nov 12, 2024
5f863d9
Merge pull request #177 from Hoang-Nguyen-Huy/develop
nguyenhcp2004 Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/main/java/com/swp/PodBookingSystem/repository/AssignmentRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import org.springframework.stereotype.Repository;

import java.util.List;
import java.util.Optional;

@Repository
public interface AssignmentRepository extends JpaRepository<Assignment, String> {
Expand All @@ -22,9 +23,11 @@ public interface AssignmentRepository extends JpaRepository<Assignment, String>
"WHERE a.slot = :slot " +
"AND a.weekDate = :weekDate " +
"AND ac.buildingNumber = :buildingId")
String findStaffForMatchingOrder(@Param("slot") String slot,
@Param("weekDate") String weekDate,
@Param("buildingId") Integer buildingId);
List<String> findStaffIdsForMatchingOrder(@Param("slot") String slot,
@Param("weekDate") String weekDate,
@Param("buildingId") Integer buildingId);




@Query("SELECT a FROM Assignment a " +
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/com/swp/PodBookingSystem/repository/OrderDetailRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ Page<OrderDetail> findOrdersByBuildingNumberAndTimeRange(
// integer countByBuildingId(@Param("buildingId") Integer buildingId);

@Query("SELECT SUM((od.priceRoom + COALESCE(amenityTotal.totalAmenityPrice, 0)) * " +
"(1 - COALESCE(od.discountPercentage, 0) / 100.0) * (1 - COALESCE(sp.discountPercentage, 0) / 100.0)) as grandTotal " +
"(1 - COALESCE(od.discountPercentage, 0) / 100.0)) as grandTotal " +
"FROM OrderDetail od " +
"LEFT JOIN od.servicePackage sp " +
"LEFT JOIN (SELECT oda.orderDetail.id as orderDetailId, SUM(oda.price * oda.quantity) as totalAmenityPrice " +
Expand All @@ -99,7 +99,7 @@ Page<OrderDetail> findOrdersByBuildingNumberAndTimeRange(
Double calculateRevenueCurrentDay();

@Query("SELECT SUM((od.priceRoom + COALESCE(amenityTotal.totalAmenityPrice, 0)) * " +
"(1 - COALESCE(od.discountPercentage, 0) / 100.0) * (1 - COALESCE(sp.discountPercentage, 0) / 100.0)) as grandTotal " +
"(1 - COALESCE(od.discountPercentage, 0) / 100.0)) as grandTotal " +
"FROM OrderDetail od " +
"LEFT JOIN od.servicePackage sp " +
"LEFT JOIN (SELECT oda.orderDetail.id as orderDetailId, SUM(oda.price * oda.quantity) as totalAmenityPrice " +
Expand All @@ -113,7 +113,7 @@ Optional<Double> calculateRevenueBetweenDateTime(@Param("startTime") LocalDateTi
@Query("SELECT NEW com.swp.PodBookingSystem.dto.respone.OrderDetail.RevenueChartDto(" +
"CONCAT(YEAR(:startTime), '-', LPAD(CAST(MONTH(:startTime) AS string), 2, '0'), '-', LPAD(CAST(DAY(:startTime) AS string), 2, '0')), " +
"SUM((od.priceRoom + COALESCE(amenityTotal.totalAmenityPrice, 0)) * " +
"(1 - COALESCE(od.discountPercentage, 0) / 100.0) * (1 - COALESCE(sp.discountPercentage, 0) / 100.0))) " +
"(1 - COALESCE(od.discountPercentage, 0) / 100.0))) " +
"FROM OrderDetail od " +
"LEFT JOIN od.servicePackage sp " +
"LEFT JOIN (SELECT oda.orderDetail.id as orderDetailId, SUM(oda.price * oda.quantity) as totalAmenityPrice " +
Expand All @@ -126,7 +126,7 @@ Optional<Double> calculateRevenueBetweenDateTime(@Param("startTime") LocalDateTi
@Query("SELECT NEW com.swp.PodBookingSystem.dto.respone.OrderDetail.RevenueChartDto(" +
"CONCAT(YEAR(od.startTime), '-', LPAD(CAST(MONTH(od.startTime) AS string), 2, '0'), '-', LPAD(CAST(DAY(od.startTime) AS string), 2, '0')), " +
"SUM((od.priceRoom + COALESCE(amenityTotal.totalAmenityPrice, 0)) * " +
"(1 - COALESCE(od.discountPercentage, 0) / 100.0) * (1 - COALESCE(sp.discountPercentage, 0) / 100.0))) " +
"(1 - COALESCE(od.discountPercentage, 0) / 100.0))) " +
"FROM OrderDetail od " +
"LEFT JOIN od.servicePackage sp " +
"LEFT JOIN (SELECT oda.orderDetail.id as orderDetailId, SUM(oda.price * oda.quantity) as totalAmenityPrice " +
Expand All @@ -142,8 +142,8 @@ Optional<Double> calculateRevenueBetweenDateTime(@Param("startTime") LocalDateTi
@Query("SELECT NEW com.swp.PodBookingSystem.dto.respone.OrderDetail.RevenueChartDto(" +
"CONCAT(YEAR(MIN(od.startTime)), '-', LPAD(CAST(MONTH(MIN(od.startTime)) AS string), 2, '0'), '-01'), " +
"SUM((od.priceRoom + COALESCE(amenityTotal.totalAmenityPrice, 0)) * " +
"(1 - COALESCE(od.discountPercentage, 0) / 100.0) * " +
"(1 - COALESCE(sp.discountPercentage, 0) / 100.0))) " +
"(1 - COALESCE(od.discountPercentage, 0) / 100.0) " +
")) " +
"FROM OrderDetail od " +
"LEFT JOIN od.servicePackage sp " +
"LEFT JOIN (SELECT oda.orderDetail.id as orderDetailId, SUM(oda.price * oda.quantity) as totalAmenityPrice " +
Expand Down Expand Up @@ -172,7 +172,7 @@ Optional<Double> calculateRevenueBetweenDateTime(@Param("startTime") LocalDateTi
"AND TIME(od.startTime) BETWEEN :slotStartTime AND :slotEndTime " +
"AND od.building.id = :buildingNumber " +
"AND od.startTime > CURRENT_TIMESTAMP " +
"AND (od.orderHandler.id != :staffId OR od.orderHandler IS NULL)")
"AND od.orderHandler IS NULL")
void assignOrdersToStaff(@Param("staffId") String staffId,
@Param("weekDay") int weekDay,
@Param("slotStartTime") String slotStartTime,
Expand Down
11 changes: 4 additions & 7 deletions src/main/java/com/swp/PodBookingSystem/service/OrderDetailService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,13 +364,10 @@ public OrderDetail createOrderDetail(OrderDetailCreationRequest request, Order o

DayOfWeek dayOfWeek = startTime.getDayOfWeek();
String weekDate = getDayLabel(dayOfWeek);
Account orderHandler;
String orderHandlerId = assignmentRepository.findStaffForMatchingOrder(slot, weekDate, building.getId());
if (orderHandlerId == null){
orderHandler = null;
} else {
orderHandler = accountRepository.getById(orderHandlerId);
}
List<String> staffIds = assignmentRepository.findStaffIdsForMatchingOrder(slot, weekDate, building.getId());
String orderHandlerId = staffIds.isEmpty() ? null : staffIds.get(0);

Account orderHandler = (orderHandlerId == null) ? null : accountRepository.getById(orderHandlerId);
OrderDetail response = new OrderDetail();

response.setCustomer(account);
Expand Down