From 2190e5a4d8537f770f8d2278bf1b6959f8563ee3 Mon Sep 17 00:00:00 2001
From: Ezeki Zibzibadze <ez@jok.io>
Date: Wed, 14 Aug 2019 17:57:37 +0400
Subject: [PATCH] fix: enableIdMapping logic

---
 src/operations/create.ts     | 2 +-
 src/operations/delete.ts     | 4 ++--
 src/operations/get.ts        | 2 +-
 src/operations/query.ts      | 6 +++---
 src/operations/update.ts     | 4 ++--
 src/operations/updateMany.ts | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/operations/create.ts b/src/operations/create.ts
index 5059244..4f20095 100644
--- a/src/operations/create.ts
+++ b/src/operations/create.ts
@@ -34,7 +34,7 @@ export default function createFn<TDocument extends DocumentBase>(
 		}
 
 		return (repositoryOptions &&
-			(repositoryOptions.skipIdTransformations || repositoryOptions.enableIdMapping))
+			(repositoryOptions.skipIdTransformations || !repositoryOptions.enableIdMapping))
 			? doc
 			: <TDocument>mapObject(doc)
 	}
diff --git a/src/operations/delete.ts b/src/operations/delete.ts
index 5531767..0928048 100644
--- a/src/operations/delete.ts
+++ b/src/operations/delete.ts
@@ -20,8 +20,8 @@ export default function deleteFn<TDocument extends DocumentBase>(
 			: transformIdFilter(filter)
 
 		const mongoFilter = (repositoryOptions && repositoryOptions.enableIdMapping)
-			? filter1
-			: mapIdFilter(filter1)
+			? mapIdFilter(filter1)
+			: filter1
 
 		const softDeleteEnabled = repositoryOptions && repositoryOptions.delete
 			&& repositoryOptions.delete.enableSoftDeleteByDefault
diff --git a/src/operations/get.ts b/src/operations/get.ts
index 38a55e8..7120d57 100644
--- a/src/operations/get.ts
+++ b/src/operations/get.ts
@@ -36,7 +36,7 @@ export default function getFn<TDocument extends DocumentBase>(
 		}
 
 		return (repositoryOptions &&
-			(repositoryOptions.skipIdTransformations || repositoryOptions.enableIdMapping))
+			(repositoryOptions.skipIdTransformations || !repositoryOptions.enableIdMapping))
 			? doc
 			: mapObject(doc)
 	}
diff --git a/src/operations/query.ts b/src/operations/query.ts
index d22c22c..354d629 100644
--- a/src/operations/query.ts
+++ b/src/operations/query.ts
@@ -39,8 +39,8 @@ export default function queryFn<TDocument extends DocumentBase>(
 			: transformIdFilter(filterQuery)
 
 		const mongoFilter = repositoryOptions && repositoryOptions.enableIdMapping
-			? filter1
-			: mapIdFilter(filter1)
+			? mapIdFilter(filter1)
+			: filter1
 
 		const session = (repositoryOptions && repositoryOptions.session) || undefined
 
@@ -54,7 +54,7 @@ export default function queryFn<TDocument extends DocumentBase>(
 					.filter(x => !!x)
 					.map(x => <TDocument>x),
 			)
-			.then(items => repositoryOptions && repositoryOptions.enableIdMapping
+			.then(items => repositoryOptions && !repositoryOptions.enableIdMapping
 				? items
 				: items
 					.map(mapObject)
diff --git a/src/operations/update.ts b/src/operations/update.ts
index 0b3f0c4..0cb775d 100644
--- a/src/operations/update.ts
+++ b/src/operations/update.ts
@@ -26,8 +26,8 @@ export default function updateFn<TDocument extends DocumentBase>(
 			: transformIdFilter(filter)
 
 		const mongoFilter = repositoryOptions && repositoryOptions.enableIdMapping
-			? filter1
-			: mapIdFilter(filter1)
+			? mapIdFilter(filter1)
+			: filter1
 
 		const returnUpdatedByDefault = repositoryOptions && repositoryOptions.update
 			? repositoryOptions.update.returnUpdatedByDefault
diff --git a/src/operations/updateMany.ts b/src/operations/updateMany.ts
index 6a1dfd4..e307021 100644
--- a/src/operations/updateMany.ts
+++ b/src/operations/updateMany.ts
@@ -25,8 +25,8 @@ export default function updateManyFn<TDocument extends DocumentBase>(
 			: transformIdFilter(filter)
 
 		const mongoFilter = repositoryOptions && repositoryOptions.enableIdMapping
-			? filter1
-			: mapIdFilter(filter1)
+			? mapIdFilter(filter1)
+			: filter1
 
 		// remove version from updated fields
 		// it will be incremented by one