Added "in" and "not-in" suffixes

Author: marcelgwerder

README.md

@@ -140,11 +140,23 @@ Or all the books except the ones with id 5 or 6:
 /api/books?id-not=5|6
 ```
 
+The same could be achieved using the `-in` suffix:
+```
+/api/books?id-in=5,6
+```
+Respectively the `not-in` suffix:
+```
+/api/books?id-not-in=5,6
+```
+
+
 #####Suffixes#####
 Suffix        | Operator      | Meaning
 ------------- | ------------- | -------------
 -lk           | LIKE          | Same as the SQL `LIKE` operator
 -not-lk       | NOT LIKE      | Same as the SQL `NOT LIKE` operator
+-in           | IN            | Same as the SQL `IN` operator
+-not-in       | NOT IN        | Same as the SQL `NOT IN` operator
 -min          | >=            | Greater than or equal to
 -max          | <=            | Smaller than or equal to
 -st           | <             | Smaller than

src/Parser.php

@@ -549,9 +549,11 @@ protected function parseFilter($filterParams)
 			'max' => '<=', 
 			'lk' => 'LIKE',
 			'not-lk' => 'NOT LIKE',
+			'in' => 'IN',
+			'not-in' => 'NOT IN',
 			'not' => '!=',
 		];
-		
+
 		$supportedPrefixesStr = implode('|', $supportedPostfixes);
 		$supportedPostfixesStr = implode('|', array_keys($supportedPostfixes));
 
@@ -576,35 +578,50 @@ protected function parseFilter($filterParams)
 
 			$column = $keyMatches[2];
 
-			$values = explode('|', $filterParamValue);
+			if($comparator == 'IN') 
+			{
+				$values = explode(',', $filterParamValue);
 
-			if(count($values) > 1)
+				$this->query->whereIn($column, $values);
+			}
+			else if($comparator == 'NOT IN') 
 			{
-				$this->query->where(function($query) use($column, $comparator, $values)
-				{
-					foreach($values as $value)
-					{
-						if($comparator == 'LIKE' || $comparator == 'NOT LIKE') $value = preg_replace('/(^\*|\*$)/', '%', $value);
+				$values = explode(',', $filterParamValue);
 
-						//Link the filters with AND of there is a "not" and with OR if there's none
-						if($comparator == '!=' || $comparator == 'NOT LIKE')
-						{
-							$query->where($column, $comparator, $value);
-						}
-						else 
-						{
-							$query->orWhere($column, $comparator, $value);
-						}
-					}
-				});
+				$this->query->whereNotIn($column, $values);
 			}
 			else 
 			{
-				$value = $values[0];
+				$values = explode('|', $filterParamValue);
+
+				if(count($values) > 1)
+				{
+					$this->query->where(function($query) use($column, $comparator, $values)
+					{
+						foreach($values as $value)
+						{
+							if($comparator == 'LIKE' || $comparator == 'NOT LIKE') $value = preg_replace('/(^\*|\*$)/', '%', $value);
+
+							//Link the filters with AND of there is a "not" and with OR if there's none
+							if($comparator == '!=' || $comparator == 'NOT LIKE')
+							{
+								$query->where($column, $comparator, $value);
+							}
+							else 
+							{
+								$query->orWhere($column, $comparator, $value);
+							}
+						}
+					});
+				}
+				else 
+				{
+					$value = $values[0];
 
-				if($comparator == 'LIKE' || $comparator == 'NOT LIKE') $value = preg_replace('/(^\*|\*$)/', '%', $value);
+					if($comparator == 'LIKE' || $comparator == 'NOT LIKE') $value = preg_replace('/(^\*|\*$)/', '%', $value);
 
-				$this->query->where($column, $comparator, $value);
+					$this->query->where($column, $comparator, $value);
+				}
 			}
 		}
 	}

tests/ApiHandlerTest.php

@@ -29,6 +29,8 @@ public function setUp()
 			'id-max'        => 6,
 			'id-gt'         => 7,
 			'id-st'         => 8,
+			'id-in'         => '1,2',
+			'id-not-in'     => '3,4',
 			//Pagination
 			'_limit'        => 5,
 			'_offset'       => 10,
@@ -184,6 +186,12 @@ public function testGetBuilder()
 		//assert for id-st
 		$this->assertContains(['type' => 'Basic', 'column' => 'id', 'operator' => '<', 'value' => 8, 'boolean' => 'and'], $wheres);
 
+		//assert for id-in
+		$this->assertContains(['type' => 'In', 'column' => 'id', 'values' => ['1', '2'], 'boolean' => 'and'], $wheres);
+
+		//assert for id-not-in
+		$this->assertContains(['type' => 'NotIn', 'column' => 'id', 'values' => ['3', '4'], 'boolean' => 'and'], $wheres);
+
 		//
 		// Limit
 		//