feat: structure / image upload

Author: watscho

.env.example

@@ -9,10 +9,12 @@ REDIS_TOKEN_EXPIRATION=86400
 JWT_SECRET=
 JWT_EXPIRATION=24h
 
-MAIL_HOST=sandbox.smtp.mailtrap.io
-MAIL_PORT=2525
+MAIL_HOST=127.0.0.1
+MAIL_PORT=1025
 MAIL_USER=
 MAIL_PASSWORD=
-MAIL_TPL_PATH=views/templates
+MAIL_TPL_PATH=templates
+
+STORAGE_PATH=storage/public
 
 API_LOG_FILENAME=api-logs.log

.gitignore

@@ -2,4 +2,5 @@ node_modules
 public
 .env
 *.log
-.DS_Store
+.DS_Store
+storage/public

README.md

@@ -27,7 +27,7 @@
     "watch": "npm run rm:public && cross-env ts-node-dev --files --respawn --inspect -r tsconfig-paths/register ./src",
     "build": "npm run rm:public && cross-env NODE_ENV=production tsc && tsc-alias && npm run copy:files",
     "rm:public": "rm -rf ./public",
-    "copy:files": "cp .env ./public/.env && cp -R ./src/views ./public",
+    "copy:files": "cp .env ./public/.env && cp -R ./src/templates ./public",
     "seed": "ts-node --files -r tsconfig-paths/register ./src/seeds",
     "lint": "eslint --debug ./src",
     "lint:fix": "eslint --debug ./src --fix",
@@ -42,9 +42,11 @@
     "@types/email-templates": "10.0.1",
     "@types/express": "4.17.14",
     "@types/jsonwebtoken": "8.5.9",
+    "@types/multer": "1.4.7",
     "@types/node": "18.8.3",
     "@types/nodemailer": "6.4.7",
     "@types/randomstring": "1.1.8",
+    "@types/sharp": "^0.31.1",
     "@types/validator": "13.7.11",
     "@typescript-eslint/eslint-plugin": "5.39.0",
     "@typescript-eslint/parser": "5.39.0",
@@ -73,9 +75,11 @@
     "i18next-http-middleware": "3.2.2",
     "jsonwebtoken": "8.5.1",
     "mongoose": "6.6.5",
+    "multer": "1.4.5-lts.1",
     "nodemailer": "6.9.1",
     "randomstring": "1.2.3",
     "redis": "4.3.1",
+    "sharp": "0.31.3",
     "validator": "13.7.0",
     "winston": "3.8.2"
   }

package.json

@@ -19,6 +19,7 @@ export declare global {
       MAIL_USER: string
       MAIL_PASSWORD: string
       MAIL_TPL_PATH: string
+      STORAGE_PATH: string
     }
   }
 }

src/@types/global.d.ts

@@ -2,3 +2,12 @@ export enum ExpiresInDays {
   Verification = 7,
   ResetPassword = 7
 }
+
+export enum Mimetype {
+  Jpeg = 'image/jpeg',
+  Png = 'image/png'
+}
+
+export enum ImageSizeInMB {
+  Ten = 10
+}

src/constants/index.ts

