PNR_Info service

client/options.go

@@ -1,6 +1,9 @@
 package client
 
-import "github.com/tmconsulting/amadeus-golang-sdk/logger"
+import (
+	"github.com/tmconsulting/amadeus-golang-sdk/configuration"
+	"github.com/tmconsulting/amadeus-golang-sdk/logger"
+)
 
 // Option describes a functional option for configuring AmadeusClient.
 type Option func(client *AmadeusClient)
@@ -38,3 +41,9 @@ func SetLogger(l logger.LogWriter) Option {
 		c.service.Client.Logger = logger.NewLogger(l)
 	}
 }
+
+func SetConfig(config configuration.ConfigType) Option {
+	return func(c *AmadeusClient) {
+		configuration.Config = config
+	}
+}

client/soapClient.go

@@ -164,6 +164,8 @@ func (s *SOAP4Client) Call(soapUrl, soapAction, messageId string, query, reply i
 		return nil, err
 	}
 
+	fmt.Println("XML Response: ", string(rawbody))
+
 	err = s.Logger.Push("inc", soapAction, string(rawbody))
 	if err != nil {
 		_, _ = fmt.Fprintf(os.Stderr, "Failed to fire hook log_response: %v\n", err)

configuration/config.go

@@ -1,126 +1,14 @@
 package configuration
 
-import (
-	"encoding/base64"
-	"log"
-	"os"
+var Config ConfigType
 
-	"github.com/microparts/configuration-golang"
-	"github.com/microparts/errors-go"
-	"github.com/microparts/logs-go"
-	"gopkg.in/yaml.v2"
-)
-
-type connectionConfig struct {
-	URL         string `yaml:"url"`
-	WSAP        string `yaml:"wsap"`
-	Originator  string `yaml:"originator"`
-	Password    string `yaml:"password"`
-	PasswordRaw string
-	PinCode     string `yaml:"pin_code"`
-	VatURL      string `yaml:"vat_url"`
-	VatSOAPURL  string `yaml:"vat_soap_url"`
-	VatOfficeID string `yaml:"vat_office_id"`
-	VatSign     string `yaml:"vat_sign"`
-}
-
-type amadeusConfig struct {
-	Connection         connectionConfig `yaml:"connection"`
-	MaxRecommendations int              `yaml:"max_recommendations"`
-}
-
-type httpConfig struct {
-	Host string `yaml:"host"`
-	Port string `yaml:"port"`
+type ConfigType struct {
+	Formats  formatsConfig
+	Provider string
 }
 
 type formatsConfig struct {
-	Time    string `yaml:"time"`
-	Date    string `yaml:"date"`
-	XMLDate string `yaml:"xml_date"`
-}
-
-// CfgType service config structure
-type CfgType struct {
-	Amadeus       amadeusConfig       `yaml:"amadeus"`
-	HTTP          httpConfig          `yaml:"http"`
-	Formats       formatsConfig       `yaml:"formats"`
-	Queue         queueConfig         `yaml:"queue"`
-	Log           *logs.Config        `yaml:"log"`
-	Settings      SettingsConfig      `yaml:"settings"`
-	Notifications NotificationsConfig `yaml:"notifications"`
-}
-
-type queueConfig struct {
-	PubSub PubSubConfig `yaml:"pubsub"`
-}
-
-// PubSubConfig  PubSub Config
-type PubSubConfig struct {
-	Host         string `yaml:"host"`
-	ProjectID    string `yaml:"project_id"`
-	Topic        string `yaml:"topic"`
-	Subscription string `yaml:"subscription"`
-	Key          string `yaml:"key"`
-}
-
-// SettingsConfig Settings Config
-type SettingsConfig struct {
-	FoidRequreAirlines        []string `yaml:"foid_require_airlines"`
-	RemoveDuplicateAirlines   bool     `yaml:"remove_duplicate_airlines"`
-	MaxAttemptsCancelVoid     int      `yaml:"max_attempts_cancel_void"`
-	MaxAttemptsDocIssuance    int      `yaml:"max_attempts_doc_issuance"`
-	MaxAttemptsPNRRET         int      `yaml:"max_attempts_pnr_ret"`
-	MaxAttemptsPNRADD         int      `yaml:"max_attempts_pnr_add"`
-	IssueExpire               int      `yaml:"issue_expire"`
-	BookingRequestsDelay      int      `yaml:"booking_requests_delay"`
-	IssueRequestsDelay        int      `yaml:"issue_requests_delay"`
-	FareRulesParagraphsToShow []string `yaml:"fare_rules_paragraphs_to_show"`
-	FareQualifierList         []string `yaml:"fare_qualifier_list"`
-}
-
-type NotificationsConfig struct {
-	ErrorMessageEmail string       `yaml:"error_message_email"`
-	MailFrom          string       `yaml:"mail_from"`
-	Queue             PubSubConfig `yaml:"pubsub"`
-}
-
-var (
-	// Provider is current service
-	Provider = "amadeus"
-)
-
-var Config *CfgType
-
-// InitConfig initialize config data
-func InitConfig() error {
-	configPath := config.GetEnv("CONFIG_PATH", "")
-	configBytes, err := config.ReadConfigs(configPath)
-	if errors.HasErrors(err) {
-		log.Printf("[config] read error: %+v", err)
-		return err
-	}
-
-	err = yaml.Unmarshal(configBytes, &Config)
-	if errors.HasErrors(err) {
-		log.Printf("[config] unmarshal error for bytes: %+v", configBytes)
-		return err
-	}
-	//
-	// structs.TimeFormat = func() string {
-	// 	return Config.Formats.Time
-	// }
-	//
-	// structs.DateFormat = func() string {
-	// 	return Config.Formats.Date
-	// }
-
-	if pwdBytes, err := base64.StdEncoding.DecodeString(Config.Amadeus.Connection.Password); err == nil {
-		Config.Amadeus.Connection.PasswordRaw = string(pwdBytes)
-	} else {
-		log.Println("Error decoding password. Is it not encrypted in bass64?")
-		os.Exit(-1)
-	}
-
-	return nil
+	Time    string
+	Date    string
+	XMLDate string
 }

service/service_test.go

@@ -26,6 +26,7 @@ var (
 	passwordRaw       string
 	officeId          string
 	stdOutLog, logger l.LogWriter
+	config            configuration.ConfigType
 )
 
 func tearUp() {
@@ -36,6 +37,10 @@ func tearUp() {
 	logger = nilLogger.Init()
 	stdOutLog = stdoutLogger.Init()
 
+	config.Formats.Time = "2006-01-02T15:04:05"
+	config.Formats.Date = "2006-01-02"
+	config.Provider = "amadeus"
+
 	log.Printf("url: %s\noriginator: %s\npasswordRaw: %s\nofficeId: %s", url, originator, passwordRaw, officeId)
 }
 
@@ -89,17 +94,7 @@ func TestNewSKD(t *testing.T) {
 
 		tearUp()
 
-		err := configuration.InitConfig()
-		if err != nil {
-			t.FailNow()
-		}
-
-		//url = configuration.Config.Amadeus.Connection.URL
-		//originator = configuration.Config.Amadeus.Connection.Originator
-		//passwordRaw = configuration.Config.Amadeus.Connection.PasswordRaw
-		//officeId = "MOWR228FG"
-
-		cl := client.New(client.SetURL(url), client.SetUser(originator), client.SetPassword(passwordRaw), client.SetAgent(officeId), client.SetLogger(stdOutLog))
+		cl := client.New(client.SetURL(url), client.SetUser(originator), client.SetPassword(passwordRaw), client.SetAgent(officeId), client.SetLogger(stdOutLog), client.SetConfig(config))
 
 		amadeusSDK := New(cl)
 		//amadeusSDK := New(cl, SetMethodVersion(PNRAddMultiElements, MethodVersion(PNRRetrieveV113)))

structs/fare/masterPricerTravelBoardSearch/v14.3/response/parseReply.go

@@ -630,7 +630,7 @@ func ParseReply(request *search.SearchRequest, reply *Response) (*search.SearchR
 
 		var recommendation = &search.Recommendation{
 			ID:                recommendationID,
-			Provider:          configuration.Provider,
+			Provider:          configuration.Config.Provider,
 			Class:             recClass,
 			ItinerarySegments: routesSegments,
 			ValidatingAirline: structsCommon.Airline{},