From a1df9bf5a5a0aa695b6ee88bddc2f93873295a36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Fri, 22 Jan 2021 10:27:02 +0300
Subject: [PATCH] Use async queryable in startup templates.

---
 .../MongoDb/MongoDbMyProjectNameDbSchemaMigrator.cs       | 8 +++-----
 .../EntityFrameworkCore/Samples/SampleRepositoryTests.cs  | 2 +-
 .../MongoDb/Samples/SampleRepositoryTests.cs              | 3 +--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDb/MongoDbMyProjectNameDbSchemaMigrator.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDb/MongoDbMyProjectNameDbSchemaMigrator.cs
index 395ff28b39..2a00826ba7 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDb/MongoDbMyProjectNameDbSchemaMigrator.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDb/MongoDbMyProjectNameDbSchemaMigrator.cs
@@ -18,15 +18,15 @@ namespace MyCompanyName.MyProjectName.MongoDB
             _serviceProvider = serviceProvider;
         }
 
-        public Task MigrateAsync()
+        public async Task MigrateAsync()
         {
             var dbContexts = _serviceProvider.GetServices<IAbpMongoDbContext>();
-            var connectionStringResolver = _serviceProvider.GetService<IConnectionStringResolver>();
+            var connectionStringResolver = _serviceProvider.GetRequiredService<IConnectionStringResolver>();
 
             foreach (var dbContext in dbContexts)
             {
                 var connectionString =
-                    connectionStringResolver.Resolve(
+                    await connectionStringResolver.ResolveAsync(
                         ConnectionStringNameAttribute.GetConnStringName(dbContext.GetType()));
                 var mongoUrl = new MongoUrl(connectionString);
                 var databaseName = mongoUrl.DatabaseName;
@@ -39,8 +39,6 @@ namespace MyCompanyName.MyProjectName.MongoDB
 
                 (dbContext as AbpMongoDbContext)?.InitializeCollections(client.GetDatabase(databaseName));
             }
-
-            return Task.CompletedTask;
         }
     }
 }
diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/Samples/SampleRepositoryTests.cs b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/Samples/SampleRepositoryTests.cs
index 15fd991d77..3fdaa28ea7 100644
--- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/Samples/SampleRepositoryTests.cs
+++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/EntityFrameworkCore/Samples/SampleRepositoryTests.cs
@@ -33,7 +33,7 @@ namespace MyCompanyName.MyProjectName.EntityFrameworkCore.Samples
             await WithUnitOfWorkAsync(async () =>
             {
                 //Act
-                var adminUser = await _appUserRepository
+                var adminUser = await (await _appUserRepository.GetQueryableAsync())
                     .Where(u => u.UserName == "admin")
                     .FirstOrDefaultAsync();
 
diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDb/Samples/SampleRepositoryTests.cs b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDb/Samples/SampleRepositoryTests.cs
index deee3b4b61..0c45d0a52e 100644
--- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDb/Samples/SampleRepositoryTests.cs
+++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDb/Samples/SampleRepositoryTests.cs
@@ -32,8 +32,7 @@ namespace MyCompanyName.MyProjectName.MongoDB.Samples
             await WithUnitOfWorkAsync(async () =>
             {
                 //Act
-                var adminUser = await _appUserRepository
-                    .GetMongoQueryable()
+                var adminUser = await (await _appUserRepository.GetMongoQueryableAsync())
                     .FirstOrDefaultAsync(u => u.UserName == "admin");
 
                 //Assert