diff --git a/SHERPA.BBM.UI/Data/BBM_EFService.cs b/SHERPA.BBM.UI/Data/BBM_EFService.cs index 0e4960f..9dbc18a 100644 --- a/SHERPA.BBM.UI/Data/BBM_EFService.cs +++ b/SHERPA.BBM.UI/Data/BBM_EFService.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Configuration; using System.Linq; +using System.Text; using System.Threading.Tasks; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; @@ -12,31 +13,40 @@ namespace SHERPA.BBM.UI.Data { #region Private Fields + private static IConfiguration _configuration; private static ILogger _logger; - private readonly IConfiguration _configuration; #endregion Private Fields #region Protected Fields - protected static string connString = "";//"Data Source=SQL2012DEV;Initial Catalog=SHERPA.BBM;User ID=sa;Password=keyhammer;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework"; + protected static string connString = ""; - //protected static string connString = ""; + //protected static string connString = "Data Source=SQL2012DEV;Initial Catalog=SHERPA.BBM;User ID=sa;Password=keyhammer;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework"; protected static Controllers.BBMController dbController; #endregion Protected Fields #region Public Constructors - //protected string connString = ""; public BBM_EFService(IConfiguration configuration, ILogger logger) { _logger = logger; - this._configuration = configuration; + _configuration = configuration; connString = _configuration["SherpaBBM"]; - _logger.LogInformation($"Actual connString: {connString}"); - dbController = new Controllers.BBMController(connString); - _logger.LogInformation($"DbController OK: {dbController.BaskGetLastDesc(0).Count} basket | {dbController.NegotGetLastDesc(0).Count} negotiations"); + _logger.LogInformation($"ConnString: {connString}"); + if (string.IsNullOrEmpty(connString)) + { + _logger.LogError("ConnString empty!"); + } + else + { + dbController = new Controllers.BBMController(connString); + StringBuilder sb = new StringBuilder(); + sb.AppendLine($"DbController OK: {dbController.currConnString}"); + sb.AppendLine($"CST: {dbController.CustomersCount()} | CNT: {dbController.CountersCount()} | BSK: {dbController.BasketsCount()} | NGT: {dbController.NegotiationsCount()} | DOC: {dbController.DocsCount()} | ITM: {dbController.ItemsCount()} | RES: {dbController.ResourcesCount()}"); + _logger.LogInformation(sb.ToString()); + } } #endregion Public Constructors @@ -100,7 +110,7 @@ namespace SHERPA.BBM.UI.Data public Task CounterGetAll() { - return Task.FromResult(dbController.ContersGetAll().ToArray()); + return Task.FromResult(dbController.CountersGetAll().ToArray()); } public string CounterGetNext(string CodCounter, int numZeros) diff --git a/SHERPA.BBM.UI/Program.cs b/SHERPA.BBM.UI/Program.cs index ad67895..ac16013 100644 --- a/SHERPA.BBM.UI/Program.cs +++ b/SHERPA.BBM.UI/Program.cs @@ -20,12 +20,12 @@ namespace SHERPA.BBM.UI { webBuilder.UseStartup(); }) - .ConfigureLogging(logging => - { - logging.ClearProviders(); - logging.SetMinimumLevel(Microsoft.Extensions.Logging.LogLevel.Trace); - }) - .UseNLog(); + .ConfigureLogging(logging => + { + logging.ClearProviders(); + logging.SetMinimumLevel(Microsoft.Extensions.Logging.LogLevel.Trace); + }) + .UseNLog(); public static void Main(string[] args) { diff --git a/SHERPA.BBM.UI/Properties/PublishProfiles/IISProfile.pubxml b/SHERPA.BBM.UI/Properties/PublishProfiles/IISProfile.pubxml index f2cf399..8fd7516 100644 --- a/SHERPA.BBM.UI/Properties/PublishProfiles/IISProfile.pubxml +++ b/SHERPA.BBM.UI/Properties/PublishProfiles/IISProfile.pubxml @@ -7,7 +7,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt MSDeploy True - Release + Debug Any CPU @@ -17,7 +17,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt https://w2019-iis-dev:8172/MsDeploy.axd Default Web Site/BBM - True + False WMSVC True jenkins diff --git a/SHERPA.BBM/Controllers/BBMController.cs b/SHERPA.BBM/Controllers/BBMController.cs index 8c02f0d..70390a5 100644 --- a/SHERPA.BBM/Controllers/BBMController.cs +++ b/SHERPA.BBM/Controllers/BBMController.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Configuration; +using NLog; namespace SHERPA.BBM.Controllers { @@ -11,23 +12,17 @@ namespace SHERPA.BBM.Controllers { #region Private Fields + private static NLog.Logger Log = LogManager.GetCurrentClassLogger(); private MainDbContext dbCtx; #endregion Private Fields -#if false - public BBMController() - { - string connString = ConfigurationManager.AppSettings["BBMModel"]; - dbCtx = new MainDbContext(connString); - } -#endif - #region Public Constructors public BBMController(string connString) { dbCtx = new MainDbContext(connString); + Log.Info($"Avvio classe BBMController, connString: {connString}"); } #endregion Public Constructors @@ -90,6 +85,14 @@ namespace SHERPA.BBM.Controllers return done; } + public int BasketsCount() + { + int answ = dbCtx + .DbSetBaskets + .Count(); + return answ; + } + /// /// Elenco ultimi Baskets /// @@ -145,24 +148,6 @@ namespace SHERPA.BBM.Controllers return done; } - /// - /// Elenco Conunters - /// - /// - /// - public List ContersGetAll(string searchVal = "") - { - List dbResult = new List(); - - dbResult = dbCtx - .DbSetCounters - .Where(x => x.CodCounter.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) - .OrderBy(x => x.CodCounter) - .ToList(); - - return dbResult; - } - public string CounterGetNext(string CodCounter, int numZeros) { string answ = $"{CodCounter}.0000"; @@ -195,6 +180,32 @@ namespace SHERPA.BBM.Controllers return answ; } + public int CountersCount() + { + int answ = dbCtx + .DbSetCounters + .Count(); + return answ; + } + + /// + /// Elenco Conunters + /// + /// + /// + public List CountersGetAll(string searchVal = "") + { + List dbResult = new List(); + + dbResult = dbCtx + .DbSetCounters + .Where(x => x.CodCounter.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) + .OrderBy(x => x.CodCounter) + .ToList(); + + return dbResult; + } + /// /// Aggiorna un FluxCounter /// @@ -227,6 +238,14 @@ namespace SHERPA.BBM.Controllers return done; } + public int CustomersCount() + { + int answ = dbCtx + .DbSetCustomers + .Count(); + return answ; + } + /// /// Elenco Customers /// @@ -396,6 +415,14 @@ namespace SHERPA.BBM.Controllers return done; } + public int DocsCount() + { + int answ = dbCtx + .DbSetDocs + .Count(); + return answ; + } + /// /// Aggiorna un item Doc come ACTIVE (e inactive gli altri della stessa negoziazione) /// @@ -574,6 +601,14 @@ namespace SHERPA.BBM.Controllers return dbResult; } + public int ItemsCount() + { + int answ = dbCtx + .DbSetItems + .Count(); + return answ; + } + /// /// Aggiorna un item /// @@ -673,6 +708,14 @@ namespace SHERPA.BBM.Controllers return dbResult; } + public int NegotiationsCount() + { + int answ = dbCtx + .DbSetNegotiations + .Count(); + return answ; + } + /// /// Aggiorna un item Negotiation /// @@ -850,6 +893,14 @@ namespace SHERPA.BBM.Controllers return dbResult; } + public int ResourcesCount() + { + int answ = dbCtx + .DbSetResources + .Count(); + return answ; + } + /// /// Aggiorna una Resource /// @@ -951,33 +1002,5 @@ namespace SHERPA.BBM.Controllers } #endregion Public Methods - -#if false - public void RollBackAll() - { - var context = DataContextFactory.GetDataContext(); - var changedEntries = context.ChangeTracker.Entries() - .Where(x => x.State != EntityState.Unchanged).ToList(); - - foreach (var entry in changedEntries) - { - switch (entry.State) - { - case EntityState.Modified: - entry.CurrentValues.SetValues(entry.OriginalValues); - entry.State = EntityState.Unchanged; - break; - - case EntityState.Added: - entry.State = EntityState.Detached; - break; - - case EntityState.Deleted: - entry.State = EntityState.Unchanged; - break; - } - } - } -#endif } } \ No newline at end of file diff --git a/SHERPA.BBM/MainDbContext.cs b/SHERPA.BBM/MainDbContext.cs index e77f327..6cfba21 100644 --- a/SHERPA.BBM/MainDbContext.cs +++ b/SHERPA.BBM/MainDbContext.cs @@ -25,11 +25,9 @@ namespace SHERPA.BBM public MainDbContext(string connectionString) : base(connectionString) { -#if false Database.CreateIfNotExists(); //Database.SetInitializer(new MigrateDatabaseToLatestVersion()); Database.Initialize(false); -#endif } #endregion Public Constructors diff --git a/SHERPA.BBM/SHERPA.BBM.csproj b/SHERPA.BBM/SHERPA.BBM.csproj index 69cfd46..156df8a 100644 --- a/SHERPA.BBM/SHERPA.BBM.csproj +++ b/SHERPA.BBM/SHERPA.BBM.csproj @@ -43,6 +43,9 @@ ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll + + ..\packages\NLog.4.7.9\lib\net45\NLog.dll + @@ -52,6 +55,7 @@ + @@ -64,6 +68,7 @@ ..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll + diff --git a/SHERPA.BBM/packages.config b/SHERPA.BBM/packages.config index 47063f3..c00fe46 100644 --- a/SHERPA.BBM/packages.config +++ b/SHERPA.BBM/packages.config @@ -1,6 +1,7 @@  +