KevinMidboe/immich
1
0
Fork 0
mirror of https://github.com/KevinMidboe/immich.git synced 2025-12-07 19:59:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(server): Error when loading album with deleted owner (#4086)

Browse Source 
* soft delete albums when user gets soft deleted

* fix wrong intl openapi version

* fix tests

* ability to restore albums, automatically restore when user restored

* (e2e) tests for shared albums via link and with user

* (e2e) test deletion of users and linked albums

* (e2e) fix share album with owner test

* fix: deletedAt

* chore: fix restore order

* fix: use timezone date column

* chore: cleanup e2e tests

* (e2e) fix user delete test

---------

Co-authored-by: Jason Rasmussen <jrasm91@gmail.com>
This commit is contained in:
Daniel Dietzler
2023-09-18 17:56:50 +02:00
committed by GitHub
parent 7d07aaeba3
commit f1c98ac9e6
12 changed files with 149 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/test/fixtures/album.stub.ts vendored
View File

@@ -15,6 +15,7 @@ export const albumStub = {
albumThumbnailAssetId: null,
createdAt: new Date(),
updatedAt: new Date(),
deletedAt: null,
sharedLinks: [],
sharedUsers: [],
}),
@@ -29,6 +30,7 @@ export const albumStub = {
albumThumbnailAssetId: null,
createdAt: new Date(),
updatedAt: new Date(),
deletedAt: null,
sharedLinks: [],
sharedUsers: [userStub.user1],
}),
@@ -43,6 +45,7 @@ export const albumStub = {
albumThumbnailAssetId: null,
createdAt: new Date(),
updatedAt: new Date(),
deletedAt: null,
sharedLinks: [],
sharedUsers: [userStub.user1, userStub.user2],
}),
@@ -57,6 +60,7 @@ export const albumStub = {
albumThumbnailAssetId: null,
createdAt: new Date(),
updatedAt: new Date(),
deletedAt: null,
sharedLinks: [],
sharedUsers: [userStub.admin],
}),
@@ -71,6 +75,7 @@ export const albumStub = {
albumThumbnailAssetId: null,
createdAt: new Date(),
updatedAt: new Date(),
deletedAt: null,
sharedLinks: [],
sharedUsers: [],
}),
@@ -85,6 +90,7 @@ export const albumStub = {
albumThumbnailAssetId: assetStub.image.id,
createdAt: new Date(),
updatedAt: new Date(),
deletedAt: null,
sharedLinks: [],
sharedUsers: [],
}),
@@ -99,6 +105,7 @@ export const albumStub = {
albumThumbnailAssetId: assetStub.image.id,
createdAt: new Date(),
updatedAt: new Date(),
deletedAt: null,
sharedLinks: [],
sharedUsers: [],
}),
@@ -113,6 +120,7 @@ export const albumStub = {
albumThumbnailAssetId: null,
createdAt: new Date(),
updatedAt: new Date(),
deletedAt: null,
sharedLinks: [],
sharedUsers: [],
}),
@@ -127,6 +135,7 @@ export const albumStub = {
albumThumbnailAssetId: assetStub.livePhotoMotionAsset.id,
createdAt: new Date(),
updatedAt: new Date(),
deletedAt: null,
sharedLinks: [],
sharedUsers: [],
}),
@@ -141,6 +150,7 @@ export const albumStub = {
albumThumbnailAssetId: assetStub.image.id,
createdAt: new Date(),
updatedAt: new Date(),
deletedAt: null,
sharedLinks: [],
sharedUsers: [],
}),

5
server/test/fixtures/error.stub.ts vendored
View File

@@ -19,6 +19,11 @@ export const errorStub = {
statusCode: 401,
message: 'Invalid user token',
},
invalidShareKey: {
error: 'Unauthorized',
statusCode: 401,
message: 'Invalid share key',
},
badRequest: {
error: 'Bad Request',
statusCode: 400,

1
server/test/fixtures/shared-link.stub.ts vendored
View File

@@ -151,6 +151,7 @@ export const sharedLinkStub = {
description: '',
createdAt: today,
updatedAt: today,
deletedAt: null,
albumThumbnailAsset: null,
albumThumbnailAssetId: null,
sharedUsers: [],