make sql

docs/docs/administration/server-commands.md

@@ -53,7 +53,6 @@ immich-admin list-users
     email: 'immich@example.com.com',
     name: 'Immich Admin',
     storageLabel: 'admin',
-    externalPath: null,
     profileImagePath: 'upload/profile/e65e6f88-2a30-4dbe-8dd9-1885f4889b53/e65e6f88-2a30-4dbe-8dd9-1885f4889b53.jpg',
     shouldChangePassword: true,
     isAdmin: true,

e2e/src/fixtures.ts

@@ -44,7 +44,6 @@ export const userDto = {
     email: signupDto.admin.email,
     password: signupDto.admin.password,
     storageLabel: 'admin',
-    externalPath: null,
     oauthId: '',
     shouldChangePassword: false,
     profileImagePath: '',
@@ -63,7 +62,6 @@ export const userDto = {
     email: createUserDto.user1.email,
     password: createUserDto.user1.password,
     storageLabel: null,
-    externalPath: null,
     oauthId: '',
     shouldChangePassword: false,
     profileImagePath: '',

e2e/src/responses.ts

@@ -65,7 +65,6 @@ export const signupResponseDto = {
     name: 'Immich Admin',
     email: 'admin@immich.cloud',
     storageLabel: 'admin',
-    externalPath: null,
     profileImagePath: '',
     // why? lol
     shouldChangePassword: true,

server/e2e/jobs/specs/library-watcher.e2e-spec.ts

@@ -29,8 +29,6 @@ describe(`Library watcher (e2e)`, () => {
     await restoreTempFolder();
     await api.authApi.adminSignUp(server);
     admin = await api.authApi.adminLogin(server);
-
-    await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, '/');
   });
 
   afterEach(async () => {
@@ -204,8 +202,6 @@ describe(`Library watcher (e2e)`, () => {
         ],
       });
 
-      await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, '/');
-
       await fs.mkdir(`${IMMICH_TEST_ASSET_TEMP_PATH}/dir1`, { recursive: true });
       await fs.mkdir(`${IMMICH_TEST_ASSET_TEMP_PATH}/dir2`, { recursive: true });
       await fs.mkdir(`${IMMICH_TEST_ASSET_TEMP_PATH}/dir3`, { recursive: true });

server/e2e/jobs/specs/library.e2e-spec.ts

@@ -40,8 +40,6 @@ describe(`${LibraryController.name} (e2e)`, () => {
         type: LibraryType.EXTERNAL,
         importPaths: [`${IMMICH_TEST_ASSET_PATH}/albums/nature`],
       });
-      await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, '/');
-
       await api.libraryApi.scanLibrary(server, admin.accessToken, library.id);
 
       const assets = await api.assetApi.getAllAssets(server, admin.accessToken);
@@ -79,8 +77,6 @@ describe(`${LibraryController.name} (e2e)`, () => {
         type: LibraryType.EXTERNAL,
         importPaths: [`${IMMICH_TEST_ASSET_PATH}/albums/nature`],
       });
-      await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, '/');
-
       await api.libraryApi.scanLibrary(server, admin.accessToken, library.id);
 
       const assets = await api.assetApi.getAllAssets(server, admin.accessToken);
@@ -118,16 +114,12 @@ describe(`${LibraryController.name} (e2e)`, () => {
     });
 
     it('should scan external library with exclusion pattern', async () => {
-      await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, '/not/a/real/path');
-
       const library = await api.libraryApi.create(server, admin.accessToken, {
         type: LibraryType.EXTERNAL,
         importPaths: [`${IMMICH_TEST_ASSET_PATH}/albums/nature`],
         exclusionPatterns: ['**/el_corcal*'],
       });
 
-      await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, '/');
-
       await api.libraryApi.scanLibrary(server, admin.accessToken, library.id);
 
       const assets = await api.assetApi.getAllAssets(server, admin.accessToken);
@@ -163,7 +155,6 @@ describe(`${LibraryController.name} (e2e)`, () => {
         type: LibraryType.EXTERNAL,
         importPaths: [`${IMMICH_TEST_ASSET_TEMP_PATH}`],
       });
-      await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, '/');
 
       await api.libraryApi.scanLibrary(server, admin.accessToken, library.id);
 
@@ -190,39 +181,11 @@ describe(`${LibraryController.name} (e2e)`, () => {
       );
     });
 
-    it('should offline files outside of changed external path', async () => {
-      const library = await api.libraryApi.create(server, admin.accessToken, {
-        type: LibraryType.EXTERNAL,
-        importPaths: [`${IMMICH_TEST_ASSET_PATH}/albums/nature`],
-      });
-      await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, '/');
-      await api.libraryApi.scanLibrary(server, admin.accessToken, library.id);
-
-      await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, '/some/other/path');
-      await api.libraryApi.scanLibrary(server, admin.accessToken, library.id);
-
-      const assets = await api.assetApi.getAllAssets(server, admin.accessToken);
-
-      expect(assets).toEqual(
-        expect.arrayContaining([
-          expect.objectContaining({
-            isOffline: true,
-            originalFileName: 'el_torcal_rocks',
-          }),
-          expect.objectContaining({
-            isOffline: true,
-            originalFileName: 'tanners_ridge',
-          }),
-        ]),
-      );
-    });
-
     it('should scan new files', async () => {
       const library = await api.libraryApi.create(server, admin.accessToken, {
         type: LibraryType.EXTERNAL,
         importPaths: [`${IMMICH_TEST_ASSET_TEMP_PATH}`],
       });
-      await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, '/');
 
       await fs.promises.cp(
         `${IMMICH_TEST_ASSET_PATH}/albums/nature/silver_fir.jpg`,
@@ -258,7 +221,6 @@ describe(`${LibraryController.name} (e2e)`, () => {
           type: LibraryType.EXTERNAL,
           importPaths: [`${IMMICH_TEST_ASSET_TEMP_PATH}`],
         });
-        await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, '/');
 
         await fs.promises.cp(
           `${IMMICH_TEST_ASSET_PATH}/albums/nature/el_torcal_rocks.jpg`,
@@ -305,7 +267,6 @@ describe(`${LibraryController.name} (e2e)`, () => {
           type: LibraryType.EXTERNAL,
           importPaths: [`${IMMICH_TEST_ASSET_TEMP_PATH}`],
         });
-        await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, '/');
 
         await fs.promises.cp(
           `${IMMICH_TEST_ASSET_PATH}/albums/nature/el_torcal_rocks.jpg`,
@@ -345,7 +306,6 @@ describe(`${LibraryController.name} (e2e)`, () => {
           type: LibraryType.EXTERNAL,
           importPaths: [`${IMMICH_TEST_ASSET_TEMP_PATH}`],
         });
-        await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, '/');
 
         await fs.promises.cp(
           `${IMMICH_TEST_ASSET_PATH}/albums/nature/el_torcal_rocks.jpg`,
@@ -396,61 +356,6 @@ describe(`${LibraryController.name} (e2e)`, () => {
           importPaths: [`${IMMICH_TEST_ASSET_PATH}/albums/nature`],
         });
       });
