chore: codegen/lint

mobile/openapi/README.md

@@ -576,6 +576,8 @@ Class | Method | HTTP request | Description
  - [SyncAlbumUserV1](doc//SyncAlbumUserV1.md)
  - [SyncAlbumV1](doc//SyncAlbumV1.md)
  - [SyncAssetDeleteV1](doc//SyncAssetDeleteV1.md)
+ - [SyncAssetEditDeleteV1](doc//SyncAssetEditDeleteV1.md)
+ - [SyncAssetEditV1](doc//SyncAssetEditV1.md)
  - [SyncAssetExifV1](doc//SyncAssetExifV1.md)
  - [SyncAssetFaceDeleteV1](doc//SyncAssetFaceDeleteV1.md)
  - [SyncAssetFaceV1](doc//SyncAssetFaceV1.md)

mobile/openapi/lib/api.dart

@@ -315,6 +315,8 @@ part 'model/sync_album_user_delete_v1.dart';
 part 'model/sync_album_user_v1.dart';
 part 'model/sync_album_v1.dart';
 part 'model/sync_asset_delete_v1.dart';
+part 'model/sync_asset_edit_delete_v1.dart';
+part 'model/sync_asset_edit_v1.dart';
 part 'model/sync_asset_exif_v1.dart';
 part 'model/sync_asset_face_delete_v1.dart';
 part 'model/sync_asset_face_v1.dart';

mobile/openapi/lib/api_client.dart

@@ -676,6 +676,10 @@ class ApiClient {
           return SyncAlbumV1.fromJson(value);
         case 'SyncAssetDeleteV1':
           return SyncAssetDeleteV1.fromJson(value);
+        case 'SyncAssetEditDeleteV1':
+          return SyncAssetEditDeleteV1.fromJson(value);
+        case 'SyncAssetEditV1':
+          return SyncAssetEditV1.fromJson(value);
         case 'SyncAssetExifV1':
           return SyncAssetExifV1.fromJson(value);
         case 'SyncAssetFaceDeleteV1':

mobile/openapi/lib/model/sync_asset_edit_delete_v1.dart

@@ -13,26 +13,26 @@ part of openapi.api;
 class SyncAssetEditDeleteV1 {
   /// Returns a new [SyncAssetEditDeleteV1] instance.
   SyncAssetEditDeleteV1({
-    required this.assetId,
+    required this.editId,
   });
 
-  String assetId;
+  String editId;
 
   @override
   bool operator ==(Object other) => identical(this, other) || other is SyncAssetEditDeleteV1 &&
-    other.assetId == assetId;
+    other.editId == editId;
 
   @override
   int get hashCode =>
     // ignore: unnecessary_parenthesis
-    (assetId.hashCode);
+    (editId.hashCode);
 
   @override
-  String toString() => 'SyncAssetEditDeleteV1[assetId=$assetId]';
+  String toString() => 'SyncAssetEditDeleteV1[editId=$editId]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
-      json[r'assetId'] = this.assetId;
+      json[r'editId'] = this.editId;
     return json;
   }
 
@@ -45,7 +45,7 @@ class SyncAssetEditDeleteV1 {
       final json = value.cast<String, dynamic>();
 
       return SyncAssetEditDeleteV1(
-        assetId: mapValueOfType<String>(json, r'assetId')!,
+        editId: mapValueOfType<String>(json, r'editId')!,
       );
     }
     return null;
@@ -93,7 +93,7 @@ class SyncAssetEditDeleteV1 {
 
   /// The list of required keys that must be present in a JSON.
   static const requiredKeys = <String>{
-    'assetId',
+    'editId',
   };
 }
 

mobile/openapi/lib/model/sync_entity_type.dart

@@ -29,6 +29,8 @@ class SyncEntityType {
   static const assetV1 = SyncEntityType._(r'AssetV1');
   static const assetDeleteV1 = SyncEntityType._(r'AssetDeleteV1');
   static const assetExifV1 = SyncEntityType._(r'AssetExifV1');
+  static const assetEditV1 = SyncEntityType._(r'AssetEditV1');
+  static const assetEditDeleteV1 = SyncEntityType._(r'AssetEditDeleteV1');
   static const assetMetadataV1 = SyncEntityType._(r'AssetMetadataV1');
   static const assetMetadataDeleteV1 = SyncEntityType._(r'AssetMetadataDeleteV1');
   static const partnerV1 = SyncEntityType._(r'PartnerV1');
@@ -80,6 +82,8 @@ class SyncEntityType {
     assetV1,
     assetDeleteV1,
     assetExifV1,
+    assetEditV1,
+    assetEditDeleteV1,
     assetMetadataV1,
     assetMetadataDeleteV1,
     partnerV1,
@@ -166,6 +170,8 @@ class SyncEntityTypeTypeTransformer {
         case r'AssetV1': return SyncEntityType.assetV1;
         case r'AssetDeleteV1': return SyncEntityType.assetDeleteV1;
         case r'AssetExifV1': return SyncEntityType.assetExifV1;
+        case r'AssetEditV1': return SyncEntityType.assetEditV1;
+        case r'AssetEditDeleteV1': return SyncEntityType.assetEditDeleteV1;
         case r'AssetMetadataV1': return SyncEntityType.assetMetadataV1;
         case r'AssetMetadataDeleteV1': return SyncEntityType.assetMetadataDeleteV1;
         case r'PartnerV1': return SyncEntityType.partnerV1;

mobile/openapi/lib/model/sync_request_type.dart

@@ -30,6 +30,7 @@ class SyncRequestType {
   static const albumAssetExifsV1 = SyncRequestType._(r'AlbumAssetExifsV1');
   static const assetsV1 = SyncRequestType._(r'AssetsV1');
   static const assetExifsV1 = SyncRequestType._(r'AssetExifsV1');
+  static const assetEditsV1 = SyncRequestType._(r'AssetEditsV1');
   static const assetMetadataV1 = SyncRequestType._(r'AssetMetadataV1');
   static const authUsersV1 = SyncRequestType._(r'AuthUsersV1');
   static const memoriesV1 = SyncRequestType._(r'MemoriesV1');
@@ -54,6 +55,7 @@ class SyncRequestType {
     albumAssetExifsV1,
     assetsV1,
     assetExifsV1,
+    assetEditsV1,
     assetMetadataV1,
     authUsersV1,
     memoriesV1,
@@ -113,6 +115,7 @@ class SyncRequestTypeTypeTransformer {
         case r'AlbumAssetExifsV1': return SyncRequestType.albumAssetExifsV1;
         case r'AssetsV1': return SyncRequestType.assetsV1;
         case r'AssetExifsV1': return SyncRequestType.assetExifsV1;
+        case r'AssetEditsV1': return SyncRequestType.assetEditsV1;
         case r'AssetMetadataV1': return SyncRequestType.assetMetadataV1;
         case r'AuthUsersV1': return SyncRequestType.authUsersV1;
         case r'MemoriesV1': return SyncRequestType.memoriesV1;

open-api/typescript-sdk/src/fetch-client.ts

@@ -2968,7 +2968,7 @@ export type SyncAssetDeleteV1 = {
     assetId: string;
 };
 export type SyncAssetEditDeleteV1 = {
-    assetId: string;
+    editId: string;
 };
 export type SyncAssetEditV1 = {
     action: AssetEditAction;

server/src/queries/asset.edit.repository.sql

@@ -21,11 +21,11 @@ order by
 
 -- AssetEditRepository.getWithSyncInfo
 select
-  "id",
-  "assetId",
-  "sequence",
-  "action",
-  "parameters"
+  "asset_edit"."id",
+  "asset_edit"."assetId",
+  "asset_edit"."sequence",
+  "asset_edit"."action",
+  "asset_edit"."parameters"
 from
   "asset_edit"
 where

server/src/queries/sync.repository.sql

@@ -517,10 +517,10 @@ order by
 -- SyncRepository.assetEdit.getDeletes
 select
   "asset_edit_audit"."id",
-  "assetId"
+  "editId"
 from
   "asset_edit_audit" as "asset_edit_audit"
-  left join "asset" on "asset"."id" = "asset_edit_audit"."assetId"
+  inner join "asset" on "asset"."id" = "asset_edit_audit"."assetId"
 where
   "asset_edit_audit"."id" < $1
   and "asset_edit_audit"."id" > $2
@@ -531,10 +531,10 @@ order by
 -- SyncRepository.assetEdit.getUpserts
 select
   "asset_edit"."id",
-  "assetId",
-  "action",
-  "parameters",
-  "sequence",
+  "asset_edit"."assetId",
+  "asset_edit"."sequence",
+  "asset_edit"."action",
+  "asset_edit"."parameters",
   "asset_edit"."updateId"
 from
   "asset_edit" as "asset_edit"

server/test/factories/asset-edit.factory.ts

@@ -4,7 +4,7 @@ import { AssetEditTable } from 'src/schema/tables/asset-edit.table';
 import { AssetFactory } from 'test/factories/asset.factory';
 import { build } from 'test/factories/builder.factory';
 import { AssetEditLike, AssetLike, FactoryBuilder } from 'test/factories/types';
-import { newUuid } from 'test/small.factory';
+import { newDate, newUuid } from 'test/small.factory';
 
 export class AssetEditFactory {
   private constructor(private readonly value: Selectable<AssetEditTable>) {}
@@ -24,6 +24,7 @@ export class AssetEditFactory {
       parameters: { x: 5, y: 6, width: 200, height: 100 },
       sequence: 1,
       updateId,
+      updatedAt: newDate(),
       ...dto,
     });
   }