Skip to content

Commit c066dd5

Browse files
juicycleffjuicycleff
committed
feat: update dependencies to version 1.3.0 for forge and forgeui; enhance event type and endpoint response handling
1 parent fb6bf3a commit c066dd5

3 files changed

Lines changed: 41 additions & 16 deletions

File tree

‎api/forge.go‎

Lines changed: 35 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ func (a *ForgeAPI) createEventType(ctx forge.Context, req *CreateEventTypeForgeR
145145
return nil, nil
146146
}
147147

148-
func (a *ForgeAPI) listEventTypes(ctx forge.Context, req *ListEventTypesForgeRequest) ([]*catalog.EventType, error) {
148+
func (a *ForgeAPI) listEventTypes(ctx forge.Context, req *ListEventTypesForgeRequest) (*catalog.EventType, error) {
149149
limit := req.Limit
150150
if limit == 0 {
151151
limit = 50
@@ -163,7 +163,12 @@ func (a *ForgeAPI) listEventTypes(ctx forge.Context, req *ListEventTypesForgeReq
163163
return nil, mapError(err)
164164
}
165165

166-
return types, nil
166+
if err := ctx.JSON(http.StatusOK, types); err != nil {
167+
return nil, mapError(err)
168+
}
169+
170+
//nolint:nilnil // response already written via ctx.JSON.
171+
return nil, nil
167172
}
168173

169174
func (a *ForgeAPI) getEventType(ctx forge.Context, req *GetEventTypeForgeRequest) (*catalog.EventType, error) {
@@ -304,7 +309,7 @@ func (a *ForgeAPI) createEndpoint(ctx forge.Context, req *CreateEndpointForgeReq
304309
return nil, nil
305310
}
306311

307-
func (a *ForgeAPI) listEndpoints(ctx forge.Context, req *ListEndpointsForgeRequest) ([]*endpoint.Endpoint, error) {
312+
func (a *ForgeAPI) listEndpoints(ctx forge.Context, req *ListEndpointsForgeRequest) (*endpoint.Endpoint, error) {
308313
if req.TenantID == "" {
309314
return nil, forge.BadRequest("tenant_id query parameter is required")
310315
}
@@ -324,7 +329,12 @@ func (a *ForgeAPI) listEndpoints(ctx forge.Context, req *ListEndpointsForgeReque
324329
return nil, mapError(err)
325330
}
326331

327-
return eps, nil
332+
if err := ctx.JSON(http.StatusOK, eps); err != nil {
333+
return nil, mapError(err)
334+
}
335+
336+
//nolint:nilnil // response already written via ctx.JSON.
337+
return nil, nil
328338
}
329339

330340
func (a *ForgeAPI) getEndpoint(ctx forge.Context, req *GetEndpointForgeRequest) (*endpoint.Endpoint, error) {
@@ -502,7 +512,7 @@ func (a *ForgeAPI) sendEvent(ctx forge.Context, req *CreateEventForgeRequest) (*
502512
return nil, nil
503513
}
504514

505-
func (a *ForgeAPI) listEvents(ctx forge.Context, req *ListEventsForgeRequest) ([]*event.Event, error) {
515+
func (a *ForgeAPI) listEvents(ctx forge.Context, req *ListEventsForgeRequest) (*event.Event, error) {
506516
limit := req.Limit
507517
if limit == 0 {
508518
limit = 50
@@ -519,7 +529,12 @@ func (a *ForgeAPI) listEvents(ctx forge.Context, req *ListEventsForgeRequest) ([
519529
return nil, mapError(err)
520530
}
521531

522-
return events, nil
532+
if err := ctx.JSON(http.StatusOK, events); err != nil {
533+
return nil, mapError(err)
534+
}
535+
536+
//nolint:nilnil // response already written via ctx.JSON.
537+
return nil, nil
523538
}
524539

525540
func (a *ForgeAPI) getEvent(ctx forge.Context, req *GetEventForgeRequest) (*event.Event, error) {
@@ -555,7 +570,7 @@ func (a *ForgeAPI) registerDeliveryRoutes(router forge.Router) {
555570
}
556571
}
557572

558-
func (a *ForgeAPI) listDeliveries(ctx forge.Context, req *ListDeliveriesForgeRequest) ([]*delivery.Delivery, error) {
573+
func (a *ForgeAPI) listDeliveries(ctx forge.Context, req *ListDeliveriesForgeRequest) (*delivery.Delivery, error) {
559574
epID, err := id.ParseEndpointID(req.EndpointID)
560575
if err != nil {
561576
return nil, forge.BadRequest("invalid endpoint ID")
@@ -581,7 +596,12 @@ func (a *ForgeAPI) listDeliveries(ctx forge.Context, req *ListDeliveriesForgeReq
581596
return nil, mapError(listErr)
582597
}
583598

584-
return deliveries, nil
599+
if err := ctx.JSON(http.StatusOK, deliveries); err != nil {
600+
return nil, mapError(err)
601+
}
602+
603+
//nolint:nilnil // response already written via ctx.JSON.
604+
return nil, nil
585605
}
586606

587607
// ---------------------------------------------------------------------------
@@ -624,7 +644,7 @@ func (a *ForgeAPI) registerDLQRoutes(router forge.Router) {
624644
}
625645
}
626646

627-
func (a *ForgeAPI) listDLQ(ctx forge.Context, req *ListDLQForgeRequest) ([]*dlq.Entry, error) {
647+
func (a *ForgeAPI) listDLQ(ctx forge.Context, req *ListDLQForgeRequest) (*dlq.Entry, error) {
628648
limit := req.Limit
629649
if limit == 0 {
630650
limit = 50
@@ -641,7 +661,12 @@ func (a *ForgeAPI) listDLQ(ctx forge.Context, req *ListDLQForgeRequest) ([]*dlq.
641661
return nil, mapError(err)
642662
}
643663

644-
return entries, nil
664+
if err := ctx.JSON(http.StatusOK, entries); err != nil {
665+
return nil, mapError(err)
666+
}
667+
668+
//nolint:nilnil // response already written via ctx.JSON.
669+
return nil, nil
645670
}
646671

647672
func (a *ForgeAPI) replayDLQ(ctx forge.Context, req *ReplayDLQForgeRequest) (*dlq.Entry, error) {

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ require (
66
github.com/a-h/templ v0.3.1001
77
github.com/redis/go-redis/v9 v9.18.0
88
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2
9-
github.com/xraph/forge v1.2.0
10-
github.com/xraph/forgeui v1.2.0
9+
github.com/xraph/forge v1.3.0
10+
github.com/xraph/forgeui v1.3.0
1111
github.com/xraph/go-utils v1.0.0
1212
github.com/xraph/grove v1.0.0
1313
github.com/xraph/grove/drivers/mongodriver v1.0.0

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -324,10 +324,10 @@ github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6
324324
github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM=
325325
github.com/xraph/confy v0.1.0 h1:dAdI/ShnkU5PEXVsfR86swoWj6XjJ37BdPQpBIUmg9M=
326326
github.com/xraph/confy v0.1.0/go.mod h1:/uhVfKibPR+kn7MI9LkVVekk84NP0sxsKZ9sFQoQ5Kc=
327-
github.com/xraph/forge v1.2.0 h1:+f5pAoWIa4vzFDD3j5b3qDk+X52/Hr1kyoV6CV8vx0g=
328-
github.com/xraph/forge v1.2.0/go.mod h1:n7mKRcLgNsGblsMDmpBrZNieMSe7dFmnGaA1O8sDZSw=
329-
github.com/xraph/forgeui v1.2.0 h1:3ti6abcQDDDdVM5Rgw4Bqgfw3Ot5zUDBjqgaucd2lgE=
330-
github.com/xraph/forgeui v1.2.0/go.mod h1:2oXAltVMFHJJG0OmXNzcA/BAEE+8L36LGTlkkDgaPpA=
327+
github.com/xraph/forge v1.3.0 h1:NZHmHSuis3IRfs1siMKy6vDB4D3vZrphTTSZVrRvmkw=
328+
github.com/xraph/forge v1.3.0/go.mod h1:SL+lSzFEd9sDw+LTVUeMsVLlWhZM83LMunP2yf6Dm28=
329+
github.com/xraph/forgeui v1.3.0 h1:HPS6+7fndy0qMkD1tB1QNydTOAqQ7oXOTi30+TlXOok=
330+
github.com/xraph/forgeui v1.3.0/go.mod h1:2oXAltVMFHJJG0OmXNzcA/BAEE+8L36LGTlkkDgaPpA=
331331
github.com/xraph/go-utils v1.0.0 h1:P1jOvtDlC5xZyGtnIhypFfPUBgpfyrwESY4TK4P2I5g=
332332
github.com/xraph/go-utils v1.0.0/go.mod h1:yp+PD9dXSA7tA9Pxmuveg5E7Ht1iHIVov8yMvanMG7U=
333333
github.com/xraph/grove v1.0.0 h1:LBbxKav5AEG27Xg+Tq2R6Ww3qP6kjIh1TaThIc3WIso=

0 commit comments

Comments
 (0)