diff --git a/v2/api/activity.go b/v2/api/activity.go index 0c54220..9a193d5 100644 --- a/v2/api/activity.go +++ b/v2/api/activity.go @@ -15,7 +15,7 @@ import ( // @Summary Stops a activity // @Produce json // @Success 200 {object} pkg.Activity -// @Router /activity/stop [delete] +// @Router /activity/stop [patch] // @Security BasicAuth // @Security ApiKeyAuth func (a *API) StopActivity(c *gin.Context) { diff --git a/v2/docs/docs.go b/v2/docs/docs.go index 9f5b142..09cd8da 100644 --- a/v2/docs/docs.go +++ b/v2/docs/docs.go @@ -1,5 +1,4 @@ -// Package docs GENERATED BY SWAG; DO NOT EDIT -// This file was generated by swaggo/swag +// Package docs Code generated by swaggo/swag. DO NOT EDIT package docs import "github.com/swaggo/swag" @@ -206,7 +205,7 @@ const docTemplate = `{ } }, "/activity/stop": { - "delete": { + "patch": { "security": [ { "BasicAuth": [] @@ -953,7 +952,7 @@ const docTemplate = `{ "format": "date-time" }, "Type": { - "type": "string" + "$ref": "#/definitions/pkg.HolidayType" }, "UserID": { "type": "integer" @@ -993,7 +992,7 @@ const docTemplate = `{ "format": "date-time" }, "Type": { - "type": "string" + "$ref": "#/definitions/pkg.HolidayType" } } }, @@ -1041,14 +1040,16 @@ const docTemplate = `{ "type": "object", "properties": { "ActiveTime": { - "type": "integer" + "type": "integer", + "format": "int64" }, "Day": { "type": "string", "format": "date-time" }, "Overtime": { - "type": "integer" + "type": "integer", + "format": "int64" }, "UserID": { "type": "integer" @@ -1059,20 +1060,28 @@ const docTemplate = `{ "type": "object", "properties": { "ActiveActivity": { - "x-nullable": true, - "$ref": "#/definitions/Activity" + "allOf": [ + { + "$ref": "#/definitions/Activity" + } + ], + "x-nullable": true }, "ActiveTimeThisDayInMinutes": { - "type": "integer" + "type": "integer", + "format": "int64" }, "ActiveTimeThisMonthInMinutes": { - "type": "integer" + "type": "integer", + "format": "int64" }, "ActiveTimeThisWeekInMinutes": { - "type": "integer" + "type": "integer", + "format": "int64" }, "ActiveTimeThisYearInMinutes": { - "type": "integer" + "type": "integer", + "format": "int64" }, "Date": { "type": "string", @@ -1082,16 +1091,20 @@ const docTemplate = `{ "type": "integer" }, "OvertimeThisDayInMinutes": { - "type": "integer" + "type": "integer", + "format": "int64" }, "OvertimeThisMonthInMinutes": { - "type": "integer" + "type": "integer", + "format": "int64" }, "OvertimeThisWeekInMinutes": { - "type": "integer" + "type": "integer", + "format": "int64" }, "OvertimeThisYearInMinutes": { - "type": "integer" + "type": "integer", + "format": "int64" }, "UsedHolidays": { "type": "integer" @@ -1183,7 +1196,8 @@ const docTemplate = `{ "type": "object", "properties": { "ActiveTime": { - "type": "integer" + "type": "integer", + "format": "int64" }, "Day": { "type": "string", @@ -1196,12 +1210,28 @@ const docTemplate = `{ "type": "boolean" }, "Overtime": { - "type": "integer" + "type": "integer", + "format": "int64" }, "UserID": { "type": "integer" } } + }, + "pkg.HolidayType": { + "type": "string", + "enum": [ + "free", + "sick", + "legal_holiday", + "unpaid_free" + ], + "x-enum-varnames": [ + "HolidayTypeFree", + "HolidayTypeSick", + "HolidayTypeLegalHoliday", + "HolidayTypeLegalUnpaidFree" + ] } }, "securityDefinitions": { @@ -1231,6 +1261,8 @@ var SwaggerInfo = &swag.Spec{ Description: "", InfoInstanceName: "swagger", SwaggerTemplate: docTemplate, + LeftDelim: "{{", + RightDelim: "}}", } func init() { diff --git a/v2/docs/swagger.json b/v2/docs/swagger.json index e7589e9..410254b 100644 --- a/v2/docs/swagger.json +++ b/v2/docs/swagger.json @@ -197,7 +197,7 @@ } }, "/activity/stop": { - "delete": { + "patch": { "security": [ { "BasicAuth": [] @@ -944,7 +944,7 @@ "format": "date-time" }, "Type": { - "type": "string" + "$ref": "#/definitions/pkg.HolidayType" }, "UserID": { "type": "integer" @@ -984,7 +984,7 @@ "format": "date-time" }, "Type": { - "type": "string" + "$ref": "#/definitions/pkg.HolidayType" } } }, @@ -1032,14 +1032,16 @@ "type": "object", "properties": { "ActiveTime": { - "type": "integer" + "type": "integer", + "format": "int64" }, "Day": { "type": "string", "format": "date-time" }, "Overtime": { - "type": "integer" + "type": "integer", + "format": "int64" }, "UserID": { "type": "integer" @@ -1050,20 +1052,28 @@ "type": "object", "properties": { "ActiveActivity": { - "x-nullable": true, - "$ref": "#/definitions/Activity" + "allOf": [ + { + "$ref": "#/definitions/Activity" + } + ], + "x-nullable": true }, "ActiveTimeThisDayInMinutes": { - "type": "integer" + "type": "integer", + "format": "int64" }, "ActiveTimeThisMonthInMinutes": { - "type": "integer" + "type": "integer", + "format": "int64" }, "ActiveTimeThisWeekInMinutes": { - "type": "integer" + "type": "integer", + "format": "int64" }, "ActiveTimeThisYearInMinutes": { - "type": "integer" + "type": "integer", + "format": "int64" }, "Date": { "type": "string", @@ -1073,16 +1083,20 @@ "type": "integer" }, "OvertimeThisDayInMinutes": { - "type": "integer" + "type": "integer", + "format": "int64" }, "OvertimeThisMonthInMinutes": { - "type": "integer" + "type": "integer", + "format": "int64" }, "OvertimeThisWeekInMinutes": { - "type": "integer" + "type": "integer", + "format": "int64" }, "OvertimeThisYearInMinutes": { - "type": "integer" + "type": "integer", + "format": "int64" }, "UsedHolidays": { "type": "integer" @@ -1174,7 +1188,8 @@ "type": "object", "properties": { "ActiveTime": { - "type": "integer" + "type": "integer", + "format": "int64" }, "Day": { "type": "string", @@ -1187,12 +1202,28 @@ "type": "boolean" }, "Overtime": { - "type": "integer" + "type": "integer", + "format": "int64" }, "UserID": { "type": "integer" } } + }, + "pkg.HolidayType": { + "type": "string", + "enum": [ + "free", + "sick", + "legal_holiday", + "unpaid_free" + ], + "x-enum-varnames": [ + "HolidayTypeFree", + "HolidayTypeSick", + "HolidayTypeLegalHoliday", + "HolidayTypeLegalUnpaidFree" + ] } }, "securityDefinitions": { diff --git a/v2/docs/swagger.yaml b/v2/docs/swagger.yaml index e196601..6443581 100644 --- a/v2/docs/swagger.yaml +++ b/v2/docs/swagger.yaml @@ -34,7 +34,7 @@ definitions: format: date-time type: string Type: - type: string + $ref: '#/definitions/pkg.HolidayType' UserID: type: integer type: object @@ -62,7 +62,7 @@ definitions: format: date-time type: string Type: - type: string + $ref: '#/definitions/pkg.HolidayType' type: object InputToken: properties: @@ -93,11 +93,13 @@ definitions: InputWorkDay: properties: ActiveTime: + format: int64 type: integer Day: format: date-time type: string Overtime: + format: int64 type: integer UserID: type: integer @@ -105,15 +107,20 @@ definitions: Overtime: properties: ActiveActivity: - $ref: '#/definitions/Activity' + allOf: + - $ref: '#/definitions/Activity' x-nullable: true ActiveTimeThisDayInMinutes: + format: int64 type: integer ActiveTimeThisMonthInMinutes: + format: int64 type: integer ActiveTimeThisWeekInMinutes: + format: int64 type: integer ActiveTimeThisYearInMinutes: + format: int64 type: integer Date: format: date-time @@ -121,12 +128,16 @@ definitions: HolidaysStillAvailable: type: integer OvertimeThisDayInMinutes: + format: int64 type: integer OvertimeThisMonthInMinutes: + format: int64 type: integer OvertimeThisWeekInMinutes: + format: int64 type: integer OvertimeThisYearInMinutes: + format: int64 type: integer UsedHolidays: type: integer @@ -187,6 +198,7 @@ definitions: WorkDay: properties: ActiveTime: + format: int64 type: integer Day: format: date-time @@ -196,10 +208,23 @@ definitions: IsHoliday: type: boolean Overtime: + format: int64 type: integer UserID: type: integer type: object + pkg.HolidayType: + enum: + - free + - sick + - legal_holiday + - unpaid_free + type: string + x-enum-varnames: + - HolidayTypeFree + - HolidayTypeSick + - HolidayTypeLegalHoliday + - HolidayTypeLegalUnpaidFree info: contact: {} title: Your Overtime API @@ -385,7 +410,7 @@ paths: tags: - activity /activity/stop: - delete: + patch: produces: - application/json responses: