apps/backend/src/app/files/files.controller.ts

@@ -77,30 +77,24 @@ export class FilesController {
 				}
 
 				console.log("Executing save procedure...");
-				return (
-					res
-						// @ts-ignore
-						.status(HttpStatus.CREATED)
-						.send(await this.filesService.save(fileBuffer, Params))
-				);
+				return res
+					// @ts-ignore
+					.status(HttpStatus.CREATED)
+					.send(await this.filesService.save(fileBuffer, Params));
 			} catch (err) {
 				console.error(err);
-				return (
-					res
-						// @ts-ignore
-						.status(err.status || HttpStatus.INTERNAL_SERVER_ERROR)
-						.send(err)
-				);
+				return res
+					// @ts-ignore
+					.status(err.status || HttpStatus.INTERNAL_SERVER_ERROR)
+					.send(err);
 			}
 		});
 
 		req.on("error", (err) => {
-			return (
-				res
-					// @ts-ignore
-					.status(err.status || HttpStatus.INTERNAL_SERVER_ERROR)
-					.send(err)
-			);
+			return res
+				// @ts-ignore
+				.status(err.status || HttpStatus.INTERNAL_SERVER_ERROR)
+				.send(err);
 		});
 
 		return;
@@ -113,7 +107,7 @@ export class FilesController {
 		@Query("offset", new DefaultValuePipe(0), ParseIntPipe) offset: number,
 		@Query("search", new DefaultValuePipe("")) search: string,
 	) {
-		return this.filesService.search(limit, offset, search);
+		return this.filesService.search(limit, offset, search)
 	}
 
 	@HttpCode(HttpStatus.FOUND)

apps/backend/src/app/groups/groups.controller.ts

@@ -7,38 +7,42 @@ import {
 	Param,
 	ParseIntPipe,
 	Post,
-	Query, UseGuards
-} from '@nestjs/common';
+	Query,
+} from "@nestjs/common";
 import { CreateGroupDto } from "apps/backend/src/app/groups/groups.dto";
 import { ISearchQuery } from "apps/backend/src/app/groups/groups.types";
 import { GroupsService } from "./groups.service";
-import { AdminGuard } from 'apps/backend/src/app/auth/auth.guard';
 
 @Controller("groups")
 export class GroupsController {
 	constructor(private readonly groupsService: GroupsService) {}
 
-	@Get("find")
+	//GET all groups with limit and offset + optional search
+	@Get()
 	async findMany(
 		@Query("limit", new DefaultValuePipe(20), ParseIntPipe) limit: number,
 		@Query("offset", new DefaultValuePipe(0), ParseIntPipe) offset: number,
 		@Query("search", new DefaultValuePipe("")) search: string,
-	) {}
+	) {
+		//TODO add service method
+	}
 
+	//POST a new group
 	@Post("new")
-	async newGroup() {}
+	async newGroup(@Body() dto: CreateGroupDto) {}
 
-	@UseGuards(AdminGuard)
+	//DELETE a group
 	@Delete(":groupId")
 	async deleteGroup(@Param("groupId") groupId: string) {}
 
-	//TODO Patch
-
-	@Get(":groupId/files")
-	async getFilesForGroup(
+	//GET files associated to group with limit and offset
+	@Get(":groupId")
+	async getForGroup(
 		@Query("limit", new DefaultValuePipe(20), ParseIntPipe) limit: number,
 		@Query("offset", new DefaultValuePipe(0), ParseIntPipe) offset: number,
 		@Query("search", new DefaultValuePipe("")) search: string,
 		@Param("groupId") groupId: string,
-	) {}
+	) {
+		const query = { limit, offset, search };
+	}
 }

apps/backend/src/app/machines/machines.controller.ts

@@ -4,41 +4,38 @@ import {
 	Delete,
 	Get,
 	Param,
-	ParseBoolPipe,
 	ParseIntPipe,
 	Post,
 	Query,
-	UseGuards,
 } from "@nestjs/common";
-import { AdminGuard } from "apps/backend/src/app/auth/auth.guard";
 import { MachinesService } from "apps/backend/src/app/machines/machines.service";
 
 @Controller("machines")
 export class MachinesController {
 	constructor(private readonly machineService: MachinesService) {}
 
-	@Get("find")
+	@Get()
 	async findMany(
 		@Query("limit", new DefaultValuePipe(20), ParseIntPipe) limit: number,
 		@Query("offset", new DefaultValuePipe(0), ParseIntPipe) offset: number,
 		@Query("search", new DefaultValuePipe("")) search: string,
-	) {}
+	) {
+		const query = { limit, offset, search };
+	}
 
-	@UseGuards(AdminGuard)
 	@Post("new")
 	async newMachine() {}
 
-	@UseGuards(AdminGuard)
 	@Delete(":machineId")
-	async deleteMachine(@Param("machineId") machineId: string) {}
+	async deleteGroup(@Param("machineId") machineId: string) {}
 
-	//TODO Patch
-
-	@Get(":machineId/files")
-	async getFilesForMachine(
+	@Get(":groupId")
+	async getForGroup(
 		@Query("limit", new DefaultValuePipe(20), ParseIntPipe) limit: number,
 		@Query("offset", new DefaultValuePipe(0), ParseIntPipe) offset: number,
 		@Query("search", new DefaultValuePipe("")) search: string,
 		@Param("machineId") machineId: string,
-	) {}
+	) {
+		const query = { limit, offset, search };
+	}
 }

apps/backend/src/app/machines/machines.module.ts

@@ -2,10 +2,9 @@ import { Module } from "@nestjs/common";
 import { DbModule } from "apps/backend/src/app/db/db.module";
 import { MachinesController } from "apps/backend/src/app/machines/machines.controller";
 import { MachinesService } from "apps/backend/src/app/machines/machines.service";
-import { CredentialsModule } from 'apps/backend/src/app/credentials/credentials.module';
 
 @Module({
-	imports: [DbModule, CredentialsModule],
+	imports: [DbModule],
 	controllers: [MachinesController],
 	providers: [MachinesService],
 })