mirror of
				https://github.com/KevinMidboe/immich.git
				synced 2025-10-29 17:40:28 +00:00 
			
		
		
		
	feat(web): favorite an asset (#939)
* feat(web): favorite an asset * fix: test and linting * fix: asset dto type
This commit is contained in:
		| @@ -58,6 +58,7 @@ doc/SmartInfoResponseDto.md | ||||
| doc/ThumbnailFormat.md | ||||
| doc/TimeGroupEnum.md | ||||
| doc/UpdateAlbumDto.md | ||||
| doc/UpdateAssetDto.md | ||||
| doc/UpdateDeviceInfoDto.md | ||||
| doc/UpdateUserDto.md | ||||
| doc/UsageByUserDto.md | ||||
| @@ -132,6 +133,7 @@ lib/model/smart_info_response_dto.dart | ||||
| lib/model/thumbnail_format.dart | ||||
| lib/model/time_group_enum.dart | ||||
| lib/model/update_album_dto.dart | ||||
| lib/model/update_asset_dto.dart | ||||
| lib/model/update_device_info_dto.dart | ||||
| lib/model/update_user_dto.dart | ||||
| lib/model/usage_by_user_dto.dart | ||||
|   | ||||
| @@ -92,6 +92,7 @@ Class | Method | HTTP request | Description | ||||
| *AssetApi* | [**getUserAssetsByDeviceId**](doc//AssetApi.md#getuserassetsbydeviceid) | **GET** /asset/{deviceId} |  | ||||
| *AssetApi* | [**searchAsset**](doc//AssetApi.md#searchasset) | **POST** /asset/search |  | ||||
| *AssetApi* | [**serveFile**](doc//AssetApi.md#servefile) | **GET** /asset/file |  | ||||
| *AssetApi* | [**updateAssetById**](doc//AssetApi.md#updateassetbyid) | **PUT** /asset/assetById/{assetId} |  | ||||
| *AssetApi* | [**uploadFile**](doc//AssetApi.md#uploadfile) | **POST** /asset/upload |  | ||||
| *AuthenticationApi* | [**adminSignUp**](doc//AuthenticationApi.md#adminsignup) | **POST** /auth/admin-sign-up |  | ||||
| *AuthenticationApi* | [**login**](doc//AuthenticationApi.md#login) | **POST** /auth/login |  | ||||
| @@ -170,6 +171,7 @@ Class | Method | HTTP request | Description | ||||
|  - [ThumbnailFormat](doc//ThumbnailFormat.md) | ||||
|  - [TimeGroupEnum](doc//TimeGroupEnum.md) | ||||
|  - [UpdateAlbumDto](doc//UpdateAlbumDto.md) | ||||
|  - [UpdateAssetDto](doc//UpdateAssetDto.md) | ||||
|  - [UpdateDeviceInfoDto](doc//UpdateDeviceInfoDto.md) | ||||
|  - [UpdateUserDto](doc//UpdateUserDto.md) | ||||
|  - [UsageByUserDto](doc//UsageByUserDto.md) | ||||
|   | ||||
| @@ -25,6 +25,7 @@ Method | HTTP request | Description | ||||
| [**getUserAssetsByDeviceId**](AssetApi.md#getuserassetsbydeviceid) | **GET** /asset/{deviceId} |  | ||||
| [**searchAsset**](AssetApi.md#searchasset) | **POST** /asset/search |  | ||||
| [**serveFile**](AssetApi.md#servefile) | **GET** /asset/file |  | ||||
| [**updateAssetById**](AssetApi.md#updateassetbyid) | **PUT** /asset/assetById/{assetId} |  | ||||
| [**uploadFile**](AssetApi.md#uploadfile) | **POST** /asset/upload |  | ||||
|  | ||||
|  | ||||
| @@ -784,6 +785,57 @@ Name | Type | Description  | Notes | ||||
|  | ||||
| [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) | ||||
|  | ||||
| # **updateAssetById** | ||||
| > AssetResponseDto updateAssetById(assetId, updateAssetDto) | ||||
|  | ||||
|  | ||||
|  | ||||
| Update an asset | ||||
|  | ||||
| ### Example | ||||
| ```dart | ||||
| import 'package:openapi/api.dart'; | ||||
| // TODO Configure HTTP Bearer authorization: bearer | ||||
| // Case 1. Use String Token | ||||
| //defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken('YOUR_ACCESS_TOKEN'); | ||||
| // Case 2. Use Function which generate token. | ||||
| // String yourTokenGeneratorFunction() { ... } | ||||
| //defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction); | ||||
|  | ||||
| final api_instance = AssetApi(); | ||||
| final assetId = assetId_example; // String |  | ||||
| final updateAssetDto = UpdateAssetDto(); // UpdateAssetDto |  | ||||
|  | ||||
| try { | ||||
|     final result = api_instance.updateAssetById(assetId, updateAssetDto); | ||||
|     print(result); | ||||
| } catch (e) { | ||||
|     print('Exception when calling AssetApi->updateAssetById: $e\n'); | ||||
| } | ||||
| ``` | ||||
|  | ||||
| ### Parameters | ||||
|  | ||||
| Name | Type | Description  | Notes | ||||
| ------------- | ------------- | ------------- | ------------- | ||||
|  **assetId** | **String**|  |  | ||||
|  **updateAssetDto** | [**UpdateAssetDto**](UpdateAssetDto.md)|  |  | ||||
|  | ||||
| ### Return type | ||||
|  | ||||
| [**AssetResponseDto**](AssetResponseDto.md) | ||||
|  | ||||
| ### Authorization | ||||
|  | ||||
| [bearer](../README.md#bearer) | ||||
|  | ||||
| ### HTTP request headers | ||||
|  | ||||
|  - **Content-Type**: application/json | ||||
|  - **Accept**: application/json | ||||
|  | ||||
| [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) | ||||
|  | ||||
| # **uploadFile** | ||||
| > AssetFileUploadResponseDto uploadFile(assetData) | ||||
|  | ||||
|   | ||||
							
								
								
									
										15
									
								
								mobile/openapi/doc/UpdateAssetDto.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								mobile/openapi/doc/UpdateAssetDto.md
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,15 @@ | ||||
| # openapi.model.UpdateAssetDto | ||||
|  | ||||
| ## Load the model package | ||||
| ```dart | ||||
| import 'package:openapi/api.dart'; | ||||
| ``` | ||||
|  | ||||
| ## Properties | ||||
| Name | Type | Description | Notes | ||||
| ------------ | ------------- | ------------- | ------------- | ||||
| **isFavorite** | **bool** |  |  | ||||
|  | ||||
| [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) | ||||
|  | ||||
|  | ||||
| @@ -85,6 +85,7 @@ part 'model/smart_info_response_dto.dart'; | ||||
| part 'model/thumbnail_format.dart'; | ||||
| part 'model/time_group_enum.dart'; | ||||
| part 'model/update_album_dto.dart'; | ||||
| part 'model/update_asset_dto.dart'; | ||||
| part 'model/update_device_info_dto.dart'; | ||||
| part 'model/update_user_dto.dart'; | ||||
| part 'model/usage_by_user_dto.dart'; | ||||
|   | ||||
| @@ -858,6 +858,67 @@ class AssetApi { | ||||
|     return null; | ||||
|   } | ||||
|  | ||||
|   ///  | ||||
|   /// | ||||
|   /// Update an asset | ||||
|   /// | ||||
|   /// Note: This method returns the HTTP [Response]. | ||||
|   /// | ||||
|   /// Parameters: | ||||
|   /// | ||||
|   /// * [String] assetId (required): | ||||
|   /// | ||||
|   /// * [UpdateAssetDto] updateAssetDto (required): | ||||
|   Future<Response> updateAssetByIdWithHttpInfo(String assetId, UpdateAssetDto updateAssetDto,) async { | ||||
|     // ignore: prefer_const_declarations | ||||
|     final path = r'/asset/assetById/{assetId}' | ||||
|       .replaceAll('{assetId}', assetId); | ||||
|  | ||||
|     // ignore: prefer_final_locals | ||||
|     Object? postBody = updateAssetDto; | ||||
|  | ||||
|     final queryParams = <QueryParam>[]; | ||||
|     final headerParams = <String, String>{}; | ||||
|     final formParams = <String, String>{}; | ||||
|  | ||||
|     const contentTypes = <String>['application/json']; | ||||
|  | ||||
|  | ||||
|     return apiClient.invokeAPI( | ||||
|       path, | ||||
|       'PUT', | ||||
|       queryParams, | ||||
|       postBody, | ||||
|       headerParams, | ||||
|       formParams, | ||||
|       contentTypes.isEmpty ? null : contentTypes.first, | ||||
|     ); | ||||
|   } | ||||
|  | ||||
|   ///  | ||||
|   /// | ||||
|   /// Update an asset | ||||
|   /// | ||||
|   /// Parameters: | ||||
|   /// | ||||
|   /// * [String] assetId (required): | ||||
|   /// | ||||
|   /// * [UpdateAssetDto] updateAssetDto (required): | ||||
|   Future<AssetResponseDto?> updateAssetById(String assetId, UpdateAssetDto updateAssetDto,) async { | ||||
|     final response = await updateAssetByIdWithHttpInfo(assetId, updateAssetDto,); | ||||
|     if (response.statusCode >= HttpStatus.badRequest) { | ||||
|       throw ApiException(response.statusCode, await _decodeBodyBytes(response)); | ||||
|     } | ||||
|     // When a remote server returns no body with a status of 204, we shall not decode it. | ||||
|     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input" | ||||
|     // FormatException when trying to decode an empty string. | ||||
|     if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) { | ||||
|       return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'AssetResponseDto',) as AssetResponseDto; | ||||
|      | ||||
|     } | ||||
|     return null; | ||||
|   } | ||||
|  | ||||
|   /// Performs an HTTP 'POST /asset/upload' operation and returns the [Response]. | ||||
|   /// Parameters: | ||||
|   /// | ||||
|   | ||||
| @@ -292,6 +292,8 @@ class ApiClient { | ||||
|           return TimeGroupEnumTypeTransformer().decode(value); | ||||
|         case 'UpdateAlbumDto': | ||||
|           return UpdateAlbumDto.fromJson(value); | ||||
|         case 'UpdateAssetDto': | ||||
|           return UpdateAssetDto.fromJson(value); | ||||
|         case 'UpdateDeviceInfoDto': | ||||
|           return UpdateDeviceInfoDto.fromJson(value); | ||||
|         case 'UpdateUserDto': | ||||
|   | ||||
							
								
								
									
										111
									
								
								mobile/openapi/lib/model/update_asset_dto.dart
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										111
									
								
								mobile/openapi/lib/model/update_asset_dto.dart
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,111 @@ | ||||
| // | ||||
| // AUTO-GENERATED FILE, DO NOT MODIFY! | ||||
| // | ||||
| // @dart=2.12 | ||||
|  | ||||
| // ignore_for_file: unused_element, unused_import | ||||
| // ignore_for_file: always_put_required_named_parameters_first | ||||
| // ignore_for_file: constant_identifier_names | ||||
| // ignore_for_file: lines_longer_than_80_chars | ||||
|  | ||||
| part of openapi.api; | ||||
|  | ||||
| class UpdateAssetDto { | ||||
|   /// Returns a new [UpdateAssetDto] instance. | ||||
|   UpdateAssetDto({ | ||||
|     required this.isFavorite, | ||||
|   }); | ||||
|  | ||||
|   bool isFavorite; | ||||
|  | ||||
|   @override | ||||
|   bool operator ==(Object other) => identical(this, other) || other is UpdateAssetDto && | ||||
|      other.isFavorite == isFavorite; | ||||
|  | ||||
|   @override | ||||
|   int get hashCode => | ||||
|     // ignore: unnecessary_parenthesis | ||||
|     (isFavorite.hashCode); | ||||
|  | ||||
|   @override | ||||
|   String toString() => 'UpdateAssetDto[isFavorite=$isFavorite]'; | ||||
|  | ||||
|   Map<String, dynamic> toJson() { | ||||
|     final _json = <String, dynamic>{}; | ||||
|       _json[r'isFavorite'] = isFavorite; | ||||
|     return _json; | ||||
|   } | ||||
|  | ||||
|   /// Returns a new [UpdateAssetDto] instance and imports its values from | ||||
|   /// [value] if it's a [Map], null otherwise. | ||||
|   // ignore: prefer_constructors_over_static_methods | ||||
|   static UpdateAssetDto? fromJson(dynamic value) { | ||||
|     if (value is Map) { | ||||
|       final json = value.cast<String, dynamic>(); | ||||
|  | ||||
|       // Ensure that the map contains the required keys. | ||||
|       // Note 1: the values aren't checked for validity beyond being non-null. | ||||
|       // Note 2: this code is stripped in release mode! | ||||
|       assert(() { | ||||
|         requiredKeys.forEach((key) { | ||||
|           assert(json.containsKey(key), 'Required key "UpdateAssetDto[$key]" is missing from JSON.'); | ||||
|           assert(json[key] != null, 'Required key "UpdateAssetDto[$key]" has a null value in JSON.'); | ||||
|         }); | ||||
|         return true; | ||||
|       }()); | ||||
|  | ||||
|       return UpdateAssetDto( | ||||
|         isFavorite: mapValueOfType<bool>(json, r'isFavorite')!, | ||||
|       ); | ||||
|     } | ||||
|     return null; | ||||
|   } | ||||
|  | ||||
|   static List<UpdateAssetDto>? listFromJson(dynamic json, {bool growable = false,}) { | ||||
|     final result = <UpdateAssetDto>[]; | ||||
|     if (json is List && json.isNotEmpty) { | ||||
|       for (final row in json) { | ||||
|         final value = UpdateAssetDto.fromJson(row); | ||||
|         if (value != null) { | ||||
|           result.add(value); | ||||
|         } | ||||
|       } | ||||
|     } | ||||
|     return result.toList(growable: growable); | ||||
|   } | ||||
|  | ||||
|   static Map<String, UpdateAssetDto> mapFromJson(dynamic json) { | ||||
|     final map = <String, UpdateAssetDto>{}; | ||||
|     if (json is Map && json.isNotEmpty) { | ||||
|       json = json.cast<String, dynamic>(); // ignore: parameter_assignments | ||||
|       for (final entry in json.entries) { | ||||
|         final value = UpdateAssetDto.fromJson(entry.value); | ||||
|         if (value != null) { | ||||
|           map[entry.key] = value; | ||||
|         } | ||||
|       } | ||||
|     } | ||||
|     return map; | ||||
|   } | ||||
|  | ||||
|   // maps a json object with a list of UpdateAssetDto-objects as value to a dart map | ||||
|   static Map<String, List<UpdateAssetDto>> mapListFromJson(dynamic json, {bool growable = false,}) { | ||||
|     final map = <String, List<UpdateAssetDto>>{}; | ||||
|     if (json is Map && json.isNotEmpty) { | ||||
|       json = json.cast<String, dynamic>(); // ignore: parameter_assignments | ||||
|       for (final entry in json.entries) { | ||||
|         final value = UpdateAssetDto.listFromJson(entry.value, growable: growable,); | ||||
|         if (value != null) { | ||||
|           map[entry.key] = value; | ||||
|         } | ||||
|       } | ||||
|     } | ||||
|     return map; | ||||
|   } | ||||
|  | ||||
|   /// The list of required keys that must be present in a JSON. | ||||
|   static const requiredKeys = <String>{ | ||||
|     'isFavorite', | ||||
|   }; | ||||
| } | ||||
|  | ||||
							
								
								
									
										27
									
								
								mobile/openapi/test/update_asset_dto_test.dart
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										27
									
								
								mobile/openapi/test/update_asset_dto_test.dart
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,27 @@ | ||||
| // | ||||
| // AUTO-GENERATED FILE, DO NOT MODIFY! | ||||
| // | ||||
| // @dart=2.12 | ||||
|  | ||||
| // ignore_for_file: unused_element, unused_import | ||||
| // ignore_for_file: always_put_required_named_parameters_first | ||||
| // ignore_for_file: constant_identifier_names | ||||
| // ignore_for_file: lines_longer_than_80_chars | ||||
|  | ||||
| import 'package:openapi/api.dart'; | ||||
| import 'package:test/test.dart'; | ||||
|  | ||||
| // tests for UpdateAssetDto | ||||
| void main() { | ||||
|   // final instance = UpdateAssetDto(); | ||||
|  | ||||
|   group('test UpdateAssetDto', () { | ||||
|     // bool isFavorite | ||||
|     test('to test the property `isFavorite`', () async { | ||||
|       // TODO | ||||
|     }); | ||||
|  | ||||
|  | ||||
|   }); | ||||
|  | ||||
| } | ||||
| @@ -4,8 +4,8 @@ import { BadRequestException, NotFoundException, ForbiddenException } from '@nes | ||||
| import { AlbumEntity } from '@app/database/entities/album.entity'; | ||||
| import { AlbumResponseDto } from './response-dto/album-response.dto'; | ||||
| import { IAssetRepository } from '../asset/asset-repository'; | ||||
| import {AddAssetsResponseDto} from "./response-dto/add-assets-response.dto"; | ||||
| import {IAlbumRepository} from "./album-repository"; | ||||
| import { AddAssetsResponseDto } from './response-dto/add-assets-response.dto'; | ||||
| import { IAlbumRepository } from './album-repository'; | ||||
|  | ||||
| describe('Album service', () => { | ||||
|   let sut: AlbumService; | ||||
| @@ -125,6 +125,7 @@ describe('Album service', () => { | ||||
|  | ||||
|     assetRepositoryMock = { | ||||
|       create: jest.fn(), | ||||
|       update: jest.fn(), | ||||
|       getAllByUserId: jest.fn(), | ||||
|       getAllByDeviceId: jest.fn(), | ||||
|       getAssetCountByTimeBucket: jest.fn(), | ||||
| @@ -333,7 +334,7 @@ describe('Album service', () => { | ||||
|  | ||||
|     const albumResponse: AddAssetsResponseDto = { | ||||
|       alreadyInAlbum: [], | ||||
|       successfullyAdded: 1 | ||||
|       successfullyAdded: 1, | ||||
|     }; | ||||
|  | ||||
|     const albumId = albumEntity.id; | ||||
| @@ -341,13 +342,13 @@ describe('Album service', () => { | ||||
|     albumRepositoryMock.get.mockImplementation(() => Promise.resolve<AlbumEntity>(albumEntity)); | ||||
|     albumRepositoryMock.addAssets.mockImplementation(() => Promise.resolve<AddAssetsResponseDto>(albumResponse)); | ||||
|  | ||||
|     const result = await sut.addAssetsToAlbum( | ||||
|     const result = (await sut.addAssetsToAlbum( | ||||
|       authUser, | ||||
|       { | ||||
|         assetIds: ['1'], | ||||
|       }, | ||||
|       albumId, | ||||
|     ) as AddAssetsResponseDto; | ||||
|     )) as AddAssetsResponseDto; | ||||
|  | ||||
|     // TODO: stub and expect album rendered | ||||
|     expect(result.album?.id).toEqual(albumId); | ||||
| @@ -358,7 +359,7 @@ describe('Album service', () => { | ||||
|  | ||||
|     const albumResponse: AddAssetsResponseDto = { | ||||
|       alreadyInAlbum: [], | ||||
|       successfullyAdded: 1 | ||||
|       successfullyAdded: 1, | ||||
|     }; | ||||
|  | ||||
|     const albumId = albumEntity.id; | ||||
| @@ -366,13 +367,13 @@ describe('Album service', () => { | ||||
|     albumRepositoryMock.get.mockImplementation(() => Promise.resolve<AlbumEntity>(albumEntity)); | ||||
|     albumRepositoryMock.addAssets.mockImplementation(() => Promise.resolve<AddAssetsResponseDto>(albumResponse)); | ||||
|  | ||||
|     const result = await sut.addAssetsToAlbum( | ||||
|     const result = (await sut.addAssetsToAlbum( | ||||
|       authUser, | ||||
|       { | ||||
|         assetIds: ['1'], | ||||
|       }, | ||||
|       albumId, | ||||
|     ) as AddAssetsResponseDto; | ||||
|     )) as AddAssetsResponseDto; | ||||
|  | ||||
|     // TODO: stub and expect album rendered | ||||
|     expect(result.album?.id).toEqual(albumId); | ||||
| @@ -383,7 +384,7 @@ describe('Album service', () => { | ||||
|  | ||||
|     const albumResponse: AddAssetsResponseDto = { | ||||
|       alreadyInAlbum: [], | ||||
|       successfullyAdded: 1 | ||||
|       successfullyAdded: 1, | ||||
|     }; | ||||
|  | ||||
|     const albumId = albumEntity.id; | ||||
| @@ -447,7 +448,7 @@ describe('Album service', () => { | ||||
|  | ||||
|     const albumResponse: AddAssetsResponseDto = { | ||||
|       alreadyInAlbum: [], | ||||
|       successfullyAdded: 1 | ||||
|       successfullyAdded: 1, | ||||
|     }; | ||||
|  | ||||
|     const albumId = albumEntity.id; | ||||
|   | ||||
| @@ -13,6 +13,7 @@ import { AssetCountByUserIdResponseDto } from './response-dto/asset-count-by-use | ||||
| import { CheckExistingAssetsDto } from './dto/check-existing-assets.dto'; | ||||
| import { CheckExistingAssetsResponseDto } from './response-dto/check-existing-assets-response.dto'; | ||||
| import { In } from 'typeorm/find-options/operator/In'; | ||||
| import { UpdateAssetDto } from './dto/update-asset.dto'; | ||||
|  | ||||
| export interface IAssetRepository { | ||||
|   create( | ||||
| @@ -22,6 +23,7 @@ export interface IAssetRepository { | ||||
|     mimeType: string, | ||||
|     checksum?: Buffer, | ||||
|   ): Promise<AssetEntity>; | ||||
|   update(asset: AssetEntity, dto: UpdateAssetDto): Promise<AssetEntity>; | ||||
|   getAllByUserId(userId: string): Promise<AssetEntity[]>; | ||||
|   getAllByDeviceId(userId: string, deviceId: string): Promise<string[]>; | ||||
|   getById(assetId: string): Promise<AssetEntity>; | ||||
| @@ -252,6 +254,15 @@ export class AssetRepository implements IAssetRepository { | ||||
|     return createdAsset; | ||||
|   } | ||||
|  | ||||
|   /** | ||||
|    * Update asset | ||||
|    */ | ||||
|   async update(asset: AssetEntity, dto: UpdateAssetDto): Promise<AssetEntity> { | ||||
|     asset.isFavorite = dto.isFavorite ?? asset.isFavorite; | ||||
|  | ||||
|     return await this.assetRepository.save(asset); | ||||
|   } | ||||
|  | ||||
|   /** | ||||
|    * Get assets by device's Id on the database | ||||
|    * @param userId | ||||
|   | ||||
| @@ -15,6 +15,7 @@ import { | ||||
|   BadRequestException, | ||||
|   UploadedFile, | ||||
|   Header, | ||||
|   Put, | ||||
| } from '@nestjs/common'; | ||||
| import { Authenticated } from '../../decorators/authenticated.decorator'; | ||||
| import { AssetService } from './asset.service'; | ||||
| @@ -50,6 +51,7 @@ import { QueryFailedError } from 'typeorm'; | ||||
| import { AssetCountByUserIdResponseDto } from './response-dto/asset-count-by-user-id-response.dto'; | ||||
| import { CheckExistingAssetsDto } from './dto/check-existing-assets.dto'; | ||||
| import { CheckExistingAssetsResponseDto } from './response-dto/check-existing-assets-response.dto'; | ||||
| import { UpdateAssetDto } from './dto/update-asset.dto'; | ||||
|  | ||||
| @Authenticated() | ||||
| @ApiBearerAuth() | ||||
| @@ -222,6 +224,18 @@ export class AssetController { | ||||
|     return await this.assetService.getAssetById(authUser, assetId); | ||||
|   } | ||||
|  | ||||
|   /** | ||||
|    * Update an asset | ||||
|    */ | ||||
|   @Put('/assetById/:assetId') | ||||
|   async updateAssetById( | ||||
|     @GetAuthUser() authUser: AuthUserDto, | ||||
|     @Param('assetId') assetId: string, | ||||
|     @Body() dto: UpdateAssetDto, | ||||
|   ): Promise<AssetResponseDto> { | ||||
|     return await this.assetService.updateAssetById(authUser, assetId, dto); | ||||
|   } | ||||
|  | ||||
|   @Delete('/') | ||||
|   async deleteAsset( | ||||
|     @GetAuthUser() authUser: AuthUserDto, | ||||
|   | ||||
| @@ -97,6 +97,7 @@ describe('AssetService', () => { | ||||
|   beforeAll(() => { | ||||
|     assetRepositoryMock = { | ||||
|       create: jest.fn(), | ||||
|       update: jest.fn(), | ||||
|       getAllByUserId: jest.fn(), | ||||
|       getAllByDeviceId: jest.fn(), | ||||
|       getAssetCountByTimeBucket: jest.fn(), | ||||
|   | ||||
| @@ -1,6 +1,7 @@ | ||||
| import { CuratedLocationsResponseDto } from './response-dto/curated-locations-response.dto'; | ||||
| import { | ||||
|   BadRequestException, | ||||
|   ForbiddenException, | ||||
|   Inject, | ||||
|   Injectable, | ||||
|   InternalServerErrorException, | ||||
| @@ -39,6 +40,7 @@ import { AssetCountByUserIdResponseDto } from './response-dto/asset-count-by-use | ||||
| import { timeUtils } from '@app/common/utils'; | ||||
| import { CheckExistingAssetsDto } from './dto/check-existing-assets.dto'; | ||||
| import { CheckExistingAssetsResponseDto } from './response-dto/check-existing-assets-response.dto'; | ||||
| import { UpdateAssetDto } from './dto/update-asset.dto'; | ||||
|  | ||||
| const fileInfo = promisify(stat); | ||||
|  | ||||
| @@ -123,6 +125,21 @@ export class AssetService { | ||||
|     return mapAsset(asset); | ||||
|   } | ||||
|  | ||||
|   public async updateAssetById(authUser: AuthUserDto, assetId: string, dto: UpdateAssetDto): Promise<AssetResponseDto> { | ||||
|     const asset = await this._assetRepository.getById(assetId); | ||||
|     if (!asset) { | ||||
|       throw new BadRequestException('Asset not found'); | ||||
|     } | ||||
|  | ||||
|     if (authUser.id !== asset.userId) { | ||||
|       throw new ForbiddenException('Not the owner'); | ||||
|     } | ||||
|  | ||||
|     const updatedAsset = await this._assetRepository.update(asset, dto); | ||||
|  | ||||
|     return mapAsset(updatedAsset); | ||||
|   } | ||||
|  | ||||
|   public async downloadFile(query: ServeFileDto, res: Res) { | ||||
|     try { | ||||
|       let fileReadStream = null; | ||||
|   | ||||
| @@ -0,0 +1,6 @@ | ||||
| import { IsBoolean } from 'class-validator'; | ||||
|  | ||||
| export class UpdateAssetDto { | ||||
|   @IsBoolean() | ||||
|   isFavorite!: boolean; | ||||
| } | ||||
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							| @@ -1391,6 +1391,19 @@ export interface UpdateAlbumDto { | ||||
|      */ | ||||
|     'albumThumbnailAssetId'?: string; | ||||
| } | ||||
| /** | ||||
|  *  | ||||
|  * @export | ||||
|  * @interface UpdateAssetDto | ||||
|  */ | ||||
| export interface UpdateAssetDto { | ||||
|     /** | ||||
|      *  | ||||
|      * @type {boolean} | ||||
|      * @memberof UpdateAssetDto | ||||
|      */ | ||||
|     'isFavorite': boolean; | ||||
| } | ||||
| /** | ||||
|  *  | ||||
|  * @export | ||||
| @@ -3058,6 +3071,50 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration | ||||
|                 options: localVarRequestOptions, | ||||
|             }; | ||||
|         }, | ||||
|         /** | ||||
|          * Update an asset | ||||
|          * @summary  | ||||
|          * @param {string} assetId  | ||||
|          * @param {UpdateAssetDto} updateAssetDto  | ||||
|          * @param {*} [options] Override http request option. | ||||
|          * @throws {RequiredError} | ||||
|          */ | ||||
|         updateAssetById: async (assetId: string, updateAssetDto: UpdateAssetDto, options: AxiosRequestConfig = {}): Promise<RequestArgs> => { | ||||
|             // verify required parameter 'assetId' is not null or undefined | ||||
|             assertParamExists('updateAssetById', 'assetId', assetId) | ||||
|             // verify required parameter 'updateAssetDto' is not null or undefined | ||||
|             assertParamExists('updateAssetById', 'updateAssetDto', updateAssetDto) | ||||
|             const localVarPath = `/asset/assetById/{assetId}` | ||||
|                 .replace(`{${"assetId"}}`, encodeURIComponent(String(assetId))); | ||||
|             // use dummy base URL string because the URL constructor only accepts absolute URLs. | ||||
|             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); | ||||
|             let baseOptions; | ||||
|             if (configuration) { | ||||
|                 baseOptions = configuration.baseOptions; | ||||
|             } | ||||
|  | ||||
|             const localVarRequestOptions = { method: 'PUT', ...baseOptions, ...options}; | ||||
|             const localVarHeaderParameter = {} as any; | ||||
|             const localVarQueryParameter = {} as any; | ||||
|  | ||||
|             // authentication bearer required | ||||
|             // http bearer authentication required | ||||
|             await setBearerAuthToObject(localVarHeaderParameter, configuration) | ||||
|  | ||||
|  | ||||
|      | ||||
|             localVarHeaderParameter['Content-Type'] = 'application/json'; | ||||
|  | ||||
|             setSearchParams(localVarUrlObj, localVarQueryParameter); | ||||
|             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; | ||||
|             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; | ||||
|             localVarRequestOptions.data = serializeDataIfNeeded(updateAssetDto, localVarRequestOptions, configuration) | ||||
|  | ||||
|             return { | ||||
|                 url: toPathString(localVarUrlObj), | ||||
|                 options: localVarRequestOptions, | ||||
|             }; | ||||
|         }, | ||||
|         /** | ||||
|          *  | ||||
|          * @param {any} assetData  | ||||
| @@ -3279,6 +3336,18 @@ export const AssetApiFp = function(configuration?: Configuration) { | ||||
|             const localVarAxiosArgs = await localVarAxiosParamCreator.serveFile(aid, did, isThumb, isWeb, options); | ||||
|             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); | ||||
|         }, | ||||
|         /** | ||||
|          * Update an asset | ||||
|          * @summary  | ||||
|          * @param {string} assetId  | ||||
|          * @param {UpdateAssetDto} updateAssetDto  | ||||
|          * @param {*} [options] Override http request option. | ||||
|          * @throws {RequiredError} | ||||
|          */ | ||||
|         async updateAssetById(assetId: string, updateAssetDto: UpdateAssetDto, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<AssetResponseDto>> { | ||||
|             const localVarAxiosArgs = await localVarAxiosParamCreator.updateAssetById(assetId, updateAssetDto, options); | ||||
|             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); | ||||
|         }, | ||||
|         /** | ||||
|          *  | ||||
|          * @param {any} assetData  | ||||
| @@ -3450,6 +3519,17 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath | ||||
|         serveFile(aid: string, did: string, isThumb?: boolean, isWeb?: boolean, options?: any): AxiosPromise<object> { | ||||
|             return localVarFp.serveFile(aid, did, isThumb, isWeb, options).then((request) => request(axios, basePath)); | ||||
|         }, | ||||
|         /** | ||||
|          * Update an asset | ||||
|          * @summary  | ||||
|          * @param {string} assetId  | ||||
|          * @param {UpdateAssetDto} updateAssetDto  | ||||
|          * @param {*} [options] Override http request option. | ||||
|          * @throws {RequiredError} | ||||
|          */ | ||||
|         updateAssetById(assetId: string, updateAssetDto: UpdateAssetDto, options?: any): AxiosPromise<AssetResponseDto> { | ||||
|             return localVarFp.updateAssetById(assetId, updateAssetDto, options).then((request) => request(axios, basePath)); | ||||
|         }, | ||||
|         /** | ||||
|          *  | ||||
|          * @param {any} assetData  | ||||
| @@ -3652,6 +3732,19 @@ export class AssetApi extends BaseAPI { | ||||
|         return AssetApiFp(this.configuration).serveFile(aid, did, isThumb, isWeb, options).then((request) => request(this.axios, this.basePath)); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Update an asset | ||||
|      * @summary  | ||||
|      * @param {string} assetId  | ||||
|      * @param {UpdateAssetDto} updateAssetDto  | ||||
|      * @param {*} [options] Override http request option. | ||||
|      * @throws {RequiredError} | ||||
|      * @memberof AssetApi | ||||
|      */ | ||||
|     public updateAssetById(assetId: string, updateAssetDto: UpdateAssetDto, options?: AxiosRequestConfig) { | ||||
|         return AssetApiFp(this.configuration).updateAssetById(assetId, updateAssetDto, options).then((request) => request(this.axios, this.basePath)); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      *  | ||||
|      * @param {any} assetData  | ||||
|   | ||||
| @@ -9,6 +9,14 @@ | ||||
| 	import CircleIconButton from '../shared-components/circle-icon-button.svelte'; | ||||
| 	import ContextMenu from '../shared-components/context-menu/context-menu.svelte'; | ||||
| 	import MenuOption from '../shared-components/context-menu/menu-option.svelte'; | ||||
| 	import Star from 'svelte-material-icons/Star.svelte'; | ||||
| 	import StarOutline from 'svelte-material-icons/StarOutline.svelte'; | ||||
| 	import { page } from '$app/stores'; | ||||
| 	import { AssetResponseDto } from '../../../api'; | ||||
|  | ||||
| 	export let asset: AssetResponseDto; | ||||
|  | ||||
| 	const isOwner = asset.ownerId === $page.data.user.id; | ||||
|  | ||||
| 	const dispatch = createEventDispatcher(); | ||||
|  | ||||
| @@ -38,8 +46,15 @@ | ||||
| 	</div> | ||||
| 	<div class="text-white flex gap-2"> | ||||
| 		<CircleIconButton logo={CloudDownloadOutline} on:click={() => dispatch('download')} /> | ||||
| 		<CircleIconButton logo={DeleteOutline} on:click={() => dispatch('delete')} /> | ||||
| 		<CircleIconButton logo={InformationOutline} on:click={() => dispatch('showDetail')} /> | ||||
| 		{#if isOwner} | ||||
| 			<CircleIconButton | ||||
| 				logo={asset.isFavorite ? Star : StarOutline} | ||||
| 				on:click={() => dispatch('favorite')} | ||||
| 				title="Favorite" | ||||
| 			/> | ||||
| 		{/if} | ||||
| 		<CircleIconButton logo={DeleteOutline} on:click={() => dispatch('delete')} /> | ||||
| 		<CircleIconButton logo={DotsVertical} on:click={(event) => showOptionsMenu(event)} /> | ||||
| 	</div> | ||||
| </div> | ||||
|   | ||||
| @@ -178,6 +178,14 @@ | ||||
| 		} | ||||
| 	}; | ||||
|  | ||||
| 	const toggleFavorite = async () => { | ||||
| 		const { data } = await api.assetApi.updateAssetById(asset.id, { | ||||
| 			isFavorite: !asset.isFavorite | ||||
| 		}); | ||||
|  | ||||
| 		asset.isFavorite = data.isFavorite; | ||||
| 	}; | ||||
|  | ||||
| 	const openAlbumPicker = (shared: boolean) => { | ||||
| 		isShowAlbumPicker = true; | ||||
| 		addToSharedAlbum = shared; | ||||
| @@ -218,10 +226,12 @@ | ||||
| > | ||||
| 	<div class="col-start-1 col-span-4 row-start-1 row-span-1 z-[1000] transition-transform"> | ||||
| 		<AsserViewerNavBar | ||||
| 			{asset} | ||||
| 			on:goBack={closeViewer} | ||||
| 			on:showDetail={showDetailInfoHandler} | ||||
| 			on:download={downloadFile} | ||||
| 			on:delete={deleteAsset} | ||||
| 			on:favorite={toggleFavorite} | ||||
| 			on:addToAlbum={() => openAlbumPicker(false)} | ||||
| 			on:addToSharedAlbum={() => openAlbumPicker(true)} | ||||
| 		/> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user