KevinMidboe/immich
1
0
Fork 0
mirror of https://github.com/KevinMidboe/immich.git synced 2026-01-08 02:05:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(server): Exclude archived assets from search-explore #4041 (#4122)

Browse Source 
* Exclude archived assets from search-explore  #4041

* Update test to properly expect an empty array with archived items

* typesense changes wip

* Add isArchived filter to default search filters

* Bump assets typesense schema version

* fix(server): sync bug for bulk asset update

---------

Co-authored-by: Jason Rasmussen <jrasm91@gmail.com>
This commit is contained in:
Russell Tan
2023-09-27 18:38:55 -07:00
committed by GitHub
parent 0a22e64799
commit 69c23aa3ec
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/src/infra/repositories/typesense.repository.ts
View File

@@ -150,7 +150,7 @@ export class TypesenseRepository implements ISearchRepository {
async explore(userId: string): Promise<SearchExploreItem<AssetEntity>[]> {
const common = {
q: '*',
filter_by: this.buildFilterBy('ownerId', userId, true),
filter_by: [this.buildFilterBy('ownerId', userId, true), this.buildFilterBy('isArchived', false)].join(' && '),
per_page: 100,
};
@@ -172,10 +172,7 @@ export class TypesenseRepository implements ISearchRepository {
const config = {
...common,
query_by: 'originalFileName',
filter_by: [
this.buildFilterBy('ownerId', userId, true),
this.buildFilterBy(facet.field_name, count.value, true),
].join(' && '),
filter_by: [common.filter_by, this.buildFilterBy(facet.field_name, count.value, true)].join(' && '),
per_page: 1,
};
@@ -468,7 +465,7 @@ export class TypesenseRepository implements ISearchRepository {
private getAssetFilters(filters: SearchFilter) {
const { userId } = filters;
const _filters = [this.buildFilterBy('ownerId', userId, true)];
const _filters = [this.buildFilterBy('ownerId', userId, true), this.buildFilterBy('isArchived', false)];
if (filters.id) {
_filters.push(this.buildFilterBy('id', filters.id, true));