Merge branch 'main' of github.com:ArturHamannRonconi/types-ddd into fix/url-value-object

Author: ArturHamannRonconi

CHANGELOG.md

@@ -4,6 +4,53 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
+---
+### 3.5.0 - 2023-01-21
+
+### Update
+
+- rich-domain: update lib core to 1.17.0
+
+
+---
+### 3.4.7 - 2023-01-19
+
+### Update
+
+- rich-domain: update lib core to 1.16.2
+
+---
+### 3.4.6 - 2023-01-18
+
+### Update
+
+- rich-domain: update lib core to 1.16.1
+
+---
+### 3.4.5 - 2023-01-14
+
+### Changed
+
+- date.value-object: rename method from `isEqual` to `isEqualDate`
+
+### Update
+
+- rich-domain: update lib core to 1.16.0
+- Entity: added method isEqual to compare current instance with another one.
+- ValueObject: added method isEqual to compare current instance with another one. [Issue 27](https://github.com/4lessandrodev/rich-domain/issues/27)
+
+---
+
+### 3.4.4 - 2023-01-12
+
+### Added
+
+- custom-string.value-object: By: [VinnyLima](https://github.com/VinnyLima)
+- removeSpecialChars and onlyNumbers: [Issue 223](https://github.com/4lessandrodev/types-ddd/issues/223)
+- email.value-object: added MESSAGE as customizable value
+
+---
+
 ### 3.4.3 - 2023-01-05
 
 ### Updated

docs/README.md

@@ -1194,17 +1194,12 @@ You can compare two entities.
 
 ```ts
 
-const isEqual = user1.equal(user2);
+const isEqual = user1.isEqual(user2);
 
 console.log(isEqual);
 
 > false
 
-const isDeepEqual = user1.deepEqual(user2);
-
-console.log(isDeepEqual);
-
-> false
 
 ```
 

lib/utils/cpf.value-object.ts

@@ -2,7 +2,6 @@ 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}$/;
@@ -36,7 +35,9 @@ export class CPFValueObject extends ValueObject<Prop> {
 	 * @example after "52734865211"
 	 */
 	removeSpecialChars(): CPFValueObject {
-		this.props.value = removeSpecialCharsFromCpf(this.props.value);
+		this.props.value = this.util
+			.string(this.props.value)
+			.removeSpecialChars();
 		return this;
 	}
 
@@ -58,8 +59,10 @@ export class CPFValueObject extends ValueObject<Prop> {
 	 * @example param "527.348.652-11"
 	 */
 	compare(cpf: string): boolean {
-		const formattedCpf = removeSpecialCharsFromCpf(cpf);
-		const instanceValue = removeSpecialCharsFromCpf(this.props.value);
+		const formattedCpf = this.util.string(cpf).removeSpecialChars();
+		const instanceValue = this.util
+			.string(this.props.value)
+			.removeSpecialChars();
 		return instanceValue === formattedCpf;
 	}
 

lib/utils/currency.value-object.ts

@@ -209,7 +209,7 @@ class CurrencyValueObject extends ValueObject<Prop> {
 	 * @returns boolean true if instance value is positive else false
 	 */
 	isPositive(): boolean {
-		return this.cents >= 0;
+		return this.validator.number(this.cents).isPositive();
 	}
 
 	validation(_value: any, _key: any): boolean {

lib/utils/custom-string.value-object.ts

@@ -62,6 +62,20 @@ export class CustomStringValueObject extends ValueObject<Prop> {
 		);
 	}
 
+	/**
+	 * @returns value without special chars as string
+	 */
+	get removeSpecialChars(): string {
+		return this.props.value.replace(/[^a-zA-Z0-9]/g, '');
+	}
+
+	/**
+	 * @returns value only numbers as string
+	 */
+	get onlyNumbers(): string {
+		return this.props.value.replace(/\D/g, '');
+	}
+
 	/**
 	 * @returns validation
 	 * @method VALIDATOR: function (value: string): boolean;

lib/utils/date-value-object.ts

@@ -438,7 +438,7 @@ export class DateValueObject extends ValueObject<Prop> {
 	 * @param date as Date
 	 * @returns true or false. True if instance date is equal to provided value
 	 */
-	isEqual(date: Date): boolean {
+	isEqualDate(date: Date): boolean {
 		const time = date.getTime();
 		const instanceTime = this.props.value.getTime();
 		return instanceTime === time;

lib/utils/email.value-object.ts

@@ -10,6 +10,7 @@ export class EmailValueObject extends ValueObject<Prop> {
 	protected static readonly DISABLE_SETTER: boolean = true;
 	protected static readonly BLOCKED_DOMAINS: Array<string> = [];
 	protected static readonly VALID_DOMAINS: Array<string> = [];
+	protected static readonly MESSAGE: string = 'Invalid email';
 
 	private constructor(props: Prop) {
 		super(props, { disableSetters: EmailValueObject.DISABLE_SETTER });
@@ -67,7 +68,7 @@ export class EmailValueObject extends ValueObject<Prop> {
 
 	public static create(value: string): Result<EmailValueObject> {
 		if (!EmailValueObject.isValidProps(value)) {
-			return Result.fail('Invalid email');
+			return Result.fail(EmailValueObject.MESSAGE);
 		}
 		return Result.Ok(new EmailValueObject({ value }));
 	}

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

@@ -38,7 +38,11 @@ export class UserNameValueObject extends ValueObject<Prop> {
 				name[0].toUpperCase() + name.slice(1).toLowerCase();
 			capitalized.push(lowerCaseName);
 		}
-		this.props.value = capitalized.toString().replace(/,/g, ' ');
+		const value = this.util
+			.string(capitalized.toString())
+			.replace(',')
+			.to(' ');
+		this.props.value = value;
 		return this;
 	}
 
@@ -94,7 +98,10 @@ export class UserNameValueObject extends ValueObject<Prop> {
 	getInitials(): string {
 		const names = this.props.value.split(' ');
 		const letters = names.map((name) => name[0]);
-		const initials = letters.toString().replace(/,/g, '.');
+		const initials = this.util
+			.string(letters.toString())
+			.replace(',')
+			.to('.');
 		return initials;
 	}
 

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "types-ddd",
-	"version": "3.4.3",
+	"version": "3.5.0",
 	"description": "This package provide utils file and interfaces to assistant build a complex application with domain driving design",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -61,7 +61,7 @@
 		"bcrypt": "^5.0.1",
 		"pino": "^8.8.0",
 		"pino-pretty": "^9.1.1",
-		"rich-domain": "^1.15.2"
+		"rich-domain": "^1.17.0"
 	},
 	"devDependencies": {
 		"@microsoft/tsdoc": "^0.14.1",
@@ -74,7 +74,7 @@
 		"lint-staged": "^13.0.4",
 		"madge": "^5.0.1",
 		"prettier": "^2.8.1",
-		"rimraf": "^3.0.2",
+		"rimraf": "^4.1.1",
 		"ts-jest": "^27.1.4",
 		"ts-node": "^10.7.0",
 		"typescript": "^4.9.4"

tests/utils/custom-string.value-object.spec.ts

@@ -63,6 +63,19 @@ describe('custom-string.value-object', () => {
 		expect(validation.MAX_LENGTH).toBeDefined();
 		expect(validation.MIN_LENGTH).toBeDefined();
 	});
+
+	it('should be get string only numbers', () => {
+		const valueObject =
+			CustomStringValueObject.create('B2D05E00').value().onlyNumbers;
+		expect(valueObject).toBe('20500');
+	});
+
+	it('should be get string without chars especial', () => {
+		const valueObject = CustomStringValueObject.create(
+			'===[brazil(*-*)free]==='
+		);
+		expect(valueObject.value().removeSpecialChars).toBe('brazilfree');
+	});
 });
 
 describe('custom validation', () => {