Merge branch 'develop' into Slice-fixes

Author: igajurelNCQA

Cql/CoreTests/Packaging/CqlTypeToFhirTypeMapperTests.cs

@@ -44,18 +44,6 @@ public void TypeEntryFor_CqlPrimitiveTypeListWithoutElementType_ThrowsArgumentNu
         mapper.TypeEntryFor(CqlPrimitiveType.List);
     }
 
-    [TestMethod]
-    [ExpectedException(typeof(NotSupportedException))]
-    public void TypeEntryFor_CqlPrimitiveTypeLong_ThrowsNotSupportedException()
-    {
-        // Arrange
-        var typeResolver = new FhirTypeResolver(ModelInfo.ModelInspector);
-        var mapper = new CqlTypeToFhirTypeMapper(typeResolver);
-
-        // Act
-        mapper.TypeEntryFor(CqlPrimitiveType.Long);
-    }
-
     [TestMethod]
     public void TypeEntryFor_CqlPrimitiveTypeListWithElementType_ReturnsFhirList()
     {
@@ -109,4 +97,20 @@ public void TypeEntryFor_CqlValueTupleType_ReturnsFhirBasic()
         Assert.AreEqual(FHIRAllTypes.Basic, result.FhirType);
         Assert.AreEqual(CqlPrimitiveType.Tuple, result.CqlType);
     }
+
+    [TestMethod]
+    public void TypeEntryFor_CqlLongTypeTuple_ReturnsFhirString()
+    {
+        // Arrange
+        var typeResolver = new FhirTypeResolver(ModelInfo.ModelInspector);
+        var mapper = new CqlTypeToFhirTypeMapper(typeResolver);
+
+        // Act
+        var result = mapper.TypeEntryFor(CqlPrimitiveType.Long);
+
+        // Assert
+        Assert.IsNotNull(result);
+        Assert.AreEqual(FHIRAllTypes.String, result.FhirType);
+        Assert.AreEqual(CqlPrimitiveType.Long, result.CqlType);
+    }
 }

Cql/Cql.Packaging/CqlTypeToFhirTypeMapper.cs

@@ -131,8 +131,7 @@ public CqlTypeToFhirTypeMapper(TypeResolver typeResolver, ModelInspector modelIn
                     return new CqlTypeToFhirMapping(FHIRAllTypes.DateTime, cqlType);
                 case CqlPrimitiveType.Long:
 #if FhirReleaseR4
-                    // integer64 only supported in R5. Compare https://hl7.org/fhir/R4/datatypes.html vs https://hl7.org/fhir/R5/datatypes.html
-                    throw new NotSupportedException("No mapping from CQL Long to FHIR in release 4 (see https://hl7.org/fhir/R4/datatypes.html)");
+                      return new CqlTypeToFhirMapping(FHIRAllTypes.String, cqlType);
 //#else FhirReleaseR5
 //                    return new CqlTypeToFhirMapping(FHIRAllTypes.Integer64, cqlType);
 #endif
@@ -383,4 +382,4 @@ public record CqlTypeToFhirMapping(
       CqlPrimitiveType? CqlType,
       CqlTypeToFhirMapping? ElementType = null
     );
-}
+}