Merge branch 'refs/heads/main' into EFS-985-add-subset-of-Subscription-schema

Author: imranq2

.github/workflows/publish_docker.yml

@@ -1,33 +1,41 @@
 name: publish_docker
 
 on:
-    release:
-        types: [created]
+  release:
+    types: [created]
 
 jobs:
-    main:
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout Master
-              uses: actions/checkout@v4
-            - name: Set up QEMU
-              uses: docker/setup-qemu-action@v2
-            - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@v2
-            - name: Login to DockerHub
-              uses: docker/login-action@v2
-              with:
-                  username: ${{ secrets.DOCKERHUB_USERNAME }}
-                  password: ${{ secrets.DOCKERHUB_TOKEN }}
-            - name: Get Previous tag
-              id: previoustag
-              uses: WyriHaximus/github-action-get-previous-tag@v1
-            - name: Build and push
-              id: docker_build
-              uses: docker/build-push-action@v3
-              with:
-                  push: true
-                  platforms: linux/amd64,linux/arm64
-                  tags: imranq2/node-fhir-server-mongo:latest, imranq2/node-fhir-server-mongo:${{ steps.previoustag.outputs.tag }}
-            - name: Image digest
-              run: echo ${{ steps.docker_build.outputs.digest }}
+  main:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Master
+        uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Get Previous tag
+        id: previoustag
+        uses: WyriHaximus/github-action-get-previous-tag@v1
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v3
+        with:
+          push: true
+          platforms: linux/amd64,linux/arm64
+          tags: imranq2/node-fhir-server-mongo:latest, imranq2/node-fhir-server-mongo:${{ steps.previoustag.outputs.tag }}
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}
+      - name: Build Status badge
+        uses: peterrhodesdev/[email protected]
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          filename: build_status
+          label: 'Build Status'
+          message: ${{ steps.docker_build.outcome }}
+          color: ${{ steps.docker_build.outcome == 'success' && '5ACD57' || 'FF0000' }}

README.md

@@ -1,6 +1,6 @@
-![Node.js CI](https://github.com/imranq2/node-fhir-server-mongo/workflows/Node.js%20CI/badge.svg)
+![Testcase status](https://github.com/imranq2/node-fhir-server-mongo/workflows/Node.js%20CI/badge.svg)
 
-![publish_docker](https://github.com/imranq2/node-fhir-server-mongo/workflows/publish_docker/badge.svg)
+![Build Status](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/wiki/icanbwell/fhir-server/build_status.md)
 
 ## Intro
 

src/graphql/dataSource.js

@@ -228,7 +228,13 @@ class FhirDataSource {
         const requestedResources = info
             .fieldNodes[0]
             .selectionSet
-            ?.selections?.map(s => s.typeCondition?.name?.value)
+            ?.selections?.map(s => {
+                if (s.kind === 'FragmentSpread' && info.fragments) {
+                    return info.fragments[s.name.value]?.typeCondition?.name?.value
+                } else {
+                    return s.typeCondition?.name?.value;
+                }
+            })
             ?.filter(s => s) || [];
 
         if (!reference.reference) {

src/tests/common.js

@@ -1,3 +1,4 @@
+const cron = require('node-cron');
 const env = require('var');
 const { jest } = require('@jest/globals');
 
@@ -87,6 +88,7 @@ module.exports.createTestRequest = async (fnUpdateContainer) => {
 module.exports.commonBeforeEach = async () => {
     // noinspection DynamicallyGeneratedCodeJS
     jest.setTimeout(30000);
+    cron.schedule = jest.fn();
     env.VALIDATE_SCHEMA = true;
     const urlObject = new URL(env.AUTH_JWKS_URL);
     jwksEndpoint(urlObject.protocol + '//' + urlObject.host, urlObject.pathname, [

src/tests/graphql/fragments/fixtures/expectedResponse.json

@@ -0,0 +1,34 @@
+{
+  "entry": [
+    {
+      "resource": {
+        "id": "2",
+        "provider": {
+          "__typename": "Practitioner",
+          "name": [
+            {
+              "family": "Azamar",
+              "given": ["Daniel"]
+            }
+          ]
+        }
+      }
+    },
+    {
+      "resource": {
+        "id": "3",
+        "provider": null
+      }
+    },
+    {
+      "resource": {
+        "id": "1",
+        "provider": {
+          "__typename": "Organization",
+          "orgName": "Testing"
+        }
+      }
+    }
+  ],
+  "meta": null
+}