Skip to content

Self-hosted, Self-Improving, Federated Everything App — dev management, agent orchestration, persistent mind, digital twin, second brain, and creative pipeline from a single dashboard over Tailscale to port the user into the OS

fix([issue-12609]): make 7- and 30-day substance averages cover exactly N calendar days

[._.]/ Adam Eivy4f45ee87490b
diff --git a/server/services/meatspaceAlcohol.js b/server/services/meatspaceAlcohol.js
index 0ff5af2e96..c681ff75a0 100644
--- a/server/services/meatspaceAlcohol.js
+++ b/server/services/meatspaceAlcohol.js
@@ -60,8 +60,9 @@ export function computeRollingAverages(entries, sex = 'male') {
// Helper: average over last N days (including zero-drink days)
const rollingAverage = (days) => {
+ // Window is exactly `days` calendar days including today: [today - (days - 1), today].
const cutoff = new Date(now);
- cutoff.setDate(cutoff.getDate() - days);
+ cutoff.setDate(cutoff.getDate() - (days - 1));
const cutoffStr = getDateString(cutoff);
let totalDrinks = 0;
diff --git a/server/services/meatspaceAlcohol.test.js b/server/services/meatspaceAlcohol.test.js
index a602994c23..529098e6be 100644
--- a/server/services/meatspaceAlcohol.test.js
+++ b/server/services/meatspaceAlcohol.test.js
@@ -91,6 +91,19 @@ describe('computeRollingAverages', () => {
expect(result.weeklyTotal).toBe(14);
});
+ it('excludes the day 7 days ago from the 7-day window', () => {
+ // 2 drinks on each of the last 8 calendar days: the 7-day window is today-6..today,
+ // so the 8th day (today-7) must not count. 14 drinks / 7 days, not 16 / 7.
+ const entries = [];
+ for (let i = 0; i < 8; i++) {
+ entries.push({ date: daysAgo(i), alcohol: { standardDrinks: 2, drinks: [{}] } });
+ }
+ const result = computeRollingAverages(entries, 'male');
+ expect(result.avg7day).toBe(2);
+ expect(result.weeklyTotal).toBe(14);
+ expect(result.riskLevel).toBe('moderate');
+ });
+
it('uses female NIAAA thresholds', () => {
const entries = [];
for (let i = 0; i < 7; i++) {
diff --git a/server/services/meatspaceNicotine.js b/server/services/meatspaceNicotine.js
index f2591ecd99..b97b444840 100644
--- a/server/services/meatspaceNicotine.js
+++ b/server/services/meatspaceNicotine.js
@@ -31,8 +31,9 @@ export function computeRollingAverages(entries) {
// Helper: average over last N days
const rollingAverage = (days) => {
+ // Window is exactly `days` calendar days including today: [today - (days - 1), today].
const cutoff = new Date(now);
- cutoff.setDate(cutoff.getDate() - days);
+ cutoff.setDate(cutoff.getDate() - (days - 1));
const cutoffStr = getDateString(cutoff);
let totalMg = 0;
diff --git a/server/services/meatspaceNicotine.test.js b/server/services/meatspaceNicotine.test.js
new file mode 100644
index 0000000000..81fc3ee978
--- /dev/null
+++ b/server/services/meatspaceNicotine.test.js
@@ -0,0 +1,33 @@
+import { describe, it, expect } from 'vitest';
+import { computeRollingAverages } from './meatspaceNicotine.js';
+import { getDateString } from '../lib/fileUtils.js';
+
+describe('computeRollingAverages (nicotine)', () => {
+ // Local calendar date, matching the function's own "today" derivation.
+ const daysAgo = (n) => {
+ const d = new Date();
+ d.setDate(d.getDate() - n);
+ return getDateString(d);
+ };
+
+ it('averages the 7-day window over exactly 7 calendar days', () => {
+ // 10 mg on each of the last 8 days: today-7 must be excluded, so 70 mg / 7 = 10.
+ const entries = [];
+ for (let i = 0; i < 8; i++) {
+ entries.push({ date: daysAgo(i), nicotine: { totalMg: 10 } });
+ }
+ const result = computeRollingAverages(entries);
+ expect(result.avg7day).toBe(10);
+ expect(result.weeklyTotal).toBe(70);
+ });
+
+ it('averages the 30-day window over exactly 30 calendar days', () => {
+ // 3 mg on each of the last 31 days: today-30 must be excluded, so 90 mg / 30 = 3.
+ const entries = [];
+ for (let i = 0; i < 31; i++) {
+ entries.push({ date: daysAgo(i), nicotine: { totalMg: 3 } });
+ }
+ const result = computeRollingAverages(entries);
+ expect(result.avg30day).toBe(3);
+ });
+});