Converts the AlbumFunctions class into a service (#43)

LycheeOrg · Jan 30, 2019 · 6d8444b · 6d8444b
1 parent 7f5c40a
commit 6d8444b
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 13 deletions.
diff --git a/app/Http/Controllers/AlbumController.php b/app/Http/Controllers/AlbumController.php
@@ -14,9 +14,20 @@
 use Symfony\Component\HttpFoundation\StreamedResponse;
 use ZipStream\ZipStream;
 
-
 class AlbumController extends Controller
 {
+	/**
+	 * @var AlbumFunctions
+	 */
+	private $albumFunctions;
+
+	/**
+	 * @param AlbumFunctions $albumFunctions
+	 */
+	public function __construct(AlbumFunctions $albumFunctions)
+	{
+		$this->albumFunctions = $albumFunctions;
+	}
 	/**
 	 * Add a new Album
 	 *
@@ -30,14 +41,11 @@ function add(Request $request)
 			'parent_id' => 'int|nullable'
 		]);
 
-		$album = AlbumFunctions::create($request['title'],$request['parent_id']);
+		$album = $this->albumFunctions->create($request['title'], $request['parent_id']);
 
 		return Response::json($album->id, JSON_NUMERIC_CHECK);
-
 	}
 
-
-
 	/**
 	 * Provided an albumID, returns the album.
 	 *

diff --git a/app/Http/Controllers/ImportController.php b/app/Http/Controllers/ImportController.php
@@ -17,15 +17,21 @@ class ImportController extends Controller
 	 */
 	private $photoFunctions;
 
+	/**
+	 * @var AlbumFunctions
+	 */
+	private $albumFunctions;
+
 	/**
 	 * Create a new command instance.
 	 *
 	 * @param PhotoFunctions $photoFunctions
 	 * @return void
 	 */
-	public function __construct(PhotoFunctions $photoFunctions)
+	public function __construct(PhotoFunctions $photoFunctions, AlbumFunctions $albumFunctions)
 	{
 		$this->photoFunctions = $photoFunctions;
+		$this->albumFunctions = $albumFunctions;
 	}
 
 	/**
@@ -129,7 +135,7 @@ public function server(Request $request)
 
 		$request->validate([
 			'path'    => 'string|required',
-			'albumID' => 'string|required'
+			'albumID' => 'int|required'
 		]);
 
 		return $this->server_exec($request['path'], $request['albumID']);
@@ -139,14 +145,14 @@ public function server(Request $request)
 
 
 	/**
-	 * @param $path
-	 * @param $albumID
+	 * @param string  $path
+	 * @param integer $albumID
 	 * @return boolean|string Returns true when successful.
 	 *                        Warning: Folder empty or no readable files to process!
 	 *                        Notice: Import only contained albums!
 	 * @throws \ImagickException
 	 */
-	public function server_exec($path, $albumID)
+	public function server_exec(string $path, integer $albumID)
 	{
 
 		// Parse path
@@ -199,7 +205,7 @@ public function server_exec($path, $albumID)
 					// Album creation
 
 					// Folder
-					$album = AlbumFunctions::create(basename($file), $albumID);
+					$album = $this->albumFunctions->create(basename($file), $albumID);
 					// this actually should not fail.
 					if ($album === false) {
 						$error = true;

diff --git a/app/ModelFunctions/AlbumFunctions.php b/app/ModelFunctions/AlbumFunctions.php
@@ -7,8 +7,12 @@
 
 class AlbumFunctions
 {
-
-	public static function create($title, $parent_id)
+	/**
+	 * @param  string $title
+	 * @param  int    $parent_id
+	 * @return Album
+	 */
+	public function create(string $title, $parent_id) : Album
 	{
 		$num = Album::where('id', '=', $parent_id)->count();
 		// id cannot be 0, so by definition if $parent_id is 0 then...

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -2,6 +2,7 @@
 
 namespace App\Providers;
 
+use App\ModelFunctions\AlbumFunctions;
 use App\ModelFunctions\PhotoFunctions;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
@@ -10,6 +11,7 @@
 class AppServiceProvider extends ServiceProvider
 {
     public $singletons = [
+        AlbumFunctions::class => AlbumFunctions::class,
         PhotoFunctions::class => PhotoFunctions::class
     ];