Add constructor to MachinesService with DbService injection.

This change introduces a constructor to the MachinesService class, ensuring the DbService is properly injected. This setup prepares for future methods dealing with machine data operations, such as fetching, creating, and deleting machines, as well as retrieving associated files.

apps/backend/src/app/db/schema.ts

@@ -73,12 +73,6 @@ export const FilesTable = pgTable("files", {
 		})
 		.notNull(),
 
-	uploader: p
-		.varchar("uploader", {
-			length: 64,
-		})
-		.notNull(),
-
 	groupId: p.uuid("group_id").references(() => FilesGroupTable.uuid),
 
 	fileSize: p.integer("file_size").notNull(),

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

@@ -1,7 +1,19 @@
-import { Controller } from "@nestjs/common";
+import { Controller, Get, Param, Post, StreamableFile } from '@nestjs/common';
 import { FilesService } from "./files.service";
 
 @Controller("files")
 export class FilesController {
 	constructor(private readonly filesService: FilesService) {}
+
+  //TODO POST FILE
+  @Post('new')
+  async saveFile() {
+
+  }
+
+	@Get(':fileId')
+  async getFile(@Param('fileId') fileId: string) {
+    return this.filesService.get(fileId);
+  }
+
 }

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

@@ -1,9 +1,9 @@
-import { Injectable, NotFoundException, StreamableFile } from "@nestjs/common";
+import { Injectable, NotFoundException, StreamableFile } from '@nestjs/common';
-import { DbService } from "apps/backend/src/app/db/db.service";
+import { DbService } from 'apps/backend/src/app/db/db.service';
-import { FilesTable } from "apps/backend/src/app/db/schema";
+import { FilesTable } from 'apps/backend/src/app/db/schema';
-import { StorageService } from "apps/backend/src/app/storage/storage.service";
+import { StorageService } from 'apps/backend/src/app/storage/storage.service';
-import { IFileWithInformation } from "apps/backend/src/app/storage/storage.types";
+import { eq } from 'drizzle-orm';
-import { eq } from "drizzle-orm";
+
 
 @Injectable()
 export class FilesService {
@@ -19,7 +19,7 @@ export class FilesService {
 	 * @return A promise that resolves to an object containing the streamable file and additional file information.
 	 * @throws NotFoundException if the file does not exist in the database.
 	 */
-	public async get(fileId: string): Promise<IFileWithInformation<object>> {
+	public async get(fileId: string): Promise<StreamableFile> {
 		const foundFiles = await this.database
 			.use()
 			.select()
@@ -44,20 +44,21 @@ export class FilesService {
 			file.extension,
 			file.isDocumentation,
 		);
-		const streamableFile = new StreamableFile(fileBuffer);
 		const fileInformation = await this.storage.generateInformation(
 			fileBuffer,
 			file.fileName,
 			file.isDocumentation,
 		);
+		const fileNameWithoutSpaces = file.fileName.replace(/\s/g, "_");
+		return new StreamableFile(fileBuffer, {
+			disposition: `attachment; filename="${fileNameWithoutSpaces}.${fileInformation.fileType.ext.toLowerCase()}"`
+		});
+	}
+
+	//TODO list the files
+
+	//TODO save a file
+	public async set() {
 
-		return {
-			stream: streamableFile,
-			info: fileInformation,
-			additionalData: {
-				//Since we can have twice or more entry in the database for the same checksum of a file.
-				foundEntry: foundFiles.length,
-			},
-		};
 	}
 }

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

@@ -1,4 +1,5 @@
 import {
+	Body,
 	Controller,
 	DefaultValuePipe,
 	Delete,
@@ -6,10 +7,11 @@ import {
 	Param,
 	ParseIntPipe,
 	Post,
-	Query,
+	Query
-} from "@nestjs/common";
+} from '@nestjs/common';
 import { ISearchQuery } from "apps/backend/src/app/groups/groups.types";
 import { GroupsService } from "./groups.service";
+import { CreateGroupDto } from 'apps/backend/src/app/groups/groups.dto';
 
 @Controller("groups")
 export class GroupsController {
@@ -22,12 +24,14 @@ export class GroupsController {
 		@Query("offset", new DefaultValuePipe(0), ParseIntPipe) offset: number,
 		@Query("search", new DefaultValuePipe("")) search: string,
 	) {
-		const query = { limit, offset, search };
+		//TODO add service method
 	}
 
 	//POST a new group
 	@Post("new")
-	async newGroup() {}
+	async newGroup(@Body() dto : CreateGroupDto) {
+
+	}
 
 	//DELETE a group
 	@Delete(":groupId")

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

@@ -0,0 +1,8 @@
+import { IsString, MinLength, MaxLength } from 'class-validator';
+
+export class CreateGroupDto {
+  @IsString()
+  @MinLength(4)
+  @MaxLength(64)
+  groupName: string;
+}

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

@@ -1,8 +1,10 @@
 import { Module } from "@nestjs/common";
 import { GroupsController } from "./groups.controller";
 import { GroupsService } from "./groups.service";
+import { DbModule } from '../db/db.module';
 
 @Module({
+	imports: [DbModule],
 	controllers: [GroupsController],
 	providers: [GroupsService],
 })

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

@@ -1,4 +1,30 @@
 import { Injectable } from "@nestjs/common";
+import { DbService } from 'apps/backend/src/app/db/db.service';
+import { FilesGroupTable } from 'apps/backend/src/app/db/schema';
+import { ilike } from 'drizzle-orm';
 
 @Injectable()
-export class GroupsService {}
+export class GroupsService {
+  constructor(private readonly database: DbService) {}
+
+  //TODO a method to fetch groups in the database by a specific search with limit, offset and a search field (can be blank)
+  async getGroupsByName(limit: number, offset: number, search: string) {
+    const result = await this.database.use()
+      .select()
+      .from(FilesGroupTable)
+      .where(ilike(FilesGroupTable.groupName, search))
+      .limit(limit)
+      .offset(offset)
+      .prepare("getGroupsByName")
+      .execute()
+    console.log(`Found ${result.length} groups for search :\n > "${search}"`)
+    return result;
+  }
+
+  //TODO The method to create a group
+
+
+  //TODO a method to delete a group and place the associated file at a null group reference
+
+  //TODO a method to get the files of a group in the database by a specific search with limit, offset and a search field (can be blank)
+}

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

@@ -1,4 +1,15 @@
 import { Injectable } from "@nestjs/common";
+import { DbService } from 'apps/backend/src/app/db/db.service';
 
 @Injectable()
-export class MachinesService {}
+export class MachinesService {
+  constructor(private readonly database: DbService) {}
+
+  //TODO a method to fetch machines in the database by a specific search with limit, offset and a search field (can be blank)
+
+  //TODO The method to create a machine
+
+  //TODO a method to delete a machine and delete the associated FilesTypeForMachine row
+
+  //TODO a method to get the files of a group in the database by a specific search with limit, offset and a search field (can be blank)
+}