LEGLINK-871: manifest.ndjson Device and List resources are missing meta.profile (#1833)

Add missing profiles in submission

Co-authored-by: John Britton <johnbritton@users.noreply.github.com>

Author: smailliwcs

DotNet/Automation.Link/Validation/ReportAbsManifestValidator.cs

@@ -13,6 +13,12 @@ public class ReportAbsManifestValidator
     private const int MaxErrors = 200;
     private const string ApplicablePeriodExtensionUrl = "http://www.cdc.gov/nhsn/fhirportal/dqm/ig/StructureDefinition/link-patient-list-applicable-period-extension";
 
+    // NHSN DQM IG profiles the Report service stamps on the manifest resources
+    // (Report.ReportConstants.BundleSettings). Asserted here so a regression that drops
+    // meta.profile fails the automation suite rather than the downstream IG validator.
+    private const string DeviceProfileUrl = "http://hl7.org/fhir/us/nhsn-dqm/StructureDefinition/nhsn-submitting-device";
+    private const string PatientListProfileUrl = "http://hl7.org/fhir/us/nhsn-dqm/StructureDefinition/poi-list";
+
     /// <summary>
     /// Controls expected derived OperationOutcome writes per failed-validation patient.
     /// </summary>
@@ -323,6 +329,12 @@ private void ValidateManifest(
         if (deviceResources.Count != 1) AddError(errors, $"Manifest should contain exactly one Device resource. Actual={deviceResources.Count}");
         if (listResources.Count != 1) AddError(errors, $"Manifest should contain exactly one List resource. Actual={listResources.Count}");
 
+        foreach (var device in deviceResources)
+            ValidateMetaProfile(device, "Device", DeviceProfileUrl, errors);
+
+        foreach (var list in listResources)
+            ValidateMetaProfile(list, "List", PatientListProfileUrl, errors);
+
         var patientList = listResources.FirstOrDefault();
         if (patientList.ValueKind == JsonValueKind.Undefined)
         {
@@ -791,6 +803,51 @@ private List<JsonElement> ParseNdjson(string ndjson, string fileName, List<strin
         return resources;
     }
 
+    /// <summary>
+    /// Asserts that a manifest resource declares the NHSN DQM IG profile it is meant to conform to.
+    /// Downstream IG validation cannot resolve the resource without it.
+    /// </summary>
+    private static void ValidateMetaProfile(
+        JsonElement resource,
+        string resourceType,
+        string expectedProfileUrl,
+        List<string> errors)
+    {
+        var profiles = GetMetaProfiles(resource);
+
+        if (profiles.Count == 0)
+        {
+            AddError(errors, $"Manifest {resourceType} is missing meta.profile. Expected '{expectedProfileUrl}'.");
+            return;
+        }
+
+        if (!profiles.Contains(expectedProfileUrl, StringComparer.Ordinal))
+            AddError(errors, $"Manifest {resourceType} meta.profile mismatch. Expected '{expectedProfileUrl}', actual [{string.Join(", ", profiles)}].");
+    }
+
+    private static List<string> GetMetaProfiles(JsonElement resource)
+    {
+        var profiles = new List<string>();
+
+        if (!resource.TryGetProperty("meta", out var meta) || meta.ValueKind != JsonValueKind.Object)
+            return profiles;
+
+        if (!meta.TryGetProperty("profile", out var profileArr) || profileArr.ValueKind != JsonValueKind.Array)
+            return profiles;
+
+        foreach (var profile in profileArr.EnumerateArray())
+        {
+            if (profile.ValueKind == JsonValueKind.String)
+            {
+                var value = profile.GetString();
+                if (!string.IsNullOrWhiteSpace(value))
+                    profiles.Add(value);
+            }
+        }
+
+        return profiles;
+    }
+
     private static bool IsType(JsonElement resource, string type) =>
         string.Equals(GetString(resource, "resourceType"), type, StringComparison.OrdinalIgnoreCase);
 

DotNet/Report/Application/Settings/ReportConstants.cs

@@ -15,7 +15,7 @@ public static class BundleSettings
             public const string BundlingUrlBase = "https://www.cdc.gov/nhsn/nhsn-measures";
             public const string BundlingFullUrlFormat = BundlingUrlBase + "/{0}";
             public const string CdcOrgIdSystem = "https://www.cdc.gov/nhsn/OrgID";
-            public const string CensusProfileUrl = "https://www.cdc.gov/nhsn/nhsn-measures/StructureDefinition/poi-list";
+            public const string CensusProfileUrl = "http://hl7.org/fhir/us/nhsn-dqm/StructureDefinition/poi-list";
             public const string DataAbsentReasonExtensionUrl = "http://hl7.org/fhir/StructureDefinition/data-absent-reason";
             public const string DataAbsentReasonUnknownCode = "unknown";
             public const string IdentifierSystem = "urn:ietf:rfc:3986";
@@ -25,6 +25,7 @@ public static class BundleSettings
             public const string OrganizationTypeSystem = "http://terminology.hl7.org/CodeSystem/organization-type";
             public const string ReportBundleProfileUrl = "https://www.cdc.gov/nhsn/nhsn-measures/StructureDefinition/nhsn-measurereport-bundle";
             public const string SubjectListMeasureReportProfile = "http://www.cdc.gov/nhsn/fhirportal/dqm/ig/StructureDefinition/subjectlist-measurereport";
+            public const string SubmittingDeviceProfile = "http://hl7.org/fhir/us/nhsn-dqm/StructureDefinition/nhsn-submitting-device";
             public const string SubmittingOrganizationProfile = "https://www.cdc.gov/nhsn/nhsn-measures/StructureDefinition/nhsn-submitting-organization";
         }
 

DotNet/Report/KafkaProducers/ReportManifestProducer.cs

@@ -158,7 +158,10 @@ public virtual async Task<bool> Produce(ReportScheduleModel schedule, string cor
 
         private Device CreateDevice()
         {
-            var device = new Device();
+            var device = new Device
+            {
+                Meta = new Meta { Profile = [ReportConstants.BundleSettings.SubmittingDeviceProfile] }
+            };
             device.DeviceName.Add(new Device.DeviceNameComponent()
             {
                 Name = "NHSNLink"
@@ -180,6 +183,7 @@ private Device CreateDevice()
         private List CreatePatientList(List<string> patientIds, DateTime startDate, DateTime endDate)
         {
             var admittedPatients = new List();
+            admittedPatients.Meta = new Meta { Profile = [ReportConstants.BundleSettings.CensusProfileUrl] };
             admittedPatients.Status = List.ListStatus.Current;
             admittedPatients.Mode = ListMode.Snapshot;
             admittedPatients.Extension.Add(new Extension()

DotNet/ServiceTests/UnitTests/Automation/ReportAbsManifestValidatorTests.cs

@@ -16,6 +16,8 @@ public class ReportAbsManifestValidatorTests
 {
     private const string ExpectedStart = "2025-01-01T00:00:00Z";
     private const string ExpectedEnd = "2025-01-31T23:59:59Z";
+    private const string DeviceProfile = "http://hl7.org/fhir/us/nhsn-dqm/StructureDefinition/nhsn-submitting-device";
+    private const string PatientListProfile = "http://hl7.org/fhir/us/nhsn-dqm/StructureDefinition/poi-list";
 
     [Fact]
     public async Task ValidateAllAsync_WithMockExternalAbsFromGeneratedData_Passes()
@@ -269,12 +271,67 @@ public async Task ValidateAllAsync_WithUnexpectedMeasureId_Fails()
         Assert.Contains("VALIDATION failed", ex.Message, StringComparison.OrdinalIgnoreCase);
     }
 
+    [Fact]
+    public async Task ValidateAllAsync_WhenDeviceIsMissingProfile_Fails()
+    {
+        var output = new BufferingAutomationOutput();
+        var (patientIds, bundles) = FhirBundleGenerator.Generate(output, patientCount: 1, totalResourcesPerPatient: 120);
+        var patientId = patientIds.Single();
+
+        var mockExternalAbsResources = BuildMockExternalAbsResources(
+            patientId, bundles, "MEASURE-UT-4", ExpectedStart, ExpectedEnd, deviceProfile: null);
+
+        var validator = new ReportAbsManifestValidator(output, CreatePipelineDataReader());
+
+        await Assert.ThrowsAsync<InvalidOperationException>(() =>
+            validator.ValidateAllAsync(
+                mockExternalAbsResources,
+                new[] { patientId },
+                "MEASURE-UT-4",
+                ExpectedStart,
+                ExpectedEnd));
+
+        Assert.Contains(output.Lines, line =>
+            line.Contains("Manifest Device is missing meta.profile", StringComparison.OrdinalIgnoreCase));
+    }
+
+    [Fact]
+    public async Task ValidateAllAsync_WhenPatientListProfileIsWrong_Fails()
+    {
+        var output = new BufferingAutomationOutput();
+        var (patientIds, bundles) = FhirBundleGenerator.Generate(output, patientCount: 1, totalResourcesPerPatient: 120);
+        var patientId = patientIds.Single();
+
+        var mockExternalAbsResources = BuildMockExternalAbsResources(
+            patientId,
+            bundles,
+            "MEASURE-UT-5",
+            ExpectedStart,
+            ExpectedEnd,
+            patientListProfile: "https://www.cdc.gov/nhsn/nhsn-measures/StructureDefinition/poi-list");
+
+        var validator = new ReportAbsManifestValidator(output, CreatePipelineDataReader());
+
+        await Assert.ThrowsAsync<InvalidOperationException>(() =>
+            validator.ValidateAllAsync(
+                mockExternalAbsResources,
+                new[] { patientId },
+                "MEASURE-UT-5",
+                ExpectedStart,
+                ExpectedEnd));
+
+        Assert.Contains(output.Lines, line =>
+            line.Contains("Manifest List meta.profile mismatch", StringComparison.OrdinalIgnoreCase));
+    }
+
     private static Dictionary<string, object> BuildMockExternalAbsResources(
         string patientId,
         IReadOnlyList<(string Name, string Json)> bundles,
         string measureId,
         string start,
-        string end)
+        string end,
+        string? deviceProfile = DeviceProfile,
+        string? patientListProfile = PatientListProfile)
     {
         var generatedPatientJson = ExtractGeneratedPatientJson(patientId, bundles);
 
@@ -290,18 +347,18 @@ private static Dictionary<string, object> BuildMockExternalAbsResources(
                 resourceType = "Organization",
                 id = orgId
             }),
-            JsonSerializer.Serialize(new
+            SerializeWithOptionalProfile(deviceProfile, new Dictionary<string, object>
             {
-                resourceType = "Device",
-                id = deviceId
+                ["resourceType"] = "Device",
+                ["id"] = deviceId
             }),
-            JsonSerializer.Serialize(new
+            SerializeWithOptionalProfile(patientListProfile, new Dictionary<string, object>
             {
-                resourceType = "List",
-                id = "PatientList-UT",
-                status = "current",
-                mode = "snapshot",
-                extension = new object[]
+                ["resourceType"] = "List",
+                ["id"] = "PatientList-UT",
+                ["status"] = "current",
+                ["mode"] = "snapshot",
+                ["extension"] = new object[]
                 {
                     new
                     {
@@ -313,7 +370,7 @@ private static Dictionary<string, object> BuildMockExternalAbsResources(
                         }
                     }
                 },
-                entry = new object[]
+                ["entry"] = new object[]
                 {
                     new { item = new { reference = $"Patient/{patientId}" } }
                 }
@@ -373,11 +430,12 @@ private static Dictionary<string, object> BuildAbsResourcesWithExtraOperationOut
         var manifestNdjson = string.Join("\n", new[]
         {
             JsonSerializer.Serialize(new { resourceType = "Organization", id = "Org-UT" }),
-            JsonSerializer.Serialize(new { resourceType = "Device", id = "Device-UT" }),
+            JsonSerializer.Serialize(new { resourceType = "Device", id = "Device-UT", meta = new { profile = new[] { DeviceProfile } } }),
             JsonSerializer.Serialize(new
             {
                 resourceType = "List",
                 id = "PatientList-UT",
+                meta = new { profile = new[] { PatientListProfile } },
                 status = "current",
                 mode = "snapshot",
                 extension = new object[]
@@ -437,6 +495,18 @@ private static Dictionary<string, object> BuildAbsResourcesWithExtraOperationOut
         };
     }
 
+    /// <summary>
+    /// Serializes a manifest resource, adding meta.profile only when a profile is supplied so
+    /// tests can model a resource that is missing it entirely.
+    /// </summary>
+    private static string SerializeWithOptionalProfile(string? profile, Dictionary<string, object> resource)
+    {
+        if (profile != null)
+            resource["meta"] = new { profile = new[] { profile } };
+
+        return JsonSerializer.Serialize(resource);
+    }
+
     private static string ExtractGeneratedPatientJson(string patientId, IReadOnlyList<(string Name, string Json)> bundles)
     {
         foreach (var (_, bundleJson) in bundles)
@@ -474,11 +544,12 @@ private static Dictionary<string, object> BuildAbsResourcesForSingleReportableMe
         var manifestNdjson = string.Join("\n", new[]
         {
             JsonSerializer.Serialize(new { resourceType = "Organization", id = "Org-UT" }),
-            JsonSerializer.Serialize(new { resourceType = "Device", id = "Device-UT" }),
+            JsonSerializer.Serialize(new { resourceType = "Device", id = "Device-UT", meta = new { profile = new[] { DeviceProfile } } }),
             JsonSerializer.Serialize(new
             {
                 resourceType = "List",
                 id = "PatientList-UT",
+                meta = new { profile = new[] { PatientListProfile } },
                 status = "current",
                 mode = "snapshot",
                 extension = new object[]