Fixes bug that caused unavailability that starts at the exact second availability starts or ends to be unsubtracted from availability.

Author: justin-schroeder

.phpunit.result.cache

@@ -1 +1 @@
-C:37:"PHPUnit\Runner\DefaultTestResultCache":2303:{a:2:{s:7:"defects";a:12:{s:56:"Tests\CarbonAvailabilityTest::testBackToBackPeriodsMerge";i:3;s:60:"Tests\CarbonAvailabilityTest::testDisconnectedTimesAreMerged";i:3;s:62:"Tests\CarbonAvailabilityTest::testDisconnectedPeriodsDontMerge";i:3;s:67:"Tests\CarbonAvailabilityTest::testInclusiveAvailabilitiesAreRemoved";i:3;s:63:"Tests\CarbonAvailabilityTest::testTimesGetSplitByUnavailability";i:4;s:57:"Tests\CarbonAvailabilityTest::testAvailabilityStartsLater";i:4;s:57:"Tests\CarbonAvailabilityTest::testAvailabilityEndsEarlier";i:4;s:65:"Tests\CarbonAvailabilityTest::testAvailabilityIsRemovedIfEclipsed";i:4;s:74:"Tests\CarbonAvailabilityTest::testAvailabilityIsRemovedIfEclipsedPerfectly";i:3;s:56:"Tests\CarbonAvailabilityTest::testBasicSessionTimesSplit";i:3;s:47:"Tests\CarbonAvailabilityTest::testReadMeExample";i:3;s:49:"Tests\CarbonAvailabilityTest::testThisDumbProblem";i:3;}s:5:"times";a:19:{s:40:"Tests\CarbonAvailabilityTest::testIsTrue";d:0.022;s:56:"Tests\CarbonAvailabilityTest::testBackToBackPeriodsMerge";d:0.049;s:62:"Tests\CarbonAvailabilityTest::testDisconnectedPeriodsDontMerge";d:0;s:60:"Tests\CarbonAvailabilityTest::testDisconnectedTimesAreMerged";d:0;s:72:"Tests\CarbonAvailabilityTest::testDisconnectedTimesAreMergedWithOutliers";d:0.001;s:67:"Tests\CarbonAvailabilityTest::testInclusiveAvailabilitiesAreRemoved";d:0;s:74:"Tests\CarbonAvailabilityTest::testInverseInclusiveAvailabilitiesAreRemoved";d:0;s:63:"Tests\CarbonAvailabilityTest::testTimesGetSplitByUnavailability";d:0.001;s:57:"Tests\CarbonAvailabilityTest::testAvailabilityStartsLater";d:0;s:57:"Tests\CarbonAvailabilityTest::testAvailabilityEndsEarlier";d:0;s:65:"Tests\CarbonAvailabilityTest::testAvailabilityIsRemovedIfEclipsed";d:0;s:69:"Tests\CarbonAvailabilityTest::testTimesGetDoubleSplitByUnavailability";d:0.001;s:60:"Tests\CarbonAvailabilityTest::testAvailabilityStaysUntouched";d:0;s:57:"Tests\CarbonAvailabilityTest::testMultipleTimesGetTrimmed";d:0.001;s:74:"Tests\CarbonAvailabilityTest::testAvailabilityIsRemovedIfEclipsedPerfectly";d:0;s:51:"Tests\CarbonAvailabilityTest::testBasicSessionTimes";d:0.017;s:56:"Tests\CarbonAvailabilityTest::testBasicSessionTimesSplit";d:0.001;s:47:"Tests\CarbonAvailabilityTest::testReadMeExample";d:0.001;s:49:"Tests\CarbonAvailabilityTest::testThisDumbProblem";d:0;}}}
+C:37:"PHPUnit\Runner\DefaultTestResultCache":2062:{a:2:{s:7:"defects";a:7:{s:57:"Tests\CarbonAvailabilityTest::testAvailabilityStartsLater";i:4;s:57:"Tests\CarbonAvailabilityTest::testAvailabilityEndsEarlier";i:4;s:65:"Tests\CarbonAvailabilityTest::testAvailabilityIsRemovedIfEclipsed";i:4;s:74:"Tests\CarbonAvailabilityTest::testAvailabilityIsRemovedIfEclipsedPerfectly";i:4;s:57:"Tests\CarbonAvailabilityTest::testMultipleTimesGetTrimmed";i:4;s:69:"Tests\CarbonAvailabilityTest::testAvailabilityStartsWhenBookingStarts";i:4;s:67:"Tests\CarbonAvailabilityTest::testAvailabilityWndsWhenBookingStarts";i:4;}s:5:"times";a:19:{s:56:"Tests\CarbonAvailabilityTest::testBackToBackPeriodsMerge";d:0.065;s:62:"Tests\CarbonAvailabilityTest::testDisconnectedPeriodsDontMerge";d:0.001;s:60:"Tests\CarbonAvailabilityTest::testDisconnectedTimesAreMerged";d:0.001;s:72:"Tests\CarbonAvailabilityTest::testDisconnectedTimesAreMergedWithOutliers";d:0.001;s:67:"Tests\CarbonAvailabilityTest::testInclusiveAvailabilitiesAreRemoved";d:0.001;s:74:"Tests\CarbonAvailabilityTest::testInverseInclusiveAvailabilitiesAreRemoved";d:0.001;s:63:"Tests\CarbonAvailabilityTest::testTimesGetSplitByUnavailability";d:0.001;s:57:"Tests\CarbonAvailabilityTest::testAvailabilityStartsLater";d:0.001;s:57:"Tests\CarbonAvailabilityTest::testAvailabilityEndsEarlier";d:0.001;s:65:"Tests\CarbonAvailabilityTest::testAvailabilityIsRemovedIfEclipsed";d:0.001;s:74:"Tests\CarbonAvailabilityTest::testAvailabilityIsRemovedIfEclipsedPerfectly";d:0.001;s:60:"Tests\CarbonAvailabilityTest::testAvailabilityStaysUntouched";d:0.001;s:69:"Tests\CarbonAvailabilityTest::testTimesGetDoubleSplitByUnavailability";d:0.001;s:57:"Tests\CarbonAvailabilityTest::testMultipleTimesGetTrimmed";d:0.001;s:51:"Tests\CarbonAvailabilityTest::testBasicSessionTimes";d:0.027;s:56:"Tests\CarbonAvailabilityTest::testBasicSessionTimesSplit";d:0.001;s:47:"Tests\CarbonAvailabilityTest::testReadMeExample";d:0.002;s:69:"Tests\CarbonAvailabilityTest::testAvailabilityStartsWhenBookingStarts";d:0.001;s:67:"Tests\CarbonAvailabilityTest::testAvailabilityWndsWhenBookingStarts";d:0.001;}}}

