Json format 2.0

src/json.ts

@@ -4,6 +4,7 @@ import {
   JsonValidatorOptions,
 } from "./types.js"
 import { JsonValidatorOneOne } from "./versions/1.1/json.js"
+import { JsonValidatorTwoZero } from "./versions/2.0/json.js"
 
 /**
  *
@@ -18,6 +19,8 @@ export async function validateJson(
 ): Promise<ValidationResult> {
   if (version === "v1.1") {
     return JsonValidatorOneOne.validateJson(jsonInput, options)
+  } else if (version === "v2.0") {
+    return JsonValidatorTwoZero.validateJson(jsonInput, options)
   }
   return new Promise((resolve) => {
     resolve({

src/versions/2.0/csv.ts

@@ -12,10 +12,10 @@ import {
   BillingCodeType,
   CHARGE_BILLING_CLASSES,
   CHARGE_SETTINGS,
-  CONTRACTING_METHODS,
+  STANDARD_CHARGE_METHODOLOGY,
   ChargeBillingClass,
   ChargeSetting,
-  ContractingMethod,
+  StandardChargeMethod,
   DRUG_UNITS,
   DrugUnit,
 } from "./types"
@@ -354,7 +354,7 @@ export function validateWideFields(
   Object.entries(row).forEach(([field, value], columnIndex) => {
     if (
       field.includes("contracting_method") &&
-      !CONTRACTING_METHODS.includes(value as ContractingMethod)
+      !STANDARD_CHARGE_METHODOLOGY.includes(value as StandardChargeMethod)
     ) {
       errors.push(
         csvErr(
@@ -364,7 +364,7 @@ export function validateWideFields(
           ERRORS.ALLOWED_VALUES(
             field,
             value,
-            CONTRACTING_METHODS as unknown as string[]
+            STANDARD_CHARGE_METHODOLOGY as unknown as string[]
           )
         )
       )
@@ -458,8 +458,8 @@ export function validateTallFields(
   }
 
   if (
-    !CONTRACTING_METHODS.includes(
-      row["standard_charge | methodology"] as ContractingMethod
+    !STANDARD_CHARGE_METHODOLOGY.includes(
+      row["standard_charge | methodology"] as StandardChargeMethod
     )
   ) {
     errors.push(
@@ -471,7 +471,7 @@ export function validateTallFields(
         ERRORS.ALLOWED_VALUES(
           "standard_charge | methodology",
           row["standard_charge | methodology"],
-          CONTRACTING_METHODS as unknown as string[]
+          STANDARD_CHARGE_METHODOLOGY as unknown as string[]
         )
       )
     )

src/versions/2.0/json.ts

@@ -13,12 +13,12 @@ import {
   CHARGE_BILLING_CLASSES,
   CHARGE_SETTINGS,
   DRUG_UNITS,
-  CONTRACTING_METHODS,
+  STANDARD_CHARGE_METHODOLOGY,
 } from "./types.js"
 import { errorObjectToValidationError, parseJson } from "../common/json.js"
 
 const STANDARD_CHARGE_DEFINITIONS = {
-  billing_code_information: {
+  code_information: {
     type: "object",
     properties: {
       code: { type: "string" },
@@ -37,6 +37,7 @@ const STANDARD_CHARGE_DEFINITIONS = {
     },
     required: ["unit", "type"],
   },
+
   standard_charges: {
     type: "object",
     properties: {
@@ -48,11 +49,6 @@ const STANDARD_CHARGE_DEFINITIONS = {
         enum: CHARGE_SETTINGS,
         type: "string",
       },
-      modifiers: {
-        type: "array",
-        items: { type: "string" },
-        uniqueItems: true,
-      },
       payers_information: {
         type: "array",
         items: { $ref: "#/definitions/payers_information" },
@@ -71,9 +67,9 @@ const STANDARD_CHARGE_DEFINITIONS = {
     properties: {
       description: { type: "string" },
       drug_information: { $ref: "#/definitions/drug_information" },
-      billing_code_information: {
+      code_information: {
         type: "array",
-        items: { $ref: "#/definitions/billing_code_information" },
+        items: { $ref: "#/definitions/code_information" },
         minItems: 1,
       },
       standard_charges: {
@@ -82,29 +78,24 @@ const STANDARD_CHARGE_DEFINITIONS = {
         minItems: 1,
       },
     },
-    required: ["description", "billing_code_information", "standard_charges"],
+    required: ["description", "code_information", "standard_charges"],
   },
   payers_information: {
     type: "object",
     properties: {
       payer_name: { type: "string" },
       plan_name: { type: "string" },
       additional_payer_notes: { type: "string" },
-      standard_charge: { type: "number", exclusiveMinimum: 0 },
-      standard_charge_percent: { type: "number", exclusiveMinimum: 0 },
-      contracting_method: {
-        enum: CONTRACTING_METHODS,
+      standard_charge_dollar: { type: "number", exclusiveMinimum: 0 },
+      standard_charge_algorithm: { type: "string" },
+      standard_charge_percentage: { type: "number", exclusiveMinimum: 0 },
+      estimated_amount: { type: "number", exclusiveMinimum: 0 },
+      methodology: {
+        enum: STANDARD_CHARGE_METHODOLOGY,
         type: "string",
       },
     },
-    required: ["payer_name", "plan_name", "contracting_method"],
-    if: {
-      properties: {
-        contracting_method: { const: "percent of total billed charges" },
-      },
-    },
-    then: { required: ["standard_charge_percent"] },
-    else: { required: ["standard_charge"] },
+    required: ["payer_name", "plan_name", "methodology"],
   },
 }
 
@@ -113,9 +104,9 @@ const STANDARD_CHARGE_PROPERTIES = {
   properties: {
     description: { type: "string" },
     drug_information: { $ref: "#/definitions/drug_information" },
-    billing_code_information: {
+    code_information: {
       type: "array",
-      items: { $ref: "#/definitions/billing_code_information" },
+      items: { $ref: "#/definitions/code_information" },
       minItems: 1,
     },
     standard_charges: {
@@ -124,7 +115,7 @@ const STANDARD_CHARGE_PROPERTIES = {
       minItems: 1,
     },
   },
-  required: ["description", "billing_code_information", "standard_charges"],
+  required: ["description", "code_information", "standard_charges"],
 }
 
 export const STANDARD_CHARGE_SCHEMA = {
@@ -145,22 +136,92 @@ export const METADATA_DEFINITIONS = {
     },
     required: ["license_number", "state"],
   },
+  affirmation: {
+    type: "object",
+    properties: {
+      affirmation: {
+        const:
+          "To the best of its knowledge and belief, the hospital has included all applicable standard charge information in accordance with the requirements of 45 CFR 180.50, and the information encoded is true, accurate, and complete as of the date indicated.",
+      },
+      confirm_affirmation: {
+        type: "boolean",
+      },
+    },
+    required: ["affirmation", "confirm_affirmation"],
+  },
+  modifier_information: {
+    type: "object",
+    properties: {
+      description: {
+        type: "string",
+      },
+      code: {
+        type: "string",
+      },
+      modifier_payer_information: {
+        type: "array",
+        items: {
+          $ref: "#/definitions/modifier_payer_information",
+        },
+        minItems: 1,
+      },
+    },
+    required: ["description", "modifier_payer_information", "code"],
+  },
+  modifier_payer_information: {
+    type: "object",
+    properties: {
+      payer_name: {
+        type: "string",
+      },
+      plan_name: {
+        type: "string",
+      },
+      description: {
+        type: "string",
+      },
+    },
+    required: ["payer_name", "plan_name", "description"],
+  },
 }
 
 export const METADATA_PROPERTIES = {
   hospital_name: { type: "string" },
   last_updated_on: { type: "string", format: "date" },
   license_information: {
-    type: "array",
-    items: { $ref: "#/definitions/license_information" },
-    minItems: 1,
+    $ref: "#/definitions/license_information",
   },
   version: { type: "string" },
-  hospital_location: { type: "string" },
-  financial_aid_policy: { type: "string" },
+  hospital_address: {
+    type: "array",
+    items: { type: "string" },
+  },
+  hospital_location: {
+    type: "array",
+    items: {
+      type: "string",
+    },
+  },
+  affirmation: {
+    $ref: "#/definitions/affirmation",
+  },
+  modifier_information: {
+    type: "array",
+    items: {
+      $ref: "#/definitions/modifier_information",
+    },
+  },
 }
 
-export const METADATA_REQUIRED = ["hospital_name", "last_updated_on", "version"]
+export const METADATA_REQUIRED = [
+  "hospital_name",
+  "last_updated_on",
+  "hospital_location",
+  "hospital_address",
+  "license_information",
+  "version",
+  "affirmation",
+]
 
 export const METADATA_SCHEMA = {
   $schema: "http://json-schema.org/draft-07/schema#",
@@ -213,6 +274,7 @@ export async function validateJson(
       if (typeof key === "string") {
         metadata[key] = value
       } else {
+        // is this where I need to put another check for the modifier information?
         hasCharges = true
         if (!validator.validate(STANDARD_CHARGE_SCHEMA, value)) {
           valid = false

src/versions/2.0/types.ts

@@ -38,12 +38,12 @@ export const CHARGE_BILLING_CLASSES = [
 type ChargeBillingClassTuple = typeof CHARGE_BILLING_CLASSES
 export type ChargeBillingClass = ChargeBillingClassTuple[number]
 
-export const CONTRACTING_METHODS = [
+export const STANDARD_CHARGE_METHODOLOGY = [
   "case rate",
   "fee schedule",
   "percent of total billed charges",
   "per diem",
   "other",
 ] as const
-type ContractingMethodTuple = typeof CONTRACTING_METHODS
-export type ContractingMethod = ContractingMethodTuple[number]
+type StandardChargeTuple = typeof STANDARD_CHARGE_METHODOLOGY
+export type StandardChargeMethod = StandardChargeTuple[number]

test/json.spec.ts → test/1.1/json.spec.ts

@@ -1,16 +1,19 @@
 import test from "ava"
-import { loadFixtureStream } from "./utils"
-import { validateJson } from "../src/json.js"
+import { loadFixtureStream } from "../utils.js"
+import { validateJson } from "../../src/json.js"
 
 test("validateJson", async (t) => {
-  const result = await validateJson(loadFixtureStream("sample-1.json"), "v1.1")
+  const result = await validateJson(
+    loadFixtureStream("/1.1/sample-1.json"),
+    "v1.1"
+  )
   t.is(result.valid, false)
   t.is(result.errors.length, 1)
 })
 
 test("validateJson empty", async (t) => {
   const result = await validateJson(
-    loadFixtureStream("sample-empty.json"),
+    loadFixtureStream("/1.1/sample-empty.json"),
     "v1.1"
   )
   t.is(result.valid, false)
@@ -19,7 +22,7 @@ test("validateJson empty", async (t) => {
 
 test("validateJson maxErrors", async (t) => {
   const result = await validateJson(
-    loadFixtureStream("sample-empty.json"),
+    loadFixtureStream("/1.1/sample-empty.json"),
     "v1.1",
     {
       maxErrors: 1,
@@ -31,7 +34,7 @@ test("validateJson maxErrors", async (t) => {
 
 test("validateJson valid", async (t) => {
   const result = await validateJson(
-    loadFixtureStream("sample-valid.json"),
+    loadFixtureStream("/1.1/sample-valid.json"),
     "v1.1"
   )
   t.is(result.valid, true)

test/2.0/json.spec.ts

@@ -0,0 +1,59 @@
+import test from "ava"
+import { loadFixtureStream } from "../utils.js"
+import { validateJson } from "../../src/json.js"
+
+test("validateJson", async (t) => {
+  const result = await validateJson(
+    loadFixtureStream("/2.0/sample-valid.json"),
+    "v2.0"
+  )
+  t.is(result.valid, true)
+  t.deepEqual(result.errors.length, 0)
+})
+
+test("validateJson empty", async (t) => {
+  const result = await validateJson(
+    loadFixtureStream("/2.0/sample-empty.json"),
+    "v2.0"
+  )
+  t.is(result.valid, false)
+  t.deepEqual(result.errors.length, 8)
+})
+
+test("validateJson maxErrors", async (t) => {
+  const result = await validateJson(
+    loadFixtureStream("/2.0/sample-empty.json"),
+    "v2.0",
+    {
+      maxErrors: 1,
+    }
+  )
+  t.is(result.valid, false)
+  t.deepEqual(result.errors.length, 1)
+})
+
+test("validateJson errorFile", async (t) => {
+  const result = await validateJson(
+    loadFixtureStream("/2.0/sample-errors.json"),
+    "v2.0"
+  )
+  t.is(result.valid, false)
+  t.deepEqual(result.errors.length, 3)
+  t.deepEqual(result.errors, [
+    {
+      path: "/standard_charges/0/payers_information/0/standard_charge_dollar",
+      field: "standard_charge_dollar",
+      message: "must be number",
+    },
+    {
+      path: "/standard_charges/3/payers_information/2",
+      field: "2",
+      message: "must have required property 'methodology'",
+    },
+    {
+      path: "/affirmation/affirmation",
+      field: "affirmation",
+      message: "must be equal to constant",
+    },
+  ])
+})