helpy4/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich synced 2025-11-14 17:36:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix migration

Browse source 
fix tests
This commit is contained in:
Peter Ombodi 2025-10-06 16:06:10 +03:00
parent b2ac41c8bb
commit dd2a5b99ba
5 changed files with 1 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mobile/drift_schemas/main/drift_schema_v13.json generated
View file

File diff suppressed because one or more lines are too long

10
mobile/lib/infrastructure/repositories/db.repository.steps.dart generated
View file

@ -5427,7 +5427,6 @@ final class Schema13 extends i0.VersionedSchema {
_column_12, _column_12,
_column_0, _column_0,
_column_95, _column_95,
_column_96,
_column_22, _column_22,
_column_14, _column_14,
_column_23, _column_23,
@ -5466,8 +5465,6 @@ class Shape23 extends i0.VersionedTable {
columnsByName['id']! as i1.GeneratedColumn<String>; columnsByName['id']! as i1.GeneratedColumn<String>;
i1.GeneratedColumn<String> get albumId => i1.GeneratedColumn<String> get albumId =>
columnsByName['album_id']! as i1.GeneratedColumn<String>; columnsByName['album_id']! as i1.GeneratedColumn<String>;
i1.GeneratedColumn<String> get volume =>
columnsByName['volume']! as i1.GeneratedColumn<String>;
i1.GeneratedColumn<String> get checksum => i1.GeneratedColumn<String> get checksum =>
columnsByName['checksum']! as i1.GeneratedColumn<String>; columnsByName['checksum']! as i1.GeneratedColumn<String>;
i1.GeneratedColumn<bool> get isFavorite => i1.GeneratedColumn<bool> get isFavorite =>
@ -5483,13 +5480,6 @@ i1.GeneratedColumn<String> _column_95(String aliasedName) =>
false, false,
type: i1.DriftSqlType.string, type: i1.DriftSqlType.string,
); );
i1.GeneratedColumn<String> _column_96(String aliasedName) =>
i1.GeneratedColumn<String>(
'volume',
aliasedName,
true,
type: i1.DriftSqlType.string,
);
i0.MigrationStepWithVersion migrationSteps({ i0.MigrationStepWithVersion migrationSteps({
required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2, required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3, required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,

32
mobile/test/domain/services/hash_service_test.dart
View file

@ -191,36 +191,4 @@ void main() {
}); });
}); });
group('HashService hashAssets (trash sync mode)', () {
test('hashes trashed assets and writes to trashed repo', () async {
final album = LocalAlbumStub.recent;
final trashed1 = TrashedAssetStub.trashed1.copyWith(id: 't1');
when(() => mockAlbumRepo.getBackupAlbums()).thenAnswer((_) async => [album]);
when(() => mockTrashedAssetRepo.getAssetsToHash([album.id])).thenAnswer((_) async => [trashed1]);
when(
() => mockNativeApi.hashAssets([trashed1.id], allowNetworkAccess: false),
).thenAnswer((_) async => [HashResult(assetId: trashed1.id, hash: 't1-hash')]);
await sut.hashAssets();
verify(() => mockNativeApi.hashAssets([trashed1.id], allowNetworkAccess: false)).called(1);
verify(() => mockTrashedAssetRepo.updateHashes({'t1': 't1-hash'})).called(1);
verifyNever(() => mockAssetRepo.updateHashes(any()));
});
test('skips when trashed list is empty', () async {
final album = LocalAlbumStub.recent;
when(() => mockAlbumRepo.getBackupAlbums()).thenAnswer((_) async => [album]);
when(() => mockTrashedAssetRepo.getAssetsToHash([album.id])).thenAnswer((_) async => []);
await sut.hashAssets();
verifyNever(() => mockNativeApi.hashAssets(any(), allowNetworkAccess: any(named: 'allowNetworkAccess')));
verifyNever(() => mockTrashedAssetRepo.updateHashes(any()));
verifyNever(() => mockAssetRepo.updateHashes(any()));
});
});
} }

36
mobile/test/drift/main/generated/schema_v13.dart generated
View file

