Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

B 21438 main #14679

Merged
merged 22 commits into from
Feb 18, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
9350415
Merge branch 'B-21410' into B-21438-MAIN
CoryKleinjanCACI Jan 9, 2025
f4b5180
Merge branch 'main' into B-21438-MAIN
CoryKleinjanCACI Jan 15, 2025
9f13960
Merge branch 'B-21410' into B-21438-MAIN
CoryKleinjanCACI Jan 15, 2025
32578a6
Merge branch 'main' into B-21438-MAIN
CoryKleinjanCACI Jan 27, 2025
18f2d12
Merge branch 'B-21410' into B-21438-MAIN
CoryKleinjanCACI Jan 27, 2025
20e4274
Setting Market and Status to show in prime sim
CoryKleinjanCACI Jan 28, 2025
3d151bb
Adding MTOServiceItemDomesticShuttle
CoryKleinjanCACI Jan 28, 2025
be29734
Merge branch 'main' into B-21438-MAIN
CoryKleinjanCACI Jan 28, 2025
55952fb
fixing tests
CoryKleinjanCACI Jan 29, 2025
e3915bc
fixing issue with domestic shuttle
CoryKleinjanCACI Jan 29, 2025
763b709
Allowing MTO shuttle to be created
CoryKleinjanCACI Jan 29, 2025
49a9a2f
Updating struct type
CoryKleinjanCACI Jan 30, 2025
6e4d0cc
Adding ability to update values for international shuttle via prime ui
CoryKleinjanCACI Jan 30, 2025
dec78a3
Updating prime ui shuttle tests
CoryKleinjanCACI Jan 30, 2025
625a7e8
Updating tests
CoryKleinjanCACI Jan 31, 2025
a0a649f
updating tests
CoryKleinjanCACI Jan 31, 2025
0e8ae72
updating tests
CoryKleinjanCACI Jan 31, 2025
f0909ab
Updating prime update validation for accessorial service items
CoryKleinjanCACI Jan 31, 2025
284c42f
Merge branch 'main' into B-21438-MAIN
CoryKleinjanCACI Feb 17, 2025
48f94fc
Merge branch 'main' into B-21438-MAIN
CoryKleinjanCACI Feb 17, 2025
29892f9
Merge branch 'main' into B-21438-MAIN
CoryKleinjanCACI Feb 18, 2025
b8e56df
Merge branch 'main' into B-21438-MAIN
CoryKleinjanCACI Feb 18, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions cmd/prime-api-client/prime/create_mto_service_item.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ type shuttleParams struct {
Body primemessages.MTOServiceItemShuttle `json:"body"`
}

type domesticShuttleParams struct {
Body primemessages.MTOServiceItemDomesticShuttle `json:"body"`
}

// InitCreateMTOServiceItemFlags initializes flags.
func InitCreateMTOServiceItemFlags(flag *pflag.FlagSet) {
flag.String(utils.FilenameFlag, "", "Name of the file being passed in")
Expand Down Expand Up @@ -146,12 +150,17 @@ func CreateMTOServiceItem(cmd *cobra.Command, args []string) error {
var params shuttleParams
err = utils.DecodeJSONFileToPayload(filename, utils.ContainsDash(args), &params)
serviceItemParams.SetBody(&params.Body)
case primemessages.MTOServiceItemModelTypeMTOServiceItemDomesticShuttle:
var params domesticShuttleParams
err = utils.DecodeJSONFileToPayload(filename, utils.ContainsDash(args), &params)
serviceItemParams.SetBody(&params.Body)
default:
err = fmt.Errorf("allowed modelType(): %v", []primemessages.MTOServiceItemModelType{
primemessages.MTOServiceItemModelTypeMTOServiceItemDestSIT,
primemessages.MTOServiceItemModelTypeMTOServiceItemOriginSIT,
primemessages.MTOServiceItemModelTypeMTOServiceItemDomesticCrating,
primemessages.MTOServiceItemModelTypeMTOServiceItemShuttle,
primemessages.MTOServiceItemModelTypeMTOServiceItemDomesticShuttle,
})
}
// return any decoding errors
Expand Down
94 changes: 92 additions & 2 deletions pkg/gen/primeapi/embedded_spec.go

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

6 changes: 6 additions & 0 deletions pkg/gen/primemessages/m_t_o_service_item.go

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

Loading
Loading