Feature 28 create user controller and service

.eslintrc.js

@@ -21,5 +21,11 @@ module.exports = {
     '@typescript-eslint/explicit-function-return-type': 'off',
     '@typescript-eslint/explicit-module-boundary-types': 'off',
     '@typescript-eslint/no-explicit-any': 'off',
+    'prettier/prettier': [
+      'error',
+      {
+        endOfLine: 'auto',
+      },
+    ],
   },
 };

src/activity/controllers/activity/activity.controller.ts

@@ -17,7 +17,7 @@ import { CreateActivityDto } from '../../dto/create-activity.dto';
 import { UpdateActivityDto } from '../../dto/update-activity.dto';
 import { Query as ExpressQuery } from 'express-serve-static-core';
 import { AuthGuard } from '@nestjs/passport';
-import { Role } from '../../../auth/schemas/userAuthSchema';
+import { Role } from '../../../auth/schemas/userAuth.model';
 
 @Controller('events')
 export class ActivityController {

src/activity/dto/create-activity.dto.ts

@@ -13,7 +13,7 @@ import {
 } from 'class-validator';
 import { IsTime } from '../../../custom-validators/is-time';
 import { IsSocialMedia } from '../../../custom-validators/is-social-media';
-import { User } from '../../auth/schemas/userAuthSchema';
+import { User } from '../../auth/schemas/userAuth.model';
 
 export class CreateActivityDto {
   @IsEmpty({ message: 'You cannot pass user id.' })

src/activity/dto/update-activity.dto.ts

@@ -13,7 +13,7 @@ import {
 } from 'class-validator';
 import { IsTime } from '../../../custom-validators/is-time';
 import { IsSocialMedia } from '../../../custom-validators/is-social-media';
-import { User } from '../../auth/schemas/userAuthSchema';
+import { User } from '../../auth/schemas/userAuth.model';
 
 export class UpdateActivityDto {
   @IsEmpty({ message: 'You cannot pass user id.' })

src/activity/schemas/activity.schema.ts

@@ -1,5 +1,5 @@
 import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
-import { User } from '../../auth/schemas/userAuthSchema';
+import { User } from '../../auth/schemas/userAuth.model';
 import mongoose from 'mongoose';
 
 export interface SocialMedia {

src/activity/services/activity/activity.service.spec.ts

@@ -1,10 +1,11 @@
+/* eslint-disable prettier/prettier */
 import { Test, TestingModule } from '@nestjs/testing';
 import { ActivityService } from './activity.service';
 import mongoose, { Model } from 'mongoose';
 import { getModelToken } from '@nestjs/mongoose';
 import { Activity } from '../../schemas/activity.schema';
 import { CreateActivityDto } from '../../dto/create-activity.dto';
-import { User } from '../../../auth/schemas/userAuthSchema';
+import { User } from '../../../auth/schemas/userAuth.model';
 import { BadRequestException, NotFoundException } from '@nestjs/common';
 import createMockActivity from '../../../../test/mock-data/createMockActivity';
 import mockActivityFromDB from '../../../../test/mock-data/returned-mock-activity';

src/activity/services/activity/activity.service.ts

@@ -7,7 +7,7 @@ import { InjectModel } from '@nestjs/mongoose';
 import mongoose, { Model } from 'mongoose';
 import { Activity } from '../../schemas/activity.schema';
 import { Query } from 'express-serve-static-core';
-import { User } from '../../../auth/schemas/userAuthSchema';
+import { User } from '../../../auth/schemas/userAuth.model';
 
 @Injectable()
 export class ActivityService {

src/app.module.ts

@@ -1,9 +1,7 @@
 import { Module } from '@nestjs/common';
 import { MongooseModule } from '@nestjs/mongoose';
 import { ConfigModule } from '@nestjs/config';
-/*
 import { UserModule } from './user/user.module';
-*/
 import { ActivityModule } from './activity/activity.module';
 import { AuthModule } from './auth/auth.module';
 
@@ -14,7 +12,7 @@ import { AuthModule } from './auth/auth.module';
       isGlobal: true,
     }),
     MongooseModule.forRoot(process.env.MONGODB_URI),
-    /*UserModule,*/
+    UserModule,
     ActivityModule,
     AuthModule,
   ],

src/auth/auth.module.ts

@@ -2,7 +2,7 @@ import { Module } from '@nestjs/common';
 import { AuthController } from './auth.controller';
 import { AuthService } from './auth.service';
 import { MongooseModule } from '@nestjs/mongoose';
-import { UserAuthSchema } from './schemas/userAuthSchema';
+import { UserAuthSchema } from './schemas/userAuth.model';
 import { PassportModule } from '@nestjs/passport';
 import { JwtModule } from '@nestjs/jwt';
 import { ConfigService } from '@nestjs/config';

src/auth/auth.service.ts

@@ -1,8 +1,7 @@
 import { Injectable, UnauthorizedException } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
-import { User } from './schemas/userAuthSchema';
-
+import { User } from './schemas/userAuth.model';
 import * as bcrypt from 'bcryptjs';
 import { JwtService } from '@nestjs/jwt';
 import { SignUpDto } from './dto/signup.dto';
@@ -19,7 +18,12 @@ export class AuthService {
 
   async signUp(signUpDto: SignUpDto): Promise<{ token: string }> {
     const { name, email, password, role } = signUpDto;
+
+    console.log('name: ', name);
+    console.log('email: ', email);
+    console.log('password: ', password);
     const hashedPassword = await bcrypt.hash(password, 10);
+    console.log('hashedPassword: ', hashedPassword);
     const user = await this.userModel.create({
       name,
       email,

src/auth/dto/signup.dto.ts

@@ -1,5 +1,5 @@
 import { IsEmail, IsNotEmpty, IsString, MinLength } from 'class-validator';
-import { Role } from '../schemas/userAuthSchema';
+import { Role } from '../schemas/userAuth.model';
 
 export class SignUpDto {
   @IsNotEmpty()

src/auth/jwt.strategy.ts

@@ -3,7 +3,7 @@ import { InjectModel } from '@nestjs/mongoose';
 import { PassportStrategy } from '@nestjs/passport';
 import { Model } from 'mongoose';
 import { Strategy, ExtractJwt } from 'passport-jwt';
-import { User } from './schemas/userAuthSchema';
+import { User } from './schemas/userAuth.model';
 
 @Injectable()
 export class JwtStrategy extends PassportStrategy(Strategy) {

src/auth/schemas/userAuth.model.ts

@@ -0,0 +1,27 @@
+import { Document } from 'mongoose';
+import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
+
+export enum Role {
+  admin = 'admin',
+  creator = 'creator',
+  user = 'user',
+}
+
+@Schema({
+  timestamps: true,
+})
+export class User extends Document {
+  @Prop()
+  name: string;
+
+  @Prop({ unique: [true, 'Duplicate email entered'] })
+  email: string;
+
+  @Prop()
+  password: string;
+
+  @Prop()
+  role: Role;
+}
+
+export const UserAuthSchema = SchemaFactory.createForClass(User);

src/user/controllers/user/user.controller.spec.ts

@@ -0,0 +1,70 @@
+// import { Test, TestingModule } from '@nestjs/testing';
+// import { UserController } from './user.controller';
+// import { UserService } from '../../services/user/user.service';
+// import { Role } from 'src/auth/schemas/userAuth.model';
+// import { CreateUserDto } from 'src/user/dto/create-user.dto';
+
+// const mockUserService = {
+//   adminAddUser: jest.fn().mockResolvedValue('someId'),
+//   adminUpdateUser: jest.fn().mockResolvedValue(null),
+//   adminDeleteUser: jest.fn().mockResolvedValue(null),
+// };
+
+// describe('UserController', () => {
+//   let controller: UserController;
+
+//   beforeEach(async () => {
+//     const module: TestingModule = await Test.createTestingModule({
+//       controllers: [UserController],
+//       providers: [
+//         {
+//           provide: UserService,
+//           useValue: mockUserService,
+//         },
+//       ],
+//     }).compile();
+
+//     controller = module.get<UserController>(UserController);
+//     jest.clearAllMocks();
+//   });
+
+//   describe('Admin CRUD operations', () => {
+//     it('should add, update, and delete a user', async () => {
+//       const createUserDto: CreateUserDto = {
+//         id: 'testId',
+//         name: 'test',
+//         email: '[email protected]',
+//         password: '1234567890',
+//         role: Role.admin,
+//       };
+//       const updatedName = 'updatedName';
+//       const req = { user: { role: 'admin' } };
+
+//       // Create
+//       const generatedId = await controller.adminAddUser(createUserDto, req);
+//       expect(generatedId.id).toEqual('someId');
+//       expect(mockUserService.adminAddUser).toHaveBeenCalledWith(
+//         createUserDto.name,
+//         createUserDto.email,
+//         createUserDto.password,
+//         createUserDto.role,
+//       );
+
+//       // Update
+//       createUserDto.name = updatedName;
+//       await controller.adminUpdateUser(generatedId.id, createUserDto, req);
+//       expect(mockUserService.adminUpdateUser).toHaveBeenCalledWith(
+//         generatedId.id,
+//         updatedName,
+//         createUserDto.email,
+//         createUserDto.role,
+//       );
+
+//       // Delete
+//       await controller.adminDeleteUser(generatedId.id, req);
+//       expect(mockUserService.adminDeleteUser).toHaveBeenCalledWith(
+//         generatedId.id,
+//       );
+//     }, 30000);
+//   });
+// });

src/user/controllers/user/user.controller.ts

@@ -1,41 +1,71 @@
-// import { Body, Controller, Get, Param, Patch, Post } from '@nestjs/common';
-// import { UserService } from '../../services/user/user.service';
-// import { Role } from '../../schemas/user.model';
-//
-// @Controller('user')
-// export class UserController {
-//   constructor(private readonly userService: UserService) {}
-//   @Post('add')
-//   async addUser(
-//     @Body('name') name: string,
-//     @Body('email') email: string,
-//     @Body('role') role: string,
-//   ) {
-//     const generatedId = await this.userService.addUser(name, email, role);
-//     return { id: generatedId };
-//   }
-//
-//   @Get('')
-//   async getAllUsers() {
-//     return await this.userService.getAllUsers();
-//   }
-//
-//   @Get(':id')
-//   async getUserById(@Param('id') id: string) {
-//     return this.userService.getUserById(id);
-//   }
-//
-//   @Get('email/:email')
-//   async getUserByEmail(@Param('email') email: string) {
-//     return await this.userService.getUserByEmail(email);
-//   }
-//   @Patch('update/:id')
-//   async updateUser(
-//     @Param('id') id: string,
-//     @Body('name') name: string,
-//     @Body('email') email: string,
-//     @Body('role') role: Role,
-//   ) {
-//     await this.userService.updateUser(id, name, email, role);
-//   }
-// }
+/* eslint-disable @typescript-eslint/no-unused-vars */
+import {
+  Body,
+  Controller,
+  Delete,
+  Get,
+  Param,
+  Patch,
+  Post,
+  Req,
+} from '@nestjs/common';
+import { UserService } from '../../services/user/user.service';
+import { Role } from '../../schemas/user.model';
+import { CreateUserDto } from 'src/user/dto/create-user.dto';
+
+// ================== User admin routes ======================== \\
+// TODO: Add AuthGuard to all admin routes and check for admin roles
+@Controller('users')
+export class UserController {
+  constructor(private readonly userService: UserService) {}
+
+  // ----------------- Add User ------------------------------- \\
+  @Post('new')
+  // @UseGuards(AuthGuard())
+  async adminAddUser(@Body() createUserDto: CreateUserDto, @Req() req: any) {
+    const generatedId = await this.userService.newUser(createUserDto);
+    return { id: generatedId };
+  }
+
+  // ----------------- Get Users ----------------------------- \\
+  @Get('')
+  // @UseGuards(AuthGuard())
+  async getAllUsers() {
+    return await this.userService.getAllUsers();
+  }
+
+  // ----------------- Get User ------------------------------ \\
+  @Get('find/:id')
+  // @UseGuards(AuthGuard())
+  async getUserById(@Param('id') id: string) {
+    return this.userService.getUserById(id);
+  }
+
+  // ----------------- Get User by Email --------------------- \\
+  @Get('email/:email')
+  // @UseGuards(AuthGuard())
+  async getUserByEmail(@Param('email') email: string) {
+    return await this.userService.getUserByEmail(email);
+  }
+
+  // ----------------- Update User --------------------------- \\
+  @Patch('update/:id')
+  // @UseGuards(AuthGuard())
+  async updateUser(
+    @Param('id') id: string,
+    @Body('name') name: string,
+    @Body('email') email: string,
+    @Body('role') role: Role,
+  ) {
+    await this.userService.updateUser(id, name, email, role);
+  }
+
+  // ----------------- Delete User --------------------------- //
+  @Delete('remove/:id')
+  // @UseGuards(AuthGuard())
+  async adminDeleteUser(@Param('id') id: string, @Req() req: any) {
+    await this.userService.removeUser(id);
+  }
+
+  // ================== End Admin routes ======================== \\
+}

src/user/dto/create-user.dto.ts

@@ -1,4 +1,4 @@
-import { Role } from '../../auth/schemas/userAuthSchema';
+import { Role } from '../../auth/schemas/userAuth.model';
 import {
   IsAlpha,
   IsEmail,
@@ -21,9 +21,14 @@ export class CreateUserDto {
   @IsNotEmpty()
   @IsString()
   @IsAlpha()
-  @MinLength(2, { message: 'Must be equal to or longer than 2 letters' })
+  @MinLength(2, { message: 'Name must be longer than 2 letters.' })
   name: string;
 
+  @IsNotEmpty()
+  @IsString()
+  @MinLength(8, { message: 'Password must contain 8 characters or more.' })
+  password: string;
+
   @IsNotEmpty()
   @IsEnum(Role)
   role: Role;