From 3bbcd1caab2e618a9885e5f3d608bce0349de88d Mon Sep 17 00:00:00 2001 From: Asai Neko Date: Fri, 27 Mar 2026 17:56:36 +0800 Subject: [PATCH] Fix event list response the hole result struct Signed-off-by: Asai Neko --- api/event/list.go | 20 ++++++++++---------- docs/docs.go | 27 ++++++++++++++++++++++----- docs/swagger.json | 27 ++++++++++++++++++++++----- docs/swagger.yaml | 19 +++++++++++++++---- 4 files changed, 69 insertions(+), 24 deletions(-) diff --git a/api/event/list.go b/api/event/list.go index 64c5da5..9c78f8a 100644 --- a/api/event/list.go +++ b/api/event/list.go @@ -19,15 +19,15 @@ import ( // @Accept json // @Produce json // @Security Bearer -// @Param limit query int false "Maximum number of events to return (default 20)" -// @Param offset query int true "Number of events to skip" -// @Param type query string false "Filter by event type: 'official' or 'party'" -// @Param sort_by query string false "Sort field: 'start_time' (default), 'end_time', 'name'" -// @Param sort_order query string false "Sort direction: 'asc' or 'desc' (default)" -// @Success 200 {object} utils.RespStatus{data=service_event.EventListResponse} "Successful paginated list retrieval" -// @Failure 400 {object} utils.RespStatus{data=nil} "Invalid Input" -// @Failure 401 {object} utils.RespStatus{data=nil} "Unauthorized" -// @Failure 500 {object} utils.RespStatus{data=nil} "Internal Server Error" +// @Param limit query int false "Maximum number of events to return (default 20)" +// @Param offset query int true "Number of events to skip" +// @Param type query string false "Filter by event type: 'official' or 'party'" +// @Param sort_by query string false "Sort field: 'start_time' (default), 'end_time', 'name'" +// @Param sort_order query string false "Sort direction: 'asc' or 'desc' (default)" +// @Success 200 {object} utils.RespStatus{data=service_event.EventListResponse} "Successful paginated list retrieval" +// @Failure 400 {object} utils.RespStatus{data=nil} "Invalid Input" +// @Failure 401 {object} utils.RespStatus{data=nil} "Unauthorized" +// @Failure 500 {object} utils.RespStatus{data=nil} "Internal Server Error" // @Router /event/list [get] func (self *EventHandler) List(c *gin.Context) { ctx, span := tracer.StartSpan( @@ -114,5 +114,5 @@ func (self *EventHandler) List(c *gin.Context) { return } - utils.HttpResponse(c, result.Common.HttpCode, result.Common.Exception.String(), result) + utils.HttpResponse(c, result.Common.HttpCode, result.Common.Exception.String(), result.Data) } diff --git a/docs/docs.go b/docs/docs.go index b76abb4..259fb74 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -2424,10 +2424,7 @@ const docTemplate = `{ "type": "object", "properties": { "data": { - "type": "array", - "items": { - "$ref": "#/definitions/service_event.EventListResponse" - } + "$ref": "#/definitions/service_event.EventListResponse" } } } @@ -4080,7 +4077,7 @@ const docTemplate = `{ } } }, - "service_event.EventListResponse": { + "service_event.EventListItems": { "type": "object", "required": [ "enable_kyc", @@ -4133,6 +4130,20 @@ const docTemplate = `{ } } }, + "service_event.EventListResponse": { + "type": "object", + "properties": { + "items": { + "type": "array", + "items": { + "$ref": "#/definitions/service_event.EventListItems" + } + }, + "total": { + "type": "integer" + } + } + }, "service_event.EventStatsResponse": { "type": "object", "properties": { @@ -4168,9 +4179,15 @@ const docTemplate = `{ "is_agenda_published": { "type": "boolean" }, + "limit": { + "type": "integer" + }, "name": { "type": "string" }, + "quota": { + "type": "integer" + }, "start_time": { "type": "string" }, diff --git a/docs/swagger.json b/docs/swagger.json index a57ceb9..fa30d28 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -2422,10 +2422,7 @@ "type": "object", "properties": { "data": { - "type": "array", - "items": { - "$ref": "#/definitions/service_event.EventListResponse" - } + "$ref": "#/definitions/service_event.EventListResponse" } } } @@ -4078,7 +4075,7 @@ } } }, - "service_event.EventListResponse": { + "service_event.EventListItems": { "type": "object", "required": [ "enable_kyc", @@ -4131,6 +4128,20 @@ } } }, + "service_event.EventListResponse": { + "type": "object", + "properties": { + "items": { + "type": "array", + "items": { + "$ref": "#/definitions/service_event.EventListItems" + } + }, + "total": { + "type": "integer" + } + } + }, "service_event.EventStatsResponse": { "type": "object", "properties": { @@ -4166,9 +4177,15 @@ "is_agenda_published": { "type": "boolean" }, + "limit": { + "type": "integer" + }, "name": { "type": "string" }, + "quota": { + "type": "integer" + }, "start_time": { "type": "string" }, diff --git a/docs/swagger.yaml b/docs/swagger.yaml index b206e6c..8872fad 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -293,7 +293,7 @@ definitions: required: - attendance_id type: object - service_event.EventListResponse: + service_event.EventListItems: properties: description: type: string @@ -330,6 +330,15 @@ definitions: - subtitle - type type: object + service_event.EventListResponse: + properties: + items: + items: + $ref: '#/definitions/service_event.EventListItems' + type: array + total: + type: integer + type: object service_event.EventStatsResponse: properties: agenda_submission_count: @@ -353,8 +362,12 @@ definitions: type: string is_agenda_published: type: boolean + limit: + type: integer name: type: string + quota: + type: integer start_time: type: string subtitle: @@ -1816,9 +1829,7 @@ paths: - $ref: '#/definitions/utils.RespStatus' - properties: data: - items: - $ref: '#/definitions/service_event.EventListResponse' - type: array + $ref: '#/definitions/service_event.EventListResponse' type: object "400": description: Invalid Input