Compare commits

...

4 Commits

Author SHA1 Message Date
adriano ea163b62b4 Merge branch 'master' of github.com:AdrianoRobson/projeto-hit into feat_faro 2024-09-17 05:08:01 -05:00
adriano c4e5608aca prepare to merge 2024-09-17 05:04:49 -05:00
gustavo-gsp f4f5dad8d2 fix: resolve issue of creating multiple contacts for the same WhatsApp number of a client
Details:
- Fixed the bug that allowed the creation of more than one contact for the same WhatsApp number of a client.
2024-09-06 16:59:23 -03:00
gustavo-gsp 05c9f3af6d perf: improve backend with compression and optimize frontend with lazy load
Details:
- Added compression to the backend to reduce page load times.
- Implemented lazy loading in frontend routes to optimize page loading performance.
2024-09-05 12:20:52 -03:00
8 changed files with 114 additions and 98 deletions

View File

@ -22,6 +22,7 @@
"@types/pino": "^6.3.4",
"axios": "^1.2.3",
"bcryptjs": "^2.4.3",
"compression": "^1.7.4",
"cookie-parser": "^1.4.5",
"cors": "^2.8.5",
"date-fns": "^2.30.0",
@ -56,9 +57,9 @@
"yup": "^0.32.8"
},
"devDependencies": {
"@types/lodash": "4.14",
"@types/bcryptjs": "^2.4.2",
"@types/bluebird": "^3.5.32",
"@types/compression": "^1.7.5",
"@types/cookie-parser": "^1.4.2",
"@types/cors": "^2.8.7",
"@types/express": "^4.17.13",
@ -66,6 +67,7 @@
"@types/faker": "^5.1.3",
"@types/jest": "^26.0.15",
"@types/jsonwebtoken": "^8.5.0",
"@types/lodash": "4.14",
"@types/multer": "^1.4.4",
"@types/node": "^14.11.8",
"@types/supertest": "^2.0.10",

View File

@ -11,6 +11,7 @@ import uploadConfig from "./config/upload";
import AppError from "./errors/AppError";
import routes from "./routes";
import { logger } from "./utils/logger";
import compression from 'compression';
Sentry.init({ dsn: process.env.SENTRY_DSN });
@ -23,6 +24,7 @@ app.use(
})
);
app.use(compression());
app.use(cookieParser());
app.use(express.json());
app.use(Sentry.Handlers.requestHandler());

View File