-
-      it('should not scan assets for user without external path', async () => {
-        await api.libraryApi.scanLibrary(server, admin.accessToken, library.id);
-        const assets = await api.assetApi.getAllAssets(server, admin.accessToken);
-
-        expect(assets).toEqual([]);
-      });
-
-      it("should not import assets outside of user's external path", async () => {
-        await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, '/not/a/real/path');
-        await api.libraryApi.scanLibrary(server, admin.accessToken, library.id);
-
-        const assets = await api.assetApi.getAllAssets(server, admin.accessToken);
-        expect(assets).toEqual([]);
-      });
-
-      it.each([`${IMMICH_TEST_ASSET_PATH}/albums/nature`, `${IMMICH_TEST_ASSET_PATH}/albums/nature/`])(
-        'should scan external library with external path %s',
-        async (externalPath: string) => {
-          await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, externalPath);
-
-          await api.libraryApi.scanLibrary(server, admin.accessToken, library.id);
-
-          const assets = await api.assetApi.getAllAssets(server, admin.accessToken);
-
-          expect(assets).toEqual(
-            expect.arrayContaining([
-              expect.objectContaining({
-                type: AssetType.IMAGE,
-                originalFileName: 'el_torcal_rocks',
-                libraryId: library.id,
-                resized: true,
-                exifInfo: expect.objectContaining({
-                  exifImageWidth: 512,
-                  exifImageHeight: 341,
-                  latitude: null,
-                  longitude: null,
-                }),
-              }),
-              expect.objectContaining({
-                type: AssetType.IMAGE,
-                originalFileName: 'silver_fir',
-                libraryId: library.id,
-                resized: true,
-                exifInfo: expect.objectContaining({
-                  exifImageWidth: 511,
-                  exifImageHeight: 323,
-                  latitude: null,
-                  longitude: null,
-                }),
-              }),
-            ]),
-          );
-        },
-      );
     });
 
     it('should not scan an upload library', async () => {
@@ -484,7 +389,6 @@ describe(`${LibraryController.name} (e2e)`, () => {
         type: LibraryType.EXTERNAL,
         importPaths: [`${IMMICH_TEST_ASSET_TEMP_PATH}`],
       });
-      await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, '/');
 
       await api.libraryApi.scanLibrary(server, admin.accessToken, library.id);
 
@@ -506,12 +410,11 @@ describe(`${LibraryController.name} (e2e)`, () => {
       expect(assets).toEqual([]);
     });
 
-    it('should not remvove online files', async () => {
+    it('should not remove online files', async () => {
       const library = await api.libraryApi.create(server, admin.accessToken, {
         type: LibraryType.EXTERNAL,
         importPaths: [`${IMMICH_TEST_ASSET_PATH}/albums/nature`],
       });
-      await api.userApi.setExternalPath(server, admin.accessToken, admin.userId, '/');
 
       await api.libraryApi.scanLibrary(server, admin.accessToken, library.id);
 

server/src/infra/sql/access.repository.sql

@@ -7,8 +7,8 @@ FROM
   "activity" "ActivityEntity"
 WHERE
   (
-    ("ActivityEntity"."id" IN ($1))
-    AND ("ActivityEntity"."userId" = $2)
+    "ActivityEntity"."id" IN ($1)
+    AND "ActivityEntity"."userId" = $2
   )
 
 -- AccessRepository.activity.checkAlbumOwnerAccess
@@ -22,14 +22,8 @@ FROM
   )
 WHERE
   (
-    ("ActivityEntity"."id" IN ($1))
-    AND (
-      (
-        (
-          "ActivityEntity__ActivityEntity_album"."ownerId" = $2
-        )
-      )
-    )
+    "ActivityEntity"."id" IN ($1)
+    AND "ActivityEntity__ActivityEntity_album"."ownerId" = $2
   )
 
 -- AccessRepository.activity.checkCreateAccess
@@ -59,8 +53,8 @@ FROM
 WHERE
   (
     (
-      ("AlbumEntity"."id" IN ($1))
-      AND ("AlbumEntity"."ownerId" = $2)
+      "AlbumEntity"."id" IN ($1)
+      AND "AlbumEntity"."ownerId" = $2
     )
   )
   AND ("AlbumEntity"."deletedAt" IS NULL)
@@ -78,12 +72,8 @@ FROM
 WHERE
   (
     (
-      ("AlbumEntity"."id" IN ($1))
-      AND (
-        (
-          ("AlbumEntity__AlbumEntity_sharedUsers"."id" = $2)
-        )
-      )
+      "AlbumEntity"."id" IN ($1)
+      AND "AlbumEntity__AlbumEntity_sharedUsers"."id" = $2
     )
   )
   AND ("AlbumEntity"."deletedAt" IS NULL)
@@ -96,8 +86,8 @@ FROM
   "shared_links" "SharedLinkEntity"
 WHERE
   (
-    ("SharedLinkEntity"."id" = $1)
-    AND ("SharedLinkEntity"."albumId" IN ($2))
+    "SharedLinkEntity"."id" = $1
+    AND "SharedLinkEntity"."albumId" IN ($2)
   )
 
 -- AccessRepository.asset.checkAlbumAccess
@@ -129,8 +119,8 @@ FROM
   "assets" "AssetEntity"
 WHERE
   (
-    ("AssetEntity"."id" IN ($1))
-    AND ("AssetEntity"."ownerId" = $2)
+    "AssetEntity"."id" IN ($1)
+    AND "AssetEntity"."ownerId" = $2
   )
 
 -- AccessRepository.asset.checkPartnerAccess
@@ -178,8 +168,8 @@ FROM
   "user_token" "UserTokenEntity"
 WHERE
   (
-    ("UserTokenEntity"."userId" = $1)
-    AND ("UserTokenEntity"."id" IN ($2))
+    "UserTokenEntity"."userId" = $1
+    AND "UserTokenEntity"."id" IN ($2)
   )
 
 -- AccessRepository.library.checkOwnerAccess
@@ -190,8 +180,8 @@ FROM
 WHERE
   (
     (
-      ("LibraryEntity"."id" IN ($1))
-      AND ("LibraryEntity"."ownerId" = $2)
+      "LibraryEntity"."id" IN ($1)
+      AND "LibraryEntity"."ownerId" = $2
     )
   )
   AND ("LibraryEntity"."deletedAt" IS NULL)
@@ -213,8 +203,8 @@ FROM
   "person" "PersonEntity"
 WHERE
   (
-    ("PersonEntity"."id" IN ($1))
-    AND ("PersonEntity"."ownerId" = $2)
+    "PersonEntity"."id" IN ($1)
+    AND "PersonEntity"."ownerId" = $2
   )
 
 -- AccessRepository.person.checkFaceOwnerAccess
@@ -228,14 +218,8 @@ FROM
   )
 WHERE
   (
-    ("AssetFaceEntity"."id" IN ($1))
-    AND (
-      (
-        (
-          "AssetFaceEntity__AssetFaceEntity_asset"."ownerId" = $2
-        )
-      )
-    )
+    "AssetFaceEntity"."id" IN ($1)
+    AND "AssetFaceEntity__AssetFaceEntity_asset"."ownerId" = $2
   )
 
 -- AccessRepository.partner.checkUpdateAccess

server/src/infra/sql/album.repository.sql

@@ -21,7 +21,6 @@ FROM
       "AlbumEntity__AlbumEntity_owner"."isAdmin" AS "AlbumEntity__AlbumEntity_owner_isAdmin",
       "AlbumEntity__AlbumEntity_owner"."email" AS "AlbumEntity__AlbumEntity_owner_email",
       "AlbumEntity__AlbumEntity_owner"."storageLabel" AS "AlbumEntity__AlbumEntity_owner_storageLabel",
-      "AlbumEntity__AlbumEntity_owner"."externalPath" AS "AlbumEntity__AlbumEntity_owner_externalPath",
       "AlbumEntity__AlbumEntity_owner"."oauthId" AS "AlbumEntity__AlbumEntity_owner_oauthId",
       "AlbumEntity__AlbumEntity_owner"."profileImagePath" AS "AlbumEntity__AlbumEntity_owner_profileImagePath",
       "AlbumEntity__AlbumEntity_owner"."shouldChangePassword" AS "AlbumEntity__AlbumEntity_owner_shouldChangePassword",
@@ -37,7 +36,6 @@ FROM
       "AlbumEntity__AlbumEntity_sharedUsers"."isAdmin" AS "AlbumEntity__AlbumEntity_sharedUsers_isAdmin",
       "AlbumEntity__AlbumEntity_sharedUsers"."email" AS "AlbumEntity__AlbumEntity_sharedUsers_email",
       "AlbumEntity__AlbumEntity_sharedUsers"."storageLabel" AS "AlbumEntity__AlbumEntity_sharedUsers_storageLabel",
-      "AlbumEntity__AlbumEntity_sharedUsers"."externalPath" AS "AlbumEntity__AlbumEntity_sharedUsers_externalPath",
       "AlbumEntity__AlbumEntity_sharedUsers"."oauthId" AS "AlbumEntity__AlbumEntity_sharedUsers_oauthId",
       "AlbumEntity__AlbumEntity_sharedUsers"."profileImagePath" AS "AlbumEntity__AlbumEntity_sharedUsers_profileImagePath",
       "AlbumEntity__AlbumEntity_sharedUsers"."shouldChangePassword" AS "AlbumEntity__AlbumEntity_sharedUsers_shouldChangePassword",
@@ -72,7 +70,7 @@ FROM
       )
       LEFT JOIN "shared_links" "AlbumEntity__AlbumEntity_sharedLinks" ON "AlbumEntity__AlbumEntity_sharedLinks"."albumId" = "AlbumEntity"."id"
     WHERE
-      ((("AlbumEntity"."id" = $1)))
+      (("AlbumEntity"."id" = $1))
       AND ("AlbumEntity"."deletedAt" IS NULL)
   ) "distinctAlias"
 ORDER BY
@@ -97,7 +95,6 @@ SELECT
   "AlbumEntity__AlbumEntity_owner"."isAdmin" AS "AlbumEntity__AlbumEntity_owner_isAdmin",
   "AlbumEntity__AlbumEntity_owner"."email" AS "AlbumEntity__AlbumEntity_owner_email",
   "AlbumEntity__AlbumEntity_owner"."storageLabel" AS "AlbumEntity__AlbumEntity_owner_storageLabel",
-  "AlbumEntity__AlbumEntity_owner"."externalPath" AS "AlbumEntity__AlbumEntity_owner_externalPath",
   "AlbumEntity__AlbumEntity_owner"."oauthId" AS "AlbumEntity__AlbumEntity_owner_oauthId",
   "AlbumEntity__AlbumEntity_owner"."profileImagePath" AS "AlbumEntity__AlbumEntity_owner_profileImagePath",
   "AlbumEntity__AlbumEntity_owner"."shouldChangePassword" AS "AlbumEntity__AlbumEntity_owner_shouldChangePassword",
@@ -113,7 +110,6 @@ SELECT
   "AlbumEntity__AlbumEntity_sharedUsers"."isAdmin" AS "AlbumEntity__AlbumEntity_sharedUsers_isAdmin",
   "AlbumEntity__AlbumEntity_sharedUsers"."email" AS "AlbumEntity__AlbumEntity_sharedUsers_email",
   "AlbumEntity__AlbumEntity_sharedUsers"."storageLabel" AS "AlbumEntity__AlbumEntity_sharedUsers_storageLabel",
-  "AlbumEntity__AlbumEntity_sharedUsers"."externalPath" AS "AlbumEntity__AlbumEntity_sharedUsers_externalPath",
   "AlbumEntity__AlbumEntity_sharedUsers"."oauthId" AS "AlbumEntity__AlbumEntity_sharedUsers_oauthId",
   "AlbumEntity__AlbumEntity_sharedUsers"."profileImagePath" AS "AlbumEntity__AlbumEntity_sharedUsers_profileImagePath",
   "AlbumEntity__AlbumEntity_sharedUsers"."shouldChangePassword" AS "AlbumEntity__AlbumEntity_sharedUsers_shouldChangePassword",
@@ -135,7 +131,7 @@ FROM
     "AlbumEntity__AlbumEntity_sharedUsers"."deletedAt" IS NULL
   )
 WHERE
