KevinMidboe/immich
1
0
Fork 0
mirror of https://github.com/KevinMidboe/immich.git synced 2025-12-08 20:29:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(server): change asset entity to date type (#2599)

Browse Source 
* refactor(server): change asset entity to date type

* lower coverage threshold
This commit is contained in:
Michel Heusschen
2023-05-29 16:05:14 +02:00
committed by GitHub
parent caba462703
commit 94d0705607
18 changed files with 98 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/libs/domain/src/asset/asset.repository.ts
View File

@@ -15,8 +15,8 @@ export interface LivePhotoSearchOptions {
export interface MapMarkerSearchOptions {
isFavorite?: boolean;
fileCreatedBefore?: string;
fileCreatedAfter?: string;
fileCreatedBefore?: Date;
fileCreatedAfter?: Date;
}
export interface MapMarker {

16
server/libs/domain/src/asset/dto/map-marker.dto.ts
View File

@@ -1,7 +1,7 @@
import { ApiProperty } from '@nestjs/swagger';
import { toBoolean } from 'apps/immich/src/utils/transform.util';
import { Transform } from 'class-transformer';
import { IsBoolean, IsISO8601, IsOptional } from 'class-validator';
import { Transform, Type } from 'class-transformer';
import { IsBoolean, IsDate, IsOptional } from 'class-validator';
export class MapMarkerDto {
@ApiProperty()
@@ -10,13 +10,13 @@ export class MapMarkerDto {
@Transform(toBoolean)
isFavorite?: boolean;
@ApiProperty({ format: 'date-time' })
@IsOptional()
@IsISO8601({ strict: true, strictSeparator: true })
fileCreatedAfter?: string;
@IsDate()
@Type(() => Date)
fileCreatedAfter?: Date;
@ApiProperty({ format: 'date-time' })
@IsOptional()
@IsISO8601({ strict: true, strictSeparator: true })
fileCreatedBefore?: string;
@IsDate()
@Type(() => Date)
fileCreatedBefore?: Date;
}

6
server/libs/domain/src/asset/response-dto/asset-response.dto.ts
View File

@@ -16,9 +16,9 @@ export class AssetResponseDto {
originalPath!: string;
originalFileName!: string;
resized!: boolean;
fileCreatedAt!: string;
fileModifiedAt!: string;
updatedAt!: string;
fileCreatedAt!: Date;
fileModifiedAt!: Date;
updatedAt!: Date;
isFavorite!: boolean;
isArchived!: boolean;
mimeType!: string | null;

4
server/libs/domain/src/storage-template/storage-template.core.ts
View File

@@ -107,7 +107,7 @@ export class StorageTemplateCore {
this.render(
template,
{
fileCreatedAt: new Date().toISOString(),
fileCreatedAt: new Date(),
originalPath: '/upload/test/IMG_123.jpg',
type: AssetType.IMAGE,
} as AssetEntity,
@@ -140,7 +140,7 @@ export class StorageTemplateCore {
filetypefull: asset.type == AssetType.IMAGE ? 'IMAGE' : 'VIDEO',
};
const dt = luxon.DateTime.fromISO(new Date(asset.fileCreatedAt).toISOString());
const dt = luxon.DateTime.fromJSDate(asset.fileCreatedAt);
const dateTokens = [
...supportedYearTokens,