PNR_Info service

.circleci/config.yml

@@ -0,0 +1,30 @@
+version: 2.0
+
+orbs:
+  codecov: codecov/[email protected]
+
+jobs:
+  build:
+    docker:
+      - image: circleci/golang:1.12
+    steps:
+      - checkout
+      - run:
+          name: "Create directories"
+          command: |
+            mkdir -p /tmp/artifacts
+      - run:
+          name: "Run tests and collect coverage reports"
+          command: |
+            make test
+            mv coverage.html /tmp/artifacts
+            mv c.out /tmp/artifacts
+      - store_artifacts:
+          path: /tmp/artifacts
+      - run:
+          name: Upload Coverage Results
+          command: "bash <(curl -s https://codecov.io/bash) \
+            -f /tmp/artifacts/* \
+            -n ${CIRCLE_BUILD_NUM} \
+            -t ${CODECOV_TOKEN} \
+            -y .codecov.yml"

.gitignore

@@ -1,3 +1,5 @@
 .idea
 .env
-vendor
+vendor
+c.out
+coverage.html

Makefile

@@ -1,2 +1,17 @@
-tests:
-	go test ./... -v
+deps:
+	go mod vendor
+.PHONY: deps
+
+lint:
+	golint $(PKGS)
+.PHONY: lint
+
+test-unit:
+	go test ./... --race --cover -count=1 -timeout 1s -coverprofile=c.out -v
+.PHONY: test-unit
+
+coverage-html:
+	go tool cover -html=c.out -o coverage.html
+
+test: deps test-unit coverage-html
+.PHONY: test

README.md

@@ -1,5 +1,7 @@
 # Amadeus WBS SDK
 
