hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-18 23:43:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed and tests for equals method

Browse Source
This commit is contained in:
lotte
2019-07-17 16:28:17 +02:00
parent 2bfe6ceebb
commit d16ee88641
23 changed files with 128 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/core/utilities/equatable.ts
View File

@@ -12,11 +12,11 @@ function equalsByFields(object1, object2, fieldList): boolean {
if (hasNoValue(object1[key]) || hasNoValue(object2[key])) {
return true;
}
const mapping = getFieldsForEquals(this.constructor, key);
const mapping = getFieldsForEquals(object1.constructor, key);
if (hasValue(mapping)) {
return !equalsByFields(object1[key], object2[key], mapping);
}
if (this[key] instanceof EquatableObject) {
if (object1[key] instanceof EquatableObject) {
return !object1[key].equals(object2[key]);
}
return object1[key] !== object2[key];
@@ -26,6 +26,12 @@ function equalsByFields(object1, object2, fieldList): boolean {
export abstract class EquatableObject<T> {
equals(other: T): boolean {
if (hasNoValue(other)) {
return false;
}
if (this as any === other) {
return true;
}
const excludedKeys = getExcludedFromEqualsFor(this.constructor);
const keys = Object.keys(this).filter((key) => excludedKeys.findIndex((excludedKey) => key === excludedKey) < 0);
return equalsByFields(this, other, keys);