add ability delete files

controllers/chats.js

@@ -1,6 +1,9 @@
 const ChatModel = require('../model/chat');
 const UserModel = require('../model/user');
 const MessageModel = require('../model/message');
+const fs = require('fs').promises;
+const path = require('path');
+require('dotenv').config();
 
 const listChats = async (req, res, next) => {
 	try {
@@ -38,6 +41,7 @@ const startChat = async (req, res, next) => {
 			originalName,
 			originalLastName,
 			avatarUrl,
+			avatarsArr,
 			color,
 			online,
 			number,
@@ -48,6 +52,7 @@ const startChat = async (req, res, next) => {
 			originalName: OriginalName,
 			originalLastName: OriginalLastName,
 			avatarUrl: AvatarUrl,
+			avatarsArr: AvatarsArr,
 			color: Color,
 			online: Online,
 			number: Number,
@@ -57,6 +62,7 @@ const startChat = async (req, res, next) => {
 				originalName,
 				originalLastName,
 				avatarUrl,
+				avatarsArr,
 				color,
 				online,
 				number,
@@ -65,6 +71,7 @@ const startChat = async (req, res, next) => {
 				originalName: OriginalName,
 				originalLastName: OriginalLastName,
 				avatarUrl: AvatarUrl,
+				avatarsArr: AvatarsArr,
 				color: Color,
 				online: Online,
 				number: Number,
@@ -84,6 +91,7 @@ const startChat = async (req, res, next) => {
 				originalName,
 				originalLastName,
 				avatarUrl,
+				avatarsArr,
 				color,
 				online,
 				number,
@@ -96,6 +104,7 @@ const startChat = async (req, res, next) => {
 				originalName: OriginalName,
 				originalLastName: originalLastName,
 				avatarUrl: AvatarUrl,
+				avatarsArr: AvatarsArr,
 				color: Color,
 				online: Online,
 				number: Number,
@@ -117,14 +126,42 @@ const removeChatForBoth = async (req, res, next) => {
 	try {
 		const companionId = req.params.id;
 		const userId = req.user.id;
+		const DIR_IMAGES = process.env.DIR_IMAGES;
+		const DIR_AUDIOS = process.env.DIR_AUDIOS;
+		const DIR_VIDEOS = process.env.DIR_VIDEOS;
+		const DIR_FILES = process.env.DIR_FILES;
 		const isUserChat = await ChatModel.getByField(companionId, userId);
 		const isCompanionChat = await ChatModel.getByField(userId, companionId);
-		if (isUserChat || isCompanionChat) {
-			isUserChat && (await MessageModel.removeAll(companionId, userId));
-			isCompanionChat && (await MessageModel.removeAll(userId, companionId));
-			isUserChat && (await ChatModel.remove(isUserChat._id, userId));
-			isCompanionChat &&
-				(await ChatModel.remove(isCompanionChat._id, companionId));
+		if (isUserChat && isCompanionChat) {
+			const deleteFile = async (type, message) => {
+				if (type !== 'text') {
+					switch (type) {
+						case 'image':
+							await fs.unlink(path.join(DIR_IMAGES, message));
+							break;
+						case 'audio':
+							await fs.unlink(path.join(DIR_AUDIOS, message));
+							break;
+						case 'video':
+							await fs.unlink(path.join(DIR_VIDEOS, message));
+							break;
+						default:
+							await fs.unlink(path.join(DIR_FILES, message));
+							break;
+					}
+				}
+			};
+			const { messages } = await MessageModel.getList(
+				{ owner: userId, companionId },
+				{}
+			);
+			await messages.forEach(
+				async ({ type, message }) => await deleteFile(type, message)
+			);
+			await MessageModel.removeAll(companionId, userId);
+			await MessageModel.removeAll(userId, companionId);
+			await ChatModel.remove(isUserChat._id, userId);
+			await ChatModel.remove(isCompanionChat._id, companionId);
 			return res.json({
 				status: 'success',
 				code: 200,
@@ -226,7 +263,7 @@ const typingChat = async (req, res, next) => {
 	}
 };
 
-const chatById = async (req, res, next) => {
+const getChatById = async (req, res, next) => {
 	try {
 		const userId = req.user.id;
 		const companionId = req.params.companionId;
@@ -253,5 +290,5 @@ module.exports = {
 	sortChat,
 	seenChat,
 	typingChat,
-	chatById,
+	getChatById,
 };

controllers/contacts.js

@@ -5,7 +5,7 @@ const ChatModel = require('../model/chat');
 const listContacts = async (req, res, next) => {
 	try {
 		const userId = req.user.id;
-		const contacts = await ContactModel.getList(userId, req.query);
+		const contacts = await ContactModel.getList({ owner: userId }, req.query);
 		return res.json({
 			status: 'success',
 			code: 200,
@@ -47,7 +47,7 @@ const addContact = async (req, res, next) => {
 		const number = req.body.number;
 		const user = await UserModel.findByNumber(number);
 		const isExist = await ContactModel.getByField(number, userId);
-		if (user && !isExist) {
+		if (user && user.number !== number && !isExist) {
 			const { name, lastName, country, avatarUrl, color, _id } = user;
 			const newContact = await ContactModel.add({
 				companionId: _id,

controllers/messages.js

@@ -21,6 +21,54 @@ const listMessages = async (req, res, next) => {
 	}
 };
 
+const removeMessage = async (req, res, next) => {
+	try {
+		const id = req.params.id;
+		const userId = req.user.id;
+		const DIR_IMAGES = process.env.DIR_IMAGES;
+		const DIR_AUDIOS = process.env.DIR_AUDIOS;
+		const DIR_VIDEOS = process.env.DIR_VIDEOS;
+		const DIR_FILES = process.env.DIR_FILES;
+		const userMessage = await MessageModel.remove(id, userId);
+		const companionMessage = await MessageModel.removeByFields(
+			userId,
+			userMessage.idTime,
+			userMessage.companionId
+		);
+		if (userMessage.type !== 'text') {
+			switch (userMessage.type) {
+				case 'image':
+					await fs.unlink(path.join(DIR_IMAGES, userMessage.message));
+					break;
+				case 'audio':
+					await fs.unlink(path.join(DIR_AUDIOS, userMessage.message));
+					break;
+				case 'video':
+					await fs.unlink(path.join(DIR_VIDEOS, userMessage.message));
+					break;
+				default:
+					await fs.unlink(path.join(DIR_FILES, userMessage.message));
+					break;
+			}
+		}
+		if (userMessage && companionMessage) {
+			return res.json({
+				status: 'success',
+				code: 200,
+				data: {},
+			});
+		} else {
+			return res.status(404).json({
+				status: 'error',
+				code: 404,
+				data: 'Not Found',
+			});
+		}
+	} catch (e) {
+		next(e);
+	}
+};
+
 const listMessagesById = async (req, res, next) => {
 	try {
 		const userId = req.user.id;
@@ -42,6 +90,7 @@ const listMessagesById = async (req, res, next) => {
 const sentMessage = async (req, res, next) => {
 	try {
 		const { id, message } = req.body;
+		const idTime = Math.round(Date.now() / 1000);
 		const user = req.user;
 		const userId = user.id;
 		const companion = await UserModel.findById(id);
@@ -58,6 +107,7 @@ const sentMessage = async (req, res, next) => {
 				color,
 				number,
 				type: 'text',
+				idTime,
 				companionId: id,
 				owner: userId,
 			});
@@ -69,6 +119,7 @@ const sentMessage = async (req, res, next) => {
 				color,
 				number,
 				type: 'text',
+				idTime,
 				companionId: userId,
 				owner: id,
 			});
@@ -107,11 +158,13 @@ const imageMessage = async (req, res, next) => {
 	try {
 		const userId = req.user.id;
 		const id = req.params.companionId;
+		const idTime = Math.round(Date.now() / 1000);
 		const isChat = await ChatModel.getByField(id, userId);
 		const isCompanionChat = await ChatModel.getByField(userId, id);
 		const DIR_IMAGES = process.env.DIR_IMAGES;
 		const pathToFile = req.file.path;
-		const newNameImg = req.file.originalname;
+		const originalName = req.file.originalname;
+		const newNameImg = `${Math.round(Date.now() / 1000)}${originalName}`;
 		const fullType = req.file.mimetype;
 		await Jimp.read(pathToFile);
 		await createFolderIsExist(path.join(DIR_IMAGES, userId));
@@ -128,6 +181,7 @@ const imageMessage = async (req, res, next) => {
 				number,
 				type: 'image',
 				fullType,
+				idTime,
 				companionId: id,
 				owner: userId,
 			});
@@ -140,6 +194,7 @@ const imageMessage = async (req, res, next) => {
 				number,
 				type: 'image',
 				fullType,
+				idTime,
 				companionId: userId,
 				owner: id,
 			});
@@ -178,11 +233,13 @@ const audioMessage = async (req, res, next) => {
 	try {
 		const userId = req.user.id;
 		const id = req.params.companionId;
+		const idTime = Math.round(Date.now() / 1000);
 		const isChat = await ChatModel.getByField(id, userId);
 		const isCompanionChat = await ChatModel.getByField(userId, id);
 		const DIR_AUDIOS = process.env.DIR_AUDIOS;
 		const pathToFile = req.file.path;
-		const newNameAudio = req.file.originalname;
+		const originalName = req.file.originalname;
+		const newNameAudio = `${Math.round(Date.now() / 1000)}${originalName}`;
 		const fullType = req.file.mimetype;
 		await createFolderIsExist(path.join(DIR_AUDIOS, userId));
 		await fs.rename(pathToFile, path.join(DIR_AUDIOS, userId, newNameAudio));
@@ -198,6 +255,7 @@ const audioMessage = async (req, res, next) => {
 				number,
 				type: 'audio',
 				fullType,
+				idTime,
 				companionId: id,
 				owner: userId,
 			});
@@ -210,6 +268,7 @@ const audioMessage = async (req, res, next) => {
 				number,
 				type: 'audio',
 				fullType,
+				idTime,
 				companionId: userId,
 				owner: id,
 			});
@@ -248,11 +307,13 @@ const videoMessage = async (req, res, next) => {
 	try {
 		const userId = req.user.id;
 		const id = req.params.companionId;
+		const idTime = Math.round(Date.now() / 1000);
 		const isChat = await ChatModel.getByField(id, userId);
 		const isCompanionChat = await ChatModel.getByField(userId, id);
 		const DIR_VIDEOS = process.env.DIR_VIDEOS;
 		const pathToFile = req.file.path;
-		const newNameVideo = req.file.originalname;
+		const originalName = req.file.originalname;
+		const newNameVideo = `${Math.round(Date.now() / 1000)}${originalName}`;
 		const fullType = req.file.mimetype;
 		await createFolderIsExist(path.join(DIR_VIDEOS, userId));
 		await fs.rename(pathToFile, path.join(DIR_VIDEOS, userId, newNameVideo));
@@ -268,6 +329,7 @@ const videoMessage = async (req, res, next) => {
 				number,
 				type: 'video',
 				fullType,
+				idTime,
 				companionId: id,
 				owner: userId,
 			});
@@ -280,6 +342,7 @@ const videoMessage = async (req, res, next) => {
 				number,
 				type: 'video',
 				fullType,
+				idTime,
 				companionId: userId,
 				owner: id,
 			});
@@ -318,11 +381,11 @@ const fileMessage = async (req, res, next) => {
 	try {
 		const userId = req.user.id;
 		const id = req.params.companionId;
+		const idTime = Math.round(Date.now() / 1000);
 		const isChat = await ChatModel.getByField(id, userId);
 		const isCompanionChat = await ChatModel.getByField(userId, id);
 		const DIR_FILES = process.env.DIR_FILES;
 		const pathToFile = req.file.path;
-		const newNameFile = req.file.originalname;
 		const fullType = req.file.mimetype;
 		let type;
 		switch (fullType) {
@@ -338,6 +401,7 @@ const fileMessage = async (req, res, next) => {
 			default:
 				break;
 		}
+		const newNameFile = `${Math.round(Date.now() / 1000)}file.${type}`;
 		await createFolderIsExist(path.join(DIR_FILES, userId));
 		await fs.rename(pathToFile, path.join(DIR_FILES, userId, newNameFile));
 		const fileUrl = path.normalize(path.join(userId, newNameFile));
@@ -352,6 +416,7 @@ const fileMessage = async (req, res, next) => {
 				number,
 				type,
 				fullType,
+				idTime,
 				companionId: id,
 				owner: userId,
 			});
@@ -364,6 +429,7 @@ const fileMessage = async (req, res, next) => {
 				number,
 				type,
 				fullType,
+				idTime,
 				companionId: userId,
 				owner: id,
 			});
@@ -400,6 +466,7 @@ const fileMessage = async (req, res, next) => {
 
 module.exports = {
 	listMessages,
+	removeMessage,
 	listMessagesById,
 	sentMessage,
 	imageMessage,

controllers/user.js

@@ -151,7 +151,8 @@ const updateAvatar = async (req, res, next) => {
 		const token = req.user.token;
 		const DIR_IMAGES = process.env.DIR_IMAGES;
 		const pathToFile = req.file.path;
-		const newNameAvatar = req.file.originalname;
+		const originalName = req.file.originalname;
+		const newNameAvatar = `${Math.round(Date.now() / 1000)}${originalName}`;
 		const img = await Jimp.read(pathToFile);
 		await img
 			.autocrop()
@@ -164,7 +165,8 @@ const updateAvatar = async (req, res, next) => {
 		await createFolderIsExist(path.join(DIR_IMAGES, userId));
 		await fs.rename(pathToFile, path.join(DIR_IMAGES, userId, newNameAvatar));
 		const avatarUrl = path.normalize(path.join(userId, newNameAvatar));
-		await UserModel.updateUser(userId, { avatarUrl });
+		const avatarsArr = [avatarUrl, ...req.user.avatarsArr];
+		await UserModel.updateUser(userId, { avatarUrl, avatarsArr });
 		return res.status(200).json({
 			status: 'success',
 			code: 200,