From f2d03cda96eb5febbf9801f6b6cf5daa37220bc9 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Fri, 27 Dec 2019 21:30:58 +0100
Subject: [API] Extend times API (#9200)

Extensively extend the times API.

close #8833; close #8513; close #8559
---
 modules/structs/issue_tracked_time.go | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

(limited to 'modules')

diff --git a/modules/structs/issue_tracked_time.go b/modules/structs/issue_tracked_time.go
index be90b36267..7e150687ef 100644
--- a/modules/structs/issue_tracked_time.go
+++ b/modules/structs/issue_tracked_time.go
@@ -8,23 +8,31 @@ import (
 	"time"
 )
 
+// AddTimeOption options for adding time to an issue
+type AddTimeOption struct {
+	// time in seconds
+	// required: true
+	Time int64 `json:"time" binding:"Required"`
+	// swagger:strfmt date-time
+	Created time.Time `json:"created"`
+	// User who spent the time (optional)
+	User string `json:"user_name"`
+}
+
 // TrackedTime worked time for an issue / pr
 type TrackedTime struct {
 	ID int64 `json:"id"`
 	// swagger:strfmt date-time
 	Created time.Time `json:"created"`
 	// Time in seconds
-	Time    int64 `json:"time"`
-	UserID  int64 `json:"user_id"`
-	IssueID int64 `json:"issue_id"`
+	Time int64 `json:"time"`
+	// deprecated (only for backwards compatibility)
+	UserID   int64  `json:"user_id"`
+	UserName string `json:"user_name"`
+	// deprecated (only for backwards compatibility)
+	IssueID int64  `json:"issue_id"`
+	Issue   *Issue `json:"issue"`
 }
 
-// TrackedTimes represent a list of tracked times
-type TrackedTimes []*TrackedTime
-
-// AddTimeOption options for adding time to an issue
-type AddTimeOption struct {
-	// time in seconds
-	// required: true
-	Time int64 `json:"time" binding:"Required"`
-}
+// TrackedTimeList represents a list of tracked times
+type TrackedTimeList []*TrackedTime
-- 
cgit v1.2.3