done left search menu

controllers/chats.js

@@ -32,10 +32,21 @@ const startChat = async (req, res, next) => {
 		const companion = await UserModel.findById(id);
 		const isUser = await ChatModel.getByField(id, userId);
 		const isCompanion = await ChatModel.getByField(userId, id);
-		const { name, lastName, avatarUrl, color, online, number } = companion;
+		const {
+			name,
+			lastName,
+			originalName,
+			originalLastName,
+			avatarUrl,
+			color,
+			online,
+			number,
+		} = companion;
 		const {
 			name: Name,
 			lastName: LastName,
+			originalName: OriginalName,
+			originalLastName: OriginalLastName,
 			avatarUrl: AvatarUrl,
 			color: Color,
 			online: Online,
@@ -43,12 +54,16 @@ const startChat = async (req, res, next) => {
 		} = user;
 		if (companion && isUser && isCompanion) {
 			await ChatModel.update(isUser._id, userId, {
+				originalName,
+				originalLastName,
 				avatarUrl,
 				color,
 				online,
 				number,
 			});
 			await ChatModel.update(isCompanion._id, id, {
+				originalName: OriginalName,
+				originalLastName: OriginalLastName,
 				avatarUrl: AvatarUrl,
 				color: Color,
 				online: Online,
@@ -66,6 +81,8 @@ const startChat = async (req, res, next) => {
 			const newChat = await ChatModel.add({
 				name,
 				lastName,
+				originalName,
+				originalLastName,
 				avatarUrl,
 				color,
 				online,
@@ -76,6 +93,8 @@ const startChat = async (req, res, next) => {
 			await ChatModel.add({
 				name: Name,
 				lastName: LastName,
+				originalName: OriginalName,
+				originalLastName: originalLastName,
 				avatarUrl: AvatarUrl,
 				color: Color,
 				online: Online,

model/schemas/chat.js

@@ -18,6 +18,14 @@ const chatSchema = new Schema(
 			type: String,
 			default: null,
 		},
+		originalName: {
+			type: String,
+			default: null,
+		},
+		originalLastName: {
+			type: String,
+			default: null,
+		},
 		avatarUrl: {
 			type: String,
 			default: null,

model/schemas/user.js

@@ -12,6 +12,14 @@ const userSchema = new Schema(
 			type: String,
 			default: null,
 		},
+		originalName: {
+			type: String,
+			default: null,
+		},
+		originalLastName: {
+			type: String,
+			default: null,
+		},
 		number: {
 			type: String,
 			required: [true, 'Number required'],
@@ -45,6 +53,14 @@ const userSchema = new Schema(
 			type: String,
 			default: null,
 		},
+		sort: {
+			type: Boolean,
+			default: false,
+		},
+		nightMode: {
+			type: Boolean,
+			default: false,
+		},
 	},
 	{ timestamps: true }
 );

validation/contact.js

@@ -9,8 +9,8 @@ const schemaCreateContact = Joi.object({
 const schemaUpdateContact = Joi.object({
 	id: Joi.string().required(),
 	_id: Joi.string().required(),
-	name: Joi.string().min(3).max(30).optional().trim().optional(),
-	lastName: Joi.string().min(3).max(30).optional().trim().optional(),
+	name: Joi.string().min(1).max(30).optional().trim().optional(),
+	lastName: Joi.string().min(1).max(30).optional().trim().optional(),
 }).min(2);
 
 module.exports.createContact = (req, _res, next) => {

validation/user.js

@@ -8,8 +8,12 @@ const schemaCreateNewUser = Joi.object({
 }).min(2);
 
 const schemaUpdateUser = Joi.object({
-	name: Joi.string().min(3).max(30).optional().trim().optional(),
-	lastName: Joi.string().min(3).max(30).optional().trim().optional(),
+	name: Joi.string().min(1).max(30).optional().trim().optional(),
+	lastName: Joi.string().min(1).max(30).optional().trim().optional(),
+	originalName: Joi.string().min(3).max(30).optional().trim().optional(),
+	originalLastName: Joi.string().min(3).max(30).optional().trim().optional(),
+	nightMode: Joi.boolean().optional(),
+	sort: Joi.boolean().optional(),
 }).min(1);
 
 const schemaLogIn = Joi.object({