Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optimizing sql and improved Log data #1883

Merged
merged 18 commits into from
Jun 23, 2023
Merged

Optimizing sql and improved Log data #1883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
596ddc1
optimizing sql
ildyria Jun 17, 2023
30d7b9a
remove 2 relations, make sure that permissions are preloaded to avoid…
ildyria Jun 18, 2023
bf46066
forgotten parts
ildyria Jun 18, 2023
7058eff
more forgotten parts
ildyria Jun 18, 2023
f28a0d5
save
ildyria Jun 21, 2023
e9e552a
composer update
ildyria Jun 21, 2023
b15d688
composer update
ildyria Jun 21, 2023
f79173e
fix complaints
ildyria Jun 21, 2023
79c8e12
Merge branch 'composer-update' into wip-optimizing-sql
ildyria Jun 21, 2023
5adc2f8
done with explain formatting
ildyria Jun 21, 2023
970dabf
formatting
ildyria Jun 21, 2023
cb578fa
only on mysql
ildyria Jun 21, 2023
6d4e341
Merge branch 'master' into wip-optimizing-sql
ildyria Jun 21, 2023
39b3310
improved logging
ildyria Jun 21, 2023
d97d16e
also add timing information
ildyria Jun 21, 2023
51d425d
fix formatting
ildyria Jun 21, 2023
ca4ebfd
fix stupid mistake
ildyria Jun 22, 2023
600a376
fix formatting
ildyria Jun 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions app/Actions/Album/SetProtectionPolicy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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]);
Expand Down
4 changes: 2 additions & 2 deletions app/Actions/Album/Unlock.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 === '' ||
Expand Down
4 changes: 2 additions & 2 deletions app/Actions/Albums/Top.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading