fix delete (#898)

LycheeOrg · Jan 31, 2021 · 2071a87 · 2071a87
1 parent 307eb72
commit 2071a87
Show file tree

Hide file tree

Showing 13 changed files with 60 additions and 60 deletions.
diff --git a/app/Actions/Album/Delete.php b/app/Actions/Album/Delete.php
@@ -31,15 +31,29 @@ public function do(string $albumIDs): bool
 
 		$albums = Album::whereIn('id', explode(',', $albumIDs))->get();
 
-		Schema::disableForeignKeyConstraints();
+		$sqlPhoto = Photo::leftJoin('albums', 'photos.album_id', '=', 'albums.id')
+			->select('photos.*');
+
 		foreach ($albums as $album) {
-			$no_error &= $album->predelete();
+			$sqlPhoto = $sqlPhoto->orWhere(fn ($q) => $q->where('albums._lft', '>=', $album->_lft)
+				->where('albums._rgt', '<=', $album->_rgt));
+		}
 
-			//! We break the tree (because delete() is broken see https://github.com/lazychaser/laravel-nestedset/issues/485)
-			Album::where('_lft', '>', $album->_lft)->where('_rgt', '<=', $album->_rgt)->delete();
+		$photos = $sqlPhoto->get();
+		foreach ($photos as $photo) {
+			$no_error &= $photo->predelete();
+			$no_error &= $photo->delete();
+		}
 
-			$no_error &= $album->delete();
+		$sql_delete = Album::query();
+
+		//! We break the tree (because delete() is broken see https://github.com/lazychaser/laravel-nestedset/issues/485)
+		Schema::disableForeignKeyConstraints();
+		foreach ($albums as $album) {
+			$sql_delete = $sql_delete->orWhere(fn ($q) => $q
+				->where('_lft', '>=', $album->_lft)->where('_rgt', '<=', $album->_rgt));
 		}
+		$sql_delete->delete();
 		Schema::enableForeignKeyConstraints();
 
 		//? We fix the tree :)

diff --git a/tests/Feature/AlbumTest.php b/tests/Feature/AlbumTest.php
@@ -4,6 +4,7 @@
 
 namespace Tests\Feature;
 
+use AccessControl;
 use Tests\Feature\Lib\AlbumsUnitTest;
 use Tests\Feature\Lib\SessionUnitTest;
 use Tests\TestCase;
@@ -31,7 +32,7 @@ public function testAddReadLogged()
 		$albums_tests = new AlbumsUnitTest($this);
 		$session_tests = new SessionUnitTest();
 
-		$session_tests->log_as_id(0);
+		AccessControl::log_as_id(0);
 
 		$albums_tests->get('recent', '', 'true');
 		$albums_tests->get('starred', '', 'true');
@@ -102,7 +103,7 @@ public function testAddReadLogged()
 		/*
 		 * Because we don't know login and password we are just going to assumed we are logged in.
 		 */
-		$session_tests->log_as_id(0);
+		AccessControl::log_as_id(0);
 
 		/*
 		 * Let's try to delete this album.
@@ -122,7 +123,7 @@ public function testTrueNegative()
 		$albums_tests = new AlbumsUnitTest($this);
 		$session_tests = new SessionUnitTest();
 
-		$session_tests->log_as_id(0);
+		AccessControl::log_as_id(0);
 
 		$albums_tests->set_description('-1', 'new description', 'false');
 		$albums_tests->set_public('-1', 1, 1, 1, 0, 1, 1, 'false');

diff --git a/tests/Feature/DiagnosticsTest.php b/tests/Feature/DiagnosticsTest.php
@@ -4,8 +4,8 @@
 
 namespace Tests\Feature;
 
+use AccessControl;
 use App\Models\Configs;
-use Tests\Feature\Lib\SessionUnitTest;
 use Tests\TestCase;
 
 class DiagnosticsTest extends TestCase
@@ -20,8 +20,7 @@ public function testDiagnostics()
 		$response = $this->get('/Diagnostics');
 		$response->assertStatus(200); // code 200 something
 
-		$session_tests = new SessionUnitTest();
-		$session_tests->log_as_id(0);
+		AccessControl::log_as_id(0);
 
 		$response = $this->get('/Diagnostics');
 		$response->assertStatus(200); // code 200 something
@@ -36,6 +35,6 @@ public function testDiagnostics()
 
 		Configs::where('key', '=', 'lossless_optimization')->update(['value' => '1']);
 
-		$session_tests->logout($this);
+		AccessControl::logout();
 	}
 }
diff --git a/tests/Feature/GeoDataTest.php b/tests/Feature/GeoDataTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Feature;
 
+use AccessControl;
 use App\Models\Configs;
 use Illuminate\Http\UploadedFile;
 use Tests\Feature\Lib\AlbumsUnitTest;
 use Tests\Feature\Lib\PhotosUnitTest;
-use Tests\Feature\Lib\SessionUnitTest;
 use Tests\TestCase;
 
 class GeoDataTest extends TestCase
@@ -18,9 +18,8 @@ public function testGeo()
 	{
 		$photos_tests = new PhotosUnitTest($this);
 		$albums_tests = new AlbumsUnitTest($this);
-		$session_tests = new SessionUnitTest();
 
-		$session_tests->log_as_id(0);
+		AccessControl::log_as_id(0);
 
 		/*
 		* Make a copy of the image because import deletes the file and we want to be
@@ -118,6 +117,6 @@ public function testGeo()
 		// reset
 		Configs::set('map_display', $map_display_value);
 
-		$session_tests->logout($this);
+		AccessControl::logout();
 	}
 }
diff --git a/tests/Feature/IndexTest.php b/tests/Feature/IndexTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Feature;
 
+use AccessControl;
 use App\Models\Configs;
 use Tests\TestCase;
 
@@ -34,6 +35,7 @@ public function testHome()
 	 */
 	public function testPhpInfo()
 	{
+		AccessControl::logout();
 		// we don't want a non admin to access this
 		$response = $this->get('/phpinfo');
 		$response->assertStatus(200);

diff --git a/tests/Feature/Lib/SessionUnitTest.php b/tests/Feature/Lib/SessionUnitTest.php
@@ -2,7 +2,6 @@
 
 namespace Tests\Feature\Lib;
 
-use App\ModelFunctions\SessionFunctions;
 use Illuminate\Testing\TestResponse;
 use Tests\TestCase;
 
@@ -110,13 +109,4 @@ public function set_old(
 		$response->assertOk();
 		$response->assertSee($result, false);
 	}
-
-	/**
-	 * @param int $id
-	 */
-	public function log_as_id(int $id)
-	{
-		$sessionFunctions = new SessionFunctions();
-		$sessionFunctions->log_as_id($id);
-	}
 }
diff --git a/tests/Feature/LogsTest.php b/tests/Feature/LogsTest.php
@@ -4,8 +4,8 @@
 
 namespace Tests\Feature;
 
+use AccessControl;
 use App\Models\Logs;
-use Tests\Feature\Lib\SessionUnitTest;
 use Tests\TestCase;
 
 class LogsTest extends TestCase
@@ -17,22 +17,20 @@ class LogsTest extends TestCase
 	 */
 	public function testLogs()
 	{
-		$session_tests = new SessionUnitTest();
-
 		$response = $this->get('/Logs');
 		$response->assertOk();
 		$response->assertSeeText('false');
 
 		// set user as admin
-		$session_tests->log_as_id(0);
+		AccessControl::log_as_id(0);
 
 		Logs::notice(__METHOD__, __LINE__, 'test');
 		$response = $this->get('/Logs');
 		$response->assertOk();
 		$response->assertDontSeeText('false');
 		$response->assertViewIs('logs.list');
 
-		$session_tests->logout($this);
+		AccessControl::logout();
 	}
 
 	public function testApiLogs()
@@ -54,8 +52,7 @@ public function testClearLogs()
 		$response->assertSeeText('false');
 
 		// set user as admin
-		$session_tests = new SessionUnitTest();
-		$session_tests->log_as_id(0);
+		AccessControl::log_as_id(0);
 
 		$response = $this->post('/api/Logs::clearNoise');
 		$response->assertOk();
@@ -69,6 +66,6 @@ public function testClearLogs()
 		$response->assertOk();
 		$response->assertSeeText('Everything looks fine, Lychee has not reported any problems!');
 
-		$session_tests->logout($this);
+		AccessControl::logout();
 	}
 }
diff --git a/tests/Feature/PhotosRotateTest.php b/tests/Feature/PhotosRotateTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Feature;
 
+use AccessControl;
 use App\Models\Configs;
 use Illuminate\Http\UploadedFile;
 use Tests\Feature\Lib\PhotosUnitTest;
-use Tests\Feature\Lib\SessionUnitTest;
 use Tests\TestCase;
 
 class PhotosRotateTest extends TestCase
@@ -16,9 +16,8 @@ class PhotosRotateTest extends TestCase
 	public function testRotate()
 	{
 		$photos_tests = new PhotosUnitTest($this);
-		$session_tests = new SessionUnitTest();
 
-		$session_tests->log_as_id(0);
+		AccessControl::log_as_id(0);
 
 		/*
 		* Make a copy of the image because import deletes the file and we want to be
@@ -98,6 +97,6 @@ public function testRotate()
 		// reset
 		Configs::set('editor_enabled', $editor_enabled_value);
 
-		$session_tests->logout($this);
+		AccessControl::logout();
 	}
 }
diff --git a/tests/Feature/PhotosTest.php b/tests/Feature/PhotosTest.php
@@ -2,13 +2,13 @@
 
 namespace Tests\Feature;
 
+use AccessControl;
 use App\Models\Configs;
 use App\Models\Photo;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Collection as BaseCollection;
 use Tests\Feature\Lib\AlbumsUnitTest;
 use Tests\Feature\Lib\PhotosUnitTest;
-use Tests\Feature\Lib\SessionUnitTest;
 use Tests\TestCase;
 
 class PhotosTest extends TestCase
@@ -22,9 +22,8 @@ public function testUpload()
 	{
 		$photos_tests = new PhotosUnitTest($this);
 		$albums_tests = new AlbumsUnitTest($this);
-		$session_tests = new SessionUnitTest();
 
-		$session_tests->log_as_id(0);
+		AccessControl::log_as_id(0);
 
 		/*
 		 * Make a copy of the image because import deletes the file and we want to be
@@ -192,15 +191,14 @@ public function testUpload()
 		$response->assertOk();
 		$response->assertSee('true');
 
-		$session_tests->logout($this);
+		AccessControl::logout();
 	}
 
 	public function testTrueNegative()
 	{
 		$photos_tests = new PhotosUnitTest($this);
-		$session_tests = new SessionUnitTest();
 
-		$session_tests->log_as_id(0);
+		AccessControl::log_as_id(0);
 
 		$photos_tests->wrong_upload($this);
 		$photos_tests->wrong_upload2($this);
@@ -210,7 +208,7 @@ public function testTrueNegative()
 		$photos_tests->set_album('-1', '-1', 'false');
 		$photos_tests->set_license('-1', 'CC0', 'false');
 
-		$session_tests->logout($this);
+		AccessControl::logout();
 	}
 
 	public function testUpload2()
@@ -237,9 +235,8 @@ public function testImport()
 	{
 		$photos_tests = new PhotosUnitTest($this);
 		$albums_tests = new AlbumsUnitTest($this);
-		$session_tests = new SessionUnitTest();
 
-		$session_tests->log_as_id(0);
+		AccessControl::log_as_id(0);
 
 		// save initial value
 		$init_config_value = Configs::get_value('import_via_symlink');
@@ -270,6 +267,6 @@ public function testImport()
 		// set back to initial value
 		Configs::set('import_via_symlink', $init_config_value);
 
-		$session_tests->logout($this);
+		AccessControl::logout();
 	}
 }
diff --git a/tests/Feature/RSSTest.php b/tests/Feature/RSSTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Feature;
 
+use AccessControl;
 use App\Models\Configs;
 use Illuminate\Http\UploadedFile;
 use Tests\Feature\Lib\AlbumsUnitTest;
 use Tests\Feature\Lib\PhotosUnitTest;
-use Tests\Feature\Lib\SessionUnitTest;
 use Tests\TestCase;
 
 class RSSTest extends TestCase
@@ -45,10 +45,9 @@ public function testRSS1()
 		// now we start adding some stuff
 		$photos_tests = new PhotosUnitTest($this);
 		$albums_tests = new AlbumsUnitTest($this);
-		$session_tests = new SessionUnitTest();
 
 		// log as admin
-		$session_tests->log_as_id(0);
+		AccessControl::log_as_id(0);
 
 		// create an album
 		$albumID = $albums_tests->add('0', 'test_album', 'true');
@@ -86,5 +85,7 @@ public function testRSS1()
 
 		Configs::set('Mod_Frame', $init_config_value);
 		Configs::set('full_photo', $init_full_photo);
+
+		AccessControl::logout();
 	}
 }
diff --git a/tests/Feature/UpdateTest.php b/tests/Feature/UpdateTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Feature;
 
+use AccessControl;
 use App\Models\Configs;
-use Tests\Feature\Lib\SessionUnitTest;
 use Tests\TestCase;
 
 class UpdateTest extends TestCase
@@ -34,8 +34,7 @@ public function testDoLogged()
 	{
 		$gitpull = Configs::get_value('allow_online_git_pull', '0');
 
-		$session_tests = new SessionUnitTest();
-		$session_tests->log_as_id(0);
+		AccessControl::log_as_id(0);
 
 		Configs::set('allow_online_git_pull', '0');
 		$this->do_call('Error: Online updates are not allowed.');
@@ -53,6 +52,6 @@ public function testDoLogged()
 
 		Configs::set('allow_online_git_pull', $gitpull);
 
-		$session_tests->logout($this);
+		AccessControl::logout();
 	}
 }