no more demographic nofilter

Recidiviz · Jan 28, 2021 · 8af4e1d · 8af4e1d
1 parent eb24e87
commit 8af4e1d
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 25 deletions.
diff --git a/spotlight-client/src/contentModels/HistoricalPopulationBreakdownMetric.test.ts b/spotlight-client/src/contentModels/HistoricalPopulationBreakdownMetric.test.ts
@@ -99,8 +99,6 @@ test("fills in missing data", async () => {
   const metric = await getMetric();
 
   DemographicViewList.forEach((demographicView) => {
-    if (demographicView === "nofilter") return;
-
     runInAction(() => {
       metric.demographicView = demographicView;
     });

diff --git a/spotlight-client/src/contentModels/HistoricalPopulationBreakdownMetric.ts b/spotlight-client/src/contentModels/HistoricalPopulationBreakdownMetric.ts
@@ -123,8 +123,6 @@ export default class HistoricalPopulationBreakdownMetric extends Metric<
 
     // isolate each data series and impute any missing records
     DemographicViewList.forEach((demographicView) => {
-      if (demographicView === "nofilter") return;
-
       const recordsForDemographicView = transformedData.filter(
         recordIsTotalByDimension(demographicView)
       );
@@ -181,7 +179,7 @@ export default class HistoricalPopulationBreakdownMetric extends Metric<
 
   get dataSeries(): DataSeries<HistoricalPopulationBreakdownRecord>[] | null {
     const { records, demographicView } = this;
-    if (!records || demographicView === "nofilter") return null;
+    if (!records) return null;
 
     const categories = getDemographicCategories(demographicView);
 

diff --git a/spotlight-client/src/contentModels/createMetricMapping.ts b/spotlight-client/src/contentModels/createMetricMapping.ts
@@ -18,6 +18,7 @@
 import { assertNever } from "assert-never";
 import { MetricTypeIdList, TenantContent, TenantId } from "../contentApi/types";
 import {
+  NOFILTER_KEY,
   parolePopulationCurrent,
   parolePopulationHistorical,
   paroleProgramParticipationCurrent,
@@ -50,7 +51,7 @@ import SentenceTypeByLocationMetric from "./SentenceTypeByLocationMetric";
 import SupervisionSuccessRateDemographicsMetric from "./SupervisionSuccessRateDemographicsMetric";
 import SupervisionSuccessRateMonthlyMetric from "./SupervisionSuccessRateMonthlyMetric";
 import { ERROR_MESSAGES } from "../constants";
-import { NOFILTER_KEY, TOTAL_KEY } from "../demographics";
+import { TOTAL_KEY } from "../demographics";
 
 type MetricMappingFactoryOptions = {
   localityLabelMapping: TenantContent["localities"];
@@ -92,7 +93,7 @@ export default function createMetricMapping({
           new PopulationBreakdownByLocationMetric({
             ...metadata,
             tenantId,
-            defaultDemographicView: NOFILTER_KEY,
+            defaultDemographicView: "total",
             defaultLocalityId: TOTAL_KEY,
             localityLabels: localityLabelMapping.Sentencing,
             dataTransformer: sentencePopulationCurrent,
@@ -126,7 +127,7 @@ export default function createMetricMapping({
           new PopulationBreakdownByLocationMetric({
             ...metadata,
             tenantId,
-            defaultDemographicView: NOFILTER_KEY,
+            defaultDemographicView: "total",
             defaultLocalityId: TOTAL_KEY,
             localityLabels: localityLabelMapping.Prison,
             dataTransformer: prisonPopulationCurrent,
@@ -144,7 +145,7 @@ export default function createMetricMapping({
           new PopulationBreakdownByLocationMetric({
             ...metadata,
             tenantId,
-            defaultDemographicView: NOFILTER_KEY,
+            defaultDemographicView: "total",
             defaultLocalityId: TOTAL_KEY,
             localityLabels: localityLabelMapping.Probation,
             dataTransformer: probationPopulationCurrent,
@@ -162,7 +163,7 @@ export default function createMetricMapping({
           new PopulationBreakdownByLocationMetric({
             ...metadata,
             tenantId,
-            defaultDemographicView: NOFILTER_KEY,
+            defaultDemographicView: "total",
             defaultLocalityId: TOTAL_KEY,
             localityLabels: localityLabelMapping.Parole,
             dataTransformer: parolePopulationCurrent,

diff --git a/spotlight-client/src/demographics/types.ts b/spotlight-client/src/demographics/types.ts
@@ -18,9 +18,6 @@
 export type TotalIdentifier = "ALL";
 export const TOTAL_KEY: TotalIdentifier = "ALL";
 
-type NoFilterIdentifier = "nofilter";
-export const NOFILTER_KEY: NoFilterIdentifier = "nofilter";
-
 export type RaceIdentifier =
   | TotalIdentifier
   | "AMERICAN_INDIAN_ALASKAN_NATIVE"
@@ -44,7 +41,6 @@ export const DemographicViewList = [
   "raceOrEthnicity",
   "gender",
   "ageBucket",
-  "nofilter",
 ] as const;
 export type DemographicView = typeof DemographicViewList[number];
 export function isDemographicView(x: string): x is DemographicView {

diff --git a/spotlight-client/src/demographics/utils.test.ts b/spotlight-client/src/demographics/utils.test.ts
@@ -37,10 +37,6 @@ describe("recordIsTotalByDimension", () => {
     expect(testData.filter(recordIsTotalByDimension(view))).toEqual(expected);
   };
 
-  test("returns all records", () => {
-    verifyFilter("nofilter", testData);
-  });
-
   test("returns only totals", () => {
     verifyFilter("total", testData.slice(0, 1));
   });

diff --git a/spotlight-client/src/demographics/utils.ts b/spotlight-client/src/demographics/utils.ts
@@ -22,21 +22,17 @@ import {
   DemographicView,
   DemographicViewList,
   GenderIdentifier,
-  NOFILTER_KEY,
   RaceIdentifier,
   TOTAL_KEY,
 } from "./types";
 
 /**
  * Returns a filter predicate for the specified demographic view
  * that will exclude totals and breakdowns for all other views.
- * Respects a special bypass value (see `NOFILTER_KEY`)
  */
 export function recordIsTotalByDimension(
   demographicView: DemographicView
 ): (record: DemographicFields) => boolean {
-  if (demographicView === NOFILTER_KEY) return () => true;
-
   const keysToCheck = [...DemographicViewList].filter(isDemographicFieldKey);
 
   if (demographicView !== "total") {
@@ -92,7 +88,7 @@ const ageBucketCategories: AgeCategory[] = [
 ];
 
 export function getDemographicCategories(
-  view: Exclude<DemographicView, "nofilter">
+  view: DemographicView
 ): (TotalCategory | RaceOrEthnicityCategory | GenderCategory | AgeCategory)[] {
   switch (view) {
     case "total":

diff --git a/spotlight-client/src/metricsApi/types.ts b/spotlight-client/src/metricsApi/types.ts
@@ -49,3 +49,6 @@ export type RateFields = {
   rateNumerator: number;
   rate: number;
 };
+
+type NoFilterIdentifier = "nofilter";
+export const NOFILTER_KEY: NoFilterIdentifier = "nofilter";
diff --git a/spotlight-client/src/metricsApi/utils.ts b/spotlight-client/src/metricsApi/utils.ts
@@ -19,11 +19,10 @@ import { ValuesType } from "utility-types";
 import {
   AgeIdentifier,
   GenderIdentifier,
-  NOFILTER_KEY,
   RaceIdentifier,
 } from "../demographics/types";
 import { RawMetricData } from "./fetchMetrics";
-import { DemographicFields, LocalityFields } from "./types";
+import { DemographicFields, LocalityFields, NOFILTER_KEY } from "./types";
 
 export function extractDemographicFields(
   record: ValuesType<RawMetricData>