Add DateString to coding sessions

Author: viccon

redis/redis.go

@@ -24,10 +24,8 @@ func New(addr, password string) *Client {
 }
 
 func (c *Client) Write(ctx context.Context, session pulse.CodingSession) error {
-	key := session.Date.Format("2006-01-02")
-
 	// Check if we already have a session for this date.
-	cmd := c.redisClient.Get(ctx, key)
+	cmd := c.redisClient.Get(ctx, session.DateString())
 	data, err := cmd.Result()
 	if err != nil && !errors.Is(err, redis.Nil) {
 		var prevSession pulse.CodingSession
@@ -43,7 +41,7 @@ func (c *Client) Write(ctx context.Context, session pulse.CodingSession) error {
 		return err
 	}
 
-	return c.redisClient.Set(ctx, key, bytes, 0).Err()
+	return c.redisClient.Set(ctx, session.DateString(), bytes, 0).Err()
 }
 
 func (c *Client) ReadAll(ctx context.Context) (pulse.CodingSessions, error) {

session.go

@@ -54,16 +54,20 @@ func NewCodingSession(buffers Buffers, now time.Time) CodingSession {
 }
 
 // Merge takes two coding sessions, merges them, and returns the result.
-func (a CodingSession) Merge(b CodingSession) CodingSession {
+func (c CodingSession) Merge(other CodingSession) CodingSession {
 	mergedSession := CodingSession{
-		Date:         cmp.Or(a.Date, b.Date),
-		Duration:     a.Duration + b.Duration,
-		Repositories: a.Repositories.merge(b.Repositories),
+		Date:         cmp.Or(c.Date, other.Date),
+		Duration:     c.Duration + other.Duration,
+		Repositories: c.Repositories.merge(other.Repositories),
 	}
 
 	return mergedSession
 }
 
+func (c CodingSession) DateString() string {
+	return c.Date.Format("2006-01-02")
+}
+
 // CodingSessions represents a slice of coding sessions.
 type CodingSessions []CodingSession