Use engagehf-models package

README.md

@@ -11,7 +11,7 @@ SPDX-License-Identifier: MIT
 # Stanford Biodesign Digital Health ENGAGE-HF Web Frontend
 
 [![Build and Test](https://github.com/StanfordBDHG/ENGAGE-HF-Web-Frontend/actions/workflows/build-and-test.yml/badge.svg)](https://github.com/StanfordBDHG/ENGAGE-HF-Web-Frontend/actions/workflows/build-and-test.yml)
-[![Deployment](https://github.com/StanfordBDHG/ENGAGE-HF-Web-Frontend/actions/workflows/main.yml/badge.svg)](https://github.com/StanfordBDHG/ENGAGE-HF-Web-Frontend/actions/workflows/main.yml)
+[![Deployment](https://github.com/StanfordBDHG/ENGAGE-HF-Web-Frontend/actions/workflows/deployment.yml/badge.svg)](https://github.com/StanfordBDHG/ENGAGE-HF-Web-Frontend/actions/workflows/deployment.yml)
 [![codecov](https://codecov.io/gh/StanfordBDHG/ENGAGE-HF-Web-Frontend/graph/badge.svg?token=PsKyNz7Woe)](https://codecov.io/gh/StanfordBDHG/ENGAGE-HF-Web-Frontend)
 
 ## How To Use ENGAGE-HF Web Frontend

modules/firebase/AuthProvider.ts

@@ -7,7 +7,7 @@
 //
 import { useNavigate } from '@tanstack/react-router'
 import { type ReactNode, useEffect } from 'react'
-import { auth } from '@/modules/firebase/guards'
+import { auth } from '@/modules/firebase/app'
 import { routes } from '@/modules/routes'
 import { useAuthUser } from '@/packages/design-system/src/modules/auth/hooks'
 

modules/firebase/UserProvider.tsx

@@ -6,8 +6,8 @@
 // SPDX-License-Identifier: MIT
 //
 import { queryOptions, useSuspenseQuery } from '@tanstack/react-query'
-import { getCurrentUser } from '@/modules/firebase/guards'
+import { getCurrentUser } from '@/modules/firebase/app'
 import { getUserInfo } from '@/packages/design-system/src/modules/auth/user'
 
 export const currentUserQueryOptions = () =>
   queryOptions({

modules/firebase/guards.tsx → modules/firebase/app.ts

@@ -7,6 +7,7 @@
 //
 import { initializeApp } from '@firebase/app'
 import { connectFunctionsEmulator, getFunctions } from '@firebase/functions'
+import { type UserType } from '@stanfordbdhg/engagehf-models'
 import { queryOptions } from '@tanstack/react-query'
 import { redirect } from '@tanstack/react-router'
 import { connectAuthEmulator, getAuth, OAuthProvider } from 'firebase/auth'
@@ -19,7 +20,6 @@ import {
   getCollectionRefs,
   getDocDataOrThrow,
   getDocumentsRefs,
-  type UserType,
 } from '@/modules/firebase/utils'
 
 const firebaseApp = initializeApp(firebaseConfig)

modules/firebase/localizedText.ts

@@ -6,7 +6,7 @@
 // SPDX-License-Identifier: MIT
 //
 import { isObject } from 'lodash'
-import { type LocalizedText } from '@/modules/firebase/models/medication'
+import { type LocalizedText } from '@/modules/firebase/models'
 
 const locale = 'en'
 

modules/firebase/medication.ts

@@ -0,0 +1,62 @@
+//
+// This source file is part of the ENGAGE-HF project based on the Stanford Spezi Template Application project
+//
+// SPDX-FileCopyrightText: 2023 Stanford University
+//
+// SPDX-License-Identifier: MIT
+//
+import { type FHIRMedicationRequest } from '@/modules/firebase/models'
+
+export const getMedicationRequestData = (medication: {
+  medication: string
+  drug: string
+  frequencyPerDay: number
+  quantity: number
+  instructions: string
+}): FHIRMedicationRequest => ({
+  id: null,
+  extension: null,
+  resourceType: 'MedicationRequest',
+  medicationReference: {
+    reference: `medications/${medication.medication}/drugs/${medication.drug}`,
+    type: null,
+    display: null,
+    identifier: null,
+  },
+  dosageInstruction: [
+    {
+      text: medication.instructions,
+      timing: {
+        code: null,
+        repeat: {
+          frequency: medication.frequencyPerDay,
+          period: 1,
+          periodUnit: 'd',
+          timeOfDay: null,
+        },
+      },
+      doseAndRate: [
+        {
+          type: null,
+          doseQuantity: {
+            code: '{tbl}',
+            system: 'http://unitsofmeasure.org',
+            unit: 'tbl.',
+            value: medication.quantity,
+          },
+        },
+      ],
+      patientInstruction: null,
+    },
+  ],
+})
+
+export const getMedicationRequestMedicationIds = (
+  request: FHIRMedicationRequest,
+) => {
+  const reference = request.medicationReference?.reference.split('/')
+  return {
+    medicationId: reference?.at(1),
+    drugId: reference?.at(3),
+  }
+}

modules/firebase/models.ts

@@ -0,0 +1,63 @@
+//
+// This source file is part of the Stanford Biodesign Digital Health ENGAGE-HF open-source project
+//
+// SPDX-FileCopyrightText: 2023 Stanford University and the project authors (see CONTRIBUTORS.md)
+//
+// SPDX-License-Identifier: MIT
+//
+import type {
+  fhirAllergyIntoleranceConverter,
+  fhirAppointmentConverter,
+  fhirCodingConverter,
+  fhirElementConverter,
+  fhirMedicationRequestConverter,
+  fhirObservationConverter,
+  fhirResourceConverter,
+  InferEncoded,
+  invitationConverter,
+  medicationClassConverter,
+  organizationConverter,
+  userConverter,
+} from '@stanfordbdhg/engagehf-models'
+
+export type Organization = InferEncoded<typeof organizationConverter> & {
+  id: string
+}
+
+export type Invitation = InferEncoded<typeof invitationConverter>
+
+export type User = InferEncoded<typeof userConverter> & { id: string }
+
+export type FHIRElement = InferEncoded<typeof fhirElementConverter>
+export const basicFhirElement: FHIRElement = {
+  id: null,
+  extension: null,
+}
+
+export type FHIRResource = InferEncoded<typeof fhirResourceConverter>
+
+export type FHIRCoding = InferEncoded<typeof fhirCodingConverter>
+export const basicFhirCoding: FHIRCoding = {
+  ...basicFhirElement,
+  system: null,
+  version: null,
+  code: null,
+  display: null,
+  userSelected: null,
+}
+
+export type FHIRMedicationRequest = InferEncoded<
+  typeof fhirMedicationRequestConverter
+>
+
+export type MedicationClass = InferEncoded<typeof medicationClassConverter>
+
+export type FHIRObservation = InferEncoded<typeof fhirObservationConverter>
+
+export type FHIRAllergyIntolerance = InferEncoded<
+  typeof fhirAllergyIntoleranceConverter
+>
+
+export type FHIRAppointment = InferEncoded<typeof fhirAppointmentConverter>
+
+export type LocalizedText = string | Record<string, string>