Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion v2/api/activity.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
70 changes: 51 additions & 19 deletions v2/docs/docs.go
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -206,7 +205,7 @@ const docTemplate = `{
}
},
"/activity/stop": {
"delete": {
"patch": {
"security": [
{
"BasicAuth": []
Expand Down Expand Up @@ -953,7 +952,7 @@ const docTemplate = `{
"format": "date-time"
},
"Type": {
"type": "string"
"$ref": "#/definitions/pkg.HolidayType"
},
"UserID": {
"type": "integer"
Expand Down Expand Up @@ -993,7 +992,7 @@ const docTemplate = `{
"format": "date-time"
},
"Type": {
"type": "string"
"$ref": "#/definitions/pkg.HolidayType"
}
}
},
Expand Down Expand Up @@ -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"
Expand All @@ -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",
Expand All @@ -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"
Expand Down Expand Up @@ -1183,7 +1196,8 @@ const docTemplate = `{
"type": "object",
"properties": {
"ActiveTime": {
"type": "integer"
"type": "integer",
"format": "int64"
},
"Day": {
"type": "string",
Expand All @@ -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": {
Expand Down Expand Up @@ -1231,6 +1261,8 @@ var SwaggerInfo = &swag.Spec{
Description: "",
InfoInstanceName: "swagger",
SwaggerTemplate: docTemplate,
LeftDelim: "{{",
RightDelim: "}}",
}

func init() {
Expand Down
65 changes: 48 additions & 17 deletions v2/docs/swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
}
},
"/activity/stop": {
"delete": {
"patch": {
"security": [
{
"BasicAuth": []
Expand Down Expand Up @@ -944,7 +944,7 @@
"format": "date-time"
},
"Type": {
"type": "string"
"$ref": "#/definitions/pkg.HolidayType"
},
"UserID": {
"type": "integer"
Expand Down Expand Up @@ -984,7 +984,7 @@
"format": "date-time"
},
"Type": {
"type": "string"
"$ref": "#/definitions/pkg.HolidayType"
}
}
},
Expand Down Expand Up @@ -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"
Expand All @@ -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",
Expand All @@ -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"
Expand Down Expand Up @@ -1174,7 +1188,8 @@
"type": "object",
"properties": {
"ActiveTime": {
"type": "integer"
"type": "integer",
"format": "int64"
},
"Day": {
"type": "string",
Expand All @@ -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": {
Expand Down
Loading