Update mongodb api

Author: webprofusion-chrisc

API/OCM.Net/OCM.API.Core/Util/CacheProviderMongoDB.cs

@@ -297,7 +297,9 @@ public async Task InsertAllPOI(IEnumerable<OCM.API.Common.Model.ChargePoint> poi
             if (updateStrategy == CacheUpdateStrategy.Incremental)
             {
                 var poiCollection = database.GetCollection<POIMongoDB>("poi");
-                var maxPOI = await poiCollection.AsQueryable().OrderByDescending(s => s.DateLastStatusUpdate).FirstAsync();
+                var maxPOI = await MongoDB.Driver.Linq.MongoQueryable.FirstOrDefaultAsync(
+                    poiCollection.AsQueryable().OrderByDescending(s => s.DateLastStatusUpdate)
+                );
 
                 int maxId = 0;
                 if (maxPOI != null) { maxId = maxPOI.ID; }
@@ -320,7 +322,9 @@ public async Task InsertAllPOI(IEnumerable<OCM.API.Common.Model.ChargePoint> poi
             if (updateStrategy == CacheUpdateStrategy.Modified)
             {
                 var poiCollection = database.GetCollection<POIMongoDB>("poi");
-                var maxPOI = await poiCollection.AsQueryable().OrderByDescending(s => s.DateLastStatusUpdate).FirstOrDefaultAsync();
+                var maxPOI = await MongoDB.Driver.Linq.MongoQueryable.FirstOrDefaultAsync(
+                    poiCollection.AsQueryable().OrderByDescending(s => s.DateLastStatusUpdate)
+                );
 
                 DateTime? dateLastModified = null;
                 if (maxPOI != null) { dateLastModified = maxPOI.DateLastStatusUpdate.Value.AddMinutes(-10); }
@@ -352,7 +356,7 @@ public async Task InsertAllPOI(IEnumerable<OCM.API.Common.Model.ChargePoint> poi
                 var stopwatch = Stopwatch.StartNew();
 
                 // get data list, include navigation properties to improve query performance
-                var list = await dataList.ToListAsync();
+                var list = await Microsoft.EntityFrameworkCore.EntityFrameworkQueryableExtensions.ToListAsync(dataList);
 
                 stopwatch.Stop();
 
@@ -760,7 +764,9 @@ public async Task<MirrorStatus> GetMirrorStatus(bool includeDupeCheck, bool incl
             try
             {
                 var statusCollection = database.GetCollection<MirrorStatus>("status");
-                var currentStatus = await statusCollection.AsQueryable().FirstOrDefaultAsync();
+                var currentStatus = await MongoDB.Driver.Linq.MongoQueryable.FirstOrDefaultAsync(
+                    statusCollection.AsQueryable()
+                );
 
                 if (currentStatus == null)
                 {
@@ -776,10 +782,10 @@ public async Task<MirrorStatus> GetMirrorStatus(bool includeDupeCheck, bool incl
                 {
                     using (var db = new OCMEntities())
                     {
-                        currentStatus.TotalPOIInDB = await db.ChargePoints.LongCountAsync();
-                        currentStatus.LastPOIUpdate = await db.ChargePoints.MaxAsync(i => i.DateLastStatusUpdate);
-                        currentStatus.LastPOICreated = await db.ChargePoints.MaxAsync(i => i.DateCreated);
-                        currentStatus.MaxPOIId = await db.ChargePoints.MaxAsync(i => i.Id);
+                        currentStatus.TotalPOIInDB = await Microsoft.EntityFrameworkCore.EntityFrameworkQueryableExtensions.LongCountAsync(db.ChargePoints);
+                        currentStatus.LastPOIUpdate = await Microsoft.EntityFrameworkCore.EntityFrameworkQueryableExtensions.MaxAsync(db.ChargePoints, i => i.DateLastStatusUpdate);
+                        currentStatus.LastPOICreated = await Microsoft.EntityFrameworkCore.EntityFrameworkQueryableExtensions.MaxAsync(db.ChargePoints, i => i.DateCreated);
+                        currentStatus.MaxPOIId = await Microsoft.EntityFrameworkCore.EntityFrameworkQueryableExtensions.MaxAsync(db.ChargePoints, i => i.Id);
                     }
                 }
                 else
@@ -795,8 +801,9 @@ public async Task<MirrorStatus> GetMirrorStatus(bool includeDupeCheck, bool incl
                 {
                     //perform check to see if number of distinct ids!= number of pois
                     var poiCollection = database.GetCollection<POIMongoDB>("poi");
-                    currentStatus.NumDistinctPOIs = await poiCollection.AsQueryable().DistinctBy(d => d.ID).CountAsync();
-
+                    currentStatus.NumDistinctPOIs = await MongoDB.Driver.Linq.MongoQueryable.CountAsync(
+                        poiCollection.AsQueryable().DistinctBy(d => d.ID)
+                    );
                 }
 
                 var serverInfo = client.Settings.Servers.FirstOrDefault();
@@ -1359,7 +1366,7 @@ public static Task<List<TSource>> ToListAsyncSafe<TSource>(
                 throw new ArgumentNullException(nameof(source));
             if (!(source is IAsyncEnumerable<TSource>))
                 return Task.FromResult(source.ToList());
-            return source.ToListAsync();
+            return Microsoft.EntityFrameworkCore.EntityFrameworkQueryableExtensions.ToListAsync(source);
         }
     }
 }