Add driver's license

.github/workflows/test.yml

@@ -51,6 +51,8 @@ jobs:
            echo BC_CDN_TEMP_LOCATIONS=$BC_CDN_TEMP_LOCATIONS >> .env
            echo BC_CDN_CONTRACTS=$BC_CDN_CONTRACTS >> .env
            echo BC_CDN_TEMP_CONTRACTS=$BC_CDN_TEMP_CONTRACTS >> .env
+           echo BC_CDN_LICENSES=$BC_CDN_LICENSES >> .env
+           echo BC_CDN_TEMP_LICENSES=$BC_CDN_TEMP_LICENSES >> .env           
            echo BC_BACKEND_HOST=$BC_BACKEND_HOST >> .env
            echo BC_FRONTEND_HOST=$BC_FRONTEND_HOST >> .env
            echo BC_MINIMUM_AGE=$BC_MINIMUM_AGE >> .env
@@ -84,6 +86,8 @@ jobs:
         BC_CDN_TEMP_LOCATIONS: ${{ vars.BC_CDN_TEMP_LOCATIONS }}
         BC_CDN_CONTRACTS: ${{ vars.BC_CDN_CONTRACTS }}
         BC_CDN_TEMP_CONTRACTS: ${{ vars.BC_CDN_TEMP_CONTRACTS }}
+        BC_CDN_LICENSES: ${{ vars.BC_CDN_LICENSES }}
+        BC_CDN_TEMP_LICENSES: ${{ vars.BC_CDN_TEMP_LICENSES }}      
         BC_BACKEND_HOST: ${{ vars.BC_BACKEND_HOST }}
         BC_FRONTEND_HOST: ${{ vars.BC_FRONTEND_HOST }}
         BC_MINIMUM_AGE: ${{ vars.BC_MINIMUM_AGE }}

api/.env.docker.example

@@ -26,6 +26,8 @@ BC_CDN_LOCATIONS=/var/www/cdn/bookcars/locations
 BC_CDN_TEMP_LOCATIONS=/var/www/cdn/bookcars/temp/locations
 BC_CDN_CONTRACTS=/var/www/cdn/bookcars/contracts
 BC_CDN_TEMP_CONTRACTS=/var/www/cdn/bookcars/temp/contracts
+BC_CDN_LICENSES=/var/www/cdn/bookcars/licenses
+BC_CDN_TEMP_LICENSES=/var/www/cdn/bookcars/temp/licenses
 BC_DEFAULT_LANGUAGE=en
 BC_BACKEND_HOST=http://localhost:3001/
 BC_FRONTEND_HOST=http://localhost/

api/.env.example

@@ -26,6 +26,8 @@ BC_CDN_LOCATIONS=/var/www/cdn/bookcars/locations
 BC_CDN_TEMP_LOCATIONS=/var/www/cdn/bookcars/temp/locations
 BC_CDN_CONTRACTS=/var/www/cdn/bookcars/contracts
 BC_CDN_TEMP_CONTRACTS=/var/www/cdn/bookcars/temp/contracts
+BC_CDN_LICENSES=/var/www/cdn/bookcars/licenses
+BC_CDN_TEMP_LICENSES=/var/www/cdn/bookcars/temp/licenses
 BC_DEFAULT_LANGUAGE=en
 BC_BACKEND_HOST=http://localhost:3001/
 BC_FRONTEND_HOST=http://localhost:3002/

api/__tests__/supplier.test.ts

