Merge branch 'main' into feat/71-diary-create-api

BE/package.json

@@ -8,16 +8,16 @@
   "scripts": {
     "build": "nest build",
     "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
-    "start": "nest start",
-    "start:dev": "nest start --watch",
+    "start": "cross-env NODE_ENV=production nest start",
+    "start:dev": "cross-env NODE_ENV=dev nest start --watch",
     "start:debug": "nest start --debug --watch",
     "start:prod": "node dist/main",
     "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
-    "test": "jest",
+    "test": "cross-env NODE_ENV=test jest",
     "test:watch": "jest --watch",
     "test:cov": "jest --coverage",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
-    "test:e2e": "jest --config ./test/jest-e2e.json"
+    "test:e2e": "cross-env NODE_ENV=test jest --config ./test/jest-e2e.json"
   },
   "dependencies": {
     "@nestjs/common": "^10.0.0",
@@ -29,9 +29,9 @@
     "@nestjs/typeorm": "^10.0.0",
     "@types/dotenv": "^8.2.0",
     "@types/passport-jwt": "^3.0.13",
+    "aws-sdk": "^2.1499.0",
     "bcryptjs": "^2.4.3",
     "class-transformer": "^0.5.1",
-    "aws-sdk": "^2.1499.0",
     "class-validator": "^0.14.0",
     "dotenv": "^16.3.1",
     "mysql2": "^3.6.3",
@@ -51,6 +51,7 @@
     "@types/supertest": "^2.0.12",
     "@typescript-eslint/eslint-plugin": "^6.0.0",
     "@typescript-eslint/parser": "^6.0.0",
+    "cross-env": "^7.0.3",
     "eslint": "^8.42.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-prettier": "^5.0.0",

BE/src/app.module.ts

@@ -1,18 +1,45 @@
+import "dotenv/config";
 import { Module } from "@nestjs/common";
 import { TypeOrmModule } from "@nestjs/typeorm";
 import { typeORMConfig } from "./configs/typeorm.config";
 import { UsersModule } from "./users/users.module";
 import { DiariesModule } from "./diaries/diaries.module";
 import { AuthModule } from "./auth/auth.module";
 import { IntroduceModule } from "./introduce/introduce.module";
+import { ShapesModule } from "./shapes/shapes.module";
+import { ShapesRepository } from "./shapes/shapes.repository";
+import { UsersRepository } from "./users/users.repository";
+import { typeORMTestConfig } from "./configs/typeorm.test.config";
 
 @Module({
   imports: [
-    TypeOrmModule.forRoot(typeORMConfig),
+    TypeOrmModule.forRoot(
+      process.env.NODE_ENV === "test" ? typeORMTestConfig : typeORMConfig,
+    ),
     UsersModule,
     DiariesModule,
     AuthModule,
     IntroduceModule,
+    ShapesModule,
   ],
+  providers: [ShapesRepository, UsersRepository],
 })
-export class AppModule {}
+export class AppModule {
+  constructor(
+    private shapesRepository: ShapesRepository,
+    private usersRepository: UsersRepository,
+  ) {}
+
+  async onModuleInit() {
+    const commonUser =
+      (await this.usersRepository.getUserByUserId("commonUser")) ||
+      (await this.usersRepository.createUser({
+        userId: "commonUser",
+        password: process.env.COMMON_USER_PASS,
+        nickname: "commonUser",
+        email: "[email protected]",
+      }));
+
+    await this.shapesRepository.createDefaultShapes(commonUser);
+  }
+}

BE/src/auth/get-user.decorator.ts

@@ -0,0 +1,9 @@
+import { createParamDecorator, ExecutionContext } from "@nestjs/common";
+import { User } from "src/users/users.entity";
+
+export const GetUser = createParamDecorator(
+  (_: unknown, ctx: ExecutionContext): User => {
+    const req = ctx.switchToHttp().getRequest();
+    return req.user;
+  },
+);

BE/src/configs/typeorm.config.ts

@@ -9,18 +9,6 @@ export const typeORMConfig: TypeOrmModuleOptions = {
   password: process.env.DB_PASS,
   database: process.env.DB_NAME,
   entities: ["dist/**/*.entity{.ts,.js}"],
-  synchronize: true,
-  timezone: "+09:00",
-};
-
-export const typeORMTestConfig: TypeOrmModuleOptions = {
-  type: "mysql",
-  host: process.env.DB_HOST,
-  port: 3306,
-  username: process.env.DB_USER,
-  password: process.env.DB_PASS,
-  database: process.env.DB_NAME,
-  entities: ["src/**/*.entity{.ts,.js}"],
-  synchronize: true,
+  synchronize: false,
   timezone: "+09:00",
 };

BE/src/configs/typeorm.test.config.ts

@@ -0,0 +1,14 @@
+import "dotenv/config";
+import { TypeOrmModuleOptions } from "@nestjs/typeorm";
+
+export const typeORMTestConfig: TypeOrmModuleOptions = {
+  type: "mysql",
+  host: process.env.DB_HOST,
+  port: 3306,
+  username: process.env.DB_USER,
+  password: process.env.DB_PASS,
+  database: process.env.TEST_DB_NAME,
+  entities: ["src/**/*.entity{.ts,.js}"],
+  synchronize: true,
+  timezone: "+09:00",
+};

BE/src/diaries/diaries.dto.ts

@@ -8,7 +8,7 @@ export class CreateDiaryDto {
   content: string;
 
   @IsString()
-  @Matches(RegExp("^-?d+(.d+)?,-?d+(.d+)?,-?d+(.d+)?$"), {
+  @Matches(RegExp(/^-?d+(.d+)?,-?d+(.d+)?,-?d+(.d+)?$/), {
     message: "적절하지 않은 포인트 양식입니다",
   })
   point: string;
@@ -18,6 +18,9 @@ export class CreateDiaryDto {
 
   @IsArray()
   tags: string[];
+
+  @IsUUID()
+  shapeUuid: string;
 }
 
 export class ReadDiaryDto {
@@ -35,10 +38,19 @@ export class UpdateDiaryDto {
   @IsString()
   content: string;
 
+  @IsString()
+  @Matches(RegExp("^-?d+(.d+)?,-?d+(.d+)?,-?d+(.d+)?$"), {
+    message: "적절하지 않은 포인트 양식입니다",
+  })
+  point: string;
+
   @IsDate()
   date: Date;
 
-  @IsString()
+  @IsArray()
+  tags: string[];
+
+  @IsUUID()
   shapeUuid: string;
 }
 

BE/src/diaries/diaries.entity.ts

@@ -44,9 +44,6 @@ export class Diary extends BaseEntity {
   @Column({ type: "text" })
   content: string;
 
-  @Column({ length: 7 })
-  color: string;
-
   @Column({ type: "float" })
   positiveRatio: number;
 

BE/src/diaries/diaries.repository.ts

@@ -21,7 +21,6 @@ export class DiariesRepository {
     const content = encodedContent;
 
     // 미구현 기능을 대체하기 위한 임시 값
-    const color = "#FFFFFF";
     const positiveRatio = 0.0;
     const negativeRatio = 100.0;
     const neutralRatio = 0.0;
@@ -34,7 +33,6 @@ export class DiariesRepository {
       content,
       point,
       date,
-      color,
       positiveRatio,
       negativeRatio,
       neutralRatio,

BE/src/main.ts

@@ -3,6 +3,7 @@ import { AppModule } from "./app.module";
 
 async function bootstrap() {
   const app = await NestFactory.create(AppModule);
+  app.enableCors();
   await app.listen(process.env.BE_PORT);
 }
 bootstrap();

BE/src/shapes/shapes.controller.ts

@@ -0,0 +1,25 @@
+import { Controller, Get, Param, UseGuards } from "@nestjs/common";
+import { ShapesService } from "./shapes.service";
+import { AuthGuard } from "@nestjs/passport";
+import { Shape } from "./shapes.entity";
+import { GetUser } from "src/auth/get-user.decorator";
+import { User } from "src/users/users.entity";
+
+@Controller("shapes")
+export class ShapesController {
+  constructor(private shapesService: ShapesService) {}
+
+  @Get("/default")
+  async getDefaultShapeFiles(): Promise<Shape[]> {
+    return this.shapesService.getDefaultShapeFiles();
+  }
+
+  @Get("/:uuid")
+  @UseGuards(AuthGuard())
+  async getShapeFilesByUuid(
+    @Param("uuid") uuid: string,
+    @GetUser() user: User,
+  ): Promise<object> {
+    return this.shapesService.getShapeFileByUuid(uuid, user);
+  }
+}

BE/src/shapes/shapes.default.ts

@@ -0,0 +1,7 @@
+import { Shape } from "./shapes.entity";
+
+export const defaultShapes: Partial<Shape>[] = [
+  { shapePath: "test-basic-shape-1.png" },
+  { shapePath: "test-basic-shape-2.png" },
+  { shapePath: "test-basic-shape-3.png" },
+];

BE/src/shapes/shapes.module.ts

@@ -0,0 +1,15 @@
+import { Module } from "@nestjs/common";
+import { TypeOrmModule } from "@nestjs/typeorm";
+import { UsersModule } from "src/users/users.module";
+import { Shape } from "./shapes.entity";
+import { ShapesController } from "./shapes.controller";
+import { ShapesService } from "./shapes.service";
+import { ShapesRepository } from "./shapes.repository";
+import { AuthModule } from "src/auth/auth.module";
+
+@Module({
+  imports: [TypeOrmModule.forFeature([Shape]), UsersModule, AuthModule],
+  controllers: [ShapesController],
+  providers: [ShapesService, ShapesRepository],
+})
+export class ShapesModule {}

BE/src/shapes/shapes.repository.ts

@@ -0,0 +1,34 @@
+import { defaultShapes } from "./shapes.default";
+import { User } from "src/users/users.entity";
+import { Shape } from "./shapes.entity";
+import { NotFoundException } from "@nestjs/common";
+
+export class ShapesRepository {
+  async createDefaultShapes(commonUser: User) {
+    await Promise.all(
+      defaultShapes.map(async (defaultShape) => {
+        const existingShape = await this.getShapeByShapePath(
+          defaultShape.shapePath,
+        );
+
+        if (existingShape) return;
+
+        defaultShape.user = commonUser;
+        const shape = Shape.create(defaultShape);
+        await shape.save();
+      }),
+    );
+  }
+
+  async getShapeByShapePath(shapePath: string): Promise<Shape | null> {
+    return Shape.findOne({ where: { shapePath } });
+  }
+
+  async getShapeByUuid(uuid: string): Promise<Shape> {
+    const found = await Shape.findOne({ where: { uuid } });
+    if (!found) {
+      throw new NotFoundException(`Can't find Shape with uuid: [${uuid}]`);
+    }
+    return found;
+  }
+}

BE/src/shapes/shapes.service.ts

@@ -0,0 +1,30 @@
+import { Injectable, UnauthorizedException } from "@nestjs/common";
+import { ShapesRepository } from "./shapes.repository";
+import { getFileFromS3 } from "src/utils/e3";
+import { defaultShapes } from "./shapes.default";
+import { Shape } from "./shapes.entity";
+import { User } from "src/users/users.entity";
+
+@Injectable()
+export class ShapesService {
+  constructor(private shapesRepository: ShapesRepository) {}
+
+  async getDefaultShapeFiles(): Promise<Shape[]> {
+    const promises = defaultShapes.map(async (defaultShape) => {
+      return this.shapesRepository.getShapeByShapePath(defaultShape.shapePath);
+    });
+
+    const shapeFiles = await Promise.all(promises);
+    return shapeFiles;
+  }
+
+  async getShapeFileByUuid(uuid: string, user: User): Promise<object> {
+    const shape = await this.shapesRepository.getShapeByUuid(uuid);
+    const { userId, id } = await shape.user;
+
+    if (userId !== "commonUser" && id !== user.id) {
+      throw new UnauthorizedException();
+    }
+    return getFileFromS3(shape.shapePath);
+  }
+}