From c9b4a60d12d8ac88144c583f935b4e9bddfcfb10 Mon Sep 17 00:00:00 2001 From: "alex.kadyrov" Date: Fri, 26 Jul 2019 01:53:43 +0300 Subject: [PATCH] search request --- .../v14.3/request/makeQuery.go | 4 ++-- .../v16.3/request/makeQuery.go | 14 +++++++++----- utils/datetime.go | 6 ++++++ 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/structs/fare/masterPricerTravelBoardSearch/v14.3/request/makeQuery.go b/structs/fare/masterPricerTravelBoardSearch/v14.3/request/makeQuery.go index c12d8d0..3358fc0 100644 --- a/structs/fare/masterPricerTravelBoardSearch/v14.3/request/makeQuery.go +++ b/structs/fare/masterPricerTravelBoardSearch/v14.3/request/makeQuery.go @@ -3,7 +3,7 @@ package Fare_MasterPricerTravelBoardSearchRequest_v14_3 // fmptbq143 import ( search "github.com/tmconsulting/amadeus-golang-sdk/structs/fare/masterPricerTravelBoardSearch" "github.com/tmconsulting/amadeus-golang-sdk/structs/formats" - "gitlab.teamc.io/tm-consulting/tmc24/avia/layer3/amadeus-agent-go/utils/convert" + "github.com/tmconsulting/amadeus-golang-sdk/utils" ) func MakeRequest(request *search.Request) *Request { @@ -117,7 +117,7 @@ func MakeRequest(request *search.Request) *Request { }, TimeDetails: &DateAndTimeInformationType_181295S{ FirstDateTimeDetail: &DateAndTimeDetailsTypeI{ - Date: formats.Date_DDMMYY(convert.DateToAmadeusDate(i.DepartureDate)), + Date: formats.Date_DDMMYY(utils.DateToAmadeusDate(i.DepartureDate)), }, }, } diff --git a/structs/fare/masterPricerTravelBoardSearch/v16.3/request/makeQuery.go b/structs/fare/masterPricerTravelBoardSearch/v16.3/request/makeQuery.go index 3b0148e..6a0195b 100644 --- a/structs/fare/masterPricerTravelBoardSearch/v16.3/request/makeQuery.go +++ b/structs/fare/masterPricerTravelBoardSearch/v16.3/request/makeQuery.go @@ -1,12 +1,16 @@ package Fare_MasterPricerTravelBoardSearchRequest_v16_3 // fmptbq143 -import search "github.com/tmconsulting/amadeus-golang-sdk/structs/fare/masterPricerTravelBoardSearch" +import ( + search "github.com/tmconsulting/amadeus-golang-sdk/structs/fare/masterPricerTravelBoardSearch" + "github.com/tmconsulting/amadeus-golang-sdk/structs/formats" + "gitlab.teamc.io/tm-consulting/tmc24/avia/layer3/amadeus-agent-go/utils/convert" +) func MakeRequest(request *search.Request) *Request { var query = Request{ NumberOfUnit: &NumberOfUnitsType{ - UnitNumberDetail: []*NumberOfUnitDetailsType_260583C{ + UnitNumberDetail: []*NumberOfUnitDetailsType_270113C{ { NumberOfUnits: formats.NumericInteger_Length1To6(request.Passengers.ADT + request.Passengers.CHD), TypeOfUnit: formats.AlphaNumericString_Length1To3("PX"), @@ -38,14 +42,14 @@ func MakeRequest(request *search.Request) *Request { }, }, }, - FeeIdDescription: &CodedAttributeType{ - FeeId: []*CodedAttributeInformationType_247829C{ + FeeIdDescription: &CodedAttributeType_199259S{ + FeeId: []*CodedAttributeInformationType_277155C{ {FeeType: formats.AlphaNumericString_Length1To5("FFI"), FeeIdNumber: formats.AlphaNumericString_Length1To50("2")}, {FeeType: formats.AlphaNumericString_Length1To5("UPH"), FeeIdNumber: formats.AlphaNumericString_Length1To50("6")}, }, }, }, - TravelFlightInfo: &TravelFlightInformationType_185853S{ + TravelFlightInfo: &TravelFlightInformationType_199258S{ CabinId: &CabinIdentificationType_233500C{ CabinQualifier: formats.AlphaNumericString_Length1To2("MD"), Cabin: []formats.AlphaString_Length0To1{ diff --git a/utils/datetime.go b/utils/datetime.go index 80a64ca..40ae6be 100644 --- a/utils/datetime.go +++ b/utils/datetime.go @@ -1,6 +1,7 @@ package utils import ( + "fmt" "strconv" "time" ) @@ -35,3 +36,8 @@ func AmadeusDateTimeConvert(dateStr string, timeStr string) time.Time { } return time.Date(year, time.Month(month), day, hour, minute, 0, 0, time.UTC) } + +func DateToAmadeusDate(date time.Time) string { + year := strconv.Itoa(date.Year()) + return fmt.Sprintf("%02d%02d%s", date.Day(), date.Month(), year[2:4]) +}