Merge branch 'integrate-jsonb-stats-extension'

Author: jhf

app/src/app/enterprises/[id]/statistical-variables/statistical-variables-form.tsx

@@ -27,7 +27,8 @@ export default function StatisticalVariablesForm({
   return (
     <form className="space-y-4">
       {statDefinitions.map((statDefinition) => {
-        const value = data?.stats_summary?.[statDefinition.code]?.sum;
+        const metric = data?.stats_summary?.[statDefinition.code];
+        const value = metric && "sum" in metric ? metric.sum : undefined;
         return (
           <DisplayFormField
             key={statDefinition.code}

app/src/app/reports/ReportsPageClient.tsx

@@ -65,15 +65,15 @@ export default function ReportsPageClient({
             ...(drillDown.available.region?.map((point) =>
               value === "count"
                 ? point.count
-                : ((point.stats_summary?.[value]?.sum as number) ?? 0)
+                : (() => { const m = point.stats_summary?.[value]; return m && "sum" in m ? (m.sum as number) : 0; })()
             ) || [])
           );
           const categoryMax = Math.max(
             0,
             ...(drillDown.available.activity_category?.map((point) =>
               value === "count"
                 ? point.count
-                : ((point.stats_summary?.[value]?.sum as number) ?? 0)
+                : (() => { const m = point.stats_summary?.[value]; return m && "sum" in m ? (m.sum as number) : 0; })()
             ) || [])
           );
 

app/src/app/reports/drill-down-chart.tsx

@@ -131,10 +131,11 @@ export const DrillDownChart = ({
   return <div ref={chartContainerRef} />;
 };
 
-const getStatValue = (point: DrillDownPoint, variable: string): number =>
-  variable === "count"
-    ? point.count
-    : ((point.stats_summary?.[variable]?.sum as number) ?? 0);
+const getStatValue = (point: DrillDownPoint, variable: string): number => {
+  if (variable === "count") return point.count;
+  const metric = point.stats_summary?.[variable];
+  return metric && "sum" in metric ? (metric.sum as number) : 0;
+};
 
 const toPointOptionObject = (point: DrillDownPoint, variable: string) => ({
   name: `${point.path} - ${point.name}`,

app/src/app/search/components/statistical-unit-table-row.tsx

@@ -379,13 +379,10 @@ export const StatisticalUnitTableRow = ({
                     const metric = unit.stats_summary[column.stat_code];
                     let valueToDisplay: number | string | null = null;
 
-                    if (metric && metric.type === "number") {
-                      // metric is NumberStatMetric, sum is number | undefined
+                    if (metric && ("sum" in metric)) {
                       valueToDisplay = metric.sum !== undefined ? metric.sum : null;
                     } else {
-                      // For other types or if metric is undefined, display a placeholder
-                      // as we are only asked to display 'sum' from 'number' type metrics.
-                      valueToDisplay = "-"; // Or null for an empty cell
+                      valueToDisplay = "-";
                     }
                     return thousandSeparator(valueToDisplay);
                   })()}

app/src/app/types.d.ts

@@ -12,10 +12,48 @@ interface ExternalIdents {
   [key: string]: number | string;
 }
 
+// jsonb_stats aggregate types — see jsonb_stats README.md "Structures in Detail"
+
+/** Numeric aggregate (int_agg, float_agg, dec2_agg, nat_agg) */
+interface NumericStatAgg {
+  type: "int_agg" | "float_agg" | "dec2_agg" | "nat_agg";
+  count: number;
+  sum: number;
+  min: number;
+  max: number;
+  mean: number;
+  sum_sq_diff: number;
+  variance: number | null;
+  stddev: number | null;
+  coefficient_of_variation_pct: number | null;
+}
+
+/** Categorical aggregate (str_agg, bool_agg) */
+interface CategoricalStatAgg {
+  type: "str_agg" | "bool_agg";
+  counts: { [value: string]: number };
+}
+
+/** Array aggregate */
+interface ArrayStatAgg {
+  type: "arr_agg";
+  count: number;
+  counts: { [element: string]: number };
+}
+
+/** Date aggregate */
+interface DateStatAgg {
+  type: "date_agg";
+  counts: { [isoDate: string]: number };
+  min: string;
+  max: string;
+}
+
+type StatAgg = NumericStatAgg | CategoricalStatAgg | ArrayStatAgg | DateStatAgg;
+
+/** stats_agg object: { type: "stats_agg", [statCode]: StatAgg } */
 interface StatsSummary {
-  [key: string]: {
-    [key: string]: number | string;
-  };
+  [statCode: string]: StatAgg;
 }
 
 interface StatisticalUnit extends Tables<"statistical_unit"> {

app/src/atoms/search.ts

@@ -233,39 +233,9 @@ export const resetSearchInitializationAtom = atom(
 // SELECTION ATOMS - Replace SelectionContext
 // ============================================================================
 
-interface ExternalIdents {
-  [key: string]: string;
-}
-
-// Define the structure for metrics within stats_summary
-interface BaseStatMetric {
-  type: "array" | "number" | "string" | "boolean";
-}
-
-export interface NumberStatMetric extends BaseStatMetric {
-  type: "number";
-  max?: number;
-  min?: number;
-  sum?: number; // If present, this is always a number
-  mean?: number;
-  count?: number;
-  stddev?: number;
-  variance?: number;
-  sum_sq_diff?: number;
-  coefficient_of_variation_pct?: number;
-}
-
-export interface CountsStatMetric extends BaseStatMetric {
-  type: "array" | "string" | "boolean";
-  counts: { [key: string]: number };
-}
-
-export type StatMetric = NumberStatMetric | CountsStatMetric;
-
-// Refined StatsSummary: Each key is a stat_code, value is its metric object or undefined
-interface StatsSummary {
-  [statCode: string]: StatMetric | undefined;
-}
+// Re-export discriminated union types from app/types.d.ts for use in search components
+export type { NumericStatAgg, CategoricalStatAgg, ArrayStatAgg, DateStatAgg, StatAgg } from '@/app/types';
+import type { StatsSummary, ExternalIdents } from '@/app/types';
 
 export type StatisticalUnit = Omit<Tables<"statistical_unit">, 'external_idents' | 'stats_summary'> & {
   external_idents: ExternalIdents;

app/src/components/statistical-unit-hierarchy/topology-item.tsx

@@ -110,8 +110,8 @@ export function TopologyItem({
               />
               {statDefinitions.map(
                 (statDefinition: Tables<"stat_definition_active">) => {
-                  const statsSum =
-                    stats?.stats_summary?.[statDefinition.code]?.sum;
+                  const metric = stats?.stats_summary?.[statDefinition.code];
+                  const statsSum = metric && "sum" in metric ? metric.sum : undefined;
                   const stat = unit.stat_for_unit?.find(
                     (s) => s.stat_definition_id === statDefinition.id
                   );

app/src/components/statistical-unit-hierarchy/types.d.ts

@@ -266,7 +266,7 @@ declare interface StatisticalUnitStats {
   unit_id: number;
   valid_from: string;
   valid_to: string;
-  stats: { [key: string]: number | string };
+  stats: { type: "stats"; [statCode: string]: { type: string; value: number | string | boolean } | string };
   stats_summary: StatsSummary;
 };
 

app/src/lib/database.types.ts

@@ -2929,6 +2929,7 @@ export type Database = {
           establishment_id: number | null
           id: number
           legal_unit_id: number | null
+          stat: Json | null
           stat_definition_id: number
           valid_from: string
           valid_range: string
@@ -2947,6 +2948,7 @@ export type Database = {
           establishment_id?: number | null
           id?: number
           legal_unit_id?: number | null
+          stat?: Json | null
           stat_definition_id: number
           valid_from: string
           valid_range: string
@@ -2965,6 +2967,7 @@ export type Database = {
           establishment_id?: number | null
           id?: number
           legal_unit_id?: number | null
+          stat?: Json | null
           stat_definition_id?: number
           valid_from?: string
           valid_range?: string
@@ -12040,23 +12043,77 @@ export type Database = {
         Args: never
         Returns: boolean
       },
-      jsonb_stats_summary_merge: {
+      jsonb_stats_accum: {
+        Args: {
+          state?: Json
+          stats?: Json
+        }
+        Returns: Json
+      },
+      jsonb_stats_accum_sfunc: {
+        Args: {
+          internal?: unknown
+          stats?: Json
+        }
+        Returns: unknown
+      },
+      jsonb_stats_combine: {
+        Args: {
+          state1?: unknown
+          state2?: unknown
+        }
+        Returns: unknown
+      },
+      jsonb_stats_deserial: {
+        Args: {
+          bytes?: string
+          _internal?: unknown
+        }
+        Returns: unknown
+      },
+      jsonb_stats_final: {
+        Args: {
+          state?: Json
+        }
+        Returns: Json
+      },
+      jsonb_stats_final_internal: {
+        Args: {
+          internal?: unknown
+        }
+        Returns: Json
+      },
+      jsonb_stats_merge: {
         Args: {
           a?: Json
           b?: Json
         }
         Returns: Json
       },
-      jsonb_stats_to_summary: {
+      jsonb_stats_merge_sfunc: {
+        Args: {
+          internal?: unknown
+          agg?: Json
+        }
+        Returns: unknown
+      },
+      jsonb_stats_serial: {
+        Args: {
+          internal?: unknown
+        }
+        Returns: string
+      },
+      jsonb_stats_sfunc: {
         Args: {
           state?: Json
-          stats?: Json
+          code?: string
+          stat_val?: Json
         }
         Returns: Json
       },
-      jsonb_stats_to_summary_round: {
+      jsonb_stats_to_agg: {
         Args: {
-          state?: Json
+          stats?: Json
         }
         Returns: Json
       },
@@ -12810,6 +12867,12 @@ export type Database = {
         }
         Returns: string
       },
+      stat: {
+        Args: {
+          value?: unknown
+        }
+        Returns: Json
+      },
       stat_for_unit_hierarchy: {
         Args: {
           parent_establishment_id?: number
@@ -12944,6 +13007,19 @@ export type Database = {
         }
         Returns: Json
       },
+      stats: {
+        Args: {
+          input?: Json
+        }
+        Returns: Json
+      }
+        | {
+        Args: {
+          code?: string
+          val?: unknown
+        }
+        Returns: Json
+      },
       status: {
         Args: {
           statistical_unit?: Database["public"]["Tables"]["statistical_unit"]["Row"]

doc/data-model.md

@@ -70,7 +70,7 @@ These tables link to any of the four core statistical units:
 
 ### Statistics
 
-- `stat_for_unit(id, value_int, value_float, value_string, value_bool, stat_definition_id, data_source_id, establishment_id, legal_unit_id, edit_by_user_id, valid_range, valid_from, valid_to, valid_until, edit_at, edit_comment)` (temporal)
+- `stat_for_unit(id, value_int, value_float, value_string, value_bool, stat_definition_id, data_source_id, establishment_id, legal_unit_id, edit_by_user_id, valid_range, valid_from, valid_to, valid_until, edit_at, edit_comment, stat)` (temporal)
   - Key FKs: data_source_id, edit_by_user_id, establishment_id, legal_unit_id, stat_definition_id, valid_range, valid_range.
 - `stat_definition(id, code, type, name, enabled, frequency, description, priority)`
   - Enums: `frequency` (`public.stat_frequency`), `type` (`public.stat_type`).