@@ -1,5 +1,7 @@
+import { ObjectId } from 'mongoose'
+
 export interface JwtUser {
-  id: string
+  id: ObjectId
 }
 
 export interface AccessToken {

src/contracts/jwt.ts

@@ -0,0 +1,22 @@
+import { Model, ObjectId } from 'mongoose'
+
+export interface IMedia {
+  originalname: string
+  encoding: string
+  mimetype: string
+  destination: string
+  filename: string
+  path: string
+  size: number
+  orderColumn: number
+  refType: string
+  refId: ObjectId
+  user: ObjectId
+}
+
+export type MediaFileUploadRequest = Omit<
+  IMedia,
+  'refId' | 'refType' | 'orderColumn'
+>
+
+export type MediaModel = Model<IMedia>

src/contracts/media.ts

@@ -1,4 +1,5 @@
 import { Request } from 'express'
+import { ObjectId } from 'mongoose'
 
 export interface ContextRequest<T> extends Omit<Request, 'context'> {
   context: T
@@ -22,7 +23,7 @@ export interface CombinedRequest<
 
 export interface UserRequest {
   user: {
-    id: string
+    id: ObjectId
     email: string
     verified: boolean
   }

src/contracts/request.ts

@@ -1,26 +1,28 @@
 import { Model, ObjectId } from 'mongoose'
 
 export interface IVerification {
-  userId: string
   email: string
   accessToken: string
   expiresIn: Date
+  user: ObjectId
 }
 
 export interface IResetPassword {
-  userId: string
   accessToken: string
   expiresIn: Date
+  user: ObjectId
 }
 
 export interface IUser {
+  id: ObjectId
   email: string
   password: string
   firstName?: string
   lastName?: string
   verified: boolean
   verifications: ObjectId[]
   resetPasswords: ObjectId[]
+  media: ObjectId[]
 }
 
 export interface IUserMethods {

src/contracts/user.ts

@@ -101,7 +101,7 @@ export const authController = {
         session
       )
 
-      await userService.pushVerificationsIdByUserId(
+      await userService.addVerificationToUser(
         {
           userId: user.id,
           verificationId: verification.id
@@ -150,7 +150,7 @@ export const authController = {
     res: Response
   ) => {
     try {
-      await redis.client.set(`expiredToken:${accessToken}`, user.id, {
+      await redis.client.set(`expiredToken:${accessToken}`, `${user.id}`, {
         EX: process.env.REDIS_TOKEN_EXPIRATION,
         NX: true
       })
@@ -198,7 +198,7 @@ export const authController = {
         session
       )
 
-      await userService.pushResetPasswordIdByUserId(
+      await userService.addResetPasswordToUser(
         {
           userId: user.id,
           resetPasswordId: resetPassword.id
@@ -254,7 +254,7 @@ export const authController = {
         })
       }
 
-      const user = await userService.getById(resetPassword.userId)
+      const user = await userService.getById(resetPassword.user)
 
       if (!user) {
         return res.status(StatusCodes.NOT_FOUND).json({
@@ -267,7 +267,7 @@ export const authController = {
       const hashedPassword = await createHash(password)
 
       await userService.updatePasswordByUserId(
-        resetPassword.userId,
+        resetPassword.user,
         hashedPassword,
         session
       )

src/controllers/authController.ts

@@ -1,2 +1,3 @@
 export { authController } from './authController'
 export { userController } from './userController'
+export { mediaController } from './mediaController'

src/controllers/index.ts

@@ -0,0 +1,55 @@
+import { Response } from 'express'
+import { ReasonPhrases, StatusCodes } from 'http-status-codes'
+import winston from 'winston'
+
+import { mediaService, userService } from '@/services'
+import { Image } from '@/infrastructure/image'
+import { ContextRequest, UserRequest } from '@/contracts/request'
+import { startSession } from 'mongoose'
+
+export const mediaController = {
+  create: async (
+    { context: { user }, file }: ContextRequest<UserRequest>,
+    res: Response
+  ) => {
+    const session = await startSession()
+
+    try {
+      session.startTransaction()
+      const media = await mediaService.create(
+        {
+          ...(file as Express.Multer.File),
+          user: user.id
+        },
+        session
+      )
+
+      await userService.addMediaToUser({ userId: user.id, mediaId: media.id })
+
+      const image = await new Image(media).sharp()
+
+      await session.commitTransaction()
+      session.endSession()
+
+      return res.status(StatusCodes.OK).json({
+        data: { id: media.id, image },
+        message: ReasonPhrases.OK,
+        status: StatusCodes.OK
+      })
+    } catch (error) {
+      winston.error(error)
+
+      await new Image(file as Express.Multer.File).deleteFile()
+
+      if (session.inTransaction()) {
+        await session.abortTransaction()
+        session.endSession()
+      }
+
+      return res.status(StatusCodes.BAD_REQUEST).json({
+        message: ReasonPhrases.BAD_REQUEST,
+        status: StatusCodes.BAD_REQUEST
+      })
+    }
+  }
+}

src/controllers/mediaController.ts

@@ -91,7 +91,7 @@ export const userController = {
           session
         )
 
-        await userService.pushVerificationsIdByUserId(
+        await userService.addVerificationToUser(
           {
             userId: user.id,
             verificationId: verification.id
@@ -149,14 +149,14 @@ export const userController = {
       session.startTransaction()
 
       await userService.updateVerificationAndEmailByUserId(
-        verification.userId,
+        verification.user,
         verification.email,
         session
       )
 
-      await verificationService.deleteManyByUserId(verification.userId, session)
+      await verificationService.deleteManyByUserId(verification.user, session)
 
-      const { accessToken } = jwtSign(verification.userId)
+      const { accessToken } = jwtSign(verification.user)
 
       const userMail = new UserMail()
 
@@ -285,7 +285,7 @@ export const userController = {
         )
       }
 
-      await userService.pushVerificationsIdByUserId(
+      await userService.addVerificationToUser(
         {
           userId: user.id,
           verificationId: verification.id

src/controllers/userController.ts

@@ -1,7 +1,8 @@
 import express, { Express } from 'express'
+import { join } from 'path'
 import 'dotenv/config'
 
-import '@/logger'
+import '@/infrastructure/logger'
 import { mongoose, redis } from '@/dataSources'
 import {
   corsMiddleware,
@@ -17,8 +18,13 @@ redis.run()
 const app: Express = express()
 
 app.use(
-  express.json(),
-  express.urlencoded({ extended: true }),
+  join('/', process.env.STORAGE_PATH),
+  express.static(join(__dirname, process.env.STORAGE_PATH))
+)
+
+app.use(
+  express.json({ limit: '10mb' }),
+  express.urlencoded({ limit: '10mb', extended: true }),
   corsMiddleware,
   i18nextHttpMiddleware.handle(i18next),
   authMiddleware,