fix: importing data from wakapi instance (resolve #428)

models/compat/wakatime/v1/all_time.go

@@ -3,6 +3,7 @@ package v1
 import (
 	"github.com/muety/wakapi/models"
 	"github.com/muety/wakapi/utils"
+	"time"
 )
 
 // https://wakatime.com/developers#all_time_since_today
@@ -28,11 +29,19 @@ type AllTimeRange struct {
 
 func NewAllTimeFrom(summary *models.Summary) *AllTimeViewModel {
 	total := summary.TotalTime()
+	tzName, _ := summary.FromTime.T().Zone()
 	return &AllTimeViewModel{
 		Data: &AllTimeData{
 			TotalSeconds: float32(total.Seconds()),
 			Text:         utils.FmtWakatimeDuration(total),
 			IsUpToDate:   true,
+			Range: &AllTimeRange{
+				End:       summary.ToTime.T().Format(time.RFC3339),
+				EndDate:   utils.FormatDate(summary.ToTime.T()),
+				Start:     summary.FromTime.T().Format(time.RFC3339),
+				StartDate: utils.FormatDate(summary.FromTime.T()),
+				Timezone:  tzName,
+			},
 		},
 	}
 }

services/imports/wakatime.go

@@ -57,17 +57,19 @@ func (w *WakatimeHeartbeatImporter) Import(user *models.User, minFrom time.Time,
 			endDate = maxTo
 		}
 
-		userAgents, err := w.fetchUserAgents(baseUrl)
-		if err != nil {
-			config.Log().Error("failed to fetch user agents while importing wakatime heartbeats for user '%s' - %v", user.ID, err)
-			return
-		}
+		userAgents := map[string]*wakatime.UserAgentEntry{}
+		//userAgents, err := w.fetchUserAgents(baseUrl)
+		// if err != nil {
+		// 	config.Log().Error("failed to fetch user agents while importing wakatime heartbeats for user '%s' - %v", user.ID, err)
+		// 	return
+		// }
 
-		machinesNames, err := w.fetchMachineNames(baseUrl)
-		if err != nil {
-			config.Log().Error("failed to fetch machine names while importing wakatime heartbeats for user '%s' - %v", user.ID, err)
-			return
-		}
+		machinesNames := map[string]*wakatime.MachineEntry{}
+		// machinesNames, err := w.fetchMachineNames(baseUrl)
+		// if err != nil {
+		// 	config.Log().Error("failed to fetch machine names while importing wakatime heartbeats for user '%s' - %v", user.ID, err)
+		// 	return
+		// }
 
 		days := generateDays(startDate, endDate)
 
@@ -259,11 +261,19 @@ func mapHeartbeat(
 ) *models.Heartbeat {
 	ua := userAgents[entry.UserAgentId]
 	if ua == nil {
+		// try to parse id as an actual user agent string (as returned by wakapi)
+		if opSys, editor, err := utils.ParseUserAgent(entry.UserAgentId); err == nil {
+			ua = &wakatime.UserAgentEntry{
+				Editor: opSys,
+				Os:     editor,
+			}
+		} else {
 			ua = &wakatime.UserAgentEntry{
 				Editor: "unknown",
 				Os:     "unknown",
 			}
 		}
+	}
 
 	ma := machineNames[entry.MachineNameId]
 	if ma == nil {