Merge branch 'dev' of https://github.com/lantanagroup/link-cloud into user/ariana/LEGLINK-961-MeasureEval-handleFhirResourceswithIdenticalds

Author: arianamihailescu

DotNet/ServiceTests/UnitTests/Terminology/Services/FhirServiceTests.cs

@@ -1394,6 +1394,69 @@ public void GetValueSets_ReturnsListOfValueSets()
 
     #region GetCodeSystems Tests
 
+    [Fact]
+    public void GetCodeSystemById_WithCachedCodes_SetsContentToComplete()
+    {
+        // Arrange
+        var codeSystemId = "test-code-system";
+        var codeSystem = new CodeSystem
+        {
+            Id = codeSystemId,
+            Content = CodeSystemContentMode.NotPresent
+        };
+        var mockCodeGroup = new CodeGroup
+        {
+            Id = codeSystemId,
+            Type = CodeGroup.CodeGroupTypes.CodeSystem,
+            Resource = codeSystem,
+            Codes = new Dictionary<string, List<Code>>
+            {
+                { "http://test.system", new List<Code> { new() { Value = "test-code", Display = "Test Code" } } }
+            }
+        };
+
+        _mockCacheService
+            .Setup(x => x.GetCodeGroupById(CodeGroup.CodeGroupTypes.CodeSystem, codeSystemId, It.IsAny<string>()))
+            .Returns(mockCodeGroup);
+
+        // Act
+        var result = _service.GetCodeSystemById(codeSystemId);
+
+        // Assert
+        Assert.NotNull(result);
+        Assert.Equal(CodeSystemContentMode.Complete, result.Content);
+    }
+
+    [Fact]
+    public void GetCodeSystemById_WithoutCachedCodes_PreservesContentMode()
+    {
+        // Arrange
+        var codeSystemId = "test-empty-code-system";
+        var codeSystem = new CodeSystem
+        {
+            Id = codeSystemId,
+            Content = CodeSystemContentMode.NotPresent
+        };
+        var mockCodeGroup = new CodeGroup
+        {
+            Id = codeSystemId,
+            Type = CodeGroup.CodeGroupTypes.CodeSystem,
+            Resource = codeSystem,
+            Codes = new Dictionary<string, List<Code>>()
+        };
+
+        _mockCacheService
+            .Setup(x => x.GetCodeGroupById(CodeGroup.CodeGroupTypes.CodeSystem, codeSystemId, It.IsAny<string>()))
+            .Returns(mockCodeGroup);
+
+        // Act
+        var result = _service.GetCodeSystemById(codeSystemId);
+
+        // Assert
+        Assert.NotNull(result);
+        Assert.Equal(CodeSystemContentMode.NotPresent, result.Content);
+    }
+
     [Fact]
     public void GetCodeSystems_WithDuplicateCode_EmitsSingleConceptWithLastDisplay()
     {

DotNet/Terminology/Services/FhirService.cs

@@ -183,7 +183,11 @@ public CodeSystem GetCodeSystemById(string id)
             throw new KeyNotFoundException($"Code system not found with ID {id}");
         }
 
-        return codeGroup.Resource as CodeSystem;
+        var codeSystem = codeGroup.Resource as CodeSystem;
+        if(codeSystem != null && codeSystem.Content == CodeSystemContentMode.NotPresent && codeGroup.Codes.Values.Any(c => c.Count > 0))
+            codeSystem.Content = CodeSystemContentMode.Complete;
+
+        return codeSystem;
     }
 
     public Bundle GetCodeSystems(string? url, SummaryType? summary)
@@ -212,6 +216,8 @@ public Bundle GetCodeSystems(string? url, SummaryType? summary)
                 }
 
                 CodeSystem clone = (CodeSystem)codeGroup.Resource.DeepCopy();
+                if (clone.Content == CodeSystemContentMode.NotPresent && codeGroup.Codes.Values.Any(c => c.Count > 0))
+                    clone.Content = CodeSystemContentMode.Complete;
 
                 if (summary != SummaryType.True)
                 {