We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 8aa50fc commit 80da434Copy full SHA for 80da434
1 file changed
serverside_challenge_2/challenge/app/models/usage_charge.rb
@@ -10,11 +10,11 @@ class UsageCharge < ApplicationRecord
10
scope :lower_than, ->(usage) { where("usage_lower <= ?", usage) }
11
12
# 従量料金 = 従量料金単価(円/kWh) × 電気使用量(kWh)
13
- # ※ 計算で用いる 電気使用量(kWh) は、usage_lower以上、usage_upper以下の範囲内の使用量
+ # ※ 計算で用いる 電気使用量(kWh) は、usage(またはusage_upper) - usage_lower で計算する
14
# @param usage [Integer] 電気使用量(kWh)
15
# @return [BigDecimal] 従量料金(円)
16
def calc_charge(usage)
17
- return 0.0 if usage_lower > usage
+ return 0.0 if usage_lower >= usage
18
19
upper = usage_upper.present? && usage_upper < usage ? usage_upper : usage
20
applicable_usage = upper - usage_lower
0 commit comments