mirror/wakapi
1
0
Fork 0
mirror of https://github.com/muety/wakapi.git synced 2023-08-10 21:12:56 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'notarock/62'

Browse Source
This commit is contained in:
Ferdinand Mütsch
2020-10-26 22:34:50 +01:00
parent 4506493353 3f973a28ea
commit e19761337f
13 changed files with 296 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
routes/heartbeat.go
View File

@@ -13,14 +13,16 @@ import (
)
type HeartbeatHandler struct {
config *config2.Config
heartbeatSrvc *services.HeartbeatService
config *config2.Config
heartbeatSrvc *services.HeartbeatService
customRuleSrvc *services.CustomRuleService
}
func NewHeartbeatHandler(heartbeatService *services.HeartbeatService) *HeartbeatHandler {
func NewHeartbeatHandler(heartbeatService *services.HeartbeatService, customRuleService *services.CustomRuleService) *HeartbeatHandler {
return &HeartbeatHandler{
config: config2.Get(),
heartbeatSrvc: heartbeatService,
config: config2.Get(),
heartbeatSrvc: heartbeatService,
customRuleSrvc: customRuleService,
}
}
@@ -41,13 +43,21 @@ func (h *HeartbeatHandler) ApiPost(w http.ResponseWriter, r *http.Request) {
return
}
rules, err := h.customRuleSrvc.GetCustomRuleForUser(user.ID)
if err != nil {
w.WriteHeader(http.StatusBadRequest)
w.Write([]byte(err.Error()))
return
}
for _, hb := range heartbeats {
hb.OperatingSystem = opSys
hb.Editor = editor
hb.Machine = machineName
hb.User = user
hb.UserID = user.ID
hb.Augment(h.config.App.CustomLanguages)
hb.AugmentWithConfigRules(h.config.App.CustomLanguages)
hb.AugmentWithUserRules(rules)
if !hb.Valid() {
w.WriteHeader(http.StatusBadRequest)