helpy4/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich synced 2025-11-14 17:36:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(web, mobile): Options to show archived assets in map (#4293)

Browse source 
* Add include archive setting to map on web

* open api

* better naming for web isArchived variable

* add withArchived setting to mobile

* (e2e): tests for mapMarker endpoint and isArchived

* isArchived to mobile

* chore: cleanup test

* chore: optimize e2e

---------

Co-authored-by: shalong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
Co-authored-by: Jason Rasmussen <jrasm91@gmail.com>
This commit is contained in:
Daniel Dietzler 2023-10-04 15:51:07 +02:00 • committed by GitHub
parent e5b4d09827
commit e571880c16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 184 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

1
server/src/domain/asset/asset.repository.ts
View file

@ -22,6 +22,7 @@ export interface LivePhotoSearchOptions {
}
export interface MapMarkerSearchOptions {
isArchived?: boolean;
isFavorite?: boolean;
fileCreatedBefore?: Date;
fileCreatedAfter?: Date;

6
server/src/domain/asset/dto/map-marker.dto.ts
View file

@ -4,6 +4,12 @@ import { IsBoolean, IsDate } from 'class-validator';
import { Optional, toBoolean } from '../../domain.util';
export class MapMarkerDto {
@ApiProperty()
@Optional()
@IsBoolean()
@Transform(toBoolean)
isArchived?: boolean;
@ApiProperty()
@Optional()
@IsBoolean()

4
server/src/infra/repositories/asset.repository.ts
View file

@ -355,7 +355,7 @@ export class AssetRepository implements IAssetRepository {
}
async getMapMarkers(ownerId: string, options: MapMarkerSearchOptions = {}): Promise<MapMarker[]> {
const { isFavorite, fileCreatedAfter, fileCreatedBefore } = options;
const { isArchived, isFavorite, fileCreatedAfter, fileCreatedBefore } = options;
const assets = await this.repository.find({
select: {
@ -368,7 +368,7 @@ export class AssetRepository implements IAssetRepository {
where: {
ownerId,
isVisible: true,
isArchived: false,
isArchived,
exifInfo: {
latitude: Not(IsNull()),
longitude: Not(IsNull()),