src/CarbonAvailability.php

@@ -156,11 +156,11 @@ public static function subtractPeriod($avail, $unavail)
                     CarbonPeriod::create($unavail->getEndDate(), $avail->getEndDate())
                 ];
             }
-            if ($avail->startsAfter($unavail->getStartDate()) && $avail->endsAfter($unavail->getEndDate())) {
+            if ($avail->startsAfterOrAt($unavail->getStartDate()) && $avail->endsAfter($unavail->getEndDate())) {
                 // Trim the front end of the availability
                 $avail->setStartDate($unavail->getEndDate());
             }
-            if ($avail->endsAfter($unavail->getStartDate()) && $avail->endsBefore($unavail->getEndDate())) {
+            if ($avail->endsAfter($unavail->getStartDate()) && $avail->endsBeforeOrAt($unavail->getEndDate())) {
                 // Trim the back end of the availability
                 $avail->setEndDate($unavail->getStartDate());
             }

tests/CarbonAvailabilityTest.php

@@ -411,7 +411,7 @@ public function testAvailabilityStartsWhenBookingStarts()
     {
         $availability = [['2019-12-10 18:00:00', '2019-12-10 19:00:00']];
 
-        $booked = [['2019-12-10 17:59:59', '2019-12-10 18:45:00']];
+        $booked = [['2019-12-10 18:00:00', '2019-12-10 18:45:00']];
 
         $availability = new CarbonAvailability($availability, $booked);
         $sessions = $availability->sessions('15 minutes');
@@ -421,4 +421,25 @@ public function testAvailabilityStartsWhenBookingStarts()
             $sessions[0]->toDateTimeString()
         ], ['2019-12-10 18:45:00']);
     }
+
+    /**
+     * [===============]
+     *     [xxxxxxxxxxx]
+     * [===]
+     * |
+     */
+    public function testAvailabilityWndsWhenBookingStarts()
+    {
+        $availability = [['2019-12-10 18:00:00', '2019-12-10 19:00:00']];
+
+        $booked = [['2019-12-10 18:15:00', '2019-12-10 19:00:00']];
+
+        $availability = new CarbonAvailability($availability, $booked);
+        $sessions = $availability->sessions('15 minutes');
+
+        $this->assertCount(1, $sessions);
+        $this->assertEquals([
+            $sessions[0]->toDateTimeString()
+        ], ['2019-12-10 18:00:00']);
+    }
 }