Merge pull request #12 from JankariTech/sortTimeEntries

sort timeentries better

Author: individual-it

cmd/diff.go

@@ -28,7 +28,6 @@ import (
 	"golang.org/x/term"
 	"os"
 	"path"
-	"sort"
 	"strconv"
 	"strings"
 	"time"
@@ -96,9 +95,6 @@ var diffCmd = &cobra.Command{
 			_, _ = fmt.Fprint(os.Stderr, err)
 			os.Exit(1)
 		}
-		sort.Slice(tmetricTimeEntries, func(i, j int) bool {
-			return tmetricTimeEntries[i].Note < tmetricTimeEntries[j].Note
-		})
 
 		var openProjectUser openproject.User
 		if userNameFromCmd != "" {
@@ -115,9 +111,6 @@ var diffCmd = &cobra.Command{
 			_, _ = fmt.Fprint(os.Stderr, err)
 			os.Exit(1)
 		}
-		sort.Slice(openProjectTimeEntries, func(i, j int) bool {
-			return openProjectTimeEntries[i].Comment.Raw < openProjectTimeEntries[j].Comment.Raw
-		})
 
 		start, _ := time.Parse("2006-01-02", startDate)
 		end, _ := time.Parse("2006-01-02", endDate)

openproject/openproject.go

@@ -42,7 +42,7 @@ func GetAllTimeEntries(config *config.Config, user User, startDate string, endDa
 		SetBasicAuth("apikey", config.OpenProjectToken).
 		SetHeader("Content-Type", "application/json").
 		SetQueryParam("pageSize", "3000").
-		SetQueryParam("sortBy", "[[\"updated_at\",\"desc\"]]").
+		SetQueryParam("sortBy", "[[\"updated_at\",\"asc\"]]").
 		// the operator is '<>d' and means between the dates
 		SetQueryParam("filters", fmt.Sprintf(
 			`[{"user":{"operator":"=","values":["%v"]}},{"spent_on":{"operator":"\u003c\u003ed","values":["%v","%v"]}}]`,

tmetric/tmetric.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"github.com/JankariTech/OpenProjectTmetricIntegration/config"
 	"github.com/go-resty/resty/v2"
+	"sort"
 )
 
 func GetAllTimeEntries(config *config.Config, tmetricUser User, startDate string, endDate string) ([]TimeEntry, error) {
@@ -39,6 +40,10 @@ func GetAllTimeEntries(config *config.Config, tmetricUser User, startDate string
 			timeEntriesOfTheSelectedClient = append(timeEntriesOfTheSelectedClient, entry)
 		}
 	}
+	sort.Slice(timeEntriesOfTheSelectedClient, func(i, j int) bool {
+		return timeEntriesOfTheSelectedClient[i].StartTime < timeEntriesOfTheSelectedClient[j].StartTime
+	})
+
 	return timeEntriesOfTheSelectedClient, nil
 }