beenull/immich
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chore(server): remove unused method (#4627)

Browse source 
* chore(server): remove unused method

* chore: open api
This commit is contained in:
Jason Rasmussen 2023-10-24 12:59:06 -04:00 committed by GitHub
parent 5921ec9a58
commit 3021eca8e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 0 additions and 869 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

139
cli/src/api/open-api/api.ts generated
View file

@ -1052,44 +1052,6 @@ export interface ChangePasswordDto {
*/
'password': string;
}
/**
*
* @export
* @interface CheckDuplicateAssetDto
*/
export interface CheckDuplicateAssetDto {
/**
*
* @type {string}
* @memberof CheckDuplicateAssetDto
*/
'deviceAssetId': string;
/**
*
* @type {string}
* @memberof CheckDuplicateAssetDto
*/
'deviceId': string;
}
/**
*
* @export
* @interface CheckDuplicateAssetResponseDto
*/
export interface CheckDuplicateAssetResponseDto {
/**
*
* @type {string}
* @memberof CheckDuplicateAssetResponseDto
*/
'id'?: string;
/**
*
* @type {boolean}
* @memberof CheckDuplicateAssetResponseDto
*/
'isExist': boolean;
}
/**
*
* @export
@ -5856,55 +5818,6 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration
options: localVarRequestOptions,
};
},
/**
* Check duplicated asset before uploading - for Web upload used
* @param {CheckDuplicateAssetDto} checkDuplicateAssetDto
* @param {string} [key]
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
checkDuplicateAsset: async (checkDuplicateAssetDto: CheckDuplicateAssetDto, key?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
// verify required parameter 'checkDuplicateAssetDto' is not null or undefined
assertParamExists('checkDuplicateAsset', 'checkDuplicateAssetDto', checkDuplicateAssetDto)
const localVarPath = `/asset/check`;
// 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: 'POST', ...baseOptions, ...options};
const localVarHeaderParameter = {} as any;
const localVarQueryParameter = {} as any;
// authentication cookie required
// authentication api_key required
await setApiKeyToObject(localVarHeaderParameter, "x-api-key", configuration)
// authentication bearer required
// http bearer authentication required
await setBearerAuthToObject(localVarHeaderParameter, configuration)
if (key !== undefined) {
localVarQueryParameter['key'] = key;
}
localVarHeaderParameter['Content-Type'] = 'application/json';
setSearchParams(localVarUrlObj, localVarQueryParameter);
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
localVarRequestOptions.data = serializeDataIfNeeded(checkDuplicateAssetDto, localVarRequestOptions, configuration)
return {
url: toPathString(localVarUrlObj),
options: localVarRequestOptions,
};
},
/**
* Checks if multiple assets exist on the server and returns all existing - used by background backup
* @param {CheckExistingAssetsDto} checkExistingAssetsDto
@ -7439,17 +7352,6 @@ export const AssetApiFp = function(configuration?: Configuration) {
const localVarAxiosArgs = await localVarAxiosParamCreator.bulkUploadCheck(assetBulkUploadCheckDto, options);
return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
},
/**
* Check duplicated asset before uploading - for Web upload used
* @param {CheckDuplicateAssetDto} checkDuplicateAssetDto
* @param {string} [key]
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
async checkDuplicateAsset(checkDuplicateAssetDto: CheckDuplicateAssetDto, key?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CheckDuplicateAssetResponseDto>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.checkDuplicateAsset(checkDuplicateAssetDto, key, options);
return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
},
/**
* Checks if multiple assets exist on the server and returns all existing - used by background backup
* @param {CheckExistingAssetsDto} checkExistingAssetsDto
@ -7805,15 +7707,6 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath
bulkUploadCheck(requestParameters: AssetApiBulkUploadCheckRequest, options?: AxiosRequestConfig): AxiosPromise<AssetBulkUploadCheckResponseDto> {
return localVarFp.bulkUploadCheck(requestParameters.assetBulkUploadCheckDto, options).then((request) => request(axios, basePath));
},
/**
* Check duplicated asset before uploading - for Web upload used
* @param {AssetApiCheckDuplicateAssetRequest} requestParameters Request parameters.
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
checkDuplicateAsset(requestParameters: AssetApiCheckDuplicateAssetRequest, options?: AxiosRequestConfig): AxiosPromise<CheckDuplicateAssetResponseDto> {
return localVarFp.checkDuplicateAsset(requestParameters.checkDuplicateAssetDto, requestParameters.key, options).then((request) => request(axios, basePath));
},
/**
* Checks if multiple assets exist on the server and returns all existing - used by background backup
* @param {AssetApiCheckExistingAssetsRequest} requestParameters Request parameters.
@ -8087,27 +7980,6 @@ export interface AssetApiBulkUploadCheckRequest {
readonly assetBulkUploadCheckDto: AssetBulkUploadCheckDto
}
/**
* Request parameters for checkDuplicateAsset operation in AssetApi.
* @export
* @interface AssetApiCheckDuplicateAssetRequest
*/
export interface AssetApiCheckDuplicateAssetRequest {
/**
*
* @type {CheckDuplicateAssetDto}
* @memberof AssetApiCheckDuplicateAsset
*/
readonly checkDuplicateAssetDto: CheckDuplicateAssetDto
/**
*
* @type {string}
* @memberof AssetApiCheckDuplicateAsset
*/
readonly key?: string
}
/**
* Request parameters for checkExistingAssets operation in AssetApi.
* @export
@ -8819,17 +8691,6 @@ export class AssetApi extends BaseAPI {
return AssetApiFp(this.configuration).bulkUploadCheck(requestParameters.assetBulkUploadCheckDto, options).then((request) => request(this.axios, this.basePath));
}
/**
* Check duplicated asset before uploading - for Web upload used
* @param {AssetApiCheckDuplicateAssetRequest} requestParameters Request parameters.
* @param {*} [options] Override http request option.
* @throws {RequiredError}
* @memberof AssetApi
*/
public checkDuplicateAsset(requestParameters: AssetApiCheckDuplicateAssetRequest, options?: AxiosRequestConfig) {
return AssetApiFp(this.configuration).checkDuplicateAsset(requestParameters.checkDuplicateAssetDto, requestParameters.key, options).then((request) => request(this.axios, this.basePath));
}
/**
* Checks if multiple assets exist on the server and returns all existing - used by background backup
* @param {AssetApiCheckExistingAssetsRequest} requestParameters Request parameters.

6
mobile/openapi/.openapi-generator/FILES generated
View file

@ -40,8 +40,6 @@ doc/CLIPConfig.md
doc/CLIPMode.md
doc/CQMode.md
doc/ChangePasswordDto.md
doc/CheckDuplicateAssetDto.md
doc/CheckDuplicateAssetResponseDto.md
doc/CheckExistingAssetsDto.md
doc/CheckExistingAssetsResponseDto.md
doc/CitiesFile.md
@ -216,8 +214,6 @@ lib/model/auth_device_response_dto.dart
lib/model/bulk_id_response_dto.dart
lib/model/bulk_ids_dto.dart
lib/model/change_password_dto.dart
lib/model/check_duplicate_asset_dto.dart
lib/model/check_duplicate_asset_response_dto.dart
lib/model/check_existing_assets_dto.dart
lib/model/check_existing_assets_response_dto.dart
lib/model/cities_file.dart
@ -364,8 +360,6 @@ test/authentication_api_test.dart
test/bulk_id_response_dto_test.dart
test/bulk_ids_dto_test.dart
test/change_password_dto_test.dart
test/check_duplicate_asset_dto_test.dart
test/check_duplicate_asset_response_dto_test.dart
test/check_existing_assets_dto_test.dart
test/check_existing_assets_response_dto_test.dart
test/cities_file_test.dart

3
mobile/openapi/README.md generated
View file

@ -88,7 +88,6 @@ Class | Method | HTTP request | Description
*AlbumApi* | [**removeUserFromAlbum**](doc//AlbumApi.md#removeuserfromalbum) | **DELETE** /album/{id}/user/{userId} |
*AlbumApi* | [**updateAlbumInfo**](doc//AlbumApi.md#updatealbuminfo) | **PATCH** /album/{id} |
*AssetApi* | [**bulkUploadCheck**](doc//AssetApi.md#bulkuploadcheck) | **POST** /asset/bulk-upload-check |
*AssetApi* | [**checkDuplicateAsset**](doc//AssetApi.md#checkduplicateasset) | **POST** /asset/check |
*AssetApi* | [**checkExistingAssets**](doc//AssetApi.md#checkexistingassets) | **POST** /asset/exist |
*AssetApi* | [**deleteAssets**](doc//AssetApi.md#deleteassets) | **DELETE** /asset |
*AssetApi* | [**downloadArchive**](doc//AssetApi.md#downloadarchive) | **POST** /asset/download/archive |
@ -233,8 +232,6 @@ Class | Method | HTTP request | Description
- [CLIPMode](doc//CLIPMode.md)
- [CQMode](doc//CQMode.md)
- [ChangePasswordDto](doc//ChangePasswordDto.md)
- [CheckDuplicateAssetDto](doc//CheckDuplicateAssetDto.md)
- [CheckDuplicateAssetResponseDto](doc//CheckDuplicateAssetResponseDto.md)
- [CheckExistingAssetsDto](doc//CheckExistingAssetsDto.md)
- [CheckExistingAssetsResponseDto](doc//CheckExistingAssetsResponseDto.md)
- [CitiesFile](doc//CitiesFile.md)

60
mobile/openapi/doc/AssetApi.md generated
View file

@ -10,7 +10,6 @@ All URIs are relative to */api*
Method | HTTP request | Description
------------- | ------------- | -------------
[**bulkUploadCheck**](AssetApi.md#bulkuploadcheck) | **POST** /asset/bulk-upload-check |
[**checkDuplicateAsset**](AssetApi.md#checkduplicateasset) | **POST** /asset/check |
[**checkExistingAssets**](AssetApi.md#checkexistingassets) | **POST** /asset/exist |
[**deleteAssets**](AssetApi.md#deleteassets) | **DELETE** /asset |
[**downloadArchive**](AssetApi.md#downloadarchive) | **POST** /asset/download/archive |
@ -99,65 +98,6 @@ 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)
# **checkDuplicateAsset**
> CheckDuplicateAssetResponseDto checkDuplicateAsset(checkDuplicateAssetDto, key)
Check duplicated asset before uploading - for Web upload used
### Example
```dart
import 'package:openapi/api.dart';
// TODO Configure API key authorization: cookie
//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKey = 'YOUR_API_KEY';
// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKeyPrefix = 'Bearer';
// TODO Configure API key authorization: api_key
//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKey = 'YOUR_API_KEY';
// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKeyPrefix = 'Bearer';
// 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 checkDuplicateAssetDto = CheckDuplicateAssetDto(); // CheckDuplicateAssetDto |
final key = key_example; // String |
try {
final result = api_instance.checkDuplicateAsset(checkDuplicateAssetDto, key);
print(result);
} catch (e) {
print('Exception when calling AssetApi->checkDuplicateAsset: $e\n');
}
```
### Parameters
Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
**checkDuplicateAssetDto** | [**CheckDuplicateAssetDto**](CheckDuplicateAssetDto.md)| |
**key** | **String**| | [optional]
### Return type
[**CheckDuplicateAssetResponseDto**](CheckDuplicateAssetResponseDto.md)
### Authorization
[cookie](../README.md#cookie), [api_key](../README.md#api_key), [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)
# **checkExistingAssets**
> CheckExistingAssetsResponseDto checkExistingAssets(checkExistingAssetsDto)

16
mobile/openapi/doc/CheckDuplicateAssetDto.md generated
View file

@ -1,16 +0,0 @@
# openapi.model.CheckDuplicateAssetDto
## Load the model package
```dart
import 'package:openapi/api.dart';
```
## Properties
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**deviceAssetId** | **String** | |
**deviceId** | **String** | |
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

16
mobile/openapi/doc/CheckDuplicateAssetResponseDto.md generated
View file

@ -1,16 +0,0 @@
# openapi.model.CheckDuplicateAssetResponseDto
## Load the model package
```dart
import 'package:openapi/api.dart';
```
## Properties
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**id** | **String** | | [optional]
**isExist** | **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)

2
mobile/openapi/lib/api.dart generated
View file

@ -77,8 +77,6 @@ part 'model/clip_config.dart';
part 'model/clip_mode.dart';
part 'model/cq_mode.dart';
part 'model/change_password_dto.dart';
part 'model/check_duplicate_asset_dto.dart';
part 'model/check_duplicate_asset_response_dto.dart';
part 'model/check_existing_assets_dto.dart';
part 'model/check_existing_assets_response_dto.dart';
part 'model/cities_file.dart';

60
mobile/openapi/lib/api/asset_api.dart generated
View file

@ -68,66 +68,6 @@ class AssetApi {
return null;
}
/// Check duplicated asset before uploading - for Web upload used
///
/// Note: This method returns the HTTP [Response].
///
/// Parameters:
///
/// * [CheckDuplicateAssetDto] checkDuplicateAssetDto (required):
///
/// * [String] key:
Future<Response> checkDuplicateAssetWithHttpInfo(CheckDuplicateAssetDto checkDuplicateAssetDto, { String? key, }) async {
// ignore: prefer_const_declarations
final path = r'/asset/check';
// ignore: prefer_final_locals
Object? postBody = checkDuplicateAssetDto;
final queryParams = <QueryParam>[];
final headerParams = <String, String>{};
final formParams = <String, String>{};
if (key != null) {
queryParams.addAll(_queryParams('', 'key', key));
}
const contentTypes = <String>['application/json'];
return apiClient.invokeAPI(
path,
'POST',
queryParams,
postBody,
headerParams,
formParams,
contentTypes.isEmpty ? null : contentTypes.first,
);
}
/// Check duplicated asset before uploading - for Web upload used
///
/// Parameters:
///
/// * [CheckDuplicateAssetDto] checkDuplicateAssetDto (required):
///
/// * [String] key:
Future<CheckDuplicateAssetResponseDto?> checkDuplicateAsset(CheckDuplicateAssetDto checkDuplicateAssetDto, { String? key, }) async {
final response = await checkDuplicateAssetWithHttpInfo(checkDuplicateAssetDto, key: key, );
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), 'CheckDuplicateAssetResponseDto',) as CheckDuplicateAssetResponseDto;
}
return null;
}
/// Checks if multiple assets exist on the server and returns all existing - used by background backup
///
/// Note: This method returns the HTTP [Response].

4
mobile/openapi/lib/api_client.dart generated
View file

@ -245,10 +245,6 @@ class ApiClient {
return CQModeTypeTransformer().decode(value);
case 'ChangePasswordDto':
return ChangePasswordDto.fromJson(value);
case 'CheckDuplicateAssetDto':
return CheckDuplicateAssetDto.fromJson(value);
case 'CheckDuplicateAssetResponseDto':
return CheckDuplicateAssetResponseDto.fromJson(value);
case 'CheckExistingAssetsDto':
return CheckExistingAssetsDto.fromJson(value);
case 'CheckExistingAssetsResponseDto':

106
mobile/openapi/lib/model/check_duplicate_asset_dto.dart generated
View file

@ -1,106 +0,0 @@
//
// 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 CheckDuplicateAssetDto {
/// Returns a new [CheckDuplicateAssetDto] instance.
CheckDuplicateAssetDto({
required this.deviceAssetId,
required this.deviceId,
});
String deviceAssetId;
String deviceId;
@override
bool operator ==(Object other) => identical(this, other) || other is CheckDuplicateAssetDto &&
other.deviceAssetId == deviceAssetId &&
other.deviceId == deviceId;
@override
int get hashCode =>
// ignore: unnecessary_parenthesis
(deviceAssetId.hashCode) +
(deviceId.hashCode);
@override
String toString() => 'CheckDuplicateAssetDto[deviceAssetId=$deviceAssetId, deviceId=$deviceId]';
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
json[r'deviceAssetId'] = this.deviceAssetId;
json[r'deviceId'] = this.deviceId;
return json;
}
/// Returns a new [CheckDuplicateAssetDto] instance and imports its values from
/// [value] if it's a [Map], null otherwise.
// ignore: prefer_constructors_over_static_methods
static CheckDuplicateAssetDto? fromJson(dynamic value) {
if (value is Map) {
final json = value.cast<String, dynamic>();
return CheckDuplicateAssetDto(
deviceAssetId: mapValueOfType<String>(json, r'deviceAssetId')!,
deviceId: mapValueOfType<String>(json, r'deviceId')!,
);
}
return null;
}
static List<CheckDuplicateAssetDto> listFromJson(dynamic json, {bool growable = false,}) {
final result = <CheckDuplicateAssetDto>[];
if (json is List && json.isNotEmpty) {
for (final row in json) {
final value = CheckDuplicateAssetDto.fromJson(row);
if (value != null) {
result.add(value);
}
}
}
return result.toList(growable: growable);
}
static Map<String, CheckDuplicateAssetDto> mapFromJson(dynamic json) {
final map = <String, CheckDuplicateAssetDto>{};
if (json is Map && json.isNotEmpty) {
json = json.cast<String, dynamic>(); // ignore: parameter_assignments
for (final entry in json.entries) {
final value = CheckDuplicateAssetDto.fromJson(entry.value);
if (value != null) {
map[entry.key] = value;
}
}
}
return map;
}
// maps a json object with a list of CheckDuplicateAssetDto-objects as value to a dart map
static Map<String, List<CheckDuplicateAssetDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
final map = <String, List<CheckDuplicateAssetDto>>{};
if (json is Map && json.isNotEmpty) {
// ignore: parameter_assignments
json = json.cast<String, dynamic>();
for (final entry in json.entries) {
map[entry.key] = CheckDuplicateAssetDto.listFromJson(entry.value, growable: growable,);
}
}
return map;
}
/// The list of required keys that must be present in a JSON.
static const requiredKeys = <String>{
'deviceAssetId',
'deviceId',
};
}