-  ((("AlbumEntity"."id" IN ($1))))
+  (("AlbumEntity"."id" IN ($1)))
   AND ("AlbumEntity"."deletedAt" IS NULL)
 
 -- AlbumRepository.getByAssetId
@@ -155,7 +151,6 @@ SELECT
   "AlbumEntity__AlbumEntity_owner"."isAdmin" AS "AlbumEntity__AlbumEntity_owner_isAdmin",
   "AlbumEntity__AlbumEntity_owner"."email" AS "AlbumEntity__AlbumEntity_owner_email",
   "AlbumEntity__AlbumEntity_owner"."storageLabel" AS "AlbumEntity__AlbumEntity_owner_storageLabel",
-  "AlbumEntity__AlbumEntity_owner"."externalPath" AS "AlbumEntity__AlbumEntity_owner_externalPath",
   "AlbumEntity__AlbumEntity_owner"."oauthId" AS "AlbumEntity__AlbumEntity_owner_oauthId",
   "AlbumEntity__AlbumEntity_owner"."profileImagePath" AS "AlbumEntity__AlbumEntity_owner_profileImagePath",
   "AlbumEntity__AlbumEntity_owner"."shouldChangePassword" AS "AlbumEntity__AlbumEntity_owner_shouldChangePassword",
@@ -171,7 +166,6 @@ SELECT
   "AlbumEntity__AlbumEntity_sharedUsers"."isAdmin" AS "AlbumEntity__AlbumEntity_sharedUsers_isAdmin",
   "AlbumEntity__AlbumEntity_sharedUsers"."email" AS "AlbumEntity__AlbumEntity_sharedUsers_email",
   "AlbumEntity__AlbumEntity_sharedUsers"."storageLabel" AS "AlbumEntity__AlbumEntity_sharedUsers_storageLabel",
-  "AlbumEntity__AlbumEntity_sharedUsers"."externalPath" AS "AlbumEntity__AlbumEntity_sharedUsers_externalPath",
   "AlbumEntity__AlbumEntity_sharedUsers"."oauthId" AS "AlbumEntity__AlbumEntity_sharedUsers_oauthId",
   "AlbumEntity__AlbumEntity_sharedUsers"."profileImagePath" AS "AlbumEntity__AlbumEntity_sharedUsers_profileImagePath",
   "AlbumEntity__AlbumEntity_sharedUsers"."shouldChangePassword" AS "AlbumEntity__AlbumEntity_sharedUsers_shouldChangePassword",
@@ -201,20 +195,12 @@ WHERE
   (
     (
       (
-        (
-          ("AlbumEntity"."ownerId" = $1)
-          AND ((("AlbumEntity__AlbumEntity_assets"."id" = $2)))
-        )
+        "AlbumEntity"."ownerId" = $1
+        AND "AlbumEntity__AlbumEntity_assets"."id" = $2
       )
       OR (
-        (
-          (
-            (
-              ("AlbumEntity__AlbumEntity_sharedUsers"."id" = $3)
-            )
-          )
-          AND ((("AlbumEntity__AlbumEntity_assets"."id" = $4)))
-        )
+        "AlbumEntity__AlbumEntity_sharedUsers"."id" = $3
+        AND "AlbumEntity__AlbumEntity_assets"."id" = $4
       )
     )
   )
