From c3bcfd3ef063db9783a9b166346626420f4f5f1c Mon Sep 17 00:00:00 2001
From: Matin <matinjm7247@gmail.com>
Date: Mon, 27 Jan 2025 09:22:29 +0330
Subject: [PATCH] chore: test and fix bugs of user group

---
 .env.example                                 | 14 ++++++++++----
 src/modules/auth/DTO/loginPassword.dto.ts    |  4 ++--
 src/modules/users/providers/users.service.ts | 16 +++++++++++++---
 src/modules/users/users.controller.ts        |  9 ++++++++-
 4 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/.env.example b/.env.example
index b21aa5e..c8b6f2c 100644
--- a/.env.example
+++ b/.env.example
@@ -2,11 +2,11 @@ NODE_ENV=development
 PORT=3500
 
 
-DB_HOST=
-DB_PORT=
-DB_NAME=
-DB_USER=
+DB_HOST=localhost
+DB_PORT=54320
+DB_USER=danak
 DB_PASS=
+DB_NAME=
 
 
 PGADMIN_EMAIL=root@test.ir
@@ -39,4 +39,10 @@ JWT_SECRET_KEY=secret
 ACCESS_TOKEN_EXPIRE=1 #==> in hour
 REFRESH_TOKEN_EXPIRE=3 #===> in days
 
+BUCKET_NAME=dsc
+BUCKET_REGION=default
+BUCKET_URL=https://storage.iran.liara.space
+BUCKET_ACCESS_KEY=
+BUCKET_SECRET_KEY=
+BUCKET_UPLOAD_URL=https://dsc.storage.iran.liara.space
 
diff --git a/src/modules/auth/DTO/loginPassword.dto.ts b/src/modules/auth/DTO/loginPassword.dto.ts
index ab41de7..abe8b26 100644
--- a/src/modules/auth/DTO/loginPassword.dto.ts
+++ b/src/modules/auth/DTO/loginPassword.dto.ts
@@ -6,12 +6,12 @@ import { AuthMessage } from "../../../common/enums/message.enum";
 export class LoginPasswordDTO {
   @IsNotEmpty({ message: AuthMessage.EMAIL_NOT_EMPTY })
   @IsEmail(undefined, { message: AuthMessage.INVALID_EMAIL_FORMAT })
-  @ApiProperty({ description: "email of user", default: "user@test.ir" })
+  @ApiProperty({ description: "email of user", default: "admin-dsc@gmail.com" })
   email: string;
 
   @IsNotEmpty({ message: AuthMessage.PasswordNotEmpty })
   @IsString({ message: AuthMessage.INVALID_PASS_FORMAT })
-  @ApiProperty({ type: "string", description: "password user", example: "@1234" })
+  @ApiProperty({ type: "string", description: "password user", example: "admin123" })
   password: string;
 }
 
diff --git a/src/modules/users/providers/users.service.ts b/src/modules/users/providers/users.service.ts
index 38a66bf..2aef12f 100644
--- a/src/modules/users/providers/users.service.ts
+++ b/src/modules/users/providers/users.service.ts
@@ -12,6 +12,7 @@ import { User } from "../entities/user.entity";
 import { RoleEnum } from "../enums/role.enum";
 import { ValidityType } from "../enums/validity-type.enum";
 import { RoleRepository } from "../repositories/roles.repository";
+import { UserGroupRepository } from "../repositories/user-group.repository";
 import { UserRepository } from "../repositories/users.repository";
 
 @Injectable()
@@ -34,6 +35,7 @@ export class UsersService {
   constructor(
     private userRepository: UserRepository,
     private roleRepository: RoleRepository,
+    private userGroupRepository: UserGroupRepository,
   ) {}
 
   /************************************************************ */
@@ -117,11 +119,19 @@ export class UsersService {
 
   async createUserGroup(createUserGroupDto: CreateUserGroupDto) {
     const users = await this.userRepository.find({ where: { id: In(createUserGroupDto.userIds) } });
-    const userGroup = this.userRepository.create({
+    const userGroup = this.userGroupRepository.create({
       ...createUserGroupDto,
-      ...users,
+      users,
     });
-    return await this.userRepository.save(userGroup);
+    console.log({ userGroup });
+    return await this.userGroupRepository.save(userGroup);
+  }
+
+  async getUserGroup() {
+    const usersGroup = await this.userGroupRepository.find({});
+    return {
+      usersGroup,
+    };
   }
 
   ///****************************************************** */
diff --git a/src/modules/users/users.controller.ts b/src/modules/users/users.controller.ts
index 06e3f92..a9fe12f 100644
--- a/src/modules/users/users.controller.ts
+++ b/src/modules/users/users.controller.ts
@@ -41,9 +41,16 @@ export class UsersController {
   @AuthGuards()
   @Roles(RoleEnum.ADMIN)
   @ApiOperation({ summary: "Create user group" })
-  @HttpCode(HttpStatus.OK)
+  @HttpCode(HttpStatus.CREATED)
   @Post("user-group")
   createUserGroup(@Body() createDto: CreateUserGroupDto) {
     return this.usersService.createUserGroup(createDto);
   }
+
+  @ApiOperation({ summary: "get all user group" })
+  @HttpCode(HttpStatus.OK)
+  @Get("user-group")
+  UserGroups() {
+    return this.usersService.getUserGroup();
+  }
 }