modify to adapt test cases

Author: minjikarin

README.md

@@ -544,14 +544,13 @@ amadeus.dutyOfCare.diseases.covid19Report.get({
 
 //Car & Transfers APIs
 // Transfer Search API : Search Transfer offers 
-amadeus.shopping.transferOffers.post(
-  JSON.stringify(body));
+amadeus.shopping.transferOffers.post(JSON.stringify(body));
 
-// Transfer Book API : Book a transfer based on an offer id
+// Transfer Book API : Book a transfer based on the offer id
 amadeus.ordering.transferOrders.post(JSON.stringify(body),offerId='2094123123');
 
-// Transfer Management API : Cancel a transfer based on an order id
-amadeus.ordering.transferOrders('XXX').transfers.cancellation.post(JSON.stringify({}), confirmNbr=12345);
+// Transfer Management API : Cancel a transfer based on the order id & confirmation number
+amadeus.ordering.transferOrder('XXX').transfers.cancellation.post(JSON.stringify({}), confirmNbr='12345');
 
 ```
 

spec/amadeus/namespaces.test.js

@@ -85,7 +85,7 @@ describe('Namespaces', () => {
 
       expect(amadeus.ordering).toBeDefined();
       expect(amadeus.ordering.transferOrders).toBeDefined();
-      expect(amadeus.ordering.transferOffers('XXX').transfers.cancellation).toBeDefined();
+      expect(amadeus.ordering.transferOrder('XXX').transfers.cancellation).toBeDefined();
 
       expect(amadeus.airport).toBeDefined();
       expect(amadeus.airport.directDestinations).toBeDefined();
@@ -173,7 +173,7 @@ describe('Namespaces', () => {
       expect(amadeus.booking.hotelBookings.post).toBeDefined();
       expect(amadeus.shopping.transferOffers.post).toBeDefined();
       expect(amadeus.ordering.transferOrders.post).toBeDefined();
-      expect(amadeus.ordering.transferOrders('XXX').transfers.cancellation.post).toBeDefined();
+      expect(amadeus.ordering.transferOrder('XXX').transfers.cancellation.post).toBeDefined();
     });
 
     it('should define all expected .delete methods', () => {
@@ -555,16 +555,16 @@ describe('Namespaces', () => {
 
     it('.amadeus.ordering.transferOrders.post', () => {
       amadeus.client.post = jest.fn();
-      amadeus.shopping.transferOrders.post();
+      amadeus.ordering.transferOrders.post({}, '1234123123');
       expect(amadeus.client.post)
-        .toHaveBeenCalledWith('/v1/shopping/transfer-orders', {});
+        .toHaveBeenCalledWith('/v1/ordering/transfer-orders?offerId=1234123123', {});
     });
 
     it('.amadeus.ordering.transferOrders().transfers.cancellation.post', () => {
       amadeus.client.post = jest.fn();
-      amadeus.shopping.transferOrders(XXX).transfers.cancellation.post();
+      amadeus.ordering.transferOrder('XXX').transfers.cancellation.post({}, 12345);
       expect(amadeus.client.post)
-        .toHaveBeenCalledWith('/v1/shopping/transfer-orders/XXX/transfers/cancellation', {});
+        .toHaveBeenCalledWith('/v1/ordering/transfer-orders/XXX/transfers/cancellation?confirmNbr=12345', {});
     });
 
   });

src/amadeus/namespaces/ordering.js

@@ -1,4 +1,5 @@
 import TransferOrders from './ordering/transfer_orders';
+import TransferOrder from './ordering/transfer_order';
 
 /**
  * A namespaced client for the
@@ -12,17 +13,14 @@ import TransferOrders from './ordering/transfer_orders';
  * ```
  *
  * @param {Client} client
- * @property {TransferOrders} TransferOrders
- * @protected
+ * @property {TransferOrders} transferOrders
+ * @property {TransferOrder} transferOrder
  */
 class Ordering {
   constructor(client) {
-    this.client    = client;
+    this.client = client;
     this.transferOrders = new TransferOrders(client);
-  }
-
-  transferOrders (offerId) {
-    return new TransferOrders(this.client, offerId);
+    this.transferOrder = (orderId) => new TransferOrder(client, orderId);
   }
 }
 

src/amadeus/namespaces/ordering/transfer_order.js

@@ -0,0 +1,25 @@
+import Transfers from './transfer_orders/transfers';
+
+/**
+ * A namespaced client for the
+ * `/v1/ordering/transfer-orders/XXXXX` endpoints
+ *
+ * Access via the {@link Amadeus} object
+ *
+ * ```js
+ * let amadeus = new Amadeus();
+ * amadeus.ordering.transferOrder('XXX');
+ * ```
+ *
+ * @param {Client} client
+ * @param {string} orderId
+ */
+class TransferOrder {
+  constructor(client, orderId) {
+    this.client = client;
+    this.orderId = orderId;
+    this.transfers = new Transfers(client, orderId);
+  }
+}
+
+export default TransferOrder;

src/amadeus/namespaces/ordering/transfer_orders.js

@@ -12,28 +12,25 @@
  * @param {Client} client
  */
 class TransferOrders {
-    constructor(client) {
-      this.client = client;
-      this.offerId = offerId;
-    }
-  
-    /**
-     * To book the selected transfer-offer and create a transfer-order
-     *
-     * @param {Object} params
-     * @return {Promise.<Response,ResponseError>} a Promise
-     *
-     * To book the transfer-offer(s) suggested by transferOffers and create a transfer-order
-     *
-     * ```js
-     * amadeus.ordering.transferOrders.post(JSON.stringify(body),offerId='2094123123');
-     * ```
-     */
-    post(params = {}) {
-      return this.client.post(
-        `/v1/ordering/transfer-orders/${this.offerId}`, params
-      );
-    }
+  constructor(client) {
+    this.client = client;
+
   }
-  
-  export default TransferOrders;
+
+  /**
+   * To book the selected transfer-offer and create a transfer-order
+   *
+   * @return {Promise.<Response,ResponseError>} a Promise
+   *
+   * To book the transfer-offer(s) suggested by transferOffers and create a transfer-order
+   *
+   * ```js
+   * amadeus.ordering.transferOrders.post(body, '2094123123');;
+   * ```
+   */
+  post(body, offerId) {
+    return this.client.post(`/v1/ordering/transfer-orders?offerId=${offerId}`, body);
+  }
+}
+
+export default TransferOrders;

src/amadeus/namespaces/ordering/transfer_orders/transfers.js

@@ -14,10 +14,11 @@ import Cancellation from './transfers/cancellation';
  * @param {Client} client
  */
 class Transfers {
-    constructor(client) {
-      this.client = client;
-      this.cancellation = new Cancellation(client);
-    }
+  constructor(client, orderId) {
+    this.client = client;
+    this.orderId = orderId;
+    this.cancellation = new Cancellation(client, orderId);
   }
-  
-  export default Transfers;
+}
+
+export default Transfers;

src/amadeus/namespaces/ordering/transfer_orders/transfers/cancellation.js

@@ -6,32 +6,31 @@
  *
  * ```js
  * let amadeus = new Amadeus();
- * amadeus.ordering.transferOrder('XXX').transfers.cancellation.post(body, confirmNbr=123);
+ * amadeus.ordering.transferOrder('XXX').transfers.cancellation.post(JSON.stringify({}), 12345);;
  * ```
  *
  * @param {Client} client
  */
-class TransferOrder {
-    constructor(client) {
-      this.client = client;
-      this.orderId = orderId;
-    }
-  
-    /**
-     * To retrieve a transfer order based on its id
-     * @param {Object} params
-     * @return {Promise.<Response,ResponseError>} a Promise
-     *
-     * To retrieve a transfer order with ID 'XXX'
-     *
-     * ```js
-     * amadeus.ordering.transferOrders('XXX').transfers.cancellation.post({}, confirmNbr=123);
-     * ```
-     */
-    post(params = {}) {
-      return this.client.post(
-        `/v1/ordering/transfer-orders/${this.orderId}/transfers/cancellation`, params);
-    }
+class Cancellation {
+  constructor(client, orderId) {
+    this.client = client;
+    this.orderId = orderId;
   }
-  
-  export default TransferOrder;
+
+  /**
+   * To cancel a transfer order based on its id
+   * @return {Promise.<Response,ResponseError>} a Promise
+   *
+   * To cancel a transfer order with ID 'XXX' and confirmation number '12345'
+   *
+   * ```js
+   * amadeus.ordering.transferOrder('XXX').transfers.cancellation.post(JSON.stringify({}), 12345);;
+   * ```
+   */
+  post(body, confirmNbr) {
+    return this.client.post(
+      `/v1/ordering/transfer-orders/${this.orderId}/transfers/cancellation?confirmNbr=${confirmNbr}`, body);
+  }
+}
+
+export default Cancellation;

src/amadeus/namespaces/shopping/transfer_offers.js

@@ -13,73 +13,26 @@
  * @param {Client} client
  */
 class TransferOffers {
-    constructor(client) {
-      this.client = client;
-    }
-  
-    /**
-     * To search .
-     *
-     * @param {Object} params
-     * @return {Promise.<Response,ResponseError>} a Promise
-     *
-     * To search the list of transfer offers
-     *
-     * ```js
-     * amadeus.shopping.transferOffers.post (JSON.stringify({
-        "startLocationCode": "CDG",
-        "endAddressLine": "Avenue Anatole France, 5",
-        "endCityName": "Paris",
-        "endZipCode": "75007",
-        "endCountryCode": "FR",
-        "endName": "Souvenirs De La Tour",
-        "endGeoCode": "48.859466,2.2976965",
-        "transferType": "PRIVATE",
-        "startDateTime": "2023-11-10T10:30:00",
-        "providerCodes": "TXO",
-        "passengers": 2,
-        "stopOvers": [
-            {
-            "duration": "PT2H30M",
-            "sequenceNumber": 1,
-            "addressLine": "Avenue de la Bourdonnais, 19",
-            "countryCode": "FR",
-            "cityName": "Paris",
-            "zipCode": "75007",
-            "name": "De La Tours",
-            "geoCode": "48.859477,2.2976985",
-            "stateCode": "FR"
-            }
-        ],
-        "startConnectedSegment": {
-            "transportationType": "FLIGHT",
-            "transportationNumber": "AF380",
-            "departure": {
-            "localDateTime": "2023-11-10T09:00:00",
-            "iataCode": "NCE"
-            },
-            "arrival": {
-            "localDateTime": "2023-11-10T10:00:00",
-            "iataCode": "CDG"
-            }
-        },
-        "passengerCharacteristics": [
-            {
-            "passengerTypeCode": "ADT",
-            "age": 20
-            },
-            {
-            "passengerTypeCode": "CHD",
-            "age": 10
-            }
-        ]
-        }
-     * ```
-    */
-    post(params = {}) {
-      return this.client.post('/v1/shopping/transfer-offers', params);
-    }
-  
+  constructor(client) {
+    this.client = client;
   }
-  
-  export default TransferOffers;
+
+  /**
+   * To search the list of transfer offers.
+   *
+   * @param {Object} params
+   * @return {Promise.<Response,ResponseError>} a Promise
+   *
+   * To search the list of transfer offers
+   *
+   * ```js
+   * amadeus.shopping.transferOffers.post(body)
+
+   * ```
+  */
+  post(params = {}) {
+    return this.client.post('/v1/shopping/transfer-offers', params);
+  }
+}
+
+export default TransferOffers;