@@ -285,7 +271,6 @@ SELECT
   "AlbumEntity__AlbumEntity_sharedUsers"."isAdmin" AS "AlbumEntity__AlbumEntity_sharedUsers_isAdmin",
   "AlbumEntity__AlbumEntity_sharedUsers"."email" AS "AlbumEntity__AlbumEntity_sharedUsers_email",
   "AlbumEntity__AlbumEntity_sharedUsers"."storageLabel" AS "AlbumEntity__AlbumEntity_sharedUsers_storageLabel",
-  "AlbumEntity__AlbumEntity_sharedUsers"."externalPath" AS "AlbumEntity__AlbumEntity_sharedUsers_externalPath",
   "AlbumEntity__AlbumEntity_sharedUsers"."oauthId" AS "AlbumEntity__AlbumEntity_sharedUsers_oauthId",
   "AlbumEntity__AlbumEntity_sharedUsers"."profileImagePath" AS "AlbumEntity__AlbumEntity_sharedUsers_profileImagePath",
   "AlbumEntity__AlbumEntity_sharedUsers"."shouldChangePassword" AS "AlbumEntity__AlbumEntity_sharedUsers_shouldChangePassword",
@@ -313,7 +298,6 @@ SELECT
   "AlbumEntity__AlbumEntity_owner"."isAdmin" AS "AlbumEntity__AlbumEntity_owner_isAdmin",
   "AlbumEntity__AlbumEntity_owner"."email" AS "AlbumEntity__AlbumEntity_owner_email",
   "AlbumEntity__AlbumEntity_owner"."storageLabel" AS "AlbumEntity__AlbumEntity_owner_storageLabel",
-  "AlbumEntity__AlbumEntity_owner"."externalPath" AS "AlbumEntity__AlbumEntity_owner_externalPath",
   "AlbumEntity__AlbumEntity_owner"."oauthId" AS "AlbumEntity__AlbumEntity_owner_oauthId",
   "AlbumEntity__AlbumEntity_owner"."profileImagePath" AS "AlbumEntity__AlbumEntity_owner_profileImagePath",
   "AlbumEntity__AlbumEntity_owner"."shouldChangePassword" AS "AlbumEntity__AlbumEntity_owner_shouldChangePassword",
@@ -336,7 +320,7 @@ FROM
     "AlbumEntity__AlbumEntity_owner"."deletedAt" IS NULL
   )
 WHERE
-  ((("AlbumEntity"."ownerId" = $1)))
+  (("AlbumEntity"."ownerId" = $1))
   AND ("AlbumEntity"."deletedAt" IS NULL)
 ORDER BY
   "AlbumEntity"."createdAt" DESC
@@ -358,7 +342,6 @@ SELECT
   "AlbumEntity__AlbumEntity_sharedUsers"."isAdmin" AS "AlbumEntity__AlbumEntity_sharedUsers_isAdmin",
   "AlbumEntity__AlbumEntity_sharedUsers"."email" AS "AlbumEntity__AlbumEntity_sharedUsers_email",
   "AlbumEntity__AlbumEntity_sharedUsers"."storageLabel" AS "AlbumEntity__AlbumEntity_sharedUsers_storageLabel",
-  "AlbumEntity__AlbumEntity_sharedUsers"."externalPath" AS "AlbumEntity__AlbumEntity_sharedUsers_externalPath",
   "AlbumEntity__AlbumEntity_sharedUsers"."oauthId" AS "AlbumEntity__AlbumEntity_sharedUsers_oauthId",
   "AlbumEntity__AlbumEntity_sharedUsers"."profileImagePath" AS "AlbumEntity__AlbumEntity_sharedUsers_profileImagePath",
   "AlbumEntity__AlbumEntity_sharedUsers"."shouldChangePassword" AS "AlbumEntity__AlbumEntity_sharedUsers_shouldChangePassword",
@@ -386,7 +369,6 @@ SELECT
   "AlbumEntity__AlbumEntity_owner"."isAdmin" AS "AlbumEntity__AlbumEntity_owner_isAdmin",
   "AlbumEntity__AlbumEntity_owner"."email" AS "AlbumEntity__AlbumEntity_owner_email",
   "AlbumEntity__AlbumEntity_owner"."storageLabel" AS "AlbumEntity__AlbumEntity_owner_storageLabel",
-  "AlbumEntity__AlbumEntity_owner"."externalPath" AS "AlbumEntity__AlbumEntity_owner_externalPath",
   "AlbumEntity__AlbumEntity_owner"."oauthId" AS "AlbumEntity__AlbumEntity_owner_oauthId",
   "AlbumEntity__AlbumEntity_owner"."profileImagePath" AS "AlbumEntity__AlbumEntity_owner_profileImagePath",
   "AlbumEntity__AlbumEntity_owner"."shouldChangePassword" AS "AlbumEntity__AlbumEntity_owner_shouldChangePassword",
