chore(server): remove deprecated endpoints (#6984)

* chore: remove deprecated endpoints * chore: open api
immich-app · Feb 8, 2024 · 90a7f16 · 90a7f16
1 parent 198e851
commit 90a7f16
Show file tree

Hide file tree

Showing 36 changed files with 140 additions and 2,877 deletions.
diff --git a/mobile/lib/modules/asset_viewer/services/asset_description.service.dart b/mobile/lib/modules/asset_viewer/services/asset_description.service.dart
@@ -36,7 +36,7 @@ class AssetDescriptionService {
 
   Future<String> readLatest(String assetRemoteId, int localExifId) async {
     final latestAssetFromServer =
-        await _api.assetApi.getAssetById(assetRemoteId);
+        await _api.assetApi.getAssetInfo(assetRemoteId);
     final localExifInfo = await _db.exifInfos.get(localExifId);
 
     if (latestAssetFromServer != null && localExifInfo != null) {

diff --git a/mobile/lib/modules/asset_viewer/services/image_viewer.service.dart b/mobile/lib/modules/asset_viewer/services/image_viewer.service.dart
@@ -25,12 +25,12 @@ class ImageViewerService {
       // Download LivePhotos image and motion part
       if (asset.isImage && asset.livePhotoVideoId != null && Platform.isIOS) {
         var imageResponse =
-            await _apiService.assetApi.downloadFileOldWithHttpInfo(
+            await _apiService.downloadApi.downloadFileWithHttpInfo(
           asset.remoteId!,
         );
 
         var motionReponse =
-            await _apiService.assetApi.downloadFileOldWithHttpInfo(
+            await _apiService.downloadApi.downloadFileWithHttpInfo(
           asset.livePhotoVideoId!,
         );
 
@@ -71,8 +71,8 @@ class ImageViewerService {
 
         return entity != null;
       } else {
-        var res = await _apiService.assetApi
-            .downloadFileOldWithHttpInfo(asset.remoteId!);
+        var res = await _apiService.downloadApi
+            .downloadFileWithHttpInfo(asset.remoteId!);
 
         if (res.statusCode != 200) {
           _log.severe(

diff --git a/mobile/lib/modules/backup/services/backup_verification.service.dart b/mobile/lib/modules/backup/services/backup_verification.service.dart
@@ -136,7 +136,7 @@ class BackupVerificationService {
     ExifInfo? exif = remote.exifInfo;
     if (exif != null && exif.lat != null) return false;
     if (exif == null || exif.fileSize == null) {
-      final dto = await apiService.assetApi.getAssetById(remote.remoteId!);
+      final dto = await apiService.assetApi.getAssetInfo(remote.remoteId!);
       if (dto != null && dto.exifInfo != null) {
         exif = ExifInfo.fromDto(dto.exifInfo!);
       }
@@ -165,8 +165,8 @@ class BackupVerificationService {
           // (skip first few KBs containing metadata)
           final Uint64List localImage =
               _fakeDecodeImg(local, await file.readAsBytes());
-          final res = await apiService.assetApi
-              .downloadFileOldWithHttpInfo(remote.remoteId!);
+          final res = await apiService.downloadApi
+              .downloadFileWithHttpInfo(remote.remoteId!);
           final Uint64List remoteImage = _fakeDecodeImg(remote, res.bodyBytes);
 
           final eq = const ListEquality().equals(remoteImage, localImage);

diff --git a/mobile/lib/modules/trash/services/trash.service.dart b/mobile/lib/modules/trash/services/trash.service.dart
@@ -22,7 +22,7 @@ class TrashService {
     try {
       List<String> remoteIds =
           assetList.where((a) => a.isRemote).map((e) => e.remoteId!).toList();
-      await _apiService.assetApi.restoreAssetsOld(BulkIdsDto(ids: remoteIds));
+      await _apiService.trashApi.restoreAssets(BulkIdsDto(ids: remoteIds));
       return true;
     } catch (error, stack) {
       _log.severe("Cannot restore assets ${error.toString()}", error, stack);
@@ -32,15 +32,15 @@ class TrashService {
 
   Future<void> emptyTrash() async {
     try {
-      await _apiService.assetApi.emptyTrashOld();
+      await _apiService.trashApi.emptyTrash();
     } catch (error, stack) {
       _log.severe("Cannot empty trash ${error.toString()}", error, stack);
     }
   }
 
   Future<void> restoreTrash() async {
     try {
-      await _apiService.assetApi.restoreTrashOld();
+      await _apiService.trashApi.restoreTrash();
     } catch (error, stack) {
       _log.severe("Cannot restore trash ${error.toString()}", error, stack);
     }

diff --git a/mobile/lib/shared/services/api.service.dart b/mobile/lib/shared/services/api.service.dart
@@ -24,6 +24,8 @@ class ApiService {
   late SharedLinkApi sharedLinkApi;
   late SystemConfigApi systemConfigApi;
   late ActivityApi activityApi;
+  late DownloadApi downloadApi;
+  late TrashApi trashApi;
 
   ApiService() {
     final endpoint = Store.tryGet(StoreKey.serverEndpoint);
@@ -51,6 +53,8 @@ class ApiService {
     sharedLinkApi = SharedLinkApi(_apiClient);
     systemConfigApi = SystemConfigApi(_apiClient);
     activityApi = ActivityApi(_apiClient);
+    downloadApi = DownloadApi(_apiClient);
+    trashApi = TrashApi(_apiClient);
   }
 
   Future<String> resolveAndSetEndpoint(String serverUrl) async {

diff --git a/mobile/lib/shared/services/asset.service.dart b/mobile/lib/shared/services/asset.service.dart
@@ -129,7 +129,7 @@ class AssetService {
     // fileSize is always filled on the server but not set on client
     if (a.exifInfo?.fileSize == null) {
       if (a.isRemote) {
-        final dto = await _apiService.assetApi.getAssetById(a.remoteId!);
+        final dto = await _apiService.assetApi.getAssetInfo(a.remoteId!);
         if (dto != null && dto.exifInfo != null) {
           final newExif = Asset.remote(dto).exifInfo!.copyWith(id: a.id);
           if (newExif != a.exifInfo) {

diff --git a/mobile/lib/shared/services/share.service.dart b/mobile/lib/shared/services/share.service.dart
@@ -31,8 +31,8 @@ class ShareService {
           final tempDir = await getTemporaryDirectory();
           final fileName = asset.fileName;
           final tempFile = await File('${tempDir.path}/$fileName').create();
-          final res = await _apiService.assetApi
-              .downloadFileOldWithHttpInfo(asset.remoteId!);
+          final res = await _apiService.downloadApi
+              .downloadFileWithHttpInfo(asset.remoteId!);
 
           if (res.statusCode != 200) {
             _log.severe(

diff --git a/mobile/openapi/.openapi-generator/FILES b/mobile/openapi/.openapi-generator/FILES
diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md