Replace "top hosts" category with "most mouths fed"

Author: ramikg

Dockerfile

@@ -2,7 +2,8 @@ FROM golang:1.22-bookworm as builder
 WORKDIR /go/src/bolt
 COPY . .
 
-RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -o /bolt cmd/main.go && chmod +x /bolt
+# The "json1" build tag enables JSON SQL functions in go-sqlite3
+RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -tags json1 -o /bolt cmd/main.go && chmod +x /bolt
 
 FROM gcr.io/distroless/base
 COPY --from=builder /bolt /bolt

docs/assets/examples/monthly_digest.png

@@ -27,11 +27,11 @@ type VenueOrderCount struct {
 	LastCreatedAt string `db:"last_created_at"` // The driver returns this column as a string
 }
 
-type HostOrderCount struct {
-	HostId        string `db:"host_id"`
-	HostName      string `db:"host"`
-	OrderCount    int    `db:"order_count"`
-	LastCreatedAt string `db:"last_created_at"` // The driver returns this column as a string
+type MouthsFedCount struct {
+	HostId         string `db:"host_id"`
+	HostName       string `db:"host"`
+	MouthsFedCount int    `db:"mouths_fed_count"`
+	LastCreatedAt  string `db:"last_created_at"` // The driver returns this column as a string
 }
 
 type Order struct {
@@ -53,6 +53,6 @@ type Order struct {
 type Store interface {
 	SaveOrder(ctx context.Context, order *Order) error
 	GetVenuesWithMostOrders(startTime time.Time, limit uint64, channelId string, filteredVenueIds []string) ([]VenueOrderCount, error)
-	GetHostsWithMostOrders(startTime time.Time, limit uint64, channelId string, filteredHostIds []string) ([]HostOrderCount, error)
+	GetHostsWithMostMouthsFed(startTime time.Time, limit uint64, channelId string, filteredHostIds []string) ([]MouthsFedCount, error)
 	GetActiveChannelIds(lastDateConsideredActive time.Time) ([]string, error)
 }

order/order.go

@@ -69,24 +69,24 @@ func buildTopVenuesMessageBlocks(monthlyTopVenues []order.VenueOrderCount, month
 	return topVenuesBlocks, nil
 }
 
-func buildTopHostsMessageBlocks(monthlyTopHosts []order.HostOrderCount, monthlyTopHostsTotalCounts []order.HostOrderCount) ([]slack.Block, error) {
-	hostIdToTotalOrderCount := make(map[string]int)
+func buildTopHostsMessageBlocks(monthlyTopHosts []order.MouthsFedCount, monthlyTopHostsTotalCounts []order.MouthsFedCount) ([]slack.Block, error) {
+	hostIdToTotalMouthsFedCount := make(map[string]int)
 	for _, host := range monthlyTopHostsTotalCounts {
-		hostIdToTotalOrderCount[host.HostId] = host.OrderCount
+		hostIdToTotalMouthsFedCount[host.HostId] = host.MouthsFedCount
 	}
 
 	topHostsHeader := slack.NewSectionBlock(
 		nil,
 		[]*slack.TextBlockObject{
-			slack.NewTextBlockObject("mrkdwn", ":star: *Top hosts*", false, false),
+			slack.NewTextBlockObject("mrkdwn", ":spoon: *Most mouths fed*", false, false),
 			slack.NewTextBlockObject("mrkdwn", fmt.Sprintf("*%s (Total)*", dateOneMonthAgo.Month().String()), false, false),
 		},
 		nil,
 	)
 
 	topHostsRows := make([]*slack.TextBlockObject, 0, len(monthlyTopHosts)*2)
 	for i, host := range monthlyTopHosts {
-		totalOrderCount, hostExists := hostIdToTotalOrderCount[host.HostId]
+		totalMouthsFedCount, hostExists := hostIdToTotalMouthsFedCount[host.HostId]
 		if !hostExists {
 			return nil, fmt.Errorf("host %s (%s) is not in monthlyTopHostsTotalCounts", host.HostId, host.HostName)
 		}
@@ -97,11 +97,11 @@ func buildTopHostsMessageBlocks(monthlyTopHosts []order.HostOrderCount, monthlyT
 		}
 
 		leftColumnString := fmt.Sprintf("%s %s%s%s", positionEmoji, UnicodeLeftToRightMark, host.HostName, UnicodeLeftToRightMark)
-		if host.OrderCount == totalOrderCount {
+		if host.MouthsFedCount == totalMouthsFedCount {
 			leftColumnString += " :new:"
 		}
 
-		rightColumnString := fmt.Sprintf("%d (%d)", host.OrderCount, totalOrderCount)
+		rightColumnString := fmt.Sprintf("%d (%d)", host.MouthsFedCount, totalMouthsFedCount)
 
 		topHostsRows = append(topHostsRows,
 			slack.NewTextBlockObject("mrkdwn", leftColumnString, false, false),
@@ -125,10 +125,10 @@ func venueOrderCountsToVenueIds(venueOrderCounts []order.VenueOrderCount) []stri
 	return venueIds
 }
 
-func hostOrderCountsToHostIds(hostOrderCounts []order.HostOrderCount) []string {
+func mouthsFedCountsToHostIds(mouthsFedCounts []order.MouthsFedCount) []string {
 	var hostIds []string
-	for _, hostOrderCount := range hostOrderCounts {
-		hostIds = append(hostIds, hostOrderCount.HostId)
+	for _, mouthsFedCount := range mouthsFedCounts {
+		hostIds = append(hostIds, mouthsFedCount.HostId)
 	}
 	return hostIds
 }
@@ -149,13 +149,13 @@ func (h *Service) getTopVenuesMessageBlocks(channelId string) ([]slack.Block, er
 }
 
 func (h *Service) getTopHostsMessageBlocks(channelId string) ([]slack.Block, error) {
-	monthlyTopHosts, err := h.orderStore.GetHostsWithMostOrders(dateOneMonthAgo, numberOfDigestRows, channelId, []string{})
+	monthlyTopHosts, err := h.orderStore.GetHostsWithMostMouthsFed(dateOneMonthAgo, numberOfDigestRows, channelId, []string{})
 	if err != nil {
 		return nil, fmt.Errorf("error getting top hosts of the last month: %w", err)
 	}
 
-	monthlyTopHostIds := hostOrderCountsToHostIds(monthlyTopHosts)
-	monthlyTopHostsTotalCounts, err := h.orderStore.GetHostsWithMostOrders(time.Time{}, numberOfDigestRows, channelId, monthlyTopHostIds)
+	monthlyTopHostIds := mouthsFedCountsToHostIds(monthlyTopHosts)
+	monthlyTopHostsTotalCounts, err := h.orderStore.GetHostsWithMostMouthsFed(time.Time{}, numberOfDigestRows, channelId, monthlyTopHostIds)
 	if err != nil {
 		return nil, fmt.Errorf("error getting top hosts of all time: %w", err)
 	}

service/digest.go

@@ -72,17 +72,22 @@ func (d *DBStore) GetVenuesWithMostOrders(startTime time.Time, limit uint64, cha
 	return venueOrderCounts, nil
 }
 
-func (d *DBStore) GetHostsWithMostOrders(startTime time.Time, limit uint64, channelId string, filteredHostIds []string) ([]order.HostOrderCount, error) {
-	query := sq.Select("host_id", "host", "COUNT(*) as order_count", "MAX(created_at) as last_created_at").
-		From("orders").
+func (d *DBStore) GetHostsWithMostMouthsFed(startTime time.Time, limit uint64, channelId string, filteredHostIds []string) ([]order.MouthsFedCount, error) {
+	subquery := sq.Select("orders.*", "json_each.value as participant").
+		From("orders, json_each(orders.participants)").
+		Where(sq.Gt{"json_extract(participant, '$.amount')": 0}).
+		Where("json_extract(participant, '$.name') != host").
 		Where(sq.Eq{"receiver": channelId}).
 		Where(sq.Eq{"status": order.StatusDone}).
-		Where(sq.GtOrEq{"created_at": startTime}).
-		GroupBy("host_id").
-		OrderBy("order_count DESC", "last_created_at ASC")
+		Where(sq.GtOrEq{"created_at": startTime})
 	if len(filteredHostIds) > 0 {
-		query = query.Where(sq.Eq{"host_id": filteredHostIds})
+		subquery = subquery.Where(sq.Eq{"host_id": filteredHostIds})
 	}
+
+	query := sq.Select("host_id", "host", "COUNT(*) as mouths_fed_count", "MAX(created_at) as last_created_at").
+		FromSelect(subquery, "extracted_participants").
+		GroupBy("host_id").
+		OrderBy("mouths_fed_count DESC", "last_created_at ASC")
 	if limit > 0 {
 		query = query.Limit(limit)
 	}
@@ -92,13 +97,13 @@ func (d *DBStore) GetHostsWithMostOrders(startTime time.Time, limit uint64, chan
 		return nil, fmt.Errorf("building SELECT query: %w", err)
 	}
 
-	var hostOrderCounts []order.HostOrderCount
-	err = d.db.Select(&hostOrderCounts, sql, args...)
+	var mouthsFedCount []order.MouthsFedCount
+	err = d.db.Select(&mouthsFedCount, sql, args...)
 	if err != nil {
 		return nil, fmt.Errorf("executing SELECT query: %w", err)
 	}
 
-	return hostOrderCounts, nil
+	return mouthsFedCount, nil
 }
 
 func (d *DBStore) GetActiveChannelIds(lastDateConsideredActive time.Time) ([]string, error) {