Skip to content

Commit e3daf68

Browse files
committed
Updated nestjs to latest
1 parent f80c5eb commit e3daf68

File tree

9 files changed

+46
-45
lines changed

9 files changed

+46
-45
lines changed

docker-compose.test.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ services:
4343
networks:
4444
- backend
4545
ports:
46-
- 8005:8005
46+
- ${PERMISSION_SERVICE_PORT}:${PERMISSION_SERVICE_PORT}
4747
user:
4848
build: ./user
4949
restart: always
@@ -65,15 +65,12 @@ services:
6565
MONGO_INITDB_DATABASE: ${MONGO_DATABASE}
6666
volumes:
6767
- "./db/init/:/docker-entrypoint-initdb.d/"
68-
ports:
69-
- 27017:27017
7068
networks:
7169
- backend
7270
env_file:
7371
- .env.test
72+
ports:
73+
- 27017:27017
7474
networks:
7575
backend:
7676
driver: bridge
77-
frontend:
78-
external:
79-
name: infrastructure

gateway/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@
1313
"test": "jest --config ./test/jest-e2e.json --detectOpenHandles"
1414
},
1515
"dependencies": {
16-
"@nestjs/common": "7.5.1",
17-
"@nestjs/core": "7.5.1",
18-
"@nestjs/microservices": "7.5.1",
19-
"@nestjs/platform-express": "7.5.1",
16+
"@nestjs/common": "7.6.15",
17+
"@nestjs/core": "7.6.15",
18+
"@nestjs/microservices": "7.6.15",
19+
"@nestjs/platform-express": "7.6.15",
2020
"@nestjs/swagger": "4.7.5",
2121
"reflect-metadata": "0.1.13",
2222
"rimraf": "3.0.2",
2323
"rxjs": "6.6.3",
2424
"swagger-ui-express": "4.1.4"
2525
},
2626
"devDependencies": {
27-
"@nestjs/testing": "7.5.1",
27+
"@nestjs/testing": "7.6.15",
2828
"@types/express": "4.17.7",
2929
"@types/jest": "26.0.10",
3030
"@types/node": "14.0.27",

mailer/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
},
1414
"dependencies": {
1515
"@nest-modules/mailer": "1.3.22",
16-
"@nestjs/common": "7.5.1",
17-
"@nestjs/core": "7.5.1",
18-
"@nestjs/microservices": "7.5.1",
19-
"@nestjs/platform-express": "7.5.1",
16+
"@nestjs/common": "7.6.15",
17+
"@nestjs/core": "7.6.15",
18+
"@nestjs/microservices": "7.6.15",
19+
"@nestjs/platform-express": "7.6.15",
2020
"nodemailer": "^6.4.11",
2121
"reflect-metadata": "0.1.13",
2222
"rimraf": "3.0.2",

permission/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
"lint": "eslint \"src/**/*.ts\" --fix"
1313
},
1414
"dependencies": {
15-
"@nestjs/common": "7.5.1",
16-
"@nestjs/core": "7.5.1",
17-
"@nestjs/microservices": "7.5.1",
18-
"@nestjs/platform-express": "7.5.1",
15+
"@nestjs/common": "7.6.15",
16+
"@nestjs/core": "7.6.15",
17+
"@nestjs/microservices": "7.6.15",
18+
"@nestjs/platform-express": "7.6.15",
1919
"reflect-metadata": "0.1.13",
2020
"rimraf": "3.0.2",
2121
"rxjs": "6.6.3"

task/package.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,18 @@
1212
"lint": "eslint \"src/**/*.ts\" --fix"
1313
},
1414
"dependencies": {
15-
"@nestjs/common": "7.5.1",
16-
"@nestjs/core": "7.5.1",
17-
"@nestjs/microservices": "7.5.1",
18-
"@nestjs/mongoose": "7.1.2",
19-
"@nestjs/platform-express": "7.5.1",
20-
"mongoose": "5.10.0",
15+
"@nestjs/common": "7.6.15",
16+
"@nestjs/core": "7.6.15",
17+
"@nestjs/microservices": "7.6.15",
18+
"@nestjs/mongoose": "7.2.4",
19+
"@nestjs/platform-express": "7.6.15",
20+
"mongoose": "5.11.15",
2121
"reflect-metadata": "0.1.13",
2222
"rimraf": "3.0.2",
2323
"rxjs": "6.6.3"
2424
},
2525
"devDependencies": {
2626
"@types/express": "4.17.8",
27-
"@types/mongoose": "5.10.2",
2827
"@types/node": "14.0.27",
2928
"dotenv": "8.2.0",
3029
"ts-node": "9.0.0",

token/package.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,19 @@
1212
"lint": "eslint \"src/**/*.ts\" --fix"
1313
},
1414
"dependencies": {
15-
"@nestjs/common": "7.5.1",
16-
"@nestjs/core": "7.5.1",
17-
"@nestjs/microservices": "7.5.1",
18-
"@nestjs/mongoose": "7.1.2",
19-
"@nestjs/platform-express": "7.5.1",
15+
"@nestjs/common": "7.6.15",
16+
"@nestjs/core": "7.6.15",
17+
"@nestjs/microservices": "7.6.15",
18+
"@nestjs/mongoose": "7.2.4",
19+
"@nestjs/platform-express": "7.6.15",
2020
"@nestjs/jwt": "7.2.0",
21-
"mongoose": "5.10.0",
21+
"mongoose": "5.11.15",
2222
"reflect-metadata": "0.1.13",
2323
"rimraf": "3.0.2",
2424
"rxjs": "6.6.3"
2525
},
2626
"devDependencies": {
2727
"@types/express": "4.17.8",
28-
"@types/mongoose": "5.10.2",
2928
"@types/node": "14.0.27",
3029
"dotenv": "8.2.0",
3130
"ts-node": "9.0.0",

token/src/services/token.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export class TokenService {
2727
}).save();
2828
}
2929

