Fix handling of mismatched datapoints against CDM (#630)

This was causing issues, because the code assumed that if there was no identity with `Id` in the datapoints request, it must be there using `ExternalId`. Now that we can use `InstanceId` instead, that was no longer correct.

I've fixed the issue, and also made it so that we throw an explicit exception if this should ever happen again.

There's an implicit ordering here. _Technically_ a caller could reference a timeseries in multiple ways in the same request, but I think it's fair to call that outside of what we want to support. None of our extractors currently do this, and I think it would fail against the timeseries API at another time.

Author: einarmo

Cognite.Extensions/TimeSeries/DataPointResultHandlers.cs

@@ -137,7 +137,19 @@ public static IDictionary<Identity, IEnumerable<Datapoint>> CleanFromError(
 
             foreach (var ts in timeseries)
             {
-                var idt = datapoints.ContainsKey(Identity.Create(ts.Id)) ? Identity.Create(ts.Id) : Identity.Create(ts.ExternalId);
+                Identity idt;
+                if (datapoints.ContainsKey(Identity.Create(ts.Id))) idt = Identity.Create(ts.Id);
+                else if (ts.InstanceId != null && datapoints.ContainsKey(Identity.Create(ts.InstanceId))) idt = Identity.Create(ts.InstanceId);
+                else if (ts.ExternalId != null && datapoints.ContainsKey(Identity.Create(ts.ExternalId))) idt = Identity.Create(ts.ExternalId);
+                else
+                {
+                    // This should not happen, and would indicate a bug in CDF itself, or some future
+                    // change to the timeseries API that would make this possible. Throw an explicit exception,
+                    // there is no safe recovery possible here, since we don't have a way to communicate to the caller
+                    // to remove this timeseries, since we don't know how to identify it in the original request.
+                    throw new InvalidOperationException($"Retrieved timeseries {ts.Id} which was not requested");
+                }
+
                 var points = datapoints[idt];
 
                 var bad = new List<Datapoint>();

version

@@ -1 +1 @@
-1.39.0
+1.39.1