Rewrite logic to two keyed lock

Author: antonkomarev

src/Locker/PostgresAdvisoryLockModeEnum.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cog\DbLocker\Locker;
+
+/**
+ * PostgresAdvisoryLockModeEnum defines the mode of advisory lock acquisition.
+ *
+ * - Try: Attempt to acquire the lock without blocking (PG_TRY_ADVISORY_LOCK, PG_TRY_ADVISORY_XACT_LOCK).
+ * - Block: Acquire the lock, blocking until it becomes available (PG_ADVISORY_LOCK, PG_ADVISORY_XACT_LOCK).
+ */
+enum PostgresAdvisoryLockModeEnum
+{
+    case Try;
+    case Block;
+}

src/Locker/PostgresAdvisoryLockScopeEnum.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cog\DbLocker\Locker;
+
+/**
+ * PostgresAdvisoryLockScopeEnum defines the scope of advisory lock acquisition.
+ *
+ * - Session: Session-level advisory lock (PG_ADVISORY_LOCK, PG_TRY_ADVISORY_LOCK)
+ * - Transaction: Transaction-level advisory lock (PG_ADVISORY_XACT_LOCK, PG_TRY_ADVISORY_XACT_LOCK)
+ */
+enum PostgresAdvisoryLockScopeEnum
+{
+    case Session;
+    case Transaction;
+}

src/Locker/PostgresAdvisoryLocker.php

@@ -20,48 +20,29 @@
 final class PostgresAdvisoryLocker
 {
     /**
-     * Acquire transaction-level lock (recommended).
+     * Acquire an advisory lock with configurable scope and mode.
      */
-    public function acquireLockWithinTransaction(
+    public function acquireLock(
         PDO $dbConnection,
         PostgresLockId $postgresLockId,
-        PostgresLockModeEnum $lockMode = PostgresLockModeEnum::Try,
+        PostgresAdvisoryLockScopeEnum $scope = PostgresAdvisoryLockScopeEnum::Transaction,
+        PostgresAdvisoryLockModeEnum $mode = PostgresAdvisoryLockModeEnum::Try,
     ): bool {
-        if ($dbConnection->inTransaction() === false) {
-            $lockId = $postgresLockId->humanReadableValue;
-
+        if ($scope === PostgresAdvisoryLockScopeEnum::Transaction && $dbConnection->inTransaction() === false) {
             throw new LogicException(
-                "Transaction-level advisory lock `$lockId` cannot be acquired outside of transaction",
+                "Transaction-level advisory lock `$postgresLockId->humanReadableValue` cannot be acquired outside of transaction",
             );
         }
 
-        $sql = match ($lockMode) {
-            PostgresLockModeEnum::Try => 'SELECT PG_TRY_ADVISORY_XACT_LOCK(:class_id, :object_id); -- ' . $postgresLockId->humanReadableValue,
-            PostgresLockModeEnum::Block => 'SELECT PG_ADVISORY_XACT_LOCK(:class_id, :object_id); -- ' . $postgresLockId->humanReadableValue,
-        };
-
-        $statement = $dbConnection->prepare($sql);
-        $statement->execute(
-            [
-                'class_id' => $postgresLockId->classId,
-                'object_id' => $postgresLockId->objectId,
-            ],
-        );
-
-        return $statement->fetchColumn(0);
-    }
-
-    /**
-     * Acquire session-level lock (use only if transaction-level lock not applicable).
-     */
-    public function acquireLockWithinSession(
-        PDO $dbConnection,
-        PostgresLockId $postgresLockId,
-        PostgresLockModeEnum $lockMode = PostgresLockModeEnum::Try,
-    ): bool {
-        $sql = match ($lockMode) {
-            PostgresLockModeEnum::Try => 'SELECT PG_TRY_ADVISORY_LOCK(:class_id, :object_id); -- ' . $postgresLockId->humanReadableValue,
-            PostgresLockModeEnum::Block => 'SELECT PG_ADVISORY_LOCK(:class_id, :object_id); -- ' . $postgresLockId->humanReadableValue,
+        $sql = match ([$scope, $mode]) {
+            [PostgresAdvisoryLockScopeEnum::Transaction, PostgresAdvisoryLockModeEnum::Try] =>
+                'SELECT PG_TRY_ADVISORY_XACT_LOCK(:class_id, :object_id); -- ' . $postgresLockId->humanReadableValue,
+            [PostgresAdvisoryLockScopeEnum::Transaction, PostgresAdvisoryLockModeEnum::Block] =>
+                'SELECT PG_ADVISORY_XACT_LOCK(:class_id, :object_id); -- ' . $postgresLockId->humanReadableValue,
+            [PostgresAdvisoryLockScopeEnum::Session, PostgresAdvisoryLockModeEnum::Try] =>
+                'SELECT PG_TRY_ADVISORY_LOCK(:class_id, :object_id); -- ' . $postgresLockId->humanReadableValue,
+            [PostgresAdvisoryLockScopeEnum::Session, PostgresAdvisoryLockModeEnum::Block] =>
+                'SELECT PG_ADVISORY_LOCK(:class_id, :object_id); -- ' . $postgresLockId->humanReadableValue,
         };
 
         $statement = $dbConnection->prepare($sql);