refactor: remove canvas, automations, and custom statuses; simplify notification and status model
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
import { Hono } from "hono";
|
||||
import { db, tasks, habits, habitCompletions, projects, statusDefinitions } from "@project-e/db";
|
||||
import { and, eq, gte, getTableColumns, inArray, isNull, or } from "drizzle-orm";
|
||||
import { db, tasks, habits, habitCompletions, projects } from "@project-e/db";
|
||||
import { and, eq, gte, inArray, isNull, or } from "drizzle-orm";
|
||||
import { requireAuth, resolveActiveDomain, requireWorkspaceAccess, AuthError } from "../middleware/auth";
|
||||
|
||||
export const analyticsRoutes = new Hono();
|
||||
@@ -22,18 +22,15 @@ analyticsRoutes.get("/productivity", async (c) => {
|
||||
const startDate = new Date();
|
||||
startDate.setDate(startDate.getDate() - range);
|
||||
|
||||
const taskColumns = getTableColumns(tasks);
|
||||
const allTasks = await db.select({ ...taskColumns, statusCategory: statusDefinitions.category })
|
||||
const allTasks = await db.select()
|
||||
.from(tasks)
|
||||
.leftJoin(statusDefinitions, eq(tasks.statusId, statusDefinitions.id))
|
||||
.where(and(
|
||||
eq(tasks.domainId, domainId),
|
||||
gte(tasks.createdAt, startDate),
|
||||
isNull(tasks.deletedAt),
|
||||
));
|
||||
|
||||
// "Done" is a status category; a status marked category='done' completes a task.
|
||||
const completedTasks = allTasks.filter(t => t.statusCategory === "done");
|
||||
const completedTasks = allTasks.filter(t => t.status === "done");
|
||||
const taskCompletionRate = allTasks.length > 0 ? Math.round((completedTasks.length / allTasks.length) * 100) : 0;
|
||||
|
||||
return c.json({
|
||||
@@ -51,7 +48,7 @@ analyticsRoutes.get("/productivity", async (c) => {
|
||||
}
|
||||
});
|
||||
|
||||
// GET /api/analytics/habits?range=... — Habit completion rate
|
||||
// GET /api/analytics/habits?range=... — Habit completion rate (fixed per-habit expected)
|
||||
analyticsRoutes.get("/habits", async (c) => {
|
||||
try {
|
||||
const user = await requireAuth(c);
|
||||
@@ -74,7 +71,6 @@ analyticsRoutes.get("/habits", async (c) => {
|
||||
|
||||
const habitIds = allHabits.map((h) => h.id);
|
||||
|
||||
// Only count completions belonging to habits in this domain (not all completions globally)
|
||||
const allLogs = habitIds.length > 0
|
||||
? await db.select()
|
||||
.from(habitCompletions)
|
||||
@@ -84,8 +80,45 @@ analyticsRoutes.get("/habits", async (c) => {
|
||||
))
|
||||
: [];
|
||||
|
||||
const habitConsistency = allHabits.length > 0
|
||||
? Math.round((allLogs.length / (allHabits.length * range)) * 100)
|
||||
const logsByHabit = new Map<string, number>();
|
||||
for (const lg of allLogs) logsByHabit.set(lg.habitId, (logsByHabit.get(lg.habitId) || 0) + 1);
|
||||
|
||||
const expectedForHabit = (h: typeof allHabits[number]) => {
|
||||
if (!h.active) return 0;
|
||||
const skipSet = new Set(h.skipDays || []);
|
||||
if (h.frequency === "daily") {
|
||||
let expected = 0;
|
||||
const cursor = new Date(startDate);
|
||||
for (let i = 0; i < range; i++) {
|
||||
if (!skipSet.has(cursor.getUTCDay())) expected += h.goalPerPeriod || 1;
|
||||
cursor.setDate(cursor.getDate() + 1);
|
||||
}
|
||||
return expected;
|
||||
}
|
||||
if (h.frequency === "weekly") {
|
||||
const weeks = Math.ceil(range / 7);
|
||||
return weeks * (h.goalPerPeriod || 1);
|
||||
}
|
||||
return range * (h.goalPerPeriod || 1);
|
||||
};
|
||||
|
||||
let totalExpected = 0;
|
||||
const perHabit: Array<{ id: string; name: string; completed: number; expected: number; consistency: number }> = [];
|
||||
for (const h of allHabits) {
|
||||
const expected = expectedForHabit(h);
|
||||
const completed = logsByHabit.get(h.id) || 0;
|
||||
totalExpected += expected;
|
||||
perHabit.push({
|
||||
id: h.id,
|
||||
name: h.name,
|
||||
completed,
|
||||
expected,
|
||||
consistency: expected > 0 ? Math.min(100, Math.round((completed / expected) * 100)) : 0,
|
||||
});
|
||||
}
|
||||
|
||||
const habitConsistency = totalExpected > 0
|
||||
? Math.min(100, Math.round((allLogs.length / totalExpected) * 100))
|
||||
: 0;
|
||||
|
||||
const activeStreaks = allHabits.filter(h => (h.streakCount || 0) > 0);
|
||||
@@ -95,6 +128,8 @@ analyticsRoutes.get("/habits", async (c) => {
|
||||
habitConsistency,
|
||||
totalHabits: allHabits.length,
|
||||
totalLogs: allLogs.length,
|
||||
totalExpected,
|
||||
perHabit,
|
||||
activeStreaks: activeStreaks.length,
|
||||
bestStreak,
|
||||
period: range,
|
||||
@@ -130,9 +165,8 @@ analyticsRoutes.get("/projects", async (c) => {
|
||||
|
||||
// Count tasks per project (any status, including non-done) for the domain
|
||||
const taskRows = projectIds.length > 0
|
||||
? await db.select({ projectId: tasks.projectId, statusCategory: statusDefinitions.category })
|
||||
? await db.select({ projectId: tasks.projectId, status: tasks.status })
|
||||
.from(tasks)
|
||||
.leftJoin(statusDefinitions, eq(tasks.statusId, statusDefinitions.id))
|
||||
.where(and(
|
||||
isNull(tasks.deletedAt),
|
||||
inArray(tasks.projectId, projectIds),
|
||||
@@ -144,7 +178,7 @@ analyticsRoutes.get("/projects", async (c) => {
|
||||
if (!t.projectId) continue;
|
||||
const entry = counts.get(t.projectId) ?? { totalTasks: 0, completedTasks: 0 };
|
||||
entry.totalTasks += 1;
|
||||
if (t.statusCategory === "done") entry.completedTasks += 1;
|
||||
if (t.status === "done") entry.completedTasks += 1;
|
||||
counts.set(t.projectId, entry);
|
||||
}
|
||||
|
||||
@@ -176,6 +210,71 @@ analyticsRoutes.get("/projects", async (c) => {
|
||||
}
|
||||
});
|
||||
|
||||
// GET /api/analytics/velocity?range=... — Tasks completed per day (used by new dashboard)
|
||||
analyticsRoutes.get("/velocity", async (c) => {
|
||||
try {
|
||||
const user = await requireAuth(c);
|
||||
const url = new URL(c.req.url);
|
||||
const range = parseInt(url.searchParams.get("range") || "30");
|
||||
let domainId = url.searchParams.get("domain") || undefined;
|
||||
if (!domainId) {
|
||||
const active = await resolveActiveDomain(user);
|
||||
domainId = active.id;
|
||||
}
|
||||
await requireWorkspaceAccess(c, domainId);
|
||||
const firstDay = new Date();
|
||||
firstDay.setDate(firstDay.getDate() - (range - 1));
|
||||
firstDay.setHours(0, 0, 0, 0);
|
||||
const domainTasks = await db.select().from(tasks).where(and(eq(tasks.domainId, domainId), isNull(tasks.deletedAt), gte(tasks.completedAt, firstDay)));
|
||||
const localDateKey = (d: Date) => `${d.getFullYear()}-${String(d.getMonth()+1).padStart(2,"0")}-${String(d.getDate()).padStart(2,"0")}`;
|
||||
const byDay = new Map<string, number>();
|
||||
for (const t of domainTasks) if (t.completedAt) {
|
||||
const k = localDateKey(t.completedAt);
|
||||
byDay.set(k, (byDay.get(k)||0)+1);
|
||||
}
|
||||
const items: Array<{ date: string; completed: number }> = [];
|
||||
const cursor = new Date(firstDay);
|
||||
for (let i=0;i<range;i++) {
|
||||
const k = localDateKey(cursor);
|
||||
items.push({ date: k, completed: byDay.get(k)||0 });
|
||||
cursor.setDate(cursor.getDate()+1);
|
||||
}
|
||||
const avg = items.reduce((s,i)=>s+i.completed,0)/range;
|
||||
return c.json({ items, avg: Math.round(avg*10)/10, period: range }, { headers: { "Cache-Control": "private, max-age=300, stale-while-revalidate=600" } });
|
||||
} catch (error) {
|
||||
if (error instanceof AuthError) return c.json({ error: { code: error.code, message: error.message } }, error.status as any);
|
||||
console.error("[analytics] GET /velocity error:", error);
|
||||
return c.json({ error: { code: "INTERNAL_ERROR", message: "Failed to get velocity" } }, 500);
|
||||
}
|
||||
});
|
||||
|
||||
analyticsRoutes.get("/cycle", async (c) => {
|
||||
try {
|
||||
const user = await requireAuth(c);
|
||||
const url = new URL(c.req.url);
|
||||
const range = parseInt(url.searchParams.get("range") || "30");
|
||||
let domainId = url.searchParams.get("domain") || undefined;
|
||||
if (!domainId) {
|
||||
const active = await resolveActiveDomain(user);
|
||||
domainId = active.id;
|
||||
}
|
||||
await requireWorkspaceAccess(c, domainId);
|
||||
const startDate = new Date();
|
||||
startDate.setDate(startDate.getDate() - range);
|
||||
const doneTasks = await db.select().from(tasks).where(and(eq(tasks.domainId, domainId), eq(tasks.status, "done"), gte(tasks.completedAt, startDate), isNull(tasks.deletedAt)));
|
||||
const durations: number[] = [];
|
||||
for (const t of doneTasks) if (t.completedAt) durations.push((t.completedAt.getTime() - t.createdAt.getTime()) / (1000*60*60*24));
|
||||
durations.sort((a,b)=>a-b);
|
||||
const median = durations.length ? durations[Math.floor(durations.length/2)] : 0;
|
||||
const avg = durations.length ? durations.reduce((s,v)=>s+v,0)/durations.length : 0;
|
||||
return c.json({ median: Math.round(median*10)/10, avg: Math.round(avg*10)/10, count: durations.length, period: range }, { headers: { "Cache-Control": "private, max-age=300, stale-while-revalidate=600" } });
|
||||
} catch (error) {
|
||||
if (error instanceof AuthError) return c.json({ error: { code: error.code, message: error.message } }, error.status as any);
|
||||
console.error("[analytics] GET /cycle error:", error);
|
||||
return c.json({ error: { code: "INTERNAL_ERROR", message: "Failed to get cycle" } }, 500);
|
||||
}
|
||||
});
|
||||
|
||||
// GET /api/analytics/daily?range=... — Daily task creation & completion time series
|
||||
analyticsRoutes.get("/daily", async (c) => {
|
||||
try {
|
||||
@@ -195,10 +294,8 @@ analyticsRoutes.get("/daily", async (c) => {
|
||||
firstDay.setDate(firstDay.getDate() - (range - 1));
|
||||
firstDay.setHours(0, 0, 0, 0);
|
||||
|
||||
const dailyTaskColumns = getTableColumns(tasks);
|
||||
const domainTasks = await db.select({ ...dailyTaskColumns, statusCategory: statusDefinitions.category })
|
||||
const domainTasks = await db.select()
|
||||
.from(tasks)
|
||||
.leftJoin(statusDefinitions, eq(tasks.statusId, statusDefinitions.id))
|
||||
.where(and(
|
||||
eq(tasks.domainId, domainId),
|
||||
isNull(tasks.deletedAt),
|
||||
@@ -222,7 +319,7 @@ analyticsRoutes.get("/daily", async (c) => {
|
||||
for (const t of domainTasks) {
|
||||
const createdKey = localDateKey(t.createdAt);
|
||||
createdByDay.set(createdKey, (createdByDay.get(createdKey) || 0) + 1);
|
||||
if (t.statusCategory === "done" && t.completedAt) {
|
||||
if (t.status === "done" && t.completedAt) {
|
||||
const completedKey = localDateKey(t.completedAt);
|
||||
completedByDay.set(completedKey, (completedByDay.get(completedKey) || 0) + 1);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user