Skip to content

Commit 80da434

Browse files
committed
UsageCharge#calc_chargeを少し改良。あとコメント修正
1 parent 8aa50fc commit 80da434

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

serverside_challenge_2/challenge/app/models/usage_charge.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ class UsageCharge < ApplicationRecord
1010
scope :lower_than, ->(usage) { where("usage_lower <= ?", usage) }
1111

1212
# 従量料金 = 従量料金単価(円/kWh) × 電気使用量(kWh)
13-
# ※ 計算で用いる 電気使用量(kWh) は、usage_lower以上、usage_upper以下の範囲内の使用量
13+
# ※ 計算で用いる 電気使用量(kWh) は、usage(またはusage_upper) - usage_lower で計算する
1414
# @param usage [Integer] 電気使用量(kWh)
1515
# @return [BigDecimal] 従量料金(円)
1616
def calc_charge(usage)
17-
return 0.0 if usage_lower > usage
17+
return 0.0 if usage_lower >= usage
1818

1919
upper = usage_upper.present? && usage_upper < usage ? usage_upper : usage
2020
applicable_usage = upper - usage_lower

0 commit comments

Comments
 (0)