Merge pull request #122 from phuuthanh-dev/develop

dashboard

Author: phuuthanh-dev

src/main/java/vn/webapp/backend/auction/controller/DashBoardController.java

@@ -18,8 +18,13 @@ public class DashBoardController {
     public ResponseEntity<DashBoardResponse> getDashBoardTotal(
             @RequestParam("yearGetRegisterAccount") Integer yearGetRegisterAccount,
             @RequestParam("yearGetAuction") Integer yearGetAuction,
-            @RequestParam("yearGetRevenue") Integer yearGetRevenue
+            @RequestParam("yearGetRevenue") Integer yearGetRevenue,
+            @RequestParam("yearGetAuctionFailedAndSuccess") Integer yearGetAuctionFailedAndSuccess,
+            @RequestParam("monthGetAuctionFailedAndSuccess") Integer monthGetAuctionFailedAndSuccess,
+            @RequestParam("yearGetUserJoinAuction") Integer yearGetUserJoinAuction
     ) {
-        return ResponseEntity.ok(dashBoardService.getInformation(yearGetRegisterAccount, yearGetAuction, yearGetRevenue));
+        return ResponseEntity.ok(dashBoardService.getInformation(yearGetRegisterAccount, yearGetAuction, yearGetRevenue,
+                yearGetAuctionFailedAndSuccess, monthGetAuctionFailedAndSuccess,
+                yearGetUserJoinAuction));
     }
 }

src/main/java/vn/webapp/backend/auction/controller/RequestApprovalController.java

@@ -30,7 +30,7 @@ public ResponseEntity<RequestApproval> getRequestById(@PathVariable Integer id)
 
     @PutMapping("/set-state/{id}")
     public ResponseEntity<RequestApproval> setState(@PathVariable Integer id, @RequestParam Integer responderId, @RequestParam String state) {
-        requestApprovalService.setRequestState(id,responderId, state);
+        requestApprovalService.setRequestState(id, responderId, state);
         return ResponseEntity.ok().build();
     }
 
@@ -57,7 +57,7 @@ public ResponseEntity<Page<RequestApproval>> getRequestByRoleOfSender(
             @RequestParam(defaultValue = "asc") String sortOrder) {
         Sort.Direction direction = (sortOrder.equalsIgnoreCase("asc")) ? Sort.Direction.ASC : Sort.Direction.DESC;
         Pageable pageable = PageRequest.of(page, size, direction, sortBy);
-        return ResponseEntity.ok(requestApprovalService.getRequestBySenderRole(role,jewelryName,category,pageable));
+        return ResponseEntity.ok(requestApprovalService.getRequestBySenderRole(role, jewelryName, category, pageable));
     }
 
 
@@ -99,7 +99,7 @@ public ResponseEntity<Page<RequestApproval>> getRequestApprovalByUserId(
             @RequestParam(defaultValue = "desc") String sortOrder) {
         Sort.Direction direction = (sortOrder.equalsIgnoreCase("asc")) ? Sort.Direction.ASC : Sort.Direction.DESC;
         Pageable pageable = PageRequest.of(page, size, direction, sortBy);
-        return ResponseEntity.ok(requestApprovalService.getRequestApprovalByUserId(id, jewelryName,pageable));
+        return ResponseEntity.ok(requestApprovalService.getRequestApprovalByUserId(id, jewelryName, pageable));
     }
 
     @GetMapping("/request-passed")

src/main/java/vn/webapp/backend/auction/dto/DashBoardResponse.java