115
mobile/openapi/lib/model/check_duplicate_asset_response_dto.dart generated
View file

@ -1,115 +0,0 @@
//
// 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 CheckDuplicateAssetResponseDto {
/// Returns a new [CheckDuplicateAssetResponseDto] instance.
CheckDuplicateAssetResponseDto({
this.id,
required this.isExist,
});
///
/// Please note: This property should have been non-nullable! Since the specification file
/// does not include a default value (using the "default:" property), however, the generated
/// source code must fall back to having a nullable type.
/// Consider adding a "default:" property in the specification file to hide this note.
///
String? id;
bool isExist;
@override
bool operator ==(Object other) => identical(this, other) || other is CheckDuplicateAssetResponseDto &&
other.id == id &&
other.isExist == isExist;
@override
int get hashCode =>
// ignore: unnecessary_parenthesis
(id == null ? 0 : id!.hashCode) +
(isExist.hashCode);
@override
String toString() => 'CheckDuplicateAssetResponseDto[id=$id, isExist=$isExist]';
Map<String, dynamic> toJson() {
final json = <String, dynamic>{};
if (this.id != null) {
json[r'id'] = this.id;
} else {
// json[r'id'] = null;
}
json[r'isExist'] = this.isExist;
return json;
}
/// Returns a new [CheckDuplicateAssetResponseDto] instance and imports its values from
/// [value] if it's a [Map], null otherwise.
// ignore: prefer_constructors_over_static_methods
static CheckDuplicateAssetResponseDto? fromJson(dynamic value) {
if (value is Map) {
final json = value.cast<String, dynamic>();
return CheckDuplicateAssetResponseDto(
id: mapValueOfType<String>(json, r'id'),
isExist: mapValueOfType<bool>(json, r'isExist')!,
);
}
return null;
}
static List<CheckDuplicateAssetResponseDto> listFromJson(dynamic json, {bool growable = false,}) {
final result = <CheckDuplicateAssetResponseDto>[];
if (json is List && json.isNotEmpty) {
for (final row in json) {
final value = CheckDuplicateAssetResponseDto.fromJson(row);
if (value != null) {
result.add(value);
}
}
}
return result.toList(growable: growable);
}
static Map<String, CheckDuplicateAssetResponseDto> mapFromJson(dynamic json) {
final map = <String, CheckDuplicateAssetResponseDto>{};
if (json is Map && json.isNotEmpty) {
json = json.cast<String, dynamic>(); // ignore: parameter_assignments
for (final entry in json.entries) {
final value = CheckDuplicateAssetResponseDto.fromJson(entry.value);
if (value != null) {
map[entry.key] = value;
}
}
}
return map;
}
// maps a json object with a list of CheckDuplicateAssetResponseDto-objects as value to a dart map
static Map<String, List<CheckDuplicateAssetResponseDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
final map = <String, List<CheckDuplicateAssetResponseDto>>{};
if (json is Map && json.isNotEmpty) {
// ignore: parameter_assignments
json = json.cast<String, dynamic>();
for (final entry in json.entries) {
map[entry.key] = CheckDuplicateAssetResponseDto.listFromJson(entry.value, growable: growable,);
}
}
return map;
}
/// The list of required keys that must be present in a JSON.
static const requiredKeys = <String>{
'isExist',
};
}

