From dea1a614da1b1a97f6dcd7e31b733d2ef557ccf4 Mon Sep 17 00:00:00 2001 From: Andrei Tutin Date: Thu, 12 Jan 2023 15:36:27 +0300 Subject: [PATCH 1/6] fixed database connection --- .development.env | 4 ++-- src/app.module.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.development.env b/.development.env index eb55857..716b4af 100644 --- a/.development.env +++ b/.development.env @@ -2,6 +2,6 @@ PORT=5000 POSTGRES_HOST=postgres POSTGRES_USER=postgres POSTGRES_DB=nest-course -POSTGRESS_PASSWORD=root -POSTGRESS_PORT=5432 +POSTGRES_PASSWORD=root +POSTGRES_PORT=5432 PRIVATE_KEY=secret_key_safasf diff --git a/src/app.module.ts b/src/app.module.ts index 1791239..e7acc31 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -26,9 +26,9 @@ import * as path from 'path'; SequelizeModule.forRoot({ dialect: 'postgres', host: process.env.POSTGRES_HOST, - port: Number(process.env.POSTGRESS_PORT), + port: Number(process.env.POSTGRES_PORT), username: process.env.POSTGRES_USER, - password: process.env.POSTGRESS_PASSWORD, + password: process.env.POSTGRES_PASSWORD, database: process.env.POSTGRES_DB, models: [User, Role, UserRoles, Post], autoLoadModels: true From ef558915b6cf4a6c75a90a96c02bd5de87566914 Mon Sep 17 00:00:00 2001 From: Andrei Tutin Date: Thu, 12 Jan 2023 15:38:26 +0300 Subject: [PATCH 2/6] fixed "Cannot read property 'id' of null error while registration" --- src/users/users.service.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/users/users.service.ts b/src/users/users.service.ts index e6bc04f..a06e805 100644 --- a/src/users/users.service.ts +++ b/src/users/users.service.ts @@ -15,7 +15,7 @@ export class UsersService { async createUser(dto: CreateUserDto) { const user = await this.userRepository.create(dto); const role = await this.roleService.getRoleByValue("ADMIN") - await user.$set('roles', [role.id]) + await user.$set('roles', [role?.id]) user.roles = [role] return user; } @@ -27,7 +27,10 @@ export class UsersService { async getUserByEmail(email: string) { const user = await this.userRepository.findOne({where: {email}, include: {all: true}}) - return user; + + if (user) return user; + + return null } async addRole(dto: AddRoleDto) { From c65361bfe3956151b6aee717b6d5dc20ca5e9ef0 Mon Sep 17 00:00:00 2001 From: Andrei Tutin Date: Thu, 12 Jan 2023 15:40:08 +0300 Subject: [PATCH 3/6] fixed Dockerfile --- Dockerfile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index f8da1ba..375f471 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,8 +6,4 @@ COPY package*.json ./ RUN npm install -COPY . . - -COPY ./dist ./dist - -CMD ["npm", "run", "start:dev"] +COPY . . \ No newline at end of file From 0f9728bd378fe44794cec85277d3dccf31c5c66e Mon Sep 17 00:00:00 2001 From: Andrei Tutin Date: Thu, 12 Jan 2023 15:40:58 +0300 Subject: [PATCH 4/6] added node_modules .dockerignore --- .dockerignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..b512c09 --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +node_modules \ No newline at end of file From b9b0dafba6f924eecfcd98c18a2895f7d82a7084 Mon Sep 17 00:00:00 2001 From: Andrei Tutin Date: Thu, 12 Jan 2023 15:41:31 +0300 Subject: [PATCH 5/6] update README --- README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index a6e1733..4189232 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,9 @@ в файле .development.env конфигурация для бд. Добавить свою. -#### npm run start:dev - Запуск - -## - -#### docker-compose up +```sh +npm install +``` +```sh +docker-compose up +``` From d5ebc24f51329b7e81693c8ea75d108f7d2afb50 Mon Sep 17 00:00:00 2001 From: Andrei Tutin Date: Thu, 12 Jan 2023 16:20:07 +0300 Subject: [PATCH 6/6] =?UTF-8?q?=D0=B2=D0=B5=D1=80=D0=BD=D1=83=D0=BB=20getU?= =?UTF-8?q?serByEmail=20=D0=BF=D1=80=D0=B5=D0=B6=D0=BD=D0=B8=D0=B9=20?= =?UTF-8?q?=D0=B2=D0=B8=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/users/users.service.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/users/users.service.ts b/src/users/users.service.ts index a06e805..a5f2619 100644 --- a/src/users/users.service.ts +++ b/src/users/users.service.ts @@ -27,10 +27,7 @@ export class UsersService { async getUserByEmail(email: string) { const user = await this.userRepository.findOne({where: {email}, include: {all: true}}) - - if (user) return user; - - return null + return user; } async addRole(dto: AddRoleDto) {