SIP-30 - Fixed the Collection-Request

red-freak · red-freak · commit f1fcb1ab1fbc · 2023-02-02T12:34:35.000+01:00
diff --git a/src/Http/Controllers/Api/Dtos/HeartbeatCollection.php b/src/Http/Controllers/Api/Dtos/HeartbeatCollection.php
@@ -44,12 +44,12 @@ public function lockables(string $modelClass, array $ids): Collection
 		if ($modelCollection = data_get($this->models, $modelClass)) {
 			$emptyModel = new $modelClass();
 			/** @var \Illuminate\Database\Eloquent\Collection $models */
-			$models = $modelCollection->whereIn($modelClass::$lockableIdField, $ids);
+			$models = $modelCollection->whereIn($modelClass::lockableIdField(), $ids);
 
 			if ($models->count()) return $models;
 		}
 
-		return $modelClass::whereIn($modelClass::$lockableIdField, $ids)->get();
+		return $modelClass::whereIn($modelClass::lockableIdField(), $ids)->get();
 	}
 
 	/**
@@ -77,7 +77,7 @@ public function handle(): self
 		 * @var  array $ids
 		 */
 		foreach($modelsToFetch as $modelClass => $ids) {
-			$this->models[$modelClass] = $modelClass::whereIn($modelClass::$idField, $ids)->get();
+			$this->models[$modelClass] = $modelClass::whereIn($modelClass::lockableIdField(), $ids)->get();
 		}
 
 		// handle the tasks

Original file line number	Diff line number	Diff line change
`@@ -44,12 +44,12 @@ public function lockables(string $modelClass, array $ids): Collection`
`44`	`44`	`if ($modelCollection = data_get($this->models, $modelClass)) {`
`45`	`45`	`$emptyModel = new $modelClass();`
`46`	`46`	`/** @var \Illuminate\Database\Eloquent\Collection $models */`
`47`		`- $models = $modelCollection->whereIn($modelClass::$lockableIdField, $ids);`
	`47`	`+ $models = $modelCollection->whereIn($modelClass::lockableIdField(), $ids);`
`48`	`48`
`49`	`49`	`if ($models->count()) return $models;`
`50`	`50`	`}`
`51`	`51`
`52`		`- return $modelClass::whereIn($modelClass::$lockableIdField, $ids)->get();`
	`52`	`+ return $modelClass::whereIn($modelClass::lockableIdField(), $ids)->get();`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`/**`
`@@ -77,7 +77,7 @@ public function handle(): self`
`77`	`77`	`* @var array $ids`
`78`	`78`	`*/`
`79`	`79`	`foreach($modelsToFetch as $modelClass => $ids) {`
`80`		`- $this->models[$modelClass] = $modelClass::whereIn($modelClass::$idField, $ids)->get();`
	`80`	`+ $this->models[$modelClass] = $modelClass::whereIn($modelClass::lockableIdField(), $ids)->get();`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`// handle the tasks`