mirror
/
wakapi
mirror of https://github.com/muety/wakapi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Allow heartbeat fields to be unset.

This commit is contained in:
Ferdinand Mütsch 2019-05-20 18:44:16 +02:00
parent d803e818bb
commit 005b17a73c
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
models/heartbeat.go
View File

@ -18,17 +18,17 @@ type Heartbeat struct {
Entity string `json:"entity" gorm:"not null"`
Type string `json:"type"`
Category string `json:"category"`
Project string `json:"project" gorm:"index:idx_project"`
Project string `json:"project"`
Branch string `json:"branch"`
Language string `json:"language" gorm:"not null"`
Language string `json:"language"`
IsWrite bool `json:"is_write"`
Editor string `json:"editor" gorm:"not null"`
OperatingSystem string `json:"operating_system" gorm:"not null"`
Editor string `json:"editor"`
OperatingSystem string `json:"operating_system"`
Time *HeartbeatReqTime `json:"time" gorm:"type:timestamp; default:now(); index:idx_time,idx_time_user"`
}
func (h *Heartbeat) Valid() bool {
return h.User != nil && h.UserID != "" && h.Entity != "" && h.Language != "" && h.Editor != "" && h.OperatingSystem != "" && h.Time != nil
return h.User != nil && h.UserID != "" && h.Time != nil
}
func (j *HeartbeatReqTime) UnmarshalJSON(b []byte) error {

4
services/summary.go
View File

@ -76,6 +76,10 @@ func (srv *SummaryService) aggregateBy(heartbeats []*models.Heartbeat, summaryTy
key = h.OperatingSystem
}
if key == "" {
continue
}
if _, ok := durations[key]; !ok {
durations[key] = time.Duration(0)
}