PNR_Info service

.circleci/config.yml

@@ -0,0 +1,30 @@
+version: 2.0
+
+orbs:
+  codecov: codecov/codecov@1.0.4
+
+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

@@ -1,14 +1,14 @@
 package client
 
 import (
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/air/sellFromRecommendation/v05.2/request"
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/air/sellFromRecommendation/v05.2/response"
-	"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/cancel/v11.3"
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/pnr/reply/v11.3"
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/ticket/createTSTFromPricing/v04.1"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/air/sellFromRecommendation/v05.2/request"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/air/sellFromRecommendation/v05.2/response"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/fare/pricePNRWithBookingClass/v14.1/request"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/fare/pricePNRWithBookingClass/v14.1/response"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/pnr/addMultiElements/v11.3"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/pnr/cancel/v11.3"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/pnr/retrieve/v11.3/response"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/ticket/createTSTFromPricing/v04.1"
 )
 
 func (client *AmadeusClient) AirSellFromRecommendationV052(query *Air_SellFromRecommendationRequest_v05_2.Request) (*Air_SellFromRecommendationResponse_v05_2.Response, *ResponseSOAPHeader, error) {
@@ -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/client.go

@@ -1,9 +1,9 @@
 package client
 
 import (
-	"github.com/tmconsulting/amadeus-golang-sdk/logger"
-	"github.com/tmconsulting/amadeus-golang-sdk/logger/nilLogger"
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/session/v03.0"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/logger"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/logger/nilLogger"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/session/v03.0"
 )
 
 var (

client/comandCryptic.go

@@ -1,7 +1,7 @@
 package client
 
 import (
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/commandCryptic/v07.3"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/commandCryptic/v07.3"
 )
 
 func (client *AmadeusClient) CommandCrypticV073(query *CommandCryptic_v07_3.Request) (*CommandCryptic_v07_3.Response, error) {

client/information.go

@@ -1,20 +1,28 @@
 package client
 
 import (
-	"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/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/v2/structs/fare/checkRules/v07.1/request"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/fare/checkRules/v07.1/response"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/fare/informativePricingWithoutPNR/v12.4/request"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/fare/informativePricingWithoutPNR/v12.4/response"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/pnr/retrieve/v11.3/request"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/pnr/retrieve/v11.3/response"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/pnr/retrieve/v19.1/request"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/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/issue.go

@@ -1,7 +1,7 @@
 package client
 
 import (
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/docIssuance/issueTicket/v09.1"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/docIssuance/issueTicket/v09.1"
 )
 
 func (client *AmadeusClient) DocIssuanceIssueTicketV091(query *DocIssuance_IssueTicket_v09_1.Request) (*DocIssuance_IssueTicket_v09_1.Response, *ResponseSOAPHeader, error) {

client/options.go

@@ -1,6 +1,8 @@
 package client
 
-import "github.com/tmconsulting/amadeus-golang-sdk/logger"
+import (
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/logger"
+)
 
 // Option describes a functional option for configuring AmadeusClient.
 type Option func(client *AmadeusClient)

client/refund.go

@@ -1,13 +1,13 @@
 package client
 
 import (
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/ama/ticketIgnoreRefund/v03.0"
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/ama/ticketInitRefund/v03.0"
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/ama/ticketProcessRefund/v03.0"
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/pnr/ignore/v04.1"
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/salesReports/displayTransactionReport/v13.2"
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/ticket/processEDoc/v15.2/request"
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/ticket/processEDoc/v15.2/response"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/ama/ticketIgnoreRefund/v03.0"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/ama/ticketInitRefund/v03.0"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/ama/ticketProcessRefund/v03.0"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/pnr/ignore/v04.1"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/salesReports/displayTransactionReport/v13.2"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/ticket/processEDoc/v15.2/request"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/ticket/processEDoc/v15.2/response"
 )
 
 func (client *AmadeusClient) AMATicketIgnoreRefundV030(query *AMA_TicketIgnoreRefund_v03_0.Request) (*AMA_TicketIgnoreRefund_v03_0.Response, *ResponseSOAPHeader, error) {

client/search.go

@@ -1,12 +1,12 @@
 package client
 
 import (
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/fare/informativeBestPricingWithoutPNR/v12.4/request"
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/fare/informativeBestPricingWithoutPNR/v12.4/response"
-	"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/v16.3/request"
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/fare/masterPricerTravelBoardSearch/v16.3/response"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/fare/informativeBestPricingWithoutPNR/v12.4/request"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/fare/informativeBestPricingWithoutPNR/v12.4/response"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/fare/masterPricerTravelBoardSearch/v14.3/request"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/fare/masterPricerTravelBoardSearch/v14.3/response"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/fare/masterPricerTravelBoardSearch/v16.3/request"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/fare/masterPricerTravelBoardSearch/v16.3/response"
 )
 
 func (client *AmadeusClient) FareMasterPricerTravelBoardSearchV143(query *Fare_MasterPricerTravelBoardSearchRequest_v14_3.Request) (*Fare_MasterPricerTravelBoardSearchResponse_v14_3.Response, *ResponseSOAPHeader, error) {

client/session.go

@@ -3,8 +3,8 @@ package client
 import (
 	"errors"
 
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/security/signOut/v04.1"
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/session/v03.0"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/security/signOut/v04.1"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/session/v03.0"
 )
 
 func (client *AmadeusClient) SecuritySignOutV041() (*SecuritySignOut_v04_1.Response, *ResponseSOAPHeader, error) {

client/soap.go

@@ -4,7 +4,7 @@ import (
 	"encoding/xml"
 	"fmt"
 
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/session/v03.0"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/session/v03.0"
 )
 
 const (

client/soapClient.go

@@ -13,8 +13,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/tmconsulting/amadeus-golang-sdk/logger"
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/session/v03.0"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/logger"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/session/v03.0"
 )
 
 var timeout = 20 * time.Second

client/void.go

@@ -1,12 +1,12 @@
 package client
 
 import (
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/salesReports/displayQueryReport/v10.1/request"
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/salesReports/displayQueryReport/v10.1/response"
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/ticket/cancelDocument/v11.1"
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/ticket/deleteTST/v04.1"
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/ticket/displayTST/v07.1/request"
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/ticket/displayTST/v07.1/response"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/salesReports/displayQueryReport/v10.1/request"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/salesReports/displayQueryReport/v10.1/response"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/ticket/cancelDocument/v11.1"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/ticket/deleteTST/v04.1"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/ticket/displayTST/v07.1/request"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/ticket/displayTST/v07.1/response"
 )
 
 func (client *AmadeusClient) SalesReportsDisplayQueryReportV101(query *SalesReports_QueryReportRequest_v10_1.Request) (*SalesReports_QueryReportReply_v10_1.Response, *ResponseSOAPHeader, error) {

go.mod

@@ -1,4 +1,4 @@
-module github.com/tmconsulting/amadeus-golang-sdk
+module github.com/tmconsulting/amadeus-golang-sdk/v2
 
 go 1.12
 

service/00_session.go

@@ -1,9 +1,9 @@
 package service
 
 import (
-	"github.com/tmconsulting/amadeus-golang-sdk/client"
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/security/signOut/v04.1"
-	"github.com/tmconsulting/amadeus-golang-sdk/structs/session/v03.0"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/client"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/security/signOut/v04.1"
+	"github.com/tmconsulting/amadeus-golang-sdk/v2/structs/session/v03.0"
 )
 
 func (s *service) SecuritySignOut() (*SecuritySignOut_v04_1.Response, *client.ResponseSOAPHeader, error) {