Infrastructure/immich
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2025-02-11 01:18:24 -05:00
Code Issues Activity

Merge branch 'feat/nullable-dates' of https://github.com/immich-app/immich into feat/inline-offline-check

Browse source
This commit is contained in:
Jonathan Jogenfors 2025-02-06 01:03:54 +01:00
commit f5e285ed4d
20 changed files with 26 additions and 196 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
server/src/queries/access.repository.sql
View file

@ -79,9 +79,6 @@ from
inner join "albums_assets_assets" as "albumAssets" on "albums"."id" = "albumAssets"."albumsId"
inner join "assets" on "assets"."id" = "albumAssets"."assetsId"
and "assets"."deletedAt" is null
and "assets"."fileCreatedAt" is not null
and "assets"."fileModifiedAt" is not null
and "assets"."localDateTime" is not null
left join "albums_shared_users_users" as "albumUsers" on "albumUsers"."albumsId" = "albums"."id"
left join "users" on "users"."id" = "albumUsers"."usersId"
and "users"."deletedAt" is null
@ -111,9 +108,6 @@ from
and "sharedBy"."deletedAt" is null
inner join "assets" on "assets"."ownerId" = "sharedBy"."id"
and "assets"."deletedAt" is null
and "assets"."fileCreatedAt" is not null
and "assets"."fileModifiedAt" is not null
and "assets"."localDateTime" is not null
where
"partner"."sharedWithId" = $1
and "assets"."isArchived" = $2
@ -132,9 +126,6 @@ from
left join "shared_link__asset" on "shared_link__asset"."sharedLinksId" = "shared_links"."id"
left join "assets" on "assets"."id" = "shared_link__asset"."assetsId"
and "assets"."deletedAt" is null
and "assets"."fileCreatedAt" is not null
and "assets"."fileModifiedAt" is not null
and "assets"."localDateTime" is not null
left join "albums_assets_assets" on "albums_assets_assets"."albumsId" = "albums"."id"
left join "assets" as "albumAssets" on "albumAssets"."id" = "albums_assets_assets"."assetsId"
and "albumAssets"."deletedAt" is null
@ -182,9 +173,6 @@ from
"asset_faces"
left join "assets" on "assets"."id" = "asset_faces"."assetId"
and "assets"."deletedAt" is null
and "assets"."fileCreatedAt" is not null
and "assets"."fileModifiedAt" is not null
and "assets"."localDateTime" is not null
where
"asset_faces"."id" in ($1)
and "assets"."ownerId" = $2

3
server/src/queries/activity.repository.sql
View file

@ -25,9 +25,6 @@ from
"activity"
left join "assets" on "assets"."id" = "activity"."assetId"
and "assets"."deletedAt" is null
and "assets"."fileCreatedAt" is not null
and "assets"."fileModifiedAt" is not null
and "assets"."localDateTime" is not null
where
"activity"."albumId" = $1
order by

6
server/src/queries/album.repository.sql
View file

@ -98,9 +98,6 @@ select
where
"albums_assets_assets"."albumsId" = "albums"."id"
and "assets"."deletedAt" is null
and "assets"."fileCreatedAt" is not null
and "assets"."fileModifiedAt" is not null
and "assets"."localDateTime" is not null
order by
"assets"."fileCreatedAt" desc
) as "asset"
@ -215,9 +212,6 @@ from
where
"albums"."id" in ($1)
and "assets"."deletedAt" is null
and "assets"."fileCreatedAt" is not null
and "assets"."fileModifiedAt" is not null
and "assets"."localDateTime" is not null
group by
"albums"."id"

19
server/src/queries/asset.repository.sql
View file

