feat: consumer 분리

boostcampwm-2022 · Dec 20, 2022 · afbf118 · afbf118
1 parent 2c4b2f7
commit afbf118
Show file tree

Hide file tree

Showing 36 changed files with 923 additions and 14 deletions.
diff --git a/noti-server/src/app.controller.ts b/noti-server/src/app.controller.ts
@@ -1,12 +1,4 @@
-import {
-  Body,
-  ConsoleLogger,
-  Controller,
-  Get,
-  Param,
-  Post,
-  Req,
-} from '@nestjs/common';
+import { Body, Controller, Post } from '@nestjs/common';
 import { AppService } from './app.service';
 
 @Controller('job')

diff --git a/noti-server/src/app.module.ts b/noti-server/src/app.module.ts
@@ -4,9 +4,9 @@ import { AppService } from './app.service';
 import { ConfigModule } from '@nestjs/config';
 import { BullModule } from '@nestjs/bull';
 
-import { DelayedConsumer } from './app.delayed.consumer';
-import { ImmediateConsumer } from './app.immediate.consumer';
-import { MailModule } from './mail/mail.module';
+// import { DelayedConsumer } from './app.delayed.consumer';
+// import { ImmediateConsumer } from './app.immediate.consumer';
+// import { MailModule } from './mail/mail.module';
 
 @Module({
   imports: [
@@ -21,9 +21,8 @@ import { MailModule } from './mail/mail.module';
     }),
     BullModule.registerQueue({ name: 'delayed' }, { name: 'immediate' }),
     CacheModule.register(),
-    MailModule,
   ],
   controllers: [AppController],
-  providers: [AppService, DelayedConsumer, ImmediateConsumer],
+  providers: [AppService],
 })
 export class AppModule {}
