adriano.andrade
/
projeto-hit
mirror of https://github.com/AdrianoRobson/projeto-hit.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat(ticket-transfer): Para a transferencia de ticket para um usuario especifico ou para uma fila especifica

adriano 2023-10-18 16:42:03 -03:00
parent fd5d9829e4
commit dcf471fa42
6 changed files with 187 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/controllers/ReportController.ts
View File

@ -64,7 +64,7 @@ export const reportUserService = async (req: Request, res: Response): Promise<Re
const { userId, startDate, endDate } = req.query as IndexQuery
let usersProfile = await ListUserParamiterService({ profile: 'user' })
let usersProfile = await ListUserParamiterService({ profile: 'user', raw:true })
const sumUserOlineTime = await ShowUserServiceReport({ startDate, endDate, userId });
const closedByUser = await ShowUserServiceReport({ startDate, endDate, ticketStatus: 'closed', userId });

1
backend/src/controllers/TicketController.ts
View File

@ -236,6 +236,7 @@ export const update = async (
ticket2 = ticket;
} else {
// Para aparecer pendente para todos usuarios que estao na fila
if (req.body.transfer) {
req.body.userId = null;

59
backend/src/controllers/UserController.ts
View File

@ -10,11 +10,15 @@ import UpdateUserService from "../services/UserServices/UpdateUserService";
import ShowUserService from "../services/UserServices/ShowUserService";
import DeleteUserService from "../services/UserServices/DeleteUserService";
import ListUserParamiterService from "../services/UserServices/ListUserParamiterService"
import ListUserParamiterService from "../services/UserServices/ListUserParamiterService";
import User from "../models/User";
import { startWhoIsOnlineMonitor, stopWhoIsOnlineMonitor } from "../helpers/WhoIsOnlineMonitor"
import UserOnlineTIme from '../models/UserOnlineTime'
import {
startWhoIsOnlineMonitor,
stopWhoIsOnlineMonitor
} from "../helpers/WhoIsOnlineMonitor";
import UserOnlineTIme from "../models/UserOnlineTime";
import ListUser from "../services/UserServices/ListUserParamiterService";
type IndexQuery = {
searchParam: string;
@ -31,13 +35,12 @@ export const index = async (req: Request, res: Response): Promise<Response> => {
profile
});
if (req.user.profile !== 'master') {
if (req.user.profile !== "master") {
let auxUsers: Array<object> = [];
for (var user of users) {
if (user.profile !== 'master') {
auxUsers.push(user)
if (user.profile !== "master") {
auxUsers.push(user);
}
}
@ -46,8 +49,6 @@ export const index = async (req: Request, res: Response): Promise<Response> => {
return res.json({ users, count, hasMore });
// const { users, count, hasMore } = await ListUsersService({
// searchParam,
// pageNumber
@ -69,11 +70,23 @@ export const index = async (req: Request, res: Response): Promise<Response> => {
// return res.json({ users, count, hasMore });
};
export const all = async (req: Request, res: Response): Promise<Response> => {
const { profile } = req.query as IndexQuery;
const users = await ListUser({
profile
});
return res.json({ users });
};
export const store = async (req: Request, res: Response): Promise<Response> => {
const { email, password, name, profile, queueIds } = req.body;
if (req.url === "/signup" && (await CheckSettingsHelper("userCreation")) === "disabled") {
if (
req.url === "/signup" &&
(await CheckSettingsHelper("userCreation")) === "disabled"
) {
throw new AppError("ERR_USER_CREATION_DISABLED", 403);
} else if (req.url !== "/signup" && req.user.profile !== "master") {
throw new AppError("ERR_NO_PERMISSION", 403);
@ -93,9 +106,8 @@ export const store = async (req: Request, res: Response): Promise<Response> => {
user
});
// await stopWhoIsOnlineMonitor()
await startWhoIsOnlineMonitor()
await startWhoIsOnlineMonitor();
return res.status(200).json(user);
};
@ -108,17 +120,18 @@ export const show = async (req: Request, res: Response): Promise<Response> => {
return res.status(200).json(user);
};
export const logoutUser = async (req: Request, res: Response): Promise<Response> => {
export const logoutUser = async (
req: Request,
res: Response
): Promise<Response> => {
const { userId } = req.params;
await stopWhoIsOnlineMonitor()
await stopWhoIsOnlineMonitor();
let onlineTime = {
userId: userId,
status: 'logout...'
}
status: "logout..."
};
const io = getIO();
io.emit("onlineStatus", {
@ -126,13 +139,12 @@ export const logoutUser = async (req: Request, res: Response): Promise<Response>
userOnlineTime: onlineTime
});
await startWhoIsOnlineMonitor()
await startWhoIsOnlineMonitor();
//
return res.status(200).json({});
};
export const update = async (
req: Request,
res: Response
@ -165,26 +177,23 @@ export const remove = async (
throw new AppError("ERR_NO_PERMISSION", 403);
}
await DeleteUserService(userId);
const io = getIO();
io.emit("user", {
action: "delete",
userId
});
//test del
await stopWhoIsOnlineMonitor()
await stopWhoIsOnlineMonitor();
io.emit("onlineStatus", {
action: "delete",
userOnlineTime: userId
});
await startWhoIsOnlineMonitor()
await startWhoIsOnlineMonitor();
//
return res.status(200).json({ message: "User deleted" });

2
backend/src/routes/userRoutes.ts
View File

@ -6,6 +6,8 @@ import * as UserController from "../controllers/UserController";
const userRoutes = Router();
userRoutes.get("/users/all", isAuth, UserController.all);
userRoutes.get("/users", isAuth, UserController.index);
userRoutes.post("/users", isAuth, UserController.store);

8
backend/src/services/UserServices/ListUserParamiterService.ts
View File

@ -7,10 +7,11 @@ import UserQueue from "../../models/UserQueue";
interface Request {
userId?: string | number;
profile?: string;
raw?:boolean
}
const ListUser = async ({ profile, userId }: Request): Promise<User[]> => {
const ListUser = async ({ profile, userId, raw}: Request): Promise<User[]> => {
let where_clause = {}
@ -38,9 +39,12 @@ const ListUser = async ({ profile, userId }: Request): Promise<User[]> => {
const users = await User.findAll({
where: where_clause,
raw: true,
raw,
attributes: ['id', 'name', 'email'],
include: [
{ model: Queue, as: "queues", attributes: ["id", "name", "color"] }
],
// include: [
// {

175
frontend/src/components/TransferTicketModal/index.js
View File

@ -1,30 +1,30 @@
import React, { useState, useContext, useMemo } from "react";
import { useHistory } from "react-router-dom";
import React, { useState, useContext, useMemo, useRef, useEffect } from "react"
import { useHistory } from "react-router-dom"
import Button from "@material-ui/core/Button";
import Dialog from "@material-ui/core/Dialog";
import Select from "@material-ui/core/Select";
import FormControl from "@material-ui/core/FormControl";
import InputLabel from "@material-ui/core/InputLabel";
import MenuItem from "@material-ui/core/MenuItem";
import { makeStyles } from "@material-ui/core";
import Button from "@material-ui/core/Button"
import Dialog from "@material-ui/core/Dialog"
import Select from "@material-ui/core/Select"
import FormControl from "@material-ui/core/FormControl"
import InputLabel from "@material-ui/core/InputLabel"
import MenuItem from "@material-ui/core/MenuItem"
import { makeStyles } from "@material-ui/core"
import DialogActions from "@material-ui/core/DialogActions";
import DialogContent from "@material-ui/core/DialogContent";
import DialogTitle from "@material-ui/core/DialogTitle";
import DialogActions from "@material-ui/core/DialogActions"
import DialogContent from "@material-ui/core/DialogContent"
import DialogTitle from "@material-ui/core/DialogTitle"
import { i18n } from "../../translate/i18n";
import api from "../../services/api";
import ButtonWithSpinner from "../ButtonWithSpinner";
import toastError from "../../errors/toastError";
import { i18n } from "../../translate/i18n"
import api from "../../services/api"
import ButtonWithSpinner from "../ButtonWithSpinner"
import toastError from "../../errors/toastError"
import { WhatsAppsContext } from "../../context/WhatsApp/WhatsAppsContext";
import { WhatsAppsContext } from "../../context/WhatsApp/WhatsAppsContext"
const useStyles = makeStyles((theme) => ({
maxWidth: {
width: "100%",
},
}));
}))
// Receive array of queues arrays
// Return a new array with unique queues from all arrays has passed by the parameter
@ -45,49 +45,117 @@ const queueArraysToOneArray = (array) => {
const TransferTicketModal = ({ modalOpen, onClose, ticketid }) => {
const history = useHistory();
const { whatsApps } = useContext(WhatsAppsContext);
const [loading, setLoading] = useState(false);
const [selectedQueue, setSelectedQueue] = useState('');
const classes = useStyles();
const queues = useMemo(() => {
const history = useHistory()
const { whatsApps } = useContext(WhatsAppsContext)
const [loading, setLoading] = useState(false)
const [selectedQueue, setSelectedQueue] = useState('')
const [selectedUser, setSelectedUser] = useState('')
const classes = useStyles()
const [users, setUsers] = useState([])
const [queues, setQueues] = useState([])
const isRun = useRef(false)
const _queues = useMemo(() => {
if (!whatsApps) return []
const whatsAppsQueues = whatsApps.map(({ queues }) => queues)
//const whatsAppsQueues = whatsApps.filter(({ status }) => status === "CONNECTED" ).map(({ queues }) => queues)
const uniqueQueuesAvailable = queueArraysToOneArray(whatsAppsQueues)
return uniqueQueuesAvailable
}, [whatsApps])
const [itemHover, setItemHover] = useState(-1)
useEffect(() => {
if (isRun.current) return
setQueues(_queues)
isRun.current = true
}, [whatsApps])
useEffect(() => {
console.log('==========> selectedUser: ', selectedUser)
if (selectedUser) {
let { queues } = users.find(u => +u.id == +selectedUser)
const userQueues = queues.map((q) => {
const { id, color, name } = q
return { id, color, name }
})
setQueues(userQueues)
setSelectedQueue('')
}
else {
setQueues(_queues)
setSelectedUser('')
}
}, [selectedUser])
const handleClose = () => {
onClose();
};
onClose()
}
const handleSaveTicket = async e => {
e.preventDefault();
if (!ticketid) return;
if (!selectedQueue) return;
setLoading(true);
e.preventDefault()
if (!ticketid) return
if (!selectedQueue) return
setLoading(true)
try {
let data = {};
let data = {}
if (selectedQueue && selectedQueue !== null) {
data.queueId = selectedQueue
}
// test del PARA APARECER NA FILA DE OUTRO ATENDENTE E O MESMO CLICAR EM ACEITAR AO INVES DE ENVIAR PARA ATENDENDO
data.status = 'pending'
data.transfer = true
await api.put(`/tickets/${ticketid}`, data);
if (selectedUser) {
data.userId = selectedUser
}
else {
// test del PARA APARECER NA FILA DE OUTRO ATENDENTE E O MESMO CLICAR EM ACEITAR AO INVES DE ENVIAR PARA ATENDENDO
data.status = 'pending'
data.transfer = true
}
setLoading(false);
history.push(`/tickets`);
await api.put(`/tickets/${ticketid}`, data)
setLoading(false)
history.push(`/tickets`)
} catch (err) {
setLoading(false);
toastError(err);
setLoading(false)
toastError(err)
}
};
}
useEffect(() => {
const delayDebounceFn = setTimeout(() => {
const fetchUsers = async () => {
try {
const { data } = await api.get("/users/all", {
params: { profile: 'user' },
})
setUsers(data.users)
console.log('data.users: ', data.users)
} catch (err) {
console.log(err)
}
}
fetchUsers()
}, 500)
return () => clearTimeout(delayDebounceFn)
}, [])
return (
<Dialog open={modalOpen} onClose={handleClose} maxWidth="lg" scroll="paper">
@ -98,6 +166,7 @@ const TransferTicketModal = ({ modalOpen, onClose, ticketid }) => {
<DialogContent dividers>
<FormControl variant="outlined" className={classes.maxWidth}>
<InputLabel>{i18n.t("transferTicketModal.fieldQueueLabel")}</InputLabel>
<Select
value={selectedQueue}
onChange={(e) => setSelectedQueue(e.target.value)}
@ -118,6 +187,26 @@ const TransferTicketModal = ({ modalOpen, onClose, ticketid }) => {
</MenuItem>
))}
</Select>
<br />
<Select
value={selectedUser}
onChange={e => setSelectedUser(e.target.value)}
label={'Transfeir para usuario'}
>
<MenuItem style={{ background: "white", }} value={''}>&nbsp;</MenuItem>
{users.map((user) => (
<MenuItem
key={user.id}
value={user.id}
>{user.name}
</MenuItem>
))}
</Select>
</FormControl>
</DialogContent>
<DialogActions>
@ -140,7 +229,7 @@ const TransferTicketModal = ({ modalOpen, onClose, ticketid }) => {
</DialogActions>
</form>
</Dialog >
);
};
)
}
export default TransferTicketModal;
export default TransferTicketModal