@ -47,9 +47,6 @@ with
and "asset_files"."type" = $6
)
and "assets"."deletedAt" is null
and "assets"."fileCreatedAt" is not null
and "assets"."fileModifiedAt" is not null
and "assets"."localDateTime" is not null
order by
(assets."localDateTime" at time zone 'UTC')::date desc
limit
@ -164,6 +161,7 @@ where
and "isVisible" = $3
and "assets"."fileCreatedAt" is not null
and "assets"."fileModifiedAt" is not null
and "assets"."localDateTime" is not null
and "deletedAt" is null
-- AssetRepository.getLivePhotoCount
@ -246,8 +244,6 @@ where
"assets"."sidecarPath" = $1
or "assets"."sidecarPath" is null
)
and "assets"."fileCreatedAt" is not null
and "assets"."fileModifiedAt" is not null
and "assets"."isVisible" = $2
and "deletedAt" is null
order by
@ -267,9 +263,6 @@ with
where
"assets"."deletedAt" is null
and "assets"."isVisible" = $2
and "assets"."fileCreatedAt" is not null
and "assets"."fileModifiedAt" is not null
and "assets"."localDateTime" is not null
)
select
"timeBucket",
@ -310,9 +303,6 @@ where
)
and "assets"."deletedAt" is null
and "assets"."isVisible" = $2
and "assets"."fileCreatedAt" is not null
and "assets"."fileModifiedAt" is not null
and "assets"."localDateTime" is not null
and date_trunc($3, "localDateTime" at time zone 'UTC') at time zone 'UTC' = $4
order by
"assets"."localDateTime" desc
@ -339,9 +329,6 @@ with
and "assets"."duplicateId" is not null
and "assets"."deletedAt" is null
and "assets"."isVisible" = $2
and "assets"."fileCreatedAt" is not null
and "assets"."fileModifiedAt" is not null
and "assets"."localDateTime" is not null
group by
"assets"."duplicateId"
),
@ -399,8 +386,6 @@ from
where
"ownerId" = $2::uuid
and "isVisible" = $3
and "assets"."fileCreatedAt" is not null
and "assets"."fileModifiedAt" is not null
and "isArchived" = $4
and "type" = $5
and "deletedAt" is null
@ -430,8 +415,6 @@ from
where
"assets"."ownerId" = $1::uuid
and "isVisible" = $2
and "assets"."fileCreatedAt" is not null
and "assets"."fileModifiedAt" is not null
and "updatedAt" <= $3
and "assets"."id" > $4
order by

6
server/src/queries/memory.repository.sql
View file

@ -26,9 +26,6 @@ select
where
"memories_assets_assets"."memoriesId" = "memories"."id"
and "assets"."deletedAt" is null
and "assets"."fileCreatedAt" is not null
and "assets"."fileModifiedAt" is not null
and "assets"."localDateTime" is not null
) as agg
) as "assets"
from
@ -59,9 +56,6 @@ select
where
"memories_assets_assets"."memoriesId" = "memories"."id"
and "assets"."deletedAt" is null
and "assets"."fileCreatedAt" is not null
and "assets"."fileModifiedAt" is not null
and "assets"."localDateTime" is not null
) as agg
) as "assets"
from

6
server/src/queries/person.repository.sql
View file

@ -169,9 +169,6 @@ from
and "asset_faces"."personId" = $1
and "assets"."isArchived" = $2
and "assets"."deletedAt" is null
and "assets"."fileCreatedAt" is not null
and "assets"."fileModifiedAt" is not null
and "assets"."localDateTime" is not null
and "assets"."livePhotoVideoId" is null
-- PersonRepository.getNumberOfPeople
@ -186,9 +183,6 @@ from
inner join "asset_faces" on "asset_faces"."personId" = "person"."id"
inner join "assets" on "assets"."id" = "asset_faces"."assetId"
and "assets"."deletedAt" is null
and "assets"."fileCreatedAt" is not null
and "assets"."fileModifiedAt" is not null
and "assets"."localDateTime" is not null
and "assets"."isArchived" = $2
where
"person"."ownerId" = $3

12
server/src/queries/search.repository.sql
View file

