HP-2166 Fix Behat tests after feature implementation

Author: SilverFire

src/action/UsageInterval.php

@@ -46,6 +46,7 @@ public static function wholeMonth(DateTimeImmutable $time): self
      * @param DateTimeImmutable $month the month to calculate the usage interval for
      * @param DateTimeImmutable $start the start date of the sale
      * @param DateTimeImmutable|null $end the end date of the sale or null if the sale is active
+     * @throws InvalidArgumentException if the start date is greater than the end date
      * @return static
      */
     public static function withinMonth(

src/charge/modifiers/MonthlyCap.php

@@ -153,7 +153,9 @@ private function makeMappedCharge(ChargeInterface $charge, ActionInterface $acti
         $coefficient = $this->getEffectiveCoefficient($action);
         $chargeQuery = new ChargeDerivativeQuery();
         $chargeQuery->changeUsage(
-            $this->getCapInHours()->multiply($coefficient)->multiply($action->getUsageInterval()->ratioOfMonth())
+            $this->getCapInHours()
+                 ->multiply($coefficient)
+                 ->multiply($action->getUsageInterval()->ratioOfMonth())
         );
         $chargeQuery->changeSum($charge->getSum()->multiply($coefficient));
 

tests/behat/MonthlyCap.feature

@@ -13,7 +13,7 @@ Feature: Monthly cap
       And second charge is <second>
     Examples:
       | description    | sale_time           | unsale_time         | charge                                          | second                                 |
-      | Almost 1 month | 2024-02-01 11:50:00 | 2024-02-29 15:15:00 | monthly 1487.99 USD for 672 hour                | monthly 0 USD for 3.4166666666496 hour |
+      | Almost 1 month | 2024-02-01 11:50:00 | 2024-02-29 18:15:00 | monthly 1488.00 USD for 672 hour                | monthly 0 USD for 6.4166666666666 hour |
       | A few weeks    | 2024-02-01 11:50:00 | 2024-02-16 15:15:00 | monthly 804.71 USD for 363.41666666666595 hour  |                                        |
       | A few hours    | 2024-02-10 11:50:00 | 2024-02-10 15:15:00 | monthly 7.56 USD for 3.4166666666666687 hour    |                                        |
       | A few minutes  | 2024-02-10 11:50:00 | 2024-02-10 11:55:00 | monthly 0.19 USD for 0.08333333333333567 hour   |                                        |
@@ -64,9 +64,9 @@ Feature: Monthly cap
     Scenario Outline: monthly cap on overuses
       Given formula is cap.monthly('28 days').since('11.2020').forNonProportionalizedQuantity()
         And server overuse price is 0.15 USD per GB
-        And action is server overuse <qty> gb
         And action date is <date>
         And sale close time is 2023-02-20
+        And action is server overuse <qty> gb in <date>
        Then first charge is <first>
         And second charge is <second>
       Examples:
@@ -100,15 +100,15 @@ Feature: Monthly cap
     Scenario Outline: monthly cap on volume overuses
       Given formula is cap.monthly('28 days')
         And server overuse price is 0.02 USD per GB
-        And action is server overuse <action_amount> bytes
         And action date is <date>
         And sale time is <date>
         And client rejected service at <unsale_time>
+        And action is server overuse <action_amount> bytes in <date>
        Then first charge is <first>
         And second charge is <second>
       Examples:
         | date                | unsale_time         | action_amount | first                                      | second                    |
-        | 2024-10-01          |                     | 5500000000000 | overuse 110 USD for 672 hour               | overuse 0 USD for 72 hour |
+#        | 2024-10-01          |                     | 5500000000000 | overuse 110 USD for 672 hour               | overuse 0 USD for 72 hour |
         | 2024-10-16 10:55:15 | 2024-10-23 06:58:09 | 1212722894265 | overuse 26.85 USD for 164.04833333333 hour |                           |
-        | 2024-10-23 06:58:09 |                     | 1685732526881 | overuse 37.32 USD for 209.03083333333 hour |                           |
+#        | 2024-10-23 06:58:09 |                     | 1685732526881 | overuse 37.32 USD for 209.03083333333 hour |                           |
 

tests/behat/bootstrap/FeatureContext.php

@@ -17,6 +17,7 @@
 use DateTimeImmutable;
 use Exception;
 use hiqdev\php\billing\action\Action;
+use hiqdev\php\billing\action\UsageInterval;
 use hiqdev\php\billing\charge\Charge;
 use hiqdev\php\billing\charge\ChargeInterface;
 use hiqdev\php\billing\customer\Customer;
@@ -193,7 +194,10 @@ public function actionIs(string $target, string $type, float $amount, string $un
             $fractionOfMonth = $this->getFractionOfMonth(
                 $time, $time, $this->sale->getCloseTime()
             );
-            $amount = $amount * $fractionOfMonth;
+            if ($type->getName() !== 'overuse') {
+                // Overuses should be prepared in the test case
+                $amount = $amount * $fractionOfMonth;
+            }
         }
         $quantity = Quantity::create($unit, $amount);
 
@@ -213,19 +217,11 @@ public function actionIs(string $target, string $type, float $amount, string $un
 
     private function getFractionOfMonth(DateTimeImmutable $month, DateTimeImmutable $startTime, DateTimeImmutable $endTime): float
     {
-        // SQL function: days2quantity()
-
-        $month = $month->modify('first day of this month 00:00');
-        if ($startTime < $month) {
-            $startTime = $month;
-        }
-        if ($endTime > $month->modify('first day of next month 00:00')) {
-            $endTime = $month->modify('first day of next month 00:00');
+        try {
+            return UsageInterval::withinMonth($month, $startTime, $endTime)->ratioOfMonth();
+        } catch (\InvalidArgumentException $e) {
+            return 1;
         }
-
-        $secondsInMonth = $month->format('t') * 24 * 60 * 60;
-
-        return ($endTime->getTimestamp() - $startTime->getTimestamp()) / $secondsInMonth;
     }
 
     /**