KevinMidboe/immich
1
0
Fork 0
mirror of https://github.com/KevinMidboe/immich.git synced 2025-10-29 17:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(server) Add user FK to album entity (#1569)

Browse Source
This commit is contained in:
Alex
2023-02-06 20:47:06 -06:00
committed by GitHub
parent ac39ebddc0
commit 3cc4af5947
14 changed files with 173 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/apps/immich/src/api-v1/album/album-repository.ts
View File

@@ -180,6 +180,9 @@ export class AlbumRepository implements IAlbumRepository {
// Get information of shared links in albums
query = query.leftJoinAndSelect('album.sharedLinks', 'sharedLink');
// get information of owner of albums
query = query.leftJoinAndSelect('album.owner', 'owner');
const albums = await query.getMany();
albums.sort((a, b) => new Date(b.createdAt).valueOf() - new Date(a.createdAt).valueOf());
@@ -202,6 +205,7 @@ export class AlbumRepository implements IAlbumRepository {
.getQuery();
return `album.id IN ${subQuery}`;
})
.leftJoinAndSelect('album.owner', 'owner')
.leftJoinAndSelect('album.assets', 'assets')
.leftJoinAndSelect('assets.assetInfo', 'assetInfo')
.leftJoinAndSelect('album.sharedUsers', 'sharedUser')
@@ -216,6 +220,7 @@ export class AlbumRepository implements IAlbumRepository {
const album = await this.albumRepository.findOne({
where: { id: albumId },
relations: {
owner: true,
sharedUsers: {
userInfo: true,
},

41
server/apps/immich/test/album.e2e-spec.ts
View File

@@ -37,20 +37,19 @@ describe('Album', () => {
});
describe('with auth', () => {
let authUser: AuthUserDto;
let userService: UserService;
let authService: AuthService;
let authUser: AuthUserDto;
beforeAll(async () => {
const builder = Test.createTestingModule({ imports: [AppModule] });
authUser = getAuthUser(); // set default auth user
authUser = getAuthUser();
const moduleFixture: TestingModule = await authCustom(builder, () => authUser).compile();
app = moduleFixture.createNestApplication();
userService = app.get(UserService);
authService = app.get(AuthService);
database = app.get(DataSource);
await app.init();
});
@@ -58,25 +57,25 @@ describe('Album', () => {
await app.close();
});
describe('with empty DB', () => {
afterEach(async () => {
await clearDb(database);
});
// TODO - Until someone figure out how to passed in a logged in user to the request.
// describe('with empty DB', () => {
// it('creates an album', async () => {
// const data: CreateAlbumDto = {
// albumName: 'first albbum',
// };
it('creates an album', async () => {
const data: CreateAlbumDto = {
albumName: 'first albbum',
};
const { status, body } = await _createAlbum(app, data);
expect(status).toEqual(201);
expect(body).toEqual(
expect.objectContaining({
ownerId: authUser.id,
albumName: data.albumName,
}),
);
});
});
// const { status, body } = await _createAlbum(app, data);
// expect(status).toEqual(201);
// expect(body).toEqual(
// expect.objectContaining({
// ownerId: authUser.id,
// albumName: data.albumName,
// }),
// );
// });
// });
describe('with albums in DB', () => {
const userOneShared = 'userOneShared';