From c22b2d7e5526b2b6b8f5f36ee2ccc4bddafdf7b2 Mon Sep 17 00:00:00 2001
From: Bas Kamer <bas@bushbaby.nl>
Date: Thu, 18 Apr 2024 09:46:34 +0200
Subject: [PATCH] merge into 'if'

---
 src/entity.ts | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

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<T extends ObjectLiteral>(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<T extends ObjectLiteral>(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]) {