Merge pull request #221 from amadeus4dev/fix-device-type

Fix device type
amadeus4dev · Dec 21, 2022 · aa73c8f · aa73c8f
2 parents 240b9a5 + 98f4067
commit aa73c8f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/main/java/com/amadeus/resources/FlightOrder.java b/src/main/java/com/amadeus/resources/FlightOrder.java
@@ -40,6 +40,7 @@ public static class Traveler {
 
     private @Getter @Setter String id;
     private @Getter @Setter String dateOfBirth;
+    private @Getter @Setter String gender;
     private @Getter @Setter Name name;
     private @Getter @Setter Contact contact;
     private @Getter @Setter Document[] documents;
@@ -60,13 +61,6 @@ public static class Name {
   public static class Contact {
 
     private @Getter @Setter Phone[] phones;
-    private @Getter @Setter DeviceType deviceType;
-
-    public enum DeviceType {
-      MOBILE,
-      LANDLINE,
-      FAX
-    }
   }
 
   @AllArgsConstructor
@@ -97,6 +91,13 @@ public static class Phone {
 
     private @Getter @Setter String countryCallingCode;
     private @Getter @Setter String number;
+    private @Getter @Setter DeviceType deviceType;
+
+    public enum DeviceType {
+      MOBILE,
+      LANDLINE,
+      FAX
+    }
   }
 
 }
diff --git a/src/test/java/com/amadeus/booking/FlightOrdersIT.java b/src/test/java/com/amadeus/booking/FlightOrdersIT.java
@@ -13,6 +13,7 @@
 import com.amadeus.resources.FlightOrder.Document;
 import com.amadeus.resources.FlightOrder.Name;
 import com.amadeus.resources.FlightOrder.Phone;
+import com.amadeus.resources.FlightOrder.Phone.DeviceType;
 import com.amadeus.resources.FlightOrder.Traveler;
 import com.amadeus.resources.FlightPrice;
 import com.github.tomakehurst.wiremock.WireMockServer;
@@ -113,10 +114,10 @@ private Traveler[] getTravelerData() {
     phone[0] = new Phone();
     phone[0].setCountryCallingCode("33");
     phone[0].setNumber("675426222");
+    phone[0].setDeviceType(DeviceType.MOBILE);
 
     Contact contact = new Contact();
     contact.setPhones(phone);
-    contact.setDeviceType(Contact.DeviceType.MOBILE);
     traveler.setContact(contact);
 
     Document[] document = new Document[1];