(refacto) data validation file

Author: antoine92190

src/ChatWindow/ChatWindow.vue

@@ -79,7 +79,10 @@ import Room from './Room/Room'
 
 import locales from '../locales'
 import { defaultThemeStyles, cssThemeVars } from '../themes'
-const { roomsValid, partcipantsValid } = require('../utils/room-validation')
+const {
+	roomsValidation,
+	partcipantsValidation
+} = require('../utils/data-validation')
 
 export default {
 	name: 'ChatContainer',
@@ -212,22 +215,12 @@ export default {
 		},
 
 		room(val) {
-			if (!val) return
+			if (!val || Object.entries(val).length === 0) return
 
-			if (Object.entries(val).length === 0) return
-
-			if (!roomsValid(val)) {
-				throw new Error(
-					'Rooms object is not valid! Must contain roomId[String, Number], roomName[String] and users[Array]'
-				)
-			}
+			roomsValidation(val)
 
 			val.users.forEach(user => {
-				if (!partcipantsValid(user)) {
-					throw new Error(
-						'Participants object is not valid! Must contain _id[String, Number] and username[String]'
-					)
-				}
+				partcipantsValidation(user)
 			})
 		},
 

src/ChatWindow/Message/Message.vue

@@ -189,7 +189,7 @@ import MessageActions from './MessageActions'
 import MessageReactions from './MessageReactions'
 import AudioPlayer from './AudioPlayer'
 
-const { messagesValid } = require('../../utils/room-validation')
+const { messagesValidation } = require('../../utils/data-validation')
 const {
 	isImageFile,
 	isVideoFile,
@@ -289,12 +289,7 @@ export default {
 	},
 
 	mounted() {
-		if (!messagesValid(this.message)) {
-			throw new Error(
-				'Messages object is not valid! Must contain _id[String, Number], content[String, Number] and senderId[String, Number]'
-			)
-		}
-
+		messagesValidation(this.message)
 		this.$emit('message-added', { message: this.message, index: this.index })
 	},
 

src/utils/room-validation.js renamed to src/utils/data-validation.js

@@ -1,4 +1,4 @@
-export function roomsValid(obj) {
+export function roomsValidation(obj) {
 	const roomsValidate = [
 		{ key: 'roomId', type: ['string', 'number'] },
 		{ key: 'roomName', type: ['string'] },
@@ -19,10 +19,14 @@ export function roomsValid(obj) {
 		})
 	}
 
-	return validate(obj, roomsValidate)
+	if (!validate(obj, roomsValidate)) {
+		throw new Error(
+			'Rooms object is not valid! Must contain roomId[String, Number], roomName[String] and users[Array]'
+		)
+	}
 }
 
-export function partcipantsValid(obj) {
+export function partcipantsValidation(obj) {
 	const participantsValidate = [
 		{ key: '_id', type: ['string', 'number'] },
 		{ key: 'username', type: ['string'] }
@@ -35,11 +39,15 @@ export function partcipantsValid(obj) {
 		})
 	}
 
-	return validate(obj, participantsValidate)
+	if (!validate(obj, participantsValidate)) {
+		throw new Error(
+			'Participants object is not valid! Must contain _id[String, Number] and username[String]'
+		)
+	}
 }
 
-export function messagesValid(obj) {
-	const participantsValidate = [
+export function messagesValidation(obj) {
+	const messagesValidate = [
 		{ key: '_id', type: ['string', 'number'] },
 		{ key: 'content', type: ['string', 'number'] },
 		{ key: 'senderId', type: ['string', 'number'] }
@@ -52,7 +60,11 @@ export function messagesValid(obj) {
 		})
 	}
 
-	return validate(obj, participantsValidate)
+	if (!validate(obj, messagesValidate)) {
+		throw new Error(
+			'Messages object is not valid! Must contain _id[String, Number], content[String, Number] and senderId[String, Number]'
+		)
+	}
 }
 
 function checkObjectValid(obj, key) {