Merge branch 'master' of github.com:HF6-PROJECT/api into ara-17

src/modules/item/__test__/item.service.test.ts

@@ -21,7 +21,7 @@ describe('ItemService', () => {
 		itemService = new ItemService();
 		userService = new UserService();
 		folderService = new FolderService();
-		sharingService = new SharingService();
+		sharingService = new SharingService(itemService);
 		blobService = new BlobService();
 		shortcutService = new ShortcutService();
 
@@ -137,10 +137,13 @@ describe('ItemService', () => {
 				parentId: null,
 			});
 
-			await sharingService.createSharing({
-				itemId: folder.id,
-				userId: otherUser.id,
-			});
+			await sharingService.createSharing(
+				{
+					itemId: folder.id,
+					userId: otherUser.id,
+				},
+				user.id,
+			);
 
 			const blob1 = await blobService.createBlob({
 				mimeType: 'text/plain',
@@ -177,20 +180,29 @@ describe('ItemService', () => {
 				parentId: folder.id,
 			});
 
-			await sharingService.createSharing({
-				itemId: blob1.id,
-				userId: otherUser.id,
-			});
+			await sharingService.createSharing(
+				{
+					itemId: blob1.id,
+					userId: otherUser.id,
+				},
+				user.id,
+			);
 
-			await sharingService.createSharing({
-				itemId: folder1.id,
-				userId: otherUser.id,
-			});
+			await sharingService.createSharing(
+				{
+					itemId: folder1.id,
+					userId: otherUser.id,
+				},
+				user.id,
+			);
 
-			await sharingService.createSharing({
-				itemId: folder3.id,
-				userId: otherUser.id,
-			});
+			await sharingService.createSharing(
+				{
+					itemId: folder3.id,
+					userId: otherUser.id,
+				},
+				user.id,
+			);
 
 			const shortcut1 = await shortcutService.createShortcut({
 				name: 'Shortcut1',
@@ -206,10 +218,13 @@ describe('ItemService', () => {
 				parentId: folder.id,
 			});
 
-			await sharingService.createSharing({
-				itemId: shortcut1.id,
-				userId: otherUser.id,
-			});
+			await sharingService.createSharing(
+				{
+					itemId: shortcut1.id,
+					userId: otherUser.id,
+				},
+				user.id,
+			);
 
 			const itemsOwner = await itemService.getAllOwnedAndSharredItemsByParentIdAndUserId(
 				user.id,

src/modules/item/blob/blob.route.ts

@@ -6,9 +6,10 @@ import ItemService from '../item.service';
 import AccessService from '../sharing/access.service';
 
 export default async (fastify: FastifyInstance) => {
+	const itemService = new ItemService();
 	const blobController = new BlobController(
 		new BlobService(),
-		new AccessService(new ItemService(), new SharingService()),
+		new AccessService(itemService, new SharingService(itemService)),
 	);
 
 	fastify.get(

src/modules/item/docs/docs.route.ts

@@ -6,10 +6,11 @@ import ItemService from '../item.service';
 import SharingService from '../sharing/sharing.service';
 
 export default async (fastify: FastifyInstance) => {
+	const itemService = new ItemService();
 	const docsService = new DocsService();
 	const docsController = new DocsController(
 		docsService,
-		new AccessService(new ItemService(), new SharingService()),
+		new AccessService(itemService, new SharingService(itemService)),
 	);
 
 	fastify.get(

src/modules/item/folder/folder.route.ts

@@ -6,10 +6,11 @@ import ItemService from '../item.service';
 import SharingService from '../sharing/sharing.service';
 
 export default async (fastify: FastifyInstance) => {
+	const itemService = new ItemService();
 	const folderService = new FolderService();
 	const folderController = new FolderController(
 		folderService,
-		new AccessService(new ItemService(), new SharingService()),
+		new AccessService(itemService, new SharingService(itemService)),
 	);
 
 	fastify.get(

src/modules/item/item.route.ts

@@ -8,7 +8,7 @@ export default async (fastify: FastifyInstance) => {
 	const itemService = new ItemService();
 	const itemController = new ItemController(
 		itemService,
-		new AccessService(itemService, new SharingService()),
+		new AccessService(itemService, new SharingService(itemService)),
 	);
 
 	fastify.get(

src/modules/item/item.service.ts

@@ -49,6 +49,32 @@ export default class ItemService {
 		return this.formatItems(items);
 	}
 
+	public async getAllOwnedAndSharredItemsByParentIdAndUserIdRecursively(
+		userId: number,
+		parentId: number | null,
+	): Promise<ItemWithProperties[]> {
+		const returnItems = [];
+
+		const items = await this.getAllOwnedAndSharredItemsByParentIdAndUserId(userId, parentId);
+		returnItems.push(...items);
+
+		await Promise.all(
+			items.map(async (item) => {
+				if (item.mimeType !== 'application/vnd.cloudstore.folder') {
+					return;
+				}
+
+				const childItems = await this.getAllOwnedAndSharredItemsByParentIdAndUserId(
+					userId,
+					item.id,
+				);
+				returnItems.push(...childItems);
+			}),
+		);
+
+		return returnItems;
+	}
+
 	public async getAllOwnedAndSharredItemsByParentIdAndUserId(
 		userId: number,
 		parentId: number | null,

src/modules/item/sharing/__test__/access.service.test.ts

@@ -16,7 +16,7 @@ describe('ItemService', () => {
 	beforeAll(async () => {
 		itemService = new ItemService();
 		userService = new UserService();
-		sharingService = new SharingService();
+		sharingService = new SharingService(itemService);
 		accessService = new AccessService(itemService, sharingService);
 
 		user = await userService.createUser({
@@ -52,10 +52,13 @@ describe('ItemService', () => {
 				parentId: null,
 				mimeType: 'text/plain',
 			});
-			await sharingService.createSharing({
-				itemId: createdItem.id,
-				userId: user.id,
-			});
+			await sharingService.createSharing(
+				{
+					itemId: createdItem.id,
+					userId: user.id,
+				},
+				otherUser.id,
+			);
 
 			const hasAccessToItem = await accessService.hasAccessToItem(createdItem.id, user.id);
 

src/modules/item/sharing/__test__/add.test.ts

@@ -3,11 +3,13 @@ import UserService from '../../../auth/user.service';
 import AuthService from '../../../auth/auth.service';
 import ItemService from '../../item.service';
 import SharingService from '../sharing.service';
+import FolderService from '../../folder/folder.service';
 
 describe('POST /api/sharing', () => {
 	let userService: UserService;
 	let authService: AuthService;
 	let itemService: ItemService;
+	let folderService: FolderService;
 	let sharingService: SharingService;
 
 	let user: User;
@@ -17,7 +19,8 @@ describe('POST /api/sharing', () => {
 		authService = new AuthService();
 		userService = new UserService();
 		itemService = new ItemService();
-		sharingService = new SharingService();
+		folderService = new FolderService();
+		sharingService = new SharingService(itemService);
 
 		user = await userService.createUser({
 			name: 'Joe Biden the 1st',
@@ -63,6 +66,81 @@ describe('POST /api/sharing', () => {
 		});
 	});
 
+	it('should return status 200, return the created sharing and recursively create sharings on all child items', async () => {
+		const { accessToken } = await authService.createTokens(user.id);
+
+		const folder = await folderService.createFolder({
+			name: 'root',
+			ownerId: user.id,
+			parentId: null,
+			color: 'red',
+		});
+
+		const item1 = await itemService.createItem({
+			name: 'test1.txt',
+			ownerId: user.id,
+			parentId: folder.id,
+			mimeType: 'text/plain',
+		});
+
+		const item2 = await itemService.createItem({
+			name: 'test2.txt',
+			ownerId: user.id,
+			parentId: folder.id,
+			mimeType: 'text/plain',
+		});
+
+		const subFolder = await folderService.createFolder({
+			name: 'sub',
+			ownerId: user.id,
+			parentId: folder.id,
+			color: 'red',
+		});
+
+		const item3 = await itemService.createItem({
+			name: 'test3.txt',
+			ownerId: user.id,
+			parentId: subFolder.id,
+			mimeType: 'text/plain',
+		});
+
+		const response = await global.fastify.inject({
+			method: 'POST',
+			url: '/api/sharing',
+			headers: {
+				authorization: 'Bearer ' + accessToken,
+			},
+			payload: {
+				itemId: folder.id,
+				userId: otherUser.id,
+			},
+		});
+
+		expect(response.statusCode).toBe(200);
+		expect(response.json()).toEqual({
+			id: expect.any(Number),
+			itemId: folder.id,
+			userId: otherUser.id,
+			createdAt: expect.any(String),
+			updatedAt: expect.any(String),
+		});
+		await expect(
+			sharingService.getByItemIdAndUserId(folder.id, otherUser.id),
+		).resolves.toBeDefined();
+		await expect(
+			sharingService.getByItemIdAndUserId(item1.id, otherUser.id),
+		).resolves.toBeDefined();
+		await expect(
+			sharingService.getByItemIdAndUserId(item2.id, otherUser.id),
+		).resolves.toBeDefined();
+		await expect(
+			sharingService.getByItemIdAndUserId(subFolder.id, otherUser.id),
+		).resolves.toBeDefined();
+		await expect(
+			sharingService.getByItemIdAndUserId(item3.id, otherUser.id),
+		).resolves.toBeDefined();
+	});
+
 	it('should return status 401, when unauthorized', async () => {
 		const item = await itemService.createItem({
 			name: 'test.txt',
@@ -135,10 +213,13 @@ describe('POST /api/sharing', () => {
 			mimeType: 'text/plain',
 		});
 
-		await sharingService.createSharing({
-			itemId: item.id,
-			userId: user.id,
-		});
+		await sharingService.createSharing(
+			{
+				itemId: item.id,
+				userId: user.id,
+			},
+			otherUser.id,
+		);
 
 		const response = await global.fastify.inject({
 			method: 'POST',