From e6d3b32a938b69c899cd40fa89de24b27b136837 Mon Sep 17 00:00:00 2001
From: Amine <larbiamine22@yahoo.fr>
Date: Tue, 13 Dec 2022 19:38:25 +0100
Subject: [PATCH] modifications pour rajouter le pdf
---
.gitignore | 3 ++
package-lock.json | 13 +++++
package.json | 1 +
src/config/config.model.ts | 1 +
src/config/config.prod.json | 2 +-
src/config/config.template.json | 1 +
src/config/index.ts | 2 +-
src/internships/dao/internships.dao.ts | 2 +-
src/internships/internships.controller.ts | 61 ++++++++++++++++++++---
9 files changed, 75 insertions(+), 11 deletions(-)
diff --git a/.gitignore b/.gitignore
index e4e5ae6..d1486f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -105,3 +105,6 @@ dist
# config files
config.json
+
+# file where we store pdf
+internship-agreements/
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index aabd4b5..c34df50 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -29,6 +29,7 @@
"@types/jest": "28.1.8",
"@types/node": "^16.0.0",
"@types/supertest": "^2.0.11",
+ "@types/uuid": "^9.0.0",
"@typescript-eslint/eslint-plugin": "^5.0.0",
"@typescript-eslint/parser": "^5.0.0",
"cross-env": "^7.0.3",
@@ -3138,6 +3139,12 @@
"@types/superagent": "*"
}
},
+ "node_modules/@types/uuid": {
+ "version": "9.0.0",
+ "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.0.tgz",
+ "integrity": "sha512-kr90f+ERiQtKWMz5rP32ltJ/BtULDI5RVO0uavn1HQUOwjx0R1h0rnDYNL0CepF1zL5bSY6FISAfd9tOdDhU5Q==",
+ "dev": true
+ },
"node_modules/@types/webidl-conversions": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
@@ -12456,6 +12463,12 @@
"@types/superagent": "*"
}
},
+ "@types/uuid": {
+ "version": "9.0.0",
+ "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.0.tgz",
+ "integrity": "sha512-kr90f+ERiQtKWMz5rP32ltJ/BtULDI5RVO0uavn1HQUOwjx0R1h0rnDYNL0CepF1zL5bSY6FISAfd9tOdDhU5Q==",
+ "dev": true
+ },
"@types/webidl-conversions": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
diff --git a/package.json b/package.json
index 8f5f493..07f72a8 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,7 @@
"@types/jest": "28.1.8",
"@types/node": "^16.0.0",
"@types/supertest": "^2.0.11",
+ "@types/uuid": "^9.0.0",
"@typescript-eslint/eslint-plugin": "^5.0.0",
"@typescript-eslint/parser": "^5.0.0",
"cross-env": "^7.0.3",
diff --git a/src/config/config.model.ts b/src/config/config.model.ts
index 79984c4..991a78d 100644
--- a/src/config/config.model.ts
+++ b/src/config/config.model.ts
@@ -1,4 +1,5 @@
export interface IServerConfig {
+ url: string;
port: number;
}
diff --git a/src/config/config.prod.json b/src/config/config.prod.json
index 221da47..9a88b14 100644
--- a/src/config/config.prod.json
+++ b/src/config/config.prod.json
@@ -1,6 +1,6 @@
{
"server": {
- "uri": "localhost",
+ "url": "localhost",
"port": 3001
},
"mongodb": {
diff --git a/src/config/config.template.json b/src/config/config.template.json
index ee6bb83..9a88b14 100644
--- a/src/config/config.template.json
+++ b/src/config/config.template.json
@@ -1,5 +1,6 @@
{
"server": {
+ "url": "localhost",
"port": 3001
},
"mongodb": {
diff --git a/src/config/index.ts b/src/config/index.ts
index e948aae..2b462df 100644
--- a/src/config/index.ts
+++ b/src/config/index.ts
@@ -7,7 +7,7 @@ import { exit } from 'process';
const CONFIG_DEV = 'config.json';
const CONFIG_PROD = 'config.prod.json';
-let config;
+let config: IConfig;
// Load config based on env
switch (process.env.NODE_ENV) {
case 'dev':
diff --git a/src/internships/dao/internships.dao.ts b/src/internships/dao/internships.dao.ts
index b5bfdfc..6429599 100644
--- a/src/internships/dao/internships.dao.ts
+++ b/src/internships/dao/internships.dao.ts
@@ -121,7 +121,7 @@ export class InternshipDao {
): Promise<Internship | void> =>
new Promise((resolve, reject) => {
if (!isStateValid(state)) reject(BAD_REQUEST);
- console.log(typeof content);
+ console.log(content);
let nextState: string, contentHolder: string;
let valid = false;
switch (state) {
diff --git a/src/internships/internships.controller.ts b/src/internships/internships.controller.ts
index 1fb011e..9b5cdb2 100644
--- a/src/internships/internships.controller.ts
+++ b/src/internships/internships.controller.ts
@@ -7,13 +7,23 @@ import {
Param,
Body,
UseInterceptors,
+ UploadedFile,
} from '@nestjs/common';
-import { BAD_TRACKING_STATE } from 'src/shared/HttpError';
+import { BAD_REQUEST, BAD_TRACKING_STATE } from 'src/shared/HttpError';
import * as InternshipStates from 'src/shared/InternshipState';
import { HttpInterceptor } from '../interceptors/http.interceptor';
import { CreateInternshipDto } from './dto/create-internship.dto';
import { InternshipEntity } from './entities/internship.entity';
import { InternshipService } from './internships.service';
+import { FileInterceptor } from '@nestjs/platform-express';
+import * as path from 'path';
+import {
+ STATE_RESPONSIBLE_ACCEPTS_INTERNSHIP_INFORMATION,
+ STATE_STUDENT_ENTERS_INTERNSHIP_INFORMATION,
+} from 'src/shared/InternshipState';
+import config from 'src/config';
+import { Optional } from '@nestjs/common/decorators';
+import { v4 } from 'uuid';
@Controller('internships')
@UseInterceptors(HttpInterceptor)
@@ -47,18 +57,53 @@ export class InternshipsController {
return this._internshipsService.update(params.studentId, internshipDto);
}
- @Put(':studentId/tracking')
+ @Put(':studentId/:state')
+ @UseInterceptors(
+ FileInterceptor('pdf', {
+ dest: './internship-agreements',
+ fileFilter: (req, file, cb) => {
+ file.filename = `${v4()}.pdf`;
+ cb(null, true);
+ },
+ }),
+ )
updateState(
- @Param() params: { studentId: string },
- @Body() body: { state: string; content?: string | boolean },
+ @Param() params: { studentId: string; state: string },
+ @Optional() @Body() body: { content?: boolean },
+ @Optional() @UploadedFile() file,
): Promise<InternshipEntity | void> {
- if (!InternshipStates.isStateValid(body.state))
- throw BAD_TRACKING_STATE(body.state);
+ if (!InternshipStates.isStateValid(params.state))
+ throw BAD_TRACKING_STATE(params.state);
+
// AMINE : Handle PDF file upload -> save file in /pdf/ folder and set content as local file URL. In case of step with no file, set content as true/false
+
+ //case where there isn't a file
+ //Deux premiers états
+
+ if (
+ params.state === STATE_STUDENT_ENTERS_INTERNSHIP_INFORMATION ||
+ params.state === STATE_RESPONSIBLE_ACCEPTS_INTERNSHIP_INFORMATION
+ ) {
+ if (!body) throw BAD_REQUEST;
+ return this._internshipsService.updateTracking(
+ params.studentId,
+ params.state,
+ body.content,
+ );
+ }
+
+ //case where there is a file
+ if (!file) throw BAD_REQUEST;
+ console.log(file);
+ console.log(config);
return this._internshipsService.updateTracking(
params.studentId,
- body.state,
- body.content,
+ params.state,
+ path.join(
+ `${config.server.url}:${config.server.port}`,
+ file.path,
+ file.fieldname,
+ ),
);
}
--
GitLab