@@ -411,38 +393,14 @@ FROM
 WHERE
   (
     (
-      (
-        (
-          (
-            (
-              ("AlbumEntity__AlbumEntity_sharedUsers"."id" = $1)
-            )
-          )
-        )
+      ("AlbumEntity__AlbumEntity_sharedUsers"."id" = $1)
+      OR (
+        "AlbumEntity__AlbumEntity_sharedLinks"."userId" = $2
       )
       OR (
-        (
-          (
-            (
-              (
-                "AlbumEntity__AlbumEntity_sharedLinks"."userId" = $2
-              )
-            )
-          )
-        )
-      )
-      OR (
-        (
-          ("AlbumEntity"."ownerId" = $3)
-          AND (
-            (
-              (
-                NOT (
-                  "AlbumEntity__AlbumEntity_sharedUsers"."id" IS NULL
-                )
-              )
-            )
-          )
+        "AlbumEntity"."ownerId" = $3
+        AND NOT (
+          "AlbumEntity__AlbumEntity_sharedUsers"."id" IS NULL
         )
       )
     )
@@ -468,7 +426,6 @@ SELECT
   "AlbumEntity__AlbumEntity_sharedUsers"."isAdmin" AS "AlbumEntity__AlbumEntity_sharedUsers_isAdmin",
   "AlbumEntity__AlbumEntity_sharedUsers"."email" AS "AlbumEntity__AlbumEntity_sharedUsers_email",
   "AlbumEntity__AlbumEntity_sharedUsers"."storageLabel" AS "AlbumEntity__AlbumEntity_sharedUsers_storageLabel",
-  "AlbumEntity__AlbumEntity_sharedUsers"."externalPath" AS "AlbumEntity__AlbumEntity_sharedUsers_externalPath",
   "AlbumEntity__AlbumEntity_sharedUsers"."oauthId" AS "AlbumEntity__AlbumEntity_sharedUsers_oauthId",
   "AlbumEntity__AlbumEntity_sharedUsers"."profileImagePath" AS "AlbumEntity__AlbumEntity_sharedUsers_profileImagePath",
   "AlbumEntity__AlbumEntity_sharedUsers"."shouldChangePassword" AS "AlbumEntity__AlbumEntity_sharedUsers_shouldChangePassword",
@@ -496,7 +453,6 @@ SELECT
   "AlbumEntity__AlbumEntity_owner"."isAdmin" AS "AlbumEntity__AlbumEntity_owner_isAdmin",
   "AlbumEntity__AlbumEntity_owner"."email" AS "AlbumEntity__AlbumEntity_owner_email",
   "AlbumEntity__AlbumEntity_owner"."storageLabel" AS "AlbumEntity__AlbumEntity_owner_storageLabel",
-  "AlbumEntity__AlbumEntity_owner"."externalPath" AS "AlbumEntity__AlbumEntity_owner_externalPath",
   "AlbumEntity__AlbumEntity_owner"."oauthId" AS "AlbumEntity__AlbumEntity_owner_oauthId",
   "AlbumEntity__AlbumEntity_owner"."profileImagePath" AS "AlbumEntity__AlbumEntity_owner_profileImagePath",
   "AlbumEntity__AlbumEntity_owner"."shouldChangePassword" AS "AlbumEntity__AlbumEntity_owner_shouldChangePassword",
@@ -521,21 +477,9 @@ FROM
 WHERE
   (
     (
-      ("AlbumEntity"."ownerId" = $1)
-      AND (
-        (
-          (
-            "AlbumEntity__AlbumEntity_sharedUsers"."id" IS NULL
-          )
-        )
-      )
-      AND (
-        (
-          (
-            "AlbumEntity__AlbumEntity_sharedLinks"."id" IS NULL
-          )
-        )
-      )
+      "AlbumEntity"."ownerId" = $1
+      AND "AlbumEntity__AlbumEntity_sharedUsers"."id" IS NULL
+      AND "AlbumEntity__AlbumEntity_sharedLinks"."id" IS NULL
     )
   )
   AND ("AlbumEntity"."deletedAt" IS NULL)
@@ -559,7 +503,6 @@ SELECT
   "AlbumEntity__AlbumEntity_owner"."isAdmin" AS "AlbumEntity__AlbumEntity_owner_isAdmin",
   "AlbumEntity__AlbumEntity_owner"."email" AS "AlbumEntity__AlbumEntity_owner_email",
   "AlbumEntity__AlbumEntity_owner"."storageLabel" AS "AlbumEntity__AlbumEntity_owner_storageLabel",
-  "AlbumEntity__AlbumEntity_owner"."externalPath" AS "AlbumEntity__AlbumEntity_owner_externalPath",
   "AlbumEntity__AlbumEntity_owner"."oauthId" AS "AlbumEntity__AlbumEntity_owner_oauthId",
   "AlbumEntity__AlbumEntity_owner"."profileImagePath" AS "AlbumEntity__AlbumEntity_owner_profileImagePath",
   "AlbumEntity__AlbumEntity_owner"."shouldChangePassword" AS "AlbumEntity__AlbumEntity_owner_shouldChangePassword",
@@ -630,8 +573,8 @@ WHERE
     WHERE
       (
         (
-          ("AlbumEntity"."id" = $1)
-          AND ((("AlbumEntity__AlbumEntity_assets"."id" = $2)))
+          "AlbumEntity"."id" = $1
+          AND "AlbumEntity__AlbumEntity_assets"."id" = $2
         )
       )
       AND ("AlbumEntity"."deletedAt" IS NULL)

server/src/infra/sql/api.key.repository.sql

@@ -15,7 +15,6 @@ FROM
       "APIKeyEntity__APIKeyEntity_user"."isAdmin" AS "APIKeyEntity__APIKeyEntity_user_isAdmin",
       "APIKeyEntity__APIKeyEntity_user"."email" AS "APIKeyEntity__APIKeyEntity_user_email",
       "APIKeyEntity__APIKeyEntity_user"."storageLabel" AS "APIKeyEntity__APIKeyEntity_user_storageLabel",
-      "APIKeyEntity__APIKeyEntity_user"."externalPath" AS "APIKeyEntity__APIKeyEntity_user_externalPath",
       "APIKeyEntity__APIKeyEntity_user"."oauthId" AS "APIKeyEntity__APIKeyEntity_user_oauthId",
       "APIKeyEntity__APIKeyEntity_user"."profileImagePath" AS "APIKeyEntity__APIKeyEntity_user_profileImagePath",
       "APIKeyEntity__APIKeyEntity_user"."shouldChangePassword" AS "APIKeyEntity__APIKeyEntity_user_shouldChangePassword",
@@ -32,7 +31,7 @@ FROM
         "APIKeyEntity__APIKeyEntity_user"."deletedAt" IS NULL
       )
     WHERE
-      (("APIKeyEntity"."key" = $1))
+      ("APIKeyEntity"."key" = $1)
   ) "distinctAlias"
 ORDER BY
   "APIKeyEntity_id" ASC
@@ -50,8 +49,8 @@ FROM
   "api_keys" "APIKeyEntity"
 WHERE
   (
-    ("APIKeyEntity"."userId" = $1)
-    AND ("APIKeyEntity"."id" = $2)
+    "APIKeyEntity"."userId" = $1
+    AND "APIKeyEntity"."id" = $2
   )
 LIMIT
   1
@@ -66,6 +65,6 @@ SELECT
 FROM
   "api_keys" "APIKeyEntity"
 WHERE
-  (("APIKeyEntity"."userId" = $1))
+  ("APIKeyEntity"."userId" = $1)
 ORDER BY
   "APIKeyEntity"."createdAt" DESC

server/src/infra/sql/asset.repository.sql

@@ -65,11 +65,11 @@ FROM
 WHERE
   (
     (
-      ("AssetEntity"."ownerId" = $1)
-      AND ("AssetEntity"."isVisible" = $2)
-      AND ("AssetEntity"."isArchived" = $3)
-      AND (NOT ("AssetEntity"."resizePath" IS NULL))
-      AND ("AssetEntity"."fileCreatedAt" BETWEEN $4 AND $5)
+      "AssetEntity"."ownerId" = $1
+      AND "AssetEntity"."isVisible" = $2
+      AND "AssetEntity"."isArchived" = $3
+      AND NOT ("AssetEntity"."resizePath" IS NULL)
+      AND "AssetEntity"."fileCreatedAt" BETWEEN $4 AND $5
     )
   )
   AND ("AssetEntity"."deletedAt" IS NULL)
@@ -286,7 +286,7 @@ FROM
   LEFT JOIN "asset_stack" "AssetEntity__AssetEntity_stack" ON "AssetEntity__AssetEntity_stack"."id" = "AssetEntity"."stackId"
   LEFT JOIN "assets" "bd93d5747511a4dad4923546c51365bf1a803774" ON "bd93d5747511a4dad4923546c51365bf1a803774"."stackId" = "AssetEntity__AssetEntity_stack"."id"
 WHERE
-  (("AssetEntity"."id" IN ($1)))
+  ("AssetEntity"."id" IN ($1))
 
 -- AssetRepository.deleteAll
 DELETE FROM "assets"
@@ -331,13 +331,7 @@ FROM
     "AssetEntity__AssetEntity_library"."deletedAt" IS NULL
   )
 WHERE
-  (
-    (
-      (
-        (("AssetEntity__AssetEntity_library"."id" IN ($1)))
-      )
-    )
-  )
+  (("AssetEntity__AssetEntity_library"."id" IN ($1)))
   AND ("AssetEntity"."deletedAt" IS NULL)
 
 -- AssetRepository.getByLibraryIdAndOriginalPath
@@ -384,8 +378,8 @@ FROM
     WHERE
       (
         (
-          ((("AssetEntity__AssetEntity_library"."id" = $1)))
-          AND ("AssetEntity"."originalPath" = $2)
+          "AssetEntity__AssetEntity_library"."id" = $1
+          AND "AssetEntity"."originalPath" = $2
         )
       )
       AND ("AssetEntity"."deletedAt" IS NULL)
@@ -452,9 +446,9 @@ FROM
   "assets" "AssetEntity"
 WHERE
   (
-    ("AssetEntity"."ownerId" = $1)
-    AND ("AssetEntity"."deviceId" = $2)
-    AND ("AssetEntity"."isVisible" = $3)
+    "AssetEntity"."ownerId" = $1
+    AND "AssetEntity"."deviceId" = $2
+    AND "AssetEntity"."isVisible" = $3
   )
 
 -- AssetRepository.getById
