feat: and query operator implementation

Author: harshithad0703

src/lib/query.ts

@@ -201,6 +201,24 @@ export class Query extends BaseQuery {
     return this;
   }
 
+  /**
+   * @method notExists
+   * @memberof Query
+   * @description Returns the raw (JSON) query based on the filters applied on Query object.
+   * @example
+   * import contentstack from '@contentstack/delivery-sdk'
+   *
+   * const stack = contentstack.Stack({ apiKey: "apiKey", deliveryToken: "deliveryToken", environment: "environment" });
+   * const query = stack.contentType("contentTypeUid").entry().query();
+   * const result = notExists('fieldUid').find()
+   * 
+   * @returns {Query}
+   */
+  notExists(key: string): Query {
+    this._parameters[key] = { '$exists': false };
+    return this;
+  }
+
   /**
    * @method or
    * @memberof Query
@@ -215,19 +233,35 @@ export class Query extends BaseQuery {
    *  
    * @returns {Query}
    */
-  notExists(key: string): Query {
-    this._parameters[key] = { '$exists': false };
+  or(...queries: Query[]): Query {
+    const paramsList: BaseQueryParameters[] = [];
+    for (const queryItem of queries) {
+      paramsList.push(queryItem._parameters);
+    }
+    this._parameters.$or = paramsList;
     return this;
   }
 
-  or(...queries: Query[]): Query {
-    const combinedQuery: any = { $or: [] };
-    for (const query of queries) {
-      combinedQuery.$or.push(query._parameters);
+  /**
+   * @method and
+   * @memberof Query
+   * @description Returns the raw (JSON) query based on the filters applied on Query object.
+   * @example
+   * import contentstack from '@contentstack/delivery-sdk'
+   *
+   * const stack = contentstack.Stack({ apiKey: "apiKey", deliveryToken: "deliveryToken", environment: "environment" });
+   * const query1 = await contentType.Entry().query().containedIn('fieldUID', ['value']);
+   * const query2 = await contentType.Entry().query().where('fieldUID', QueryOperation.EQUALS, 'value2');
+   * const query = await contentType.Entry().query().and(query1, query2).find();
+   *  
+   * @returns {Query}
+   */
+  and(...queries: Query[]): Query {
+    const paramsList: BaseQueryParameters[] = [];
+    for (const queryItem of queries) {
+      paramsList.push(queryItem._parameters);
     }
-    const newQuery: Query = Object.create(this);
-    newQuery._parameters = combinedQuery;
-    
-    return newQuery;
+    this._parameters.$and = paramsList;
+    return this;
   }
 }