merge: remote-tracking branch 'immich/main' into feat/integrity-checks-izzy

server/src/dtos/asset-response.dto.ts

@@ -124,7 +124,6 @@ export type MapAsset = {
   originalPath: string;
   owner?: User | null;
   ownerId: string;
-  sidecarPath: string | null;
   stack?: Stack | null;
   stackId: string | null;
   tags?: Tag[];

server/src/dtos/asset.dto.ts

@@ -19,7 +19,6 @@ import {
 import { BulkIdsDto } from 'src/dtos/asset-ids.response.dto';
 import { AssetMetadataKey, AssetType, AssetVisibility } from 'src/enum';
 import { AssetStats } from 'src/repositories/asset.repository';
-import { AssetMetadata, AssetMetadataItem } from 'src/types';
 import { IsNotSiblingOf, Optional, ValidateBoolean, ValidateEnum, ValidateUUID } from 'src/validation';
 
 export class DeviceIdDto {
@@ -154,23 +153,12 @@ export class AssetMetadataUpsertDto {
   items!: AssetMetadataUpsertItemDto[];
 }
 
-export class AssetMetadataUpsertItemDto implements AssetMetadataItem {
+export class AssetMetadataUpsertItemDto {
   @ValidateEnum({ enum: AssetMetadataKey, name: 'AssetMetadataKey' })
   key!: AssetMetadataKey;
 
   @IsObject()
-  @ValidateNested()
-  @Type((options) => {
-    switch (options?.object.key) {
-      case AssetMetadataKey.MobileApp: {
-        return AssetMetadataMobileAppDto;
-      }
-      default: {
-        return Object;
-      }
-    }
-  })
-  value!: AssetMetadata[AssetMetadataKey];
+  value!: object;
 }
 
 export class AssetMetadataMobileAppDto {

server/src/dtos/sync.dto.ts

@@ -50,6 +50,7 @@ export class AssetDeltaSyncResponseDto {
 export const extraSyncModels: Function[] = [];
 
 export const ExtraModel = (): ClassDecorator => {
+  // eslint-disable-next-line unicorn/consistent-function-scoping
   return (object: Function) => {
     extraSyncModels.push(object);
   };

server/src/dtos/workflow.dto.ts

@@ -7,7 +7,7 @@ import { Optional, ValidateBoolean, ValidateEnum } from 'src/validation';
 
 export class WorkflowFilterItemDto {
   @IsUUID()
-  filterId!: string;
+  pluginFilterId!: string;
 
   @IsObject()
   @Optional()
@@ -16,7 +16,7 @@ export class WorkflowFilterItemDto {
 
 export class WorkflowActionItemDto {
   @IsUUID()
-  actionId!: string;
+  pluginActionId!: string;
 
   @IsObject()
   @Optional()
@@ -86,7 +86,7 @@ export class WorkflowResponseDto {
 export class WorkflowFilterResponseDto {
   id!: string;
   workflowId!: string;
-  filterId!: string;
+  pluginFilterId!: string;
   filterConfig!: FilterConfig | null;
   order!: number;
 }
@@ -94,7 +94,7 @@ export class WorkflowFilterResponseDto {
 export class WorkflowActionResponseDto {
   id!: string;
   workflowId!: string;
-  actionId!: string;
+  pluginActionId!: string;
   actionConfig!: ActionConfig | null;
   order!: number;
 }
@@ -103,7 +103,7 @@ export function mapWorkflowFilter(filter: WorkflowFilter): WorkflowFilterRespons
   return {
     id: filter.id,
     workflowId: filter.workflowId,
-    filterId: filter.filterId,
+    pluginFilterId: filter.pluginFilterId,
     filterConfig: filter.filterConfig,
     order: filter.order,
   };
@@ -113,7 +113,7 @@ export function mapWorkflowAction(action: WorkflowAction): WorkflowActionRespons
   return {
     id: action.id,
     workflowId: action.workflowId,
-    actionId: action.actionId,
+    pluginActionId: action.pluginActionId,
     actionConfig: action.actionConfig,
     order: action.order,
   };