feat: update bot send mail

Author: hiiiii02102002

client/src/components/forms/channel.tsx

@@ -22,7 +22,7 @@ import { useQuery } from '@tanstack/react-query';
 import { queryChannelTypesOption } from '@/lib/query-options/channel';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { ChannelType } from '@/types/channel';
-import { useEffect, useMemo } from 'react';
+import { useMemo } from 'react';
 import { useDidUpdate } from '@/hooks/use-did-update';
 
 type Props = {

client/src/components/pages/channels/data-toolbar.tsx

@@ -1,9 +1,7 @@
 import ChannelForm from '@/components/forms/channel';
 import {
    Button,
-   Input,
    Sheet,
-   SheetClose,
    SheetContent,
    SheetDescription,
    SheetFooter,
@@ -13,14 +11,10 @@ import {
 } from '@/components/ui';
 import { useCreateChannel } from '@/hooks/channel';
 import { useSearch } from '@/hooks/use-search';
-import React, { useState } from 'react';
+import { useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
 
-type Props = {
-   table: any;
-};
-
 export const DataToolbar = () => {
    const { renderInput } = useSearch();
    const { t } = useTranslation(['common', 'channel']);

client/src/components/pages/channels/row-action.tsx

@@ -19,7 +19,7 @@ import { useBodyOverflow } from '@/hooks/use-body-overflow';
 import { TChannelWithChannelType } from '@/types/channel';
 import { Row } from '@tanstack/react-table';
 import { Link, MoreHorizontal } from 'lucide-react';
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 
 type Props = {

client/src/pages/channels.tsx

@@ -30,7 +30,7 @@ export const Channels = () => {
             <DataTable
                columns={cols}
                data={data.items || []}
-               renderToolbar={(table) => <DataToolbar />}
+               renderToolbar={() => <DataToolbar />}
                opts={{
                   state: {
                      sorting,

server/src/config/index.ts

@@ -30,4 +30,6 @@ export const {
    SIGNATURE_SECRET,
    PUBLIC_DOMAIN,
    BOT_ENDPOINT,
+   MAIL_USER,
+   MAIL_PASS,
 } = process.env;

server/src/dtos/bot-mail.dto.ts

@@ -0,0 +1,25 @@
+import { TTemplate } from '@/mail/send-mail';
+import { IsEmail, IsNotEmpty, IsObject, IsString } from 'class-validator';
+
+export class BotMailDto {
+   @IsString()
+   @IsEmail()
+   @IsNotEmpty()
+   to: string;
+
+   @IsString()
+   @IsNotEmpty()
+   subject: string;
+
+   @IsString()
+   @IsNotEmpty()
+   @IsString()
+   from: string;
+
+   @IsString()
+   @IsNotEmpty()
+   template: TTemplate;
+
+   @IsObject()
+   variables: Record<string, any>;
+}

server/src/mail/send-mail.ts

@@ -2,6 +2,7 @@ import { render } from '@react-email/render';
 import nodemailer from 'nodemailer';
 import { logger } from '../utils/logger';
 import { ForgotPassword, ForgotPasswordProps } from './templates';
+import { MAIL_PASS, MAIL_USER } from '@/config';
 
 interface TemplateProps {
    'forgot-password': ForgotPasswordProps;
@@ -16,17 +17,25 @@ const MAP_TEMPLATES: TMapTemplates = {
    'verify-email': () => '',
 };
 
+export type TTemplate = keyof TemplateProps;
 
 export const sendMail = async <T extends keyof TemplateProps>(opts: {
    to: string;
    subject: string;
    template: T;
    props: TemplateProps[T];
-   user?: string
-   pass?: string
+   from?: string;
+   user?: string;
+   pass?: string;
 }) => {
-   const { to, subject, template, props, pass
-      = process.env.MAIL_PASS, user = process.env.MAIL_USER
+   const {
+      to,
+      subject,
+      template,
+      props,
+      pass = MAIL_PASS,
+      user = MAIL_USER,
+      from = MAIL_USER,
    } = opts;
    try {
       const html = MAP_TEMPLATES[template](props);
@@ -42,9 +51,8 @@ export const sendMail = async <T extends keyof TemplateProps>(opts: {
          },
       });
 
-
       await transporter.sendMail({
-         from: process.env.MAIL_FROM,
+         from,
          to,
          subject,
          html,

server/src/services/bot-mail.service.ts

@@ -0,0 +1,38 @@
+import { BotMailDto } from '@/dtos/bot-mail.dto';
+import { SendMailQueue } from '@/queues/mail.queue';
+import { Service } from 'typedi';
+import { db } from '@/database/db';
+import { settings } from '@/database/schema';
+import { eq } from 'drizzle-orm';
+
+@Service()
+export class BotMailService {
+   constructor(private readonly sendMailQueue: SendMailQueue) {}
+
+   async sendMail(fields: BotMailDto) {
+      const { from, subject, template, to, variables } = fields;
+
+      const userId = '1';
+
+      const [user] = await db
+         .select()
+         .from(settings)
+         .where(eq(settings.userId, userId));
+
+      if (!user) {
+         return;
+      }
+
+      const { email, password } = user.email;
+
+      await this.sendMailQueue.addJob({
+         from,
+         to,
+         props: variables,
+         subject,
+         template,
+         pass: password,
+         user: email,
+      });
+   }
+}

server/src/services/setting.service.ts

@@ -6,7 +6,7 @@ import { Service } from 'typedi';
 import { decrypt, encrypt } from '@/utils/crypto';
 @Service()
 export class SettingService {
-   async findByUserId(userId: string) {
+   async findByUserId(userId: string): Promise<string> {
       const [setting] = await db
          .select()
          .from(settings)