VAN-454 service.amadeus / search / implement non-stop filter - added …

…non-stop filter

docs/api.apib

@@ -36,6 +36,7 @@ format.
         + `filter-cabin-class` (array, optional)
             + Y, F, C (enum) - request with this cabin class(es)
         + `filter-airline`: AB (array, optional) - list of airline IATA codes 
+        + `filter-stops`: 0 (number, optional) - if set to zero, will only return non-stop flights
         + `legs` (array, fixed-type, required) 
             + (object)
                 + `departure`: BER (string, required) - name of departure IATA airport code

src/Search/Model/AmadeusRequestTransformer.php

@@ -115,6 +115,12 @@ public function buildFareMasterRequestOptions(Request $request) : FareMasterPric
             $options['cabinClass'] = $request->getFilterCabinClass();
         }
 
+        if ($request->getFilterStops() === 0) {
+            $options['requestedFlightTypes'] = [
+                FareMasterPricerTbSearch::FLIGHTTYPE_NONSTOP,
+            ];
+        }
+
         if (!empty($coopCodes)) {
             $options['corporateQualifier'] = FareMasterPricerTbSearch::CORPORATE_QUALIFIER_UNIFARE;
             $options['corporateCodesUnifares'] = array_values($coopCodes);

src/Search/Request/Validator/AmadeusRequestValidator.php

@@ -102,6 +102,8 @@ function ($element) {
             }
         );
 
+        $validator->optional('filter-stops')->integer(true);
+
         $validator->required('legs')->each(
             function (Validator $validator) {
                 $validator->required('departure');

tests/_data/requests/wrong-filter-types.json

@@ -39,7 +39,7 @@
   ],
   "filter-price-min": "",
   "filter-price-max": "",
-  "filter-stops": null,
+  "filter-stops": true,
   "page": 1,
   "legs": [
     {

tests/api/Search/RequestErrorHandling/CheckFilterCept.php

@@ -32,6 +32,15 @@
         ]
     ]]
 );
+$I->canSeeResponseContainsJson(
+    ['filter-stops' => [
+        [
+            'code'    => ValidationException::INTERNAL_ERROR_CODE,
+            'message' => 'INVALID OR MISSING REQUEST PARAM - filter-stops must be an integer',
+            'status'  => 400
+        ]
+    ]]
+);
 
 $I->canSeeResponseContainsJson(
     [

tests/unit/Helper/RequestFaker.php

@@ -24,6 +24,7 @@ class RequestFaker
     const OPT_FLEXIBLE_LEG_DATES = 'flexibleDate';
     const OPT_AIRLINE_FILTER = 'airlineFilter';
     const OPT_CABIN_CLASS_FILTER = 'cabinClassFilter';
+    const OPT_NONSTOP_FILTER = 'nonstopFilter';
     const OPT_AREA_SEARCH = 'areaSearch';
     const OPT_PAX = 'pax';
     const OPT_RESULT_LIMIT = 'resultLimit';
@@ -49,6 +50,9 @@ public static function getFakeRequest(array $options) : Request
         if (isset($options[self::OPT_CABIN_CLASS_FILTER])) {
             $request->setFilterCabinClass($options[self::OPT_CABIN_CLASS_FILTER]);
         }
+        if (isset($options[self::OPT_NONSTOP_FILTER])) {
+            $request->setFilterStops(0);
+        }
         $request->setBusinessCases(new ArrayCollection());
         $request->getBusinessCases()->add(new ArrayCollection());
         $request->getBusinessCases()->first()->add(self::buildBusinessCase($options));

tests/unit/Search/Model/AmadeusRequestTransformerTest.php

@@ -492,4 +492,25 @@ public function testItBuildsClientParams()
         $this->assertEquals('password-length', $params->authParams->passwordLength);
         $this->assertEquals('user-id', $params->authParams->userId);
     }
+
+    /**
+     * Verify that it adds the required flight types if the stops filter is set
+     */
+    public function testItSetsNonStopFilter()
+    {
+        $config = new \stdClass();
+        $config->search = new \stdClass();
+
+        $transformer = new AmadeusRequestTransformer($config);
+
+        $requestOptions = [
+            RequestFaker::OPT_NONSTOP_FILTER => true,
+        ];
+        $request = RequestFaker::buildDefaultRequest($requestOptions);
+
+        $options = $transformer->buildFareMasterRequestOptions($request);
+
+        $this->assertInstanceOf(Client\RequestOptions\FareMasterPricerTbSearch::class, $options);
+        $this->assertEquals(['N'], $options->requestedFlightTypes);
+    }
 }