@@ -491,7 +485,7 @@ SELECT
 FROM
   "assets" "AssetEntity"
 WHERE
-  (("AssetEntity"."id" = $1))
+  ("AssetEntity"."id" = $1)
 LIMIT
   1
 
@@ -539,8 +533,8 @@ FROM
 WHERE
   (
     (
-      ("AssetEntity"."ownerId" = $1)
-      AND ("AssetEntity"."checksum" = $2)
+      "AssetEntity"."ownerId" = $1
+      AND "AssetEntity"."checksum" = $2
     )
   )
   AND ("AssetEntity"."deletedAt" IS NULL)
@@ -584,16 +578,12 @@ WHERE
   (
     (
       (
-        (
-          ("AssetEntity"."sidecarPath" IS NULL)
-          AND ("AssetEntity"."isVisible" = $1)
-        )
+        "AssetEntity"."sidecarPath" IS NULL
+        AND "AssetEntity"."isVisible" = $1
       )
       OR (
-        (
-          ("AssetEntity"."sidecarPath" = $2)
-          AND ("AssetEntity"."isVisible" = $3)
-        )
+        "AssetEntity"."sidecarPath" = $2
+        AND "AssetEntity"."isVisible" = $3
       )
     )
   )

server/src/infra/sql/library.repository.sql

@@ -23,7 +23,6 @@ FROM
       "LibraryEntity__LibraryEntity_owner"."isAdmin" AS "LibraryEntity__LibraryEntity_owner_isAdmin",
       "LibraryEntity__LibraryEntity_owner"."email" AS "LibraryEntity__LibraryEntity_owner_email",
       "LibraryEntity__LibraryEntity_owner"."storageLabel" AS "LibraryEntity__LibraryEntity_owner_storageLabel",
-      "LibraryEntity__LibraryEntity_owner"."externalPath" AS "LibraryEntity__LibraryEntity_owner_externalPath",
       "LibraryEntity__LibraryEntity_owner"."oauthId" AS "LibraryEntity__LibraryEntity_owner_oauthId",
       "LibraryEntity__LibraryEntity_owner"."profileImagePath" AS "LibraryEntity__LibraryEntity_owner_profileImagePath",
       "LibraryEntity__LibraryEntity_owner"."shouldChangePassword" AS "LibraryEntity__LibraryEntity_owner_shouldChangePassword",
@@ -40,7 +39,7 @@ FROM
         "LibraryEntity__LibraryEntity_owner"."deletedAt" IS NULL
       )
     WHERE
-      ((("LibraryEntity"."id" = $1)))
+      (("LibraryEntity"."id" = $1))
       AND ("LibraryEntity"."deletedAt" IS NULL)
   ) "distinctAlias"
 ORDER BY
@@ -63,7 +62,7 @@ WHERE
     FROM
       "libraries" "LibraryEntity"
     WHERE
-      ((("LibraryEntity"."name" = $1)))
+      (("LibraryEntity"."name" = $1))
       AND ("LibraryEntity"."deletedAt" IS NULL)
   )
 LIMIT
@@ -75,7 +74,7 @@ SELECT
 FROM
   "libraries" "LibraryEntity"
 WHERE
-  ((("LibraryEntity"."ownerId" = $1)))
+  (("LibraryEntity"."ownerId" = $1))
   AND ("LibraryEntity"."deletedAt" IS NULL)
 
 -- LibraryRepository.getDefaultUploadLibrary
@@ -96,8 +95,8 @@ FROM
 WHERE
   (
     (
-      ("LibraryEntity"."ownerId" = $1)
-      AND ("LibraryEntity"."type" = $2)
+      "LibraryEntity"."ownerId" = $1
+      AND "LibraryEntity"."type" = $2
     )
   )
   AND ("LibraryEntity"."deletedAt" IS NULL)
@@ -114,8 +113,8 @@ FROM
 WHERE
   (
     (
-      ("LibraryEntity"."ownerId" = $1)
-      AND ("LibraryEntity"."type" = $2)
+      "LibraryEntity"."ownerId" = $1
+      AND "LibraryEntity"."type" = $2
     )
   )
   AND ("LibraryEntity"."deletedAt" IS NULL)
@@ -139,7 +138,6 @@ SELECT
   "LibraryEntity__LibraryEntity_owner"."isAdmin" AS "LibraryEntity__LibraryEntity_owner_isAdmin",
   "LibraryEntity__LibraryEntity_owner"."email" AS "LibraryEntity__LibraryEntity_owner_email",
   "LibraryEntity__LibraryEntity_owner"."storageLabel" AS "LibraryEntity__LibraryEntity_owner_storageLabel",
-  "LibraryEntity__LibraryEntity_owner"."externalPath" AS "LibraryEntity__LibraryEntity_owner_externalPath",
   "LibraryEntity__LibraryEntity_owner"."oauthId" AS "LibraryEntity__LibraryEntity_owner_oauthId",
   "LibraryEntity__LibraryEntity_owner"."profileImagePath" AS "LibraryEntity__LibraryEntity_owner_profileImagePath",
   "LibraryEntity__LibraryEntity_owner"."shouldChangePassword" AS "LibraryEntity__LibraryEntity_owner_shouldChangePassword",
@@ -158,8 +156,8 @@ FROM
 WHERE
   (
     (
-      ("LibraryEntity"."ownerId" = $1)
-      AND ("LibraryEntity"."isVisible" = $2)
+      "LibraryEntity"."ownerId" = $1
+      AND "LibraryEntity"."isVisible" = $2
     )
   )
   AND ("LibraryEntity"."deletedAt" IS NULL)
@@ -185,7 +183,6 @@ SELECT
   "LibraryEntity__LibraryEntity_owner"."isAdmin" AS "LibraryEntity__LibraryEntity_owner_isAdmin",
   "LibraryEntity__LibraryEntity_owner"."email" AS "LibraryEntity__LibraryEntity_owner_email",
   "LibraryEntity__LibraryEntity_owner"."storageLabel" AS "LibraryEntity__LibraryEntity_owner_storageLabel",
-  "LibraryEntity__LibraryEntity_owner"."externalPath" AS "LibraryEntity__LibraryEntity_owner_externalPath",
   "LibraryEntity__LibraryEntity_owner"."oauthId" AS "LibraryEntity__LibraryEntity_owner_oauthId",
   "LibraryEntity__LibraryEntity_owner"."profileImagePath" AS "LibraryEntity__LibraryEntity_owner_profileImagePath",
   "LibraryEntity__LibraryEntity_owner"."shouldChangePassword" AS "LibraryEntity__LibraryEntity_owner_shouldChangePassword",
@@ -225,7 +222,6 @@ SELECT
   "LibraryEntity__LibraryEntity_owner"."isAdmin" AS "LibraryEntity__LibraryEntity_owner_isAdmin",
   "LibraryEntity__LibraryEntity_owner"."email" AS "LibraryEntity__LibraryEntity_owner_email",
   "LibraryEntity__LibraryEntity_owner"."storageLabel" AS "LibraryEntity__LibraryEntity_owner_storageLabel",
-  "LibraryEntity__LibraryEntity_owner"."externalPath" AS "LibraryEntity__LibraryEntity_owner_externalPath",
   "LibraryEntity__LibraryEntity_owner"."oauthId" AS "LibraryEntity__LibraryEntity_owner_oauthId",
   "LibraryEntity__LibraryEntity_owner"."profileImagePath" AS "LibraryEntity__LibraryEntity_owner_profileImagePath",
   "LibraryEntity__LibraryEntity_owner"."shouldChangePassword" AS "LibraryEntity__LibraryEntity_owner_shouldChangePassword",
