Optimizing sql and improved Log data (#1883)

* optimizing sql * remove 2 relations, make sure that permissions are preloaded to avoid n+1 problem * add Explain to mysql queries
LycheeOrg · Jun 23, 2023 · 0525fa8 · 0525fa8
1 parent 6da4fd0
commit 0525fa8
Show file tree

Hide file tree

Showing 23 changed files with 785 additions and 134 deletions.
diff --git a/app/Actions/Album/SetProtectionPolicy.php b/app/Actions/Album/SetProtectionPolicy.php
@@ -30,7 +30,7 @@ class SetProtectionPolicy extends Action
 	public function do(BaseAlbum $album, AlbumProtectionPolicy $protectionPolicy, bool $shallSetPassword, ?string $password): void
 	{
 		$album->is_nsfw = $protectionPolicy->is_nsfw;
-		$active_permissions = $album->public_permissions;
+		$active_permissions = $album->public_permissions();
 
 		if (!$protectionPolicy->is_public) {
 			$active_permissions?->delete();
@@ -58,9 +58,8 @@ public function do(BaseAlbum $album, AlbumProtectionPolicy $protectionPolicy, bo
 				$active_permissions->password = null;
 			}
 		}
-		$album->public_permissions()->save($active_permissions);
+		$active_permissions->base_album_id = $album->id;
 		$active_permissions->save();
-		// $album->save();
 
 		// Reset permissions for photos
 		$album->photos()->update(['photos.is_public' => false]);

diff --git a/app/Actions/Album/Unlock.php b/app/Actions/Album/Unlock.php
@@ -32,8 +32,8 @@ public function __construct()
 	 */
 	public function do(BaseAlbum $album, string $password): void
 	{
-		if ($album->public_permissions !== null) {
-			$album_password = $album->public_permissions->password;
+		if ($album->public_permissions() !== null) {
+			$album_password = $album->public_permissions()->password;
 			if (
 				$album_password === null ||
 				$album_password === '' ||

diff --git a/app/Actions/Albums/Top.php b/app/Actions/Albums/Top.php
@@ -74,15 +74,15 @@ public function get(): TopAlbumsResource
 		}
 
 		$tagAlbumQuery = $this->albumQueryPolicy
-			->applyVisibilityFilter(TagAlbum::query()->with(['owner']));
+			->applyVisibilityFilter(TagAlbum::query()->with(['access_permissions', 'owner']));
 		/** @var BaseCollection<TagAlbum> $tagAlbums */
 		$tagAlbums = (new SortingDecorator($tagAlbumQuery))
 			->orderBy($this->sorting->column, $this->sorting->order)
 			->get();
 
 		/** @var NsQueryBuilder $query */
 		$query = $this->albumQueryPolicy
-			->applyVisibilityFilter(Album::query()->with(['owner'])->whereIsRoot());
+			->applyVisibilityFilter(Album::query()->with(['access_permissions', 'owner'])->whereIsRoot());
 
 		$userID = Auth::id();
 		if ($userID !== null) {