Revert "fix: Change usableDonation to usedDonation in response DTO"

This reverts commit 4f8ba8a.
9oormthon-univ · Nov 30, 2024 · 9ff68b5 · 9ff68b5
1 parent 4f8ba8a
commit 9ff68b5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/main/java/com/example/mymoo/domain/statistics/controller/StatisticsController.java b/src/main/java/com/example/mymoo/domain/statistics/controller/StatisticsController.java
@@ -30,7 +30,7 @@ public class StatisticsController {
     @GetMapping("children")
     public ResponseEntity<ChildStatisticsDTO> getChildStatistics(
     ){
-        return ResponseEntity.status(HttpStatus.OK).body(
+        return ResponseEntity.status(HttpStatus.ACCEPTED).body(
                 statisticsService.getChildStatistics()
         );
     }
@@ -45,7 +45,7 @@ public ResponseEntity<ChildStatisticsDTO> getChildStatistics(
     @GetMapping("utilizations")
     public ResponseEntity<UtilizationStatisticsDTO> getUtilizationStatistics(
     ){
-        return ResponseEntity.status(HttpStatus.OK).body(
+        return ResponseEntity.status(HttpStatus.ACCEPTED).body(
                 statisticsService.getUtilizationStatistics()
         );
     }
@@ -60,7 +60,7 @@ public ResponseEntity<UtilizationStatisticsDTO> getUtilizationStatistics(
     @GetMapping("stores")
     public ResponseEntity<StoreStatisticsDTO> getStoreStatistics(
     ){
-        return ResponseEntity.status(HttpStatus.OK).body(
+        return ResponseEntity.status(HttpStatus.ACCEPTED).body(
                 statisticsService.getStoreStatistics()
         );
     }

diff --git a/...n/java/com/example/mymoo/domain/statistics/dto/response/UtilizationStatisticsElement.java b/...n/java/com/example/mymoo/domain/statistics/dto/response/UtilizationStatisticsElement.java
@@ -9,7 +9,7 @@
 public class UtilizationStatisticsElement {
     private String address;
     private Long allDonation;
-    private Long usedDonation;
+    private Long usableDonation;
     private Double utilization;
 
     public UtilizationStatisticsElement(
@@ -23,12 +23,13 @@ public UtilizationStatisticsElement(
         if (guName != null){
             this.address += " "+guName;
         }
-        this.allDonation = allDonation != null ? allDonation : 0L;
-        this.usedDonation = this.allDonation - (usableDonation != null ? usableDonation : 0L);
-        if (this.allDonation > 0) {
+        this.allDonation = allDonation;
+        this.usableDonation = usableDonation;
+        if (allDonation != null && allDonation > 0) {
             this.utilization = BigDecimal.valueOf(
-                this.usedDonation*100 / this.allDonation
-            ).setScale(2, RoundingMode.HALF_UP).doubleValue();
+                    usableDonation != null ?
+                            (allDonation.doubleValue()-usableDonation.doubleValue())*100 / allDonation.doubleValue() : 0.0)
+                    .setScale(2, RoundingMode.HALF_UP).doubleValue();
         } else {
             this.utilization = 0.0;
         }