@@ -240,8 +236,8 @@ FROM
   LEFT JOIN "users" "LibraryEntity__LibraryEntity_owner" ON "LibraryEntity__LibraryEntity_owner"."id" = "LibraryEntity"."ownerId"
 WHERE
   (
-    ("LibraryEntity"."isVisible" = $1)
-    AND (NOT ("LibraryEntity"."deletedAt" IS NULL))
+    "LibraryEntity"."isVisible" = $1
+    AND NOT ("LibraryEntity"."deletedAt" IS NULL)
   )
 ORDER BY
   "LibraryEntity"."createdAt" ASC

server/src/infra/sql/move.repository.sql

@@ -11,8 +11,8 @@ FROM
   "move_history" "MoveEntity"
 WHERE
   (
-    ("MoveEntity"."entityId" = $1)
-    AND ("MoveEntity"."pathType" = $2)
+    "MoveEntity"."entityId" = $1
+    AND "MoveEntity"."pathType" = $2
   )
 LIMIT
   1

server/src/infra/sql/person.repository.sql

@@ -83,7 +83,7 @@ FROM
   "asset_faces" "AssetFaceEntity"
   LEFT JOIN "person" "AssetFaceEntity__AssetFaceEntity_person" ON "AssetFaceEntity__AssetFaceEntity_person"."id" = "AssetFaceEntity"."personId"
 WHERE
-  (("AssetFaceEntity"."assetId" = $1))
+  ("AssetFaceEntity"."assetId" = $1)
 
 -- PersonRepository.getFaceById
 SELECT DISTINCT
@@ -113,7 +113,7 @@ FROM
       "asset_faces" "AssetFaceEntity"
       LEFT JOIN "person" "AssetFaceEntity__AssetFaceEntity_person" ON "AssetFaceEntity__AssetFaceEntity_person"."id" = "AssetFaceEntity"."personId"
     WHERE
-      (("AssetFaceEntity"."id" = $1))
+      ("AssetFaceEntity"."id" = $1)
   ) "distinctAlias"
 ORDER BY
   "AssetFaceEntity_id" ASC
@@ -181,7 +181,7 @@ FROM
         "AssetFaceEntity__AssetFaceEntity_asset"."deletedAt" IS NULL
       )
     WHERE
-      (("AssetFaceEntity"."id" = $1))
+      ("AssetFaceEntity"."id" = $1)
   ) "distinctAlias"
 ORDER BY
   "AssetFaceEntity_id" ASC
@@ -325,13 +325,9 @@ FROM
     WHERE
       (
         (
-          (
-            (
-              ("AssetEntity__AssetEntity_faces"."personId" = $1)
-            )
-          )
-          AND ("AssetEntity"."isVisible" = $2)
-          AND ("AssetEntity"."isArchived" = $3)
+          "AssetEntity__AssetEntity_faces"."personId" = $1
+          AND "AssetEntity"."isVisible" = $2
+          AND "AssetEntity"."isArchived" = $3
         )
       )
       AND ("AssetEntity"."deletedAt" IS NULL)
@@ -399,10 +395,8 @@ FROM
 WHERE
   (
     (
-      (
-        ("AssetFaceEntity"."assetId" = $1)
-        AND ("AssetFaceEntity"."personId" = $2)
-      )
+      "AssetFaceEntity"."assetId" = $1
+      AND "AssetFaceEntity"."personId" = $2
     )
   )
 
@@ -420,6 +414,6 @@ SELECT
 FROM
   "asset_faces" "AssetFaceEntity"
 WHERE
-  (("AssetFaceEntity"."personId" = $1))
+  ("AssetFaceEntity"."personId" = $1)
 LIMIT
   1

server/src/infra/sql/shared.link.repository.sql

@@ -150,7 +150,6 @@ FROM
       "6d7fd45329a05fd86b3dbcacde87fe76e33a422d"."isAdmin" AS "6d7fd45329a05fd86b3dbcacde87fe76e33a422d_isAdmin",
       "6d7fd45329a05fd86b3dbcacde87fe76e33a422d"."email" AS "6d7fd45329a05fd86b3dbcacde87fe76e33a422d_email",
       "6d7fd45329a05fd86b3dbcacde87fe76e33a422d"."storageLabel" AS "6d7fd45329a05fd86b3dbcacde87fe76e33a422d_storageLabel",
-      "6d7fd45329a05fd86b3dbcacde87fe76e33a422d"."externalPath" AS "6d7fd45329a05fd86b3dbcacde87fe76e33a422d_externalPath",
       "6d7fd45329a05fd86b3dbcacde87fe76e33a422d"."oauthId" AS "6d7fd45329a05fd86b3dbcacde87fe76e33a422d_oauthId",
       "6d7fd45329a05fd86b3dbcacde87fe76e33a422d"."profileImagePath" AS "6d7fd45329a05fd86b3dbcacde87fe76e33a422d_profileImagePath",
       "6d7fd45329a05fd86b3dbcacde87fe76e33a422d"."shouldChangePassword" AS "6d7fd45329a05fd86b3dbcacde87fe76e33a422d_shouldChangePassword",
@@ -184,8 +183,8 @@ FROM
       )
     WHERE
       (
-        ("SharedLinkEntity"."id" = $1)
-        AND ("SharedLinkEntity"."userId" = $2)
+        "SharedLinkEntity"."id" = $1
+        AND "SharedLinkEntity"."userId" = $2
       )
   ) "distinctAlias"
 ORDER BY
@@ -254,7 +253,6 @@ SELECT
   "6d7fd45329a05fd86b3dbcacde87fe76e33a422d"."isAdmin" AS "6d7fd45329a05fd86b3dbcacde87fe76e33a422d_isAdmin",
   "6d7fd45329a05fd86b3dbcacde87fe76e33a422d"."email" AS "6d7fd45329a05fd86b3dbcacde87fe76e33a422d_email",
   "6d7fd45329a05fd86b3dbcacde87fe76e33a422d"."storageLabel" AS "6d7fd45329a05fd86b3dbcacde87fe76e33a422d_storageLabel",
-  "6d7fd45329a05fd86b3dbcacde87fe76e33a422d"."externalPath" AS "6d7fd45329a05fd86b3dbcacde87fe76e33a422d_externalPath",
   "6d7fd45329a05fd86b3dbcacde87fe76e33a422d"."oauthId" AS "6d7fd45329a05fd86b3dbcacde87fe76e33a422d_oauthId",
   "6d7fd45329a05fd86b3dbcacde87fe76e33a422d"."profileImagePath" AS "6d7fd45329a05fd86b3dbcacde87fe76e33a422d_profileImagePath",
   "6d7fd45329a05fd86b3dbcacde87fe76e33a422d"."shouldChangePassword" AS "6d7fd45329a05fd86b3dbcacde87fe76e33a422d_shouldChangePassword",
@@ -280,7 +278,7 @@ FROM
     "6d7fd45329a05fd86b3dbcacde87fe76e33a422d"."deletedAt" IS NULL
   )
 WHERE
-  (("SharedLinkEntity"."userId" = $1))
+  ("SharedLinkEntity"."userId" = $1)
 ORDER BY
   "SharedLinkEntity"."createdAt" DESC
 
@@ -308,7 +306,6 @@ FROM
       "SharedLinkEntity__SharedLinkEntity_user"."isAdmin" AS "SharedLinkEntity__SharedLinkEntity_user_isAdmin",
       "SharedLinkEntity__SharedLinkEntity_user"."email" AS "SharedLinkEntity__SharedLinkEntity_user_email",
       "SharedLinkEntity__SharedLinkEntity_user"."storageLabel" AS "SharedLinkEntity__SharedLinkEntity_user_storageLabel",
