Fix the implementation of Flight booking API (#72)

anthonyroux · web-flow · commit 3768aa60465f · 2020-04-15T10:26:55.000+02:00
* Fix the implementation fo the Flight Offers Price and Flight Create Orders helper methods

* Fix typo in comment
diff --git a/src/examples/flight/createorders/FlightCreateOrders.java b/src/examples/flight/createorders/FlightCreateOrders.java
@@ -12,12 +12,12 @@
 public class FlightCreateOrders {
   /**
    * <p>
-   *   An example to call the Flight Create Orders API
-   *   <code>/v1/booking/flight-orders</code> endpoints.
+   * An example to call the Flight Create Orders API
+   * <code>/v1/booking/flight-orders</code> endpoints.
    * </p>
    *
    * <p>
-   *   Access via the Amadeus client object.
+   * Access via the Amadeus client object.
    * </p>
    *
    * <pre>
@@ -26,6 +26,10 @@ public class FlightCreateOrders {
    */
   public static void main(String[] args) throws ResponseException {
 
+    Amadeus amadeus = Amadeus
+            .builder("YOUR_CLIENT_ID", "YOUR_CLIENT_SECRET")
+            .build();
+
     Traveler traveler = new Traveler();
 
     traveler.setId("1");
@@ -56,26 +60,28 @@ public static void main(String[] args) throws ResponseException {
     travelerArray[0] = traveler;
     System.out.println(travelerArray[0]);
 
-    Amadeus amadeus = Amadeus
-        .builder("YOUR_CLIENT_ID","YOUR_CLIENT_SECRET")
-        .build();
-
     FlightOfferSearch[] flightOffersSearches = amadeus.shopping.flightOffersSearch.get(
-        Params.with("originLocationCode", "SYD")
-                .and("destinationLocationCode", "BKK")
-                .and("departureDate", "2020-11-01")
-                .and("returnDate", "2020-11-08")
-                .and("adults", 1)
-                .and("max", 1));
+            Params.with("originLocationCode", "PAR")
+                    .and("destinationLocationCode", "NYC")
+                    .and("departureDate", "2020-11-01")
+                    .and("returnDate", "2020-11-08")
+                    .and("adults", 1)
+                    .and("max", 3));
+
+    // We price the 2nd flight of the list to confirm the price and the availability
+    FlightPrice flightPricing = amadeus.shopping.flightOffersSearch.pricing.post(
+            flightOffersSearches[1]);
+
 
-    FlightOrder order = amadeus.booking.flightOrders.post(flightOffersSearches, travelerArray);
+    // We book the flight previously priced
+    FlightOrder order = amadeus.booking.flightOrders.post(flightPricing, travelerArray);
+    System.out.println(order.getResponse());
 
-    // Return CO2 Emission of a given flight
-    String weight = order.getFlightOffers()[0].getItineraries(
+    // Return CO2 Emission of the previously booked flight
+    int weight = order.getFlightOffers()[0].getItineraries(
     )[0].getSegments()[0].getCo2Emissions()[0].getWeight();
     String unit = order.getFlightOffers()[0].getItineraries(
     )[0].getSegments()[0].getCo2Emissions()[0].getWeightUnit();
 
-    System.out.println(weight + unit);
   }
 }
diff --git a/src/examples/flight/offers/FlightOffersPrice.java b/src/examples/flight/offers/FlightOffersPrice.java
@@ -9,7 +9,7 @@
 public class FlightOffersPrice {
   /**
    * <p>
-   *   An example to call hotel Booking API
+   *   An example to call Flight Offers Price API
    *   <code>/v1/shopping/flight-offers/pricing</code> endpoints.
    * </p>
    *
@@ -33,13 +33,15 @@ public static void main(String[] args) throws ResponseException {
                 .and("departureDate", "2020-11-01")
                 .and("returnDate", "2020-11-08")
                 .and("adults", 1)
-                .and("max", 1));
+                .and("max", 2));
 
+    // We price the 2nd flight of the list to confirm the price and the availability
     FlightPrice flightPricing = amadeus.shopping.flightOffersSearch.pricing.post(
-            flightOffersSearches,
+            flightOffersSearches[1],
             Params.with("include", "detailed-fare-rules")
               .and("forceClass", "false")
-          );  
+          );
+    
     System.out.println(flightPricing.getResponse());
   }
 }
diff --git a/src/main/java/com/amadeus/booking/FlightOrders.java b/src/main/java/com/amadeus/booking/FlightOrders.java
@@ -5,11 +5,16 @@
 import com.amadeus.exceptions.ResponseException;
 import com.amadeus.resources.FlightOfferSearch;
 import com.amadeus.resources.FlightOrder;
+import com.amadeus.resources.FlightPrice;
 import com.amadeus.resources.Resource;
 import com.amadeus.resources.Traveler;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 
+
 /**
  * <p>
  * A namespaced client for the
@@ -36,6 +41,41 @@ public FlightOrders(Amadeus client) {
     this.client = client;
   }
 
+  /**
+   * Build the JSON from the Travelers array.
+   *
+   * @param travelers array of Traveler
+   * @return
+   */
+  private JsonArray buildTravelersJSON(Traveler[] travelers) {
+    Gson gson = new GsonBuilder().create();
+    JsonArray travelerArray = new JsonArray();
+
+    for (int i = 0; i < travelers.length; i++) {
+      JsonElement traveler = gson.toJsonTree(travelers[i], Traveler.class);
+      travelerArray.add(traveler);
+    }
+    return travelerArray;
+  }
+
+  /**
+   * Build the JSON from the Travelers array.
+   *
+   * @param flightOffers Array of FlightOfferSearch
+   * @return JsonArray of the flightOffers
+   */
+  private JsonArray buildFlightOffersJSON(FlightOfferSearch[] flightOffers) {
+    Gson gson = new GsonBuilder().create();
+    JsonArray flightOffersArray = new JsonArray();
+
+    for (int i = 0; i < flightOffers.length; i++) {
+      JsonElement flightOffer = gson.toJsonTree(flightOffers[i], FlightOfferSearch.class);
+      flightOffersArray.add(flightOffer);
+    }
+    return flightOffersArray;
+  }
+
+
   /**
    * <p>
    * The Flight Create Orders API allows you to perform flight booking.
@@ -79,58 +119,82 @@ public FlightOrder post(String body) throws ResponseException {
    * amadeus.booking.flightOrders.post(object);</pre>
    *
    * @param flightOffersSearches List of flight-offers as FlightOfferSearch[]
-   * @param travelers List of travelers as Traveler[]
+   * @param travelers            List of travelers as Traveler[]
    * @return an API resource
    * @throws ResponseException when an exception occurs
    */
-  public FlightOrder post(FlightOfferSearch[] flightOffersSearches, 
-      Traveler[] travelers) throws ResponseException {
-
-    JsonObject nameObject = new JsonObject();
-    nameObject.addProperty("firstName", travelers[0].getName().getFirstName());
-    nameObject.addProperty("lastName", travelers[0].getName().getLastName());
-
-    JsonObject phoneObject = new JsonObject();
-    phoneObject.addProperty("countryCallingCode", 
-        travelers[0].getContact().getPhones()[0].getCountryCallingCode());
-    phoneObject.addProperty("number", travelers[0].getContact().getPhones()[0].getNumber());
-    phoneObject.addProperty("deviceType", travelers[0].getContact().getPhones()[0].getDeviceType());
-
-
-    JsonArray phonesArray = new JsonArray();
-    phonesArray.add(phoneObject);
-
-    JsonObject contactObject = new JsonObject();
-    contactObject.add("phones", phonesArray);
-
-    JsonObject documentsOject = new JsonObject();
-    documentsOject.addProperty("documentType", travelers[0].getDocuments()[0].getDocumentType());
-    documentsOject.addProperty("number", travelers[0].getDocuments()[0].getNumber());
-    documentsOject.addProperty("expiryDate", travelers[0].getDocuments()[0].getExpiryDate());
-    documentsOject.addProperty("nationality", travelers[0].getDocuments()[0].getNationality());
-    documentsOject.addProperty("issuanceCountry", 
-        travelers[0].getDocuments()[0].getIssuanceCountry());
-    documentsOject.addProperty("holder", travelers[0].getDocuments()[0].isHolder());
-    JsonArray documentsArray = new JsonArray();
-    documentsArray.add(documentsOject);
-
-    JsonObject travelerObject = new JsonObject();
-    travelerObject.addProperty("id", travelers[0].getId());
-    travelerObject.addProperty("dateOfBirth", travelers[0].getDateOfBirth());
-    travelerObject.add("name", nameObject);
-    travelerObject.add("contact", contactObject);
-    travelerObject.add("documents", documentsArray);
-    JsonArray travelerArray = new JsonArray();
-    travelerArray.add(travelerObject);
-    
+  public FlightOrder post(FlightOfferSearch[] flightOffersSearches,
+                          Traveler[] travelers) throws ResponseException {
+
+    JsonObject typeObject = new JsonObject();
+    typeObject.addProperty("type", "flight-order");
+
+    // Prepare the Flight Offers JSON
+    JsonArray flightOffersArray = buildFlightOffersJSON(flightOffersSearches);
+    typeObject.add("flightOffers", flightOffersArray);
+
+    // Prepare the TravelerJSON
+    JsonArray travelerArray = buildTravelersJSON(travelers);
+    typeObject.add("travelers", travelerArray);
+
+    JsonObject jsonObject = new JsonObject();
+    jsonObject.add("data", typeObject);
+
+    Response response = client.post("/v1/booking/flight-orders", jsonObject);
+    return (FlightOrder) Resource.fromObject(response, FlightOrder.class);
+  }
+
+  /**
+   * <p>
+   * The Flight Create Orders API allows you to perform flight booking.
+   * </p>
+   *
+   * <pre>
+   * amadeus.booking.flightOrders.post(flightOfferSearch, traveler);</pre>
+   *
+   * @param flightOffersSearch a flight-offer as FlightOfferSearch
+   * @param travelers          List of travelers as Traveler[]
+   * @return an API resource
+   * @throws ResponseException when an exception occurs
+   */
+  public FlightOrder post(FlightOfferSearch flightOffersSearch,
+                          Traveler[] travelers) throws ResponseException {
+    FlightOfferSearch[] flightOffersSearchArray = new FlightOfferSearch[1];
+    flightOffersSearchArray[0] = flightOffersSearch;
+
+    return post(flightOffersSearchArray, travelers);
+  }
+
+  /**
+   * <p>
+   * The Flight Create Orders API allows you to perform flight booking.
+   * </p>
+   *
+   * <pre>
+   * amadeus.booking.flightOrders.post(flightOfferSearch, traveler);</pre>
+   *
+   * @param flightPrice a flight-offers-pricing as FlightPrice
+   * @param travelers   List of travelers as Traveler[]
+   * @return an API resource
+   * @throws ResponseException when an exception occurs
+   */
+  public FlightOrder post(FlightPrice flightPrice,
+                          Traveler[] travelers) throws ResponseException {
+
     JsonObject typeObject = new JsonObject();
     typeObject.addProperty("type", "flight-order");
-    typeObject.add("flightOffers", flightOffersSearches[0].getResponse().getData());
+
+    Gson gson = new GsonBuilder().create();
+
+    JsonArray flightOffersArray = buildFlightOffersJSON(flightPrice.getFlightOffers());
+    typeObject.add("flightOffers", flightOffersArray);
+
+    // Build Traveler JSON
+    JsonArray travelerArray = buildTravelersJSON(travelers);
     typeObject.add("travelers", travelerArray);
 
     JsonObject jsonObject = new JsonObject();
     jsonObject.add("data", typeObject);
-    System.out.println(jsonObject);
 
     Response response = client.post("/v1/booking/flight-orders", jsonObject);
     return (FlightOrder) Resource.fromObject(response, FlightOrder.class);
diff --git a/src/main/java/com/amadeus/resources/FlightOfferSearch.java b/src/main/java/com/amadeus/resources/FlightOfferSearch.java
@@ -1,7 +1,6 @@
 package com.amadeus.resources;
 
 import com.google.gson.annotations.SerializedName;
-import java.util.Date;
 import lombok.Getter;
 import lombok.ToString;
 
@@ -19,7 +18,7 @@ protected FlightOfferSearch() {}
   private @Getter boolean instantTicketingRequired;
   private @Getter boolean nonHomogeneous;
   private @Getter boolean oneWay;
-  private @Getter Date lastTicketingDate;
+  private @Getter String lastTicketingDate;
   private @Getter int numberOfBookableSeats;
   private @Getter Itinerary[] itineraries;
   private @Getter SearchPrice price;
@@ -61,7 +60,7 @@ public class Co2Emissions {
     protected Co2Emissions() {
     }
 
-    private @Getter String weight;
+    private @Getter int weight;
     private @Getter String weightUnit;
     private @Getter String cabin;
   }
@@ -108,6 +107,11 @@ protected Fee() {
   @ToString
   public class PricingOptions {
     private @Getter boolean includedCheckedBagsOnly;
+    private @Getter String[] fareType;
+    private @Getter String[] corporateCodes;
+    private @Getter boolean refundableFare;
+    private @Getter boolean noRestrictionFare;
+    private @Getter boolean noPenaltyFare;
   }
 
   @ToString
@@ -141,7 +145,7 @@ public class IncludedCheckedBags {
     protected IncludedCheckedBags() {
     }
 
-    private @Getter double weight;
+    private @Getter int weight;
     private @Getter String weightUnit;
   }
 }
diff --git a/src/main/java/com/amadeus/resources/Resource.java b/src/main/java/com/amadeus/resources/Resource.java
@@ -14,12 +14,12 @@ protected Resource() {}
   /**
    * The original response that this object is populated from.
    */
-  private @Getter Response response;
+  private transient @Getter Response response;
   /**
    * The class used for deserialization.
    * @hide as only used internally
    */
-  private @Getter Class deSerializationClass;
+  private transient @Getter Class deSerializationClass;
 
   /**
    * Turns a response into a Gson deserialized array of resources,
diff --git a/src/main/java/com/amadeus/shopping/flightOffers/Pricing.java b/src/main/java/com/amadeus/shopping/flightOffers/Pricing.java
