[Bug Fix] 통화가 일 경계에 걸칠 경우 1초만큼의 요금이 누락되는 버그 수정

jopro.o · jopro.o · commit dbd60f58f679 · 2021-03-07T12:15:58.000+09:00
diff --git a/chapter14/src/main/java/org/eternity/billing/step02/BasicRatePolicy.java b/chapter14/src/main/java/org/eternity/billing/step02/BasicRatePolicy.java
@@ -25,6 +25,7 @@ private Money calculate(Call call) {
         return feeRules
                 .stream()
                 .map(rule -> rule.calculateFee(call))
-                .reduce(Money.ZERO, (first, second) -> first.plus(second));
+                .reduce(Money.ZERO,
+                        (first, second) -> second.isGreaterThanOrEqual(Money.ZERO) ? first.plus(second) : first);
     }
 }
diff --git a/chapter14/src/main/java/org/eternity/billing/step02/FeePerDuration.java b/chapter14/src/main/java/org/eternity/billing/step02/FeePerDuration.java
@@ -15,7 +15,7 @@ public FeePerDuration(Money fee, Duration duration) {
     }
 
     public Money calculate(DateTimeInterval interval) {
-        return fee.times(interval.duration().getSeconds() / duration.getSeconds());
+        return fee.times(Math.ceil((double)interval.duration().toNanos() / duration.toNanos()));
     }
 }
 
diff --git a/chapter14/src/main/java/org/eternity/time/DateTimeInterval.java b/chapter14/src/main/java/org/eternity/time/DateTimeInterval.java
@@ -12,7 +12,7 @@ public static DateTimeInterval of(LocalDateTime from, LocalDateTime to) {
     }
 
     public static DateTimeInterval toMidnight(LocalDateTime from) {
-        return new DateTimeInterval(from, LocalDateTime.of(from.toLocalDate(), LocalTime.of(23, 59, 59)));
+        return new DateTimeInterval(from, LocalDateTime.of(from.toLocalDate(), LocalTime.of(23, 59, 59, 999_999_999)));
     }
 
     public static DateTimeInterval fromMidnight(LocalDateTime to) {
@@ -22,7 +22,7 @@ public static DateTimeInterval fromMidnight(LocalDateTime to) {
     public static DateTimeInterval during(LocalDate date) {
         return new DateTimeInterval(
                 LocalDateTime.of(date, LocalTime.of(0, 0)),
-                LocalDateTime.of(date, LocalTime.of(23, 59, 59)));
+                LocalDateTime.of(date, LocalTime.of(23, 59, 59, 999_999_999)));
     }
 
     private DateTimeInterval(LocalDateTime from, LocalDateTime to) {
@@ -43,7 +43,7 @@ public LocalDateTime getTo() {
     }
 
     public List<DateTimeInterval> splitByDay() {
-        if (days() > 1) {
+        if (days() > 0) {
             return split(days());
         }
 

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ private Money calculate(Call call) {`
`25`	`25`	`return feeRules`
`26`	`26`	`.stream()`
`27`	`27`	`.map(rule -> rule.calculateFee(call))`
`28`		`- .reduce(Money.ZERO, (first, second) -> first.plus(second));`
	`28`	`+ .reduce(Money.ZERO,`
	`29`	`+ (first, second) -> second.isGreaterThanOrEqual(Money.ZERO) ? first.plus(second) : first);`
`29`	`30`	`}`
`30`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public FeePerDuration(Money fee, Duration duration) {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`public Money calculate(DateTimeInterval interval) {`
`18`		`- return fee.times(interval.duration().getSeconds() / duration.getSeconds());`
	`18`	`+ return fee.times(Math.ceil((double)interval.duration().toNanos() / duration.toNanos()));`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public static DateTimeInterval of(LocalDateTime from, LocalDateTime to) {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`public static DateTimeInterval toMidnight(LocalDateTime from) {`
`15`		`- return new DateTimeInterval(from, LocalDateTime.of(from.toLocalDate(), LocalTime.of(23, 59, 59)));`
	`15`	`+ return new DateTimeInterval(from, LocalDateTime.of(from.toLocalDate(), LocalTime.of(23, 59, 59, 999_999_999)));`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`public static DateTimeInterval fromMidnight(LocalDateTime to) {`
`@@ -22,7 +22,7 @@ public static DateTimeInterval fromMidnight(LocalDateTime to) {`
`22`	`22`	`public static DateTimeInterval during(LocalDate date) {`
`23`	`23`	`return new DateTimeInterval(`
`24`	`24`	`LocalDateTime.of(date, LocalTime.of(0, 0)),`
`25`		`- LocalDateTime.of(date, LocalTime.of(23, 59, 59)));`
	`25`	`+ LocalDateTime.of(date, LocalTime.of(23, 59, 59, 999_999_999)));`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`private DateTimeInterval(LocalDateTime from, LocalDateTime to) {`
`@@ -43,7 +43,7 @@ public LocalDateTime getTo() {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`public List<DateTimeInterval> splitByDay() {`
`46`		`- if (days() > 1) {`
	`46`	`+ if (days() > 0) {`
`47`	`47`	`return split(days());`
`48`	`48`	`}`
`49`	`49`