@ -1,5 +1,6 @@
import { getIO } from "../../libs/socket";
import Contact from "../../models/Contact";
const { Op } = require('sequelize');
import { createOrUpdateContactCache } from '../../helpers/ContactsCache'
import { tr } from "date-fns/locale";
@ -35,15 +36,37 @@ const CreateOrUpdateContactService = async ({
const io = getIO();
let contact: Contact | null;
contact = await Contact.findOne({ where: { number } });
const firstFourDigits = number.slice(0, 4);
const lastEightDigits = number.slice(-8);
//const numberFormat = number?.length === 13 && number[4] == '9' ? number.slice(0, 4) + number.slice(0, 4) : number;
//contact = await Contact.findOne({ where: { number } });
contact = await Contact.findOne({
where: {
[Op.and]: [
{
number: {
[Op.like]: `%${firstFourDigits}%`
}
},
{
number: {
[Op.like]: `%${lastEightDigits}%`
}
}
]
}
});
if (contact) {
contact.update({ profilePicUrl });
// TEST DEL
await createOrUpdateContactCache(`contact:${contact.id}`, { profilePicUrl })
//
if(contact.number == number){
contact.update({ profilePicUrl });
await createOrUpdateContactCache(`contact:${contact.id}`, { profilePicUrl })
} else{
contact.update({ profilePicUrl, number });
await createOrUpdateContactCache(`contact:${contact.id}`, { profilePicUrl, number })
}
io.emit("contact", {
action: "update",

View File

@ -12,9 +12,6 @@ import UpdateTicketService from "./UpdateTicketService";
import { getSettingValue } from "../../helpers/WhaticketSettings"
import ListWhatsAppsNumber from "../WhatsappService/ListWhatsAppsNumber"
import { getSettingValue } from "../../helpers/WhaticketSettings";
import ListWhatsAppsNumber from "../WhatsappService/ListWhatsAppsNumber";
const FindOrCreateTicketServiceBot = async (
contact: Contact,
whatsappId: number,
@ -104,8 +101,6 @@ const FindOrCreateTicketServiceBot = async (
unreadMessages
});
console.log("lxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
await dialogFlowStartContext(contact, ticket, botInfo);
}
}
@ -131,8 +126,6 @@ const FindOrCreateTicketServiceBot = async (
phoneNumberId
});
console.log("yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy");
await dialogFlowStartContext(contact, ticket, botInfo);
}

View File

@ -1061,8 +1061,6 @@ const handleMessage = async (
// console.log('----------> chat: ', JSON.parse(JSON.stringify(chat)))
console
if (chat.isGroup) {
// let msgGroupContact;

View File

@ -1,9 +1,14 @@
import React, { useContext } from "react";
import React, { useContext, Suspense, lazy } from "react";
import { Route as RouterRoute, Redirect } from "react-router-dom";
import { AuthContext } from "../context/Auth/AuthContext";
import BackdropLoading from "../components/BackdropLoading";
// Exemplo de como você carregaria componentes de forma lazy
const Dashboard = lazy(() => import("../pages/Dashboard"));
const Login = lazy(() => import("../pages/Login"));
const Signup = lazy(() => import("../pages/Signup"));
const Route = ({ component: Component, isPrivate = false, ...rest }) => {
const { isAuth, loading } = useContext(AuthContext);
@ -20,7 +25,7 @@ const Route = ({ component: Component, isPrivate = false, ...rest }) => {
return (
<>
{loading && <BackdropLoading />}
<Redirect to={{ pathname: "/", state: { from: rest.location } }} />;
<Redirect to={{ pathname: "/", state: { from: rest.location } }} />
</>
);
}
@ -28,9 +33,11 @@ const Route = ({ component: Component, isPrivate = false, ...rest }) => {
return (
<>
{loading && <BackdropLoading />}
<RouterRoute {...rest} component={Component} />
<Suspense fallback={<BackdropLoading />}>
<RouterRoute {...rest} component={Component} />
</Suspense>
</>
);
};
export default Route;
export default Route;

View File

@ -1,94 +1,85 @@
import React from 'react'
import React, { Suspense, lazy } from 'react';
import { BrowserRouter, Switch } from 'react-router-dom'
import { ToastContainer } from 'react-toastify'
import LoggedInLayout from '../layout'
import Dashboard from '../pages/Dashboard/'
import Report from '../pages/Report/'
import SchedulesReminder from '../pages/SchedulesReminder/'
import Tickets from '../pages/Tickets/'
import Signup from '../pages/Signup/'
import Login from '../pages/Login/'
import Connections from '../pages/Connections/'
import Campaign from '../pages/Campaign'
import Settings from '../pages/Settings/'
import Users from '../pages/Users'
import Contacts from '../pages/Contacts/'
import QuickAnswers from '../pages/QuickAnswers/'
import StatusChatEnd from '../pages/StatusChatEnd/'
import Position from '../pages/Position/'
import Queues from '../pages/Queues/'
import { AuthProvider } from '../context/Auth/AuthContext'
import { WhatsAppsProvider } from '../context/WhatsApp/WhatsAppsContext'
import LoggedInLayout from '../layout'
import Route from './Route'
import BackdropLoading from "../components/BackdropLoading";
const Dashboard = lazy(() => import('../pages/Dashboard/'));
const Report = lazy(() => import('../pages/Report/'));
const SchedulesReminder = lazy(() => import('../pages/SchedulesReminder/'));
const Tickets = lazy(() => import('../pages/Tickets/'));
const Signup = lazy(() => import('../pages/Signup/'));
const Login = lazy(() => import('../pages/Login/'));
const Connections = lazy(() => import('../pages/Connections/'));
const Campaign = lazy(() => import('../pages/Campaign/'));
const Settings = lazy(() => import('../pages/Settings/'));
const Users = lazy(() => import('../pages/Users/'));
const Contacts = lazy(() => import('../pages/Contacts/'));
const QuickAnswers = lazy(() => import('../pages/QuickAnswers/'));
const StatusChatEnd = lazy(() => import('../pages/StatusChatEnd/'));
const Position = lazy(() => import('../pages/Position/'));
const Queues = lazy(() => import('../pages/Queues/'));
const Routes = () => {
return (
<BrowserRouter>
<AuthProvider>
<Switch>
<Route exact path="/login" component={Login} />
<Route exact path="/signup" component={Signup} />
<WhatsAppsProvider>
<LoggedInLayout>
<Route exact path="/" component={Dashboard} isPrivate />
<Route
exact
path="/tickets/:ticketId?"
component={Tickets}
isPrivate
/>
<Route
exact
path="/connections"
component={Connections}
isPrivate
/>
<Route exact path="/report" component={Report} isPrivate />
<Route exact path="/contacts" component={Contacts} isPrivate />
<Route
exact
path="/schedulesReminder"
component={SchedulesReminder}
isPrivate
/>
<Route exact path="/users" component={Users} isPrivate />
<Route
exact
path="/quickAnswers"
component={QuickAnswers}
isPrivate
/>
<Route
exact
path="/statusChatEnd"
component={StatusChatEnd}
isPrivate
/>
<Route
exact
path="/position"
component={Position}
isPrivate
/>
<Route exact path="/Settings" component={Settings} isPrivate />
<Route exact path="/Queues" component={Queues} isPrivate />
<Route exact path="/campaign" component={Campaign} isPrivate />
</LoggedInLayout>
</WhatsAppsProvider>
</Switch>
<Suspense fallback={<BackdropLoading />}>
<Switch>
<Route exact path="/login" component={Login} />
<Route exact path="/signup" component={Signup} />
<WhatsAppsProvider>
<LoggedInLayout>
<Route exact path="/" component={Dashboard} isPrivate />
<Route
exact
path="/tickets/:ticketId?"
component={Tickets}
isPrivate
/>
<Route
exact
path="/connections"
component={Connections}
isPrivate
/>
<Route exact path="/report" component={Report} isPrivate />
<Route exact path="/contacts" component={Contacts} isPrivate />
<Route
exact
path="/schedulesReminder"
component={SchedulesReminder}
isPrivate
/>
<Route exact path="/users" component={Users} isPrivate />
<Route
exact
path="/quickAnswers"
component={QuickAnswers}
isPrivate
/>
<Route
exact
path="/statusChatEnd"
component={StatusChatEnd}
isPrivate
/>
<Route exact path="/position" component={Position} isPrivate />
<Route exact path="/Settings" component={Settings} isPrivate />
<Route exact path="/Queues" component={Queues} isPrivate />
<Route exact path="/campaign" component={Campaign} isPrivate />
</LoggedInLayout>
</WhatsAppsProvider>
</Switch>
</Suspense>
<ToastContainer autoClose={3000} />
</AuthProvider>
</BrowserRouter>
)
);
}
export default Routes

2
package-lock.json generated
View File

@ -1,5 +1,5 @@
{
"name": "whaticket",
"name": "projeto-hit",
"lockfileVersion": 2,
"requires": true,
"packages": {