7
mobile/openapi/test/asset_api_test.dart generated
View file

@ -24,13 +24,6 @@ void main() {
// TODO
});
// Check duplicated asset before uploading - for Web upload used
//
//Future<CheckDuplicateAssetResponseDto> checkDuplicateAsset(CheckDuplicateAssetDto checkDuplicateAssetDto, { String key }) async
test('test checkDuplicateAsset', () async {
// TODO
});
// Checks if multiple assets exist on the server and returns all existing - used by background backup
//
//Future<CheckExistingAssetsResponseDto> checkExistingAssets(CheckExistingAssetsDto checkExistingAssetsDto) async

32
mobile/openapi/test/check_duplicate_asset_dto_test.dart generated
View file

@ -1,32 +0,0 @@
//
// 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 CheckDuplicateAssetDto
void main() {
// final instance = CheckDuplicateAssetDto();
group('test CheckDuplicateAssetDto', () {
// String deviceAssetId
test('to test the property `deviceAssetId`', () async {
// TODO
});
// String deviceId
test('to test the property `deviceId`', () async {
// TODO
});
});
}

32
mobile/openapi/test/check_duplicate_asset_response_dto_test.dart generated
View file

@ -1,32 +0,0 @@
//
// 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 CheckDuplicateAssetResponseDto
void main() {
// final instance = CheckDuplicateAssetResponseDto();
group('test CheckDuplicateAssetResponseDto', () {
// String id
test('to test the property `id`', () async {
// TODO
});
// bool isExist
test('to test the property `isExist`', () async {
// TODO
});
});
}

