Building and Testing Fern Definitions

fern/definition/medical/document.yml

@@ -32,16 +32,22 @@ service:
           facilityId:
             docs: The ID of the Facility where the patient is receiving care.
             type: string
+        body:
+          docs: |
+            Metadata holds a record of up to 50 custom string key-value pairs. Key names can be up to 40 characters long and values up to 500 characters long. 
+            This metadata will be returned in the webhook response.
+          type: optional<map<string, string>>
       response: DocumentQuery
       examples:
         - name: Example1
           query-parameters:
             patientId: "12345678"
             facilityId: "12345678"
+          request: {"youCan": "putAny", "stringKeyValue": "pairsHere"}
           response:
             body: $DocumentQuery.Example1
 
-    getQueryStatus:
+    getQueryStatus:  
       display-name: Get Document Query Status
       docs: |
         Returns the document query status for the specified patient.

fern/definition/medical/fhir.yml

@@ -35,6 +35,16 @@ service:
               formatted `YYYY-MM-DD` as per ISO 8601. If not provided,
                no end date filter will be applied.
             type: optional<string>
+          conversionType:
+            docs: |
+              The doc type to convert to. Either html or pdf.
+            type: optional<string>
+        body:
+          docs: |
+            Metadata holds a record of up to 50 custom string key-value pairs. Key names can be up to 40 characters long and values up to 500 characters long. 
+            This metadata will be returned in the webhook response.
+          type: optional<map<string, string>>
+
       response:
         type: StartConsolidatedQueryResponse
         docs: Returns a Bundle that contains a property entry which is simply an array of FHIR resources.
@@ -63,6 +73,24 @@ service:
           response:
             body: $GetConsolidatedQueryStatusResponse.Example0
 
+    createPatientConsolidated:
+      display-name: Create Patient's Consolidated Data
+      docs: Create Patient's Consolidated Data with a FHIR Bundle.
+      method: PUT
+      path: /patient/{id}/consolidated
+      path-parameters:
+        id:
+          type: string
+          docs: The ID of the Patient
+      response:
+        type: TransactionResponse
+      examples:
+        - name: Example1
+          path-parameters:
+            id: "12345678"
+          response:
+            body: $TransactionResponse.Example0
+
     countPatientData:
       display-name: Count Patient Data
       docs: Get a count of a Patient's data per resource.
@@ -150,6 +178,28 @@ types:
             no end date filter will be applied.
         type: optional<string>
 
+  TransactionResponse:
+    properties:
+      resourceType:
+        type: string
+        docs: The type of the FHIR resource. For a transaction response, this is always "Bundle".
+      id:
+        type: string
+        docs: A unique identifier for this transaction response.
+      type:
+        type: string
+        docs: The type of the bundle, which is "transaction-response" in this case.
+      entry:
+        type: list<map<string, unknown>>
+        docs: An array of responses for each transaction in the bundle. Each entry can be any arbitrary JSON object. 
+    examples:
+      - name: Example0
+        value:
+          resourceType: "Bundle"
+          id: "12345"
+          type: "transaction-response"
+          entry: [{ "resourceId": "abc123", "status": "created", "details": "Resource created successfully" }]
+
   ResourcesSearchableByPatient:
     enum:
       - Account

fern/definition/medical/patient.yml

@@ -108,13 +108,12 @@ types:
   Addresses:
     discriminated: false
     union:
-      - commons.Address
       - list<commons.Address>
 
   Contacts:
     discriminated: false
     union:
-      - Contact
+      - list<Contact>
 
   PersonalIdentifier:
     union:
@@ -150,17 +149,11 @@ types:
       email:
         type: optional<string>
         docs: The Patient's email address.
-      facilityIds:
-        type: list<FacilityId>
-        docs: Array of the IDs of the Facilities where the Patient is receiving care.
     examples:
       - name: Example1
         value:
           phone: "1234567899"
           email: karen@cvspharmacy.com
-          facilityIds:
-            - $FacilityId.Example1
-            - $FacilityId.Example2
 
   FacilityId:
     type: string
@@ -196,8 +189,11 @@ types:
       address:
         type: optional<Addresses>
       contact:
