update schema

add DB_USERNAME when needed

.github/workflows/build-mobile.yml

@@ -58,7 +58,7 @@ jobs:
       contents: read
     # Skip when PR from a fork
     if: ${{ !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' && needs.pre-job.outputs.should_run == 'true' }}
-    runs-on: macos-14
+    runs-on: mich
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -66,24 +66,46 @@ jobs:
           ref: ${{ inputs.ref || github.sha }}
           persist-credentials: false
 
-      - uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+      - name: Install missing deps
-        with:
+        run: |
-          distribution: 'zulu'
+          sudo add-apt-repository ppa:rmescandon/yq
-          java-version: '17'
+          sudo apt-get update
-          cache: 'gradle'
+          sudo apt-get install -y yq xz-utils ninja-build zstd
-
-      - name: Setup Flutter SDK
-        uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046 # v2.19.0
-        with:
-          channel: 'stable'
-          flutter-version-file: ./mobile/pubspec.yaml
-          cache: true
 
       - name: Create the Keystore
         env:
           KEY_JKS: ${{ secrets.KEY_JKS }}
         working-directory: ./mobile
-        run: echo $KEY_JKS | base64 -d > android/key.jks
+        run: printf "%s" $KEY_JKS | base64 -d > android/key.jks
+
+      - uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+
+      - name: Restore Gradle Cache
+        id: cache-gradle-restore
+        uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+            ~/.android/sdk
+            mobile/android/.gradle
+            mobile/.dart_tool
+          key: build-mobile-gradle-${{ runner.os }}-main
+
+      - name: Setup Flutter SDK
+        uses: subosito/flutter-action@395322a6cded4e9ed503aebd4cc1965625f8e59a # v2.20.0
+        with:
+          channel: 'stable'
+          flutter-version-file: ./mobile/pubspec.yaml
+          cache: true
+
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407 # v3.2.2
+        with:
+          packages: ''
 
       - name: Get Packages
         working-directory: ./mobile
@@ -103,12 +125,30 @@ jobs:
           ALIAS: ${{ secrets.ALIAS }}
           ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
           ANDROID_STORE_PASSWORD: ${{ secrets.ANDROID_STORE_PASSWORD }}
+          IS_MAIN: ${{ github.ref == 'refs/heads/main' }}
         run: |
-          flutter build apk --release
+          if [[ $IS_MAIN == 'true' ]]; then
-          flutter build apk --release --split-per-abi --target-platform android-arm,android-arm64,android-x64
+            flutter build apk --release
+            flutter build apk --release --split-per-abi --target-platform android-arm,android-arm64,android-x64
+          else
+            flutter build apk --debug --split-per-abi --target-platform android-arm64
+          fi
 
       - name: Publish Android Artifact
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: release-apk-signed
           path: mobile/build/app/outputs/flutter-apk/*.apk
+
+      - name: Save Gradle Cache
+        id: cache-gradle-save
+        uses: actions/cache/save@5a3ec84eff668545956fd18022155c47e93e2684 # v4
+        if: github.ref == 'refs/heads/main'
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+            ~/.android/sdk
+            mobile/android/.gradle
+            mobile/.dart_tool
+          key: ${{ steps.cache-gradle-restore.outputs.cache-primary-key }}

.github/workflows/cli.yml

@@ -70,7 +70,7 @@ jobs:
         uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
@@ -99,7 +99,7 @@ jobs:
             type=raw,value=latest,enable=${{ github.event_name == 'release' }}
 
       - name: Build and push image
-        uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
+        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
         with:
           file: cli/Dockerfile
           platforms: linux/amd64,linux/arm64

.github/workflows/codeql-analysis.yml

@@ -50,7 +50,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+        uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -63,7 +63,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+        uses: github/codeql-action/autobuild@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -76,6 +76,6 @@ jobs:
       #   ./location_of_script_within_repo/buildscript.sh
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+        uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
         with:
           category: '/language:${{matrix.language}}'

.github/workflows/docker.yml

@@ -177,7 +177,7 @@ jobs:
     runs-on: ubuntu-latest
     if: always()
     steps:
-      - uses: immich-app/devtools/actions/success-check@6b81b1572e466f7f48ba3c823159ce3f4a4d66a6 # success-check-action-0.0.3
+      - uses: immich-app/devtools/actions/success-check@68f10eb389bb02a3cf9d1156111964c549eb421b # 0.0.4
         with:
           needs: ${{ toJSON(needs) }}
 
@@ -188,6 +188,6 @@ jobs:
     runs-on: ubuntu-latest
     if: always()
     steps:
-      - uses: immich-app/devtools/actions/success-check@6b81b1572e466f7f48ba3c823159ce3f4a4d66a6 # success-check-action-0.0.3
+      - uses: immich-app/devtools/actions/success-check@68f10eb389bb02a3cf9d1156111964c549eb421b # 0.0.4
         with:
           needs: ${{ toJSON(needs) }}

.github/workflows/prepare-release.yml

@@ -100,7 +100,7 @@ jobs:
           name: release-apk-signed
 
       - name: Create draft release
-        uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631 # v2.2.2
+        uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
         with:
           draft: true
           tag_name: ${{ env.IMMICH_VERSION }}

.github/workflows/static_analysis.yml

@@ -49,7 +49,7 @@ jobs:
           persist-credentials: false
 
       - name: Setup Flutter SDK
-        uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046 # v2.19.0
+        uses: subosito/flutter-action@395322a6cded4e9ed503aebd4cc1965625f8e59a # v2.20.0
         with:
           channel: 'stable'
           flutter-version-file: ./mobile/pubspec.yaml
@@ -109,7 +109,7 @@ jobs:
         working-directory: ./mobile
 
       - name: Run DCM
-        run: dcm analyze lib
+        run: dcm analyze lib --fatal-style --fatal-warnings
         working-directory: ./mobile
 
   zizmor:
@@ -134,7 +134,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload SARIF file
-        uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+        uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
         with:
           sarif_file: results.sarif
           category: zizmor

.github/workflows/test.yml

@@ -499,7 +499,7 @@ jobs:
     runs-on: ubuntu-latest
     if: always()
     steps:
-      - uses: immich-app/devtools/actions/success-check@6b81b1572e466f7f48ba3c823159ce3f4a4d66a6 # success-check-action-0.0.3
+      - uses: immich-app/devtools/actions/success-check@68f10eb389bb02a3cf9d1156111964c549eb421b # 0.0.4
         with:
           needs: ${{ toJSON(needs) }}
 
@@ -516,7 +516,7 @@ jobs:
           persist-credentials: false
 
       - name: Setup Flutter SDK
-        uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046 # v2.19.0
+        uses: subosito/flutter-action@395322a6cded4e9ed503aebd4cc1965625f8e59a # v2.20.0
         with:
           channel: 'stable'
           flutter-version-file: ./mobile/pubspec.yaml
@@ -609,7 +609,7 @@ jobs:
           persist-credentials: false
 
       - name: Run ShellCheck
-        uses: ludeeus/action-shellcheck@master
+        uses: ludeeus/action-shellcheck@00cae500b08a931fb5698e11e79bfbd38e612a38 # 2.0.0
         with:
           ignore_paths: >-
             **/open-api/**
@@ -668,7 +668,7 @@ jobs:
       contents: read
     services:
       postgres:
-        image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3
+        image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3@sha256:1f5583fe3397210a0fbc7f11b0cec18bacc4a99e3e8ea0548e9bd6bcf26ec37a
         env:
           POSTGRES_PASSWORD: postgres
           POSTGRES_USER: postgres

.github/workflows/weblate-lock.yml

@@ -52,6 +52,6 @@ jobs:
     permissions: {}
     if: always()
     steps:
-      - uses: immich-app/devtools/actions/success-check@6b81b1572e466f7f48ba3c823159ce3f4a4d66a6 # success-check-action-0.0.3
+      - uses: immich-app/devtools/actions/success-check@68f10eb389bb02a3cf9d1156111964c549eb421b # 0.0.4
         with:
           needs: ${{ toJSON(needs) }}

Makefile

@@ -83,7 +83,7 @@ test-medium-dev:
 	docker exec -it immich_server /bin/sh -c "npm run test:medium"
 
 build-all: $(foreach M,$(filter-out e2e .github,$(MODULES)),build-$M) ;
-install-all: $(foreach M,$(filter-out .github,$(MODULES)),install-$M) ;
+install-all: $(foreach M,$(MODULES),install-$M) ;  
 ci-all: $(foreach M,$(filter-out .github,$(MODULES)),ci-$M) ;
 check-all: $(foreach M,$(filter-out sdk cli docs .github,$(MODULES)),check-$M) ;
 lint-all: $(foreach M,$(filter-out sdk docs .github,$(MODULES)),lint-$M) ;

docker/docker-compose.dev.yml

@@ -134,6 +134,7 @@ services:
       - ${UPLOAD_LOCATION}/postgres:/var/lib/postgresql/data
     ports:
       - 5432:5432
+    shm_size: 128mb
   # set IMMICH_TELEMETRY_INCLUDE=all in .env to enable metrics
   # immich-prometheus:
   #   container_name: immich_prometheus

docker/docker-compose.prod.yml

@@ -75,6 +75,7 @@ services:
       - ${UPLOAD_LOCATION}/postgres:/var/lib/postgresql/data
     ports:
       - 5432:5432
+    shm_size: 128mb
     restart: always
 
   # set IMMICH_TELEMETRY_INCLUDE=all in .env to enable metrics

docker/docker-compose.yml

@@ -67,6 +67,7 @@ services:
     volumes:
       # Do not edit the next line. If you want to change the database storage location on your system, edit the value of DB_DATA_LOCATION in the .env file
       - ${DB_DATA_LOCATION}:/var/lib/postgresql/data
+    shm_size: 128mb
     restart: always
 
 volumes:

docs/docs/FAQ.mdx

@@ -490,7 +490,7 @@ You can also scan the Postgres database file structure for errors:
 <details>
 <summary>Scan for file structure errors</summary>
 ```bash
-docker exec -it immich_postgres pg_amcheck --username=postgres --heapallindexed --parent-check --rootdescend --progress --all --install-missing
+docker exec -it immich_postgres pg_amcheck --username=<DB_USERNAME> --heapallindexed --parent-check --rootdescend --progress --all --install-missing
 ```
 
 A normal result will end something like this and return with an exit code of `0`:

docs/docs/administration/backup-and-restore.md

@@ -57,7 +57,7 @@ Then please follow the steps in the following section for restoring the database
   <TabItem value="Linux system" label="Linux system" default>
 
 ```bash title='Backup'
-docker exec -t immich_postgres pg_dumpall --clean --if-exists --username=postgres | gzip > "/path/to/backup/dump.sql.gz"
+docker exec -t immich_postgres pg_dumpall --clean --if-exists --username=<DB_USERNAME> | gzip > "/path/to/backup/dump.sql.gz"
 ```
 
 ```bash title='Restore'
@@ -79,7 +79,7 @@ docker compose up -d            # Start remainder of Immich apps
   <TabItem value="Windows system (PowerShell)" label="Windows system (PowerShell)">
 
 ```powershell title='Backup'
-[System.IO.File]::WriteAllLines("C:\absolute\path\to\backup\dump.sql", (docker exec -t immich_postgres pg_dumpall --clean --if-exists --username=postgres))
+[System.IO.File]::WriteAllLines("C:\absolute\path\to\backup\dump.sql", (docker exec -t immich_postgres pg_dumpall --clean --if-exists --username=<DB_USERNAME>))
 ```
 
 ```powershell title='Restore'

docs/docs/guides/template-backup-script.md

@@ -52,9 +52,9 @@ REMOTE_BACKUP_PATH="/path/to/remote/backup/directory"
 ### Local
 
 # Backup Immich database
-docker exec -t immich_postgres pg_dumpall --clean --if-exists --username=postgres > "$UPLOAD_LOCATION"/database-backup/immich-database.sql
+docker exec -t immich_postgres pg_dumpall --clean --if-exists --username=<DB_USERNAME> > "$UPLOAD_LOCATION"/database-backup/immich-database.sql
 # For deduplicating backup programs such as Borg or Restic, compressing the content can increase backup size by making it harder to deduplicate. If you are using a different program or still prefer to compress, you can use the following command instead:
-# docker exec -t immich_postgres pg_dumpall --clean --if-exists --username=postgres | /usr/bin/gzip --rsyncable > "$UPLOAD_LOCATION"/database-backup/immich-database.sql.gz
+# docker exec -t immich_postgres pg_dumpall --clean --if-exists --username=<DB_USERNAME> | /usr/bin/gzip --rsyncable > "$UPLOAD_LOCATION"/database-backup/immich-database.sql.gz
 
 ### Append to local Borg repository
 borg create "$BACKUP_PATH/immich-borg::{now}" "$UPLOAD_LOCATION" --exclude "$UPLOAD_LOCATION"/thumbs/ --exclude "$UPLOAD_LOCATION"/encoded-video/

e2e/package-lock.json

@@ -34,6 +34,7 @@
         "pngjs": "^7.0.0",
         "prettier": "^3.2.5",
         "prettier-plugin-organize-imports": "^4.0.0",
+        "sharp": "^0.33.5",
         "socket.io-client": "^4.7.4",
         "supertest": "^7.0.0",
         "typescript": "^5.3.3",
@@ -178,6 +179,17 @@
         "node": ">=18"
       }
     },
+    "node_modules/@emnapi/runtime": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.3.tgz",
+      "integrity": "sha512-pBPWdu6MLKROBX05wSNKcNb++m5Er+KQ9QkB+WVM+pW2Kx9hoSrVTnu3BdkI5eBLZoKu/J6mW/B6i6bJB2ytXQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
     "node_modules/@esbuild/aix-ppc64": {
       "version": "0.25.5",
       "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.5.tgz",
@@ -823,6 +835,386 @@
         "url": "https://github.com/sponsors/nzakas"
       }
     },
+    "node_modules/@img/sharp-darwin-arm64": {
+      "version": "0.33.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.33.5.tgz",
+      "integrity": "sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-darwin-arm64": "1.0.4"
+      }
+    },
+    "node_modules/@img/sharp-darwin-x64": {
+      "version": "0.33.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.33.5.tgz",
+      "integrity": "sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-darwin-x64": "1.0.4"
+      }
+    },
+    "node_modules/@img/sharp-libvips-darwin-arm64": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.0.4.tgz",
+      "integrity": "sha512-XblONe153h0O2zuFfTAbQYAX2JhYmDHeWikp1LM9Hul9gVPjFY427k6dFEcOL72O01QxQsWi761svJ/ev9xEDg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@img/sharp-libvips-darwin-x64": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.0.4.tgz",
+      "integrity": "sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@img/sharp-libvips-linux-arm": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.0.5.tgz",
+      "integrity": "sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@img/sharp-libvips-linux-arm64": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.0.4.tgz",
+      "integrity": "sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@img/sharp-libvips-linux-s390x": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.0.4.tgz",
+      "integrity": "sha512-u7Wz6ntiSSgGSGcjZ55im6uvTrOxSIS8/dgoVMoiGE9I6JAfU50yH5BoDlYA1tcuGS7g/QNtetJnxA6QEsCVTA==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@img/sharp-libvips-linux-x64": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.4.tgz",
+      "integrity": "sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@img/sharp-libvips-linuxmusl-arm64": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.0.4.tgz",
+      "integrity": "sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@img/sharp-libvips-linuxmusl-x64": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.0.4.tgz",
+      "integrity": "sha512-viYN1KX9m+/hGkJtvYYp+CCLgnJXwiQB39damAO7WMdKWlIhmYTfHjwSbQeUK/20vY154mwezd9HflVFM1wVSw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@img/sharp-linux-arm": {
+      "version": "0.33.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.33.5.tgz",
+      "integrity": "sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-linux-arm": "1.0.5"
+      }
+    },
+    "node_modules/@img/sharp-linux-arm64": {
+      "version": "0.33.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.33.5.tgz",
+      "integrity": "sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-linux-arm64": "1.0.4"
+      }
+    },
+    "node_modules/@img/sharp-linux-s390x": {
+      "version": "0.33.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.33.5.tgz",
+      "integrity": "sha512-y/5PCd+mP4CA/sPDKl2961b+C9d+vPAveS33s6Z3zfASk2j5upL6fXVPZi7ztePZ5CuH+1kW8JtvxgbuXHRa4Q==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-linux-s390x": "1.0.4"
+      }
+    },
+    "node_modules/@img/sharp-linux-x64": {
+      "version": "0.33.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.5.tgz",
+      "integrity": "sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-linux-x64": "1.0.4"
+      }
+    },
+    "node_modules/@img/sharp-linuxmusl-arm64": {
+      "version": "0.33.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.33.5.tgz",
+      "integrity": "sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-linuxmusl-arm64": "1.0.4"
+      }
+    },
+    "node_modules/@img/sharp-linuxmusl-x64": {
+      "version": "0.33.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.33.5.tgz",
+      "integrity": "sha512-WT+d/cgqKkkKySYmqoZ8y3pxx7lx9vVejxW/W4DOFMYVSkErR+w7mf2u8m/y4+xHe7yY9DAXQMWQhpnMuFfScw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-libvips-linuxmusl-x64": "1.0.4"
+      }
+    },
+    "node_modules/@img/sharp-wasm32": {
+      "version": "0.33.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.33.5.tgz",
+      "integrity": "sha512-ykUW4LVGaMcU9lu9thv85CbRMAwfeadCJHRsg2GmeRa/cJxsVY9Rbd57JcMxBkKHag5U/x7TSBpScF4U8ElVzg==",
+      "cpu": [
+        "wasm32"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND LGPL-3.0-or-later AND MIT",
+      "optional": true,
+      "dependencies": {
+        "@emnapi/runtime": "^1.2.0"
+      },
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@img/sharp-win32-ia32": {
+      "version": "0.33.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.33.5.tgz",
+      "integrity": "sha512-T36PblLaTwuVJ/zw/LaH0PdZkRz5rd3SmMHX8GSmR7vtNSP5Z6bQkExdSK7xGWyxLw4sUknBuugTelgw2faBbQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
+    "node_modules/@img/sharp-win32-x64": {
+      "version": "0.33.5",
+      "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.5.tgz",
+      "integrity": "sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND LGPL-3.0-or-later",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
     "node_modules/@immich/cli": {
       "resolved": "../cli",
       "link": true
@@ -2447,6 +2839,20 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/color": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz",
+      "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1",
+        "color-string": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=12.5.0"
+      }
+    },
     "node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -2467,6 +2873,17 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/color-string": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",
+      "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "^1.0.0",
+        "simple-swizzle": "^0.2.2"
+      }
+    },
     "node_modules/color-support": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
@@ -3964,6 +4381,13 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/is-arrayish": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
+      "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/is-builtin-module": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-5.0.0.tgz",
@@ -5536,6 +5960,46 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/sharp": {
+      "version": "0.33.5",
+      "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.33.5.tgz",
+      "integrity": "sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "color": "^4.2.3",
+        "detect-libc": "^2.0.3",
+        "semver": "^7.6.3"
+      },
+      "engines": {
+        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      },
+      "optionalDependencies": {
+        "@img/sharp-darwin-arm64": "0.33.5",
+        "@img/sharp-darwin-x64": "0.33.5",
+        "@img/sharp-libvips-darwin-arm64": "1.0.4",
+        "@img/sharp-libvips-darwin-x64": "1.0.4",
+        "@img/sharp-libvips-linux-arm": "1.0.5",
+        "@img/sharp-libvips-linux-arm64": "1.0.4",
+        "@img/sharp-libvips-linux-s390x": "1.0.4",
+        "@img/sharp-libvips-linux-x64": "1.0.4",
+        "@img/sharp-libvips-linuxmusl-arm64": "1.0.4",
+        "@img/sharp-libvips-linuxmusl-x64": "1.0.4",
+        "@img/sharp-linux-arm": "0.33.5",
+        "@img/sharp-linux-arm64": "0.33.5",
+        "@img/sharp-linux-s390x": "0.33.5",
+        "@img/sharp-linux-x64": "0.33.5",
+        "@img/sharp-linuxmusl-arm64": "0.33.5",
+        "@img/sharp-linuxmusl-x64": "0.33.5",
+        "@img/sharp-wasm32": "0.33.5",
+        "@img/sharp-win32-ia32": "0.33.5",
+        "@img/sharp-win32-x64": "0.33.5"
+      }
+    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -5655,6 +6119,16 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/simple-swizzle": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
+      "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-arrayish": "^0.3.1"
+      }
+    },
     "node_modules/socket.io-client": {
       "version": "4.8.1",
       "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.8.1.tgz",

e2e/package.json

@@ -44,6 +44,7 @@
     "pngjs": "^7.0.0",
     "prettier": "^3.2.5",
     "prettier-plugin-organize-imports": "^4.0.0",
+    "sharp": "^0.33.5",
     "socket.io-client": "^4.7.4",
     "supertest": "^7.0.0",
     "typescript": "^5.3.3",

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

@@ -15,6 +15,7 @@ import { DateTime } from 'luxon';
 import { randomBytes } from 'node:crypto';
 import { readFile, writeFile } from 'node:fs/promises';
 import { basename, join } from 'node:path';
+import sharp from 'sharp';
 import { Socket } from 'socket.io-client';
 import { createUserDto, uuidDto } from 'src/fixtures';
 import { makeRandomImage } from 'src/generators';
@@ -40,6 +41,40 @@ const today = DateTime.fromObject({
 }) as DateTime<true>;
 const yesterday = today.minus({ days: 1 });
 
+const createTestImageWithExif = async (filename: string, exifData: Record<string, any>) => {
+  // Generate unique color to ensure different checksums for each image
+  const r = Math.floor(Math.random() * 256);
+  const g = Math.floor(Math.random() * 256);
+  const b = Math.floor(Math.random() * 256);
+
+  // Create a 100x100 solid color JPEG using Sharp
+  const imageBytes = await sharp({
+    create: {
+      width: 100,
+      height: 100,
+      channels: 3,
+      background: { r, g, b },
+    },
+  })
+    .jpeg({ quality: 90 })
+    .toBuffer();
+
+  // Add random suffix to filename to avoid collisions
+  const uniqueFilename = filename.replace('.jpg', `-${randomBytes(4).toString('hex')}.jpg`);
+  const filepath = join(tempDir, uniqueFilename);
+  await writeFile(filepath, imageBytes);
+
+  // Filter out undefined values before writing EXIF
+  const cleanExifData = Object.fromEntries(Object.entries(exifData).filter(([, value]) => value !== undefined));
+
+  await exiftool.write(filepath, cleanExifData);
+
+  // Re-read the image bytes after EXIF has been written
+  const finalImageBytes = await readFile(filepath);
+
+  return { filepath, imageBytes: finalImageBytes, filename: uniqueFilename };
+};
+
 describe('/asset', () => {
   let admin: LoginResponseDto;
   let websocket: Socket;
@@ -1190,6 +1225,411 @@ describe('/asset', () => {
     });
   });
 
+  describe('EXIF metadata extraction', () => {
+    describe('Additional date tag extraction', () => {
+      describe('Date-time vs time-only tag handling', () => {
+        it('should fall back to file timestamps when only time-only tags are available', async () => {
+          const { imageBytes, filename } = await createTestImageWithExif('time-only-fallback.jpg', {
+            TimeCreated: '2023:11:15 14:30:00', // Time-only tag, should not be used for dateTimeOriginal
+            // Exclude all date-time tags to force fallback to file timestamps
+            SubSecDateTimeOriginal: undefined,
+            DateTimeOriginal: undefined,
+            SubSecCreateDate: undefined,
+            SubSecMediaCreateDate: undefined,
+            CreateDate: undefined,
+            MediaCreateDate: undefined,
+            CreationDate: undefined,
+            DateTimeCreated: undefined,
+            GPSDateTime: undefined,
+            DateTimeUTC: undefined,
+            SonyDateTime2: undefined,
+            GPSDateStamp: undefined,
+          });
+
+          const oldDate = new Date('2020-01-01T00:00:00.000Z');
+          const asset = await utils.createAsset(admin.accessToken, {
+            assetData: {
+              filename,
+              bytes: imageBytes,
+            },
+            fileCreatedAt: oldDate.toISOString(),
+            fileModifiedAt: oldDate.toISOString(),
+          });
+
+          await utils.waitForWebsocketEvent({ event: 'assetUpload', id: asset.id });
+
+          const assetInfo = await getAssetInfo({ id: asset.id }, { headers: asBearerAuth(admin.accessToken) });
+
+          expect(assetInfo.exifInfo?.dateTimeOriginal).toBeDefined();
+          // Should fall back to file timestamps, which we set to 2020-01-01
+          expect(new Date(assetInfo.exifInfo!.dateTimeOriginal!).getTime()).toBe(
+            new Date('2020-01-01T00:00:00.000Z').getTime(),
+          );
+        });
+
+        it('should prefer DateTimeOriginal over time-only tags', async () => {
+          const { imageBytes, filename } = await createTestImageWithExif('datetime-over-time.jpg', {
+            DateTimeOriginal: '2023:10:10 10:00:00', // Should be preferred
+            TimeCreated: '2023:11:15 14:30:00', // Should be ignored (time-only)
+          });
+
+          const asset = await utils.createAsset(admin.accessToken, {
+            assetData: {
+              filename,
+              bytes: imageBytes,
+            },
+          });
+
+          await utils.waitForWebsocketEvent({ event: 'assetUpload', id: asset.id });
+
+          const assetInfo = await getAssetInfo({ id: asset.id }, { headers: asBearerAuth(admin.accessToken) });
+
+          expect(assetInfo.exifInfo?.dateTimeOriginal).toBeDefined();
+          // Should use DateTimeOriginal, not TimeCreated
+          expect(new Date(assetInfo.exifInfo!.dateTimeOriginal!).getTime()).toBe(
+            new Date('2023-10-10T10:00:00.000Z').getTime(),
+          );
+        });
+      });
+
+      describe('GPSDateTime tag extraction', () => {
+        it('should extract GPSDateTime with GPS coordinates', async () => {
+          const { imageBytes, filename } = await createTestImageWithExif('gps-datetime.jpg', {
+            GPSDateTime: '2023:11:15 12:30:00Z',
+            GPSLatitude: 37.7749,
+            GPSLongitude: -122.4194,
+            // Exclude other date tags
+            SubSecDateTimeOriginal: undefined,
+            DateTimeOriginal: undefined,
+            SubSecCreateDate: undefined,
+            SubSecMediaCreateDate: undefined,
+            CreateDate: undefined,
+            MediaCreateDate: undefined,
+            CreationDate: undefined,
+            DateTimeCreated: undefined,
+            TimeCreated: undefined,
+          });
+
+          const asset = await utils.createAsset(admin.accessToken, {
+            assetData: {
+              filename,
+              bytes: imageBytes,
+            },
+          });
+
+          await utils.waitForWebsocketEvent({ event: 'assetUpload', id: asset.id });
+
+          const assetInfo = await getAssetInfo({ id: asset.id }, { headers: asBearerAuth(admin.accessToken) });
+
+          expect(assetInfo.exifInfo?.dateTimeOriginal).toBeDefined();
+          expect(assetInfo.exifInfo?.latitude).toBeCloseTo(37.7749, 4);
+          expect(assetInfo.exifInfo?.longitude).toBeCloseTo(-122.4194, 4);
+          expect(new Date(assetInfo.exifInfo!.dateTimeOriginal!).getTime()).toBe(
+            new Date('2023-11-15T12:30:00.000Z').getTime(),
+          );
+        });
+      });
+
+      describe('CreateDate tag extraction', () => {
+        it('should extract CreateDate when available', async () => {
+          const { imageBytes, filename } = await createTestImageWithExif('create-date.jpg', {
+            CreateDate: '2023:11:15 10:30:00',
+            // Exclude other higher priority date tags
+            SubSecDateTimeOriginal: undefined,
+            DateTimeOriginal: undefined,
+            SubSecCreateDate: undefined,
+            SubSecMediaCreateDate: undefined,
+            MediaCreateDate: undefined,
+            CreationDate: undefined,
+            DateTimeCreated: undefined,
+            TimeCreated: undefined,
+            GPSDateTime: undefined,
+          });
+
+          const asset = await utils.createAsset(admin.accessToken, {
+            assetData: {
+              filename,
+              bytes: imageBytes,
+            },
+          });
+
+          await utils.waitForWebsocketEvent({ event: 'assetUpload', id: asset.id });
+
+          const assetInfo = await getAssetInfo({ id: asset.id }, { headers: asBearerAuth(admin.accessToken) });
+
+          expect(assetInfo.exifInfo?.dateTimeOriginal).toBeDefined();
+          expect(new Date(assetInfo.exifInfo!.dateTimeOriginal!).getTime()).toBe(
+            new Date('2023-11-15T10:30:00.000Z').getTime(),
+          );
+        });
+      });
+
+      describe('GPSDateStamp tag extraction', () => {
+        it('should fall back to file timestamps when only date-only tags are available', async () => {
+          const { imageBytes, filename } = await createTestImageWithExif('gps-datestamp.jpg', {
+            GPSDateStamp: '2023:11:15', // Date-only tag, should not be used for dateTimeOriginal
+            // Note: NOT including GPSTimeStamp to avoid automatic GPSDateTime creation
+            GPSLatitude: 51.5074,
+            GPSLongitude: -0.1278,
+            // Explicitly exclude all testable date-time tags to force fallback to file timestamps
+            DateTimeOriginal: undefined,
+            CreateDate: undefined,
+            CreationDate: undefined,
+            GPSDateTime: undefined,
+          });
+
+          const oldDate = new Date('2020-01-01T00:00:00.000Z');
+          const asset = await utils.createAsset(admin.accessToken, {
+            assetData: {
+              filename,
+              bytes: imageBytes,
+            },
+            fileCreatedAt: oldDate.toISOString(),
+            fileModifiedAt: oldDate.toISOString(),
+          });
+
+          await utils.waitForWebsocketEvent({ event: 'assetUpload', id: asset.id });
+
+          const assetInfo = await getAssetInfo({ id: asset.id }, { headers: asBearerAuth(admin.accessToken) });
+
+          expect(assetInfo.exifInfo?.dateTimeOriginal).toBeDefined();
+          expect(assetInfo.exifInfo?.latitude).toBeCloseTo(51.5074, 4);
+          expect(assetInfo.exifInfo?.longitude).toBeCloseTo(-0.1278, 4);
+          // Should fall back to file timestamps, which we set to 2020-01-01
+          expect(new Date(assetInfo.exifInfo!.dateTimeOriginal!).getTime()).toBe(
+            new Date('2020-01-01T00:00:00.000Z').getTime(),
+          );
+        });
+      });
+
+      /*
+       * NOTE: The following EXIF date tags are NOT effectively usable with JPEG test files:
+       *
+       * NOT WRITABLE to JPEG:
+       * - MediaCreateDate: Can be read from video files but not written to JPEG
+       * - DateTimeCreated: Read-only tag in JPEG format
+       * - DateTimeUTC: Cannot be written to JPEG files
+       * - SonyDateTime2: Proprietary Sony tag, not writable to JPEG
+       * - SubSecMediaCreateDate: Tag not defined for JPEG format
+       * - SourceImageCreateTime: Non-standard insta360 tag, not writable to JPEG
+       *
+       * WRITABLE but NOT READABLE from JPEG:
+       * - SubSecDateTimeOriginal: Can be written but not read back from JPEG
+       * - SubSecCreateDate: Can be written but not read back from JPEG
+       *
+       * EFFECTIVELY TESTABLE TAGS (writable and readable):
+       * - DateTimeOriginal ✓
+       * - CreateDate ✓
+       * - CreationDate ✓
+       * - GPSDateTime ✓
+       *
+       * The metadata service correctly handles non-readable tags and will fall back to
+       * file timestamps when only non-readable tags are present.
+       */
+
+      describe('Date tag priority order', () => {
+        it('should respect the complete date tag priority order', async () => {
+          // Test cases using only EFFECTIVELY TESTABLE tags (writable AND readable from JPEG)
+          const testCases = [
+            {
+              name: 'DateTimeOriginal has highest priority among testable tags',
+              exifData: {
+                DateTimeOriginal: '2023:04:04 04:00:00', // TESTABLE - highest priority among readable tags
+                CreateDate: '2023:05:05 05:00:00', // TESTABLE
+                CreationDate: '2023:07:07 07:00:00', // TESTABLE
+                GPSDateTime: '2023:10:10 10:00:00', // TESTABLE
+              },
+              expectedDate: '2023-04-04T04:00:00.000Z',
+            },
+            {
+              name: 'CreateDate when DateTimeOriginal missing',
+              exifData: {
+                CreateDate: '2023:05:05 05:00:00', // TESTABLE
+                CreationDate: '2023:07:07 07:00:00', // TESTABLE
+                GPSDateTime: '2023:10:10 10:00:00', // TESTABLE
+              },
+              expectedDate: '2023-05-05T05:00:00.000Z',
+            },
+            {
+              name: 'CreationDate when standard EXIF tags missing',
+              exifData: {
+                CreationDate: '2023:07:07 07:00:00', // TESTABLE
+                GPSDateTime: '2023:10:10 10:00:00', // TESTABLE
+              },
+              expectedDate: '2023-07-07T07:00:00.000Z',
+            },
+            {
+              name: 'GPSDateTime when no other testable date tags present',
+              exifData: {
+                GPSDateTime: '2023:10:10 10:00:00', // TESTABLE
+                Make: 'SONY',
+              },
+              expectedDate: '2023-10-10T10:00:00.000Z',
+            },
+          ];
+
+          for (const testCase of testCases) {
+            const { imageBytes, filename } = await createTestImageWithExif(
+              `${testCase.name.replaceAll(/\s+/g, '-').toLowerCase()}.jpg`,
+              testCase.exifData,
+            );
+
+            const asset = await utils.createAsset(admin.accessToken, {
+              assetData: {
+                filename,
+                bytes: imageBytes,
+              },
+            });
+
+            await utils.waitForWebsocketEvent({ event: 'assetUpload', id: asset.id });
+
+            const assetInfo = await getAssetInfo({ id: asset.id }, { headers: asBearerAuth(admin.accessToken) });
+
+            expect(assetInfo.exifInfo?.dateTimeOriginal, `Failed for: ${testCase.name}`).toBeDefined();
+            expect(
+              new Date(assetInfo.exifInfo!.dateTimeOriginal!).getTime(),
+              `Date mismatch for: ${testCase.name}`,
+            ).toBe(new Date(testCase.expectedDate).getTime());
+          }
+        });
+      });
+
+      describe('Edge cases for date tag handling', () => {
+        it('should fall back to file timestamps with GPSDateStamp alone', async () => {
+          const { imageBytes, filename } = await createTestImageWithExif('gps-datestamp-only.jpg', {
+            GPSDateStamp: '2023:08:08', // Date-only tag, should not be used for dateTimeOriginal
+            // Intentionally no GPSTimeStamp
+            // Exclude all other date tags
+            SubSecDateTimeOriginal: undefined,
+            DateTimeOriginal: undefined,
+            SubSecCreateDate: undefined,
+            SubSecMediaCreateDate: undefined,
+            CreateDate: undefined,
+            MediaCreateDate: undefined,
+            CreationDate: undefined,
+            DateTimeCreated: undefined,
+            TimeCreated: undefined,
+            GPSDateTime: undefined,
+            DateTimeUTC: undefined,
+          });
+
+          const oldDate = new Date('2020-01-01T00:00:00.000Z');
+          const asset = await utils.createAsset(admin.accessToken, {
+            assetData: {
+              filename,
+              bytes: imageBytes,
+            },
+            fileCreatedAt: oldDate.toISOString(),
+            fileModifiedAt: oldDate.toISOString(),
+          });
+
+          await utils.waitForWebsocketEvent({ event: 'assetUpload', id: asset.id });
+
+          const assetInfo = await getAssetInfo({ id: asset.id }, { headers: asBearerAuth(admin.accessToken) });
+
+          expect(assetInfo.exifInfo?.dateTimeOriginal).toBeDefined();
+          // Should fall back to file timestamps, which we set to 2020-01-01
+          expect(new Date(assetInfo.exifInfo!.dateTimeOriginal!).getTime()).toBe(
+            new Date('2020-01-01T00:00:00.000Z').getTime(),
+          );
+        });
+
+        it('should handle all testable date tags present to verify complete priority order', async () => {
+          const { imageBytes, filename } = await createTestImageWithExif('all-testable-date-tags.jpg', {
+            // All TESTABLE date tags to JPEG format (writable AND readable)
+            DateTimeOriginal: '2023:04:04 04:00:00', // TESTABLE - highest priority among readable tags
+            CreateDate: '2023:05:05 05:00:00', // TESTABLE
+            CreationDate: '2023:07:07 07:00:00', // TESTABLE
+            GPSDateTime: '2023:10:10 10:00:00', // TESTABLE
+            // Note: Excluded non-testable tags:
+            // SubSec tags: writable but not readable from JPEG
+            // Non-writable tags: MediaCreateDate, DateTimeCreated, DateTimeUTC, SonyDateTime2, etc.
+            // Time-only/date-only tags: already excluded from EXIF_DATE_TAGS
+          });
+
+          const asset = await utils.createAsset(admin.accessToken, {
+            assetData: {
+              filename,
+              bytes: imageBytes,
+            },
+          });
+
+          await utils.waitForWebsocketEvent({ event: 'assetUpload', id: asset.id });
+
+          const assetInfo = await getAssetInfo({ id: asset.id }, { headers: asBearerAuth(admin.accessToken) });
+
+          expect(assetInfo.exifInfo?.dateTimeOriginal).toBeDefined();
+          // Should use DateTimeOriginal as it has the highest priority among testable tags
+          expect(new Date(assetInfo.exifInfo!.dateTimeOriginal!).getTime()).toBe(
+            new Date('2023-04-04T04:00:00.000Z').getTime(),
+          );
+        });
+
+        it('should use CreationDate when SubSec tags are missing', async () => {
+          const { imageBytes, filename } = await createTestImageWithExif('creation-date-priority.jpg', {
+            CreationDate: '2023:07:07 07:00:00', // WRITABLE
+            GPSDateTime: '2023:10:10 10:00:00', // WRITABLE
+            // Note: DateTimeCreated, DateTimeUTC, SonyDateTime2 are NOT writable to JPEG
+            // Note: TimeCreated and GPSDateStamp are excluded from EXIF_DATE_TAGS (time-only/date-only)
+            // Exclude SubSec and standard EXIF tags
+            SubSecDateTimeOriginal: undefined,
+            DateTimeOriginal: undefined,
+            SubSecCreateDate: undefined,
+            CreateDate: undefined,
+          });
+
+          const asset = await utils.createAsset(admin.accessToken, {
+            assetData: {
+              filename,
+              bytes: imageBytes,
+            },
+          });
+
+          await utils.waitForWebsocketEvent({ event: 'assetUpload', id: asset.id });
+
+          const assetInfo = await getAssetInfo({ id: asset.id }, { headers: asBearerAuth(admin.accessToken) });
+
+          expect(assetInfo.exifInfo?.dateTimeOriginal).toBeDefined();
+          // Should use CreationDate when available
+          expect(new Date(assetInfo.exifInfo!.dateTimeOriginal!).getTime()).toBe(
+            new Date('2023-07-07T07:00:00.000Z').getTime(),
+          );
+        });
+
+        it('should skip invalid date formats and use next valid tag', async () => {
+          const { imageBytes, filename } = await createTestImageWithExif('invalid-date-handling.jpg', {
+            // Note: Testing invalid date handling with only WRITABLE tags
+            GPSDateTime: '2023:10:10 10:00:00', // WRITABLE - Valid date
+            CreationDate: '2023:13:13 13:00:00', // WRITABLE - Valid date
+            // Note: TimeCreated excluded (time-only), DateTimeCreated not writable to JPEG
+            // Exclude other date tags
+            SubSecDateTimeOriginal: undefined,
+            DateTimeOriginal: undefined,
+            SubSecCreateDate: undefined,
+            CreateDate: undefined,
+          });
+
+          const asset = await utils.createAsset(admin.accessToken, {
+            assetData: {
+              filename,
+              bytes: imageBytes,
+            },
+          });
+
+          await utils.waitForWebsocketEvent({ event: 'assetUpload', id: asset.id });
+
+          const assetInfo = await getAssetInfo({ id: asset.id }, { headers: asBearerAuth(admin.accessToken) });
+
+          expect(assetInfo.exifInfo?.dateTimeOriginal).toBeDefined();
+          // Should skip invalid dates and use the first valid one (GPSDateTime)
+          expect(new Date(assetInfo.exifInfo!.dateTimeOriginal!).getTime()).toBe(
+            new Date('2023-10-10T10:00:00.000Z').getTime(),
+          );
+        });
+      });
+    });
+  });
+
   describe('POST /assets/exist', () => {
     it('ignores invalid deviceAssetIds', async () => {
       const response = await utils.checkExistingAssets(user1.accessToken, {

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

@@ -6,7 +6,7 @@ import {
   createMemory,
   getMemory,
 } from '@immich/sdk';
-import { createUserDto, uuidDto } from 'src/fixtures';
+import { createUserDto } from 'src/fixtures';
 import { errorDto } from 'src/responses';
 import { app, asBearerAuth, utils } from 'src/utils';
 import request from 'supertest';
@@ -17,7 +17,6 @@ describe('/memories', () => {
   let user: LoginResponseDto;
   let adminAsset: AssetMediaResponseDto;
   let userAsset1: AssetMediaResponseDto;
-  let userAsset2: AssetMediaResponseDto;
   let userMemory: MemoryResponseDto;
 
   beforeAll(async () => {
@@ -25,10 +24,9 @@ describe('/memories', () => {
 
     admin = await utils.adminSetup();
     user = await utils.userSetup(admin.accessToken, createUserDto.user1);
-    [adminAsset, userAsset1, userAsset2] = await Promise.all([
+    [adminAsset, userAsset1] = await Promise.all([
       utils.createAsset(admin.accessToken),
       utils.createAsset(user.accessToken),
-      utils.createAsset(user.accessToken),
     ]);
     userMemory = await createMemory(
       {
@@ -43,121 +41,7 @@ describe('/memories', () => {
     );
   });
 
-  describe('GET /memories', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).get('/memories');
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-  });
-
-  describe('POST /memories', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).post('/memories');
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should validate data when type is on this day', async () => {
-      const { status, body } = await request(app)
-        .post('/memories')
-        .set('Authorization', `Bearer ${user.accessToken}`)
-        .send({
-          type: 'on_this_day',
-          data: {},
-          memoryAt: new Date(2021).toISOString(),
-        });
-
-      expect(status).toBe(400);
-      expect(body).toEqual(
-        errorDto.badRequest(['data.year must be a positive number', 'data.year must be an integer number']),
-      );
-    });
-
-    it('should create a new memory', async () => {
-      const { status, body } = await request(app)
-        .post('/memories')
-        .set('Authorization', `Bearer ${user.accessToken}`)
-        .send({
-          type: 'on_this_day',
-          data: { year: 2021 },
-          memoryAt: new Date(2021).toISOString(),
-        });
-
-      expect(status).toBe(201);
-      expect(body).toEqual({
-        id: expect.any(String),
-        type: 'on_this_day',
-        data: { year: 2021 },
-        createdAt: expect.any(String),
-        updatedAt: expect.any(String),
-        isSaved: false,
-        memoryAt: expect.any(String),
-        ownerId: user.userId,
-        assets: [],
-      });
-    });
-
-    it('should create a new memory (with assets)', async () => {
-      const { status, body } = await request(app)
-        .post('/memories')
-        .set('Authorization', `Bearer ${user.accessToken}`)
-        .send({
-          type: 'on_this_day',
-          data: { year: 2021 },
-          memoryAt: new Date(2021).toISOString(),
-          assetIds: [userAsset1.id, userAsset2.id],
-        });
-
-      expect(status).toBe(201);
-      expect(body).toMatchObject({
-        id: expect.any(String),
-        assets: expect.arrayContaining([
-          expect.objectContaining({ id: userAsset1.id }),
-          expect.objectContaining({ id: userAsset2.id }),
-        ]),
-      });
-      expect(body.assets).toHaveLength(2);
-    });
-
-    it('should create a new memory and ignore assets the user does not have access to', async () => {
-      const { status, body } = await request(app)
-        .post('/memories')
-        .set('Authorization', `Bearer ${user.accessToken}`)
-        .send({
-          type: 'on_this_day',
-          data: { year: 2021 },
-          memoryAt: new Date(2021).toISOString(),
-          assetIds: [userAsset1.id, adminAsset.id],
-        });
-
-      expect(status).toBe(201);
-      expect(body).toMatchObject({
-        id: expect.any(String),
-        assets: [expect.objectContaining({ id: userAsset1.id })],
-      });
-      expect(body.assets).toHaveLength(1);
-    });
-  });
-
   describe('GET /memories/:id', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).get(`/memories/${uuidDto.invalid}`);
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should require a valid id', async () => {
-      const { status, body } = await request(app)
-        .get(`/memories/${uuidDto.invalid}`)
-        .set('Authorization', `Bearer ${user.accessToken}`);
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(['id must be a UUID']));
-    });
-
     it('should require access', async () => {
       const { status, body } = await request(app)
         .get(`/memories/${userMemory.id}`)
@@ -176,22 +60,6 @@ describe('/memories', () => {
   });
 
   describe('PUT /memories/:id', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).put(`/memories/${uuidDto.invalid}`).send({ isSaved: true });
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should require a valid id', async () => {
-      const { status, body } = await request(app)
-        .put(`/memories/${uuidDto.invalid}`)
-        .send({ isSaved: true })
-        .set('Authorization', `Bearer ${user.accessToken}`);
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(['id must be a UUID']));
-    });
-
     it('should require access', async () => {
       const { status, body } = await request(app)
         .put(`/memories/${userMemory.id}`)
@@ -218,23 +86,6 @@ describe('/memories', () => {
   });
 
   describe('PUT /memories/:id/assets', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app)
-        .put(`/memories/${userMemory.id}/assets`)
-        .send({ ids: [userAsset1.id] });
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should require a valid id', async () => {
-      const { status, body } = await request(app)
-        .put(`/memories/${uuidDto.invalid}/assets`)
-        .send({ ids: [userAsset1.id] })
-        .set('Authorization', `Bearer ${user.accessToken}`);
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(['id must be a UUID']));
-    });
-
     it('should require access', async () => {
       const { status, body } = await request(app)
         .put(`/memories/${userMemory.id}/assets`)
@@ -244,15 +95,6 @@ describe('/memories', () => {
       expect(body).toEqual(errorDto.noPermission);
     });
 
-    it('should require a valid asset id', async () => {
-      const { status, body } = await request(app)
-        .put(`/memories/${userMemory.id}/assets`)
-        .send({ ids: [uuidDto.invalid] })
-        .set('Authorization', `Bearer ${user.accessToken}`);
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(['each value in ids must be a UUID']));
-    });
-
     it('should require asset access', async () => {
       const { status, body } = await request(app)
         .put(`/memories/${userMemory.id}/assets`)
@@ -279,23 +121,6 @@ describe('/memories', () => {
   });
 
   describe('DELETE /memories/:id/assets', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app)
-        .delete(`/memories/${userMemory.id}/assets`)
-        .send({ ids: [userAsset1.id] });
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should require a valid id', async () => {
-      const { status, body } = await request(app)
-        .delete(`/memories/${uuidDto.invalid}/assets`)
-        .send({ ids: [userAsset1.id] })
-        .set('Authorization', `Bearer ${user.accessToken}`);
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(['id must be a UUID']));
-    });
-
     it('should require access', async () => {
       const { status, body } = await request(app)
         .delete(`/memories/${userMemory.id}/assets`)
@@ -305,15 +130,6 @@ describe('/memories', () => {
       expect(body).toEqual(errorDto.noPermission);
     });
 
-    it('should require a valid asset id', async () => {
-      const { status, body } = await request(app)
-        .delete(`/memories/${userMemory.id}/assets`)
-        .send({ ids: [uuidDto.invalid] })
-        .set('Authorization', `Bearer ${user.accessToken}`);
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(['each value in ids must be a UUID']));
-    });
-
     it('should only remove assets in the memory', async () => {
       const { status, body } = await request(app)
         .delete(`/memories/${userMemory.id}/assets`)
@@ -340,21 +156,6 @@ describe('/memories', () => {
   });
 
   describe('DELETE /memories/:id', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).delete(`/memories/${uuidDto.invalid}`);
-
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should require a valid id', async () => {
-      const { status, body } = await request(app)
-        .delete(`/memories/${uuidDto.invalid}`)
-        .set('Authorization', `Bearer ${user.accessToken}`);
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest(['id must be a UUID']));
-    });
-
     it('should require access', async () => {
       const { status, body } = await request(app)
         .delete(`/memories/${userMemory.id}`)

e2e/src/generate-date-tag-test-images.ts

@@ -0,0 +1,178 @@
+#!/usr/bin/env node
+
+/**
+ * Script to generate test images with additional EXIF date tags
+ * This creates actual JPEG images with embedded metadata for testing
+ * Images are generated into e2e/test-assets/metadata/dates/
+ */
+
+import { execSync } from 'node:child_process';
+import { writeFileSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import sharp from 'sharp';
+
+interface TestImage {
+  filename: string;
+  description: string;
+  exifTags: Record<string, string>;
+}
+
+const testImages: TestImage[] = [
+  {
+    filename: 'time-created.jpg',
+    description: 'Image with TimeCreated tag',
+    exifTags: {
+      TimeCreated: '2023:11:15 14:30:00',
+      Make: 'Canon',
+      Model: 'EOS R5',
+    },
+  },
+  {
+    filename: 'gps-datetime.jpg',
+    description: 'Image with GPSDateTime and coordinates',
+    exifTags: {
+      GPSDateTime: '2023:11:15 12:30:00Z',
+      GPSLatitude: '37.7749',
+      GPSLongitude: '-122.4194',
+      GPSLatitudeRef: 'N',
+      GPSLongitudeRef: 'W',
+    },
+  },
+  {
+    filename: 'datetime-utc.jpg',
+    description: 'Image with DateTimeUTC tag',
+    exifTags: {
+      DateTimeUTC: '2023:11:15 10:30:00',
+      Make: 'Nikon',
+      Model: 'D850',
+    },
+  },
+  {
+    filename: 'gps-datestamp.jpg',
+    description: 'Image with GPSDateStamp and GPSTimeStamp',
+    exifTags: {
+      GPSDateStamp: '2023:11:15',
+      GPSTimeStamp: '08:30:00',
+      GPSLatitude: '51.5074',
+      GPSLongitude: '-0.1278',
+      GPSLatitudeRef: 'N',
+      GPSLongitudeRef: 'W',
+    },
+  },
+  {
+    filename: 'sony-datetime2.jpg',
+    description: 'Sony camera image with SonyDateTime2 tag',
+    exifTags: {
+      SonyDateTime2: '2023:11:15 06:30:00',
+      Make: 'SONY',
+      Model: 'ILCE-7RM5',
+    },
+  },
+  {
+    filename: 'date-priority-test.jpg',
+    description: 'Image with multiple date tags to test priority',
+    exifTags: {
+      SubSecDateTimeOriginal: '2023:01:01 01:00:00',
+      DateTimeOriginal: '2023:02:02 02:00:00',
+      SubSecCreateDate: '2023:03:03 03:00:00',
+      CreateDate: '2023:04:04 04:00:00',
+      CreationDate: '2023:05:05 05:00:00',
+      DateTimeCreated: '2023:06:06 06:00:00',
+      TimeCreated: '2023:07:07 07:00:00',
+      GPSDateTime: '2023:08:08 08:00:00',
+      DateTimeUTC: '2023:09:09 09:00:00',
+      GPSDateStamp: '2023:10:10',
+      SonyDateTime2: '2023:11:11 11:00:00',
+    },
+  },
+  {
+    filename: 'new-tags-only.jpg',
+    description: 'Image with only additional date tags (no standard tags)',
+    exifTags: {
+      TimeCreated: '2023:12:01 15:45:30',
+      GPSDateTime: '2023:12:01 13:45:30Z',
+      DateTimeUTC: '2023:12:01 13:45:30',
+      GPSDateStamp: '2023:12:01',
+      SonyDateTime2: '2023:12:01 08:45:30',
+      GPSLatitude: '40.7128',
+      GPSLongitude: '-74.0060',
+      GPSLatitudeRef: 'N',
+      GPSLongitudeRef: 'W',
+    },
+  },
+];
+
+const generateTestImages = async (): Promise<void> => {
+  // Target directory: e2e/test-assets/metadata/dates/
+  // Current file is in: e2e/src/
+  const __filename = fileURLToPath(import.meta.url);
+  const __dirname = dirname(__filename);
+  const targetDir = join(__dirname, '..', 'test-assets', 'metadata', 'dates');
+
+  console.log('Generating test images with additional EXIF date tags...');
+  console.log(`Target directory: ${targetDir}`);
+
+  for (const image of testImages) {
+    try {
+      const imagePath = join(targetDir, image.filename);
+
+      // Create unique JPEG file using Sharp
+      const r = Math.floor(Math.random() * 256);
+      const g = Math.floor(Math.random() * 256);
+      const b = Math.floor(Math.random() * 256);
+
+      const jpegData = await sharp({
+        create: {
+          width: 100,
+          height: 100,
+          channels: 3,
+          background: { r, g, b },
+        },
+      })
+        .jpeg({ quality: 90 })
+        .toBuffer();
+
+      writeFileSync(imagePath, jpegData);
+
+      // Build exiftool command to add EXIF data
+      const exifArgs = Object.entries(image.exifTags)
+        .map(([tag, value]) => `-${tag}="${value}"`)
+        .join(' ');
+
+      const command = `exiftool ${exifArgs} -overwrite_original "${imagePath}"`;
+
+      console.log(`Creating ${image.filename}: ${image.description}`);
+      execSync(command, { stdio: 'pipe' });
+
+      // Verify the tags were written
+      const verifyCommand = `exiftool -json "${imagePath}"`;
+      const result = execSync(verifyCommand, { encoding: 'utf8' });
+      const metadata = JSON.parse(result)[0];
+
+      console.log(`  ✓ Created with ${Object.keys(image.exifTags).length} EXIF tags`);
+
+      // Log first date tag found for verification
+      const firstDateTag = Object.keys(image.exifTags).find(
+        (tag) => tag.includes('Date') || tag.includes('Time') || tag.includes('Created'),
+      );
+      if (firstDateTag && metadata[firstDateTag]) {
+        console.log(`  ✓ Verified ${firstDateTag}: ${metadata[firstDateTag]}`);
+      }
+    } catch (error) {
+      console.error(`Failed to create ${image.filename}:`, (error as Error).message);
+    }
+  }
+
+  console.log('\nTest image generation complete!');
+  console.log('Files created in:', targetDir);
+  console.log('\nTo test these images:');
+  console.log(`cd ${targetDir} && exiftool -time:all -gps:all *.jpg`);
+};
+
+export { generateTestImages };
+
+// Run the generator if this file is executed directly
+if (import.meta.url === `file://${process.argv[1]}`) {
+  generateTestImages().catch(console.error);
+}

machine-learning/Dockerfile

@@ -59,7 +59,7 @@ ENV PYTHONDONTWRITEBYTECODE=1 \
 
 RUN apt-get update && apt-get install -y --no-install-recommends g++
 
-COPY --from=ghcr.io/astral-sh/uv:latest@sha256:cda0fdc9b6066975ba4c791597870d18bc3a441dfc18ab24c5e888c16e15780c /uv /uvx /bin/
+COPY --from=ghcr.io/astral-sh/uv:latest@sha256:9653efd4380d5a0e5511e337dcfc3b8ba5bc4e6ea7fa3be7716598261d5503fa /uv /uvx /bin/
 RUN --mount=type=cache,target=/root/.cache/uv \
     --mount=type=bind,source=uv.lock,target=uv.lock \
     --mount=type=bind,source=pyproject.toml,target=pyproject.toml \

mobile/analysis_options.yaml

@@ -146,6 +146,7 @@ dart_code_metrics:
   #  - no-empty-block
   #  - no-equal-then-else
   #  - prefer-correct-test-file-name
+    - prefer-const-border-radius
   #  - prefer-match-file-name
   #  - prefer-return-await
   #  - avoid-self-assignment
@@ -290,7 +291,8 @@ dart_code_metrics:
     # Style
   #  - prefer-trailing-comma
   #  - unnecessary-trailing-comma
-  #  - prefer-declaring-const-constructor
+    - prefer-declaring-const-constructor
   #  - prefer-single-widget-per-file
+    - prefer-switch-expression
   #  - prefer-prefixed-global-constants
   #  - prefer-correct-callback-field-name

mobile/android/gradle.properties

@@ -2,4 +2,6 @@ org.gradle.jvmargs=-Xmx4096M
 android.useAndroidX=true
 android.enableJetifier=true
 android.nonTransitiveRClass=false
-android.nonFinalResIds=false
+android.nonFinalResIds=false
+org.gradle.caching=true
+org.gradle.parallel=true

mobile/integration_test/test_utils/login_helper.dart

@@ -7,7 +7,7 @@ import 'general_helper.dart';
 class ImmichTestLoginHelper {
   final WidgetTester tester;
 
-  ImmichTestLoginHelper(this.tester);
+  const ImmichTestLoginHelper(this.tester);
 
   Future<void> waitForLoginScreen() async {
     await pumpUntilFound(tester, find.text("Login"));
@@ -60,11 +60,11 @@ class ImmichTestLoginHelper {
     await tester.tap(button);
   }
 
-  Future<void> assertLoginSuccess({int timeoutSeconds = 15}) async {
+  Future<void> assertLoginSuccess() async {
     await pumpUntilFound(tester, find.text("home_page_building_timeline".tr()));
   }
 
-  Future<void> assertLoginFailed({int timeoutSeconds = 15}) async {
+  Future<void> assertLoginFailed() async {
     await pumpUntilFound(tester, find.text("login_form_failed_login".tr()));
   }
 }

mobile/ios/WidgetExtension/EntryGenerators.swift

@@ -3,7 +3,7 @@ import WidgetKit
 
 func buildEntry(
   api: ImmichAPI,
-  asset: SearchResult,
+  asset: Asset,
   dateOffset: Int,
   subtitle: String? = nil
 )
@@ -15,7 +15,8 @@ func buildEntry(
     to: Date.now
   )!
   let image = try await api.fetchImage(asset: asset)
-  return ImageEntry(date: entryDate, image: image, subtitle: subtitle)
+
+  return ImageEntry(date: entryDate, image: image, subtitle: subtitle, deepLink: asset.deepLink)
 }
 
 func generateRandomEntries(

mobile/ios/WidgetExtension/ImageWidgetView.swift

@@ -6,6 +6,7 @@ struct ImageEntry: TimelineEntry {
   var image: UIImage?
   var subtitle: String? = nil
   var error: WidgetError? = nil
+  var deepLink: URL? = nil
 
   // Resizes the stored image to a maximum width of 450 pixels
   mutating func resize() {
@@ -54,6 +55,7 @@ struct ImmichWidgetView: View {
         }
         .padding(16)
       }
+      .widgetURL(entry.deepLink)
     }
   }
 }

mobile/ios/WidgetExtension/ImmichAPI.swift

@@ -43,9 +43,13 @@ enum AssetType: String, Codable {
   case other = "OTHER"
 }
 
-struct SearchResult: Codable {
+struct Asset: Codable {
   let id: String
   let type: AssetType
+  
+  var deepLink: URL? {
+    return URL(string: "immich://asset?id=\(id)")
+  }
 }
 
 struct SearchFilters: Codable {
@@ -56,7 +60,7 @@ struct SearchFilters: Codable {
 
 struct MemoryResult: Codable {
   let id: String
-  var assets: [SearchResult]
+  var assets: [Asset]
   let type: String
 
   struct MemoryData: Codable {
@@ -127,7 +131,7 @@ class ImmichAPI {
   }
 
   func fetchSearchResults(with filters: SearchFilters) async throws
-    -> [SearchResult]
+    -> [Asset]
   {
     // get URL
     guard
@@ -147,7 +151,7 @@ class ImmichAPI {
     let (data, _) = try await URLSession.shared.data(for: request)
 
     // decode data
-    return try JSONDecoder().decode([SearchResult].self, from: data)
+    return try JSONDecoder().decode([Asset].self, from: data)
   }
 
   func fetchMemory(for date: Date) async throws -> [MemoryResult] {
@@ -172,7 +176,7 @@ class ImmichAPI {
     return try JSONDecoder().decode([MemoryResult].self, from: data)
   }
 
-  func fetchImage(asset: SearchResult) async throws(WidgetError) -> UIImage {
+  func fetchImage(asset: Asset) async throws(WidgetError) -> UIImage {
     let thumbnailParams = [URLQueryItem(name: "size", value: "preview")]
     let assetEndpoint = "/assets/" + asset.id + "/thumbnail"
 

mobile/lib/constants/errors.dart

@@ -4,6 +4,8 @@ sealed class ImmichErrors {
 }
 
 class NoResponseDtoError extends ImmichErrors implements Exception {
+  const NoResponseDtoError();
+
   @override
   String toString() => "Response Dto is null";
 }

mobile/lib/domain/models/album/album.model.dart

@@ -0,0 +1,79 @@
+enum AlbumAssetOrder {
+  // do not change this order!
+  asc,
+  desc,
+}
+
+enum AlbumUserRole {
+  // do not change this order!
+  editor,
+  viewer,
+}
+
+// Model for an album stored in the server
+class Album {
+  final String id;
+  final String name;
+  final String ownerId;
+  final String description;
+  final DateTime createdAt;
+  final DateTime updatedAt;
+  final String? thumbnailAssetId;
+  final bool isActivityEnabled;
+  final AlbumAssetOrder order;
+
+  const Album({
+    required this.id,
+    required this.name,
+    required this.ownerId,
+    required this.description,
+    required this.createdAt,
+    required this.updatedAt,
+    this.thumbnailAssetId,
+    required this.isActivityEnabled,
+    required this.order,
+  });
+
+  @override
+  String toString() {
+    return '''Album {
+   id: $id,
+   name: $name,
+   ownerId: $ownerId,
+   description: $description,
+   createdAt: $createdAt,
+   updatedAt: $updatedAt,
+   isActivityEnabled: $isActivityEnabled,
+   order: $order,
+   thumbnailAssetId: ${thumbnailAssetId ?? "<NA>"}
+ }''';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    if (other is! Album) return false;
+    if (identical(this, other)) return true;
+    return id == other.id &&
+        name == other.name &&
+        ownerId == other.ownerId &&
+        description == other.description &&
+        createdAt == other.createdAt &&
+        updatedAt == other.updatedAt &&
+        thumbnailAssetId == other.thumbnailAssetId &&
+        isActivityEnabled == other.isActivityEnabled &&
+        order == other.order;
+  }
+
+  @override
+  int get hashCode {
+    return id.hashCode ^
+        name.hashCode ^
+        ownerId.hashCode ^
+        description.hashCode ^
+        createdAt.hashCode ^
+        updatedAt.hashCode ^
+        thumbnailAssetId.hashCode ^
+        isActivityEnabled.hashCode ^
+        order.hashCode;
+  }
+}

mobile/lib/domain/models/person.model.dart

@@ -1,7 +1,7 @@
 import 'dart:convert';
 
 class Person {
-  Person({
+  const Person({
     required this.id,
     this.birthDate,
     required this.isHidden,

mobile/lib/domain/services/local_sync.service.dart

@@ -2,10 +2,8 @@ import 'dart:async';
 
 import 'package:collection/collection.dart';
 import 'package:flutter/widgets.dart';
+import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/domain/models/local_album.model.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/domain/services/store.service.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
 import 'package:immich_mobile/platform/native_sync_api.g.dart';
 import 'package:immich_mobile/presentation/pages/dev/dev_logger.dart';
@@ -17,22 +15,16 @@ class LocalSyncService {
   final DriftLocalAlbumRepository _localAlbumRepository;
   final NativeSyncApi _nativeSyncApi;
   final Platform _platform;
-  final StoreService _storeService;
   final Logger _log = Logger("DeviceSyncService");
 
   LocalSyncService({
     required DriftLocalAlbumRepository localAlbumRepository,
     required NativeSyncApi nativeSyncApi,
-    required StoreService storeService,
     Platform? platform,
   })  : _localAlbumRepository = localAlbumRepository,
         _nativeSyncApi = nativeSyncApi,
-        _storeService = storeService,
         _platform = platform ?? const LocalPlatform();
 
-  bool get _ignoreIcloudAssets =>
-      _storeService.get(StoreKey.ignoreIcloudAssets, false) == true;
-
   Future<void> sync({bool full = false}) async {
     final Stopwatch stopwatch = Stopwatch()..start();
     try {
@@ -84,11 +76,7 @@ class LocalSyncService {
             );
             continue;
           }
-          if (_ignoreIcloudAssets) {
+          await updateAlbum(dbAlbum, album);
-            await removeAlbum(dbAlbum);
-          } else {
-            await updateAlbum(dbAlbum, album);
-          }
         }
       }
 
@@ -106,12 +94,7 @@ class LocalSyncService {
     try {
       final Stopwatch stopwatch = Stopwatch()..start();
 
-      List<PlatformAlbum> deviceAlbums =
+      final deviceAlbums = await _nativeSyncApi.getAlbums();
-          List.of(await _nativeSyncApi.getAlbums());
-      if (_platform.isIOS && _ignoreIcloudAssets) {
-        deviceAlbums.removeWhere((album) => album.isCloud);
-      }
-
       final dbAlbums =
           await _localAlbumRepository.getAll(sortBy: {SortLocalAlbumsBy.id});
 

mobile/lib/domain/services/log.service.dart

@@ -5,7 +5,7 @@ import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/log.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/drift_store.repository.dart';
 import 'package:logging/logging.dart';
 
 /// Service responsible for handling application logging.
@@ -14,8 +14,8 @@ import 'package:logging/logging.dart';
 /// writes them to a persistent [ILogRepository], and manages log levels
 /// via [IStoreRepository]
 class LogService {
-  final IsarLogRepository _logRepository;
+  final LogRepository _logRepository;
-  final IsarStoreRepository _storeRepository;
+  final IStoreRepository _storeRepository;
 
   final List<LogMessage> _msgBuffer = [];
 
@@ -37,8 +37,8 @@ class LogService {
   }
 
   static Future<LogService> init({
-    required IsarLogRepository logRepository,
+    required LogRepository logRepository,
-    required IsarStoreRepository storeRepository,
+    required IStoreRepository storeRepository,
     bool shouldBuffer = true,
   }) async {
     _instance ??= await create(
@@ -50,8 +50,8 @@ class LogService {
   }
 
   static Future<LogService> create({
-    required IsarLogRepository logRepository,
+    required LogRepository logRepository,
-    required IsarStoreRepository storeRepository,
+    required IStoreRepository storeRepository,
     bool shouldBuffer = true,
   }) async {
     final instance = LogService._(logRepository, storeRepository, shouldBuffer);

mobile/lib/domain/services/store.service.dart

@@ -1,18 +1,18 @@
 import 'dart:async';
 
 import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/drift_store.repository.dart';
 
 /// Provides access to a persistent key-value store with an in-memory cache.
 /// Listens for repository changes to keep the cache updated.
 class StoreService {
-  final IsarStoreRepository _storeRepository;
+  final IStoreRepository _storeRepository;
 
   /// In-memory cache. Keys are [StoreKey.id]
   final Map<int, Object?> _cache = {};
   late final StreamSubscription<StoreDto> _storeUpdateSubscription;
 
-  StoreService._({required IsarStoreRepository storeRepository})
+  StoreService._({required IStoreRepository storeRepository})
       : _storeRepository = storeRepository;
 
   // TODO: Temporary typedef to make minimal changes. Remove this and make the presentation layer access store through a provider
@@ -26,14 +26,14 @@ class StoreService {
 
   // TODO: Replace the implementation with the one from create after removing the typedef
   static Future<StoreService> init({
-    required IsarStoreRepository storeRepository,
+    required IStoreRepository storeRepository,
   }) async {
     _instance ??= await create(storeRepository: storeRepository);
     return _instance!;
   }
 
   static Future<StoreService> create({
-    required IsarStoreRepository storeRepository,
+    required IStoreRepository storeRepository,
   }) async {
     final instance = StoreService._(storeRepository: storeRepository);
     await instance._populateCache();

mobile/lib/domain/services/sync_stream.service.dart

@@ -76,11 +76,76 @@ class SyncStreamService {
       case SyncEntityType.assetExifV1:
         return _syncStreamRepository.updateAssetsExifV1(data.cast());
       case SyncEntityType.partnerAssetV1:
-        return _syncStreamRepository.updatePartnerAssetsV1(data.cast());
+        return _syncStreamRepository.updateAssetsV1(
+          data.cast(),
+          debugLabel: 'partner',
+        );
+      case SyncEntityType.partnerAssetBackfillV1:
+        return _syncStreamRepository.updateAssetsV1(
+          data.cast(),
+          debugLabel: 'partner backfill',
+        );
       case SyncEntityType.partnerAssetDeleteV1:
-        return _syncStreamRepository.deletePartnerAssetsV1(data.cast());
+        return _syncStreamRepository.deleteAssetsV1(
+          data.cast(),
+          debugLabel: "partner",
+        );
       case SyncEntityType.partnerAssetExifV1:
-        return _syncStreamRepository.updatePartnerAssetsExifV1(data.cast());
+        return _syncStreamRepository.updateAssetsExifV1(
+          data.cast(),
+          debugLabel: 'partner',
+        );
+      case SyncEntityType.partnerAssetExifBackfillV1:
+        return _syncStreamRepository.updateAssetsExifV1(
+          data.cast(),
+          debugLabel: 'partner backfill',
+        );
+      case SyncEntityType.albumV1:
+        return _syncStreamRepository.updateAlbumsV1(data.cast());
+      case SyncEntityType.albumDeleteV1:
+        return _syncStreamRepository.deleteAlbumsV1(data.cast());
+      case SyncEntityType.albumUserV1:
+        return _syncStreamRepository.updateAlbumUsersV1(data.cast());
+      case SyncEntityType.albumUserBackfillV1:
+        return _syncStreamRepository.updateAlbumUsersV1(
+          data.cast(),
+          debugLabel: 'backfill',
+        );
+      case SyncEntityType.albumUserDeleteV1:
+        return _syncStreamRepository.deleteAlbumUsersV1(data.cast());
+      case SyncEntityType.albumAssetV1:
+        return _syncStreamRepository.updateAssetsV1(
+          data.cast(),
+          debugLabel: 'album',
+        );
+      case SyncEntityType.albumAssetBackfillV1:
+        return _syncStreamRepository.updateAssetsV1(
+          data.cast(),
+          debugLabel: 'album backfill',
+        );
+      case SyncEntityType.albumAssetExifV1:
+        return _syncStreamRepository.updateAssetsExifV1(
+          data.cast(),
+          debugLabel: 'album',
+        );
+      case SyncEntityType.albumAssetExifBackfillV1:
+        return _syncStreamRepository.updateAssetsExifV1(
+          data.cast(),
+          debugLabel: 'album backfill',
+        );
+      case SyncEntityType.albumToAssetV1:
+        return _syncStreamRepository.updateAlbumToAssetsV1(data.cast());
+      case SyncEntityType.albumToAssetBackfillV1:
+        return _syncStreamRepository.updateAlbumToAssetsV1(
+          data.cast(),
+          debugLabel: 'backfill',
+        );
+      case SyncEntityType.albumToAssetDeleteV1:
+        return _syncStreamRepository.deleteAlbumToAssetsV1(data.cast());
+      // No-op. SyncAckV1 entities are checkpoints in the sync stream
+      // to acknowledge that the client has processed all the backfill events
+      case SyncEntityType.syncAckV1:
+        return;
       default:
         _logger.warning("Unknown sync data type: $type");
     }

mobile/lib/domain/services/timeline.service.dart

@@ -45,6 +45,13 @@ class TimelineFactory {
         bucketSource: () =>
             _timelineRepository.watchLocalBucket(albumId, groupBy: groupBy),
       );
+
+  TimelineService remoteAlbum({required String albumId}) => TimelineService(
+        assetSource: (offset, count) => _timelineRepository
+            .getRemoteBucketAssets(albumId, offset: offset, count: count),
+        bucketSource: () =>
+            _timelineRepository.watchRemoteBucket(albumId, groupBy: groupBy),
+      );
 }
 
 class TimelineService {

mobile/lib/entities/asset.entity.dart

@@ -554,18 +554,12 @@ class Asset {
 }""";
   }
 
-  static getVisibility(AssetVisibility visibility) {
+  static getVisibility(AssetVisibility visibility) => switch (visibility) {
-    switch (visibility) {
+        AssetVisibility.archive => AssetVisibilityEnum.archive,
-      case AssetVisibility.timeline:
+        AssetVisibility.hidden => AssetVisibilityEnum.hidden,
-        return AssetVisibilityEnum.timeline;
+        AssetVisibility.locked => AssetVisibilityEnum.locked,
-      case AssetVisibility.archive:
+        AssetVisibility.timeline || _ => AssetVisibilityEnum.timeline,
-        return AssetVisibilityEnum.archive;
+      };
-      case AssetVisibility.hidden:
-        return AssetVisibilityEnum.hidden;
-      case AssetVisibility.locked:
-        return AssetVisibilityEnum.locked;
-    }
-  }
 }
 
 enum AssetType {

mobile/lib/entities/store.entity.dart

@@ -11,7 +11,7 @@ class SSLClientCertStoreVal {
   final Uint8List data;
   final String? password;
 
-  SSLClientCertStoreVal(this.data, this.password);
+  const SSLClientCertStoreVal(this.data, this.password);
 
   void save() {
     final b64Str = base64Encode(data);

mobile/lib/infrastructure/entities/isar_store.entity.dart

@@ -0,0 +1,13 @@
+import 'package:isar/isar.dart';
+
+part 'isar_store.entity.g.dart';
+
+/// Internal class for `Store`, do not use elsewhere.
+@Collection(inheritance: false)
+class StoreValue {
+  final Id id;
+  final int? intValue;
+  final String? strValue;
+
+  const StoreValue(this.id, {this.intValue, this.strValue});
+}

mobile/lib/infrastructure/entities/isar_store.entity.g.dart

@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'store.entity.dart';
+part of 'isar_store.entity.dart';
 
 // **************************************************************************
 // IsarCollectionGenerator

mobile/lib/infrastructure/entities/local_album.entity.dart

@@ -1,5 +1,5 @@
 import 'package:drift/drift.dart';
-import 'package:immich_mobile/domain/models/local_album.model.dart';
+import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
 
 class LocalAlbumEntity extends Table with DriftDefaultsMixin {

mobile/lib/infrastructure/entities/local_album.entity.drift.dart

@@ -3,7 +3,7 @@
 import 'package:drift/drift.dart' as i0;
 import 'package:immich_mobile/infrastructure/entities/local_album.entity.drift.dart'
     as i1;
-import 'package:immich_mobile/domain/models/local_album.model.dart' as i2;
+import 'package:immich_mobile/domain/models/album/local_album.model.dart' as i2;
 import 'package:immich_mobile/infrastructure/entities/local_album.entity.dart'
     as i3;
 import 'package:drift/src/runtime/query_builder/query_builder.dart' as i4;

mobile/lib/infrastructure/entities/log.entity.dart

@@ -1,5 +1,7 @@
 import 'package:immich_mobile/domain/models/log.model.dart';
+import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
 import 'package:isar/isar.dart';
+import 'package:drift/drift.dart';
 
 part 'log.entity.g.dart';
 
@@ -45,3 +47,21 @@ class LoggerMessage {
     );
   }
 }
+
+class LoggerMessageEntity extends Table with DriftDefaultsMixin {
+  const LoggerMessageEntity();
+
+  IntColumn get id => integer().autoIncrement()();
+
+  TextColumn get message => text()();
+
+  TextColumn get details => text().nullable()();
+
+  IntColumn get level => intEnum<LogLevel>()();
+
+  DateTimeColumn get createdAt => dateTime()();
+
+  TextColumn get context1 => text().nullable()();
+
+  TextColumn get context2 => text().nullable()();
+}

mobile/lib/infrastructure/entities/log.entity.drift.dart

@@ -0,0 +1,589 @@
+// dart format width=80
+// ignore_for_file: type=lint
+import 'package:drift/drift.dart' as i0;
+import 'package:immich_mobile/infrastructure/entities/log.entity.drift.dart'
+    as i1;
+import 'package:immich_mobile/domain/models/log.model.dart' as i2;
+import 'package:immich_mobile/infrastructure/entities/log.entity.dart' as i3;
+
+typedef $$LoggerMessageEntityTableCreateCompanionBuilder
+    = i1.LoggerMessageEntityCompanion Function({
+  required int id,
+  required String message,
+  i0.Value<String?> details,
+  required i2.LogLevel level,
+  required DateTime createdAt,
+  i0.Value<String?> context1,
+  i0.Value<String?> context2,
+});
+typedef $$LoggerMessageEntityTableUpdateCompanionBuilder
+    = i1.LoggerMessageEntityCompanion Function({
+  i0.Value<int> id,
+  i0.Value<String> message,
+  i0.Value<String?> details,
+  i0.Value<i2.LogLevel> level,
+  i0.Value<DateTime> createdAt,
+  i0.Value<String?> context1,
+  i0.Value<String?> context2,
+});
+
+class $$LoggerMessageEntityTableFilterComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$LoggerMessageEntityTable> {
+  $$LoggerMessageEntityTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnFilters<int> get id => $composableBuilder(
+      column: $table.id, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<String> get message => $composableBuilder(
+      column: $table.message, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<String> get details => $composableBuilder(
+      column: $table.details, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnWithTypeConverterFilters<i2.LogLevel, i2.LogLevel, int> get level =>
+      $composableBuilder(
+          column: $table.level,
+          builder: (column) => i0.ColumnWithTypeConverterFilters(column));
+
+  i0.ColumnFilters<DateTime> get createdAt => $composableBuilder(
+      column: $table.createdAt, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<String> get context1 => $composableBuilder(
+      column: $table.context1, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<String> get context2 => $composableBuilder(
+      column: $table.context2, builder: (column) => i0.ColumnFilters(column));
+}
+
+class $$LoggerMessageEntityTableOrderingComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$LoggerMessageEntityTable> {
+  $$LoggerMessageEntityTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnOrderings<int> get id => $composableBuilder(
+      column: $table.id, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<String> get message => $composableBuilder(
+      column: $table.message, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<String> get details => $composableBuilder(
+      column: $table.details, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<int> get level => $composableBuilder(
+      column: $table.level, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<DateTime> get createdAt => $composableBuilder(
+      column: $table.createdAt,
+      builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<String> get context1 => $composableBuilder(
+      column: $table.context1, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<String> get context2 => $composableBuilder(
+      column: $table.context2, builder: (column) => i0.ColumnOrderings(column));
+}
+
+class $$LoggerMessageEntityTableAnnotationComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$LoggerMessageEntityTable> {
+  $$LoggerMessageEntityTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.GeneratedColumn<int> get id =>
+      $composableBuilder(column: $table.id, builder: (column) => column);
+
+  i0.GeneratedColumn<String> get message =>
+      $composableBuilder(column: $table.message, builder: (column) => column);
+
+  i0.GeneratedColumn<String> get details =>
+      $composableBuilder(column: $table.details, builder: (column) => column);
+
+  i0.GeneratedColumnWithTypeConverter<i2.LogLevel, int> get level =>
+      $composableBuilder(column: $table.level, builder: (column) => column);
+
+  i0.GeneratedColumn<DateTime> get createdAt =>
+      $composableBuilder(column: $table.createdAt, builder: (column) => column);
+
+  i0.GeneratedColumn<String> get context1 =>
+      $composableBuilder(column: $table.context1, builder: (column) => column);
+
+  i0.GeneratedColumn<String> get context2 =>
+      $composableBuilder(column: $table.context2, builder: (column) => column);
+}
+
+class $$LoggerMessageEntityTableTableManager extends i0.RootTableManager<
+    i0.GeneratedDatabase,
+    i1.$LoggerMessageEntityTable,
+    i1.LoggerMessageEntityData,
+    i1.$$LoggerMessageEntityTableFilterComposer,
+    i1.$$LoggerMessageEntityTableOrderingComposer,
+    i1.$$LoggerMessageEntityTableAnnotationComposer,
+    $$LoggerMessageEntityTableCreateCompanionBuilder,
+    $$LoggerMessageEntityTableUpdateCompanionBuilder,
+    (
+      i1.LoggerMessageEntityData,
+      i0.BaseReferences<i0.GeneratedDatabase, i1.$LoggerMessageEntityTable,
+          i1.LoggerMessageEntityData>
+    ),
+    i1.LoggerMessageEntityData,
+    i0.PrefetchHooks Function()> {
+  $$LoggerMessageEntityTableTableManager(
+      i0.GeneratedDatabase db, i1.$LoggerMessageEntityTable table)
+      : super(i0.TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () => i1
+              .$$LoggerMessageEntityTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () =>
+              i1.$$LoggerMessageEntityTableOrderingComposer(
+                  $db: db, $table: table),
+          createComputedFieldComposer: () =>
+              i1.$$LoggerMessageEntityTableAnnotationComposer(
+                  $db: db, $table: table),
+          updateCompanionCallback: ({
+            i0.Value<int> id = const i0.Value.absent(),
+            i0.Value<String> message = const i0.Value.absent(),
+            i0.Value<String?> details = const i0.Value.absent(),
+            i0.Value<i2.LogLevel> level = const i0.Value.absent(),
+            i0.Value<DateTime> createdAt = const i0.Value.absent(),
+            i0.Value<String?> context1 = const i0.Value.absent(),
+            i0.Value<String?> context2 = const i0.Value.absent(),
+          }) =>
+              i1.LoggerMessageEntityCompanion(
+            id: id,
+            message: message,
+            details: details,
+            level: level,
+            createdAt: createdAt,
+            context1: context1,
+            context2: context2,
+          ),
+          createCompanionCallback: ({
+            required int id,
+            required String message,
+            i0.Value<String?> details = const i0.Value.absent(),
+            required i2.LogLevel level,
+            required DateTime createdAt,
+            i0.Value<String?> context1 = const i0.Value.absent(),
+            i0.Value<String?> context2 = const i0.Value.absent(),
+          }) =>
+              i1.LoggerMessageEntityCompanion.insert(
+            id: id,
+            message: message,
+            details: details,
+            level: level,
+            createdAt: createdAt,
+            context1: context1,
+            context2: context2,
+          ),
+          withReferenceMapper: (p0) => p0
+              .map((e) => (e.readTable(table), i0.BaseReferences(db, table, e)))
+              .toList(),
+          prefetchHooksCallback: null,
+        ));
+}
+
+typedef $$LoggerMessageEntityTableProcessedTableManager
+    = i0.ProcessedTableManager<
+        i0.GeneratedDatabase,
+        i1.$LoggerMessageEntityTable,
+        i1.LoggerMessageEntityData,
+        i1.$$LoggerMessageEntityTableFilterComposer,
+        i1.$$LoggerMessageEntityTableOrderingComposer,
+        i1.$$LoggerMessageEntityTableAnnotationComposer,
+        $$LoggerMessageEntityTableCreateCompanionBuilder,
+        $$LoggerMessageEntityTableUpdateCompanionBuilder,
+        (
+          i1.LoggerMessageEntityData,
+          i0.BaseReferences<i0.GeneratedDatabase, i1.$LoggerMessageEntityTable,
+              i1.LoggerMessageEntityData>
+        ),
+        i1.LoggerMessageEntityData,
+        i0.PrefetchHooks Function()>;
+
+class $LoggerMessageEntityTable extends i3.LoggerMessageEntity
+    with i0.TableInfo<$LoggerMessageEntityTable, i1.LoggerMessageEntityData> {
+  @override
+  final i0.GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $LoggerMessageEntityTable(this.attachedDatabase, [this._alias]);
+  static const i0.VerificationMeta _idMeta = const i0.VerificationMeta('id');
+  @override
+  late final i0.GeneratedColumn<int> id = i0.GeneratedColumn<int>(
+      'id', aliasedName, false,
+      hasAutoIncrement: true,
+      type: i0.DriftSqlType.int,
+      requiredDuringInsert: true,
+      defaultConstraints:
+          i0.GeneratedColumn.constraintIsAlways('PRIMARY KEY AUTOINCREMENT'));
+  static const i0.VerificationMeta _messageMeta =
+      const i0.VerificationMeta('message');
+  @override
+  late final i0.GeneratedColumn<String> message = i0.GeneratedColumn<String>(
+      'message', aliasedName, false,
+      type: i0.DriftSqlType.string, requiredDuringInsert: true);
+  static const i0.VerificationMeta _detailsMeta =
+      const i0.VerificationMeta('details');
+  @override
+  late final i0.GeneratedColumn<String> details = i0.GeneratedColumn<String>(
+      'details', aliasedName, true,
+      type: i0.DriftSqlType.string, requiredDuringInsert: false);
+  @override
+  late final i0.GeneratedColumnWithTypeConverter<i2.LogLevel, int> level =
+      i0.GeneratedColumn<int>('level', aliasedName, false,
+              type: i0.DriftSqlType.int, requiredDuringInsert: true)
+          .withConverter<i2.LogLevel>(
+              i1.$LoggerMessageEntityTable.$converterlevel);
+  static const i0.VerificationMeta _createdAtMeta =
+      const i0.VerificationMeta('createdAt');
+  @override
+  late final i0.GeneratedColumn<DateTime> createdAt =
+      i0.GeneratedColumn<DateTime>('created_at', aliasedName, false,
+          type: i0.DriftSqlType.dateTime, requiredDuringInsert: true);
+  static const i0.VerificationMeta _context1Meta =
+      const i0.VerificationMeta('context1');
+  @override
+  late final i0.GeneratedColumn<String> context1 = i0.GeneratedColumn<String>(
+      'context1', aliasedName, true,
+      type: i0.DriftSqlType.string, requiredDuringInsert: false);
+  static const i0.VerificationMeta _context2Meta =
+      const i0.VerificationMeta('context2');
+  @override
+  late final i0.GeneratedColumn<String> context2 = i0.GeneratedColumn<String>(
+      'context2', aliasedName, true,
+      type: i0.DriftSqlType.string, requiredDuringInsert: false);
+  @override
+  List<i0.GeneratedColumn> get $columns =>
+      [id, message, details, level, createdAt, context1, context2];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'logger_message_entity';
+  @override
+  i0.VerificationContext validateIntegrity(
+      i0.Insertable<i1.LoggerMessageEntityData> instance,
+      {bool isInserting = false}) {
+    final context = i0.VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('id')) {
+      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta));
+    } else if (isInserting) {
+      context.missing(_idMeta);
+    }
+    if (data.containsKey('message')) {
+      context.handle(_messageMeta,
+          message.isAcceptableOrUnknown(data['message']!, _messageMeta));
+    } else if (isInserting) {
+      context.missing(_messageMeta);
+    }
+    if (data.containsKey('details')) {
+      context.handle(_detailsMeta,
+          details.isAcceptableOrUnknown(data['details']!, _detailsMeta));
+    }
+    if (data.containsKey('created_at')) {
+      context.handle(_createdAtMeta,
+          createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta));
+    } else if (isInserting) {
+      context.missing(_createdAtMeta);
+    }
+    if (data.containsKey('context1')) {
+      context.handle(_context1Meta,
+          context1.isAcceptableOrUnknown(data['context1']!, _context1Meta));
+    }
+    if (data.containsKey('context2')) {
+      context.handle(_context2Meta,
+          context2.isAcceptableOrUnknown(data['context2']!, _context2Meta));
+    }
+    return context;
+  }
+
+  @override
+  Set<i0.GeneratedColumn> get $primaryKey => {id};
+  @override
+  i1.LoggerMessageEntityData map(Map<String, dynamic> data,
+      {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return i1.LoggerMessageEntityData(
+      id: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.int, data['${effectivePrefix}id'])!,
+      message: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}message'])!,
+      details: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}details']),
+      level: i1.$LoggerMessageEntityTable.$converterlevel.fromSql(
+          attachedDatabase.typeMapping
+              .read(i0.DriftSqlType.int, data['${effectivePrefix}level'])!),
+      createdAt: attachedDatabase.typeMapping.read(
+          i0.DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!,
+      context1: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}context1']),
+      context2: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}context2']),
+    );
+  }
+
+  @override
+  $LoggerMessageEntityTable createAlias(String alias) {
+    return $LoggerMessageEntityTable(attachedDatabase, alias);
+  }
+
+  static i0.JsonTypeConverter2<i2.LogLevel, int, int> $converterlevel =
+      const i0.EnumIndexConverter<i2.LogLevel>(i2.LogLevel.values);
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class LoggerMessageEntityData extends i0.DataClass
+    implements i0.Insertable<i1.LoggerMessageEntityData> {
+  final int id;
+  final String message;
+  final String? details;
+  final i2.LogLevel level;
+  final DateTime createdAt;
+  final String? context1;
+  final String? context2;
+  const LoggerMessageEntityData(
+      {required this.id,
+      required this.message,
+      this.details,
+      required this.level,
+      required this.createdAt,
+      this.context1,
+      this.context2});
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    map['id'] = i0.Variable<int>(id);
+    map['message'] = i0.Variable<String>(message);
+    if (!nullToAbsent || details != null) {
+      map['details'] = i0.Variable<String>(details);
+    }
+    {
+      map['level'] = i0.Variable<int>(
+          i1.$LoggerMessageEntityTable.$converterlevel.toSql(level));
+    }
+    map['created_at'] = i0.Variable<DateTime>(createdAt);
+    if (!nullToAbsent || context1 != null) {
+      map['context1'] = i0.Variable<String>(context1);
+    }
+    if (!nullToAbsent || context2 != null) {
+      map['context2'] = i0.Variable<String>(context2);
+    }
+    return map;
+  }
+
+  factory LoggerMessageEntityData.fromJson(Map<String, dynamic> json,
+      {i0.ValueSerializer? serializer}) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return LoggerMessageEntityData(
+      id: serializer.fromJson<int>(json['id']),
+      message: serializer.fromJson<String>(json['message']),
+      details: serializer.fromJson<String?>(json['details']),
+      level: i1.$LoggerMessageEntityTable.$converterlevel
+          .fromJson(serializer.fromJson<int>(json['level'])),
+      createdAt: serializer.fromJson<DateTime>(json['createdAt']),
+      context1: serializer.fromJson<String?>(json['context1']),
+      context2: serializer.fromJson<String?>(json['context2']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({i0.ValueSerializer? serializer}) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'id': serializer.toJson<int>(id),
+      'message': serializer.toJson<String>(message),
+      'details': serializer.toJson<String?>(details),
+      'level': serializer.toJson<int>(
+          i1.$LoggerMessageEntityTable.$converterlevel.toJson(level)),
+      'createdAt': serializer.toJson<DateTime>(createdAt),
+      'context1': serializer.toJson<String?>(context1),
+      'context2': serializer.toJson<String?>(context2),
+    };
+  }
+
+  i1.LoggerMessageEntityData copyWith(
+          {int? id,
+          String? message,
+          i0.Value<String?> details = const i0.Value.absent(),
+          i2.LogLevel? level,
+          DateTime? createdAt,
+          i0.Value<String?> context1 = const i0.Value.absent(),
+          i0.Value<String?> context2 = const i0.Value.absent()}) =>
+      i1.LoggerMessageEntityData(
+        id: id ?? this.id,
+        message: message ?? this.message,
+        details: details.present ? details.value : this.details,
+        level: level ?? this.level,
+        createdAt: createdAt ?? this.createdAt,
+        context1: context1.present ? context1.value : this.context1,
+        context2: context2.present ? context2.value : this.context2,
+      );
+  LoggerMessageEntityData copyWithCompanion(
+      i1.LoggerMessageEntityCompanion data) {
+    return LoggerMessageEntityData(
+      id: data.id.present ? data.id.value : this.id,
+      message: data.message.present ? data.message.value : this.message,
+      details: data.details.present ? data.details.value : this.details,
+      level: data.level.present ? data.level.value : this.level,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+      context1: data.context1.present ? data.context1.value : this.context1,
+      context2: data.context2.present ? data.context2.value : this.context2,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('LoggerMessageEntityData(')
+          ..write('id: $id, ')
+          ..write('message: $message, ')
+          ..write('details: $details, ')
+          ..write('level: $level, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('context1: $context1, ')
+          ..write('context2: $context2')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(id, message, details, level, createdAt, context1, context2);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is i1.LoggerMessageEntityData &&
+          other.id == this.id &&
+          other.message == this.message &&
+          other.details == this.details &&
+          other.level == this.level &&
+          other.createdAt == this.createdAt &&
+          other.context1 == this.context1 &&
+          other.context2 == this.context2);
+}
+
+class LoggerMessageEntityCompanion
+    extends i0.UpdateCompanion<i1.LoggerMessageEntityData> {
+  final i0.Value<int> id;
+  final i0.Value<String> message;
+  final i0.Value<String?> details;
+  final i0.Value<i2.LogLevel> level;
+  final i0.Value<DateTime> createdAt;
+  final i0.Value<String?> context1;
+  final i0.Value<String?> context2;
+  const LoggerMessageEntityCompanion({
+    this.id = const i0.Value.absent(),
+    this.message = const i0.Value.absent(),
+    this.details = const i0.Value.absent(),
+    this.level = const i0.Value.absent(),
+    this.createdAt = const i0.Value.absent(),
+    this.context1 = const i0.Value.absent(),
+    this.context2 = const i0.Value.absent(),
+  });
+  LoggerMessageEntityCompanion.insert({
+    required int id,
+    required String message,
+    this.details = const i0.Value.absent(),
+    required i2.LogLevel level,
+    required DateTime createdAt,
+    this.context1 = const i0.Value.absent(),
+    this.context2 = const i0.Value.absent(),
+  })  : id = i0.Value(id),
+        message = i0.Value(message),
+        level = i0.Value(level),
+        createdAt = i0.Value(createdAt);
+  static i0.Insertable<i1.LoggerMessageEntityData> custom({
+    i0.Expression<int>? id,
+    i0.Expression<String>? message,
+    i0.Expression<String>? details,
+    i0.Expression<int>? level,
+    i0.Expression<DateTime>? createdAt,
+    i0.Expression<String>? context1,
+    i0.Expression<String>? context2,
+  }) {
+    return i0.RawValuesInsertable({
+      if (id != null) 'id': id,
+      if (message != null) 'message': message,
+      if (details != null) 'details': details,
+      if (level != null) 'level': level,
+      if (createdAt != null) 'created_at': createdAt,
+      if (context1 != null) 'context1': context1,
+      if (context2 != null) 'context2': context2,
+    });
+  }
+
+  i1.LoggerMessageEntityCompanion copyWith(
+      {i0.Value<int>? id,
+      i0.Value<String>? message,
+      i0.Value<String?>? details,
+      i0.Value<i2.LogLevel>? level,
+      i0.Value<DateTime>? createdAt,
+      i0.Value<String?>? context1,
+      i0.Value<String?>? context2}) {
+    return i1.LoggerMessageEntityCompanion(
+      id: id ?? this.id,
+      message: message ?? this.message,
+      details: details ?? this.details,
+      level: level ?? this.level,
+      createdAt: createdAt ?? this.createdAt,
+      context1: context1 ?? this.context1,
+      context2: context2 ?? this.context2,
+    );
+  }
+
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    if (id.present) {
+      map['id'] = i0.Variable<int>(id.value);
+    }
+    if (message.present) {
+      map['message'] = i0.Variable<String>(message.value);
+    }
+    if (details.present) {
+      map['details'] = i0.Variable<String>(details.value);
+    }
+    if (level.present) {
+      map['level'] = i0.Variable<int>(
+          i1.$LoggerMessageEntityTable.$converterlevel.toSql(level.value));
+    }
+    if (createdAt.present) {
+      map['created_at'] = i0.Variable<DateTime>(createdAt.value);
+    }
+    if (context1.present) {
+      map['context1'] = i0.Variable<String>(context1.value);
+    }
+    if (context2.present) {
+      map['context2'] = i0.Variable<String>(context2.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('LoggerMessageEntityCompanion(')
+          ..write('id: $id, ')
+          ..write('message: $message, ')
+          ..write('details: $details, ')
+          ..write('level: $level, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('context1: $context1, ')
+          ..write('context2: $context2')
+          ..write(')'))
+        .toString();
+  }
+}

mobile/lib/infrastructure/entities/remote_album.entity.dart

@@ -0,0 +1,34 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/domain/models/album/album.model.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
+import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
+
+class RemoteAlbumEntity extends Table with DriftDefaultsMixin {
+  const RemoteAlbumEntity();
+
+  TextColumn get id => text()();
+
+  TextColumn get name => text()();
+
+  TextColumn get description => text().withDefault(const Constant(''))();
+
+  DateTimeColumn get createdAt => dateTime().withDefault(currentDateAndTime)();
+
+  DateTimeColumn get updatedAt => dateTime().withDefault(currentDateAndTime)();
+
+  TextColumn get ownerId =>
+      text().references(UserEntity, #id, onDelete: KeyAction.cascade)();
+
+  TextColumn get thumbnailAssetId => text()
+      .references(RemoteAssetEntity, #id, onDelete: KeyAction.setNull)
+      .nullable()();
+
+  BoolColumn get isActivityEnabled =>
+      boolean().withDefault(const Constant(true))();
+
+  IntColumn get order => intEnum<AlbumAssetOrder>()();
+
+  @override
+  Set<Column> get primaryKey => {id};
+}

mobile/lib/infrastructure/entities/remote_album.entity.drift.dart

@@ -0,0 +1,946 @@
+// dart format width=80
+// ignore_for_file: type=lint
+import 'package:drift/drift.dart' as i0;
+import 'package:immich_mobile/infrastructure/entities/remote_album.entity.drift.dart'
+    as i1;
+import 'package:immich_mobile/domain/models/album/album.model.dart' as i2;
+import 'package:immich_mobile/infrastructure/entities/remote_album.entity.dart'
+    as i3;
+import 'package:drift/src/runtime/query_builder/query_builder.dart' as i4;
+import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart'
+    as i5;
+import 'package:drift/internal/modular.dart' as i6;
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart'
+    as i7;
+
+typedef $$RemoteAlbumEntityTableCreateCompanionBuilder
+    = i1.RemoteAlbumEntityCompanion Function({
+  required String id,
+  required String name,
+  i0.Value<String> description,
+  i0.Value<DateTime> createdAt,
+  i0.Value<DateTime> updatedAt,
+  required String ownerId,
+  i0.Value<String?> thumbnailAssetId,
+  i0.Value<bool> isActivityEnabled,
+  required i2.AlbumAssetOrder order,
+});
+typedef $$RemoteAlbumEntityTableUpdateCompanionBuilder
+    = i1.RemoteAlbumEntityCompanion Function({
+  i0.Value<String> id,
+  i0.Value<String> name,
+  i0.Value<String> description,
+  i0.Value<DateTime> createdAt,
+  i0.Value<DateTime> updatedAt,
+  i0.Value<String> ownerId,
+  i0.Value<String?> thumbnailAssetId,
+  i0.Value<bool> isActivityEnabled,
+  i0.Value<i2.AlbumAssetOrder> order,
+});
+
+final class $$RemoteAlbumEntityTableReferences extends i0.BaseReferences<
+    i0.GeneratedDatabase,
+    i1.$RemoteAlbumEntityTable,
+    i1.RemoteAlbumEntityData> {
+  $$RemoteAlbumEntityTableReferences(
+      super.$_db, super.$_table, super.$_typedResult);
+
+  static i5.$UserEntityTable _ownerIdTable(i0.GeneratedDatabase db) =>
+      i6.ReadDatabaseContainer(db)
+          .resultSet<i5.$UserEntityTable>('user_entity')
+          .createAlias(i0.$_aliasNameGenerator(
+              i6.ReadDatabaseContainer(db)
+                  .resultSet<i1.$RemoteAlbumEntityTable>('remote_album_entity')
+                  .ownerId,
+              i6.ReadDatabaseContainer(db)
+                  .resultSet<i5.$UserEntityTable>('user_entity')
+                  .id));
+
+  i5.$$UserEntityTableProcessedTableManager get ownerId {
+    final $_column = $_itemColumn<String>('owner_id')!;
+
+    final manager = i5
+        .$$UserEntityTableTableManager(
+            $_db,
+            i6.ReadDatabaseContainer($_db)
+                .resultSet<i5.$UserEntityTable>('user_entity'))
+        .filter((f) => f.id.sqlEquals($_column));
+    final item = $_typedResult.readTableOrNull(_ownerIdTable($_db));
+    if (item == null) return manager;
+    return i0.ProcessedTableManager(
+        manager.$state.copyWith(prefetchedData: [item]));
+  }
+
+  static i7.$RemoteAssetEntityTable _thumbnailAssetIdTable(
+          i0.GeneratedDatabase db) =>
+      i6.ReadDatabaseContainer(db)
+          .resultSet<i7.$RemoteAssetEntityTable>('remote_asset_entity')
+          .createAlias(i0.$_aliasNameGenerator(
+              i6.ReadDatabaseContainer(db)
+                  .resultSet<i1.$RemoteAlbumEntityTable>('remote_album_entity')
+                  .thumbnailAssetId,
+              i6.ReadDatabaseContainer(db)
+                  .resultSet<i7.$RemoteAssetEntityTable>('remote_asset_entity')
+                  .id));
+
+  i7.$$RemoteAssetEntityTableProcessedTableManager? get thumbnailAssetId {
+    final $_column = $_itemColumn<String>('thumbnail_asset_id');
+    if ($_column == null) return null;
+    final manager = i7
+        .$$RemoteAssetEntityTableTableManager(
+            $_db,
+            i6.ReadDatabaseContainer($_db)
+                .resultSet<i7.$RemoteAssetEntityTable>('remote_asset_entity'))
+        .filter((f) => f.id.sqlEquals($_column));
+    final item = $_typedResult.readTableOrNull(_thumbnailAssetIdTable($_db));
+    if (item == null) return manager;
+    return i0.ProcessedTableManager(
+        manager.$state.copyWith(prefetchedData: [item]));
+  }
+}
+
+class $$RemoteAlbumEntityTableFilterComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$RemoteAlbumEntityTable> {
+  $$RemoteAlbumEntityTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnFilters<String> get id => $composableBuilder(
+      column: $table.id, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<String> get name => $composableBuilder(
+      column: $table.name, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<String> get description => $composableBuilder(
+      column: $table.description,
+      builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<DateTime> get createdAt => $composableBuilder(
+      column: $table.createdAt, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<DateTime> get updatedAt => $composableBuilder(
+      column: $table.updatedAt, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<bool> get isActivityEnabled => $composableBuilder(
+      column: $table.isActivityEnabled,
+      builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnWithTypeConverterFilters<i2.AlbumAssetOrder, i2.AlbumAssetOrder, int>
+      get order => $composableBuilder(
+          column: $table.order,
+          builder: (column) => i0.ColumnWithTypeConverterFilters(column));
+
+  i5.$$UserEntityTableFilterComposer get ownerId {
+    final i5.$$UserEntityTableFilterComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.ownerId,
+        referencedTable: i6.ReadDatabaseContainer($db)
+            .resultSet<i5.$UserEntityTable>('user_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i5.$$UserEntityTableFilterComposer(
+              $db: $db,
+              $table: i6.ReadDatabaseContainer($db)
+                  .resultSet<i5.$UserEntityTable>('user_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+
+  i7.$$RemoteAssetEntityTableFilterComposer get thumbnailAssetId {
+    final i7.$$RemoteAssetEntityTableFilterComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.thumbnailAssetId,
+        referencedTable: i6.ReadDatabaseContainer($db)
+            .resultSet<i7.$RemoteAssetEntityTable>('remote_asset_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i7.$$RemoteAssetEntityTableFilterComposer(
+              $db: $db,
+              $table: i6.ReadDatabaseContainer($db)
+                  .resultSet<i7.$RemoteAssetEntityTable>('remote_asset_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+}
+
+class $$RemoteAlbumEntityTableOrderingComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$RemoteAlbumEntityTable> {
+  $$RemoteAlbumEntityTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnOrderings<String> get id => $composableBuilder(
+      column: $table.id, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<String> get name => $composableBuilder(
+      column: $table.name, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<String> get description => $composableBuilder(
+      column: $table.description,
+      builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<DateTime> get createdAt => $composableBuilder(
+      column: $table.createdAt,
+      builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<DateTime> get updatedAt => $composableBuilder(
+      column: $table.updatedAt,
+      builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<bool> get isActivityEnabled => $composableBuilder(
+      column: $table.isActivityEnabled,
+      builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<int> get order => $composableBuilder(
+      column: $table.order, builder: (column) => i0.ColumnOrderings(column));
+
+  i5.$$UserEntityTableOrderingComposer get ownerId {
+    final i5.$$UserEntityTableOrderingComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.ownerId,
+        referencedTable: i6.ReadDatabaseContainer($db)
+            .resultSet<i5.$UserEntityTable>('user_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i5.$$UserEntityTableOrderingComposer(
+              $db: $db,
+              $table: i6.ReadDatabaseContainer($db)
+                  .resultSet<i5.$UserEntityTable>('user_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+
+  i7.$$RemoteAssetEntityTableOrderingComposer get thumbnailAssetId {
+    final i7.$$RemoteAssetEntityTableOrderingComposer composer =
+        $composerBuilder(
+            composer: this,
+            getCurrentColumn: (t) => t.thumbnailAssetId,
+            referencedTable: i6.ReadDatabaseContainer($db)
+                .resultSet<i7.$RemoteAssetEntityTable>('remote_asset_entity'),
+            getReferencedColumn: (t) => t.id,
+            builder: (joinBuilder,
+                    {$addJoinBuilderToRootComposer,
+                    $removeJoinBuilderFromRootComposer}) =>
+                i7.$$RemoteAssetEntityTableOrderingComposer(
+                  $db: $db,
+                  $table: i6.ReadDatabaseContainer($db)
+                      .resultSet<i7.$RemoteAssetEntityTable>(
+                          'remote_asset_entity'),
+                  $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                  joinBuilder: joinBuilder,
+                  $removeJoinBuilderFromRootComposer:
+                      $removeJoinBuilderFromRootComposer,
+                ));
+    return composer;
+  }
+}
+
+class $$RemoteAlbumEntityTableAnnotationComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$RemoteAlbumEntityTable> {
+  $$RemoteAlbumEntityTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.GeneratedColumn<String> get id =>
+      $composableBuilder(column: $table.id, builder: (column) => column);
+
+  i0.GeneratedColumn<String> get name =>
+      $composableBuilder(column: $table.name, builder: (column) => column);
+
+  i0.GeneratedColumn<String> get description => $composableBuilder(
+      column: $table.description, builder: (column) => column);
+
+  i0.GeneratedColumn<DateTime> get createdAt =>
+      $composableBuilder(column: $table.createdAt, builder: (column) => column);
+
+  i0.GeneratedColumn<DateTime> get updatedAt =>
+      $composableBuilder(column: $table.updatedAt, builder: (column) => column);
+
+  i0.GeneratedColumn<bool> get isActivityEnabled => $composableBuilder(
+      column: $table.isActivityEnabled, builder: (column) => column);
+
+  i0.GeneratedColumnWithTypeConverter<i2.AlbumAssetOrder, int> get order =>
+      $composableBuilder(column: $table.order, builder: (column) => column);
+
+  i5.$$UserEntityTableAnnotationComposer get ownerId {
+    final i5.$$UserEntityTableAnnotationComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.ownerId,
+        referencedTable: i6.ReadDatabaseContainer($db)
+            .resultSet<i5.$UserEntityTable>('user_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i5.$$UserEntityTableAnnotationComposer(
+              $db: $db,
+              $table: i6.ReadDatabaseContainer($db)
+                  .resultSet<i5.$UserEntityTable>('user_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+
+  i7.$$RemoteAssetEntityTableAnnotationComposer get thumbnailAssetId {
+    final i7.$$RemoteAssetEntityTableAnnotationComposer composer =
+        $composerBuilder(
+            composer: this,
+            getCurrentColumn: (t) => t.thumbnailAssetId,
+            referencedTable: i6.ReadDatabaseContainer($db)
+                .resultSet<i7.$RemoteAssetEntityTable>('remote_asset_entity'),
+            getReferencedColumn: (t) => t.id,
+            builder: (joinBuilder,
+                    {$addJoinBuilderToRootComposer,
+                    $removeJoinBuilderFromRootComposer}) =>
+                i7.$$RemoteAssetEntityTableAnnotationComposer(
+                  $db: $db,
+                  $table: i6.ReadDatabaseContainer($db)
+                      .resultSet<i7.$RemoteAssetEntityTable>(
+                          'remote_asset_entity'),
+                  $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                  joinBuilder: joinBuilder,
+                  $removeJoinBuilderFromRootComposer:
+                      $removeJoinBuilderFromRootComposer,
+                ));
+    return composer;
+  }
+}
+
+class $$RemoteAlbumEntityTableTableManager extends i0.RootTableManager<
+    i0.GeneratedDatabase,
+    i1.$RemoteAlbumEntityTable,
+    i1.RemoteAlbumEntityData,
+    i1.$$RemoteAlbumEntityTableFilterComposer,
+    i1.$$RemoteAlbumEntityTableOrderingComposer,
+    i1.$$RemoteAlbumEntityTableAnnotationComposer,
+    $$RemoteAlbumEntityTableCreateCompanionBuilder,
+    $$RemoteAlbumEntityTableUpdateCompanionBuilder,
+    (i1.RemoteAlbumEntityData, i1.$$RemoteAlbumEntityTableReferences),
+    i1.RemoteAlbumEntityData,
+    i0.PrefetchHooks Function({bool ownerId, bool thumbnailAssetId})> {
+  $$RemoteAlbumEntityTableTableManager(
+      i0.GeneratedDatabase db, i1.$RemoteAlbumEntityTable table)
+      : super(i0.TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () =>
+              i1.$$RemoteAlbumEntityTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () => i1
+              .$$RemoteAlbumEntityTableOrderingComposer($db: db, $table: table),
+          createComputedFieldComposer: () =>
+              i1.$$RemoteAlbumEntityTableAnnotationComposer(
+                  $db: db, $table: table),
+          updateCompanionCallback: ({
+            i0.Value<String> id = const i0.Value.absent(),
+            i0.Value<String> name = const i0.Value.absent(),
+            i0.Value<String> description = const i0.Value.absent(),
+            i0.Value<DateTime> createdAt = const i0.Value.absent(),
+            i0.Value<DateTime> updatedAt = const i0.Value.absent(),
+            i0.Value<String> ownerId = const i0.Value.absent(),
+            i0.Value<String?> thumbnailAssetId = const i0.Value.absent(),
+            i0.Value<bool> isActivityEnabled = const i0.Value.absent(),
+            i0.Value<i2.AlbumAssetOrder> order = const i0.Value.absent(),
+          }) =>
+              i1.RemoteAlbumEntityCompanion(
+            id: id,
+            name: name,
+            description: description,
+            createdAt: createdAt,
+            updatedAt: updatedAt,
+            ownerId: ownerId,
+            thumbnailAssetId: thumbnailAssetId,
+            isActivityEnabled: isActivityEnabled,
+            order: order,
+          ),
+          createCompanionCallback: ({
+            required String id,
+            required String name,
+            i0.Value<String> description = const i0.Value.absent(),
+            i0.Value<DateTime> createdAt = const i0.Value.absent(),
+            i0.Value<DateTime> updatedAt = const i0.Value.absent(),
+            required String ownerId,
+            i0.Value<String?> thumbnailAssetId = const i0.Value.absent(),
+            i0.Value<bool> isActivityEnabled = const i0.Value.absent(),
+            required i2.AlbumAssetOrder order,
+          }) =>
+              i1.RemoteAlbumEntityCompanion.insert(
+            id: id,
+            name: name,
+            description: description,
+            createdAt: createdAt,
+            updatedAt: updatedAt,
+            ownerId: ownerId,
+            thumbnailAssetId: thumbnailAssetId,
+            isActivityEnabled: isActivityEnabled,
+            order: order,
+          ),
+          withReferenceMapper: (p0) => p0
+              .map((e) => (
+                    e.readTable(table),
+                    i1.$$RemoteAlbumEntityTableReferences(db, table, e)
+                  ))
+              .toList(),
+          prefetchHooksCallback: ({ownerId = false, thumbnailAssetId = false}) {
+            return i0.PrefetchHooks(
+              db: db,
+              explicitlyWatchedTables: [],
+              addJoins: <
+                  T extends i0.TableManagerState<
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic>>(state) {
+                if (ownerId) {
+                  state = state.withJoin(
+                    currentTable: table,
+                    currentColumn: table.ownerId,
+                    referencedTable:
+                        i1.$$RemoteAlbumEntityTableReferences._ownerIdTable(db),
+                    referencedColumn: i1.$$RemoteAlbumEntityTableReferences
+                        ._ownerIdTable(db)
+                        .id,
+                  ) as T;
+                }
+                if (thumbnailAssetId) {
+                  state = state.withJoin(
+                    currentTable: table,
+                    currentColumn: table.thumbnailAssetId,
+                    referencedTable: i1.$$RemoteAlbumEntityTableReferences
+                        ._thumbnailAssetIdTable(db),
+                    referencedColumn: i1.$$RemoteAlbumEntityTableReferences
+                        ._thumbnailAssetIdTable(db)
+                        .id,
+                  ) as T;
+                }
+
+                return state;
+              },
+              getPrefetchedDataCallback: (items) async {
+                return [];
+              },
+            );
+          },
+        ));
+}
+
+typedef $$RemoteAlbumEntityTableProcessedTableManager
+    = i0.ProcessedTableManager<
+        i0.GeneratedDatabase,
+        i1.$RemoteAlbumEntityTable,
+        i1.RemoteAlbumEntityData,
+        i1.$$RemoteAlbumEntityTableFilterComposer,
+        i1.$$RemoteAlbumEntityTableOrderingComposer,
+        i1.$$RemoteAlbumEntityTableAnnotationComposer,
+        $$RemoteAlbumEntityTableCreateCompanionBuilder,
+        $$RemoteAlbumEntityTableUpdateCompanionBuilder,
+        (i1.RemoteAlbumEntityData, i1.$$RemoteAlbumEntityTableReferences),
+        i1.RemoteAlbumEntityData,
+        i0.PrefetchHooks Function({bool ownerId, bool thumbnailAssetId})>;
+
+class $RemoteAlbumEntityTable extends i3.RemoteAlbumEntity
+    with i0.TableInfo<$RemoteAlbumEntityTable, i1.RemoteAlbumEntityData> {
+  @override
+  final i0.GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $RemoteAlbumEntityTable(this.attachedDatabase, [this._alias]);
+  static const i0.VerificationMeta _idMeta = const i0.VerificationMeta('id');
+  @override
+  late final i0.GeneratedColumn<String> id = i0.GeneratedColumn<String>(
+      'id', aliasedName, false,
+      type: i0.DriftSqlType.string, requiredDuringInsert: true);
+  static const i0.VerificationMeta _nameMeta =
+      const i0.VerificationMeta('name');
+  @override
+  late final i0.GeneratedColumn<String> name = i0.GeneratedColumn<String>(
+      'name', aliasedName, false,
+      type: i0.DriftSqlType.string, requiredDuringInsert: true);
+  static const i0.VerificationMeta _descriptionMeta =
+      const i0.VerificationMeta('description');
+  @override
+  late final i0.GeneratedColumn<String> description =
+      i0.GeneratedColumn<String>('description', aliasedName, false,
+          type: i0.DriftSqlType.string,
+          requiredDuringInsert: false,
+          defaultValue: const i4.Constant(''));
+  static const i0.VerificationMeta _createdAtMeta =
+      const i0.VerificationMeta('createdAt');
+  @override
+  late final i0.GeneratedColumn<DateTime> createdAt =
+      i0.GeneratedColumn<DateTime>('created_at', aliasedName, false,
+          type: i0.DriftSqlType.dateTime,
+          requiredDuringInsert: false,
+          defaultValue: i4.currentDateAndTime);
+  static const i0.VerificationMeta _updatedAtMeta =
+      const i0.VerificationMeta('updatedAt');
+  @override
+  late final i0.GeneratedColumn<DateTime> updatedAt =
+      i0.GeneratedColumn<DateTime>('updated_at', aliasedName, false,
+          type: i0.DriftSqlType.dateTime,
+          requiredDuringInsert: false,
+          defaultValue: i4.currentDateAndTime);
+  static const i0.VerificationMeta _ownerIdMeta =
+      const i0.VerificationMeta('ownerId');
+  @override
+  late final i0.GeneratedColumn<String> ownerId = i0.GeneratedColumn<String>(
+      'owner_id', aliasedName, false,
+      type: i0.DriftSqlType.string,
+      requiredDuringInsert: true,
+      defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+          'REFERENCES user_entity (id) ON DELETE CASCADE'));
+  static const i0.VerificationMeta _thumbnailAssetIdMeta =
+      const i0.VerificationMeta('thumbnailAssetId');
+  @override
+  late final i0.GeneratedColumn<String> thumbnailAssetId =
+      i0.GeneratedColumn<String>('thumbnail_asset_id', aliasedName, true,
+          type: i0.DriftSqlType.string,
+          requiredDuringInsert: false,
+          defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+              'REFERENCES remote_asset_entity (id) ON DELETE SET NULL'));
+  static const i0.VerificationMeta _isActivityEnabledMeta =
+      const i0.VerificationMeta('isActivityEnabled');
+  @override
+  late final i0.GeneratedColumn<bool> isActivityEnabled =
+      i0.GeneratedColumn<bool>('is_activity_enabled', aliasedName, false,
+          type: i0.DriftSqlType.bool,
+          requiredDuringInsert: false,
+          defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+              'CHECK ("is_activity_enabled" IN (0, 1))'),
+          defaultValue: const i4.Constant(true));
+  @override
+  late final i0.GeneratedColumnWithTypeConverter<i2.AlbumAssetOrder, int>
+      order = i0.GeneratedColumn<int>('order', aliasedName, false,
+              type: i0.DriftSqlType.int, requiredDuringInsert: true)
+          .withConverter<i2.AlbumAssetOrder>(
+              i1.$RemoteAlbumEntityTable.$converterorder);
+  @override
+  List<i0.GeneratedColumn> get $columns => [
+        id,
+        name,
+        description,
+        createdAt,
+        updatedAt,
+        ownerId,
+        thumbnailAssetId,
+        isActivityEnabled,
+        order
+      ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'remote_album_entity';
+  @override
+  i0.VerificationContext validateIntegrity(
+      i0.Insertable<i1.RemoteAlbumEntityData> instance,
+      {bool isInserting = false}) {
+    final context = i0.VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('id')) {
+      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta));
+    } else if (isInserting) {
+      context.missing(_idMeta);
+    }
+    if (data.containsKey('name')) {
+      context.handle(
+          _nameMeta, name.isAcceptableOrUnknown(data['name']!, _nameMeta));
+    } else if (isInserting) {
+      context.missing(_nameMeta);
+    }
+    if (data.containsKey('description')) {
+      context.handle(
+          _descriptionMeta,
+          description.isAcceptableOrUnknown(
+              data['description']!, _descriptionMeta));
+    }
+    if (data.containsKey('created_at')) {
+      context.handle(_createdAtMeta,
+          createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta));
+    }
+    if (data.containsKey('updated_at')) {
+      context.handle(_updatedAtMeta,
+          updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta));
+    }
+    if (data.containsKey('owner_id')) {
+      context.handle(_ownerIdMeta,
+          ownerId.isAcceptableOrUnknown(data['owner_id']!, _ownerIdMeta));
+    } else if (isInserting) {
+      context.missing(_ownerIdMeta);
+    }
+    if (data.containsKey('thumbnail_asset_id')) {
+      context.handle(
+          _thumbnailAssetIdMeta,
+          thumbnailAssetId.isAcceptableOrUnknown(
+              data['thumbnail_asset_id']!, _thumbnailAssetIdMeta));
+    }
+    if (data.containsKey('is_activity_enabled')) {
+      context.handle(
+          _isActivityEnabledMeta,
+          isActivityEnabled.isAcceptableOrUnknown(
+              data['is_activity_enabled']!, _isActivityEnabledMeta));
+    }
+    return context;
+  }
+
+  @override
+  Set<i0.GeneratedColumn> get $primaryKey => {id};
+  @override
+  i1.RemoteAlbumEntityData map(Map<String, dynamic> data,
+      {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return i1.RemoteAlbumEntityData(
+      id: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}id'])!,
+      name: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}name'])!,
+      description: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}description'])!,
+      createdAt: attachedDatabase.typeMapping.read(
+          i0.DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!,
+      updatedAt: attachedDatabase.typeMapping.read(
+          i0.DriftSqlType.dateTime, data['${effectivePrefix}updated_at'])!,
+      ownerId: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}owner_id'])!,
+      thumbnailAssetId: attachedDatabase.typeMapping.read(
+          i0.DriftSqlType.string, data['${effectivePrefix}thumbnail_asset_id']),
+      isActivityEnabled: attachedDatabase.typeMapping.read(
+          i0.DriftSqlType.bool, data['${effectivePrefix}is_activity_enabled'])!,
+      order: i1.$RemoteAlbumEntityTable.$converterorder.fromSql(attachedDatabase
+          .typeMapping
+          .read(i0.DriftSqlType.int, data['${effectivePrefix}order'])!),
+    );
+  }
+
+  @override
+  $RemoteAlbumEntityTable createAlias(String alias) {
+    return $RemoteAlbumEntityTable(attachedDatabase, alias);
+  }
+
+  static i0.JsonTypeConverter2<i2.AlbumAssetOrder, int, int> $converterorder =
+      const i0.EnumIndexConverter<i2.AlbumAssetOrder>(
+          i2.AlbumAssetOrder.values);
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class RemoteAlbumEntityData extends i0.DataClass
+    implements i0.Insertable<i1.RemoteAlbumEntityData> {
+  final String id;
+  final String name;
+  final String description;
+  final DateTime createdAt;
+  final DateTime updatedAt;
+  final String ownerId;
+  final String? thumbnailAssetId;
+  final bool isActivityEnabled;
+  final i2.AlbumAssetOrder order;
+  const RemoteAlbumEntityData(
+      {required this.id,
+      required this.name,
+      required this.description,
+      required this.createdAt,
+      required this.updatedAt,
+      required this.ownerId,
+      this.thumbnailAssetId,
+      required this.isActivityEnabled,
+      required this.order});
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    map['id'] = i0.Variable<String>(id);
+    map['name'] = i0.Variable<String>(name);
+    map['description'] = i0.Variable<String>(description);
+    map['created_at'] = i0.Variable<DateTime>(createdAt);
+    map['updated_at'] = i0.Variable<DateTime>(updatedAt);
+    map['owner_id'] = i0.Variable<String>(ownerId);
+    if (!nullToAbsent || thumbnailAssetId != null) {
+      map['thumbnail_asset_id'] = i0.Variable<String>(thumbnailAssetId);
+    }
+    map['is_activity_enabled'] = i0.Variable<bool>(isActivityEnabled);
+    {
+      map['order'] = i0.Variable<int>(
+          i1.$RemoteAlbumEntityTable.$converterorder.toSql(order));
+    }
+    return map;
+  }
+
+  factory RemoteAlbumEntityData.fromJson(Map<String, dynamic> json,
+      {i0.ValueSerializer? serializer}) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return RemoteAlbumEntityData(
+      id: serializer.fromJson<String>(json['id']),
+      name: serializer.fromJson<String>(json['name']),
+      description: serializer.fromJson<String>(json['description']),
+      createdAt: serializer.fromJson<DateTime>(json['createdAt']),
+      updatedAt: serializer.fromJson<DateTime>(json['updatedAt']),
+      ownerId: serializer.fromJson<String>(json['ownerId']),
+      thumbnailAssetId: serializer.fromJson<String?>(json['thumbnailAssetId']),
+      isActivityEnabled: serializer.fromJson<bool>(json['isActivityEnabled']),
+      order: i1.$RemoteAlbumEntityTable.$converterorder
+          .fromJson(serializer.fromJson<int>(json['order'])),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({i0.ValueSerializer? serializer}) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'id': serializer.toJson<String>(id),
+      'name': serializer.toJson<String>(name),
+      'description': serializer.toJson<String>(description),
+      'createdAt': serializer.toJson<DateTime>(createdAt),
+      'updatedAt': serializer.toJson<DateTime>(updatedAt),
+      'ownerId': serializer.toJson<String>(ownerId),
+      'thumbnailAssetId': serializer.toJson<String?>(thumbnailAssetId),
+      'isActivityEnabled': serializer.toJson<bool>(isActivityEnabled),
+      'order': serializer.toJson<int>(
+          i1.$RemoteAlbumEntityTable.$converterorder.toJson(order)),
+    };
+  }
+
+  i1.RemoteAlbumEntityData copyWith(
+          {String? id,
+          String? name,
+          String? description,
+          DateTime? createdAt,
+          DateTime? updatedAt,
+          String? ownerId,
+          i0.Value<String?> thumbnailAssetId = const i0.Value.absent(),
+          bool? isActivityEnabled,
+          i2.AlbumAssetOrder? order}) =>
+      i1.RemoteAlbumEntityData(
+        id: id ?? this.id,
+        name: name ?? this.name,
+        description: description ?? this.description,
+        createdAt: createdAt ?? this.createdAt,
+        updatedAt: updatedAt ?? this.updatedAt,
+        ownerId: ownerId ?? this.ownerId,
+        thumbnailAssetId: thumbnailAssetId.present
+            ? thumbnailAssetId.value
+            : this.thumbnailAssetId,
+        isActivityEnabled: isActivityEnabled ?? this.isActivityEnabled,
+        order: order ?? this.order,
+      );
+  RemoteAlbumEntityData copyWithCompanion(i1.RemoteAlbumEntityCompanion data) {
+    return RemoteAlbumEntityData(
+      id: data.id.present ? data.id.value : this.id,
+      name: data.name.present ? data.name.value : this.name,
+      description:
+          data.description.present ? data.description.value : this.description,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+      updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
+      ownerId: data.ownerId.present ? data.ownerId.value : this.ownerId,
+      thumbnailAssetId: data.thumbnailAssetId.present
+          ? data.thumbnailAssetId.value
+          : this.thumbnailAssetId,
+      isActivityEnabled: data.isActivityEnabled.present
+          ? data.isActivityEnabled.value
+          : this.isActivityEnabled,
+      order: data.order.present ? data.order.value : this.order,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('RemoteAlbumEntityData(')
+          ..write('id: $id, ')
+          ..write('name: $name, ')
+          ..write('description: $description, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('updatedAt: $updatedAt, ')
+          ..write('ownerId: $ownerId, ')
+          ..write('thumbnailAssetId: $thumbnailAssetId, ')
+          ..write('isActivityEnabled: $isActivityEnabled, ')
+          ..write('order: $order')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(id, name, description, createdAt, updatedAt,
+      ownerId, thumbnailAssetId, isActivityEnabled, order);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is i1.RemoteAlbumEntityData &&
+          other.id == this.id &&
+          other.name == this.name &&
+          other.description == this.description &&
+          other.createdAt == this.createdAt &&
+          other.updatedAt == this.updatedAt &&
+          other.ownerId == this.ownerId &&
+          other.thumbnailAssetId == this.thumbnailAssetId &&
+          other.isActivityEnabled == this.isActivityEnabled &&
+          other.order == this.order);
+}
+
+class RemoteAlbumEntityCompanion
+    extends i0.UpdateCompanion<i1.RemoteAlbumEntityData> {
+  final i0.Value<String> id;
+  final i0.Value<String> name;
+  final i0.Value<String> description;
+  final i0.Value<DateTime> createdAt;
+  final i0.Value<DateTime> updatedAt;
+  final i0.Value<String> ownerId;
+  final i0.Value<String?> thumbnailAssetId;
+  final i0.Value<bool> isActivityEnabled;
+  final i0.Value<i2.AlbumAssetOrder> order;
+  const RemoteAlbumEntityCompanion({
+    this.id = const i0.Value.absent(),
+    this.name = const i0.Value.absent(),
+    this.description = const i0.Value.absent(),
+    this.createdAt = const i0.Value.absent(),
+    this.updatedAt = const i0.Value.absent(),
+    this.ownerId = const i0.Value.absent(),
+    this.thumbnailAssetId = const i0.Value.absent(),
+    this.isActivityEnabled = const i0.Value.absent(),
+    this.order = const i0.Value.absent(),
+  });
+  RemoteAlbumEntityCompanion.insert({
+    required String id,
+    required String name,
+    this.description = const i0.Value.absent(),
+    this.createdAt = const i0.Value.absent(),
+    this.updatedAt = const i0.Value.absent(),
+    required String ownerId,
+    this.thumbnailAssetId = const i0.Value.absent(),
+    this.isActivityEnabled = const i0.Value.absent(),
+    required i2.AlbumAssetOrder order,
+  })  : id = i0.Value(id),
+        name = i0.Value(name),
+        ownerId = i0.Value(ownerId),
+        order = i0.Value(order);
+  static i0.Insertable<i1.RemoteAlbumEntityData> custom({
+    i0.Expression<String>? id,
+    i0.Expression<String>? name,
+    i0.Expression<String>? description,
+    i0.Expression<DateTime>? createdAt,
+    i0.Expression<DateTime>? updatedAt,
+    i0.Expression<String>? ownerId,
+    i0.Expression<String>? thumbnailAssetId,
+    i0.Expression<bool>? isActivityEnabled,
+    i0.Expression<int>? order,
+  }) {
+    return i0.RawValuesInsertable({
+      if (id != null) 'id': id,
+      if (name != null) 'name': name,
+      if (description != null) 'description': description,
+      if (createdAt != null) 'created_at': createdAt,
+      if (updatedAt != null) 'updated_at': updatedAt,
+      if (ownerId != null) 'owner_id': ownerId,
+      if (thumbnailAssetId != null) 'thumbnail_asset_id': thumbnailAssetId,
+      if (isActivityEnabled != null) 'is_activity_enabled': isActivityEnabled,
+      if (order != null) 'order': order,
+    });
+  }
+
+  i1.RemoteAlbumEntityCompanion copyWith(
+      {i0.Value<String>? id,
+      i0.Value<String>? name,
+      i0.Value<String>? description,
+      i0.Value<DateTime>? createdAt,
+      i0.Value<DateTime>? updatedAt,
+      i0.Value<String>? ownerId,
+      i0.Value<String?>? thumbnailAssetId,
+      i0.Value<bool>? isActivityEnabled,
+      i0.Value<i2.AlbumAssetOrder>? order}) {
+    return i1.RemoteAlbumEntityCompanion(
+      id: id ?? this.id,
+      name: name ?? this.name,
+      description: description ?? this.description,
+      createdAt: createdAt ?? this.createdAt,
+      updatedAt: updatedAt ?? this.updatedAt,
+      ownerId: ownerId ?? this.ownerId,
+      thumbnailAssetId: thumbnailAssetId ?? this.thumbnailAssetId,
+      isActivityEnabled: isActivityEnabled ?? this.isActivityEnabled,
+      order: order ?? this.order,
+    );
+  }
+
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    if (id.present) {
+      map['id'] = i0.Variable<String>(id.value);
+    }
+    if (name.present) {
+      map['name'] = i0.Variable<String>(name.value);
+    }
+    if (description.present) {
+      map['description'] = i0.Variable<String>(description.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = i0.Variable<DateTime>(createdAt.value);
+    }
+    if (updatedAt.present) {
+      map['updated_at'] = i0.Variable<DateTime>(updatedAt.value);
+    }
+    if (ownerId.present) {
+      map['owner_id'] = i0.Variable<String>(ownerId.value);
+    }
+    if (thumbnailAssetId.present) {
+      map['thumbnail_asset_id'] = i0.Variable<String>(thumbnailAssetId.value);
+    }
+    if (isActivityEnabled.present) {
+      map['is_activity_enabled'] = i0.Variable<bool>(isActivityEnabled.value);
+    }
+    if (order.present) {
+      map['order'] = i0.Variable<int>(
+          i1.$RemoteAlbumEntityTable.$converterorder.toSql(order.value));
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('RemoteAlbumEntityCompanion(')
+          ..write('id: $id, ')
+          ..write('name: $name, ')
+          ..write('description: $description, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('updatedAt: $updatedAt, ')
+          ..write('ownerId: $ownerId, ')
+          ..write('thumbnailAssetId: $thumbnailAssetId, ')
+          ..write('isActivityEnabled: $isActivityEnabled, ')
+          ..write('order: $order')
+          ..write(')'))
+        .toString();
+  }
+}

mobile/lib/infrastructure/entities/remote_album_asset.entity.dart

@@ -0,0 +1,17 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_album.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
+import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
+
+class RemoteAlbumAssetEntity extends Table with DriftDefaultsMixin {
+  const RemoteAlbumAssetEntity();
+
+  TextColumn get assetId =>
+      text().references(RemoteAssetEntity, #id, onDelete: KeyAction.cascade)();
+
+  TextColumn get albumId =>
+      text().references(RemoteAlbumEntity, #id, onDelete: KeyAction.cascade)();
+
+  @override
+  Set<Column> get primaryKey => {assetId, albumId};
+}

mobile/lib/infrastructure/entities/remote_album_asset.entity.drift.dart

@@ -0,0 +1,565 @@
+// dart format width=80
+// ignore_for_file: type=lint
+import 'package:drift/drift.dart' as i0;
+import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.drift.dart'
+    as i1;
+import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.dart'
+    as i2;
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart'
+    as i3;
+import 'package:drift/internal/modular.dart' as i4;
+import 'package:immich_mobile/infrastructure/entities/remote_album.entity.drift.dart'
+    as i5;
+
+typedef $$RemoteAlbumAssetEntityTableCreateCompanionBuilder
+    = i1.RemoteAlbumAssetEntityCompanion Function({
+  required String assetId,
+  required String albumId,
+});
+typedef $$RemoteAlbumAssetEntityTableUpdateCompanionBuilder
+    = i1.RemoteAlbumAssetEntityCompanion Function({
+  i0.Value<String> assetId,
+  i0.Value<String> albumId,
+});
+
+final class $$RemoteAlbumAssetEntityTableReferences extends i0.BaseReferences<
+    i0.GeneratedDatabase,
+    i1.$RemoteAlbumAssetEntityTable,
+    i1.RemoteAlbumAssetEntityData> {
+  $$RemoteAlbumAssetEntityTableReferences(
+      super.$_db, super.$_table, super.$_typedResult);
+
+  static i3.$RemoteAssetEntityTable _assetIdTable(i0.GeneratedDatabase db) =>
+      i4.ReadDatabaseContainer(db)
+          .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity')
+          .createAlias(i0.$_aliasNameGenerator(
+              i4.ReadDatabaseContainer(db)
+                  .resultSet<i1.$RemoteAlbumAssetEntityTable>(
+                      'remote_album_asset_entity')
+                  .assetId,
+              i4.ReadDatabaseContainer(db)
+                  .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity')
+                  .id));
+
+  i3.$$RemoteAssetEntityTableProcessedTableManager get assetId {
+    final $_column = $_itemColumn<String>('asset_id')!;
+
+    final manager = i3
+        .$$RemoteAssetEntityTableTableManager(
+            $_db,
+            i4.ReadDatabaseContainer($_db)
+                .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'))
+        .filter((f) => f.id.sqlEquals($_column));
+    final item = $_typedResult.readTableOrNull(_assetIdTable($_db));
+    if (item == null) return manager;
+    return i0.ProcessedTableManager(
+        manager.$state.copyWith(prefetchedData: [item]));
+  }
+
+  static i5.$RemoteAlbumEntityTable _albumIdTable(i0.GeneratedDatabase db) =>
+      i4.ReadDatabaseContainer(db)
+          .resultSet<i5.$RemoteAlbumEntityTable>('remote_album_entity')
+          .createAlias(i0.$_aliasNameGenerator(
+              i4.ReadDatabaseContainer(db)
+                  .resultSet<i1.$RemoteAlbumAssetEntityTable>(
+                      'remote_album_asset_entity')
+                  .albumId,
+              i4.ReadDatabaseContainer(db)
+                  .resultSet<i5.$RemoteAlbumEntityTable>('remote_album_entity')
+                  .id));
+
+  i5.$$RemoteAlbumEntityTableProcessedTableManager get albumId {
+    final $_column = $_itemColumn<String>('album_id')!;
+
+    final manager = i5
+        .$$RemoteAlbumEntityTableTableManager(
+            $_db,
+            i4.ReadDatabaseContainer($_db)
+                .resultSet<i5.$RemoteAlbumEntityTable>('remote_album_entity'))
+        .filter((f) => f.id.sqlEquals($_column));
+    final item = $_typedResult.readTableOrNull(_albumIdTable($_db));
+    if (item == null) return manager;
+    return i0.ProcessedTableManager(
+        manager.$state.copyWith(prefetchedData: [item]));
+  }
+}
+
+class $$RemoteAlbumAssetEntityTableFilterComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$RemoteAlbumAssetEntityTable> {
+  $$RemoteAlbumAssetEntityTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i3.$$RemoteAssetEntityTableFilterComposer get assetId {
+    final i3.$$RemoteAssetEntityTableFilterComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.assetId,
+        referencedTable: i4.ReadDatabaseContainer($db)
+            .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i3.$$RemoteAssetEntityTableFilterComposer(
+              $db: $db,
+              $table: i4.ReadDatabaseContainer($db)
+                  .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+
+  i5.$$RemoteAlbumEntityTableFilterComposer get albumId {
+    final i5.$$RemoteAlbumEntityTableFilterComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.albumId,
+        referencedTable: i4.ReadDatabaseContainer($db)
+            .resultSet<i5.$RemoteAlbumEntityTable>('remote_album_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i5.$$RemoteAlbumEntityTableFilterComposer(
+              $db: $db,
+              $table: i4.ReadDatabaseContainer($db)
+                  .resultSet<i5.$RemoteAlbumEntityTable>('remote_album_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+}
+
+class $$RemoteAlbumAssetEntityTableOrderingComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$RemoteAlbumAssetEntityTable> {
+  $$RemoteAlbumAssetEntityTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i3.$$RemoteAssetEntityTableOrderingComposer get assetId {
+    final i3.$$RemoteAssetEntityTableOrderingComposer composer =
+        $composerBuilder(
+            composer: this,
+            getCurrentColumn: (t) => t.assetId,
+            referencedTable: i4.ReadDatabaseContainer($db)
+                .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
+            getReferencedColumn: (t) => t.id,
+            builder: (joinBuilder,
+                    {$addJoinBuilderToRootComposer,
+                    $removeJoinBuilderFromRootComposer}) =>
+                i3.$$RemoteAssetEntityTableOrderingComposer(
+                  $db: $db,
+                  $table: i4.ReadDatabaseContainer($db)
+                      .resultSet<i3.$RemoteAssetEntityTable>(
+                          'remote_asset_entity'),
+                  $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                  joinBuilder: joinBuilder,
+                  $removeJoinBuilderFromRootComposer:
+                      $removeJoinBuilderFromRootComposer,
+                ));
+    return composer;
+  }
+
+  i5.$$RemoteAlbumEntityTableOrderingComposer get albumId {
+    final i5.$$RemoteAlbumEntityTableOrderingComposer composer =
+        $composerBuilder(
+            composer: this,
+            getCurrentColumn: (t) => t.albumId,
+            referencedTable: i4.ReadDatabaseContainer($db)
+                .resultSet<i5.$RemoteAlbumEntityTable>('remote_album_entity'),
+            getReferencedColumn: (t) => t.id,
+            builder: (joinBuilder,
+                    {$addJoinBuilderToRootComposer,
+                    $removeJoinBuilderFromRootComposer}) =>
+                i5.$$RemoteAlbumEntityTableOrderingComposer(
+                  $db: $db,
+                  $table: i4.ReadDatabaseContainer($db)
+                      .resultSet<i5.$RemoteAlbumEntityTable>(
+                          'remote_album_entity'),
+                  $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                  joinBuilder: joinBuilder,
+                  $removeJoinBuilderFromRootComposer:
+                      $removeJoinBuilderFromRootComposer,
+                ));
+    return composer;
+  }
+}
+
+class $$RemoteAlbumAssetEntityTableAnnotationComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$RemoteAlbumAssetEntityTable> {
+  $$RemoteAlbumAssetEntityTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i3.$$RemoteAssetEntityTableAnnotationComposer get assetId {
+    final i3.$$RemoteAssetEntityTableAnnotationComposer composer =
+        $composerBuilder(
+            composer: this,
+            getCurrentColumn: (t) => t.assetId,
+            referencedTable: i4.ReadDatabaseContainer($db)
+                .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
+            getReferencedColumn: (t) => t.id,
+            builder: (joinBuilder,
+                    {$addJoinBuilderToRootComposer,
+                    $removeJoinBuilderFromRootComposer}) =>
+                i3.$$RemoteAssetEntityTableAnnotationComposer(
+                  $db: $db,
+                  $table: i4.ReadDatabaseContainer($db)
+                      .resultSet<i3.$RemoteAssetEntityTable>(
+                          'remote_asset_entity'),
+                  $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                  joinBuilder: joinBuilder,
+                  $removeJoinBuilderFromRootComposer:
+                      $removeJoinBuilderFromRootComposer,
+                ));
+    return composer;
+  }
+
+  i5.$$RemoteAlbumEntityTableAnnotationComposer get albumId {
+    final i5.$$RemoteAlbumEntityTableAnnotationComposer composer =
+        $composerBuilder(
+            composer: this,
+            getCurrentColumn: (t) => t.albumId,
+            referencedTable: i4.ReadDatabaseContainer($db)
+                .resultSet<i5.$RemoteAlbumEntityTable>('remote_album_entity'),
+            getReferencedColumn: (t) => t.id,
+            builder: (joinBuilder,
+                    {$addJoinBuilderToRootComposer,
+                    $removeJoinBuilderFromRootComposer}) =>
+                i5.$$RemoteAlbumEntityTableAnnotationComposer(
+                  $db: $db,
+                  $table: i4.ReadDatabaseContainer($db)
+                      .resultSet<i5.$RemoteAlbumEntityTable>(
+                          'remote_album_entity'),
+                  $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                  joinBuilder: joinBuilder,
+                  $removeJoinBuilderFromRootComposer:
+                      $removeJoinBuilderFromRootComposer,
+                ));
+    return composer;
+  }
+}
+
+class $$RemoteAlbumAssetEntityTableTableManager extends i0.RootTableManager<
+    i0.GeneratedDatabase,
+    i1.$RemoteAlbumAssetEntityTable,
+    i1.RemoteAlbumAssetEntityData,
+    i1.$$RemoteAlbumAssetEntityTableFilterComposer,
+    i1.$$RemoteAlbumAssetEntityTableOrderingComposer,
+    i1.$$RemoteAlbumAssetEntityTableAnnotationComposer,
+    $$RemoteAlbumAssetEntityTableCreateCompanionBuilder,
+    $$RemoteAlbumAssetEntityTableUpdateCompanionBuilder,
+    (i1.RemoteAlbumAssetEntityData, i1.$$RemoteAlbumAssetEntityTableReferences),
+    i1.RemoteAlbumAssetEntityData,
+    i0.PrefetchHooks Function({bool assetId, bool albumId})> {
+  $$RemoteAlbumAssetEntityTableTableManager(
+      i0.GeneratedDatabase db, i1.$RemoteAlbumAssetEntityTable table)
+      : super(i0.TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () =>
+              i1.$$RemoteAlbumAssetEntityTableFilterComposer(
+                  $db: db, $table: table),
+          createOrderingComposer: () =>
+              i1.$$RemoteAlbumAssetEntityTableOrderingComposer(
+                  $db: db, $table: table),
+          createComputedFieldComposer: () =>
+              i1.$$RemoteAlbumAssetEntityTableAnnotationComposer(
+                  $db: db, $table: table),
+          updateCompanionCallback: ({
+            i0.Value<String> assetId = const i0.Value.absent(),
+            i0.Value<String> albumId = const i0.Value.absent(),
+          }) =>
+              i1.RemoteAlbumAssetEntityCompanion(
+            assetId: assetId,
+            albumId: albumId,
+          ),
+          createCompanionCallback: ({
+            required String assetId,
+            required String albumId,
+          }) =>
+              i1.RemoteAlbumAssetEntityCompanion.insert(
+            assetId: assetId,
+            albumId: albumId,
+          ),
+          withReferenceMapper: (p0) => p0
+              .map((e) => (
+                    e.readTable(table),
+                    i1.$$RemoteAlbumAssetEntityTableReferences(db, table, e)
+                  ))
+              .toList(),
+          prefetchHooksCallback: ({assetId = false, albumId = false}) {
+            return i0.PrefetchHooks(
+              db: db,
+              explicitlyWatchedTables: [],
+              addJoins: <
+                  T extends i0.TableManagerState<
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic>>(state) {
+                if (assetId) {
+                  state = state.withJoin(
+                    currentTable: table,
+                    currentColumn: table.assetId,
+                    referencedTable: i1.$$RemoteAlbumAssetEntityTableReferences
+                        ._assetIdTable(db),
+                    referencedColumn: i1.$$RemoteAlbumAssetEntityTableReferences
+                        ._assetIdTable(db)
+                        .id,
+                  ) as T;
+                }
+                if (albumId) {
+                  state = state.withJoin(
+                    currentTable: table,
+                    currentColumn: table.albumId,
+                    referencedTable: i1.$$RemoteAlbumAssetEntityTableReferences
+                        ._albumIdTable(db),
+                    referencedColumn: i1.$$RemoteAlbumAssetEntityTableReferences
+                        ._albumIdTable(db)
+                        .id,
+                  ) as T;
+                }
+
+                return state;
+              },
+              getPrefetchedDataCallback: (items) async {
+                return [];
+              },
+            );
+          },
+        ));
+}
+
+typedef $$RemoteAlbumAssetEntityTableProcessedTableManager
+    = i0.ProcessedTableManager<
+        i0.GeneratedDatabase,
+        i1.$RemoteAlbumAssetEntityTable,
+        i1.RemoteAlbumAssetEntityData,
+        i1.$$RemoteAlbumAssetEntityTableFilterComposer,
+        i1.$$RemoteAlbumAssetEntityTableOrderingComposer,
+        i1.$$RemoteAlbumAssetEntityTableAnnotationComposer,
+        $$RemoteAlbumAssetEntityTableCreateCompanionBuilder,
+        $$RemoteAlbumAssetEntityTableUpdateCompanionBuilder,
+        (
+          i1.RemoteAlbumAssetEntityData,
+          i1.$$RemoteAlbumAssetEntityTableReferences
+        ),
+        i1.RemoteAlbumAssetEntityData,
+        i0.PrefetchHooks Function({bool assetId, bool albumId})>;
+
+class $RemoteAlbumAssetEntityTable extends i2.RemoteAlbumAssetEntity
+    with
+        i0.TableInfo<$RemoteAlbumAssetEntityTable,
+            i1.RemoteAlbumAssetEntityData> {
+  @override
+  final i0.GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $RemoteAlbumAssetEntityTable(this.attachedDatabase, [this._alias]);
+  static const i0.VerificationMeta _assetIdMeta =
+      const i0.VerificationMeta('assetId');
+  @override
+  late final i0.GeneratedColumn<String> assetId = i0.GeneratedColumn<String>(
+      'asset_id', aliasedName, false,
+      type: i0.DriftSqlType.string,
+      requiredDuringInsert: true,
+      defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+          'REFERENCES remote_asset_entity (id) ON DELETE CASCADE'));
+  static const i0.VerificationMeta _albumIdMeta =
+      const i0.VerificationMeta('albumId');
+  @override
+  late final i0.GeneratedColumn<String> albumId = i0.GeneratedColumn<String>(
+      'album_id', aliasedName, false,
+      type: i0.DriftSqlType.string,
+      requiredDuringInsert: true,
+      defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+          'REFERENCES remote_album_entity (id) ON DELETE CASCADE'));
+  @override
+  List<i0.GeneratedColumn> get $columns => [assetId, albumId];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'remote_album_asset_entity';
+  @override
+  i0.VerificationContext validateIntegrity(
+      i0.Insertable<i1.RemoteAlbumAssetEntityData> instance,
+      {bool isInserting = false}) {
+    final context = i0.VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('asset_id')) {
+      context.handle(_assetIdMeta,
+          assetId.isAcceptableOrUnknown(data['asset_id']!, _assetIdMeta));
+    } else if (isInserting) {
+      context.missing(_assetIdMeta);
+    }
+    if (data.containsKey('album_id')) {
+      context.handle(_albumIdMeta,
+          albumId.isAcceptableOrUnknown(data['album_id']!, _albumIdMeta));
+    } else if (isInserting) {
+      context.missing(_albumIdMeta);
+    }
+    return context;
+  }
+
+  @override
+  Set<i0.GeneratedColumn> get $primaryKey => {assetId, albumId};
+  @override
+  i1.RemoteAlbumAssetEntityData map(Map<String, dynamic> data,
+      {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return i1.RemoteAlbumAssetEntityData(
+      assetId: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}asset_id'])!,
+      albumId: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}album_id'])!,
+    );
+  }
+
+  @override
+  $RemoteAlbumAssetEntityTable createAlias(String alias) {
+    return $RemoteAlbumAssetEntityTable(attachedDatabase, alias);
+  }
+
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class RemoteAlbumAssetEntityData extends i0.DataClass
+    implements i0.Insertable<i1.RemoteAlbumAssetEntityData> {
+  final String assetId;
+  final String albumId;
+  const RemoteAlbumAssetEntityData(
+      {required this.assetId, required this.albumId});
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    map['asset_id'] = i0.Variable<String>(assetId);
+    map['album_id'] = i0.Variable<String>(albumId);
+    return map;
+  }
+
+  factory RemoteAlbumAssetEntityData.fromJson(Map<String, dynamic> json,
+      {i0.ValueSerializer? serializer}) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return RemoteAlbumAssetEntityData(
+      assetId: serializer.fromJson<String>(json['assetId']),
+      albumId: serializer.fromJson<String>(json['albumId']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({i0.ValueSerializer? serializer}) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'assetId': serializer.toJson<String>(assetId),
+      'albumId': serializer.toJson<String>(albumId),
+    };
+  }
+
+  i1.RemoteAlbumAssetEntityData copyWith({String? assetId, String? albumId}) =>
+      i1.RemoteAlbumAssetEntityData(
+        assetId: assetId ?? this.assetId,
+        albumId: albumId ?? this.albumId,
+      );
+  RemoteAlbumAssetEntityData copyWithCompanion(
+      i1.RemoteAlbumAssetEntityCompanion data) {
+    return RemoteAlbumAssetEntityData(
+      assetId: data.assetId.present ? data.assetId.value : this.assetId,
+      albumId: data.albumId.present ? data.albumId.value : this.albumId,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('RemoteAlbumAssetEntityData(')
+          ..write('assetId: $assetId, ')
+          ..write('albumId: $albumId')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(assetId, albumId);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is i1.RemoteAlbumAssetEntityData &&
+          other.assetId == this.assetId &&
+          other.albumId == this.albumId);
+}
+
+class RemoteAlbumAssetEntityCompanion
+    extends i0.UpdateCompanion<i1.RemoteAlbumAssetEntityData> {
+  final i0.Value<String> assetId;
+  final i0.Value<String> albumId;
+  const RemoteAlbumAssetEntityCompanion({
+    this.assetId = const i0.Value.absent(),
+    this.albumId = const i0.Value.absent(),
+  });
+  RemoteAlbumAssetEntityCompanion.insert({
+    required String assetId,
+    required String albumId,
+  })  : assetId = i0.Value(assetId),
+        albumId = i0.Value(albumId);
+  static i0.Insertable<i1.RemoteAlbumAssetEntityData> custom({
+    i0.Expression<String>? assetId,
+    i0.Expression<String>? albumId,
+  }) {
+    return i0.RawValuesInsertable({
+      if (assetId != null) 'asset_id': assetId,
+      if (albumId != null) 'album_id': albumId,
+    });
+  }
+
+  i1.RemoteAlbumAssetEntityCompanion copyWith(
+      {i0.Value<String>? assetId, i0.Value<String>? albumId}) {
+    return i1.RemoteAlbumAssetEntityCompanion(
+      assetId: assetId ?? this.assetId,
+      albumId: albumId ?? this.albumId,
+    );
+  }
+
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    if (assetId.present) {
+      map['asset_id'] = i0.Variable<String>(assetId.value);
+    }
+    if (albumId.present) {
+      map['album_id'] = i0.Variable<String>(albumId.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('RemoteAlbumAssetEntityCompanion(')
+          ..write('assetId: $assetId, ')
+          ..write('albumId: $albumId')
+          ..write(')'))
+        .toString();
+  }
+}

mobile/lib/infrastructure/entities/remote_album_user.entity.dart

@@ -0,0 +1,20 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/domain/models/album/album.model.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_album.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
+import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
+
+class RemoteAlbumUserEntity extends Table with DriftDefaultsMixin {
+  const RemoteAlbumUserEntity();
+
+  TextColumn get albumId =>
+      text().references(RemoteAlbumEntity, #id, onDelete: KeyAction.cascade)();
+
+  TextColumn get userId =>
+      text().references(UserEntity, #id, onDelete: KeyAction.cascade)();
+
+  IntColumn get role => intEnum<AlbumUserRole>()();
+
+  @override
+  Set<Column> get primaryKey => {albumId, userId};
+}

mobile/lib/infrastructure/entities/remote_album_user.entity.drift.dart

@@ -0,0 +1,618 @@
+// dart format width=80
+// ignore_for_file: type=lint
+import 'package:drift/drift.dart' as i0;
+import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.drift.dart'
+    as i1;
+import 'package:immich_mobile/domain/models/album/album.model.dart' as i2;
+import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.dart'
+    as i3;
+import 'package:immich_mobile/infrastructure/entities/remote_album.entity.drift.dart'
+    as i4;
+import 'package:drift/internal/modular.dart' as i5;
+import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart'
+    as i6;
+
+typedef $$RemoteAlbumUserEntityTableCreateCompanionBuilder
+    = i1.RemoteAlbumUserEntityCompanion Function({
+  required String albumId,
+  required String userId,
+  required i2.AlbumUserRole role,
+});
+typedef $$RemoteAlbumUserEntityTableUpdateCompanionBuilder
+    = i1.RemoteAlbumUserEntityCompanion Function({
+  i0.Value<String> albumId,
+  i0.Value<String> userId,
+  i0.Value<i2.AlbumUserRole> role,
+});
+
+final class $$RemoteAlbumUserEntityTableReferences extends i0.BaseReferences<
+    i0.GeneratedDatabase,
+    i1.$RemoteAlbumUserEntityTable,
+    i1.RemoteAlbumUserEntityData> {
+  $$RemoteAlbumUserEntityTableReferences(
+      super.$_db, super.$_table, super.$_typedResult);
+
+  static i4.$RemoteAlbumEntityTable _albumIdTable(i0.GeneratedDatabase db) =>
+      i5.ReadDatabaseContainer(db)
+          .resultSet<i4.$RemoteAlbumEntityTable>('remote_album_entity')
+          .createAlias(i0.$_aliasNameGenerator(
+              i5.ReadDatabaseContainer(db)
+                  .resultSet<i1.$RemoteAlbumUserEntityTable>(
+                      'remote_album_user_entity')
+                  .albumId,
+              i5.ReadDatabaseContainer(db)
+                  .resultSet<i4.$RemoteAlbumEntityTable>('remote_album_entity')
+                  .id));
+
+  i4.$$RemoteAlbumEntityTableProcessedTableManager get albumId {
+    final $_column = $_itemColumn<String>('album_id')!;
+
+    final manager = i4
+        .$$RemoteAlbumEntityTableTableManager(
+            $_db,
+            i5.ReadDatabaseContainer($_db)
+                .resultSet<i4.$RemoteAlbumEntityTable>('remote_album_entity'))
+        .filter((f) => f.id.sqlEquals($_column));
+    final item = $_typedResult.readTableOrNull(_albumIdTable($_db));
+    if (item == null) return manager;
+    return i0.ProcessedTableManager(
+        manager.$state.copyWith(prefetchedData: [item]));
+  }
+
+  static i6.$UserEntityTable _userIdTable(i0.GeneratedDatabase db) =>
+      i5.ReadDatabaseContainer(db)
+          .resultSet<i6.$UserEntityTable>('user_entity')
+          .createAlias(i0.$_aliasNameGenerator(
+              i5.ReadDatabaseContainer(db)
+                  .resultSet<i1.$RemoteAlbumUserEntityTable>(
+                      'remote_album_user_entity')
+                  .userId,
+              i5.ReadDatabaseContainer(db)
+                  .resultSet<i6.$UserEntityTable>('user_entity')
+                  .id));
+
+  i6.$$UserEntityTableProcessedTableManager get userId {
+    final $_column = $_itemColumn<String>('user_id')!;
+
+    final manager = i6
+        .$$UserEntityTableTableManager(
+            $_db,
+            i5.ReadDatabaseContainer($_db)
+                .resultSet<i6.$UserEntityTable>('user_entity'))
+        .filter((f) => f.id.sqlEquals($_column));
+    final item = $_typedResult.readTableOrNull(_userIdTable($_db));
+    if (item == null) return manager;
+    return i0.ProcessedTableManager(
+        manager.$state.copyWith(prefetchedData: [item]));
+  }
+}
+
+class $$RemoteAlbumUserEntityTableFilterComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$RemoteAlbumUserEntityTable> {
+  $$RemoteAlbumUserEntityTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnWithTypeConverterFilters<i2.AlbumUserRole, i2.AlbumUserRole, int>
+      get role => $composableBuilder(
+          column: $table.role,
+          builder: (column) => i0.ColumnWithTypeConverterFilters(column));
+
+  i4.$$RemoteAlbumEntityTableFilterComposer get albumId {
+    final i4.$$RemoteAlbumEntityTableFilterComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.albumId,
+        referencedTable: i5.ReadDatabaseContainer($db)
+            .resultSet<i4.$RemoteAlbumEntityTable>('remote_album_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i4.$$RemoteAlbumEntityTableFilterComposer(
+              $db: $db,
+              $table: i5.ReadDatabaseContainer($db)
+                  .resultSet<i4.$RemoteAlbumEntityTable>('remote_album_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+
+  i6.$$UserEntityTableFilterComposer get userId {
+    final i6.$$UserEntityTableFilterComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.userId,
+        referencedTable: i5.ReadDatabaseContainer($db)
+            .resultSet<i6.$UserEntityTable>('user_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i6.$$UserEntityTableFilterComposer(
+              $db: $db,
+              $table: i5.ReadDatabaseContainer($db)
+                  .resultSet<i6.$UserEntityTable>('user_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+}
+
+class $$RemoteAlbumUserEntityTableOrderingComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$RemoteAlbumUserEntityTable> {
+  $$RemoteAlbumUserEntityTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnOrderings<int> get role => $composableBuilder(
+      column: $table.role, builder: (column) => i0.ColumnOrderings(column));
+
+  i4.$$RemoteAlbumEntityTableOrderingComposer get albumId {
+    final i4.$$RemoteAlbumEntityTableOrderingComposer composer =
+        $composerBuilder(
+            composer: this,
+            getCurrentColumn: (t) => t.albumId,
+            referencedTable: i5.ReadDatabaseContainer($db)
+                .resultSet<i4.$RemoteAlbumEntityTable>('remote_album_entity'),
+            getReferencedColumn: (t) => t.id,
+            builder: (joinBuilder,
+                    {$addJoinBuilderToRootComposer,
+                    $removeJoinBuilderFromRootComposer}) =>
+                i4.$$RemoteAlbumEntityTableOrderingComposer(
+                  $db: $db,
+                  $table: i5.ReadDatabaseContainer($db)
+                      .resultSet<i4.$RemoteAlbumEntityTable>(
+                          'remote_album_entity'),
+                  $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                  joinBuilder: joinBuilder,
+                  $removeJoinBuilderFromRootComposer:
+                      $removeJoinBuilderFromRootComposer,
+                ));
+    return composer;
+  }
+
+  i6.$$UserEntityTableOrderingComposer get userId {
+    final i6.$$UserEntityTableOrderingComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.userId,
+        referencedTable: i5.ReadDatabaseContainer($db)
+            .resultSet<i6.$UserEntityTable>('user_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i6.$$UserEntityTableOrderingComposer(
+              $db: $db,
+              $table: i5.ReadDatabaseContainer($db)
+                  .resultSet<i6.$UserEntityTable>('user_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+}
+
+class $$RemoteAlbumUserEntityTableAnnotationComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$RemoteAlbumUserEntityTable> {
+  $$RemoteAlbumUserEntityTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.GeneratedColumnWithTypeConverter<i2.AlbumUserRole, int> get role =>
+      $composableBuilder(column: $table.role, builder: (column) => column);
+
+  i4.$$RemoteAlbumEntityTableAnnotationComposer get albumId {
+    final i4.$$RemoteAlbumEntityTableAnnotationComposer composer =
+        $composerBuilder(
+            composer: this,
+            getCurrentColumn: (t) => t.albumId,
+            referencedTable: i5.ReadDatabaseContainer($db)
+                .resultSet<i4.$RemoteAlbumEntityTable>('remote_album_entity'),
+            getReferencedColumn: (t) => t.id,
+            builder: (joinBuilder,
+                    {$addJoinBuilderToRootComposer,
+                    $removeJoinBuilderFromRootComposer}) =>
+                i4.$$RemoteAlbumEntityTableAnnotationComposer(
+                  $db: $db,
+                  $table: i5.ReadDatabaseContainer($db)
+                      .resultSet<i4.$RemoteAlbumEntityTable>(
+                          'remote_album_entity'),
+                  $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                  joinBuilder: joinBuilder,
+                  $removeJoinBuilderFromRootComposer:
+                      $removeJoinBuilderFromRootComposer,
+                ));
+    return composer;
+  }
+
+  i6.$$UserEntityTableAnnotationComposer get userId {
+    final i6.$$UserEntityTableAnnotationComposer composer = $composerBuilder(
+        composer: this,
+        getCurrentColumn: (t) => t.userId,
+        referencedTable: i5.ReadDatabaseContainer($db)
+            .resultSet<i6.$UserEntityTable>('user_entity'),
+        getReferencedColumn: (t) => t.id,
+        builder: (joinBuilder,
+                {$addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer}) =>
+            i6.$$UserEntityTableAnnotationComposer(
+              $db: $db,
+              $table: i5.ReadDatabaseContainer($db)
+                  .resultSet<i6.$UserEntityTable>('user_entity'),
+              $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+              joinBuilder: joinBuilder,
+              $removeJoinBuilderFromRootComposer:
+                  $removeJoinBuilderFromRootComposer,
+            ));
+    return composer;
+  }
+}
+
+class $$RemoteAlbumUserEntityTableTableManager extends i0.RootTableManager<
+    i0.GeneratedDatabase,
+    i1.$RemoteAlbumUserEntityTable,
+    i1.RemoteAlbumUserEntityData,
+    i1.$$RemoteAlbumUserEntityTableFilterComposer,
+    i1.$$RemoteAlbumUserEntityTableOrderingComposer,
+    i1.$$RemoteAlbumUserEntityTableAnnotationComposer,
+    $$RemoteAlbumUserEntityTableCreateCompanionBuilder,
+    $$RemoteAlbumUserEntityTableUpdateCompanionBuilder,
+    (i1.RemoteAlbumUserEntityData, i1.$$RemoteAlbumUserEntityTableReferences),
+    i1.RemoteAlbumUserEntityData,
+    i0.PrefetchHooks Function({bool albumId, bool userId})> {
+  $$RemoteAlbumUserEntityTableTableManager(
+      i0.GeneratedDatabase db, i1.$RemoteAlbumUserEntityTable table)
+      : super(i0.TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () =>
+              i1.$$RemoteAlbumUserEntityTableFilterComposer(
+                  $db: db, $table: table),
+          createOrderingComposer: () =>
+              i1.$$RemoteAlbumUserEntityTableOrderingComposer(
+                  $db: db, $table: table),
+          createComputedFieldComposer: () =>
+              i1.$$RemoteAlbumUserEntityTableAnnotationComposer(
+                  $db: db, $table: table),
+          updateCompanionCallback: ({
+            i0.Value<String> albumId = const i0.Value.absent(),
+            i0.Value<String> userId = const i0.Value.absent(),
+            i0.Value<i2.AlbumUserRole> role = const i0.Value.absent(),
+          }) =>
+              i1.RemoteAlbumUserEntityCompanion(
+            albumId: albumId,
+            userId: userId,
+            role: role,
+          ),
+          createCompanionCallback: ({
+            required String albumId,
+            required String userId,
+            required i2.AlbumUserRole role,
+          }) =>
+              i1.RemoteAlbumUserEntityCompanion.insert(
+            albumId: albumId,
+            userId: userId,
+            role: role,
+          ),
+          withReferenceMapper: (p0) => p0
+              .map((e) => (
+                    e.readTable(table),
+                    i1.$$RemoteAlbumUserEntityTableReferences(db, table, e)
+                  ))
+              .toList(),
+          prefetchHooksCallback: ({albumId = false, userId = false}) {
+            return i0.PrefetchHooks(
+              db: db,
+              explicitlyWatchedTables: [],
+              addJoins: <
+                  T extends i0.TableManagerState<
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic>>(state) {
+                if (albumId) {
+                  state = state.withJoin(
+                    currentTable: table,
+                    currentColumn: table.albumId,
+                    referencedTable: i1.$$RemoteAlbumUserEntityTableReferences
+                        ._albumIdTable(db),
+                    referencedColumn: i1.$$RemoteAlbumUserEntityTableReferences
+                        ._albumIdTable(db)
+                        .id,
+                  ) as T;
+                }
+                if (userId) {
+                  state = state.withJoin(
+                    currentTable: table,
+                    currentColumn: table.userId,
+                    referencedTable: i1.$$RemoteAlbumUserEntityTableReferences
+                        ._userIdTable(db),
+                    referencedColumn: i1.$$RemoteAlbumUserEntityTableReferences
+                        ._userIdTable(db)
+                        .id,
+                  ) as T;
+                }
+
+                return state;
+              },
+              getPrefetchedDataCallback: (items) async {
+                return [];
+              },
+            );
+          },
+        ));
+}
+
+typedef $$RemoteAlbumUserEntityTableProcessedTableManager
+    = i0.ProcessedTableManager<
+        i0.GeneratedDatabase,
+        i1.$RemoteAlbumUserEntityTable,
+        i1.RemoteAlbumUserEntityData,
+        i1.$$RemoteAlbumUserEntityTableFilterComposer,
+        i1.$$RemoteAlbumUserEntityTableOrderingComposer,
+        i1.$$RemoteAlbumUserEntityTableAnnotationComposer,
+        $$RemoteAlbumUserEntityTableCreateCompanionBuilder,
+        $$RemoteAlbumUserEntityTableUpdateCompanionBuilder,
+        (
+          i1.RemoteAlbumUserEntityData,
+          i1.$$RemoteAlbumUserEntityTableReferences
+        ),
+        i1.RemoteAlbumUserEntityData,
+        i0.PrefetchHooks Function({bool albumId, bool userId})>;
+
+class $RemoteAlbumUserEntityTable extends i3.RemoteAlbumUserEntity
+    with
+        i0
+        .TableInfo<$RemoteAlbumUserEntityTable, i1.RemoteAlbumUserEntityData> {
+  @override
+  final i0.GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $RemoteAlbumUserEntityTable(this.attachedDatabase, [this._alias]);
+  static const i0.VerificationMeta _albumIdMeta =
+      const i0.VerificationMeta('albumId');
+  @override
+  late final i0.GeneratedColumn<String> albumId = i0.GeneratedColumn<String>(
+      'album_id', aliasedName, false,
+      type: i0.DriftSqlType.string,
+      requiredDuringInsert: true,
+      defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+          'REFERENCES remote_album_entity (id) ON DELETE CASCADE'));
+  static const i0.VerificationMeta _userIdMeta =
+      const i0.VerificationMeta('userId');
+  @override
+  late final i0.GeneratedColumn<String> userId = i0.GeneratedColumn<String>(
+      'user_id', aliasedName, false,
+      type: i0.DriftSqlType.string,
+      requiredDuringInsert: true,
+      defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+          'REFERENCES user_entity (id) ON DELETE CASCADE'));
+  @override
+  late final i0.GeneratedColumnWithTypeConverter<i2.AlbumUserRole, int> role =
+      i0.GeneratedColumn<int>('role', aliasedName, false,
+              type: i0.DriftSqlType.int, requiredDuringInsert: true)
+          .withConverter<i2.AlbumUserRole>(
+              i1.$RemoteAlbumUserEntityTable.$converterrole);
+  @override
+  List<i0.GeneratedColumn> get $columns => [albumId, userId, role];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'remote_album_user_entity';
+  @override
+  i0.VerificationContext validateIntegrity(
+      i0.Insertable<i1.RemoteAlbumUserEntityData> instance,
+      {bool isInserting = false}) {
+    final context = i0.VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('album_id')) {
+      context.handle(_albumIdMeta,
+          albumId.isAcceptableOrUnknown(data['album_id']!, _albumIdMeta));
+    } else if (isInserting) {
+      context.missing(_albumIdMeta);
+    }
+    if (data.containsKey('user_id')) {
+      context.handle(_userIdMeta,
+          userId.isAcceptableOrUnknown(data['user_id']!, _userIdMeta));
+    } else if (isInserting) {
+      context.missing(_userIdMeta);
+    }
+    return context;
+  }
+
+  @override
+  Set<i0.GeneratedColumn> get $primaryKey => {albumId, userId};
+  @override
+  i1.RemoteAlbumUserEntityData map(Map<String, dynamic> data,
+      {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return i1.RemoteAlbumUserEntityData(
+      albumId: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}album_id'])!,
+      userId: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}user_id'])!,
+      role: i1.$RemoteAlbumUserEntityTable.$converterrole.fromSql(
+          attachedDatabase.typeMapping
+              .read(i0.DriftSqlType.int, data['${effectivePrefix}role'])!),
+    );
+  }
+
+  @override
+  $RemoteAlbumUserEntityTable createAlias(String alias) {
+    return $RemoteAlbumUserEntityTable(attachedDatabase, alias);
+  }
+
+  static i0.JsonTypeConverter2<i2.AlbumUserRole, int, int> $converterrole =
+      const i0.EnumIndexConverter<i2.AlbumUserRole>(i2.AlbumUserRole.values);
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class RemoteAlbumUserEntityData extends i0.DataClass
+    implements i0.Insertable<i1.RemoteAlbumUserEntityData> {
+  final String albumId;
+  final String userId;
+  final i2.AlbumUserRole role;
+  const RemoteAlbumUserEntityData(
+      {required this.albumId, required this.userId, required this.role});
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    map['album_id'] = i0.Variable<String>(albumId);
+    map['user_id'] = i0.Variable<String>(userId);
+    {
+      map['role'] = i0.Variable<int>(
+          i1.$RemoteAlbumUserEntityTable.$converterrole.toSql(role));
+    }
+    return map;
+  }
+
+  factory RemoteAlbumUserEntityData.fromJson(Map<String, dynamic> json,
+      {i0.ValueSerializer? serializer}) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return RemoteAlbumUserEntityData(
+      albumId: serializer.fromJson<String>(json['albumId']),
+      userId: serializer.fromJson<String>(json['userId']),
+      role: i1.$RemoteAlbumUserEntityTable.$converterrole
+          .fromJson(serializer.fromJson<int>(json['role'])),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({i0.ValueSerializer? serializer}) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'albumId': serializer.toJson<String>(albumId),
+      'userId': serializer.toJson<String>(userId),
+      'role': serializer.toJson<int>(
+          i1.$RemoteAlbumUserEntityTable.$converterrole.toJson(role)),
+    };
+  }
+
+  i1.RemoteAlbumUserEntityData copyWith(
+          {String? albumId, String? userId, i2.AlbumUserRole? role}) =>
+      i1.RemoteAlbumUserEntityData(
+        albumId: albumId ?? this.albumId,
+        userId: userId ?? this.userId,
+        role: role ?? this.role,
+      );
+  RemoteAlbumUserEntityData copyWithCompanion(
+      i1.RemoteAlbumUserEntityCompanion data) {
+    return RemoteAlbumUserEntityData(
+      albumId: data.albumId.present ? data.albumId.value : this.albumId,
+      userId: data.userId.present ? data.userId.value : this.userId,
+      role: data.role.present ? data.role.value : this.role,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('RemoteAlbumUserEntityData(')
+          ..write('albumId: $albumId, ')
+          ..write('userId: $userId, ')
+          ..write('role: $role')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(albumId, userId, role);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is i1.RemoteAlbumUserEntityData &&
+          other.albumId == this.albumId &&
+          other.userId == this.userId &&
+          other.role == this.role);
+}
+
+class RemoteAlbumUserEntityCompanion
+    extends i0.UpdateCompanion<i1.RemoteAlbumUserEntityData> {
+  final i0.Value<String> albumId;
+  final i0.Value<String> userId;
+  final i0.Value<i2.AlbumUserRole> role;
+  const RemoteAlbumUserEntityCompanion({
+    this.albumId = const i0.Value.absent(),
+    this.userId = const i0.Value.absent(),
+    this.role = const i0.Value.absent(),
+  });
+  RemoteAlbumUserEntityCompanion.insert({
+    required String albumId,
+    required String userId,
+    required i2.AlbumUserRole role,
+  })  : albumId = i0.Value(albumId),
+        userId = i0.Value(userId),
+        role = i0.Value(role);
+  static i0.Insertable<i1.RemoteAlbumUserEntityData> custom({
+    i0.Expression<String>? albumId,
+    i0.Expression<String>? userId,
+    i0.Expression<int>? role,
+  }) {
+    return i0.RawValuesInsertable({
+      if (albumId != null) 'album_id': albumId,
+      if (userId != null) 'user_id': userId,
+      if (role != null) 'role': role,
+    });
+  }
+
+  i1.RemoteAlbumUserEntityCompanion copyWith(
+      {i0.Value<String>? albumId,
+      i0.Value<String>? userId,
+      i0.Value<i2.AlbumUserRole>? role}) {
+    return i1.RemoteAlbumUserEntityCompanion(
+      albumId: albumId ?? this.albumId,
+      userId: userId ?? this.userId,
+      role: role ?? this.role,
+    );
+  }
+
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    if (albumId.present) {
+      map['album_id'] = i0.Variable<String>(albumId.value);
+    }
+    if (userId.present) {
+      map['user_id'] = i0.Variable<String>(userId.value);
+    }
+    if (role.present) {
+      map['role'] = i0.Variable<int>(
+          i1.$RemoteAlbumUserEntityTable.$converterrole.toSql(role.value));
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('RemoteAlbumUserEntityCompanion(')
+          ..write('albumId: $albumId, ')
+          ..write('userId: $userId, ')
+          ..write('role: $role')
+          ..write(')'))
+        .toString();
+  }
+}

mobile/lib/infrastructure/entities/remote_asset.entity.dart

@@ -1,5 +1,6 @@
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
 import 'package:immich_mobile/infrastructure/utils/asset.mixin.dart';
 import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
@@ -34,3 +35,21 @@ class RemoteAssetEntity extends Table
   @override
   Set<Column> get primaryKey => {id};
 }
+
+extension RemoteAssetEntityDataDomainEx on RemoteAssetEntityData {
+  Asset toDto() => Asset(
+        id: id,
+        name: name,
+        checksum: checksum,
+        type: type,
+        createdAt: createdAt,
+        updatedAt: updatedAt,
+        durationInSeconds: durationInSeconds,
+        isFavorite: isFavorite,
+        height: height,
+        width: width,
+        thumbHash: thumbHash,
+        visibility: visibility,
+        localId: null,
+      );
+}

mobile/lib/infrastructure/entities/store.entity.dart

@@ -1,13 +1,13 @@
-import 'package:isar/isar.dart';
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
 
-part 'store.entity.g.dart';
+class StoreEntity extends Table with DriftDefaultsMixin {
+  const StoreEntity();
 
-/// Internal class for `Store`, do not use elsewhere.
+  IntColumn get id => integer()();
-@Collection(inheritance: false)
+  IntColumn get intValue => integer().nullable()();
-class StoreValue {
+  TextColumn get strValue => text().nullable()();
-  final Id id;
-  final int? intValue;
-  final String? strValue;
 
-  const StoreValue(this.id, {this.intValue, this.strValue});
+  @override
+  Set<Column> get primaryKey => {id};
 }

mobile/lib/infrastructure/entities/store.entity.drift.dart

@@ -0,0 +1,364 @@
+// dart format width=80
+// ignore_for_file: type=lint
+import 'package:drift/drift.dart' as i0;
+import 'package:immich_mobile/infrastructure/entities/store.entity.drift.dart'
+    as i1;
+import 'package:immich_mobile/infrastructure/entities/store.entity.dart' as i2;
+
+typedef $$StoreEntityTableCreateCompanionBuilder = i1.StoreEntityCompanion
+    Function({
+  required int id,
+  i0.Value<int?> intValue,
+  i0.Value<String?> strValue,
+});
+typedef $$StoreEntityTableUpdateCompanionBuilder = i1.StoreEntityCompanion
+    Function({
+  i0.Value<int> id,
+  i0.Value<int?> intValue,
+  i0.Value<String?> strValue,
+});
+
+class $$StoreEntityTableFilterComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$StoreEntityTable> {
+  $$StoreEntityTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnFilters<int> get id => $composableBuilder(
+      column: $table.id, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<int> get intValue => $composableBuilder(
+      column: $table.intValue, builder: (column) => i0.ColumnFilters(column));
+
+  i0.ColumnFilters<String> get strValue => $composableBuilder(
+      column: $table.strValue, builder: (column) => i0.ColumnFilters(column));
+}
+
+class $$StoreEntityTableOrderingComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$StoreEntityTable> {
+  $$StoreEntityTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnOrderings<int> get id => $composableBuilder(
+      column: $table.id, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<int> get intValue => $composableBuilder(
+      column: $table.intValue, builder: (column) => i0.ColumnOrderings(column));
+
+  i0.ColumnOrderings<String> get strValue => $composableBuilder(
+      column: $table.strValue, builder: (column) => i0.ColumnOrderings(column));
+}
+
+class $$StoreEntityTableAnnotationComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$StoreEntityTable> {
+  $$StoreEntityTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.GeneratedColumn<int> get id =>
+      $composableBuilder(column: $table.id, builder: (column) => column);
+
+  i0.GeneratedColumn<int> get intValue =>
+      $composableBuilder(column: $table.intValue, builder: (column) => column);
+
+  i0.GeneratedColumn<String> get strValue =>
+      $composableBuilder(column: $table.strValue, builder: (column) => column);
+}
+
+class $$StoreEntityTableTableManager extends i0.RootTableManager<
+    i0.GeneratedDatabase,
+    i1.$StoreEntityTable,
+    i1.StoreEntityData,
+    i1.$$StoreEntityTableFilterComposer,
+    i1.$$StoreEntityTableOrderingComposer,
+    i1.$$StoreEntityTableAnnotationComposer,
+    $$StoreEntityTableCreateCompanionBuilder,
+    $$StoreEntityTableUpdateCompanionBuilder,
+    (
+      i1.StoreEntityData,
+      i0.BaseReferences<i0.GeneratedDatabase, i1.$StoreEntityTable,
+          i1.StoreEntityData>
+    ),
+    i1.StoreEntityData,
+    i0.PrefetchHooks Function()> {
+  $$StoreEntityTableTableManager(
+      i0.GeneratedDatabase db, i1.$StoreEntityTable table)
+      : super(i0.TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () =>
+              i1.$$StoreEntityTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () =>
+              i1.$$StoreEntityTableOrderingComposer($db: db, $table: table),
+          createComputedFieldComposer: () =>
+              i1.$$StoreEntityTableAnnotationComposer($db: db, $table: table),
+          updateCompanionCallback: ({
+            i0.Value<int> id = const i0.Value.absent(),
+            i0.Value<int?> intValue = const i0.Value.absent(),
+            i0.Value<String?> strValue = const i0.Value.absent(),
+          }) =>
+              i1.StoreEntityCompanion(
+            id: id,
+            intValue: intValue,
+            strValue: strValue,
+          ),
+          createCompanionCallback: ({
+            required int id,
+            i0.Value<int?> intValue = const i0.Value.absent(),
+            i0.Value<String?> strValue = const i0.Value.absent(),
+          }) =>
+              i1.StoreEntityCompanion.insert(
+            id: id,
+            intValue: intValue,
+            strValue: strValue,
+          ),
+          withReferenceMapper: (p0) => p0
+              .map((e) => (e.readTable(table), i0.BaseReferences(db, table, e)))
+              .toList(),
+          prefetchHooksCallback: null,
+        ));
+}
+
+typedef $$StoreEntityTableProcessedTableManager = i0.ProcessedTableManager<
+    i0.GeneratedDatabase,
+    i1.$StoreEntityTable,
+    i1.StoreEntityData,
+    i1.$$StoreEntityTableFilterComposer,
+    i1.$$StoreEntityTableOrderingComposer,
+    i1.$$StoreEntityTableAnnotationComposer,
+    $$StoreEntityTableCreateCompanionBuilder,
+    $$StoreEntityTableUpdateCompanionBuilder,
+    (
+      i1.StoreEntityData,
+      i0.BaseReferences<i0.GeneratedDatabase, i1.$StoreEntityTable,
+          i1.StoreEntityData>
+    ),
+    i1.StoreEntityData,
+    i0.PrefetchHooks Function()>;
+
+class $StoreEntityTable extends i2.StoreEntity
+    with i0.TableInfo<$StoreEntityTable, i1.StoreEntityData> {
+  @override
+  final i0.GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $StoreEntityTable(this.attachedDatabase, [this._alias]);
+  static const i0.VerificationMeta _idMeta = const i0.VerificationMeta('id');
+  @override
+  late final i0.GeneratedColumn<int> id = i0.GeneratedColumn<int>(
+      'id', aliasedName, false,
+      type: i0.DriftSqlType.int, requiredDuringInsert: true);
+  static const i0.VerificationMeta _intValueMeta =
+      const i0.VerificationMeta('intValue');
+  @override
+  late final i0.GeneratedColumn<int> intValue = i0.GeneratedColumn<int>(
+      'int_value', aliasedName, true,
+      type: i0.DriftSqlType.int, requiredDuringInsert: false);
+  static const i0.VerificationMeta _strValueMeta =
+      const i0.VerificationMeta('strValue');
+  @override
+  late final i0.GeneratedColumn<String> strValue = i0.GeneratedColumn<String>(
+      'str_value', aliasedName, true,
+      type: i0.DriftSqlType.string, requiredDuringInsert: false);
+  @override
+  List<i0.GeneratedColumn> get $columns => [id, intValue, strValue];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'store_entity';
+  @override
+  i0.VerificationContext validateIntegrity(
+      i0.Insertable<i1.StoreEntityData> instance,
+      {bool isInserting = false}) {
+    final context = i0.VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('id')) {
+      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta));
+    } else if (isInserting) {
+      context.missing(_idMeta);
+    }
+    if (data.containsKey('int_value')) {
+      context.handle(_intValueMeta,
+          intValue.isAcceptableOrUnknown(data['int_value']!, _intValueMeta));
+    }
+    if (data.containsKey('str_value')) {
+      context.handle(_strValueMeta,
+          strValue.isAcceptableOrUnknown(data['str_value']!, _strValueMeta));
+    }
+    return context;
+  }
+
+  @override
+  Set<i0.GeneratedColumn> get $primaryKey => {id};
+  @override
+  i1.StoreEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return i1.StoreEntityData(
+      id: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.int, data['${effectivePrefix}id'])!,
+      intValue: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.int, data['${effectivePrefix}int_value']),
+      strValue: attachedDatabase.typeMapping
+          .read(i0.DriftSqlType.string, data['${effectivePrefix}str_value']),
+    );
+  }
+
+  @override
+  $StoreEntityTable createAlias(String alias) {
+    return $StoreEntityTable(attachedDatabase, alias);
+  }
+
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class StoreEntityData extends i0.DataClass
+    implements i0.Insertable<i1.StoreEntityData> {
+  final int id;
+  final int? intValue;
+  final String? strValue;
+  const StoreEntityData({required this.id, this.intValue, this.strValue});
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    map['id'] = i0.Variable<int>(id);
+    if (!nullToAbsent || intValue != null) {
+      map['int_value'] = i0.Variable<int>(intValue);
+    }
+    if (!nullToAbsent || strValue != null) {
+      map['str_value'] = i0.Variable<String>(strValue);
+    }
+    return map;
+  }
+
+  factory StoreEntityData.fromJson(Map<String, dynamic> json,
+      {i0.ValueSerializer? serializer}) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return StoreEntityData(
+      id: serializer.fromJson<int>(json['id']),
+      intValue: serializer.fromJson<int?>(json['intValue']),
+      strValue: serializer.fromJson<String?>(json['strValue']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({i0.ValueSerializer? serializer}) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'id': serializer.toJson<int>(id),
+      'intValue': serializer.toJson<int?>(intValue),
+      'strValue': serializer.toJson<String?>(strValue),
+    };
+  }
+
+  i1.StoreEntityData copyWith(
+          {int? id,
+          i0.Value<int?> intValue = const i0.Value.absent(),
+          i0.Value<String?> strValue = const i0.Value.absent()}) =>
+      i1.StoreEntityData(
+        id: id ?? this.id,
+        intValue: intValue.present ? intValue.value : this.intValue,
+        strValue: strValue.present ? strValue.value : this.strValue,
+      );
+  StoreEntityData copyWithCompanion(i1.StoreEntityCompanion data) {
+    return StoreEntityData(
+      id: data.id.present ? data.id.value : this.id,
+      intValue: data.intValue.present ? data.intValue.value : this.intValue,
+      strValue: data.strValue.present ? data.strValue.value : this.strValue,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('StoreEntityData(')
+          ..write('id: $id, ')
+          ..write('intValue: $intValue, ')
+          ..write('strValue: $strValue')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(id, intValue, strValue);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is i1.StoreEntityData &&
+          other.id == this.id &&
+          other.intValue == this.intValue &&
+          other.strValue == this.strValue);
+}
+
+class StoreEntityCompanion extends i0.UpdateCompanion<i1.StoreEntityData> {
+  final i0.Value<int> id;
+  final i0.Value<int?> intValue;
+  final i0.Value<String?> strValue;
+  const StoreEntityCompanion({
+    this.id = const i0.Value.absent(),
+    this.intValue = const i0.Value.absent(),
+    this.strValue = const i0.Value.absent(),
+  });
+  StoreEntityCompanion.insert({
+    required int id,
+    this.intValue = const i0.Value.absent(),
+    this.strValue = const i0.Value.absent(),
+  }) : id = i0.Value(id);
+  static i0.Insertable<i1.StoreEntityData> custom({
+    i0.Expression<int>? id,
+    i0.Expression<int>? intValue,
+    i0.Expression<String>? strValue,
+  }) {
+    return i0.RawValuesInsertable({
+      if (id != null) 'id': id,
+      if (intValue != null) 'int_value': intValue,
+      if (strValue != null) 'str_value': strValue,
+    });
+  }
+
+  i1.StoreEntityCompanion copyWith(
+      {i0.Value<int>? id,
+      i0.Value<int?>? intValue,
+      i0.Value<String?>? strValue}) {
+    return i1.StoreEntityCompanion(
+      id: id ?? this.id,
+      intValue: intValue ?? this.intValue,
+      strValue: strValue ?? this.strValue,
+    );
+  }
+
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    if (id.present) {
+      map['id'] = i0.Variable<int>(id.value);
+    }
+    if (intValue.present) {
+      map['int_value'] = i0.Variable<int>(intValue.value);
+    }
+    if (strValue.present) {
+      map['str_value'] = i0.Variable<String>(strValue.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('StoreEntityCompanion(')
+          ..write('id: $id, ')
+          ..write('intValue: $intValue, ')
+          ..write('strValue: $strValue')
+          ..write(')'))
+        .toString();
+  }
+}

mobile/lib/infrastructure/repositories/api.repository.dart

@@ -5,7 +5,7 @@ class ApiRepository {
 
   Future<T> checkNull<T>(Future<T?> future) async {
     final response = await future;
-    if (response == null) throw NoResponseDtoError();
+    if (response == null) throw const NoResponseDtoError();
     return response;
   }
 }

mobile/lib/infrastructure/repositories/db.repository.dart

@@ -7,8 +7,13 @@ import 'package:immich_mobile/infrastructure/entities/exif.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_album.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_album_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/log.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/partner.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_album.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.dart';
 import 'package:isar/isar.dart';
@@ -40,6 +45,11 @@ class IsarDatabaseRepository implements IDatabaseRepository {
     LocalAlbumAssetEntity,
     RemoteAssetEntity,
     RemoteExifEntity,
+    RemoteAlbumEntity,
+    RemoteAlbumAssetEntity,
+    RemoteAlbumUserEntity,
+    StoreEntity,
+    LoggerMessageEntity,
   ],
   include: {
     'package:immich_mobile/infrastructure/entities/merged_asset.drift',

mobile/lib/infrastructure/repositories/db.repository.drift.dart

@@ -17,9 +17,19 @@ import 'package:immich_mobile/infrastructure/entities/local_album_asset.entity.d
     as i7;
 import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart'
     as i8;
-import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
+import 'package:immich_mobile/infrastructure/entities/remote_album.entity.drift.dart'
     as i9;
-import 'package:drift/internal/modular.dart' as i10;
+import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.drift.dart'
+    as i10;
+import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.drift.dart'
+    as i11;
+import 'package:immich_mobile/infrastructure/entities/store.entity.drift.dart'
+    as i12;
+import 'package:immich_mobile/infrastructure/entities/log.entity.drift.dart'
+    as i13;
+import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
+    as i14;
+import 'package:drift/internal/modular.dart' as i15;
 
 abstract class $Drift extends i0.GeneratedDatabase {
   $Drift(i0.QueryExecutor e) : super(e);
@@ -39,8 +49,17 @@ abstract class $Drift extends i0.GeneratedDatabase {
       i7.$LocalAlbumAssetEntityTable(this);
   late final i8.$RemoteExifEntityTable remoteExifEntity =
       i8.$RemoteExifEntityTable(this);
-  i9.MergedAssetDrift get mergedAssetDrift => i10.ReadDatabaseContainer(this)
+  late final i9.$RemoteAlbumEntityTable remoteAlbumEntity =
-      .accessor<i9.MergedAssetDrift>(i9.MergedAssetDrift.new);
+      i9.$RemoteAlbumEntityTable(this);
+  late final i10.$RemoteAlbumAssetEntityTable remoteAlbumAssetEntity =
+      i10.$RemoteAlbumAssetEntityTable(this);
+  late final i11.$RemoteAlbumUserEntityTable remoteAlbumUserEntity =
+      i11.$RemoteAlbumUserEntityTable(this);
+  late final i12.$StoreEntityTable storeEntity = i12.$StoreEntityTable(this);
+  late final i13.$LoggerMessageEntityTable loggerMessageEntity =
+      i13.$LoggerMessageEntityTable(this);
+  i14.MergedAssetDrift get mergedAssetDrift => i15.ReadDatabaseContainer(this)
+      .accessor<i14.MergedAssetDrift>(i14.MergedAssetDrift.new);
   @override
   Iterable<i0.TableInfo<i0.Table, Object?>> get allTables =>
       allSchemaEntities.whereType<i0.TableInfo<i0.Table, Object?>>();
@@ -56,7 +75,12 @@ abstract class $Drift extends i0.GeneratedDatabase {
         partnerEntity,
         localAlbumEntity,
         localAlbumAssetEntity,
-        remoteExifEntity
+        remoteExifEntity,
+        remoteAlbumEntity,
+        remoteAlbumAssetEntity,
+        remoteAlbumUserEntity,
+        storeEntity,
+        loggerMessageEntity
       ];
   @override
   i0.StreamQueryUpdateRules get streamUpdateRules =>
@@ -114,6 +138,52 @@ abstract class $Drift extends i0.GeneratedDatabase {
               i0.TableUpdate('remote_exif_entity', kind: i0.UpdateKind.delete),
             ],
           ),
+          i0.WritePropagation(
+            on: i0.TableUpdateQuery.onTableName('user_entity',
+                limitUpdateKind: i0.UpdateKind.delete),
+            result: [
+              i0.TableUpdate('remote_album_entity', kind: i0.UpdateKind.delete),
+            ],
+          ),
+          i0.WritePropagation(
+            on: i0.TableUpdateQuery.onTableName('remote_asset_entity',
+                limitUpdateKind: i0.UpdateKind.delete),
+            result: [
+              i0.TableUpdate('remote_album_entity', kind: i0.UpdateKind.update),
+            ],
+          ),
+          i0.WritePropagation(
+            on: i0.TableUpdateQuery.onTableName('remote_asset_entity',
+                limitUpdateKind: i0.UpdateKind.delete),
+            result: [
+              i0.TableUpdate('remote_album_asset_entity',
+                  kind: i0.UpdateKind.delete),
+            ],
+          ),
+          i0.WritePropagation(
+            on: i0.TableUpdateQuery.onTableName('remote_album_entity',
+                limitUpdateKind: i0.UpdateKind.delete),
+            result: [
+              i0.TableUpdate('remote_album_asset_entity',
+                  kind: i0.UpdateKind.delete),
+            ],
+          ),
+          i0.WritePropagation(
+            on: i0.TableUpdateQuery.onTableName('remote_album_entity',
+                limitUpdateKind: i0.UpdateKind.delete),
+            result: [
+              i0.TableUpdate('remote_album_user_entity',
+                  kind: i0.UpdateKind.delete),
+            ],
+          ),
+          i0.WritePropagation(
+            on: i0.TableUpdateQuery.onTableName('user_entity',
+                limitUpdateKind: i0.UpdateKind.delete),
+            result: [
+              i0.TableUpdate('remote_album_user_entity',
+                  kind: i0.UpdateKind.delete),
+            ],
+          ),
         ],
       );
   @override
@@ -140,4 +210,15 @@ class $DriftManager {
       .$$LocalAlbumAssetEntityTableTableManager(_db, _db.localAlbumAssetEntity);
   i8.$$RemoteExifEntityTableTableManager get remoteExifEntity =>
       i8.$$RemoteExifEntityTableTableManager(_db, _db.remoteExifEntity);
+  i9.$$RemoteAlbumEntityTableTableManager get remoteAlbumEntity =>
+      i9.$$RemoteAlbumEntityTableTableManager(_db, _db.remoteAlbumEntity);
+  i10.$$RemoteAlbumAssetEntityTableTableManager get remoteAlbumAssetEntity =>
+      i10.$$RemoteAlbumAssetEntityTableTableManager(
+          _db, _db.remoteAlbumAssetEntity);
+  i11.$$RemoteAlbumUserEntityTableTableManager get remoteAlbumUserEntity => i11
+      .$$RemoteAlbumUserEntityTableTableManager(_db, _db.remoteAlbumUserEntity);
+  i12.$$StoreEntityTableTableManager get storeEntity =>
+      i12.$$StoreEntityTableTableManager(_db, _db.storeEntity);
+  i13.$$LoggerMessageEntityTableTableManager get loggerMessageEntity =>
+      i13.$$LoggerMessageEntityTableTableManager(_db, _db.loggerMessageEntity);
 }

mobile/lib/infrastructure/repositories/drift_store.repository.dart

@@ -0,0 +1,145 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/store.model.dart';
+import 'package:immich_mobile/domain/models/user.model.dart';
+import 'package:immich_mobile/infrastructure/entities/store.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/drift_user.repository.dart';
+import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
+
+final driftStoreRepositoryProvider = Provider<DriftStoreRepository>(
+  (ref) => DriftStoreRepository(ref.watch(driftProvider)),
+);
+
+class DriftStoreRepository implements IStoreRepository {
+  final Drift _db;
+  final validStoreKeys = StoreKey.values.map((e) => e.id).toSet();
+
+  DriftStoreRepository(this._db);
+
+  @override
+  Future<bool> deleteAll() async {
+    return await _db.transaction(() async {
+      await _db.delete(_db.storeEntity).go();
+      return true;
+    });
+  }
+
+  @override
+  Stream<StoreDto<Object>> watchAll() {
+    return (_db.select(_db.storeEntity)
+          ..where((tbl) => tbl.id.isIn(validStoreKeys)))
+        .watch()
+        .asyncExpand(
+          (entities) => Stream.fromFutures(
+            entities.map((e) async => _toUpdateEvent(e)),
+          ),
+        );
+  }
+
+  @override
+  Future<void> delete<T>(StoreKey<T> key) async {
+    return await _db.transaction(() async {
+      await (_db.delete(_db.storeEntity)..where((tbl) => tbl.id.equals(key.id)))
+          .go();
+    });
+  }
+
+  @override
+  Future<bool> insert<T>(StoreKey<T> key, T value) async {
+    return await _db.transaction(() async {
+      await _db
+          .into(_db.storeEntity)
+          .insertOnConflictUpdate(await _fromValue(key, value));
+      return true;
+    });
+  }
+
+  @override
+  Future<T?> tryGet<T>(StoreKey<T> key) async {
+    final entity = await (_db.select(_db.storeEntity)
+          ..where((tbl) => tbl.id.equals(key.id)))
+        .getSingleOrNull();
+    if (entity == null) {
+      return null;
+    }
+    return await _toValue(key, entity);
+  }
+
+  @override
+  Future<bool> update<T>(StoreKey<T> key, T value) async {
+    return await _db.transaction(() async {
+      await _db
+          .into(_db.storeEntity)
+          .insertOnConflictUpdate(await _fromValue(key, value));
+      return true;
+    });
+  }
+
+  @override
+  Stream<T?> watch<T>(StoreKey<T> key) async* {
+    yield* (_db.select(_db.storeEntity)..where((tbl) => tbl.id.equals(key.id)))
+        .watchSingleOrNull()
+        .asyncMap((e) async => e == null ? null : await _toValue(key, e));
+  }
+
+  Future<StoreDto<Object>> _toUpdateEvent(StoreEntityData entity) async {
+    final key = StoreKey.values.firstWhere((e) => e.id == entity.id)
+        as StoreKey<Object>;
+    final value = await _toValue(key, entity);
+    return StoreDto(key, value);
+  }
+
+  Future<T?> _toValue<T>(StoreKey<T> key, StoreEntityData entity) async =>
+      switch (key.type) {
+        const (int) => entity.intValue,
+        const (String) => entity.strValue,
+        const (bool) => entity.intValue == 1,
+        const (DateTime) => entity.intValue == null
+            ? null
+            : DateTime.fromMillisecondsSinceEpoch(entity.intValue!),
+        const (UserDto) => entity.strValue == null
+            ? null
+            : await DriftUserRepository(_db).getByUserId(entity.strValue!),
+        _ => null,
+      } as T?;
+
+  Future<StoreEntityData> _fromValue<T>(StoreKey<T> key, T value) async {
+    final (int? intValue, String? strValue) = switch (key.type) {
+      const (int) => (value as int, null),
+      const (String) => (null, value as String),
+      const (bool) => ((value as bool) ? 1 : 0, null),
+      const (DateTime) => ((value as DateTime).millisecondsSinceEpoch, null),
+      const (UserDto) => (
+          null,
+          (await DriftUserRepository(_db).update(value as UserDto)).id,
+        ),
+      _ => throw UnsupportedError(
+          "Unsupported primitive type: ${key.type} for key: ${key.name}",
+        ),
+    };
+    return StoreEntityData(
+      id: key.id,
+      intValue: intValue,
+      strValue: strValue,
+    );
+  }
+
+  @override
+  Future<List<StoreDto<Object>>> getAll() async {
+    final entities = await (_db.select(_db.storeEntity)
+          ..where((tbl) => tbl.id.isIn(validStoreKeys)))
+        .get();
+    return Future.wait(entities.map((e) => _toUpdateEvent(e)).toList());
+  }
+}
+
+abstract class IStoreRepository {
+  Future<bool> deleteAll();
+  Stream<StoreDto<Object>> watchAll();
+  Future<void> delete<T>(StoreKey<T> key);
+  Future<bool> insert<T>(StoreKey<T> key, T value);
+  Future<T?> tryGet<T>(StoreKey<T> key);
+  Future<bool> update<T>(StoreKey<T> key, T value);
+  Stream<T?> watch<T>(StoreKey<T> key);
+  Future<List<StoreDto<Object>>> getAll();
+}

mobile/lib/infrastructure/repositories/drift_user.repository.dart

@@ -0,0 +1,117 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/models/user.model.dart';
+import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart';
+import 'package:immich_mobile/domain/models/user_metadata.model.dart';
+
+class DriftUserRepository {
+  final Drift _db;
+  const DriftUserRepository(this._db);
+
+  Future<void> delete(List<String> ids) async {
+    await _db.transaction(() async {
+      await (_db.delete(_db.userEntity)..where((tbl) => tbl.id.isIn(ids))).go();
+    });
+  }
+
+  Future<void> deleteAll() async {
+    await _db.transaction(() async {
+      await _db.delete(_db.userEntity).go();
+    });
+  }
+
+  Future<List<UserDto>> getAll({SortUserBy? sortBy}) async {
+    var query = _db.select(_db.userEntity);
+
+    if (sortBy != null) {
+      switch (sortBy) {
+        case SortUserBy.id:
+          query = query..orderBy([(u) => OrderingTerm.asc(u.id)]);
+      }
+    }
+
+    final users = await query.get();
+    return users.map((u) => _toDto(u)).toList();
+  }
+
+  Future<UserDto?> getByUserId(String id) async {
+    final user = await (_db.select(_db.userEntity)
+          ..where((tbl) => tbl.id.equals(id)))
+        .getSingleOrNull();
+    return user != null ? _toDto(user) : null;
+  }
+
+  Future<List<UserDto?>> getByUserIds(List<String> ids) async {
+    final users = await (_db.select(_db.userEntity)
+          ..where((tbl) => tbl.id.isIn(ids)))
+        .get();
+
+    // Create a map for quick lookup
+    final userMap = {for (var user in users) user.id: _toDto(user)};
+
+    // Return results in the same order as input ids
+    return ids.map((id) => userMap[id]).toList();
+  }
+
+  Future<bool> insert(UserDto user) async {
+    await _db.transaction(() async {
+      await _db.into(_db.userEntity).insertOnConflictUpdate(_fromDto(user));
+    });
+    return true;
+  }
+
+  Future<UserDto> update(UserDto user) async {
+    await _db.transaction(() async {
+      await _db.into(_db.userEntity).insertOnConflictUpdate(_fromDto(user));
+    });
+    return user;
+  }
+
+  Future<bool> updateAll(List<UserDto> users) async {
+    await _db.transaction(() async {
+      await _db.batch((batch) {
+        for (final user in users) {
+          batch.insert(_db.userEntity, _fromDto(user),
+              mode: InsertMode.insertOrReplace);
+        }
+      });
+    });
+    return true;
+  }
+
+  UserDto _toDto(UserEntityData entity) {
+    return UserDto(
+      id: entity.id,
+      updatedAt: entity.updatedAt,
+      email: entity.email,
+      name: entity.name,
+      isAdmin: entity.isAdmin,
+      profileImagePath: entity.profileImagePath ?? '',
+      // Note: These fields are not in the current UserEntity table but are in UserDto
+      // You may need to add them to the table or provide defaults
+      isPartnerSharedBy: false,
+      isPartnerSharedWith: false,
+      avatarColor: AvatarColor.primary,
+      memoryEnabled: true,
+      inTimeline: false,
+      quotaUsageInBytes: entity.quotaUsageInBytes,
+      quotaSizeInBytes: entity.quotaSizeInBytes ?? 0,
+    );
+  }
+
+  UserEntityCompanion _fromDto(UserDto dto) {
+    return UserEntityCompanion(
+      id: Value(dto.id),
+      name: Value(dto.name),
+      isAdmin: Value(dto.isAdmin),
+      email: Value(dto.email),
+      profileImagePath: Value.absentIfNull(
+          dto.profileImagePath?.isEmpty == true ? null : dto.profileImagePath),
+      updatedAt: Value(dto.updatedAt),
+      quotaSizeInBytes: Value.absentIfNull(
+          dto.quotaSizeInBytes == 0 ? null : dto.quotaSizeInBytes),
+      quotaUsageInBytes: Value(dto.quotaUsageInBytes),
+    );
+  }
+}

mobile/lib/infrastructure/repositories/local_album.repository.dart

@@ -1,6 +1,6 @@
 import 'package:drift/drift.dart';
+import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/domain/models/local_album.model.dart';
 import 'package:immich_mobile/infrastructure/entities/local_album.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/local_album_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart';

mobile/lib/infrastructure/repositories/log.repository.dart

@@ -1,46 +1,99 @@
+import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
-import 'package:immich_mobile/infrastructure/entities/log.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/log.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
-import 'package:isar/isar.dart';
+import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 
-class IsarLogRepository extends IsarDatabaseRepository {
+final driftLogRepositoryProvider = Provider<LogRepository>(
-  final Isar _db;
+  (ref) => LogRepository(ref.watch(driftProvider)),
-  const IsarLogRepository(super.db) : _db = db;
+);
+
+class LogRepository {
+  final Drift _db;
+
+  const LogRepository(this._db);
 
   Future<bool> deleteAll() async {
-    await transaction(() async => await _db.loggerMessages.clear());
+    await _db.transaction(() async {
+      await _db.delete(_db.loggerMessageEntity).go();
+    });
     return true;
   }
 
   Future<List<LogMessage>> getAll() async {
-    final logs =
+    final query = _db.select(_db.loggerMessageEntity)
-        await _db.loggerMessages.where().sortByCreatedAtDesc().findAll();
+      ..orderBy([(t) => OrderingTerm.desc(t.createdAt)]);
-    return logs.map((l) => l.toDto()).toList();
+    final results = await query.get();
+    return results
+        .map(
+          (row) => LogMessage(
+            message: row.message,
+            level: row.level,
+            createdAt: row.createdAt,
+            logger: row.context1,
+            error: row.details,
+            stack: row.context2,
+          ),
+        )
+        .toList();
   }
 
   Future<bool> insert(LogMessage log) async {
-    final logEntity = LoggerMessage.fromDto(log);
+    await _db.transaction(() async {
-    await transaction(() async {
+      await _db.into(_db.loggerMessageEntity).insert(
-      await _db.loggerMessages.put(logEntity);
+            LoggerMessageEntityCompanion.insert(
+              id: 0, // Will be auto-incremented by the database
+              message: log.message,
+              details: Value(log.error),
+              level: log.level,
+              createdAt: log.createdAt,
+              context1: Value(log.logger),
+              context2: Value(log.stack),
+            ),
+          );
     });
     return true;
   }
 
   Future<bool> insertAll(Iterable<LogMessage> logs) async {
-    await transaction(() async {
+    await _db.transaction(() async {
-      final logEntities =
+      for (final log in logs) {
-          logs.map((log) => LoggerMessage.fromDto(log)).toList();
+        await _db.into(_db.loggerMessageEntity).insert(
-      await _db.loggerMessages.putAll(logEntities);
+              LoggerMessageEntityCompanion.insert(
+                id: 0, // Will be auto-incremented by the database
+                message: log.message,
+                details: Value(log.error),
+                level: log.level,
+                createdAt: log.createdAt,
+                context1: Value(log.logger),
+                context2: Value(log.stack),
+              ),
+            );
+      }
     });
     return true;
   }
 
   Future<void> truncate({int limit = 250}) async {
-    await transaction(() async {
+    await _db.transaction(() async {
-      final count = await _db.loggerMessages.count();
+      final countQuery = _db.selectOnly(_db.loggerMessageEntity)
+        ..addColumns([_db.loggerMessageEntity.id.count()]);
+      final countResult = await countQuery.getSingle();
+      final count = countResult.read(_db.loggerMessageEntity.id.count()) ?? 0;
+
       if (count <= limit) return;
+
       final toRemove = count - limit;
-      await _db.loggerMessages.where().limit(toRemove).deleteAll();
+      final oldestIds = await (_db.select(_db.loggerMessageEntity)
+            ..orderBy([(t) => OrderingTerm.asc(t.createdAt)])
+            ..limit(toRemove))
+          .get();
+
+      final idsToDelete = oldestIds.map((row) => row.id).toList();
+      await (_db.delete(_db.loggerMessageEntity)
+            ..where((tbl) => tbl.id.isIn(idsToDelete)))
+          .go();
     });
   }
 }

mobile/lib/infrastructure/repositories/remote_album.repository.dart

@@ -0,0 +1,45 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/domain/models/album/album.model.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_album.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+
+enum SortRemoteAlbumsBy { id }
+
+class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
+  final Drift _db;
+  const DriftRemoteAlbumRepository(this._db) : super(_db);
+
+  Future<List<Album>> getAll({Set<SortRemoteAlbumsBy> sortBy = const {}}) {
+    final query = _db.remoteAlbumEntity.select();
+
+    if (sortBy.isNotEmpty) {
+      final orderings = <OrderClauseGenerator<$RemoteAlbumEntityTable>>[];
+      for (final sort in sortBy) {
+        orderings.add(
+          switch (sort) {
+            SortRemoteAlbumsBy.id => (row) => OrderingTerm.asc(row.id),
+          },
+        );
+      }
+      query.orderBy(orderings);
+    }
+
+    return query.map((row) => row.toDto()).get();
+  }
+}
+
+extension on RemoteAlbumEntityData {
+  Album toDto() {
+    return Album(
+      id: id,
+      name: name,
+      ownerId: ownerId,
+      createdAt: createdAt,
+      updatedAt: updatedAt,
+      description: description,
+      thumbnailAssetId: thumbnailAssetId,
+      isActivityEnabled: isActivityEnabled,
+      order: order,
+    );
+  }
+}

mobile/lib/infrastructure/repositories/store.repository.dart

@@ -1,16 +1,19 @@
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
-import 'package:immich_mobile/infrastructure/entities/store.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/isar_store.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/user.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/drift_store.repository.dart';
 import 'package:isar/isar.dart';
 
-class IsarStoreRepository extends IsarDatabaseRepository {
+class IsarStoreRepository extends IsarDatabaseRepository
+    implements IStoreRepository {
   final Isar _db;
   final validStoreKeys = StoreKey.values.map((e) => e.id).toSet();
 
   IsarStoreRepository(super.db) : _db = db;
 
+  @override
   Future<bool> deleteAll() async {
     return await transaction(() async {
       await _db.storeValues.clear();
@@ -18,6 +21,7 @@ class IsarStoreRepository extends IsarDatabaseRepository {
     });
   }
 
+  @override
   Stream<StoreDto<Object>> watchAll() {
     return _db.storeValues
         .filter()
@@ -30,10 +34,12 @@ class IsarStoreRepository extends IsarDatabaseRepository {
         );
   }
 
+  @override
   Future<void> delete<T>(StoreKey<T> key) async {
     return await transaction(() async => await _db.storeValues.delete(key.id));
   }
 
+  @override
   Future<bool> insert<T>(StoreKey<T> key, T value) async {
     return await transaction(() async {
       await _db.storeValues.put(await _fromValue(key, value));
@@ -41,6 +47,7 @@ class IsarStoreRepository extends IsarDatabaseRepository {
     });
   }
 
+  @override
   Future<T?> tryGet<T>(StoreKey<T> key) async {
     final entity = (await _db.storeValues.get(key.id));
     if (entity == null) {
@@ -49,6 +56,7 @@ class IsarStoreRepository extends IsarDatabaseRepository {
     return await _toValue(key, entity);
   }
 
+  @override
   Future<bool> update<T>(StoreKey<T> key, T value) async {
     return await transaction(() async {
       await _db.storeValues.put(await _fromValue(key, value));
@@ -56,6 +64,7 @@ class IsarStoreRepository extends IsarDatabaseRepository {
     });
   }
 
+  @override
   Stream<T?> watch<T>(StoreKey<T> key) async* {
     yield* _db.storeValues
         .watchObject(key.id, fireImmediately: true)
@@ -100,6 +109,7 @@ class IsarStoreRepository extends IsarDatabaseRepository {
     return StoreValue(key.id, intValue: intValue, strValue: strValue);
   }
 
+  @override
   Future<List<StoreDto<Object>>> getAll() async {
     final entities = await _db.storeValues
         .filter()

mobile/lib/infrastructure/repositories/sync_api.repository.dart

@@ -42,11 +42,16 @@ class SyncApiRepository {
       SyncStreamDto(
         types: [
           SyncRequestType.usersV1,
-          SyncRequestType.partnersV1,
           SyncRequestType.assetsV1,
-          SyncRequestType.partnerAssetsV1,
           SyncRequestType.assetExifsV1,
+          SyncRequestType.partnersV1,
+          SyncRequestType.partnerAssetsV1,
           SyncRequestType.partnerAssetExifsV1,
+          SyncRequestType.albumsV1,
+          SyncRequestType.albumUsersV1,
+          SyncRequestType.albumAssetsV1,
+          SyncRequestType.albumAssetExifsV1,
+          SyncRequestType.albumToAssetsV1,
         ],
       ).toJson(),
     );
@@ -135,6 +140,25 @@ const _kResponseMap = <SyncEntityType, Function(Object)>{
   SyncEntityType.assetDeleteV1: SyncAssetDeleteV1.fromJson,
   SyncEntityType.assetExifV1: SyncAssetExifV1.fromJson,
   SyncEntityType.partnerAssetV1: SyncAssetV1.fromJson,
+  SyncEntityType.partnerAssetBackfillV1: SyncAssetV1.fromJson,
   SyncEntityType.partnerAssetDeleteV1: SyncAssetDeleteV1.fromJson,
   SyncEntityType.partnerAssetExifV1: SyncAssetExifV1.fromJson,
+  SyncEntityType.partnerAssetExifBackfillV1: SyncAssetExifV1.fromJson,
+  SyncEntityType.albumV1: SyncAlbumV1.fromJson,
+  SyncEntityType.albumDeleteV1: SyncAlbumDeleteV1.fromJson,
+  SyncEntityType.albumUserV1: SyncAlbumUserV1.fromJson,
+  SyncEntityType.albumUserBackfillV1: SyncAlbumUserV1.fromJson,
+  SyncEntityType.albumUserDeleteV1: SyncAlbumUserDeleteV1.fromJson,
+  SyncEntityType.albumAssetV1: SyncAssetV1.fromJson,
+  SyncEntityType.albumAssetBackfillV1: SyncAssetV1.fromJson,
+  SyncEntityType.albumAssetExifV1: SyncAssetExifV1.fromJson,
+  SyncEntityType.albumAssetExifBackfillV1: SyncAssetExifV1.fromJson,
+  SyncEntityType.albumToAssetV1: SyncAlbumToAssetV1.fromJson,
+  SyncEntityType.albumToAssetBackfillV1: SyncAlbumToAssetV1.fromJson,
+  SyncEntityType.albumToAssetDeleteV1: SyncAlbumToAssetDeleteV1.fromJson,
+  SyncEntityType.syncAckV1: _SyncAckV1.fromJson,
 };
+
+class _SyncAckV1 {
+  static _SyncAckV1? fromJson(dynamic _) => _SyncAckV1();
+}

mobile/lib/infrastructure/repositories/sync_stream.repository.dart

@@ -1,13 +1,17 @@
 import 'package:drift/drift.dart';
+import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/partner.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_album.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:logging/logging.dart';
-import 'package:openapi/api.dart' as api show AssetVisibility;
+import 'package:openapi/api.dart' as api show AssetVisibility, AlbumUserRole;
-import 'package:openapi/api.dart' hide AssetVisibility;
+import 'package:openapi/api.dart' hide AssetVisibility, AlbumUserRole;
 
 class SyncStreamRepository extends DriftDatabaseRepository {
   final Logger _logger = Logger('DriftSyncStreamRepository');
@@ -17,16 +21,10 @@ class SyncStreamRepository extends DriftDatabaseRepository {
 
   Future<void> deleteUsersV1(Iterable<SyncUserDeleteV1> data) async {
     try {
-      await _db.batch((batch) {
+      await _db.userEntity
-        for (final user in data) {
+          .deleteWhere((row) => row.id.isIn(data.map((e) => e.userId)));
-          batch.delete(
-            _db.userEntity,
-            UserEntityCompanion(id: Value(user.userId)),
-          );
-        }
-      });
     } catch (error, stack) {
-      _logger.severe('Error while processing SyncUserDeleteV1', error, stack);
+      _logger.severe('Error: SyncUserDeleteV1', error, stack);
       rethrow;
     }
   }
@@ -48,7 +46,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {
         }
       });
     } catch (error, stack) {
-      _logger.severe('Error while processing SyncUserV1', error, stack);
+      _logger.severe('Error: SyncUserV1', error, stack);
       rethrow;
     }
   }
@@ -67,7 +65,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {
         }
       });
     } catch (e, s) {
-      _logger.severe('Error while processing SyncPartnerDeleteV1', e, s);
+      _logger.severe('Error: SyncPartnerDeleteV1', e, s);
       rethrow;
     }
   }
@@ -90,67 +88,30 @@ class SyncStreamRepository extends DriftDatabaseRepository {
         }
       });
     } catch (e, s) {
-      _logger.severe('Error while processing SyncPartnerV1', e, s);
+      _logger.severe('Error: SyncPartnerV1', e, s);
       rethrow;
     }
   }
 
-  Future<void> deleteAssetsV1(Iterable<SyncAssetDeleteV1> data) async {
+  Future<void> deleteAssetsV1(
+    Iterable<SyncAssetDeleteV1> data, {
+    String debugLabel = 'user',
+  }) async {
     try {
-      await _deleteAssetsV1(data);
+      await _db.remoteAssetEntity
+          .deleteWhere((row) => row.id.isIn(data.map((e) => e.assetId)));
     } catch (e, s) {
-      _logger.severe('Error while processing deleteAssetsV1', e, s);
+      _logger.severe('Error: deleteAssetsV1 - $debugLabel', e, s);
       rethrow;
     }
   }
 
-  Future<void> updateAssetsV1(Iterable<SyncAssetV1> data) async {
+  Future<void> updateAssetsV1(
+    Iterable<SyncAssetV1> data, {
+    String debugLabel = 'user',
+  }) async {
     try {
-      await _updateAssetsV1(data);
+      await _db.batch((batch) {
-    } catch (e, s) {
-      _logger.severe('Error while processing updateAssetsV1', e, s);
-      rethrow;
-    }
-  }
-
-  Future<void> deletePartnerAssetsV1(Iterable<SyncAssetDeleteV1> data) async {
-    try {
-      await _deleteAssetsV1(data);
-    } catch (e, s) {
-      _logger.severe('Error while processing deletePartnerAssetsV1', e, s);
-      rethrow;
-    }
-  }
-
-  Future<void> updatePartnerAssetsV1(Iterable<SyncAssetV1> data) async {
-    try {
-      await _updateAssetsV1(data);
-    } catch (e, s) {
-      _logger.severe('Error while processing updatePartnerAssetsV1', e, s);
-      rethrow;
-    }
-  }
-
-  Future<void> updateAssetsExifV1(Iterable<SyncAssetExifV1> data) async {
-    try {
-      await _updateAssetExifV1(data);
-    } catch (e, s) {
-      _logger.severe('Error while processing updateAssetsExifV1', e, s);
-      rethrow;
-    }
-  }
-
-  Future<void> updatePartnerAssetsExifV1(Iterable<SyncAssetExifV1> data) async {
-    try {
-      await _updateAssetExifV1(data);
-    } catch (e, s) {
-      _logger.severe('Error while processing updatePartnerAssetsExifV1', e, s);
-      rethrow;
-    }
-  }
-
-  Future<void> _updateAssetsV1(Iterable<SyncAssetV1> data) =>
-      _db.batch((batch) {
         for (final asset in data) {
           final companion = RemoteAssetEntityCompanion(
             name: Value(asset.originalFileName),
@@ -175,19 +136,18 @@ class SyncStreamRepository extends DriftDatabaseRepository {
           );
         }
       });
+    } catch (e, s) {
+      _logger.severe('Error: updateAssetsV1 - $debugLabel', e, s);
+      rethrow;
+    }
+  }
 
-  Future<void> _deleteAssetsV1(Iterable<SyncAssetDeleteV1> assets) =>
+  Future<void> updateAssetsExifV1(
-      _db.batch((batch) {
+    Iterable<SyncAssetExifV1> data, {
-        for (final asset in assets) {
+    String debugLabel = 'user',
-          batch.delete(
+  }) async {
-            _db.remoteAssetEntity,
+    try {
-            RemoteAssetEntityCompanion(id: Value(asset.assetId)),
+      await _db.batch((batch) {
-          );
-        }
-      });
-
-  Future<void> _updateAssetExifV1(Iterable<SyncAssetExifV1> data) =>
-      _db.batch((batch) {
         for (final exif in data) {
           final companion = RemoteExifEntityCompanion(
             city: Value(exif.city),
@@ -219,6 +179,141 @@ class SyncStreamRepository extends DriftDatabaseRepository {
           );
         }
       });
+    } catch (e, s) {
+      _logger.severe('Error: updateAssetsExifV1 - $debugLabel', e, s);
+      rethrow;
+    }
+  }
+
+  Future<void> deleteAlbumsV1(Iterable<SyncAlbumDeleteV1> data) async {
+    try {
+      await _db.remoteAlbumEntity
+          .deleteWhere((row) => row.id.isIn(data.map((e) => e.albumId)));
+    } catch (e, s) {
+      _logger.severe('Error: deleteAlbumsV1', e, s);
+      rethrow;
+    }
+  }
+
+  Future<void> updateAlbumsV1(Iterable<SyncAlbumV1> data) async {
+    try {
+      await _db.batch((batch) {
+        for (final album in data) {
+          final companion = RemoteAlbumEntityCompanion(
+            name: Value(album.name),
+            description: Value(album.description),
+            isActivityEnabled: Value(album.isActivityEnabled),
+            order: Value(album.order.toAlbumAssetOrder()),
+            thumbnailAssetId: Value(album.thumbnailAssetId),
+            ownerId: Value(album.ownerId),
+            createdAt: Value(album.createdAt),
+            updatedAt: Value(album.updatedAt),
+          );
+
+          batch.insert(
+            _db.remoteAlbumEntity,
+            companion.copyWith(id: Value(album.id)),
+            onConflict: DoUpdate((_) => companion),
+          );
+        }
+      });
+    } catch (e, s) {
+      _logger.severe('Error: updateAlbumsV1', e, s);
+      rethrow;
+    }
+  }
+
+  Future<void> deleteAlbumUsersV1(Iterable<SyncAlbumUserDeleteV1> data) async {
+    try {
+      await _db.batch((batch) {
+        for (final album in data) {
+          batch.delete(
+            _db.remoteAlbumUserEntity,
+            RemoteAlbumUserEntityCompanion(
+              albumId: Value(album.albumId),
+              userId: Value(album.userId),
+            ),
+          );
+        }
+      });
+    } catch (e, s) {
+      _logger.severe('Error: deleteAlbumUsersV1', e, s);
+      rethrow;
+    }
+  }
+
+  Future<void> updateAlbumUsersV1(
+    Iterable<SyncAlbumUserV1> data, {
+    String debugLabel = 'user',
+  }) async {
+    try {
+      await _db.batch((batch) {
+        for (final album in data) {
+          final companion = RemoteAlbumUserEntityCompanion(
+            role: Value(album.role.toAlbumUserRole()),
+          );
+
+          batch.insert(
+            _db.remoteAlbumUserEntity,
+            companion.copyWith(
+              albumId: Value(album.albumId),
+              userId: Value(album.userId),
+            ),
+            onConflict: DoUpdate((_) => companion),
+          );
+        }
+      });
+    } catch (e, s) {
+      _logger.severe('Error: updateAlbumUsersV1 - $debugLabel', e, s);
+      rethrow;
+    }
+  }
+
+  Future<void> deleteAlbumToAssetsV1(
+    Iterable<SyncAlbumToAssetDeleteV1> data,
+  ) async {
+    try {
+      await _db.batch((batch) {
+        for (final album in data) {
+          batch.delete(
+            _db.remoteAlbumAssetEntity,
+            RemoteAlbumAssetEntityCompanion(
+              albumId: Value(album.albumId),
+              assetId: Value(album.assetId),
+            ),
+          );
+        }
+      });
+    } catch (e, s) {
+      _logger.severe('Error: deleteAlbumToAssetsV1', e, s);
+      rethrow;
+    }
+  }
+
+  Future<void> updateAlbumToAssetsV1(
+    Iterable<SyncAlbumToAssetV1> data, {
+    String debugLabel = 'user',
+  }) async {
+    try {
+      await _db.batch((batch) {
+        for (final album in data) {
+          final companion = RemoteAlbumAssetEntityCompanion(
+            albumId: Value(album.albumId),
+            assetId: Value(album.assetId),
+          );
+
+          batch.insert(
+            _db.remoteAlbumAssetEntity,
+            companion,
+            onConflict: DoNothing(),
+          );
+        }
+      });
+    } catch (e, s) {
+      _logger.severe('Error: updateAlbumToAssetsV1 - $debugLabel', e, s);
+      rethrow;
+    }
+  }
 }
 
 extension on AssetTypeEnum {
@@ -231,6 +326,22 @@ extension on AssetTypeEnum {
       };
 }
 
+extension on AssetOrder {
+  AlbumAssetOrder toAlbumAssetOrder() => switch (this) {
+        AssetOrder.asc => AlbumAssetOrder.asc,
+        AssetOrder.desc => AlbumAssetOrder.desc,
+        _ => throw Exception('Unknown AssetOrder value: $this'),
+      };
+}
+
+extension on api.AlbumUserRole {
+  AlbumUserRole toAlbumUserRole() => switch (this) {
+        api.AlbumUserRole.editor => AlbumUserRole.editor,
+        api.AlbumUserRole.viewer => AlbumUserRole.viewer,
+        _ => throw Exception('Unknown AlbumUserRole value: $this'),
+      };
+}
+
 extension on api.AssetVisibility {
   AssetVisibility toAssetVisibility() => switch (this) {
         api.AssetVisibility.timeline => AssetVisibility.timeline,

mobile/lib/infrastructure/repositories/timeline.repository.dart

@@ -6,6 +6,7 @@ import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:stream_transform/stream_transform.dart';
 
@@ -14,6 +15,21 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
 
   const DriftTimelineRepository(super._db) : _db = _db;
 
+  Stream<List<String>> watchTimelineUserIds(String userId) {
+    final query = _db.partnerEntity.selectOnly()
+      ..addColumns([_db.partnerEntity.sharedById])
+      ..where(
+        _db.partnerEntity.inTimeline.equals(true) &
+            _db.partnerEntity.sharedWithId.equals(userId),
+      );
+
+    return query
+        .map((row) => row.read(_db.partnerEntity.sharedById)!)
+        .watch()
+        // Add current user ID to the list
+        .map((users) => users..add(userId));
+  }
+
   List<Bucket> _generateBuckets(int count) {
     final numBuckets = (count / kTimelineNoneSegmentSize).floor();
     final buckets = List.generate(
@@ -139,6 +155,62 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
         .map((row) => row.readTable(_db.localAssetEntity).toDto())
         .get();
   }
+
+  Stream<List<Bucket>> watchRemoteBucket(
+    String albumId, {
+    GroupAssetsBy groupBy = GroupAssetsBy.day,
+  }) {
+    if (groupBy == GroupAssetsBy.none) {
+      return _db.remoteAlbumAssetEntity
+          .count(where: (row) => row.albumId.equals(albumId))
+          .map(_generateBuckets)
+          .watchSingle();
+    }
+
+    final assetCountExp = _db.remoteAssetEntity.id.count();
+    final dateExp = _db.remoteAssetEntity.createdAt.dateFmt(groupBy);
+
+    final query = _db.remoteAssetEntity.selectOnly()
+      ..addColumns([assetCountExp, dateExp])
+      ..join([
+        innerJoin(
+          _db.remoteAlbumAssetEntity,
+          _db.remoteAlbumAssetEntity.assetId
+              .equalsExp(_db.remoteAssetEntity.id),
+        ),
+      ])
+      ..where(_db.remoteAlbumAssetEntity.albumId.equals(albumId))
+      ..groupBy([dateExp])
+      ..orderBy([OrderingTerm.desc(dateExp)]);
+
+    return query.map((row) {
+      final timeline = row.read(dateExp)!.dateFmt(groupBy);
+      final assetCount = row.read(assetCountExp)!;
+      return TimeBucket(date: timeline, assetCount: assetCount);
+    }).watch();
+  }
+
+  Future<List<BaseAsset>> getRemoteBucketAssets(
+    String albumId, {
+    required int offset,
+    required int count,
+  }) {
+    final query = _db.remoteAssetEntity.select().join(
+      [
+        innerJoin(
+          _db.remoteAlbumAssetEntity,
+          _db.remoteAlbumAssetEntity.assetId
+              .equalsExp(_db.remoteAssetEntity.id),
+        ),
+      ],
+    )
+      ..where(_db.remoteAlbumAssetEntity.albumId.equals(albumId))
+      ..orderBy([OrderingTerm.desc(_db.remoteAssetEntity.createdAt)])
+      ..limit(count, offset: offset);
+    return query
+        .map((row) => row.readTable(_db.remoteAssetEntity).toDto())
+        .get();
+  }
 }
 
 extension on Expression<DateTime> {

mobile/lib/models/albums/album_viewer_page_state.model.dart

@@ -5,7 +5,7 @@ class AlbumViewerPageState {
   final String editTitleText;
   final String editDescriptionText;
 
-  AlbumViewerPageState({
+  const AlbumViewerPageState({
     required this.isEditAlbum,
     required this.editTitleText,
     required this.editDescriptionText,

mobile/lib/models/albums/asset_selection_page_result.model.dart

@@ -4,7 +4,7 @@ import 'package:immich_mobile/entities/asset.entity.dart';
 class AssetSelectionPageResult {
   final Set<Asset> selectedAssets;
 
-  AssetSelectionPageResult({
+  const AssetSelectionPageResult({
     required this.selectedAssets,
   });
   @override

mobile/lib/models/auth/auth_state.model.dart

@@ -7,7 +7,7 @@ class AuthState {
   final bool isAdmin;
   final String profileImagePath;
 
-  AuthState({
+  const AuthState({
     required this.deviceId,
     required this.userId,
     required this.userEmail,

mobile/lib/models/auth/auxilary_endpoint.model.dart

@@ -5,7 +5,7 @@ class AuxilaryEndpoint {
   final String url;
   final AuxCheckStatus status;
 
-  AuxilaryEndpoint({
+  const AuxilaryEndpoint({
     required this.url,
     required this.status,
   });
@@ -55,7 +55,7 @@ class AuxilaryEndpoint {
 
 class AuxCheckStatus {
   final String name;
-  AuxCheckStatus({
+  const AuxCheckStatus({
     required this.name,
   });
   const AuxCheckStatus._(this.name);

mobile/lib/models/auth/login_response.model.dart

@@ -13,7 +13,7 @@ class LoginResponse {
 
   final String userId;
 
-  LoginResponse({
+  const LoginResponse({
     required this.accessToken,
     required this.isAdmin,
     required this.name,

mobile/lib/models/backup/available_album.model.dart

@@ -4,7 +4,7 @@ class AvailableAlbum {
   final Album album;
   final int assetCount;
   final DateTime? lastBackup;
-  AvailableAlbum({
+  const AvailableAlbum({
     required this.album,
     required this.assetCount,
     this.lastBackup,

mobile/lib/models/backup/current_upload_asset.model.dart

@@ -9,7 +9,7 @@ class CurrentUploadAsset {
   final int? fileSize;
   final bool? iCloudAsset;
 
-  CurrentUploadAsset({
+  const CurrentUploadAsset({
     required this.id,
     required this.fileCreatedAt,
     required this.fileName,

mobile/lib/models/backup/success_upload_asset.model.dart

@@ -5,7 +5,7 @@ class SuccessUploadAsset {
   final String remoteAssetId;
   final bool isDuplicate;
 
-  SuccessUploadAsset({
+  const SuccessUploadAsset({
     required this.candidate,
     required this.remoteAssetId,
     required this.isDuplicate,

mobile/lib/models/download/download_state.model.dart

@@ -10,7 +10,7 @@ class DownloadInfo {
   // enum
   final TaskStatus status;
 
-  DownloadInfo({
+  const DownloadInfo({
     required this.fileName,
     required this.progress,
     required this.status,
@@ -71,7 +71,7 @@ class DownloadState {
   final TaskStatus downloadStatus;
   final Map<String, DownloadInfo> taskProgress;
   final bool showProgress;
-  DownloadState({
+  const DownloadState({
     required this.downloadStatus,
     required this.taskProgress,
     required this.showProgress,

mobile/lib/models/folder/recursive_folder.model.dart

@@ -3,7 +3,7 @@ import 'package:immich_mobile/models/folder/root_folder.model.dart';
 class RecursiveFolder extends RootFolder {
   final String name;
 
-  RecursiveFolder({
+  const RecursiveFolder({
     required this.name,
     required super.path,
     required super.subfolders,

mobile/lib/models/folder/root_folder.model.dart

@@ -4,7 +4,7 @@ class RootFolder {
   final List<RecursiveFolder> subfolders;
   final String path;
 
-  RootFolder({
+  const RootFolder({
     required this.subfolders,
     required this.path,
   });

mobile/lib/models/map/map_event.model.dart

@@ -8,4 +8,6 @@ class MapAssetsInBoundsUpdated extends MapEvent {
   const MapAssetsInBoundsUpdated(this.assetRemoteIds);
 }
 
-class MapCloseBottomSheet extends MapEvent {}
+class MapCloseBottomSheet extends MapEvent {
+  const MapCloseBottomSheet();
+}

mobile/lib/models/map/map_marker.model.dart

@@ -4,7 +4,7 @@ import 'package:openapi/api.dart';
 class MapMarker {
   final LatLng latLng;
   final String assetRemoteId;
-  MapMarker({
+  const MapMarker({
     required this.latLng,
     required this.assetRemoteId,
   });

mobile/lib/models/map/map_state.model.dart

@@ -11,7 +11,7 @@ class MapState {
   final AsyncValue<String> lightStyleFetched;
   final AsyncValue<String> darkStyleFetched;
 
-  MapState({
+  const MapState({
     this.themeMode = ThemeMode.system,
     this.showFavoriteOnly = false,
     this.includeArchived = false,

mobile/lib/models/memories/memory.model.dart

@@ -7,7 +7,7 @@ import 'package:immich_mobile/entities/asset.entity.dart';
 class Memory {
   final String title;
   final List<Asset> assets;
-  Memory({
+  const Memory({
     required this.title,
     required this.assets,
   });

mobile/lib/models/search/search_curated_content.model.dart

@@ -14,7 +14,7 @@ class SearchCuratedContent {
   /// The id to lookup the asset from the server
   final String id;
 
-  SearchCuratedContent({
+  const SearchCuratedContent({
     required this.label,
     required this.id,
     this.subtitle,

mobile/lib/models/search/search_result.model.dart

@@ -6,7 +6,7 @@ class SearchResult {
   final List<Asset> assets;
   final int? nextPage;
 
-  SearchResult({
+  const SearchResult({
     required this.assets,
     this.nextPage,
   });

mobile/lib/models/search/search_result_page_state.model.dart

@@ -8,7 +8,7 @@ class SearchResultPageState {
   final bool isSmart;
   final List<Asset> searchResult;
 
-  SearchResultPageState({
+  const SearchResultPageState({
     required this.isLoading,
     required this.isSuccess,
     required this.isError,

mobile/lib/models/server_info/server_info.model.dart

@@ -13,7 +13,7 @@ class ServerInfo {
   final bool isNewReleaseAvailable;
   final String versionMismatchErrorMessage;
 
-  ServerInfo({
+  const ServerInfo({
     required this.serverVersion,
     required this.latestVersion,
     required this.serverFeatures,

mobile/lib/pages/albums/albums.page.dart

@@ -105,7 +105,9 @@ class AlbumsPage extends HookConsumerWidget {
                   color: context.colorScheme.onSurface.withAlpha(0),
                   width: 0,
                 ),
-                borderRadius: BorderRadius.circular(24),
+                borderRadius: const BorderRadius.all(
+                  Radius.circular(24),
+                ),
                 gradient: LinearGradient(
                   colors: [
                     context.colorScheme.primary.withValues(alpha: 0.075),
@@ -301,7 +303,9 @@ class QuickFilterButton extends StatelessWidget {
         ),
         shape: WidgetStateProperty.all(
           RoundedRectangleBorder(
-            borderRadius: BorderRadius.circular(20),
+            borderRadius: const BorderRadius.all(
+              Radius.circular(20),
+            ),
             side: BorderSide(
               color: context.colorScheme.onSurface.withAlpha(25),
               width: 1,
@@ -334,8 +338,10 @@ class SortButton extends ConsumerWidget {
       style: MenuStyle(
         elevation: const WidgetStatePropertyAll(1),
         shape: WidgetStateProperty.all(
-          RoundedRectangleBorder(
+          const RoundedRectangleBorder(
-            borderRadius: BorderRadius.circular(24),
+            borderRadius: BorderRadius.all(
+              Radius.circular(24),
+            ),
           ),
         ),
         padding: const WidgetStatePropertyAll(
@@ -384,8 +390,10 @@ class SortButton extends ConsumerWidget {
                       : Colors.transparent,
                 ),
                 shape: WidgetStateProperty.all(
-                  RoundedRectangleBorder(
+                  const RoundedRectangleBorder(
-                    borderRadius: BorderRadius.circular(24),
+                    borderRadius: BorderRadius.all(
+                      Radius.circular(24),
+                    ),
                   ),
                 ),
               ),

mobile/lib/pages/backup/backup_album_selection.page.dart

@@ -246,8 +246,10 @@ class BackupAlbumSelectionPage extends HookConsumerWidget {
                         context: context,
                         builder: (BuildContext context) {
                           return AlertDialog(
-                            shape: RoundedRectangleBorder(
+                            shape: const RoundedRectangleBorder(
-                              borderRadius: BorderRadius.circular(10),
+                              borderRadius: BorderRadius.all(
+                                Radius.circular(10),
+                              ),
                             ),
                             elevation: 5,
                             title: Text(

mobile/lib/pages/backup/backup_controller.page.dart

@@ -147,7 +147,9 @@ class BackupControllerPage extends HookConsumerWidget {
         padding: const EdgeInsets.only(top: 8.0),
         child: Card(
           shape: RoundedRectangleBorder(
-            borderRadius: BorderRadius.circular(20),
+            borderRadius: const BorderRadius.all(
+              Radius.circular(20),
+            ),
             side: BorderSide(
               color: context.colorScheme.outlineVariant,
               width: 1,

mobile/lib/pages/backup/failed_backup_status.page.dart

@@ -42,9 +42,11 @@ class FailedBackupStatusPage extends HookConsumerWidget {
               vertical: 4,
             ),
             child: Card(
-              shape: RoundedRectangleBorder(
+              shape: const RoundedRectangleBorder(
-                borderRadius: BorderRadius.circular(15), // if you need this
+                borderRadius: BorderRadius.all(
-                side: const BorderSide(
+                  Radius.circular(15), // if you need this
+                ),
+                side: BorderSide(
                   color: Colors.black12,
                   width: 1,
                 ),

mobile/lib/pages/common/app_log_detail.page.dart

@@ -60,7 +60,9 @@ class AppLogDetailPage extends HookConsumerWidget {
             Container(
               decoration: BoxDecoration(
                 color: context.colorScheme.surfaceContainerHigh,
-                borderRadius: BorderRadius.circular(15.0),
+                borderRadius: const BorderRadius.all(
+                  Radius.circular(15.0),
+                ),
               ),
               child: Padding(
                 padding: const EdgeInsets.all(8.0),
@@ -99,7 +101,9 @@ class AppLogDetailPage extends HookConsumerWidget {
             Container(
               decoration: BoxDecoration(
                 color: context.colorScheme.surfaceContainerHigh,
-                borderRadius: BorderRadius.circular(15.0),
+                borderRadius: const BorderRadius.all(
+                  Radius.circular(15.0),
+                ),
               ),
               child: Padding(
                 padding: const EdgeInsets.all(8.0),

mobile/lib/pages/common/create_album.page.dart

@@ -120,8 +120,10 @@ class CreateAlbumPage extends HookConsumerWidget {
                 alignment: Alignment.centerLeft,
                 padding:
                     const EdgeInsets.symmetric(vertical: 24, horizontal: 16),
-                shape: RoundedRectangleBorder(
+                shape: const RoundedRectangleBorder(
-                  borderRadius: BorderRadius.circular(10),
+                  borderRadius: BorderRadius.all(
+                    Radius.circular(10),
+                  ),
                 ),
                 backgroundColor: context.colorScheme.surfaceContainerHigh,
               ),

mobile/lib/pages/common/download_panel.dart

@@ -90,8 +90,10 @@ class DownloadTaskTile extends StatelessWidget {
       width: context.width - 32,
       child: Card(
         clipBehavior: Clip.antiAlias,
-        shape: RoundedRectangleBorder(
+        shape: const RoundedRectangleBorder(
-          borderRadius: BorderRadius.circular(16),
+          borderRadius: BorderRadius.all(
+            Radius.circular(16),
+          ),
         ),
         child: ListTile(
           minVerticalPadding: 18,

mobile/lib/pages/common/settings.page.dart

@@ -3,6 +3,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/settings/advanced_settings.dart';
 import 'package:immich_mobile/widgets/settings/asset_list_settings/asset_list_settings.dart';
 import 'package:immich_mobile/widgets/settings/asset_viewer_settings/asset_viewer_settings.dart';
@@ -11,7 +12,6 @@ import 'package:immich_mobile/widgets/settings/language_settings.dart';
 import 'package:immich_mobile/widgets/settings/networking_settings/networking_settings.dart';
 import 'package:immich_mobile/widgets/settings/notification_setting.dart';
 import 'package:immich_mobile/widgets/settings/preference_settings/preference_setting.dart';
-import 'package:immich_mobile/routing/router.dart';
 
 enum SettingSection {
   advanced(
@@ -85,12 +85,13 @@ class SettingsPage extends StatelessWidget {
         centerTitle: false,
         title: const Text('settings').tr(),
       ),
-      body: context.isMobile ? _MobileLayout() : _TabletLayout(),
+      body: context.isMobile ? const _MobileLayout() : const _TabletLayout(),
     );
   }
 }
 
 class _MobileLayout extends StatelessWidget {
+  const _MobileLayout();
   @override
   Widget build(BuildContext context) {
     return ListView(
@@ -147,6 +148,7 @@ class _MobileLayout extends StatelessWidget {
 }
 
 class _TabletLayout extends HookWidget {
+  const _TabletLayout();
   @override
   Widget build(BuildContext context) {
     final selectedSection =

mobile/lib/pages/common/tab_shell.page.dart

@@ -0,0 +1,183 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/providers/asset_viewer/scroll_notifier.provider.dart';
+import 'package:immich_mobile/providers/multiselect.provider.dart';
+import 'package:immich_mobile/providers/search/search_input_focus.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
+import 'package:immich_mobile/providers/tab.provider.dart';
+
+@RoutePage()
+class TabShellPage extends ConsumerWidget {
+  const TabShellPage({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final isScreenLandscape = context.orientation == Orientation.landscape;
+
+    Widget buildIcon({required Widget icon, required bool isProcessing}) {
+      if (!isProcessing) return icon;
+      return Stack(
+        alignment: Alignment.center,
+        clipBehavior: Clip.none,
+        children: [
+          icon,
+          Positioned(
+            right: -18,
+            child: SizedBox(
+              height: 20,
+              width: 20,
+              child: CircularProgressIndicator(
+                strokeWidth: 2,
+                valueColor: AlwaysStoppedAnimation<Color>(
+                  context.primaryColor,
+                ),
+              ),
+            ),
+          ),
+        ],
+      );
+    }
+
+    void onNavigationSelected(TabsRouter router, int index) {
+      // On Photos page menu tapped
+      if (router.activeIndex == 0 && index == 0) {
+        scrollToTopNotifierProvider.scrollToTop();
+      }
+
+      // On Search page tapped
+      if (router.activeIndex == 1 && index == 1) {
+        ref.read(searchInputFocusProvider).requestFocus();
+      }
+
+      ref.read(hapticFeedbackProvider.notifier).selectionClick();
+      router.setActiveIndex(index);
+      ref.read(tabProvider.notifier).state = TabEnum.values[index];
+    }
+
+    final navigationDestinations = [
+      NavigationDestination(
+        label: 'photos'.tr(),
+        icon: const Icon(
+          Icons.photo_library_outlined,
+        ),
+        selectedIcon: buildIcon(
+          isProcessing: false,
+          icon: Icon(
+            Icons.photo_library,
+            color: context.primaryColor,
+          ),
+        ),
+      ),
+      NavigationDestination(
+        label: 'search'.tr(),
+        icon: const Icon(
+          Icons.search_rounded,
+        ),
+        selectedIcon: Icon(
+          Icons.search,
+          color: context.primaryColor,
+        ),
+      ),
+      NavigationDestination(
+        label: 'albums'.tr(),
+        icon: const Icon(
+          Icons.photo_album_outlined,
+        ),
+        selectedIcon: buildIcon(
+          isProcessing: false,
+          icon: Icon(
+            Icons.photo_album_rounded,
+            color: context.primaryColor,
+          ),
+        ),
+      ),
+      NavigationDestination(
+        label: 'library'.tr(),
+        icon: const Icon(
+          Icons.space_dashboard_outlined,
+        ),
+        selectedIcon: buildIcon(
+          isProcessing: false,
+          icon: Icon(
+            Icons.space_dashboard_rounded,
+            color: context.primaryColor,
+          ),
+        ),
+      ),
+    ];
+
+    Widget bottomNavigationBar(TabsRouter tabsRouter) {
+      return NavigationBar(
+        selectedIndex: tabsRouter.activeIndex,
+        onDestinationSelected: (index) =>
+            onNavigationSelected(tabsRouter, index),
+        destinations: navigationDestinations,
+      );
+    }
+
+    Widget navigationRail(TabsRouter tabsRouter) {
+      return NavigationRail(
+        destinations: navigationDestinations
+            .map(
+              (e) => NavigationRailDestination(
+                icon: e.icon,
+                label: Text(e.label),
+                selectedIcon: e.selectedIcon,
+              ),
+            )
+            .toList(),
+        onDestinationSelected: (index) =>
+            onNavigationSelected(tabsRouter, index),
+        selectedIndex: tabsRouter.activeIndex,
+        labelType: NavigationRailLabelType.all,
+        groupAlignment: 0.0,
+      );
+    }
+
+    final multiselectEnabled = ref.watch(multiselectProvider);
+    return AutoTabsRouter(
+      routes: [
+        const MainTimelineRoute(),
+        SearchRoute(),
+        const AlbumsRoute(),
+        const LibraryRoute(),
+      ],
+      duration: const Duration(milliseconds: 600),
+      transitionBuilder: (context, child, animation) => FadeTransition(
+        opacity: animation,
+        child: child,
+      ),
+      builder: (context, child) {
+        final tabsRouter = AutoTabsRouter.of(context);
+        final heroedChild = HeroControllerScope(
+          controller: HeroController(),
+          child: child,
+        );
+        return PopScope(
+          canPop: tabsRouter.activeIndex == 0,
+          onPopInvokedWithResult: (didPop, _) =>
+              !didPop ? tabsRouter.setActiveIndex(0) : null,
+          child: Scaffold(
+            resizeToAvoidBottomInset: false,
+            body: isScreenLandscape
+                ? Row(
+                    children: [
+                      navigationRail(tabsRouter),
+                      const VerticalDivider(),
+                      Expanded(child: heroedChild),
+                    ],
+                  )
+                : heroedChild,
+            bottomNavigationBar: multiselectEnabled || isScreenLandscape
+                ? null
+                : bottomNavigationBar(tabsRouter),
+          ),
+        );
+      },
+    );
+  }
+}

mobile/lib/pages/editing/edit.page.dart

@@ -124,7 +124,9 @@ class EditImagePage extends ConsumerWidget {
           ),
           child: Container(
             decoration: BoxDecoration(
-              borderRadius: BorderRadius.circular(7),
+              borderRadius: const BorderRadius.all(
+                Radius.circular(7),
+              ),
               boxShadow: [
                 BoxShadow(
                   color: Colors.black.withValues(alpha: 0.2),
@@ -135,7 +137,9 @@ class EditImagePage extends ConsumerWidget {
               ],
             ),
             child: ClipRRect(
-              borderRadius: BorderRadius.circular(7),
+              borderRadius: const BorderRadius.all(
+                Radius.circular(7),
+              ),
               child: Image(
                 image: image.image,
                 fit: BoxFit.contain,
@@ -149,7 +153,9 @@ class EditImagePage extends ConsumerWidget {
         margin: const EdgeInsets.only(bottom: 60, right: 10, left: 10, top: 10),
         decoration: BoxDecoration(
           color: context.scaffoldBackgroundColor,
-          borderRadius: BorderRadius.circular(30),
+          borderRadius: const BorderRadius.all(
+            Radius.circular(30),
+          ),
         ),
         child: Row(
           mainAxisAlignment: MainAxisAlignment.spaceEvenly,

mobile/lib/pages/editing/filter.page.dart

@@ -162,13 +162,17 @@ class _FilterButton extends StatelessWidget {
             width: 80,
             height: 80,
             decoration: BoxDecoration(
-              borderRadius: BorderRadius.circular(10),
+              borderRadius: const BorderRadius.all(
+                Radius.circular(10),
+              ),
               border: isSelected
                   ? Border.all(color: context.primaryColor, width: 3)
                   : null,
             ),
             child: ClipRRect(
-              borderRadius: BorderRadius.circular(10),
+              borderRadius: const BorderRadius.all(
+                Radius.circular(10),
+              ),
               child: ColorFiltered(
                 colorFilter: filter,
                 child: FittedBox(

mobile/lib/pages/library/library.page.dart

@@ -105,7 +105,9 @@ class QuickAccessButtons extends ConsumerWidget {
           color: context.colorScheme.onSurface.withAlpha(10),
           width: 1,
         ),
-        borderRadius: BorderRadius.circular(20),
+        borderRadius: const BorderRadius.all(
+          Radius.circular(20),
+        ),
         gradient: LinearGradient(
           colors: [
             context.colorScheme.primary.withAlpha(10),
@@ -240,7 +242,9 @@ class PeopleCollectionCard extends ConsumerWidget {
                 height: size,
                 width: size,
                 decoration: BoxDecoration(
-                  borderRadius: BorderRadius.circular(20),
+                  borderRadius: const BorderRadius.all(
+                    Radius.circular(20),
+                  ),
                   gradient: LinearGradient(
                     colors: [
                       context.colorScheme.primary.withAlpha(30),

mobile/lib/pages/library/partner/partner_detail.page.dart

@@ -80,7 +80,9 @@ class PartnerDetailPage extends HookConsumerWidget {
                 color: context.colorScheme.onSurface.withAlpha(10),
                 width: 1,
               ),
-              borderRadius: BorderRadius.circular(20),
+              borderRadius: const BorderRadius.all(
+                Radius.circular(20),
+              ),
               gradient: LinearGradient(
                 colors: [
                   context.colorScheme.primary.withAlpha(10),

mobile/lib/pages/library/places/places_collection.page.dart

@@ -143,7 +143,9 @@ class PlaceTile extends StatelessWidget {
         ),
       ),
       leading: ClipRRect(
-        borderRadius: BorderRadius.circular(20),
+        borderRadius: const BorderRadius.all(
+          Radius.circular(20),
+        ),
         child: CachedNetworkImage(
           width: 80,
           height: 80,