CMSgov · jimmyfagan · Jun 13, 2024 · Jun 27, 2024 · Jul 3, 2024 · Jul 17, 2024
diff --git a/Dockerfiles/readme.md b/Dockerfiles/readme.md
@@ -1,4 +1,4 @@
-# Build, Tag, and Publish integration and selenium tests ECR iamge
+# Build, Tag, and Publish integration and selenium tests ECR image
 
 Go to BB2 local repo base directory and do the followings (assume aws cli installed and configured properly):
 

diff --git a/apps/accounts/fixtures/scopes.json b/apps/accounts/fixtures/scopes.json
@@ -1,84 +1,84 @@
 [
-    {
-      "model": "auth.group",
-      "pk": 5,
-      "fields": {
-        "name": "BlueButton",
-        "permissions": []
-      }
-    },
-    {
-        "model": "capabilities.protectedcapability",
-        "pk": 1,
-        "fields": {
-            "title": "My general patient and demographic information.",
-            "slug": "patient/Patient.read",
-            "group": 5,
-            "description": "Patient FHIR Resource",
-            "protected_resources": "[\n  [\n    \"GET\",\n   \"/v[12]/fhir/Patient[/]?$\"\n  ],\n [\n    \"GET\",\n   \"/v[12]/fhir/Patient[/?].*$\"\n  ]\n]",
-            "default": "True"
-        }
-    },
-    {
-        "model": "capabilities.protectedcapability",
-        "pk": 2,
-        "fields": {
-            "title": "Profile information including name and email.",
-            "slug": "profile",
-            "group": 5,
-            "description": "OIDC userinfo endpoint /connect/userinfo",
-            "protected_resources": "[\n  [\n    \"GET\",\n    \"/v[12]/connect/userinfo.*$\"\n  ]\n]",
-            "default": "True"
-        }
-    },
-    {
-        "model": "capabilities.protectedcapability",
-        "pk": 3,
-        "fields": {
-            "title": "My Medicare claim information.",
-            "slug": "patient/ExplanationOfBenefit.read",
-            "group": 5,
-            "description": "ExplanationOfBenefit FHIR Resource",
-            "protected_resources": "[\n  [\n    \"GET\",\n   \"/v[12]/fhir/ExplanationOfBenefit[/]?$\"\n  ],\n  [\n    \"GET\",\n   \"/v[12]/fhir/ExplanationOfBenefit[/?].*$\"\n  ]\n]",
-            "default": "True"
-        }
-    },
-    {
-        "model": "capabilities.protectedcapability",
-        "pk": 4,
-        "fields": {
-            "title": "My Medicare and supplemental coverage information.",
-            "slug": "patient/Coverage.read",
-            "group": 5,
-            "description": "Coverage FHIR Resource",
-            "protected_resources": "[\n  [\n    \"GET\",\n   \"/v[12]/fhir/Coverage[/]?$\"\n  ],\n  [\n    \"GET\",\n   \"/v[12]/fhir/Coverage[/?].*$\"\n  ]\n]",
-            "default": "True"
-        }
-    },
-    {
-        "model": "capabilities.protectedcapability",
-        "pk": 5,
-        "fields": {
-            "title": "Token Management",
-            "slug": "token_management",
-            "group": 5,
-            "description": "Allow an app to manage all of a user's tokens.",
-            "protected_resources": "[]",
-            "protected_resources": "[[\"GET\", \"/some-url\"]]",
-            "default": "False"
-        }
-    },
-    {
-        "model": "capabilities.protectedcapability",
-        "pk": 6,
-        "fields": {
-            "title": "Token Introspect",
-            "slug": "token_introspect",
-            "group": 5,
-            "description": "Allow an app to introspect a user's tokens.",
-            "protected_resources": "[]",
-            "protected_resources": "[[\"POST\", \"/v[12]/o/introspect\"]]",
-            "default": "False"
-        }
+  {
+    "model": "auth.group",
+    "pk": 5,
+    "fields": {
+      "name": "BlueButton",
+      "permissions": []
     }
+  },
+  {
+    "model": "capabilities.protectedcapability",
+    "pk": 1,
+    "fields": {
+      "title": "My general patient and demographic information.",
+      "slug": "patient/Patient.read",
+      "group": 5,
+      "description": "Patient FHIR Resource",
+      "protected_resources": "[\n  [\n    \"GET\",\n   \"/v[12]/fhir/Patient[/]?$\"\n  ],\n [\n    \"GET\",\n   \"/v[12]/fhir/Patient[/?].*$\"\n  ]\n]",
+      "default": "True"
+    }
+  },
+  {
+    "model": "capabilities.protectedcapability",
+    "pk": 2,
+    "fields": {
+      "title": "Profile information including name and email.",
+      "slug": "profile",
+      "group": 5,
+      "description": "OIDC userinfo endpoint /connect/userinfo",
+      "protected_resources": "[\n  [\n    \"GET\",\n    \"/v[12]/connect/userinfo.*$\"\n  ]\n]",
+      "default": "True"
+    }
+  },
+  {
+    "model": "capabilities.protectedcapability",
+    "pk": 3,
+    "fields": {
+      "title": "My Medicare claim information.",
+      "slug": "patient/ExplanationOfBenefit.read",
+      "group": 5,
+      "description": "ExplanationOfBenefit FHIR Resource",
+      "protected_resources": "[\n  [\n    \"GET\",\n   \"/v[12]/fhir/ExplanationOfBenefit[/]?$\"\n  ],\n  [\n    \"GET\",\n   \"/v[12]/fhir/ExplanationOfBenefit[/?].*$\"\n  ]\n]",
+      "default": "True"
+    }
+  },
+  {
+    "model": "capabilities.protectedcapability",
+    "pk": 4,
+    "fields": {
+      "title": "My Medicare and supplemental coverage information.",
+      "slug": "patient/Coverage.read",
+      "group": 5,
+      "description": "Coverage FHIR Resource",
+      "protected_resources": "[\n  [\n    \"GET\",\n   \"/v[12]/fhir/Coverage[/]?$\"\n  ],\n  [\n    \"GET\",\n   \"/v[12]/fhir/Coverage[/?].*$\"\n  ]\n]",
+      "default": "True"
+    }
+  },
+  {
+    "model": "capabilities.protectedcapability",
+    "pk": 5,
+    "fields": {
+      "title": "Token Management",
+      "slug": "token_management",
+      "group": 5,
+      "description": "Allow an app to manage all of a user's tokens.",
+      "protected_resources": "[]",
+      "protected_resources": "[[\"GET\", \"/some-url\"]]",
+      "default": "False"
+    }
+  },
+  {
+    "model": "capabilities.protectedcapability",
+    "pk": 6,
+    "fields": {
+      "title": "Token Introspect",
+      "slug": "token_introspect",
+      "group": 5,
+      "description": "Allow an app to introspect a user's tokens.",
+      "protected_resources": "[]",
+      "protected_resources": "[[\"POST\", \"/v[12]/o/introspect\"]]",
+      "default": "False"
+    }
+  }
 ]
diff --git a/apps/fhir/bluebutton/constants.py b/apps/fhir/bluebutton/constants.py
@@ -1,3 +1,3 @@
-ALLOWED_RESOURCE_TYPES = ['Patient', 'Coverage', 'ExplanationOfBenefit']
+ALLOWED_RESOURCE_TYPES = ['Patient', 'Coverage', 'ExplanationOfBenefit', 'Organization']
 DEFAULT_PAGE_SIZE = 10
 MAX_PAGE_SIZE = 50
diff --git a/apps/fhir/bluebutton/views/fhir_resources/bfd-c4dic-coverage-read.json b/apps/fhir/bluebutton/views/fhir_resources/bfd-c4dic-coverage-read.json
@@ -0,0 +1,79 @@
+{
+  "resourceType": "Coverage",
+  "id": "c4dic-567834",
+  "meta": {
+    "lastUpdated": "2024-06-26T15:40:21.850-07:00",
+    "profile": [
+      "http://hl7.org/fhir/us/insurance-card/StructureDefinition/C4DIC-Coverage|1.1"
+    ]
+  },
+  "contained": [
+    {
+      "resourceType": "Organization",
+      "id": "provider-org",
+      "meta": {
+        "profile": [
+          "http://hl7.org/fhir/us/insurance-card/StructureDefinition/C4DIC-Organization|1.1"
+        ]
+      }
+    }
+  ],
+  "identifier": [
+    {
+      "type": {
+        "coding": [
+          {
+            "system": "http://terminology.hl7.org/CodeSystem/v2-0203",
+            "code": "MB",
+            "display": "Member Number"
+          }
+        ]
+      },
+      "system": "https://bluebutton.cms.gov/resources/variables/bene_id",
+      "value": "567834",
+      "assigner": {
+        "reference": "#provider-org"
+      }
+    }
+  ],
+  "type": {
+    "coding": [
+      {
+        "system": "http://terminology.hl7.org/CodeSystem/v3-ActCode",
+        "code": "SUBSIDIZ"
+      }
+    ]
+  },
+  "subscriberId": "3456789",
+  "beneficiary": {
+    "reference": "Patient/567834"
+  },
+  "relationship": {
+    "coding": [
+      {
+        "system": "http://terminology.hl7.org/CodeSystem/subscriber-relationship",
+        "code": "self",
+        "display": "Self"
+      }
+    ]
+  },
+  "payor": [
+    {
+      "reference": "#provider-org"
+    }
+  ],
+  "class": [
+    {
+      "type": {
+        "coding": [
+          {
+            "system": "http://terminology.hl7.org/CodeSystem/coverage-class",
+            "code": "group",
+            "display": "Group"
+          }
+        ]
+      },
+      "value": "Medicare"
+    }
+  ]
+}
diff --git a/apps/fhir/bluebutton/views/fhir_resources/bfd-c4dic-coverage-search.json b/apps/fhir/bluebutton/views/fhir_resources/bfd-c4dic-coverage-search.json
@@ -0,0 +1,98 @@
+{
+  "resourceType": "Bundle",
+  "id": "0c217c0f-79aa-423f-b770-1537a957fd9f",
+  "meta": {
+    "lastUpdated": "2024-06-26T15:40:22.104-07:00"
+  },
+  "type": "searchset",
+  "total": 1,
+  "link": [
+    {
+      "relation": "self",
+      "url": "https://localhost:6500/v2/fhir/Coverage?_format=json&_profile=http%3A%2F%2Fhl7.org%2Ffhir%2Fus%2Finsurance-card%2FStructureDefinition%2FC4DIC-Coverage&beneficiary=567834"
+    }
+  ],
+  "entry": [
+    {
+      "resource": {
+        "resourceType": "Coverage",
+        "id": "c4dic-567834",
+        "meta": {
+          "lastUpdated": "2024-06-26T15:40:21.850-07:00",
+          "profile": [
+            "http://hl7.org/fhir/us/insurance-card/StructureDefinition/C4DIC-Coverage|1.1"
+          ]
+        },
+        "contained": [
+          {
+            "resourceType": "Organization",
+            "id": "provider-org",
+            "meta": {
+              "profile": [
+                "http://hl7.org/fhir/us/insurance-card/StructureDefinition/C4DIC-Organization|1.1"
+              ]
+            }
+          }
+        ],
+        "identifier": [
+          {
+            "type": {
+              "coding": [
+                {
+                  "system": "http://terminology.hl7.org/CodeSystem/v2-0203",
+                  "code": "MB",
+                  "display": "Member Number"
+                }
+              ]
+            },
+            "system": "https://bluebutton.cms.gov/resources/variables/bene_id",
+            "value": "567834",
+            "assigner": {
+              "reference": "#provider-org"
+            }
+          }
+        ],
+        "type": {
+          "coding": [
+            {
+              "system": "http://terminology.hl7.org/CodeSystem/v3-ActCode",
+              "code": "SUBSIDIZ"
+            }
+          ]
+        },
+        "subscriberId": "3456789",
+        "beneficiary": {
+          "reference": "Patient/567834"
+        },
+        "relationship": {
+          "coding": [
+            {
+              "system": "http://terminology.hl7.org/CodeSystem/subscriber-relationship",
+              "code": "self",
+              "display": "Self"
+            }
+          ]
+        },
+        "payor": [
+          {
+            "reference": "#provider-org"
+          }
+        ],
+        "class": [
+          {
+            "type": {
+              "coding": [
+                {
+                  "system": "http://terminology.hl7.org/CodeSystem/coverage-class",
+                  "code": "group",
+                  "display": "Group"
+                }
+              ]
+            },
+            "value": "Medicare"
+          }
+        ]
+      }
+    }
+  ]
+}