-      "SharedLinkEntity__SharedLinkEntity_user"."externalPath" AS "SharedLinkEntity__SharedLinkEntity_user_externalPath",
       "SharedLinkEntity__SharedLinkEntity_user"."oauthId" AS "SharedLinkEntity__SharedLinkEntity_user_oauthId",
       "SharedLinkEntity__SharedLinkEntity_user"."profileImagePath" AS "SharedLinkEntity__SharedLinkEntity_user_profileImagePath",
       "SharedLinkEntity__SharedLinkEntity_user"."shouldChangePassword" AS "SharedLinkEntity__SharedLinkEntity_user_shouldChangePassword",
@@ -325,7 +322,7 @@ FROM
         "SharedLinkEntity__SharedLinkEntity_user"."deletedAt" IS NULL
       )
     WHERE
-      (("SharedLinkEntity"."key" = $1))
+      ("SharedLinkEntity"."key" = $1)
   ) "distinctAlias"
 ORDER BY
   "SharedLinkEntity_id" ASC

server/src/infra/sql/user.repository.sql

@@ -8,7 +8,6 @@ SELECT
   "UserEntity"."isAdmin" AS "UserEntity_isAdmin",
   "UserEntity"."email" AS "UserEntity_email",
   "UserEntity"."storageLabel" AS "UserEntity_storageLabel",
-  "UserEntity"."externalPath" AS "UserEntity_externalPath",
   "UserEntity"."oauthId" AS "UserEntity_oauthId",
   "UserEntity"."profileImagePath" AS "UserEntity_profileImagePath",
   "UserEntity"."shouldChangePassword" AS "UserEntity_shouldChangePassword",
@@ -21,7 +20,7 @@ SELECT
 FROM
   "users" "UserEntity"
 WHERE
-  ((("UserEntity"."isAdmin" = $1)))
+  (("UserEntity"."isAdmin" = $1))
   AND ("UserEntity"."deletedAt" IS NULL)
 LIMIT
   1
@@ -41,7 +40,7 @@ WHERE
     FROM
       "users" "UserEntity"
     WHERE
-      ((("UserEntity"."isAdmin" = $1)))
+      (("UserEntity"."isAdmin" = $1))
       AND ("UserEntity"."deletedAt" IS NULL)
   )
 LIMIT
@@ -55,7 +54,6 @@ SELECT
   "user"."isAdmin" AS "user_isAdmin",
   "user"."email" AS "user_email",
   "user"."storageLabel" AS "user_storageLabel",
-  "user"."externalPath" AS "user_externalPath",
   "user"."oauthId" AS "user_oauthId",
   "user"."profileImagePath" AS "user_profileImagePath",
   "user"."shouldChangePassword" AS "user_shouldChangePassword",
@@ -79,7 +77,6 @@ SELECT
   "UserEntity"."isAdmin" AS "UserEntity_isAdmin",
   "UserEntity"."email" AS "UserEntity_email",
   "UserEntity"."storageLabel" AS "UserEntity_storageLabel",
-  "UserEntity"."externalPath" AS "UserEntity_externalPath",
   "UserEntity"."oauthId" AS "UserEntity_oauthId",
   "UserEntity"."profileImagePath" AS "UserEntity_profileImagePath",
   "UserEntity"."shouldChangePassword" AS "UserEntity_shouldChangePassword",
@@ -92,7 +89,7 @@ SELECT
 FROM
   "users" "UserEntity"
 WHERE
-  ((("UserEntity"."storageLabel" = $1)))
+  (("UserEntity"."storageLabel" = $1))
   AND ("UserEntity"."deletedAt" IS NULL)
 LIMIT
   1
@@ -105,7 +102,6 @@ SELECT
   "UserEntity"."isAdmin" AS "UserEntity_isAdmin",
   "UserEntity"."email" AS "UserEntity_email",
   "UserEntity"."storageLabel" AS "UserEntity_storageLabel",
-  "UserEntity"."externalPath" AS "UserEntity_externalPath",
   "UserEntity"."oauthId" AS "UserEntity_oauthId",
   "UserEntity"."profileImagePath" AS "UserEntity_profileImagePath",
   "UserEntity"."shouldChangePassword" AS "UserEntity_shouldChangePassword",
@@ -118,7 +114,7 @@ SELECT
 FROM
   "users" "UserEntity"
 WHERE
-  ((("UserEntity"."oauthId" = $1)))
+  (("UserEntity"."oauthId" = $1))
   AND ("UserEntity"."deletedAt" IS NULL)
 LIMIT
   1

server/src/infra/sql/user.token.repository.sql

@@ -18,7 +18,6 @@ FROM
       "UserTokenEntity__UserTokenEntity_user"."isAdmin" AS "UserTokenEntity__UserTokenEntity_user_isAdmin",
       "UserTokenEntity__UserTokenEntity_user"."email" AS "UserTokenEntity__UserTokenEntity_user_email",
       "UserTokenEntity__UserTokenEntity_user"."storageLabel" AS "UserTokenEntity__UserTokenEntity_user_storageLabel",
-      "UserTokenEntity__UserTokenEntity_user"."externalPath" AS "UserTokenEntity__UserTokenEntity_user_externalPath",
       "UserTokenEntity__UserTokenEntity_user"."oauthId" AS "UserTokenEntity__UserTokenEntity_user_oauthId",
       "UserTokenEntity__UserTokenEntity_user"."profileImagePath" AS "UserTokenEntity__UserTokenEntity_user_profileImagePath",
       "UserTokenEntity__UserTokenEntity_user"."shouldChangePassword" AS "UserTokenEntity__UserTokenEntity_user_shouldChangePassword",
@@ -35,7 +34,7 @@ FROM
         "UserTokenEntity__UserTokenEntity_user"."deletedAt" IS NULL
       )
     WHERE
-      (("UserTokenEntity"."token" = $1))
+      ("UserTokenEntity"."token" = $1)
   ) "distinctAlias"
 ORDER BY
   "UserTokenEntity_id" ASC

web/src/lib/components/forms/edit-user-form.svelte

@@ -34,14 +34,13 @@
 
   const editUser = async () => {
     try {
-      const { id, email, name, storageLabel, externalPath } = user;
+      const { id, email, name, storageLabel } = user;
       await updateUser({
         updateUserDto: {
           id,
           email,
           name,
           storageLabel: storageLabel || '',
-          externalPath: externalPath || '',
           quotaSizeInBytes: quotaSize ? convertToBytes(Number(quotaSize), 'GiB') : null,
         },
       });

web/src/lib/components/user-settings-page/user-profile-settings.svelte

@@ -64,14 +64,6 @@
           required={false}
         />
 
-        <SettingInputField
-          inputType={SettingInputFieldType.TEXT}
-          label="EXTERNAL PATH"
-          disabled={true}
-          value={editedUser.externalPath || ''}
-          required={false}
-        />
-
         <div class="flex justify-end">
           <Button type="submit" size="sm" on:click={() => handleSaveProfile()}>Save</Button>
         </div>

web/src/test-data/factories/user-factory.ts

@@ -7,7 +7,6 @@ export const userFactory = Sync.makeFactory<UserResponseDto>({
   email: Sync.each(() => faker.internet.email()),
   name: Sync.each(() => faker.person.fullName()),
   storageLabel: Sync.each(() => faker.string.alphanumeric()),
-  externalPath: Sync.each(() => faker.string.alphanumeric()),
   profileImagePath: '',
   shouldChangePassword: Sync.each(() => faker.datatype.boolean()),
   isAdmin: true,