@@ -10,7 +10,6 @@
 @AllArgsConstructor
 @NoArgsConstructor
 public class DashBoardResponse {
-    private Integer totalAuctions;
     private Double totalRevenueToday;
     private Integer totalUser;
     private Integer totalJewelryActive;
@@ -23,12 +22,11 @@ public class DashBoardResponse {
     private Integer totalStaffs;
     private Integer totalManagers;
     private Integer totalAdmins;
-    private double percentAuctionFailed;
-    private double percentAuctionSuccess;
-    private double participationRate;
-    private double notParticipationRate;
+    private double auctionFailed;
+    private double auctionSuccess;
+    private Double[] totalParticipationByMonth;
     private Integer[] totalUsersByMonth;
     private Integer[] totalAuctionByMonth;
-    private Double totalRevenue;
+    private Double[] totalRevenueNear10Year;
     private Double[] totalRevenueByMonth;
 }

src/main/java/vn/webapp/backend/auction/repository/AuctionRegistrationRepository.java

@@ -28,8 +28,8 @@ public interface AuctionRegistrationRepository extends JpaRepository<AuctionRegi
     @Query("SELECT SUM(ar.registrationFee) FROM AuctionRegistration ar")
     Double sumTotalRegistrationFee();
 
-    @Query("SELECT COUNT(DISTINCT ar.user.id) FROM AuctionRegistration ar WHERE ar.auctionRegistrationState = 'VALID'")
-    Long countDistinctUsersRegistered();
+    @Query("SELECT COUNT(DISTINCT ar.user.id) FROM AuctionRegistration ar WHERE ar.auctionRegistrationState = 'VALID' AND MONTH(ar.registrationDate) = :month AND YEAR(ar.registrationDate) = :year")
+    Long countDistinctUsersRegistered(@Param("month") Integer month, @Param("year") Integer year);
 
     @Query("SELECT COUNT(ar) FROM AuctionRegistration ar WHERE ar.auction.id = :auctionId AND ar.auctionRegistrationState = 'VALID'")
     Integer countValidParticipantsByAuctionId(@Param("auctionId") Integer auctionId);

src/main/java/vn/webapp/backend/auction/repository/AuctionRepository.java

@@ -54,12 +54,12 @@ Page<Auction> findByStateAndCategoryNotDeletedOrEmptyState(
     Integer countAllAuctionsFinished();
 
     @Query("SELECT COUNT(a) FROM Auction a WHERE a.state = 'FINISHED' " +
-            "AND a.id NOT IN (SELECT ah.auction.id FROM AuctionHistory ah)")
-    Integer countAllAuctionsFailed();
+            "AND a.id NOT IN (SELECT ah.auction.id FROM AuctionHistory ah)  AND YEAR(a.endDate) = :year AND MONTH(a.endDate) = :month")
+    Integer countAllAuctionsFailed(@Param("month") Integer month, @Param("year") Integer year);
 
     @Query("SELECT COUNT(a) FROM Auction a WHERE a.state = 'FINISHED' " +
-            "AND a.id IN (SELECT ah.auction.id FROM AuctionHistory ah)")
-    Integer countAllAuctionsSuccessful();
+            "AND a.id IN (SELECT ah.auction.id FROM AuctionHistory ah) AND YEAR(a.endDate) = :year AND MONTH(a.endDate) = :month")
+    Integer countAllAuctionsSuccessful(@Param("month") Integer month, @Param("year") Integer year);
 
     @Query("SELECT COUNT(a) FROM Auction a " +
             "WHERE MONTH(a.createDate) = :month AND YEAR(a.createDate) = :year")

src/main/java/vn/webapp/backend/auction/repository/TransactionRepository.java