diff --git a/noti-worker-delayed/.env b/noti-worker-delayed/.env
@@ -0,0 +1,8 @@
+EMAIL_SERVICE=RunWithMe
+EMAIL_HOST=smtp.worksmobile.com
+EMAIL_PORT=587
+EMAIL_USER=[email protected]
+EMAIL_PW=2HMxdMVBXa68
+
+REDIS_HOST=localhost
+REDIS_PORT=6379
diff --git a/noti-worker-delayed/.eslintrc.js b/noti-worker-delayed/.eslintrc.js
@@ -0,0 +1,25 @@
+module.exports = {
+  parser: '@typescript-eslint/parser',
+  parserOptions: {
+    project: 'tsconfig.json',
+    tsconfigRootDir : __dirname, 
+    sourceType: 'module',
+  },
+  plugins: ['@typescript-eslint/eslint-plugin'],
+  extends: [
+    'plugin:@typescript-eslint/recommended',
+    'plugin:prettier/recommended',
+  ],
+  root: true,
+  env: {
+    node: true,
+    jest: true,
+  },
+  ignorePatterns: ['.eslintrc.js'],
+  rules: {
+    '@typescript-eslint/interface-name-prefix': 'off',
+    '@typescript-eslint/explicit-function-return-type': 'off',
+    '@typescript-eslint/explicit-module-boundary-types': 'off',
+    '@typescript-eslint/no-explicit-any': 'off',
+  },
+};
diff --git a/noti-worker-delayed/.gitignore b/noti-worker-delayed/.gitignore
@@ -0,0 +1,35 @@
+# compiled output
+/dist
+/node_modules
+
+# Logs
+logs
+*.log
+npm-debug.log*
+pnpm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+
+# OS
+.DS_Store
+
+# Tests
+/coverage
+/.nyc_output
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
diff --git a/noti-worker-delayed/.prettierrc b/noti-worker-delayed/.prettierrc
@@ -0,0 +1,4 @@
+{
+  "singleQuote": true,
+  "trailingComma": "all"
+}
diff --git a/noti-worker-delayed/README.md b/noti-worker-delayed/README.md
@@ -0,0 +1,73 @@
+<p align="center">
+  <a href="http://nestjs.com/" target="blank"><img src="https://nestjs.com/img/logo-small.svg" width="200" alt="Nest Logo" /></a>
+</p>
+
+[circleci-image]: https://img.shields.io/circleci/build/github/nestjs/nest/master?token=abc123def456
+[circleci-url]: https://circleci.com/gh/nestjs/nest
+
+  <p align="center">A progressive <a href="http://nodejs.org" target="_blank">Node.js</a> framework for building efficient and scalable server-side applications.</p>
+    <p align="center">
+<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/v/@nestjs/core.svg" alt="NPM Version" /></a>
+<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/l/@nestjs/core.svg" alt="Package License" /></a>
+<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/dm/@nestjs/common.svg" alt="NPM Downloads" /></a>
+<a href="https://circleci.com/gh/nestjs/nest" target="_blank"><img src="https://img.shields.io/circleci/build/github/nestjs/nest/master" alt="CircleCI" /></a>
+<a href="https://coveralls.io/github/nestjs/nest?branch=master" target="_blank"><img src="https://coveralls.io/repos/github/nestjs/nest/badge.svg?branch=master#9" alt="Coverage" /></a>
+<a href="https://discord.gg/G7Qnnhy" target="_blank"><img src="https://img.shields.io/badge/discord-online-brightgreen.svg" alt="Discord"/></a>
+<a href="https://opencollective.com/nest#backer" target="_blank"><img src="https://opencollective.com/nest/backers/badge.svg" alt="Backers on Open Collective" /></a>
+<a href="https://opencollective.com/nest#sponsor" target="_blank"><img src="https://opencollective.com/nest/sponsors/badge.svg" alt="Sponsors on Open Collective" /></a>
+  <a href="https://paypal.me/kamilmysliwiec" target="_blank"><img src="https://img.shields.io/badge/Donate-PayPal-ff3f59.svg"/></a>
+    <a href="https://opencollective.com/nest#sponsor"  target="_blank"><img src="https://img.shields.io/badge/Support%20us-Open%20Collective-41B883.svg" alt="Support us"></a>
+  <a href="https://twitter.com/nestframework" target="_blank"><img src="https://img.shields.io/twitter/follow/nestframework.svg?style=social&label=Follow"></a>
+</p>
+  <!--[![Backers on Open Collective](https://opencollective.com/nest/backers/badge.svg)](https://opencollective.com/nest#backer)
+  [![Sponsors on Open Collective](https://opencollective.com/nest/sponsors/badge.svg)](https://opencollective.com/nest#sponsor)-->
+
+## Description
+
+[Nest](https://github.com/nestjs/nest) framework TypeScript starter repository.
+
+## Installation
+
+```bash
+$ npm install
+```
+
+## Running the app
+
+```bash
+# development
+$ npm run start
+
+# watch mode
+$ npm run start:dev
+
+# production mode
+$ npm run start:prod
+```
+
+## Test
+
+```bash
+# unit tests
+$ npm run test
+
+# e2e tests
+$ npm run test:e2e
+
+# test coverage
+$ npm run test:cov
+```
+
+## Support
+
+Nest is an MIT-licensed open source project. It can grow thanks to the sponsors and support by the amazing backers. If you'd like to join them, please [read more here](https://docs.nestjs.com/support).
+
+## Stay in touch
+
+- Author - [Kamil Myśliwiec](https://kamilmysliwiec.com)
+- Website - [https://nestjs.com](https://nestjs.com/)
+- Twitter - [@nestframework](https://twitter.com/nestframework)
+
+## License
+
+Nest is [MIT licensed](LICENSE).
diff --git a/noti-worker-delayed/nest-cli.json b/noti-worker-delayed/nest-cli.json
@@ -0,0 +1,5 @@
+{
+  "$schema": "https://json.schemastore.org/nest-cli",
+  "collection": "@nestjs/schematics",
+  "sourceRoot": "src"
+}
diff --git a/noti-worker-delayed/package.json b/noti-worker-delayed/package.json
@@ -0,0 +1,75 @@
+{
+  "name": "noti-worker",
+  "version": "0.0.1",
+  "description": "",
+  "author": "",
+  "private": true,
+  "license": "UNLICENSED",
+  "scripts": {
+    "prebuild": "rimraf dist",
+    "build": "nest build",
+    "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
+    "start": "nest start",
+    "start:dev": "nest start --watch",
+    "start:debug": "nest start --debug --watch",
+    "start:prod": "node dist/main",
+    "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
+    "test": "jest",
+    "test: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"
+  },
+  "dependencies": {
+    "@nestjs-modules/mailer": "^1.8.1",
+    "@nestjs/bull": "^0.6.2",
+    "@nestjs/common": "^9.0.0",
+    "@nestjs/config": "^2.2.0",
+    "@nestjs/core": "^9.0.0",
+    "@nestjs/platform-express": "^9.0.0",
+    "bull": "^4.10.2",
+    "reflect-metadata": "^0.1.13",
+    "rimraf": "^3.0.2",
+    "rxjs": "^7.2.0"
+  },
+  "devDependencies": {
+    "@nestjs/cli": "^9.0.0",
+    "@nestjs/schematics": "^9.0.0",
+    "@nestjs/testing": "^9.0.0",
+    "@types/express": "^4.17.13",
+    "@types/jest": "28.1.8",
+    "@types/node": "^16.0.0",
+    "@types/supertest": "^2.0.11",
+    "@typescript-eslint/eslint-plugin": "^5.0.0",
+    "@typescript-eslint/parser": "^5.0.0",
+    "eslint": "^8.0.1",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "jest": "28.1.3",
+    "prettier": "^2.3.2",
+    "source-map-support": "^0.5.20",
+    "supertest": "^6.1.3",
+    "ts-jest": "28.0.8",
+    "ts-loader": "^9.2.3",
+    "ts-node": "^10.0.0",
+    "tsconfig-paths": "4.1.0",
+    "typescript": "^4.7.4"
+  },
+  "jest": {
+    "moduleFileExtensions": [
+      "js",
+      "json",
+      "ts"
+    ],
+    "rootDir": "src",
+    "testRegex": ".*\\.spec\\.ts$",
+    "transform": {
+      "^.+\\.(t|j)s$": "ts-jest"
+    },
+    "collectCoverageFrom": [
+      "**/*.(t|j)s"
+    ],
+    "coverageDirectory": "../coverage",
+    "testEnvironment": "node"
+  }
+}
diff --git a/noti-server/src/app.delayed.consumer.ts → noti-worker-delayed/src/app.consumer.ts b/noti-server/src/app.delayed.consumer.ts → noti-worker-delayed/src/app.consumer.ts
diff --git a/noti-worker-delayed/src/app.module.ts b/noti-worker-delayed/src/app.module.ts
@@ -0,0 +1,23 @@
+import { Module } from '@nestjs/common';
+import { DelayedConsumer } from './app.consumer';
+import { ConfigModule } from '@nestjs/config';
+import { BullModule } from '@nestjs/bull';
+import { MailModule } from './mail/mail.module';
+
+@Module({
+  imports: [
+    ConfigModule.forRoot({
+      isGlobal: true,
+    }),
+    BullModule.forRoot({
+      redis: {
+        host: process.env.REDIS_HOST,
+        port: Number(process.env.REDIS_PORT),
+      },
+    }),
+    MailModule,
+    BullModule.registerQueue({ name: 'delayed' }),
+  ],
+  providers: [DelayedConsumer],
+})
+export class AppModule {}
diff --git a/noti-worker-delayed/src/common/templates/cancel.hbs b/noti-worker-delayed/src/common/templates/cancel.hbs
@@ -0,0 +1,33 @@
+<div width="100%"
+  style="display:flex; justify-content: center; background-color: rgb(240, 240, 240); padding: 30px 30px;">
+  <div width="100%" style="width: 100%; padding: 20px 20px; background-color: rgb(255, 255, 255);">
+    <div></div>
+    <p style="text-align: right; font-size: 0.8rem; color: rgb(156, 156, 156)">나만의 코스로 함께
+      달리는 러닝 커뮤니티</p>
+    <div style="width:100%; border-top: 1px solid rgb(240, 240, 240); border-bottom: 1px solid rgb(240, 240, 240);">
+      <h2 style="margin-bottom: 2rem;">모임이 취소되었어요😥😥</h2>
+      <div style="width: 100%; display: flex; flex-direction: column; align-items: center;">
+        <div style="width: 100%; display: flex; justify-content: space-between;">
+          <p style="font-weight: 700;">모임 제목</p>
+          <p>{{title}}</p>
+        </div>
+        <div style="width: 100%; display: flex; justify-content: space-between;">
+          <p style="font-weight: 700;">집합 위치</p>
+          <p>{{hName}}</p>
+        </div>
+        <div style="width: 100%; display: flex; justify-content: space-between;">
+          <p style="font-weight: 700;">집합 일시</p>
+          <p>{{startTime}}</p>
+        </div>
+        <div style="width: 100%; display: flex; justify-content: space-between;">
+          <p style="font-weight: 700;">총거리</p>
+          <p>{{pathLength}}km</p>
+        </div>
+      </div>
+    </div>
+    <div>
+      <p style="font-size: 0.8rem; color: rgb(156, 156, 156)">행복회로 | 서울특별시 중구 남산동2가
+        32-13 303호</p>
+    </div>
+  </div>
+</div>
diff --git a/noti-worker-delayed/src/common/templates/recruit.hbs b/noti-worker-delayed/src/common/templates/recruit.hbs
@@ -0,0 +1,38 @@
+<div width="100%"
+  style="display:flex; justify-content: center; background-color: rgb(240, 240, 240); padding: 30px 30px;">
+  <div width="100%" style="width: 100%; padding: 20px 20px; background-color: rgb(255, 255, 255);">
+    <div></div>
+    <p style="text-align: right; font-size: 0.8rem; color: rgb(156, 156, 156)">나만의 코스로 함께
+      달리는 러닝 커뮤니티</p>
+    <div style="width:100%; border-top: 1px solid rgb(240, 240, 240); border-bottom: 1px solid rgb(240, 240, 240);">
+      <h2 style="margin-bottom: 2rem;">잠시후 출발하는 모임이 있습니다</h2>
+      <div style="width: 100%; display: flex; flex-direction: column; align-items: center;">
+        <div style="width: 100%; display: flex; justify-content: space-between;">
+          <p style="font-weight: 700;">모임 제목</p>
+          <p>{{title}}</p>
+        </div>
+        <div style="width: 100%; display: flex; justify-content: space-between;">
+          <p style="font-weight: 700;">집합 위치</p>
+          <p>{{hName}}</p>
+        </div>
+        <div style="width: 100%; display: flex; justify-content: space-between;">
+          <p style="font-weight: 700;">집합 일시</p>
+          <p>{{startTime}}</p>
+        </div>
+        <div style="width: 100%; display: flex; justify-content: space-between;">
+          <p style="font-weight: 700;">총거리</p>
+          <p>{{pathLength}}km</p>
+        </div>
+      </div>
+      <div style="width: 100%; display: flex; justify-content: center;">
+        <a href={{href}}
+          style="background-color: rgb(134, 179, 255); padding: 1rem; font-weight: 700; color: rgb(255, 255, 255); border-radius: 0.5rem; margin-bottom: 2rem; text-decoration: none;">모임
+          정보 보러가기!</a>
+      </div>
+    </div>
+    <div>
+      <p style="font-size: 0.8rem; color: rgb(156, 156, 156)">행복회로 | 서울특별시 중구 남산동2가
+        32-13 303호</p>
+    </div>
+  </div>
+</div>
diff --git a/noti-worker-delayed/src/common/templates/signup.hbs b/noti-worker-delayed/src/common/templates/signup.hbs
@@ -0,0 +1,23 @@
+<div width="100%"
+  style="display:flex; justify-content: center; background-color: rgb(240, 240, 240); padding: 30px 30px;">
+  <div width="100%" style="width: 100%; padding: 20px 20px; background-color: rgb(255, 255, 255);">
+    <div></div>
+    <p style="text-align: right; font-size: 0.8rem; color: rgb(156, 156, 156)">나만의 코스로 함께
+      달리는 러닝 커뮤니티</p>
+    <div style="width:100%; border-top: 1px solid rgb(240, 240, 240); border-bottom: 1px solid rgb(240, 240, 240);">
+      <h2 style="margin-bottom: 2rem;">{{id}}님 가입을 환영합니다.🎉</h2>
+      <p style="margin-bottom: 2rem;">
+        지금부터 이 계정으로 RunWithMe를 이용하실 수 있어요 :)
+      </p>
+      <div style="width: 100%; display: flex; justify-content: center;">
+        <a href="https://runwithme.co.kr"
+          style="background-color: rgb(134, 179, 255); padding: 1rem; font-weight: 700; color: rgb(255, 255, 255); border-radius: 0.5rem; margin-bottom: 2rem; text-decoration: none;">RunWithMe를
+          시작해보세요!</a>
+      </div>
+    </div>
+    <div>
+      <p style="font-size: 0.8rem; color: rgb(156, 156, 156)">행복회로 | 서울특별시 중구 남산동2가
+        32-13 303호</p>
+    </div>
+  </div>
+</div>