Merge branch 'main' into feat/196-list-view-filtering

BE/package.json

@@ -43,6 +43,7 @@
     "mysql2": "^3.6.3",
     "passport": "^0.6.0",
     "passport-jwt": "^4.0.1",
+    "passport-naver-v2": "^2.0.8",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.8.1",
     "typeorm": "^0.3.17"

BE/src/auth/auth.controller.ts

@@ -1,6 +1,7 @@
 import {
   Body,
   Controller,
+  Get,
   HttpCode,
   Post,
   Req,
@@ -16,13 +17,23 @@ import {
 import { CreateUserDto } from "./dto/users.dto";
 import { User } from "./users.entity";
 import { GetUser } from "./get-user.decorator";
-import { JwtAuthGuard } from "./guard/auth.jwt-guard";
 import { Request } from "express";
+import { AuthGuard } from "@nestjs/passport";
 
 @Controller("auth")
 export class AuthController {
   constructor(private authService: AuthService) {}
 
+  @Get("/naver/callback")
+  @UseGuards(AuthGuard("naver"))
+  @HttpCode(201)
+  async naverSignIn(
+    @GetUser() user: User,
+    @Req() request: Request,
+  ): Promise<AccessTokenDto> {
+    return await this.authService.naverSignIn(user, request);
+  }
+
   @Post("/signup")
   @HttpCode(204)
   async signUp(@Body() createUserDto: CreateUserDto): Promise<void> {

BE/src/auth/auth.module.ts

@@ -4,12 +4,13 @@ import { AuthController } from "./auth.controller";
 import { AuthService } from "./auth.service";
 import { JwtModule } from "@nestjs/jwt";
 import { PassportModule } from "@nestjs/passport";
-import { JwtStrategy } from "./jwt.strategy";
+import { JwtStrategy } from "./strategies/jwt.strategy";
 import { PrivateDiaryGuard } from "./guard/auth.diary-guard";
 import { TypeOrmModule } from "@nestjs/typeorm";
 import { User } from "./users.entity";
 import { UsersRepository } from "./users.repository";
 import { DiariesRepository } from "src/diaries/diaries.repository";
+import { NaverOAuthStrategy } from "./strategies/naver.strategy";
 
 @Module({
   imports: [
@@ -29,6 +30,7 @@ import { DiariesRepository } from "src/diaries/diaries.repository";
     UsersRepository,
     PrivateDiaryGuard,
     DiariesRepository,
+    NaverOAuthStrategy,
   ],
   exports: [PassportModule, UsersRepository],
 })

BE/src/auth/auth.service.ts

@@ -9,7 +9,7 @@ import { User } from "./users.entity";
 import { Redis } from "ioredis";
 import { InjectRedis } from "@liaoliaots/nestjs-redis";
 import { Request } from "express";
-import * as jwt from "jsonwebtoken";
+import { providerEnum } from "src/utils/enum";
 
 @Injectable()
 export class AuthService {
@@ -87,4 +87,33 @@ export class AuthService {
 
     return new AccessTokenDto(accessToken);
   }
+
+  async naverSignIn(user: User, request: Request): Promise<AccessTokenDto> {
+    if (
+      !(await User.findOne({
+        where: { userId: user.userId, provider: providerEnum.NAVER },
+      }))
+    ) {
+      await user.save();
+    }
+    const userId = user.userId;
+
+    const accessTokenPayload = { userId };
+    const accessToken = await this.jwtService.sign(accessTokenPayload, {
+      expiresIn: "1h",
+    });
+
+    const refreshTokenPayload = {
+      requestIp: request.ip,
+      accessToken: accessToken,
+    };
+    const refreshToken = await this.jwtService.sign(refreshTokenPayload, {
+      expiresIn: "24h",
+    });
+
+    // 86000s = 24h
+    await this.redisClient.set(userId, refreshToken, "EX", 86400);
+
+    return new AccessTokenDto(accessToken);
+  }
 }

BE/src/auth/strategies/naver.strategy.ts

@@ -0,0 +1,39 @@
+import { Injectable, BadRequestException } from "@nestjs/common";
+import { PassportStrategy } from "@nestjs/passport";
+import { Profile, Strategy } from "passport-naver-v2";
+import { User } from "../users.entity";
+import { providerEnum } from "src/utils/enum";
+
+@Injectable()
+export class NaverOAuthStrategy extends PassportStrategy(Strategy, "naver") {
+  constructor() {
+    super({
+      clientID: process.env.NAVER_CLIENT_ID,
+      clientSecret: process.env.NAVER_CLIENT_PASS,
+      callbackURL: `${process.env.BACKEND_URL}/auth/naver/callback`,
+    });
+  }
+
+  async validate(
+    accessToken: string,
+    refreshToken: string,
+    profile: Profile,
+  ): Promise<User> {
+    try {
+      const { email, id, nickname } = profile;
+      const user = new User();
+
+      user.email = email;
+      user.userId = id + "*naver";
+      user.nickname = nickname;
+      user.password = "naver";
+      user.provider = providerEnum.NAVER;
+
+      return user;
+    } catch (error) {
+      throw new BadRequestException(
+        `네이버 로그인 중 오류가 발생했습니다 : ${error.message}`,
+      );
+    }
+  }
+}

BE/src/auth/users.entity.ts

@@ -9,18 +9,17 @@ import {
   OneToMany,
   Unique,
 } from "typeorm";
-import { premiumStatus } from "src/utils/enum";
+import { premiumStatus, providerEnum } from "src/utils/enum";
 import { Diary } from "../diaries/diaries.entity";
 import { Shape } from "src/shapes/shapes.entity";
 
 @Entity()
 @Unique(["userId"])
-@Unique(["email"])
 export class User extends BaseEntity {
   @PrimaryGeneratedColumn()
   id: number;
 
-  @Column({ length: 20 })
+  @Column({ length: 60 })
   userId: string;
 
   @Column()
@@ -47,6 +46,9 @@ export class User extends BaseEntity {
   @DeleteDateColumn({ type: "datetime" })
   deletedDate: Date;
 
+  @Column({ type: "enum", enum: providerEnum, default: providerEnum.BYEOLSOOP })
+  provider: providerEnum;
+
   @OneToMany(() => Diary, (diary) => diary.user)
   diaries: Diary[];
 

BE/src/diaries/diaries.module.ts

@@ -10,10 +10,11 @@ import { ShapesModule } from "src/shapes/shapes.module";
 import { ShapesRepository } from "src/shapes/shapes.repository";
 import { TagsRepository } from "src/tags/tags.repository";
 import { HttpModule } from "@nestjs/axios";
+import { Line } from "src/lines/lines.entity";
 
 @Module({
   imports: [
-    TypeOrmModule.forFeature([Diary]),
+    TypeOrmModule.forFeature([Diary, Line]),
     AuthModule,
     TagsModule,
     ShapesModule,

BE/src/diaries/diaries.repository.ts

@@ -1,4 +1,5 @@
 import { User } from "src/auth/users.entity";
+import { Line } from "src/lines/lines.entity";
 import {
   CreateDiaryDto,
   DeleteDiaryDto,
@@ -98,7 +99,15 @@ export class DiariesRepository {
 
   async deleteDiary(deleteDiaryDto: DeleteDiaryDto): Promise<void> {
     const { uuid } = deleteDiaryDto;
-    const diary = await this.getDiaryByUuid(uuid);
+    const diary: Diary = await this.getDiaryByUuid(uuid);
+
+    const lines = await Line.find({
+      where: [
+        { firstDiary: { id: diary.id } },
+        { secondDiary: { id: diary.id } },
+      ],
+    });
+    await Line.softRemove(lines);
 
     await Diary.softRemove(diary);
   }

BE/src/diaries/diaries.service.ts

@@ -28,11 +28,11 @@ export class DiariesService {
 
   async writeDiary(createDiaryDto: CreateDiaryDto, user: User): Promise<Diary> {
     const { content, shapeUuid, tags } = createDiaryDto;
+    const trimContent = content.trim();
     const shape = await this.shapesRepository.getShapeByUuid(shapeUuid);
-    const encryptedContent = await this.getEncryptedContent(content);
+    const encryptedContent = await this.getEncryptedContent(trimContent);
     const tagEntities = await this.getTags(tags);
-    const sentimentResult: SentimentDto = await this.getSentiment(content);
-
+    const sentimentResult: SentimentDto = await this.getSentiment(trimContent);
     const diary = await this.diariesRepository.createDiary(
       createDiaryDto,
       encryptedContent,
@@ -76,10 +76,11 @@ export class DiariesService {
     user: User,
   ): Promise<Diary> {
     const { content, shapeUuid, tags } = updateDiaryDto;
+    const trimContent = content.trim();
     const shape = await this.shapesRepository.getShapeByUuid(shapeUuid);
-    const encryptedContent = await this.getEncryptedContent(content);
+    const encryptedContent = await this.getEncryptedContent(trimContent);
     const tagEntities = await this.getTags(tags);
-    const sentimentResult = await this.getSentiment(content);
+    const sentimentResult = await this.getSentiment(trimContent);
 
     return this.diariesRepository.updateDiary(
       updateDiaryDto,

BE/src/stat/dto/stat.shapes.dto.ts

@@ -0,0 +1,8 @@
+export class ShapeInfoDto {
+  uuid: number;
+  count: number;
+}
+
+export class StatShapeDto {
+  [key: string]: ({ rank: number } & ShapeInfoDto) | {};
+}

BE/src/stat/dto/stat.tags.dto.ts

@@ -1,9 +1,20 @@
+import { sentimentStatus } from "src/utils/enum";
+
 export class TagInfoDto {
   id: number;
   count: number;
   tag: string;
 }
 
+export class DiariesInfoDto {
+  sentiment: sentimentStatus;
+  date: Date;
+}
+
 export class StatTagDto {
   [key: string]: ({ rank: number } & TagInfoDto) | {};
 }
+
+export class DiariesDateDto {
+  [dateString: string]: { sentiment: sentimentStatus; count: Number };
+}

BE/src/stat/stat.controller.ts

@@ -9,7 +9,8 @@ import { GetUser } from "src/auth/get-user.decorator";
 import { JwtAuthGuard } from "src/auth/guard/auth.jwt-guard";
 import { User } from "src/auth/users.entity";
 import { StatService } from "./stat.service";
-import { StatTagDto } from "./dto/stat.tags.dto";
+import { DiariesDateDto, StatTagDto } from "./dto/stat.tags.dto";
+import { StatShapeDto } from "./dto/stat.shapes.dto";
 
 @Controller("stat")
 @UseGuards(JwtAuthGuard)
@@ -23,4 +24,20 @@ export class StatController {
   ): Promise<StatTagDto> {
     return this.statService.getTopThreeTagsByUser(year, user.id);
   }
+
+  @Get("/diaries/:year")
+  async getDiariesDate(
+    @Param("year", ParseIntPipe) year: number,
+    @GetUser() user: User,
+  ): Promise<DiariesDateDto> {
+    return this.statService.getDiariesDateByUser(year, user.id);
+  }
+
+  @Get("/shapes-rank/:year")
+  async getShapesRank(
+    @Param("year", ParseIntPipe) year: number,
+    @GetUser() user: User,
+  ): Promise<StatShapeDto> {
+    return this.statService.getTopThreeShapesByUser(year, user.id);
+  }
 }