github-mirrors/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2026-02-12 20:08:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

capitalize serverside enum

Browse Source
This commit is contained in:
mgabor
2024-04-19 20:10:31 +02:00
parent 4960477627
commit 81bebdaf33
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/cores/access.core.ts
View File

@@ -226,7 +226,7 @@ export class AccessCore {
const isShared = await this.repository.album.checkSharedAlbumAccess(
auth.user.id,
setDifference(ids, isOwner),
AlbumUserRole.Viewer,
AlbumUserRole.VIEWER,
);
return setUnion(isOwner, isShared);
}
@@ -236,7 +236,7 @@ export class AccessCore {
const isShared = await this.repository.album.checkSharedAlbumAccess(
auth.user.id,
setDifference(ids, isOwner),
AlbumUserRole.Editor,
AlbumUserRole.EDITOR,
);
return setUnion(isOwner, isShared);
}
@@ -258,7 +258,7 @@ export class AccessCore {
const isShared = await this.repository.album.checkSharedAlbumAccess(
auth.user.id,
setDifference(ids, isOwner),
AlbumUserRole.Viewer,
AlbumUserRole.VIEWER,
);
return setUnion(isOwner, isShared);
}

4
server/src/entities/album-user.entity.ts
View File

@@ -3,8 +3,8 @@ import { UserEntity } from 'src/entities/user.entity';
import { Column, Entity, Index, JoinColumn, ManyToOne, PrimaryColumn } from 'typeorm';
export enum AlbumUserRole {
Editor = 'editor',
Viewer = 'viewer',
EDITOR = 'editor',
VIEWER = 'viewer',
}
@Entity('albums_shared_users_users')

2
server/src/repositories/access.repository.ts
View File

@@ -137,7 +137,7 @@ class AlbumAccess implements IAlbumAccess {
user: { id: userId },
// If editor access is needed we check for it, otherwise both are accepted
role:
access === AlbumUserRole.Editor ? AlbumUserRole.Editor : In([AlbumUserRole.Editor, AlbumUserRole.Viewer]),
access === AlbumUserRole.EDITOR ? AlbumUserRole.EDITOR : In([AlbumUserRole.EDITOR, AlbumUserRole.VIEWER]),
},
},
})

6
server/src/services/album.service.spec.ts
View File

@@ -366,7 +366,7 @@ describe(AlbumService.name, () => {
user: userStub.user2,
albumId: albumStub.sharedWithAdmin.id,
album: albumStub.sharedWithAdmin,
role: AlbumUserRole.Editor,
role: AlbumUserRole.EDITOR,
});
await sut.addUsers(authStub.user1, albumStub.sharedWithAdmin.id, { sharedUserIds: [authStub.user2.user.id] });
expect(albumUserMock.create).toHaveBeenCalledWith({
@@ -520,7 +520,7 @@ describe(AlbumService.name, () => {
expect(accessMock.album.checkSharedAlbumAccess).toHaveBeenCalledWith(
authStub.user1.user.id,
new Set(['album-123']),
AlbumUserRole.Viewer,
AlbumUserRole.VIEWER,
);
});
@@ -531,7 +531,7 @@ describe(AlbumService.name, () => {
expect(accessMock.album.checkSharedAlbumAccess).toHaveBeenCalledWith(
authStub.admin.user.id,
new Set(['album-123']),
AlbumUserRole.Viewer,
AlbumUserRole.VIEWER,
);
});
});

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

@@ -39,7 +39,7 @@ export const albumStub = {
{
user: userStub.user1,
album: undefined as unknown as AlbumEntity,
role: AlbumUserRole.Editor,
role: AlbumUserRole.EDITOR,
userId: userStub.user1.id,
albumId: 'album-2',
},
@@ -64,14 +64,14 @@ export const albumStub = {
{
user: userStub.user1,
album: undefined as unknown as AlbumEntity,
role: AlbumUserRole.Editor,
role: AlbumUserRole.EDITOR,
userId: userStub.user1.id,
albumId: 'album-3',
},
{
user: userStub.user2,
album: undefined as unknown as AlbumEntity,
role: AlbumUserRole.Editor,
role: AlbumUserRole.EDITOR,
userId: userStub.user2.id,
albumId: 'album-3',
},
@@ -96,7 +96,7 @@ export const albumStub = {
{
user: userStub.admin,
album: undefined as unknown as AlbumEntity,
role: AlbumUserRole.Editor,
role: AlbumUserRole.EDITOR,
userId: userStub.admin.id,
albumId: 'album-3',
},