-        type: optional<list<Contact>>
-
+        type: optional<Contacts>
+      externalID:
+        type: optional<string>
+        docs: An external Patient ID to associate to a Patient in Metriport.
+
   Patient:
     extends: BasePatient
     properties:
@@ -206,6 +202,9 @@ types:
         docs: | 
           The ID assigned to this Patient. This ID will be used to uniquely 
           identify this Patient in medical documents.
+      facilityIds:
+        type: list<FacilityId>
+        docs: Array of the IDs of the Facilities where the Patient is receiving care.
     examples:
       - name: Example1
         value:
@@ -216,6 +215,8 @@ types:
           genderAtBirth: F
           personalIdentifiers:
             - $PersonalIdentifier.Example1
+          facilityIds:
+            - $FacilityId.Example1
 
   ListPatientsResponse:
     properties:

packages/sdks/java/.gitignore

@@ -1 +1,2 @@
-generated/
+tester-local
+generated

packages/sdks/java/tester-java/.env.example

@@ -0,0 +1,3 @@
+API_KEY=foo
+BASE_URL=http://localhost:8080
+FACILITY_ID=bar

packages/tester-java/.gitignore → packages/sdks/java/tester-java/.gitignore

@@ -4,3 +4,5 @@
 
 # Maven
 target/
+.env
+generated/

packages/tester-java/README.md → packages/sdks/java/tester-java/README.md

@@ -20,7 +20,7 @@ under "Developers".
 
 ## Building
 
-Run `./mvn clean package` and check the `target` folder.
+Run `./mvnw clean package` and check the `target` folder.
 
 ## Running
 
@@ -29,3 +29,4 @@ Run `java -Dapi_key=YOUR-KEY -jar target/metriport-test-1.0.jar` and:
 - replace `YOUR-KEY` with the vale of your API key
 - replace the version with whatever version defined on `pom.xml` (the default one is `1.0`, which doesn't
   require any changes)
+- note that Dapi_key is not related to DAPI (devices API). It is java syntax to add the -D with no space

packages/tester-java/pom.xml → packages/sdks/java/tester-java/pom.xml

@@ -37,7 +37,12 @@
     <dependency>
       <groupId>com.metriport</groupId>
       <artifactId>metriport-java</artifactId>
-      <version>0.1.8</version>
+      <version>8.0.0-alpha1</version>
+    </dependency>
+    <dependency>
+      <groupId>io.github.cdimascio</groupId>
+      <artifactId>java-dotenv</artifactId>
+      <version>5.2.2</version>
     </dependency>
   </dependencies>
 

packages/sdks/java/tester-java/src/main/java/com/metriport/test/CreateFacility.java

@@ -0,0 +1,36 @@
+package com.metriport.test;
+
+import io.github.cdimascio.dotenv.Dotenv;
+import com.metriport.api.Metriport;
+import com.metriport.api.resources.medical.facility.types.BaseFacility;
+import com.metriport.api.resources.commons.types.UsState;
+import com.metriport.api.resources.commons.types.Address;
+
+public class CreateFacility {
+    public static void main(String[] args) {
+        Dotenv dotenv = Dotenv.load();
+
+        Metriport metriport = Metriport.builder()
+            .apiKey(dotenv.get("API_KEY"))
+            .url(dotenv.get("BASE_URL"))
+            .build();
+
+        Address address = Address.builder()
+            .addressLine1("2261 Market Street")
+            .city("San Francisco")
+            .state(UsState.CA)
+            .zip("12345")
+            .country("USA")
+            .addressLine2("#4818")
+            .build();
+
+        BaseFacility newFacility = BaseFacility.builder()
+            .name("New Facility")
+            .npi("1234567893")
+            .address(address)
+            .build();
+
+        var response = metriport.medical().facility().create(newFacility);
+        System.out.println("Created new facility!" + response);
+    }
+}

packages/sdks/java/tester-java/src/main/java/com/metriport/test/GetFacility.java

@@ -0,0 +1,20 @@
+package com.metriport.test;
+
+import io.github.cdimascio.dotenv.Dotenv;
+import com.metriport.api.Metriport;
+public class GetFacility {
+    public static void main(String[] args) {
+        Dotenv dotenv = Dotenv.load();
+
+        Metriport metriport = Metriport.builder()
+            .apiKey(dotenv.get("API_KEY"))
+            .url(dotenv.get("BASE_URL"))
+            .build();
+
+        var response_all = metriport.medical().facility().list();
+        System.out.println("All facilities:" + response_all);
+
+        var response = metriport.medical().facility().get(dotenv.get("FACILITY_ID"));
+        System.out.println("Specific facility" + response);
+    }
+}

