Skip to content

Production Release 2025-08-04_01 #2906

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Aug 4, 2025
Merged

Production Release 2025-08-04_01 #2906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
98f9e47
reactor: remove unnecessary field from origin skus and update buffer …
clD11 Jul 30, 2025
daecf6e
reactor: radd credential valid duration to origin sku (#2903)
clD11 Jul 31, 2025
74d0d06
refactor: improve order linking logging (#2904)
clD11 Aug 4, 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
10 changes: 8 additions & 2 deletions services/skus/controllers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1468,6 +1468,8 @@ func handleCreateOrderFromReceiptH(w http.ResponseWriter, r *http.Request, svc *
if err := valid.StructCtx(ctx, &req); err != nil {
verrs, ok := collectValidationErrors(err)
if !ok {
lg.Err(err).Msg("failed to validate request")

return handlers.ValidationError("request", map[string]interface{}{"request-body": err.Error()})
}

Expand All @@ -1476,8 +1478,12 @@ func handleCreateOrderFromReceiptH(w http.ResponseWriter, r *http.Request, svc *

ord, err := svc.createOrderWithReceipt(ctx, req)
if err != nil {
lgr := lg.With().Bytes("raw_receipt", raw).Logger()

// Found an existing order, respond with the id (ord guaranteed not to be nil).
if errors.Is(err, model.ErrOrderExistsForReceipt) {
lgr.Err(err).Msg("failed order already exists for receipt")

result := model.CreateOrderWithReceiptResponse{ID: ord.ID.String()}

return handlers.RenderContent(ctx, result, w, http.StatusConflict)
Expand All @@ -1486,12 +1492,12 @@ func handleCreateOrderFromReceiptH(w http.ResponseWriter, r *http.Request, svc *
// Use new so that the shorter IF and narrow scope are possible (via if := ...; {}).
// It's an example of one of the few legit uses for 'new'.
if rverr := new(receiptValidError); errors.As(err, &rverr) {
lg.Warn().Err(err).Msg("failed to validate receipt with vendor")
lgr.Warn().Err(rverr).Msg("failed to validate receipt with vendor")

return handleReceiptErr(rverr.err)
}

lg.Warn().Err(err).Msg("failed to create order")
lgr.Warn().Err(err).Msg("failed to create order")

return handlers.WrapError(err, "failed to create order", http.StatusInternalServerError)
}
Expand Down
4 changes: 2 additions & 2 deletions services/skus/skus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ func newOrderItemReqNewMobileSet(env string) map[string]model.OrderItemRequestNe
CredentialType: "time-limited-v2",
CredentialValidDuration: "P1M",
Price: decimal.RequireFromString("4.99"),
IssuerTokenBuffer: ptrTo(3),
IssuerTokenBuffer: ptrTo(1),
IssuerTokenOverlap: ptrTo(0),
CredentialValidDurationEach: ptrTo("P1M"),
// StripeMetadata depends on env.
Expand All @@ -338,7 +338,7 @@ func newOrderItemReqNewMobileSet(env string) map[string]model.OrderItemRequestNe
CredentialType: "time-limited-v2",
CredentialValidDuration: "P1M",
Price: decimal.RequireFromString("49.99"),
IssuerTokenBuffer: ptrTo(3),
IssuerTokenBuffer: ptrTo(1),
IssuerTokenOverlap: ptrTo(0),
CredentialValidDurationEach: ptrTo("P1M"),
// StripeMetadata depends on env.
Expand Down
16 changes: 8 additions & 8 deletions services/skus/skus_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,7 +854,7 @@ func TestNewOrderItemReqNewMobileSet(t *testing.T) {
CredentialType: "time-limited-v2",
CredentialValidDuration: "P1M",
Price: decimal.RequireFromString("4.99"),
IssuerTokenBuffer: ptrTo(3),
IssuerTokenBuffer: ptrTo(1),
IssuerTokenOverlap: ptrTo(0),
CredentialValidDurationEach: ptrTo("P1M"),
StripeMetadata: &model.ItemStripeMetadata{
Expand All @@ -872,7 +872,7 @@ func TestNewOrderItemReqNewMobileSet(t *testing.T) {
CredentialType: "time-limited-v2",
CredentialValidDuration: "P1M",
Price: decimal.RequireFromString("49.99"),
IssuerTokenBuffer: ptrTo(3),
IssuerTokenBuffer: ptrTo(1),
IssuerTokenOverlap: ptrTo(0),
CredentialValidDurationEach: ptrTo("P1M"),
StripeMetadata: &model.ItemStripeMetadata{
Expand Down Expand Up @@ -968,7 +968,7 @@ func TestNewOrderItemReqNewMobileSet(t *testing.T) {
CredentialType: "time-limited-v2",
CredentialValidDuration: "P1M",
Price: decimal.RequireFromString("4.99"),
IssuerTokenBuffer: ptrTo(3),
IssuerTokenBuffer: ptrTo(1),
IssuerTokenOverlap: ptrTo(0),
CredentialValidDurationEach: ptrTo("P1M"),
StripeMetadata: &model.ItemStripeMetadata{
Expand All @@ -986,7 +986,7 @@ func TestNewOrderItemReqNewMobileSet(t *testing.T) {
CredentialType: "time-limited-v2",
CredentialValidDuration: "P1M",
Price: decimal.RequireFromString("49.99"),
IssuerTokenBuffer: ptrTo(3),
IssuerTokenBuffer: ptrTo(1),
IssuerTokenOverlap: ptrTo(0),
CredentialValidDurationEach: ptrTo("P1M"),
StripeMetadata: &model.ItemStripeMetadata{
Expand Down Expand Up @@ -1082,7 +1082,7 @@ func TestNewOrderItemReqNewMobileSet(t *testing.T) {
CredentialType: "time-limited-v2",
CredentialValidDuration: "P1M",
Price: decimal.RequireFromString("4.99"),
IssuerTokenBuffer: ptrTo(3),
IssuerTokenBuffer: ptrTo(1),
IssuerTokenOverlap: ptrTo(0),
CredentialValidDurationEach: ptrTo("P1M"),
StripeMetadata: &model.ItemStripeMetadata{
Expand All @@ -1100,7 +1100,7 @@ func TestNewOrderItemReqNewMobileSet(t *testing.T) {
CredentialType: "time-limited-v2",
CredentialValidDuration: "P1M",
Price: decimal.RequireFromString("49.99"),
IssuerTokenBuffer: ptrTo(3),
IssuerTokenBuffer: ptrTo(1),
IssuerTokenOverlap: ptrTo(0),
CredentialValidDurationEach: ptrTo("P1M"),
StripeMetadata: &model.ItemStripeMetadata{
Expand Down Expand Up @@ -1196,7 +1196,7 @@ func TestNewOrderItemReqNewMobileSet(t *testing.T) {
CredentialType: "time-limited-v2",
CredentialValidDuration: "P1M",
Price: decimal.RequireFromString("4.99"),
IssuerTokenBuffer: ptrTo(3),
IssuerTokenBuffer: ptrTo(1),
IssuerTokenOverlap: ptrTo(0),
CredentialValidDurationEach: ptrTo("P1M"),
StripeMetadata: &model.ItemStripeMetadata{
Expand All @@ -1214,7 +1214,7 @@ func TestNewOrderItemReqNewMobileSet(t *testing.T) {
CredentialType: "time-limited-v2",
CredentialValidDuration: "P1M",
Price: decimal.RequireFromString("49.99"),
IssuerTokenBuffer: ptrTo(3),
IssuerTokenBuffer: ptrTo(1),
IssuerTokenOverlap: ptrTo(0),
CredentialValidDurationEach: ptrTo("P1M"),
StripeMetadata: &model.ItemStripeMetadata{
Expand Down
Loading