NYANDEV/forgejo
NYANDEV/forgejo
4
0
Fork 1
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-08 18:04:14 +01:00
Code Issues 2 Projects 1 Releases Packages Wiki Activity

Fix push mirror, wrong timestamp format (#27153)

Browse source 
I noticed, that the push mirrors endpoint, is the only endpoint which
returns the times in long format rather than as time.Time().

I think the behavior should be consistent across the project.

----

## ⚠️ BREAKING ⚠️

This PR changes the time format used in API responses for all
push_mirror endpoints which return a push mirror.

---------

Co-authored-by: Giteabot <teabot@gitea.io>
This commit is contained in:
Daniel Kilimnik 2023-09-23 14:15:05 +02:00 committed by GitHub
parent 5f7388e586
commit 0ee7cbf725
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
modules/structs/mirror.go
View file

@ -3,6 +3,8 @@
package structs package structs
import "time"
// CreatePushMirrorOption represents need information to create a push mirror of a repository. // CreatePushMirrorOption represents need information to create a push mirror of a repository.
type CreatePushMirrorOption struct { type CreatePushMirrorOption struct {
RemoteAddress string `json:"remote_address"` RemoteAddress string `json:"remote_address"`
@ -15,12 +17,14 @@ type CreatePushMirrorOption struct {
// PushMirror represents information of a push mirror // PushMirror represents information of a push mirror
// swagger:model // swagger:model
type PushMirror struct { type PushMirror struct {
RepoName string `json:"repo_name"` RepoName string `json:"repo_name"`
RemoteName string `json:"remote_name"` RemoteName string `json:"remote_name"`
RemoteAddress string `json:"remote_address"` RemoteAddress string `json:"remote_address"`
CreatedUnix string `json:"created"` // swagger:strfmt date-time
LastUpdateUnix string `json:"last_update"` CreatedUnix time.Time `json:"created"`
LastError string `json:"last_error"` // swagger:strfmt date-time
Interval string `json:"interval"` LastUpdateUnix *time.Time `json:"last_update"`
SyncOnCommit bool `json:"sync_on_commit"` LastError string `json:"last_error"`
Interval string `json:"interval"`
SyncOnCommit bool `json:"sync_on_commit"`
} }

4
services/convert/mirror.go
View file

@ -15,8 +15,8 @@ func ToPushMirror(pm *repo_model.PushMirror) (*api.PushMirror, error) {
RepoName: repo.Name, RepoName: repo.Name,
RemoteName: pm.RemoteName, RemoteName: pm.RemoteName,
RemoteAddress: pm.RemoteAddress, RemoteAddress: pm.RemoteAddress,
CreatedUnix: pm.CreatedUnix.FormatLong(), CreatedUnix: pm.CreatedUnix.AsTime(),
LastUpdateUnix: pm.LastUpdateUnix.FormatLong(), LastUpdateUnix: pm.LastUpdateUnix.AsTimePtr(),
LastError: pm.LastError, LastError: pm.LastError,
Interval: pm.Interval.String(), Interval: pm.Interval.String(),
SyncOnCommit: pm.SyncOnCommit, SyncOnCommit: pm.SyncOnCommit,

2
templates/swagger/v1_json.tmpl generated
View file

@ -21646,6 +21646,7 @@
"properties": { "properties": {
"created": { "created": {
"type": "string", "type": "string",
"format": "date-time",
"x-go-name": "CreatedUnix" "x-go-name": "CreatedUnix"
}, },
"interval": { "interval": {
@ -21658,6 +21659,7 @@
}, },
"last_update": { "last_update": {
"type": "string", "type": "string",
"format": "date-time",
"x-go-name": "LastUpdateUnix" "x-go-name": "LastUpdateUnix"
}, },
"remote_address": { "remote_address": {