Merge pull request #14 from sourcetoad/fixes

Ensure we lock database searches to prevent dirty saves

Author: iBotPeaches

src/Models/AuditActivity.php

@@ -76,8 +76,6 @@ public function getHumanVerbAttribute(): string
                 return trans('logger::enums.verb_post');
 
             case HttpVerb::PATCH:
-                return trans('logger::enums.verb_patch');
-
             case HttpVerb::PUT:
                 return trans('logger::enums.verb_patch');
 
@@ -142,4 +140,4 @@ public function entity()
     {
         return $this->morphTo();
     }
-}
+}

src/Models/AuditKey.php

@@ -54,6 +54,7 @@ public static function createOrFind(array $keys): AuditKey
 
         /** @var AuditKey $key */
         $key = AuditKey::query()
+            ->lockForUpdate()
             ->firstOrCreate([
                 'hash' => $jsonHash
             ], [
@@ -62,4 +63,4 @@ public static function createOrFind(array $keys): AuditKey
 
         return $key;
     }
-}
+}

src/Models/AuditModel.php

@@ -43,7 +43,7 @@ class AuditModel extends BaseModel
     public static function createOrFind(AuditActivity $activity, int $modelType, int $modelId): AuditModel
     {
         /** @var AuditModel $model */
-        $model = AuditModel::query()->create([
+        $model = AuditModel::query()->lockForUpdate()->create([
             'activity_id' => $activity->id,
             'entity_type' => $modelType,
             'entity_id'   => $modelId,
@@ -65,4 +65,4 @@ public function entity()
     {
         return $this->morphTo();
     }
-}
+}

src/Models/AuditRoute.php

@@ -42,12 +42,12 @@ public static function createOrFind(string $route): AuditRoute
         $routeHash = md5(strtolower(trim($route)));
 
         /** @var AuditRoute $route */
-        $route = AuditRoute::query()->firstOrCreate([
+        $route = AuditRoute::query()->lockForUpdate()->firstOrCreate([
             'route_hash' => $routeHash,
         ], [
             'route' => $route,
         ]);
 
         return $route;
     }
-}
+}