81
server/immich-openapi-specs.json
View file

@ -927,58 +927,6 @@
]
}
},
"/asset/check": {
"post": {
"description": "Check duplicated asset before uploading - for Web upload used",
"operationId": "checkDuplicateAsset",
"parameters": [
{
"name": "key",
"required": false,
"in": "query",
"schema": {
"type": "string"
}
}
],
"requestBody": {
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/CheckDuplicateAssetDto"
}
}
},
"required": true
},
"responses": {
"200": {
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/CheckDuplicateAssetResponseDto"
}
}
},
"description": ""
}
},
"security": [
{
"bearer": []
},
{
"cookie": []
},
{
"api_key": []
}
],
"tags": [
"Asset"
]
}
},
"/asset/curated-locations": {
"get": {
"operationId": "getCuratedLocations",
@ -6269,35 +6217,6 @@
],
"type": "object"
},
"CheckDuplicateAssetDto": {
"properties": {
"deviceAssetId": {
"type": "string"
},
"deviceId": {
"type": "string"
}
},
"required": [
"deviceAssetId",
"deviceId"
],
"type": "object"
},
"CheckDuplicateAssetResponseDto": {
"properties": {
"id": {
"type": "string"
},
"isExist": {
"type": "boolean"
}
},
"required": [
"isExist"
],
"type": "object"
},
"CheckExistingAssetsDto": {
"properties": {
"deviceAssetIds": {

15
server/src/immich/api-v1/asset/asset.controller.ts
View file

@ -23,7 +23,6 @@ import FileNotEmptyValidator from '../validation/file-not-empty-validator';
import { AssetService } from './asset.service';
import { AssetBulkUploadCheckDto } from './dto/asset-check.dto';
import { AssetSearchDto } from './dto/asset-search.dto';
import { CheckDuplicateAssetDto } from './dto/check-duplicate-asset.dto';
import { CheckExistingAssetsDto } from './dto/check-existing-assets.dto';
import { CreateAssetDto, ImportAssetDto } from './dto/create-asset.dto';
import { DeviceIdDto } from './dto/device-id.dto';
@ -32,7 +31,6 @@ import { SearchAssetDto } from './dto/search-asset.dto';
import { ServeFileDto } from './dto/serve-file.dto';
import { AssetBulkUploadCheckResponseDto } from './response-dto/asset-check-response.dto';
import { AssetFileUploadResponseDto } from './response-dto/asset-file-upload-response.dto';
import { CheckDuplicateAssetResponseDto } from './response-dto/check-duplicate-asset-response.dto';
import { CheckExistingAssetsResponseDto } from './response-dto/check-existing-assets-response.dto';
import { CuratedLocationsResponseDto } from './response-dto/curated-locations-response.dto';
import { CuratedObjectsResponseDto } from './response-dto/curated-objects-response.dto';
@ -189,19 +187,6 @@ export class AssetController {
return this.assetService.getAssetById(authUser, id) as Promise<AssetResponseDto>;
}
/**
* Check duplicated asset before uploading - for Web upload used
*/
@SharedLinkRoute()
@Post('/check')
@HttpCode(HttpStatus.OK)
checkDuplicateAsset(
@AuthUser() authUser: AuthUserDto,
@Body(ValidationPipe) dto: CheckDuplicateAssetDto,
): Promise<CheckDuplicateAssetResponseDto> {
return this.assetService.checkDuplicatedAsset(authUser, dto);
}
/**
* Checks if multiple assets exist on the server and returns all existing - used by background backup
*/

19
server/src/immich/api-v1/asset/asset.service.ts
View file

@ -34,7 +34,6 @@ import { IAssetRepository } from './asset-repository';
import { AssetCore } from './asset.core';
import { AssetBulkUploadCheckDto } from './dto/asset-check.dto';
import { AssetSearchDto } from './dto/asset-search.dto';
import { CheckDuplicateAssetDto } from './dto/check-duplicate-asset.dto';
import { CheckExistingAssetsDto } from './dto/check-existing-assets.dto';
import { CreateAssetDto, ImportAssetDto } from './dto/create-asset.dto';
import { GetAssetThumbnailDto, GetAssetThumbnailFormatEnum } from './dto/get-asset-thumbnail.dto';
@ -47,7 +46,6 @@ import {
AssetUploadAction,
} from './response-dto/asset-check-response.dto';
import { AssetFileUploadResponseDto } from './response-dto/asset-file-upload-response.dto';
import { CheckDuplicateAssetResponseDto } from './response-dto/check-duplicate-asset-response.dto';
import { CheckExistingAssetsResponseDto } from './response-dto/check-existing-assets-response.dto';
import { CuratedLocationsResponseDto } from './response-dto/curated-locations-response.dto';
import { CuratedObjectsResponseDto } from './response-dto/curated-objects-response.dto';
@ -319,23 +317,6 @@ export class AssetService {
return this._assetRepository.getDetectedObjectsByUserId(authUser.id);
}
async checkDuplicatedAsset(
authUser: AuthUserDto,
checkDuplicateAssetDto: CheckDuplicateAssetDto,
): Promise<CheckDuplicateAssetResponseDto> {
const res = await this.assetRepository.findOne({
where: {
deviceAssetId: checkDuplicateAssetDto.deviceAssetId,
deviceId: checkDuplicateAssetDto.deviceId,
ownerId: authUser.id,
},
});
const isDuplicated = res ? true : false;
return new CheckDuplicateAssetResponseDto(isDuplicated, res?.id);
}
async checkExistingAssets(
authUser: AuthUserDto,
checkExistingAssetsDto: CheckExistingAssetsDto,

9
server/src/immich/api-v1/asset/dto/check-duplicate-asset.dto.ts
View file

@ -1,9 +0,0 @@
import { IsNotEmpty } from 'class-validator';
export class CheckDuplicateAssetDto {
@IsNotEmpty()
deviceAssetId!: string;
@IsNotEmpty()
deviceId!: string;
}

8
server/src/immich/api-v1/asset/response-dto/check-duplicate-asset-response.dto.ts
View file

@ -1,8 +0,0 @@
export class CheckDuplicateAssetResponseDto {
constructor(isExist: boolean, id?: string) {
this.isExist = isExist;
this.id = id;
}
isExist: boolean;
id?: string;
}

139
web/src/api/open-api/api.ts generated
View file

@ -1052,44 +1052,6 @@ export interface ChangePasswordDto {
*/
'password': string;
}
/**
*
* @export
* @interface CheckDuplicateAssetDto
*/
export interface CheckDuplicateAssetDto {
/**
*
* @type {string}
* @memberof CheckDuplicateAssetDto
*/
'deviceAssetId': string;
/**
*
* @type {string}
* @memberof CheckDuplicateAssetDto
*/
'deviceId': string;
}
/**
*
* @export
* @interface CheckDuplicateAssetResponseDto
*/
export interface CheckDuplicateAssetResponseDto {
/**
*
* @type {string}
* @memberof CheckDuplicateAssetResponseDto
*/
'id'?: string;
/**
*
* @type {boolean}
* @memberof CheckDuplicateAssetResponseDto
*/
'isExist': boolean;
}
/**
*
* @export
@ -5856,55 +5818,6 @@ export const AssetApiAxiosParamCreator = function (configuration?: Configuration
options: localVarRequestOptions,
};
},
/**
* Check duplicated asset before uploading - for Web upload used
* @param {CheckDuplicateAssetDto} checkDuplicateAssetDto
* @param {string} [key]
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
checkDuplicateAsset: async (checkDuplicateAssetDto: CheckDuplicateAssetDto, key?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
// verify required parameter 'checkDuplicateAssetDto' is not null or undefined
assertParamExists('checkDuplicateAsset', 'checkDuplicateAssetDto', checkDuplicateAssetDto)
const localVarPath = `/asset/check`;
// 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: 'POST', ...baseOptions, ...options};
const localVarHeaderParameter = {} as any;
const localVarQueryParameter = {} as any;
// authentication cookie required
// authentication api_key required
await setApiKeyToObject(localVarHeaderParameter, "x-api-key", configuration)
// authentication bearer required
// http bearer authentication required
await setBearerAuthToObject(localVarHeaderParameter, configuration)
if (key !== undefined) {
localVarQueryParameter['key'] = key;
}
localVarHeaderParameter['Content-Type'] = 'application/json';
setSearchParams(localVarUrlObj, localVarQueryParameter);
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
localVarRequestOptions.data = serializeDataIfNeeded(checkDuplicateAssetDto, localVarRequestOptions, configuration)
return {
url: toPathString(localVarUrlObj),
options: localVarRequestOptions,
};
},
/**
* Checks if multiple assets exist on the server and returns all existing - used by background backup
* @param {CheckExistingAssetsDto} checkExistingAssetsDto
@ -7439,17 +7352,6 @@ export const AssetApiFp = function(configuration?: Configuration) {
const localVarAxiosArgs = await localVarAxiosParamCreator.bulkUploadCheck(assetBulkUploadCheckDto, options);
return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
},
/**
* Check duplicated asset before uploading - for Web upload used
* @param {CheckDuplicateAssetDto} checkDuplicateAssetDto
* @param {string} [key]
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
async checkDuplicateAsset(checkDuplicateAssetDto: CheckDuplicateAssetDto, key?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CheckDuplicateAssetResponseDto>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.checkDuplicateAsset(checkDuplicateAssetDto, key, options);
return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
},
/**
* Checks if multiple assets exist on the server and returns all existing - used by background backup
* @param {CheckExistingAssetsDto} checkExistingAssetsDto
@ -7805,15 +7707,6 @@ export const AssetApiFactory = function (configuration?: Configuration, basePath
bulkUploadCheck(requestParameters: AssetApiBulkUploadCheckRequest, options?: AxiosRequestConfig): AxiosPromise<AssetBulkUploadCheckResponseDto> {
return localVarFp.bulkUploadCheck(requestParameters.assetBulkUploadCheckDto, options).then((request) => request(axios, basePath));
},
/**
* Check duplicated asset before uploading - for Web upload used
* @param {AssetApiCheckDuplicateAssetRequest} requestParameters Request parameters.
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
checkDuplicateAsset(requestParameters: AssetApiCheckDuplicateAssetRequest, options?: AxiosRequestConfig): AxiosPromise<CheckDuplicateAssetResponseDto> {
return localVarFp.checkDuplicateAsset(requestParameters.checkDuplicateAssetDto, requestParameters.key, options).then((request) => request(axios, basePath));
},
/**
* Checks if multiple assets exist on the server and returns all existing - used by background backup
* @param {AssetApiCheckExistingAssetsRequest} requestParameters Request parameters.
@ -8087,27 +7980,6 @@ export interface AssetApiBulkUploadCheckRequest {
readonly assetBulkUploadCheckDto: AssetBulkUploadCheckDto
}
/**
* Request parameters for checkDuplicateAsset operation in AssetApi.
* @export
* @interface AssetApiCheckDuplicateAssetRequest
*/
export interface AssetApiCheckDuplicateAssetRequest {
/**
*
* @type {CheckDuplicateAssetDto}
* @memberof AssetApiCheckDuplicateAsset
*/
readonly checkDuplicateAssetDto: CheckDuplicateAssetDto
/**
*
* @type {string}
* @memberof AssetApiCheckDuplicateAsset
*/
readonly key?: string
}
/**
* Request parameters for checkExistingAssets operation in AssetApi.
* @export
@ -8819,17 +8691,6 @@ export class AssetApi extends BaseAPI {
return AssetApiFp(this.configuration).bulkUploadCheck(requestParameters.assetBulkUploadCheckDto, options).then((request) => request(this.axios, this.basePath));
}
/**
* Check duplicated asset before uploading - for Web upload used
* @param {AssetApiCheckDuplicateAssetRequest} requestParameters Request parameters.
* @param {*} [options] Override http request option.
* @throws {RequiredError}
* @memberof AssetApi
*/
public checkDuplicateAsset(requestParameters: AssetApiCheckDuplicateAssetRequest, options?: AxiosRequestConfig) {
return AssetApiFp(this.configuration).checkDuplicateAsset(requestParameters.checkDuplicateAssetDto, requestParameters.key, options).then((request) => request(this.axios, this.basePath));
}
/**
* Checks if multiple assets exist on the server and returns all existing - used by background backup
* @param {AssetApiCheckExistingAssetsRequest} requestParameters Request parameters.