mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-16 15:23:29 +00:00
Merge #1399 for follow-up
This commit is contained in:
commit
ea2f84b483
2 files changed
+21
-6
No files matched your search
@@ -14,9 +14,9 @@
|
||||
* source's own reads only, and hands back the same section and the same
|
||||
* reference grounding. Each block reads exactly what the full build reads for
|
||||
* it: the core clinical aggregates come from `extractFeatures` scoped to the
|
||||
* one block (whose bulk read keeps its all-type cap, so the rows a block sees
|
||||
* are unchanged), the timelines from the same windowed read, the coarse tail
|
||||
* from the same rollup reader.
|
||||
* one block (whose bulk read is restricted to that block's own measurement
|
||||
* types under the same newest-first cap), the timelines from the same
|
||||
* windowed read, the coarse tail from the same rollup reader.
|
||||
*
|
||||
* Two cases go to the full builder instead:
|
||||
*
|
||||
|
||||
@@ -1072,7 +1072,8 @@ export async function extractFeatures(
|
||||
/**
|
||||
* Build only these blocks (plus `context`) and return. Each block is
|
||||
* identical to the one the full extraction builds: the bulk read keeps its
|
||||
* all-type newest-first cap, so the rows a block sees do not change. Used
|
||||
* newest-first cap, restricted to the requested blocks' own measurement
|
||||
* types, so a dense type cannot starve a sparse one out of the read. Used
|
||||
* by the single-metric Coach read, which reads one block and nothing else.
|
||||
*/
|
||||
only?: ReadonlySet<ScopedFeatureBlock>;
|
||||
@@ -1126,13 +1127,27 @@ export async function extractFeatures(
|
||||
// cap is safe even unbounded: the genuine all-time extremes are sourced
|
||||
// separately via `readAllTimeExtremes` on the bounded branch, so capping only
|
||||
// sheds the deepest rows of the bulk read and never relabels an extreme.
|
||||
// A scoped read (`only`) builds its blocks from their own measurement
|
||||
// types, so its bulk read is restricted to those types. Under the
|
||||
// all-type cap a dense type fills the whole cap within hours — PULSE
|
||||
// from a wearable is a 200k-row-class type — and starves every sparse
|
||||
// type out of the read, so the scoped block then reports no data for a
|
||||
// metric that demonstrably exists.
|
||||
const scopedTypes = only ? [...allTimeTypes] : [];
|
||||
const typeFilter =
|
||||
scopedTypes.length > 0 ? { type: { in: scopedTypes } } : {};
|
||||
const measurements = !needsMeasurementRows
|
||||
? []
|
||||
: await prisma.measurement
|
||||
.findMany({
|
||||
where: sinceCutoff
|
||||
? { userId, measuredAt: { gte: sinceCutoff }, deletedAt: null }
|
||||
: { userId, deletedAt: null },
|
||||
? {
|
||||
userId,
|
||||
measuredAt: { gte: sinceCutoff },
|
||||
deletedAt: null,
|
||||
...typeFilter,
|
||||
}
|
||||
: { userId, deletedAt: null, ...typeFilter },
|
||||
orderBy: { measuredAt: "desc" },
|
||||
take: FEATURE_MEASUREMENT_ROW_CAP,
|
||||
// Project only the columns every downstream consumer reads (`byType`,
|
||||
|
||||
Reference in new issue
Block a user