PNR_Info service #13

alexkadyrov · 2019-07-15T15:52:51Z

#15 related

smgladkovskiy

Помимо всего прочего, не забываем обновлять go.mod.

client/book.go

client/information.go

logger/logrusLogger/repository.go

service/20_book.go

service/21_cancel.go

structs/pnr/retrieve/response.go

structs/pnr/retrieve/v11.3/request/query.go

structs/pnr/retrieve/v11.3/response/reply.go

structs/pnr/retrieve/v19.1/request/query.go

structs/pnr/retrieve/v19.1/response/reply.go

smgladkovskiy

Ещё немного замечаний

smgladkovskiy · 2019-07-16T19:38:33Z

structs/pnr/retrieve/v11.3/response/reply.go

+import (
+	"github.com/tmconsulting/amadeus-golang-sdk/structs/pnr/retrieve"
+	"github.com/tmconsulting/amadeus-golang-sdk/utils"
+	"gitlab.teamc.io/tm-consulting/tmc24/avia/layer3/amadeus-agent-go/configuration"


Это явно лишнее

smgladkovskiy · 2019-07-16T19:41:09Z

structs/pnr/retrieve/v11.3/response/reply.go

+	// This data element is used to qualify the company code, to identify the industry business it belongs.
+	TravelSector string `xml:"travelSector"`
+
+	// This data element is used to convey the company code


Вынести формат времени в свойства сервиса и опицией ооверрайдить при необходимости

smgladkovskiy · 2019-07-16T19:41:37Z

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"
+	PNR_Reply_v11_3_response "github.com/tmconsulting/amadeus-golang-sdk/structs/pnr/retrieve/v11.3/response"


Лишний алиас

* circle ci tests * build and test badges

badges correction

smgladkovskiy · 2019-07-16T20:45:33Z

rebase for build and tests coverage

smgladkovskiy · 2019-09-27T14:20:14Z

structs/fare/masterPricerTravelBoardSearch/search.go

+type mapItineraries map[int]*Itinerary
+
+// Check validate search request
+func (request *SearchRequest) Check() (err error) {


Разбивай чек на куски:

проверка на пустые данные

проверка на согласованность типа маршрута и itineraries

проверка пассажиров

проверка и работа с itineraries

Все их (функции) покрыть тестами.

smgladkovskiy · 2019-09-27T14:20:51Z

structs/fare/masterPricerTravelBoardSearch/search.go

+	return nil
+}
+
+/*


убрать комментированные данные

smgladkovskiy · 2019-09-27T14:21:23Z

structs/fare/masterPricerTravelBoardSearch/search.go

+*/
+
+// SearchResponse structure of Search response
+type SearchResponse struct {


структуры запросов и ответов выделить и разнести по файлам, дабы читались проще

smgladkovskiy · 2019-09-27T14:23:08Z

structs/fare/masterPricerTravelBoardSearch/v14.3/request/makeQuery.go

+			UnitNumberDetail: []*NumberOfUnitDetailsType_260583C{
+				{
+					NumberOfUnits: formats.NumericInteger_Length1To6(request.Passengers.ADT + request.Passengers.CHD),
+					TypeOfUnit:    formats.AlphaNumericString_Length1To3("PX"),


Тут и далее -- может в константы эти штуки выносить с добавлением того, что может быть ещё, помимо тех параметров, что тут указаны? Когда потребуется регулировать структуру запроса -- они будут вынесены в параметры request'а

smgladkovskiy · 2019-09-27T14:24:17Z

structs/fare/masterPricerTravelBoardSearch/v14.3/request/makeQuery.go

+
+	paxID := 1
+	if request.Passengers.ADT > 0 {
+		var travellers []*TravellerDetailsType


добавление пассажира -- в единую функцию с передачей параметра типа пассажира. Добавление пакса сделать проходом по мапе.

и тесты на это

smgladkovskiy · 2019-09-27T14:31:47Z

structs/fare/masterPricerTravelBoardSearch/request.go

@@ -0,0 +1,35 @@
+package search


что пустое?

smgladkovskiy · 2019-09-27T14:31:54Z

structs/fare/masterPricerTravelBoardSearch/response.go

@@ -0,0 +1,122 @@
+package search


Что пустое?

smgladkovskiy · 2019-09-27T14:32:10Z

structs/fare/masterPricerTravelBoardSearch/search.go

+	"time"
+)
+
+/*


не нужный код

smgladkovskiy · 2019-09-27T14:33:28Z

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

+
+func (reply *Response) ToCommon(request *search.SearchRequest) (*search.SearchResponse, error) {
+
+	return ParseReply(request, reply)


а зачем делать тут функцию, если можно было бы содержимое той функции тут отразить?

smgladkovskiy · 2019-09-27T14:34:31Z

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

+	var segments = make(map[string]*structsCommon.Flight)
+
+	//	Recommendation details
+	for _, recReply := range reply.Recommendation {


вот это бы зарефакторить, разбив на более мелкие составляющие, начиная с самого глубокого цикла по дереву вложённости

smgladkovskiy · 2019-09-28T07:49:35Z

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))


это в логи нужно. дебагом

smgladkovskiy · 2019-09-28T07:51:37Z

client/options.go

@@ -38,3 +41,9 @@ func SetLogger(l logger.LogWriter) Option {
 		c.service.Client.Logger = logger.NewLogger(l)
 	}
 }
+
+func SetConfig(config configuration.ConfigType) Option {


Не надо так. Опции -- для опций. Тут не нужно передавать структурой целой конфиг. Если нужен формат -- сделай "setTimeFormat" функцию и всё. По-дефолту формат в свойство клиента и переопределяй опцией.

smgladkovskiy · 2019-09-28T07:51:51Z

configuration/config.go

@@ -1,126 +1,14 @@
 package configuration


не нужен конфиг тут от слова совсем!

smgladkovskiy · 2019-09-28T07:52:21Z

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,


Конфиг не нужен. из свойств клиента брать.

alexkadyrov added 4 commits July 12, 2019 14:17

logger

8173691

pnr_retrieve

7cb307c

pnr_retrieve

6ae820c

pnr_retrieve

cf6e1f6

smgladkovskiy reviewed Jul 16, 2019

View reviewed changes

smgladkovskiy self-assigned this Jul 16, 2019

smgladkovskiy added this to the v1.x.x milestone Jul 16, 2019

alexkadyrov added 4 commits July 16, 2019 15:14

правки по дискашену

bbecf3b

правки по дискашену

c90777b

правки по дискашену

cfcb2c0

правки по дискашену

074d09d

smgladkovskiy changed the title ~~Refactoring 2~~ PNR_Info service Jul 16, 2019

PNR info. Segments parsing

9a13392

smgladkovskiy reviewed Jul 16, 2019

View reviewed changes

smgladkovskiy added 2 commits July 16, 2019 23:42

Tests (#18)

4804268

* circle ci tests * build and test badges

Update README.md

1eb476d

badges correction

alexkadyrov added 8 commits July 17, 2019 20:34

PNR info. Segments parsing

1c0bdf7

Merge branch 'mass-refactoring' into refactoring-2

e924a5b

search request

6af3efe

search request

6048cf5

search request

c9b4a60

search complete

3a8d88e

убрана бизнес логика, фильтры, скипы

89d0479

cleanup

3b955a5

smgladkovskiy requested changes Sep 27, 2019

View reviewed changes

alexkadyrov force-pushed the refactoring-2 branch from b5a4e4d to 3b955a5 Compare September 27, 2019 14:44

smgladkovskiy force-pushed the mass-refactoring branch from 1badb5d to 7ab48ea Compare September 27, 2019 14:55

config

9e29012

smgladkovskiy requested changes Sep 28, 2019

View reviewed changes

alexkadyrov added 11 commits September 29, 2019 23:40

got rid of config

69652c3

search request validation

52b9b98

search request add travelers

6a2edef

search request add travelers

cac9f47

тесты на make query и на валидаторы

8dcb91d

тесты на функции по работе с датами и временем

c251e9d

тесты на методы структур

9ee8a84

тесты на методы работы со слайсами и массивами

0bbdbe9

deploy

af2a79d

deploy

1886525

FareMasterPricerTravelBoardSearch V16.3

83b7c9d

smgladkovskiy approved these changes Oct 4, 2019

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

PNR_Info service #13

PNR_Info service #13

alexkadyrov commented Jul 15, 2019 •

edited by smgladkovskiy

smgladkovskiy left a comment

smgladkovskiy left a comment

smgladkovskiy Jul 16, 2019

smgladkovskiy Jul 16, 2019

smgladkovskiy Jul 16, 2019

smgladkovskiy commented Jul 16, 2019

smgladkovskiy Sep 27, 2019

smgladkovskiy Sep 27, 2019

smgladkovskiy Sep 27, 2019

smgladkovskiy Sep 27, 2019

smgladkovskiy Sep 27, 2019

smgladkovskiy Sep 27, 2019

smgladkovskiy Sep 27, 2019

smgladkovskiy Sep 27, 2019

smgladkovskiy Sep 27, 2019

smgladkovskiy Sep 27, 2019

smgladkovskiy Sep 27, 2019

smgladkovskiy Sep 28, 2019

smgladkovskiy Sep 28, 2019

smgladkovskiy Sep 28, 2019

smgladkovskiy Sep 28, 2019

+              	"time"
+              )
+              /*


		func (reply Response) ToCommon(request search.SearchRequest) (*search.SearchResponse, error) {

		return ParseReply(request, reply)

PNR_Info service #13

Are you sure you want to change the base?

PNR_Info service #13

Conversation

alexkadyrov commented Jul 15, 2019 • edited by smgladkovskiy

smgladkovskiy left a comment

Choose a reason for hiding this comment

smgladkovskiy left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

smgladkovskiy commented Jul 16, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alexkadyrov commented Jul 15, 2019 •

edited by smgladkovskiy