back round 1 view raw

appview: db: introduce punchcard table #237

merged

opened by

oppi.li 6 months ago targeting master from push-qoplqnlvlqqo

tracks commit per user by day

Signed-off-by: oppiliappan me@oppi.li

options

unified split

Changed files

+117

appview

db.go

punchcard.go

+23

appview/db/db.go

···

       314
       314
        
       			expiry text not null

     

       315
       315
        
       		);

     

       316
       316
        
       

     

       317
       317
       +
       		create table if not exists punchcard (

     

       318
       318
       +
       			did text not null,

     

       319
       319
       +
       			date text not null, -- yyyy-mm-dd

     

       320
       320
       +
       			count integer,

     

       321
       321
       +
       			primary key (did, date)

     

       322
       322
       +
       		);

     

       323
       323
       +
       

     

       317
       324
        
       		create table if not exists migrations (

     

       318
       325
        
       			id integer primary key autoincrement,

     

       319
       326
        
       			name text unique

     
···

       516
       523
        
       	}

     

       517
       524
        
       }

     

       518
       525
        
       

     

       526
       526
       +
       func FilterGte(key string, arg any) filter {

     

       527
       527
       +
       	return filter{

     

       528
       528
       +
       		key: key,

     

       529
       529
       +
       		arg: arg,

     

       530
       530
       +
       		cmp: ">=",

     

       531
       531
       +
       	}

     

       532
       532
       +
       }

     

       533
       533
       +
       

     

       534
       534
       +
       func FilterLte(key string, arg any) filter {

     

       535
       535
       +
       	return filter{

     

       536
       536
       +
       		key: key,

     

       537
       537
       +
       		arg: arg,

     

       538
       538
       +
       		cmp: "<=",

     

       539
       539
       +
       	}

     

       540
       540
       +
       }

     

       541
       541
       +
       

     

       519
       542
        
       func (f filter) Condition() string {

     

       520
       543
        
       	return fmt.Sprintf("%s %s ?", f.key, f.cmp)

     

       521
       544
        
       }

+94

appview/db/punchcard.go

···

       1
       1
       +
       package db

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"database/sql"

     

       5
       5
       +
       	"fmt"

     

       6
       6
       +
       	"strings"

     

       7
       7
       +
       	"time"

     

       8
       8
       +
       )

     

       9
       9
       +
       

     

       10
       10
       +
       type Punch struct {

     

       11
       11
       +
       	Did   string

     

       12
       12
       +
       	Date  time.Time

     

       13
       13
       +
       	Count int

     

       14
       14
       +
       }

     

       15
       15
       +
       

     

       16
       16
       +
       // this adds to the existing count

     

       17
       17
       +
       func AddPunch(e Execer, punch Punch) error {

     

       18
       18
       +
       	_, err := e.Exec(`

     

       19
       19
       +
       		insert into punchcard (did, date, count)

     

       20
       20
       +
       		values (?, ?, ?)

     

       21
       21
       +
       			on conflict(did, date) do update set

     

       22
       22
       +
       			count = coalesce(punchcard.count, 0) + excluded.count;

     

       23
       23
       +
       	`, punch.Did, punch.Date.Format(time.DateOnly), punch.Count)

     

       24
       24
       +
       	return err

     

       25
       25
       +
       }

     

       26
       26
       +
       

     

       27
       27
       +
       type Punchcard struct {

     

       28
       28
       +
       	Total   int

     

       29
       29
       +
       	Punches []Punch

     

       30
       30
       +
       }

     

       31
       31
       +
       

     

       32
       32
       +
       func MakePunchcard(e Execer, filters ...filter) (Punchcard, error) {

     

       33
       33
       +
       	punchcard := Punchcard{}

     

       34
       34
       +
       	now := time.Now()

     

       35
       35
       +
       	startOfYear := time.Date(now.Year(), 1, 1, 0, 0, 0, 0, time.UTC)

     

       36
       36
       +
       	endOfYear := time.Date(now.Year(), 12, 31, 0, 0, 0, 0, time.UTC)

     

       37
       37
       +
       	for d := startOfYear; d.Before(endOfYear) || d.Equal(endOfYear); d = d.AddDate(0, 0, 1) {

     

       38
       38
       +
       		punchcard.Punches = append(punchcard.Punches, Punch{

     

       39
       39
       +
       			Date:  d,

     

       40
       40
       +
       			Count: 0,

     

       41
       41
       +
       		})

     

       42
       42
       +
       	}

     

       43
       43
       +
       

     

       44
       44
       +
       	var conditions []string

     

       45
       45
       +
       	var args []any

     

       46
       46
       +
       	for _, filter := range filters {

     

       47
       47
       +
       		conditions = append(conditions, filter.Condition())

     

       48
       48
       +
       		args = append(args, filter.arg)

     

       49
       49
       +
       	}

     

       50
       50
       +
       

     

       51
       51
       +
       	whereClause := ""

     

       52
       52
       +
       	if conditions != nil {

     

       53
       53
       +
       		whereClause = " where " + strings.Join(conditions, " and ")

     

       54
       54
       +
       	}

     

       55
       55
       +
       

     

       56
       56
       +
       	query := fmt.Sprintf(`

     

       57
       57
       +
       		select date, sum(count) as total_count

     

       58
       58
       +
       		from punchcard

     

       59
       59
       +
       		%s

     

       60
       60
       +
       		group by date

     

       61
       61
       +
       		order by date

     

       62
       62
       +
       		`, whereClause)

     

       63
       63
       +
       

     

       64
       64
       +
       	rows, err := e.Query(query, args...)

     

       65
       65
       +
       	if err != nil {

     

       66
       66
       +
       		return punchcard, err

     

       67
       67
       +
       	}

     

       68
       68
       +
       	defer rows.Close()

     

       69
       69
       +
       

     

       70
       70
       +
       	for rows.Next() {

     

       71
       71
       +
       		var punch Punch

     

       72
       72
       +
       		var date string

     

       73
       73
       +
       		var count sql.NullInt64

     

       74
       74
       +
       		if err := rows.Scan(&date, &count); err != nil {

     

       75
       75
       +
       			return punchcard, err

     

       76
       76
       +
       		}

     

       77
       77
       +
       

     

       78
       78
       +
       		punch.Date, err = time.Parse(time.DateOnly, date)

     

       79
       79
       +
       		if err != nil {

     

       80
       80
       +
       			fmt.Println("invalid date")

     

       81
       81
       +
       			// this punch is not recorded if date is invalid

     

       82
       82
       +
       			continue

     

       83
       83
       +
       		}

     

       84
       84
       +
       

     

       85
       85
       +
       		if count.Valid {

     

       86
       86
       +
       			punch.Count = int(count.Int64)

     

       87
       87
       +
       		}

     

       88
       88
       +
       

     

       89
       89
       +
       		punchcard.Punches[punch.Date.YearDay()] = punch

     

       90
       90
       +
       		punchcard.Total += punch.Count

     

       91
       91
       +
       	}

     

       92
       92
       +
       

     

       93
       93
       +
       	return punchcard, nil

     

       94
       94
       +
       }