@@ -33,11 +33,11 @@ Page<Transaction> findTransactionByTypeAndState(
     @Query("SELECT COUNT(t) FROM Transaction t WHERE t.type = 'REGISTRATION' AND t.user.username = :username")
     Integer getCountTransactionsRegistrationByUsername(@Param("username") String username);
 
-    @Query("SELECT SUM(t.totalPrice * 0.08) FROM Transaction t WHERE t.type = 'PAYMENT_TO_WINNER' AND t.state = 'SUCCEED'")
-    Double getTotalCommissionRevenue();
+    @Query("SELECT SUM(t.totalPrice * 0.08) FROM Transaction t WHERE t.type = 'PAYMENT_TO_WINNER' AND t.state = 'SUCCEED' AND YEAR(t.paymentTime) = :year")
+    Double getTotalCommissionRevenueByYear(@Param("year") Integer year);
 
-    @Query("SELECT SUM(t.auction.participationFee) FROM Transaction t WHERE t.type = 'REGISTRATION' AND t.state = 'SUCCEED'")
-    Double getTotalRegistrationFeeRevenue();
+    @Query("SELECT SUM(t.auction.participationFee) FROM Transaction t WHERE t.type = 'REGISTRATION' AND t.state = 'SUCCEED' AND YEAR(t.paymentTime) = :year")
+    Double getTotalRegistrationFeeRevenueByYear(@Param("year") Integer year);
 
     @Query("SELECT COALESCE(SUM(t.totalPrice * 0.08), 0) " +
             "FROM Transaction t " +

src/main/java/vn/webapp/backend/auction/service/dashboard/DashBoardService.java

@@ -9,6 +9,8 @@
 import vn.webapp.backend.auction.enums.Role;
 import vn.webapp.backend.auction.repository.*;
 
+import java.time.Year;
+
 import java.time.LocalDateTime;
 
 @Service
@@ -21,38 +23,35 @@ public class DashBoardService {
     private final AuctionRegistrationRepository auctionRegistrationRepository;
     private final TransactionRepository transactionRepository;
 
-    public DashBoardResponse getInformation(Integer yearGetRegisterAccount, Integer yearGetAuction, Integer yearGetRevenue) {
+    public DashBoardResponse getInformation(Integer yearGetRegisterAccount, Integer yearGetAuction, Integer yearGetRevenue,
+                                            Integer yearGetAuctionFailedAndSuccess, Integer monthGetAuctionFailedAndSuccess,
+                                            Integer yearGetUserJoinAuction) {
         LocalDateTime startOfDay = LocalDateTime.now().withHour(0).withMinute(0).withSecond(0).withNano(0);
         LocalDateTime startOfNextDay = startOfDay.plusDays(1);
 
         // Total counts
         Integer totalUser = userRepository.getTotalUser();
-        Integer totalAuction = auctionRepository.countAllAuctions();
         Integer totalActiveJewelry = jewelryRepository.countAllJewelriesByState(JewelryState.ACTIVE);
         Integer totalApprovingJewelry = jewelryRepository.countAllJewelriesByState(JewelryState.APPROVING);
         Integer totalAuctionJewelry = jewelryRepository.countAllJewelriesByState(JewelryState.AUCTION);
-        Integer totalAuctionFailed = auctionRepository.countAllAuctionsFailed();
-        Integer totalAuctionSuccess = auctionRepository.countAllAuctionsSuccessful();
-        Integer totalAuctionsFinished = auctionRepository.countAllAuctionsFinished();
+        Integer auctionFailed = auctionRepository.countAllAuctionsFailed(monthGetAuctionFailedAndSuccess, yearGetAuctionFailedAndSuccess);
+        Integer auctionSuccess = auctionRepository.countAllAuctionsSuccessful(monthGetAuctionFailedAndSuccess, yearGetAuctionFailedAndSuccess);
         Integer totalUsersVerified = userRepository.getTotalUserByState(AccountState.VERIFIED);
         Integer totalUsersActive = userRepository.getTotalUserByState(AccountState.ACTIVE);
         Integer totalUsersInActive = userRepository.getTotalUserByState(AccountState.INACTIVE);
         Integer totalMembers = userRepository.getTotalUserByRole(Role.MEMBER);
         Integer totalStaffs = userRepository.getTotalUserByRole(Role.STAFF);
         Integer totalManagers = userRepository.getTotalUserByRole(Role.MANAGER);
         Integer totalAdmins = userRepository.getTotalUserByRole(Role.ADMIN);
-        Long totalUsersRegister = auctionRegistrationRepository.countDistinctUsersRegistered();
-        Long totalUsersNotRegistered = totalUser - totalUsersRegister;
 
         // Total revenues
-        Double totalCommissionRevenue = transactionRepository.getTotalCommissionRevenue();
         Double totalRevenueToday = transactionRepository.getTotalRevenueToday(startOfDay, startOfNextDay);
-        Double totalRegistrationFeeRevenue = transactionRepository.getTotalRegistrationFeeRevenue();
 
         // Arrays for monthly data
         Integer[] totalUsersRegisterByMonth = new Integer[12];
         Integer[] totalAuctionByMonth = new Integer[12];
         Double[] totalRevenueByMonth = new Double[12];
+        Double[] totalParticipationByMonth = new Double[12];
 
         // Calculate data for each month of the year
         for (int month = 1; month <= 12; month++) {
@@ -66,22 +65,31 @@ public DashBoardResponse getInformation(Integer yearGetRegisterAccount, Integer
             totalRegistrationFeeRevenueByMonthAndYear = (totalRegistrationFeeRevenueByMonthAndYear != null) ? totalRegistrationFeeRevenueByMonthAndYear : 0.0;
 
             totalRevenueByMonth[month - 1] = totalRevenue + totalRegistrationFeeRevenueByMonthAndYear;
+
+
+            Long participation = auctionRegistrationRepository.countDistinctUsersRegistered(month, yearGetUserJoinAuction);
+            totalParticipationByMonth[month - 1] = participation.doubleValue();
         }
 
-        double percentAuctionFailed = (double) totalAuctionFailed / totalAuctionsFinished * 100;
-        double percentAuctionSuccess = (double) totalAuctionSuccess / totalAuctionsFinished * 100;
-        double participationRate = (double) totalUsersRegister / totalUser * 100;
-        double notParticipationRate = (double) totalUsersNotRegistered / totalUser * 100;
+        // Calculate revenue for the last 10 years
+        Double[] totalRevenueNear10Year = new Double[10];
+        for (int i = 0; i < 10; i++) {
+            int year = Year.now().getValue() - 9 + i;
+            Double totalRevenueForYear = transactionRepository.getTotalCommissionRevenueByYear(year);
+            totalRevenueForYear = (totalRevenueForYear != null) ? totalRevenueForYear : 0.0;
 
-        Double totalRevenue = totalRegistrationFeeRevenue + totalCommissionRevenue;
+            Double totalRegistrationFeeRevenueForYear = transactionRepository.getTotalRegistrationFeeRevenueByYear(year);
+            totalRegistrationFeeRevenueForYear = (totalRegistrationFeeRevenueForYear != null) ? totalRegistrationFeeRevenueForYear : 0.0;
+
+            totalRevenueNear10Year[i] = totalRevenueForYear + totalRegistrationFeeRevenueForYear;
+        }
 
         return DashBoardResponse.builder()
                 .totalUser(totalUser)
                 .totalRevenueToday(totalRevenueToday)
                 .totalJewelryActive(totalActiveJewelry)
                 .totalJewelryWaitApproving(totalApprovingJewelry)
                 .totalAuctionJewelry(totalAuctionJewelry)
-                .totalAuctions(totalAuction)
                 .totalUsersVerified(totalUsersVerified)
                 .totalUsersActive(totalUsersActive)
                 .totalUsersInActive(totalUsersInActive)
@@ -91,11 +99,10 @@ public DashBoardResponse getInformation(Integer yearGetRegisterAccount, Integer
                 .totalAdmins(totalAdmins)
                 .totalUsersByMonth(totalUsersRegisterByMonth)
                 .totalAuctionByMonth(totalAuctionByMonth)
-                .percentAuctionFailed(percentAuctionFailed)
-                .percentAuctionSuccess(percentAuctionSuccess)
-                .notParticipationRate(notParticipationRate)
-                .participationRate(participationRate)
-                .totalRevenue(totalRevenue)
+                .auctionFailed(auctionFailed)
+                .auctionSuccess(auctionSuccess)
+                .totalParticipationByMonth(totalParticipationByMonth)
+                .totalRevenueNear10Year(totalRevenueNear10Year)
                 .totalRevenueByMonth(totalRevenueByMonth)
                 .build();
     }