diff --git a/src/entity.ts b/src/entity.ts index 2673f1e..cab674b 100644 --- a/src/entity.ts +++ b/src/entity.ts @@ -14,11 +14,8 @@ export function encrypt(entity: any): any { let { propertyName, mode, target } = columnMetadata; let options: ExtendedColumnOptions = columnMetadata.options; let encrypt = options.encrypt; - if (encrypt?.encryptionPredicate && !encrypt?.encryptionPredicate(entity)) { - continue; - } if ( - encrypt && + encrypt && !(encrypt?.encryptionPredicate && !encrypt?.encryptionPredicate(entity)) && mode === 'regular' && (encrypt.looseMatching || entity.constructor === target) ) { @@ -45,12 +42,9 @@ export function decrypt(entity: any): any { let { propertyName, mode, target } = columnMetadata; let options: ExtendedColumnOptions = columnMetadata.options; let encrypt = options.encrypt; - if (encrypt?.encryptionPredicate && !encrypt?.encryptionPredicate(entity)) { - continue; - } if ( - encrypt && - mode === 'regular' && + encrypt && !(encrypt?.encryptionPredicate && !encrypt?.encryptionPredicate(entity)) && + mode === "regular" && (encrypt.looseMatching || entity.constructor === target) ) { if (entity[propertyName]) {