add user module

prisma/migrations/20240616044853_add_ondelete_to_draft/migration.sql

@@ -0,0 +1,5 @@
+-- DropForeignKey
+ALTER TABLE "drafts" DROP CONSTRAINT "drafts_ownerId_fkey";
+
+-- AddForeignKey
+ALTER TABLE "drafts" ADD CONSTRAINT "drafts_ownerId_fkey" FOREIGN KEY ("ownerId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE;

prisma/schema.prisma

@@ -33,7 +33,7 @@ model Draft {
   desc    String?
   private Boolean @default(true)
 
-  owner   User  @relation(fields: [ownerId], references: [id])
+  owner   User  @relation(fields: [ownerId], references: [id], onDelete: Cascade)
   ownerId Int
   civs    Civ[]
 

src/app.module.ts

@@ -12,6 +12,7 @@ import { TechModule } from './tech/tech.module';
 import { AgeModule } from './age/age.module';
 import { VersionModule } from './version/version.module';
 import { DraftModule } from './draft/draft.module';
+import { UserModule } from './user/user.module';
 
 @Module({
   imports: [
@@ -25,6 +26,7 @@ import { DraftModule } from './draft/draft.module';
     AgeModule,
     VersionModule,
     DraftModule,
+    UserModule,
   ],
 })
 export class AppModule {}

src/auth/auth.controller.ts

@@ -1,5 +1,5 @@
 import { Body, Controller, HttpCode, HttpStatus, Post } from '@nestjs/common';
-import { ApiCreatedResponse, ApiTags } from '@nestjs/swagger';
+import { ApiCreatedResponse, ApiOkResponse, ApiTags } from '@nestjs/swagger';
 import { AuthService, JwtAccessToken } from './auth.service';
 import { AuthDto } from './dto/auth.dto';
 
@@ -9,13 +9,12 @@ export class AuthController {
   constructor(private authService: AuthService) {}
 
   @ApiCreatedResponse({ type: JwtAccessToken })
-  @HttpCode(HttpStatus.OK)
   @Post('signup')
   signup(@Body() dto: AuthDto): Promise<JwtAccessToken> {
     return this.authService.signup(dto);
   }
 
-  @ApiCreatedResponse({ type: JwtAccessToken })
+  @ApiOkResponse({ status: HttpStatus.OK, type: JwtAccessToken })
   @HttpCode(HttpStatus.OK)
   @Post('login')
   login(@Body() dto: AuthDto): Promise<JwtAccessToken> {

src/auth/auth.service.ts

@@ -1,17 +1,13 @@
-import {
-  ForbiddenException,
-  Injectable,
-  InternalServerErrorException,
-} from '@nestjs/common';
+import { ForbiddenException, Injectable } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { JwtService } from '@nestjs/jwt';
 import { ApiProperty } from '@nestjs/swagger';
 import { User } from '@prisma/client';
 import * as argon from 'argon2';
 
+import { PrismaClientKnownRequestError } from '@prisma/client/runtime';
 import { PrismaService } from '../prisma/prisma.service';
 import { AuthDto } from './dto/auth.dto';
-import { PrismaClientKnownRequestError } from '@prisma/client/runtime';
 
 export class JwtAccessToken {
   @ApiProperty()
@@ -79,13 +75,13 @@ export class AuthService {
   }
 
   async signToken(userId: number, email: string): Promise<JwtAccessToken> {
-    const payload: object = {
+    const payload = {
       sub: userId,
       email,
     };
 
     const token = await this.jwt.signAsync(payload, {
-      expiresIn: '7d',
+      expiresIn: '15m',
       secret: this.config.get('JWT_SECRET') || process.env.JWT_SECRET,
     });
 

src/auth/jwt-strategy/jwt.strategy.ts

@@ -14,7 +14,7 @@ interface JwtPayload {
 
 @Injectable()
 export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {
-  constructor(private config: ConfigService, private prisma: PrismaService) {
+  constructor(config: ConfigService, private prisma: PrismaService) {
     super({
       jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),
       secretOrKey: config.get('JWT_SECRET') || process.env.JWT_SECRET,
@@ -32,7 +32,6 @@ export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {
       throw new ForbiddenException('User not found for authorization');
     }
 
-    // TODO: clean this up
     // delete password before returning the user object
     user.hash = '';
 

src/draft/draft.controller.ts

@@ -1,11 +1,13 @@
 import {
   Body,
+  ClassSerializerInterceptor,
   Controller,
   Delete,
   Get,
   Param,
   Patch,
   Post,
+  UseInterceptors,
 } from '@nestjs/common';
 import { ApiNoContentResponse, ApiOkResponse, ApiTags } from '@nestjs/swagger';
 import { DraftService } from './draft.service';
@@ -14,29 +16,33 @@ import { UpdateDraftDto } from './dto/update-draft.dto';
 import { DraftEntity } from './entities/draft.entity';
 
 @ApiTags('Drafts')
-@Controller('draft')
+@Controller('drafts')
 export class DraftController {
   constructor(private readonly draftService: DraftService) {}
 
   @ApiOkResponse({ type: DraftEntity })
+  @UseInterceptors(ClassSerializerInterceptor)
   @Post()
   create(@Body() createDraftDto: CreateDraftDto) {
     return this.draftService.create(createDraftDto);
   }
 
   @ApiOkResponse({ type: [DraftEntity] })
+  @UseInterceptors(ClassSerializerInterceptor)
   @Get()
   findAll() {
     return this.draftService.findAll();
   }
 
   @ApiOkResponse({ type: DraftEntity })
+  @UseInterceptors(ClassSerializerInterceptor)
   @Get(':id')
   findOne(@Param('id') id: string) {
     return this.draftService.findOne(+id);
   }
 
   @ApiOkResponse({ type: DraftEntity })
+  @UseInterceptors(ClassSerializerInterceptor)
   @Patch(':id')
   update(@Param('id') id: string, @Body() updateDraftDto: UpdateDraftDto) {
     return this.draftService.update(+id, updateDraftDto);

src/draft/draft.module.ts

@@ -1,3 +1,5 @@
+/* istanbul ignore file */
+
 import { Module } from '@nestjs/common';
 import { DraftController } from './draft.controller';
 import { DraftService } from './draft.service';

src/prisma/prisma.service.ts

@@ -17,6 +17,7 @@ export class PrismaService extends PrismaClient {
     });
   }
 
+  // FOR TESTING ONLY
   async cleanDb() {
     await this.user.deleteMany();
     await this.unit.deleteMany();

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

@@ -0,0 +1 @@
+export class CreateUserDto {}

src/user/dto/update-user.dto.ts

@@ -0,0 +1,4 @@
+import { PartialType } from '@nestjs/swagger';
+import { CreateUserDto } from './create-user.dto';
+
+export class UpdateUserDto extends PartialType(CreateUserDto) {}

src/user/entities/user.entity.ts

@@ -0,0 +1 @@
+export class User {}

src/user/user.controller.spec.ts

@@ -0,0 +1,20 @@
+import { Test, TestingModule } from '@nestjs/testing';
+import { UserController } from './user.controller';
+import { UserService } from './user.service';
+
+describe('UserController', () => {
+  let controller: UserController;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      controllers: [UserController],
+      providers: [UserService],
+    }).compile();
+
+    controller = module.get<UserController>(UserController);
+  });
+
+  it('should be defined', () => {
+    expect(controller).toBeDefined();
+  });
+});

src/user/user.controller.ts

@@ -0,0 +1,36 @@
+import {
+  Body,
+  Controller,
+  Delete,
+  Get,
+  Patch,
+  UseGuards,
+} from '@nestjs/common';
+import { ApiTags } from '@nestjs/swagger';
+import { User } from '@prisma/client';
+import { GetUser } from '../auth/decorator/get-user.decorator';
+import { JwtGuard } from '../auth/guard/jwt.guard';
+import { UpdateUserDto } from './dto/update-user.dto';
+import { UserService } from './user.service';
+
+@ApiTags('Users')
+@UseGuards(JwtGuard)
+@Controller('users')
+export class UserController {
+  constructor(private readonly userService: UserService) {}
+
+  @Get()
+  getSelf(@GetUser() user: User) {
+    return user;
+  }
+
+  @Patch()
+  update(@Body() updateUserDto: UpdateUserDto, @GetUser('id') id: number) {
+    return this.userService.update(id, updateUserDto);
+  }
+
+  @Delete()
+  remove(@GetUser('id') id: number) {
+    return this.userService.remove(id);
+  }
+}

src/user/user.module.ts

@@ -0,0 +1,11 @@
+/* istanbul ignore file */
+
+import { Module } from '@nestjs/common';
+import { UserController } from './user.controller';
+import { UserService } from './user.service';
+
+@Module({
+  controllers: [UserController],
+  providers: [UserService],
+})
+export class UserModule {}

src/user/user.service.spec.ts

@@ -0,0 +1,18 @@
+import { Test, TestingModule } from '@nestjs/testing';
+import { UserService } from './user.service';
+
+describe('UserService', () => {
+  let service: UserService;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      providers: [UserService],
+    }).compile();
+
+    service = module.get<UserService>(UserService);
+  });
+
+  it('should be defined', () => {
+    expect(service).toBeDefined();
+  });
+});

src/user/user.service.ts

@@ -0,0 +1,26 @@
+import { Injectable } from '@nestjs/common';
+import { CreateUserDto } from './dto/create-user.dto';
+import { UpdateUserDto } from './dto/update-user.dto';
+
+@Injectable()
+export class UserService {
+  create(createUserDto: CreateUserDto) {
+    return 'This action adds a new user';
+  }
+
+  findAll() {
+    return `This action returns all user`;
+  }
+
+  findOne(id: number) {
+    return `This action returns a #${id} user`;
+  }
+
+  update(id: number, updateUserDto: UpdateUserDto) {
+    return `This action updates a #${id} user`;
+  }
+
+  remove(id: number) {
+    return `This action removes a #${id} user`;
+  }
+}