+[![CircleCI](https://circleci.com/gh/tmconsulting/amadeus-golang-sdk/tree/mass-refactoring.svg?style=shield)](https://circleci.com/gh/tmconsulting/amadeus-golang-sdk/tree/mass-refactoring) [![codecov](https://codecov.io/gh/tmconsulting/amadeus-golang-sdk/branch/mass-refactoring/graph/badge.svg)](https://codecov.io/gh/tmconsulting/amadeus-golang-sdk)
+
 This package contains structures, forms, functions and SOAP handler for Amadeus WS.
 
 ## Methods implementation progress
@@ -26,6 +28,7 @@ This package contains structures, forms, functions and SOAP handler for Amadeus
 - [ ] Queue_RemoveItem (03.1)
 - [x] Security_Authenticate (06.1)
 - [x] Security_SignOut (04.1)
+- [ ] Service_BookPriceService
 - [x] Ticket_CreateTSTFromPricing (04.1)
 - [ ] Ticket_CreditCardCheck (06.1)
 - [x] Ticket_DeleteTST (04.1)
@@ -36,47 +39,51 @@ This package contains structures, forms, functions and SOAP handler for Amadeus
 
 It is go gettable and go.mod powered
 
-    $ go get github.com/tmconsulting/amadeus-golang-sdk@latest
+    $ go get github.com/tmconsulting/amadeus-golang-sdk@mass-refactoring
 
 ## Usage
 
-Prepare log writer realisation if you need to see outgoing and incoming xmls (null logging used if nil is passed), 
- methods map that you want (and allowed by Amadeus) to run (use `GetLatestMethodsMap()` to use latest methods versions 
- that are implemented) and credentials to connect: url, originator, password (not in base64!). Initiate SDK and service:
+Prepare log writer realisation if you need to see outgoing and incoming xmls (null logging used if nil is passed). 
+ Check methods version that will be used in SDK (use `GetLatestMethodsMap()` to use latest methods versions that are 
+ implemented). Ыуе credentials to connect: url, originator, password (not in base64!). Initiate SDK and service and use 
+ service methods:
 
 ```go
 package main
 
 import (
-	"log"
-	
-	"github.com/tmconsulting/amadeus-golang-sdk/logger/stdoutLogger"
-	"github.com/tmconsulting/amadeus-golang-sdk/sdk"
-	"github.com/tmconsulting/amadeus-golang-sdk/service"
+    "log"
+    
+    "github.com/tmconsulting/amadeus-golang-sdk/client"
+    "github.com/tmconsulting/amadeus-golang-sdk/service"
+    "github.com/tmconsulting/amadeus-golang-sdk/structs/commandCryptic"
 )
 
 func main() {
-	url := "https://nodeD1.test.webservices.amadeus.com/1ASIWXXXXXX"
- 	originator := "WSBENXXX"
- 	passwordRaw := "dGhlIHBhc3N3b3Jk"
- 	officeID := "BRUXX1111"
- 	client := sdk.CreateAmadeusClient(url, originator, passwordRaw, officeID, stdoutLogger.Init())
-
- 	amadeusSDK := service.NewSKD(client, service.GetLatestMethodsMap())
-
- 	response, err := amadeusSDK.CommandCryptic("AN20MAYMOWLED/ALH")
- 	if err != nil {
-  	log.Fatalf("error: %v", err)
- 	}
-
- 	log.Printf("response: %v\n", response)
+    url := "https://nodeD1.test.webservices.amadeus.com/1ASIWXXXXXX"
+    originator := "WSBENXXX"
+    passwordRaw := "dGhlIHBhc3N3b3Jk"
+    officeID := "BRUXX1111"
+    
+    cl := client.New(client.SetURL(url), client.SetUser(originator), client.SetPassword(passwordRaw), client.SetAgent(officeID))
+    s := service.New(cl)
+    
+    resp, err := s.CommandCryptic("AN20DECMOWLED/ALH")
+    if err != nil {
+        panic(err)
+    }
+    
+    log.Printf("responses: %v\n", resp)
 }
 ```
 
 ## Testing
 
-Create test `.env` file from [test.env-example](test.env-example), or run with ENV variables `make test` 
-(or `go test ./... -v`)
+Run tests (`make test` or `go test ./... -v`) with ENV variabless:
+* URL
+* ORIGINATOR
+* PASSWORD_RAW
+* OFFICE_ID
 
 ## Contribution
 

client/book.go

@@ -7,7 +7,7 @@ import (
 	"github.com/tmconsulting/amadeus-golang-sdk/structs/fare/pricePNRWithBookingClass/v14.1/response"
 	"github.com/tmconsulting/amadeus-golang-sdk/structs/pnr/addMultiElements/v11.3"
 	"github.com/tmconsulting/amadeus-golang-sdk/structs/pnr/cancel/v11.3"
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/pnr/reply/v11.3"
+	"github.com/tmconsulting/amadeus-golang-sdk/structs/pnr/retrieve/v11.3/response"
 	"github.com/tmconsulting/amadeus-golang-sdk/structs/ticket/createTSTFromPricing/v04.1"
 )
 
@@ -17,8 +17,8 @@ func (client *AmadeusClient) AirSellFromRecommendationV052(query *Air_SellFromRe
 	return &reply, header, err
 }
 
-func (client *AmadeusClient) PNRAddMultiElementsV113(query *PNR_AddMultiElementsRequest_v11_3.Request) (*PNR_Reply_v11_3.Response, *ResponseSOAPHeader, error) {
-	var reply PNR_Reply_v11_3.Response
+func (client *AmadeusClient) PNRAddMultiElementsV113(query *PNR_AddMultiElementsRequest_v11_3.Request) (*PNR_Retrieve_v11_3_response.Response, *ResponseSOAPHeader, error) {
+	var reply PNR_Retrieve_v11_3_response.Response
 	header, err := client.service.Call(soapUrl, "PNRADD_11_3_1A", query, &reply, client)
 	return &reply, header, err
 }
@@ -35,8 +35,8 @@ func (client *AmadeusClient) TicketCreateTSTFromPricingV041(query *Ticket_Create
 	return &reply, header, err
 }
 
-func (client *AmadeusClient) PNRCancelV113(query *PNR_Cancel_v11_3.Request) (*PNR_Reply_v11_3.Response, *ResponseSOAPHeader, error) {
-	var reply PNR_Reply_v11_3.Response
+func (client *AmadeusClient) PNRCancelV113(query *PNR_Cancel_v11_3.Request) (*PNR_Retrieve_v11_3_response.Response, *ResponseSOAPHeader, error) {
+	var reply PNR_Retrieve_v11_3_response.Response
 	header, err := client.service.Call(soapUrl, "PNRXCL_11_3_1A", query, &reply, client)
 	return &reply, header, err
 }

client/information.go

@@ -5,16 +5,24 @@ import (
 	"github.com/tmconsulting/amadeus-golang-sdk/structs/fare/checkRules/v07.1/response"
 	"github.com/tmconsulting/amadeus-golang-sdk/structs/fare/informativePricingWithoutPNR/v12.4/request"
 	"github.com/tmconsulting/amadeus-golang-sdk/structs/fare/informativePricingWithoutPNR/v12.4/response"
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/pnr/reply/v11.3"
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/pnr/retrieve/v11.3"
+	"github.com/tmconsulting/amadeus-golang-sdk/structs/pnr/retrieve/v11.3/request"
+	"github.com/tmconsulting/amadeus-golang-sdk/structs/pnr/retrieve/v11.3/response"
+	"github.com/tmconsulting/amadeus-golang-sdk/structs/pnr/retrieve/v19.1/request"
+	"github.com/tmconsulting/amadeus-golang-sdk/structs/pnr/retrieve/v19.1/response"
 )
 
-func (client *AmadeusClient) PNRRetrieveV113(query *PNR_Retrieve_v11_3.Request) (*PNR_Reply_v11_3.Response, *ResponseSOAPHeader, error) {
-	var reply PNR_Reply_v11_3.Response
+func (client *AmadeusClient) PNRRetrieveV113(query *PNR_Retrieve_v11_3_request.Request) (*PNR_Retrieve_v11_3_response.Response, *ResponseSOAPHeader, error) {
+	var reply PNR_Retrieve_v11_3_response.Response
 	header, err := client.service.Call(soapUrl, "PNRRET_11_3_1A", query, &reply, client)
 	return &reply, header, err
 }
 
+func (client *AmadeusClient) PNRRetrieveV191(query *PNR_Retrieve_v19_1_request.Request) (*PNR_Retrieve_v19_1_response.Response, *ResponseSOAPHeader, error) {
+	var reply PNR_Retrieve_v19_1_response.Response
+	header, err := client.service.Call(soapUrl, "PNRRET_19_1_1A", query, &reply, client)
+	return &reply, header, err
+}
+
 func (client *AmadeusClient) FareInformativePricingWithoutPNRV124(query *Fare_InformativePricingWithoutPNR_v12_4.Request) (*Fare_InformativePricingWithoutPNRReply_v12_4.Response, *ResponseSOAPHeader, error) {
 	var reply Fare_InformativePricingWithoutPNRReply_v12_4.Response
 	header, err := client.service.Call(soapUrl, "TIPNRQ_12_4_1A", query, &reply, client)

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

@@ -0,0 +1,14 @@
+package configuration
+
+var Config ConfigType
+
+type ConfigType struct {
+	Formats  formatsConfig
+	Provider string
+}
+
+type formatsConfig struct {
+	Time    string
+	Date    string
+	XMLDate string
+}

service/10_search.go

@@ -6,12 +6,29 @@ import (
 	"github.com/tmconsulting/amadeus-golang-sdk/structs/fare/informativeBestPricingWithoutPNR/v12.4/response"
 	"github.com/tmconsulting/amadeus-golang-sdk/structs/fare/informativePricingWithoutPNR/v12.4/request"
 	"github.com/tmconsulting/amadeus-golang-sdk/structs/fare/informativePricingWithoutPNR/v12.4/response"
+	"github.com/tmconsulting/amadeus-golang-sdk/structs/fare/masterPricerTravelBoardSearch"
 	"github.com/tmconsulting/amadeus-golang-sdk/structs/fare/masterPricerTravelBoardSearch/v14.3/request"
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/fare/masterPricerTravelBoardSearch/v14.3/response"
+	//"github.com/tmconsulting/amadeus-golang-sdk/structs/fare/masterPricerTravelBoardSearch/v14.3/response"
 )
 
-func (s *service) FareMasterPricerTravelBoardSearch(query *Fare_MasterPricerTravelBoardSearchRequest_v14_3.Request) (*Fare_MasterPricerTravelBoardSearchResponse_v14_3.Response, *client.ResponseSOAPHeader, error) {
-	return s.sdk.FareMasterPricerTravelBoardSearchV143(query)
+func (s *service) FareMasterPricerTravelBoardSearch(query *search.SearchRequest) (*search.SearchResponse, *client.ResponseSOAPHeader, error) {
+	switch s.mm[FareMasterPricerTravelBoardSearch] {
+	case FareMasterPricerTravelBoardSearchV143:
+		request := Fare_MasterPricerTravelBoardSearchRequest_v14_3.MakeRequest(query)
+		response, header, err := s.sdk.FareMasterPricerTravelBoardSearchV143(request)
+		if response == nil {
+			return nil, header, err
+		}
+
+		errResponse := response.CheckErrorReply()
+		if errResponse != nil {
+			return nil, header, errResponse
+		}
+
+		reply, err := response.ToCommon(query)
+		return reply, header, err
+	}
+	return nil, nil, nil
 }
 
 func (s *service) FareInformativeBestPricingWithout(query *Fare_InformativeBestPricingWithoutPNRRequest_v12_4.Request) (*Fare_InformativeBestPricingWithoutPNRResponse_v12_4.Response, *client.ResponseSOAPHeader, error) {

service/20_book.go

@@ -7,15 +7,16 @@ import (
 	"github.com/tmconsulting/amadeus-golang-sdk/structs/fare/pricePNRWithBookingClass/v14.1/request"
 	"github.com/tmconsulting/amadeus-golang-sdk/structs/fare/pricePNRWithBookingClass/v14.1/response"
 	"github.com/tmconsulting/amadeus-golang-sdk/structs/pnr/addMultiElements/v11.3"
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/pnr/reply/v11.3"
+	"github.com/tmconsulting/amadeus-golang-sdk/structs/pnr/retrieve/v11.3/response"
 	"github.com/tmconsulting/amadeus-golang-sdk/structs/ticket/createTSTFromPricing/v04.1"
 )
 
 func (s *service) AirSellFromRecommendation(query *Air_SellFromRecommendationRequest_v05_2.Request) (*Air_SellFromRecommendationResponse_v05_2.Response, *client.ResponseSOAPHeader, error) {
 	return s.sdk.AirSellFromRecommendationV052(query)
 }
 
-func (s *service) PNRAddMultiElements(query *PNR_AddMultiElementsRequest_v11_3.Request) (*PNR_Reply_v11_3.Response, *client.ResponseSOAPHeader, error) {
+func (s *service) PNRAddMultiElements(query *PNR_AddMultiElementsRequest_v11_3.Request) (*PNR_Retrieve_v11_3_response.Response, *client.ResponseSOAPHeader, error) {
+	// @TODO сделать версионирование
 	return s.sdk.PNRAddMultiElementsV113(query)
 }
 

service/21_cancel.go

@@ -3,9 +3,9 @@ package service
 import (
 	"github.com/tmconsulting/amadeus-golang-sdk/client"
 	"github.com/tmconsulting/amadeus-golang-sdk/structs/pnr/cancel/v11.3"
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/pnr/reply/v11.3"
+	"github.com/tmconsulting/amadeus-golang-sdk/structs/pnr/retrieve/v11.3/response"
 )
 
-func (s *service) PNRCancel(query *PNR_Cancel_v11_3.Request) (*PNR_Reply_v11_3.Response, *client.ResponseSOAPHeader, error) {
+func (s *service) PNRCancel(query *PNR_Cancel_v11_3.Request) (*PNR_Retrieve_v11_3_response.Response, *client.ResponseSOAPHeader, error) {
 	return s.sdk.PNRCancelV113(query)
 }

service/99_information.go

@@ -6,14 +6,31 @@ import (
 	"github.com/tmconsulting/amadeus-golang-sdk/structs/commandCryptic/v07.3"
 	"github.com/tmconsulting/amadeus-golang-sdk/structs/fare/checkRules/v07.1/request"
 	"github.com/tmconsulting/amadeus-golang-sdk/structs/fare/checkRules/v07.1/response"
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/pnr/reply/v11.3"
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/pnr/retrieve/v11.3"
+	"github.com/tmconsulting/amadeus-golang-sdk/structs/pnr/retrieve"
+	"github.com/tmconsulting/amadeus-golang-sdk/structs/pnr/retrieve/v11.3/request"
+	"github.com/tmconsulting/amadeus-golang-sdk/structs/pnr/retrieve/v19.1/request"
 	"github.com/tmconsulting/amadeus-golang-sdk/structs/ticket/displayTST/v07.1/request"
 	"github.com/tmconsulting/amadeus-golang-sdk/structs/ticket/displayTST/v07.1/response"
 )
 
-func (s *service) PNRRetrieve(query *PNR_Retrieve_v11_3.Request) (*PNR_Reply_v11_3.Response, *client.ResponseSOAPHeader, error) {
-	return s.sdk.PNRRetrieveV113(query)
+func (s *service) PNRRetrieve(query *PNR_Information.Request) (*PNR_Information.Response, *client.ResponseSOAPHeader, error) {
+	switch s.mm[PNRRetrieve] {
+	case PNRRetrieveV113:
+		query := PNR_Retrieve_v11_3_request.MakeRequest(query)
+		response, header, err := s.sdk.PNRRetrieveV113(query)
+		if response == nil {
+			return nil, header, err
+		}
+		return response.ToCommon(), header, err
+	case PNRRetrieveV191:
+		query := PNR_Retrieve_v19_1_request.MakeRequest(query)
+		response, header, err := s.sdk.PNRRetrieveV191(query)
+		if response == nil {
+			return nil, header, err
+		}
+		return response.ToCommon(), header, err
+	}
+	return nil, nil, nil
 }
 
 func (s *service) TicketDisplayTST(query *Ticket_DisplayTSTRequest_v07_1.Request) (*Ticket_DisplayTSTResponse_v07_1.Response, *client.ResponseSOAPHeader, error) {

service/methods.go

@@ -11,6 +11,7 @@ var ErrNoRealisation = errors.New("sorry, method has no realisation")
 // Methods versions sdk realisation
 const (
 	PNRRetrieveV113 MethodVersion = iota
+	PNRRetrieveV191
 	TicketDisplayTSTV071
 	FareInformativePricingWithoutPNRV124
 	FareCheckRulesV071