@ -7184,13 +7184,6 @@ class TrashedLocalAssetEntity extends Table
type: DriftSqlType.string, type: DriftSqlType.string,
requiredDuringInsert: true, requiredDuringInsert: true,
); );
late final GeneratedColumn<String> volume = GeneratedColumn<String>(
'volume',
aliasedName,
true,
type: DriftSqlType.string,
requiredDuringInsert: false,
);
late final GeneratedColumn<String> checksum = GeneratedColumn<String>( late final GeneratedColumn<String> checksum = GeneratedColumn<String>(
'checksum', 'checksum',
aliasedName, aliasedName,
@ -7228,7 +7221,6 @@ class TrashedLocalAssetEntity extends Table
durationInSeconds, durationInSeconds,
id, id,
albumId, albumId,
volume,
checksum, checksum,
isFavorite, isFavorite,
orientation, orientation,
@ -7283,10 +7275,6 @@ class TrashedLocalAssetEntity extends Table
DriftSqlType.string, DriftSqlType.string,
data['${effectivePrefix}album_id'], data['${effectivePrefix}album_id'],
)!, )!,
volume: attachedDatabase.typeMapping.read(
DriftSqlType.string,
data['${effectivePrefix}volume'],
),
checksum: attachedDatabase.typeMapping.read( checksum: attachedDatabase.typeMapping.read(
DriftSqlType.string, DriftSqlType.string,
data['${effectivePrefix}checksum'], data['${effectivePrefix}checksum'],
@ -7324,7 +7312,6 @@ class TrashedLocalAssetEntityData extends DataClass
final int? durationInSeconds; final int? durationInSeconds;
final String id; final String id;
final String albumId; final String albumId;
final String? volume;
final String? checksum; final String? checksum;
final bool isFavorite; final bool isFavorite;
final int orientation; final int orientation;
@ -7338,7 +7325,6 @@ class TrashedLocalAssetEntityData extends DataClass
this.durationInSeconds, this.durationInSeconds,
required this.id, required this.id,
required this.albumId, required this.albumId,
this.volume,
this.checksum, this.checksum,
required this.isFavorite, required this.isFavorite,
required this.orientation, required this.orientation,
@ -7361,9 +7347,6 @@ class TrashedLocalAssetEntityData extends DataClass
} }
map['id'] = Variable<String>(id); map['id'] = Variable<String>(id);
map['album_id'] = Variable<String>(albumId); map['album_id'] = Variable<String>(albumId);
if (!nullToAbsent || volume != null) {
map['volume'] = Variable<String>(volume);
}
if (!nullToAbsent || checksum != null) { if (!nullToAbsent || checksum != null) {
map['checksum'] = Variable<String>(checksum); map['checksum'] = Variable<String>(checksum);
} }
@ -7387,7 +7370,6 @@ class TrashedLocalAssetEntityData extends DataClass
durationInSeconds: serializer.fromJson<int?>(json['durationInSeconds']), durationInSeconds: serializer.fromJson<int?>(json['durationInSeconds']),
id: serializer.fromJson<String>(json['id']), id: serializer.fromJson<String>(json['id']),
albumId: serializer.fromJson<String>(json['albumId']), albumId: serializer.fromJson<String>(json['albumId']),
volume: serializer.fromJson<String?>(json['volume']),
checksum: serializer.fromJson<String?>(json['checksum']), checksum: serializer.fromJson<String?>(json['checksum']),
isFavorite: serializer.fromJson<bool>(json['isFavorite']), isFavorite: serializer.fromJson<bool>(json['isFavorite']),
orientation: serializer.fromJson<int>(json['orientation']), orientation: serializer.fromJson<int>(json['orientation']),
@ -7406,7 +7388,6 @@ class TrashedLocalAssetEntityData extends DataClass
'durationInSeconds': serializer.toJson<int?>(durationInSeconds), 'durationInSeconds': serializer.toJson<int?>(durationInSeconds),
'id': serializer.toJson<String>(id), 'id': serializer.toJson<String>(id),
'albumId': serializer.toJson<String>(albumId), 'albumId': serializer.toJson<String>(albumId),
'volume': serializer.toJson<String?>(volume),
'checksum': serializer.toJson<String?>(checksum), 'checksum': serializer.toJson<String?>(checksum),
'isFavorite': serializer.toJson<bool>(isFavorite), 'isFavorite': serializer.toJson<bool>(isFavorite),
'orientation': serializer.toJson<int>(orientation), 'orientation': serializer.toJson<int>(orientation),
@ -7423,7 +7404,6 @@ class TrashedLocalAssetEntityData extends DataClass
Value<int?> durationInSeconds = const Value.absent(), Value<int?> durationInSeconds = const Value.absent(),
String? id, String? id,
String? albumId, String? albumId,
Value<String?> volume = const Value.absent(),
Value<String?> checksum = const Value.absent(), Value<String?> checksum = const Value.absent(),
bool? isFavorite, bool? isFavorite,
int? orientation, int? orientation,
@ -7439,7 +7419,6 @@ class TrashedLocalAssetEntityData extends DataClass
: this.durationInSeconds, : this.durationInSeconds,
id: id ?? this.id, id: id ?? this.id,
albumId: albumId ?? this.albumId, albumId: albumId ?? this.albumId,
volume: volume.present ? volume.value : this.volume,
checksum: checksum.present ? checksum.value : this.checksum, checksum: checksum.present ? checksum.value : this.checksum,
isFavorite: isFavorite ?? this.isFavorite, isFavorite: isFavorite ?? this.isFavorite,
orientation: orientation ?? this.orientation, orientation: orientation ?? this.orientation,
@ -7459,7 +7438,6 @@ class TrashedLocalAssetEntityData extends DataClass
: this.durationInSeconds, : this.durationInSeconds,
id: data.id.present ? data.id.value : this.id, id: data.id.present ? data.id.value : this.id,
albumId: data.albumId.present ? data.albumId.value : this.albumId, albumId: data.albumId.present ? data.albumId.value : this.albumId,
volume: data.volume.present ? data.volume.value : this.volume,
checksum: data.checksum.present ? data.checksum.value : this.checksum, checksum: data.checksum.present ? data.checksum.value : this.checksum,
isFavorite: data.isFavorite.present isFavorite: data.isFavorite.present
? data.isFavorite.value ? data.isFavorite.value
@ -7482,7 +7460,6 @@ class TrashedLocalAssetEntityData extends DataClass
..write('durationInSeconds: $durationInSeconds, ') ..write('durationInSeconds: $durationInSeconds, ')
..write('id: $id, ') ..write('id: $id, ')
..write('albumId: $albumId, ') ..write('albumId: $albumId, ')
..write('volume: $volume, ')
..write('checksum: $checksum, ') ..write('checksum: $checksum, ')
..write('isFavorite: $isFavorite, ') ..write('isFavorite: $isFavorite, ')
..write('orientation: $orientation') ..write('orientation: $orientation')
@ -7501,7 +7478,6 @@ class TrashedLocalAssetEntityData extends DataClass
durationInSeconds, durationInSeconds,
id, id,
albumId, albumId,
volume,
checksum, checksum,
isFavorite, isFavorite,
orientation, orientation,
@ -7519,7 +7495,6 @@ class TrashedLocalAssetEntityData extends DataClass
other.durationInSeconds == this.durationInSeconds && other.durationInSeconds == this.durationInSeconds &&
other.id == this.id && other.id == this.id &&
other.albumId == this.albumId && other.albumId == this.albumId &&
other.volume == this.volume &&
other.checksum == this.checksum && other.checksum == this.checksum &&
other.isFavorite == this.isFavorite && other.isFavorite == this.isFavorite &&
other.orientation == this.orientation); other.orientation == this.orientation);
@ -7536,7 +7511,6 @@ class TrashedLocalAssetEntityCompanion
final Value<int?> durationInSeconds; final Value<int?> durationInSeconds;
final Value<String> id; final Value<String> id;
final Value<String> albumId; final Value<String> albumId;
final Value<String?> volume;
final Value<String?> checksum; final Value<String?> checksum;
final Value<bool> isFavorite; final Value<bool> isFavorite;
final Value<int> orientation; final Value<int> orientation;
@ -7550,7 +7524,6 @@ class TrashedLocalAssetEntityCompanion
this.durationInSeconds = const Value.absent(), this.durationInSeconds = const Value.absent(),
this.id = const Value.absent(), this.id = const Value.absent(),
this.albumId = const Value.absent(), this.albumId = const Value.absent(),
this.volume = const Value.absent(),
this.checksum = const Value.absent(), this.checksum = const Value.absent(),
this.isFavorite = const Value.absent(), this.isFavorite = const Value.absent(),
this.orientation = const Value.absent(), this.orientation = const Value.absent(),
@ -7565,7 +7538,6 @@ class TrashedLocalAssetEntityCompanion
this.durationInSeconds = const Value.absent(), this.durationInSeconds = const Value.absent(),
required String id, required String id,
required String albumId, required String albumId,
this.volume = const Value.absent(),
this.checksum = const Value.absent(), this.checksum = const Value.absent(),
this.isFavorite = const Value.absent(), this.isFavorite = const Value.absent(),
this.orientation = const Value.absent(), this.orientation = const Value.absent(),
@ -7583,7 +7555,6 @@ class TrashedLocalAssetEntityCompanion
Expression<int>? durationInSeconds, Expression<int>? durationInSeconds,
Expression<String>? id, Expression<String>? id,
Expression<String>? albumId, Expression<String>? albumId,
Expression<String>? volume,
Expression<String>? checksum, Expression<String>? checksum,
Expression<bool>? isFavorite, Expression<bool>? isFavorite,
Expression<int>? orientation, Expression<int>? orientation,
@ -7598,7 +7569,6 @@ class TrashedLocalAssetEntityCompanion
if (durationInSeconds != null) 'duration_in_seconds': durationInSeconds, if (durationInSeconds != null) 'duration_in_seconds': durationInSeconds,
if (id != null) 'id': id, if (id != null) 'id': id,
if (albumId != null) 'album_id': albumId, if (albumId != null) 'album_id': albumId,
if (volume != null) 'volume': volume,
if (checksum != null) 'checksum': checksum, if (checksum != null) 'checksum': checksum,
if (isFavorite != null) 'is_favorite': isFavorite, if (isFavorite != null) 'is_favorite': isFavorite,
if (orientation != null) 'orientation': orientation, if (orientation != null) 'orientation': orientation,
@ -7615,7 +7585,6 @@ class TrashedLocalAssetEntityCompanion
Value<int?>? durationInSeconds, Value<int?>? durationInSeconds,
Value<String>? id, Value<String>? id,
Value<String>? albumId, Value<String>? albumId,
Value<String?>? volume,
Value<String?>? checksum, Value<String?>? checksum,
Value<bool>? isFavorite, Value<bool>? isFavorite,
Value<int>? orientation, Value<int>? orientation,
@ -7630,7 +7599,6 @@ class TrashedLocalAssetEntityCompanion
durationInSeconds: durationInSeconds ?? this.durationInSeconds, durationInSeconds: durationInSeconds ?? this.durationInSeconds,
id: id ?? this.id, id: id ?? this.id,
albumId: albumId ?? this.albumId, albumId: albumId ?? this.albumId,
volume: volume ?? this.volume,
checksum: checksum ?? this.checksum, checksum: checksum ?? this.checksum,
isFavorite: isFavorite ?? this.isFavorite, isFavorite: isFavorite ?? this.isFavorite,
orientation: orientation ?? this.orientation, orientation: orientation ?? this.orientation,
@ -7667,9 +7635,6 @@ class TrashedLocalAssetEntityCompanion
if (albumId.present) { if (albumId.present) {
map['album_id'] = Variable<String>(albumId.value); map['album_id'] = Variable<String>(albumId.value);
} }
if (volume.present) {
map['volume'] = Variable<String>(volume.value);
}
if (checksum.present) { if (checksum.present) {
map['checksum'] = Variable<String>(checksum.value); map['checksum'] = Variable<String>(checksum.value);
} }
@ -7694,7 +7659,6 @@ class TrashedLocalAssetEntityCompanion
..write('durationInSeconds: $durationInSeconds, ') ..write('durationInSeconds: $durationInSeconds, ')
..write('id: $id, ') ..write('id: $id, ')
..write('albumId: $albumId, ') ..write('albumId: $albumId, ')
..write('volume: $volume, ')
..write('checksum: $checksum, ') ..write('checksum: $checksum, ')
..write('isFavorite: $isFavorite, ') ..write('isFavorite: $isFavorite, ')
..write('orientation: $orientation') ..write('orientation: $orientation')

13
mobile/test/fixtures/asset.stub.dart vendored
View file

@ -75,16 +75,3 @@ abstract final class LocalAssetStub {
updatedAt: DateTime(20021), updatedAt: DateTime(20021),
); );
} }
abstract final class TrashedAssetStub {
const TrashedAssetStub._();
static final trashed1 = TrashedAsset(
id: "t1",
name: "trashed1.jpg",
type: AssetType.image,
createdAt: DateTime(2025, 1, 1),
updatedAt: DateTime(2025, 1, 2),
albumId: "album1",
);
}