@ -110,9 +110,6 @@ with
"assets"."ownerId" = any ($2::uuid[])
and "assets"."deletedAt" is null
and "assets"."isVisible" = $3
and "assets"."fileCreatedAt" is not null
and "assets"."fileModifiedAt" is not null
and "assets"."localDateTime" is not null
and "assets"."type" = $4
and "assets"."id" != $5::uuid
order by
@ -141,9 +138,6 @@ with
where
"assets"."ownerId" = any ($2::uuid[])
and "assets"."deletedAt" is null
and "assets"."fileCreatedAt" is not null
and "assets"."fileModifiedAt" is not null
and "assets"."localDateTime" is not null
order by
face_search.embedding <=> $3
limit
@ -196,9 +190,6 @@ with recursive
and "assets"."isArchived" = $3
and "assets"."type" = $4
and "assets"."deletedAt" is null
and "assets"."fileCreatedAt" is not null
and "assets"."fileModifiedAt" is not null
and "assets"."localDateTime" is not null
order by
"city"
limit
@ -224,9 +215,6 @@ with recursive
and "assets"."isArchived" = $8
and "assets"."type" = $9
and "assets"."deletedAt" is null
and "assets"."fileCreatedAt" is not null
and "assets"."fileModifiedAt" is not null
and "assets"."localDateTime" is not null
and "exif"."city" > "cte"."city"
order by
"city"

9
server/src/queries/shared.link.repository.sql
View file

@ -31,9 +31,6 @@ from
where
"shared_links"."id" = "shared_link__asset"."sharedLinksId"
and "assets"."deletedAt" is null
and "assets"."fileCreatedAt" is not null
and "assets"."fileModifiedAt" is not null
and "assets"."localDateTime" is not null
order by
"assets"."fileCreatedAt" asc
) as "a" on true
@ -68,9 +65,6 @@ from
where
"albums_assets_assets"."assetsId" = "assets"."id"
and "assets"."deletedAt" is null
and "assets"."fileCreatedAt" is not null
and "assets"."fileModifiedAt" is not null
and "assets"."localDateTime" is not null
order by
"assets"."fileCreatedAt" asc
) as "assets" on true
@ -119,9 +113,6 @@ from
where
"assets"."id" = "shared_link__asset"."assetsId"
and "assets"."deletedAt" is null
and "assets"."fileCreatedAt" is not null
and "assets"."fileModifiedAt" is not null
and "assets"."localDateTime" is not null
) as "assets" on true
left join lateral (
select

9
server/src/queries/stack.repository.sql
View file

@ -23,9 +23,6 @@ select
) as "exifInfo" on true
where
"assets"."deletedAt" is null
and "assets"."fileCreatedAt" is not null
and "assets"."fileModifiedAt" is not null
and "assets"."localDateTime" is not null
and "assets"."stackId" = "asset_stack"."id"
) as agg
) as "assets"
@ -71,9 +68,6 @@ select
) as "exifInfo" on true
where
"assets"."deletedAt" is null
and "assets"."fileCreatedAt" is not null
and "assets"."fileModifiedAt" is not null
and "assets"."localDateTime" is not null
and "assets"."stackId" = "asset_stack"."id"
) as agg
) as "assets"
@ -119,9 +113,6 @@ select
) as "exifInfo" on true
where
"assets"."deletedAt" is null
and "assets"."fileCreatedAt" is not null
and "assets"."fileModifiedAt" is not null
and "assets"."localDateTime" is not null
and "assets"."stackId" = "asset_stack"."id"
) as agg
) as "assets"

6
server/src/queries/view.repository.sql
View file

@ -10,6 +10,9 @@ where
and "isVisible" = $3
and "isArchived" = $4
and "deletedAt" is null
and "fileModifiedAt" is not null
and "fileModifiedAt" is not null
and "localDateTime" is not null
-- ViewRepository.getAssetsByOriginalPath
select
@ -23,6 +26,9 @@ where
and "isVisible" = $2
and "isArchived" = $3
and "deletedAt" is null
and "fileModifiedAt" is not null
and "fileModifiedAt" is not null
and "localDateTime" is not null
and "originalPath" like $4
and "originalPath" not like $5
order by

28
server/src/repositories/access.repository.ts
View file

