fix some pr comments

Author: FilinBrChaos

apps/ehr/src/pages/reports/InvoiceablePatients.tsx

@@ -106,7 +106,6 @@ export default function InvoiceablePatients(): React.ReactElement {
   const pageSP = Number(searchParams.get('page') ?? '0');
   const statusSP = searchParams.get('status');
   const patientSP = searchParams.get('patient');
-  console.log('patient sp changed, ', patientSP);
 
   const handleBack = (): void => {
     navigate('/reports');

packages/utils/lib/helpers/tasks/invoices-tasks.ts

@@ -30,14 +30,15 @@ export function parseInvoiceTaskInput(invoiceTask: Task): InvoiceTaskInput {
   const claimId = getInvoiceTaskInputFieldByCode('claimId', invoiceTask);
   const finalizationDate = getInvoiceTaskInputFieldByCode('finalizationDate', invoiceTask);
 
-  return InvoiceTaskInputSchema.parse({
+  const taskInput: InvoiceTaskInput = {
     dueDate,
     memo,
     smsTextMessage,
-    amount,
     claimId,
     finalizationDate,
-  });
+    amountCents: parseInt(amount ?? '0'),
+  };
+  return InvoiceTaskInputSchema.parse(taskInput);
 }
 
 function getInvoiceTaskInputFieldByCode(code: keyof InvoiceTaskInput, task: Task): string | undefined {

packages/utils/lib/types/api/invoicing.types.ts

@@ -5,21 +5,22 @@ import { Secrets } from '../../secrets';
 export const INVOICEABLE_PATIENTS_PAGE_SIZE = 40;
 export const GET_INVOICES_TASKS_ZAMBDA_KEY = 'get-invoices-tasks';
 
-export const InvoiceTaskDisplayStatuses = ['ready', 'updating', 'sending', 'sent', 'error'];
+export const InvoiceTaskDisplayStatuses = ['ready', 'updating', 'sending', 'sent', 'error'] as const;
 export type InvoiceTaskDisplayStatus = (typeof InvoiceTaskDisplayStatuses)[number];
 
 export const InvoiceTaskInputSchemaBase = z.object({
   dueDate: z.string(),
   memo: z.string(),
   smsTextMessage: z.string(),
-  amountCents: z.number().gt(0),
+  amountCents: z.number(),
   claimId: z.string().optional(),
   finalizationDate: z.string().optional(),
 });
 export const InvoiceTaskInputSchema = InvoiceTaskInputSchemaBase.partial();
 export type InvoiceTaskInput = z.infer<typeof InvoiceTaskInputSchema>;
 export const SubSendInvoiceToPatientTaskInputSchema = InvoiceTaskInputSchemaBase.extend({
   memo: z.string().optional(),
+  amountCents: z.number().gt(0),
 });
 export type SubSendInvoiceToPatientTaskInput = z.infer<typeof SubSendInvoiceToPatientTaskInputSchema>;
 

packages/zambdas/src/cron/create-invoices-tasks/index.ts

@@ -73,7 +73,7 @@ export const index = wrapHandler(ZAMBDA_NAME, async (input: ZambdaInput): Promis
   }
 });
 
-async function getPrefilledInvoiceInfo(
+async function getInvoiceTaskInput(
   claimId: string,
   finalizationDate: Date,
   patientBalanceInCents: number
@@ -104,7 +104,7 @@ export async function createTaskForEncounter(oystehr: Oystehr, encounterPkg: Enc
     const { encounter, claim, amountCents } = encounterPkg;
     const patientId = encounter.subject?.reference?.replace('Patient/', '');
     if (!patientId) throw new Error('Patient ID not found in encounter: ' + encounter.id);
-    const prefilledInvoiceInfo = await getPrefilledInvoiceInfo(claim.claimId, claim.timestamp, amountCents);
+    const prefilledInvoiceInfo = await getInvoiceTaskInput(claim.claimId, claim.timestamp, amountCents);
     console.log(
       `Creating task. patient: ${claim.patientExternalId}, claim: ${claim.claimId}, oyst encounter: ${encounter.id} balance (cents): ${amountCents}`
     );

packages/zambdas/src/ehr/get-invoices-tasks/index.ts

@@ -70,7 +70,7 @@ export const index = wrapHandler(ZAMBDA_NAME, async (input: ZambdaInput): Promis
     const oystehr = createOystehrClient(m2mToken, secrets);
 
     const fhirSearchStart = performance.now();
-    const fhirResources = await getFhirResourcesGroupped(oystehr, validatedParams);
+    const fhirResources = await getFhirResourcesGrouped(oystehr, validatedParams);
     const fhirSearchEnd = performance.now();
     const taskGroups = fhirResources.taskGroups;
 
@@ -115,10 +115,19 @@ function performEffect(taskGroups: TaskGroup[], total: number): GetInvoicesTasks
     }
     const visitDate = formatDateConfigurable({ isoDate: appointment?.start, timezone });
 
+    const relatedPerson = resources.find(
+      (resource) =>
+        resource.resourceType === 'RelatedPerson' &&
+        (resource as RelatedPerson).relationship?.find(
+          (relationship) => relationship.coding?.find((code) => code.code === 'user-relatedperson')
+        )
+    ) as RelatedPerson;
+    const patientPhoneNumber = relatedPerson && getPhoneNumberForIndividual(relatedPerson);
+
     reports.push({
       claimId: taskInput.claimId ?? '---',
       finalizationDate: taskInput.finalizationDate ?? '---',
-      amountInvoiceable: `${taskInput.amountCents ?? 0 / 100}`,
+      amountInvoiceable: `${(taskInput.amountCents ?? 0) / 100}`,
       visitDate: visitDate ?? '---',
       location: group.location?.name ?? '---',
       task: task,
@@ -127,7 +136,7 @@ function performEffect(taskGroups: TaskGroup[], total: number): GetInvoicesTasks
         fullName: patientName,
         dob: patientDob,
         gender: patientGenderLabel,
-        phoneNumber: 'll', // todo this
+        phoneNumber: patientPhoneNumber,
       },
       responsibleParty: {
         fullName: responsiblePartyName,
@@ -141,7 +150,7 @@ function performEffect(taskGroups: TaskGroup[], total: number): GetInvoicesTasks
   return { reports, totalCount: total };
 }
 
-async function getFhirResourcesGroupped(
+async function getFhirResourcesGrouped(
   oystehr: Oystehr,
   complexValidatedInput: GetInvoicesTasksInput
 ): Promise<{ taskGroups: TaskGroup[]; bundleTotal: number }> {

packages/zambdas/src/ehr/invoiceable-patients-report/index.ts

@@ -62,7 +62,13 @@ export const index = wrapHandler(ZAMBDA_NAME, async (input: ZambdaInput): Promis
       console.log(`Updated task input for task id: "${taskId}"`);
     }
 
-    console.error('Task was not updated because no inventory record was found for the task.'); // todo how i can better manage this situation
+    console.warn('Task was not updated because no inventory record was found for the task.'); // todo how i can better manage this situation
+    await oystehr.fhir.patch({
+      resourceType: 'Task',
+      id: taskId,
+      operations: [{ op: 'replace', path: '/status', value: mapDisplayToInvoiceTaskStatus('error') }],
+    });
+
     return {
       statusCode: 200,
       body: JSON.stringify({ message: 'Task was not updated because no inventory record was found for the task.' }),

packages/zambdas/src/subscriptions/task/sub-refresh-invoice-task/index.ts

@@ -1,23 +1,21 @@
-import Oystehr from '@oystehr/sdk';
 import { CandidApiClient, CandidApiEnvironment } from 'candidhealth';
 import { InventoryRecord } from 'candidhealth/api/resources/patientAr/resources/v1';
 import fs from 'fs';
 import { DateTime } from 'luxon';
 import { getCandidInventoryPages } from 'utils';
-import { createTaskForEncounter, getEncountersWithoutTaskFhir } from 'zambdas/src/cron/create-invoices-tasks';
 
-async function createOyst(zambdaEnv: Record<string, string>, token: string): Promise<Oystehr> {
-  const oystehr = new Oystehr({
-    accessToken: token,
-    projectId: zambdaEnv.PROJECT_ID,
-    services: {
-      fhirApiUrl: zambdaEnv.FHIR_API,
-      projectApiUrl: zambdaEnv.PROJECT_API,
-    },
-  });
-  console.log(`Created Oystehr client`);
-  return oystehr;
-}
+// async function createOyst(zambdaEnv: Record<string, string>, token: string): Promise<Oystehr> {
+//   const oystehr = new Oystehr({
+//     accessToken: token,
+//     projectId: zambdaEnv.PROJECT_ID,
+//     services: {
+//       fhirApiUrl: zambdaEnv.FHIR_API,
+//       projectApiUrl: zambdaEnv.PROJECT_API,
+//     },
+//   });
+//   console.log(`Created Oystehr client`);
+//   return oystehr;
+// }
 
 async function createCandid(
   zambdaEnv: Record<string, string>,
@@ -41,14 +39,14 @@ async function main(): Promise<void> {
   const candidEnv = environment === 'production' ? CandidApiEnvironment.Production : CandidApiEnvironment.Staging;
   const startFrom = DateTime.fromFormat('01/14/2026', 'MM/dd/yyyy');
   const endOn = startFrom.plus({ weeks: 2 });
-  const token = '<a-key-from-ottehr-console-here>';
+  // const token = '<a-key-from-ottehr-console-here>';
   const maxCandidPages = 18;
 
   console.log(`Reading environment variables from packages/zambdas/.env/${environment}.json.`);
   const zambdaEnv: Record<string, string> = JSON.parse(
     fs.readFileSync(`packages/zambdas/.env/${environment}.json`, 'utf8')
   );
-  const oystehr = await createOyst(zambdaEnv, token);
+  // const oystehr = await createOyst(zambdaEnv, token);
   const candid = await createCandid(zambdaEnv, candidEnv);
 
   let candidClaims = await getAllCandidClaims(candid, startFrom, maxCandidPages);
@@ -65,13 +63,13 @@ async function main(): Promise<void> {
   }
   console.log(`Found ${candidClaims.length} claims between ${firstDate} and ${lastDate}`);
 
-  const pkgs = await getEncountersWithoutTaskFhir(oystehr, candid, candidClaims);
-  console.log('Encounters without a task and positive amount: ', pkgs.length);
+  // const pkgs = await getEncountersWithoutTaskFhir(oystehr, candid, candidClaims);
+  // console.log('Encounters without a task and positive amount: ', pkgs.length);
 
   const promises: Promise<void>[] = [];
-  pkgs.forEach((encounter) => {
-    promises.push(createTaskForEncounter(oystehr, encounter));
-  });
+  // pkgs.forEach((encounter) => {
+  //   promises.push(createTaskForEncounter(oystehr, encounter));
+  // });
   await Promise.all(promises);
 }