WIP

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.github/workflows/cli.yml

@@ -88,7 +88,7 @@ jobs:
             type=raw,value=latest,enable=${{ github.event_name == 'release' }}
 
       - name: Build and push image
-        uses: docker/build-push-action@v6.12.0
+        uses: docker/build-push-action@v6.13.0
         with:
           file: cli/Dockerfile
           platforms: linux/amd64,linux/arm64

.github/workflows/docker.yml

@@ -174,7 +174,7 @@ jobs:
           fi
 
       - name: Build and push image
-        uses: docker/build-push-action@v6.12.0
+        uses: docker/build-push-action@v6.13.0
         with:
           context: ${{ env.context }}
           file: ${{ env.file }}
@@ -265,7 +265,7 @@ jobs:
           fi
 
       - name: Build and push image
-        uses: docker/build-push-action@v6.12.0
+        uses: docker/build-push-action@v6.13.0
         with:
           context: ${{ env.context }}
           file: ${{ env.file }}

cli/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@immich/cli",
-  "version": "2.2.48",
+  "version": "2.2.50",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@immich/cli",
-      "version": "2.2.48",
+      "version": "2.2.50",
       "license": "GNU Affero General Public License version 3",
       "dependencies": {
         "fast-glob": "^3.3.2",
@@ -24,7 +24,7 @@
         "@types/cli-progress": "^3.11.0",
         "@types/lodash-es": "^4.17.12",
         "@types/mock-fs": "^4.13.1",
-        "@types/node": "^22.10.9",
+        "@types/node": "^22.13.1",
         "@typescript-eslint/eslint-plugin": "^8.15.0",
         "@typescript-eslint/parser": "^8.15.0",
         "@vitest/coverage-v8": "^3.0.0",
@@ -52,14 +52,14 @@
     },
     "../open-api/typescript-sdk": {
       "name": "@immich/sdk",
-      "version": "1.125.7",
+      "version": "1.126.1",
       "dev": true,
       "license": "GNU Affero General Public License version 3",
       "dependencies": {
         "@oazapfts/runtime": "^1.0.2"
       },
       "devDependencies": {
-        "@types/node": "^22.10.9",
+        "@types/node": "^22.13.1",
         "typescript": "^5.3.3"
       }
     },
@@ -1482,9 +1482,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "22.10.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.9.tgz",
-      "integrity": "sha512-Ir6hwgsKyNESl/gLOcEz3krR4CBGgliDqBQ2ma4wIhEx0w+xnoeTq3tdrNw15kU3SxogDjOgv9sqdtLW8mIHaw==",
+      "version": "22.13.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.1.tgz",
+      "integrity": "sha512-jK8uzQlrvXqEU91UxiK5J7pKHyzgnI1Qnl0QDHIgVGuolJhRb9EEl28Cj9b3rGR8B2lhFCtvIm5os8lFnO/1Ew==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@immich/cli",
-  "version": "2.2.48",
+  "version": "2.2.50",
   "description": "Command Line Interface (CLI) for Immich",
   "type": "module",
   "exports": "./dist/index.js",
@@ -20,7 +20,7 @@
     "@types/cli-progress": "^3.11.0",
     "@types/lodash-es": "^4.17.12",
     "@types/mock-fs": "^4.13.1",
-    "@types/node": "^22.10.9",
+    "@types/node": "^22.13.1",
     "@typescript-eslint/eslint-plugin": "^8.15.0",
     "@typescript-eslint/parser": "^8.15.0",
     "@vitest/coverage-v8": "^3.0.0",

deployment/modules/cloudflare/docs-release/.terraform.lock.hcl

@@ -2,37 +2,37 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.opentofu.org/cloudflare/cloudflare" {
-  version     = "4.50.0"
-  constraints = "4.50.0"
+  version     = "4.52.0"
+  constraints = "4.52.0"
   hashes = [
-    "h1:0qvD5ZKn2tMZ8cOjQrUSITIC9tKCZbrSaSswV9lOyiU=",
-    "h1:4N0gplrZ0zOsJv3Kx1VfIx2FwrZHbYU0Un2yfiLZIGQ=",
-    "h1:81AMQq4kNKU/35U8ElQegUxG4E6xB0erIjG5xVmjIyo=",
-    "h1:EEQNADUmV3IL6x00yzy04i7OCSLeOMgM9XQkV3w71gA=",
-    "h1:HD0KI7td6oiSSAnJNn8UPSGf+hKiTo4JVQYfAiU1SqM=",
-    "h1:Hl+o5LtcvZg2f3l1hh9vaG/DFK6k+dTIZSeM0lXyfpo=",
-    "h1:ZUO2oIJ6jtZdvl816h0cEIiIeZ/fFCF64+abGEVxZZM=",
-    "h1:Zio80fnEeUKdlSOhTVskMEFSLUQ6TMsMKnXc+Dy2P2A=",
-    "h1:aLLvg36evTyqjtXGV2MjAV8imktXFmry7p/xCu9GQC4=",
-    "h1:azL05eWyy2V8SWkbZZImPWvv8ynG4eqmrbZhjXBDFug=",
-    "h1:ckMysHY4fJmr7o58XMi+DdgOTB/U/Mf1u1JA9ly3g/I=",
-    "h1:jxOwjDNjt5WCb4YjjiMsman91O8Y+MAPz6UwJ4a6F+0=",
-    "h1:u4OfnjSLa4Wk1IUFAzrvMnGgr8MvRHEWVDHEScPK2E8=",
-    "h1:wQkR1oeSkzlHn3rnVuLJRJLBHlg4EHt7Y64DeTjfkjQ=",
-    "zh:0ef99ed39472a94e6a0d6fa733cf0a46bce3bf66eba2873efae8846efdddc237",
-    "zh:2929cbbffcead171d45c88e4a7a59e9c013ea775dafa68b10da8db7cd04b6140",
-    "zh:462601c87118088e1a718842e367af7d8e7620598d426980a6d6b33de759865e",
-    "zh:56766eb62a74a9d88d9efb8486dd3a0c5c9db873d0a980ae9ef1e8af27d74231",
-    "zh:6b4e8810d99498a5a20a5872982a0f1354e79cfc4a7dfe7cc656f1c7eaae47d8",
-    "zh:6d65bdb4ec94b6eecc8abe26d94e2ca09262dc1e7a9934db829f418be0119920",
-    "zh:71adeaf31e41a358ec6095004062e43f56ee7d4b2504e5613ab351d511695641",
+    "h1:2BEJyXJtYC4B4nda/WCYUmuJYDaYk88F8t1pwPzr0iQ=",
+    "h1:4IASk5SESeWKQ7JU0+M7KApuF5mZyklvwMXPBabim3c=",
+    "h1:5ImZxxALSnWfH/4EXw/wFirSmk5Tr0ACmcysy51AafE=",
+    "h1:6TJ3dxLSin4ZKBJLsZDn95H2ZYnGm8S7GGHvvXuuMQU=",
+    "h1:IzTUjg9kQ4N3qizP9CjYLeHwjsuGgtxwXvfUQWyOLcA=",
+    "h1:NTaOQfYINA0YTG/V1/9+SYtgX1it63+cBugj4WK4FWc=",
+    "h1:PXH48LuJn329sCfMXprdMDk51EZaWFyajVvS03qhQLs=",
+    "h1:Pi5M+GeoMSN2eJ6QnIeXjBf19O+rby/74CfB2ocpv20=",
+    "h1:ShXZ2ZjBvm3thfoPPzPT8+OhyismnydQVkUAfI8X12w=",
+    "h1:WQ9hu0Wge2msBbODfottCSKgu8oKUrw4Opz+fDPVVHk=",
+    "h1:Z5yXML2DE0uH9UU+M0ut9JMQAORcwVZz1CxBHzeBmao=",
+    "h1:jqI2qKknpleS3JDSplyGYHMu0u9K/tor1ZOjFwDgEMk=",
+    "h1:kgfutDh14Q5nw4eg6qGFamFxIiY8Ae0FPKRBLDOzpcI=",
+    "h1:zCAO7GZmfYhWb+i6TfqlqhMeDyPZWGio2IzEzAh3YTs=",
+    "zh:19be1a91c982b902c42aba47766860dfa5dc151eed1e95fd39ca642229381ef0",
+    "zh:1de451c4d1ecf7efbe67b6dace3426ba810711afdd644b0f1b870364c8ae91f8",
+    "zh:352b4a2120173298622e669258744554339d959ac3a95607b117a48ee4a83238",
+    "zh:3c6f1346d9154afbd2d558fabb4b0150fc8d559aa961254144fe1bc17fe6032f",
+    "zh:4c4c92d53fb535b1e0eff26f222bbd627b97d3b4c891ec9c321268676d06152f",
+    "zh:53276f68006c9ceb7cdb10a6ccf91a5c1eadd1407a28edb5741e84e88d7e29e8",
+    "zh:7925a97773948171a63d4f65bb81ee92fd6d07a447e36012977313293a5435c9",
+    "zh:7dfb0a4496cfe032437386d0a2cd9229a1956e9c30bd920923c141b0f0440060",
     "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f",
-    "zh:89761c15908ccc2cf9c50bb5cb3be45d3ad0c45fc7c608c6b95f48c0288b7160",
-    "zh:8cc5d7c5939da89cfd01f3e51c84f3576564783acea9db86bd9e32049805ed96",
-    "zh:987cff8225b1dd436cdcb4fc6228689ae7e4281de6896412a2a9a3325c49f05e",
-    "zh:991e83ebb89867d71e01a1c215ed159efb425683b0a44707be8579eb0a337f06",
-    "zh:ab8177ae2d8f5cfa90043a6f867435012cae115f6061b832a7e2462e0ae87a67",
-    "zh:d1ca34df1398f201274a6a18102975148c10ca15aa43cfc56cc9897620929509",
-    "zh:d34946f70201baf6dda03e3b294c6bbe40d95d0278e97b9f636ded94822b24ac",
+    "zh:8d4aa79f0a414bb4163d771063c70cd991c8fac6c766e685bac2ee12903c5bd6",
+    "zh:a67540c13565616a7e7e51ee9366e88b0dc60046e1d75c72680e150bd02725bb",
+    "zh:a936383a4767f5393f38f622e92bf2d0c03fe04b69c284951f27345766c7b31b",
+    "zh:d4887d73c466ff036eecf50ad6404ba38fd82ea4855296b1846d244b0f13c380",
+    "zh:e9093c8bd5b6cd99c81666e315197791781b8f93afa14fc2e0f732d1bb2a44b7",
+    "zh:efd3b3f1ec59a37f635aa1d4efcf178734c2fcf8ddb0d56ea690bec342da8672",
   ]
 }

deployment/modules/cloudflare/docs-release/config.tf

@@ -5,7 +5,7 @@ terraform {
   required_providers {
     cloudflare = {
       source = "cloudflare/cloudflare"
-      version = "4.50.0"
+      version = "4.52.0"
     }
   }
 }

deployment/modules/cloudflare/docs/.terraform.lock.hcl

@@ -2,37 +2,37 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.opentofu.org/cloudflare/cloudflare" {
-  version     = "4.50.0"
-  constraints = "4.50.0"
+  version     = "4.52.0"
+  constraints = "4.52.0"
   hashes = [
-    "h1:0qvD5ZKn2tMZ8cOjQrUSITIC9tKCZbrSaSswV9lOyiU=",
-    "h1:4N0gplrZ0zOsJv3Kx1VfIx2FwrZHbYU0Un2yfiLZIGQ=",
-    "h1:81AMQq4kNKU/35U8ElQegUxG4E6xB0erIjG5xVmjIyo=",
-    "h1:EEQNADUmV3IL6x00yzy04i7OCSLeOMgM9XQkV3w71gA=",
-    "h1:HD0KI7td6oiSSAnJNn8UPSGf+hKiTo4JVQYfAiU1SqM=",
-    "h1:Hl+o5LtcvZg2f3l1hh9vaG/DFK6k+dTIZSeM0lXyfpo=",
-    "h1:ZUO2oIJ6jtZdvl816h0cEIiIeZ/fFCF64+abGEVxZZM=",
-    "h1:Zio80fnEeUKdlSOhTVskMEFSLUQ6TMsMKnXc+Dy2P2A=",
-    "h1:aLLvg36evTyqjtXGV2MjAV8imktXFmry7p/xCu9GQC4=",
-    "h1:azL05eWyy2V8SWkbZZImPWvv8ynG4eqmrbZhjXBDFug=",
-    "h1:ckMysHY4fJmr7o58XMi+DdgOTB/U/Mf1u1JA9ly3g/I=",
-    "h1:jxOwjDNjt5WCb4YjjiMsman91O8Y+MAPz6UwJ4a6F+0=",
-    "h1:u4OfnjSLa4Wk1IUFAzrvMnGgr8MvRHEWVDHEScPK2E8=",
-    "h1:wQkR1oeSkzlHn3rnVuLJRJLBHlg4EHt7Y64DeTjfkjQ=",
-    "zh:0ef99ed39472a94e6a0d6fa733cf0a46bce3bf66eba2873efae8846efdddc237",
-    "zh:2929cbbffcead171d45c88e4a7a59e9c013ea775dafa68b10da8db7cd04b6140",
-    "zh:462601c87118088e1a718842e367af7d8e7620598d426980a6d6b33de759865e",
-    "zh:56766eb62a74a9d88d9efb8486dd3a0c5c9db873d0a980ae9ef1e8af27d74231",
-    "zh:6b4e8810d99498a5a20a5872982a0f1354e79cfc4a7dfe7cc656f1c7eaae47d8",
-    "zh:6d65bdb4ec94b6eecc8abe26d94e2ca09262dc1e7a9934db829f418be0119920",
-    "zh:71adeaf31e41a358ec6095004062e43f56ee7d4b2504e5613ab351d511695641",
+    "h1:2BEJyXJtYC4B4nda/WCYUmuJYDaYk88F8t1pwPzr0iQ=",
+    "h1:4IASk5SESeWKQ7JU0+M7KApuF5mZyklvwMXPBabim3c=",
+    "h1:5ImZxxALSnWfH/4EXw/wFirSmk5Tr0ACmcysy51AafE=",
+    "h1:6TJ3dxLSin4ZKBJLsZDn95H2ZYnGm8S7GGHvvXuuMQU=",
+    "h1:IzTUjg9kQ4N3qizP9CjYLeHwjsuGgtxwXvfUQWyOLcA=",
+    "h1:NTaOQfYINA0YTG/V1/9+SYtgX1it63+cBugj4WK4FWc=",
+    "h1:PXH48LuJn329sCfMXprdMDk51EZaWFyajVvS03qhQLs=",
+    "h1:Pi5M+GeoMSN2eJ6QnIeXjBf19O+rby/74CfB2ocpv20=",
+    "h1:ShXZ2ZjBvm3thfoPPzPT8+OhyismnydQVkUAfI8X12w=",
+    "h1:WQ9hu0Wge2msBbODfottCSKgu8oKUrw4Opz+fDPVVHk=",
+    "h1:Z5yXML2DE0uH9UU+M0ut9JMQAORcwVZz1CxBHzeBmao=",
+    "h1:jqI2qKknpleS3JDSplyGYHMu0u9K/tor1ZOjFwDgEMk=",
+    "h1:kgfutDh14Q5nw4eg6qGFamFxIiY8Ae0FPKRBLDOzpcI=",
+    "h1:zCAO7GZmfYhWb+i6TfqlqhMeDyPZWGio2IzEzAh3YTs=",
+    "zh:19be1a91c982b902c42aba47766860dfa5dc151eed1e95fd39ca642229381ef0",
+    "zh:1de451c4d1ecf7efbe67b6dace3426ba810711afdd644b0f1b870364c8ae91f8",
+    "zh:352b4a2120173298622e669258744554339d959ac3a95607b117a48ee4a83238",
+    "zh:3c6f1346d9154afbd2d558fabb4b0150fc8d559aa961254144fe1bc17fe6032f",
+    "zh:4c4c92d53fb535b1e0eff26f222bbd627b97d3b4c891ec9c321268676d06152f",
+    "zh:53276f68006c9ceb7cdb10a6ccf91a5c1eadd1407a28edb5741e84e88d7e29e8",
+    "zh:7925a97773948171a63d4f65bb81ee92fd6d07a447e36012977313293a5435c9",
+    "zh:7dfb0a4496cfe032437386d0a2cd9229a1956e9c30bd920923c141b0f0440060",
     "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f",
-    "zh:89761c15908ccc2cf9c50bb5cb3be45d3ad0c45fc7c608c6b95f48c0288b7160",
-    "zh:8cc5d7c5939da89cfd01f3e51c84f3576564783acea9db86bd9e32049805ed96",
-    "zh:987cff8225b1dd436cdcb4fc6228689ae7e4281de6896412a2a9a3325c49f05e",
-    "zh:991e83ebb89867d71e01a1c215ed159efb425683b0a44707be8579eb0a337f06",
-    "zh:ab8177ae2d8f5cfa90043a6f867435012cae115f6061b832a7e2462e0ae87a67",
-    "zh:d1ca34df1398f201274a6a18102975148c10ca15aa43cfc56cc9897620929509",
-    "zh:d34946f70201baf6dda03e3b294c6bbe40d95d0278e97b9f636ded94822b24ac",
+    "zh:8d4aa79f0a414bb4163d771063c70cd991c8fac6c766e685bac2ee12903c5bd6",
+    "zh:a67540c13565616a7e7e51ee9366e88b0dc60046e1d75c72680e150bd02725bb",
+    "zh:a936383a4767f5393f38f622e92bf2d0c03fe04b69c284951f27345766c7b31b",
+    "zh:d4887d73c466ff036eecf50ad6404ba38fd82ea4855296b1846d244b0f13c380",
+    "zh:e9093c8bd5b6cd99c81666e315197791781b8f93afa14fc2e0f732d1bb2a44b7",
+    "zh:efd3b3f1ec59a37f635aa1d4efcf178734c2fcf8ddb0d56ea690bec342da8672",
   ]
 }

deployment/modules/cloudflare/docs/config.tf

@@ -5,7 +5,7 @@ terraform {
   required_providers {
     cloudflare = {
       source = "cloudflare/cloudflare"
-      version = "4.50.0"
+      version = "4.52.0"
     }
   }
 }

docker/docker-compose.prod.yml

@@ -103,7 +103,7 @@ services:
     command: ['./run.sh', '-disable-reporting']
     ports:
       - 3000:3000
-    image: grafana/grafana:11.4.0-ubuntu@sha256:afccec22ba0e4815cca1d2bf3836e414322390dc78d77f1851976ffa8d61051c
+    image: grafana/grafana:11.5.1-ubuntu@sha256:9a4ab78cec1a2ec7d1ca5dfd5aacec6412706a1bc9e971fc7184e2f6696a63f5
     volumes:
       - grafana-data:/var/lib/grafana
 

docs/docs/developer/setup.md

@@ -76,7 +76,7 @@ To see local changes to `@immich/ui` in Immich, do the following:
 
 ### Mobile app
 
-The mobile app `(/mobile)` will required Flutter toolchain 3.13.x to be installed on your system.
+The mobile app `(/mobile)` will required Flutter toolchain 3.13.x and FVM to be installed on your system.
 
 Please refer to the [Flutter's official documentation](https://flutter.dev/docs/get-started/install) for more information on setting up the toolchain on your machine.
 

docs/docs/features/ml-hardware-acceleration.md

@@ -11,7 +11,7 @@ You do not need to redo any machine learning jobs after enabling hardware accele
 
 - ARM NN (Mali)
 - CUDA (NVIDIA GPUs with [compute capability](https://developer.nvidia.com/cuda-gpus) 5.2 or higher)
-- OpenVINO (Intel discrete GPUs such as Iris Xe and Arc)
+- OpenVINO (Intel GPUs such as Iris Xe and Arc)
 
 ## Limitations
 
@@ -43,8 +43,9 @@ You do not need to redo any machine learning jobs after enabling hardware accele
 
 #### OpenVINO
 
-- The server must have a discrete GPU, i.e. Iris Xe or Arc. Expect issues when attempting to use integrated graphics.
+- Integrated GPUs are more likely to experience issues than discrete GPUs, especially for older processors or servers with low RAM.
 - Ensure the server's kernel version is new enough to use the device for hardware accceleration.
+- Expect higher RAM usage when using OpenVINO compared to CPU processing.
 
 ## Setup
 

docs/src/components/version-switcher.tsx

@@ -44,12 +44,12 @@ export default function VersionSwitcher(): JSX.Element {
   return (
     versions.length > 0 && (
       <DropdownNavbarItem
-        className="navbar__item"
+        className="version-switcher-34ab39"
         label={label}
         mobile={windowSize === 'mobile'}
         items={versions.map(({ label, url }) => ({
           label,
-          to: url + location.pathname,
+          to: url + location.pathname + location.hash,
           target: '_self',
         }))}
       />

docs/src/css/custom.css

@@ -75,6 +75,11 @@ div[class^='announcementBar_'] {
   font-weight: 500;
 }
 
+/* workaround for version switcher PR 15894 */
+div[class*='navbar__items'] > li:has(a[class*='version-switcher-34ab39']) {
+  display: none;
+}
+
 code {
   font-weight: 600;
 }

docs/src/pages/index.tsx

@@ -53,7 +53,7 @@ function HomepageHeader() {
 
           <Link
             className="flex place-items-center place-content-center py-3 px-8 border bg-immich-primary/10 dark:bg-gray-300  rounded-xl hover:no-underline text-immich-primary dark:text-immich-dark-bg font-bold uppercase"
-            to="https://demo.immich.app/"
+            to="https://immich.store"
           >
             Buy Merch
           </Link>

docs/static/archived-versions.json

@@ -1,4 +1,12 @@
 [
+  {
+    "label": "v1.126.1",
+    "url": "https://v1.126.1.archive.immich.app"
+  },
+  {
+    "label": "v1.126.0",
+    "url": "https://v1.126.0.archive.immich.app"
+  },
   {
     "label": "v1.125.7",
     "url": "https://v1.125.7.archive.immich.app"

e2e/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "immich-e2e",
-  "version": "1.125.7",
+  "version": "1.126.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "immich-e2e",
-      "version": "1.125.7",
+      "version": "1.126.1",
       "license": "GNU Affero General Public License version 3",
       "devDependencies": {
         "@eslint/eslintrc": "^3.1.0",
@@ -15,7 +15,7 @@
         "@immich/sdk": "file:../open-api/typescript-sdk",
         "@playwright/test": "^1.44.1",
         "@types/luxon": "^3.4.2",
-        "@types/node": "^22.10.9",
+        "@types/node": "^22.13.1",
         "@types/oidc-provider": "^8.5.1",
         "@types/pg": "^8.11.0",
         "@types/pngjs": "^6.0.4",
@@ -45,7 +45,7 @@
     },
     "../cli": {
       "name": "@immich/cli",
-      "version": "2.2.48",
+      "version": "2.2.50",
       "dev": true,
       "license": "GNU Affero General Public License version 3",
       "dependencies": {
@@ -64,7 +64,7 @@
         "@types/cli-progress": "^3.11.0",
         "@types/lodash-es": "^4.17.12",
         "@types/mock-fs": "^4.13.1",
-        "@types/node": "^22.10.9",
+        "@types/node": "^22.13.1",
         "@typescript-eslint/eslint-plugin": "^8.15.0",
         "@typescript-eslint/parser": "^8.15.0",
         "@vitest/coverage-v8": "^3.0.0",
@@ -92,14 +92,14 @@
     },
     "../open-api/typescript-sdk": {
       "name": "@immich/sdk",
-      "version": "1.125.7",
+      "version": "1.126.1",
       "dev": true,
       "license": "GNU Affero General Public License version 3",
       "dependencies": {
         "@oazapfts/runtime": "^1.0.2"
       },
       "devDependencies": {
-        "@types/node": "^22.10.9",
+        "@types/node": "^22.13.1",
         "typescript": "^5.3.3"
       }
     },
@@ -1666,9 +1666,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "22.10.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.9.tgz",
-      "integrity": "sha512-Ir6hwgsKyNESl/gLOcEz3krR4CBGgliDqBQ2ma4wIhEx0w+xnoeTq3tdrNw15kU3SxogDjOgv9sqdtLW8mIHaw==",
+      "version": "22.13.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.1.tgz",
+      "integrity": "sha512-jK8uzQlrvXqEU91UxiK5J7pKHyzgnI1Qnl0QDHIgVGuolJhRb9EEl28Cj9b3rGR8B2lhFCtvIm5os8lFnO/1Ew==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

e2e/package.json

@@ -1,6 +1,6 @@
 {
   "name": "immich-e2e",
-  "version": "1.125.7",
+  "version": "1.126.1",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -25,7 +25,7 @@
     "@immich/sdk": "file:../open-api/typescript-sdk",
     "@playwright/test": "^1.44.1",
     "@types/luxon": "^3.4.2",
-    "@types/node": "^22.10.9",
+    "@types/node": "^22.13.1",
     "@types/oidc-provider": "^8.5.1",
     "@types/pg": "^8.11.0",
     "@types/pngjs": "^6.0.4",

e2e/src/api/specs/person.e2e-spec.ts

@@ -195,6 +195,7 @@ describe('/people', () => {
         .send({
           name: 'New Person',
           birthDate: '1990-01-01',
+          color: '#333',
         });
       expect(status).toBe(201);
       expect(body).toMatchObject({
@@ -273,6 +274,24 @@ describe('/people', () => {
       expect(body).toMatchObject({ birthDate: null });
     });
 
+    it('should set a color', async () => {
+      const { status, body } = await request(app)
+        .put(`/people/${visiblePerson.id}`)
+        .set('Authorization', `Bearer ${admin.accessToken}`)
+        .send({ color: '#555' });
+      expect(status).toBe(200);
+      expect(body).toMatchObject({ color: '#555' });
+    });
+
+    it('should clear a color', async () => {
+      const { status, body } = await request(app)
+        .put(`/people/${visiblePerson.id}`)
+        .set('Authorization', `Bearer ${admin.accessToken}`)
+        .send({ color: null });
+      expect(status).toBe(200);
+      expect(body.color).toBeUndefined();
+    });
+
     it('should mark a person as favorite', async () => {
       const person = await utils.createPerson(admin.accessToken, {
         name: 'visible_person',

e2e/src/api/specs/shared-link.e2e-spec.ts

@@ -150,6 +150,30 @@ describe('/shared-links', () => {
       );
     });
 
+    it('should filter on albumId', async () => {
+      const { status, body } = await request(app)
+        .get(`/shared-links?albumId=${album.id}`)
+        .set('Authorization', `Bearer ${user1.accessToken}`);
+
+      expect(status).toBe(200);
+      expect(body).toHaveLength(2);
+      expect(body).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ id: linkWithAlbum.id }),
+          expect.objectContaining({ id: linkWithPassword.id }),
+        ]),
+      );
+    });
+
+    it('should find 0 albums', async () => {
+      const { status, body } = await request(app)
+        .get(`/shared-links?albumId=${uuidDto.notFound}`)
+        .set('Authorization', `Bearer ${user1.accessToken}`);
+
+      expect(status).toBe(200);
+      expect(body).toHaveLength(0);
+    });
+
     it('should not get shared links created by other users', async () => {
       const { status, body } = await request(app)
         .get('/shared-links')

i18n/en.json

@@ -436,6 +436,7 @@
   "back_close_deselect": "Back, close, or deselect",
   "backward": "Backward",
   "birthdate_saved": "Date of birth saved successfully",
+  "show_shared_links": "Show shared links",
   "birthdate_set_description": "Date of birth is used to calculate the age of this person at the time of a photo.",
   "blurred_background": "Blurred background",
   "bugs_and_feature_requests": "Bugs & Feature Requests",
@@ -768,8 +769,10 @@
   "go_to_search": "Go to search",
   "go_to_folder": "Go to folder",
   "group_albums_by": "Group albums by...",
+  "group_country": "Group by country",
   "group_no": "No grouping",
   "group_owner": "Group by owner",
+  "group_places_by": "Group places by...",
   "group_year": "Group by year",
   "has_quota": "Has quota",
   "hi_user": "Hi {name} ({email})",
@@ -802,6 +805,7 @@
   "include_shared_albums": "Include shared albums",
   "include_shared_partner_assets": "Include shared partner assets",
   "individual_share": "Individual share",
+  "individual_shares": "Individual shares",
   "info": "Info",
   "interval": {
     "day_at_onepm": "Every day at 1pm",
@@ -987,6 +991,7 @@
   "pick_a_location": "Pick a location",
   "place": "Place",
   "places": "Places",
+  "places_count": "{count, plural, one {{count, number} Place} other {{count, number} Places}}",
   "play": "Play",
   "play_memories": "Play memories",
   "play_motion_photo": "Play Motion Photo",
@@ -1169,6 +1174,7 @@
   "shared_from_partner": "Photos from {partner}",
   "shared_link_options": "Shared link options",
   "shared_links": "Shared links",
+  "shared_links_description": "Share photos and videos with a link",
   "shared_photos_and_videos_count": "{assetCount, plural, other {# shared photos & videos.}}",
   "shared_with_partner": "Shared with {partner}",
   "sharing": "Sharing",
@@ -1278,6 +1284,7 @@
   "unfavorite": "Unfavorite",
   "unhide_person": "Unhide person",
   "unknown": "Unknown",
+  "unknown_country": "Unknown Country",
   "unknown_year": "Unknown Year",
   "unlimited": "Unlimited",
   "unlink_motion_video": "Unlink motion video",

i18n/fa.json

@@ -312,157 +312,157 @@
   "admin_password": "رمز عبور مدیر",
   "administration": "مدیریت",
   "advanced": "پیشرفته",
-  "album_added": "",
+  "album_added": "آلبوم اضافه شد",
   "album_added_notification_setting_description": "",
-  "album_cover_updated": "",
-  "album_info_updated": "",
-  "album_name": "",
-  "album_options": "",
-  "album_updated": "",
+  "album_cover_updated": "جلد آلبوم به‌روزرسانی شد",
+  "album_info_updated": "اطلاعات آلبوم به‌روزرسانی شد",
+  "album_name": "نام آلبوم",
+  "album_options": "گزینه‌های آلبوم",
+  "album_updated": "آلبوم به‌روزرسانی شد",
   "album_updated_setting_description": "",
-  "albums": "",
+  "albums": "آلبوم‌ها",
   "albums_count": "",
-  "all": "",
-  "all_people": "",
-  "allow_dark_mode": "",
-  "allow_edits": "",
-  "api_key": "",
-  "api_keys": "",
-  "app_settings": "",
-  "appears_in": "",
-  "archive": "",
+  "all": "همه",
+  "all_people": "همه افراد",
+  "allow_dark_mode": "اجازه دادن به حالت تاریک",
+  "allow_edits": "اجازه ویرایش",
+  "api_key": "کلید API",
+  "api_keys": "کلیدهای API",
+  "app_settings": "تنظیمات برنامه",
+  "appears_in": "ظاهر می‌شود در",
+  "archive": "بایگانی",
   "archive_or_unarchive_photo": "",
-  "archive_size": "",
+  "archive_size": "اندازه بایگانی",
   "archive_size_description": "",
-  "asset_offline": "",
-  "assets": "",
-  "authorized_devices": "",
-  "back": "",
-  "backward": "",
-  "blurred_background": "",
+  "asset_offline": "محتوا آفلاین",
+  "assets": "محتواها",
+  "authorized_devices": "دستگاه‌های مجاز",
+  "back": "بازگشت",
+  "backward": "عقب",
+  "blurred_background": "پس‌زمینه محو",
   "bulk_delete_duplicates_confirmation": "",
   "bulk_keep_duplicates_confirmation": "",
   "bulk_trash_duplicates_confirmation": "",
-  "camera": "",
-  "camera_brand": "",
-  "camera_model": "",
-  "cancel": "",
-  "cancel_search": "",
-  "cannot_merge_people": "",
-  "cannot_update_the_description": "",
-  "change_date": "",
-  "change_expiration_time": "",
-  "change_location": "",
-  "change_name": "",
-  "change_name_successfully": "",
-  "change_password": "",
-  "change_your_password": "",
+  "camera": "دوربین",
+  "camera_brand": "برند دوربین",
+  "camera_model": "مدل دوربین",
+  "cancel": "لغو",
+  "cancel_search": "لغو جستجو",
+  "cannot_merge_people": "نمی‌توان افراد را ادغام کرد",
+  "cannot_update_the_description": "نمی‌توان توضیحات را به‌روزرسانی کرد",
+  "change_date": "تغییر تاریخ",
+  "change_expiration_time": "تغییر زمان انقضا",
+  "change_location": "تغییر مکان",
+  "change_name": "تغییر نام",
+  "change_name_successfully": "نام با موفقیت تغییر یافت",
+  "change_password": "تغییر رمز عبور",
+  "change_your_password": "رمز عبور خود را تغییر دهید",
   "changed_visibility_successfully": "",
-  "check_all": "",
-  "check_logs": "",
+  "check_all": "انتخاب همه",
+  "check_logs": "بررسی لاگ‌ها",
   "choose_matching_people_to_merge": "",
-  "city": "",
-  "clear": "",
-  "clear_all": "",
-  "clear_message": "",
-  "clear_value": "",
-  "close": "",
-  "collapse_all": "",
-  "color_theme": "",
-  "comment_options": "",
-  "comments_are_disabled": "",
-  "confirm": "",
-  "confirm_admin_password": "",
+  "city": "شهر",
+  "clear": "پاک کردن",
+  "clear_all": "پاک کردن همه",
+  "clear_message": "پاک کردن پیام",
+  "clear_value": "پاک کردن مقدار",
+  "close": "بستن",
+  "collapse_all": "جمع کردن همه",
+  "color_theme": "تم رنگ",
+  "comment_options": "گزینه‌های نظر",
+  "comments_are_disabled": "نظرات غیرفعال هستند",
+  "confirm": "تأیید",
+  "confirm_admin_password": "تأیید رمز عبور مدیر",
   "confirm_delete_shared_link": "",
-  "confirm_password": "",
-  "contain": "",
-  "context": "",
-  "continue": "",
-  "copied_image_to_clipboard": "",
-  "copied_to_clipboard": "",
-  "copy_error": "",
-  "copy_file_path": "",
-  "copy_image": "",
-  "copy_link": "",
-  "copy_link_to_clipboard": "",
-  "copy_password": "",
-  "copy_to_clipboard": "",
-  "country": "",
-  "cover": "",
-  "covers": "",
-  "create": "",
-  "create_album": "",
-  "create_library": "",
-  "create_link": "",
-  "create_link_to_share": "",
-  "create_new_person": "",
-  "create_new_user": "",
-  "create_user": "",
-  "created": "",
-  "current_device": "",
+  "confirm_password": "تأیید رمز عبور",
+  "contain": "شامل",
+  "context": "زمینه",
+  "continue": "ادامه",
+  "copied_image_to_clipboard": "تصویر به کلیپ‌بورد کپی شد.",
+  "copied_to_clipboard": "به کلیپ‌بورد کپی شد!",
+  "copy_error": "خطا در کپی",
+  "copy_file_path": "کپی مسیر فایل",
+  "copy_image": "کپی تصویر",
+  "copy_link": "کپی لینک",
+  "copy_link_to_clipboard": "کپی لینک به کلیپ‌بورد",
+  "copy_password": "کپی رمز عبور",
+  "copy_to_clipboard": "کپی به کلیپ‌بورد",
+  "country": "کشور",
+  "cover": "جلد",
+  "covers": "جلدها",
+  "create": "ایجاد",
+  "create_album": "ایجاد آلبوم",
+  "create_library": "ایجاد کتابخانه",
+  "create_link": "ایجاد لینک",
+  "create_link_to_share": "ایجاد لینک برای اشتراک‌گذاری",
+  "create_new_person": "ایجاد فرد جدید",
+  "create_new_user": "ایجاد کاربر جدید",
+  "create_user": "ایجاد کاربر",
+  "created": "ایجاد شد",
+  "current_device": "دستگاه فعلی",
   "custom_locale": "",
   "custom_locale_description": "",
-  "dark": "",
-  "date_after": "",
-  "date_and_time": "",
-  "date_before": "",
-  "date_range": "",
-  "day": "",
-  "deduplicate_all": "",
+  "dark": "تاریک",
+  "date_after": "تاریخ پس از",
+  "date_and_time": "تاریخ و زمان",
+  "date_before": "تاریخ قبل از",
+  "date_range": "بازه زمانی",
+  "day": "روز",
+  "deduplicate_all": "حذف تکراری‌ها به صورت کامل",
   "default_locale": "",
   "default_locale_description": "",
-  "delete": "",
-  "delete_album": "",
+  "delete": "حذف",
+  "delete_album": "حذف آلبوم",
   "delete_api_key_prompt": "",
   "delete_duplicates_confirmation": "",
-  "delete_key": "",
-  "delete_library": "",
-  "delete_link": "",
-  "delete_shared_link": "",
-  "delete_user": "",
-  "deleted_shared_link": "",
-  "description": "",
-  "details": "",
-  "direction": "",
-  "disabled": "",
-  "disallow_edits": "",
-  "discover": "",
-  "dismiss_all_errors": "",
-  "dismiss_error": "",
-  "display_options": "",
-  "display_order": "",
-  "display_original_photos": "",
+  "delete_key": "حذف کلید",
+  "delete_library": "حذف کتابخانه",
+  "delete_link": "حذف لینک",
+  "delete_shared_link": "حذف لینک اشتراکی",
+  "delete_user": "حذف کاربر",
+  "deleted_shared_link": "لینک اشتراکی حذف شد",
+  "description": "توضیحات",
+  "details": "جزئیات",
+  "direction": "جهت",
+  "disabled": "غیرفعال",
+  "disallow_edits": "عدم اجازه ویرایش",
+  "discover": "کشف کردن",
+  "dismiss_all_errors": "رد تمام خطاها",
+  "dismiss_error": "رد خطا",
+  "display_options": "گزینه‌های نمایش",
+  "display_order": "ترتیب نمایش",
+  "display_original_photos": "نمایش عکس‌های اصلی",
   "display_original_photos_setting_description": "",
-  "done": "",
-  "download": "",
-  "download_settings": "",
-  "download_settings_description": "",
-  "downloading": "",
-  "duplicates": "",
+  "done": "انجام شد",
+  "download": "دانلود",
+  "download_settings": "تنظیمات دانلود",
+  "download_settings_description": "مدیریت تنظیمات مرتبط با دانلود محتوا",
+  "downloading": "در حال دانلود",
+  "duplicates": "تکراری‌ها",
   "duplicates_description": "",
-  "duration": "",
-  "edit_album": "",
-  "edit_avatar": "",
-  "edit_date": "",
-  "edit_date_and_time": "",
-  "edit_exclusion_pattern": "",
-  "edit_faces": "",
+  "duration": "مدت زمان",
+  "edit_album": "ویرایش آلبوم",
+  "edit_avatar": "ویرایش آواتار",
+  "edit_date": "ویرایش تاریخ",
+  "edit_date_and_time": "ویرایش تاریخ و زمان",
+  "edit_exclusion_pattern": "ویرایش الگوی استثناء",
+  "edit_faces": "ویرایش چهره‌ها",
   "edit_import_path": "",
   "edit_import_paths": "",
-  "edit_key": "",
-  "edit_link": "",
-  "edit_location": "",
-  "edit_name": "",
-  "edit_people": "",
-  "edit_title": "",
-  "edit_user": "",
-  "edited": "",
-  "editor": "",
-  "email": "",
-  "empty_trash": "",
-  "end_date": "",
-  "error": "",
-  "error_loading_image": "",
+  "edit_key": "ویرایش کلید",
+  "edit_link": "ویرایش لینک",
+  "edit_location": "ویرایش مکان",
+  "edit_name": "ویرایش نام",
+  "edit_people": "ویرایش افراد",
+  "edit_title": "ویرایش عنوان",
+  "edit_user": "ویرایش کاربر",
+  "edited": "ویرایش شد",
+  "editor": "ویرایشگر",
+  "email": "ایمیل",
+  "empty_trash": "خالی کردن سطل زباله",
+  "end_date": "تاریخ پایان",
+  "error": "خطا",
+  "error_loading_image": "خطا در بارگذاری تصویر",
   "errors": {
     "exclusion_pattern_already_exists": "",
     "import_path_already_exists": "",
@@ -530,400 +530,400 @@
     "unable_to_update_timeline_display_status": "",
     "unable_to_update_user": ""
   },
-  "exit_slideshow": "",
-  "expand_all": "",
-  "expire_after": "",
-  "expired": "",
-  "explore": "",
-  "export": "",
-  "export_as_json": "",
-  "extension": "",
-  "external": "",
-  "external_libraries": "",
-  "favorite": "",
+  "exit_slideshow": "خروج از نمایش اسلاید",
+  "expand_all": "باز کردن همه",
+  "expire_after": "منقضی شدن بعد از",
+  "expired": "منقضی شده",
+  "explore": "کاوش کردن",
+  "export": "صادر کردن",
+  "export_as_json": "صادر کردن به‌صورت JSON",
+  "extension": "پسوند",
+  "external": "خارجی",
+  "external_libraries": "کتابخانه‌های خارجی",
+  "favorite": "علاقه‌مندی",
   "favorite_or_unfavorite_photo": "",
-  "favorites": "",
+  "favorites": "علاقه‌مندی‌ها",
   "feature_photo_updated": "",
-  "file_name": "",
-  "file_name_or_extension": "",
-  "filename": "",
-  "filetype": "",
-  "filter_people": "",
+  "file_name": "نام فایل",
+  "file_name_or_extension": "نام فایل یا پسوند",
+  "filename": "نام فایل",
+  "filetype": "نوع فایل",
+  "filter_people": "فیلتر افراد",
   "find_them_fast": "",
-  "fix_incorrect_match": "",
-  "forward": "",
-  "general": "",
-  "get_help": "",
-  "getting_started": "",
-  "go_back": "",
-  "go_to_search": "",
-  "group_albums_by": "",
-  "has_quota": "",
-  "hide_gallery": "",
-  "hide_password": "",
-  "hide_person": "",
-  "host": "",
-  "hour": "",
-  "image": "",
-  "immich_logo": "",
-  "immich_web_interface": "",
-  "import_from_json": "",
-  "import_path": "",
+  "fix_incorrect_match": "رفع تطابق نادرست",
+  "forward": "جلو",
+  "general": "عمومی",
+  "get_help": "دریافت کمک",
+  "getting_started": "شروع به کار",
+  "go_back": "بازگشت",
+  "go_to_search": "رفتن به جستجو",
+  "group_albums_by": "گروه‌بندی آلبوم‌ها براساس...",
+  "has_quota": "دارای سهمیه",
+  "hide_gallery": "پنهان کردن گالری",
+  "hide_password": "پنهان کردن رمز عبور",
+  "hide_person": "پنهان کردن فرد",
+  "host": "میزبان",
+  "hour": "ساعت",
+  "image": "تصویر",
+  "immich_logo": "لوگوی Immich",
+  "immich_web_interface": "رابط وب Immich",
+  "import_from_json": "وارد کردن از JSON",
+  "import_path": "مسیر وارد کردن",
   "in_albums": "",
-  "in_archive": "",
-  "include_archived": "",
-  "include_shared_albums": "",
+  "in_archive": "در بایگانی",
+  "include_archived": "شامل بایگانی شده‌ها",
+  "include_shared_albums": "شامل آلبوم‌های اشتراکی",
   "include_shared_partner_assets": "",
-  "individual_share": "",
-  "info": "",
+  "individual_share": "اشتراک فردی",
+  "info": "اطلاعات",
   "interval": {
     "day_at_onepm": "",
     "hours": "",
     "night_at_midnight": "",
     "night_at_twoam": ""
   },
-  "invite_people": "",
-  "invite_to_album": "",
-  "jobs": "",
-  "keep": "",
-  "keep_all": "",
-  "keyboard_shortcuts": "",
-  "language": "",
-  "language_setting_description": "",
-  "last_seen": "",
-  "leave": "",
-  "let_others_respond": "",
-  "level": "",
-  "library": "",
-  "library_options": "",
-  "light": "",
-  "link_options": "",
-  "link_to_oauth": "",
-  "linked_oauth_account": "",
-  "list": "",
-  "loading": "",
-  "loading_search_results_failed": "",
-  "log_out": "",
-  "log_out_all_devices": "",
-  "login_has_been_disabled": "",
-  "look": "",
-  "loop_videos": "",
+  "invite_people": "دعوت افراد",
+  "invite_to_album": "دعوت به آلبوم",
+  "jobs": "وظایف",
+  "keep": "نگه داشتن",
+  "keep_all": "نگه داشتن همه",
+  "keyboard_shortcuts": "میانبرهای صفحه‌کلید",
+  "language": "زبان",
+  "language_setting_description": "انتخاب زبان دلخواه شما",
+  "last_seen": "آخرین مشاهده",
+  "leave": "ترک کردن",
+  "let_others_respond": "اجازه به دیگران برای پاسخ‌گویی",
+  "level": "سطح",
+  "library": "کتابخانه",
+  "library_options": "گزینه‌های کتابخانه",
+  "light": "روشن",
+  "link_options": "گزینه‌های لینک",
+  "link_to_oauth": "اتصال به OAuth",
+  "linked_oauth_account": "حساب OAuth متصل شده",
+  "list": "لیست",
+  "loading": "در حال بارگذاری",
+  "loading_search_results_failed": "بارگذاری نتایج جستجو ناموفق بود",
+  "log_out": "خروج از سیستم",
+  "log_out_all_devices": "خروج از همه دستگاه‌ها",
+  "login_has_been_disabled": "ورود غیرفعال شده است.",
+  "look": "نگاه کردن",
+  "loop_videos": "پخش مداوم ویدئوها",
   "loop_videos_description": "",
-  "make": "",
-  "manage_shared_links": "",
+  "make": "ساختن",
+  "manage_shared_links": "مدیریت لینک‌های اشتراکی",
   "manage_sharing_with_partners": "",
-  "manage_the_app_settings": "",
-  "manage_your_account": "",
-  "manage_your_api_keys": "",
-  "manage_your_devices": "",
-  "manage_your_oauth_connection": "",
-  "map": "",
+  "manage_the_app_settings": "مدیریت تنظیمات برنامه",
+  "manage_your_account": "مدیریت حساب کاربری شما",
+  "manage_your_api_keys": "مدیریت کلیدهای API شما",
+  "manage_your_devices": "مدیریت دستگاه‌های متصل",
+  "manage_your_oauth_connection": "مدیریت اتصال OAuth شما",
+  "map": "نقشه",
   "map_marker_with_image": "",
-  "map_settings": "",
-  "matches": "",
-  "media_type": "",
-  "memories": "",
+  "map_settings": "تنظیمات نقشه",
+  "matches": "تطابق‌ها",
+  "media_type": "نوع رسانه",
+  "memories": "خاطرات",
   "memories_setting_description": "",
-  "memory": "",
-  "menu": "",
-  "merge": "",
-  "merge_people": "",
+  "memory": "خاطره",
+  "menu": "منو",
+  "merge": "ادغام",
+  "merge_people": "ادغام افراد",
   "merge_people_limit": "",
   "merge_people_prompt": "",
-  "merge_people_successfully": "",
-  "minimize": "",
-  "minute": "",
-  "missing": "",
-  "model": "",
-  "month": "",
-  "more": "",
-  "moved_to_trash": "",
-  "my_albums": "",
-  "name": "",
-  "name_or_nickname": "",
-  "never": "",
-  "new_api_key": "",
-  "new_password": "",
-  "new_person": "",
-  "new_user_created": "",
-  "newest_first": "",
-  "next": "",
-  "next_memory": "",
-  "no": "",
+  "merge_people_successfully": "ادغام افراد با موفقیت انجام شد",
+  "minimize": "کوچک کردن",
+  "minute": "دقیقه",
+  "missing": "گمشده",
+  "model": "مدل",
+  "month": "ماه",
+  "more": "بیشتر",
+  "moved_to_trash": "به سطل زباله منتقل شد",
+  "my_albums": "آلبوم‌های من",
+  "name": "نام",
+  "name_or_nickname": "نام یا لقب",
+  "never": "هرگز",
+  "new_api_key": "کلید API جدید",
+  "new_password": "رمز عبور جدید",
+  "new_person": "فرد جدید",
+  "new_user_created": "کاربر جدید ایجاد شد",
+  "newest_first": "جدیدترین ابتدا",
+  "next": "بعدی",
+  "next_memory": "خاطره بعدی",
+  "no": "خیر",
   "no_albums_message": "",
   "no_archived_assets_message": "",
   "no_assets_message": "",
-  "no_duplicates_found": "",
-  "no_exif_info_available": "",
+  "no_duplicates_found": "هیچ تکراری یافت نشد.",
+  "no_exif_info_available": "اطلاعات EXIF موجود نیست",
   "no_explore_results_message": "",
   "no_favorites_message": "",
   "no_libraries_message": "",
-  "no_name": "",
-  "no_places": "",
-  "no_results": "",
+  "no_name": "بدون نام",
+  "no_places": "مکانی یافت نشد",
+  "no_results": "نتیجه‌ای یافت نشد",
   "no_shared_albums_message": "",
-  "not_in_any_album": "",
+  "not_in_any_album": "در هیچ آلبومی نیست",
   "note_apply_storage_label_to_previously_uploaded assets": "",
   "note_unlimited_quota": "",
-  "notes": "",
-  "notification_toggle_setting_description": "",
-  "notifications": "",
-  "notifications_setting_description": "",
-  "oauth": "",
-  "offline": "",
-  "offline_paths": "",
+  "notes": "یادداشت‌ها",
+  "notification_toggle_setting_description": "اعلان‌های ایمیلی را فعال کنید",
+  "notifications": "اعلان‌ها",
+  "notifications_setting_description": "مدیریت اعلان‌ها",
+  "oauth": "OAuth",
+  "offline": "آفلاین",
+  "offline_paths": "مسیرهای آفلاین",
   "offline_paths_description": "",
-  "ok": "",
-  "oldest_first": "",
-  "online": "",
-  "only_favorites": "",
-  "open_the_search_filters": "",
-  "options": "",
-  "organize_your_library": "",
-  "other": "",
-  "other_devices": "",
-  "other_variables": "",
-  "owned": "",
-  "owner": "",
-  "partner": "",
-  "partner_can_access": "",
+  "ok": "تأیید",
+  "oldest_first": "قدیمی‌ترین ابتدا",
+  "online": "آنلاین",
+  "only_favorites": "فقط علاقه‌مندی‌ها",
+  "open_the_search_filters": "باز کردن فیلترهای جستجو",
+  "options": "گزینه‌ها",
+  "organize_your_library": "کتابخانه خود را سازماندهی کنید",
+  "other": "دیگر",
+  "other_devices": "دستگاه‌های دیگر",
+  "other_variables": "متغیرهای دیگر",
+  "owned": "مالکیت",
+  "owner": "مالک",
+  "partner": "شریک",
+  "partner_can_access": "{partner} می‌تواند دسترسی داشته باشد",
   "partner_can_access_assets": "",
-  "partner_can_access_location": "",
-  "partner_sharing": "",
-  "partners": "",
-  "password": "",
-  "password_does_not_match": "",
-  "password_required": "",
-  "password_reset_success": "",
+  "partner_can_access_location": "مکان‌هایی که عکس‌های شما گرفته شده‌اند",
+  "partner_sharing": "اشتراک‌گذاری با شریک",
+  "partners": "شرکا",
+  "password": "رمز عبور",
+  "password_does_not_match": "رمز عبور مطابقت ندارد",
+  "password_required": "رمز عبور مورد نیاز است",
+  "password_reset_success": "بازنشانی رمز عبور موفقیت‌آمیز بود",
   "past_durations": {
     "days": "",
     "hours": "",
     "years": ""
   },
-  "path": "",
-  "pattern": "",
-  "pause": "",
-  "pause_memories": "",
-  "paused": "",
-  "pending": "",
-  "people": "",
+  "path": "مسیر",
+  "pattern": "الگو",
+  "pause": "توقف",
+  "pause_memories": "توقف خاطرات",
+  "paused": "متوقف شده",
+  "pending": "در انتظار",
+  "people": "افراد",
   "people_sidebar_description": "",
-  "permanent_deletion_warning": "",
-  "permanent_deletion_warning_setting_description": "",
-  "permanently_delete": "",
-  "permanently_deleted_asset": "",
-  "person": "",
-  "photos": "",
+  "permanent_deletion_warning": "هشدار حذف دائمی",
+  "permanent_deletion_warning_setting_description": "نمایش هشدار هنگام حذف دائمی محتواها",
+  "permanently_delete": "حذف دائمی",
+  "permanently_deleted_asset": "محتوای حذف شده دائمی",
+  "person": "فرد",
+  "photos": "عکس‌ها",
   "photos_count": "",
-  "photos_from_previous_years": "",
-  "pick_a_location": "",
-  "place": "",
-  "places": "",
-  "play": "",
-  "play_memories": "",
-  "play_motion_photo": "",
-  "play_or_pause_video": "",
-  "port": "",
-  "preset": "",
-  "preview": "",
-  "previous": "",
-  "previous_memory": "",
-  "previous_or_next_photo": "",
-  "primary": "",
-  "profile_picture_set": "",
-  "public_share": "",
-  "reaction_options": "",
-  "read_changelog": "",
-  "recent": "",
-  "recent_searches": "",
-  "refresh": "",
-  "refreshed": "",
+  "photos_from_previous_years": "عکس‌های سال‌های گذشته",
+  "pick_a_location": "یک مکان انتخاب کنید",
+  "place": "مکان",
+  "places": "مکان‌ها",
+  "play": "پخش",
+  "play_memories": "پخش خاطرات",
+  "play_motion_photo": "پخش عکس متحرک",
+  "play_or_pause_video": "پخش یا توقف ویدیو",
+  "port": "پورت",
+  "preset": "پیش‌فرض",
+  "preview": "پیش‌نمایش",
+  "previous": "قبلی",
+  "previous_memory": "خاطره قبلی",
+  "previous_or_next_photo": "عکس قبلی یا بعدی",
+  "primary": "اصلی",
+  "profile_picture_set": "تصویر پروفایل تنظیم شد.",
+  "public_share": "اشتراک عمومی",
+  "reaction_options": "گزینه‌های واکنش",
+  "read_changelog": "مطالعه تغییرات نسخه",
+  "recent": "اخیر",
+  "recent_searches": "جستجوهای اخیر",
+  "refresh": "تازه سازی",
+  "refreshed": "تازه سازی شد",
   "refreshes_every_file": "",
-  "remove": "",
-  "remove_deleted_assets": "",
-  "remove_from_album": "",
-  "remove_from_favorites": "",
+  "remove": "حذف",
+  "remove_deleted_assets": "حذف محتواهای حذف‌شده",
+  "remove_from_album": "حذف از آلبوم",
+  "remove_from_favorites": "حذف از علاقه‌مندی‌ها",
   "remove_from_shared_link": "",
   "removed_api_key": "",
-  "rename": "",
-  "repair": "",
+  "rename": "تغییر نام",
+  "repair": "تعمیر",
   "repair_no_results_message": "",
-  "replace_with_upload": "",
+  "replace_with_upload": "جایگزینی با آپلود",
   "require_password": "",
   "require_user_to_change_password_on_first_login": "",
-  "reset": "",
-  "reset_password": "",
+  "reset": "بازنشانی",
+  "reset_password": "بازنشانی رمز عبور",
   "reset_people_visibility": "",
   "resolved_all_duplicates": "",
-  "restore": "",
-  "restore_all": "",
-  "restore_user": "",
-  "resume": "",
+  "restore": "بازیابی",
+  "restore_all": "بازیابی همه",
+  "restore_user": "بازیابی کاربر",
+  "resume": "ادامه",
   "retry_upload": "",
-  "review_duplicates": "",
-  "role": "",
-  "save": "",
+  "review_duplicates": "بررسی تکراری‌ها",
+  "role": "نقش",
+  "save": "ذخیره",
   "saved_api_key": "",
-  "saved_profile": "",
-  "saved_settings": "",
-  "say_something": "",
-  "scan_all_libraries": "",
-  "scan_settings": "",
+  "saved_profile": "پروفایل ذخیره شد",
+  "saved_settings": "تنظیمات ذخیره شد",
+  "say_something": "چیزی بگویید",
+  "scan_all_libraries": "اسکن همه کتابخانه‌ها",
+  "scan_settings": "تنظیمات اسکن",
   "scanning_for_album": "",
-  "search": "",
-  "search_albums": "",
-  "search_by_context": "",
-  "search_camera_make": "",
-  "search_camera_model": "",
-  "search_city": "",
-  "search_country": "",
-  "search_for_existing_person": "",
-  "search_people": "",
-  "search_places": "",
-  "search_state": "",
-  "search_timezone": "",
-  "search_type": "",
+  "search": "جستجو",
+  "search_albums": "جستجوی آلبوم‌ها",
+  "search_by_context": "جستجو براساس زمینه",
+  "search_camera_make": "جستجوی برند دوربین...",
+  "search_camera_model": "جستجوی مدل دوربین...",
+  "search_city": "جستجوی شهر...",
+  "search_country": "جستجوی کشور...",
+  "search_for_existing_person": "جستجوی فرد موجود",
+  "search_people": "جستجوی افراد",
+  "search_places": "جستجوی مکان‌ها",
+  "search_state": "جستجوی ایالت...",
+  "search_timezone": "جستجوی منطقه زمانی...",
+  "search_type": "نوع جستجو",
   "search_your_photos": "",
   "searching_locales": "",
-  "second": "",
-  "select_album_cover": "",
-  "select_all": "",
-  "select_avatar_color": "",
-  "select_face": "",
-  "select_featured_photo": "",
-  "select_keep_all": "",
-  "select_library_owner": "",
-  "select_new_face": "",
-  "select_photos": "",
+  "second": "ثانیه",
+  "select_album_cover": "انتخاب جلد آلبوم",
+  "select_all": "انتخاب همه",
+  "select_avatar_color": "انتخاب رنگ آواتار",
+  "select_face": "انتخاب چهره",
+  "select_featured_photo": "انتخاب عکس ویژه",
+  "select_keep_all": "انتخاب نگهداری همه",
+  "select_library_owner": "انتخاب مالک کتابخانه",
+  "select_new_face": "انتخاب چهره جدید",
+  "select_photos": "انتخاب عکس‌ها",
   "select_trash_all": "",
-  "selected": "",
-  "send_message": "",
-  "send_welcome_email": "",
-  "server_stats": "",
-  "set": "",
+  "selected": "انتخاب شده",
+  "send_message": "ارسال پیام",
+  "send_welcome_email": "ارسال ایمیل خوش‌آمدگویی",
+  "server_stats": "آمار سرور",
+  "set": "تنظیم",
   "set_as_album_cover": "",
   "set_as_profile_picture": "",
-  "set_date_of_birth": "",
-  "set_profile_picture": "",
+  "set_date_of_birth": "تنظیم تاریخ تولد",
+  "set_profile_picture": "تنظیم تصویر پروفایل",
   "set_slideshow_to_fullscreen": "",
-  "settings": "",
-  "settings_saved": "",
-  "share": "",
-  "shared": "",
-  "shared_by": "",
+  "settings": "تنظیمات",
+  "settings_saved": "تنظیمات ذخیره شد",
+  "share": "اشتراک‌گذاری",
+  "shared": "مشترک",
+  "shared_by": "مشترک توسط",
   "shared_by_you": "",
-  "shared_from_partner": "",
-  "shared_links": "",
+  "shared_from_partner": "عکس‌ها از {partner}",
+  "shared_links": "لینک‌های اشتراکی",
   "shared_photos_and_videos_count": "",
-  "shared_with_partner": "",
-  "sharing": "",
+  "shared_with_partner": "مشترک با {partner}",
+  "sharing": "اشتراک‌گذاری",
   "sharing_sidebar_description": "",
-  "show_album_options": "",
+  "show_album_options": "نمایش گزینه‌های آلبوم",
   "show_and_hide_people": "",
-  "show_file_location": "",
-  "show_gallery": "",
-  "show_hidden_people": "",
+  "show_file_location": "نمایش مسیر فایل",
+  "show_gallery": "نمایش گالری",
+  "show_hidden_people": "نمایش افراد پنهان",
   "show_in_timeline": "",
   "show_in_timeline_setting_description": "",
   "show_keyboard_shortcuts": "",
-  "show_metadata": "",
+  "show_metadata": "نمایش اطلاعات متا",
   "show_or_hide_info": "",
-  "show_password": "",
+  "show_password": "نمایش رمز عبور",
   "show_person_options": "",
-  "show_progress_bar": "",
-  "show_search_options": "",
-  "shuffle": "",
-  "sign_out": "",
-  "sign_up": "",
-  "size": "",
-  "skip_to_content": "",
-  "slideshow": "",
-  "slideshow_settings": "",
+  "show_progress_bar": "نمایش نوار پیشرفت",
+  "show_search_options": "نمایش گزینه‌های جستجو",
+  "shuffle": "تصادفی",
+  "sign_out": "خروج",
+  "sign_up": "ثبت‌نام",
+  "size": "اندازه",
+  "skip_to_content": "رفتن به محتوا",
+  "slideshow": "نمایش اسلاید",
+  "slideshow_settings": "تنظیمات نمایش اسلاید",
   "sort_albums_by": "",
-  "stack": "",
+  "stack": "پشته",
   "stack_selected_photos": "",
   "stacktrace": "",
-  "start": "",
-  "start_date": "",
-  "state": "",
-  "status": "",
-  "stop_motion_photo": "",
+  "start": "شروع",
+  "start_date": "تاریخ شروع",
+  "state": "ایالت",
+  "status": "وضعیت",
+  "stop_motion_photo": "توقف عکس متحرک",
   "stop_photo_sharing": "",
   "stop_photo_sharing_description": "",
   "stop_sharing_photos_with_user": "",
-  "storage": "",
-  "storage_label": "",
+  "storage": "فضای ذخیره‌سازی",
+  "storage_label": "برچسب فضای ذخیره‌سازی",
   "storage_usage": "",
-  "submit": "",
-  "suggestions": "",
+  "submit": "ارسال",
+  "suggestions": "پیشنهادات",
   "sunrise_on_the_beach": "",
-  "swap_merge_direction": "",
-  "sync": "",
-  "template": "",
-  "theme": "",
-  "theme_selection": "",
+  "swap_merge_direction": "تغییر جهت ادغام",
+  "sync": "همگام‌سازی",
+  "template": "الگو",
+  "theme": "تم",
+  "theme_selection": "انتخاب تم",
   "theme_selection_description": "",
   "time_based_memories": "",
-  "timezone": "",
-  "to_archive": "",
-  "to_favorite": "",
+  "timezone": "منطقه زمانی",
+  "to_archive": "بایگانی",
+  "to_favorite": "به علاقه‌مندی‌ها",
   "to_trash": "",
-  "toggle_settings": "",
-  "toggle_theme": "",
-  "total_usage": "",
-  "trash": "",
+  "toggle_settings": "تغییر تنظیمات",
+  "toggle_theme": "تغییر تم تاریک",
+  "total_usage": "استفاده کلی",
+  "trash": "سطل زباله",
   "trash_all": "",
   "trash_count": "",
   "trash_no_results_message": "",
   "trashed_items_will_be_permanently_deleted_after": "",
-  "type": "",
+  "type": "نوع",
   "unarchive": "",
-  "unfavorite": "",
-  "unhide_person": "",
-  "unknown": "",
-  "unknown_year": "",
-  "unlimited": "",
-  "unlink_oauth": "",
+  "unfavorite": "حذف از علاقه‌مندی‌ها",
+  "unhide_person": "آشکار کردن فرد",
+  "unknown": "ناشناخته",
+  "unknown_year": "سال نامشخص",
+  "unlimited": "نامحدود",
+  "unlink_oauth": "لغو اتصال OAuth",
   "unlinked_oauth_account": "",
-  "unnamed_album": "",
-  "unnamed_share": "",
-  "unselect_all": "",
+  "unnamed_album": "آلبوم بدون نام",
+  "unnamed_share": "اشتراک بدون نام",
+  "unselect_all": "لغو انتخاب همه",
   "unstack": "",
   "untracked_files": "",
   "untracked_files_decription": "",
-  "up_next": "",
+  "up_next": "مورد بعدی",
   "updated_password": "",
-  "upload": "",
-  "upload_concurrency": "",
-  "url": "",
-  "usage": "",
-  "user": "",
-  "user_id": "",
-  "user_usage_detail": "",
-  "username": "",
-  "users": "",
-  "utilities": "",
-  "validate": "",
-  "variables": "",
-  "version": "",
+  "upload": "آپلود",
+  "upload_concurrency": "تعداد آپلود همزمان",
+  "url": "آدرس",
+  "usage": "استفاده",
+  "user": "کاربر",
+  "user_id": "شناسه کاربر",
+  "user_usage_detail": "جزئیات استفاده کاربر",
+  "username": "نام کاربری",
+  "users": "کاربران",
+  "utilities": "ابزارها",
+  "validate": "اعتبارسنجی",
+  "variables": "متغیرها",
+  "version": "نسخه",
   "version_announcement_message": "",
-  "video": "",
+  "video": "ویدیو",
   "video_hover_setting": "",
   "video_hover_setting_description": "",
-  "videos": "",
+  "videos": "ویدیوها",
   "videos_count": "",
-  "view": "",
-  "view_all": "",
-  "view_all_users": "",
-  "view_links": "",
-  "view_next_asset": "",
-  "view_previous_asset": "",
-  "waiting": "",
-  "week": "",
-  "welcome": "",
+  "view": "مشاهده",
+  "view_all": "مشاهده همه",
+  "view_all_users": "مشاهده همه کاربران",
+  "view_links": "مشاهده لینک‌ها",
+  "view_next_asset": "مشاهده محتوای بعدی",
+  "view_previous_asset": "مشاهده محتوای قبلی",
+  "waiting": "در انتظار",
+  "week": "هفته",
+  "welcome": "خوش آمدید",
   "welcome_to_immich": "",
-  "year": "",
-  "yes": "",
+  "year": "سال",
+  "yes": "بله",
   "you_dont_have_any_shared_links": "",
   "zoom_image": "بزرگنمایی تصویر"
 }

machine-learning/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "machine-learning"
-version = "1.125.7"
+version = "1.126.1"
 description = ""
 authors = ["Hau Tran <alex.tran1502@gmail.com>"]
 readme = "README.md"

mobile/android/fastlane/Fastfile

@@ -35,8 +35,8 @@ platform :android do
       task: 'bundle', 
       build_type: 'Release',
       properties: {
-        "android.injected.version.code" => 182,
-        "android.injected.version.name" => "1.125.7",
+        "android.injected.version.code" => 184,
+        "android.injected.version.name" => "1.126.1",
       }
     )
     upload_to_play_store(skip_upload_apk: true, skip_upload_images: true, skip_upload_screenshots: true, aab: '../build/app/outputs/bundle/release/app-release.aab')

mobile/ios/Runner.xcodeproj/project.pbxproj

@@ -541,7 +541,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 190;
+				CURRENT_PROJECT_VERSION = 193;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
@@ -685,7 +685,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 190;
+				CURRENT_PROJECT_VERSION = 193;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
@@ -715,7 +715,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 190;
+				CURRENT_PROJECT_VERSION = 193;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
@@ -748,7 +748,7 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 190;
+				CURRENT_PROJECT_VERSION = 193;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -791,7 +791,7 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 190;
+				CURRENT_PROJECT_VERSION = 193;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -831,7 +831,7 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 190;
+				CURRENT_PROJECT_VERSION = 193;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;

mobile/ios/Runner/Info.plist

@@ -78,7 +78,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.125.2</string>
+	<string>1.126.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -93,7 +93,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>190</string>
+	<string>193</string>
 	<key>FLTEnableImpeller</key>
 	<true/>
 	<key>ITSAppUsesNonExemptEncryption</key>

mobile/ios/fastlane/Fastfile

@@ -19,7 +19,7 @@ platform :ios do
   desc "iOS Release"
   lane :release do
     increment_version_number(
-      version_number: "1.125.7"
+      version_number: "1.126.1"
     )
     increment_build_number(
       build_number: latest_testflight_build_number + 1,

mobile/lib/utils/openapi_patching.dart

@@ -10,6 +10,7 @@ dynamic upgradeDto(dynamic value, String targetType) {
         addDefault(value, 'ratings', RatingsResponse().toJson());
         addDefault(value, 'people', PeopleResponse().toJson());
         addDefault(value, 'tags', TagsResponse().toJson());
+        addDefault(value, 'sharedLinks', SharedLinksResponse().toJson());
       }
       break;
     case 'ServerConfigDto':

mobile/openapi/README.md

@@ -3,7 +3,7 @@ Immich API
 
 This Dart package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
-- API version: 1.125.7
+- API version: 1.126.1
 - Generator version: 7.8.0
 - Build package: org.openapitools.codegen.languages.DartClientCodegen
 
@@ -408,6 +408,8 @@ Class | Method | HTTP request | Description
  - [SharedLinkEditDto](doc//SharedLinkEditDto.md)
  - [SharedLinkResponseDto](doc//SharedLinkResponseDto.md)
  - [SharedLinkType](doc//SharedLinkType.md)
+ - [SharedLinksResponse](doc//SharedLinksResponse.md)
+ - [SharedLinksUpdate](doc//SharedLinksUpdate.md)
  - [SignUpDto](doc//SignUpDto.md)
  - [SmartSearchDto](doc//SmartSearchDto.md)
  - [SourceType](doc//SourceType.md)

mobile/openapi/lib/api.dart

@@ -221,6 +221,8 @@ part 'model/shared_link_create_dto.dart';
 part 'model/shared_link_edit_dto.dart';
 part 'model/shared_link_response_dto.dart';
 part 'model/shared_link_type.dart';
+part 'model/shared_links_response.dart';
+part 'model/shared_links_update.dart';
 part 'model/sign_up_dto.dart';
 part 'model/smart_search_dto.dart';
 part 'model/source_type.dart';

mobile/openapi/lib/api/shared_links_api.dart

@@ -127,7 +127,10 @@ class SharedLinksApi {
   }
 
   /// Performs an HTTP 'GET /shared-links' operation and returns the [Response].
-  Future<Response> getAllSharedLinksWithHttpInfo() async {
+  /// Parameters:
+  ///
+  /// * [String] albumId:
+  Future<Response> getAllSharedLinksWithHttpInfo({ String? albumId, }) async {
     // ignore: prefer_const_declarations
     final path = r'/shared-links';
 
@@ -138,6 +141,10 @@ class SharedLinksApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+    if (albumId != null) {
+      queryParams.addAll(_queryParams('', 'albumId', albumId));
+    }
+
     const contentTypes = <String>[];
 
 
@@ -152,8 +159,11 @@ class SharedLinksApi {
     );
   }
 
-  Future<List<SharedLinkResponseDto>?> getAllSharedLinks() async {
-    final response = await getAllSharedLinksWithHttpInfo();
+  /// Parameters:
+  ///
+  /// * [String] albumId:
+  Future<List<SharedLinkResponseDto>?> getAllSharedLinks({ String? albumId, }) async {
+    final response = await getAllSharedLinksWithHttpInfo( albumId: albumId, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }

mobile/openapi/lib/api_client.dart

@@ -496,6 +496,10 @@ class ApiClient {
           return SharedLinkResponseDto.fromJson(value);
         case 'SharedLinkType':
           return SharedLinkTypeTypeTransformer().decode(value);
+        case 'SharedLinksResponse':
+          return SharedLinksResponse.fromJson(value);
+        case 'SharedLinksUpdate':
+          return SharedLinksUpdate.fromJson(value);
         case 'SignUpDto':
           return SignUpDto.fromJson(value);
         case 'SmartSearchDto':

mobile/openapi/lib/model/people_update_item.dart

@@ -14,6 +14,7 @@ class PeopleUpdateItem {
   /// Returns a new [PeopleUpdateItem] instance.
   PeopleUpdateItem({
     this.birthDate,
+    this.color,
     this.featureFaceAssetId,
     required this.id,
     this.isFavorite,
@@ -24,6 +25,8 @@ class PeopleUpdateItem {
   /// Person date of birth. Note: the mobile app cannot currently set the birth date to null.
   DateTime? birthDate;
 
+  String? color;
+
   /// Asset is used to get the feature face thumbnail.
   ///
   /// Please note: This property should have been non-nullable! Since the specification file
@@ -65,6 +68,7 @@ class PeopleUpdateItem {
   @override
   bool operator ==(Object other) => identical(this, other) || other is PeopleUpdateItem &&
     other.birthDate == birthDate &&
+    other.color == color &&
     other.featureFaceAssetId == featureFaceAssetId &&
     other.id == id &&
     other.isFavorite == isFavorite &&
@@ -75,6 +79,7 @@ class PeopleUpdateItem {
   int get hashCode =>
     // ignore: unnecessary_parenthesis
     (birthDate == null ? 0 : birthDate!.hashCode) +
+    (color == null ? 0 : color!.hashCode) +
     (featureFaceAssetId == null ? 0 : featureFaceAssetId!.hashCode) +
     (id.hashCode) +
     (isFavorite == null ? 0 : isFavorite!.hashCode) +
@@ -82,7 +87,7 @@ class PeopleUpdateItem {
     (name == null ? 0 : name!.hashCode);
 
   @override
-  String toString() => 'PeopleUpdateItem[birthDate=$birthDate, featureFaceAssetId=$featureFaceAssetId, id=$id, isFavorite=$isFavorite, isHidden=$isHidden, name=$name]';
+  String toString() => 'PeopleUpdateItem[birthDate=$birthDate, color=$color, featureFaceAssetId=$featureFaceAssetId, id=$id, isFavorite=$isFavorite, isHidden=$isHidden, name=$name]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -91,6 +96,11 @@ class PeopleUpdateItem {
     } else {
     //  json[r'birthDate'] = null;
     }
+    if (this.color != null) {
+      json[r'color'] = this.color;
+    } else {
+    //  json[r'color'] = null;
+    }
     if (this.featureFaceAssetId != null) {
       json[r'featureFaceAssetId'] = this.featureFaceAssetId;
     } else {
@@ -125,6 +135,7 @@ class PeopleUpdateItem {
 
       return PeopleUpdateItem(
         birthDate: mapDateTime(json, r'birthDate', r''),
+        color: mapValueOfType<String>(json, r'color'),
         featureFaceAssetId: mapValueOfType<String>(json, r'featureFaceAssetId'),
         id: mapValueOfType<String>(json, r'id')!,
         isFavorite: mapValueOfType<bool>(json, r'isFavorite'),

mobile/openapi/lib/model/person_create_dto.dart

@@ -14,6 +14,7 @@ class PersonCreateDto {
   /// Returns a new [PersonCreateDto] instance.
   PersonCreateDto({
     this.birthDate,
+    this.color,
     this.isFavorite,
     this.isHidden,
     this.name,
@@ -22,6 +23,8 @@ class PersonCreateDto {
   /// Person date of birth. Note: the mobile app cannot currently set the birth date to null.
   DateTime? birthDate;
 
+  String? color;
+
   ///
   /// Please note: This property should have been non-nullable! Since the specification file
   /// does not include a default value (using the "default:" property), however, the generated
@@ -51,6 +54,7 @@ class PersonCreateDto {
   @override
   bool operator ==(Object other) => identical(this, other) || other is PersonCreateDto &&
     other.birthDate == birthDate &&
+    other.color == color &&
     other.isFavorite == isFavorite &&
     other.isHidden == isHidden &&
     other.name == name;
@@ -59,12 +63,13 @@ class PersonCreateDto {
   int get hashCode =>
     // ignore: unnecessary_parenthesis
     (birthDate == null ? 0 : birthDate!.hashCode) +
+    (color == null ? 0 : color!.hashCode) +
     (isFavorite == null ? 0 : isFavorite!.hashCode) +
     (isHidden == null ? 0 : isHidden!.hashCode) +
     (name == null ? 0 : name!.hashCode);
 
   @override
-  String toString() => 'PersonCreateDto[birthDate=$birthDate, isFavorite=$isFavorite, isHidden=$isHidden, name=$name]';
+  String toString() => 'PersonCreateDto[birthDate=$birthDate, color=$color, isFavorite=$isFavorite, isHidden=$isHidden, name=$name]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -73,6 +78,11 @@ class PersonCreateDto {
     } else {
     //  json[r'birthDate'] = null;
     }
+    if (this.color != null) {
+      json[r'color'] = this.color;
+    } else {
+    //  json[r'color'] = null;
+    }
     if (this.isFavorite != null) {
       json[r'isFavorite'] = this.isFavorite;
     } else {
@@ -101,6 +111,7 @@ class PersonCreateDto {
 
       return PersonCreateDto(
         birthDate: mapDateTime(json, r'birthDate', r''),
+        color: mapValueOfType<String>(json, r'color'),
         isFavorite: mapValueOfType<bool>(json, r'isFavorite'),
         isHidden: mapValueOfType<bool>(json, r'isHidden'),
         name: mapValueOfType<String>(json, r'name'),

mobile/openapi/lib/model/person_response_dto.dart

@@ -14,6 +14,7 @@ class PersonResponseDto {
   /// Returns a new [PersonResponseDto] instance.
   PersonResponseDto({
     required this.birthDate,
+    this.color,
     required this.id,
     this.isFavorite,
     required this.isHidden,
@@ -24,6 +25,15 @@ class PersonResponseDto {
 
   DateTime? birthDate;
 
+  /// This property was added in v1.126.0
+  ///
+  /// Please note: This property should have been non-nullable! Since the specification file
+  /// does not include a default value (using the "default:" property), however, the generated
+  /// source code must fall back to having a nullable type.
+  /// Consider adding a "default:" property in the specification file to hide this note.
+  ///
+  String? color;
+
   String id;
 
   /// This property was added in v1.126.0
@@ -53,6 +63,7 @@ class PersonResponseDto {
   @override
   bool operator ==(Object other) => identical(this, other) || other is PersonResponseDto &&
     other.birthDate == birthDate &&
+    other.color == color &&
     other.id == id &&
     other.isFavorite == isFavorite &&
     other.isHidden == isHidden &&
@@ -64,6 +75,7 @@ class PersonResponseDto {
   int get hashCode =>
     // ignore: unnecessary_parenthesis
     (birthDate == null ? 0 : birthDate!.hashCode) +
+    (color == null ? 0 : color!.hashCode) +
     (id.hashCode) +
     (isFavorite == null ? 0 : isFavorite!.hashCode) +
     (isHidden.hashCode) +
@@ -72,7 +84,7 @@ class PersonResponseDto {
     (updatedAt == null ? 0 : updatedAt!.hashCode);
 
   @override
-  String toString() => 'PersonResponseDto[birthDate=$birthDate, id=$id, isFavorite=$isFavorite, isHidden=$isHidden, name=$name, thumbnailPath=$thumbnailPath, updatedAt=$updatedAt]';
+  String toString() => 'PersonResponseDto[birthDate=$birthDate, color=$color, id=$id, isFavorite=$isFavorite, isHidden=$isHidden, name=$name, thumbnailPath=$thumbnailPath, updatedAt=$updatedAt]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -80,6 +92,11 @@ class PersonResponseDto {
       json[r'birthDate'] = _dateFormatter.format(this.birthDate!.toUtc());
     } else {
     //  json[r'birthDate'] = null;
+    }
+    if (this.color != null) {
+      json[r'color'] = this.color;
+    } else {
+    //  json[r'color'] = null;
     }
       json[r'id'] = this.id;
     if (this.isFavorite != null) {
@@ -108,6 +125,7 @@ class PersonResponseDto {
 
       return PersonResponseDto(
         birthDate: mapDateTime(json, r'birthDate', r''),
+        color: mapValueOfType<String>(json, r'color'),
         id: mapValueOfType<String>(json, r'id')!,
         isFavorite: mapValueOfType<bool>(json, r'isFavorite'),
         isHidden: mapValueOfType<bool>(json, r'isHidden')!,

mobile/openapi/lib/model/person_update_dto.dart

@@ -14,6 +14,7 @@ class PersonUpdateDto {
   /// Returns a new [PersonUpdateDto] instance.
   PersonUpdateDto({
     this.birthDate,
+    this.color,
     this.featureFaceAssetId,
     this.isFavorite,
     this.isHidden,
@@ -23,6 +24,8 @@ class PersonUpdateDto {
   /// Person date of birth. Note: the mobile app cannot currently set the birth date to null.
   DateTime? birthDate;
 
+  String? color;
+
   /// Asset is used to get the feature face thumbnail.
   ///
   /// Please note: This property should have been non-nullable! Since the specification file
@@ -61,6 +64,7 @@ class PersonUpdateDto {
   @override
   bool operator ==(Object other) => identical(this, other) || other is PersonUpdateDto &&
     other.birthDate == birthDate &&
+    other.color == color &&
     other.featureFaceAssetId == featureFaceAssetId &&
     other.isFavorite == isFavorite &&
     other.isHidden == isHidden &&
@@ -70,13 +74,14 @@ class PersonUpdateDto {
   int get hashCode =>
     // ignore: unnecessary_parenthesis
     (birthDate == null ? 0 : birthDate!.hashCode) +
+    (color == null ? 0 : color!.hashCode) +
     (featureFaceAssetId == null ? 0 : featureFaceAssetId!.hashCode) +
     (isFavorite == null ? 0 : isFavorite!.hashCode) +
     (isHidden == null ? 0 : isHidden!.hashCode) +
     (name == null ? 0 : name!.hashCode);
 
   @override
-  String toString() => 'PersonUpdateDto[birthDate=$birthDate, featureFaceAssetId=$featureFaceAssetId, isFavorite=$isFavorite, isHidden=$isHidden, name=$name]';
+  String toString() => 'PersonUpdateDto[birthDate=$birthDate, color=$color, featureFaceAssetId=$featureFaceAssetId, isFavorite=$isFavorite, isHidden=$isHidden, name=$name]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -85,6 +90,11 @@ class PersonUpdateDto {
     } else {
     //  json[r'birthDate'] = null;
     }
+    if (this.color != null) {
+      json[r'color'] = this.color;
+    } else {
+    //  json[r'color'] = null;
+    }
     if (this.featureFaceAssetId != null) {
       json[r'featureFaceAssetId'] = this.featureFaceAssetId;
     } else {
@@ -118,6 +128,7 @@ class PersonUpdateDto {
 
       return PersonUpdateDto(
         birthDate: mapDateTime(json, r'birthDate', r''),
+        color: mapValueOfType<String>(json, r'color'),
         featureFaceAssetId: mapValueOfType<String>(json, r'featureFaceAssetId'),
         isFavorite: mapValueOfType<bool>(json, r'isFavorite'),
         isHidden: mapValueOfType<bool>(json, r'isHidden'),

mobile/openapi/lib/model/person_with_faces_response_dto.dart

@@ -14,6 +14,7 @@ class PersonWithFacesResponseDto {
   /// Returns a new [PersonWithFacesResponseDto] instance.
   PersonWithFacesResponseDto({
     required this.birthDate,
+    this.color,
     this.faces = const [],
     required this.id,
     this.isFavorite,
@@ -25,6 +26,15 @@ class PersonWithFacesResponseDto {
 
   DateTime? birthDate;
 
+  /// This property was added in v1.126.0
+  ///
+  /// Please note: This property should have been non-nullable! Since the specification file
+  /// does not include a default value (using the "default:" property), however, the generated
+  /// source code must fall back to having a nullable type.
+  /// Consider adding a "default:" property in the specification file to hide this note.
+  ///
+  String? color;
+
   List<AssetFaceWithoutPersonResponseDto> faces;
 
   String id;
@@ -56,6 +66,7 @@ class PersonWithFacesResponseDto {
   @override
   bool operator ==(Object other) => identical(this, other) || other is PersonWithFacesResponseDto &&
     other.birthDate == birthDate &&
+    other.color == color &&
     _deepEquality.equals(other.faces, faces) &&
     other.id == id &&
     other.isFavorite == isFavorite &&
@@ -68,6 +79,7 @@ class PersonWithFacesResponseDto {
   int get hashCode =>
     // ignore: unnecessary_parenthesis
     (birthDate == null ? 0 : birthDate!.hashCode) +
+    (color == null ? 0 : color!.hashCode) +
     (faces.hashCode) +
     (id.hashCode) +
     (isFavorite == null ? 0 : isFavorite!.hashCode) +
@@ -77,7 +89,7 @@ class PersonWithFacesResponseDto {
     (updatedAt == null ? 0 : updatedAt!.hashCode);
 
   @override
-  String toString() => 'PersonWithFacesResponseDto[birthDate=$birthDate, faces=$faces, id=$id, isFavorite=$isFavorite, isHidden=$isHidden, name=$name, thumbnailPath=$thumbnailPath, updatedAt=$updatedAt]';
+  String toString() => 'PersonWithFacesResponseDto[birthDate=$birthDate, color=$color, faces=$faces, id=$id, isFavorite=$isFavorite, isHidden=$isHidden, name=$name, thumbnailPath=$thumbnailPath, updatedAt=$updatedAt]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -85,6 +97,11 @@ class PersonWithFacesResponseDto {
       json[r'birthDate'] = _dateFormatter.format(this.birthDate!.toUtc());
     } else {
     //  json[r'birthDate'] = null;
+    }
+    if (this.color != null) {
+      json[r'color'] = this.color;
+    } else {
+    //  json[r'color'] = null;
     }
       json[r'faces'] = this.faces;
       json[r'id'] = this.id;
@@ -114,6 +131,7 @@ class PersonWithFacesResponseDto {
 
       return PersonWithFacesResponseDto(
         birthDate: mapDateTime(json, r'birthDate', r''),
+        color: mapValueOfType<String>(json, r'color'),
         faces: AssetFaceWithoutPersonResponseDto.listFromJson(json[r'faces']),
         id: mapValueOfType<String>(json, r'id')!,
         isFavorite: mapValueOfType<bool>(json, r'isFavorite'),

mobile/openapi/lib/model/shared_links_response.dart

@@ -0,0 +1,107 @@
+//
+// AUTO-GENERATED FILE, DO NOT MODIFY!
+//
+// @dart=2.18
+
+// ignore_for_file: unused_element, unused_import
+// ignore_for_file: always_put_required_named_parameters_first
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: lines_longer_than_80_chars
+
+part of openapi.api;
+
+class SharedLinksResponse {
+  /// Returns a new [SharedLinksResponse] instance.
+  SharedLinksResponse({
+    this.enabled = true,
+    this.sidebarWeb = false,
+  });
+
+  bool enabled;
+
+  bool sidebarWeb;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is SharedLinksResponse &&
+    other.enabled == enabled &&
+    other.sidebarWeb == sidebarWeb;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (enabled.hashCode) +
+    (sidebarWeb.hashCode);
+
+  @override
+  String toString() => 'SharedLinksResponse[enabled=$enabled, sidebarWeb=$sidebarWeb]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'enabled'] = this.enabled;
+      json[r'sidebarWeb'] = this.sidebarWeb;
+    return json;
+  }
+
+  /// Returns a new [SharedLinksResponse] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static SharedLinksResponse? fromJson(dynamic value) {
+    upgradeDto(value, "SharedLinksResponse");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return SharedLinksResponse(
+        enabled: mapValueOfType<bool>(json, r'enabled')!,
+        sidebarWeb: mapValueOfType<bool>(json, r'sidebarWeb')!,
+      );
+    }
+    return null;
+  }
+
+  static List<SharedLinksResponse> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <SharedLinksResponse>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = SharedLinksResponse.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, SharedLinksResponse> mapFromJson(dynamic json) {
+    final map = <String, SharedLinksResponse>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = SharedLinksResponse.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of SharedLinksResponse-objects as value to a dart map
+  static Map<String, List<SharedLinksResponse>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<SharedLinksResponse>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = SharedLinksResponse.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'enabled',
+    'sidebarWeb',
+  };
+}
+

mobile/openapi/lib/model/shared_links_update.dart

@@ -0,0 +1,125 @@
+//
+// AUTO-GENERATED FILE, DO NOT MODIFY!
+//
+// @dart=2.18
+
+// ignore_for_file: unused_element, unused_import
+// ignore_for_file: always_put_required_named_parameters_first
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: lines_longer_than_80_chars
+
+part of openapi.api;
+
+class SharedLinksUpdate {
+  /// Returns a new [SharedLinksUpdate] instance.
+  SharedLinksUpdate({
+    this.enabled,
+    this.sidebarWeb,
+  });
+
+  ///
+  /// Please note: This property should have been non-nullable! Since the specification file
+  /// does not include a default value (using the "default:" property), however, the generated
+  /// source code must fall back to having a nullable type.
+  /// Consider adding a "default:" property in the specification file to hide this note.
+  ///
+  bool? enabled;
+
+  ///
+  /// Please note: This property should have been non-nullable! Since the specification file
+  /// does not include a default value (using the "default:" property), however, the generated
+  /// source code must fall back to having a nullable type.
+  /// Consider adding a "default:" property in the specification file to hide this note.
+  ///
+  bool? sidebarWeb;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is SharedLinksUpdate &&
+    other.enabled == enabled &&
+    other.sidebarWeb == sidebarWeb;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (enabled == null ? 0 : enabled!.hashCode) +
+    (sidebarWeb == null ? 0 : sidebarWeb!.hashCode);
+
+  @override
+  String toString() => 'SharedLinksUpdate[enabled=$enabled, sidebarWeb=$sidebarWeb]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+    if (this.enabled != null) {
+      json[r'enabled'] = this.enabled;
+    } else {
+    //  json[r'enabled'] = null;
+    }
+    if (this.sidebarWeb != null) {
+      json[r'sidebarWeb'] = this.sidebarWeb;
+    } else {
+    //  json[r'sidebarWeb'] = null;
+    }
+    return json;
+  }
+
+  /// Returns a new [SharedLinksUpdate] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static SharedLinksUpdate? fromJson(dynamic value) {
+    upgradeDto(value, "SharedLinksUpdate");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return SharedLinksUpdate(
+        enabled: mapValueOfType<bool>(json, r'enabled'),
+        sidebarWeb: mapValueOfType<bool>(json, r'sidebarWeb'),
+      );
+    }
+    return null;
+  }
+
+  static List<SharedLinksUpdate> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <SharedLinksUpdate>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = SharedLinksUpdate.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, SharedLinksUpdate> mapFromJson(dynamic json) {
+    final map = <String, SharedLinksUpdate>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = SharedLinksUpdate.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of SharedLinksUpdate-objects as value to a dart map
+  static Map<String, List<SharedLinksUpdate>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<SharedLinksUpdate>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = SharedLinksUpdate.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+  };
+}
+

mobile/openapi/lib/model/user_preferences_response_dto.dart

@@ -21,6 +21,7 @@ class UserPreferencesResponseDto {
     required this.people,
     required this.purchase,
     required this.ratings,
+    required this.sharedLinks,
     required this.tags,
   });
 
@@ -40,6 +41,8 @@ class UserPreferencesResponseDto {
 
   RatingsResponse ratings;
 
+  SharedLinksResponse sharedLinks;
+
   TagsResponse tags;
 
   @override
@@ -52,6 +55,7 @@ class UserPreferencesResponseDto {
     other.people == people &&
     other.purchase == purchase &&
     other.ratings == ratings &&
+    other.sharedLinks == sharedLinks &&
     other.tags == tags;
 
   @override
@@ -65,10 +69,11 @@ class UserPreferencesResponseDto {
     (people.hashCode) +
     (purchase.hashCode) +
     (ratings.hashCode) +
+    (sharedLinks.hashCode) +
     (tags.hashCode);
 
   @override
-  String toString() => 'UserPreferencesResponseDto[avatar=$avatar, download=$download, emailNotifications=$emailNotifications, folders=$folders, memories=$memories, people=$people, purchase=$purchase, ratings=$ratings, tags=$tags]';
+  String toString() => 'UserPreferencesResponseDto[avatar=$avatar, download=$download, emailNotifications=$emailNotifications, folders=$folders, memories=$memories, people=$people, purchase=$purchase, ratings=$ratings, sharedLinks=$sharedLinks, tags=$tags]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -80,6 +85,7 @@ class UserPreferencesResponseDto {
       json[r'people'] = this.people;
       json[r'purchase'] = this.purchase;
       json[r'ratings'] = this.ratings;
+      json[r'sharedLinks'] = this.sharedLinks;
       json[r'tags'] = this.tags;
     return json;
   }
@@ -101,6 +107,7 @@ class UserPreferencesResponseDto {
         people: PeopleResponse.fromJson(json[r'people'])!,
         purchase: PurchaseResponse.fromJson(json[r'purchase'])!,
         ratings: RatingsResponse.fromJson(json[r'ratings'])!,
+        sharedLinks: SharedLinksResponse.fromJson(json[r'sharedLinks'])!,
         tags: TagsResponse.fromJson(json[r'tags'])!,
       );
     }
@@ -157,6 +164,7 @@ class UserPreferencesResponseDto {
     'people',
     'purchase',
     'ratings',
+    'sharedLinks',
     'tags',
   };
 }

mobile/openapi/lib/model/user_preferences_update_dto.dart

@@ -21,6 +21,7 @@ class UserPreferencesUpdateDto {
     this.people,
     this.purchase,
     this.ratings,
+    this.sharedLinks,
     this.tags,
   });
 
@@ -88,6 +89,14 @@ class UserPreferencesUpdateDto {
   ///
   RatingsUpdate? ratings;
 
+  ///
+  /// Please note: This property should have been non-nullable! Since the specification file
+  /// does not include a default value (using the "default:" property), however, the generated
+  /// source code must fall back to having a nullable type.
+  /// Consider adding a "default:" property in the specification file to hide this note.
+  ///
+  SharedLinksUpdate? sharedLinks;
+
   ///
   /// Please note: This property should have been non-nullable! Since the specification file
   /// does not include a default value (using the "default:" property), however, the generated
@@ -106,6 +115,7 @@ class UserPreferencesUpdateDto {
     other.people == people &&
     other.purchase == purchase &&
     other.ratings == ratings &&
+    other.sharedLinks == sharedLinks &&
     other.tags == tags;
 
   @override
@@ -119,10 +129,11 @@ class UserPreferencesUpdateDto {
     (people == null ? 0 : people!.hashCode) +
     (purchase == null ? 0 : purchase!.hashCode) +
     (ratings == null ? 0 : ratings!.hashCode) +
+    (sharedLinks == null ? 0 : sharedLinks!.hashCode) +
     (tags == null ? 0 : tags!.hashCode);
 
   @override
-  String toString() => 'UserPreferencesUpdateDto[avatar=$avatar, download=$download, emailNotifications=$emailNotifications, folders=$folders, memories=$memories, people=$people, purchase=$purchase, ratings=$ratings, tags=$tags]';
+  String toString() => 'UserPreferencesUpdateDto[avatar=$avatar, download=$download, emailNotifications=$emailNotifications, folders=$folders, memories=$memories, people=$people, purchase=$purchase, ratings=$ratings, sharedLinks=$sharedLinks, tags=$tags]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -166,6 +177,11 @@ class UserPreferencesUpdateDto {
     } else {
     //  json[r'ratings'] = null;
     }
+    if (this.sharedLinks != null) {
+      json[r'sharedLinks'] = this.sharedLinks;
+    } else {
+    //  json[r'sharedLinks'] = null;
+    }
     if (this.tags != null) {
       json[r'tags'] = this.tags;
     } else {
@@ -191,6 +207,7 @@ class UserPreferencesUpdateDto {
         people: PeopleUpdate.fromJson(json[r'people']),
         purchase: PurchaseUpdate.fromJson(json[r'purchase']),
         ratings: RatingsUpdate.fromJson(json[r'ratings']),
+        sharedLinks: SharedLinksUpdate.fromJson(json[r'sharedLinks']),
         tags: TagsUpdate.fromJson(json[r'tags']),
       );
     }

mobile/pubspec.yaml

@@ -2,7 +2,7 @@ name: immich_mobile
 description: Immich - selfhosted backup media file on mobile phone
 
 publish_to: 'none'
-version: 1.125.7+182
+version: 1.126.1+184
 
 environment:
   sdk: '>=3.3.0 <4.0.0'

open-api/immich-openapi-specs.json

@@ -5230,7 +5230,17 @@
     "/shared-links": {
       "get": {
         "operationId": "getAllSharedLinks",
-        "parameters": [],
+        "parameters": [
+          {
+            "name": "albumId",
+            "required": false,
+            "in": "query",
+            "schema": {
+              "format": "uuid",
+              "type": "string"
+            }
+          }
+        ],
         "responses": {
           "200": {
             "content": {
@@ -7458,7 +7468,7 @@
   "info": {
     "title": "Immich",
     "description": "Immich API",
-    "version": "1.125.7",
+    "version": "1.126.1",
     "contact": {}
   },
   "tags": [],
@@ -10286,6 +10296,10 @@
             "nullable": true,
             "type": "string"
           },
+          "color": {
+            "nullable": true,
+            "type": "string"
+          },
           "featureFaceAssetId": {
             "description": "Asset is used to get the feature face thumbnail.",
             "type": "string"
@@ -10402,6 +10416,10 @@
             "nullable": true,
             "type": "string"
           },
+          "color": {
+            "nullable": true,
+            "type": "string"
+          },
           "isFavorite": {
             "type": "boolean"
           },
@@ -10423,6 +10441,10 @@
             "nullable": true,
             "type": "string"
           },
+          "color": {
+            "description": "This property was added in v1.126.0",
+            "type": "string"
+          },
           "id": {
             "type": "string"
           },
@@ -10473,6 +10495,10 @@
             "nullable": true,
             "type": "string"
           },
+          "color": {
+            "nullable": true,
+            "type": "string"
+          },
           "featureFaceAssetId": {
             "description": "Asset is used to get the feature face thumbnail.",
             "type": "string"
@@ -10498,6 +10524,10 @@
             "nullable": true,
             "type": "string"
           },
+          "color": {
+            "description": "This property was added in v1.126.0",
+            "type": "string"
+          },
           "faces": {
             "items": {
               "$ref": "#/components/schemas/AssetFaceWithoutPersonResponseDto"
@@ -11494,6 +11524,34 @@
         ],
         "type": "string"
       },
+      "SharedLinksResponse": {
+        "properties": {
+          "enabled": {
+            "default": true,
+            "type": "boolean"
+          },
+          "sidebarWeb": {
+            "default": false,
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "enabled",
+          "sidebarWeb"
+        ],
+        "type": "object"
+      },
+      "SharedLinksUpdate": {
+        "properties": {
+          "enabled": {
+            "type": "boolean"
+          },
+          "sidebarWeb": {
+            "type": "boolean"
+          }
+        },
+        "type": "object"
+      },
       "SignUpDto": {
         "properties": {
           "email": {
@@ -12611,7 +12669,6 @@
         "properties": {
           "color": {
             "nullable": true,
-            "pattern": "^#?([0-9A-F]{3}|[0-9A-F]{4}|[0-9A-F]{6}|[0-9A-F]{8})$",
             "type": "string"
           }
         },
@@ -13141,6 +13198,9 @@
           "ratings": {
             "$ref": "#/components/schemas/RatingsResponse"
           },
+          "sharedLinks": {
+            "$ref": "#/components/schemas/SharedLinksResponse"
+          },
           "tags": {
             "$ref": "#/components/schemas/TagsResponse"
           }
@@ -13154,6 +13214,7 @@
           "people",
           "purchase",
           "ratings",
+          "sharedLinks",
           "tags"
         ],
         "type": "object"
@@ -13184,6 +13245,9 @@
           "ratings": {
             "$ref": "#/components/schemas/RatingsUpdate"
           },
+          "sharedLinks": {
+            "$ref": "#/components/schemas/SharedLinksUpdate"
+          },
           "tags": {
             "$ref": "#/components/schemas/TagsUpdate"
           }

open-api/typescript-sdk/package-lock.json

@@ -1,18 +1,18 @@
 {
   "name": "@immich/sdk",
-  "version": "1.125.7",
+  "version": "1.126.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@immich/sdk",
-      "version": "1.125.7",
+      "version": "1.126.1",
       "license": "GNU Affero General Public License version 3",
       "dependencies": {
         "@oazapfts/runtime": "^1.0.2"
       },
       "devDependencies": {
-        "@types/node": "^22.10.9",
+        "@types/node": "^22.13.1",
         "typescript": "^5.3.3"
       }
     },
@@ -22,9 +22,9 @@
       "integrity": "sha512-8tKiYffhwTGHSHYGnZ3oneLGCjX0po/XAXQ5Ng9fqKkvIdl/xz8+Vh8i+6xjzZqvZ2pLVpUcuSfnvNI/x67L0g=="
     },
     "node_modules/@types/node": {
-      "version": "22.10.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.9.tgz",
-      "integrity": "sha512-Ir6hwgsKyNESl/gLOcEz3krR4CBGgliDqBQ2ma4wIhEx0w+xnoeTq3tdrNw15kU3SxogDjOgv9sqdtLW8mIHaw==",
+      "version": "22.13.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.1.tgz",
+      "integrity": "sha512-jK8uzQlrvXqEU91UxiK5J7pKHyzgnI1Qnl0QDHIgVGuolJhRb9EEl28Cj9b3rGR8B2lhFCtvIm5os8lFnO/1Ew==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

open-api/typescript-sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@immich/sdk",
-  "version": "1.125.7",
+  "version": "1.126.1",
   "description": "Auto-generated TypeScript SDK for the Immich API",
   "type": "module",
   "main": "./build/index.js",
@@ -19,7 +19,7 @@
     "@oazapfts/runtime": "^1.0.2"
   },
   "devDependencies": {
-    "@types/node": "^22.10.9",
+    "@types/node": "^22.13.1",
     "typescript": "^5.3.3"
   },
   "repository": {

open-api/typescript-sdk/src/fetch-client.ts

@@ -1,6 +1,6 @@
 /**
  * Immich
- * 1.125.7
+ * 1.126.1
  * DO NOT MODIFY - This file has been generated using oazapfts.
  * See https://www.npmjs.com/package/oazapfts
  */
@@ -113,6 +113,10 @@ export type PurchaseResponse = {
 export type RatingsResponse = {
     enabled: boolean;
 };
+export type SharedLinksResponse = {
+    enabled: boolean;
+    sidebarWeb: boolean;
+};
 export type TagsResponse = {
     enabled: boolean;
     sidebarWeb: boolean;
@@ -126,6 +130,7 @@ export type UserPreferencesResponseDto = {
     people: PeopleResponse;
     purchase: PurchaseResponse;
     ratings: RatingsResponse;
+    sharedLinks: SharedLinksResponse;
     tags: TagsResponse;
 };
 export type AvatarUpdate = {
@@ -158,6 +163,10 @@ export type PurchaseUpdate = {
 export type RatingsUpdate = {
     enabled?: boolean;
 };
+export type SharedLinksUpdate = {
+    enabled?: boolean;
+    sidebarWeb?: boolean;
+};
 export type TagsUpdate = {
     enabled?: boolean;
     sidebarWeb?: boolean;
@@ -171,6 +180,7 @@ export type UserPreferencesUpdateDto = {
     people?: PeopleUpdate;
     purchase?: PurchaseUpdate;
     ratings?: RatingsUpdate;
+    sharedLinks?: SharedLinksUpdate;
     tags?: TagsUpdate;
 };
 export type AlbumUserResponseDto = {
@@ -213,6 +223,8 @@ export type AssetFaceWithoutPersonResponseDto = {
 };
 export type PersonWithFacesResponseDto = {
     birthDate: string | null;
+    /** This property was added in v1.126.0 */
+    color?: string;
     faces: AssetFaceWithoutPersonResponseDto[];
     id: string;
     /** This property was added in v1.126.0 */
@@ -493,6 +505,8 @@ export type DuplicateResponseDto = {
 };
 export type PersonResponseDto = {
     birthDate: string | null;
+    /** This property was added in v1.126.0 */
+    color?: string;
     id: string;
     /** This property was added in v1.126.0 */
     isFavorite?: boolean;
@@ -693,6 +707,7 @@ export type PersonCreateDto = {
     /** Person date of birth.
     Note: the mobile app cannot currently set the birth date to null. */
     birthDate?: string | null;
+    color?: string | null;
     isFavorite?: boolean;
     /** Person visibility */
     isHidden?: boolean;
@@ -703,6 +718,7 @@ export type PeopleUpdateItem = {
     /** Person date of birth.
     Note: the mobile app cannot currently set the birth date to null. */
     birthDate?: string | null;
+    color?: string | null;
     /** Asset is used to get the feature face thumbnail. */
     featureFaceAssetId?: string;
     /** Person id. */
@@ -720,6 +736,7 @@ export type PersonUpdateDto = {
     /** Person date of birth.
     Note: the mobile app cannot currently set the birth date to null. */
     birthDate?: string | null;
+    color?: string | null;
     /** Asset is used to get the feature face thumbnail. */
     featureFaceAssetId?: string;
     isFavorite?: boolean;
@@ -2745,11 +2762,15 @@ export function deleteSession({ id }: {
         method: "DELETE"
     }));
 }
-export function getAllSharedLinks(opts?: Oazapfts.RequestOpts) {
+export function getAllSharedLinks({ albumId }: {
+    albumId?: string;
+}, opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
         status: 200;
         data: SharedLinkResponseDto[];
-    }>("/shared-links", {
+    }>(`/shared-links${QS.query(QS.explode({
+        albumId
+    }))}`, {
         ...opts
     }));
 }

server/Dockerfile

@@ -1,5 +1,5 @@
 # dev build
-FROM ghcr.io/immich-app/base-server-dev:20250123@sha256:04eba5cd87d61bc3d20a3915b2302f04d08fbc329c55ee0cde103c502f59f412 AS dev
+FROM ghcr.io/immich-app/base-server-dev:20250204@sha256:8b203f19f4d5cf4619b60ee5f50d6d4b5ea3745747f5e5170d1b7404ebeb0792 AS dev
 
 RUN apt-get install --no-install-recommends -yqq tini
 WORKDIR /usr/src/app
@@ -42,7 +42,7 @@ RUN npm run build
 
 
 # prod build
-FROM ghcr.io/immich-app/base-server-prod:20250123@sha256:591739983913f82672d8191258f3a1a24c123db0d619ff91fca8fef431ee1338
+FROM ghcr.io/immich-app/base-server-prod:20250204@sha256:2af3da713d5ab3ccca23b216b747557ea6016117e72deac101e35069ccaf9b5e
 
 WORKDIR /usr/src/app
 ENV NODE_ENV=production \

server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "immich",
-  "version": "1.125.7",
+  "version": "1.126.1",
   "description": "",
   "author": "",
   "private": true,
@@ -35,16 +35,19 @@
     "email:dev": "email dev -p 3050 --dir src/emails"
   },
   "dependencies": {
-    "@nestjs/bullmq": "^11.0.0",
-    "@nestjs/common": "^10.2.2",
-    "@nestjs/core": "^10.2.2",
+    "@apollo/server": "^4.11.3",
+    "@nestjs/apollo": "^13.0.2",
+    "@nestjs/bullmq": "^11.0.1",
+    "@nestjs/common": "^11.0.4",
+    "@nestjs/core": "^11.0.4",
     "@nestjs/event-emitter": "^3.0.0",
-    "@nestjs/platform-express": "^10.2.2",
-    "@nestjs/platform-socket.io": "^10.2.2",
+    "@nestjs/graphql": "^13.0.2",
+    "@nestjs/platform-express": "^11.0.4",
+    "@nestjs/platform-socket.io": "^11.0.4",
     "@nestjs/schedule": "^5.0.0",
-    "@nestjs/swagger": "^8.0.0",
-    "@nestjs/typeorm": "^10.0.0",
-    "@nestjs/websockets": "^10.2.2",
+    "@nestjs/swagger": "^11.0.2",
+    "@nestjs/typeorm": "^11.0.0",
+    "@nestjs/websockets": "^11.0.4",
     "@opentelemetry/auto-instrumentations-node": "^0.55.0",
     "@opentelemetry/context-async-hooks": "^1.24.0",
     "@opentelemetry/exporter-prometheus": "^0.57.0",
@@ -63,6 +66,7 @@
     "fast-glob": "^3.3.2",
     "fluent-ffmpeg": "^2.1.2",
     "geo-tz": "^8.0.0",
+    "graphql": "^16.10.0",
     "handlebars": "^4.7.8",
     "i18n-iso-countries": "^7.6.0",
     "ioredis": "^5.3.2",
@@ -72,9 +76,9 @@
     "kysely-postgres-js": "^2.0.0",
     "lodash": "^4.17.21",
     "luxon": "^3.4.2",
-    "nest-commander": "^3.11.1",
-    "nestjs-cls": "^4.3.0",
-    "nestjs-kysely": "^1.0.0",
+    "nest-commander": "^3.16.0",
+    "nestjs-cls": "^5.0.0",
+    "nestjs-kysely": "^1.1.0",
     "nestjs-otel": "^6.0.0",
     "nodemailer": "^6.9.13",
     "openid-client": "^5.4.3",
@@ -97,9 +101,9 @@
   "devDependencies": {
     "@eslint/eslintrc": "^3.1.0",
     "@eslint/js": "^9.8.0",
-    "@nestjs/cli": "^10.1.16",
-    "@nestjs/schematics": "^10.0.2",
-    "@nestjs/testing": "^10.2.2",
+    "@nestjs/cli": "^11.0.2",
+    "@nestjs/schematics": "^11.0.0",
+    "@nestjs/testing": "^11.0.4",
     "@swc/core": "^1.4.14",
     "@testcontainers/postgresql": "^10.2.1",
     "@types/archiver": "^6.0.0",
@@ -112,7 +116,7 @@
     "@types/lodash": "^4.14.197",
     "@types/mock-fs": "^4.13.1",
     "@types/multer": "^1.4.7",
-    "@types/node": "^22.10.9",
+    "@types/node": "^22.13.1",
     "@types/nodemailer": "^6.4.14",
     "@types/picomatch": "^3.0.0",
     "@types/pngjs": "^6.0.5",

server/src/app.module.ts

@@ -1,12 +1,15 @@
+import { ApolloDriver, ApolloDriverConfig } from '@nestjs/apollo';
 import { BullModule } from '@nestjs/bullmq';
 import { Inject, Module, OnModuleDestroy, OnModuleInit, ValidationPipe } from '@nestjs/common';
 import { APP_FILTER, APP_GUARD, APP_INTERCEPTOR, APP_PIPE, ModuleRef } from '@nestjs/core';
+import { GraphQLModule } from '@nestjs/graphql';
 import { ScheduleModule, SchedulerRegistry } from '@nestjs/schedule';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { PostgresJSDialect } from 'kysely-postgres-js';
 import { ClsModule } from 'nestjs-cls';
 import { KyselyModule } from 'nestjs-kysely';
 import { OpenTelemetryModule } from 'nestjs-otel';
+import { join } from 'node:path';
 import postgres from 'postgres';
 import { commands } from 'src/commands';
 import { IWorker } from 'src/constants';
@@ -24,6 +27,7 @@ import { providers, repositories } from 'src/repositories';
 import { ConfigRepository } from 'src/repositories/config.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
 import { teardownTelemetry, TelemetryRepository } from 'src/repositories/telemetry.repository';
+import { resolvers } from 'src/resolvers';
 import { services } from 'src/services';
 import { CliService } from 'src/services/cli.service';
 import { DatabaseService } from 'src/services/database.service';
@@ -104,9 +108,28 @@ class BaseModule implements OnModuleInit, OnModuleDestroy {
 }
 
 @Module({
-  imports: [...imports, ScheduleModule.forRoot()],
+  imports: [
+    ...imports,
+    ScheduleModule.forRoot(),
+    GraphQLModule.forRoot<ApolloDriverConfig>({
+      driver: ApolloDriver,
+      playground: true,
+      autoSchemaFile: join(process.cwd(), 'src/schema.gql'),
+      sortSchema: true,
+      debug: true,
+      buildSchemaOptions: {
+        numberScalarMode: 'integer',
+      },
+    }),
+  ],
   controllers: [...controllers],
-  providers: [...common, ...middleware, { provide: IWorker, useValue: ImmichWorker.API }],
+  providers: [
+    //
+    ...common,
+    ...middleware,
+    ...resolvers,
+    { provide: IWorker, useValue: ImmichWorker.API },
+  ],
 })
 export class ApiModule extends BaseModule {}
 

server/src/constants.ts

@@ -33,7 +33,7 @@ export const citiesFile = 'cities500.txt';
 export const MOBILE_REDIRECT = 'app.immich:///oauth-callback';
 export const LOGIN_URL = '/auth/login?autoLaunch=0';
 
-export const excludePaths = ['/.well-known/immich', '/custom.css', '/favicon.ico'];
+export const excludePaths = ['/.well-known/immich', '/custom.css', '/favicon.ico', '/graphql'];
 
 export const FACE_THUMBNAIL_SIZE = 250;
 

server/src/controllers/shared-link.controller.ts

@@ -9,6 +9,7 @@ import {
   SharedLinkEditDto,
   SharedLinkPasswordDto,
   SharedLinkResponseDto,
+  SharedLinkSearchDto,
 } from 'src/dtos/shared-link.dto';
 import { ImmichCookie, Permission } from 'src/enum';
 import { Auth, Authenticated, GetLoginDetails } from 'src/middleware/auth.guard';
@@ -24,8 +25,8 @@ export class SharedLinkController {
 
   @Get()
   @Authenticated({ permission: Permission.SHARED_LINK_READ })
-  getAllSharedLinks(@Auth() auth: AuthDto): Promise<SharedLinkResponseDto[]> {
-    return this.service.getAll(auth);
+  getAllSharedLinks(@Auth() auth: AuthDto, @Query() dto: SharedLinkSearchDto): Promise<SharedLinkResponseDto[]> {
+    return this.service.getAll(auth, dto);
   }
 
   @Get('me')

server/src/controllers/user.controller.ts

@@ -9,6 +9,7 @@ import {
   Param,
   Post,
   Put,
+  Req,
   Res,
   UploadedFile,
   UseInterceptors,
@@ -38,8 +39,21 @@ export class UserController {
 
   @Get()
   @Authenticated()
-  searchUsers(@Auth() auth: AuthDto): Promise<UserResponseDto[]> {
-    return this.service.search(auth);
+  async searchUsers(@Req() req: Request): Promise<UserResponseDto[]> {
+    const response = await fetch(`http://localhost:2283/graphql`, {
+      method: 'POST',
+      body: JSON.stringify({
+        operationName: null,
+        query: '{ users { id name email } }',
+      }),
+      headers: {
+        ...req.headers,
+        'Content-Type': 'application/json',
+      },
+    });
+
+    const { data } = await response.json();
+    return data.users;
   }
 
   @Get('me')

server/src/cores/storage.core.ts

@@ -5,12 +5,13 @@ import { AssetEntity } from 'src/entities/asset.entity';
 import { PersonEntity } from 'src/entities/person.entity';
 import { AssetFileType, AssetPathType, ImageFormat, PathType, PersonPathType, StorageFolder } from 'src/enum';
 import { IAssetRepository } from 'src/interfaces/asset.interface';
-import { ICryptoRepository } from 'src/interfaces/crypto.interface';
 import { IMoveRepository } from 'src/interfaces/move.interface';
 import { IPersonRepository } from 'src/interfaces/person.interface';
 import { IStorageRepository } from 'src/interfaces/storage.interface';
-import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
-import { IConfigRepository, ILoggingRepository } from 'src/types';
+import { ConfigRepository } from 'src/repositories/config.repository';
+import { CryptoRepository } from 'src/repositories/crypto.repository';
+import { LoggingRepository } from 'src/repositories/logging.repository';
+import { SystemMetadataRepository } from 'src/repositories/system-metadata.repository';
 import { getAssetFiles } from 'src/utils/asset.util';
 import { getConfig } from 'src/utils/config';
 
@@ -33,24 +34,24 @@ let instance: StorageCore | null;
 export class StorageCore {
   private constructor(
     private assetRepository: IAssetRepository,
-    private configRepository: IConfigRepository,
-    private cryptoRepository: ICryptoRepository,
+    private configRepository: ConfigRepository,
+    private cryptoRepository: CryptoRepository,
     private moveRepository: IMoveRepository,
     private personRepository: IPersonRepository,
     private storageRepository: IStorageRepository,
-    private systemMetadataRepository: ISystemMetadataRepository,
-    private logger: ILoggingRepository,
+    private systemMetadataRepository: SystemMetadataRepository,
+    private logger: LoggingRepository,
   ) {}
 
   static create(
     assetRepository: IAssetRepository,
-    configRepository: IConfigRepository,
-    cryptoRepository: ICryptoRepository,
+    configRepository: ConfigRepository,
+    cryptoRepository: CryptoRepository,
     moveRepository: IMoveRepository,
     personRepository: IPersonRepository,
     storageRepository: IStorageRepository,
-    systemMetadataRepository: ISystemMetadataRepository,
-    logger: ILoggingRepository,
+    systemMetadataRepository: SystemMetadataRepository,
+    logger: LoggingRepository,
   ) {
     if (!instance) {
       instance = new StorageCore(

server/src/db.d.ts

@@ -276,6 +276,7 @@ export interface Partners {
 
 export interface Person {
   birthDate: Timestamp | null;
+  color: string | null;
   createdAt: Generated<Timestamp>;
   faceAssetId: string | null;
   id: Generated<string>;

server/src/dtos/person.dto.ts

@@ -7,7 +7,14 @@ import { AuthDto } from 'src/dtos/auth.dto';
 import { AssetFaceEntity } from 'src/entities/asset-face.entity';
 import { PersonEntity } from 'src/entities/person.entity';
 import { SourceType } from 'src/enum';
-import { IsDateStringFormat, MaxDateString, Optional, ValidateBoolean, ValidateUUID } from 'src/validation';
+import {
+  IsDateStringFormat,
+  MaxDateString,
+  Optional,
+  ValidateBoolean,
+  ValidateHexColor,
+  ValidateUUID,
+} from 'src/validation';
 
 export class PersonCreateDto {
   /**
@@ -35,6 +42,10 @@ export class PersonCreateDto {
 
   @ValidateBoolean({ optional: true })
   isFavorite?: boolean;
+
+  @Optional({ emptyToNull: true, nullable: true })
+  @ValidateHexColor()
+  color?: string | null;
 }
 
 export class PersonUpdateDto extends PersonCreateDto {
@@ -102,6 +113,8 @@ export class PersonResponseDto {
   updatedAt?: Date;
   @PropertyLifecycle({ addedAt: 'v1.126.0' })
   isFavorite?: boolean;
+  @PropertyLifecycle({ addedAt: 'v1.126.0' })
+  color?: string;
 }
 
 export class PersonWithFacesResponseDto extends PersonResponseDto {
@@ -176,6 +189,7 @@ export function mapPerson(person: PersonEntity): PersonResponseDto {
     thumbnailPath: person.thumbnailPath,
     isHidden: person.isHidden,
     isFavorite: person.isFavorite,
+    color: person.color ?? undefined,
     updatedAt: person.updatedAt,
   };
 }

server/src/dtos/session.dto.ts

@@ -1,4 +1,4 @@
-import { SessionEntity } from 'src/entities/session.entity';
+import { SessionItem } from 'src/types';
 
 export class SessionResponseDto {
   id!: string;
@@ -9,7 +9,7 @@ export class SessionResponseDto {
   deviceOS!: string;
 }
 
-export const mapSession = (entity: SessionEntity, currentId?: string): SessionResponseDto => ({
+export const mapSession = (entity: SessionItem, currentId?: string): SessionResponseDto => ({
   id: entity.id,
   createdAt: entity.createdAt.toISOString(),
   updatedAt: entity.updatedAt.toISOString(),

server/src/dtos/shared-link.dto.ts

@@ -7,6 +7,11 @@ import { SharedLinkEntity } from 'src/entities/shared-link.entity';
 import { SharedLinkType } from 'src/enum';
 import { Optional, ValidateBoolean, ValidateDate, ValidateUUID } from 'src/validation';
 
+export class SharedLinkSearchDto {
+  @ValidateUUID({ optional: true })
+  albumId?: string;
+}
+
 export class SharedLinkCreateDto {
   @IsEnum(SharedLinkType)
   @ApiProperty({ enum: SharedLinkType, enumName: 'SharedLinkType' })

server/src/dtos/tag.dto.ts

@@ -1,8 +1,7 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { Transform } from 'class-transformer';
 import { IsHexColor, IsNotEmpty, IsString } from 'class-validator';
 import { TagEntity } from 'src/entities/tag.entity';
-import { Optional, ValidateUUID } from 'src/validation';
+import { Optional, ValidateHexColor, ValidateUUID } from 'src/validation';
 
 export class TagCreateDto {
   @IsString()
@@ -18,9 +17,8 @@ export class TagCreateDto {
 }
 
 export class TagUpdateDto {
-  @Optional({ nullable: true, emptyToNull: true })
-  @IsHexColor()
-  @Transform(({ value }) => (typeof value === 'string' && value[0] !== '#' ? `#${value}` : value))
+  @Optional({ emptyToNull: true, nullable: true })
+  @ValidateHexColor()
   color?: string | null;
 }
 

server/src/dtos/user-preferences.dto.ts

@@ -38,6 +38,14 @@ class PeopleUpdate {
   sidebarWeb?: boolean;
 }
 
+class SharedLinksUpdate {
+  @ValidateBoolean({ optional: true })
+  enabled?: boolean;
+
+  @ValidateBoolean({ optional: true })
+  sidebarWeb?: boolean;
+}
+
 class TagsUpdate {
   @ValidateBoolean({ optional: true })
   enabled?: boolean;
@@ -98,6 +106,11 @@ export class UserPreferencesUpdateDto {
   @Type(() => RatingsUpdate)
   ratings?: RatingsUpdate;
 
+  @Optional()
+  @ValidateNested()
+  @Type(() => SharedLinksUpdate)
+  sharedLinks?: SharedLinksUpdate;
+
   @Optional()
   @ValidateNested()
   @Type(() => TagsUpdate)
@@ -152,6 +165,11 @@ class TagsResponse {
   sidebarWeb: boolean = true;
 }
 
+class SharedLinksResponse {
+  enabled: boolean = true;
+  sidebarWeb: boolean = false;
+}
+
 class EmailNotificationsResponse {
   enabled!: boolean;
   albumInvite!: boolean;
@@ -175,6 +193,7 @@ export class UserPreferencesResponseDto implements UserPreferences {
   memories!: MemoriesResponse;
   people!: PeopleResponse;
   ratings!: RatingsResponse;
+  sharedLinks!: SharedLinksResponse;
   tags!: TagsResponse;
   avatar!: AvatarResponse;
   emailNotifications!: EmailNotificationsResponse;

server/src/entities/person.entity.ts

@@ -52,4 +52,7 @@ export class PersonEntity {
 
   @Column({ default: false })
   isFavorite!: boolean;
+
+  @Column({ type: 'varchar', nullable: true, default: null })
+  color?: string | null;
 }

server/src/entities/user-metadata.entity.ts

@@ -34,6 +34,10 @@ export interface UserPreferences {
   ratings: {
     enabled: boolean;
   };
+  sharedLinks: {
+    enabled: boolean;
+    sidebarWeb: boolean;
+  };
   tags: {
     enabled: boolean;
     sidebarWeb: boolean;
@@ -74,6 +78,10 @@ export const getDefaultPreferences = (user: { email: string }): UserPreferences
       enabled: true,
       sidebarWeb: false,
     },
+    sharedLinks: {
+      enabled: true,
+      sidebarWeb: false,
+    },
     ratings: {
       enabled: false,
     },

server/src/interfaces/process.interface.ts

@@ -1,25 +0,0 @@
-import { ChildProcessWithoutNullStreams, SpawnOptionsWithoutStdio } from 'node:child_process';
-import { Readable } from 'node:stream';
-
-export interface ImmichReadStream {
-  stream: Readable;
-  type?: string;
-  length?: number;
-}
-
-export interface ImmichZipStream extends ImmichReadStream {
-  addFile: (inputPath: string, filename: string) => void;
-  finalize: () => Promise<void>;
-}
-
-export interface DiskUsage {
-  available: number;
-  free: number;
-  total: number;
-}
-
-export const IProcessRepository = 'IProcessRepository';
-
-export interface IProcessRepository {
-  spawn(command: string, args?: readonly string[], options?: SpawnOptionsWithoutStdio): ChildProcessWithoutNullStreams;
-}

server/src/interfaces/session.interface.ts

@@ -1,17 +0,0 @@
-import { Insertable, Updateable } from 'kysely';
-import { Sessions } from 'src/db';
-import { SessionEntity } from 'src/entities/session.entity';
-
-export const ISessionRepository = 'ISessionRepository';
-
-type E = SessionEntity;
-export type SessionSearchOptions = { updatedBefore: Date };
-
-export interface ISessionRepository {
-  search(options: SessionSearchOptions): Promise<SessionEntity[]>;
-  create(dto: Insertable<Sessions>): Promise<SessionEntity>;
-  update(id: string, dto: Updateable<Sessions>): Promise<SessionEntity>;
-  delete(id: string): Promise<void>;
-  getByToken(token: string): Promise<E | undefined>;
-  getByUserId(userId: string): Promise<E[]>;
-}

server/src/interfaces/shared-link.interface.ts

@@ -4,8 +4,13 @@ import { SharedLinkEntity } from 'src/entities/shared-link.entity';
 
 export const ISharedLinkRepository = 'ISharedLinkRepository';
 
+export type SharedLinkSearchOptions = {
+  userId: string;
+  albumId?: string;
+};
+
 export interface ISharedLinkRepository {
-  getAll(userId: string): Promise<SharedLinkEntity[]>;
+  getAll(options: SharedLinkSearchOptions): Promise<SharedLinkEntity[]>;
   get(userId: string, id: string): Promise<SharedLinkEntity | undefined>;
   getByKey(key: Buffer): Promise<SharedLinkEntity | undefined>;
   create(entity: Insertable<SharedLinks> & { assetIds?: string[] }): Promise<SharedLinkEntity>;

server/src/interfaces/system-metadata.interface.ts

@@ -1,10 +0,0 @@
-import { SystemMetadata } from 'src/entities/system-metadata.entity';
-
-export const ISystemMetadataRepository = 'ISystemMetadataRepository';
-
-export interface ISystemMetadataRepository {
-  get<T extends keyof SystemMetadata>(key: T): Promise<SystemMetadata[T] | null>;
-  set<T extends keyof SystemMetadata>(key: T, value: SystemMetadata[T]): Promise<void>;
-  delete<T extends keyof SystemMetadata>(key: T): Promise<void>;
-  readFile(filename: string): Promise<string>;
-}

server/src/middleware/asset-upload.interceptor.ts

@@ -5,19 +5,18 @@ import { AssetMediaResponseDto, AssetMediaStatus } from 'src/dtos/asset-media-re
 import { ImmichHeader } from 'src/enum';
 import { AuthenticatedRequest } from 'src/middleware/auth.guard';
 import { AssetMediaService } from 'src/services/asset-media.service';
-import { fromMaybeArray } from 'src/utils/request';
+import { fromMaybeArray, getReqRes } from 'src/utils/request';
 
 @Injectable()
 export class AssetUploadInterceptor implements NestInterceptor {
   constructor(private service: AssetMediaService) {}
 
   async intercept(context: ExecutionContext, next: CallHandler<any>) {
-    const req = context.switchToHttp().getRequest<AuthenticatedRequest>();
-    const res = context.switchToHttp().getResponse<Response<AssetMediaResponseDto>>();
+    const { type, req, res } = getReqRes<AuthenticatedRequest, Response<AssetMediaResponseDto>>(context);
 
     const checksum = fromMaybeArray(req.headers[ImmichHeader.CHECKSUM]);
     const response = await this.service.getUploadAssetIdByChecksum(req.user, checksum);
-    if (response) {
+    if (response && type === 'http') {
       res.status(200);
       return of({ status: AssetMediaStatus.DUPLICATE, id: response.id });
     }

server/src/middleware/auth.guard.ts

@@ -13,6 +13,7 @@ import { AuthDto } from 'src/dtos/auth.dto';
 import { ImmichQuery, MetadataKey, Permission } from 'src/enum';
 import { LoggingRepository } from 'src/repositories/logging.repository';
 import { AuthService, LoginDetails } from 'src/services/auth.service';
+import { getReqRes } from 'src/utils/request';
 import { UAParser } from 'ua-parser-js';
 
 type AdminRoute = { admin?: true };
@@ -35,7 +36,8 @@ export const Authenticated = (options?: AuthenticatedOptions): MethodDecorator =
 };
 
 export const Auth = createParamDecorator((data, context: ExecutionContext): AuthDto => {
-  return context.switchToHttp().getRequest<AuthenticatedRequest>().user;
+  const { req } = getReqRes<AuthenticatedRequest>(context);
+  return req.user;
 });
 
 export const FileResponse = () =>
@@ -86,12 +88,12 @@ export class AuthGuard implements CanActivate {
       sharedLink: sharedLinkRoute,
       permission,
     } = { sharedLink: false, admin: false, ...options };
-    const request = context.switchToHttp().getRequest<AuthRequest>();
+    const { req } = getReqRes<AuthenticatedRequest>(context);
 
-    request.user = await this.authService.authenticate({
-      headers: request.headers,
-      queryParams: request.query as Record<string, string>,
-      metadata: { adminRoute, sharedLinkRoute, permission, uri: request.path },
+    req.user = await this.authService.authenticate({
+      headers: req.headers,
+      queryParams: req.query as Record<string, string>,
+      metadata: { adminRoute, sharedLinkRoute, permission, uri: req.path },
     });
 
     return true;

server/src/middleware/global-exception.filter.ts

@@ -1,8 +1,18 @@
 import { ArgumentsHost, Catch, ExceptionFilter, HttpException } from '@nestjs/common';
-import { Response } from 'express';
+import { GqlContextType } from '@nestjs/graphql';
+import { GraphQLError } from 'graphql';
 import { ClsService } from 'nestjs-cls';
 import { LoggingRepository } from 'src/repositories/logging.repository';
 import { logGlobalError } from 'src/utils/logger';
+import { getReqRes } from 'src/utils/request';
+
+type StructuredError = {
+  status: number;
+  body: {
+    [key: string]: unknown;
+    message?: string;
+  };
+};
 
 @Catch()
 export class GlobalExceptionFilter implements ExceptionFilter<Error> {
@@ -14,15 +24,20 @@ export class GlobalExceptionFilter implements ExceptionFilter<Error> {
   }
 
   catch(error: Error, host: ArgumentsHost) {
-    const ctx = host.switchToHttp();
-    const response = ctx.getResponse<Response>();
+    const { res } = getReqRes(host);
     const { status, body } = this.fromError(error);
-    if (!response.headersSent) {
-      response.status(status).json({ ...body, statusCode: status, correlationId: this.cls.getId() });
+    const message = { ...body, statusCode: status, correlationId: this.cls.getId() };
+
+    if (host.getType<GqlContextType>() === 'graphql') {
+      throw new GraphQLError(body?.message || 'Error', { extensions: message });
+    }
+
+    if (!res.headersSent) {
+      res.status(status).json(message);
     }
   }
 
-  private fromError(error: Error) {
+  private fromError(error: Error): StructuredError {
     logGlobalError(this.logger, error);
 
     if (error instanceof HttpException) {
@@ -34,7 +49,7 @@ export class GlobalExceptionFilter implements ExceptionFilter<Error> {
         body = { message: body };
       }
 
-      return { status, body };
+      return { status, body } as StructuredError;
     }
 
     return {

server/src/middleware/logging.interceptor.ts

@@ -1,7 +1,7 @@
 import { CallHandler, ExecutionContext, Injectable, NestInterceptor } from '@nestjs/common';
-import { Request, Response } from 'express';
 import { Observable, finalize } from 'rxjs';
 import { LoggingRepository } from 'src/repositories/logging.repository';
+import { getReqRes } from 'src/utils/request';
 
 const maxArrayLength = 100;
 const replacer = (key: string, value: unknown) => {
@@ -23,10 +23,7 @@ export class LoggingInterceptor implements NestInterceptor {
   }
 
   intercept(context: ExecutionContext, next: CallHandler<any>): Observable<any> {
-    const handler = context.switchToHttp();
-    const req = handler.getRequest<Request>();
-    const res = handler.getResponse<Response>();
-
+    const { req, res } = getReqRes(context);
     const { method, ip, url } = req;
 
     const start = performance.now();
@@ -35,9 +32,7 @@ export class LoggingInterceptor implements NestInterceptor {
       finalize(() => {
         const finish = performance.now();
         const duration = (finish - start).toFixed(2);
-        const { statusCode } = res;
-
-        this.logger.debug(`${method} ${url} ${statusCode} ${duration}ms ${ip}`);
+        this.logger.debug(`${method} ${url} ${res?.statusCode || ''} ${duration}ms ${ip}`);
         if (req.body && Object.keys(req.body).length > 0) {
           this.logger.verbose(JSON.stringify(req.body, replacer));
         }

server/src/migrations/1738889177573-AddPersonColor.ts

@@ -0,0 +1,14 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AddPersonColor1738889177573 implements MigrationInterface {
+    name = 'AddPersonColor1738889177573'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "person" ADD "color" character varying`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "person" DROP COLUMN "color"`);
+    }
+
+}

server/src/models/user.model.ts

@@ -0,0 +1,27 @@
+import { Field, ObjectType, registerEnumType } from '@nestjs/graphql';
+import { UserAvatarColor } from 'src/enum';
+
+registerEnumType(UserAvatarColor, {
+  name: 'UserAvatarColor',
+});
+
+@ObjectType()
+export class User {
+  @Field()
+  id!: string;
+
+  @Field()
+  name!: string;
+
+  @Field()
+  email!: string;
+
+  @Field(() => UserAvatarColor)
+  avatarColor!: UserAvatarColor;
+
+  @Field()
+  profileImagePath!: string;
+
+  @Field({ nullable: true })
+  profileChangedAt!: Date;
+}

server/src/repositories/asset.repository.ts

@@ -524,7 +524,7 @@ export class AssetRepository implements IAssetRepository {
       .executeTakeFirst() as Promise<AssetEntity | undefined>;
   }
 
-  getMapMarkers(ownerIds: string[], options: MapMarkerSearchOptions = {}): Promise<MapMarker[]> {
+  private getMapMarkers(ownerIds: string[], options: MapMarkerSearchOptions = {}): Promise<MapMarker[]> {
     const { isArchived, isFavorite, fileCreatedAfter, fileCreatedBefore } = options;
 
     return this.db

server/src/repositories/index.ts

@@ -9,13 +9,10 @@ import { IMachineLearningRepository } from 'src/interfaces/machine-learning.inte
 import { IMoveRepository } from 'src/interfaces/move.interface';
 import { IPartnerRepository } from 'src/interfaces/partner.interface';
 import { IPersonRepository } from 'src/interfaces/person.interface';
-import { IProcessRepository } from 'src/interfaces/process.interface';
 import { ISearchRepository } from 'src/interfaces/search.interface';
-import { ISessionRepository } from 'src/interfaces/session.interface';
 import { ISharedLinkRepository } from 'src/interfaces/shared-link.interface';
 import { IStackRepository } from 'src/interfaces/stack.interface';
 import { IStorageRepository } from 'src/interfaces/storage.interface';
-import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
 import { ITagRepository } from 'src/interfaces/tag.interface';
 import { IUserRepository } from 'src/interfaces/user.interface';
 import { AccessRepository } from 'src/repositories/access.repository';
@@ -73,7 +70,10 @@ export const repositories = [
   MetadataRepository,
   NotificationRepository,
   OAuthRepository,
+  ProcessRepository,
+  SessionRepository,
   ServerInfoRepository,
+  SystemMetadataRepository,
   TelemetryRepository,
   TrashRepository,
   ViewRepository,
@@ -92,13 +92,10 @@ export const providers = [
   { provide: IMoveRepository, useClass: MoveRepository },
   { provide: IPartnerRepository, useClass: PartnerRepository },
   { provide: IPersonRepository, useClass: PersonRepository },
-  { provide: IProcessRepository, useClass: ProcessRepository },
   { provide: ISearchRepository, useClass: SearchRepository },
-  { provide: ISessionRepository, useClass: SessionRepository },
   { provide: ISharedLinkRepository, useClass: SharedLinkRepository },
   { provide: IStackRepository, useClass: StackRepository },
   { provide: IStorageRepository, useClass: StorageRepository },
-  { provide: ISystemMetadataRepository, useClass: SystemMetadataRepository },
   { provide: ITagRepository, useClass: TagRepository },
   { provide: IUserRepository, useClass: UserRepository },
 ];

server/src/repositories/logging.repository.spec.ts

@@ -1,14 +1,14 @@
 import { ClsService } from 'nestjs-cls';
 import { ImmichWorker } from 'src/enum';
+import { ConfigRepository } from 'src/repositories/config.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
-import { IConfigRepository } from 'src/types';
 import { mockEnvData, newConfigRepositoryMock } from 'test/repositories/config.repository.mock';
 import { Mocked } from 'vitest';
 
 describe(LoggingRepository.name, () => {
   let sut: LoggingRepository;
 
-  let configMock: Mocked<IConfigRepository>;
+  let configMock: Mocked<ConfigRepository>;
   let clsMock: Mocked<ClsService>;
 
   beforeEach(() => {

server/src/repositories/map.repository.ts

@@ -1,4 +1,4 @@
-import { Inject, Injectable } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { getName } from 'i18n-iso-countries';
 import { Expression, Kysely, sql, SqlBool } from 'kysely';
 import { InjectKysely } from 'nestjs-kysely';
@@ -11,9 +11,9 @@ import { DB, GeodataPlaces, NaturalearthCountries } from 'src/db';
 import { DummyValue, GenerateSql } from 'src/decorators';
 import { NaturalEarthCountriesTempEntity } from 'src/entities/natural-earth-countries.entity';
 import { LogLevel, SystemMetadataKey } from 'src/enum';
-import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
 import { ConfigRepository } from 'src/repositories/config.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
+import { SystemMetadataRepository } from 'src/repositories/system-metadata.repository';
 
 export interface MapMarkerSearchOptions {
   isArchived?: boolean;
@@ -48,7 +48,7 @@ interface MapDB extends DB {
 export class MapRepository {
   constructor(
     private configRepository: ConfigRepository,
-    @Inject(ISystemMetadataRepository) private metadataRepository: ISystemMetadataRepository,
+    private metadataRepository: SystemMetadataRepository,
     private logger: LoggingRepository,
     @InjectKysely() private db: Kysely<MapDB>,
   ) {

server/src/repositories/notification.repository.spec.ts

@@ -1,17 +1,16 @@
 import { LoggingRepository } from 'src/repositories/logging.repository';
 import { EmailRenderRequest, EmailTemplate, NotificationRepository } from 'src/repositories/notification.repository';
-import { ILoggingRepository } from 'src/types';
-import { newLoggingRepositoryMock } from 'test/repositories/logger.repository.mock';
+import { ILoggingRepository, newLoggingRepositoryMock } from 'test/repositories/logger.repository.mock';
 import { Mocked } from 'vitest';
 
 describe(NotificationRepository.name, () => {
   let sut: NotificationRepository;
-  let loggerMock: Mocked<ILoggingRepository>;
+  let loggerMock: Mocked<LoggingRepository>;
 
   beforeEach(() => {
-    loggerMock = newLoggingRepositoryMock();
+    loggerMock = newLoggingRepositoryMock() as ILoggingRepository as Mocked<LoggingRepository>;
 
-    sut = new NotificationRepository(loggerMock as ILoggingRepository as LoggingRepository);
+    sut = new NotificationRepository(loggerMock as LoggingRepository);
   });
 
   describe('renderEmail', () => {

server/src/repositories/oauth.repository.ts

@@ -43,7 +43,12 @@ export class OAuthRepository {
     const params = client.callbackParams(url);
     try {
       const tokens = await client.callback(redirectUrl, params, { state: params.state });
-      return await client.userinfo<OAuthProfile>(tokens.access_token || '');
+      const profile = await client.userinfo<OAuthProfile>(tokens.access_token || '');
+      if (!profile.sub) {
+        throw new Error('Unexpected profile response, no `sub`');
+      }
+
+      return profile;
     } catch (error: Error | any) {
       if (error.message.includes('unexpected JWT alg received')) {
         this.logger.warn(

server/src/repositories/process.repository.ts

@@ -1,13 +1,11 @@
 import { Injectable } from '@nestjs/common';
 import { ChildProcessWithoutNullStreams, spawn, SpawnOptionsWithoutStdio } from 'node:child_process';
-import { IProcessRepository } from 'src/interfaces/process.interface';
 import { LoggingRepository } from 'src/repositories/logging.repository';
-import { StorageRepository } from 'src/repositories/storage.repository';
 
 @Injectable()
-export class ProcessRepository implements IProcessRepository {
+export class ProcessRepository {
   constructor(private logger: LoggingRepository) {
-    this.logger.setContext(StorageRepository.name);
+    this.logger.setContext(ProcessRepository.name);
   }
 
   spawn(command: string, args: readonly string[], options?: SpawnOptionsWithoutStdio): ChildProcessWithoutNullStreams {

server/src/repositories/session.repository.ts

@@ -3,36 +3,37 @@ import { Insertable, Kysely, Updateable } from 'kysely';
 import { InjectKysely } from 'nestjs-kysely';
 import { DB, Sessions } from 'src/db';
 import { DummyValue, GenerateSql } from 'src/decorators';
-import { SessionEntity, withUser } from 'src/entities/session.entity';
-import { ISessionRepository, SessionSearchOptions } from 'src/interfaces/session.interface';
+import { withUser } from 'src/entities/session.entity';
 import { asUuid } from 'src/utils/database';
 
+export type SessionSearchOptions = { updatedBefore: Date };
+
 @Injectable()
-export class SessionRepository implements ISessionRepository {
+export class SessionRepository {
   constructor(@InjectKysely() private db: Kysely<DB>) {}
 
   @GenerateSql({ params: [{ updatedBefore: DummyValue.DATE }] })
-  search(options: SessionSearchOptions): Promise<SessionEntity[]> {
+  search(options: SessionSearchOptions) {
     return this.db
       .selectFrom('sessions')
       .selectAll()
       .where('sessions.updatedAt', '<=', options.updatedBefore)
-      .execute() as Promise<SessionEntity[]>;
+      .execute();
   }
 
   @GenerateSql({ params: [DummyValue.STRING] })
-  getByToken(token: string): Promise<SessionEntity | undefined> {
+  getByToken(token: string) {
     return this.db
       .selectFrom('sessions')
       .innerJoinLateral(withUser, (join) => join.onTrue())
       .selectAll('sessions')
       .select((eb) => eb.fn.toJson('user').as('user'))
       .where('sessions.token', '=', token)
-      .executeTakeFirst() as Promise<SessionEntity | undefined>;
+      .executeTakeFirst();
   }
 
   @GenerateSql({ params: [DummyValue.UUID] })
-  getByUserId(userId: string): Promise<SessionEntity[]> {
+  getByUserId(userId: string) {
     return this.db
       .selectFrom('sessions')
       .innerJoinLateral(withUser, (join) => join.onTrue())
@@ -41,30 +42,24 @@ export class SessionRepository implements ISessionRepository {
       .where('sessions.userId', '=', userId)
       .orderBy('sessions.updatedAt', 'desc')
       .orderBy('sessions.createdAt', 'desc')
-      .execute() as unknown as Promise<SessionEntity[]>;
+      .execute();
   }
 
-  async create(dto: Insertable<Sessions>): Promise<SessionEntity> {
-    const { id, token, userId, createdAt, updatedAt, deviceType, deviceOS } = await this.db
-      .insertInto('sessions')
-      .values(dto)
-      .returningAll()
-      .executeTakeFirstOrThrow();
-
-    return { id, token, userId, createdAt, updatedAt, deviceType, deviceOS } as SessionEntity;
+  create(dto: Insertable<Sessions>) {
+    return this.db.insertInto('sessions').values(dto).returningAll().executeTakeFirstOrThrow();
   }
 
-  update(id: string, dto: Updateable<Sessions>): Promise<SessionEntity> {
+  update(id: string, dto: Updateable<Sessions>) {
     return this.db
       .updateTable('sessions')
       .set(dto)
       .where('sessions.id', '=', asUuid(id))
       .returningAll()
-      .executeTakeFirstOrThrow() as Promise<SessionEntity>;
+      .executeTakeFirstOrThrow();
   }
 
   @GenerateSql({ params: [DummyValue.UUID] })
-  async delete(id: string): Promise<void> {
+  async delete(id: string) {
     await this.db.deleteFrom('sessions').where('id', '=', asUuid(id)).execute();
   }
 }

server/src/repositories/shared-link.repository.ts

@@ -7,7 +7,7 @@ import { DB, SharedLinks } from 'src/db';
 import { DummyValue, GenerateSql } from 'src/decorators';
 import { SharedLinkEntity } from 'src/entities/shared-link.entity';
 import { SharedLinkType } from 'src/enum';
-import { ISharedLinkRepository } from 'src/interfaces/shared-link.interface';
+import { ISharedLinkRepository, SharedLinkSearchOptions } from 'src/interfaces/shared-link.interface';
 
 @Injectable()
 export class SharedLinkRepository implements ISharedLinkRepository {
@@ -93,7 +93,7 @@ export class SharedLinkRepository implements ISharedLinkRepository {
   }
 
   @GenerateSql({ params: [DummyValue.UUID] })
-  getAll(userId: string): Promise<SharedLinkEntity[]> {
+  getAll({ userId, albumId }: SharedLinkSearchOptions): Promise<SharedLinkEntity[]> {
     return this.db
       .selectFrom('shared_links')
       .selectAll('shared_links')
@@ -149,6 +149,7 @@ export class SharedLinkRepository implements ISharedLinkRepository {
       )
       .select((eb) => eb.fn.toJson('album').as('album'))
       .where((eb) => eb.or([eb('shared_links.type', '=', SharedLinkType.INDIVIDUAL), eb('album.id', 'is not', null)]))
+      .$if(!!albumId, (eb) => eb.where('shared_links.albumId', '=', albumId!))
       .orderBy('shared_links.createdAt', 'desc')
       .distinctOn(['shared_links.createdAt'])
       .execute() as unknown as Promise<SharedLinkEntity[]>;

server/src/repositories/storage.repository.spec.ts

@@ -2,8 +2,8 @@ import mockfs from 'mock-fs';
 import { CrawlOptionsDto } from 'src/dtos/library.dto';
 import { LoggingRepository } from 'src/repositories/logging.repository';
 import { StorageRepository } from 'src/repositories/storage.repository';
-import { ILoggingRepository } from 'src/types';
-import { newLoggingRepositoryMock } from 'test/repositories/logger.repository.mock';
+import { ILoggingRepository, newLoggingRepositoryMock } from 'test/repositories/logger.repository.mock';
+import { Mocked } from 'vitest';
 
 interface Test {
   test: string;
@@ -182,11 +182,11 @@ const tests: Test[] = [
 
 describe(StorageRepository.name, () => {
   let sut: StorageRepository;
-  let logger: ILoggingRepository;
+  let logger: Mocked<ILoggingRepository>;
 
   beforeEach(() => {
     logger = newLoggingRepositoryMock();
-    sut = new StorageRepository(logger as LoggingRepository);
+    sut = new StorageRepository(logger as ILoggingRepository as LoggingRepository);
   });
 
   afterEach(() => {

server/src/repositories/system-metadata.repository.ts

@@ -5,12 +5,11 @@ import { readFile } from 'node:fs/promises';
 import { DB, SystemMetadata as DbSystemMetadata } from 'src/db';
 import { GenerateSql } from 'src/decorators';
 import { SystemMetadata } from 'src/entities/system-metadata.entity';
-import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
 
 type Upsert = Insertable<DbSystemMetadata>;
 
 @Injectable()
-export class SystemMetadataRepository implements ISystemMetadataRepository {
+export class SystemMetadataRepository {
   constructor(@InjectKysely() private db: Kysely<DB>) {}
 
   @GenerateSql({ params: ['metadata_key'] })

server/src/resolvers/index.ts

@@ -0,0 +1,3 @@
+import { UsersResolver } from 'src/resolvers/user.resolver';
+
+export const resolvers = [UsersResolver];

server/src/resolvers/user.resolver.ts

@@ -0,0 +1,22 @@
+import { Args, Int, Query, Resolver } from '@nestjs/graphql';
+import { AuthDto } from 'src/dtos/auth.dto';
+import { Auth, Authenticated } from 'src/middleware/auth.guard';
+import { User } from 'src/models/user.model';
+import { UserService } from 'src/services/user.service';
+
+@Resolver(() => User)
+export class UsersResolver {
+  constructor(private service: UserService) {}
+
+  @Authenticated()
+  @Query(() => User)
+  async user(@Args('id', { type: () => Int }) id: string) {
+    return this.service.get(id);
+  }
+
+  @Authenticated()
+  @Query(() => [User])
+  async users(@Auth() auth: AuthDto) {
+    return this.service.search(auth);
+  }
+}

server/src/schema.gql

@@ -0,0 +1,35 @@
+# ------------------------------------------------------
+# THIS FILE WAS AUTOMATICALLY GENERATED (DO NOT MODIFY)
+# ------------------------------------------------------
+
+"""
+A date-time string at UTC, such as 2019-12-03T09:54:33Z, compliant with the date-time format.
+"""
+scalar DateTime
+
+type Query {
+  user(id: Int!): User!
+  users: [User!]!
+}
+
+type User {
+  avatarColor: UserAvatarColor!
+  email: String!
+  id: String!
+  name: String!
+  profileChangedAt: DateTime
+  profileImagePath: String!
+}
+
+enum UserAvatarColor {
+  AMBER
+  BLUE
+  GRAY
+  GREEN
+  ORANGE
+  PINK
+  PRIMARY
+  PURPLE
+  RED
+  YELLOW
+}

server/src/services/activity.service.spec.ts

@@ -1,21 +1,16 @@
 import { BadRequestException } from '@nestjs/common';
 import { ReactionType } from 'src/dtos/activity.dto';
 import { ActivityService } from 'src/services/activity.service';
-import { IActivityRepository } from 'src/types';
 import { activityStub } from 'test/fixtures/activity.stub';
 import { authStub } from 'test/fixtures/auth.stub';
-import { IAccessRepositoryMock } from 'test/repositories/access.repository.mock';
-import { newTestService } from 'test/utils';
-import { Mocked } from 'vitest';
+import { newTestService, ServiceMocks } from 'test/utils';
 
 describe(ActivityService.name, () => {
   let sut: ActivityService;
-
-  let accessMock: IAccessRepositoryMock;
-  let activityMock: Mocked<IActivityRepository>;
+  let mocks: ServiceMocks;
 
   beforeEach(() => {
-    ({ sut, accessMock, activityMock } = newTestService(ActivityService));
+    ({ sut, mocks } = newTestService(ActivityService));
   });
 
   it('should work', () => {
@@ -24,12 +19,12 @@ describe(ActivityService.name, () => {
 
   describe('getAll', () => {
     it('should get all', async () => {
-      accessMock.album.checkOwnerAccess.mockResolvedValue(new Set(['album-id']));
-      activityMock.search.mockResolvedValue([]);
+      mocks.access.album.checkOwnerAccess.mockResolvedValue(new Set(['album-id']));
+      mocks.activity.search.mockResolvedValue([]);
 
       await expect(sut.getAll(authStub.admin, { assetId: 'asset-id', albumId: 'album-id' })).resolves.toEqual([]);
 
-      expect(activityMock.search).toHaveBeenCalledWith({
+      expect(mocks.activity.search).toHaveBeenCalledWith({
         assetId: 'asset-id',
         albumId: 'album-id',
         isLiked: undefined,
@@ -37,14 +32,14 @@ describe(ActivityService.name, () => {
     });
 
     it('should filter by type=like', async () => {
-      accessMock.album.checkOwnerAccess.mockResolvedValue(new Set(['album-id']));
-      activityMock.search.mockResolvedValue([]);
+      mocks.access.album.checkOwnerAccess.mockResolvedValue(new Set(['album-id']));
+      mocks.activity.search.mockResolvedValue([]);
 
       await expect(
         sut.getAll(authStub.admin, { assetId: 'asset-id', albumId: 'album-id', type: ReactionType.LIKE }),
       ).resolves.toEqual([]);
 
-      expect(activityMock.search).toHaveBeenCalledWith({
+      expect(mocks.activity.search).toHaveBeenCalledWith({
         assetId: 'asset-id',
         albumId: 'album-id',
         isLiked: true,
@@ -52,14 +47,14 @@ describe(ActivityService.name, () => {
     });
 
     it('should filter by type=comment', async () => {
-      accessMock.album.checkOwnerAccess.mockResolvedValue(new Set(['album-id']));
-      activityMock.search.mockResolvedValue([]);
+      mocks.access.album.checkOwnerAccess.mockResolvedValue(new Set(['album-id']));
+      mocks.activity.search.mockResolvedValue([]);
 
       await expect(
         sut.getAll(authStub.admin, { assetId: 'asset-id', albumId: 'album-id', type: ReactionType.COMMENT }),
       ).resolves.toEqual([]);
 
-      expect(activityMock.search).toHaveBeenCalledWith({
+      expect(mocks.activity.search).toHaveBeenCalledWith({
         assetId: 'asset-id',
         albumId: 'album-id',
         isLiked: false,
@@ -69,8 +64,8 @@ describe(ActivityService.name, () => {
 
   describe('getStatistics', () => {
     it('should get the comment count', async () => {
-      activityMock.getStatistics.mockResolvedValue(1);
-      accessMock.album.checkOwnerAccess.mockResolvedValue(new Set([activityStub.oneComment.albumId]));
+      mocks.activity.getStatistics.mockResolvedValue(1);
+      mocks.access.album.checkOwnerAccess.mockResolvedValue(new Set([activityStub.oneComment.albumId]));
       await expect(
         sut.getStatistics(authStub.admin, {
           assetId: 'asset-id',
@@ -93,8 +88,8 @@ describe(ActivityService.name, () => {
     });
 
     it('should create a comment', async () => {
-      accessMock.activity.checkCreateAccess.mockResolvedValue(new Set(['album-id']));
-      activityMock.create.mockResolvedValue(activityStub.oneComment);
+      mocks.access.activity.checkCreateAccess.mockResolvedValue(new Set(['album-id']));
+      mocks.activity.create.mockResolvedValue(activityStub.oneComment);
 
       await sut.create(authStub.admin, {
         albumId: 'album-id',
@@ -103,7 +98,7 @@ describe(ActivityService.name, () => {
         comment: 'comment',
       });
 
-      expect(activityMock.create).toHaveBeenCalledWith({
+      expect(mocks.activity.create).toHaveBeenCalledWith({
         userId: 'admin_id',
         albumId: 'album-id',
         assetId: 'asset-id',
@@ -113,8 +108,8 @@ describe(ActivityService.name, () => {
     });
 
     it('should fail because activity is disabled for the album', async () => {
-      accessMock.album.checkOwnerAccess.mockResolvedValue(new Set(['album-id']));
-      activityMock.create.mockResolvedValue(activityStub.oneComment);
+      mocks.access.album.checkOwnerAccess.mockResolvedValue(new Set(['album-id']));
+      mocks.activity.create.mockResolvedValue(activityStub.oneComment);
 
       await expect(
         sut.create(authStub.admin, {
@@ -127,9 +122,9 @@ describe(ActivityService.name, () => {
     });
 
     it('should create a like', async () => {
-      accessMock.activity.checkCreateAccess.mockResolvedValue(new Set(['album-id']));
-      activityMock.create.mockResolvedValue(activityStub.liked);
-      activityMock.search.mockResolvedValue([]);
+      mocks.access.activity.checkCreateAccess.mockResolvedValue(new Set(['album-id']));
+      mocks.activity.create.mockResolvedValue(activityStub.liked);
+      mocks.activity.search.mockResolvedValue([]);
 
       await sut.create(authStub.admin, {
         albumId: 'album-id',
@@ -137,7 +132,7 @@ describe(ActivityService.name, () => {
         type: ReactionType.LIKE,
       });
 
-      expect(activityMock.create).toHaveBeenCalledWith({
+      expect(mocks.activity.create).toHaveBeenCalledWith({
         userId: 'admin_id',
         albumId: 'album-id',
         assetId: 'asset-id',
@@ -146,9 +141,9 @@ describe(ActivityService.name, () => {
     });
 
     it('should skip if like exists', async () => {
-      accessMock.album.checkOwnerAccess.mockResolvedValue(new Set(['album-id']));
-      accessMock.activity.checkCreateAccess.mockResolvedValue(new Set(['album-id']));
-      activityMock.search.mockResolvedValue([activityStub.liked]);
+      mocks.access.album.checkOwnerAccess.mockResolvedValue(new Set(['album-id']));
+      mocks.access.activity.checkCreateAccess.mockResolvedValue(new Set(['album-id']));
+      mocks.activity.search.mockResolvedValue([activityStub.liked]);
 
       await sut.create(authStub.admin, {
         albumId: 'album-id',
@@ -156,26 +151,26 @@ describe(ActivityService.name, () => {
         type: ReactionType.LIKE,
       });
 
-      expect(activityMock.create).not.toHaveBeenCalled();
+      expect(mocks.activity.create).not.toHaveBeenCalled();
     });
   });
 
   describe('delete', () => {
     it('should require access', async () => {
       await expect(sut.delete(authStub.admin, activityStub.oneComment.id)).rejects.toBeInstanceOf(BadRequestException);
-      expect(activityMock.delete).not.toHaveBeenCalled();
+      expect(mocks.activity.delete).not.toHaveBeenCalled();
     });
 
     it('should let the activity owner delete a comment', async () => {
-      accessMock.activity.checkOwnerAccess.mockResolvedValue(new Set(['activity-id']));
+      mocks.access.activity.checkOwnerAccess.mockResolvedValue(new Set(['activity-id']));
       await sut.delete(authStub.admin, 'activity-id');
-      expect(activityMock.delete).toHaveBeenCalledWith('activity-id');
+      expect(mocks.activity.delete).toHaveBeenCalledWith('activity-id');
     });
 
     it('should let the album owner delete a comment', async () => {
-      accessMock.activity.checkAlbumOwnerAccess.mockResolvedValue(new Set(['activity-id']));
+      mocks.access.activity.checkAlbumOwnerAccess.mockResolvedValue(new Set(['activity-id']));
       await sut.delete(authStub.admin, 'activity-id');
-      expect(activityMock.delete).toHaveBeenCalledWith('activity-id');
+      expect(mocks.activity.delete).toHaveBeenCalledWith('activity-id');
     });
   });
 });

server/src/services/album.service.spec.ts

@@ -2,29 +2,18 @@ import { BadRequestException } from '@nestjs/common';
 import _ from 'lodash';
 import { BulkIdErrorReason } from 'src/dtos/asset-ids.response.dto';
 import { AlbumUserRole } from 'src/enum';
-import { IAlbumRepository } from 'src/interfaces/album.interface';
-import { IEventRepository } from 'src/interfaces/event.interface';
-import { IUserRepository } from 'src/interfaces/user.interface';
 import { AlbumService } from 'src/services/album.service';
-import { IAlbumUserRepository } from 'src/types';
 import { albumStub } from 'test/fixtures/album.stub';
 import { authStub } from 'test/fixtures/auth.stub';
 import { userStub } from 'test/fixtures/user.stub';
-import { IAccessRepositoryMock } from 'test/repositories/access.repository.mock';
-import { newTestService } from 'test/utils';
-import { Mocked } from 'vitest';
+import { newTestService, ServiceMocks } from 'test/utils';
 
 describe(AlbumService.name, () => {
   let sut: AlbumService;
-
-  let accessMock: IAccessRepositoryMock;
-  let albumMock: Mocked<IAlbumRepository>;
-  let albumUserMock: Mocked<IAlbumUserRepository>;
-  let eventMock: Mocked<IEventRepository>;
-  let userMock: Mocked<IUserRepository>;
+  let mocks: ServiceMocks;
 
   beforeEach(() => {
-    ({ sut, accessMock, albumMock, albumUserMock, eventMock, userMock } = newTestService(AlbumService));
+    ({ sut, mocks } = newTestService(AlbumService));
   });
 
   it('should work', () => {
@@ -33,25 +22,25 @@ describe(AlbumService.name, () => {
 
   describe('getStatistics', () => {
     it('should get the album count', async () => {
-      albumMock.getOwned.mockResolvedValue([]);
-      albumMock.getShared.mockResolvedValue([]);
-      albumMock.getNotShared.mockResolvedValue([]);
+      mocks.album.getOwned.mockResolvedValue([]);
+      mocks.album.getShared.mockResolvedValue([]);
+      mocks.album.getNotShared.mockResolvedValue([]);
       await expect(sut.getStatistics(authStub.admin)).resolves.toEqual({
         owned: 0,
         shared: 0,
         notShared: 0,
       });
 
-      expect(albumMock.getOwned).toHaveBeenCalledWith(authStub.admin.user.id);
-      expect(albumMock.getShared).toHaveBeenCalledWith(authStub.admin.user.id);
-      expect(albumMock.getNotShared).toHaveBeenCalledWith(authStub.admin.user.id);
+      expect(mocks.album.getOwned).toHaveBeenCalledWith(authStub.admin.user.id);
+      expect(mocks.album.getShared).toHaveBeenCalledWith(authStub.admin.user.id);
+      expect(mocks.album.getNotShared).toHaveBeenCalledWith(authStub.admin.user.id);
     });
   });
 
   describe('getAll', () => {
     it('gets list of albums for auth user', async () => {
-      albumMock.getOwned.mockResolvedValue([albumStub.empty, albumStub.sharedWithUser]);
-      albumMock.getMetadataForIds.mockResolvedValue([
+      mocks.album.getOwned.mockResolvedValue([albumStub.empty, albumStub.sharedWithUser]);
+      mocks.album.getMetadataForIds.mockResolvedValue([
         { albumId: albumStub.empty.id, assetCount: 0, startDate: null, endDate: null },
         { albumId: albumStub.sharedWithUser.id, assetCount: 0, startDate: null, endDate: null },
       ]);
@@ -63,8 +52,8 @@ describe(AlbumService.name, () => {
     });
 
     it('gets list of albums that have a specific asset', async () => {
-      albumMock.getByAssetId.mockResolvedValue([albumStub.oneAsset]);
-      albumMock.getMetadataForIds.mockResolvedValue([
+      mocks.album.getByAssetId.mockResolvedValue([albumStub.oneAsset]);
+      mocks.album.getMetadataForIds.mockResolvedValue([
         {
           albumId: albumStub.oneAsset.id,
           assetCount: 1,
@@ -76,37 +65,37 @@ describe(AlbumService.name, () => {
       const result = await sut.getAll(authStub.admin, { assetId: albumStub.oneAsset.id });
       expect(result).toHaveLength(1);
       expect(result[0].id).toEqual(albumStub.oneAsset.id);
-      expect(albumMock.getByAssetId).toHaveBeenCalledTimes(1);
+      expect(mocks.album.getByAssetId).toHaveBeenCalledTimes(1);
     });
 
     it('gets list of albums that are shared', async () => {
-      albumMock.getShared.mockResolvedValue([albumStub.sharedWithUser]);
-      albumMock.getMetadataForIds.mockResolvedValue([
+      mocks.album.getShared.mockResolvedValue([albumStub.sharedWithUser]);
+      mocks.album.getMetadataForIds.mockResolvedValue([
         { albumId: albumStub.sharedWithUser.id, assetCount: 0, startDate: null, endDate: null },
       ]);
 
       const result = await sut.getAll(authStub.admin, { shared: true });
       expect(result).toHaveLength(1);
       expect(result[0].id).toEqual(albumStub.sharedWithUser.id);
-      expect(albumMock.getShared).toHaveBeenCalledTimes(1);
+      expect(mocks.album.getShared).toHaveBeenCalledTimes(1);
     });
 
     it('gets list of albums that are NOT shared', async () => {
-      albumMock.getNotShared.mockResolvedValue([albumStub.empty]);
-      albumMock.getMetadataForIds.mockResolvedValue([
+      mocks.album.getNotShared.mockResolvedValue([albumStub.empty]);
+      mocks.album.getMetadataForIds.mockResolvedValue([
         { albumId: albumStub.empty.id, assetCount: 0, startDate: null, endDate: null },
       ]);
 
       const result = await sut.getAll(authStub.admin, { shared: false });
       expect(result).toHaveLength(1);
       expect(result[0].id).toEqual(albumStub.empty.id);
-      expect(albumMock.getNotShared).toHaveBeenCalledTimes(1);
+      expect(mocks.album.getNotShared).toHaveBeenCalledTimes(1);
     });
   });
 
   it('counts assets correctly', async () => {
-    albumMock.getOwned.mockResolvedValue([albumStub.oneAsset]);
-    albumMock.getMetadataForIds.mockResolvedValue([
+    mocks.album.getOwned.mockResolvedValue([albumStub.oneAsset]);
+    mocks.album.getMetadataForIds.mockResolvedValue([
       {
         albumId: albumStub.oneAsset.id,
         assetCount: 1,
@@ -119,14 +108,14 @@ describe(AlbumService.name, () => {
 
     expect(result).toHaveLength(1);
     expect(result[0].assetCount).toEqual(1);
-    expect(albumMock.getOwned).toHaveBeenCalledTimes(1);
+    expect(mocks.album.getOwned).toHaveBeenCalledTimes(1);
   });
 
   describe('create', () => {
     it('creates album', async () => {
-      albumMock.create.mockResolvedValue(albumStub.empty);
-      userMock.get.mockResolvedValue(userStub.user1);
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set(['123']));
+      mocks.album.create.mockResolvedValue(albumStub.empty);
+      mocks.user.get.mockResolvedValue(userStub.user1);
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['123']));
 
       await sut.create(authStub.admin, {
         albumName: 'Empty album',
@@ -135,7 +124,7 @@ describe(AlbumService.name, () => {
         assetIds: ['123'],
       });
 
-      expect(albumMock.create).toHaveBeenCalledWith(
+      expect(mocks.album.create).toHaveBeenCalledWith(
         {
           ownerId: authStub.admin.user.id,
           albumName: albumStub.empty.albumName,
@@ -147,30 +136,30 @@ describe(AlbumService.name, () => {
         [{ userId: 'user-id', role: AlbumUserRole.EDITOR }],
       );
 
-      expect(userMock.get).toHaveBeenCalledWith('user-id', {});
-      expect(accessMock.asset.checkOwnerAccess).toHaveBeenCalledWith(authStub.admin.user.id, new Set(['123']));
-      expect(eventMock.emit).toHaveBeenCalledWith('album.invite', {
+      expect(mocks.user.get).toHaveBeenCalledWith('user-id', {});
+      expect(mocks.access.asset.checkOwnerAccess).toHaveBeenCalledWith(authStub.admin.user.id, new Set(['123']));
+      expect(mocks.event.emit).toHaveBeenCalledWith('album.invite', {
         id: albumStub.empty.id,
         userId: 'user-id',
       });
     });
 
     it('should require valid userIds', async () => {
-      userMock.get.mockResolvedValue(void 0);
+      mocks.user.get.mockResolvedValue(void 0);
       await expect(
         sut.create(authStub.admin, {
           albumName: 'Empty album',
           albumUsers: [{ userId: 'user-3', role: AlbumUserRole.EDITOR }],
         }),
       ).rejects.toBeInstanceOf(BadRequestException);
-      expect(userMock.get).toHaveBeenCalledWith('user-3', {});
-      expect(albumMock.create).not.toHaveBeenCalled();
+      expect(mocks.user.get).toHaveBeenCalledWith('user-3', {});
+      expect(mocks.album.create).not.toHaveBeenCalled();
     });
 
     it('should only add assets the user is allowed to access', async () => {
-      userMock.get.mockResolvedValue(userStub.user1);
-      albumMock.create.mockResolvedValue(albumStub.oneAsset);
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
+      mocks.user.get.mockResolvedValue(userStub.user1);
+      mocks.album.create.mockResolvedValue(albumStub.oneAsset);
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
 
       await sut.create(authStub.admin, {
         albumName: 'Test album',
@@ -178,7 +167,7 @@ describe(AlbumService.name, () => {
         assetIds: ['asset-1', 'asset-2'],
       });
 
-      expect(albumMock.create).toHaveBeenCalledWith(
+      expect(mocks.album.create).toHaveBeenCalledWith(
         {
           ownerId: authStub.admin.user.id,
           albumName: 'Test album',
@@ -189,7 +178,7 @@ describe(AlbumService.name, () => {
         ['asset-1'],
         [],
       );
-      expect(accessMock.asset.checkOwnerAccess).toHaveBeenCalledWith(
+      expect(mocks.access.asset.checkOwnerAccess).toHaveBeenCalledWith(
         authStub.admin.user.id,
         new Set(['asset-1', 'asset-2']),
       );
@@ -198,7 +187,7 @@ describe(AlbumService.name, () => {
 
   describe('update', () => {
     it('should prevent updating an album that does not exist', async () => {
-      albumMock.getById.mockResolvedValue(void 0);
+      mocks.album.getById.mockResolvedValue(void 0);
 
       await expect(
         sut.update(authStub.user1, 'invalid-id', {
@@ -206,7 +195,7 @@ describe(AlbumService.name, () => {
         }),
       ).rejects.toBeInstanceOf(BadRequestException);
 
-      expect(albumMock.update).not.toHaveBeenCalled();
+      expect(mocks.album.update).not.toHaveBeenCalled();
     });
 
     it('should prevent updating a not owned album (shared with auth user)', async () => {
@@ -218,10 +207,10 @@ describe(AlbumService.name, () => {
     });
 
     it('should require a valid thumbnail asset id', async () => {
-      accessMock.album.checkOwnerAccess.mockResolvedValue(new Set(['album-4']));
-      albumMock.getById.mockResolvedValue(albumStub.oneAsset);
-      albumMock.update.mockResolvedValue(albumStub.oneAsset);
-      albumMock.getAssetIds.mockResolvedValue(new Set());
+      mocks.access.album.checkOwnerAccess.mockResolvedValue(new Set(['album-4']));
+      mocks.album.getById.mockResolvedValue(albumStub.oneAsset);
+      mocks.album.update.mockResolvedValue(albumStub.oneAsset);
+      mocks.album.getAssetIds.mockResolvedValue(new Set());
 
       await expect(
         sut.update(authStub.admin, albumStub.oneAsset.id, {
@@ -229,22 +218,22 @@ describe(AlbumService.name, () => {
         }),
       ).rejects.toBeInstanceOf(BadRequestException);
 
-      expect(albumMock.getAssetIds).toHaveBeenCalledWith('album-4', ['not-in-album']);
-      expect(albumMock.update).not.toHaveBeenCalled();
+      expect(mocks.album.getAssetIds).toHaveBeenCalledWith('album-4', ['not-in-album']);
+      expect(mocks.album.update).not.toHaveBeenCalled();
     });
 
     it('should allow the owner to update the album', async () => {
-      accessMock.album.checkOwnerAccess.mockResolvedValue(new Set(['album-4']));
+      mocks.access.album.checkOwnerAccess.mockResolvedValue(new Set(['album-4']));
 
-      albumMock.getById.mockResolvedValue(albumStub.oneAsset);
-      albumMock.update.mockResolvedValue(albumStub.oneAsset);
+      mocks.album.getById.mockResolvedValue(albumStub.oneAsset);
+      mocks.album.update.mockResolvedValue(albumStub.oneAsset);
 
       await sut.update(authStub.admin, albumStub.oneAsset.id, {
         albumName: 'new album name',
       });
 
-      expect(albumMock.update).toHaveBeenCalledTimes(1);
-      expect(albumMock.update).toHaveBeenCalledWith('album-4', {
+      expect(mocks.album.update).toHaveBeenCalledTimes(1);
+      expect(mocks.album.update).toHaveBeenCalledWith('album-4', {
         id: 'album-4',
         albumName: 'new album name',
       });
@@ -253,33 +242,33 @@ describe(AlbumService.name, () => {
 
   describe('delete', () => {
     it('should throw an error for an album not found', async () => {
-      accessMock.album.checkOwnerAccess.mockResolvedValue(new Set());
+      mocks.access.album.checkOwnerAccess.mockResolvedValue(new Set());
 
       await expect(sut.delete(authStub.admin, albumStub.sharedWithAdmin.id)).rejects.toBeInstanceOf(
         BadRequestException,
       );
 
-      expect(albumMock.delete).not.toHaveBeenCalled();
+      expect(mocks.album.delete).not.toHaveBeenCalled();
     });
 
     it('should not let a shared user delete the album', async () => {
-      albumMock.getById.mockResolvedValue(albumStub.sharedWithAdmin);
+      mocks.album.getById.mockResolvedValue(albumStub.sharedWithAdmin);
 
       await expect(sut.delete(authStub.admin, albumStub.sharedWithAdmin.id)).rejects.toBeInstanceOf(
         BadRequestException,
       );
 
-      expect(albumMock.delete).not.toHaveBeenCalled();
+      expect(mocks.album.delete).not.toHaveBeenCalled();
     });
 
     it('should let the owner delete an album', async () => {
-      accessMock.album.checkOwnerAccess.mockResolvedValue(new Set([albumStub.empty.id]));
-      albumMock.getById.mockResolvedValue(albumStub.empty);
+      mocks.access.album.checkOwnerAccess.mockResolvedValue(new Set([albumStub.empty.id]));
+      mocks.album.getById.mockResolvedValue(albumStub.empty);
 
       await sut.delete(authStub.admin, albumStub.empty.id);
 
-      expect(albumMock.delete).toHaveBeenCalledTimes(1);
-      expect(albumMock.delete).toHaveBeenCalledWith(albumStub.empty.id);
+      expect(mocks.album.delete).toHaveBeenCalledTimes(1);
+      expect(mocks.album.delete).toHaveBeenCalledWith(albumStub.empty.id);
     });
   });
 
@@ -288,47 +277,47 @@ describe(AlbumService.name, () => {
       await expect(
         sut.addUsers(authStub.admin, albumStub.sharedWithAdmin.id, { albumUsers: [{ userId: 'user-1' }] }),
       ).rejects.toBeInstanceOf(BadRequestException);
-      expect(albumMock.update).not.toHaveBeenCalled();
+      expect(mocks.album.update).not.toHaveBeenCalled();
     });
 
     it('should throw an error if the userId is already added', async () => {
-      accessMock.album.checkOwnerAccess.mockResolvedValue(new Set([albumStub.sharedWithAdmin.id]));
-      albumMock.getById.mockResolvedValue(albumStub.sharedWithAdmin);
+      mocks.access.album.checkOwnerAccess.mockResolvedValue(new Set([albumStub.sharedWithAdmin.id]));
+      mocks.album.getById.mockResolvedValue(albumStub.sharedWithAdmin);
       await expect(
         sut.addUsers(authStub.user1, albumStub.sharedWithAdmin.id, {
           albumUsers: [{ userId: authStub.admin.user.id }],
         }),
       ).rejects.toBeInstanceOf(BadRequestException);
-      expect(albumMock.update).not.toHaveBeenCalled();
+      expect(mocks.album.update).not.toHaveBeenCalled();
     });
 
     it('should throw an error if the userId does not exist', async () => {
-      accessMock.album.checkOwnerAccess.mockResolvedValue(new Set([albumStub.sharedWithAdmin.id]));
-      albumMock.getById.mockResolvedValue(albumStub.sharedWithAdmin);
-      userMock.get.mockResolvedValue(void 0);
+      mocks.access.album.checkOwnerAccess.mockResolvedValue(new Set([albumStub.sharedWithAdmin.id]));
+      mocks.album.getById.mockResolvedValue(albumStub.sharedWithAdmin);
+      mocks.user.get.mockResolvedValue(void 0);
       await expect(
         sut.addUsers(authStub.user1, albumStub.sharedWithAdmin.id, { albumUsers: [{ userId: 'user-3' }] }),
       ).rejects.toBeInstanceOf(BadRequestException);
-      expect(albumMock.update).not.toHaveBeenCalled();
+      expect(mocks.album.update).not.toHaveBeenCalled();
     });
 
     it('should throw an error if the userId is the ownerId', async () => {
-      accessMock.album.checkOwnerAccess.mockResolvedValue(new Set([albumStub.sharedWithAdmin.id]));
-      albumMock.getById.mockResolvedValue(albumStub.sharedWithAdmin);
+      mocks.access.album.checkOwnerAccess.mockResolvedValue(new Set([albumStub.sharedWithAdmin.id]));
+      mocks.album.getById.mockResolvedValue(albumStub.sharedWithAdmin);
       await expect(
         sut.addUsers(authStub.user1, albumStub.sharedWithAdmin.id, {
           albumUsers: [{ userId: userStub.user1.id }],
         }),
       ).rejects.toBeInstanceOf(BadRequestException);
-      expect(albumMock.update).not.toHaveBeenCalled();
+      expect(mocks.album.update).not.toHaveBeenCalled();
     });
 
     it('should add valid shared users', async () => {
-      accessMock.album.checkOwnerAccess.mockResolvedValue(new Set([albumStub.sharedWithAdmin.id]));
-      albumMock.getById.mockResolvedValue(_.cloneDeep(albumStub.sharedWithAdmin));
-      albumMock.update.mockResolvedValue(albumStub.sharedWithAdmin);
-      userMock.get.mockResolvedValue(userStub.user2);
-      albumUserMock.create.mockResolvedValue({
+      mocks.access.album.checkOwnerAccess.mockResolvedValue(new Set([albumStub.sharedWithAdmin.id]));
+      mocks.album.getById.mockResolvedValue(_.cloneDeep(albumStub.sharedWithAdmin));
+      mocks.album.update.mockResolvedValue(albumStub.sharedWithAdmin);
+      mocks.user.get.mockResolvedValue(userStub.user2);
+      mocks.albumUser.create.mockResolvedValue({
         usersId: userStub.user2.id,
         albumsId: albumStub.sharedWithAdmin.id,
         role: AlbumUserRole.EDITOR,
@@ -336,11 +325,11 @@ describe(AlbumService.name, () => {
       await sut.addUsers(authStub.user1, albumStub.sharedWithAdmin.id, {
         albumUsers: [{ userId: authStub.user2.user.id }],
       });
-      expect(albumUserMock.create).toHaveBeenCalledWith({
+      expect(mocks.albumUser.create).toHaveBeenCalledWith({
         usersId: authStub.user2.user.id,
         albumsId: albumStub.sharedWithAdmin.id,
       });
-      expect(eventMock.emit).toHaveBeenCalledWith('album.invite', {
+      expect(mocks.event.emit).toHaveBeenCalledWith('album.invite', {
         id: albumStub.sharedWithAdmin.id,
         userId: userStub.user2.id,
       });
@@ -349,94 +338,94 @@ describe(AlbumService.name, () => {
 
   describe('removeUser', () => {
     it('should require a valid album id', async () => {
-      accessMock.album.checkOwnerAccess.mockResolvedValue(new Set(['album-1']));
-      albumMock.getById.mockResolvedValue(void 0);
+      mocks.access.album.checkOwnerAccess.mockResolvedValue(new Set(['album-1']));
+      mocks.album.getById.mockResolvedValue(void 0);
       await expect(sut.removeUser(authStub.admin, 'album-1', 'user-1')).rejects.toBeInstanceOf(BadRequestException);
-      expect(albumMock.update).not.toHaveBeenCalled();
+      expect(mocks.album.update).not.toHaveBeenCalled();
     });
 
     it('should remove a shared user from an owned album', async () => {
-      accessMock.album.checkOwnerAccess.mockResolvedValue(new Set([albumStub.sharedWithUser.id]));
-      albumMock.getById.mockResolvedValue(albumStub.sharedWithUser);
+      mocks.access.album.checkOwnerAccess.mockResolvedValue(new Set([albumStub.sharedWithUser.id]));
+      mocks.album.getById.mockResolvedValue(albumStub.sharedWithUser);
 
       await expect(
         sut.removeUser(authStub.admin, albumStub.sharedWithUser.id, userStub.user1.id),
       ).resolves.toBeUndefined();
 
-      expect(albumUserMock.delete).toHaveBeenCalledTimes(1);
-      expect(albumUserMock.delete).toHaveBeenCalledWith({
+      expect(mocks.albumUser.delete).toHaveBeenCalledTimes(1);
+      expect(mocks.albumUser.delete).toHaveBeenCalledWith({
         albumsId: albumStub.sharedWithUser.id,
         usersId: userStub.user1.id,
       });
-      expect(albumMock.getById).toHaveBeenCalledWith(albumStub.sharedWithUser.id, { withAssets: false });
+      expect(mocks.album.getById).toHaveBeenCalledWith(albumStub.sharedWithUser.id, { withAssets: false });
     });
 
     it('should prevent removing a shared user from a not-owned album (shared with auth user)', async () => {
-      albumMock.getById.mockResolvedValue(albumStub.sharedWithMultiple);
+      mocks.album.getById.mockResolvedValue(albumStub.sharedWithMultiple);
 
       await expect(
         sut.removeUser(authStub.user1, albumStub.sharedWithMultiple.id, authStub.user2.user.id),
       ).rejects.toBeInstanceOf(BadRequestException);
 
-      expect(albumUserMock.delete).not.toHaveBeenCalled();
-      expect(accessMock.album.checkOwnerAccess).toHaveBeenCalledWith(
+      expect(mocks.albumUser.delete).not.toHaveBeenCalled();
+      expect(mocks.access.album.checkOwnerAccess).toHaveBeenCalledWith(
         authStub.user1.user.id,
         new Set([albumStub.sharedWithMultiple.id]),
       );
     });
 
     it('should allow a shared user to remove themselves', async () => {
-      albumMock.getById.mockResolvedValue(albumStub.sharedWithUser);
+      mocks.album.getById.mockResolvedValue(albumStub.sharedWithUser);
 
       await sut.removeUser(authStub.user1, albumStub.sharedWithUser.id, authStub.user1.user.id);
 
-      expect(albumUserMock.delete).toHaveBeenCalledTimes(1);
-      expect(albumUserMock.delete).toHaveBeenCalledWith({
+      expect(mocks.albumUser.delete).toHaveBeenCalledTimes(1);
+      expect(mocks.albumUser.delete).toHaveBeenCalledWith({
         albumsId: albumStub.sharedWithUser.id,
         usersId: authStub.user1.user.id,
       });
     });
 
     it('should allow a shared user to remove themselves using "me"', async () => {
-      albumMock.getById.mockResolvedValue(albumStub.sharedWithUser);
+      mocks.album.getById.mockResolvedValue(albumStub.sharedWithUser);
 
       await sut.removeUser(authStub.user1, albumStub.sharedWithUser.id, 'me');
 
-      expect(albumUserMock.delete).toHaveBeenCalledTimes(1);
-      expect(albumUserMock.delete).toHaveBeenCalledWith({
+      expect(mocks.albumUser.delete).toHaveBeenCalledTimes(1);
+      expect(mocks.albumUser.delete).toHaveBeenCalledWith({
         albumsId: albumStub.sharedWithUser.id,
         usersId: authStub.user1.user.id,
       });
     });
 
     it('should not allow the owner to be removed', async () => {
-      albumMock.getById.mockResolvedValue(albumStub.empty);
+      mocks.album.getById.mockResolvedValue(albumStub.empty);
 
       await expect(sut.removeUser(authStub.admin, albumStub.empty.id, authStub.admin.user.id)).rejects.toBeInstanceOf(
         BadRequestException,
       );
 
-      expect(albumMock.update).not.toHaveBeenCalled();
+      expect(mocks.album.update).not.toHaveBeenCalled();
     });
 
     it('should throw an error for a user not in the album', async () => {
-      albumMock.getById.mockResolvedValue(albumStub.empty);
+      mocks.album.getById.mockResolvedValue(albumStub.empty);
 
       await expect(sut.removeUser(authStub.admin, albumStub.empty.id, 'user-3')).rejects.toBeInstanceOf(
         BadRequestException,
       );
 
-      expect(albumMock.update).not.toHaveBeenCalled();
+      expect(mocks.album.update).not.toHaveBeenCalled();
     });
   });
 
   describe('updateUser', () => {
     it('should update user role', async () => {
-      accessMock.album.checkOwnerAccess.mockResolvedValue(new Set([albumStub.sharedWithAdmin.id]));
+      mocks.access.album.checkOwnerAccess.mockResolvedValue(new Set([albumStub.sharedWithAdmin.id]));
       await sut.updateUser(authStub.user1, albumStub.sharedWithAdmin.id, userStub.admin.id, {
         role: AlbumUserRole.EDITOR,
       });
-      expect(albumUserMock.update).toHaveBeenCalledWith(
+      expect(mocks.albumUser.update).toHaveBeenCalledWith(
         { albumsId: albumStub.sharedWithAdmin.id, usersId: userStub.admin.id },
         { role: AlbumUserRole.EDITOR },
       );
@@ -445,9 +434,9 @@ describe(AlbumService.name, () => {
 
   describe('getAlbumInfo', () => {
     it('should get a shared album', async () => {
-      albumMock.getById.mockResolvedValue(albumStub.oneAsset);
-      accessMock.album.checkOwnerAccess.mockResolvedValue(new Set([albumStub.oneAsset.id]));
-      albumMock.getMetadataForIds.mockResolvedValue([
+      mocks.album.getById.mockResolvedValue(albumStub.oneAsset);
+      mocks.access.album.checkOwnerAccess.mockResolvedValue(new Set([albumStub.oneAsset.id]));
+      mocks.album.getMetadataForIds.mockResolvedValue([
         {
           albumId: albumStub.oneAsset.id,
           assetCount: 1,
@@ -458,17 +447,17 @@ describe(AlbumService.name, () => {
 
       await sut.get(authStub.admin, albumStub.oneAsset.id, {});
 
-      expect(albumMock.getById).toHaveBeenCalledWith(albumStub.oneAsset.id, { withAssets: true });
-      expect(accessMock.album.checkOwnerAccess).toHaveBeenCalledWith(
+      expect(mocks.album.getById).toHaveBeenCalledWith(albumStub.oneAsset.id, { withAssets: true });
+      expect(mocks.access.album.checkOwnerAccess).toHaveBeenCalledWith(
         authStub.admin.user.id,
         new Set([albumStub.oneAsset.id]),
       );
     });
 
     it('should get a shared album via a shared link', async () => {
-      albumMock.getById.mockResolvedValue(albumStub.oneAsset);
-      accessMock.album.checkSharedLinkAccess.mockResolvedValue(new Set(['album-123']));
-      albumMock.getMetadataForIds.mockResolvedValue([
+      mocks.album.getById.mockResolvedValue(albumStub.oneAsset);
+      mocks.access.album.checkSharedLinkAccess.mockResolvedValue(new Set(['album-123']));
+      mocks.album.getMetadataForIds.mockResolvedValue([
         {
           albumId: albumStub.oneAsset.id,
           assetCount: 1,
@@ -479,17 +468,17 @@ describe(AlbumService.name, () => {
 
       await sut.get(authStub.adminSharedLink, 'album-123', {});
 
-      expect(albumMock.getById).toHaveBeenCalledWith('album-123', { withAssets: true });
-      expect(accessMock.album.checkSharedLinkAccess).toHaveBeenCalledWith(
+      expect(mocks.album.getById).toHaveBeenCalledWith('album-123', { withAssets: true });
+      expect(mocks.access.album.checkSharedLinkAccess).toHaveBeenCalledWith(
         authStub.adminSharedLink.sharedLink?.id,
         new Set(['album-123']),
       );
     });
 
     it('should get a shared album via shared with user', async () => {
-      albumMock.getById.mockResolvedValue(albumStub.oneAsset);
-      accessMock.album.checkSharedAlbumAccess.mockResolvedValue(new Set(['album-123']));
-      albumMock.getMetadataForIds.mockResolvedValue([
+      mocks.album.getById.mockResolvedValue(albumStub.oneAsset);
+      mocks.access.album.checkSharedAlbumAccess.mockResolvedValue(new Set(['album-123']));
+      mocks.album.getMetadataForIds.mockResolvedValue([
         {
           albumId: albumStub.oneAsset.id,
           assetCount: 1,
@@ -500,8 +489,8 @@ describe(AlbumService.name, () => {
 
       await sut.get(authStub.user1, 'album-123', {});
 
-      expect(albumMock.getById).toHaveBeenCalledWith('album-123', { withAssets: true });
-      expect(accessMock.album.checkSharedAlbumAccess).toHaveBeenCalledWith(
+      expect(mocks.album.getById).toHaveBeenCalledWith('album-123', { withAssets: true });
+      expect(mocks.access.album.checkSharedAlbumAccess).toHaveBeenCalledWith(
         authStub.user1.user.id,
         new Set(['album-123']),
         AlbumUserRole.VIEWER,
@@ -511,8 +500,8 @@ describe(AlbumService.name, () => {
     it('should throw an error for no access', async () => {
       await expect(sut.get(authStub.admin, 'album-123', {})).rejects.toBeInstanceOf(BadRequestException);
 
-      expect(accessMock.album.checkOwnerAccess).toHaveBeenCalledWith(authStub.admin.user.id, new Set(['album-123']));
-      expect(accessMock.album.checkSharedAlbumAccess).toHaveBeenCalledWith(
+      expect(mocks.access.album.checkOwnerAccess).toHaveBeenCalledWith(authStub.admin.user.id, new Set(['album-123']));
+      expect(mocks.access.album.checkSharedAlbumAccess).toHaveBeenCalledWith(
         authStub.admin.user.id,
         new Set(['album-123']),
         AlbumUserRole.VIEWER,
@@ -522,10 +511,10 @@ describe(AlbumService.name, () => {
 
   describe('addAssets', () => {
     it('should allow the owner to add assets', async () => {
-      accessMock.album.checkOwnerAccess.mockResolvedValue(new Set(['album-123']));
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2', 'asset-3']));
-      albumMock.getById.mockResolvedValue(_.cloneDeep(albumStub.oneAsset));
-      albumMock.getAssetIds.mockResolvedValueOnce(new Set());
+      mocks.access.album.checkOwnerAccess.mockResolvedValue(new Set(['album-123']));
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2', 'asset-3']));
+      mocks.album.getById.mockResolvedValue(_.cloneDeep(albumStub.oneAsset));
+      mocks.album.getAssetIds.mockResolvedValueOnce(new Set());
 
       await expect(
         sut.addAssets(authStub.admin, 'album-123', { ids: ['asset-1', 'asset-2', 'asset-3'] }),
@@ -535,37 +524,37 @@ describe(AlbumService.name, () => {
         { success: true, id: 'asset-3' },
       ]);
 
-      expect(albumMock.update).toHaveBeenCalledWith('album-123', {
+      expect(mocks.album.update).toHaveBeenCalledWith('album-123', {
         id: 'album-123',
         updatedAt: expect.any(Date),
         albumThumbnailAssetId: 'asset-1',
       });
-      expect(albumMock.addAssetIds).toHaveBeenCalledWith('album-123', ['asset-1', 'asset-2', 'asset-3']);
+      expect(mocks.album.addAssetIds).toHaveBeenCalledWith('album-123', ['asset-1', 'asset-2', 'asset-3']);
     });
 
     it('should not set the thumbnail if the album has one already', async () => {
-      accessMock.album.checkOwnerAccess.mockResolvedValue(new Set(['album-123']));
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
-      albumMock.getById.mockResolvedValue(_.cloneDeep({ ...albumStub.empty, albumThumbnailAssetId: 'asset-id' }));
-      albumMock.getAssetIds.mockResolvedValueOnce(new Set());
+      mocks.access.album.checkOwnerAccess.mockResolvedValue(new Set(['album-123']));
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
+      mocks.album.getById.mockResolvedValue(_.cloneDeep({ ...albumStub.empty, albumThumbnailAssetId: 'asset-id' }));
+      mocks.album.getAssetIds.mockResolvedValueOnce(new Set());
 
       await expect(sut.addAssets(authStub.admin, 'album-123', { ids: ['asset-1'] })).resolves.toEqual([
         { success: true, id: 'asset-1' },
       ]);
 
-      expect(albumMock.update).toHaveBeenCalledWith('album-123', {
+      expect(mocks.album.update).toHaveBeenCalledWith('album-123', {
         id: 'album-123',
         updatedAt: expect.any(Date),
         albumThumbnailAssetId: 'asset-id',
       });
-      expect(albumMock.addAssetIds).toHaveBeenCalled();
+      expect(mocks.album.addAssetIds).toHaveBeenCalled();
     });
 
     it('should allow a shared user to add assets', async () => {
-      accessMock.album.checkSharedAlbumAccess.mockResolvedValue(new Set(['album-123']));
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2', 'asset-3']));
-      albumMock.getById.mockResolvedValue(_.cloneDeep(albumStub.sharedWithUser));
-      albumMock.getAssetIds.mockResolvedValueOnce(new Set());
+      mocks.access.album.checkSharedAlbumAccess.mockResolvedValue(new Set(['album-123']));
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2', 'asset-3']));
+      mocks.album.getById.mockResolvedValue(_.cloneDeep(albumStub.sharedWithUser));
+      mocks.album.getAssetIds.mockResolvedValueOnce(new Set());
 
       await expect(
         sut.addAssets(authStub.user1, 'album-123', { ids: ['asset-1', 'asset-2', 'asset-3'] }),
@@ -575,34 +564,34 @@ describe(AlbumService.name, () => {
         { success: true, id: 'asset-3' },
       ]);
 
-      expect(albumMock.update).toHaveBeenCalledWith('album-123', {
+      expect(mocks.album.update).toHaveBeenCalledWith('album-123', {
         id: 'album-123',
         updatedAt: expect.any(Date),
         albumThumbnailAssetId: 'asset-1',
       });
-      expect(albumMock.addAssetIds).toHaveBeenCalledWith('album-123', ['asset-1', 'asset-2', 'asset-3']);
-      expect(eventMock.emit).toHaveBeenCalledWith('album.update', {
+      expect(mocks.album.addAssetIds).toHaveBeenCalledWith('album-123', ['asset-1', 'asset-2', 'asset-3']);
+      expect(mocks.event.emit).toHaveBeenCalledWith('album.update', {
         id: 'album-123',
         recipientIds: ['admin_id'],
       });
     });
 
     it('should not allow a shared user with viewer access to add assets', async () => {
-      accessMock.album.checkSharedAlbumAccess.mockResolvedValue(new Set([]));
-      albumMock.getById.mockResolvedValue(_.cloneDeep(albumStub.sharedWithUser));
+      mocks.access.album.checkSharedAlbumAccess.mockResolvedValue(new Set([]));
+      mocks.album.getById.mockResolvedValue(_.cloneDeep(albumStub.sharedWithUser));
 
       await expect(
         sut.addAssets(authStub.user2, 'album-123', { ids: ['asset-1', 'asset-2', 'asset-3'] }),
       ).rejects.toBeInstanceOf(BadRequestException);
 
-      expect(albumMock.update).not.toHaveBeenCalled();
+      expect(mocks.album.update).not.toHaveBeenCalled();
     });
 
     it('should allow a shared link user to add assets', async () => {
-      accessMock.album.checkSharedLinkAccess.mockResolvedValue(new Set(['album-123']));
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2', 'asset-3']));
-      albumMock.getById.mockResolvedValue(_.cloneDeep(albumStub.oneAsset));
-      albumMock.getAssetIds.mockResolvedValueOnce(new Set());
+      mocks.access.album.checkSharedLinkAccess.mockResolvedValue(new Set(['album-123']));
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2', 'asset-3']));
+      mocks.album.getById.mockResolvedValue(_.cloneDeep(albumStub.oneAsset));
+      mocks.album.getAssetIds.mockResolvedValueOnce(new Set());
 
       await expect(
         sut.addAssets(authStub.adminSharedLink, 'album-123', { ids: ['asset-1', 'asset-2', 'asset-3'] }),
@@ -612,115 +601,115 @@ describe(AlbumService.name, () => {
         { success: true, id: 'asset-3' },
       ]);
 
-      expect(albumMock.update).toHaveBeenCalledWith('album-123', {
+      expect(mocks.album.update).toHaveBeenCalledWith('album-123', {
         id: 'album-123',
         updatedAt: expect.any(Date),
         albumThumbnailAssetId: 'asset-1',
       });
-      expect(albumMock.addAssetIds).toHaveBeenCalledWith('album-123', ['asset-1', 'asset-2', 'asset-3']);
+      expect(mocks.album.addAssetIds).toHaveBeenCalledWith('album-123', ['asset-1', 'asset-2', 'asset-3']);
 
-      expect(accessMock.album.checkSharedLinkAccess).toHaveBeenCalledWith(
+      expect(mocks.access.album.checkSharedLinkAccess).toHaveBeenCalledWith(
         authStub.adminSharedLink.sharedLink?.id,
         new Set(['album-123']),
       );
     });
 
     it('should allow adding assets shared via partner sharing', async () => {
-      accessMock.album.checkOwnerAccess.mockResolvedValue(new Set(['album-123']));
-      accessMock.asset.checkPartnerAccess.mockResolvedValue(new Set(['asset-1']));
-      albumMock.getById.mockResolvedValue(_.cloneDeep(albumStub.oneAsset));
-      albumMock.getAssetIds.mockResolvedValueOnce(new Set());
+      mocks.access.album.checkOwnerAccess.mockResolvedValue(new Set(['album-123']));
+      mocks.access.asset.checkPartnerAccess.mockResolvedValue(new Set(['asset-1']));
+      mocks.album.getById.mockResolvedValue(_.cloneDeep(albumStub.oneAsset));
+      mocks.album.getAssetIds.mockResolvedValueOnce(new Set());
 
       await expect(sut.addAssets(authStub.admin, 'album-123', { ids: ['asset-1'] })).resolves.toEqual([
         { success: true, id: 'asset-1' },
       ]);
 
-      expect(albumMock.update).toHaveBeenCalledWith('album-123', {
+      expect(mocks.album.update).toHaveBeenCalledWith('album-123', {
         id: 'album-123',
         updatedAt: expect.any(Date),
         albumThumbnailAssetId: 'asset-1',
       });
-      expect(accessMock.asset.checkPartnerAccess).toHaveBeenCalledWith(authStub.admin.user.id, new Set(['asset-1']));
+      expect(mocks.access.asset.checkPartnerAccess).toHaveBeenCalledWith(authStub.admin.user.id, new Set(['asset-1']));
     });
 
     it('should skip duplicate assets', async () => {
-      accessMock.album.checkOwnerAccess.mockResolvedValue(new Set(['album-123']));
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-id']));
-      albumMock.getById.mockResolvedValue(_.cloneDeep(albumStub.oneAsset));
-      albumMock.getAssetIds.mockResolvedValueOnce(new Set(['asset-id']));
+      mocks.access.album.checkOwnerAccess.mockResolvedValue(new Set(['album-123']));
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-id']));
+      mocks.album.getById.mockResolvedValue(_.cloneDeep(albumStub.oneAsset));
+      mocks.album.getAssetIds.mockResolvedValueOnce(new Set(['asset-id']));
 
       await expect(sut.addAssets(authStub.admin, 'album-123', { ids: ['asset-id'] })).resolves.toEqual([
         { success: false, id: 'asset-id', error: BulkIdErrorReason.DUPLICATE },
       ]);
 
-      expect(albumMock.update).not.toHaveBeenCalled();
+      expect(mocks.album.update).not.toHaveBeenCalled();
     });
 
     it('should skip assets not shared with user', async () => {
-      accessMock.album.checkOwnerAccess.mockResolvedValue(new Set(['album-123']));
-      albumMock.getById.mockResolvedValue(albumStub.oneAsset);
-      albumMock.getAssetIds.mockResolvedValueOnce(new Set());
+      mocks.access.album.checkOwnerAccess.mockResolvedValue(new Set(['album-123']));
+      mocks.album.getById.mockResolvedValue(albumStub.oneAsset);
+      mocks.album.getAssetIds.mockResolvedValueOnce(new Set());
 
       await expect(sut.addAssets(authStub.admin, 'album-123', { ids: ['asset-1'] })).resolves.toEqual([
         { success: false, id: 'asset-1', error: BulkIdErrorReason.NO_PERMISSION },
       ]);
 
-      expect(accessMock.asset.checkOwnerAccess).toHaveBeenCalledWith(authStub.admin.user.id, new Set(['asset-1']));
-      expect(accessMock.asset.checkPartnerAccess).toHaveBeenCalledWith(authStub.admin.user.id, new Set(['asset-1']));
+      expect(mocks.access.asset.checkOwnerAccess).toHaveBeenCalledWith(authStub.admin.user.id, new Set(['asset-1']));
+      expect(mocks.access.asset.checkPartnerAccess).toHaveBeenCalledWith(authStub.admin.user.id, new Set(['asset-1']));
     });
 
     it('should not allow unauthorized access to the album', async () => {
-      albumMock.getById.mockResolvedValue(albumStub.oneAsset);
+      mocks.album.getById.mockResolvedValue(albumStub.oneAsset);
 
       await expect(
         sut.addAssets(authStub.admin, 'album-123', { ids: ['asset-1', 'asset-2', 'asset-3'] }),
       ).rejects.toBeInstanceOf(BadRequestException);
 
-      expect(accessMock.album.checkOwnerAccess).toHaveBeenCalled();
-      expect(accessMock.album.checkSharedAlbumAccess).toHaveBeenCalled();
+      expect(mocks.access.album.checkOwnerAccess).toHaveBeenCalled();
+      expect(mocks.access.album.checkSharedAlbumAccess).toHaveBeenCalled();
     });
 
     it('should not allow unauthorized shared link access to the album', async () => {
-      albumMock.getById.mockResolvedValue(albumStub.oneAsset);
+      mocks.album.getById.mockResolvedValue(albumStub.oneAsset);
 
       await expect(
         sut.addAssets(authStub.adminSharedLink, 'album-123', { ids: ['asset-1', 'asset-2', 'asset-3'] }),
       ).rejects.toBeInstanceOf(BadRequestException);
 
-      expect(accessMock.album.checkSharedLinkAccess).toHaveBeenCalled();
+      expect(mocks.access.album.checkSharedLinkAccess).toHaveBeenCalled();
     });
   });
 
   describe('removeAssets', () => {
     it('should allow the owner to remove assets', async () => {
-      accessMock.album.checkOwnerAccess.mockResolvedValue(new Set(['album-123']));
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-id']));
-      albumMock.getById.mockResolvedValue(_.cloneDeep(albumStub.oneAsset));
-      albumMock.getAssetIds.mockResolvedValue(new Set(['asset-id']));
+      mocks.access.album.checkOwnerAccess.mockResolvedValue(new Set(['album-123']));
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-id']));
+      mocks.album.getById.mockResolvedValue(_.cloneDeep(albumStub.oneAsset));
+      mocks.album.getAssetIds.mockResolvedValue(new Set(['asset-id']));
 
       await expect(sut.removeAssets(authStub.admin, 'album-123', { ids: ['asset-id'] })).resolves.toEqual([
         { success: true, id: 'asset-id' },
       ]);
 
-      expect(albumMock.removeAssetIds).toHaveBeenCalledWith('album-123', ['asset-id']);
+      expect(mocks.album.removeAssetIds).toHaveBeenCalledWith('album-123', ['asset-id']);
     });
 
     it('should skip assets not in the album', async () => {
-      accessMock.album.checkOwnerAccess.mockResolvedValue(new Set(['album-123']));
-      albumMock.getById.mockResolvedValue(_.cloneDeep(albumStub.empty));
-      albumMock.getAssetIds.mockResolvedValue(new Set());
+      mocks.access.album.checkOwnerAccess.mockResolvedValue(new Set(['album-123']));
+      mocks.album.getById.mockResolvedValue(_.cloneDeep(albumStub.empty));
+      mocks.album.getAssetIds.mockResolvedValue(new Set());
 
       await expect(sut.removeAssets(authStub.admin, 'album-123', { ids: ['asset-id'] })).resolves.toEqual([
         { success: false, id: 'asset-id', error: BulkIdErrorReason.NOT_FOUND },
       ]);
 
-      expect(albumMock.update).not.toHaveBeenCalled();
+      expect(mocks.album.update).not.toHaveBeenCalled();
     });
 
     it('should allow owner to remove all assets from the album', async () => {
-      accessMock.album.checkOwnerAccess.mockResolvedValue(new Set(['album-123']));
-      albumMock.getById.mockResolvedValue(_.cloneDeep(albumStub.oneAsset));
-      albumMock.getAssetIds.mockResolvedValue(new Set(['asset-id']));
+      mocks.access.album.checkOwnerAccess.mockResolvedValue(new Set(['album-123']));
+      mocks.album.getById.mockResolvedValue(_.cloneDeep(albumStub.oneAsset));
+      mocks.album.getAssetIds.mockResolvedValue(new Set(['asset-id']));
 
       await expect(sut.removeAssets(authStub.admin, 'album-123', { ids: ['asset-id'] })).resolves.toEqual([
         { success: true, id: 'asset-id' },
@@ -728,16 +717,16 @@ describe(AlbumService.name, () => {
     });
 
     it('should reset the thumbnail if it is removed', async () => {
-      accessMock.album.checkOwnerAccess.mockResolvedValue(new Set(['album-123']));
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-id']));
-      albumMock.getById.mockResolvedValue(_.cloneDeep(albumStub.twoAssets));
-      albumMock.getAssetIds.mockResolvedValue(new Set(['asset-id']));
+      mocks.access.album.checkOwnerAccess.mockResolvedValue(new Set(['album-123']));
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-id']));
+      mocks.album.getById.mockResolvedValue(_.cloneDeep(albumStub.twoAssets));
+      mocks.album.getAssetIds.mockResolvedValue(new Set(['asset-id']));
 
       await expect(sut.removeAssets(authStub.admin, 'album-123', { ids: ['asset-id'] })).resolves.toEqual([
         { success: true, id: 'asset-id' },
       ]);
 
-      expect(albumMock.updateThumbnails).toHaveBeenCalled();
+      expect(mocks.album.updateThumbnails).toHaveBeenCalled();
     });
   });
 

server/src/services/api-key.service.spec.ts

@@ -1,50 +1,45 @@
 import { BadRequestException } from '@nestjs/common';
 import { Permission } from 'src/enum';
-import { ICryptoRepository } from 'src/interfaces/crypto.interface';
 import { APIKeyService } from 'src/services/api-key.service';
-import { IApiKeyRepository } from 'src/types';
 import { keyStub } from 'test/fixtures/api-key.stub';
 import { authStub } from 'test/fixtures/auth.stub';
-import { newTestService } from 'test/utils';
-import { Mocked } from 'vitest';
+import { newTestService, ServiceMocks } from 'test/utils';
 
 describe(APIKeyService.name, () => {
   let sut: APIKeyService;
-
-  let cryptoMock: Mocked<ICryptoRepository>;
-  let keyMock: Mocked<IApiKeyRepository>;
+  let mocks: ServiceMocks;
 
   beforeEach(() => {
-    ({ sut, cryptoMock, keyMock } = newTestService(APIKeyService));
+    ({ sut, mocks } = newTestService(APIKeyService));
   });
 
   describe('create', () => {
     it('should create a new key', async () => {
-      keyMock.create.mockResolvedValue(keyStub.admin);
+      mocks.apiKey.create.mockResolvedValue(keyStub.admin);
       await sut.create(authStub.admin, { name: 'Test Key', permissions: [Permission.ALL] });
-      expect(keyMock.create).toHaveBeenCalledWith({
+      expect(mocks.apiKey.create).toHaveBeenCalledWith({
         key: 'cmFuZG9tLWJ5dGVz (hashed)',
         name: 'Test Key',
         permissions: [Permission.ALL],
         userId: authStub.admin.user.id,
       });
-      expect(cryptoMock.newPassword).toHaveBeenCalled();
-      expect(cryptoMock.hashSha256).toHaveBeenCalled();
+      expect(mocks.crypto.newPassword).toHaveBeenCalled();
+      expect(mocks.crypto.hashSha256).toHaveBeenCalled();
     });
 
     it('should not require a name', async () => {
-      keyMock.create.mockResolvedValue(keyStub.admin);
+      mocks.apiKey.create.mockResolvedValue(keyStub.admin);
 
       await sut.create(authStub.admin, { permissions: [Permission.ALL] });
 
-      expect(keyMock.create).toHaveBeenCalledWith({
+      expect(mocks.apiKey.create).toHaveBeenCalledWith({
         key: 'cmFuZG9tLWJ5dGVz (hashed)',
         name: 'API Key',
         permissions: [Permission.ALL],
         userId: authStub.admin.user.id,
       });
-      expect(cryptoMock.newPassword).toHaveBeenCalled();
-      expect(cryptoMock.hashSha256).toHaveBeenCalled();
+      expect(mocks.crypto.newPassword).toHaveBeenCalled();
+      expect(mocks.crypto.hashSha256).toHaveBeenCalled();
     });
 
     it('should throw an error if the api key does not have sufficient permissions', async () => {
@@ -60,16 +55,16 @@ describe(APIKeyService.name, () => {
         BadRequestException,
       );
 
-      expect(keyMock.update).not.toHaveBeenCalledWith('random-guid');
+      expect(mocks.apiKey.update).not.toHaveBeenCalledWith('random-guid');
     });
 
     it('should update a key', async () => {
-      keyMock.getById.mockResolvedValue(keyStub.admin);
-      keyMock.update.mockResolvedValue(keyStub.admin);
+      mocks.apiKey.getById.mockResolvedValue(keyStub.admin);
+      mocks.apiKey.update.mockResolvedValue(keyStub.admin);
 
       await sut.update(authStub.admin, 'random-guid', { name: 'New Name' });
 
-      expect(keyMock.update).toHaveBeenCalledWith(authStub.admin.user.id, 'random-guid', { name: 'New Name' });
+      expect(mocks.apiKey.update).toHaveBeenCalledWith(authStub.admin.user.id, 'random-guid', { name: 'New Name' });
     });
   });
 
@@ -77,15 +72,15 @@ describe(APIKeyService.name, () => {
     it('should throw an error if the key is not found', async () => {
       await expect(sut.delete(authStub.admin, 'random-guid')).rejects.toBeInstanceOf(BadRequestException);
 
-      expect(keyMock.delete).not.toHaveBeenCalledWith('random-guid');
+      expect(mocks.apiKey.delete).not.toHaveBeenCalledWith('random-guid');
     });
 
     it('should delete a key', async () => {
-      keyMock.getById.mockResolvedValue(keyStub.admin);
+      mocks.apiKey.getById.mockResolvedValue(keyStub.admin);
 
       await sut.delete(authStub.admin, 'random-guid');
 
-      expect(keyMock.delete).toHaveBeenCalledWith(authStub.admin.user.id, 'random-guid');
+      expect(mocks.apiKey.delete).toHaveBeenCalledWith(authStub.admin.user.id, 'random-guid');
     });
   });
 
@@ -93,25 +88,25 @@ describe(APIKeyService.name, () => {
     it('should throw an error if the key is not found', async () => {
       await expect(sut.getById(authStub.admin, 'random-guid')).rejects.toBeInstanceOf(BadRequestException);
 
-      expect(keyMock.getById).toHaveBeenCalledWith(authStub.admin.user.id, 'random-guid');
+      expect(mocks.apiKey.getById).toHaveBeenCalledWith(authStub.admin.user.id, 'random-guid');
     });
 
     it('should get a key by id', async () => {
-      keyMock.getById.mockResolvedValue(keyStub.admin);
+      mocks.apiKey.getById.mockResolvedValue(keyStub.admin);
 
       await sut.getById(authStub.admin, 'random-guid');
 
-      expect(keyMock.getById).toHaveBeenCalledWith(authStub.admin.user.id, 'random-guid');
+      expect(mocks.apiKey.getById).toHaveBeenCalledWith(authStub.admin.user.id, 'random-guid');
     });
   });
 
   describe('getAll', () => {
     it('should return all the keys for a user', async () => {
-      keyMock.getByUserId.mockResolvedValue([keyStub.admin]);
+      mocks.apiKey.getByUserId.mockResolvedValue([keyStub.admin]);
 
       await expect(sut.getAll(authStub.admin)).resolves.toHaveLength(1);
 
-      expect(keyMock.getByUserId).toHaveBeenCalledWith(authStub.admin.user.id);
+      expect(mocks.apiKey.getByUserId).toHaveBeenCalledWith(authStub.admin.user.id);
     });
   });
 });

server/src/services/asset-media.service.spec.ts

@@ -10,10 +10,7 @@ import { AssetMediaCreateDto, AssetMediaReplaceDto, AssetMediaSize, UploadFieldN
 import { AssetFileEntity } from 'src/entities/asset-files.entity';
 import { ASSET_CHECKSUM_CONSTRAINT, AssetEntity } from 'src/entities/asset.entity';
 import { AssetFileType, AssetStatus, AssetType, CacheControl } from 'src/enum';
-import { IAssetRepository } from 'src/interfaces/asset.interface';
-import { IJobRepository, JobName } from 'src/interfaces/job.interface';
-import { IStorageRepository } from 'src/interfaces/storage.interface';
-import { IUserRepository } from 'src/interfaces/user.interface';
+import { JobName } from 'src/interfaces/job.interface';
 import { AuthRequest } from 'src/middleware/auth.guard';
 import { AssetMediaService } from 'src/services/asset-media.service';
 import { ImmichFileResponse } from 'src/utils/file';
@@ -21,9 +18,7 @@ import { assetStub } from 'test/fixtures/asset.stub';
 import { authStub } from 'test/fixtures/auth.stub';
 import { fileStub } from 'test/fixtures/file.stub';
 import { userStub } from 'test/fixtures/user.stub';
-import { IAccessRepositoryMock } from 'test/repositories/access.repository.mock';
-import { newTestService } from 'test/utils';
-import { Mocked } from 'vitest';
+import { newTestService, ServiceMocks } from 'test/utils';
 
 const file1 = Buffer.from('d2947b871a706081be194569951b7db246907957', 'hex');
 
@@ -203,15 +198,10 @@ const copiedAsset = Object.freeze({
 
 describe(AssetMediaService.name, () => {
   let sut: AssetMediaService;
-
-  let accessMock: IAccessRepositoryMock;
-  let assetMock: Mocked<IAssetRepository>;
-  let jobMock: Mocked<IJobRepository>;
-  let storageMock: Mocked<IStorageRepository>;
-  let userMock: Mocked<IUserRepository>;
+  let mocks: ServiceMocks;
 
   beforeEach(() => {
-    ({ sut, accessMock, assetMock, jobMock, storageMock, userMock } = newTestService(AssetMediaService));
+    ({ sut, mocks } = newTestService(AssetMediaService));
   });
 
   describe('getUploadAssetIdByChecksum', () => {
@@ -221,25 +211,25 @@ describe(AssetMediaService.name, () => {
 
     it('should handle a non-existent asset', async () => {
       await expect(sut.getUploadAssetIdByChecksum(authStub.admin, file1.toString('hex'))).resolves.toBeUndefined();
-      expect(assetMock.getUploadAssetIdByChecksum).toHaveBeenCalledWith(authStub.admin.user.id, file1);
+      expect(mocks.asset.getUploadAssetIdByChecksum).toHaveBeenCalledWith(authStub.admin.user.id, file1);
     });
 
     it('should find an existing asset', async () => {
-      assetMock.getUploadAssetIdByChecksum.mockResolvedValue('asset-id');
+      mocks.asset.getUploadAssetIdByChecksum.mockResolvedValue('asset-id');
       await expect(sut.getUploadAssetIdByChecksum(authStub.admin, file1.toString('hex'))).resolves.toEqual({
         id: 'asset-id',
         status: AssetMediaStatus.DUPLICATE,
       });
-      expect(assetMock.getUploadAssetIdByChecksum).toHaveBeenCalledWith(authStub.admin.user.id, file1);
+      expect(mocks.asset.getUploadAssetIdByChecksum).toHaveBeenCalledWith(authStub.admin.user.id, file1);
     });
 
     it('should find an existing asset by base64', async () => {
-      assetMock.getUploadAssetIdByChecksum.mockResolvedValue('asset-id');
+      mocks.asset.getUploadAssetIdByChecksum.mockResolvedValue('asset-id');
       await expect(sut.getUploadAssetIdByChecksum(authStub.admin, file1.toString('base64'))).resolves.toEqual({
         id: 'asset-id',
         status: AssetMediaStatus.DUPLICATE,
       });
-      expect(assetMock.getUploadAssetIdByChecksum).toHaveBeenCalledWith(authStub.admin.user.id, file1);
+      expect(mocks.asset.getUploadAssetIdByChecksum).toHaveBeenCalledWith(authStub.admin.user.id, file1);
     });
   });
 
@@ -308,14 +298,14 @@ describe(AssetMediaService.name, () => {
       expect(sut.getUploadFolder(uploadFile.filename(UploadFieldName.PROFILE_DATA, 'image.jpg'))).toEqual(
         'upload/profile/admin_id',
       );
-      expect(storageMock.mkdirSync).toHaveBeenCalledWith('upload/profile/admin_id');
+      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith('upload/profile/admin_id');
     });
 
     it('should return upload for everything else', () => {
       expect(sut.getUploadFolder(uploadFile.filename(UploadFieldName.ASSET_DATA, 'image.jpg'))).toEqual(
         'upload/upload/admin_id/ra/nd',
       );
-      expect(storageMock.mkdirSync).toHaveBeenCalledWith('upload/upload/admin_id/ra/nd');
+      expect(mocks.storage.mkdirSync).toHaveBeenCalledWith('upload/upload/admin_id/ra/nd');
     });
   });
 
@@ -330,7 +320,7 @@ describe(AssetMediaService.name, () => {
         size: 42,
       };
 
-      assetMock.create.mockResolvedValue(assetEntity);
+      mocks.asset.create.mockResolvedValue(assetEntity);
 
       await expect(
         sut.uploadAsset(
@@ -340,9 +330,9 @@ describe(AssetMediaService.name, () => {
         ),
       ).rejects.toBeInstanceOf(BadRequestException);
 
-      expect(assetMock.create).not.toHaveBeenCalled();
-      expect(userMock.updateUsage).not.toHaveBeenCalledWith(authStub.user1.user.id, file.size);
-      expect(storageMock.utimes).not.toHaveBeenCalledWith(
+      expect(mocks.asset.create).not.toHaveBeenCalled();
+      expect(mocks.user.updateUsage).not.toHaveBeenCalledWith(authStub.user1.user.id, file.size);
+      expect(mocks.storage.utimes).not.toHaveBeenCalledWith(
         file.originalPath,
         expect.any(Date),
         new Date(createDto.fileModifiedAt),
@@ -359,16 +349,16 @@ describe(AssetMediaService.name, () => {
         size: 42,
       };
 
-      assetMock.create.mockResolvedValue(assetEntity);
+      mocks.asset.create.mockResolvedValue(assetEntity);
 
       await expect(sut.uploadAsset(authStub.user1, createDto, file)).resolves.toEqual({
         id: 'id_1',
         status: AssetMediaStatus.CREATED,
       });
 
-      expect(assetMock.create).toHaveBeenCalled();
-      expect(userMock.updateUsage).toHaveBeenCalledWith(authStub.user1.user.id, file.size);
-      expect(storageMock.utimes).toHaveBeenCalledWith(
+      expect(mocks.asset.create).toHaveBeenCalled();
+      expect(mocks.user.updateUsage).toHaveBeenCalledWith(authStub.user1.user.id, file.size);
+      expect(mocks.storage.utimes).toHaveBeenCalledWith(
         file.originalPath,
         expect.any(Date),
         new Date(createDto.fileModifiedAt),
@@ -387,19 +377,19 @@ describe(AssetMediaService.name, () => {
       const error = new Error('unique key violation');
       (error as any).constraint_name = ASSET_CHECKSUM_CONSTRAINT;
 
-      assetMock.create.mockRejectedValue(error);
-      assetMock.getUploadAssetIdByChecksum.mockResolvedValue(assetEntity.id);
+      mocks.asset.create.mockRejectedValue(error);
+      mocks.asset.getUploadAssetIdByChecksum.mockResolvedValue(assetEntity.id);
 
       await expect(sut.uploadAsset(authStub.user1, createDto, file)).resolves.toEqual({
         id: 'id_1',
         status: AssetMediaStatus.DUPLICATE,
       });
 
-      expect(jobMock.queue).toHaveBeenCalledWith({
+      expect(mocks.job.queue).toHaveBeenCalledWith({
         name: JobName.DELETE_FILES,
         data: { files: ['fake_path/asset_1.jpeg', undefined] },
       });
-      expect(userMock.updateUsage).not.toHaveBeenCalled();
+      expect(mocks.user.updateUsage).not.toHaveBeenCalled();
     });
 
     it('should throw an error if the duplicate could not be found by checksum', async () => {
@@ -414,22 +404,22 @@ describe(AssetMediaService.name, () => {
       const error = new Error('unique key violation');
       (error as any).constraint_name = ASSET_CHECKSUM_CONSTRAINT;
 
-      assetMock.create.mockRejectedValue(error);
+      mocks.asset.create.mockRejectedValue(error);
 
       await expect(sut.uploadAsset(authStub.user1, createDto, file)).rejects.toBeInstanceOf(
         InternalServerErrorException,
       );
 
-      expect(jobMock.queue).toHaveBeenCalledWith({
+      expect(mocks.job.queue).toHaveBeenCalledWith({
         name: JobName.DELETE_FILES,
         data: { files: ['fake_path/asset_1.jpeg', undefined] },
       });
-      expect(userMock.updateUsage).not.toHaveBeenCalled();
+      expect(mocks.user.updateUsage).not.toHaveBeenCalled();
     });
 
     it('should handle a live photo', async () => {
-      assetMock.getById.mockResolvedValueOnce(assetStub.livePhotoMotionAsset);
-      assetMock.create.mockResolvedValueOnce(assetStub.livePhotoStillAsset);
+      mocks.asset.getById.mockResolvedValueOnce(assetStub.livePhotoMotionAsset);
+      mocks.asset.create.mockResolvedValueOnce(assetStub.livePhotoStillAsset);
 
       await expect(
         sut.uploadAsset(
@@ -442,13 +432,13 @@ describe(AssetMediaService.name, () => {
         id: 'live-photo-still-asset',
       });
 
-      expect(assetMock.getById).toHaveBeenCalledWith('live-photo-motion-asset');
-      expect(assetMock.update).not.toHaveBeenCalled();
+      expect(mocks.asset.getById).toHaveBeenCalledWith('live-photo-motion-asset');
+      expect(mocks.asset.update).not.toHaveBeenCalled();
     });
 
     it('should hide the linked motion asset', async () => {
-      assetMock.getById.mockResolvedValueOnce({ ...assetStub.livePhotoMotionAsset, isVisible: true });
-      assetMock.create.mockResolvedValueOnce(assetStub.livePhotoStillAsset);
+      mocks.asset.getById.mockResolvedValueOnce({ ...assetStub.livePhotoMotionAsset, isVisible: true });
+      mocks.asset.create.mockResolvedValueOnce(assetStub.livePhotoStillAsset);
 
       await expect(
         sut.uploadAsset(
@@ -461,25 +451,25 @@ describe(AssetMediaService.name, () => {
         id: 'live-photo-still-asset',
       });
 
-      expect(assetMock.getById).toHaveBeenCalledWith('live-photo-motion-asset');
-      expect(assetMock.update).toHaveBeenCalledWith({ id: 'live-photo-motion-asset', isVisible: false });
+      expect(mocks.asset.getById).toHaveBeenCalledWith('live-photo-motion-asset');
+      expect(mocks.asset.update).toHaveBeenCalledWith({ id: 'live-photo-motion-asset', isVisible: false });
     });
 
     it('should handle a sidecar file', async () => {
-      assetMock.getById.mockResolvedValueOnce(assetStub.image);
-      assetMock.create.mockResolvedValueOnce(assetStub.image);
+      mocks.asset.getById.mockResolvedValueOnce(assetStub.image);
+      mocks.asset.create.mockResolvedValueOnce(assetStub.image);
 
       await expect(sut.uploadAsset(authStub.user1, createDto, fileStub.photo, fileStub.photoSidecar)).resolves.toEqual({
         status: AssetMediaStatus.CREATED,
         id: assetStub.image.id,
       });
 
-      expect(storageMock.utimes).toHaveBeenCalledWith(
+      expect(mocks.storage.utimes).toHaveBeenCalledWith(
         fileStub.photoSidecar.originalPath,
         expect.any(Date),
         new Date(createDto.fileModifiedAt),
       );
-      expect(assetMock.update).not.toHaveBeenCalled();
+      expect(mocks.asset.update).not.toHaveBeenCalled();
     });
   });
 
@@ -487,22 +477,22 @@ describe(AssetMediaService.name, () => {
     it('should require the asset.download permission', async () => {
       await expect(sut.downloadOriginal(authStub.admin, 'asset-1')).rejects.toBeInstanceOf(BadRequestException);
 
-      expect(accessMock.asset.checkOwnerAccess).toHaveBeenCalledWith(authStub.admin.user.id, new Set(['asset-1']));
-      expect(accessMock.asset.checkAlbumAccess).toHaveBeenCalledWith(authStub.admin.user.id, new Set(['asset-1']));
-      expect(accessMock.asset.checkPartnerAccess).toHaveBeenCalledWith(authStub.admin.user.id, new Set(['asset-1']));
+      expect(mocks.access.asset.checkOwnerAccess).toHaveBeenCalledWith(authStub.admin.user.id, new Set(['asset-1']));
+      expect(mocks.access.asset.checkAlbumAccess).toHaveBeenCalledWith(authStub.admin.user.id, new Set(['asset-1']));
+      expect(mocks.access.asset.checkPartnerAccess).toHaveBeenCalledWith(authStub.admin.user.id, new Set(['asset-1']));
     });
 
     it('should throw an error if the asset is not found', async () => {
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
 
       await expect(sut.downloadOriginal(authStub.admin, 'asset-1')).rejects.toBeInstanceOf(NotFoundException);
 
-      expect(assetMock.getById).toHaveBeenCalledWith('asset-1', { files: true });
+      expect(mocks.asset.getById).toHaveBeenCalledWith('asset-1', { files: true });
     });
 
     it('should download a file', async () => {
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
-      assetMock.getById.mockResolvedValue(assetStub.image);
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
+      mocks.asset.getById.mockResolvedValue(assetStub.image);
 
       await expect(sut.downloadOriginal(authStub.admin, 'asset-1')).resolves.toEqual(
         new ImmichFileResponse({
@@ -518,13 +508,13 @@ describe(AssetMediaService.name, () => {
     it('should require asset.view permissions', async () => {
       await expect(sut.viewThumbnail(authStub.admin, 'id', {})).rejects.toBeInstanceOf(BadRequestException);
 
-      expect(accessMock.asset.checkOwnerAccess).toHaveBeenCalledWith(userStub.admin.id, new Set(['id']));
-      expect(accessMock.asset.checkAlbumAccess).toHaveBeenCalledWith(userStub.admin.id, new Set(['id']));
-      expect(accessMock.asset.checkPartnerAccess).toHaveBeenCalledWith(userStub.admin.id, new Set(['id']));
+      expect(mocks.access.asset.checkOwnerAccess).toHaveBeenCalledWith(userStub.admin.id, new Set(['id']));
+      expect(mocks.access.asset.checkAlbumAccess).toHaveBeenCalledWith(userStub.admin.id, new Set(['id']));
+      expect(mocks.access.asset.checkPartnerAccess).toHaveBeenCalledWith(userStub.admin.id, new Set(['id']));
     });
 
     it('should throw an error if the asset does not exist', async () => {
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.image.id]));
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.image.id]));
 
       await expect(
         sut.viewThumbnail(authStub.admin, assetStub.image.id, { size: AssetMediaSize.PREVIEW }),
@@ -532,8 +522,8 @@ describe(AssetMediaService.name, () => {
     });
 
     it('should throw an error if the requested thumbnail file does not exist', async () => {
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.image.id]));
-      assetMock.getById.mockResolvedValue({ ...assetStub.image, files: [] });
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.image.id]));
+      mocks.asset.getById.mockResolvedValue({ ...assetStub.image, files: [] });
 
       await expect(
         sut.viewThumbnail(authStub.admin, assetStub.image.id, { size: AssetMediaSize.THUMBNAIL }),
@@ -541,8 +531,8 @@ describe(AssetMediaService.name, () => {
     });
 
     it('should throw an error if the requested preview file does not exist', async () => {
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.image.id]));
-      assetMock.getById.mockResolvedValue({
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.image.id]));
+      mocks.asset.getById.mockResolvedValue({
         ...assetStub.image,
         files: [
           {
@@ -561,8 +551,8 @@ describe(AssetMediaService.name, () => {
     });
 
     it('should fall back to preview if the requested thumbnail file does not exist', async () => {
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.image.id]));
-      assetMock.getById.mockResolvedValue({
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.image.id]));
+      mocks.asset.getById.mockResolvedValue({
         ...assetStub.image,
         files: [
           {
@@ -589,8 +579,8 @@ describe(AssetMediaService.name, () => {
     });
 
     it('should get preview file', async () => {
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.image.id]));
-      assetMock.getById.mockResolvedValue({ ...assetStub.image });
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.image.id]));
+      mocks.asset.getById.mockResolvedValue({ ...assetStub.image });
       await expect(
         sut.viewThumbnail(authStub.admin, assetStub.image.id, { size: AssetMediaSize.PREVIEW }),
       ).resolves.toEqual(
@@ -604,8 +594,8 @@ describe(AssetMediaService.name, () => {
     });
 
     it('should get thumbnail file', async () => {
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.image.id]));
-      assetMock.getById.mockResolvedValue({ ...assetStub.image });
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.image.id]));
+      mocks.asset.getById.mockResolvedValue({ ...assetStub.image });
       await expect(
         sut.viewThumbnail(authStub.admin, assetStub.image.id, { size: AssetMediaSize.THUMBNAIL }),
       ).resolves.toEqual(
@@ -623,27 +613,27 @@ describe(AssetMediaService.name, () => {
     it('should require asset.view permissions', async () => {
       await expect(sut.playbackVideo(authStub.admin, 'id')).rejects.toBeInstanceOf(BadRequestException);
 
-      expect(accessMock.asset.checkOwnerAccess).toHaveBeenCalledWith(userStub.admin.id, new Set(['id']));
-      expect(accessMock.asset.checkAlbumAccess).toHaveBeenCalledWith(userStub.admin.id, new Set(['id']));
-      expect(accessMock.asset.checkPartnerAccess).toHaveBeenCalledWith(userStub.admin.id, new Set(['id']));
+      expect(mocks.access.asset.checkOwnerAccess).toHaveBeenCalledWith(userStub.admin.id, new Set(['id']));
+      expect(mocks.access.asset.checkAlbumAccess).toHaveBeenCalledWith(userStub.admin.id, new Set(['id']));
+      expect(mocks.access.asset.checkPartnerAccess).toHaveBeenCalledWith(userStub.admin.id, new Set(['id']));
     });
 
     it('should throw an error if the asset does not exist', async () => {
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.image.id]));
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.image.id]));
 
       await expect(sut.playbackVideo(authStub.admin, assetStub.image.id)).rejects.toBeInstanceOf(NotFoundException);
     });
 
     it('should throw an error if the asset is not a video', async () => {
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.image.id]));
-      assetMock.getById.mockResolvedValue(assetStub.image);
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.image.id]));
+      mocks.asset.getById.mockResolvedValue(assetStub.image);
 
       await expect(sut.playbackVideo(authStub.admin, assetStub.image.id)).rejects.toBeInstanceOf(BadRequestException);
     });
 
     it('should return the encoded video path if available', async () => {
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.hasEncodedVideo.id]));
-      assetMock.getById.mockResolvedValue(assetStub.hasEncodedVideo);
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.hasEncodedVideo.id]));
+      mocks.asset.getById.mockResolvedValue(assetStub.hasEncodedVideo);
 
       await expect(sut.playbackVideo(authStub.admin, assetStub.hasEncodedVideo.id)).resolves.toEqual(
         new ImmichFileResponse({
@@ -655,8 +645,8 @@ describe(AssetMediaService.name, () => {
     });
 
     it('should fall back to the original path', async () => {
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.video.id]));
-      assetMock.getById.mockResolvedValue(assetStub.video);
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.video.id]));
+      mocks.asset.getById.mockResolvedValue(assetStub.video);
 
       await expect(sut.playbackVideo(authStub.admin, assetStub.video.id)).resolves.toEqual(
         new ImmichFileResponse({
@@ -670,12 +660,12 @@ describe(AssetMediaService.name, () => {
 
   describe('checkExistingAssets', () => {
     it('should get existing asset ids', async () => {
-      assetMock.getByDeviceIds.mockResolvedValue(['42']);
+      mocks.asset.getByDeviceIds.mockResolvedValue(['42']);
       await expect(
         sut.checkExistingAssets(authStub.admin, { deviceId: '420', deviceAssetIds: ['69'] }),
       ).resolves.toEqual({ existingIds: ['42'] });
 
-      expect(assetMock.getByDeviceIds).toHaveBeenCalledWith(userStub.admin.id, '420', ['69']);
+      expect(mocks.asset.getByDeviceIds).toHaveBeenCalledWith(userStub.admin.id, '420', ['69']);
     });
   });
 
@@ -685,26 +675,26 @@ describe(AssetMediaService.name, () => {
         'Not found or no asset.update access',
       );
 
-      expect(assetMock.create).not.toHaveBeenCalled();
+      expect(mocks.asset.create).not.toHaveBeenCalled();
     });
 
     it('should update a photo with no sidecar to photo with no sidecar', async () => {
       const updatedFile = fileStub.photo;
       const updatedAsset = { ...existingAsset, ...updatedFile };
-      assetMock.getById.mockResolvedValueOnce(existingAsset);
-      assetMock.getById.mockResolvedValueOnce(updatedAsset);
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set([existingAsset.id]));
+      mocks.asset.getById.mockResolvedValueOnce(existingAsset);
+      mocks.asset.getById.mockResolvedValueOnce(updatedAsset);
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([existingAsset.id]));
       // this is the original file size
-      storageMock.stat.mockResolvedValue({ size: 0 } as Stats);
+      mocks.storage.stat.mockResolvedValue({ size: 0 } as Stats);
       // this is for the clone call
-      assetMock.create.mockResolvedValue(copiedAsset);
+      mocks.asset.create.mockResolvedValue(copiedAsset);
 
       await expect(sut.replaceAsset(authStub.user1, existingAsset.id, replaceDto, updatedFile)).resolves.toEqual({
         status: AssetMediaStatus.REPLACED,
         id: 'copied-asset',
       });
 
-      expect(assetMock.update).toHaveBeenCalledWith(
+      expect(mocks.asset.update).toHaveBeenCalledWith(
         expect.objectContaining({
           id: existingAsset.id,
           sidecarPath: null,
@@ -712,7 +702,7 @@ describe(AssetMediaService.name, () => {
           originalPath: 'fake_path/photo1.jpeg',
         }),
       );
-      expect(assetMock.create).toHaveBeenCalledWith(
+      expect(mocks.asset.create).toHaveBeenCalledWith(
         expect.objectContaining({
           sidecarPath: null,
           originalFileName: 'existing-filename.jpeg',
@@ -720,12 +710,12 @@ describe(AssetMediaService.name, () => {
         }),
       );
 
-      expect(assetMock.updateAll).toHaveBeenCalledWith([copiedAsset.id], {
+      expect(mocks.asset.updateAll).toHaveBeenCalledWith([copiedAsset.id], {
         deletedAt: expect.any(Date),
         status: AssetStatus.TRASHED,
       });
-      expect(userMock.updateUsage).toHaveBeenCalledWith(authStub.user1.user.id, updatedFile.size);
-      expect(storageMock.utimes).toHaveBeenCalledWith(
+      expect(mocks.user.updateUsage).toHaveBeenCalledWith(authStub.user1.user.id, updatedFile.size);
+      expect(mocks.storage.utimes).toHaveBeenCalledWith(
         updatedFile.originalPath,
         expect.any(Date),
         new Date(replaceDto.fileModifiedAt),
@@ -736,13 +726,13 @@ describe(AssetMediaService.name, () => {
       const updatedFile = fileStub.photo;
       const sidecarFile = fileStub.photoSidecar;
       const updatedAsset = { ...sidecarAsset, ...updatedFile };
-      assetMock.getById.mockResolvedValueOnce(existingAsset);
-      assetMock.getById.mockResolvedValueOnce(updatedAsset);
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set([sidecarAsset.id]));
+      mocks.asset.getById.mockResolvedValueOnce(existingAsset);
+      mocks.asset.getById.mockResolvedValueOnce(updatedAsset);
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([sidecarAsset.id]));
       // this is the original file size
-      storageMock.stat.mockResolvedValue({ size: 0 } as Stats);
+      mocks.storage.stat.mockResolvedValue({ size: 0 } as Stats);
       // this is for the clone call
-      assetMock.create.mockResolvedValue(copiedAsset);
+      mocks.asset.create.mockResolvedValue(copiedAsset);
 
       await expect(
         sut.replaceAsset(authStub.user1, sidecarAsset.id, replaceDto, updatedFile, sidecarFile),
@@ -751,12 +741,12 @@ describe(AssetMediaService.name, () => {
         id: 'copied-asset',
       });
 
-      expect(assetMock.updateAll).toHaveBeenCalledWith([copiedAsset.id], {
+      expect(mocks.asset.updateAll).toHaveBeenCalledWith([copiedAsset.id], {
         deletedAt: expect.any(Date),
         status: AssetStatus.TRASHED,
       });
-      expect(userMock.updateUsage).toHaveBeenCalledWith(authStub.user1.user.id, updatedFile.size);
-      expect(storageMock.utimes).toHaveBeenCalledWith(
+      expect(mocks.user.updateUsage).toHaveBeenCalledWith(authStub.user1.user.id, updatedFile.size);
+      expect(mocks.storage.utimes).toHaveBeenCalledWith(
         updatedFile.originalPath,
         expect.any(Date),
         new Date(replaceDto.fileModifiedAt),
@@ -767,25 +757,25 @@ describe(AssetMediaService.name, () => {
       const updatedFile = fileStub.photo;
 
       const updatedAsset = { ...sidecarAsset, ...updatedFile };
-      assetMock.getById.mockResolvedValueOnce(sidecarAsset);
-      assetMock.getById.mockResolvedValueOnce(updatedAsset);
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set([sidecarAsset.id]));
+      mocks.asset.getById.mockResolvedValueOnce(sidecarAsset);
+      mocks.asset.getById.mockResolvedValueOnce(updatedAsset);
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([sidecarAsset.id]));
       // this is the original file size
-      storageMock.stat.mockResolvedValue({ size: 0 } as Stats);
+      mocks.storage.stat.mockResolvedValue({ size: 0 } as Stats);
       // this is for the copy call
-      assetMock.create.mockResolvedValue(copiedAsset);
+      mocks.asset.create.mockResolvedValue(copiedAsset);
 
       await expect(sut.replaceAsset(authStub.user1, existingAsset.id, replaceDto, updatedFile)).resolves.toEqual({
         status: AssetMediaStatus.REPLACED,
         id: 'copied-asset',
       });
 
-      expect(assetMock.updateAll).toHaveBeenCalledWith([copiedAsset.id], {
+      expect(mocks.asset.updateAll).toHaveBeenCalledWith([copiedAsset.id], {
         deletedAt: expect.any(Date),
         status: AssetStatus.TRASHED,
       });
-      expect(userMock.updateUsage).toHaveBeenCalledWith(authStub.user1.user.id, updatedFile.size);
-      expect(storageMock.utimes).toHaveBeenCalledWith(
+      expect(mocks.user.updateUsage).toHaveBeenCalledWith(authStub.user1.user.id, updatedFile.size);
+      expect(mocks.storage.utimes).toHaveBeenCalledWith(
         updatedFile.originalPath,
         expect.any(Date),
         new Date(replaceDto.fileModifiedAt),
@@ -797,27 +787,27 @@ describe(AssetMediaService.name, () => {
       const error = new Error('unique key violation');
       (error as any).constraint_name = ASSET_CHECKSUM_CONSTRAINT;
 
-      assetMock.update.mockRejectedValue(error);
-      assetMock.getById.mockResolvedValueOnce(sidecarAsset);
-      assetMock.getUploadAssetIdByChecksum.mockResolvedValue(sidecarAsset.id);
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set([sidecarAsset.id]));
+      mocks.asset.update.mockRejectedValue(error);
+      mocks.asset.getById.mockResolvedValueOnce(sidecarAsset);
+      mocks.asset.getUploadAssetIdByChecksum.mockResolvedValue(sidecarAsset.id);
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([sidecarAsset.id]));
       // this is the original file size
-      storageMock.stat.mockResolvedValue({ size: 0 } as Stats);
+      mocks.storage.stat.mockResolvedValue({ size: 0 } as Stats);
       // this is for the clone call
-      assetMock.create.mockResolvedValue(copiedAsset);
+      mocks.asset.create.mockResolvedValue(copiedAsset);
 
       await expect(sut.replaceAsset(authStub.user1, sidecarAsset.id, replaceDto, updatedFile)).resolves.toEqual({
         status: AssetMediaStatus.DUPLICATE,
         id: sidecarAsset.id,
       });
 
-      expect(assetMock.create).not.toHaveBeenCalled();
-      expect(assetMock.updateAll).not.toHaveBeenCalled();
-      expect(jobMock.queue).toHaveBeenCalledWith({
+      expect(mocks.asset.create).not.toHaveBeenCalled();
+      expect(mocks.asset.updateAll).not.toHaveBeenCalled();
+      expect(mocks.job.queue).toHaveBeenCalledWith({
         name: JobName.DELETE_FILES,
         data: { files: [updatedFile.originalPath, undefined] },
       });
-      expect(userMock.updateUsage).not.toHaveBeenCalled();
+      expect(mocks.user.updateUsage).not.toHaveBeenCalled();
     });
   });
 
@@ -826,7 +816,7 @@ describe(AssetMediaService.name, () => {
       const file1 = Buffer.from('d2947b871a706081be194569951b7db246907957', 'hex');
       const file2 = Buffer.from('53be335e99f18a66ff12e9a901c7a6171dd76573', 'hex');
 
-      assetMock.getByChecksums.mockResolvedValue([
+      mocks.asset.getByChecksums.mockResolvedValue([
         { id: 'asset-1', checksum: file1 } as AssetEntity,
         { id: 'asset-2', checksum: file2 } as AssetEntity,
       ]);
@@ -857,14 +847,14 @@ describe(AssetMediaService.name, () => {
         ],
       });
 
-      expect(assetMock.getByChecksums).toHaveBeenCalledWith(authStub.admin.user.id, [file1, file2]);
+      expect(mocks.asset.getByChecksums).toHaveBeenCalledWith(authStub.admin.user.id, [file1, file2]);
     });
 
     it('should return non-duplicates as well', async () => {
       const file1 = Buffer.from('d2947b871a706081be194569951b7db246907957', 'hex');
       const file2 = Buffer.from('53be335e99f18a66ff12e9a901c7a6171dd76573', 'hex');
 
-      assetMock.getByChecksums.mockResolvedValue([{ id: 'asset-1', checksum: file1 } as AssetEntity]);
+      mocks.asset.getByChecksums.mockResolvedValue([{ id: 'asset-1', checksum: file1 } as AssetEntity]);
 
       await expect(
         sut.bulkUploadCheck(authStub.admin, {
@@ -889,7 +879,7 @@ describe(AssetMediaService.name, () => {
         ],
       });
 
-      expect(assetMock.getByChecksums).toHaveBeenCalledWith(authStub.admin.user.id, [file1, file2]);
+      expect(mocks.asset.getByChecksums).toHaveBeenCalledWith(authStub.admin.user.id, [file1, file2]);
     });
   });
 
@@ -910,7 +900,7 @@ describe(AssetMediaService.name, () => {
 
       await sut.onUploadError(request, file);
 
-      expect(jobMock.queue).toHaveBeenCalledWith({
+      expect(mocks.job.queue).toHaveBeenCalledWith({
         name: JobName.DELETE_FILES,
         data: { files: ['upload/upload/user-id/ra/nd/random-uuid.jpg'] },
       });

server/src/services/asset.service.spec.ts

@@ -4,22 +4,16 @@ import { mapAsset } from 'src/dtos/asset-response.dto';
 import { AssetJobName, AssetStatsResponseDto } from 'src/dtos/asset.dto';
 import { AssetEntity } from 'src/entities/asset.entity';
 import { AssetStatus, AssetType } from 'src/enum';
-import { AssetStats, IAssetRepository } from 'src/interfaces/asset.interface';
-import { IEventRepository } from 'src/interfaces/event.interface';
-import { IJobRepository, JobName, JobStatus } from 'src/interfaces/job.interface';
-import { IPartnerRepository } from 'src/interfaces/partner.interface';
-import { IStackRepository } from 'src/interfaces/stack.interface';
-import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
-import { IUserRepository } from 'src/interfaces/user.interface';
+import { AssetStats } from 'src/interfaces/asset.interface';
+import { JobName, JobStatus } from 'src/interfaces/job.interface';
 import { AssetService } from 'src/services/asset.service';
 import { assetStub } from 'test/fixtures/asset.stub';
 import { authStub } from 'test/fixtures/auth.stub';
 import { faceStub } from 'test/fixtures/face.stub';
 import { partnerStub } from 'test/fixtures/partner.stub';
 import { userStub } from 'test/fixtures/user.stub';
-import { IAccessRepositoryMock } from 'test/repositories/access.repository.mock';
-import { newTestService } from 'test/utils';
-import { Mocked, vitest } from 'vitest';
+import { newTestService, ServiceMocks } from 'test/utils';
+import { vitest } from 'vitest';
 
 const stats: AssetStats = {
   [AssetType.IMAGE]: 10,
@@ -36,27 +30,18 @@ const statResponse: AssetStatsResponseDto = {
 
 describe(AssetService.name, () => {
   let sut: AssetService;
-
-  let accessMock: IAccessRepositoryMock;
-  let assetMock: Mocked<IAssetRepository>;
-  let eventMock: Mocked<IEventRepository>;
-  let jobMock: Mocked<IJobRepository>;
-  let partnerMock: Mocked<IPartnerRepository>;
-  let stackMock: Mocked<IStackRepository>;
-  let systemMock: Mocked<ISystemMetadataRepository>;
-  let userMock: Mocked<IUserRepository>;
+  let mocks: ServiceMocks;
 
   it('should work', () => {
     expect(sut).toBeDefined();
   });
 
   const mockGetById = (assets: AssetEntity[]) => {
-    assetMock.getById.mockImplementation((assetId) => Promise.resolve(assets.find((asset) => asset.id === assetId)));
+    mocks.asset.getById.mockImplementation((assetId) => Promise.resolve(assets.find((asset) => asset.id === assetId)));
   };
 
   beforeEach(() => {
-    ({ sut, accessMock, assetMock, eventMock, jobMock, partnerMock, stackMock, systemMock, userMock } =
-      newTestService(AssetService));
+    ({ sut, mocks } = newTestService(AssetService));
 
     mockGetById([assetStub.livePhotoStillAsset, assetStub.livePhotoMotionAsset]);
   });
@@ -77,8 +62,8 @@ describe(AssetService.name, () => {
       const image3 = { ...assetStub.image, localDateTime: new Date(2015, 1, 15) };
       const image4 = { ...assetStub.image, localDateTime: new Date(2009, 1, 15) };
 
-      partnerMock.getAll.mockResolvedValue([]);
-      assetMock.getByDayOfYear.mockResolvedValue([
+      mocks.partner.getAll.mockResolvedValue([]);
+      mocks.asset.getByDayOfYear.mockResolvedValue([
         {
           yearsAgo: 1,
           assets: [image1, image2],
@@ -99,16 +84,16 @@ describe(AssetService.name, () => {
         { yearsAgo: 15, title: '15 years ago', assets: [mapAsset(image4)] },
       ]);
 
-      expect(assetMock.getByDayOfYear.mock.calls).toEqual([[[authStub.admin.user.id], { day: 15, month: 1 }]]);
+      expect(mocks.asset.getByDayOfYear.mock.calls).toEqual([[[authStub.admin.user.id], { day: 15, month: 1 }]]);
     });
 
     it('should get memories with partners with inTimeline enabled', async () => {
-      partnerMock.getAll.mockResolvedValue([partnerStub.user1ToAdmin1]);
-      assetMock.getByDayOfYear.mockResolvedValue([]);
+      mocks.partner.getAll.mockResolvedValue([partnerStub.user1ToAdmin1]);
+      mocks.asset.getByDayOfYear.mockResolvedValue([]);
 
       await sut.getMemoryLane(authStub.admin, { day: 15, month: 1 });
 
-      expect(assetMock.getByDayOfYear.mock.calls).toEqual([
+      expect(mocks.asset.getByDayOfYear.mock.calls).toEqual([
         [[authStub.admin.user.id, userStub.user1.id], { day: 15, month: 1 }],
       ]);
     });
@@ -116,76 +101,76 @@ describe(AssetService.name, () => {
 
   describe('getStatistics', () => {
     it('should get the statistics for a user, excluding archived assets', async () => {
-      assetMock.getStatistics.mockResolvedValue(stats);
+      mocks.asset.getStatistics.mockResolvedValue(stats);
       await expect(sut.getStatistics(authStub.admin, { isArchived: false })).resolves.toEqual(statResponse);
-      expect(assetMock.getStatistics).toHaveBeenCalledWith(authStub.admin.user.id, { isArchived: false });
+      expect(mocks.asset.getStatistics).toHaveBeenCalledWith(authStub.admin.user.id, { isArchived: false });
     });
 
     it('should get the statistics for a user for archived assets', async () => {
-      assetMock.getStatistics.mockResolvedValue(stats);
+      mocks.asset.getStatistics.mockResolvedValue(stats);
       await expect(sut.getStatistics(authStub.admin, { isArchived: true })).resolves.toEqual(statResponse);
-      expect(assetMock.getStatistics).toHaveBeenCalledWith(authStub.admin.user.id, { isArchived: true });
+      expect(mocks.asset.getStatistics).toHaveBeenCalledWith(authStub.admin.user.id, { isArchived: true });
     });
 
     it('should get the statistics for a user for favorite assets', async () => {
-      assetMock.getStatistics.mockResolvedValue(stats);
+      mocks.asset.getStatistics.mockResolvedValue(stats);
       await expect(sut.getStatistics(authStub.admin, { isFavorite: true })).resolves.toEqual(statResponse);
-      expect(assetMock.getStatistics).toHaveBeenCalledWith(authStub.admin.user.id, { isFavorite: true });
+      expect(mocks.asset.getStatistics).toHaveBeenCalledWith(authStub.admin.user.id, { isFavorite: true });
     });
 
     it('should get the statistics for a user for all assets', async () => {
-      assetMock.getStatistics.mockResolvedValue(stats);
+      mocks.asset.getStatistics.mockResolvedValue(stats);
       await expect(sut.getStatistics(authStub.admin, {})).resolves.toEqual(statResponse);
-      expect(assetMock.getStatistics).toHaveBeenCalledWith(authStub.admin.user.id, {});
+      expect(mocks.asset.getStatistics).toHaveBeenCalledWith(authStub.admin.user.id, {});
     });
   });
 
   describe('getRandom', () => {
     it('should get own random assets', async () => {
-      assetMock.getRandom.mockResolvedValue([assetStub.image]);
+      mocks.asset.getRandom.mockResolvedValue([assetStub.image]);
       await sut.getRandom(authStub.admin, 1);
-      expect(assetMock.getRandom).toHaveBeenCalledWith([authStub.admin.user.id], 1);
+      expect(mocks.asset.getRandom).toHaveBeenCalledWith([authStub.admin.user.id], 1);
     });
 
     it('should not include partner assets if not in timeline', async () => {
-      assetMock.getRandom.mockResolvedValue([assetStub.image]);
-      partnerMock.getAll.mockResolvedValue([{ ...partnerStub.user1ToAdmin1, inTimeline: false }]);
+      mocks.asset.getRandom.mockResolvedValue([assetStub.image]);
+      mocks.partner.getAll.mockResolvedValue([{ ...partnerStub.user1ToAdmin1, inTimeline: false }]);
       await sut.getRandom(authStub.admin, 1);
-      expect(assetMock.getRandom).toHaveBeenCalledWith([authStub.admin.user.id], 1);
+      expect(mocks.asset.getRandom).toHaveBeenCalledWith([authStub.admin.user.id], 1);
     });
 
     it('should include partner assets if in timeline', async () => {
-      assetMock.getRandom.mockResolvedValue([assetStub.image]);
-      partnerMock.getAll.mockResolvedValue([partnerStub.user1ToAdmin1]);
+      mocks.asset.getRandom.mockResolvedValue([assetStub.image]);
+      mocks.partner.getAll.mockResolvedValue([partnerStub.user1ToAdmin1]);
       await sut.getRandom(authStub.admin, 1);
-      expect(assetMock.getRandom).toHaveBeenCalledWith([userStub.admin.id, userStub.user1.id], 1);
+      expect(mocks.asset.getRandom).toHaveBeenCalledWith([userStub.admin.id, userStub.user1.id], 1);
     });
   });
 
   describe('get', () => {
     it('should allow owner access', async () => {
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.image.id]));
-      assetMock.getById.mockResolvedValue(assetStub.image);
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.image.id]));
+      mocks.asset.getById.mockResolvedValue(assetStub.image);
       await sut.get(authStub.admin, assetStub.image.id);
-      expect(accessMock.asset.checkOwnerAccess).toHaveBeenCalledWith(
+      expect(mocks.access.asset.checkOwnerAccess).toHaveBeenCalledWith(
         authStub.admin.user.id,
         new Set([assetStub.image.id]),
       );
     });
 
     it('should allow shared link access', async () => {
-      accessMock.asset.checkSharedLinkAccess.mockResolvedValue(new Set([assetStub.image.id]));
-      assetMock.getById.mockResolvedValue(assetStub.image);
+      mocks.access.asset.checkSharedLinkAccess.mockResolvedValue(new Set([assetStub.image.id]));
+      mocks.asset.getById.mockResolvedValue(assetStub.image);
       await sut.get(authStub.adminSharedLink, assetStub.image.id);
-      expect(accessMock.asset.checkSharedLinkAccess).toHaveBeenCalledWith(
+      expect(mocks.access.asset.checkSharedLinkAccess).toHaveBeenCalledWith(
         authStub.adminSharedLink.sharedLink?.id,
         new Set([assetStub.image.id]),
       );
     });
 
     it('should strip metadata for shared link if exif is disabled', async () => {
-      accessMock.asset.checkSharedLinkAccess.mockResolvedValue(new Set([assetStub.image.id]));
-      assetMock.getById.mockResolvedValue(assetStub.image);
+      mocks.access.asset.checkSharedLinkAccess.mockResolvedValue(new Set([assetStub.image.id]));
+      mocks.asset.getById.mockResolvedValue(assetStub.image);
 
       const result = await sut.get(
         { ...authStub.adminSharedLink, sharedLink: { ...authStub.adminSharedLink.sharedLink!, showExif: false } },
@@ -194,27 +179,27 @@ describe(AssetService.name, () => {
 
       expect(result).toEqual(expect.objectContaining({ hasMetadata: false }));
       expect(result).not.toHaveProperty('exifInfo');
-      expect(accessMock.asset.checkSharedLinkAccess).toHaveBeenCalledWith(
+      expect(mocks.access.asset.checkSharedLinkAccess).toHaveBeenCalledWith(
         authStub.adminSharedLink.sharedLink?.id,
         new Set([assetStub.image.id]),
       );
     });
 
     it('should allow partner sharing access', async () => {
-      accessMock.asset.checkPartnerAccess.mockResolvedValue(new Set([assetStub.image.id]));
-      assetMock.getById.mockResolvedValue(assetStub.image);
+      mocks.access.asset.checkPartnerAccess.mockResolvedValue(new Set([assetStub.image.id]));
+      mocks.asset.getById.mockResolvedValue(assetStub.image);
       await sut.get(authStub.admin, assetStub.image.id);
-      expect(accessMock.asset.checkPartnerAccess).toHaveBeenCalledWith(
+      expect(mocks.access.asset.checkPartnerAccess).toHaveBeenCalledWith(
         authStub.admin.user.id,
         new Set([assetStub.image.id]),
       );
     });
 
     it('should allow shared album access', async () => {
-      accessMock.asset.checkAlbumAccess.mockResolvedValue(new Set([assetStub.image.id]));
-      assetMock.getById.mockResolvedValue(assetStub.image);
+      mocks.access.asset.checkAlbumAccess.mockResolvedValue(new Set([assetStub.image.id]));
+      mocks.asset.getById.mockResolvedValue(assetStub.image);
       await sut.get(authStub.admin, assetStub.image.id);
-      expect(accessMock.asset.checkAlbumAccess).toHaveBeenCalledWith(
+      expect(mocks.access.asset.checkAlbumAccess).toHaveBeenCalledWith(
         authStub.admin.user.id,
         new Set([assetStub.image.id]),
       );
@@ -222,17 +207,17 @@ describe(AssetService.name, () => {
 
     it('should throw an error for no access', async () => {
       await expect(sut.get(authStub.admin, assetStub.image.id)).rejects.toBeInstanceOf(BadRequestException);
-      expect(assetMock.getById).not.toHaveBeenCalled();
+      expect(mocks.asset.getById).not.toHaveBeenCalled();
     });
 
     it('should throw an error for an invalid shared link', async () => {
       await expect(sut.get(authStub.adminSharedLink, assetStub.image.id)).rejects.toBeInstanceOf(BadRequestException);
-      expect(accessMock.asset.checkOwnerAccess).not.toHaveBeenCalled();
-      expect(assetMock.getById).not.toHaveBeenCalled();
+      expect(mocks.access.asset.checkOwnerAccess).not.toHaveBeenCalled();
+      expect(mocks.asset.getById).not.toHaveBeenCalled();
     });
 
     it('should throw an error if the asset could not be found', async () => {
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.image.id]));
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.image.id]));
       await expect(sut.get(authStub.admin, assetStub.image.id)).rejects.toBeInstanceOf(BadRequestException);
     });
   });
@@ -242,40 +227,40 @@ describe(AssetService.name, () => {
       await expect(sut.update(authStub.admin, 'asset-1', { isArchived: false })).rejects.toBeInstanceOf(
         BadRequestException,
       );
-      expect(assetMock.update).not.toHaveBeenCalled();
+      expect(mocks.asset.update).not.toHaveBeenCalled();
     });
 
     it('should update the asset', async () => {
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
-      assetMock.getById.mockResolvedValue(assetStub.image);
-      assetMock.update.mockResolvedValue(assetStub.image);
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
+      mocks.asset.getById.mockResolvedValue(assetStub.image);
+      mocks.asset.update.mockResolvedValue(assetStub.image);
 
       await sut.update(authStub.admin, 'asset-1', { isFavorite: true });
 
-      expect(assetMock.update).toHaveBeenCalledWith({ id: 'asset-1', isFavorite: true });
+      expect(mocks.asset.update).toHaveBeenCalledWith({ id: 'asset-1', isFavorite: true });
     });
 
     it('should update the exif description', async () => {
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
-      assetMock.getById.mockResolvedValue(assetStub.image);
-      assetMock.update.mockResolvedValue(assetStub.image);
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
+      mocks.asset.getById.mockResolvedValue(assetStub.image);
+      mocks.asset.update.mockResolvedValue(assetStub.image);
 
       await sut.update(authStub.admin, 'asset-1', { description: 'Test description' });
 
-      expect(assetMock.upsertExif).toHaveBeenCalledWith({ assetId: 'asset-1', description: 'Test description' });
+      expect(mocks.asset.upsertExif).toHaveBeenCalledWith({ assetId: 'asset-1', description: 'Test description' });
     });
 
     it('should update the exif rating', async () => {
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
-      assetMock.getById.mockResolvedValueOnce(assetStub.image);
-      assetMock.update.mockResolvedValueOnce(assetStub.image);
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
+      mocks.asset.getById.mockResolvedValueOnce(assetStub.image);
+      mocks.asset.update.mockResolvedValueOnce(assetStub.image);
 
       await sut.update(authStub.admin, 'asset-1', { rating: 3 });
-      expect(assetMock.upsertExif).toHaveBeenCalledWith({ assetId: 'asset-1', rating: 3 });
+      expect(mocks.asset.upsertExif).toHaveBeenCalledWith({ assetId: 'asset-1', rating: 3 });
     });
 
     it('should fail linking a live video if the motion part could not be found', async () => {
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.livePhotoStillAsset.id]));
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.livePhotoStillAsset.id]));
 
       await expect(
         sut.update(authStub.admin, assetStub.livePhotoStillAsset.id, {
@@ -283,20 +268,20 @@ describe(AssetService.name, () => {
         }),
       ).rejects.toBeInstanceOf(BadRequestException);
 
-      expect(assetMock.update).not.toHaveBeenCalledWith({
+      expect(mocks.asset.update).not.toHaveBeenCalledWith({
         id: assetStub.livePhotoStillAsset.id,
         livePhotoVideoId: assetStub.livePhotoMotionAsset.id,
       });
-      expect(assetMock.update).not.toHaveBeenCalledWith({ id: assetStub.livePhotoMotionAsset.id, isVisible: true });
-      expect(eventMock.emit).not.toHaveBeenCalledWith('asset.show', {
+      expect(mocks.asset.update).not.toHaveBeenCalledWith({ id: assetStub.livePhotoMotionAsset.id, isVisible: true });
+      expect(mocks.event.emit).not.toHaveBeenCalledWith('asset.show', {
         assetId: assetStub.livePhotoMotionAsset.id,
         userId: userStub.admin.id,
       });
     });
 
     it('should fail linking a live video if the motion part is not a video', async () => {
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.livePhotoStillAsset.id]));
-      assetMock.getById.mockResolvedValue(assetStub.livePhotoStillAsset);
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.livePhotoStillAsset.id]));
+      mocks.asset.getById.mockResolvedValue(assetStub.livePhotoStillAsset);
 
       await expect(
         sut.update(authStub.admin, assetStub.livePhotoStillAsset.id, {
@@ -304,20 +289,20 @@ describe(AssetService.name, () => {
         }),
       ).rejects.toBeInstanceOf(BadRequestException);
 
-      expect(assetMock.update).not.toHaveBeenCalledWith({
+      expect(mocks.asset.update).not.toHaveBeenCalledWith({
         id: assetStub.livePhotoStillAsset.id,
         livePhotoVideoId: assetStub.livePhotoMotionAsset.id,
       });
-      expect(assetMock.update).not.toHaveBeenCalledWith({ id: assetStub.livePhotoMotionAsset.id, isVisible: true });
-      expect(eventMock.emit).not.toHaveBeenCalledWith('asset.show', {
+      expect(mocks.asset.update).not.toHaveBeenCalledWith({ id: assetStub.livePhotoMotionAsset.id, isVisible: true });
+      expect(mocks.event.emit).not.toHaveBeenCalledWith('asset.show', {
         assetId: assetStub.livePhotoMotionAsset.id,
         userId: userStub.admin.id,
       });
     });
 
     it('should fail linking a live video if the motion part has a different owner', async () => {
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.livePhotoStillAsset.id]));
-      assetMock.getById.mockResolvedValue(assetStub.livePhotoMotionAsset);
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.livePhotoStillAsset.id]));
+      mocks.asset.getById.mockResolvedValue(assetStub.livePhotoMotionAsset);
 
       await expect(
         sut.update(authStub.admin, assetStub.livePhotoStillAsset.id, {
@@ -325,79 +310,79 @@ describe(AssetService.name, () => {
         }),
       ).rejects.toBeInstanceOf(BadRequestException);
 
-      expect(assetMock.update).not.toHaveBeenCalledWith({
+      expect(mocks.asset.update).not.toHaveBeenCalledWith({
         id: assetStub.livePhotoStillAsset.id,
         livePhotoVideoId: assetStub.livePhotoMotionAsset.id,
       });
-      expect(assetMock.update).not.toHaveBeenCalledWith({ id: assetStub.livePhotoMotionAsset.id, isVisible: true });
-      expect(eventMock.emit).not.toHaveBeenCalledWith('asset.show', {
+      expect(mocks.asset.update).not.toHaveBeenCalledWith({ id: assetStub.livePhotoMotionAsset.id, isVisible: true });
+      expect(mocks.event.emit).not.toHaveBeenCalledWith('asset.show', {
         assetId: assetStub.livePhotoMotionAsset.id,
         userId: userStub.admin.id,
       });
     });
 
     it('should link a live video', async () => {
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.livePhotoStillAsset.id]));
-      assetMock.getById.mockResolvedValueOnce({
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.livePhotoStillAsset.id]));
+      mocks.asset.getById.mockResolvedValueOnce({
         ...assetStub.livePhotoMotionAsset,
         ownerId: authStub.admin.user.id,
         isVisible: true,
       });
-      assetMock.getById.mockResolvedValueOnce(assetStub.image);
-      assetMock.update.mockResolvedValue(assetStub.image);
+      mocks.asset.getById.mockResolvedValueOnce(assetStub.image);
+      mocks.asset.update.mockResolvedValue(assetStub.image);
 
       await sut.update(authStub.admin, assetStub.livePhotoStillAsset.id, {
         livePhotoVideoId: assetStub.livePhotoMotionAsset.id,
       });
 
-      expect(assetMock.update).toHaveBeenCalledWith({ id: assetStub.livePhotoMotionAsset.id, isVisible: false });
-      expect(eventMock.emit).toHaveBeenCalledWith('asset.hide', {
+      expect(mocks.asset.update).toHaveBeenCalledWith({ id: assetStub.livePhotoMotionAsset.id, isVisible: false });
+      expect(mocks.event.emit).toHaveBeenCalledWith('asset.hide', {
         assetId: assetStub.livePhotoMotionAsset.id,
         userId: userStub.admin.id,
       });
-      expect(assetMock.update).toHaveBeenCalledWith({
+      expect(mocks.asset.update).toHaveBeenCalledWith({
         id: assetStub.livePhotoStillAsset.id,
         livePhotoVideoId: assetStub.livePhotoMotionAsset.id,
       });
     });
 
     it('should throw an error if asset could not be found after update', async () => {
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
       await expect(sut.update(authStub.admin, 'asset-1', { isFavorite: true })).rejects.toBeInstanceOf(
         BadRequestException,
       );
     });
 
     it('should unlink a live video', async () => {
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.livePhotoStillAsset.id]));
-      assetMock.getById.mockResolvedValueOnce(assetStub.livePhotoStillAsset);
-      assetMock.getById.mockResolvedValueOnce(assetStub.livePhotoMotionAsset);
-      assetMock.update.mockResolvedValueOnce(assetStub.image);
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.livePhotoStillAsset.id]));
+      mocks.asset.getById.mockResolvedValueOnce(assetStub.livePhotoStillAsset);
+      mocks.asset.getById.mockResolvedValueOnce(assetStub.livePhotoMotionAsset);
+      mocks.asset.update.mockResolvedValueOnce(assetStub.image);
 
       await sut.update(authStub.admin, assetStub.livePhotoStillAsset.id, { livePhotoVideoId: null });
 
-      expect(assetMock.update).toHaveBeenCalledWith({
+      expect(mocks.asset.update).toHaveBeenCalledWith({
         id: assetStub.livePhotoStillAsset.id,
         livePhotoVideoId: null,
       });
-      expect(assetMock.update).toHaveBeenCalledWith({ id: assetStub.livePhotoMotionAsset.id, isVisible: true });
-      expect(eventMock.emit).toHaveBeenCalledWith('asset.show', {
+      expect(mocks.asset.update).toHaveBeenCalledWith({ id: assetStub.livePhotoMotionAsset.id, isVisible: true });
+      expect(mocks.event.emit).toHaveBeenCalledWith('asset.show', {
         assetId: assetStub.livePhotoMotionAsset.id,
         userId: userStub.admin.id,
       });
     });
 
     it('should fail unlinking a live video if the asset could not be found', async () => {
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.livePhotoStillAsset.id]));
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([assetStub.livePhotoStillAsset.id]));
       // eslint-disable-next-line unicorn/no-useless-undefined
-      assetMock.getById.mockResolvedValueOnce(undefined);
+      mocks.asset.getById.mockResolvedValueOnce(undefined);
 
       await expect(
         sut.update(authStub.admin, assetStub.livePhotoStillAsset.id, { livePhotoVideoId: null }),
       ).rejects.toBeInstanceOf(BadRequestException);
 
-      expect(assetMock.update).not.toHaveBeenCalled();
-      expect(eventMock.emit).not.toHaveBeenCalled();
+      expect(mocks.asset.update).not.toHaveBeenCalled();
+      expect(mocks.event.emit).not.toHaveBeenCalled();
     });
   });
 
@@ -412,13 +397,13 @@ describe(AssetService.name, () => {
     });
 
     it('should update all assets', async () => {
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2']));
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2']));
       await sut.updateAll(authStub.admin, { ids: ['asset-1', 'asset-2'], isArchived: true });
-      expect(assetMock.updateAll).toHaveBeenCalledWith(['asset-1', 'asset-2'], { isArchived: true });
+      expect(mocks.asset.updateAll).toHaveBeenCalledWith(['asset-1', 'asset-2'], { isArchived: true });
     });
 
     it('should not update Assets table if no relevant fields are provided', async () => {
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
       await sut.updateAll(authStub.admin, {
         ids: ['asset-1'],
         latitude: 0,
@@ -428,11 +413,11 @@ describe(AssetService.name, () => {
         duplicateId: undefined,
         rating: undefined,
       });
-      expect(assetMock.updateAll).not.toHaveBeenCalled();
+      expect(mocks.asset.updateAll).not.toHaveBeenCalled();
     });
 
     it('should update Assets table if isArchived field is provided', async () => {
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
       await sut.updateAll(authStub.admin, {
         ids: ['asset-1'],
         latitude: 0,
@@ -442,7 +427,7 @@ describe(AssetService.name, () => {
         duplicateId: undefined,
         rating: undefined,
       });
-      expect(assetMock.updateAll).toHaveBeenCalled();
+      expect(mocks.asset.updateAll).toHaveBeenCalled();
     });
   });
 
@@ -456,26 +441,26 @@ describe(AssetService.name, () => {
     });
 
     it('should force delete a batch of assets', async () => {
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset1', 'asset2']));
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset1', 'asset2']));
 
       await sut.deleteAll(authStub.user1, { ids: ['asset1', 'asset2'], force: true });
 
-      expect(eventMock.emit).toHaveBeenCalledWith('assets.delete', {
+      expect(mocks.event.emit).toHaveBeenCalledWith('assets.delete', {
         assetIds: ['asset1', 'asset2'],
         userId: 'user-id',
       });
     });
 
     it('should soft delete a batch of assets', async () => {
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset1', 'asset2']));
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset1', 'asset2']));
 
       await sut.deleteAll(authStub.user1, { ids: ['asset1', 'asset2'], force: false });
 
-      expect(assetMock.updateAll).toHaveBeenCalledWith(['asset1', 'asset2'], {
+      expect(mocks.asset.updateAll).toHaveBeenCalledWith(['asset1', 'asset2'], {
         deletedAt: expect.any(Date),
         status: AssetStatus.TRASHED,
       });
-      expect(jobMock.queue.mock.calls).toEqual([]);
+      expect(mocks.job.queue.mock.calls).toEqual([]);
     });
   });
 
@@ -489,27 +474,27 @@ describe(AssetService.name, () => {
     });
 
     it('should immediately queue assets for deletion if trash is disabled', async () => {
-      assetMock.getAll.mockResolvedValue({ hasNextPage: false, items: [assetStub.image] });
-      systemMock.get.mockResolvedValue({ trash: { enabled: false } });
+      mocks.asset.getAll.mockResolvedValue({ hasNextPage: false, items: [assetStub.image] });
+      mocks.systemMetadata.get.mockResolvedValue({ trash: { enabled: false } });
 
       await expect(sut.handleAssetDeletionCheck()).resolves.toBe(JobStatus.SUCCESS);
 
-      expect(assetMock.getAll).toHaveBeenCalledWith(expect.anything(), { trashedBefore: new Date() });
-      expect(jobMock.queueAll).toHaveBeenCalledWith([
+      expect(mocks.asset.getAll).toHaveBeenCalledWith(expect.anything(), { trashedBefore: new Date() });
+      expect(mocks.job.queueAll).toHaveBeenCalledWith([
         { name: JobName.ASSET_DELETION, data: { id: assetStub.image.id, deleteOnDisk: true } },
       ]);
     });
 
     it('should queue assets for deletion after trash duration', async () => {
-      assetMock.getAll.mockResolvedValue({ hasNextPage: false, items: [assetStub.image] });
-      systemMock.get.mockResolvedValue({ trash: { enabled: true, days: 7 } });
+      mocks.asset.getAll.mockResolvedValue({ hasNextPage: false, items: [assetStub.image] });
+      mocks.systemMetadata.get.mockResolvedValue({ trash: { enabled: true, days: 7 } });
 
       await expect(sut.handleAssetDeletionCheck()).resolves.toBe(JobStatus.SUCCESS);
 
-      expect(assetMock.getAll).toHaveBeenCalledWith(expect.anything(), {
+      expect(mocks.asset.getAll).toHaveBeenCalledWith(expect.anything(), {
         trashedBefore: DateTime.now().minus({ days: 7 }).toJSDate(),
       });
-      expect(jobMock.queueAll).toHaveBeenCalledWith([
+      expect(mocks.job.queueAll).toHaveBeenCalledWith([
         { name: JobName.ASSET_DELETION, data: { id: assetStub.image.id, deleteOnDisk: true } },
       ]);
     });
@@ -519,11 +504,11 @@ describe(AssetService.name, () => {
     it('should remove faces', async () => {
       const assetWithFace = { ...assetStub.image, faces: [faceStub.face1, faceStub.mergeFace1] };
 
-      assetMock.getById.mockResolvedValue(assetWithFace);
+      mocks.asset.getById.mockResolvedValue(assetWithFace);
 
       await sut.handleAssetDeletion({ id: assetWithFace.id, deleteOnDisk: true });
 
-      expect(jobMock.queue.mock.calls).toEqual([
+      expect(mocks.job.queue.mock.calls).toEqual([
         [
           {
             name: JobName.DELETE_FILES,
@@ -540,41 +525,41 @@ describe(AssetService.name, () => {
         ],
       ]);
 
-      expect(assetMock.remove).toHaveBeenCalledWith(assetWithFace);
+      expect(mocks.asset.remove).toHaveBeenCalledWith(assetWithFace);
     });
 
     it('should update stack primary asset if deleted asset was primary asset in a stack', async () => {
-      assetMock.getById.mockResolvedValue(assetStub.primaryImage as AssetEntity);
+      mocks.asset.getById.mockResolvedValue(assetStub.primaryImage as AssetEntity);
 
       await sut.handleAssetDeletion({ id: assetStub.primaryImage.id, deleteOnDisk: true });
 
-      expect(stackMock.update).toHaveBeenCalledWith('stack-1', {
+      expect(mocks.stack.update).toHaveBeenCalledWith('stack-1', {
         id: 'stack-1',
         primaryAssetId: 'stack-child-asset-1',
       });
     });
 
     it('should delete the entire stack if deleted asset was the primary asset and the stack would only contain one asset afterwards', async () => {
-      assetMock.getById.mockResolvedValue({
+      mocks.asset.getById.mockResolvedValue({
         ...assetStub.primaryImage,
         stack: { ...assetStub.primaryImage.stack, assets: assetStub.primaryImage.stack!.assets.slice(0, 2) },
       } as AssetEntity);
 
       await sut.handleAssetDeletion({ id: assetStub.primaryImage.id, deleteOnDisk: true });
 
-      expect(stackMock.delete).toHaveBeenCalledWith('stack-1');
+      expect(mocks.stack.delete).toHaveBeenCalledWith('stack-1');
     });
 
     it('should delete a live photo', async () => {
-      assetMock.getById.mockResolvedValue(assetStub.livePhotoStillAsset);
-      assetMock.getLivePhotoCount.mockResolvedValue(0);
+      mocks.asset.getById.mockResolvedValue(assetStub.livePhotoStillAsset);
+      mocks.asset.getLivePhotoCount.mockResolvedValue(0);
 
       await sut.handleAssetDeletion({
         id: assetStub.livePhotoStillAsset.id,
         deleteOnDisk: true,
       });
 
-      expect(jobMock.queue.mock.calls).toEqual([
+      expect(mocks.job.queue.mock.calls).toEqual([
         [
           {
             name: JobName.ASSET_DELETION,
@@ -596,15 +581,15 @@ describe(AssetService.name, () => {
     });
 
     it('should not delete a live motion part if it is being used by another asset', async () => {
-      assetMock.getLivePhotoCount.mockResolvedValue(2);
-      assetMock.getById.mockResolvedValue(assetStub.livePhotoStillAsset);
+      mocks.asset.getLivePhotoCount.mockResolvedValue(2);
+      mocks.asset.getById.mockResolvedValue(assetStub.livePhotoStillAsset);
 
       await sut.handleAssetDeletion({
         id: assetStub.livePhotoStillAsset.id,
         deleteOnDisk: true,
       });
 
-      expect(jobMock.queue.mock.calls).toEqual([
+      expect(mocks.job.queue.mock.calls).toEqual([
         [
           {
             name: JobName.DELETE_FILES,
@@ -617,9 +602,9 @@ describe(AssetService.name, () => {
     });
 
     it('should update usage', async () => {
-      assetMock.getById.mockResolvedValue(assetStub.image);
+      mocks.asset.getById.mockResolvedValue(assetStub.image);
       await sut.handleAssetDeletion({ id: assetStub.image.id, deleteOnDisk: true });
-      expect(userMock.updateUsage).toHaveBeenCalledWith(assetStub.image.ownerId, -5000);
+      expect(mocks.user.updateUsage).toHaveBeenCalledWith(assetStub.image.ownerId, -5000);
     });
 
     it('should fail if asset could not be found', async () => {
@@ -631,27 +616,27 @@ describe(AssetService.name, () => {
 
   describe('run', () => {
     it('should run the refresh faces job', async () => {
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
       await sut.run(authStub.admin, { assetIds: ['asset-1'], name: AssetJobName.REFRESH_FACES });
-      expect(jobMock.queueAll).toHaveBeenCalledWith([{ name: JobName.FACE_DETECTION, data: { id: 'asset-1' } }]);
+      expect(mocks.job.queueAll).toHaveBeenCalledWith([{ name: JobName.FACE_DETECTION, data: { id: 'asset-1' } }]);
     });
 
     it('should run the refresh metadata job', async () => {
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
       await sut.run(authStub.admin, { assetIds: ['asset-1'], name: AssetJobName.REFRESH_METADATA });
-      expect(jobMock.queueAll).toHaveBeenCalledWith([{ name: JobName.METADATA_EXTRACTION, data: { id: 'asset-1' } }]);
+      expect(mocks.job.queueAll).toHaveBeenCalledWith([{ name: JobName.METADATA_EXTRACTION, data: { id: 'asset-1' } }]);
     });
 
     it('should run the refresh thumbnails job', async () => {
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
       await sut.run(authStub.admin, { assetIds: ['asset-1'], name: AssetJobName.REGENERATE_THUMBNAIL });
-      expect(jobMock.queueAll).toHaveBeenCalledWith([{ name: JobName.GENERATE_THUMBNAILS, data: { id: 'asset-1' } }]);
+      expect(mocks.job.queueAll).toHaveBeenCalledWith([{ name: JobName.GENERATE_THUMBNAILS, data: { id: 'asset-1' } }]);
     });
 
     it('should run the transcode video', async () => {
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
       await sut.run(authStub.admin, { assetIds: ['asset-1'], name: AssetJobName.TRANSCODE_VIDEO });
-      expect(jobMock.queueAll).toHaveBeenCalledWith([{ name: JobName.VIDEO_CONVERSION, data: { id: 'asset-1' } }]);
+      expect(mocks.job.queueAll).toHaveBeenCalledWith([{ name: JobName.VIDEO_CONVERSION, data: { id: 'asset-1' } }]);
     });
   });
 
@@ -659,7 +644,7 @@ describe(AssetService.name, () => {
     it('get assets by device id', async () => {
       const assets = [assetStub.image, assetStub.image1];
 
-      assetMock.getAllByDeviceId.mockResolvedValue(assets.map((asset) => asset.deviceAssetId));
+      mocks.asset.getAllByDeviceId.mockResolvedValue(assets.map((asset) => asset.deviceAssetId));
 
       const deviceId = 'device-id';
       const result = await sut.getUserAssetsByDeviceId(authStub.user1, deviceId);

server/src/services/audit.service.spec.ts

@@ -1,28 +1,18 @@
 import { BadRequestException } from '@nestjs/common';
 import { FileReportItemDto } from 'src/dtos/audit.dto';
 import { AssetFileType, AssetPathType, DatabaseAction, EntityType, PersonPathType, UserPathType } from 'src/enum';
-import { IAssetRepository } from 'src/interfaces/asset.interface';
-import { ICryptoRepository } from 'src/interfaces/crypto.interface';
 import { JobStatus } from 'src/interfaces/job.interface';
-import { IPersonRepository } from 'src/interfaces/person.interface';
-import { IUserRepository } from 'src/interfaces/user.interface';
 import { AuditService } from 'src/services/audit.service';
-import { IAuditRepository } from 'src/types';
 import { auditStub } from 'test/fixtures/audit.stub';
 import { authStub } from 'test/fixtures/auth.stub';
-import { newTestService } from 'test/utils';
-import { Mocked } from 'vitest';
+import { newTestService, ServiceMocks } from 'test/utils';
 
 describe(AuditService.name, () => {
   let sut: AuditService;
-  let auditMock: Mocked<IAuditRepository>;
-  let assetMock: Mocked<IAssetRepository>;
-  let cryptoMock: Mocked<ICryptoRepository>;
-  let personMock: Mocked<IPersonRepository>;
-  let userMock: Mocked<IUserRepository>;
+  let mocks: ServiceMocks;
 
   beforeEach(() => {
-    ({ sut, auditMock, assetMock, cryptoMock, personMock, userMock } = newTestService(AuditService));
+    ({ sut, mocks } = newTestService(AuditService));
   });
 
   it('should work', () => {
@@ -32,13 +22,13 @@ describe(AuditService.name, () => {
   describe('handleCleanup', () => {
     it('should delete old audit entries', async () => {
       await expect(sut.handleCleanup()).resolves.toBe(JobStatus.SUCCESS);
-      expect(auditMock.removeBefore).toHaveBeenCalledWith(expect.any(Date));
+      expect(mocks.audit.removeBefore).toHaveBeenCalledWith(expect.any(Date));
     });
   });
 
   describe('getDeletes', () => {
     it('should require full sync if the request is older than 100 days', async () => {
-      auditMock.getAfter.mockResolvedValue([]);
+      mocks.audit.getAfter.mockResolvedValue([]);
 
       const date = new Date(2022, 0, 1);
       await expect(sut.getDeletes(authStub.admin, { after: date, entityType: EntityType.ASSET })).resolves.toEqual({
@@ -46,7 +36,7 @@ describe(AuditService.name, () => {
         ids: [],
       });
 
-      expect(auditMock.getAfter).toHaveBeenCalledWith(date, {
+      expect(mocks.audit.getAfter).toHaveBeenCalledWith(date, {
         action: DatabaseAction.DELETE,
         userIds: [authStub.admin.user.id],
         entityType: EntityType.ASSET,
@@ -54,7 +44,7 @@ describe(AuditService.name, () => {
     });
 
     it('should get any new or updated assets and deleted ids', async () => {
-      auditMock.getAfter.mockResolvedValue([auditStub.delete.entityId]);
+      mocks.audit.getAfter.mockResolvedValue([auditStub.delete.entityId]);
 
       const date = new Date();
       await expect(sut.getDeletes(authStub.admin, { after: date, entityType: EntityType.ASSET })).resolves.toEqual({
@@ -62,7 +52,7 @@ describe(AuditService.name, () => {
         ids: ['asset-deleted'],
       });
 
-      expect(auditMock.getAfter).toHaveBeenCalledWith(date, {
+      expect(mocks.audit.getAfter).toHaveBeenCalledWith(date, {
         action: DatabaseAction.DELETE,
         userIds: [authStub.admin.user.id],
         entityType: EntityType.ASSET,
@@ -74,7 +64,7 @@ describe(AuditService.name, () => {
     it('should fail if the file is not in the immich path', async () => {
       await expect(sut.getChecksums({ filenames: ['foo/bar'] })).rejects.toBeInstanceOf(BadRequestException);
 
-      expect(cryptoMock.hashFile).not.toHaveBeenCalled();
+      expect(mocks.crypto.hashFile).not.toHaveBeenCalled();
     });
 
     it('should get checksum for valid file', async () => {
@@ -82,7 +72,7 @@ describe(AuditService.name, () => {
         { filename: './upload/my-file.jpg', checksum: expect.any(String) },
       ]);
 
-      expect(cryptoMock.hashFile).toHaveBeenCalledWith('./upload/my-file.jpg');
+      expect(mocks.crypto.hashFile).toHaveBeenCalledWith('./upload/my-file.jpg');
     });
   });
 
@@ -94,10 +84,10 @@ describe(AuditService.name, () => {
         ]),
       ).rejects.toBeInstanceOf(BadRequestException);
 
-      expect(assetMock.update).not.toHaveBeenCalled();
-      expect(assetMock.upsertFile).not.toHaveBeenCalled();
-      expect(personMock.update).not.toHaveBeenCalled();
-      expect(userMock.update).not.toHaveBeenCalled();
+      expect(mocks.asset.update).not.toHaveBeenCalled();
+      expect(mocks.asset.upsertFile).not.toHaveBeenCalled();
+      expect(mocks.person.update).not.toHaveBeenCalled();
+      expect(mocks.user.update).not.toHaveBeenCalled();
     });
 
     it('should update encoded video path', async () => {
@@ -109,10 +99,10 @@ describe(AuditService.name, () => {
         } as FileReportItemDto,
       ]);
 
-      expect(assetMock.update).toHaveBeenCalledWith({ id: 'my-id', encodedVideoPath: './upload/my-video.mp4' });
-      expect(assetMock.upsertFile).not.toHaveBeenCalled();
-      expect(personMock.update).not.toHaveBeenCalled();
-      expect(userMock.update).not.toHaveBeenCalled();
+      expect(mocks.asset.update).toHaveBeenCalledWith({ id: 'my-id', encodedVideoPath: './upload/my-video.mp4' });
+      expect(mocks.asset.upsertFile).not.toHaveBeenCalled();
+      expect(mocks.person.update).not.toHaveBeenCalled();
+      expect(mocks.user.update).not.toHaveBeenCalled();
     });
 
     it('should update preview path', async () => {
@@ -124,14 +114,14 @@ describe(AuditService.name, () => {
         } as FileReportItemDto,
       ]);
 
-      expect(assetMock.upsertFile).toHaveBeenCalledWith({
+      expect(mocks.asset.upsertFile).toHaveBeenCalledWith({
         assetId: 'my-id',
         type: AssetFileType.PREVIEW,
         path: './upload/my-preview.png',
       });
-      expect(assetMock.update).not.toHaveBeenCalled();
-      expect(personMock.update).not.toHaveBeenCalled();
-      expect(userMock.update).not.toHaveBeenCalled();
+      expect(mocks.asset.update).not.toHaveBeenCalled();
+      expect(mocks.person.update).not.toHaveBeenCalled();
+      expect(mocks.user.update).not.toHaveBeenCalled();
     });
 
     it('should update thumbnail path', async () => {
@@ -143,14 +133,14 @@ describe(AuditService.name, () => {
         } as FileReportItemDto,
       ]);
 
-      expect(assetMock.upsertFile).toHaveBeenCalledWith({
+      expect(mocks.asset.upsertFile).toHaveBeenCalledWith({
         assetId: 'my-id',
         type: AssetFileType.THUMBNAIL,
         path: './upload/my-thumbnail.webp',
       });
-      expect(assetMock.update).not.toHaveBeenCalled();
-      expect(personMock.update).not.toHaveBeenCalled();
-      expect(userMock.update).not.toHaveBeenCalled();
+      expect(mocks.asset.update).not.toHaveBeenCalled();
+      expect(mocks.person.update).not.toHaveBeenCalled();
+      expect(mocks.user.update).not.toHaveBeenCalled();
     });
 
     it('should update original path', async () => {
@@ -162,10 +152,10 @@ describe(AuditService.name, () => {
         } as FileReportItemDto,
       ]);
 
-      expect(assetMock.update).toHaveBeenCalledWith({ id: 'my-id', originalPath: './upload/my-original.png' });
-      expect(assetMock.upsertFile).not.toHaveBeenCalled();
-      expect(personMock.update).not.toHaveBeenCalled();
-      expect(userMock.update).not.toHaveBeenCalled();
+      expect(mocks.asset.update).toHaveBeenCalledWith({ id: 'my-id', originalPath: './upload/my-original.png' });
+      expect(mocks.asset.upsertFile).not.toHaveBeenCalled();
+      expect(mocks.person.update).not.toHaveBeenCalled();
+      expect(mocks.user.update).not.toHaveBeenCalled();
     });
 
     it('should update sidecar path', async () => {
@@ -177,10 +167,10 @@ describe(AuditService.name, () => {
         } as FileReportItemDto,
       ]);
 
-      expect(assetMock.update).toHaveBeenCalledWith({ id: 'my-id', sidecarPath: './upload/my-sidecar.xmp' });
-      expect(assetMock.upsertFile).not.toHaveBeenCalled();
-      expect(personMock.update).not.toHaveBeenCalled();
-      expect(userMock.update).not.toHaveBeenCalled();
+      expect(mocks.asset.update).toHaveBeenCalledWith({ id: 'my-id', sidecarPath: './upload/my-sidecar.xmp' });
+      expect(mocks.asset.upsertFile).not.toHaveBeenCalled();
+      expect(mocks.person.update).not.toHaveBeenCalled();
+      expect(mocks.user.update).not.toHaveBeenCalled();
     });
 
     it('should update face path', async () => {
@@ -192,10 +182,10 @@ describe(AuditService.name, () => {
         } as FileReportItemDto,
       ]);
 
-      expect(personMock.update).toHaveBeenCalledWith({ id: 'my-id', thumbnailPath: './upload/my-face.jpg' });
-      expect(assetMock.update).not.toHaveBeenCalled();
-      expect(assetMock.upsertFile).not.toHaveBeenCalled();
-      expect(userMock.update).not.toHaveBeenCalled();
+      expect(mocks.person.update).toHaveBeenCalledWith({ id: 'my-id', thumbnailPath: './upload/my-face.jpg' });
+      expect(mocks.asset.update).not.toHaveBeenCalled();
+      expect(mocks.asset.upsertFile).not.toHaveBeenCalled();
+      expect(mocks.user.update).not.toHaveBeenCalled();
     });
 
     it('should update profile path', async () => {
@@ -207,10 +197,10 @@ describe(AuditService.name, () => {
         } as FileReportItemDto,
       ]);
 
-      expect(userMock.update).toHaveBeenCalledWith('my-id', { profileImagePath: './upload/my-profile-pic.jpg' });
-      expect(assetMock.update).not.toHaveBeenCalled();
-      expect(assetMock.upsertFile).not.toHaveBeenCalled();
-      expect(personMock.update).not.toHaveBeenCalled();
+      expect(mocks.user.update).toHaveBeenCalledWith('my-id', { profileImagePath: './upload/my-profile-pic.jpg' });
+      expect(mocks.asset.update).not.toHaveBeenCalled();
+      expect(mocks.asset.upsertFile).not.toHaveBeenCalled();
+      expect(mocks.person.update).not.toHaveBeenCalled();
     });
   });
 });

server/src/services/auth.service.spec.ts

@@ -3,22 +3,14 @@ import { AuthDto, SignUpDto } from 'src/dtos/auth.dto';
 import { UserMetadataEntity } from 'src/entities/user-metadata.entity';
 import { UserEntity } from 'src/entities/user.entity';
 import { AuthType, Permission } from 'src/enum';
-import { ICryptoRepository } from 'src/interfaces/crypto.interface';
-import { IEventRepository } from 'src/interfaces/event.interface';
-import { ISessionRepository } from 'src/interfaces/session.interface';
-import { ISharedLinkRepository } from 'src/interfaces/shared-link.interface';
-import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
-import { IUserRepository } from 'src/interfaces/user.interface';
 import { AuthService } from 'src/services/auth.service';
-import { IApiKeyRepository, IOAuthRepository } from 'src/types';
 import { keyStub } from 'test/fixtures/api-key.stub';
 import { authStub } from 'test/fixtures/auth.stub';
 import { sessionStub } from 'test/fixtures/session.stub';
 import { sharedLinkStub } from 'test/fixtures/shared-link.stub';
 import { systemConfigStub } from 'test/fixtures/system-config.stub';
 import { userStub } from 'test/fixtures/user.stub';
-import { newTestService } from 'test/utils';
-import { Mocked } from 'vitest';
+import { newTestService, ServiceMocks } from 'test/utils';
 
 const oauthResponse = {
   accessToken: 'cmFuZG9tLWJ5dGVz',
@@ -58,23 +50,14 @@ const oauthUserWithDefaultQuota = {
 
 describe('AuthService', () => {
   let sut: AuthService;
-
-  let cryptoMock: Mocked<ICryptoRepository>;
-  let eventMock: Mocked<IEventRepository>;
-  let keyMock: Mocked<IApiKeyRepository>;
-  let oauthMock: Mocked<IOAuthRepository>;
-  let sessionMock: Mocked<ISessionRepository>;
-  let sharedLinkMock: Mocked<ISharedLinkRepository>;
-  let systemMock: Mocked<ISystemMetadataRepository>;
-  let userMock: Mocked<IUserRepository>;
+  let mocks: ServiceMocks;
 
   beforeEach(() => {
-    ({ sut, cryptoMock, eventMock, keyMock, oauthMock, sessionMock, sharedLinkMock, systemMock, userMock } =
-      newTestService(AuthService));
+    ({ sut, mocks } = newTestService(AuthService));
 
-    oauthMock.authorize.mockResolvedValue('access-token');
-    oauthMock.getProfile.mockResolvedValue({ sub, email });
-    oauthMock.getLogoutEndpoint.mockResolvedValue('http://end-session-endpoint');
+    mocks.oauth.authorize.mockResolvedValue('access-token');
+    mocks.oauth.getProfile.mockResolvedValue({ sub, email });
+    mocks.oauth.getLogoutEndpoint.mockResolvedValue('http://end-session-endpoint');
   });
 
   it('should be defined', () => {
@@ -84,31 +67,31 @@ describe('AuthService', () => {
   describe('onBootstrap', () => {
     it('should init the repo', () => {
       sut.onBootstrap();
-      expect(oauthMock.init).toHaveBeenCalled();
+      expect(mocks.oauth.init).toHaveBeenCalled();
     });
   });
 
   describe('login', () => {
     it('should throw an error if password login is disabled', async () => {
-      systemMock.get.mockResolvedValue(systemConfigStub.disabled);
+      mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.disabled);
       await expect(sut.login(fixtures.login, loginDetails)).rejects.toBeInstanceOf(UnauthorizedException);
     });
 
     it('should check the user exists', async () => {
-      userMock.getByEmail.mockResolvedValue(void 0);
+      mocks.user.getByEmail.mockResolvedValue(void 0);
       await expect(sut.login(fixtures.login, loginDetails)).rejects.toBeInstanceOf(UnauthorizedException);
-      expect(userMock.getByEmail).toHaveBeenCalledTimes(1);
+      expect(mocks.user.getByEmail).toHaveBeenCalledTimes(1);
     });
 
     it('should check the user has a password', async () => {
-      userMock.getByEmail.mockResolvedValue({} as UserEntity);
+      mocks.user.getByEmail.mockResolvedValue({} as UserEntity);
       await expect(sut.login(fixtures.login, loginDetails)).rejects.toBeInstanceOf(UnauthorizedException);
-      expect(userMock.getByEmail).toHaveBeenCalledTimes(1);
+      expect(mocks.user.getByEmail).toHaveBeenCalledTimes(1);
     });
 
     it('should successfully log the user in', async () => {
-      userMock.getByEmail.mockResolvedValue(userStub.user1);
-      sessionMock.create.mockResolvedValue(sessionStub.valid);
+      mocks.user.getByEmail.mockResolvedValue(userStub.user1);
+      mocks.session.create.mockResolvedValue(sessionStub.valid);
       await expect(sut.login(fixtures.login, loginDetails)).resolves.toEqual({
         accessToken: 'cmFuZG9tLWJ5dGVz',
         userId: 'user-id',
@@ -118,7 +101,7 @@ describe('AuthService', () => {
         isAdmin: false,
         shouldChangePassword: false,
       });
-      expect(userMock.getByEmail).toHaveBeenCalledTimes(1);
+      expect(mocks.user.getByEmail).toHaveBeenCalledTimes(1);
     });
   });
 
@@ -127,23 +110,23 @@ describe('AuthService', () => {
       const auth = { user: { email: 'test@imimch.com' } } as AuthDto;
       const dto = { password: 'old-password', newPassword: 'new-password' };
 
-      userMock.getByEmail.mockResolvedValue({
+      mocks.user.getByEmail.mockResolvedValue({
         email: 'test@immich.com',
         password: 'hash-password',
       } as UserEntity);
-      userMock.update.mockResolvedValue(userStub.user1);
+      mocks.user.update.mockResolvedValue(userStub.user1);
 
       await sut.changePassword(auth, dto);
 
-      expect(userMock.getByEmail).toHaveBeenCalledWith(auth.user.email, true);
-      expect(cryptoMock.compareBcrypt).toHaveBeenCalledWith('old-password', 'hash-password');
+      expect(mocks.user.getByEmail).toHaveBeenCalledWith(auth.user.email, true);
+      expect(mocks.crypto.compareBcrypt).toHaveBeenCalledWith('old-password', 'hash-password');
     });
 
     it('should throw when auth user email is not found', async () => {
       const auth = { user: { email: 'test@imimch.com' } } as AuthDto;
       const dto = { password: 'old-password', newPassword: 'new-password' };
 
-      userMock.getByEmail.mockResolvedValue(void 0);
+      mocks.user.getByEmail.mockResolvedValue(void 0);
 
       await expect(sut.changePassword(auth, dto)).rejects.toBeInstanceOf(UnauthorizedException);
     });
@@ -152,9 +135,9 @@ describe('AuthService', () => {
       const auth = { user: { email: 'test@imimch.com' } as UserEntity };
       const dto = { password: 'old-password', newPassword: 'new-password' };
 
-      cryptoMock.compareBcrypt.mockReturnValue(false);
+      mocks.crypto.compareBcrypt.mockReturnValue(false);
 
-      userMock.getByEmail.mockResolvedValue({
+      mocks.user.getByEmail.mockResolvedValue({
         email: 'test@immich.com',
         password: 'hash-password',
       } as UserEntity);
@@ -166,7 +149,7 @@ describe('AuthService', () => {
       const auth = { user: { email: 'test@imimch.com' } } as AuthDto;
       const dto = { password: 'old-password', newPassword: 'new-password' };
 
-      userMock.getByEmail.mockResolvedValue({
+      mocks.user.getByEmail.mockResolvedValue({
         email: 'test@immich.com',
         password: '',
       } as UserEntity);
@@ -177,7 +160,7 @@ describe('AuthService', () => {
 
   describe('logout', () => {
     it('should return the end session endpoint', async () => {
-      systemMock.get.mockResolvedValue(systemConfigStub.enabled);
+      mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.enabled);
       const auth = { user: { id: '123' } } as AuthDto;
       await expect(sut.logout(auth, AuthType.OAUTH)).resolves.toEqual({
         successful: true,
@@ -202,8 +185,8 @@ describe('AuthService', () => {
         redirectUri: '/auth/login?autoLaunch=0',
       });
 
-      expect(sessionMock.delete).toHaveBeenCalledWith('token123');
-      expect(eventMock.emit).toHaveBeenCalledWith('session.delete', { sessionId: 'token123' });
+      expect(mocks.session.delete).toHaveBeenCalledWith('token123');
+      expect(mocks.event.emit).toHaveBeenCalledWith('session.delete', { sessionId: 'token123' });
     });
 
     it('should return the default redirect if auth type is OAUTH but oauth is not enabled', async () => {
@@ -220,14 +203,14 @@ describe('AuthService', () => {
     const dto: SignUpDto = { email: 'test@immich.com', password: 'password', name: 'immich admin' };
 
     it('should only allow one admin', async () => {
-      userMock.getAdmin.mockResolvedValue({} as UserEntity);
+      mocks.user.getAdmin.mockResolvedValue({} as UserEntity);
       await expect(sut.adminSignUp(dto)).rejects.toBeInstanceOf(BadRequestException);
-      expect(userMock.getAdmin).toHaveBeenCalled();
+      expect(mocks.user.getAdmin).toHaveBeenCalled();
     });
 
     it('should sign up the admin', async () => {
-      userMock.getAdmin.mockResolvedValue(void 0);
-      userMock.create.mockResolvedValue({
+      mocks.user.getAdmin.mockResolvedValue(void 0);
+      mocks.user.create.mockResolvedValue({
         ...dto,
         id: 'admin',
         createdAt: new Date('2021-01-01'),
@@ -240,8 +223,8 @@ describe('AuthService', () => {
         email: 'test@immich.com',
         name: 'immich admin',
       });
-      expect(userMock.getAdmin).toHaveBeenCalled();
-      expect(userMock.create).toHaveBeenCalled();
+      expect(mocks.user.getAdmin).toHaveBeenCalled();
+      expect(mocks.user.create).toHaveBeenCalled();
     });
   });
 
@@ -257,8 +240,8 @@ describe('AuthService', () => {
     });
 
     it('should validate using authorization header', async () => {
-      userMock.get.mockResolvedValue(userStub.user1);
-      sessionMock.getByToken.mockResolvedValue(sessionStub.valid);
+      mocks.user.get.mockResolvedValue(userStub.user1);
+      mocks.session.getByToken.mockResolvedValue(sessionStub.valid as any);
       await expect(
         sut.authenticate({
           headers: { authorization: 'Bearer auth_token' },
@@ -284,7 +267,7 @@ describe('AuthService', () => {
     });
 
     it('should not accept an expired key', async () => {
-      sharedLinkMock.getByKey.mockResolvedValue(sharedLinkStub.expired);
+      mocks.sharedLink.getByKey.mockResolvedValue(sharedLinkStub.expired);
       await expect(
         sut.authenticate({
           headers: { 'x-immich-share-key': 'key' },
@@ -295,7 +278,7 @@ describe('AuthService', () => {
     });
 
     it('should not accept a key on a non-shared route', async () => {
-      sharedLinkMock.getByKey.mockResolvedValue(sharedLinkStub.valid);
+      mocks.sharedLink.getByKey.mockResolvedValue(sharedLinkStub.valid);
       await expect(
         sut.authenticate({
           headers: { 'x-immich-share-key': 'key' },
@@ -306,8 +289,8 @@ describe('AuthService', () => {
     });
 
     it('should not accept a key without a user', async () => {
-      sharedLinkMock.getByKey.mockResolvedValue(sharedLinkStub.expired);
-      userMock.get.mockResolvedValue(void 0);
+      mocks.sharedLink.getByKey.mockResolvedValue(sharedLinkStub.expired);
+      mocks.user.get.mockResolvedValue(void 0);
       await expect(
         sut.authenticate({
           headers: { 'x-immich-share-key': 'key' },
@@ -318,8 +301,8 @@ describe('AuthService', () => {
     });
 
     it('should accept a base64url key', async () => {
-      sharedLinkMock.getByKey.mockResolvedValue(sharedLinkStub.valid);
-      userMock.get.mockResolvedValue(userStub.admin);
+      mocks.sharedLink.getByKey.mockResolvedValue(sharedLinkStub.valid);
+      mocks.user.get.mockResolvedValue(userStub.admin);
       await expect(
         sut.authenticate({
           headers: { 'x-immich-share-key': sharedLinkStub.valid.key.toString('base64url') },
@@ -330,12 +313,12 @@ describe('AuthService', () => {
         user: userStub.admin,
         sharedLink: sharedLinkStub.valid,
       });
-      expect(sharedLinkMock.getByKey).toHaveBeenCalledWith(sharedLinkStub.valid.key);
+      expect(mocks.sharedLink.getByKey).toHaveBeenCalledWith(sharedLinkStub.valid.key);
     });
 
     it('should accept a hex key', async () => {
-      sharedLinkMock.getByKey.mockResolvedValue(sharedLinkStub.valid);
-      userMock.get.mockResolvedValue(userStub.admin);
+      mocks.sharedLink.getByKey.mockResolvedValue(sharedLinkStub.valid);
+      mocks.user.get.mockResolvedValue(userStub.admin);
       await expect(
         sut.authenticate({
           headers: { 'x-immich-share-key': sharedLinkStub.valid.key.toString('hex') },
@@ -346,13 +329,13 @@ describe('AuthService', () => {
         user: userStub.admin,
         sharedLink: sharedLinkStub.valid,
       });
-      expect(sharedLinkMock.getByKey).toHaveBeenCalledWith(sharedLinkStub.valid.key);
+      expect(mocks.sharedLink.getByKey).toHaveBeenCalledWith(sharedLinkStub.valid.key);
     });
   });
 
   describe('validate - user token', () => {
     it('should throw if no token is found', async () => {
-      sessionMock.getByToken.mockResolvedValue(void 0);
+      mocks.session.getByToken.mockResolvedValue(void 0);
       await expect(
         sut.authenticate({
           headers: { 'x-immich-user-token': 'auth_token' },
@@ -363,7 +346,7 @@ describe('AuthService', () => {
     });
 
     it('should return an auth dto', async () => {
-      sessionMock.getByToken.mockResolvedValue(sessionStub.valid);
+      mocks.session.getByToken.mockResolvedValue(sessionStub.valid as any);
       await expect(
         sut.authenticate({
           headers: { cookie: 'immich_access_token=auth_token' },
@@ -377,7 +360,7 @@ describe('AuthService', () => {
     });
 
     it('should throw if admin route and not an admin', async () => {
-      sessionMock.getByToken.mockResolvedValue(sessionStub.valid);
+      mocks.session.getByToken.mockResolvedValue(sessionStub.valid as any);
       await expect(
         sut.authenticate({
           headers: { cookie: 'immich_access_token=auth_token' },
@@ -388,8 +371,8 @@ describe('AuthService', () => {
     });
 
     it('should update when access time exceeds an hour', async () => {
-      sessionMock.getByToken.mockResolvedValue(sessionStub.inactive);
-      sessionMock.update.mockResolvedValue(sessionStub.valid);
+      mocks.session.getByToken.mockResolvedValue(sessionStub.inactive as any);
+      mocks.session.update.mockResolvedValue(sessionStub.valid);
       await expect(
         sut.authenticate({
           headers: { cookie: 'immich_access_token=auth_token' },
@@ -397,13 +380,13 @@ describe('AuthService', () => {
           metadata: { adminRoute: false, sharedLinkRoute: false, uri: 'test' },
         }),
       ).resolves.toBeDefined();
-      expect(sessionMock.update.mock.calls[0][1]).toMatchObject({ id: 'not_active', updatedAt: expect.any(Date) });
+      expect(mocks.session.update.mock.calls[0][1]).toMatchObject({ id: 'not_active', updatedAt: expect.any(Date) });
     });
   });
 
   describe('validate - api key', () => {
     it('should throw an error if no api key is found', async () => {
-      keyMock.getKey.mockResolvedValue(void 0);
+      mocks.apiKey.getKey.mockResolvedValue(void 0);
       await expect(
         sut.authenticate({
           headers: { 'x-api-key': 'auth_token' },
@@ -411,11 +394,11 @@ describe('AuthService', () => {
           metadata: { adminRoute: false, sharedLinkRoute: false, uri: 'test' },
         }),
       ).rejects.toBeInstanceOf(UnauthorizedException);
-      expect(keyMock.getKey).toHaveBeenCalledWith('auth_token (hashed)');
+      expect(mocks.apiKey.getKey).toHaveBeenCalledWith('auth_token (hashed)');
     });
 
     it('should throw an error if api key has insufficient permissions', async () => {
-      keyMock.getKey.mockResolvedValue(keyStub.authKey);
+      mocks.apiKey.getKey.mockResolvedValue(keyStub.authKey);
       await expect(
         sut.authenticate({
           headers: { 'x-api-key': 'auth_token' },
@@ -426,7 +409,7 @@ describe('AuthService', () => {
     });
 
     it('should return an auth dto', async () => {
-      keyMock.getKey.mockResolvedValue(keyStub.authKey);
+      mocks.apiKey.getKey.mockResolvedValue(keyStub.authKey);
       await expect(
         sut.authenticate({
           headers: { 'x-api-key': 'auth_token' },
@@ -434,7 +417,7 @@ describe('AuthService', () => {
           metadata: { adminRoute: false, sharedLinkRoute: false, uri: 'test' },
         }),
       ).resolves.toEqual({ user: userStub.admin, apiKey: keyStub.authKey });
-      expect(keyMock.getKey).toHaveBeenCalledWith('auth_token (hashed)');
+      expect(mocks.apiKey.getKey).toHaveBeenCalledWith('auth_token (hashed)');
     });
   });
 
@@ -452,14 +435,14 @@ describe('AuthService', () => {
 
   describe('authorize', () => {
     it('should fail if oauth is disabled', async () => {
-      systemMock.get.mockResolvedValue({ oauth: { enabled: false } });
+      mocks.systemMetadata.get.mockResolvedValue({ oauth: { enabled: false } });
       await expect(sut.authorize({ redirectUri: 'https://demo.immich.app' })).rejects.toBeInstanceOf(
         BadRequestException,
       );
     });
 
     it('should authorize the user', async () => {
-      systemMock.get.mockResolvedValue(systemConfigStub.oauthWithMobileOverride);
+      mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.oauthWithMobileOverride);
       await sut.authorize({ redirectUri: 'https://demo.immich.app' });
     });
   });
@@ -470,71 +453,71 @@ describe('AuthService', () => {
     });
 
     it('should not allow auto registering', async () => {
-      systemMock.get.mockResolvedValue(systemConfigStub.oauthEnabled);
-      userMock.getByEmail.mockResolvedValue(void 0);
+      mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.oauthEnabled);
+      mocks.user.getByEmail.mockResolvedValue(void 0);
       await expect(sut.callback({ url: 'http://immich/auth/login?code=abc123' }, loginDetails)).rejects.toBeInstanceOf(
         BadRequestException,
       );
-      expect(userMock.getByEmail).toHaveBeenCalledTimes(1);
+      expect(mocks.user.getByEmail).toHaveBeenCalledTimes(1);
     });
 
     it('should link an existing user', async () => {
-      systemMock.get.mockResolvedValue(systemConfigStub.oauthEnabled);
-      userMock.getByEmail.mockResolvedValue(userStub.user1);
-      userMock.update.mockResolvedValue(userStub.user1);
-      sessionMock.create.mockResolvedValue(sessionStub.valid);
+      mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.oauthEnabled);
+      mocks.user.getByEmail.mockResolvedValue(userStub.user1);
+      mocks.user.update.mockResolvedValue(userStub.user1);
+      mocks.session.create.mockResolvedValue(sessionStub.valid);
 
       await expect(sut.callback({ url: 'http://immich/auth/login?code=abc123' }, loginDetails)).resolves.toEqual(
         oauthResponse,
       );
 
-      expect(userMock.getByEmail).toHaveBeenCalledTimes(1);
-      expect(userMock.update).toHaveBeenCalledWith(userStub.user1.id, { oauthId: sub });
+      expect(mocks.user.getByEmail).toHaveBeenCalledTimes(1);
+      expect(mocks.user.update).toHaveBeenCalledWith(userStub.user1.id, { oauthId: sub });
     });
 
     it('should not link to a user with a different oauth sub', async () => {
-      systemMock.get.mockResolvedValue(systemConfigStub.oauthWithAutoRegister);
-      userMock.getByEmail.mockResolvedValueOnce({ ...userStub.user1, oauthId: 'existing-sub' });
-      userMock.getAdmin.mockResolvedValue(userStub.user1);
-      userMock.create.mockResolvedValue(userStub.user1);
+      mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.oauthWithAutoRegister);
+      mocks.user.getByEmail.mockResolvedValueOnce({ ...userStub.user1, oauthId: 'existing-sub' });
+      mocks.user.getAdmin.mockResolvedValue(userStub.user1);
+      mocks.user.create.mockResolvedValue(userStub.user1);
 
       await expect(sut.callback({ url: 'http://immich/auth/login?code=abc123' }, loginDetails)).rejects.toThrow(
         BadRequestException,
       );
 
-      expect(userMock.update).not.toHaveBeenCalled();
-      expect(userMock.create).not.toHaveBeenCalled();
+      expect(mocks.user.update).not.toHaveBeenCalled();
+      expect(mocks.user.create).not.toHaveBeenCalled();
     });
 
     it('should allow auto registering by default', async () => {
-      systemMock.get.mockResolvedValue(systemConfigStub.enabled);
-      userMock.getByEmail.mockResolvedValue(void 0);
-      userMock.getAdmin.mockResolvedValue(userStub.user1);
-      userMock.create.mockResolvedValue(userStub.user1);
-      sessionMock.create.mockResolvedValue(sessionStub.valid);
+      mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.enabled);
+      mocks.user.getByEmail.mockResolvedValue(void 0);
+      mocks.user.getAdmin.mockResolvedValue(userStub.user1);
+      mocks.user.create.mockResolvedValue(userStub.user1);
+      mocks.session.create.mockResolvedValue(sessionStub.valid);
 
       await expect(sut.callback({ url: 'http://immich/auth/login?code=abc123' }, loginDetails)).resolves.toEqual(
         oauthResponse,
       );
 
-      expect(userMock.getByEmail).toHaveBeenCalledTimes(2); // second call is for domain check before create
-      expect(userMock.create).toHaveBeenCalledTimes(1);
+      expect(mocks.user.getByEmail).toHaveBeenCalledTimes(2); // second call is for domain check before create
+      expect(mocks.user.create).toHaveBeenCalledTimes(1);
     });
 
     it('should throw an error if user should be auto registered but the email claim does not exist', async () => {
-      systemMock.get.mockResolvedValue(systemConfigStub.enabled);
-      userMock.getByEmail.mockResolvedValue(void 0);
-      userMock.getAdmin.mockResolvedValue(userStub.user1);
-      userMock.create.mockResolvedValue(userStub.user1);
-      sessionMock.create.mockResolvedValue(sessionStub.valid);
-      oauthMock.getProfile.mockResolvedValue({ sub, email: undefined });
+      mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.enabled);
+      mocks.user.getByEmail.mockResolvedValue(void 0);
+      mocks.user.getAdmin.mockResolvedValue(userStub.user1);
+      mocks.user.create.mockResolvedValue(userStub.user1);
+      mocks.session.create.mockResolvedValue(sessionStub.valid);
+      mocks.oauth.getProfile.mockResolvedValue({ sub, email: undefined });
 
       await expect(sut.callback({ url: 'http://immich/auth/login?code=abc123' }, loginDetails)).rejects.toBeInstanceOf(
         BadRequestException,
       );
 
-      expect(userMock.getByEmail).not.toHaveBeenCalled();
-      expect(userMock.create).not.toHaveBeenCalled();
+      expect(mocks.user.getByEmail).not.toHaveBeenCalled();
+      expect(mocks.user.create).not.toHaveBeenCalled();
     });
 
     for (const url of [
@@ -546,68 +529,68 @@ describe('AuthService', () => {
       'app.immich:///oauth-callback?code=abc123',
     ]) {
       it(`should use the mobile redirect override for a url of ${url}`, async () => {
-        systemMock.get.mockResolvedValue(systemConfigStub.oauthWithMobileOverride);
-        userMock.getByOAuthId.mockResolvedValue(userStub.user1);
-        sessionMock.create.mockResolvedValue(sessionStub.valid);
+        mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.oauthWithMobileOverride);
+        mocks.user.getByOAuthId.mockResolvedValue(userStub.user1);
+        mocks.session.create.mockResolvedValue(sessionStub.valid);
 
         await sut.callback({ url }, loginDetails);
-        expect(oauthMock.getProfile).toHaveBeenCalledWith(expect.objectContaining({}), url, 'http://mobile-redirect');
+        expect(mocks.oauth.getProfile).toHaveBeenCalledWith(expect.objectContaining({}), url, 'http://mobile-redirect');
       });
     }
 
     it('should use the default quota', async () => {
-      systemMock.get.mockResolvedValue(systemConfigStub.oauthWithStorageQuota);
-      userMock.getByEmail.mockResolvedValue(void 0);
-      userMock.getAdmin.mockResolvedValue(userStub.user1);
-      userMock.create.mockResolvedValue(userStub.user1);
+      mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.oauthWithStorageQuota);
+      mocks.user.getByEmail.mockResolvedValue(void 0);
+      mocks.user.getAdmin.mockResolvedValue(userStub.user1);
+      mocks.user.create.mockResolvedValue(userStub.user1);
 
       await expect(sut.callback({ url: 'http://immich/auth/login?code=abc123' }, loginDetails)).resolves.toEqual(
         oauthResponse,
       );
 
-      expect(userMock.create).toHaveBeenCalledWith({ ...oauthUserWithDefaultQuota, quotaSizeInBytes: 1_073_741_824 });
+      expect(mocks.user.create).toHaveBeenCalledWith({ ...oauthUserWithDefaultQuota, quotaSizeInBytes: 1_073_741_824 });
     });
 
     it('should ignore an invalid storage quota', async () => {
-      systemMock.get.mockResolvedValue(systemConfigStub.oauthWithStorageQuota);
-      userMock.getByEmail.mockResolvedValue(void 0);
-      userMock.getAdmin.mockResolvedValue(userStub.user1);
-      userMock.create.mockResolvedValue(userStub.user1);
-      oauthMock.getProfile.mockResolvedValue({ sub, email, immich_quota: 'abc' });
+      mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.oauthWithStorageQuota);
+      mocks.user.getByEmail.mockResolvedValue(void 0);
+      mocks.user.getAdmin.mockResolvedValue(userStub.user1);
+      mocks.user.create.mockResolvedValue(userStub.user1);
+      mocks.oauth.getProfile.mockResolvedValue({ sub, email, immich_quota: 'abc' });
 
       await expect(sut.callback({ url: 'http://immich/auth/login?code=abc123' }, loginDetails)).resolves.toEqual(
         oauthResponse,
       );
 
-      expect(userMock.create).toHaveBeenCalledWith({ ...oauthUserWithDefaultQuota, quotaSizeInBytes: 1_073_741_824 });
+      expect(mocks.user.create).toHaveBeenCalledWith({ ...oauthUserWithDefaultQuota, quotaSizeInBytes: 1_073_741_824 });
     });
 
     it('should ignore a negative quota', async () => {
-      systemMock.get.mockResolvedValue(systemConfigStub.oauthWithStorageQuota);
-      userMock.getByEmail.mockResolvedValue(void 0);
-      userMock.getAdmin.mockResolvedValue(userStub.user1);
-      userMock.create.mockResolvedValue(userStub.user1);
-      oauthMock.getProfile.mockResolvedValue({ sub, email, immich_quota: -5 });
+      mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.oauthWithStorageQuota);
+      mocks.user.getByEmail.mockResolvedValue(void 0);
+      mocks.user.getAdmin.mockResolvedValue(userStub.user1);
+      mocks.user.create.mockResolvedValue(userStub.user1);
+      mocks.oauth.getProfile.mockResolvedValue({ sub, email, immich_quota: -5 });
 
       await expect(sut.callback({ url: 'http://immich/auth/login?code=abc123' }, loginDetails)).resolves.toEqual(
         oauthResponse,
       );
 
-      expect(userMock.create).toHaveBeenCalledWith({ ...oauthUserWithDefaultQuota, quotaSizeInBytes: 1_073_741_824 });
+      expect(mocks.user.create).toHaveBeenCalledWith({ ...oauthUserWithDefaultQuota, quotaSizeInBytes: 1_073_741_824 });
     });
 
     it('should not set quota for 0 quota', async () => {
-      systemMock.get.mockResolvedValue(systemConfigStub.oauthWithStorageQuota);
-      userMock.getByEmail.mockResolvedValue(void 0);
-      userMock.getAdmin.mockResolvedValue(userStub.user1);
-      userMock.create.mockResolvedValue(userStub.user1);
-      oauthMock.getProfile.mockResolvedValue({ sub, email, immich_quota: 0 });
+      mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.oauthWithStorageQuota);
+      mocks.user.getByEmail.mockResolvedValue(void 0);
+      mocks.user.getAdmin.mockResolvedValue(userStub.user1);
+      mocks.user.create.mockResolvedValue(userStub.user1);
+      mocks.oauth.getProfile.mockResolvedValue({ sub, email, immich_quota: 0 });
 
       await expect(sut.callback({ url: 'http://immich/auth/login?code=abc123' }, loginDetails)).resolves.toEqual(
         oauthResponse,
       );
 
-      expect(userMock.create).toHaveBeenCalledWith({
+      expect(mocks.user.create).toHaveBeenCalledWith({
         email,
         name: ' ',
         oauthId: sub,
@@ -617,17 +600,17 @@ describe('AuthService', () => {
     });
 
     it('should use a valid storage quota', async () => {
-      systemMock.get.mockResolvedValue(systemConfigStub.oauthWithStorageQuota);
-      userMock.getByEmail.mockResolvedValue(void 0);
-      userMock.getAdmin.mockResolvedValue(userStub.user1);
-      userMock.create.mockResolvedValue(userStub.user1);
-      oauthMock.getProfile.mockResolvedValue({ sub, email, immich_quota: 5 });
+      mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.oauthWithStorageQuota);
+      mocks.user.getByEmail.mockResolvedValue(void 0);
+      mocks.user.getAdmin.mockResolvedValue(userStub.user1);
+      mocks.user.create.mockResolvedValue(userStub.user1);
+      mocks.oauth.getProfile.mockResolvedValue({ sub, email, immich_quota: 5 });
 
       await expect(sut.callback({ url: 'http://immich/auth/login?code=abc123' }, loginDetails)).resolves.toEqual(
         oauthResponse,
       );
 
-      expect(userMock.create).toHaveBeenCalledWith({
+      expect(mocks.user.create).toHaveBeenCalledWith({
         email,
         name: ' ',
         oauthId: sub,
@@ -639,34 +622,34 @@ describe('AuthService', () => {
 
   describe('link', () => {
     it('should link an account', async () => {
-      systemMock.get.mockResolvedValue(systemConfigStub.enabled);
-      userMock.update.mockResolvedValue(userStub.user1);
+      mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.enabled);
+      mocks.user.update.mockResolvedValue(userStub.user1);
 
       await sut.link(authStub.user1, { url: 'http://immich/user-settings?code=abc123' });
 
-      expect(userMock.update).toHaveBeenCalledWith(authStub.user1.user.id, { oauthId: sub });
+      expect(mocks.user.update).toHaveBeenCalledWith(authStub.user1.user.id, { oauthId: sub });
     });
 
     it('should not link an already linked oauth.sub', async () => {
-      systemMock.get.mockResolvedValue(systemConfigStub.enabled);
-      userMock.getByOAuthId.mockResolvedValue({ id: 'other-user' } as UserEntity);
+      mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.enabled);
+      mocks.user.getByOAuthId.mockResolvedValue({ id: 'other-user' } as UserEntity);
 
       await expect(sut.link(authStub.user1, { url: 'http://immich/user-settings?code=abc123' })).rejects.toBeInstanceOf(
         BadRequestException,
       );
 
-      expect(userMock.update).not.toHaveBeenCalled();
+      expect(mocks.user.update).not.toHaveBeenCalled();
     });
   });
 
   describe('unlink', () => {
     it('should unlink an account', async () => {
-      systemMock.get.mockResolvedValue(systemConfigStub.enabled);
-      userMock.update.mockResolvedValue(userStub.user1);
+      mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.enabled);
+      mocks.user.update.mockResolvedValue(userStub.user1);
 
       await sut.unlink(authStub.user1);
 
-      expect(userMock.update).toHaveBeenCalledWith(authStub.user1.user.id, { oauthId: '' });
+      expect(mocks.user.update).toHaveBeenCalledWith(authStub.user1.user.id, { oauthId: '' });
     });
   });
 });

server/src/services/auth.service.ts

@@ -17,6 +17,7 @@ import {
   mapLoginResponse,
 } from 'src/dtos/auth.dto';
 import { UserAdminResponseDto, mapUserAdmin } from 'src/dtos/user.dto';
+import { SessionEntity } from 'src/entities/session.entity';
 import { UserEntity } from 'src/entities/user.entity';
 import { AuthType, ImmichCookie, ImmichHeader, ImmichQuery, Permission } from 'src/enum';
 import { OAuthProfile } from 'src/repositories/oauth.repository';
@@ -338,7 +339,7 @@ export class AuthService extends BaseService {
         await this.sessionRepository.update(session.id, { id: session.id, updatedAt: new Date() });
       }
 
-      return { user: session.user, session };
+      return { user: session.user as unknown as UserEntity, session: session as unknown as SessionEntity };
     }
 
     throw new UnauthorizedException('Invalid user token');

server/src/services/backup.service.spec.ts

@@ -2,29 +2,18 @@ import { PassThrough } from 'node:stream';
 import { defaults, SystemConfig } from 'src/config';
 import { StorageCore } from 'src/cores/storage.core';
 import { ImmichWorker, StorageFolder } from 'src/enum';
-import { IDatabaseRepository } from 'src/interfaces/database.interface';
 import { JobStatus } from 'src/interfaces/job.interface';
-import { IProcessRepository } from 'src/interfaces/process.interface';
-import { IStorageRepository } from 'src/interfaces/storage.interface';
-import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
 import { BackupService } from 'src/services/backup.service';
-import { IConfigRepository, ICronRepository } from 'src/types';
 import { systemConfigStub } from 'test/fixtures/system-config.stub';
-import { mockSpawn, newTestService } from 'test/utils';
-import { describe, Mocked } from 'vitest';
+import { mockSpawn, newTestService, ServiceMocks } from 'test/utils';
+import { describe } from 'vitest';
 
 describe(BackupService.name, () => {
   let sut: BackupService;
-
-  let databaseMock: Mocked<IDatabaseRepository>;
-  let configMock: Mocked<IConfigRepository>;
-  let cronMock: Mocked<ICronRepository>;
-  let processMock: Mocked<IProcessRepository>;
-  let storageMock: Mocked<IStorageRepository>;
-  let systemMock: Mocked<ISystemMetadataRepository>;
+  let mocks: ServiceMocks;
 
   beforeEach(() => {
-    ({ sut, cronMock, configMock, databaseMock, processMock, storageMock, systemMock } = newTestService(BackupService));
+    ({ sut, mocks } = newTestService(BackupService));
   });
 
   it('should work', () => {
@@ -33,32 +22,32 @@ describe(BackupService.name, () => {
 
   describe('onBootstrapEvent', () => {
     it('should init cron job and handle config changes', async () => {
-      databaseMock.tryLock.mockResolvedValue(true);
+      mocks.database.tryLock.mockResolvedValue(true);
 
       await sut.onConfigInit({ newConfig: systemConfigStub.backupEnabled as SystemConfig });
 
-      expect(cronMock.create).toHaveBeenCalled();
+      expect(mocks.cron.create).toHaveBeenCalled();
     });
 
     it('should not initialize backup database cron job when lock is taken', async () => {
-      databaseMock.tryLock.mockResolvedValue(false);
+      mocks.database.tryLock.mockResolvedValue(false);
 
       await sut.onConfigInit({ newConfig: systemConfigStub.backupEnabled as SystemConfig });
 
-      expect(cronMock.create).not.toHaveBeenCalled();
+      expect(mocks.cron.create).not.toHaveBeenCalled();
     });
 
     it('should not initialise backup database job when running on microservices', async () => {
-      configMock.getWorker.mockReturnValue(ImmichWorker.MICROSERVICES);
+      mocks.config.getWorker.mockReturnValue(ImmichWorker.MICROSERVICES);
       await sut.onConfigInit({ newConfig: systemConfigStub.backupEnabled as SystemConfig });
 
-      expect(cronMock.create).not.toHaveBeenCalled();
+      expect(mocks.cron.create).not.toHaveBeenCalled();
     });
   });
 
   describe('onConfigUpdateEvent', () => {
     beforeEach(async () => {
-      databaseMock.tryLock.mockResolvedValue(true);
+      mocks.database.tryLock.mockResolvedValue(true);
       await sut.onConfigInit({ newConfig: defaults });
     });
 
@@ -75,66 +64,66 @@ describe(BackupService.name, () => {
         } as SystemConfig,
       });
 
-      expect(cronMock.update).toHaveBeenCalledWith({ name: 'backupDatabase', expression: '0 1 * * *', start: true });
-      expect(cronMock.update).toHaveBeenCalled();
+      expect(mocks.cron.update).toHaveBeenCalledWith({ name: 'backupDatabase', expression: '0 1 * * *', start: true });
+      expect(mocks.cron.update).toHaveBeenCalled();
     });
 
     it('should do nothing if instance does not have the backup database lock', async () => {
-      databaseMock.tryLock.mockResolvedValue(false);
+      mocks.database.tryLock.mockResolvedValue(false);
       await sut.onConfigInit({ newConfig: defaults });
       sut.onConfigUpdate({ newConfig: systemConfigStub.backupEnabled as SystemConfig, oldConfig: defaults });
-      expect(cronMock.update).not.toHaveBeenCalled();
+      expect(mocks.cron.update).not.toHaveBeenCalled();
     });
   });
 
   describe('cleanupDatabaseBackups', () => {
     it('should do nothing if not reached keepLastAmount', async () => {
-      systemMock.get.mockResolvedValue(systemConfigStub.backupEnabled);
-      storageMock.readdir.mockResolvedValue(['immich-db-backup-1.sql.gz']);
+      mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.backupEnabled);
+      mocks.storage.readdir.mockResolvedValue(['immich-db-backup-1.sql.gz']);
       await sut.cleanupDatabaseBackups();
-      expect(storageMock.unlink).not.toHaveBeenCalled();
+      expect(mocks.storage.unlink).not.toHaveBeenCalled();
     });
 
     it('should remove failed backup files', async () => {
-      systemMock.get.mockResolvedValue(systemConfigStub.backupEnabled);
-      storageMock.readdir.mockResolvedValue([
+      mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.backupEnabled);
+      mocks.storage.readdir.mockResolvedValue([
         'immich-db-backup-123.sql.gz.tmp',
         'immich-db-backup-234.sql.gz',
         'immich-db-backup-345.sql.gz.tmp',
       ]);
       await sut.cleanupDatabaseBackups();
-      expect(storageMock.unlink).toHaveBeenCalledTimes(2);
-      expect(storageMock.unlink).toHaveBeenCalledWith(
+      expect(mocks.storage.unlink).toHaveBeenCalledTimes(2);
+      expect(mocks.storage.unlink).toHaveBeenCalledWith(
         `${StorageCore.getBaseFolder(StorageFolder.BACKUPS)}/immich-db-backup-123.sql.gz.tmp`,
       );
-      expect(storageMock.unlink).toHaveBeenCalledWith(
+      expect(mocks.storage.unlink).toHaveBeenCalledWith(
         `${StorageCore.getBaseFolder(StorageFolder.BACKUPS)}/immich-db-backup-345.sql.gz.tmp`,
       );
     });
 
     it('should remove old backup files over keepLastAmount', async () => {
-      systemMock.get.mockResolvedValue(systemConfigStub.backupEnabled);
-      storageMock.readdir.mockResolvedValue(['immich-db-backup-1.sql.gz', 'immich-db-backup-2.sql.gz']);
+      mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.backupEnabled);
+      mocks.storage.readdir.mockResolvedValue(['immich-db-backup-1.sql.gz', 'immich-db-backup-2.sql.gz']);
       await sut.cleanupDatabaseBackups();
-      expect(storageMock.unlink).toHaveBeenCalledTimes(1);
-      expect(storageMock.unlink).toHaveBeenCalledWith(
+      expect(mocks.storage.unlink).toHaveBeenCalledTimes(1);
+      expect(mocks.storage.unlink).toHaveBeenCalledWith(
         `${StorageCore.getBaseFolder(StorageFolder.BACKUPS)}/immich-db-backup-1.sql.gz`,
       );
     });
 
     it('should remove old backup files over keepLastAmount and failed backups', async () => {
-      systemMock.get.mockResolvedValue(systemConfigStub.backupEnabled);
-      storageMock.readdir.mockResolvedValue([
+      mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.backupEnabled);
+      mocks.storage.readdir.mockResolvedValue([
         'immich-db-backup-1.sql.gz.tmp',
         'immich-db-backup-2.sql.gz',
         'immich-db-backup-3.sql.gz',
       ]);
       await sut.cleanupDatabaseBackups();
-      expect(storageMock.unlink).toHaveBeenCalledTimes(2);
-      expect(storageMock.unlink).toHaveBeenCalledWith(
+      expect(mocks.storage.unlink).toHaveBeenCalledTimes(2);
+      expect(mocks.storage.unlink).toHaveBeenCalledWith(
         `${StorageCore.getBaseFolder(StorageFolder.BACKUPS)}/immich-db-backup-1.sql.gz.tmp`,
       );
-      expect(storageMock.unlink).toHaveBeenCalledWith(
+      expect(mocks.storage.unlink).toHaveBeenCalledWith(
         `${StorageCore.getBaseFolder(StorageFolder.BACKUPS)}/immich-db-backup-2.sql.gz`,
       );
     });
@@ -142,57 +131,57 @@ describe(BackupService.name, () => {
 
   describe('handleBackupDatabase', () => {
     beforeEach(() => {
-      storageMock.readdir.mockResolvedValue([]);
-      processMock.spawn.mockReturnValue(mockSpawn(0, 'data', ''));
-      storageMock.rename.mockResolvedValue();
-      storageMock.unlink.mockResolvedValue();
-      systemMock.get.mockResolvedValue(systemConfigStub.backupEnabled);
-      storageMock.createWriteStream.mockReturnValue(new PassThrough());
+      mocks.storage.readdir.mockResolvedValue([]);
+      mocks.process.spawn.mockReturnValue(mockSpawn(0, 'data', ''));
+      mocks.storage.rename.mockResolvedValue();
+      mocks.storage.unlink.mockResolvedValue();
+      mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.backupEnabled);
+      mocks.storage.createWriteStream.mockReturnValue(new PassThrough());
     });
     it('should run a database backup successfully', async () => {
       const result = await sut.handleBackupDatabase();
       expect(result).toBe(JobStatus.SUCCESS);
-      expect(storageMock.createWriteStream).toHaveBeenCalled();
+      expect(mocks.storage.createWriteStream).toHaveBeenCalled();
     });
     it('should rename file on success', async () => {
       const result = await sut.handleBackupDatabase();
       expect(result).toBe(JobStatus.SUCCESS);
-      expect(storageMock.rename).toHaveBeenCalled();
+      expect(mocks.storage.rename).toHaveBeenCalled();
     });
     it('should fail if pg_dumpall fails', async () => {
-      processMock.spawn.mockReturnValueOnce(mockSpawn(1, '', 'error'));
+      mocks.process.spawn.mockReturnValueOnce(mockSpawn(1, '', 'error'));
       const result = await sut.handleBackupDatabase();
       expect(result).toBe(JobStatus.FAILED);
     });
     it('should not rename file if pgdump fails and gzip succeeds', async () => {
-      processMock.spawn.mockReturnValueOnce(mockSpawn(1, '', 'error'));
+      mocks.process.spawn.mockReturnValueOnce(mockSpawn(1, '', 'error'));
       const result = await sut.handleBackupDatabase();
       expect(result).toBe(JobStatus.FAILED);
-      expect(storageMock.rename).not.toHaveBeenCalled();
+      expect(mocks.storage.rename).not.toHaveBeenCalled();
     });
     it('should fail if gzip fails', async () => {
-      processMock.spawn.mockReturnValueOnce(mockSpawn(0, 'data', ''));
-      processMock.spawn.mockReturnValueOnce(mockSpawn(1, '', 'error'));
+      mocks.process.spawn.mockReturnValueOnce(mockSpawn(0, 'data', ''));
+      mocks.process.spawn.mockReturnValueOnce(mockSpawn(1, '', 'error'));
       const result = await sut.handleBackupDatabase();
       expect(result).toBe(JobStatus.FAILED);
     });
     it('should fail if write stream fails', async () => {
-      storageMock.createWriteStream.mockImplementation(() => {
+      mocks.storage.createWriteStream.mockImplementation(() => {
         throw new Error('error');
       });
       const result = await sut.handleBackupDatabase();
       expect(result).toBe(JobStatus.FAILED);
     });
     it('should fail if rename fails', async () => {
-      storageMock.rename.mockRejectedValue(new Error('error'));
+      mocks.storage.rename.mockRejectedValue(new Error('error'));
       const result = await sut.handleBackupDatabase();
       expect(result).toBe(JobStatus.FAILED);
     });
     it('should ignore unlink failing and still return failed job status', async () => {
-      processMock.spawn.mockReturnValueOnce(mockSpawn(1, '', 'error'));
-      storageMock.unlink.mockRejectedValue(new Error('error'));
+      mocks.process.spawn.mockReturnValueOnce(mockSpawn(1, '', 'error'));
+      mocks.storage.unlink.mockRejectedValue(new Error('error'));
       const result = await sut.handleBackupDatabase();
-      expect(storageMock.unlink).toHaveBeenCalled();
+      expect(mocks.storage.unlink).toHaveBeenCalled();
       expect(result).toBe(JobStatus.FAILED);
     });
     it.each`
@@ -206,9 +195,9 @@ describe(BackupService.name, () => {
     `(
       `should use pg_dumpall $expectedVersion with postgres version $postgresVersion`,
       async ({ postgresVersion, expectedVersion }) => {
-        databaseMock.getPostgresVersion.mockResolvedValue(postgresVersion);
+        mocks.database.getPostgresVersion.mockResolvedValue(postgresVersion);
         await sut.handleBackupDatabase();
-        expect(processMock.spawn).toHaveBeenCalledWith(
+        expect(mocks.process.spawn).toHaveBeenCalledWith(
           `/usr/lib/postgresql/${expectedVersion}/bin/pg_dumpall`,
           expect.any(Array),
           expect.any(Object),
@@ -220,9 +209,9 @@ describe(BackupService.name, () => {
       ${'13.99.99'}
       ${'18.0.0'}
     `(`should fail if postgres version $postgresVersion is not supported`, async ({ postgresVersion }) => {
-      databaseMock.getPostgresVersion.mockResolvedValue(postgresVersion);
+      mocks.database.getPostgresVersion.mockResolvedValue(postgresVersion);
       const result = await sut.handleBackupDatabase();
-      expect(processMock.spawn).not.toHaveBeenCalled();
+      expect(mocks.process.spawn).not.toHaveBeenCalled();
       expect(result).toBe(JobStatus.FAILED);
     });
   });

server/src/services/base.service.ts

@@ -17,13 +17,10 @@ import { IMachineLearningRepository } from 'src/interfaces/machine-learning.inte
 import { IMoveRepository } from 'src/interfaces/move.interface';
 import { IPartnerRepository } from 'src/interfaces/partner.interface';
 import { IPersonRepository } from 'src/interfaces/person.interface';
-import { IProcessRepository } from 'src/interfaces/process.interface';
 import { ISearchRepository } from 'src/interfaces/search.interface';
-import { ISessionRepository } from 'src/interfaces/session.interface';
 import { ISharedLinkRepository } from 'src/interfaces/shared-link.interface';
 import { IStackRepository } from 'src/interfaces/stack.interface';
 import { IStorageRepository } from 'src/interfaces/storage.interface';
-import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
 import { ITagRepository } from 'src/interfaces/tag.interface';
 import { IUserRepository } from 'src/interfaces/user.interface';
 import { AccessRepository } from 'src/repositories/access.repository';
@@ -33,6 +30,7 @@ import { ApiKeyRepository } from 'src/repositories/api-key.repository';
 import { AuditRepository } from 'src/repositories/audit.repository';
 import { ConfigRepository } from 'src/repositories/config.repository';
 import { CronRepository } from 'src/repositories/cron.repository';
+import { CryptoRepository } from 'src/repositories/crypto.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
 import { MapRepository } from 'src/repositories/map.repository';
 import { MediaRepository } from 'src/repositories/media.repository';
@@ -40,7 +38,10 @@ import { MemoryRepository } from 'src/repositories/memory.repository';
 import { MetadataRepository } from 'src/repositories/metadata.repository';
 import { NotificationRepository } from 'src/repositories/notification.repository';
 import { OAuthRepository } from 'src/repositories/oauth.repository';
+import { ProcessRepository } from 'src/repositories/process.repository';
 import { ServerInfoRepository } from 'src/repositories/server-info.repository';
+import { SessionRepository } from 'src/repositories/session.repository';
+import { SystemMetadataRepository } from 'src/repositories/system-metadata.repository';
 import { TelemetryRepository } from 'src/repositories/telemetry.repository';
 import { TrashRepository } from 'src/repositories/trash.repository';
 import { VersionHistoryRepository } from 'src/repositories/version-history.repository';
@@ -61,7 +62,7 @@ export class BaseService {
     @Inject(IAssetRepository) protected assetRepository: IAssetRepository,
     protected configRepository: ConfigRepository,
     protected cronRepository: CronRepository,
-    @Inject(ICryptoRepository) protected cryptoRepository: ICryptoRepository,
+    @Inject(ICryptoRepository) protected cryptoRepository: CryptoRepository,
     @Inject(IDatabaseRepository) protected databaseRepository: IDatabaseRepository,
     @Inject(IEventRepository) protected eventRepository: IEventRepository,
     @Inject(IJobRepository) protected jobRepository: IJobRepository,
@@ -77,14 +78,14 @@ export class BaseService {
     protected oauthRepository: OAuthRepository,
     @Inject(IPartnerRepository) protected partnerRepository: IPartnerRepository,
     @Inject(IPersonRepository) protected personRepository: IPersonRepository,
-    @Inject(IProcessRepository) protected processRepository: IProcessRepository,
+    protected processRepository: ProcessRepository,
     @Inject(ISearchRepository) protected searchRepository: ISearchRepository,
     protected serverInfoRepository: ServerInfoRepository,
-    @Inject(ISessionRepository) protected sessionRepository: ISessionRepository,
+    protected sessionRepository: SessionRepository,
     @Inject(ISharedLinkRepository) protected sharedLinkRepository: ISharedLinkRepository,
     @Inject(IStackRepository) protected stackRepository: IStackRepository,
     @Inject(IStorageRepository) protected storageRepository: IStorageRepository,
-    @Inject(ISystemMetadataRepository) protected systemMetadataRepository: ISystemMetadataRepository,
+    protected systemMetadataRepository: SystemMetadataRepository,
     @Inject(ITagRepository) protected tagRepository: ITagRepository,
     protected telemetryRepository: TelemetryRepository,
     protected trashRepository: TrashRepository,

server/src/services/cli.service.spec.ts

@@ -1,31 +1,27 @@
-import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
-import { IUserRepository } from 'src/interfaces/user.interface';
 import { CliService } from 'src/services/cli.service';
 import { userStub } from 'test/fixtures/user.stub';
-import { newTestService } from 'test/utils';
-import { Mocked, describe, it } from 'vitest';
+import { newTestService, ServiceMocks } from 'test/utils';
+import { describe, it } from 'vitest';
 
 describe(CliService.name, () => {
   let sut: CliService;
-
-  let userMock: Mocked<IUserRepository>;
-  let systemMock: Mocked<ISystemMetadataRepository>;
+  let mocks: ServiceMocks;
 
   beforeEach(() => {
-    ({ sut, userMock, systemMock } = newTestService(CliService));
+    ({ sut, mocks } = newTestService(CliService));
   });
 
   describe('listUsers', () => {
     it('should list users', async () => {
-      userMock.getList.mockResolvedValue([userStub.admin]);
+      mocks.user.getList.mockResolvedValue([userStub.admin]);
       await expect(sut.listUsers()).resolves.toEqual([expect.objectContaining({ isAdmin: true })]);
-      expect(userMock.getList).toHaveBeenCalledWith({ withDeleted: true });
+      expect(mocks.user.getList).toHaveBeenCalledWith({ withDeleted: true });
     });
   });
 
   describe('resetAdminPassword', () => {
     it('should only work when there is an admin account', async () => {
-      userMock.getAdmin.mockResolvedValue(void 0);
+      mocks.user.getAdmin.mockResolvedValue(void 0);
       const ask = vitest.fn().mockResolvedValue('new-password');
 
       await expect(sut.resetAdminPassword(ask)).rejects.toThrowError('Admin account does not exist');
@@ -34,12 +30,12 @@ describe(CliService.name, () => {
     });
 
     it('should default to a random password', async () => {
-      userMock.getAdmin.mockResolvedValue(userStub.admin);
+      mocks.user.getAdmin.mockResolvedValue(userStub.admin);
       const ask = vitest.fn().mockImplementation(() => {});
 
       const response = await sut.resetAdminPassword(ask);
 
-      const [id, update] = userMock.update.mock.calls[0];
+      const [id, update] = mocks.user.update.mock.calls[0];
 
       expect(response.provided).toBe(false);
       expect(ask).toHaveBeenCalled();
@@ -48,12 +44,12 @@ describe(CliService.name, () => {
     });
 
     it('should use the supplied password', async () => {
-      userMock.getAdmin.mockResolvedValue(userStub.admin);
+      mocks.user.getAdmin.mockResolvedValue(userStub.admin);
       const ask = vitest.fn().mockResolvedValue('new-password');
 
       const response = await sut.resetAdminPassword(ask);
 
-      const [id, update] = userMock.update.mock.calls[0];
+      const [id, update] = mocks.user.update.mock.calls[0];
 
       expect(response.provided).toBe(true);
       expect(ask).toHaveBeenCalled();
@@ -65,28 +61,28 @@ describe(CliService.name, () => {
   describe('disablePasswordLogin', () => {
     it('should disable password login', async () => {
       await sut.disablePasswordLogin();
-      expect(systemMock.set).toHaveBeenCalledWith('system-config', { passwordLogin: { enabled: false } });
+      expect(mocks.systemMetadata.set).toHaveBeenCalledWith('system-config', { passwordLogin: { enabled: false } });
     });
   });
 
   describe('enablePasswordLogin', () => {
     it('should enable password login', async () => {
       await sut.enablePasswordLogin();
-      expect(systemMock.set).toHaveBeenCalledWith('system-config', {});
+      expect(mocks.systemMetadata.set).toHaveBeenCalledWith('system-config', {});
     });
   });
 
   describe('disableOAuthLogin', () => {
     it('should disable oauth login', async () => {
       await sut.disableOAuthLogin();
-      expect(systemMock.set).toHaveBeenCalledWith('system-config', {});
+      expect(mocks.systemMetadata.set).toHaveBeenCalledWith('system-config', {});
     });
   });
 
   describe('enableOAuthLogin', () => {
     it('should enable oauth login', async () => {
       await sut.enableOAuthLogin();
-      expect(systemMock.set).toHaveBeenCalledWith('system-config', { oauth: { enabled: true } });
+      expect(mocks.systemMetadata.set).toHaveBeenCalledWith('system-config', { oauth: { enabled: true } });
     });
   });
 });

server/src/services/database.service.spec.ts

@@ -1,21 +1,12 @@
-import {
-  DatabaseExtension,
-  EXTENSION_NAMES,
-  IDatabaseRepository,
-  VectorExtension,
-} from 'src/interfaces/database.interface';
+import { DatabaseExtension, EXTENSION_NAMES, VectorExtension } from 'src/interfaces/database.interface';
 import { DatabaseService } from 'src/services/database.service';
-import { IConfigRepository, ILoggingRepository } from 'src/types';
 import { mockEnvData } from 'test/repositories/config.repository.mock';
-import { newTestService } from 'test/utils';
-import { Mocked } from 'vitest';
+import { newTestService, ServiceMocks } from 'test/utils';
 
 describe(DatabaseService.name, () => {
   let sut: DatabaseService;
+  let mocks: ServiceMocks;
 
-  let configMock: Mocked<IConfigRepository>;
-  let databaseMock: Mocked<IDatabaseRepository>;
-  let loggerMock: Mocked<ILoggingRepository>;
   let extensionRange: string;
   let versionBelowRange: string;
   let minVersionInRange: string;
@@ -23,16 +14,16 @@ describe(DatabaseService.name, () => {
   let versionAboveRange: string;
 
   beforeEach(() => {
-    ({ sut, configMock, databaseMock, loggerMock } = newTestService(DatabaseService));
+    ({ sut, mocks } = newTestService(DatabaseService));
 
     extensionRange = '0.2.x';
-    databaseMock.getExtensionVersionRange.mockReturnValue(extensionRange);
+    mocks.database.getExtensionVersionRange.mockReturnValue(extensionRange);
 
     versionBelowRange = '0.1.0';
     minVersionInRange = '0.2.0';
     updateInRange = '0.2.1';
     versionAboveRange = '0.3.0';
-    databaseMock.getExtensionVersion.mockResolvedValue({
+    mocks.database.getExtensionVersion.mockResolvedValue({
       installedVersion: minVersionInRange,
       availableVersion: minVersionInRange,
     });
@@ -44,11 +35,11 @@ describe(DatabaseService.name, () => {
 
   describe('onBootstrap', () => {
     it('should throw an error if PostgreSQL version is below minimum supported version', async () => {
-      databaseMock.getPostgresVersion.mockResolvedValueOnce('13.10.0');
+      mocks.database.getPostgresVersion.mockResolvedValueOnce('13.10.0');
 
       await expect(sut.onBootstrap()).rejects.toThrow('Invalid PostgreSQL version. Found 13.10.0');
 
-      expect(databaseMock.getPostgresVersion).toHaveBeenCalledTimes(1);
+      expect(mocks.database.getPostgresVersion).toHaveBeenCalledTimes(1);
     });
 
     describe.each(<Array<{ extension: VectorExtension; extensionName: string }>>[
@@ -56,7 +47,7 @@ describe(DatabaseService.name, () => {
       { extension: DatabaseExtension.VECTORS, extensionName: EXTENSION_NAMES[DatabaseExtension.VECTORS] },
     ])('should work with $extensionName', ({ extension, extensionName }) => {
       beforeEach(() => {
-        configMock.getEnv.mockReturnValue(
+        mocks.config.getEnv.mockReturnValue(
           mockEnvData({
             database: {
               config: {
@@ -85,34 +76,34 @@ describe(DatabaseService.name, () => {
       });
 
       it(`should start up successfully with ${extension}`, async () => {
-        databaseMock.getPostgresVersion.mockResolvedValue('14.0.0');
-        databaseMock.getExtensionVersion.mockResolvedValue({
+        mocks.database.getPostgresVersion.mockResolvedValue('14.0.0');
+        mocks.database.getExtensionVersion.mockResolvedValue({
           installedVersion: null,
           availableVersion: minVersionInRange,
         });
 
         await expect(sut.onBootstrap()).resolves.toBeUndefined();
 
-        expect(databaseMock.getPostgresVersion).toHaveBeenCalled();
-        expect(databaseMock.createExtension).toHaveBeenCalledWith(extension);
-        expect(databaseMock.createExtension).toHaveBeenCalledTimes(1);
-        expect(databaseMock.getExtensionVersion).toHaveBeenCalled();
-        expect(databaseMock.runMigrations).toHaveBeenCalledTimes(1);
-        expect(loggerMock.fatal).not.toHaveBeenCalled();
+        expect(mocks.database.getPostgresVersion).toHaveBeenCalled();
+        expect(mocks.database.createExtension).toHaveBeenCalledWith(extension);
+        expect(mocks.database.createExtension).toHaveBeenCalledTimes(1);
+        expect(mocks.database.getExtensionVersion).toHaveBeenCalled();
+        expect(mocks.database.runMigrations).toHaveBeenCalledTimes(1);
+        expect(mocks.logger.fatal).not.toHaveBeenCalled();
       });
 
       it(`should throw an error if the ${extension} extension is not installed`, async () => {
-        databaseMock.getExtensionVersion.mockResolvedValue({ installedVersion: null, availableVersion: null });
+        mocks.database.getExtensionVersion.mockResolvedValue({ installedVersion: null, availableVersion: null });
         const message = `The ${extensionName} extension is not available in this Postgres instance.
     If using a container image, ensure the image has the extension installed.`;
         await expect(sut.onBootstrap()).rejects.toThrow(message);
 
-        expect(databaseMock.createExtension).not.toHaveBeenCalled();
-        expect(databaseMock.runMigrations).not.toHaveBeenCalled();
+        expect(mocks.database.createExtension).not.toHaveBeenCalled();
+        expect(mocks.database.runMigrations).not.toHaveBeenCalled();
       });
 
       it(`should throw an error if the ${extension} extension version is below minimum supported version`, async () => {
-        databaseMock.getExtensionVersion.mockResolvedValue({
+        mocks.database.getExtensionVersion.mockResolvedValue({
           installedVersion: versionBelowRange,
           availableVersion: versionBelowRange,
         });
@@ -121,80 +112,80 @@ describe(DatabaseService.name, () => {
           `The ${extensionName} extension version is ${versionBelowRange}, but Immich only supports ${extensionRange}`,
         );
 
-        expect(databaseMock.runMigrations).not.toHaveBeenCalled();
+        expect(mocks.database.runMigrations).not.toHaveBeenCalled();
       });
 
       it(`should throw an error if ${extension} extension version is a nightly`, async () => {
-        databaseMock.getExtensionVersion.mockResolvedValue({ installedVersion: '0.0.0', availableVersion: '0.0.0' });
+        mocks.database.getExtensionVersion.mockResolvedValue({ installedVersion: '0.0.0', availableVersion: '0.0.0' });
 
         await expect(sut.onBootstrap()).rejects.toThrow(
           `The ${extensionName} extension version is 0.0.0, which means it is a nightly release.`,
         );
 
-        expect(databaseMock.createExtension).not.toHaveBeenCalled();
-        expect(databaseMock.updateVectorExtension).not.toHaveBeenCalled();
-        expect(databaseMock.runMigrations).not.toHaveBeenCalled();
+        expect(mocks.database.createExtension).not.toHaveBeenCalled();
+        expect(mocks.database.updateVectorExtension).not.toHaveBeenCalled();
+        expect(mocks.database.runMigrations).not.toHaveBeenCalled();
       });
 
       it(`should do in-range update for ${extension} extension`, async () => {
-        databaseMock.getExtensionVersion.mockResolvedValue({
+        mocks.database.getExtensionVersion.mockResolvedValue({
           availableVersion: updateInRange,
           installedVersion: minVersionInRange,
         });
-        databaseMock.updateVectorExtension.mockResolvedValue({ restartRequired: false });
+        mocks.database.updateVectorExtension.mockResolvedValue({ restartRequired: false });
 
         await expect(sut.onBootstrap()).resolves.toBeUndefined();
 
-        expect(databaseMock.updateVectorExtension).toHaveBeenCalledWith(extension, updateInRange);
-        expect(databaseMock.updateVectorExtension).toHaveBeenCalledTimes(1);
-        expect(databaseMock.getExtensionVersion).toHaveBeenCalled();
-        expect(databaseMock.runMigrations).toHaveBeenCalledTimes(1);
-        expect(loggerMock.fatal).not.toHaveBeenCalled();
+        expect(mocks.database.updateVectorExtension).toHaveBeenCalledWith(extension, updateInRange);
+        expect(mocks.database.updateVectorExtension).toHaveBeenCalledTimes(1);
+        expect(mocks.database.getExtensionVersion).toHaveBeenCalled();
+        expect(mocks.database.runMigrations).toHaveBeenCalledTimes(1);
+        expect(mocks.logger.fatal).not.toHaveBeenCalled();
       });
 
       it(`should not upgrade ${extension} if same version`, async () => {
-        databaseMock.getExtensionVersion.mockResolvedValue({
+        mocks.database.getExtensionVersion.mockResolvedValue({
           availableVersion: minVersionInRange,
           installedVersion: minVersionInRange,
         });
 
         await expect(sut.onBootstrap()).resolves.toBeUndefined();
 
-        expect(databaseMock.updateVectorExtension).not.toHaveBeenCalled();
-        expect(databaseMock.runMigrations).toHaveBeenCalledTimes(1);
-        expect(loggerMock.fatal).not.toHaveBeenCalled();
+        expect(mocks.database.updateVectorExtension).not.toHaveBeenCalled();
+        expect(mocks.database.runMigrations).toHaveBeenCalledTimes(1);
+        expect(mocks.logger.fatal).not.toHaveBeenCalled();
       });
 
       it(`should throw error if ${extension} available version is below range`, async () => {
-        databaseMock.getExtensionVersion.mockResolvedValue({
+        mocks.database.getExtensionVersion.mockResolvedValue({
           availableVersion: versionBelowRange,
           installedVersion: null,
         });
 
         await expect(sut.onBootstrap()).rejects.toThrow();
 
-        expect(databaseMock.createExtension).not.toHaveBeenCalled();
-        expect(databaseMock.updateVectorExtension).not.toHaveBeenCalled();
-        expect(databaseMock.runMigrations).not.toHaveBeenCalled();
-        expect(loggerMock.fatal).not.toHaveBeenCalled();
+        expect(mocks.database.createExtension).not.toHaveBeenCalled();
+        expect(mocks.database.updateVectorExtension).not.toHaveBeenCalled();
+        expect(mocks.database.runMigrations).not.toHaveBeenCalled();
+        expect(mocks.logger.fatal).not.toHaveBeenCalled();
       });
 
       it(`should throw error if ${extension} available version is above range`, async () => {
-        databaseMock.getExtensionVersion.mockResolvedValue({
+        mocks.database.getExtensionVersion.mockResolvedValue({
           availableVersion: versionAboveRange,
           installedVersion: minVersionInRange,
         });
 
         await expect(sut.onBootstrap()).rejects.toThrow();
 
-        expect(databaseMock.createExtension).not.toHaveBeenCalled();
-        expect(databaseMock.updateVectorExtension).not.toHaveBeenCalled();
-        expect(databaseMock.runMigrations).not.toHaveBeenCalled();
-        expect(loggerMock.fatal).not.toHaveBeenCalled();
+        expect(mocks.database.createExtension).not.toHaveBeenCalled();
+        expect(mocks.database.updateVectorExtension).not.toHaveBeenCalled();
+        expect(mocks.database.runMigrations).not.toHaveBeenCalled();
+        expect(mocks.logger.fatal).not.toHaveBeenCalled();
       });
 
       it('should throw error if available version is below installed version', async () => {
-        databaseMock.getExtensionVersion.mockResolvedValue({
+        mocks.database.getExtensionVersion.mockResolvedValue({
           availableVersion: minVersionInRange,
           installedVersion: updateInRange,
         });
@@ -203,13 +194,13 @@ describe(DatabaseService.name, () => {
           `The database currently has ${extensionName} ${updateInRange} activated, but the Postgres instance only has ${minVersionInRange} available.`,
         );
 
-        expect(databaseMock.updateVectorExtension).not.toHaveBeenCalled();
-        expect(databaseMock.runMigrations).not.toHaveBeenCalled();
-        expect(loggerMock.fatal).not.toHaveBeenCalled();
+        expect(mocks.database.updateVectorExtension).not.toHaveBeenCalled();
+        expect(mocks.database.runMigrations).not.toHaveBeenCalled();
+        expect(mocks.logger.fatal).not.toHaveBeenCalled();
       });
 
       it('should throw error if installed version is not in version range', async () => {
-        databaseMock.getExtensionVersion.mockResolvedValue({
+        mocks.database.getExtensionVersion.mockResolvedValue({
           availableVersion: minVersionInRange,
           installedVersion: versionAboveRange,
         });
@@ -218,84 +209,84 @@ describe(DatabaseService.name, () => {
           `The ${extensionName} extension version is ${versionAboveRange}, but Immich only supports`,
         );
 
-        expect(databaseMock.updateVectorExtension).not.toHaveBeenCalled();
-        expect(databaseMock.runMigrations).not.toHaveBeenCalled();
-        expect(loggerMock.fatal).not.toHaveBeenCalled();
+        expect(mocks.database.updateVectorExtension).not.toHaveBeenCalled();
+        expect(mocks.database.runMigrations).not.toHaveBeenCalled();
+        expect(mocks.logger.fatal).not.toHaveBeenCalled();
       });
 
       it(`should raise error if ${extension} extension upgrade failed`, async () => {
-        databaseMock.getExtensionVersion.mockResolvedValue({
+        mocks.database.getExtensionVersion.mockResolvedValue({
           availableVersion: updateInRange,
           installedVersion: minVersionInRange,
         });
-        databaseMock.updateVectorExtension.mockRejectedValue(new Error('Failed to update extension'));
+        mocks.database.updateVectorExtension.mockRejectedValue(new Error('Failed to update extension'));
 
         await expect(sut.onBootstrap()).rejects.toThrow('Failed to update extension');
 
-        expect(loggerMock.warn.mock.calls[0][0]).toContain(
+        expect(mocks.logger.warn.mock.calls[0][0]).toContain(
           `The ${extensionName} extension can be updated to ${updateInRange}.`,
         );
-        expect(loggerMock.fatal).not.toHaveBeenCalled();
-        expect(databaseMock.updateVectorExtension).toHaveBeenCalledWith(extension, updateInRange);
-        expect(databaseMock.runMigrations).not.toHaveBeenCalled();
+        expect(mocks.logger.fatal).not.toHaveBeenCalled();
+        expect(mocks.database.updateVectorExtension).toHaveBeenCalledWith(extension, updateInRange);
+        expect(mocks.database.runMigrations).not.toHaveBeenCalled();
       });
 
       it(`should warn if ${extension} extension update requires restart`, async () => {
-        databaseMock.getExtensionVersion.mockResolvedValue({
+        mocks.database.getExtensionVersion.mockResolvedValue({
           availableVersion: updateInRange,
           installedVersion: minVersionInRange,
         });
-        databaseMock.updateVectorExtension.mockResolvedValue({ restartRequired: true });
+        mocks.database.updateVectorExtension.mockResolvedValue({ restartRequired: true });
 
         await expect(sut.onBootstrap()).resolves.toBeUndefined();
 
-        expect(loggerMock.warn).toHaveBeenCalledTimes(1);
-        expect(loggerMock.warn.mock.calls[0][0]).toContain(extensionName);
-        expect(databaseMock.updateVectorExtension).toHaveBeenCalledWith(extension, updateInRange);
-        expect(databaseMock.runMigrations).toHaveBeenCalledTimes(1);
-        expect(loggerMock.fatal).not.toHaveBeenCalled();
+        expect(mocks.logger.warn).toHaveBeenCalledTimes(1);
+        expect(mocks.logger.warn.mock.calls[0][0]).toContain(extensionName);
+        expect(mocks.database.updateVectorExtension).toHaveBeenCalledWith(extension, updateInRange);
+        expect(mocks.database.runMigrations).toHaveBeenCalledTimes(1);
+        expect(mocks.logger.fatal).not.toHaveBeenCalled();
       });
 
       it(`should reindex ${extension} indices if needed`, async () => {
-        databaseMock.shouldReindex.mockResolvedValue(true);
+        mocks.database.shouldReindex.mockResolvedValue(true);
 
         await expect(sut.onBootstrap()).resolves.toBeUndefined();
 
-        expect(databaseMock.shouldReindex).toHaveBeenCalledTimes(2);
-        expect(databaseMock.reindex).toHaveBeenCalledTimes(2);
-        expect(databaseMock.runMigrations).toHaveBeenCalledTimes(1);
-        expect(loggerMock.fatal).not.toHaveBeenCalled();
+        expect(mocks.database.shouldReindex).toHaveBeenCalledTimes(2);
+        expect(mocks.database.reindex).toHaveBeenCalledTimes(2);
+        expect(mocks.database.runMigrations).toHaveBeenCalledTimes(1);
+        expect(mocks.logger.fatal).not.toHaveBeenCalled();
       });
 
       it(`should throw an error if reindexing fails`, async () => {
-        databaseMock.shouldReindex.mockResolvedValue(true);
-        databaseMock.reindex.mockRejectedValue(new Error('Error reindexing'));
+        mocks.database.shouldReindex.mockResolvedValue(true);
+        mocks.database.reindex.mockRejectedValue(new Error('Error reindexing'));
 
         await expect(sut.onBootstrap()).rejects.toBeDefined();
 
-        expect(databaseMock.shouldReindex).toHaveBeenCalledTimes(1);
-        expect(databaseMock.reindex).toHaveBeenCalledTimes(1);
-        expect(databaseMock.runMigrations).not.toHaveBeenCalled();
-        expect(loggerMock.fatal).not.toHaveBeenCalled();
-        expect(loggerMock.warn).toHaveBeenCalledWith(
+        expect(mocks.database.shouldReindex).toHaveBeenCalledTimes(1);
+        expect(mocks.database.reindex).toHaveBeenCalledTimes(1);
+        expect(mocks.database.runMigrations).not.toHaveBeenCalled();
+        expect(mocks.logger.fatal).not.toHaveBeenCalled();
+        expect(mocks.logger.warn).toHaveBeenCalledWith(
           expect.stringContaining('Could not run vector reindexing checks.'),
         );
       });
 
       it(`should not reindex ${extension} indices if not needed`, async () => {
-        databaseMock.shouldReindex.mockResolvedValue(false);
+        mocks.database.shouldReindex.mockResolvedValue(false);
 
         await expect(sut.onBootstrap()).resolves.toBeUndefined();
 
-        expect(databaseMock.shouldReindex).toHaveBeenCalledTimes(2);
-        expect(databaseMock.reindex).toHaveBeenCalledTimes(0);
-        expect(databaseMock.runMigrations).toHaveBeenCalledTimes(1);
-        expect(loggerMock.fatal).not.toHaveBeenCalled();
+        expect(mocks.database.shouldReindex).toHaveBeenCalledTimes(2);
+        expect(mocks.database.reindex).toHaveBeenCalledTimes(0);
+        expect(mocks.database.runMigrations).toHaveBeenCalledTimes(1);
+        expect(mocks.logger.fatal).not.toHaveBeenCalled();
       });
     });
 
     it('should skip migrations if DB_SKIP_MIGRATIONS=true', async () => {
-      configMock.getEnv.mockReturnValue(
+      mocks.config.getEnv.mockReturnValue(
         mockEnvData({
           database: {
             config: {
@@ -324,11 +315,11 @@ describe(DatabaseService.name, () => {
 
       await expect(sut.onBootstrap()).resolves.toBeUndefined();
 
-      expect(databaseMock.runMigrations).not.toHaveBeenCalled();
+      expect(mocks.database.runMigrations).not.toHaveBeenCalled();
     });
 
     it(`should throw error if pgvector extension could not be created`, async () => {
-      configMock.getEnv.mockReturnValue(
+      mocks.config.getEnv.mockReturnValue(
         mockEnvData({
           database: {
             config: {
@@ -354,41 +345,41 @@ describe(DatabaseService.name, () => {
           },
         }),
       );
-      databaseMock.getExtensionVersion.mockResolvedValue({
+      mocks.database.getExtensionVersion.mockResolvedValue({
         installedVersion: null,
         availableVersion: minVersionInRange,
       });
-      databaseMock.updateVectorExtension.mockResolvedValue({ restartRequired: false });
-      databaseMock.createExtension.mockRejectedValue(new Error('Failed to create extension'));
+      mocks.database.updateVectorExtension.mockResolvedValue({ restartRequired: false });
+      mocks.database.createExtension.mockRejectedValue(new Error('Failed to create extension'));
 
       await expect(sut.onBootstrap()).rejects.toThrow('Failed to create extension');
 
-      expect(loggerMock.fatal).toHaveBeenCalledTimes(1);
-      expect(loggerMock.fatal.mock.calls[0][0]).toContain(
+      expect(mocks.logger.fatal).toHaveBeenCalledTimes(1);
+      expect(mocks.logger.fatal.mock.calls[0][0]).toContain(
         `Alternatively, if your Postgres instance has pgvecto.rs, you may use this instead`,
       );
-      expect(databaseMock.createExtension).toHaveBeenCalledTimes(1);
-      expect(databaseMock.updateVectorExtension).not.toHaveBeenCalled();
-      expect(databaseMock.runMigrations).not.toHaveBeenCalled();
+      expect(mocks.database.createExtension).toHaveBeenCalledTimes(1);
+      expect(mocks.database.updateVectorExtension).not.toHaveBeenCalled();
+      expect(mocks.database.runMigrations).not.toHaveBeenCalled();
     });
 
     it(`should throw error if pgvecto.rs extension could not be created`, async () => {
-      databaseMock.getExtensionVersion.mockResolvedValue({
+      mocks.database.getExtensionVersion.mockResolvedValue({
         installedVersion: null,
         availableVersion: minVersionInRange,
       });
-      databaseMock.updateVectorExtension.mockResolvedValue({ restartRequired: false });
-      databaseMock.createExtension.mockRejectedValue(new Error('Failed to create extension'));
+      mocks.database.updateVectorExtension.mockResolvedValue({ restartRequired: false });
+      mocks.database.createExtension.mockRejectedValue(new Error('Failed to create extension'));
 
       await expect(sut.onBootstrap()).rejects.toThrow('Failed to create extension');
 
-      expect(loggerMock.fatal).toHaveBeenCalledTimes(1);
-      expect(loggerMock.fatal.mock.calls[0][0]).toContain(
+      expect(mocks.logger.fatal).toHaveBeenCalledTimes(1);
+      expect(mocks.logger.fatal.mock.calls[0][0]).toContain(
         `Alternatively, if your Postgres instance has pgvector, you may use this instead`,
       );
-      expect(databaseMock.createExtension).toHaveBeenCalledTimes(1);
-      expect(databaseMock.updateVectorExtension).not.toHaveBeenCalled();
-      expect(databaseMock.runMigrations).not.toHaveBeenCalled();
+      expect(mocks.database.createExtension).toHaveBeenCalledTimes(1);
+      expect(mocks.database.updateVectorExtension).not.toHaveBeenCalled();
+      expect(mocks.database.runMigrations).not.toHaveBeenCalled();
     });
   });
 
@@ -403,38 +394,38 @@ describe(DatabaseService.name, () => {
 
     it('should not override interval', () => {
       sut.handleConnectionError(new Error('Error'));
-      expect(loggerMock.error).toHaveBeenCalled();
+      expect(mocks.logger.error).toHaveBeenCalled();
 
       sut.handleConnectionError(new Error('foo'));
-      expect(loggerMock.error).toHaveBeenCalledTimes(1);
+      expect(mocks.logger.error).toHaveBeenCalledTimes(1);
     });
 
     it('should reconnect when interval elapses', async () => {
-      databaseMock.reconnect.mockResolvedValue(true);
+      mocks.database.reconnect.mockResolvedValue(true);
 
       sut.handleConnectionError(new Error('error'));
       await vi.advanceTimersByTimeAsync(5000);
 
-      expect(databaseMock.reconnect).toHaveBeenCalledTimes(1);
-      expect(loggerMock.log).toHaveBeenCalledWith('Database reconnected');
+      expect(mocks.database.reconnect).toHaveBeenCalledTimes(1);
+      expect(mocks.logger.log).toHaveBeenCalledWith('Database reconnected');
 
       await vi.advanceTimersByTimeAsync(5000);
-      expect(databaseMock.reconnect).toHaveBeenCalledTimes(1);
+      expect(mocks.database.reconnect).toHaveBeenCalledTimes(1);
     });
 
     it('should try again when reconnection fails', async () => {
-      databaseMock.reconnect.mockResolvedValueOnce(false);
+      mocks.database.reconnect.mockResolvedValueOnce(false);
 
       sut.handleConnectionError(new Error('error'));
       await vi.advanceTimersByTimeAsync(5000);
 
-      expect(databaseMock.reconnect).toHaveBeenCalledTimes(1);
-      expect(loggerMock.warn).toHaveBeenCalledWith(expect.stringContaining('Database connection failed'));
+      expect(mocks.database.reconnect).toHaveBeenCalledTimes(1);
+      expect(mocks.logger.warn).toHaveBeenCalledWith(expect.stringContaining('Database connection failed'));
 
-      databaseMock.reconnect.mockResolvedValueOnce(true);
+      mocks.database.reconnect.mockResolvedValueOnce(true);
       await vi.advanceTimersByTimeAsync(5000);
-      expect(databaseMock.reconnect).toHaveBeenCalledTimes(2);
-      expect(loggerMock.log).toHaveBeenCalledWith('Database reconnected');
+      expect(mocks.database.reconnect).toHaveBeenCalledTimes(2);
+      expect(mocks.logger.log).toHaveBeenCalledWith('Database reconnected');
     });
   });
 });

server/src/services/download.service.spec.ts

@@ -1,16 +1,12 @@
 import { BadRequestException } from '@nestjs/common';
 import { DownloadResponseDto } from 'src/dtos/download.dto';
 import { AssetEntity } from 'src/entities/asset.entity';
-import { IAssetRepository } from 'src/interfaces/asset.interface';
-import { IStorageRepository } from 'src/interfaces/storage.interface';
 import { DownloadService } from 'src/services/download.service';
-import { ILoggingRepository } from 'src/types';
 import { assetStub } from 'test/fixtures/asset.stub';
 import { authStub } from 'test/fixtures/auth.stub';
-import { IAccessRepositoryMock } from 'test/repositories/access.repository.mock';
-import { newTestService } from 'test/utils';
+import { newTestService, ServiceMocks } from 'test/utils';
 import { Readable } from 'typeorm/platform/PlatformTools.js';
-import { Mocked, vitest } from 'vitest';
+import { vitest } from 'vitest';
 
 const downloadResponse: DownloadResponseDto = {
   totalSize: 105_000,
@@ -24,17 +20,14 @@ const downloadResponse: DownloadResponseDto = {
 
 describe(DownloadService.name, () => {
   let sut: DownloadService;
-  let accessMock: IAccessRepositoryMock;
-  let assetMock: Mocked<IAssetRepository>;
-  let loggerMock: Mocked<ILoggingRepository>;
-  let storageMock: Mocked<IStorageRepository>;
+  let mocks: ServiceMocks;
 
   it('should work', () => {
     expect(sut).toBeDefined();
   });
 
   beforeEach(() => {
-    ({ sut, accessMock, assetMock, loggerMock, storageMock } = newTestService(DownloadService));
+    ({ sut, mocks } = newTestService(DownloadService));
   });
 
   describe('downloadArchive', () => {
@@ -45,9 +38,9 @@ describe(DownloadService.name, () => {
         stream: new Readable(),
       };
 
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2']));
-      assetMock.getByIds.mockResolvedValue([{ ...assetStub.noResizePath, id: 'asset-1' }]);
-      storageMock.createZipStream.mockReturnValue(archiveMock);
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2']));
+      mocks.asset.getByIds.mockResolvedValue([{ ...assetStub.noResizePath, id: 'asset-1' }]);
+      mocks.storage.createZipStream.mockReturnValue(archiveMock);
 
       await expect(sut.downloadArchive(authStub.admin, { assetIds: ['asset-1', 'asset-2'] })).resolves.toEqual({
         stream: archiveMock.stream,
@@ -64,19 +57,19 @@ describe(DownloadService.name, () => {
         stream: new Readable(),
       };
 
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2']));
-      storageMock.realpath.mockRejectedValue(new Error('Could not read file'));
-      assetMock.getByIds.mockResolvedValue([
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2']));
+      mocks.storage.realpath.mockRejectedValue(new Error('Could not read file'));
+      mocks.asset.getByIds.mockResolvedValue([
         { ...assetStub.noResizePath, id: 'asset-1' },
         { ...assetStub.noWebpPath, id: 'asset-2' },
       ]);
-      storageMock.createZipStream.mockReturnValue(archiveMock);
+      mocks.storage.createZipStream.mockReturnValue(archiveMock);
 
       await expect(sut.downloadArchive(authStub.admin, { assetIds: ['asset-1', 'asset-2'] })).resolves.toEqual({
         stream: archiveMock.stream,
       });
 
-      expect(loggerMock.warn).toHaveBeenCalledTimes(2);
+      expect(mocks.logger.warn).toHaveBeenCalledTimes(2);
       expect(archiveMock.addFile).toHaveBeenCalledTimes(2);
       expect(archiveMock.addFile).toHaveBeenNthCalledWith(1, 'upload/library/IMG_123.jpg', 'IMG_123.jpg');
       expect(archiveMock.addFile).toHaveBeenNthCalledWith(2, 'upload/library/IMG_456.jpg', 'IMG_456.jpg');
@@ -89,12 +82,12 @@ describe(DownloadService.name, () => {
         stream: new Readable(),
       };
 
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2']));
-      assetMock.getByIds.mockResolvedValue([
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2']));
+      mocks.asset.getByIds.mockResolvedValue([
         { ...assetStub.noResizePath, id: 'asset-1' },
         { ...assetStub.noWebpPath, id: 'asset-2' },
       ]);
-      storageMock.createZipStream.mockReturnValue(archiveMock);
+      mocks.storage.createZipStream.mockReturnValue(archiveMock);
 
       await expect(sut.downloadArchive(authStub.admin, { assetIds: ['asset-1', 'asset-2'] })).resolves.toEqual({
         stream: archiveMock.stream,
@@ -112,12 +105,12 @@ describe(DownloadService.name, () => {
         stream: new Readable(),
       };
 
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2']));
-      assetMock.getByIds.mockResolvedValue([
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2']));
+      mocks.asset.getByIds.mockResolvedValue([
         { ...assetStub.noResizePath, id: 'asset-1' },
         { ...assetStub.noResizePath, id: 'asset-2' },
       ]);
-      storageMock.createZipStream.mockReturnValue(archiveMock);
+      mocks.storage.createZipStream.mockReturnValue(archiveMock);
 
       await expect(sut.downloadArchive(authStub.admin, { assetIds: ['asset-1', 'asset-2'] })).resolves.toEqual({
         stream: archiveMock.stream,
@@ -135,12 +128,12 @@ describe(DownloadService.name, () => {
         stream: new Readable(),
       };
 
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2']));
-      assetMock.getByIds.mockResolvedValue([
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2']));
+      mocks.asset.getByIds.mockResolvedValue([
         { ...assetStub.noResizePath, id: 'asset-2' },
         { ...assetStub.noResizePath, id: 'asset-1' },
       ]);
-      storageMock.createZipStream.mockReturnValue(archiveMock);
+      mocks.storage.createZipStream.mockReturnValue(archiveMock);
 
       await expect(sut.downloadArchive(authStub.admin, { assetIds: ['asset-1', 'asset-2'] })).resolves.toEqual({
         stream: archiveMock.stream,
@@ -158,12 +151,12 @@ describe(DownloadService.name, () => {
         stream: new Readable(),
       };
 
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
-      assetMock.getByIds.mockResolvedValue([
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
+      mocks.asset.getByIds.mockResolvedValue([
         { ...assetStub.noResizePath, id: 'asset-1', originalPath: '/path/to/symlink.jpg' },
       ]);
-      storageMock.realpath.mockResolvedValue('/path/to/realpath.jpg');
-      storageMock.createZipStream.mockReturnValue(archiveMock);
+      mocks.storage.realpath.mockResolvedValue('/path/to/realpath.jpg');
+      mocks.storage.createZipStream.mockReturnValue(archiveMock);
 
       await expect(sut.downloadArchive(authStub.admin, { assetIds: ['asset-1'] })).resolves.toEqual({
         stream: archiveMock.stream,
@@ -179,30 +172,30 @@ describe(DownloadService.name, () => {
     });
 
     it('should return a list of archives (assetIds)', async () => {
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2']));
-      assetMock.getByIds.mockResolvedValue([assetStub.image, assetStub.video]);
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2']));
+      mocks.asset.getByIds.mockResolvedValue([assetStub.image, assetStub.video]);
 
       const assetIds = ['asset-1', 'asset-2'];
       await expect(sut.getDownloadInfo(authStub.admin, { assetIds })).resolves.toEqual(downloadResponse);
 
-      expect(assetMock.getByIds).toHaveBeenCalledWith(['asset-1', 'asset-2'], { exifInfo: true });
+      expect(mocks.asset.getByIds).toHaveBeenCalledWith(['asset-1', 'asset-2'], { exifInfo: true });
     });
 
     it('should return a list of archives (albumId)', async () => {
-      accessMock.album.checkOwnerAccess.mockResolvedValue(new Set(['album-1']));
-      assetMock.getByAlbumId.mockResolvedValue({
+      mocks.access.album.checkOwnerAccess.mockResolvedValue(new Set(['album-1']));
+      mocks.asset.getByAlbumId.mockResolvedValue({
         items: [assetStub.image, assetStub.video],
         hasNextPage: false,
       });
 
       await expect(sut.getDownloadInfo(authStub.admin, { albumId: 'album-1' })).resolves.toEqual(downloadResponse);
 
-      expect(accessMock.album.checkOwnerAccess).toHaveBeenCalledWith(authStub.admin.user.id, new Set(['album-1']));
-      expect(assetMock.getByAlbumId).toHaveBeenCalledWith({ take: 2500, skip: 0 }, 'album-1');
+      expect(mocks.access.album.checkOwnerAccess).toHaveBeenCalledWith(authStub.admin.user.id, new Set(['album-1']));
+      expect(mocks.asset.getByAlbumId).toHaveBeenCalledWith({ take: 2500, skip: 0 }, 'album-1');
     });
 
     it('should return a list of archives (userId)', async () => {
-      assetMock.getByUserId.mockResolvedValue({
+      mocks.asset.getByUserId.mockResolvedValue({
         items: [assetStub.image, assetStub.video],
         hasNextPage: false,
       });
@@ -211,13 +204,13 @@ describe(DownloadService.name, () => {
         downloadResponse,
       );
 
-      expect(assetMock.getByUserId).toHaveBeenCalledWith({ take: 2500, skip: 0 }, authStub.admin.user.id, {
+      expect(mocks.asset.getByUserId).toHaveBeenCalledWith({ take: 2500, skip: 0 }, authStub.admin.user.id, {
         isVisible: true,
       });
     });
 
     it('should split archives by size', async () => {
-      assetMock.getByUserId.mockResolvedValue({
+      mocks.asset.getByUserId.mockResolvedValue({
         items: [
           { ...assetStub.image, id: 'asset-1' },
           { ...assetStub.video, id: 'asset-2' },
@@ -245,8 +238,8 @@ describe(DownloadService.name, () => {
       const assetIds = [assetStub.livePhotoStillAsset.id];
       const assets = [assetStub.livePhotoStillAsset, assetStub.livePhotoMotionAsset];
 
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set(assetIds));
-      assetMock.getByIds.mockImplementation(
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(assetIds));
+      mocks.asset.getByIds.mockImplementation(
         (ids) =>
           Promise.resolve(
             ids.map((id) => assets.find((asset) => asset.id === id)).filter((asset) => !!asset),
@@ -271,8 +264,8 @@ describe(DownloadService.name, () => {
         { ...assetStub.livePhotoMotionAsset, originalPath: 'upload/encoded-video/uuid-MP.mp4' },
       ];
 
-      accessMock.asset.checkOwnerAccess.mockResolvedValue(new Set(assetIds));
-      assetMock.getByIds.mockImplementation(
+      mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(assetIds));
+      mocks.asset.getByIds.mockImplementation(
         (ids) =>
           Promise.resolve(
             ids.map((id) => assets.find((asset) => asset.id === id)).filter((asset) => !!asset),

server/src/services/duplicate.service.spec.ts

@@ -1,28 +1,20 @@
-import { IAssetRepository, WithoutProperty } from 'src/interfaces/asset.interface';
-import { IJobRepository, JobName, JobStatus } from 'src/interfaces/job.interface';
-import { ISearchRepository } from 'src/interfaces/search.interface';
-import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
+import { WithoutProperty } from 'src/interfaces/asset.interface';
+import { JobName, JobStatus } from 'src/interfaces/job.interface';
 import { DuplicateService } from 'src/services/duplicate.service';
 import { SearchService } from 'src/services/search.service';
-import { ILoggingRepository } from 'src/types';
 import { assetStub } from 'test/fixtures/asset.stub';
 import { authStub } from 'test/fixtures/auth.stub';
-import { newTestService } from 'test/utils';
-import { Mocked, beforeEach, vitest } from 'vitest';
+import { newTestService, ServiceMocks } from 'test/utils';
+import { beforeEach, vitest } from 'vitest';
 
 vitest.useFakeTimers();
 
 describe(SearchService.name, () => {
   let sut: DuplicateService;
-
-  let assetMock: Mocked<IAssetRepository>;
-  let jobMock: Mocked<IJobRepository>;
-  let loggerMock: Mocked<ILoggingRepository>;
-  let searchMock: Mocked<ISearchRepository>;
-  let systemMock: Mocked<ISystemMetadataRepository>;
+  let mocks: ServiceMocks;
 
   beforeEach(() => {
-    ({ sut, assetMock, jobMock, loggerMock, searchMock, systemMock } = newTestService(DuplicateService));
+    ({ sut, mocks } = newTestService(DuplicateService));
   });
 
   it('should work', () => {
@@ -31,7 +23,7 @@ describe(SearchService.name, () => {
 
   describe('getDuplicates', () => {
     it('should get duplicates', async () => {
-      assetMock.getDuplicates.mockResolvedValue([
+      mocks.asset.getDuplicates.mockResolvedValue([
         {
           duplicateId: assetStub.hasDupe.duplicateId!,
           assets: [assetStub.hasDupe, assetStub.hasDupe],
@@ -51,7 +43,7 @@ describe(SearchService.name, () => {
 
   describe('handleQueueSearchDuplicates', () => {
     beforeEach(() => {
-      systemMock.get.mockResolvedValue({
+      mocks.systemMetadata.get.mockResolvedValue({
         machineLearning: {
           enabled: true,
           duplicateDetection: {
@@ -62,7 +54,7 @@ describe(SearchService.name, () => {
     });
 
     it('should skip if machine learning is disabled', async () => {
-      systemMock.get.mockResolvedValue({
+      mocks.systemMetadata.get.mockResolvedValue({
         machineLearning: {
           enabled: false,
           duplicateDetection: {
@@ -72,13 +64,13 @@ describe(SearchService.name, () => {
       });
 
       await expect(sut.handleQueueSearchDuplicates({})).resolves.toBe(JobStatus.SKIPPED);
-      expect(jobMock.queue).not.toHaveBeenCalled();
-      expect(jobMock.queueAll).not.toHaveBeenCalled();
-      expect(systemMock.get).toHaveBeenCalled();
+      expect(mocks.job.queue).not.toHaveBeenCalled();
+      expect(mocks.job.queueAll).not.toHaveBeenCalled();
+      expect(mocks.systemMetadata.get).toHaveBeenCalled();
     });
 
     it('should skip if duplicate detection is disabled', async () => {
-      systemMock.get.mockResolvedValue({
+      mocks.systemMetadata.get.mockResolvedValue({
         machineLearning: {
           enabled: true,
           duplicateDetection: {
@@ -88,21 +80,21 @@ describe(SearchService.name, () => {
       });
 
       await expect(sut.handleQueueSearchDuplicates({})).resolves.toBe(JobStatus.SKIPPED);
-      expect(jobMock.queue).not.toHaveBeenCalled();
-      expect(jobMock.queueAll).not.toHaveBeenCalled();
-      expect(systemMock.get).toHaveBeenCalled();
+      expect(mocks.job.queue).not.toHaveBeenCalled();
+      expect(mocks.job.queueAll).not.toHaveBeenCalled();
+      expect(mocks.systemMetadata.get).toHaveBeenCalled();
     });
 
     it('should queue missing assets', async () => {
-      assetMock.getWithout.mockResolvedValue({
+      mocks.asset.getWithout.mockResolvedValue({
         items: [assetStub.image],
         hasNextPage: false,
       });
 
       await sut.handleQueueSearchDuplicates({});
 
-      expect(assetMock.getWithout).toHaveBeenCalledWith({ skip: 0, take: 1000 }, WithoutProperty.DUPLICATE);
-      expect(jobMock.queueAll).toHaveBeenCalledWith([
+      expect(mocks.asset.getWithout).toHaveBeenCalledWith({ skip: 0, take: 1000 }, WithoutProperty.DUPLICATE);
+      expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
           name: JobName.DUPLICATE_DETECTION,
           data: { id: assetStub.image.id },
@@ -111,15 +103,15 @@ describe(SearchService.name, () => {
     });
 
     it('should queue all assets', async () => {
-      assetMock.getAll.mockResolvedValue({
+      mocks.asset.getAll.mockResolvedValue({
         items: [assetStub.image],
         hasNextPage: false,
       });
 
       await sut.handleQueueSearchDuplicates({ force: true });
 
-      expect(assetMock.getAll).toHaveBeenCalled();
-      expect(jobMock.queueAll).toHaveBeenCalledWith([
+      expect(mocks.asset.getAll).toHaveBeenCalled();
+      expect(mocks.job.queueAll).toHaveBeenCalledWith([
         {
           name: JobName.DUPLICATE_DETECTION,
           data: { id: assetStub.image.id },
@@ -130,7 +122,7 @@ describe(SearchService.name, () => {
 
   describe('handleSearchDuplicates', () => {
     beforeEach(() => {
-      systemMock.get.mockResolvedValue({
+      mocks.systemMetadata.get.mockResolvedValue({
         machineLearning: {
           enabled: true,
           duplicateDetection: {
@@ -141,7 +133,7 @@ describe(SearchService.name, () => {
     });
 
     it('should skip if machine learning is disabled', async () => {
-      systemMock.get.mockResolvedValue({
+      mocks.systemMetadata.get.mockResolvedValue({
         machineLearning: {
           enabled: false,
           duplicateDetection: {
@@ -150,7 +142,7 @@ describe(SearchService.name, () => {
         },
       });
       const id = assetStub.livePhotoMotionAsset.id;
-      assetMock.getById.mockResolvedValue(assetStub.livePhotoMotionAsset);
+      mocks.asset.getById.mockResolvedValue(assetStub.livePhotoMotionAsset);
 
       const result = await sut.handleSearchDuplicates({ id });
 
@@ -158,7 +150,7 @@ describe(SearchService.name, () => {
     });
 
     it('should skip if duplicate detection is disabled', async () => {
-      systemMock.get.mockResolvedValue({
+      mocks.systemMetadata.get.mockResolvedValue({
         machineLearning: {
           enabled: true,
           duplicateDetection: {
@@ -167,7 +159,7 @@ describe(SearchService.name, () => {
         },
       });
       const id = assetStub.livePhotoMotionAsset.id;
-      assetMock.getById.mockResolvedValue(assetStub.livePhotoMotionAsset);
+      mocks.asset.getById.mockResolvedValue(assetStub.livePhotoMotionAsset);
 
       const result = await sut.handleSearchDuplicates({ id });
 
@@ -178,40 +170,40 @@ describe(SearchService.name, () => {
       const result = await sut.handleSearchDuplicates({ id: assetStub.image.id });
 
       expect(result).toBe(JobStatus.FAILED);
-      expect(loggerMock.error).toHaveBeenCalledWith(`Asset ${assetStub.image.id} not found`);
+      expect(mocks.logger.error).toHaveBeenCalledWith(`Asset ${assetStub.image.id} not found`);
     });
 
     it('should skip if asset is not visible', async () => {
       const id = assetStub.livePhotoMotionAsset.id;
-      assetMock.getById.mockResolvedValue(assetStub.livePhotoMotionAsset);
+      mocks.asset.getById.mockResolvedValue(assetStub.livePhotoMotionAsset);
 
       const result = await sut.handleSearchDuplicates({ id });
 
       expect(result).toBe(JobStatus.SKIPPED);
-      expect(loggerMock.debug).toHaveBeenCalledWith(`Asset ${id} is not visible, skipping`);
+      expect(mocks.logger.debug).toHaveBeenCalledWith(`Asset ${id} is not visible, skipping`);
     });
 
     it('should fail if asset is missing preview image', async () => {
-      assetMock.getById.mockResolvedValue(assetStub.noResizePath);
+      mocks.asset.getById.mockResolvedValue(assetStub.noResizePath);
 
       const result = await sut.handleSearchDuplicates({ id: assetStub.noResizePath.id });
 
       expect(result).toBe(JobStatus.FAILED);
-      expect(loggerMock.warn).toHaveBeenCalledWith(`Asset ${assetStub.noResizePath.id} is missing preview image`);
+      expect(mocks.logger.warn).toHaveBeenCalledWith(`Asset ${assetStub.noResizePath.id} is missing preview image`);
     });
 
     it('should fail if asset is missing embedding', async () => {
-      assetMock.getById.mockResolvedValue(assetStub.image);
+      mocks.asset.getById.mockResolvedValue(assetStub.image);
 
       const result = await sut.handleSearchDuplicates({ id: assetStub.image.id });
 
       expect(result).toBe(JobStatus.FAILED);
-      expect(loggerMock.debug).toHaveBeenCalledWith(`Asset ${assetStub.image.id} is missing embedding`);
+      expect(mocks.logger.debug).toHaveBeenCalledWith(`Asset ${assetStub.image.id} is missing embedding`);
     });
 
     it('should search for duplicates and update asset with duplicateId', async () => {
-      assetMock.getById.mockResolvedValue(assetStub.hasEmbedding);
-      searchMock.searchDuplicates.mockResolvedValue([
+      mocks.asset.getById.mockResolvedValue(assetStub.hasEmbedding);
+      mocks.search.searchDuplicates.mockResolvedValue([
         { assetId: assetStub.image.id, distance: 0.01, duplicateId: null },
       ]);
       const expectedAssetIds = [assetStub.image.id, assetStub.hasEmbedding.id];
@@ -219,58 +211,58 @@ describe(SearchService.name, () => {
       const result = await sut.handleSearchDuplicates({ id: assetStub.hasEmbedding.id });
 
       expect(result).toBe(JobStatus.SUCCESS);
-      expect(searchMock.searchDuplicates).toHaveBeenCalledWith({
+      expect(mocks.search.searchDuplicates).toHaveBeenCalledWith({
         assetId: assetStub.hasEmbedding.id,
         embedding: assetStub.hasEmbedding.smartSearch!.embedding,
         maxDistance: 0.01,
         type: assetStub.hasEmbedding.type,
         userIds: [assetStub.hasEmbedding.ownerId],
       });
-      expect(assetMock.updateDuplicates).toHaveBeenCalledWith({
+      expect(mocks.asset.updateDuplicates).toHaveBeenCalledWith({
         assetIds: expectedAssetIds,
         targetDuplicateId: expect.any(String),
         duplicateIds: [],
       });
-      expect(assetMock.upsertJobStatus).toHaveBeenCalledWith(
+      expect(mocks.asset.upsertJobStatus).toHaveBeenCalledWith(
         ...expectedAssetIds.map((assetId) => ({ assetId, duplicatesDetectedAt: expect.any(Date) })),
       );
     });
 
     it('should use existing duplicate ID among matched duplicates', async () => {
       const duplicateId = assetStub.hasDupe.duplicateId;
-      assetMock.getById.mockResolvedValue(assetStub.hasEmbedding);
-      searchMock.searchDuplicates.mockResolvedValue([{ assetId: assetStub.hasDupe.id, distance: 0.01, duplicateId }]);
+      mocks.asset.getById.mockResolvedValue(assetStub.hasEmbedding);
+      mocks.search.searchDuplicates.mockResolvedValue([{ assetId: assetStub.hasDupe.id, distance: 0.01, duplicateId }]);
       const expectedAssetIds = [assetStub.hasEmbedding.id];
 
       const result = await sut.handleSearchDuplicates({ id: assetStub.hasEmbedding.id });
 
       expect(result).toBe(JobStatus.SUCCESS);
-      expect(searchMock.searchDuplicates).toHaveBeenCalledWith({
+      expect(mocks.search.searchDuplicates).toHaveBeenCalledWith({
         assetId: assetStub.hasEmbedding.id,
         embedding: assetStub.hasEmbedding.smartSearch!.embedding,
         maxDistance: 0.01,
         type: assetStub.hasEmbedding.type,
         userIds: [assetStub.hasEmbedding.ownerId],
       });
-      expect(assetMock.updateDuplicates).toHaveBeenCalledWith({
+      expect(mocks.asset.updateDuplicates).toHaveBeenCalledWith({
         assetIds: expectedAssetIds,
         targetDuplicateId: assetStub.hasDupe.duplicateId,
         duplicateIds: [],
       });
-      expect(assetMock.upsertJobStatus).toHaveBeenCalledWith(
+      expect(mocks.asset.upsertJobStatus).toHaveBeenCalledWith(
         ...expectedAssetIds.map((assetId) => ({ assetId, duplicatesDetectedAt: expect.any(Date) })),
       );
     });
 
     it('should remove duplicateId if no duplicates found and asset has duplicateId', async () => {
-      assetMock.getById.mockResolvedValue(assetStub.hasDupe);
-      searchMock.searchDuplicates.mockResolvedValue([]);
+      mocks.asset.getById.mockResolvedValue(assetStub.hasDupe);
+      mocks.search.searchDuplicates.mockResolvedValue([]);
 
       const result = await sut.handleSearchDuplicates({ id: assetStub.hasDupe.id });
 
       expect(result).toBe(JobStatus.SUCCESS);
-      expect(assetMock.update).toHaveBeenCalledWith({ id: assetStub.hasDupe.id, duplicateId: null });
-      expect(assetMock.upsertJobStatus).toHaveBeenCalledWith({
+      expect(mocks.asset.update).toHaveBeenCalledWith({ id: assetStub.hasDupe.id, duplicateId: null });
+      expect(mocks.asset.upsertJobStatus).toHaveBeenCalledWith({
         assetId: assetStub.hasDupe.id,
         duplicatesDetectedAt: expect.any(Date),
       });

server/src/services/job.service.spec.ts

@@ -1,27 +1,19 @@
 import { BadRequestException } from '@nestjs/common';
 import { defaults, SystemConfig } from 'src/config';
 import { ImmichWorker } from 'src/enum';
-import { IAssetRepository } from 'src/interfaces/asset.interface';
-import { IJobRepository, JobCommand, JobItem, JobName, JobStatus, QueueName } from 'src/interfaces/job.interface';
+import { JobCommand, JobItem, JobName, JobStatus, QueueName } from 'src/interfaces/job.interface';
 import { JobService } from 'src/services/job.service';
-import { IConfigRepository, ILoggingRepository } from 'src/types';
 import { assetStub } from 'test/fixtures/asset.stub';
-import { ITelemetryRepositoryMock } from 'test/repositories/telemetry.repository.mock';
-import { newTestService } from 'test/utils';
-import { Mocked } from 'vitest';
+import { newTestService, ServiceMocks } from 'test/utils';
 
 describe(JobService.name, () => {
   let sut: JobService;
-  let assetMock: Mocked<IAssetRepository>;
-  let configMock: Mocked<IConfigRepository>;
-  let jobMock: Mocked<IJobRepository>;
-  let loggerMock: Mocked<ILoggingRepository>;
-  let telemetryMock: ITelemetryRepositoryMock;
+  let mocks: ServiceMocks;
 
   beforeEach(() => {
-    ({ sut, assetMock, configMock, jobMock, loggerMock, telemetryMock } = newTestService(JobService, {}));
+    ({ sut, mocks } = newTestService(JobService, {}));
 
-    configMock.getWorker.mockReturnValue(ImmichWorker.MICROSERVICES);
+    mocks.config.getWorker.mockReturnValue(ImmichWorker.MICROSERVICES);
   });
 
   it('should work', () => {
@@ -32,11 +24,11 @@ describe(JobService.name, () => {
     it('should update concurrency', () => {
       sut.onConfigUpdate({ newConfig: defaults, oldConfig: {} as SystemConfig });
 
-      expect(jobMock.setConcurrency).toHaveBeenCalledTimes(15);
-      expect(jobMock.setConcurrency).toHaveBeenNthCalledWith(5, QueueName.FACIAL_RECOGNITION, 1);
-      expect(jobMock.setConcurrency).toHaveBeenNthCalledWith(7, QueueName.DUPLICATE_DETECTION, 1);
-      expect(jobMock.setConcurrency).toHaveBeenNthCalledWith(8, QueueName.BACKGROUND_TASK, 5);
-      expect(jobMock.setConcurrency).toHaveBeenNthCalledWith(9, QueueName.STORAGE_TEMPLATE_MIGRATION, 1);
+      expect(mocks.job.setConcurrency).toHaveBeenCalledTimes(15);
+      expect(mocks.job.setConcurrency).toHaveBeenNthCalledWith(5, QueueName.FACIAL_RECOGNITION, 1);
+      expect(mocks.job.setConcurrency).toHaveBeenNthCalledWith(7, QueueName.DUPLICATE_DETECTION, 1);
+      expect(mocks.job.setConcurrency).toHaveBeenNthCalledWith(8, QueueName.BACKGROUND_TASK, 5);
+      expect(mocks.job.setConcurrency).toHaveBeenNthCalledWith(9, QueueName.STORAGE_TEMPLATE_MIGRATION, 1);
     });
   });
 
@@ -44,7 +36,7 @@ describe(JobService.name, () => {
     it('should run the scheduled jobs', async () => {
       await sut.handleNightlyJobs();
 
-      expect(jobMock.queueAll).toHaveBeenCalledWith([
+      expect(mocks.job.queueAll).toHaveBeenCalledWith([
         { name: JobName.ASSET_DELETION_CHECK },
         { name: JobName.USER_DELETE_CHECK },
         { name: JobName.PERSON_CLEANUP },
@@ -59,7 +51,7 @@ describe(JobService.name, () => {
 
   describe('getAllJobStatus', () => {
     it('should get all job statuses', async () => {
-      jobMock.getJobCounts.mockResolvedValue({
+      mocks.job.getJobCounts.mockResolvedValue({
         active: 1,
         completed: 1,
         failed: 1,
@@ -67,7 +59,7 @@ describe(JobService.name, () => {
         waiting: 1,
         paused: 1,
       });
-      jobMock.getQueueStatus.mockResolvedValue({
+      mocks.job.getQueueStatus.mockResolvedValue({
         isActive: true,
         isPaused: true,
       });
@@ -111,121 +103,121 @@ describe(JobService.name, () => {
     it('should handle a pause command', async () => {
       await sut.handleCommand(QueueName.METADATA_EXTRACTION, { command: JobCommand.PAUSE, force: false });
 
-      expect(jobMock.pause).toHaveBeenCalledWith(QueueName.METADATA_EXTRACTION);
+      expect(mocks.job.pause).toHaveBeenCalledWith(QueueName.METADATA_EXTRACTION);
     });
 
     it('should handle a resume command', async () => {
       await sut.handleCommand(QueueName.METADATA_EXTRACTION, { command: JobCommand.RESUME, force: false });
 
-      expect(jobMock.resume).toHaveBeenCalledWith(QueueName.METADATA_EXTRACTION);
+      expect(mocks.job.resume).toHaveBeenCalledWith(QueueName.METADATA_EXTRACTION);
     });
 
     it('should handle an empty command', async () => {
       await sut.handleCommand(QueueName.METADATA_EXTRACTION, { command: JobCommand.EMPTY, force: false });
 
-      expect(jobMock.empty).toHaveBeenCalledWith(QueueName.METADATA_EXTRACTION);
+      expect(mocks.job.empty).toHaveBeenCalledWith(QueueName.METADATA_EXTRACTION);
     });
 
     it('should not start a job that is already running', async () => {
-      jobMock.getQueueStatus.mockResolvedValue({ isActive: true, isPaused: false });
+      mocks.job.getQueueStatus.mockResolvedValue({ isActive: true, isPaused: false });
 
       await expect(
         sut.handleCommand(QueueName.VIDEO_CONVERSION, { command: JobCommand.START, force: false }),
       ).rejects.toBeInstanceOf(BadRequestException);
 
-      expect(jobMock.queue).not.toHaveBeenCalled();
-      expect(jobMock.queueAll).not.toHaveBeenCalled();
+      expect(mocks.job.queue).not.toHaveBeenCalled();
+      expect(mocks.job.queueAll).not.toHaveBeenCalled();
     });
 
     it('should handle a start video conversion command', async () => {
-      jobMock.getQueueStatus.mockResolvedValue({ isActive: false, isPaused: false });
+      mocks.job.getQueueStatus.mockResolvedValue({ isActive: false, isPaused: false });
 
       await sut.handleCommand(QueueName.VIDEO_CONVERSION, { command: JobCommand.START, force: false });
 
-      expect(jobMock.queue).toHaveBeenCalledWith({ name: JobName.QUEUE_VIDEO_CONVERSION, data: { force: false } });
+      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QUEUE_VIDEO_CONVERSION, data: { force: false } });
     });
 
     it('should handle a start storage template migration command', async () => {
-      jobMock.getQueueStatus.mockResolvedValue({ isActive: false, isPaused: false });
+      mocks.job.getQueueStatus.mockResolvedValue({ isActive: false, isPaused: false });
 
       await sut.handleCommand(QueueName.STORAGE_TEMPLATE_MIGRATION, { command: JobCommand.START, force: false });
 
-      expect(jobMock.queue).toHaveBeenCalledWith({ name: JobName.STORAGE_TEMPLATE_MIGRATION });
+      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.STORAGE_TEMPLATE_MIGRATION });
     });
 
     it('should handle a start smart search command', async () => {
-      jobMock.getQueueStatus.mockResolvedValue({ isActive: false, isPaused: false });
+      mocks.job.getQueueStatus.mockResolvedValue({ isActive: false, isPaused: false });
 
       await sut.handleCommand(QueueName.SMART_SEARCH, { command: JobCommand.START, force: false });
 
-      expect(jobMock.queue).toHaveBeenCalledWith({ name: JobName.QUEUE_SMART_SEARCH, data: { force: false } });
+      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QUEUE_SMART_SEARCH, data: { force: false } });
     });
 
     it('should handle a start metadata extraction command', async () => {
-      jobMock.getQueueStatus.mockResolvedValue({ isActive: false, isPaused: false });
+      mocks.job.getQueueStatus.mockResolvedValue({ isActive: false, isPaused: false });
 
       await sut.handleCommand(QueueName.METADATA_EXTRACTION, { command: JobCommand.START, force: false });
 
-      expect(jobMock.queue).toHaveBeenCalledWith({ name: JobName.QUEUE_METADATA_EXTRACTION, data: { force: false } });
+      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QUEUE_METADATA_EXTRACTION, data: { force: false } });
     });
 
     it('should handle a start sidecar command', async () => {
-      jobMock.getQueueStatus.mockResolvedValue({ isActive: false, isPaused: false });
+      mocks.job.getQueueStatus.mockResolvedValue({ isActive: false, isPaused: false });
 
       await sut.handleCommand(QueueName.SIDECAR, { command: JobCommand.START, force: false });
 
-      expect(jobMock.queue).toHaveBeenCalledWith({ name: JobName.QUEUE_SIDECAR, data: { force: false } });
+      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QUEUE_SIDECAR, data: { force: false } });
     });
 
     it('should handle a start thumbnail generation command', async () => {
-      jobMock.getQueueStatus.mockResolvedValue({ isActive: false, isPaused: false });
+      mocks.job.getQueueStatus.mockResolvedValue({ isActive: false, isPaused: false });
 
       await sut.handleCommand(QueueName.THUMBNAIL_GENERATION, { command: JobCommand.START, force: false });
 
-      expect(jobMock.queue).toHaveBeenCalledWith({ name: JobName.QUEUE_GENERATE_THUMBNAILS, data: { force: false } });
+      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QUEUE_GENERATE_THUMBNAILS, data: { force: false } });
     });
 
     it('should handle a start face detection command', async () => {
-      jobMock.getQueueStatus.mockResolvedValue({ isActive: false, isPaused: false });
+      mocks.job.getQueueStatus.mockResolvedValue({ isActive: false, isPaused: false });
 
       await sut.handleCommand(QueueName.FACE_DETECTION, { command: JobCommand.START, force: false });
 
-      expect(jobMock.queue).toHaveBeenCalledWith({ name: JobName.QUEUE_FACE_DETECTION, data: { force: false } });
+      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QUEUE_FACE_DETECTION, data: { force: false } });
     });
 
     it('should handle a start facial recognition command', async () => {
-      jobMock.getQueueStatus.mockResolvedValue({ isActive: false, isPaused: false });
+      mocks.job.getQueueStatus.mockResolvedValue({ isActive: false, isPaused: false });
 
       await sut.handleCommand(QueueName.FACIAL_RECOGNITION, { command: JobCommand.START, force: false });
 
-      expect(jobMock.queue).toHaveBeenCalledWith({ name: JobName.QUEUE_FACIAL_RECOGNITION, data: { force: false } });
+      expect(mocks.job.queue).toHaveBeenCalledWith({ name: JobName.QUEUE_FACIAL_RECOGNITION, data: { force: false } });
     });
 
     it('should throw a bad request when an invalid queue is used', async () => {
-      jobMock.getQueueStatus.mockResolvedValue({ isActive: false, isPaused: false });
+      mocks.job.getQueueStatus.mockResolvedValue({ isActive: false, isPaused: false });
 
       await expect(
         sut.handleCommand(QueueName.BACKGROUND_TASK, { command: JobCommand.START, force: false }),
       ).rejects.toBeInstanceOf(BadRequestException);
 
-      expect(jobMock.queue).not.toHaveBeenCalled();
-      expect(jobMock.queueAll).not.toHaveBeenCalled();
+      expect(mocks.job.queue).not.toHaveBeenCalled();
+      expect(mocks.job.queueAll).not.toHaveBeenCalled();
     });
   });
 
   describe('onJobStart', () => {
     it('should process a successful job', async () => {
-      jobMock.run.mockResolvedValue(JobStatus.SUCCESS);
+      mocks.job.run.mockResolvedValue(JobStatus.SUCCESS);
 
       await sut.onJobStart(QueueName.BACKGROUND_TASK, {
         name: JobName.DELETE_FILES,
         data: { files: ['path/to/file'] },
       });
 
-      expect(telemetryMock.jobs.addToGauge).toHaveBeenCalledWith('immich.queues.background_task.active', 1);
-      expect(telemetryMock.jobs.addToGauge).toHaveBeenCalledWith('immich.queues.background_task.active', -1);
-      expect(telemetryMock.jobs.addToCounter).toHaveBeenCalledWith('immich.jobs.delete_files.success', 1);
-      expect(loggerMock.error).not.toHaveBeenCalled();
+      expect(mocks.telemetry.jobs.addToGauge).toHaveBeenCalledWith('immich.queues.background_task.active', 1);
+      expect(mocks.telemetry.jobs.addToGauge).toHaveBeenCalledWith('immich.queues.background_task.active', -1);
+      expect(mocks.telemetry.jobs.addToCounter).toHaveBeenCalledWith('immich.jobs.delete_files.success', 1);
+      expect(mocks.logger.error).not.toHaveBeenCalled();
     });
 
     const tests: Array<{ item: JobItem; jobs: JobName[] }> = [
@@ -287,34 +279,34 @@ describe(JobService.name, () => {
       it(`should queue ${jobs.length} jobs when a ${item.name} job finishes successfully`, async () => {
         if (item.name === JobName.GENERATE_THUMBNAILS && item.data.source === 'upload') {
           if (item.data.id === 'asset-live-image') {
-            assetMock.getByIdsWithAllRelations.mockResolvedValue([assetStub.livePhotoStillAsset]);
+            mocks.asset.getByIdsWithAllRelations.mockResolvedValue([assetStub.livePhotoStillAsset]);
           } else {
-            assetMock.getByIdsWithAllRelations.mockResolvedValue([assetStub.livePhotoMotionAsset]);
+            mocks.asset.getByIdsWithAllRelations.mockResolvedValue([assetStub.livePhotoMotionAsset]);
           }
         }
 
-        jobMock.run.mockResolvedValue(JobStatus.SUCCESS);
+        mocks.job.run.mockResolvedValue(JobStatus.SUCCESS);
 
         await sut.onJobStart(QueueName.BACKGROUND_TASK, item);
 
         if (jobs.length > 1) {
-          expect(jobMock.queueAll).toHaveBeenCalledWith(
+          expect(mocks.job.queueAll).toHaveBeenCalledWith(
             jobs.map((jobName) => ({ name: jobName, data: expect.anything() })),
           );
         } else {
-          expect(jobMock.queue).toHaveBeenCalledTimes(jobs.length);
+          expect(mocks.job.queue).toHaveBeenCalledTimes(jobs.length);
           for (const jobName of jobs) {
-            expect(jobMock.queue).toHaveBeenCalledWith({ name: jobName, data: expect.anything() });
+            expect(mocks.job.queue).toHaveBeenCalledWith({ name: jobName, data: expect.anything() });
           }
         }
       });
 
       it(`should not queue any jobs when ${item.name} fails`, async () => {
-        jobMock.run.mockResolvedValue(JobStatus.FAILED);
+        mocks.job.run.mockResolvedValue(JobStatus.FAILED);
 
         await sut.onJobStart(QueueName.BACKGROUND_TASK, item);
 
-        expect(jobMock.queueAll).not.toHaveBeenCalled();
+        expect(mocks.job.queueAll).not.toHaveBeenCalled();
       });
     }
   });