Status normalization: criteria methods (see*InDatabase, dontSee*InDatabase, grab*IdFromDatabase)

src/WooCommerce/Method/OrderMethods.php

@@ -263,6 +263,9 @@ public function haveOrderItemMetaInDatabase(int $orderItemId, string $metaKey, m
      * $I->assertSame($orderId, $found);
      * ```
      *
+     * Accepts a `status` criterion with or without the `wc-` prefix (e.g. `processing` or
+     * `wc-processing`); it is normalized before matching against the stored value.
+     *
      * @param array<string, mixed> $criteria Database query criteria (e.g., ['status' => 'pending', 'id' => 123]). Supports storage-agnostic keys like 'id', 'status'
      *
      * @return int|false Order ID if found, false otherwise
@@ -321,6 +324,9 @@ public function grabOrderItemFromDatabase(array $criteria): array
      * $I->seeOrderInDatabase(['id' => $orderId, 'status' => 'completed']);
      * ```
      *
+     * Accepts a `status` criterion with or without the `wc-` prefix (e.g. `completed` or
+     * `wc-completed`); it is normalized before matching against the stored value.
+     *
      * @param array<string, mixed> $criteria Database query criteria (e.g., ['id' => 123, 'status' => 'pending']). Supports storage-agnostic keys like 'id', 'status'
      *
      * @return void

src/WooCommerce/Method/SubscriptionMethods.php

@@ -125,6 +125,9 @@ public function haveSubscriptionProductInDatabase(array $overrides = []): int
      * $I->assertSame($subscriptionId, $found);
      * ```
      *
+     * Accepts a `status` criterion with or without the `wc-` prefix (e.g. `active` or
+     * `wc-active`); it is normalized before matching against the stored value.
+     *
      * @param array<string, mixed> $criteria Database query criteria (e.g., ['status' => 'wc-active', 'id' => 123])
      *
      * @return int|false Subscription ID if found, false otherwise
@@ -295,6 +298,9 @@ public function expireSubscription(int $subscriptionId): void
      * $I->seeSubscriptionInDatabase(['id' => $subscriptionId, 'status' => 'wc-active']);
      * ```
      *
+     * Accepts a `status` criterion with or without the `wc-` prefix (e.g. `active` or
+     * `wc-active`); it is normalized before matching against the stored value.
+     *
      * @param array<string, mixed> $criteria Database query criteria (e.g., ['id' => 123, 'status' => 'wc-active'])
      *
      * @return void
@@ -354,6 +360,9 @@ public function seeSubscriptionStatus(int $subscriptionId, string $status): void
      * $I->dontSeeSubscriptionInDatabase(['id' => 999]);
      * ```
      *
+     * Accepts a `status` criterion with or without the `wc-` prefix (e.g. `cancelled` or
+     * `wc-cancelled`); it is normalized before matching against the stored value.
+     *
      * @param array<string, mixed> $criteria Database query criteria (e.g., ['status' => 'wc-deleted'])
      *
      * @return void

src/WooCommerce/OrderStorage/HPOSOrderStorage.php

@@ -122,17 +122,11 @@ public function haveOrderAddressInDatabase(int $orderId, string $addressType, ar
      */
     public function mapCriteria(array $criteria): array
     {
-        $mapped = [];
+        $prepped = [];
         foreach ($criteria as $key => $value) {
-            if ($key === 'post_status') {
-                $mapped['status'] = $value;
-            } elseif ($key === 'post_title') {
-                $mapped['title'] = $value;
-            } else {
-                $mapped[$key] = $value;
-            }
+            $prepped[$key === 'post_title' ? 'title' : $key] = $value;
         }
-        return $mapped;
+        return parent::mapCriteria($prepped);
     }
 
     /**

src/WooCommerce/Storage/AbstractHPOSStorage.php

@@ -33,7 +33,12 @@ public function mapCriteria(array $criteria): array
             $mapped[$key === 'post_status' ? 'status' : $key] = $value;
         }
 
-        return $mapped;
+        return $this->normalizeStatusInCriteria($mapped);
+    }
+
+    protected function getStatusColumnName(): string
+    {
+        return 'status';
     }
 
     protected function grabEntityStatus(int $entityId): string

src/WooCommerce/Storage/AbstractLegacyStorage.php

@@ -37,7 +37,12 @@ public function mapCriteria(array $criteria): array
             }
         }
 
-        return $mapped;
+        return $this->normalizeStatusInCriteria($mapped);
+    }
+
+    protected function getStatusColumnName(): string
+    {
+        return 'post_status';
     }
 
     protected function grabEntityStatus(int $entityId): string

src/WooCommerce/Storage/AbstractStorage.php

@@ -15,6 +15,8 @@ public function __construct(protected WPDb $wpDb)
 
     abstract protected function getEntityIdKey(): string;
 
+    abstract protected function getStatusColumnName(): string;
+
     /**
      * Normalize a status value, with an unprefixed WC status accepted.
      *
@@ -25,6 +27,22 @@ protected function normalizeStatusValue(mixed $status): mixed
         return is_string($status) ? StatusNormalizer::normalize($status) : $status;
     }
 
+    /**
+     * Normalize the status criterion, when present, with an unprefixed WC status accepted.
+     *
+     * @param array<string, mixed> $criteria Database query criteria, already mapped to storage keys.
+     * @return array<string, mixed> Criteria with the status column normalized.
+     */
+    protected function normalizeStatusInCriteria(array $criteria): array
+    {
+        $statusKey = $this->getStatusColumnName();
+        if (isset($criteria[$statusKey])) {
+            $criteria[$statusKey] = $this->normalizeStatusValue($criteria[$statusKey]);
+        }
+
+        return $criteria;
+    }
+
     public function getMetaTableName(): string
     {
         return $this->wpDb->grabPostMetaTableName();

src/WooCommerce/SubscriptionStorage/HPOSSubscriptionStorage.php

@@ -87,16 +87,11 @@ public function haveSubscriptionStatus(int $subscriptionId, string $status): voi
 
     public function mapCriteria(array $criteria): array
     {
-        $mapped = [];
+        $prepped = [];
         foreach ($criteria as $key => $value) {
-            if ($key === 'post_status') {
-                $mapped['status'] = $value;
-            } elseif ($key === 'ID') {
-                $mapped['id'] = $value;
-            } else {
-                $mapped[$key] = $value;
-            }
+            $prepped[$key === 'ID' ? 'id' : $key] = $value;
         }
+        $mapped = parent::mapCriteria($prepped);
         $mapped['type'] = 'shop_subscription';
         return $mapped;
     }

tests/acceptance/OrderCest.php

@@ -337,6 +337,18 @@ public function testSeeOrderInDatabase(AcceptanceTester $I): void
         ]);
     }
 
+    public function testSeeOrderInDatabaseNormalizesUnprefixedStatusCriterion(AcceptanceTester $I): void
+    {
+        $orderId = $I->haveOrderInDatabase([
+            'post_status' => 'wc-active',
+        ]);
+
+        $I->seeOrderInDatabase([
+            'ID' => $orderId,
+            'post_status' => 'active',
+        ]);
+    }
+
     public function testSeeOrderMetaInDatabase(AcceptanceTester $I): void
     {
         $orderId = $I->haveOrderInDatabase();

tests/acceptance/OrderHPOSCest.php

@@ -251,6 +251,19 @@ public function testGrabOrderIdFromDatabase(AcceptanceTester $I): void
         $I->assertFalse($notFound);
     }
 
+    public function testGrabOrderIdFromDatabaseNormalizesUnprefixedStatusCriterion(AcceptanceTester $I): void
+    {
+        $uniqueCustomerId = 9998;
+
+        $orderId = $I->haveOrderInDatabase([
+            'status' => 'wc-active',
+            'customer_id' => $uniqueCustomerId,
+        ]);
+
+        $grabbedId = $I->grabOrderIdFromDatabase(['status' => 'active', 'customer_id' => $uniqueCustomerId]);
+        $I->assertSame($orderId, $grabbedId);
+    }
+
     public function testGrabOrderItemFromDatabase(AcceptanceTester $I): void
     {
         $orderId = $I->haveOrderInDatabase();
@@ -310,6 +323,18 @@ public function testSeeOrderInDatabase(AcceptanceTester $I): void
         ]);
     }
 
+    public function testSeeOrderInDatabaseNormalizesUnprefixedStatusCriterion(AcceptanceTester $I): void
+    {
+        $orderId = $I->haveOrderInDatabase([
+            'status' => 'wc-active',
+        ]);
+
+        $I->seeOrderInDatabase([
+            'id' => $orderId,
+            'status' => 'active',
+        ]);
+    }
+
     public function testSeeOrderMetaInDatabase(AcceptanceTester $I): void
     {
         $orderId = $I->haveOrderInDatabase();

tests/acceptance/SubscriptionCest.php

@@ -216,6 +216,15 @@ public function testSeeSubscriptionInDatabase(AcceptanceTester $I): void
         $I->seeSubscriptionInDatabase(['ID' => $subscriptionId, 'post_status' => 'wc-active']);
     }
 
+    public function testSeeSubscriptionInDatabaseNormalizesUnprefixedStatusCriterion(AcceptanceTester $I): void
+    {
+        $subscriptionId = $I->haveSubscriptionInDatabase([
+            'post_status' => 'wc-active',
+        ]);
+
+        $I->seeSubscriptionInDatabase(['ID' => $subscriptionId, 'post_status' => 'active']);
+    }
+
     public function testSeeSubscriptionMetaWithSubscriptionId(AcceptanceTester $I): void
     {
         $subscriptionId = $I->haveSubscriptionInDatabase();

tests/acceptance/SubscriptionHPOSCest.php

@@ -5,6 +5,7 @@
 namespace Aztec\WPBrowser\Tests\Acceptance;
 
 use Aztec\WPBrowser\Tests\Support\AcceptanceTester;
+use PHPUnit\Framework\AssertionFailedError;
 
 class SubscriptionHPOSCest
 {
@@ -117,6 +118,23 @@ public function testGrabSubscriptionIdFromDatabase(AcceptanceTester $I): void
         $I->assertSame($subscriptionId, $grabbedId);
     }
 
+    public function testGrabSubscriptionIdFromDatabaseNormalizesUnprefixedStatusCriterion(AcceptanceTester $I): void
+    {
+        $uniqueCustomerId = 8887;
+
+        $subscriptionId = $I->haveSubscriptionInDatabase([
+            'status' => 'wc-active',
+            'customer_id' => $uniqueCustomerId,
+        ]);
+
+        $grabbedId = $I->grabSubscriptionIdFromDatabase([
+            'status' => 'active',
+            'customer_id' => $uniqueCustomerId,
+        ]);
+
+        $I->assertSame($subscriptionId, $grabbedId);
+    }
+
     public function testGrabSubscriptionIdNotFound(AcceptanceTester $I): void
     {
         $result = $I->grabSubscriptionIdFromDatabase([
@@ -220,6 +238,15 @@ public function testSeeSubscriptionInDatabase(AcceptanceTester $I): void
         $I->seeSubscriptionInDatabase(['id' => $subscriptionId, 'status' => 'wc-active']);
     }
 
+    public function testSeeSubscriptionInDatabaseNormalizesUnprefixedStatusCriterion(AcceptanceTester $I): void
+    {
+        $subscriptionId = $I->haveSubscriptionInDatabase([
+            'status' => 'wc-active',
+        ]);
+
+        $I->seeSubscriptionInDatabase(['id' => $subscriptionId, 'status' => 'active']);
+    }
+
     public function testSeeSubscriptionMetaWithSubscriptionId(AcceptanceTester $I): void
     {
         $subscriptionId = $I->haveSubscriptionInDatabase();
@@ -262,6 +289,31 @@ public function testDontSeeSubscriptionInDatabase(AcceptanceTester $I): void
         ]);
     }
 
+    public function testDontSeeSubscriptionInDatabaseNormalizesUnprefixedStatusCriterion(
+        AcceptanceTester $I,
+    ): void {
+        $subscriptionId = $I->haveSubscriptionInDatabase([
+            'status' => 'wc-active',
+        ]);
+
+        $I->dontSeeSubscriptionInDatabase([
+            'id' => $subscriptionId,
+            'status' => 'cancelled',
+        ]);
+
+        // If the unprefixed 'active' criterion were not normalized to 'wc-active', it would
+        // never match the stored row and dontSeeSubscriptionInDatabase would (incorrectly) pass.
+        $I->expectThrowable(
+            AssertionFailedError::class,
+            function () use ($I, $subscriptionId): void {
+                $I->dontSeeSubscriptionInDatabase([
+                    'id' => $subscriptionId,
+                    'status' => 'active',
+                ]);
+            },
+        );
+    }
+
     public function testDontSeeSubscriptionMetaInDatabase(AcceptanceTester $I): void
     {
         $subscriptionId = $I->haveSubscriptionInDatabase();