Merge pull request #221 from ArturHamannRonconi/fix/url-value-object

Fix/url value object

Author: 4lessandrodev

lib/utils/cpf.value-object.ts

@@ -2,6 +2,7 @@ import { ValueObject } from '../core';
 import { Result } from '../core';
 import isValidCpfDigit, {
 	formatValueToCpfPattern,
+	removeSpecialCharsFromCpf,
 } from './check-cpf-digit.util';
 const regexCpf =
 	/^([0-9]{3})[\.]((?!\1)[0-9]{3})[\.]([0-9]{3})[-]([0-9]{2})$|^[0-9]{11}$/;
@@ -35,9 +36,11 @@ export class CPFValueObject extends ValueObject<Prop> {
 	 * @example after "52734865211"
 	 */
 	removeSpecialChars(): CPFValueObject {
-		this.props.value = this.util
-			.string(this.props.value)
-			.removeSpecialChars();
+		this.props.value = removeSpecialCharsFromCpf(this.props.value);
+
+		// this.props.value = this.util
+		// 	.string(this.props.value)
+		// 	.removeSpecialChars();
 		return this;
 	}
 
@@ -59,10 +62,13 @@ export class CPFValueObject extends ValueObject<Prop> {
 	 * @example param "527.348.652-11"
 	 */
 	compare(cpf: string): boolean {
-		const formattedCpf = this.util.string(cpf).removeSpecialChars();
-		const instanceValue = this.util
-			.string(this.props.value)
-			.removeSpecialChars();
+		// const formattedCpf = this.util.string(cpf).removeSpecialChars();
+		// const instanceValue = this.util
+		// 	.string(this.props.value)
+		// 	.removeSpecialChars();
+
+		const formattedCpf = removeSpecialCharsFromCpf(cpf);
+		const instanceValue = removeSpecialCharsFromCpf(this.props.value);
 		return instanceValue === formattedCpf;
 	}
 

lib/utils/password.value-object.ts

@@ -97,9 +97,7 @@ class PasswordValueObject extends ValueObject<Prop> {
 	public static isValidProps(value: string): boolean {
 		const { string } = this.validator;
 		if (!PasswordValueObject.isEncrypted(value)) {
-			const passwordHasRequiredLength = string(
-				value
-			).hasLengthBetweenOrEqual(
+			const passwordHasRequiredLength = string(value).hasLengthBetween(
 				PasswordValueObject.MIN_LENGTH,
 				PasswordValueObject.MAX_LENGTH
 			);
@@ -108,6 +106,10 @@ class PasswordValueObject extends ValueObject<Prop> {
 		return true;
 	}
 
+	isEqual(password: PasswordValueObject) {
+		return this.compare(password.value());
+	}
+
 	/**
 	 *
 	 * @param value password to create

lib/utils/url.value-object.ts

@@ -1,6 +1,7 @@
 import { ValueObject } from '../core';
 import { Result } from '../core';
-const regexHash = /^\w{3,5}:\/{1,}\w{1,}\.\w*\.?\w{2,}/;
+const regexHash =
+	/^(https?:\/\/)(([\da-z\.-]+))?\.?([a-z\.]{2,6})([\/\w \.-]*)*\/?(:\d{2,4})?(\/\w+)?$/;
 
 interface Prop {
 	value: string;
@@ -29,7 +30,12 @@ class UrlValueObject extends ValueObject<Prop> {
 	 * @returns true if value is a valid url and false if does not
 	 */
 	public static isValidProps(value: string): boolean {
-		return this.validator.string(value).match(UrlValueObject.REGEX);
+		try {
+			new URL(value);
+			return true;
+		} catch (error) {
+			return false;
+		}
 	}
 
 	validation(value: string): boolean {

lib/utils/user-name.value-object.ts

@@ -38,10 +38,14 @@ export class UserNameValueObject extends ValueObject<Prop> {
 				name[0].toUpperCase() + name.slice(1).toLowerCase();
 			capitalized.push(lowerCaseName);
 		}
-		const value = this.util
-			.string(capitalized.toString())
-			.replace(',')
-			.to(' ');
+
+		// const value = this.util
+		// 	.string(capitalized.toString())
+		// 	.replace(',')
+		// 	.to(' ');
+
+		const value = capitalized.toString().replace(/,/g, ' ');
+
 		this.props.value = value;
 		return this;
 	}
@@ -98,10 +102,14 @@ export class UserNameValueObject extends ValueObject<Prop> {
 	getInitials(): string {
 		const names = this.props.value.split(' ');
 		const letters = names.map((name) => name[0]);
-		const initials = this.util
-			.string(letters.toString())
-			.replace(',')
-			.to('.');
+
+		// const initials = this.
+		// 	.string(letters.toString())
+		// 	.replace(',')
+		// 	.to('.');
+
+		const initials = letters.toString().replace(/,/g, '.');
+
 		return initials;
 	}
 
@@ -116,7 +124,7 @@ export class UserNameValueObject extends ValueObject<Prop> {
 	 */
 	public static isValidProps(value: string): boolean {
 		const { string } = this.validator;
-		return string(value).hasLengthBetweenOrEqual(
+		return string(value).hasLengthBetween(
 			UserNameValueObject.MIN_LENGTH,
 			UserNameValueObject.MAX_LENGTH
 		);

tests/utils/password.value-object.spec.ts

@@ -75,8 +75,8 @@ describe('password.value-object', () => {
 		});
 
 		it('should password to be equal', () => {
-			const passA = PasswordValueObject.random(12);
-			const passB = passA.clone();
+			const passA = PasswordValueObject.create('123456abc!').value();
+			const passB = PasswordValueObject.create('123456abc!').value();
 			const isEqual = passA.isEqual(passB);
 			expect(isEqual).toBe(true);
 		});