Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Extend IMongoDBContext - add method DatabaseExist

KrzysztofPajakedcec28e8355
diff --git a/src/Core/Grand.Domain/Data/IMongoDBContext.cs b/src/Core/Grand.Domain/Data/IMongoDBContext.cs
index 601a9f32e..f57857a12 100644
--- a/src/Core/Grand.Domain/Data/IMongoDBContext.cs
+++ b/src/Core/Grand.Domain/Data/IMongoDBContext.cs
@@ -9,6 +9,7 @@ namespace Grand.Domain.Data
public interface IMongoDBContext
{
IMongoDatabase Database();
+ Task<bool> DatabaseExist(string connectionString);
TResult RunCommand<TResult>(string command);
BsonDocument RunCommand(string command);
TResult RunCommand<TResult>(string command, ReadPreference readpreference);
diff --git a/src/Core/Grand.Domain/Data/MongoDBContext.cs b/src/Core/Grand.Domain/Data/MongoDBContext.cs
index cfbabf5e5..9c154e64f 100644
--- a/src/Core/Grand.Domain/Data/MongoDBContext.cs
+++ b/src/Core/Grand.Domain/Data/MongoDBContext.cs
@@ -27,6 +27,21 @@ namespace Grand.Domain.Data
return _database;
}
+ public async Task<bool> DatabaseExist(string connectionString)
+ {
+ var client = new MongoClient(connectionString);
+ var databaseName = new MongoUrl(connectionString).DatabaseName;
+ var database = client.GetDatabase(databaseName);
+ await database.RunCommandAsync((Command<BsonDocument>)"{ping:1}");
+
+ var filter = new BsonDocument("name", "GrandNodeVersion");
+ var found = database.ListCollectionsAsync(new ListCollectionsOptions { Filter = filter }).Result;
+ if (found.Any())
+ return true;
+ else
+ return false;
+ }
+
public TResult RunCommand<TResult>(string command)
{
return _database.RunCommand<TResult>(command);
diff --git a/src/Web/Grand.Web/Controllers/InstallController.cs b/src/Web/Grand.Web/Controllers/InstallController.cs
index de338a385..6856a4d47 100644
--- a/src/Web/Grand.Web/Controllers/InstallController.cs
+++ b/src/Web/Grand.Web/Controllers/InstallController.cs
@@ -14,8 +14,6 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
-using MongoDB.Bson;
-using MongoDB.Driver;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -139,15 +137,8 @@ namespace Grand.Web.Controllers
{
try
{
- var client = new MongoClient(connectionString);
- var databaseName = new MongoUrl(connectionString).DatabaseName;
- var database = client.GetDatabase(databaseName);
- await database.RunCommandAsync((Command<BsonDocument>)"{ping:1}");
-
- var filter = new BsonDocument("name", "GrandNodeVersion");
- var found = database.ListCollectionsAsync(new ListCollectionsOptions { Filter = filter }).Result;
-
- if (found.Any())
+ var mdb = new MongoDBContext();
+ if(await mdb.DatabaseExist(connectionString))
ModelState.AddModelError("", locService.GetResource("AlreadyInstalled"));
}
catch (Exception ex)