Merge pull request #194 from AthennaIO/develop

feat: add or clause to ObjectId

Author: jlenon7

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@athenna/database",
-  "version": "5.15.0",
+  "version": "5.16.0",
   "description": "The Athenna database handler for SQL/NoSQL.",
   "license": "MIT",
   "author": "João Lenon <lenon@athenna.io>",

package.json

@@ -1213,8 +1213,8 @@ export class MongoDriver extends Driver<Connection, Collection> {
    */
   public whereIn(column: string, values: any[]) {
     values = values.flatMap(value => {
-      if (ObjectId.isValid(value)) {
-        return [value, ObjectId.ifValidSwap(value)]
+      if (ObjectId.isValidStringOrObject(value)) {
+        return [value, new ObjectId(value)]
       }
 
       return [value]
@@ -1230,8 +1230,8 @@ export class MongoDriver extends Driver<Connection, Collection> {
    */
   public whereNotIn(column: string, values: any[]) {
     values = values.flatMap(value => {
-      if (ObjectId.isValid(value)) {
-        return [value, ObjectId.ifValidSwap(value)]
+      if (ObjectId.isValidStringOrObject(value)) {
+        return [value, new ObjectId(value)]
       }
 
       return [value]
@@ -1361,8 +1361,8 @@ export class MongoDriver extends Driver<Connection, Collection> {
    */
   public orWhereIn(column: string, values: any[]) {
     values = values.flatMap(value => {
-      if (ObjectId.isValid(value)) {
-        return [value, ObjectId.ifValidSwap(value)]
+      if (ObjectId.isValidStringOrObject(value)) {
+        return [value, new ObjectId(value)]
       }
 
       return [value]
@@ -1378,8 +1378,8 @@ export class MongoDriver extends Driver<Connection, Collection> {
    */
   public orWhereNotIn(column: string, values: any[]) {
     values = values.flatMap(value => {
-      if (ObjectId.isValid(value)) {
-        return [value, ObjectId.ifValidSwap(value)]
+      if (ObjectId.isValidStringOrObject(value)) {
+        return [value, new ObjectId(value)]
       }
 
       return [value]
@@ -1533,19 +1533,26 @@ export class MongoDriver extends Driver<Connection, Collection> {
         const keysToSwap = Object.keys(condition).filter(key => {
           const value = condition[key]
 
-          if (ObjectId.isValid(value)) {
+          if (ObjectId.isValidStringOrObject(value)) {
             return true
           }
 
           return false
         })
 
         keysToSwap.forEach(key => {
+          if (!condition.$or) {
+            condition.$or = []
+          }
+
           const objectId = condition[key]
 
-          condition[key] = {
-            $or: [{ [key]: objectId }, { [key]: new ObjectId(objectId) }]
-          }
+          condition.$or.push(
+            { [key]: objectId },
+            { [key]: new ObjectId(objectId) }
+          )
+
+          delete condition[key]
         })
 
         return condition
@@ -1557,19 +1564,26 @@ export class MongoDriver extends Driver<Connection, Collection> {
         const keysToSwap = Object.keys(condition).filter(key => {
           const value = condition[key]
 
-          if (ObjectId.isValid(value)) {
+          if (ObjectId.isValidStringOrObject(value)) {
             return true
           }
 
           return false
         })
 
         keysToSwap.forEach(key => {
+          if (!condition.$or) {
+            condition.$or = []
+          }
+
           const objectId = condition[key]
 
-          condition[key] = {
-            $or: [{ [key]: objectId }, { [key]: new ObjectId(objectId) }]
-          }
+          condition.$or.push(
+            { [key]: objectId },
+            { [key]: new ObjectId(objectId) }
+          )
+
+          delete condition[key]
         })
 
         return condition

src/database/drivers/MongoDriver.ts

@@ -24,6 +24,13 @@ export class ObjectId {
     return mongoose.isValidObjectId(objectId) && new mongoose.Types.ObjectId(objectId) == objectId
   }
 
+  /**
+   * Validate if is a valid object id string or ObjectID object.
+   */
+  public static isValidStringOrObject(objectId: any): boolean {
+    return this.isValidString(objectId) || this.isValidObject(objectId)
+  }
+
   /**
    * Validate if is a valid object id string.
    */