30-
public deleteTokenForUserId(userId: string): Query<any> {
30+
public deleteTokenForUserId(userId: string): Query<any, any> {
3131
return this.tokenModel.remove({
3232
user_id: userId,
3333
});

user/package.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,19 @@
1212
"lint": "eslint \"src/**/*.ts\" --fix"
1313
},
1414
"dependencies": {
15-
"@nestjs/common": "7.5.1",
16-
"@nestjs/core": "7.5.1",
17-
"@nestjs/microservices": "7.5.1",
18-
"@nestjs/mongoose": "7.1.2",
19-
"@nestjs/platform-express": "7.5.1",
15+
"@nestjs/common": "7.6.15",
16+
"@nestjs/core": "7.6.15",
17+
"@nestjs/microservices": "7.6.15",
18+
"@nestjs/mongoose": "7.2.4",
19+
"@nestjs/platform-express": "7.6.15",
2020
"bcrypt": "5.0.0",
21-
"mongoose": "5.10.0",
21+
"mongoose": "5.11.15",
2222
"reflect-metadata": "0.1.13",
2323
"rimraf": "3.0.2",
2424
"rxjs": "6.6.3"
2525
},
2626
"devDependencies": {
2727
"@types/express": "4.17.8",
28-
"@types/mongoose": "5.10.2",
2928
"@types/node": "14.0.27",
3029
"dotenv": "8.2.0",
3130
"ts-node": "9.0.0",

user/src/schemas/user.schema.ts

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,15 @@ function transformValue(doc, ret: { [key: string]: any }) {
99
delete ret.password;
1010
}
1111

12-
export const UserSchema = new mongoose.Schema(
12+
export interface IUserSchema extends mongoose.Document {
13+
email: string;
14+
password: string;
15+
is_confirmed: boolean;
16+
comparePassword: (password: string) => Promise<Boolean>
17+
getEncryptedPassword: (password: string) => Promise<string>;
18+
};
19+
20+
export const UserSchema = new mongoose.Schema<IUserSchema>(
1321
{
1422
email: {
1523
type: String,
@@ -43,7 +51,7 @@ export const UserSchema = new mongoose.Schema(
4351
},
4452
);
4553

46-
UserSchema.methods.getEncryptedPassword = (password: string) => {
54+
UserSchema.methods.getEncryptedPassword = (password: string): Promise<string> => {
4755
return bcrypt.hash(String(password), SALT_ROUNDS);
4856
};
4957

@@ -52,10 +60,9 @@ UserSchema.methods.compareEncryptedPassword = function (password: string) {
5260
};
5361

5462
UserSchema.pre('save', async function (next) {
55-
const self = this as IUser;
5663
if (!this.isModified('password')) {
5764
return next();
5865
}
59-
self.password = await self.getEncryptedPassword(self.password);
66+
this.password = await this.getEncryptedPassword(this.password);
6067
next();
6168
});

0 commit comments

Comments
 (0)