From 8a9701d0979f5d34093eac28e4d111f57c861b77 Mon Sep 17 00:00:00 2001 From: siwonpada Date: Thu, 2 Jan 2025 23:07:48 +0900 Subject: [PATCH 01/10] add app --- apps/crawler/src/crawler.controller.spec.ts | 22 +++ apps/crawler/src/crawler.controller.ts | 12 ++ apps/crawler/src/crawler.module.ts | 10 + apps/crawler/src/crawler.service.ts | 8 + apps/crawler/src/main.ts | 8 + apps/crawler/test/app.e2e-spec.ts | 24 +++ apps/crawler/test/jest-e2e.json | 9 + apps/crawler/tsconfig.app.json | 9 + .../ziggle-be/src}/ai/ai.controller.ts | 0 {src => apps/ziggle-be/src}/ai/ai.module.ts | 0 {src => apps/ziggle-be/src}/ai/ai.service.ts | 0 .../src}/ai/dto/req/translate.dto.ts | 0 .../src}/ai/dto/res/translateRes.dto.ts | 0 .../src}/ai/types/deadlineResponse.type.ts | 0 {src => apps/ziggle-be/src}/app.controller.ts | 0 {src => apps/ziggle-be/src}/app.module.ts | 0 .../ziggle-be/src}/crawl/crawl.controller.ts | 0 .../ziggle-be/src}/crawl/crawl.module.ts | 0 .../ziggle-be/src}/crawl/crawl.repository.ts | 0 .../ziggle-be/src}/crawl/crawl.service.ts | 0 .../src}/crawl/dto/req/createCrawl.dto.ts | 0 .../src}/crawl/dto/req/getCrawl.dto.ts | 0 .../src}/document/document.controller.ts | 0 .../src}/document/document.module.ts | 0 .../src}/document/document.service.ts | 0 .../ziggle-be/src}/fcm/fcm.consumer.ts | 0 {src => apps/ziggle-be/src}/fcm/fcm.module.ts | 0 .../ziggle-be/src}/fcm/fcm.repository.ts | 0 .../ziggle-be/src}/fcm/fcm.service.ts | 0 .../ziggle-be/src}/fcm/types/content.type.ts | 0 .../src}/fcm/types/fcmTargetUser.type.ts | 0 .../ziggle-be/src}/fcm/types/queue.type.ts | 0 .../ziggle-be/src}/file/file.module.ts | 0 .../ziggle-be/src}/file/file.service.ts | 0 .../src}/group/dto/req/getGroup.dto.ts | 0 .../src}/group/dto/res/GroupsRes.dto.ts | 0 .../src}/group/dto/res/GroupsTokenRes.dto.ts | 0 .../ziggle-be/src}/group/group.controller.ts | 0 .../ziggle-be/src}/group/group.module.ts | 0 .../ziggle-be/src}/group/group.service.ts | 0 .../src}/group/types/groupInfo.type.ts | 0 .../src}/group/types/groupsToken.type.ts | 0 .../src}/health/health.controller.ts | 0 .../ziggle-be/src}/health/health.module.ts | 0 .../src}/health/indicator/redis.indicator.ts | 0 .../ziggle-be/src}/image/image.controller.ts | 0 .../ziggle-be/src}/image/image.module.ts | 0 .../ziggle-be/src}/image/image.service.ts | 0 {src => apps/ziggle-be/src}/main.ts | 0 .../notice/dto/req/additionalNotice.dto.ts | 100 +++++----- .../src}/notice/dto/req/createNotice.dto.ts | 178 ++++++++--------- .../src}/notice/dto/req/foreignContent.dto.ts | 84 ++++---- .../src}/notice/dto/req/getAllNotice.dto.ts | 180 +++++++++--------- .../src}/notice/dto/req/getGroupNotice.dto.ts | 0 .../src}/notice/dto/req/getNotice.dto.ts | 48 ++--- .../src}/notice/dto/req/reaction.dto.ts | 24 +-- .../src}/notice/dto/req/updateNotice.dto.ts | 102 +++++----- .../dto/res/expandedGeneralNotice.dto.ts | 0 .../src}/notice/dto/res/generalNotice.dto.ts | 0 .../src}/notice/notice.controller.ts | 0 .../ziggle-be/src}/notice/notice.mapper.ts | 0 .../ziggle-be/src}/notice/notice.module.ts | 0 .../src}/notice/notice.repository.ts | 0 .../ziggle-be/src}/notice/notice.service.ts | 0 .../src}/notice/types/noticeFullContent.ts | 0 .../src}/tag/dto/req/createTag.dto.ts | 0 .../ziggle-be/src}/tag/dto/req/getTag.dto.ts | 0 .../ziggle-be/src}/tag/dto/res/TagRes.dto.ts | 0 .../ziggle-be/src}/tag/tag.controller.ts | 0 {src => apps/ziggle-be/src}/tag/tag.module.ts | 0 .../ziggle-be/src}/tag/tag.repository.ts | 0 .../ziggle-be/src}/tag/tag.service.ts | 0 .../user/decorator/get-idp-user.decorator.ts | 18 +- .../user/decorator/get-token.decorator.ts | 0 .../src}/user/decorator/get-user.decorator.ts | 16 +- .../ziggle-be/src}/user/dto/req/login.dto.ts | 0 .../ziggle-be/src}/user/dto/req/logout.dto.ts | 0 .../src}/user/dto/req/setFcmTokenReq.dto.ts | 0 .../src}/user/dto/res/jwtToken.dto.ts | 0 .../src}/user/dto/res/setFcmTokenRes.dto.ts | 0 .../src}/user/dto/res/userInfoRes.dto.ts | 0 .../src}/user/guard/anonymous.strategy.ts | 0 .../ziggle-be/src}/user/guard/idp.guard.ts | 0 .../ziggle-be/src}/user/guard/idp.strategy.ts | 0 .../src}/user/guard/idpOptional.strategy.ts | 0 .../src}/user/types/jwtToken.type.ts | 0 .../ziggle-be/src}/user/types/login.type.ts | 0 .../ziggle-be/src}/user/user.controller.ts | 0 .../ziggle-be/src}/user/user.module.ts | 0 .../ziggle-be/src}/user/user.repository.ts | 0 .../ziggle-be/src}/user/user.service.ts | 0 {test => apps/ziggle-be/test}/app.e2e-spec.ts | 0 .../crawl.controller.integration.spec.ts | 0 .../test}/crawl/crawl.controller.spec.ts | 0 .../test}/crawl/crawl.repository.spec.ts | 0 .../test}/crawl/crawl.service.spec.ts | 0 {test => apps/ziggle-be/test}/jest-e2e.json | 0 apps/ziggle-be/tsconfig.app.json | 9 + nest-cli.json | 27 ++- package.json | 12 +- 100 files changed, 516 insertions(+), 384 deletions(-) create mode 100644 apps/crawler/src/crawler.controller.spec.ts create mode 100644 apps/crawler/src/crawler.controller.ts create mode 100644 apps/crawler/src/crawler.module.ts create mode 100644 apps/crawler/src/crawler.service.ts create mode 100644 apps/crawler/src/main.ts create mode 100644 apps/crawler/test/app.e2e-spec.ts create mode 100644 apps/crawler/test/jest-e2e.json create mode 100644 apps/crawler/tsconfig.app.json rename {src => apps/ziggle-be/src}/ai/ai.controller.ts (100%) rename {src => apps/ziggle-be/src}/ai/ai.module.ts (100%) rename {src => apps/ziggle-be/src}/ai/ai.service.ts (100%) rename {src => apps/ziggle-be/src}/ai/dto/req/translate.dto.ts (100%) rename {src => apps/ziggle-be/src}/ai/dto/res/translateRes.dto.ts (100%) rename {src => apps/ziggle-be/src}/ai/types/deadlineResponse.type.ts (100%) rename {src => apps/ziggle-be/src}/app.controller.ts (100%) rename {src => apps/ziggle-be/src}/app.module.ts (100%) rename {src => apps/ziggle-be/src}/crawl/crawl.controller.ts (100%) rename {src => apps/ziggle-be/src}/crawl/crawl.module.ts (100%) rename {src => apps/ziggle-be/src}/crawl/crawl.repository.ts (100%) rename {src => apps/ziggle-be/src}/crawl/crawl.service.ts (100%) rename {src => apps/ziggle-be/src}/crawl/dto/req/createCrawl.dto.ts (100%) rename {src => apps/ziggle-be/src}/crawl/dto/req/getCrawl.dto.ts (100%) rename {src => apps/ziggle-be/src}/document/document.controller.ts (100%) rename {src => apps/ziggle-be/src}/document/document.module.ts (100%) rename {src => apps/ziggle-be/src}/document/document.service.ts (100%) rename {src => apps/ziggle-be/src}/fcm/fcm.consumer.ts (100%) rename {src => apps/ziggle-be/src}/fcm/fcm.module.ts (100%) rename {src => apps/ziggle-be/src}/fcm/fcm.repository.ts (100%) rename {src => apps/ziggle-be/src}/fcm/fcm.service.ts (100%) rename {src => apps/ziggle-be/src}/fcm/types/content.type.ts (100%) rename {src => apps/ziggle-be/src}/fcm/types/fcmTargetUser.type.ts (100%) rename {src => apps/ziggle-be/src}/fcm/types/queue.type.ts (100%) rename {src => apps/ziggle-be/src}/file/file.module.ts (100%) rename {src => apps/ziggle-be/src}/file/file.service.ts (100%) rename {src => apps/ziggle-be/src}/group/dto/req/getGroup.dto.ts (100%) rename {src => apps/ziggle-be/src}/group/dto/res/GroupsRes.dto.ts (100%) rename {src => apps/ziggle-be/src}/group/dto/res/GroupsTokenRes.dto.ts (100%) rename {src => apps/ziggle-be/src}/group/group.controller.ts (100%) rename {src => apps/ziggle-be/src}/group/group.module.ts (100%) rename {src => apps/ziggle-be/src}/group/group.service.ts (100%) rename {src => apps/ziggle-be/src}/group/types/groupInfo.type.ts (100%) rename {src => apps/ziggle-be/src}/group/types/groupsToken.type.ts (100%) rename {src => apps/ziggle-be/src}/health/health.controller.ts (100%) rename {src => apps/ziggle-be/src}/health/health.module.ts (100%) rename {src => apps/ziggle-be/src}/health/indicator/redis.indicator.ts (100%) rename {src => apps/ziggle-be/src}/image/image.controller.ts (100%) rename {src => apps/ziggle-be/src}/image/image.module.ts (100%) rename {src => apps/ziggle-be/src}/image/image.service.ts (100%) rename {src => apps/ziggle-be/src}/main.ts (100%) rename {src => apps/ziggle-be/src}/notice/dto/req/additionalNotice.dto.ts (95%) rename {src => apps/ziggle-be/src}/notice/dto/req/createNotice.dto.ts (95%) rename {src => apps/ziggle-be/src}/notice/dto/req/foreignContent.dto.ts (95%) rename {src => apps/ziggle-be/src}/notice/dto/req/getAllNotice.dto.ts (95%) rename {src => apps/ziggle-be/src}/notice/dto/req/getGroupNotice.dto.ts (100%) rename {src => apps/ziggle-be/src}/notice/dto/req/getNotice.dto.ts (95%) rename {src => apps/ziggle-be/src}/notice/dto/req/reaction.dto.ts (95%) rename {src => apps/ziggle-be/src}/notice/dto/req/updateNotice.dto.ts (94%) rename {src => apps/ziggle-be/src}/notice/dto/res/expandedGeneralNotice.dto.ts (100%) rename {src => apps/ziggle-be/src}/notice/dto/res/generalNotice.dto.ts (100%) rename {src => apps/ziggle-be/src}/notice/notice.controller.ts (100%) rename {src => apps/ziggle-be/src}/notice/notice.mapper.ts (100%) rename {src => apps/ziggle-be/src}/notice/notice.module.ts (100%) rename {src => apps/ziggle-be/src}/notice/notice.repository.ts (100%) rename {src => apps/ziggle-be/src}/notice/notice.service.ts (100%) rename {src => apps/ziggle-be/src}/notice/types/noticeFullContent.ts (100%) rename {src => apps/ziggle-be/src}/tag/dto/req/createTag.dto.ts (100%) rename {src => apps/ziggle-be/src}/tag/dto/req/getTag.dto.ts (100%) rename {src => apps/ziggle-be/src}/tag/dto/res/TagRes.dto.ts (100%) rename {src => apps/ziggle-be/src}/tag/tag.controller.ts (100%) rename {src => apps/ziggle-be/src}/tag/tag.module.ts (100%) rename {src => apps/ziggle-be/src}/tag/tag.repository.ts (100%) rename {src => apps/ziggle-be/src}/tag/tag.service.ts (100%) rename {src => apps/ziggle-be/src}/user/decorator/get-idp-user.decorator.ts (97%) rename {src => apps/ziggle-be/src}/user/decorator/get-token.decorator.ts (100%) rename {src => apps/ziggle-be/src}/user/decorator/get-user.decorator.ts (97%) rename {src => apps/ziggle-be/src}/user/dto/req/login.dto.ts (100%) rename {src => apps/ziggle-be/src}/user/dto/req/logout.dto.ts (100%) rename {src => apps/ziggle-be/src}/user/dto/req/setFcmTokenReq.dto.ts (100%) rename {src => apps/ziggle-be/src}/user/dto/res/jwtToken.dto.ts (100%) rename {src => apps/ziggle-be/src}/user/dto/res/setFcmTokenRes.dto.ts (100%) rename {src => apps/ziggle-be/src}/user/dto/res/userInfoRes.dto.ts (100%) rename {src => apps/ziggle-be/src}/user/guard/anonymous.strategy.ts (100%) rename {src => apps/ziggle-be/src}/user/guard/idp.guard.ts (100%) rename {src => apps/ziggle-be/src}/user/guard/idp.strategy.ts (100%) rename {src => apps/ziggle-be/src}/user/guard/idpOptional.strategy.ts (100%) rename {src => apps/ziggle-be/src}/user/types/jwtToken.type.ts (100%) rename {src => apps/ziggle-be/src}/user/types/login.type.ts (100%) rename {src => apps/ziggle-be/src}/user/user.controller.ts (100%) rename {src => apps/ziggle-be/src}/user/user.module.ts (100%) rename {src => apps/ziggle-be/src}/user/user.repository.ts (100%) rename {src => apps/ziggle-be/src}/user/user.service.ts (100%) rename {test => apps/ziggle-be/test}/app.e2e-spec.ts (100%) rename {test => apps/ziggle-be/test}/crawl/crawl.controller.integration.spec.ts (100%) rename {test => apps/ziggle-be/test}/crawl/crawl.controller.spec.ts (100%) rename {test => apps/ziggle-be/test}/crawl/crawl.repository.spec.ts (100%) rename {test => apps/ziggle-be/test}/crawl/crawl.service.spec.ts (100%) rename {test => apps/ziggle-be/test}/jest-e2e.json (100%) create mode 100644 apps/ziggle-be/tsconfig.app.json diff --git a/apps/crawler/src/crawler.controller.spec.ts b/apps/crawler/src/crawler.controller.spec.ts new file mode 100644 index 0000000..bddad63 --- /dev/null +++ b/apps/crawler/src/crawler.controller.spec.ts @@ -0,0 +1,22 @@ +import { Test, TestingModule } from '@nestjs/testing'; +import { CrawlerController } from './crawler.controller'; +import { CrawlerService } from './crawler.service'; + +describe('CrawlerController', () => { + let crawlerController: CrawlerController; + + beforeEach(async () => { + const app: TestingModule = await Test.createTestingModule({ + controllers: [CrawlerController], + providers: [CrawlerService], + }).compile(); + + crawlerController = app.get(CrawlerController); + }); + + describe('root', () => { + it('should return "Hello World!"', () => { + expect(crawlerController.getHello()).toBe('Hello World!'); + }); + }); +}); diff --git a/apps/crawler/src/crawler.controller.ts b/apps/crawler/src/crawler.controller.ts new file mode 100644 index 0000000..30c233d --- /dev/null +++ b/apps/crawler/src/crawler.controller.ts @@ -0,0 +1,12 @@ +import { Controller, Get } from '@nestjs/common'; +import { CrawlerService } from './crawler.service'; + +@Controller() +export class CrawlerController { + constructor(private readonly crawlerService: CrawlerService) {} + + @Get() + getHello(): string { + return this.crawlerService.getHello(); + } +} diff --git a/apps/crawler/src/crawler.module.ts b/apps/crawler/src/crawler.module.ts new file mode 100644 index 0000000..c9420cb --- /dev/null +++ b/apps/crawler/src/crawler.module.ts @@ -0,0 +1,10 @@ +import { Module } from '@nestjs/common'; +import { CrawlerController } from './crawler.controller'; +import { CrawlerService } from './crawler.service'; + +@Module({ + imports: [], + controllers: [CrawlerController], + providers: [CrawlerService], +}) +export class CrawlerModule {} diff --git a/apps/crawler/src/crawler.service.ts b/apps/crawler/src/crawler.service.ts new file mode 100644 index 0000000..9526a20 --- /dev/null +++ b/apps/crawler/src/crawler.service.ts @@ -0,0 +1,8 @@ +import { Injectable } from '@nestjs/common'; + +@Injectable() +export class CrawlerService { + getHello(): string { + return 'Hello World!'; + } +} diff --git a/apps/crawler/src/main.ts b/apps/crawler/src/main.ts new file mode 100644 index 0000000..ede5eb8 --- /dev/null +++ b/apps/crawler/src/main.ts @@ -0,0 +1,8 @@ +import { NestFactory } from '@nestjs/core'; +import { CrawlerModule } from './crawler.module'; + +async function bootstrap() { + const app = await NestFactory.create(CrawlerModule); + await app.listen(3000); +} +bootstrap(); diff --git a/apps/crawler/test/app.e2e-spec.ts b/apps/crawler/test/app.e2e-spec.ts new file mode 100644 index 0000000..a1fe9c0 --- /dev/null +++ b/apps/crawler/test/app.e2e-spec.ts @@ -0,0 +1,24 @@ +import { Test, TestingModule } from '@nestjs/testing'; +import { INestApplication } from '@nestjs/common'; +import * as request from 'supertest'; +import { CrawlerModule } from './../src/crawler.module'; + +describe('CrawlerController (e2e)', () => { + let app: INestApplication; + + beforeEach(async () => { + const moduleFixture: TestingModule = await Test.createTestingModule({ + imports: [CrawlerModule], + }).compile(); + + app = moduleFixture.createNestApplication(); + await app.init(); + }); + + it('/ (GET)', () => { + return request(app.getHttpServer()) + .get('/') + .expect(200) + .expect('Hello World!'); + }); +}); diff --git a/apps/crawler/test/jest-e2e.json b/apps/crawler/test/jest-e2e.json new file mode 100644 index 0000000..e9d912f --- /dev/null +++ b/apps/crawler/test/jest-e2e.json @@ -0,0 +1,9 @@ +{ + "moduleFileExtensions": ["js", "json", "ts"], + "rootDir": ".", + "testEnvironment": "node", + "testRegex": ".e2e-spec.ts$", + "transform": { + "^.+\\.(t|j)s$": "ts-jest" + } +} diff --git a/apps/crawler/tsconfig.app.json b/apps/crawler/tsconfig.app.json new file mode 100644 index 0000000..f30039e --- /dev/null +++ b/apps/crawler/tsconfig.app.json @@ -0,0 +1,9 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "declaration": false, + "outDir": "../../dist/apps/crawler" + }, + "include": ["src/**/*"], + "exclude": ["node_modules", "dist", "test", "**/*spec.ts"] +} diff --git a/src/ai/ai.controller.ts b/apps/ziggle-be/src/ai/ai.controller.ts similarity index 100% rename from src/ai/ai.controller.ts rename to apps/ziggle-be/src/ai/ai.controller.ts diff --git a/src/ai/ai.module.ts b/apps/ziggle-be/src/ai/ai.module.ts similarity index 100% rename from src/ai/ai.module.ts rename to apps/ziggle-be/src/ai/ai.module.ts diff --git a/src/ai/ai.service.ts b/apps/ziggle-be/src/ai/ai.service.ts similarity index 100% rename from src/ai/ai.service.ts rename to apps/ziggle-be/src/ai/ai.service.ts diff --git a/src/ai/dto/req/translate.dto.ts b/apps/ziggle-be/src/ai/dto/req/translate.dto.ts similarity index 100% rename from src/ai/dto/req/translate.dto.ts rename to apps/ziggle-be/src/ai/dto/req/translate.dto.ts diff --git a/src/ai/dto/res/translateRes.dto.ts b/apps/ziggle-be/src/ai/dto/res/translateRes.dto.ts similarity index 100% rename from src/ai/dto/res/translateRes.dto.ts rename to apps/ziggle-be/src/ai/dto/res/translateRes.dto.ts diff --git a/src/ai/types/deadlineResponse.type.ts b/apps/ziggle-be/src/ai/types/deadlineResponse.type.ts similarity index 100% rename from src/ai/types/deadlineResponse.type.ts rename to apps/ziggle-be/src/ai/types/deadlineResponse.type.ts diff --git a/src/app.controller.ts b/apps/ziggle-be/src/app.controller.ts similarity index 100% rename from src/app.controller.ts rename to apps/ziggle-be/src/app.controller.ts diff --git a/src/app.module.ts b/apps/ziggle-be/src/app.module.ts similarity index 100% rename from src/app.module.ts rename to apps/ziggle-be/src/app.module.ts diff --git a/src/crawl/crawl.controller.ts b/apps/ziggle-be/src/crawl/crawl.controller.ts similarity index 100% rename from src/crawl/crawl.controller.ts rename to apps/ziggle-be/src/crawl/crawl.controller.ts diff --git a/src/crawl/crawl.module.ts b/apps/ziggle-be/src/crawl/crawl.module.ts similarity index 100% rename from src/crawl/crawl.module.ts rename to apps/ziggle-be/src/crawl/crawl.module.ts diff --git a/src/crawl/crawl.repository.ts b/apps/ziggle-be/src/crawl/crawl.repository.ts similarity index 100% rename from src/crawl/crawl.repository.ts rename to apps/ziggle-be/src/crawl/crawl.repository.ts diff --git a/src/crawl/crawl.service.ts b/apps/ziggle-be/src/crawl/crawl.service.ts similarity index 100% rename from src/crawl/crawl.service.ts rename to apps/ziggle-be/src/crawl/crawl.service.ts diff --git a/src/crawl/dto/req/createCrawl.dto.ts b/apps/ziggle-be/src/crawl/dto/req/createCrawl.dto.ts similarity index 100% rename from src/crawl/dto/req/createCrawl.dto.ts rename to apps/ziggle-be/src/crawl/dto/req/createCrawl.dto.ts diff --git a/src/crawl/dto/req/getCrawl.dto.ts b/apps/ziggle-be/src/crawl/dto/req/getCrawl.dto.ts similarity index 100% rename from src/crawl/dto/req/getCrawl.dto.ts rename to apps/ziggle-be/src/crawl/dto/req/getCrawl.dto.ts diff --git a/src/document/document.controller.ts b/apps/ziggle-be/src/document/document.controller.ts similarity index 100% rename from src/document/document.controller.ts rename to apps/ziggle-be/src/document/document.controller.ts diff --git a/src/document/document.module.ts b/apps/ziggle-be/src/document/document.module.ts similarity index 100% rename from src/document/document.module.ts rename to apps/ziggle-be/src/document/document.module.ts diff --git a/src/document/document.service.ts b/apps/ziggle-be/src/document/document.service.ts similarity index 100% rename from src/document/document.service.ts rename to apps/ziggle-be/src/document/document.service.ts diff --git a/src/fcm/fcm.consumer.ts b/apps/ziggle-be/src/fcm/fcm.consumer.ts similarity index 100% rename from src/fcm/fcm.consumer.ts rename to apps/ziggle-be/src/fcm/fcm.consumer.ts diff --git a/src/fcm/fcm.module.ts b/apps/ziggle-be/src/fcm/fcm.module.ts similarity index 100% rename from src/fcm/fcm.module.ts rename to apps/ziggle-be/src/fcm/fcm.module.ts diff --git a/src/fcm/fcm.repository.ts b/apps/ziggle-be/src/fcm/fcm.repository.ts similarity index 100% rename from src/fcm/fcm.repository.ts rename to apps/ziggle-be/src/fcm/fcm.repository.ts diff --git a/src/fcm/fcm.service.ts b/apps/ziggle-be/src/fcm/fcm.service.ts similarity index 100% rename from src/fcm/fcm.service.ts rename to apps/ziggle-be/src/fcm/fcm.service.ts diff --git a/src/fcm/types/content.type.ts b/apps/ziggle-be/src/fcm/types/content.type.ts similarity index 100% rename from src/fcm/types/content.type.ts rename to apps/ziggle-be/src/fcm/types/content.type.ts diff --git a/src/fcm/types/fcmTargetUser.type.ts b/apps/ziggle-be/src/fcm/types/fcmTargetUser.type.ts similarity index 100% rename from src/fcm/types/fcmTargetUser.type.ts rename to apps/ziggle-be/src/fcm/types/fcmTargetUser.type.ts diff --git a/src/fcm/types/queue.type.ts b/apps/ziggle-be/src/fcm/types/queue.type.ts similarity index 100% rename from src/fcm/types/queue.type.ts rename to apps/ziggle-be/src/fcm/types/queue.type.ts diff --git a/src/file/file.module.ts b/apps/ziggle-be/src/file/file.module.ts similarity index 100% rename from src/file/file.module.ts rename to apps/ziggle-be/src/file/file.module.ts diff --git a/src/file/file.service.ts b/apps/ziggle-be/src/file/file.service.ts similarity index 100% rename from src/file/file.service.ts rename to apps/ziggle-be/src/file/file.service.ts diff --git a/src/group/dto/req/getGroup.dto.ts b/apps/ziggle-be/src/group/dto/req/getGroup.dto.ts similarity index 100% rename from src/group/dto/req/getGroup.dto.ts rename to apps/ziggle-be/src/group/dto/req/getGroup.dto.ts diff --git a/src/group/dto/res/GroupsRes.dto.ts b/apps/ziggle-be/src/group/dto/res/GroupsRes.dto.ts similarity index 100% rename from src/group/dto/res/GroupsRes.dto.ts rename to apps/ziggle-be/src/group/dto/res/GroupsRes.dto.ts diff --git a/src/group/dto/res/GroupsTokenRes.dto.ts b/apps/ziggle-be/src/group/dto/res/GroupsTokenRes.dto.ts similarity index 100% rename from src/group/dto/res/GroupsTokenRes.dto.ts rename to apps/ziggle-be/src/group/dto/res/GroupsTokenRes.dto.ts diff --git a/src/group/group.controller.ts b/apps/ziggle-be/src/group/group.controller.ts similarity index 100% rename from src/group/group.controller.ts rename to apps/ziggle-be/src/group/group.controller.ts diff --git a/src/group/group.module.ts b/apps/ziggle-be/src/group/group.module.ts similarity index 100% rename from src/group/group.module.ts rename to apps/ziggle-be/src/group/group.module.ts diff --git a/src/group/group.service.ts b/apps/ziggle-be/src/group/group.service.ts similarity index 100% rename from src/group/group.service.ts rename to apps/ziggle-be/src/group/group.service.ts diff --git a/src/group/types/groupInfo.type.ts b/apps/ziggle-be/src/group/types/groupInfo.type.ts similarity index 100% rename from src/group/types/groupInfo.type.ts rename to apps/ziggle-be/src/group/types/groupInfo.type.ts diff --git a/src/group/types/groupsToken.type.ts b/apps/ziggle-be/src/group/types/groupsToken.type.ts similarity index 100% rename from src/group/types/groupsToken.type.ts rename to apps/ziggle-be/src/group/types/groupsToken.type.ts diff --git a/src/health/health.controller.ts b/apps/ziggle-be/src/health/health.controller.ts similarity index 100% rename from src/health/health.controller.ts rename to apps/ziggle-be/src/health/health.controller.ts diff --git a/src/health/health.module.ts b/apps/ziggle-be/src/health/health.module.ts similarity index 100% rename from src/health/health.module.ts rename to apps/ziggle-be/src/health/health.module.ts diff --git a/src/health/indicator/redis.indicator.ts b/apps/ziggle-be/src/health/indicator/redis.indicator.ts similarity index 100% rename from src/health/indicator/redis.indicator.ts rename to apps/ziggle-be/src/health/indicator/redis.indicator.ts diff --git a/src/image/image.controller.ts b/apps/ziggle-be/src/image/image.controller.ts similarity index 100% rename from src/image/image.controller.ts rename to apps/ziggle-be/src/image/image.controller.ts diff --git a/src/image/image.module.ts b/apps/ziggle-be/src/image/image.module.ts similarity index 100% rename from src/image/image.module.ts rename to apps/ziggle-be/src/image/image.module.ts diff --git a/src/image/image.service.ts b/apps/ziggle-be/src/image/image.service.ts similarity index 100% rename from src/image/image.service.ts rename to apps/ziggle-be/src/image/image.service.ts diff --git a/src/main.ts b/apps/ziggle-be/src/main.ts similarity index 100% rename from src/main.ts rename to apps/ziggle-be/src/main.ts diff --git a/src/notice/dto/req/additionalNotice.dto.ts b/apps/ziggle-be/src/notice/dto/req/additionalNotice.dto.ts similarity index 95% rename from src/notice/dto/req/additionalNotice.dto.ts rename to apps/ziggle-be/src/notice/dto/req/additionalNotice.dto.ts index a7c3ba6..efed59d 100644 --- a/src/notice/dto/req/additionalNotice.dto.ts +++ b/apps/ziggle-be/src/notice/dto/req/additionalNotice.dto.ts @@ -1,50 +1,50 @@ -import { ApiProperty } from '@nestjs/swagger'; -import { Type } from 'class-transformer'; -import { - IsDate, - IsEnum, - IsOptional, - IsString, - MaxLength, -} from 'class-validator'; - -export class AdditionalNoticeDto { - @ApiProperty({ - example: '제목', - description: '바뀐 제목 (현재 진짜로 바뀌지는 않음)', - required: false, - }) - @IsString() - @IsOptional() - @MaxLength(200) - title?: string; - - @ApiProperty({ - example: '추가 내용', - description: '추가된 내용', - required: true, - }) - @IsString() - @MaxLength(100000) - body: string; - - @ApiProperty({ - example: '2021-08-01T00:00:00.000Z', - description: '마감일, 가장 최근에 post한 것을 기준으로 설정됨', - required: false, - }) - @Type(() => Date) - @IsDate() - @IsOptional() - deadline?: Date; - - @ApiProperty({ - example: 'all', - description: '공지 알림을 받을 사람들', - required: false, - }) - @IsString() - @IsEnum(['all', 'reminder']) - @IsOptional() - to?: string; -} +import { ApiProperty } from '@nestjs/swagger'; +import { Type } from 'class-transformer'; +import { + IsDate, + IsEnum, + IsOptional, + IsString, + MaxLength, +} from 'class-validator'; + +export class AdditionalNoticeDto { + @ApiProperty({ + example: '제목', + description: '바뀐 제목 (현재 진짜로 바뀌지는 않음)', + required: false, + }) + @IsString() + @IsOptional() + @MaxLength(200) + title?: string; + + @ApiProperty({ + example: '추가 내용', + description: '추가된 내용', + required: true, + }) + @IsString() + @MaxLength(100000) + body: string; + + @ApiProperty({ + example: '2021-08-01T00:00:00.000Z', + description: '마감일, 가장 최근에 post한 것을 기준으로 설정됨', + required: false, + }) + @Type(() => Date) + @IsDate() + @IsOptional() + deadline?: Date; + + @ApiProperty({ + example: 'all', + description: '공지 알림을 받을 사람들', + required: false, + }) + @IsString() + @IsEnum(['all', 'reminder']) + @IsOptional() + to?: string; +} diff --git a/src/notice/dto/req/createNotice.dto.ts b/apps/ziggle-be/src/notice/dto/req/createNotice.dto.ts similarity index 95% rename from src/notice/dto/req/createNotice.dto.ts rename to apps/ziggle-be/src/notice/dto/req/createNotice.dto.ts index 145703d..54ab36e 100644 --- a/src/notice/dto/req/createNotice.dto.ts +++ b/apps/ziggle-be/src/notice/dto/req/createNotice.dto.ts @@ -1,89 +1,89 @@ -import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; -import { Category } from '@prisma/client'; -import { Type } from 'class-transformer'; -import { - IsDate, - IsEnum, - IsNotEmpty, - IsNumber, - IsOptional, - IsString, - MaxLength, -} from 'class-validator'; - -export class CreateNoticeDto { - @ApiProperty({ - example: '제목', - description: '공지 제목', - required: true, - }) - @IsString() - @IsNotEmpty() - @MaxLength(200) - title: string; - - @ApiProperty({ - example: '

내용<\\p>', - description: '공지 내용', - required: true, - }) - @IsString() - @IsNotEmpty() - @MaxLength(100000) - body: string; - - @ApiPropertyOptional({ - example: '2021-08-01T00:00:00.000Z', - description: '마감일', - required: false, - }) - @Type(() => Date) - @IsDate() - @IsOptional() - deadline?: Date; - - @ApiPropertyOptional({ - example: [1, 2], - description: '공지태그의 id', - required: false, - }) - @IsNumber({}, { each: true }) - @IsOptional() - tags: number[] = []; - - @ApiPropertyOptional({ - description: '공지 그룹의 id', - required: false, - enum: Category, - }) - @IsEnum(Category) - @IsOptional() - category?: Category; - - @ApiPropertyOptional({ - example: ['빼고', '테스트', '바랍니다'], - description: '이미지 파일 이름', - required: false, - }) - @IsString({ each: true }) - @IsOptional() - images: string[] = []; - - @ApiPropertyOptional({ - example: ['빼고', '테스트', '바랍니다'], - description: '파일 이름', - required: false, - }) - @IsString({ each: true }) - @IsOptional() - documents: string[] = []; - - @ApiPropertyOptional({ - example: '공지 그룹 id', - description: '공지 그룹 id', - required: false, - }) - @IsString() - @IsOptional() - groupId?: string; -} +import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; +import { Category } from '@prisma/client'; +import { Type } from 'class-transformer'; +import { + IsDate, + IsEnum, + IsNotEmpty, + IsNumber, + IsOptional, + IsString, + MaxLength, +} from 'class-validator'; + +export class CreateNoticeDto { + @ApiProperty({ + example: '제목', + description: '공지 제목', + required: true, + }) + @IsString() + @IsNotEmpty() + @MaxLength(200) + title: string; + + @ApiProperty({ + example: '

내용<\\p>', + description: '공지 내용', + required: true, + }) + @IsString() + @IsNotEmpty() + @MaxLength(100000) + body: string; + + @ApiPropertyOptional({ + example: '2021-08-01T00:00:00.000Z', + description: '마감일', + required: false, + }) + @Type(() => Date) + @IsDate() + @IsOptional() + deadline?: Date; + + @ApiPropertyOptional({ + example: [1, 2], + description: '공지태그의 id', + required: false, + }) + @IsNumber({}, { each: true }) + @IsOptional() + tags: number[] = []; + + @ApiPropertyOptional({ + description: '공지 그룹의 id', + required: false, + enum: Category, + }) + @IsEnum(Category) + @IsOptional() + category?: Category; + + @ApiPropertyOptional({ + example: ['빼고', '테스트', '바랍니다'], + description: '이미지 파일 이름', + required: false, + }) + @IsString({ each: true }) + @IsOptional() + images: string[] = []; + + @ApiPropertyOptional({ + example: ['빼고', '테스트', '바랍니다'], + description: '파일 이름', + required: false, + }) + @IsString({ each: true }) + @IsOptional() + documents: string[] = []; + + @ApiPropertyOptional({ + example: '공지 그룹 id', + description: '공지 그룹 id', + required: false, + }) + @IsString() + @IsOptional() + groupId?: string; +} diff --git a/src/notice/dto/req/foreignContent.dto.ts b/apps/ziggle-be/src/notice/dto/req/foreignContent.dto.ts similarity index 95% rename from src/notice/dto/req/foreignContent.dto.ts rename to apps/ziggle-be/src/notice/dto/req/foreignContent.dto.ts index 2b43bd4..c533871 100644 --- a/src/notice/dto/req/foreignContent.dto.ts +++ b/apps/ziggle-be/src/notice/dto/req/foreignContent.dto.ts @@ -1,42 +1,42 @@ -import { ApiProperty } from '@nestjs/swagger'; -import { Type } from 'class-transformer'; -import { IsDate, IsOptional, IsString, MaxLength } from 'class-validator'; - -export class ForeignContentDto { - @ApiProperty({ - example: 'en', - description: '언어', - required: true, - }) - @IsString() - lang: string; - - @ApiProperty({ - example: '제목', - description: '바뀐 제목 (현재 진짜로 바뀌지는 않음)', - required: false, - }) - @IsString() - @IsOptional() - @MaxLength(200) - title?: string; - - @ApiProperty({ - example: '영어 내용', - description: '영어로 된 내용', - required: true, - }) - @IsString() - @MaxLength(100000) - body: string; - - @ApiProperty({ - example: '2021-08-01T00:00:00.000Z', - description: '마감일, 가장 최근에 post한 것을 기준으로 설정됨', - required: false, - }) - @Type(() => Date) - @IsDate() - @IsOptional() - deadline?: Date; -} +import { ApiProperty } from '@nestjs/swagger'; +import { Type } from 'class-transformer'; +import { IsDate, IsOptional, IsString, MaxLength } from 'class-validator'; + +export class ForeignContentDto { + @ApiProperty({ + example: 'en', + description: '언어', + required: true, + }) + @IsString() + lang: string; + + @ApiProperty({ + example: '제목', + description: '바뀐 제목 (현재 진짜로 바뀌지는 않음)', + required: false, + }) + @IsString() + @IsOptional() + @MaxLength(200) + title?: string; + + @ApiProperty({ + example: '영어 내용', + description: '영어로 된 내용', + required: true, + }) + @IsString() + @MaxLength(100000) + body: string; + + @ApiProperty({ + example: '2021-08-01T00:00:00.000Z', + description: '마감일, 가장 최근에 post한 것을 기준으로 설정됨', + required: false, + }) + @Type(() => Date) + @IsDate() + @IsOptional() + deadline?: Date; +} diff --git a/src/notice/dto/req/getAllNotice.dto.ts b/apps/ziggle-be/src/notice/dto/req/getAllNotice.dto.ts similarity index 95% rename from src/notice/dto/req/getAllNotice.dto.ts rename to apps/ziggle-be/src/notice/dto/req/getAllNotice.dto.ts index 8fcae77..4dc9e18 100644 --- a/src/notice/dto/req/getAllNotice.dto.ts +++ b/apps/ziggle-be/src/notice/dto/req/getAllNotice.dto.ts @@ -1,90 +1,90 @@ -import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; -import { Category } from '@prisma/client'; -import { Type } from 'class-transformer'; -import { - IsArray, - IsEnum, - IsNumber, - IsOptional, - IsString, -} from 'class-validator'; - -export class GetAllNoticeQueryDto { - @ApiProperty({ - example: '0', - description: '넘길 공지의 개수', - required: false, - }) - @Type(() => Number) - @IsNumber() - @IsOptional() - offset?: number; - - @ApiProperty({ - example: '10', - description: '페이지당 공지 개수', - required: false, - }) - @Type(() => Number) - @IsNumber() - @IsOptional() - limit?: number; - - @ApiProperty({ - example: 'en', - description: '언어', - required: false, - }) - @IsString() - @IsOptional() - lang?: string; - - @ApiProperty({ - example: '제목', - description: '검색할 공지의 제목 혹은 내용', - required: false, - }) - @IsString() - @IsOptional() - search?: string; - - @ApiPropertyOptional({ - example: '이런', - description: '공지태그의 이름', - required: false, - }) - @IsArray() - @IsString({ each: true }) - @IsOptional() - tags?: string[]; - - @ApiProperty({ - example: 'deadline', - description: '정렬 기준 (deadline, hot, recent)', - required: false, - }) - @IsString() - @IsEnum(['deadline', 'hot', 'recent']) - @IsOptional() - orderBy?: 'recent' | 'deadline' | 'hot'; - - @ApiProperty({ - example: 'ETC', - description: '카테고리', - required: false, - }) - @IsString() - @IsEnum(Category) - @IsOptional() - category?: Category; - - @ApiProperty({ - example: 'own', - description: '공지 타입 (own, reminders)', - required: false, - }) - @IsString() - @IsEnum(['own', 'reminders']) - @IsOptional() - my?: 'own' | 'reminders'; -} +import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger'; +import { Category } from '@prisma/client'; +import { Type } from 'class-transformer'; +import { + IsArray, + IsEnum, + IsNumber, + IsOptional, + IsString, +} from 'class-validator'; + +export class GetAllNoticeQueryDto { + @ApiProperty({ + example: '0', + description: '넘길 공지의 개수', + required: false, + }) + @Type(() => Number) + @IsNumber() + @IsOptional() + offset?: number; + + @ApiProperty({ + example: '10', + description: '페이지당 공지 개수', + required: false, + }) + @Type(() => Number) + @IsNumber() + @IsOptional() + limit?: number; + + @ApiProperty({ + example: 'en', + description: '언어', + required: false, + }) + @IsString() + @IsOptional() + lang?: string; + + @ApiProperty({ + example: '제목', + description: '검색할 공지의 제목 혹은 내용', + required: false, + }) + @IsString() + @IsOptional() + search?: string; + + @ApiPropertyOptional({ + example: '이런', + description: '공지태그의 이름', + required: false, + }) + @IsArray() + @IsString({ each: true }) + @IsOptional() + tags?: string[]; + + @ApiProperty({ + example: 'deadline', + description: '정렬 기준 (deadline, hot, recent)', + required: false, + }) + @IsString() + @IsEnum(['deadline', 'hot', 'recent']) + @IsOptional() + orderBy?: 'recent' | 'deadline' | 'hot'; + + @ApiProperty({ + example: 'ETC', + description: '카테고리', + required: false, + }) + @IsString() + @IsEnum(Category) + @IsOptional() + category?: Category; + + @ApiProperty({ + example: 'own', + description: '공지 타입 (own, reminders)', + required: false, + }) + @IsString() + @IsEnum(['own', 'reminders']) + @IsOptional() + my?: 'own' | 'reminders'; +} diff --git a/src/notice/dto/req/getGroupNotice.dto.ts b/apps/ziggle-be/src/notice/dto/req/getGroupNotice.dto.ts similarity index 100% rename from src/notice/dto/req/getGroupNotice.dto.ts rename to apps/ziggle-be/src/notice/dto/req/getGroupNotice.dto.ts diff --git a/src/notice/dto/req/getNotice.dto.ts b/apps/ziggle-be/src/notice/dto/req/getNotice.dto.ts similarity index 95% rename from src/notice/dto/req/getNotice.dto.ts rename to apps/ziggle-be/src/notice/dto/req/getNotice.dto.ts index 3ad9d72..aa02f57 100644 --- a/src/notice/dto/req/getNotice.dto.ts +++ b/apps/ziggle-be/src/notice/dto/req/getNotice.dto.ts @@ -1,24 +1,24 @@ -import { ApiProperty } from '@nestjs/swagger'; -import { Transform } from 'class-transformer'; -import { IsBoolean, IsOptional, IsString } from 'class-validator'; - -export class GetNoticeDto { - @ApiProperty({ - example: 'true', - description: '공지를 읽었는지 여부, 기본값은 false', - required: false, - }) - @Transform(({ value }) => value === 'true') - @IsBoolean() - @IsOptional() - isViewed?: boolean; - - @ApiProperty({ - example: 'en', - description: '언어', - required: false, - }) - @IsString() - @IsOptional() - lang?: string; -} +import { ApiProperty } from '@nestjs/swagger'; +import { Transform } from 'class-transformer'; +import { IsBoolean, IsOptional, IsString } from 'class-validator'; + +export class GetNoticeDto { + @ApiProperty({ + example: 'true', + description: '공지를 읽었는지 여부, 기본값은 false', + required: false, + }) + @Transform(({ value }) => value === 'true') + @IsBoolean() + @IsOptional() + isViewed?: boolean; + + @ApiProperty({ + example: 'en', + description: '언어', + required: false, + }) + @IsString() + @IsOptional() + lang?: string; +} diff --git a/src/notice/dto/req/reaction.dto.ts b/apps/ziggle-be/src/notice/dto/req/reaction.dto.ts similarity index 95% rename from src/notice/dto/req/reaction.dto.ts rename to apps/ziggle-be/src/notice/dto/req/reaction.dto.ts index fb7c920..1a318ea 100644 --- a/src/notice/dto/req/reaction.dto.ts +++ b/apps/ziggle-be/src/notice/dto/req/reaction.dto.ts @@ -1,12 +1,12 @@ -import { ApiProperty } from '@nestjs/swagger'; -import { IsString } from 'class-validator'; - -export class ReactionDto { - @ApiProperty({ - example: '👍', - description: '반응할 이모지', - required: true, - }) - @IsString() - emoji: string; -} +import { ApiProperty } from '@nestjs/swagger'; +import { IsString } from 'class-validator'; + +export class ReactionDto { + @ApiProperty({ + example: '👍', + description: '반응할 이모지', + required: true, + }) + @IsString() + emoji: string; +} diff --git a/src/notice/dto/req/updateNotice.dto.ts b/apps/ziggle-be/src/notice/dto/req/updateNotice.dto.ts similarity index 94% rename from src/notice/dto/req/updateNotice.dto.ts rename to apps/ziggle-be/src/notice/dto/req/updateNotice.dto.ts index 9bc4ab1..2c56f3a 100644 --- a/src/notice/dto/req/updateNotice.dto.ts +++ b/apps/ziggle-be/src/notice/dto/req/updateNotice.dto.ts @@ -1,51 +1,51 @@ -import { ApiProperty } from '@nestjs/swagger'; -import { Type } from 'class-transformer'; -import { - IsDate, - IsNotEmpty, - IsOptional, - IsString, - MaxLength, -} from 'class-validator'; - -export class UpdateNoticeDto { - @ApiProperty({ - example: '

내용<\\p>', - description: '공지 내용', - required: true, - }) - @IsString() - @IsNotEmpty() - @MaxLength(100000) - body: string; - - @ApiProperty({ - example: '2021-08-01T00:00:00.000Z', - description: '마감일', - required: false, - }) - @Type(() => Date) - @IsDate() - @IsOptional() - deadline?: Date; -} - -export class UpdateNoticeQueryDto { - @ApiProperty({ - example: 1, - description: 'Content IDX, Default: 1', - required: false, - }) - @IsString() - @IsOptional() - idx?: number; - - @ApiProperty({ - example: 'ko', - description: 'Language, Default: ko', - required: false, - }) - @IsString() - @IsOptional() - lang?: string; -} +import { ApiProperty } from '@nestjs/swagger'; +import { Type } from 'class-transformer'; +import { + IsDate, + IsNotEmpty, + IsOptional, + IsString, + MaxLength, +} from 'class-validator'; + +export class UpdateNoticeDto { + @ApiProperty({ + example: '

내용<\\p>', + description: '공지 내용', + required: true, + }) + @IsString() + @IsNotEmpty() + @MaxLength(100000) + body: string; + + @ApiProperty({ + example: '2021-08-01T00:00:00.000Z', + description: '마감일', + required: false, + }) + @Type(() => Date) + @IsDate() + @IsOptional() + deadline?: Date; +} + +export class UpdateNoticeQueryDto { + @ApiProperty({ + example: 1, + description: 'Content IDX, Default: 1', + required: false, + }) + @IsString() + @IsOptional() + idx?: number; + + @ApiProperty({ + example: 'ko', + description: 'Language, Default: ko', + required: false, + }) + @IsString() + @IsOptional() + lang?: string; +} diff --git a/src/notice/dto/res/expandedGeneralNotice.dto.ts b/apps/ziggle-be/src/notice/dto/res/expandedGeneralNotice.dto.ts similarity index 100% rename from src/notice/dto/res/expandedGeneralNotice.dto.ts rename to apps/ziggle-be/src/notice/dto/res/expandedGeneralNotice.dto.ts diff --git a/src/notice/dto/res/generalNotice.dto.ts b/apps/ziggle-be/src/notice/dto/res/generalNotice.dto.ts similarity index 100% rename from src/notice/dto/res/generalNotice.dto.ts rename to apps/ziggle-be/src/notice/dto/res/generalNotice.dto.ts diff --git a/src/notice/notice.controller.ts b/apps/ziggle-be/src/notice/notice.controller.ts similarity index 100% rename from src/notice/notice.controller.ts rename to apps/ziggle-be/src/notice/notice.controller.ts diff --git a/src/notice/notice.mapper.ts b/apps/ziggle-be/src/notice/notice.mapper.ts similarity index 100% rename from src/notice/notice.mapper.ts rename to apps/ziggle-be/src/notice/notice.mapper.ts diff --git a/src/notice/notice.module.ts b/apps/ziggle-be/src/notice/notice.module.ts similarity index 100% rename from src/notice/notice.module.ts rename to apps/ziggle-be/src/notice/notice.module.ts diff --git a/src/notice/notice.repository.ts b/apps/ziggle-be/src/notice/notice.repository.ts similarity index 100% rename from src/notice/notice.repository.ts rename to apps/ziggle-be/src/notice/notice.repository.ts diff --git a/src/notice/notice.service.ts b/apps/ziggle-be/src/notice/notice.service.ts similarity index 100% rename from src/notice/notice.service.ts rename to apps/ziggle-be/src/notice/notice.service.ts diff --git a/src/notice/types/noticeFullContent.ts b/apps/ziggle-be/src/notice/types/noticeFullContent.ts similarity index 100% rename from src/notice/types/noticeFullContent.ts rename to apps/ziggle-be/src/notice/types/noticeFullContent.ts diff --git a/src/tag/dto/req/createTag.dto.ts b/apps/ziggle-be/src/tag/dto/req/createTag.dto.ts similarity index 100% rename from src/tag/dto/req/createTag.dto.ts rename to apps/ziggle-be/src/tag/dto/req/createTag.dto.ts diff --git a/src/tag/dto/req/getTag.dto.ts b/apps/ziggle-be/src/tag/dto/req/getTag.dto.ts similarity index 100% rename from src/tag/dto/req/getTag.dto.ts rename to apps/ziggle-be/src/tag/dto/req/getTag.dto.ts diff --git a/src/tag/dto/res/TagRes.dto.ts b/apps/ziggle-be/src/tag/dto/res/TagRes.dto.ts similarity index 100% rename from src/tag/dto/res/TagRes.dto.ts rename to apps/ziggle-be/src/tag/dto/res/TagRes.dto.ts diff --git a/src/tag/tag.controller.ts b/apps/ziggle-be/src/tag/tag.controller.ts similarity index 100% rename from src/tag/tag.controller.ts rename to apps/ziggle-be/src/tag/tag.controller.ts diff --git a/src/tag/tag.module.ts b/apps/ziggle-be/src/tag/tag.module.ts similarity index 100% rename from src/tag/tag.module.ts rename to apps/ziggle-be/src/tag/tag.module.ts diff --git a/src/tag/tag.repository.ts b/apps/ziggle-be/src/tag/tag.repository.ts similarity index 100% rename from src/tag/tag.repository.ts rename to apps/ziggle-be/src/tag/tag.repository.ts diff --git a/src/tag/tag.service.ts b/apps/ziggle-be/src/tag/tag.service.ts similarity index 100% rename from src/tag/tag.service.ts rename to apps/ziggle-be/src/tag/tag.service.ts diff --git a/src/user/decorator/get-idp-user.decorator.ts b/apps/ziggle-be/src/user/decorator/get-idp-user.decorator.ts similarity index 97% rename from src/user/decorator/get-idp-user.decorator.ts rename to apps/ziggle-be/src/user/decorator/get-idp-user.decorator.ts index 76ec88d..41efbe6 100644 --- a/src/user/decorator/get-idp-user.decorator.ts +++ b/apps/ziggle-be/src/user/decorator/get-idp-user.decorator.ts @@ -1,9 +1,9 @@ -import { createParamDecorator, ExecutionContext } from '@nestjs/common'; -import { User } from '@prisma/client'; - -export const GetIdPUser = createParamDecorator( - (_data, ctx: ExecutionContext): User | undefined => { - const req = ctx.switchToHttp().getRequest(); - return req.user?.idp; - }, -); +import { createParamDecorator, ExecutionContext } from '@nestjs/common'; +import { User } from '@prisma/client'; + +export const GetIdPUser = createParamDecorator( + (_data, ctx: ExecutionContext): User | undefined => { + const req = ctx.switchToHttp().getRequest(); + return req.user?.idp; + }, +); diff --git a/src/user/decorator/get-token.decorator.ts b/apps/ziggle-be/src/user/decorator/get-token.decorator.ts similarity index 100% rename from src/user/decorator/get-token.decorator.ts rename to apps/ziggle-be/src/user/decorator/get-token.decorator.ts diff --git a/src/user/decorator/get-user.decorator.ts b/apps/ziggle-be/src/user/decorator/get-user.decorator.ts similarity index 97% rename from src/user/decorator/get-user.decorator.ts rename to apps/ziggle-be/src/user/decorator/get-user.decorator.ts index a86c597..06ee02d 100644 --- a/src/user/decorator/get-user.decorator.ts +++ b/apps/ziggle-be/src/user/decorator/get-user.decorator.ts @@ -1,8 +1,8 @@ -import { createParamDecorator, ExecutionContext } from '@nestjs/common'; - -export const GetUser = createParamDecorator( - (_data, ctx: ExecutionContext): string | undefined => { - const req = ctx.switchToHttp().getRequest(); - return req.user?.ziggle; - }, -); +import { createParamDecorator, ExecutionContext } from '@nestjs/common'; + +export const GetUser = createParamDecorator( + (_data, ctx: ExecutionContext): string | undefined => { + const req = ctx.switchToHttp().getRequest(); + return req.user?.ziggle; + }, +); diff --git a/src/user/dto/req/login.dto.ts b/apps/ziggle-be/src/user/dto/req/login.dto.ts similarity index 100% rename from src/user/dto/req/login.dto.ts rename to apps/ziggle-be/src/user/dto/req/login.dto.ts diff --git a/src/user/dto/req/logout.dto.ts b/apps/ziggle-be/src/user/dto/req/logout.dto.ts similarity index 100% rename from src/user/dto/req/logout.dto.ts rename to apps/ziggle-be/src/user/dto/req/logout.dto.ts diff --git a/src/user/dto/req/setFcmTokenReq.dto.ts b/apps/ziggle-be/src/user/dto/req/setFcmTokenReq.dto.ts similarity index 100% rename from src/user/dto/req/setFcmTokenReq.dto.ts rename to apps/ziggle-be/src/user/dto/req/setFcmTokenReq.dto.ts diff --git a/src/user/dto/res/jwtToken.dto.ts b/apps/ziggle-be/src/user/dto/res/jwtToken.dto.ts similarity index 100% rename from src/user/dto/res/jwtToken.dto.ts rename to apps/ziggle-be/src/user/dto/res/jwtToken.dto.ts diff --git a/src/user/dto/res/setFcmTokenRes.dto.ts b/apps/ziggle-be/src/user/dto/res/setFcmTokenRes.dto.ts similarity index 100% rename from src/user/dto/res/setFcmTokenRes.dto.ts rename to apps/ziggle-be/src/user/dto/res/setFcmTokenRes.dto.ts diff --git a/src/user/dto/res/userInfoRes.dto.ts b/apps/ziggle-be/src/user/dto/res/userInfoRes.dto.ts similarity index 100% rename from src/user/dto/res/userInfoRes.dto.ts rename to apps/ziggle-be/src/user/dto/res/userInfoRes.dto.ts diff --git a/src/user/guard/anonymous.strategy.ts b/apps/ziggle-be/src/user/guard/anonymous.strategy.ts similarity index 100% rename from src/user/guard/anonymous.strategy.ts rename to apps/ziggle-be/src/user/guard/anonymous.strategy.ts diff --git a/src/user/guard/idp.guard.ts b/apps/ziggle-be/src/user/guard/idp.guard.ts similarity index 100% rename from src/user/guard/idp.guard.ts rename to apps/ziggle-be/src/user/guard/idp.guard.ts diff --git a/src/user/guard/idp.strategy.ts b/apps/ziggle-be/src/user/guard/idp.strategy.ts similarity index 100% rename from src/user/guard/idp.strategy.ts rename to apps/ziggle-be/src/user/guard/idp.strategy.ts diff --git a/src/user/guard/idpOptional.strategy.ts b/apps/ziggle-be/src/user/guard/idpOptional.strategy.ts similarity index 100% rename from src/user/guard/idpOptional.strategy.ts rename to apps/ziggle-be/src/user/guard/idpOptional.strategy.ts diff --git a/src/user/types/jwtToken.type.ts b/apps/ziggle-be/src/user/types/jwtToken.type.ts similarity index 100% rename from src/user/types/jwtToken.type.ts rename to apps/ziggle-be/src/user/types/jwtToken.type.ts diff --git a/src/user/types/login.type.ts b/apps/ziggle-be/src/user/types/login.type.ts similarity index 100% rename from src/user/types/login.type.ts rename to apps/ziggle-be/src/user/types/login.type.ts diff --git a/src/user/user.controller.ts b/apps/ziggle-be/src/user/user.controller.ts similarity index 100% rename from src/user/user.controller.ts rename to apps/ziggle-be/src/user/user.controller.ts diff --git a/src/user/user.module.ts b/apps/ziggle-be/src/user/user.module.ts similarity index 100% rename from src/user/user.module.ts rename to apps/ziggle-be/src/user/user.module.ts diff --git a/src/user/user.repository.ts b/apps/ziggle-be/src/user/user.repository.ts similarity index 100% rename from src/user/user.repository.ts rename to apps/ziggle-be/src/user/user.repository.ts diff --git a/src/user/user.service.ts b/apps/ziggle-be/src/user/user.service.ts similarity index 100% rename from src/user/user.service.ts rename to apps/ziggle-be/src/user/user.service.ts diff --git a/test/app.e2e-spec.ts b/apps/ziggle-be/test/app.e2e-spec.ts similarity index 100% rename from test/app.e2e-spec.ts rename to apps/ziggle-be/test/app.e2e-spec.ts diff --git a/test/crawl/crawl.controller.integration.spec.ts b/apps/ziggle-be/test/crawl/crawl.controller.integration.spec.ts similarity index 100% rename from test/crawl/crawl.controller.integration.spec.ts rename to apps/ziggle-be/test/crawl/crawl.controller.integration.spec.ts diff --git a/test/crawl/crawl.controller.spec.ts b/apps/ziggle-be/test/crawl/crawl.controller.spec.ts similarity index 100% rename from test/crawl/crawl.controller.spec.ts rename to apps/ziggle-be/test/crawl/crawl.controller.spec.ts diff --git a/test/crawl/crawl.repository.spec.ts b/apps/ziggle-be/test/crawl/crawl.repository.spec.ts similarity index 100% rename from test/crawl/crawl.repository.spec.ts rename to apps/ziggle-be/test/crawl/crawl.repository.spec.ts diff --git a/test/crawl/crawl.service.spec.ts b/apps/ziggle-be/test/crawl/crawl.service.spec.ts similarity index 100% rename from test/crawl/crawl.service.spec.ts rename to apps/ziggle-be/test/crawl/crawl.service.spec.ts diff --git a/test/jest-e2e.json b/apps/ziggle-be/test/jest-e2e.json similarity index 100% rename from test/jest-e2e.json rename to apps/ziggle-be/test/jest-e2e.json diff --git a/apps/ziggle-be/tsconfig.app.json b/apps/ziggle-be/tsconfig.app.json new file mode 100644 index 0000000..c117877 --- /dev/null +++ b/apps/ziggle-be/tsconfig.app.json @@ -0,0 +1,9 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "declaration": false, + "outDir": "../../dist/apps/ziggle-be" + }, + "include": ["src/**/*"], + "exclude": ["node_modules", "dist", "test", "**/*spec.ts"] +} diff --git a/nest-cli.json b/nest-cli.json index ec2765c..99ffe1d 100644 --- a/nest-cli.json +++ b/nest-cli.json @@ -1,10 +1,11 @@ { "$schema": "https://json.schemastore.org/nest-cli", "collection": "@nestjs/schematics", - "sourceRoot": "src", + "sourceRoot": "apps/ziggle-be/src", "compilerOptions": { "deleteOutDir": true, - "webpack": true + "webpack": true, + "tsConfigPath": "apps/ziggle-be/tsconfig.app.json" }, "projects": { "prisma": { @@ -51,6 +52,26 @@ "compilerOptions": { "tsConfigPath": "libs/custom-config/tsconfig.lib.json" } + }, + "ziggle-be": { + "type": "application", + "root": "apps/ziggle-be", + "entryFile": "main", + "sourceRoot": "apps/ziggle-be/src", + "compilerOptions": { + "tsConfigPath": "apps/ziggle-be/tsconfig.app.json" + } + }, + "crawler": { + "type": "application", + "root": "apps/crawler", + "entryFile": "main", + "sourceRoot": "apps/crawler/src", + "compilerOptions": { + "tsConfigPath": "apps/crawler/tsconfig.app.json" + } } - } + }, + "monorepo": true, + "root": "apps/ziggle-be" } \ No newline at end of file diff --git a/package.json b/package.json index c6652b0..6d78a3e 100644 --- a/package.json +++ b/package.json @@ -7,18 +7,18 @@ "license": "AGPL-3.0 license", "scripts": { "build": "nest build", - "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\" \"libs/**/*.ts\"", + "format": "prettier --write \"apps/**/*.ts\" \"libs/**/*.ts\"", "start": "nest start", "start:dev": "nest start --watch", "start:debug": "nest start --debug --watch", "start:deploy": "npx prisma migrate deploy && node dist/main", - "start:prod": "node dist/main", + "start:prod": "node dist/apps/ziggle-be/main", "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix", "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": "jest --config ./apps/ziggle-be/test/jest-e2e.json" }, "dependencies": { "@aws-sdk/client-s3": "^3.521.0", @@ -108,8 +108,8 @@ "coverageDirectory": "../coverage", "testEnvironment": "node", "roots": [ - "/src/", - "/libs/" + "/libs/", + "/apps/" ] } -} +} \ No newline at end of file From 567544b596d05763cc6a3bc3cd5c87ae9caa6e39 Mon Sep 17 00:00:00 2001 From: siwonpada Date: Thu, 2 Jan 2025 23:19:55 +0900 Subject: [PATCH 02/10] add: modules --- apps/{ziggle-be => api}/src/ai/ai.controller.ts | 2 +- apps/{ziggle-be => api}/src/ai/ai.module.ts | 2 +- apps/{ziggle-be => api}/src/ai/ai.service.ts | 0 .../src/ai/dto/req/translate.dto.ts | 0 .../src/ai/dto/res/translateRes.dto.ts | 0 .../src/ai/types/deadlineResponse.type.ts | 0 .../src/api.controller.ts} | 2 +- .../src/app.module.ts => api/src/api.module.ts} | 6 +++--- .../src/crawl/crawl.controller.ts | 0 apps/{ziggle-be => api}/src/crawl/crawl.module.ts | 6 +++--- .../src/crawl/crawl.repository.ts | 0 apps/{ziggle-be => api}/src/crawl/crawl.service.ts | 8 ++++---- .../src/crawl/dto/req/createCrawl.dto.ts | 0 .../src/crawl/dto/req/getCrawl.dto.ts | 0 .../src/document/document.controller.ts | 0 .../src/document/document.module.ts | 2 +- .../src/document/document.service.ts | 2 +- apps/{ziggle-be => api}/src/fcm/fcm.consumer.ts | 0 apps/{ziggle-be => api}/src/fcm/fcm.module.ts | 0 apps/{ziggle-be => api}/src/fcm/fcm.repository.ts | 0 apps/{ziggle-be => api}/src/fcm/fcm.service.ts | 0 .../src/fcm/types/content.type.ts | 0 .../src/fcm/types/fcmTargetUser.type.ts | 0 .../{ziggle-be => api}/src/fcm/types/queue.type.ts | 0 apps/{ziggle-be => api}/src/file/file.module.ts | 0 apps/{ziggle-be => api}/src/file/file.service.ts | 0 .../src/group/dto/req/getGroup.dto.ts | 0 .../src/group/dto/res/GroupsRes.dto.ts | 0 .../src/group/dto/res/GroupsTokenRes.dto.ts | 0 .../src/group/group.controller.ts | 4 ++-- apps/{ziggle-be => api}/src/group/group.module.ts | 2 +- apps/{ziggle-be => api}/src/group/group.service.ts | 0 .../src/group/types/groupInfo.type.ts | 0 .../src/group/types/groupsToken.type.ts | 0 .../src/health/health.controller.ts | 0 .../{ziggle-be => api}/src/health/health.module.ts | 0 .../src/health/indicator/redis.indicator.ts | 0 .../src/image/image.controller.ts | 0 apps/{ziggle-be => api}/src/image/image.module.ts | 2 +- apps/{ziggle-be => api}/src/image/image.service.ts | 4 +--- apps/{ziggle-be => api}/src/main.ts | 4 ++-- .../src/notice/dto/req/additionalNotice.dto.ts | 0 .../src/notice/dto/req/createNotice.dto.ts | 0 .../src/notice/dto/req/foreignContent.dto.ts | 0 .../src/notice/dto/req/getAllNotice.dto.ts | 0 .../src/notice/dto/req/getGroupNotice.dto.ts | 0 .../src/notice/dto/req/getNotice.dto.ts | 0 .../src/notice/dto/req/reaction.dto.ts | 0 .../src/notice/dto/req/updateNotice.dto.ts | 0 .../notice/dto/res/expandedGeneralNotice.dto.ts | 0 .../src/notice/dto/res/generalNotice.dto.ts | 0 .../src/notice/notice.controller.ts | 4 ++-- .../{ziggle-be => api}/src/notice/notice.mapper.ts | 0 .../{ziggle-be => api}/src/notice/notice.module.ts | 12 ++++++------ .../src/notice/notice.repository.ts | 0 .../src/notice/notice.service.ts | 12 ++++++------ .../src/notice/types/noticeFullContent.ts | 0 .../src/tag/dto/req/createTag.dto.ts | 0 .../src/tag/dto/req/getTag.dto.ts | 0 .../src/tag/dto/res/TagRes.dto.ts | 0 apps/{ziggle-be => api}/src/tag/tag.controller.ts | 2 +- apps/{ziggle-be => api}/src/tag/tag.module.ts | 2 +- apps/{ziggle-be => api}/src/tag/tag.repository.ts | 0 apps/{ziggle-be => api}/src/tag/tag.service.ts | 0 .../src/user/decorator/get-idp-user.decorator.ts | 0 .../src/user/decorator/get-token.decorator.ts | 0 .../src/user/decorator/get-user.decorator.ts | 0 .../src/user/dto/req/login.dto.ts | 2 +- .../src/user/dto/req/logout.dto.ts | 0 .../src/user/dto/req/setFcmTokenReq.dto.ts | 0 .../src/user/dto/res/jwtToken.dto.ts | 0 .../src/user/dto/res/setFcmTokenRes.dto.ts | 0 .../src/user/dto/res/userInfoRes.dto.ts | 0 .../src/user/guard/anonymous.strategy.ts | 0 .../{ziggle-be => api}/src/user/guard/idp.guard.ts | 0 .../src/user/guard/idp.strategy.ts | 0 .../src/user/guard/idpOptional.strategy.ts | 0 .../src/user/types/jwtToken.type.ts | 0 .../src/user/types/login.type.ts | 0 .../{ziggle-be => api}/src/user/user.controller.ts | 0 apps/{ziggle-be => api}/src/user/user.module.ts | 0 .../{ziggle-be => api}/src/user/user.repository.ts | 0 apps/{ziggle-be => api}/src/user/user.service.ts | 0 apps/{ziggle-be => api}/test/app.e2e-spec.ts | 0 .../crawl/crawl.controller.integration.spec.ts | 0 .../test/crawl/crawl.controller.spec.ts | 0 .../test/crawl/crawl.repository.spec.ts | 0 .../test/crawl/crawl.service.spec.ts | 0 apps/{ziggle-be => api}/test/jest-e2e.json | 0 apps/{ziggle-be => api}/tsconfig.app.json | 2 +- nest-cli.json | 14 +++++++------- 91 files changed, 47 insertions(+), 49 deletions(-) rename apps/{ziggle-be => api}/src/ai/ai.controller.ts (94%) rename apps/{ziggle-be => api}/src/ai/ai.module.ts (88%) rename apps/{ziggle-be => api}/src/ai/ai.service.ts (100%) rename apps/{ziggle-be => api}/src/ai/dto/req/translate.dto.ts (100%) rename apps/{ziggle-be => api}/src/ai/dto/res/translateRes.dto.ts (100%) rename apps/{ziggle-be => api}/src/ai/types/deadlineResponse.type.ts (100%) rename apps/{ziggle-be/src/app.controller.ts => api/src/api.controller.ts} (93%) rename apps/{ziggle-be/src/app.module.ts => api/src/api.module.ts} (94%) rename apps/{ziggle-be => api}/src/crawl/crawl.controller.ts (100%) rename apps/{ziggle-be => api}/src/crawl/crawl.module.ts (80%) rename apps/{ziggle-be => api}/src/crawl/crawl.repository.ts (100%) rename apps/{ziggle-be => api}/src/crawl/crawl.service.ts (91%) rename apps/{ziggle-be => api}/src/crawl/dto/req/createCrawl.dto.ts (100%) rename apps/{ziggle-be => api}/src/crawl/dto/req/getCrawl.dto.ts (100%) rename apps/{ziggle-be => api}/src/document/document.controller.ts (100%) rename apps/{ziggle-be => api}/src/document/document.module.ts (88%) rename apps/{ziggle-be => api}/src/document/document.service.ts (97%) rename apps/{ziggle-be => api}/src/fcm/fcm.consumer.ts (100%) rename apps/{ziggle-be => api}/src/fcm/fcm.module.ts (100%) rename apps/{ziggle-be => api}/src/fcm/fcm.repository.ts (100%) rename apps/{ziggle-be => api}/src/fcm/fcm.service.ts (100%) rename apps/{ziggle-be => api}/src/fcm/types/content.type.ts (100%) rename apps/{ziggle-be => api}/src/fcm/types/fcmTargetUser.type.ts (100%) rename apps/{ziggle-be => api}/src/fcm/types/queue.type.ts (100%) rename apps/{ziggle-be => api}/src/file/file.module.ts (100%) rename apps/{ziggle-be => api}/src/file/file.service.ts (100%) rename apps/{ziggle-be => api}/src/group/dto/req/getGroup.dto.ts (100%) rename apps/{ziggle-be => api}/src/group/dto/res/GroupsRes.dto.ts (100%) rename apps/{ziggle-be => api}/src/group/dto/res/GroupsTokenRes.dto.ts (100%) rename apps/{ziggle-be => api}/src/group/group.controller.ts (93%) rename apps/{ziggle-be => api}/src/group/group.module.ts (91%) rename apps/{ziggle-be => api}/src/group/group.service.ts (100%) rename apps/{ziggle-be => api}/src/group/types/groupInfo.type.ts (100%) rename apps/{ziggle-be => api}/src/group/types/groupsToken.type.ts (100%) rename apps/{ziggle-be => api}/src/health/health.controller.ts (100%) rename apps/{ziggle-be => api}/src/health/health.module.ts (100%) rename apps/{ziggle-be => api}/src/health/indicator/redis.indicator.ts (100%) rename apps/{ziggle-be => api}/src/image/image.controller.ts (100%) rename apps/{ziggle-be => api}/src/image/image.module.ts (87%) rename apps/{ziggle-be => api}/src/image/image.service.ts (95%) rename apps/{ziggle-be => api}/src/main.ts (96%) rename apps/{ziggle-be => api}/src/notice/dto/req/additionalNotice.dto.ts (100%) rename apps/{ziggle-be => api}/src/notice/dto/req/createNotice.dto.ts (100%) rename apps/{ziggle-be => api}/src/notice/dto/req/foreignContent.dto.ts (100%) rename apps/{ziggle-be => api}/src/notice/dto/req/getAllNotice.dto.ts (100%) rename apps/{ziggle-be => api}/src/notice/dto/req/getGroupNotice.dto.ts (100%) rename apps/{ziggle-be => api}/src/notice/dto/req/getNotice.dto.ts (100%) rename apps/{ziggle-be => api}/src/notice/dto/req/reaction.dto.ts (100%) rename apps/{ziggle-be => api}/src/notice/dto/req/updateNotice.dto.ts (100%) rename apps/{ziggle-be => api}/src/notice/dto/res/expandedGeneralNotice.dto.ts (100%) rename apps/{ziggle-be => api}/src/notice/dto/res/generalNotice.dto.ts (100%) rename apps/{ziggle-be => api}/src/notice/notice.controller.ts (98%) rename apps/{ziggle-be => api}/src/notice/notice.mapper.ts (100%) rename apps/{ziggle-be => api}/src/notice/notice.module.ts (69%) rename apps/{ziggle-be => api}/src/notice/notice.repository.ts (100%) rename apps/{ziggle-be => api}/src/notice/notice.service.ts (96%) rename apps/{ziggle-be => api}/src/notice/types/noticeFullContent.ts (100%) rename apps/{ziggle-be => api}/src/tag/dto/req/createTag.dto.ts (100%) rename apps/{ziggle-be => api}/src/tag/dto/req/getTag.dto.ts (100%) rename apps/{ziggle-be => api}/src/tag/dto/res/TagRes.dto.ts (100%) rename apps/{ziggle-be => api}/src/tag/tag.controller.ts (97%) rename apps/{ziggle-be => api}/src/tag/tag.module.ts (89%) rename apps/{ziggle-be => api}/src/tag/tag.repository.ts (100%) rename apps/{ziggle-be => api}/src/tag/tag.service.ts (100%) rename apps/{ziggle-be => api}/src/user/decorator/get-idp-user.decorator.ts (100%) rename apps/{ziggle-be => api}/src/user/decorator/get-token.decorator.ts (100%) rename apps/{ziggle-be => api}/src/user/decorator/get-user.decorator.ts (100%) rename apps/{ziggle-be => api}/src/user/dto/req/login.dto.ts (77%) rename apps/{ziggle-be => api}/src/user/dto/req/logout.dto.ts (100%) rename apps/{ziggle-be => api}/src/user/dto/req/setFcmTokenReq.dto.ts (100%) rename apps/{ziggle-be => api}/src/user/dto/res/jwtToken.dto.ts (100%) rename apps/{ziggle-be => api}/src/user/dto/res/setFcmTokenRes.dto.ts (100%) rename apps/{ziggle-be => api}/src/user/dto/res/userInfoRes.dto.ts (100%) rename apps/{ziggle-be => api}/src/user/guard/anonymous.strategy.ts (100%) rename apps/{ziggle-be => api}/src/user/guard/idp.guard.ts (100%) rename apps/{ziggle-be => api}/src/user/guard/idp.strategy.ts (100%) rename apps/{ziggle-be => api}/src/user/guard/idpOptional.strategy.ts (100%) rename apps/{ziggle-be => api}/src/user/types/jwtToken.type.ts (100%) rename apps/{ziggle-be => api}/src/user/types/login.type.ts (100%) rename apps/{ziggle-be => api}/src/user/user.controller.ts (100%) rename apps/{ziggle-be => api}/src/user/user.module.ts (100%) rename apps/{ziggle-be => api}/src/user/user.repository.ts (100%) rename apps/{ziggle-be => api}/src/user/user.service.ts (100%) rename apps/{ziggle-be => api}/test/app.e2e-spec.ts (100%) rename apps/{ziggle-be => api}/test/crawl/crawl.controller.integration.spec.ts (100%) rename apps/{ziggle-be => api}/test/crawl/crawl.controller.spec.ts (100%) rename apps/{ziggle-be => api}/test/crawl/crawl.repository.spec.ts (100%) rename apps/{ziggle-be => api}/test/crawl/crawl.service.spec.ts (100%) rename apps/{ziggle-be => api}/test/jest-e2e.json (100%) rename apps/{ziggle-be => api}/tsconfig.app.json (81%) diff --git a/apps/ziggle-be/src/ai/ai.controller.ts b/apps/api/src/ai/ai.controller.ts similarity index 94% rename from apps/ziggle-be/src/ai/ai.controller.ts rename to apps/api/src/ai/ai.controller.ts index 65d1bd1..47a2c07 100644 --- a/apps/ziggle-be/src/ai/ai.controller.ts +++ b/apps/api/src/ai/ai.controller.ts @@ -14,9 +14,9 @@ import { ApiOperation, ApiTags, } from '@nestjs/swagger'; -import { IdPGuard } from 'src/user/guard/idp.guard'; import { TranslateDto } from './dto/req/translate.dto'; import { TranslateResDto } from './dto/res/translateRes.dto'; +import { IdPGuard } from '../user/guard/idp.guard'; @ApiTags('ai') @ApiOAuth2(['email', 'profile', 'openid'], 'oauth2') diff --git a/apps/ziggle-be/src/ai/ai.module.ts b/apps/api/src/ai/ai.module.ts similarity index 88% rename from apps/ziggle-be/src/ai/ai.module.ts rename to apps/api/src/ai/ai.module.ts index 00e1f33..2de8446 100644 --- a/apps/ziggle-be/src/ai/ai.module.ts +++ b/apps/api/src/ai/ai.module.ts @@ -1,9 +1,9 @@ import { Module } from '@nestjs/common'; import { AiService } from './ai.service'; import { AiController } from './ai.controller'; -import { UserModule } from 'src/user/user.module'; import { LoggerModule } from '@lib/logger'; import { CustomConfigModule } from '@lib/custom-config'; +import { UserModule } from '../user/user.module'; @Module({ imports: [CustomConfigModule, UserModule, LoggerModule], diff --git a/apps/ziggle-be/src/ai/ai.service.ts b/apps/api/src/ai/ai.service.ts similarity index 100% rename from apps/ziggle-be/src/ai/ai.service.ts rename to apps/api/src/ai/ai.service.ts diff --git a/apps/ziggle-be/src/ai/dto/req/translate.dto.ts b/apps/api/src/ai/dto/req/translate.dto.ts similarity index 100% rename from apps/ziggle-be/src/ai/dto/req/translate.dto.ts rename to apps/api/src/ai/dto/req/translate.dto.ts diff --git a/apps/ziggle-be/src/ai/dto/res/translateRes.dto.ts b/apps/api/src/ai/dto/res/translateRes.dto.ts similarity index 100% rename from apps/ziggle-be/src/ai/dto/res/translateRes.dto.ts rename to apps/api/src/ai/dto/res/translateRes.dto.ts diff --git a/apps/ziggle-be/src/ai/types/deadlineResponse.type.ts b/apps/api/src/ai/types/deadlineResponse.type.ts similarity index 100% rename from apps/ziggle-be/src/ai/types/deadlineResponse.type.ts rename to apps/api/src/ai/types/deadlineResponse.type.ts diff --git a/apps/ziggle-be/src/app.controller.ts b/apps/api/src/api.controller.ts similarity index 93% rename from apps/ziggle-be/src/app.controller.ts rename to apps/api/src/api.controller.ts index fb83874..45b9206 100644 --- a/apps/ziggle-be/src/app.controller.ts +++ b/apps/api/src/api.controller.ts @@ -2,7 +2,7 @@ import { Controller, Get } from '@nestjs/common'; import { ApiResponse } from '@nestjs/swagger'; @Controller() -export class AppController { +export class ApiController { @ApiResponse({ status: 200, description: 'Send the message "pong" when the server is active.', diff --git a/apps/ziggle-be/src/app.module.ts b/apps/api/src/api.module.ts similarity index 94% rename from apps/ziggle-be/src/app.module.ts rename to apps/api/src/api.module.ts index d3f114f..b7beb32 100644 --- a/apps/ziggle-be/src/app.module.ts +++ b/apps/api/src/api.module.ts @@ -1,5 +1,4 @@ import { Module } from '@nestjs/common'; -import { AppController } from './app.controller'; import { FileModule } from './file/file.module'; import { UserModule } from './user/user.module'; import { TagModule } from './tag/tag.module'; @@ -14,6 +13,7 @@ import { AiModule } from './ai/ai.module'; import { CustomConfigModule, CustomConfigService } from '@lib/custom-config'; import { HealthModule } from './health/health.module'; import { RedisModule } from '@nestjs-modules/ioredis'; +import { ApiController } from './api.controller'; @Module({ imports: [ @@ -51,6 +51,6 @@ import { RedisModule } from '@nestjs-modules/ioredis'; AiModule, HealthModule, ], - controllers: [AppController], + controllers: [ApiController], }) -export class AppModule {} +export class ApiModule {} diff --git a/apps/ziggle-be/src/crawl/crawl.controller.ts b/apps/api/src/crawl/crawl.controller.ts similarity index 100% rename from apps/ziggle-be/src/crawl/crawl.controller.ts rename to apps/api/src/crawl/crawl.controller.ts diff --git a/apps/ziggle-be/src/crawl/crawl.module.ts b/apps/api/src/crawl/crawl.module.ts similarity index 80% rename from apps/ziggle-be/src/crawl/crawl.module.ts rename to apps/api/src/crawl/crawl.module.ts index 39a51ae..0cc5956 100644 --- a/apps/ziggle-be/src/crawl/crawl.module.ts +++ b/apps/api/src/crawl/crawl.module.ts @@ -2,12 +2,12 @@ import { Module } from '@nestjs/common'; import { CrawlService } from './crawl.service'; import { CrawlController } from './crawl.controller'; import { CrawlRepository } from './crawl.repository'; -import { UserModule } from 'src/user/user.module'; -import { AiModule } from 'src/ai/ai.module'; -import { FcmModule } from 'src/fcm/fcm.module'; import { PrismaModule } from '@lib/prisma'; import { LoggerModule } from '@lib/logger'; import { CustomConfigModule } from '@lib/custom-config'; +import { UserModule } from '../user/user.module'; +import { AiModule } from '../ai/ai.module'; +import { FcmModule } from '../fcm/fcm.module'; @Module({ imports: [ diff --git a/apps/ziggle-be/src/crawl/crawl.repository.ts b/apps/api/src/crawl/crawl.repository.ts similarity index 100% rename from apps/ziggle-be/src/crawl/crawl.repository.ts rename to apps/api/src/crawl/crawl.repository.ts diff --git a/apps/ziggle-be/src/crawl/crawl.service.ts b/apps/api/src/crawl/crawl.service.ts similarity index 91% rename from apps/ziggle-be/src/crawl/crawl.service.ts rename to apps/api/src/crawl/crawl.service.ts index 509b8db..7af26a2 100644 --- a/apps/ziggle-be/src/crawl/crawl.service.ts +++ b/apps/api/src/crawl/crawl.service.ts @@ -6,14 +6,14 @@ import { } from '@nestjs/common'; import { CrawlRepository } from './crawl.repository'; import { CreateCrawlDto } from './dto/req/createCrawl.dto'; -import { UserService } from 'src/user/user.service'; import { Crawl } from '@prisma/client'; import { GetCrawlDto } from './dto/req/getCrawl.dto'; -import { AiService } from 'src/ai/ai.service'; -import { FcmService } from 'src/fcm/fcm.service'; -import { FcmTargetUser } from 'src/fcm/types/fcmTargetUser.type'; import { Loggable } from '@lib/logger/decorator/loggable'; import { CustomConfigService } from '@lib/custom-config'; +import { UserService } from '../user/user.service'; +import { FcmService } from '../fcm/fcm.service'; +import { AiService } from '../ai/ai.service'; +import { FcmTargetUser } from '../fcm/types/fcmTargetUser.type'; @Injectable() @Loggable() diff --git a/apps/ziggle-be/src/crawl/dto/req/createCrawl.dto.ts b/apps/api/src/crawl/dto/req/createCrawl.dto.ts similarity index 100% rename from apps/ziggle-be/src/crawl/dto/req/createCrawl.dto.ts rename to apps/api/src/crawl/dto/req/createCrawl.dto.ts diff --git a/apps/ziggle-be/src/crawl/dto/req/getCrawl.dto.ts b/apps/api/src/crawl/dto/req/getCrawl.dto.ts similarity index 100% rename from apps/ziggle-be/src/crawl/dto/req/getCrawl.dto.ts rename to apps/api/src/crawl/dto/req/getCrawl.dto.ts diff --git a/apps/ziggle-be/src/document/document.controller.ts b/apps/api/src/document/document.controller.ts similarity index 100% rename from apps/ziggle-be/src/document/document.controller.ts rename to apps/api/src/document/document.controller.ts diff --git a/apps/ziggle-be/src/document/document.module.ts b/apps/api/src/document/document.module.ts similarity index 88% rename from apps/ziggle-be/src/document/document.module.ts rename to apps/api/src/document/document.module.ts index 3bab816..3e85fb1 100644 --- a/apps/ziggle-be/src/document/document.module.ts +++ b/apps/api/src/document/document.module.ts @@ -1,8 +1,8 @@ import { Module } from '@nestjs/common'; import { DocumentController } from './document.controller'; import { DocumentService } from './document.service'; -import { FileModule } from 'src/file/file.module'; import { LoggerModule } from '@lib/logger'; +import { FileModule } from '../file/file.module'; @Module({ imports: [FileModule, LoggerModule], diff --git a/apps/ziggle-be/src/document/document.service.ts b/apps/api/src/document/document.service.ts similarity index 97% rename from apps/ziggle-be/src/document/document.service.ts rename to apps/api/src/document/document.service.ts index 2fce6a1..6108ad0 100644 --- a/apps/ziggle-be/src/document/document.service.ts +++ b/apps/api/src/document/document.service.ts @@ -1,7 +1,7 @@ import { Loggable } from '@lib/logger/decorator/loggable'; import { Injectable, Logger } from '@nestjs/common'; import path from 'path'; -import { FileService } from 'src/file/file.service'; +import { FileService } from '../file/file.service'; @Injectable() @Loggable() diff --git a/apps/ziggle-be/src/fcm/fcm.consumer.ts b/apps/api/src/fcm/fcm.consumer.ts similarity index 100% rename from apps/ziggle-be/src/fcm/fcm.consumer.ts rename to apps/api/src/fcm/fcm.consumer.ts diff --git a/apps/ziggle-be/src/fcm/fcm.module.ts b/apps/api/src/fcm/fcm.module.ts similarity index 100% rename from apps/ziggle-be/src/fcm/fcm.module.ts rename to apps/api/src/fcm/fcm.module.ts diff --git a/apps/ziggle-be/src/fcm/fcm.repository.ts b/apps/api/src/fcm/fcm.repository.ts similarity index 100% rename from apps/ziggle-be/src/fcm/fcm.repository.ts rename to apps/api/src/fcm/fcm.repository.ts diff --git a/apps/ziggle-be/src/fcm/fcm.service.ts b/apps/api/src/fcm/fcm.service.ts similarity index 100% rename from apps/ziggle-be/src/fcm/fcm.service.ts rename to apps/api/src/fcm/fcm.service.ts diff --git a/apps/ziggle-be/src/fcm/types/content.type.ts b/apps/api/src/fcm/types/content.type.ts similarity index 100% rename from apps/ziggle-be/src/fcm/types/content.type.ts rename to apps/api/src/fcm/types/content.type.ts diff --git a/apps/ziggle-be/src/fcm/types/fcmTargetUser.type.ts b/apps/api/src/fcm/types/fcmTargetUser.type.ts similarity index 100% rename from apps/ziggle-be/src/fcm/types/fcmTargetUser.type.ts rename to apps/api/src/fcm/types/fcmTargetUser.type.ts diff --git a/apps/ziggle-be/src/fcm/types/queue.type.ts b/apps/api/src/fcm/types/queue.type.ts similarity index 100% rename from apps/ziggle-be/src/fcm/types/queue.type.ts rename to apps/api/src/fcm/types/queue.type.ts diff --git a/apps/ziggle-be/src/file/file.module.ts b/apps/api/src/file/file.module.ts similarity index 100% rename from apps/ziggle-be/src/file/file.module.ts rename to apps/api/src/file/file.module.ts diff --git a/apps/ziggle-be/src/file/file.service.ts b/apps/api/src/file/file.service.ts similarity index 100% rename from apps/ziggle-be/src/file/file.service.ts rename to apps/api/src/file/file.service.ts diff --git a/apps/ziggle-be/src/group/dto/req/getGroup.dto.ts b/apps/api/src/group/dto/req/getGroup.dto.ts similarity index 100% rename from apps/ziggle-be/src/group/dto/req/getGroup.dto.ts rename to apps/api/src/group/dto/req/getGroup.dto.ts diff --git a/apps/ziggle-be/src/group/dto/res/GroupsRes.dto.ts b/apps/api/src/group/dto/res/GroupsRes.dto.ts similarity index 100% rename from apps/ziggle-be/src/group/dto/res/GroupsRes.dto.ts rename to apps/api/src/group/dto/res/GroupsRes.dto.ts diff --git a/apps/ziggle-be/src/group/dto/res/GroupsTokenRes.dto.ts b/apps/api/src/group/dto/res/GroupsTokenRes.dto.ts similarity index 100% rename from apps/ziggle-be/src/group/dto/res/GroupsTokenRes.dto.ts rename to apps/api/src/group/dto/res/GroupsTokenRes.dto.ts diff --git a/apps/ziggle-be/src/group/group.controller.ts b/apps/api/src/group/group.controller.ts similarity index 93% rename from apps/ziggle-be/src/group/group.controller.ts rename to apps/api/src/group/group.controller.ts index 6a295f7..a2dbd9c 100644 --- a/apps/ziggle-be/src/group/group.controller.ts +++ b/apps/api/src/group/group.controller.ts @@ -1,6 +1,5 @@ import { Controller, Get, Post, Query, UseGuards } from '@nestjs/common'; import { GroupService } from './group.service'; -import { IdPGuard } from 'src/user/guard/idp.guard'; import { ApiCreatedResponse, ApiInternalServerErrorResponse, @@ -10,10 +9,11 @@ import { ApiTags, ApiUnauthorizedResponse, } from '@nestjs/swagger'; -import { GetToken } from 'src/user/decorator/get-token.decorator'; import { GroupsTokenRes } from './dto/res/GroupsTokenRes.dto'; import { GroupListResDto } from './dto/res/GroupsRes.dto'; import { GetGroupByNameQueryDto } from './dto/req/getGroup.dto'; +import { IdPGuard } from '../user/guard/idp.guard'; +import { GetToken } from '../user/decorator/get-token.decorator'; @ApiTags('Group') @ApiOAuth2(['email', 'profile', 'openid'], 'oauth2') diff --git a/apps/ziggle-be/src/group/group.module.ts b/apps/api/src/group/group.module.ts similarity index 91% rename from apps/ziggle-be/src/group/group.module.ts rename to apps/api/src/group/group.module.ts index 47ade99..a2d9adc 100644 --- a/apps/ziggle-be/src/group/group.module.ts +++ b/apps/api/src/group/group.module.ts @@ -2,10 +2,10 @@ import { Module } from '@nestjs/common'; import { GroupService } from './group.service'; import { HttpModule } from '@nestjs/axios'; import { GroupController } from './group.controller'; -import { UserModule } from 'src/user/user.module'; import { PrismaModule } from '@lib/prisma'; import { LoggerModule } from '@lib/logger'; import { CustomConfigModule } from '@lib/custom-config'; +import { UserModule } from '../user/user.module'; @Module({ imports: [ diff --git a/apps/ziggle-be/src/group/group.service.ts b/apps/api/src/group/group.service.ts similarity index 100% rename from apps/ziggle-be/src/group/group.service.ts rename to apps/api/src/group/group.service.ts diff --git a/apps/ziggle-be/src/group/types/groupInfo.type.ts b/apps/api/src/group/types/groupInfo.type.ts similarity index 100% rename from apps/ziggle-be/src/group/types/groupInfo.type.ts rename to apps/api/src/group/types/groupInfo.type.ts diff --git a/apps/ziggle-be/src/group/types/groupsToken.type.ts b/apps/api/src/group/types/groupsToken.type.ts similarity index 100% rename from apps/ziggle-be/src/group/types/groupsToken.type.ts rename to apps/api/src/group/types/groupsToken.type.ts diff --git a/apps/ziggle-be/src/health/health.controller.ts b/apps/api/src/health/health.controller.ts similarity index 100% rename from apps/ziggle-be/src/health/health.controller.ts rename to apps/api/src/health/health.controller.ts diff --git a/apps/ziggle-be/src/health/health.module.ts b/apps/api/src/health/health.module.ts similarity index 100% rename from apps/ziggle-be/src/health/health.module.ts rename to apps/api/src/health/health.module.ts diff --git a/apps/ziggle-be/src/health/indicator/redis.indicator.ts b/apps/api/src/health/indicator/redis.indicator.ts similarity index 100% rename from apps/ziggle-be/src/health/indicator/redis.indicator.ts rename to apps/api/src/health/indicator/redis.indicator.ts diff --git a/apps/ziggle-be/src/image/image.controller.ts b/apps/api/src/image/image.controller.ts similarity index 100% rename from apps/ziggle-be/src/image/image.controller.ts rename to apps/api/src/image/image.controller.ts diff --git a/apps/ziggle-be/src/image/image.module.ts b/apps/api/src/image/image.module.ts similarity index 87% rename from apps/ziggle-be/src/image/image.module.ts rename to apps/api/src/image/image.module.ts index 2b43a78..22eda7d 100644 --- a/apps/ziggle-be/src/image/image.module.ts +++ b/apps/api/src/image/image.module.ts @@ -1,8 +1,8 @@ import { Module } from '@nestjs/common'; import { ImageService } from './image.service'; import { ImageController } from './image.controller'; -import { FileModule } from 'src/file/file.module'; import { LoggerModule } from '@lib/logger'; +import { FileModule } from '../file/file.module'; @Module({ imports: [FileModule, LoggerModule], diff --git a/apps/ziggle-be/src/image/image.service.ts b/apps/api/src/image/image.service.ts similarity index 95% rename from apps/ziggle-be/src/image/image.service.ts rename to apps/api/src/image/image.service.ts index 9d13bff..e73aa04 100644 --- a/apps/ziggle-be/src/image/image.service.ts +++ b/apps/api/src/image/image.service.ts @@ -2,17 +2,15 @@ import { BadRequestException, Injectable, InternalServerErrorException, - Logger, } from '@nestjs/common'; import path from 'path'; -import { FileService } from 'src/file/file.service'; import sharp from 'sharp'; import { Loggable } from '@lib/logger/decorator/loggable'; +import { FileService } from '../file/file.service'; @Injectable() @Loggable() export class ImageService { - private readonly logger = new Logger(ImageService.name); constructor(private readonly fileService: FileService) {} /** diff --git a/apps/ziggle-be/src/main.ts b/apps/api/src/main.ts similarity index 96% rename from apps/ziggle-be/src/main.ts rename to apps/api/src/main.ts index d190d4c..6126f8c 100644 --- a/apps/ziggle-be/src/main.ts +++ b/apps/api/src/main.ts @@ -1,13 +1,13 @@ import { NestFactory } from '@nestjs/core'; -import { AppModule } from './app.module'; import cookieParser from 'cookie-parser'; import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger'; import expressBasicAuth from 'express-basic-auth'; import { json } from 'express'; import { CustomConfigService } from '@lib/custom-config'; +import { ApiModule } from './api.module'; async function bootstrap() { - const app = await NestFactory.create(AppModule); + const app = await NestFactory.create(ApiModule); const customConfigService = app.get(CustomConfigService); // swagger auth config app.use( diff --git a/apps/ziggle-be/src/notice/dto/req/additionalNotice.dto.ts b/apps/api/src/notice/dto/req/additionalNotice.dto.ts similarity index 100% rename from apps/ziggle-be/src/notice/dto/req/additionalNotice.dto.ts rename to apps/api/src/notice/dto/req/additionalNotice.dto.ts diff --git a/apps/ziggle-be/src/notice/dto/req/createNotice.dto.ts b/apps/api/src/notice/dto/req/createNotice.dto.ts similarity index 100% rename from apps/ziggle-be/src/notice/dto/req/createNotice.dto.ts rename to apps/api/src/notice/dto/req/createNotice.dto.ts diff --git a/apps/ziggle-be/src/notice/dto/req/foreignContent.dto.ts b/apps/api/src/notice/dto/req/foreignContent.dto.ts similarity index 100% rename from apps/ziggle-be/src/notice/dto/req/foreignContent.dto.ts rename to apps/api/src/notice/dto/req/foreignContent.dto.ts diff --git a/apps/ziggle-be/src/notice/dto/req/getAllNotice.dto.ts b/apps/api/src/notice/dto/req/getAllNotice.dto.ts similarity index 100% rename from apps/ziggle-be/src/notice/dto/req/getAllNotice.dto.ts rename to apps/api/src/notice/dto/req/getAllNotice.dto.ts diff --git a/apps/ziggle-be/src/notice/dto/req/getGroupNotice.dto.ts b/apps/api/src/notice/dto/req/getGroupNotice.dto.ts similarity index 100% rename from apps/ziggle-be/src/notice/dto/req/getGroupNotice.dto.ts rename to apps/api/src/notice/dto/req/getGroupNotice.dto.ts diff --git a/apps/ziggle-be/src/notice/dto/req/getNotice.dto.ts b/apps/api/src/notice/dto/req/getNotice.dto.ts similarity index 100% rename from apps/ziggle-be/src/notice/dto/req/getNotice.dto.ts rename to apps/api/src/notice/dto/req/getNotice.dto.ts diff --git a/apps/ziggle-be/src/notice/dto/req/reaction.dto.ts b/apps/api/src/notice/dto/req/reaction.dto.ts similarity index 100% rename from apps/ziggle-be/src/notice/dto/req/reaction.dto.ts rename to apps/api/src/notice/dto/req/reaction.dto.ts diff --git a/apps/ziggle-be/src/notice/dto/req/updateNotice.dto.ts b/apps/api/src/notice/dto/req/updateNotice.dto.ts similarity index 100% rename from apps/ziggle-be/src/notice/dto/req/updateNotice.dto.ts rename to apps/api/src/notice/dto/req/updateNotice.dto.ts diff --git a/apps/ziggle-be/src/notice/dto/res/expandedGeneralNotice.dto.ts b/apps/api/src/notice/dto/res/expandedGeneralNotice.dto.ts similarity index 100% rename from apps/ziggle-be/src/notice/dto/res/expandedGeneralNotice.dto.ts rename to apps/api/src/notice/dto/res/expandedGeneralNotice.dto.ts diff --git a/apps/ziggle-be/src/notice/dto/res/generalNotice.dto.ts b/apps/api/src/notice/dto/res/generalNotice.dto.ts similarity index 100% rename from apps/ziggle-be/src/notice/dto/res/generalNotice.dto.ts rename to apps/api/src/notice/dto/res/generalNotice.dto.ts diff --git a/apps/ziggle-be/src/notice/notice.controller.ts b/apps/api/src/notice/notice.controller.ts similarity index 98% rename from apps/ziggle-be/src/notice/notice.controller.ts rename to apps/api/src/notice/notice.controller.ts index 2f8ca60..651e7e6 100644 --- a/apps/ziggle-be/src/notice/notice.controller.ts +++ b/apps/api/src/notice/notice.controller.ts @@ -23,11 +23,9 @@ import { ApiUnauthorizedResponse, } from '@nestjs/swagger'; import { NoticeService } from './notice.service'; -import { IdPGuard, IdPOptionalGuard } from 'src/user/guard/idp.guard'; import { GeneralNoticeListDto } from './dto/res/generalNotice.dto'; import { GetAllNoticeQueryDto } from './dto/req/getAllNotice.dto'; import { User } from '@prisma/client'; -import { GetUser } from 'src/user/decorator/get-user.decorator'; import { ExpandedGeneralNoticeDto } from './dto/res/expandedGeneralNotice.dto'; import { CreateNoticeDto } from './dto/req/createNotice.dto'; import { ForeignContentDto } from './dto/req/foreignContent.dto'; @@ -38,6 +36,8 @@ import { } from './dto/req/updateNotice.dto'; import { AdditionalNoticeDto } from './dto/req/additionalNotice.dto'; import { GetGroupNoticeQueryDto } from './dto/req/getGroupNotice.dto'; +import { IdPGuard, IdPOptionalGuard } from '../user/guard/idp.guard'; +import { GetUser } from '../user/decorator/get-user.decorator'; @ApiTags('notice') @ApiOAuth2(['email', 'profile', 'openid'], 'oauth2') diff --git a/apps/ziggle-be/src/notice/notice.mapper.ts b/apps/api/src/notice/notice.mapper.ts similarity index 100% rename from apps/ziggle-be/src/notice/notice.mapper.ts rename to apps/api/src/notice/notice.mapper.ts diff --git a/apps/ziggle-be/src/notice/notice.module.ts b/apps/api/src/notice/notice.module.ts similarity index 69% rename from apps/ziggle-be/src/notice/notice.module.ts rename to apps/api/src/notice/notice.module.ts index 517933c..fe28307 100644 --- a/apps/ziggle-be/src/notice/notice.module.ts +++ b/apps/api/src/notice/notice.module.ts @@ -2,16 +2,16 @@ import { Module } from '@nestjs/common'; import { NoticeController } from './notice.controller'; import { NoticeService } from './notice.service'; import { NoticeRepository } from './notice.repository'; -import { UserModule } from 'src/user/user.module'; import { NoticeMapper } from './notice.mapper'; -import { ImageModule } from 'src/image/image.module'; -import { DocumentModule } from 'src/document/document.module'; -import { FileModule } from 'src/file/file.module'; -import { GroupModule } from 'src/group/group.module'; -import { FcmModule } from 'src/fcm/fcm.module'; import { PrismaModule } from '@lib/prisma'; import { LoggerModule } from '@lib/logger'; import { CustomConfigModule } from '@lib/custom-config'; +import { UserModule } from '../user/user.module'; +import { ImageModule } from '../image/image.module'; +import { DocumentModule } from '../document/document.module'; +import { FileModule } from '../file/file.module'; +import { GroupModule } from '../group/group.module'; +import { FcmModule } from '../fcm/fcm.module'; @Module({ imports: [ diff --git a/apps/ziggle-be/src/notice/notice.repository.ts b/apps/api/src/notice/notice.repository.ts similarity index 100% rename from apps/ziggle-be/src/notice/notice.repository.ts rename to apps/api/src/notice/notice.repository.ts diff --git a/apps/ziggle-be/src/notice/notice.service.ts b/apps/api/src/notice/notice.service.ts similarity index 96% rename from apps/ziggle-be/src/notice/notice.service.ts rename to apps/api/src/notice/notice.service.ts index 0e843db..2c6bca6 100644 --- a/apps/ziggle-be/src/notice/notice.service.ts +++ b/apps/api/src/notice/notice.service.ts @@ -14,8 +14,6 @@ import { GetNoticeDto } from './dto/req/getNotice.dto'; import { ExpandedGeneralNoticeDto } from './dto/res/expandedGeneralNotice.dto'; import { NoticeFullContent } from './types/noticeFullContent'; import { CreateNoticeDto } from './dto/req/createNotice.dto'; -import { ImageService } from 'src/image/image.service'; -import { DocumentService } from 'src/document/document.service'; import { AdditionalNoticeDto } from './dto/req/additionalNotice.dto'; import { ForeignContentDto } from './dto/req/foreignContent.dto'; import { ReactionDto } from './dto/req/reaction.dto'; @@ -23,16 +21,18 @@ import { UpdateNoticeDto, UpdateNoticeQueryDto, } from './dto/req/updateNotice.dto'; -import { FileService } from 'src/file/file.service'; -import { GroupService } from 'src/group/group.service'; -import { FcmService } from 'src/fcm/fcm.service'; -import { FcmTargetUser } from 'src/fcm/types/fcmTargetUser.type'; import { htmlToText } from 'html-to-text'; import { Notification } from 'firebase-admin/messaging'; import { GetGroupNoticeQueryDto } from './dto/req/getGroupNotice.dto'; import { Authority } from '../group/types/groupInfo.type'; import { Loggable } from '@lib/logger/decorator/loggable'; import { CustomConfigService } from '@lib/custom-config'; +import { ImageService } from '../image/image.service'; +import { DocumentService } from '../document/document.service'; +import { FileService } from '../file/file.service'; +import { GroupService } from '../group/group.service'; +import { FcmService } from '../fcm/fcm.service'; +import { FcmTargetUser } from '../fcm/types/fcmTargetUser.type'; @Injectable() @Loggable() diff --git a/apps/ziggle-be/src/notice/types/noticeFullContent.ts b/apps/api/src/notice/types/noticeFullContent.ts similarity index 100% rename from apps/ziggle-be/src/notice/types/noticeFullContent.ts rename to apps/api/src/notice/types/noticeFullContent.ts diff --git a/apps/ziggle-be/src/tag/dto/req/createTag.dto.ts b/apps/api/src/tag/dto/req/createTag.dto.ts similarity index 100% rename from apps/ziggle-be/src/tag/dto/req/createTag.dto.ts rename to apps/api/src/tag/dto/req/createTag.dto.ts diff --git a/apps/ziggle-be/src/tag/dto/req/getTag.dto.ts b/apps/api/src/tag/dto/req/getTag.dto.ts similarity index 100% rename from apps/ziggle-be/src/tag/dto/req/getTag.dto.ts rename to apps/api/src/tag/dto/req/getTag.dto.ts diff --git a/apps/ziggle-be/src/tag/dto/res/TagRes.dto.ts b/apps/api/src/tag/dto/res/TagRes.dto.ts similarity index 100% rename from apps/ziggle-be/src/tag/dto/res/TagRes.dto.ts rename to apps/api/src/tag/dto/res/TagRes.dto.ts diff --git a/apps/ziggle-be/src/tag/tag.controller.ts b/apps/api/src/tag/tag.controller.ts similarity index 97% rename from apps/ziggle-be/src/tag/tag.controller.ts rename to apps/api/src/tag/tag.controller.ts index a83c674..5bef3b7 100644 --- a/apps/ziggle-be/src/tag/tag.controller.ts +++ b/apps/api/src/tag/tag.controller.ts @@ -21,7 +21,7 @@ import { import { GetTagDto } from './dto/req/getTag.dto'; import { CreateTagDto } from './dto/req/createTag.dto'; import { TagResDto } from './dto/res/TagRes.dto'; -import { IdPGuard } from 'src/user/guard/idp.guard'; +import { IdPGuard } from '../user/guard/idp.guard'; @ApiTags('tag') @ApiOAuth2(['email', 'profile', 'openid'], 'oauth2') diff --git a/apps/ziggle-be/src/tag/tag.module.ts b/apps/api/src/tag/tag.module.ts similarity index 89% rename from apps/ziggle-be/src/tag/tag.module.ts rename to apps/api/src/tag/tag.module.ts index a244f69..0b7cbf6 100644 --- a/apps/ziggle-be/src/tag/tag.module.ts +++ b/apps/api/src/tag/tag.module.ts @@ -2,9 +2,9 @@ import { Module } from '@nestjs/common'; import { TagController } from './tag.controller'; import { TagService } from './tag.service'; import { TagRepository } from './tag.repository'; -import { UserModule } from 'src/user/user.module'; import { PrismaModule } from '@lib/prisma'; import { LoggerModule } from '@lib/logger'; +import { UserModule } from '../user/user.module'; @Module({ imports: [PrismaModule, UserModule, LoggerModule], diff --git a/apps/ziggle-be/src/tag/tag.repository.ts b/apps/api/src/tag/tag.repository.ts similarity index 100% rename from apps/ziggle-be/src/tag/tag.repository.ts rename to apps/api/src/tag/tag.repository.ts diff --git a/apps/ziggle-be/src/tag/tag.service.ts b/apps/api/src/tag/tag.service.ts similarity index 100% rename from apps/ziggle-be/src/tag/tag.service.ts rename to apps/api/src/tag/tag.service.ts diff --git a/apps/ziggle-be/src/user/decorator/get-idp-user.decorator.ts b/apps/api/src/user/decorator/get-idp-user.decorator.ts similarity index 100% rename from apps/ziggle-be/src/user/decorator/get-idp-user.decorator.ts rename to apps/api/src/user/decorator/get-idp-user.decorator.ts diff --git a/apps/ziggle-be/src/user/decorator/get-token.decorator.ts b/apps/api/src/user/decorator/get-token.decorator.ts similarity index 100% rename from apps/ziggle-be/src/user/decorator/get-token.decorator.ts rename to apps/api/src/user/decorator/get-token.decorator.ts diff --git a/apps/ziggle-be/src/user/decorator/get-user.decorator.ts b/apps/api/src/user/decorator/get-user.decorator.ts similarity index 100% rename from apps/ziggle-be/src/user/decorator/get-user.decorator.ts rename to apps/api/src/user/decorator/get-user.decorator.ts diff --git a/apps/ziggle-be/src/user/dto/req/login.dto.ts b/apps/api/src/user/dto/req/login.dto.ts similarity index 77% rename from apps/ziggle-be/src/user/dto/req/login.dto.ts rename to apps/api/src/user/dto/req/login.dto.ts index f0dbc42..12ec6d6 100644 --- a/apps/ziggle-be/src/user/dto/req/login.dto.ts +++ b/apps/api/src/user/dto/req/login.dto.ts @@ -1,5 +1,5 @@ import { IsEnum, IsNotEmpty, IsOptional, IsString } from 'class-validator'; -import { LoginType, loginEnum } from 'src/user/types/login.type'; +import { loginEnum, LoginType } from '../../types/login.type'; export class LoginDto { @IsString() diff --git a/apps/ziggle-be/src/user/dto/req/logout.dto.ts b/apps/api/src/user/dto/req/logout.dto.ts similarity index 100% rename from apps/ziggle-be/src/user/dto/req/logout.dto.ts rename to apps/api/src/user/dto/req/logout.dto.ts diff --git a/apps/ziggle-be/src/user/dto/req/setFcmTokenReq.dto.ts b/apps/api/src/user/dto/req/setFcmTokenReq.dto.ts similarity index 100% rename from apps/ziggle-be/src/user/dto/req/setFcmTokenReq.dto.ts rename to apps/api/src/user/dto/req/setFcmTokenReq.dto.ts diff --git a/apps/ziggle-be/src/user/dto/res/jwtToken.dto.ts b/apps/api/src/user/dto/res/jwtToken.dto.ts similarity index 100% rename from apps/ziggle-be/src/user/dto/res/jwtToken.dto.ts rename to apps/api/src/user/dto/res/jwtToken.dto.ts diff --git a/apps/ziggle-be/src/user/dto/res/setFcmTokenRes.dto.ts b/apps/api/src/user/dto/res/setFcmTokenRes.dto.ts similarity index 100% rename from apps/ziggle-be/src/user/dto/res/setFcmTokenRes.dto.ts rename to apps/api/src/user/dto/res/setFcmTokenRes.dto.ts diff --git a/apps/ziggle-be/src/user/dto/res/userInfoRes.dto.ts b/apps/api/src/user/dto/res/userInfoRes.dto.ts similarity index 100% rename from apps/ziggle-be/src/user/dto/res/userInfoRes.dto.ts rename to apps/api/src/user/dto/res/userInfoRes.dto.ts diff --git a/apps/ziggle-be/src/user/guard/anonymous.strategy.ts b/apps/api/src/user/guard/anonymous.strategy.ts similarity index 100% rename from apps/ziggle-be/src/user/guard/anonymous.strategy.ts rename to apps/api/src/user/guard/anonymous.strategy.ts diff --git a/apps/ziggle-be/src/user/guard/idp.guard.ts b/apps/api/src/user/guard/idp.guard.ts similarity index 100% rename from apps/ziggle-be/src/user/guard/idp.guard.ts rename to apps/api/src/user/guard/idp.guard.ts diff --git a/apps/ziggle-be/src/user/guard/idp.strategy.ts b/apps/api/src/user/guard/idp.strategy.ts similarity index 100% rename from apps/ziggle-be/src/user/guard/idp.strategy.ts rename to apps/api/src/user/guard/idp.strategy.ts diff --git a/apps/ziggle-be/src/user/guard/idpOptional.strategy.ts b/apps/api/src/user/guard/idpOptional.strategy.ts similarity index 100% rename from apps/ziggle-be/src/user/guard/idpOptional.strategy.ts rename to apps/api/src/user/guard/idpOptional.strategy.ts diff --git a/apps/ziggle-be/src/user/types/jwtToken.type.ts b/apps/api/src/user/types/jwtToken.type.ts similarity index 100% rename from apps/ziggle-be/src/user/types/jwtToken.type.ts rename to apps/api/src/user/types/jwtToken.type.ts diff --git a/apps/ziggle-be/src/user/types/login.type.ts b/apps/api/src/user/types/login.type.ts similarity index 100% rename from apps/ziggle-be/src/user/types/login.type.ts rename to apps/api/src/user/types/login.type.ts diff --git a/apps/ziggle-be/src/user/user.controller.ts b/apps/api/src/user/user.controller.ts similarity index 100% rename from apps/ziggle-be/src/user/user.controller.ts rename to apps/api/src/user/user.controller.ts diff --git a/apps/ziggle-be/src/user/user.module.ts b/apps/api/src/user/user.module.ts similarity index 100% rename from apps/ziggle-be/src/user/user.module.ts rename to apps/api/src/user/user.module.ts diff --git a/apps/ziggle-be/src/user/user.repository.ts b/apps/api/src/user/user.repository.ts similarity index 100% rename from apps/ziggle-be/src/user/user.repository.ts rename to apps/api/src/user/user.repository.ts diff --git a/apps/ziggle-be/src/user/user.service.ts b/apps/api/src/user/user.service.ts similarity index 100% rename from apps/ziggle-be/src/user/user.service.ts rename to apps/api/src/user/user.service.ts diff --git a/apps/ziggle-be/test/app.e2e-spec.ts b/apps/api/test/app.e2e-spec.ts similarity index 100% rename from apps/ziggle-be/test/app.e2e-spec.ts rename to apps/api/test/app.e2e-spec.ts diff --git a/apps/ziggle-be/test/crawl/crawl.controller.integration.spec.ts b/apps/api/test/crawl/crawl.controller.integration.spec.ts similarity index 100% rename from apps/ziggle-be/test/crawl/crawl.controller.integration.spec.ts rename to apps/api/test/crawl/crawl.controller.integration.spec.ts diff --git a/apps/ziggle-be/test/crawl/crawl.controller.spec.ts b/apps/api/test/crawl/crawl.controller.spec.ts similarity index 100% rename from apps/ziggle-be/test/crawl/crawl.controller.spec.ts rename to apps/api/test/crawl/crawl.controller.spec.ts diff --git a/apps/ziggle-be/test/crawl/crawl.repository.spec.ts b/apps/api/test/crawl/crawl.repository.spec.ts similarity index 100% rename from apps/ziggle-be/test/crawl/crawl.repository.spec.ts rename to apps/api/test/crawl/crawl.repository.spec.ts diff --git a/apps/ziggle-be/test/crawl/crawl.service.spec.ts b/apps/api/test/crawl/crawl.service.spec.ts similarity index 100% rename from apps/ziggle-be/test/crawl/crawl.service.spec.ts rename to apps/api/test/crawl/crawl.service.spec.ts diff --git a/apps/ziggle-be/test/jest-e2e.json b/apps/api/test/jest-e2e.json similarity index 100% rename from apps/ziggle-be/test/jest-e2e.json rename to apps/api/test/jest-e2e.json diff --git a/apps/ziggle-be/tsconfig.app.json b/apps/api/tsconfig.app.json similarity index 81% rename from apps/ziggle-be/tsconfig.app.json rename to apps/api/tsconfig.app.json index c117877..e2e0b2f 100644 --- a/apps/ziggle-be/tsconfig.app.json +++ b/apps/api/tsconfig.app.json @@ -2,7 +2,7 @@ "extends": "../../tsconfig.json", "compilerOptions": { "declaration": false, - "outDir": "../../dist/apps/ziggle-be" + "outDir": "../../dist/apps/api" }, "include": ["src/**/*"], "exclude": ["node_modules", "dist", "test", "**/*spec.ts"] diff --git a/nest-cli.json b/nest-cli.json index 99ffe1d..a1567f9 100644 --- a/nest-cli.json +++ b/nest-cli.json @@ -1,11 +1,11 @@ { "$schema": "https://json.schemastore.org/nest-cli", "collection": "@nestjs/schematics", - "sourceRoot": "apps/ziggle-be/src", + "sourceRoot": "apps/api/src", "compilerOptions": { "deleteOutDir": true, "webpack": true, - "tsConfigPath": "apps/ziggle-be/tsconfig.app.json" + "tsConfigPath": "apps/api/tsconfig.app.json" }, "projects": { "prisma": { @@ -53,13 +53,13 @@ "tsConfigPath": "libs/custom-config/tsconfig.lib.json" } }, - "ziggle-be": { + "api": { "type": "application", - "root": "apps/ziggle-be", + "root": "apps/api", "entryFile": "main", - "sourceRoot": "apps/ziggle-be/src", + "sourceRoot": "apps/api/src", "compilerOptions": { - "tsConfigPath": "apps/ziggle-be/tsconfig.app.json" + "tsConfigPath": "apps/api/tsconfig.app.json" } }, "crawler": { @@ -73,5 +73,5 @@ } }, "monorepo": true, - "root": "apps/ziggle-be" + "root": "apps/api" } \ No newline at end of file From 472c977a0fb24d0e5ed7b50118f09f03c7c608bf Mon Sep 17 00:00:00 2001 From: siwonpada Date: Fri, 3 Jan 2025 23:54:27 +0900 Subject: [PATCH 03/10] update: CI --- .github/workflows/production.yml | 1 + .github/workflows/staging.yml | 3 +- .vscode/settings.json | 6 +++- Dockerfile => apps/api/Dockerfile | 0 apps/crawler/Dockerfile | 32 +++++++++++++++++++++ apps/crawler/src/crawler.controller.spec.ts | 22 -------------- apps/crawler/src/crawler.controller.ts | 12 -------- apps/crawler/src/crawler.module.ts | 9 +++--- apps/crawler/src/crawler.repository.ts | 7 +++++ apps/crawler/src/crawler.service.ts | 5 ++-- package.json | 5 ++-- 11 files changed, 57 insertions(+), 45 deletions(-) rename Dockerfile => apps/api/Dockerfile (100%) create mode 100644 apps/crawler/Dockerfile delete mode 100644 apps/crawler/src/crawler.controller.spec.ts delete mode 100644 apps/crawler/src/crawler.controller.ts create mode 100644 apps/crawler/src/crawler.repository.ts diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml index 01a9998..ba68d75 100644 --- a/.github/workflows/production.yml +++ b/.github/workflows/production.yml @@ -49,6 +49,7 @@ jobs: uses: docker/build-push-action@v6 with: context: . + file: ./apps/api/Dockerfile push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index df6603f..eda8f9d 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -3,7 +3,7 @@ name: Update Kubernetes Cluster (Dev) on: push: paths: - - src/** + - apps/api/** - prisma/schema.prisma branches: - main @@ -52,6 +52,7 @@ jobs: uses: docker/build-push-action@v6 with: context: . + file: ./apps/api/Dockerfile push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/.vscode/settings.json b/.vscode/settings.json index e298df9..91d6cd7 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -10,6 +10,9 @@ "gitops", "gsainfoteam", "infoteam", + "libheif", + "linuxmusl", + "localtime", "LOGGABLE", "metatype", "nestjs", @@ -17,7 +20,8 @@ "openai", "prisma", "rxjs", - "ziggle" + "ziggle", + "zoneinfo" ], "git.branchProtection": ["main"] } diff --git a/Dockerfile b/apps/api/Dockerfile similarity index 100% rename from Dockerfile rename to apps/api/Dockerfile diff --git a/apps/crawler/Dockerfile b/apps/crawler/Dockerfile new file mode 100644 index 0000000..a90aeb7 --- /dev/null +++ b/apps/crawler/Dockerfile @@ -0,0 +1,32 @@ +#Step 1: Build the app in image 'builder' +FROM node:21-alpine3.18 AS builder + +WORKDIR /app + +COPY package.json package-lock.json ./ + +RUN apk update && \ + apk add build-base libheif vips-dev vips -q +RUN npm install && npm install --force @img/sharp-linuxmusl-arm64 + +COPY . . + +RUN npx prisma generate + +RUN npx nest build crawler + +#Step 2: Copy the build from 'builder' to 'runner' +FROM node:21-alpine3.18 + +WORKDIR /app + +ENV TZ=Asia/Seoul +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && \ + apk update && \ + apk add build-base libheif vips-dev vips -q + +COPY --from=builder /app ./ + +RUN npm install -D prisma --platform=linuxmusl + +CMD ["npm", "run", "start:crawler"] diff --git a/apps/crawler/src/crawler.controller.spec.ts b/apps/crawler/src/crawler.controller.spec.ts deleted file mode 100644 index bddad63..0000000 --- a/apps/crawler/src/crawler.controller.spec.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { Test, TestingModule } from '@nestjs/testing'; -import { CrawlerController } from './crawler.controller'; -import { CrawlerService } from './crawler.service'; - -describe('CrawlerController', () => { - let crawlerController: CrawlerController; - - beforeEach(async () => { - const app: TestingModule = await Test.createTestingModule({ - controllers: [CrawlerController], - providers: [CrawlerService], - }).compile(); - - crawlerController = app.get(CrawlerController); - }); - - describe('root', () => { - it('should return "Hello World!"', () => { - expect(crawlerController.getHello()).toBe('Hello World!'); - }); - }); -}); diff --git a/apps/crawler/src/crawler.controller.ts b/apps/crawler/src/crawler.controller.ts deleted file mode 100644 index 30c233d..0000000 --- a/apps/crawler/src/crawler.controller.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { Controller, Get } from '@nestjs/common'; -import { CrawlerService } from './crawler.service'; - -@Controller() -export class CrawlerController { - constructor(private readonly crawlerService: CrawlerService) {} - - @Get() - getHello(): string { - return this.crawlerService.getHello(); - } -} diff --git a/apps/crawler/src/crawler.module.ts b/apps/crawler/src/crawler.module.ts index c9420cb..49694aa 100644 --- a/apps/crawler/src/crawler.module.ts +++ b/apps/crawler/src/crawler.module.ts @@ -1,10 +1,11 @@ import { Module } from '@nestjs/common'; -import { CrawlerController } from './crawler.controller'; import { CrawlerService } from './crawler.service'; +import { PrismaModule } from '@lib/prisma'; +import { HttpModule } from '@nestjs/axios'; +import { CrawlerRepository } from './crawler.repository'; @Module({ - imports: [], - controllers: [CrawlerController], - providers: [CrawlerService], + imports: [PrismaModule, HttpModule], + providers: [CrawlerService, CrawlerRepository], }) export class CrawlerModule {} diff --git a/apps/crawler/src/crawler.repository.ts b/apps/crawler/src/crawler.repository.ts new file mode 100644 index 0000000..e139f8c --- /dev/null +++ b/apps/crawler/src/crawler.repository.ts @@ -0,0 +1,7 @@ +import { PrismaService } from '@lib/prisma'; +import { Injectable } from '@nestjs/common'; + +@Injectable() +export class CrawlerRepository { + constructor(private readonly prismaService: PrismaService) {} +} diff --git a/apps/crawler/src/crawler.service.ts b/apps/crawler/src/crawler.service.ts index 9526a20..0525161 100644 --- a/apps/crawler/src/crawler.service.ts +++ b/apps/crawler/src/crawler.service.ts @@ -1,8 +1,7 @@ +import { HttpService } from '@nestjs/axios'; import { Injectable } from '@nestjs/common'; @Injectable() export class CrawlerService { - getHello(): string { - return 'Hello World!'; - } + constructor(private readonly httpService: HttpService) {} } diff --git a/package.json b/package.json index 6d78a3e..bab7c23 100644 --- a/package.json +++ b/package.json @@ -11,8 +11,9 @@ "start": "nest start", "start:dev": "nest start --watch", "start:debug": "nest start --debug --watch", - "start:deploy": "npx prisma migrate deploy && node dist/main", - "start:prod": "node dist/apps/ziggle-be/main", + "start:deploy": "npx prisma migrate deploy && node dist/apps/api/main", + "start:prod": "node dist/apps/api/main", + "start:crawler": "node dist/apps/crawler/main", "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix", "test": "jest", "test:watch": "jest --watch", From f99427d7cf77299d9bd3552ff1bb08a0f59b28ef Mon Sep 17 00:00:00 2001 From: Shiwon Park Date: Wed, 8 Jan 2025 19:53:14 +0900 Subject: [PATCH 04/10] test setting --- apps/crawler/test/app.e2e-spec.ts | 24 ------------------- apps/crawler/test/crawler.service.spec.ts | 24 +++++++++++++++++++ .../crawler/test/{jest-e2e.json => jest.json} | 2 +- package.json | 5 ++-- 4 files changed, 28 insertions(+), 27 deletions(-) delete mode 100644 apps/crawler/test/app.e2e-spec.ts create mode 100644 apps/crawler/test/crawler.service.spec.ts rename apps/crawler/test/{jest-e2e.json => jest.json} (82%) diff --git a/apps/crawler/test/app.e2e-spec.ts b/apps/crawler/test/app.e2e-spec.ts deleted file mode 100644 index a1fe9c0..0000000 --- a/apps/crawler/test/app.e2e-spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { Test, TestingModule } from '@nestjs/testing'; -import { INestApplication } from '@nestjs/common'; -import * as request from 'supertest'; -import { CrawlerModule } from './../src/crawler.module'; - -describe('CrawlerController (e2e)', () => { - let app: INestApplication; - - beforeEach(async () => { - const moduleFixture: TestingModule = await Test.createTestingModule({ - imports: [CrawlerModule], - }).compile(); - - app = moduleFixture.createNestApplication(); - await app.init(); - }); - - it('/ (GET)', () => { - return request(app.getHttpServer()) - .get('/') - .expect(200) - .expect('Hello World!'); - }); -}); diff --git a/apps/crawler/test/crawler.service.spec.ts b/apps/crawler/test/crawler.service.spec.ts new file mode 100644 index 0000000..222e6ae --- /dev/null +++ b/apps/crawler/test/crawler.service.spec.ts @@ -0,0 +1,24 @@ +import { Test, TestingModule } from '@nestjs/testing'; +import { CrawlerService } from '../src/crawler.service'; +import { HttpModule } from '@nestjs/axios'; + +describe('CrawlerService', () => { + let crawlerService: CrawlerService; + + beforeEach(async () => { + const module: TestingModule = await Test.createTestingModule({ + imports: [HttpModule], + providers: [CrawlerService], + }).compile(); + + crawlerService = module.get(CrawlerService); + }); + + afterEach(() => { + jest.clearAllMocks(); + }); + + it('should be defined', () => { + expect(crawlerService).toBeDefined(); + }); +}); diff --git a/apps/crawler/test/jest-e2e.json b/apps/crawler/test/jest.json similarity index 82% rename from apps/crawler/test/jest-e2e.json rename to apps/crawler/test/jest.json index e9d912f..4ca0d87 100644 --- a/apps/crawler/test/jest-e2e.json +++ b/apps/crawler/test/jest.json @@ -2,7 +2,7 @@ "moduleFileExtensions": ["js", "json", "ts"], "rootDir": ".", "testEnvironment": "node", - "testRegex": ".e2e-spec.ts$", + "testRegex": ".spec.ts$", "transform": { "^.+\\.(t|j)s$": "ts-jest" } diff --git a/package.json b/package.json index bab7c23..8147ea5 100644 --- a/package.json +++ b/package.json @@ -14,12 +14,13 @@ "start:deploy": "npx prisma migrate deploy && node dist/apps/api/main", "start:prod": "node dist/apps/api/main", "start:crawler": "node dist/apps/crawler/main", - "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix", + "lint": "eslint \"{apps,libs}/**/*.ts\" --fix", "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 ./apps/ziggle-be/test/jest-e2e.json" + "test:e2e": "jest --config ./apps/api/test/jest-e2e.json", + "test:crawler": "jest --config ./apps/crawler/test/jest.json" }, "dependencies": { "@aws-sdk/client-s3": "^3.521.0", From e30d45f3bb82186aaa502d160a6ff99e9ba5343e Mon Sep 17 00:00:00 2001 From: Shiwon Park Date: Wed, 8 Jan 2025 20:42:08 +0900 Subject: [PATCH 05/10] insensitivity --- apps/api/src/notice/notice.repository.ts | 28 +++++++++++++++--------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/apps/api/src/notice/notice.repository.ts b/apps/api/src/notice/notice.repository.ts index e833645..d396e13 100644 --- a/apps/api/src/notice/notice.repository.ts +++ b/apps/api/src/notice/notice.repository.ts @@ -61,8 +61,8 @@ export class NoticeRepository { crawls: { some: { OR: [ - { title: { contains: search } }, - { body: { contains: search } }, + { title: { contains: search, mode: 'insensitive' } }, + { body: { contains: search, mode: 'insensitive' } }, ], }, }, @@ -71,13 +71,17 @@ export class NoticeRepository { contents: { some: { OR: [ - { title: { contains: search } }, - { body: { contains: search } }, + { title: { contains: search, mode: 'insensitive' } }, + { body: { contains: search, mode: 'insensitive' } }, ], }, }, }, - { tags: { some: { name: { contains: search } } } }, + { + tags: { + some: { name: { contains: search, mode: 'insensitive' } }, + }, + }, ], } : {}), @@ -136,8 +140,8 @@ export class NoticeRepository { crawls: { some: { OR: [ - { title: { contains: search } }, - { body: { contains: search } }, + { title: { contains: search, mode: 'insensitive' } }, + { body: { contains: search, mode: 'insensitive' } }, ], }, }, @@ -146,13 +150,17 @@ export class NoticeRepository { contents: { some: { OR: [ - { title: { contains: search } }, - { body: { contains: search } }, + { title: { contains: search, mode: 'insensitive' } }, + { body: { contains: search, mode: 'insensitive' } }, ], }, }, }, - { tags: { some: { name: { contains: search } } } }, + { + tags: { + some: { name: { contains: search, mode: 'insensitive' } }, + }, + }, ], } : {}), From 1e312bfd96766c15afa89b5887ec8c594a149464 Mon Sep 17 00:00:00 2001 From: Shiwon Park Date: Thu, 9 Jan 2025 22:22:27 +0900 Subject: [PATCH 06/10] add: crawl --- apps/crawler/src/crawler.module.ts | 1 + apps/crawler/src/crawler.service.ts | 58 ++++++ apps/crawler/test/crawler.service.spec.ts | 24 +++ package-lock.json | 223 ++++++++++++++++++++++ package.json | 4 +- 5 files changed, 309 insertions(+), 1 deletion(-) diff --git a/apps/crawler/src/crawler.module.ts b/apps/crawler/src/crawler.module.ts index 49694aa..d520f80 100644 --- a/apps/crawler/src/crawler.module.ts +++ b/apps/crawler/src/crawler.module.ts @@ -7,5 +7,6 @@ import { CrawlerRepository } from './crawler.repository'; @Module({ imports: [PrismaModule, HttpModule], providers: [CrawlerService, CrawlerRepository], + exports: [CrawlerService], }) export class CrawlerModule {} diff --git a/apps/crawler/src/crawler.service.ts b/apps/crawler/src/crawler.service.ts index 0525161..a4934c9 100644 --- a/apps/crawler/src/crawler.service.ts +++ b/apps/crawler/src/crawler.service.ts @@ -1,7 +1,65 @@ import { HttpService } from '@nestjs/axios'; import { Injectable } from '@nestjs/common'; +import { load } from 'cheerio'; +import { + catchError, + concatMap, + map, + Observable, + throwError, + timeout, +} from 'rxjs'; @Injectable() export class CrawlerService { + private readonly targetUrl = + 'https://www.gist.ac.kr/kr/html/sub05/050209.html'; constructor(private readonly httpService: HttpService) {} + + getNoticeList(): Observable { + return this.httpService.get(this.targetUrl).pipe( + timeout(10 * 1000), + catchError(throwError), + map((res) => load(res.data)), + map(($) => $('table > tbody > tr')), + concatMap(($) => $.toArray().map((value) => load(value))), + map(($) => { + return { + title: $('td').eq(2).text().trim(), + link: `${this.targetUrl}${$('td').eq(2).find('a').attr('href')}`, + author: $('td').eq(3).text().trim(), + category: $('td').eq(1).text().trim(), + createdAt: $('td').eq(5).text().trim(), + }; + }), + map((meta) => ({ + id: Number.parseInt(meta.link.split('no=')[1].split('&')[0]), + ...meta, + })), + ); + } + + getNoticeDetail(link: string) { + return this.httpService.get(link).pipe( + timeout(10 * 1000), + map((res) => load(res.data)), + catchError(throwError), + map(($) => ({ + content: $('.bd_detail_content').html()?.trim(), + files: $('.bd_detail_file > ul > li > a') + .toArray() + .map((value) => ({ + href: `${this.targetUrl}${$(value).attr('href')}`, + name: $(value).text().trim(), + type: $(value).attr('class') as + | 'doc' + | 'hwp' + | 'pdf' + | 'imgs' + | 'xls' + | 'etc', + })), + })), + ); + } } diff --git a/apps/crawler/test/crawler.service.spec.ts b/apps/crawler/test/crawler.service.spec.ts index 222e6ae..a0b235f 100644 --- a/apps/crawler/test/crawler.service.spec.ts +++ b/apps/crawler/test/crawler.service.spec.ts @@ -1,6 +1,7 @@ import { Test, TestingModule } from '@nestjs/testing'; import { CrawlerService } from '../src/crawler.service'; import { HttpModule } from '@nestjs/axios'; +import { firstValueFrom, toArray } from 'rxjs'; describe('CrawlerService', () => { let crawlerService: CrawlerService; @@ -21,4 +22,27 @@ describe('CrawlerService', () => { it('should be defined', () => { expect(crawlerService).toBeDefined(); }); + + describe('getNoticeList', () => { + it('should return notice list', async () => { + const noticeList = await firstValueFrom( + crawlerService.getNoticeList().pipe(toArray()), + ); + expect(noticeList.length).toBeGreaterThan(0); + console.log(noticeList); + }); + }); + + describe('getNoticeDetail', () => { + it('should return notice detail', async () => { + const noticeList = await firstValueFrom( + crawlerService.getNoticeList().pipe(toArray()), + ); + const noticeDetail = await firstValueFrom( + crawlerService.getNoticeDetail(noticeList[0].link), + ); + expect(noticeDetail).toBeDefined(); + console.log(noticeDetail); + }); + }); }); diff --git a/package-lock.json b/package-lock.json index 84878b1..4c875c8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,6 +22,7 @@ "@nestjs/terminus": "^10.2.3", "axios": "^1.6.7", "bull": "^4.14.0", + "cheerio": "^1.0.0", "class-transformer": "^0.5.1", "class-validator": "^0.14.1", "cookie-parser": "^1.4.6", @@ -43,6 +44,7 @@ "@nestjs/schematics": "^10.0.0", "@nestjs/testing": "^10.0.0", "@prisma/client": "^5.12.1", + "@types/cheerio": "^0.22.35", "@types/cookie-parser": "^1.4.6", "@types/express": "^4.17.17", "@types/html-to-text": "^9.0.4", @@ -5307,6 +5309,16 @@ "integrity": "sha512-hWtVTC2q7hc7xZ/RLbxapMvDMgUnDvKvMOpKal4DrMyfGBUfB1oKaZlIRr6mJL+If3bAP6sV/QneGzF6tJjZDg==", "optional": true }, + "node_modules/@types/cheerio": { + "version": "0.22.35", + "resolved": "https://registry.npmjs.org/@types/cheerio/-/cheerio-0.22.35.tgz", + "integrity": "sha512-yD57BchKRvTV+JD53UZ6PD8KWY5g5rvvMLRnZR3EQBCZXiDT/HR+pKpMzFGlWNhFrXlo7VPZXtKvIEwZkAWOIA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@types/connect": { "version": "3.4.38", "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz", @@ -6759,6 +6771,12 @@ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "license": "MIT" }, + "node_modules/boolbase": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", + "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", + "license": "ISC" + }, "node_modules/bowser": { "version": "2.11.0", "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.11.0.tgz", @@ -7173,6 +7191,67 @@ "uuid": "dist/bin/uuid" } }, + "node_modules/cheerio": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0.tgz", + "integrity": "sha512-quS9HgjQpdaXOvsZz82Oz7uxtXiy6UIsIQcpBj7HRw2M63Skasm9qlDocAM7jNuaxdhpPU7c4kJN+gA5MCu4ww==", + "license": "MIT", + "dependencies": { + "cheerio-select": "^2.1.0", + "dom-serializer": "^2.0.0", + "domhandler": "^5.0.3", + "domutils": "^3.1.0", + "encoding-sniffer": "^0.2.0", + "htmlparser2": "^9.1.0", + "parse5": "^7.1.2", + "parse5-htmlparser2-tree-adapter": "^7.0.0", + "parse5-parser-stream": "^7.1.2", + "undici": "^6.19.5", + "whatwg-mimetype": "^4.0.0" + }, + "engines": { + "node": ">=18.17" + }, + "funding": { + "url": "https://github.com/cheeriojs/cheerio?sponsor=1" + } + }, + "node_modules/cheerio-select": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-2.1.0.tgz", + "integrity": "sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==", + "license": "BSD-2-Clause", + "dependencies": { + "boolbase": "^1.0.0", + "css-select": "^5.1.0", + "css-what": "^6.1.0", + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3", + "domutils": "^3.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" + } + }, + "node_modules/cheerio/node_modules/htmlparser2": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.1.0.tgz", + "integrity": "sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==", + "funding": [ + "https://github.com/fb55/htmlparser2?sponsor=1", + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], + "license": "MIT", + "dependencies": { + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3", + "domutils": "^3.1.0", + "entities": "^4.5.0" + } + }, "node_modules/chokidar": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", @@ -7754,6 +7833,34 @@ "node": ">=8" } }, + "node_modules/css-select": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz", + "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==", + "license": "BSD-2-Clause", + "dependencies": { + "boolbase": "^1.0.0", + "css-what": "^6.1.0", + "domhandler": "^5.0.2", + "domutils": "^3.0.1", + "nth-check": "^2.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" + } + }, + "node_modules/css-what": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", + "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==", + "license": "BSD-2-Clause", + "engines": { + "node": ">= 6" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" + } + }, "node_modules/dayjs": { "version": "1.11.10", "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz", @@ -8160,6 +8267,31 @@ "node": ">= 0.8" } }, + "node_modules/encoding-sniffer": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/encoding-sniffer/-/encoding-sniffer-0.2.0.tgz", + "integrity": "sha512-ju7Wq1kg04I3HtiYIOrUrdfdDvkyO9s5XM8QAj/bN61Yo/Vb4vgJxy5vi4Yxk01gWHbrofpPtpxM8bKger9jhg==", + "license": "MIT", + "dependencies": { + "iconv-lite": "^0.6.3", + "whatwg-encoding": "^3.1.1" + }, + "funding": { + "url": "https://github.com/fb55/encoding-sniffer?sponsor=1" + } + }, + "node_modules/encoding-sniffer/node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/end-of-stream": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", @@ -11981,6 +12113,18 @@ "node": ">=8" } }, + "node_modules/nth-check": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", + "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", + "license": "BSD-2-Clause", + "dependencies": { + "boolbase": "^1.0.0" + }, + "funding": { + "url": "https://github.com/fb55/nth-check?sponsor=1" + } + }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -12268,6 +12412,43 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/parse5": { + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.2.1.tgz", + "integrity": "sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==", + "license": "MIT", + "dependencies": { + "entities": "^4.5.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, + "node_modules/parse5-htmlparser2-tree-adapter": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.1.0.tgz", + "integrity": "sha512-ruw5xyKs6lrpo9x9rCZqZZnIUntICjQAd0Wsmp396Ul9lN/h+ifgVV1x1gZHi8euej6wTfpqX8j+BFQxF0NS/g==", + "license": "MIT", + "dependencies": { + "domhandler": "^5.0.3", + "parse5": "^7.0.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, + "node_modules/parse5-parser-stream": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/parse5-parser-stream/-/parse5-parser-stream-7.1.2.tgz", + "integrity": "sha512-JyeQc9iwFLn5TbvvqACIF/VXG6abODeB3Fwmv/TGdLk2LfbWkaySGY72at4+Ty7EkPZj854u4CrICqNk2qIbow==", + "license": "MIT", + "dependencies": { + "parse5": "^7.0.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, "node_modules/parseley": { "version": "0.12.1", "resolved": "https://registry.npmjs.org/parseley/-/parseley-0.12.1.tgz", @@ -14777,6 +14958,15 @@ "node": ">=8" } }, + "node_modules/undici": { + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.21.0.tgz", + "integrity": "sha512-BUgJXc752Kou3oOIuU1i+yZZypyZRqNPW0vqoMPl8VaoalSfeR0D8/t4iAS3yirs79SSMTxTag+ZC86uswv+Cw==", + "license": "MIT", + "engines": { + "node": ">=18.17" + } + }, "node_modules/undici-types": { "version": "5.26.5", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", @@ -15078,6 +15268,39 @@ "node": ">=0.8.0" } }, + "node_modules/whatwg-encoding": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz", + "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==", + "license": "MIT", + "dependencies": { + "iconv-lite": "0.6.3" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/whatwg-encoding/node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/whatwg-mimetype": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz", + "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==", + "license": "MIT", + "engines": { + "node": ">=18" + } + }, "node_modules/whatwg-url": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", diff --git a/package.json b/package.json index 8147ea5..0a0e5bd 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "@nestjs/terminus": "^10.2.3", "axios": "^1.6.7", "bull": "^4.14.0", + "cheerio": "^1.0.0", "class-transformer": "^0.5.1", "class-validator": "^0.14.1", "cookie-parser": "^1.4.6", @@ -57,6 +58,7 @@ "@nestjs/schematics": "^10.0.0", "@nestjs/testing": "^10.0.0", "@prisma/client": "^5.12.1", + "@types/cheerio": "^0.22.35", "@types/cookie-parser": "^1.4.6", "@types/express": "^4.17.17", "@types/html-to-text": "^9.0.4", @@ -114,4 +116,4 @@ "/apps/" ] } -} \ No newline at end of file +} From dbd7e38a1fb67845768b6884348f7bfa2d6b44dc Mon Sep 17 00:00:00 2001 From: Shiwon Park Date: Thu, 9 Jan 2025 22:23:33 +0900 Subject: [PATCH 07/10] add: crawl test --- apps/crawler/test/crawler.service.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/crawler/test/crawler.service.spec.ts b/apps/crawler/test/crawler.service.spec.ts index a0b235f..73e7a50 100644 --- a/apps/crawler/test/crawler.service.spec.ts +++ b/apps/crawler/test/crawler.service.spec.ts @@ -30,6 +30,7 @@ describe('CrawlerService', () => { ); expect(noticeList.length).toBeGreaterThan(0); console.log(noticeList); + console.log('noticeList.length:', noticeList.length); }); }); From 85a827348ed9a78e7eae7c9233a20b21adaddf44 Mon Sep 17 00:00:00 2001 From: Shiwon Park Date: Tue, 14 Jan 2025 23:02:08 +0900 Subject: [PATCH 08/10] user --- apps/crawler/src/crawler.module.ts | 3 +- apps/crawler/src/crawler.repository.ts | 59 ++++++++++++++++++++++++ apps/crawler/src/crawler.service.ts | 4 +- apps/crawler/src/user/user.module.ts | 11 +++++ apps/crawler/src/user/user.repository.ts | 25 ++++++++++ apps/crawler/src/user/user.service.ts | 16 +++++++ 6 files changed, 115 insertions(+), 3 deletions(-) create mode 100644 apps/crawler/src/user/user.module.ts create mode 100644 apps/crawler/src/user/user.repository.ts create mode 100644 apps/crawler/src/user/user.service.ts diff --git a/apps/crawler/src/crawler.module.ts b/apps/crawler/src/crawler.module.ts index d520f80..1796bbe 100644 --- a/apps/crawler/src/crawler.module.ts +++ b/apps/crawler/src/crawler.module.ts @@ -3,9 +3,10 @@ import { CrawlerService } from './crawler.service'; import { PrismaModule } from '@lib/prisma'; import { HttpModule } from '@nestjs/axios'; import { CrawlerRepository } from './crawler.repository'; +import { UserModule } from './user/user.module'; @Module({ - imports: [PrismaModule, HttpModule], + imports: [PrismaModule, HttpModule, UserModule], providers: [CrawlerService, CrawlerRepository], exports: [CrawlerService], }) diff --git a/apps/crawler/src/crawler.repository.ts b/apps/crawler/src/crawler.repository.ts index e139f8c..668a3d2 100644 --- a/apps/crawler/src/crawler.repository.ts +++ b/apps/crawler/src/crawler.repository.ts @@ -1,7 +1,66 @@ import { PrismaService } from '@lib/prisma'; import { Injectable } from '@nestjs/common'; +import { Crawl, User } from '@prisma/client'; @Injectable() export class CrawlerRepository { constructor(private readonly prismaService: PrismaService) {} + + async checkCrawlData({ urls }: { urls: string[] }): Promise { + return this.prismaService.crawl.findMany({ + where: { + url: { + in: urls, + }, + }, + }); + } + + async createCrawl( + { + title, + body, + type, + crawledAt, + url, + }: Pick, + user: User, + deadline?: Date, + ): Promise { + return this.prismaService.crawl.create({ + data: { + title, + body, + type, + url, + crawledAt, + notice: { + create: { + category: 'ACADEMIC', + currentDeadline: deadline, + author: { + connect: user, + }, + publishedAt: new Date(), + }, + }, + }, + }); + } + + async updateCrawl( + { title, body, type }: Pick, + id: number, + ): Promise { + return this.prismaService.crawl.update({ + where: { + id, + }, + data: { + title, + body, + type, + }, + }); + } } diff --git a/apps/crawler/src/crawler.service.ts b/apps/crawler/src/crawler.service.ts index a4934c9..f95184d 100644 --- a/apps/crawler/src/crawler.service.ts +++ b/apps/crawler/src/crawler.service.ts @@ -22,7 +22,7 @@ export class CrawlerService { catchError(throwError), map((res) => load(res.data)), map(($) => $('table > tbody > tr')), - concatMap(($) => $.toArray().map((value) => load(value))), + concatMap(($) => $.toArray().map((value: any) => load(value))), map(($) => { return { title: $('td').eq(2).text().trim(), @@ -48,7 +48,7 @@ export class CrawlerService { content: $('.bd_detail_content').html()?.trim(), files: $('.bd_detail_file > ul > li > a') .toArray() - .map((value) => ({ + .map((value: any) => ({ href: `${this.targetUrl}${$(value).attr('href')}`, name: $(value).text().trim(), type: $(value).attr('class') as diff --git a/apps/crawler/src/user/user.module.ts b/apps/crawler/src/user/user.module.ts new file mode 100644 index 0000000..526754d --- /dev/null +++ b/apps/crawler/src/user/user.module.ts @@ -0,0 +1,11 @@ +import { PrismaModule } from '@lib/prisma'; +import { Module } from '@nestjs/common'; +import { UserService } from './user.service'; +import { UserRepository } from './user.repository'; + +@Module({ + imports: [PrismaModule], + providers: [UserRepository, UserService], + exports: [UserService], +}) +export class UserModule {} diff --git a/apps/crawler/src/user/user.repository.ts b/apps/crawler/src/user/user.repository.ts new file mode 100644 index 0000000..df59cd8 --- /dev/null +++ b/apps/crawler/src/user/user.repository.ts @@ -0,0 +1,25 @@ +import { PrismaService } from '@lib/prisma'; +import { Injectable } from '@nestjs/common'; +import { User } from '@prisma/client'; +import { v4 as uuid } from 'uuid'; + +@Injectable() +export class UserRepository { + constructor(private readonly prismaService: PrismaService) {} + + async findUserByName(name: string): Promise { + return this.prismaService.user.findFirst({ + where: { name }, + }); + } + + async createTempUser(name: string): Promise { + return this.prismaService.user.create({ + data: { + uuid: uuid(), + name, + consent: false, + }, + }); + } +} diff --git a/apps/crawler/src/user/user.service.ts b/apps/crawler/src/user/user.service.ts new file mode 100644 index 0000000..aa0bf0a --- /dev/null +++ b/apps/crawler/src/user/user.service.ts @@ -0,0 +1,16 @@ +import { Injectable } from '@nestjs/common'; +import { UserRepository } from './user.repository'; +import { User } from '@prisma/client'; + +@Injectable() +export class UserService { + constructor(private readonly userRepository: UserRepository) {} + + async findOrCreateTempUser(name: string): Promise { + const user = await this.userRepository.findUserByName(name); + if (user) { + return user; + } + return this.userRepository.createTempUser(name); + } +} From 44e36bf79b3c6a474b64e40c6c8a313e0cedf114 Mon Sep 17 00:00:00 2001 From: Shiwon Park Date: Tue, 14 Jan 2025 23:09:42 +0900 Subject: [PATCH 09/10] crawler --- apps/crawler/src/crawler.repository.ts | 2 +- apps/crawler/src/crawler.service.ts | 26 +++++++++++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/apps/crawler/src/crawler.repository.ts b/apps/crawler/src/crawler.repository.ts index 668a3d2..281e698 100644 --- a/apps/crawler/src/crawler.repository.ts +++ b/apps/crawler/src/crawler.repository.ts @@ -6,7 +6,7 @@ import { Crawl, User } from '@prisma/client'; export class CrawlerRepository { constructor(private readonly prismaService: PrismaService) {} - async checkCrawlData({ urls }: { urls: string[] }): Promise { + async checkCrawlData(urls: string[]): Promise { return this.prismaService.crawl.findMany({ where: { url: { diff --git a/apps/crawler/src/crawler.service.ts b/apps/crawler/src/crawler.service.ts index f95184d..b0c08ba 100644 --- a/apps/crawler/src/crawler.service.ts +++ b/apps/crawler/src/crawler.service.ts @@ -1,5 +1,6 @@ import { HttpService } from '@nestjs/axios'; import { Injectable } from '@nestjs/common'; +import { Crawl, User } from '@prisma/client'; import { load } from 'cheerio'; import { catchError, @@ -9,12 +10,35 @@ import { throwError, timeout, } from 'rxjs'; +import { CrawlerRepository } from './crawler.repository'; @Injectable() export class CrawlerService { private readonly targetUrl = 'https://www.gist.ac.kr/kr/html/sub05/050209.html'; - constructor(private readonly httpService: HttpService) {} + constructor( + private readonly httpService: HttpService, + private readonly crawlerRepository: CrawlerRepository, + ) {} + + async checkCrawlData(urls: string[]): Promise { + return this.crawlerRepository.checkCrawlData(urls); + } + + async createCrawl( + data: Pick, + user: User, + deadline?: Date, + ): Promise { + return this.crawlerRepository.createCrawl(data, user, deadline); + } + + async updateCrawl( + data: Pick, + id: number, + ): Promise { + return this.crawlerRepository.updateCrawl(data, id); + } getNoticeList(): Observable { return this.httpService.get(this.targetUrl).pipe( From 81238c578f360a1d17fec47617969451e87050c3 Mon Sep 17 00:00:00 2001 From: Shiwon Park Date: Thu, 16 Jan 2025 23:29:34 +0900 Subject: [PATCH 10/10] add: crawler --- apps/crawler/src/crawler.repository.ts | 10 ++-- apps/crawler/src/crawler.service.ts | 32 ++++++++--- apps/crawler/src/main.ts | 77 +++++++++++++++++++++++++- 3 files changed, 105 insertions(+), 14 deletions(-) diff --git a/apps/crawler/src/crawler.repository.ts b/apps/crawler/src/crawler.repository.ts index 281e698..a4b2364 100644 --- a/apps/crawler/src/crawler.repository.ts +++ b/apps/crawler/src/crawler.repository.ts @@ -6,12 +6,10 @@ import { Crawl, User } from '@prisma/client'; export class CrawlerRepository { constructor(private readonly prismaService: PrismaService) {} - async checkCrawlData(urls: string[]): Promise { - return this.prismaService.crawl.findMany({ + async checkCrawlData(url: string): Promise { + return this.prismaService.crawl.findFirst({ where: { - url: { - in: urls, - }, + url, }, }); } @@ -24,6 +22,7 @@ export class CrawlerRepository { crawledAt, url, }: Pick, + createdAt: Date, user: User, deadline?: Date, ): Promise { @@ -41,6 +40,7 @@ export class CrawlerRepository { author: { connect: user, }, + createdAt, publishedAt: new Date(), }, }, diff --git a/apps/crawler/src/crawler.service.ts b/apps/crawler/src/crawler.service.ts index b0c08ba..4c15ff2 100644 --- a/apps/crawler/src/crawler.service.ts +++ b/apps/crawler/src/crawler.service.ts @@ -1,6 +1,6 @@ import { HttpService } from '@nestjs/axios'; import { Injectable } from '@nestjs/common'; -import { Crawl, User } from '@prisma/client'; +import { Crawl } from '@prisma/client'; import { load } from 'cheerio'; import { catchError, @@ -11,26 +11,30 @@ import { timeout, } from 'rxjs'; import { CrawlerRepository } from './crawler.repository'; +import { UserService } from './user/user.service'; @Injectable() export class CrawlerService { private readonly targetUrl = 'https://www.gist.ac.kr/kr/html/sub05/050209.html'; constructor( + private readonly userService: UserService, private readonly httpService: HttpService, private readonly crawlerRepository: CrawlerRepository, ) {} - async checkCrawlData(urls: string[]): Promise { - return this.crawlerRepository.checkCrawlData(urls); + async checkCrawlData(url: string): Promise { + return this.crawlerRepository.checkCrawlData(url); } async createCrawl( data: Pick, - user: User, + createdAt: Date, + userName: string, deadline?: Date, ): Promise { - return this.crawlerRepository.createCrawl(data, user, deadline); + const user = await this.userService.findOrCreateTempUser(userName); + return this.crawlerRepository.createCrawl(data, createdAt, user, deadline); } async updateCrawl( @@ -40,7 +44,14 @@ export class CrawlerService { return this.crawlerRepository.updateCrawl(data, id); } - getNoticeList(): Observable { + getNoticeList(): Observable<{ + title: string; + link: string; + author: string; + category: string; + createdAt: string; + id: number; + }> { return this.httpService.get(this.targetUrl).pipe( timeout(10 * 1000), catchError(throwError), @@ -63,7 +74,14 @@ export class CrawlerService { ); } - getNoticeDetail(link: string) { + getNoticeDetail(link: string): Observable<{ + content: string | undefined; + files: { + href: string; + name: string; + type: 'doc' | 'hwp' | 'pdf' | 'imgs' | 'xls' | 'etc'; + }[]; + }> { return this.httpService.get(link).pipe( timeout(10 * 1000), map((res) => load(res.data)), diff --git a/apps/crawler/src/main.ts b/apps/crawler/src/main.ts index ede5eb8..d633669 100644 --- a/apps/crawler/src/main.ts +++ b/apps/crawler/src/main.ts @@ -1,8 +1,81 @@ import { NestFactory } from '@nestjs/core'; import { CrawlerModule } from './crawler.module'; +import { + concatMap, + firstValueFrom, + identity, + map, + take, + timeout, + toArray, +} from 'rxjs'; +import { CrawlerService } from './crawler.service'; async function bootstrap() { - const app = await NestFactory.create(CrawlerModule); - await app.listen(3000); + const app = await NestFactory.createApplicationContext(CrawlerModule, { + logger: ['error'], + }); + const list = await firstValueFrom( + app + .get(CrawlerService) + .getNoticeList() + .pipe( + take(100), + timeout(60e3), + concatMap((meta) => + app + .get(CrawlerService) + .getNoticeDetail(meta.link) + .pipe(map((notice) => ({ notice, meta }))), + ), + map(async (notice) => ({ + prev: await app.get(CrawlerService).checkCrawlData(notice.meta.link), + notice: notice, + })), + concatMap(identity), + toArray(), + ), + ); + const updatedNotices = list.filter(({ prev }) => { + return prev !== undefined; + }); + const newNotices = list.filter(({ prev }) => { + return prev === undefined; + }); + + await Promise.all( + newNotices.map(async ({ notice }) => { + await app.get(CrawlerService).createCrawl( + { + title: notice.meta.title, + body: notice.notice.content ?? '', + type: 'ACADEMIC', + url: notice.meta.link, + crawledAt: new Date(), + }, + new Date(notice.meta.createdAt), + notice.meta.author, + ); + }), + ); + + await Promise.all( + updatedNotices.map(async ({ notice, prev }) => { + if (notice.notice.content == undefined) { + return; + } + if (!prev || prev.title === notice.meta.title) { + return; + } + await app.get(CrawlerService).updateCrawl( + { + title: notice.meta.title, + body: notice.notice.content ?? '', + type: 'ACADEMIC', + }, + prev?.id, + ); + }), + ); } bootstrap();