@ -138,12 +138,7 @@ class AssetAccess {
.selectFrom('albums')
.innerJoin('albums_assets_assets as albumAssets', 'albums.id', 'albumAssets.albumsId')
.innerJoin('assets', (join) =>
join
.onRef('assets.id', '=', 'albumAssets.assetsId')
.on('assets.deletedAt', 'is', null)
.on('assets.fileCreatedAt', 'is not', null)
.on('assets.fileModifiedAt', 'is not', null)
.on('assets.localDateTime', 'is not', null),
join.onRef('assets.id', '=', 'albumAssets.assetsId').on('assets.deletedAt', 'is', null),
)
.leftJoin('albums_shared_users_users as albumUsers', 'albumUsers.albumsId', 'albums.id')
.leftJoin('users', (join) => join.onRef('users.id', '=', 'albumUsers.usersId').on('users.deletedAt', 'is', null))
@ -199,12 +194,7 @@ class AssetAccess {
join.onRef('sharedBy.id', '=', 'partner.sharedById').on('sharedBy.deletedAt', 'is', null),
)
.innerJoin('assets', (join) =>
join
.onRef('assets.ownerId', '=', 'sharedBy.id')
.on('assets.deletedAt', 'is', null)
.on('assets.fileCreatedAt', 'is not', null)
.on('assets.fileModifiedAt', 'is not', null)
.on('assets.localDateTime', 'is not', null),
join.onRef('assets.ownerId', '=', 'sharedBy.id').on('assets.deletedAt', 'is', null),
)
.select('assets.id')
.where('partner.sharedWithId', '=', userId)
@ -228,12 +218,7 @@ class AssetAccess {
)
.leftJoin('shared_link__asset', 'shared_link__asset.sharedLinksId', 'shared_links.id')
.leftJoin('assets', (join) =>
join
.onRef('assets.id', '=', 'shared_link__asset.assetsId')
.on('assets.deletedAt', 'is', null)
.on('assets.fileCreatedAt', 'is not', null)
.on('assets.fileModifiedAt', 'is not', null)
.on('assets.localDateTime', 'is not', null),
join.onRef('assets.id', '=', 'shared_link__asset.assetsId').on('assets.deletedAt', 'is', null),
)
.leftJoin('albums_assets_assets', 'albums_assets_assets.albumsId', 'albums.id')
.leftJoin('assets as albumAssets', (join) =>
@ -384,12 +369,7 @@ class PersonAccess {
.selectFrom('asset_faces')
.select('asset_faces.id')
.leftJoin('assets', (join) =>
join
.onRef('assets.id', '=', 'asset_faces.assetId')
.on('assets.deletedAt', 'is', null)
.on('assets.fileCreatedAt', 'is not', null)
.on('assets.fileModifiedAt', 'is not', null)
.on('assets.localDateTime', 'is not', null),
join.onRef('assets.id', '=', 'asset_faces.assetId').on('assets.deletedAt', 'is', null),
)
.where('asset_faces.id', 'in', [...assetFaceIds])
.where('assets.ownerId', '=', userId)

9
server/src/repositories/activity.repository.ts
View file

@ -36,14 +36,7 @@ export class ActivityRepository {
.selectFrom('activity')
.selectAll('activity')
.select(withUser)
.leftJoin('assets', (join) =>
join
.onRef('assets.id', '=', 'activity.assetId')
.on('assets.deletedAt', 'is', null)
.on('assets.fileCreatedAt', 'is not', null)
.on('assets.fileModifiedAt', 'is not', null)
.on('assets.localDateTime', 'is not', null),
)
.leftJoin('assets', (join) => join.onRef('assets.id', '=', 'activity.assetId').on('assets.deletedAt', 'is', null))
.$if(!!userId, (qb) => qb.where('activity.userId', '=', userId!))
.$if(assetId === null, (qb) => qb.where('assetId', 'is', null))
.$if(!!assetId, (qb) => qb.where('activity.assetId', '=', assetId!))

13
server/src/repositories/album.repository.ts
View file

@ -63,9 +63,6 @@ const withAssets = (eb: ExpressionBuilder<DB, 'albums'>) => {
.innerJoin('albums_assets_assets', 'albums_assets_assets.assetsId', 'assets.id')
.whereRef('albums_assets_assets.albumsId', '=', 'albums.id')
.where('assets.deletedAt', 'is', null)
.where('assets.fileCreatedAt', 'is not', null)
.where('assets.fileModifiedAt', 'is not', null)
.where('assets.localDateTime', 'is not', null)
.orderBy('assets.fileCreatedAt', 'desc')
.as('asset'),
)
@ -135,9 +132,6 @@ export class AlbumRepository implements IAlbumRepository {
.select((eb) => sql<number>`${eb.fn.count('assets.id')}::int`.as('assetCount'))
.where('albums.id', 'in', ids)
.where('assets.deletedAt', 'is', null)
.where('assets.fileCreatedAt', 'is not', null)
.where('assets.fileModifiedAt', 'is not', null)
.where('assets.localDateTime', 'is not', null)
.groupBy('albums.id')
.execute();
}
@ -377,12 +371,7 @@ export class AlbumRepository implements IAlbumRepository {
return eb
.selectFrom('albums_assets_assets as album_assets')
.innerJoin('assets', (join) =>
join
.onRef('album_assets.assetsId', '=', 'assets.id')
.on('assets.deletedAt', 'is', null)
.on('assets.fileCreatedAt', 'is not', null)
.on('assets.fileModifiedAt', 'is not', null)
.on('assets.localDateTime', 'is not', null),
join.onRef('album_assets.assetsId', '=', 'assets.id').on('assets.deletedAt', 'is', null),
)
.whereRef('album_assets.albumsId', '=', 'albums.id');
}

33
server/src/repositories/asset.repository.ts
View file

@ -131,9 +131,6 @@ export class AssetRepository implements IAssetRepository {
),
)
.where('assets.deletedAt', 'is', null)
.where('assets.fileCreatedAt', 'is not', null)
.where('assets.fileModifiedAt', 'is not', null)
.where('assets.localDateTime', 'is not', null)
.orderBy(sql`(assets."localDateTime" at time zone 'UTC')::date`, 'desc')
.limit(20)
.as('a'),
@ -320,6 +317,7 @@ export class AssetRepository implements IAssetRepository {
.where('isVisible', '=', true)
.where('assets.fileCreatedAt', 'is not', null)
.where('assets.fileModifiedAt', 'is not', null)
.where('assets.localDateTime', 'is not', null)
.where('deletedAt', 'is', null)
.execute();
@ -493,7 +491,8 @@ export class AssetRepository implements IAssetRepository {
.where((eb) => eb.exists(eb.selectFrom('smart_search').where('assetId', '=', eb.ref('assets.id'))))
.where('assets.isVisible', '=', true)
.where('assets.fileCreatedAt', 'is not', null)
.where('assets.fileModifiedAt', 'is not', null),
.where('assets.fileModifiedAt', 'is not', null)
.where('assets.localDateTime', 'is not', null),
)
.$if(property === WithoutProperty.ENCODED_VIDEO, (qb) =>
qb
@ -511,23 +510,17 @@ export class AssetRepository implements IAssetRepository {
.innerJoin('asset_job_status as job_status', 'assetId', 'assets.id')
.where('job_status.previewAt', 'is not', null)
.where('job_status.facesRecognizedAt', 'is', null)
.where('assets.fileCreatedAt', 'is not', null)
.where('assets.fileModifiedAt', 'is not', null)
.where('assets.isVisible', '=', true),
)
.$if(property === WithoutProperty.SIDECAR, (qb) =>
qb
.where((eb) => eb.or([eb('assets.sidecarPath', '=', ''), eb('assets.sidecarPath', 'is', null)]))
.where('assets.fileCreatedAt', 'is not', null)
.where('assets.fileModifiedAt', 'is not', null)
.where('assets.isVisible', '=', true),
)
.$if(property === WithoutProperty.SMART_SEARCH, (qb) =>
qb
.innerJoin('asset_job_status as job_status', 'assetId', 'assets.id')
.where('job_status.previewAt', 'is not', null)
.where('assets.fileCreatedAt', 'is not', null)
.where('assets.fileModifiedAt', 'is not', null)
.where('assets.isVisible', '=', true)
.where((eb) =>
eb.not((eb) => eb.exists(eb.selectFrom('smart_search').whereRef('assetId', '=', 'assets.id'))),
@ -536,8 +529,6 @@ export class AssetRepository implements IAssetRepository {
.$if(property === WithoutProperty.THUMBNAIL, (qb) =>
qb
.innerJoin('asset_job_status as job_status', 'assetId', 'assets.id')
.where('assets.fileCreatedAt', 'is not', null)
.where('assets.fileModifiedAt', 'is not', null)
.where('assets.isVisible', '=', true)
.where((eb) =>
eb.or([
@ -577,8 +568,6 @@ export class AssetRepository implements IAssetRepository {
.where('ownerId', '=', anyUuid(ownerIds))
.where('latitude', 'is not', null)
.where('longitude', 'is not', null)
.where('assets.fileCreatedAt', 'is not', null)
.where('assets.fileModifiedAt', 'is not', null)
.where('isVisible', '=', true)
.where('deletedAt', 'is', null)
.$if(!!isArchived, (qb) => qb.where('isArchived', '=', isArchived!))
@ -599,6 +588,7 @@ export class AssetRepository implements IAssetRepository {
.where('ownerId', '=', asUuid(ownerId))
.where('assets.fileCreatedAt', 'is not', null)
.where('assets.fileModifiedAt', 'is not', null)
.where('assets.localDateTime', 'is not', null)
.where('isVisible', '=', true)
.$if(isArchived !== undefined, (qb) => qb.where('isArchived', '=', isArchived!))
.$if(isFavorite !== undefined, (qb) => qb.where('isFavorite', '=', isFavorite!))
@ -614,8 +604,6 @@ export class AssetRepository implements IAssetRepository {
.$call(withExif)
.where('ownerId', '=', anyUuid(userIds))
.where('isVisible', '=', true)
.where('assets.fileCreatedAt', 'is not', null)
.where('assets.fileModifiedAt', 'is not', null)
.where('deletedAt', 'is', null)
.orderBy((eb) => eb.fn('random'))
.limit(take)
@ -633,9 +621,6 @@ export class AssetRepository implements IAssetRepository {
.$if(!!options.isTrashed, (qb) => qb.where('assets.status', '!=', AssetStatus.DELETED))
.where('assets.deletedAt', options.isTrashed ? 'is not' : 'is', null)
.where('assets.isVisible', '=', true)
.where('assets.fileCreatedAt', 'is not', null)
.where('assets.fileModifiedAt', 'is not', null)
.where('assets.localDateTime', 'is not', null)
.$if(!!options.albumId, (qb) =>
qb
.innerJoin('albums_assets_assets', 'assets.id', 'albums_assets_assets.assetsId')
@ -714,9 +699,6 @@ export class AssetRepository implements IAssetRepository {
.$if(!!options.tagId, (qb) => withTagId(qb, options.tagId!))
.where('assets.deletedAt', options.isTrashed ? 'is not' : 'is', null)
.where('assets.isVisible', '=', true)
.where('assets.fileCreatedAt', 'is not', null)
.where('assets.fileModifiedAt', 'is not', null)
.where('assets.localDateTime', 'is not', null)
.where(truncatedDate(options.size), '=', timeBucket.replace(/^[+-]/, ''))
.orderBy('assets.localDateTime', options.order ?? 'desc')
.execute() as any as Promise<AssetEntity[]>;
@ -745,9 +727,6 @@ export class AssetRepository implements IAssetRepository {
.where('assets.duplicateId', 'is not', null)
.where('assets.deletedAt', 'is', null)
.where('assets.isVisible', '=', true)
.where('assets.fileCreatedAt', 'is not', null)
.where('assets.fileModifiedAt', 'is not', null)
.where('assets.localDateTime', 'is not', null)
.groupBy('assets.duplicateId'),
)
.with('unique', (qb) =>
@ -794,8 +773,6 @@ export class AssetRepository implements IAssetRepository {
.select(['assetId as data', 'exif.city as value'])
.where('ownerId', '=', asUuid(ownerId))
.where('isVisible', '=', true)
.where('assets.fileCreatedAt', 'is not', null)
.where('assets.fileModifiedAt', 'is not', null)
.where('isArchived', '=', false)
.where('type', '=', AssetType.IMAGE)
.where('deletedAt', 'is', null)
@ -836,8 +813,6 @@ export class AssetRepository implements IAssetRepository {
.select((eb) => eb.fn.toJson(eb.table('stacked_assets')).as('stack'))
.where('assets.ownerId', '=', asUuid(ownerId))
.where('isVisible', '=', true)
.where('assets.fileCreatedAt', 'is not', null)
.where('assets.fileModifiedAt', 'is not', null)
.where('updatedAt', '<=', updatedUntil)
.$if(!!lastId, (qb) => qb.where('assets.id', '>', lastId!))
.orderBy('assets.id')

5
server/src/repositories/memory.repository.ts
View file

@ -105,10 +105,7 @@ export class MemoryRepository implements IBulkAsset {
.selectAll('assets')
.innerJoin('memories_assets_assets', 'assets.id', 'memories_assets_assets.assetsId')
.whereRef('memories_assets_assets.memoriesId', '=', 'memories.id')
.where('assets.deletedAt', 'is', null)
.where('assets.fileCreatedAt', 'is not', null)
.where('assets.fileModifiedAt', 'is not', null)
.where('assets.localDateTime', 'is not', null),
.where('assets.deletedAt', 'is', null),
).as('assets'),
)
.where('id', '=', id)

11
server/src/repositories/person.repository.ts
View file

@ -128,10 +128,7 @@ export class PersonRepository implements IPersonRepository {
join
.onRef('asset_faces.assetId', '=', 'assets.id')
.on('assets.isArchived', '=', false)
.on('assets.deletedAt', 'is', null)
.on('assets.fileCreatedAt', 'is not', null)
.on('assets.fileModifiedAt', 'is not', null)
.on('assets.localDateTime', 'is not', null),
.on('assets.deletedAt', 'is', null),
)
.where('person.ownerId', '=', userId)
.orderBy('person.isHidden', 'asc')
@ -288,9 +285,6 @@ export class PersonRepository implements IPersonRepository {
.on('asset_faces.personId', '=', personId)
.on('assets.isArchived', '=', false)
.on('assets.deletedAt', 'is', null)
.on('assets.fileCreatedAt', 'is not', null)
.on('assets.fileModifiedAt', 'is not', null)
.on('assets.localDateTime', 'is not', null)
.on('assets.livePhotoVideoId', 'is', null),
)
.select((eb) => eb.fn.count(eb.fn('distinct', ['assets.id'])).as('count'))
@ -311,9 +305,6 @@ export class PersonRepository implements IPersonRepository {
join
.onRef('assets.id', '=', 'asset_faces.assetId')
.on('assets.deletedAt', 'is', null)
.on('assets.fileCreatedAt', 'is not', null)
.on('assets.fileModifiedAt', 'is not', null)
.on('assets.localDateTime', 'is not', null)
.on('assets.isArchived', '=', false),
)
.select((eb) => eb.fn.count(eb.fn('distinct', ['person.id'])).as('total'))

12
server/src/repositories/search.repository.ts
View file

@ -139,9 +139,6 @@ export class SearchRepository implements ISearchRepository {
.where('assets.ownerId', '=', anyUuid(userIds))
.where('assets.deletedAt', 'is', null)
.where('assets.isVisible', '=', true)
.where('assets.fileCreatedAt', 'is not', null)
.where('assets.fileModifiedAt', 'is not', null)
.where('assets.localDateTime', 'is not', null)
.where('assets.type', '=', type)
.where('assets.id', '!=', asUuid(assetId))
.orderBy(sql`smart_search.embedding <=> ${embedding}`)
@ -181,9 +178,6 @@ export class SearchRepository implements ISearchRepository {
.innerJoin('face_search', 'face_search.faceId', 'asset_faces.id')
.where('assets.ownerId', '=', anyUuid(userIds))
.where('assets.deletedAt', 'is', null)
.where('assets.fileCreatedAt', 'is not', null)
.where('assets.fileModifiedAt', 'is not', null)
.where('assets.localDateTime', 'is not', null)
.$if(!!hasPerson, (qb) => qb.where('asset_faces.personId', 'is not', null))
.orderBy(sql`face_search.embedding <=> ${embedding}`)
.limit(numResults),
@ -234,9 +228,6 @@ export class SearchRepository implements ISearchRepository {
.where('assets.isArchived', '=', false)
.where('assets.type', '=', 'IMAGE')
.where('assets.deletedAt', 'is', null)
.where('assets.fileCreatedAt', 'is not', null)
.where('assets.fileModifiedAt', 'is not', null)
.where('assets.localDateTime', 'is not', null)
.orderBy('city')
.limit(1);
@ -254,9 +245,6 @@ export class SearchRepository implements ISearchRepository {
.where('assets.isArchived', '=', false)
.where('assets.type', '=', 'IMAGE')
.where('assets.deletedAt', 'is', null)
.where('assets.fileCreatedAt', 'is not', null)
.where('assets.fileModifiedAt', 'is not', null)
.where('assets.localDateTime', 'is not', null)
.whereRef('exif.city', '>', 'cte.city')
.orderBy('city')
.limit(1)

9
server/src/repositories/shared-link.repository.ts
View file

@ -25,9 +25,6 @@ export class SharedLinkRepository implements ISharedLinkRepository {
.whereRef('shared_links.id', '=', 'shared_link__asset.sharedLinksId')
.innerJoin('assets', 'assets.id', 'shared_link__asset.assetsId')
.where('assets.deletedAt', 'is', null)
.where('assets.fileCreatedAt', 'is not', null)
.where('assets.fileModifiedAt', 'is not', null)
.where('assets.localDateTime', 'is not', null)
.selectAll('assets')
.innerJoinLateral(
(eb) => eb.selectFrom('exif').selectAll('exif').whereRef('exif.assetId', '=', 'assets.id').as('exifInfo'),
@ -53,9 +50,6 @@ export class SharedLinkRepository implements ISharedLinkRepository {
.selectAll('assets')
.whereRef('albums_assets_assets.assetsId', '=', 'assets.id')
.where('assets.deletedAt', 'is', null)
.where('assets.fileCreatedAt', 'is not', null)
.where('assets.fileModifiedAt', 'is not', null)
.where('assets.localDateTime', 'is not', null)
.innerJoinLateral(
(eb) =>
eb
@ -112,9 +106,6 @@ export class SharedLinkRepository implements ISharedLinkRepository {
.select((eb) => eb.fn.jsonAgg('assets').as('assets'))
.whereRef('assets.id', '=', 'shared_link__asset.assetsId')
.where('assets.deletedAt', 'is', null)
.where('assets.fileCreatedAt', 'is not', null)
.where('assets.fileModifiedAt', 'is not', null)
.where('assets.localDateTime', 'is not', null)
.as('assets'),
(join) => join.onTrue(),
)

8
server/src/repositories/stack.repository.ts
View file

@ -30,9 +30,6 @@ const withAssets = (eb: ExpressionBuilder<DB, 'asset_stack'>, withTags = false)
)
.select((eb) => eb.fn.toJson('exifInfo').as('exifInfo'))
.where('assets.deletedAt', 'is', null)
.where('assets.fileCreatedAt', 'is not', null)
.where('assets.fileModifiedAt', 'is not', null)
.where('assets.localDateTime', 'is not', null)
.whereRef('assets.stackId', '=', 'asset_stack.id'),
).as('assets');
};
@ -65,10 +62,7 @@ export class StackRepository implements IStackRepository {
.selectFrom('assets')
.select('assets.id')
.whereRef('assets.stackId', '=', 'asset_stack.id')
.where('assets.deletedAt', 'is', null)
.where('assets.fileCreatedAt', 'is not', null)
.where('assets.fileModifiedAt', 'is not', null)
.where('assets.localDateTime', 'is not', null),
.where('assets.deletedAt', 'is', null),
).as('assets'),
)
.execute();

6
server/src/repositories/view-repository.ts
View file

@ -18,6 +18,9 @@ export class ViewRepository {
.where('isVisible', '=', true)
.where('isArchived', '=', false)
.where('deletedAt', 'is', null)
.where('fileModifiedAt', 'is not', null)
.where('fileModifiedAt', 'is not', null)
.where('localDateTime', 'is not', null)
.execute();
return results.map((row) => row.directoryPath.replaceAll(/^\/|\/$/g, ''));
@ -35,6 +38,9 @@ export class ViewRepository {
.where('isVisible', '=', true)
.where('isArchived', '=', false)
.where('deletedAt', 'is', null)
.where('fileModifiedAt', 'is not', null)
.where('fileModifiedAt', 'is not', null)
.where('localDateTime', 'is not', null)
.where('originalPath', 'like', `%${normalizedPath}/%`)
.where('originalPath', 'not like', `%${normalizedPath}/%/%`)
.$narrowType<{ fileCreatedAt: Date }>()