packages/sdks/java/tester-java/src/main/java/com/metriport/test/GetOrg.java

@@ -0,0 +1,18 @@
+package com.metriport.test;
+
+import io.github.cdimascio.dotenv.Dotenv;
+import com.metriport.api.Metriport;
+
+public class GetOrg {
+    public static void main(String[] args) {
+        Dotenv dotenv = Dotenv.load();
+
+        Metriport metriport = Metriport.builder()
+            .apiKey(dotenv.get("API_KEY"))
+            .url(dotenv.get("BASE_URL"))
+            .build();
+
+        var response = metriport.medical().facility().list();
+        System.out.println("Received response!" + response);
+    }
+}

packages/sdks/java/tester-java/src/main/java/com/metriport/test/GetPatient.java

@@ -0,0 +1,30 @@
+package com.metriport.test;
+
+import io.github.cdimascio.dotenv.Dotenv;
+import com.metriport.api.Metriport;
+
+public class GetPatient {
+    public static void getAllPatients(String[] args) {
+        Dotenv dotenv = Dotenv.load();
+
+        Metriport metriport = Metriport.builder()
+            .apiKey(dotenv.get("API_KEY"))
+            .url(dotenv.get("BASE_URL"))
+            .build();
+
+        var response = metriport.medical().patient().list();
+        System.out.println("Received response!" + response);
+    }
+    public static void getSpecificPatient(String[] args) {
+        Dotenv dotenv = Dotenv.load();
+
+        Metriport metriport = Metriport.builder()
+            .apiKey(dotenv.get("API_KEY"))
+            .url(dotenv.get("BASE_URL"))
+            .build();
+
+        var response = metriport.medical().patient().get();
+        System.out.println("Received response!" + response);
+    }
+
+}

packages/sdks/java/tester-java/src/main/java/com/metriport/test/Main.java

@@ -0,0 +1,18 @@
+package com.metriport.test;
+import io.github.cdimascio.dotenv.Dotenv;
+import com.metriport.api.Metriport;
+import com.metriport.api.resources.commons.types.Address;
+import com.metriport.api.resources.commons.types.UsState;
+import com.metriport.api.resources.medical.organization.types.OrganizationCreate;
+import com.metriport.api.resources.medical.organization.types.OrgType;
+
+
+public class Main {
+    public static void main(String[] args) {
+      // GetOrg.main(args);
+      // GetFacility.main(args);
+      //CreateFacility.main(args); 
+      GetPatient.getAllPatients(args);
+      //GetPatient.getSpecificPatient(args);
+    }
+}

packages/sdks/python/.gitignore

@@ -1,3 +1,4 @@
 generated/
 **/__pycache__/
-*.env
+*.env
+*.pytest_cache/

packages/sdks/python/tests/test_client.py → packages/sdks/python/tester-local/tests/test_client.py

@@ -3,13 +3,16 @@
 from generated.client import Metriport
 from generated import commons
 from generated.resources import medical
-
+import os
 from dotenv import load_dotenv
 
 load_dotenv()
 
+api_key = os.environ.get("METRIPORT_API_KEY")
+base_url = os.environ.get("BASE_URL")
+
 def test_client() -> None:
-    client = Metriport(api_key=get_api_key(), base_url="http://localhost:8080")
+    client = Metriport(api_key=api_key, base_url=base_url)
     response = client.medical.organization.create(request=medical.OrganizationCreate(
       name="my-org", 
       type=medical.OrgType.ACUTE_CARE, 
@@ -23,11 +26,4 @@ def test_client() -> None:
         )
       )
     )
-    print(f"Received response with {response.id}")
-
-
-def get_api_key() -> str:
-    api_key = os.environ.get("METRIPORT_API_KEY")
-    if api_key is None:
-        raise Exception("METRIPORT_API_KEY not found")
-    return api_key
+    print(f"Received response with {response.id}")