Skip to content

Commit

Permalink
Yaml edits
Browse files Browse the repository at this point in the history
  • Loading branch information
TevinAdams committed Jan 26, 2024
1 parent 6d3bbe9 commit d5603d5
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 67 deletions.
6 changes: 0 additions & 6 deletions pkg/gen/internalapi/embedded_spec.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 0 additions & 42 deletions pkg/gen/internalmessages/internal_move.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 15 additions & 15 deletions pkg/handlers/internalapi/moves.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,24 +73,24 @@ func payloadForMoveModel(storer storage.FileStorer, order models.Order, move mod
return movePayload, nil
}

func payloadMovesList(storer storage.FileStorer, previousMovesList models.Moves, currentMoveList models.Moves, movesList models.Moves) (*internalmessages.MovesList, error) {
func payloadMovesList(previousMovesList models.Moves, currentMoveList models.Moves, movesList models.Moves) (*internalmessages.MovesList, error) {

// Convert currentMoves moves to internalmessages.MoveTaskOrder
var convertedCurrentMovesList []*internalmessages.InternalMove
moves := movesList
for _, move := range moves {

eTag := etag.GenerateEtag(move.UpdatedAt)
shipments := move.MTOShipments
var payloadShipments *internalmessages.MTOShipments = payloads.MTOShipments(storer, &shipments)
// shipments := move.MTOShipments
// var payloadShipments *internalmessages.MTOShipments = payloads.MTOShipments(storer, &shipments)
// var payloadOrders *internalmessages.Order = payloads

currentMove := &internalmessages.InternalMove{
CreatedAt: *handlers.FmtDateTime(move.CreatedAt),
ETag: eTag,
ID: *handlers.FmtUUID(move.ID),
MtoShipments: *payloadShipments,
MoveCode: move.Locator,
CreatedAt: *handlers.FmtDateTime(move.CreatedAt),
ETag: eTag,
ID: *handlers.FmtUUID(move.ID),
// MtoShipments: *payloadShipments,
MoveCode: move.Locator,
// Orders: move.Orders,
}

Expand All @@ -103,14 +103,14 @@ func payloadMovesList(storer storage.FileStorer, previousMovesList models.Moves,

if currentMoveList[0].ID != move.ID {
eTag := etag.GenerateEtag(move.UpdatedAt)
shipments := move.MTOShipments
var payloadShipments *internalmessages.MTOShipments = payloads.MTOShipments(storer, &shipments)
// shipments := move.MTOShipments
// var payloadShipments *internalmessages.MTOShipments = payloads.MTOShipments(storer, &shipments)

currentMove := &internalmessages.InternalMove{
CreatedAt: *handlers.FmtDateTime(move.CreatedAt),
ETag: eTag,
ID: *handlers.FmtUUID(move.ID),
MtoShipments: *payloadShipments,
CreatedAt: *handlers.FmtDateTime(move.CreatedAt),
ETag: eTag,
ID: *handlers.FmtUUID(move.ID),
// MtoShipments: *payloadShipments,
}

convertedPreviousMovesList = append(convertedPreviousMovesList, currentMove)
Expand Down Expand Up @@ -463,7 +463,7 @@ func (h GetAllMovesHandler) Handle(params moveop.GetAllMovesParams) middleware.R
}

// Build MovesList Payload
payload, err := payloadMovesList(h.FileStorer(), previousMovesList, currentMovesList, movesList)
payload, err := payloadMovesList(previousMovesList, currentMovesList, movesList)
if err != nil {
return handlers.ResponseForError(appCtx.Logger(), err), err
}
Expand Down
4 changes: 2 additions & 2 deletions swagger-def/internal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2726,8 +2726,8 @@ definitions:
format: date-time
type: string
readOnly: true
mtoShipments:
$ref: '#/definitions/MTOShipments'
# mtoShipments:
# $ref: '#/definitions/MTOShipments'
eTag:
type: string
readOnly: true
Expand Down
2 changes: 0 additions & 2 deletions swagger/internal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2757,8 +2757,6 @@ definitions:
format: date-time
type: string
readOnly: true
mtoShipments:
$ref: '#/definitions/MTOShipments'
eTag:
type: string
readOnly: true
Expand Down

0 comments on commit d5603d5

Please sign in to comment.