@@ -182,6 +182,7 @@ describe('PUT /api/update-supplier', () => {
       phone,
       payLater,
       minimumRentalDays: 3,
+      licenseRequired: true,
     }
     let res = await request(app)
       .put('/api/update-supplier')
@@ -194,6 +195,7 @@ describe('PUT /api/update-supplier', () => {
     expect(res.body.phone).toBe(phone)
     expect(res.body.payLater).toBeFalsy()
     expect(res.body.minimumRentalDays).toBe(3)
+    expect(res.body.licenseRequired).toBeTruthy()
 
     // test success (supplier not found)
     payload._id = testHelper.GetRandromObjectIdAsString()

api/src/app.ts

@@ -63,5 +63,7 @@ await helper.mkdir(env.CDN_LOCATIONS)
 await helper.mkdir(env.CDN_TEMP_LOCATIONS)
 await helper.mkdir(env.CDN_CONTRACTS)
 await helper.mkdir(env.CDN_TEMP_CONTRACTS)
+await helper.mkdir(env.CDN_LICENSES)
+await helper.mkdir(env.CDN_TEMP_LICENSES)
 
 export default app

api/src/config/env.config.ts

@@ -259,6 +259,20 @@ export const CDN_CONTRACTS = __env__('BC_CDN_CONTRACTS', true)
  */
 export const CDN_TEMP_CONTRACTS = __env__('BC_CDN_TEMP_CONTRACTS', true)
 
+/**
+ * Licenses' cdn folder path.
+ *
+ * @type {string}
+ */
+export const CDN_LICENSES = __env__('BC_CDN_LICENSES', true)
+
+/**
+ * Licenses' temp cdn folder path.
+ *
+ * @type {string}
+ */
+export const CDN_TEMP_LICENSES = __env__('BC_CDN_TEMP_LICENSES', true)
+
 /**
  * Backend host.
  *
@@ -373,6 +387,8 @@ export interface User extends Document {
   payLater?: boolean
   customerId?: string
   contracts?: bookcarsTypes.Contract[]
+  licenseRequired?: boolean
+  license?: string | null
   minimumRentalDays?: number
   expireAt?: Date
 }
@@ -403,6 +419,8 @@ export interface UserInfo {
   type?: string
   blacklisted?: boolean
   payLater?: boolean
+  licenseRequired?: boolean,
+  license?: string
 }
 
 /**

api/src/config/userRoutes.config.ts

@@ -31,6 +31,10 @@ const routes = {
   verifyRecaptcha: '/api/verify-recaptcha/:token/:ip',
   sendEmail: '/api/send-email',
   hasPassword: '/api/has-password/:id',
+  createLicense: '/api/create-license',
+  updateLicense: '/api/update-license/:id',
+  deleteLicense: '/api/delete-license/:id',
+  deleteTempLicense: '/api/delete-temp-license/:file',
 }
 
 export default routes

api/src/controllers/bookingController.ts

@@ -4,6 +4,7 @@ import { Expo, ExpoPushMessage, ExpoPushTicket } from 'expo-server-sdk'
 import { Request, Response } from 'express'
 import nodemailer from 'nodemailer'
 import path from 'node:path'
+import fs from 'node:fs/promises'
 import * as bookcarsTypes from ':bookcars-types'
 import i18n from '../lang/i18n'
 import Booking from '../models/Booking'
@@ -202,10 +203,24 @@ export const checkout = async (req: Request, res: Response) => {
       driver.verified = false
       driver.blacklisted = false
       driver.type = bookcarsTypes.UserType.User
+      const { license } = driver
+      driver.license = null
 
       user = new User(driver)
       await user.save()
 
+      // create license
+      if (license) {
+        const tempLicense = path.join(env.CDN_TEMP_LICENSES, license)
+        if (await helper.exists(tempLicense)) {
+          const filename = `${user.id}${path.extname(tempLicense)}`
+          const filepath = path.join(env.CDN_LICENSES, filename)
+          await fs.rename(tempLicense, filepath)
+          user.license = filename
+          await user.save()
+        }
+      }
+
       const token = new Token({ user: user._id, token: helper.generateToken() })
       await token.save()
 

api/src/controllers/carController.ts

@@ -381,12 +381,14 @@ export const getCar = async (req: Request, res: Response) => {
         fullName,
         avatar,
         payLater,
+        licenseRequired,
       } = car.supplier
       car.supplier = {
         _id,
         fullName,
         avatar,
         payLater,
+        licenseRequired,
       }
 
       for (const location of car.locations) {

api/src/controllers/supplierController.ts

@@ -69,13 +69,15 @@ export const update = async (req: Request, res: Response) => {
         location,
         bio,
         payLater,
+        licenseRequired,
         minimumRentalDays,
       } = body
       supplier.fullName = fullName
       supplier.phone = phone
       supplier.location = location
       supplier.bio = bio
       supplier.payLater = payLater
+      supplier.licenseRequired = licenseRequired
       supplier.minimumRentalDays = minimumRentalDays
 
       await supplier.save()
@@ -188,6 +190,7 @@ export const getSupplier = async (req: Request, res: Response) => {
       bio,
       payLater,
       contracts,
+      licenseRequired,
       minimumRentalDays,
     } = user
 
@@ -201,13 +204,15 @@ export const getSupplier = async (req: Request, res: Response) => {
       bio,
       payLater,
       contracts,
+      licenseRequired,
       minimumRentalDays,
     })
   } catch (err) {
     logger.error(`[supplier.getSupplier] ${i18n.t('DB_ERROR')} ${id}`, err)
     return res.status(400).send(i18n.t('DB_ERROR') + err)
   }
 }
+
 /**
  * Get Suppliers.
  *

api/src/controllers/userController.ts

@@ -946,6 +946,7 @@ export const update = async (req: Request, res: Response) => {
       birthDate,
       enableEmailNotifications,
       payLater,
+      licenseRequired,
       minimumRentalDays,
     } = body
 
@@ -966,6 +967,9 @@ export const update = async (req: Request, res: Response) => {
     if (typeof payLater !== 'undefined') {
       user.payLater = payLater
     }
+    if (typeof licenseRequired !== 'undefined') {
+      user.licenseRequired = licenseRequired
+    }
 
     await user.save()
     return res.sendStatus(200)
@@ -1077,6 +1081,7 @@ export const getUser = async (req: Request, res: Response) => {
       birthDate: 1,
       payLater: 1,
       customerId: 1,
+      licenseRequired: 1,
       license: 1,
       minimumRentalDays: 1,
     }).lean()
@@ -1449,6 +1454,13 @@ export const deleteUsers = async (req: Request, res: Response) => {
           }
         }
 
+        if (user.license) {
+          const file = path.join(env.CDN_LICENSES, user.license)
+          if (await helper.exists(file)) {
+            await fs.unlink(file)
+          }
+        }
+
         if (user.type === bookcarsTypes.UserType.Supplier) {
           const additionalDrivers = (await Booking.find({ supplier: id, _additionalDriver: { $ne: null } }, { _id: 0, _additionalDriver: 1 })).map((b) => b._additionalDriver)
           await AdditionalDriver.deleteMany({ _id: { $in: additionalDrivers } })
@@ -1569,3 +1581,149 @@ export const hasPassword = async (req: Request, res: Response) => {
     return res.status(400).send(i18n.t('DB_ERROR') + err)
   }
 }
+
+/**
+ * Upload a license to temp folder.
+ *
+ * @export
+ * @async
+ * @param {Request} req
+ * @param {Response} res
+ * @returns {unknown}
+ */
+export const createLicense = async (req: Request, res: Response) => {
+  try {
+    if (!req.file) {
+      throw new Error('req.file not found')
+    }
+    if (!req.file.originalname.includes('.')) {
+      throw new Error('File extension not found')
+    }
+
+    const filename = `${nanoid()}${path.extname(req.file.originalname)}`
+    const filepath = path.join(env.CDN_TEMP_LICENSES, filename)
+
+    await fs.writeFile(filepath, req.file.buffer)
+    return res.json(filename)
+  } catch (err) {
+    logger.error(`[user.createLicense] ${i18n.t('DB_ERROR')}`, err)
+    return res.status(400).send(i18n.t('ERROR') + err)
+  }
+}
+
+/**
+* Update a license.
+*
+* @export
+* @async
+* @param {Request} req
+* @param {Response} res
+* @returns {unknown}
+*/
+export const updateLicense = async (req: Request, res: Response) => {
+  const { id } = req.params
+  const { file } = req
+
+  try {
+    if (!file) {
+      throw new Error('req.file not found')
+    }
+    if (!file.originalname.includes('.')) {
+      throw new Error('File extension not found')
+    }
+    if (!helper.isValidObjectId(id)) {
+      throw new Error('User Id not valid')
+    }
+
+    const user = await User.findOne({ _id: id, type: bookcarsTypes.UserType.User })
+
+    if (user) {
+      if (user.license) {
+        const licenseFile = path.join(env.CDN_LICENSES, user.license)
+        if (await helper.exists(licenseFile)) {
+          await fs.unlink(licenseFile)
+        }
+      }
+
+      const filename = `${user.id}${path.extname(file.originalname)}`
+      const filepath = path.join(env.CDN_LICENSES, filename)
+
+      await fs.writeFile(filepath, file.buffer)
+
+      user.license = filename
+      await user.save()
+      return res.json(filename)
+    }
+
+    return res.sendStatus(204)
+  } catch (err) {
+    logger.error(`[user.updateLicense] ${i18n.t('DB_ERROR')} ${id}`, err)
+    return res.status(400).send(i18n.t('DB_ERROR') + err)
+  }
+}
+
+/**
+* Delete a license.
+*
+* @export
+* @async
+* @param {Request} req
+* @param {Response} res
+* @returns {unknown}
+*/
+export const deleteLicense = async (req: Request, res: Response) => {
+  const { id } = req.params
+
+  try {
+    if (!helper.isValidObjectId(id)) {
+      throw new Error('User Id not valid')
+    }
+
+    const user = await User.findOne({ _id: id, type: bookcarsTypes.UserType.User })
+
+    if (user) {
+      if (user.license) {
+        const licenseFile = path.join(env.CDN_LICENSES, user.license)
+        if (await helper.exists(licenseFile)) {
+          await fs.unlink(licenseFile)
+        }
+        user.license = null
+      }
+
+      await user.save()
+      return res.sendStatus(200)
+    }
+    return res.sendStatus(204)
+  } catch (err) {
+    logger.error(`[user.deleteLicense] ${i18n.t('DB_ERROR')} ${id}`, err)
+    return res.status(400).send(i18n.t('DB_ERROR') + err)
+  }
+}
+
+/**
+* Delete a temp license.
+*
+* @export
+* @async
+* @param {Request} req
+* @param {Response} res
+* @returns {*}
+*/
+export const deleteTempLicense = async (req: Request, res: Response) => {
+  const { file } = req.params
+
+  try {
+    if (!file.includes('.')) {
+      throw new Error('Filename not valid')
+    }
+    const licenseFile = path.join(env.CDN_TEMP_LICENSES, file)
+    if (await helper.exists(licenseFile)) {
+      await fs.unlink(licenseFile)
+    }
+
+    res.sendStatus(200)
+  } catch (err) {
+    logger.error(`[user.deleteTempLicense] ${i18n.t('DB_ERROR')} ${file}`, err)
+    res.status(400).send(i18n.t('ERROR') + err)
+  }
+}

api/src/lang/en.ts

@@ -5,7 +5,7 @@ export const en = {
   ACCOUNT_ACTIVATION_SUBJECT: 'Account Activation',
   HELLO: 'Hello ',
   ACCOUNT_ACTIVATION_LINK: 'Please activate your account by clicking the link:',
-  REGARDS: 'Kind regards,<br>BookCars team',
+  REGARDS: 'Kind regards,<br>ErbilCarRent team',
   ACCOUNT_ACTIVATION_TECHNICAL_ISSUE: 'Technical Issue! Please click on resend to validate your email.',
   ACCOUNT_ACTIVATION_LINK_EXPIRED: 'Your validation link may have expired. Please click on resend to validate your email.',
   ACCOUNT_ACTIVATION_LINK_ERROR: 'We were unable to find a user for this verification. Please Sign up.',