Merge pull request #693 from mixcore/bugfix/fix_warnings

Fix warnings
mixcore · Sep 3, 2023 · 5bedcfa · 5bedcfa
2 parents 8e9d8b0 + a42eb3c
commit 5bedcfa
Show file tree

Hide file tree

Showing 62 changed files with 421 additions and 318 deletions.
diff --git a/src/modules/mix.account/Domain/ViewModels/MixRoleViewModel.cs b/src/modules/mix.account/Domain/ViewModels/MixRoleViewModel.cs
@@ -12,9 +12,7 @@ public MixRoleViewModel()
         {
         }
 
-        public MixRoleViewModel(MixRole entity,
-
-            UnitOfWorkInfo uowInfo = null) : base(entity, uowInfo)
+        public MixRoleViewModel(MixRole entity, UnitOfWorkInfo uowInfo = null) : base(entity, uowInfo)
         {
         }
 

diff --git a/src/modules/mix.common/Controllers/SharedApiController.cs b/src/modules/mix.common/Controllers/SharedApiController.cs
@@ -45,8 +45,9 @@ public SharedApiController(
             MixCacheService cacheService,
             IHttpContextAccessor httpContextAccessor,
             MixQueueMessages<MessageQueueModel> mixMemoryMessageQueue,
-            IMixTenantService mixTenantService)
-            : base(httpContextAccessor, configuration, 
+            IMixTenantService mixTenantService,
+            IMixCmsService mixCmsService)
+            : base(httpContextAccessor, configuration,
                   cacheService, translator, mixIdentityService, queueService, mixTenantService)
         {
             _uow = uow;
@@ -56,6 +57,7 @@ public SharedApiController(
             _routeProvider = routeProvider;
             _applicationLifetime = applicationLifetime;
             _mixMemoryMessageQueue = mixMemoryMessageQueue;
+            _mixCmsService = mixCmsService;
         }
 
         #region Routes
@@ -136,7 +138,7 @@ public async Task<ActionResult> ClearCacheAsync(CancellationToken cancellationTo
         [HttpGet("sitemap")]
         public async Task<ActionResult> Sitemap(CancellationToken cancellationToken = default)
         {
-            var file = await _mixCmsService.ParseSitemapAsync();
+            var file = await _mixCmsService.ParseSitemapAsync(cancellationToken);
             return Ok(file);
         }
 

diff --git a/src/modules/mix.portal/Controllers/CommonController.cs b/src/modules/mix.portal/Controllers/CommonController.cs
@@ -43,7 +43,7 @@ public ActionResult<DashboardModel> Dashboard(string culture)
 
         [MixAuthorize]
         [HttpGet("portal-menus")]
-        public async Task<ActionResult<JArray?>> PortalMenus()
+        public async Task<ActionResult<JArray>> PortalMenus()
         {
             var user = await UserManager.GetUserAsync(User);
             var roles = await UserManager.GetRolesAsync(user);
@@ -53,7 +53,7 @@ public ActionResult<DashboardModel> Dashboard(string culture)
 
 
 
-        private async Task<JArray?> LoadUserPortalMenus(string[] roles)
+        private async Task<JArray> LoadUserPortalMenus(string[] roles)
         {
             try
             {
@@ -81,7 +81,7 @@ public ActionResult<DashboardModel> Dashboard(string culture)
                 }
                 return arrMenus;
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 return new();
             }

diff --git a/src/modules/mix.tenancy/Domain/Services/InitCmsService.cs b/src/modules/mix.tenancy/Domain/Services/InitCmsService.cs
@@ -42,11 +42,12 @@ public InitCmsService(
         }
 
 
-        public async Task InitDbContext(InitCmsDto model)
+        public Task InitDbContext(InitCmsDto model)
         {
             _databaseService.InitConnectionStrings(model.ConnectionString, model.DatabaseProvider);
-
             _databaseService.UpdateMixCmsContext();
+
+            return Task.CompletedTask;
         }
 
         public async Task InitTenantAsync(InitCmsDto model)

diff --git a/src/platform/core/mix-heart b/src/platform/core/mix-heart
diff --git a/src/platform/core/mix.mixdb.event/Services/MixDbEventService.cs b/src/platform/core/mix.mixdb.event/Services/MixDbEventService.cs
@@ -111,7 +111,7 @@ private JObject ParseBody(JObject body, JObject data)
                 {
                     if (strBody.Contains($"[[{prop.Name}]]", StringComparison.OrdinalIgnoreCase))
                     {
-                        strBody = strBody.Replace($"[[{prop.Name.ToTitleCase()}]]", data.GetValue(prop.Name).ToString());
+                        strBody = strBody.Replace($"[[{prop.Name.ToTitleCase()}]]", data.GetValue(prop.Name)!.ToString());
                     }
                 }
                 return JObject.Parse(strBody);

diff --git a/src/platform/mix.database/Entities/Account/EntityConfigurations/ClientsConfiguration.cs b/src/platform/mix.database/Entities/Account/EntityConfigurations/ClientsConfiguration.cs
@@ -2,14 +2,13 @@
 
 namespace Mix.Database.Entities.Account.EntityConfigurations
 {
-    internal class ClientsConfiguration : AccountEntityBaseConfiguration<Clients>
-
+    public class ClientsConfiguration : AccountEntityBaseConfiguration<Clients>
     {
         public ClientsConfiguration(DatabaseService databaseService) : base(databaseService)
         {
         }
 
-        public virtual void Configure(EntityTypeBuilder<Clients> builder)
+        public override void Configure(EntityTypeBuilder<Clients> builder)
         {
             builder.Property(e => e.Id)
                 .HasCharSet(Config.CharSet)

diff --git a/src/platform/mix.identity/Models/AccountViewModels/ExternalLoginViewModel.cs b/src/platform/mix.identity/Models/AccountViewModels/ExternalLoginViewModel.cs
@@ -24,9 +24,9 @@ public class ExternalLoginViewModel
 
     public class RegisterExternalBindingModel
     {
-        public string? UserName { get; set; }
-        public string? Email { get; set; }
-        public string? PhoneNumber { get; set; }
+        public string UserName { get; set; }
+        public string Email { get; set; }
+        public string PhoneNumber { get; set; }
         public MixExternalLoginProviders Provider { get; set; }
 
         public string ExternalAccessToken { get; set; }

diff --git a/src/platform/mix.library/Interfaces/IMixCmsService.cs b/src/platform/mix.library/Interfaces/IMixCmsService.cs
@@ -4,6 +4,6 @@ public interface IMixCmsService
     {
         public string GetAssetFolder(string culture, string domain);
         public MixTenantSystemModel GetCurrentTenant();
-        Task<FileModel> ParseSitemapAsync();
+        Task<FileModel> ParseSitemapAsync(CancellationToken cancellationToken = default);
     }
 }
diff --git a/src/platform/mix.library/Interfaces/IMixEdmService.cs b/src/platform/mix.library/Interfaces/IMixEdmService.cs
@@ -4,8 +4,7 @@ public interface IMixEdmService
     {
         public void SetTenantId(int tenantId);
         public void SetTenant(MixTenantSystemModel tenant);
-        public Task<string?> GetEdmTemplate(string filename);
-
-        public Task SendMailWithEdmTemplate(string subject, string templateName, JObject data, string to, string? cc = null, string? from = null);
+        public Task<string> GetEdmTemplate(string filename);
+        public Task SendMailWithEdmTemplate(string subject, string templateName, JObject data, string to, string cc = null, string from = null);
     }
 }
diff --git a/src/platform/mix.library/Services/MixCmsService.cs b/src/platform/mix.library/Services/MixCmsService.cs
@@ -40,14 +40,14 @@ public MixTenantSystemModel GetCurrentTenant()
             return CurrentTenant;
         }
 
-        public async Task<FileModel> ParseSitemapAsync()
+        public async Task<FileModel> ParseSitemapAsync(CancellationToken cancellationToken = default)
         {
             try
             {
                 XNamespace aw = "http://www.sitemaps.org/schemas/sitemap/0.9";
                 var root = new XElement(aw + "urlset");
 
-                await ParseNavigationsAsync(root);
+                await ParseNavigationsAsync(root, cancellationToken);
                 await ParsePostsDocAsync(root);
 
                 string folder = $"wwwroot";
@@ -70,7 +70,7 @@ public async Task<FileModel> ParseSitemapAsync()
 
         #region Navigation
 
-        protected virtual async Task ParseNavigationsAsync(XElement root)
+        protected virtual async Task ParseNavigationsAsync(XElement root, CancellationToken cancellation = default)
         {
             var navs = await MixNavigationViewModel.GetRepository(_mixdbUow, CacheService).GetListAsync(
                 m => m.MixTenantId == CurrentTenant.Id);
@@ -81,11 +81,9 @@ protected virtual async Task ParseNavigationsAsync(XElement root)
             }
         }
 
-        protected virtual async Task ParsePostsDocAsync(XElement root)
+        protected virtual async Task ParsePostsDocAsync(XElement root, CancellationToken cancellation = default)
         {
-            var posts = await MixPostViewModel.GetRepository(_cmsUow, CacheService).GetListAsync(
-                m => m.MixTenantId == CurrentTenant.Id);
-
+            var posts = await MixPostViewModel.GetRepository(_cmsUow, CacheService).GetListAsync(m => m.MixTenantId == CurrentTenant.Id, cancellation);
             foreach (var post in posts)
             {
                 ParsePostDoc(root, post);

diff --git a/src/platform/mix.library/Services/MixEdmService.cs b/src/platform/mix.library/Services/MixEdmService.cs
@@ -20,7 +20,7 @@ public MixEdmService(
             _queueService = queueService;
         }
 
-        public async Task<string?> GetEdmTemplate(string filename)
+        public async Task<string> GetEdmTemplate(string filename)
         {
             var edmTemplate = await MixTemplateViewModel.GetRepository(_uow, CacheService).GetSingleAsync(
                m => m.FolderType == MixTemplateFolderType.Edms
@@ -31,8 +31,8 @@ public MixEdmService(
         public virtual async Task SendMailWithEdmTemplate(
             string subject, string templateName, JObject data, 
             string to, 
-            string? cc = null,
-            string? from = null)
+            string cc = null,
+            string from = null)
         {
             var template = await GetEdmTemplate(templateName);
             if (template == null)

diff --git a/src/platform/mix.library/Subscribers/MixBackgroundTaskSubscriber.cs b/src/platform/mix.library/Subscribers/MixBackgroundTaskSubscriber.cs
@@ -98,7 +98,7 @@ private async Task SendMail(MessageQueueModel model)
 
         }
 
-        private async Task SendMessage(string message, bool result, Exception? ex = null)
+        private async Task SendMessage(string message, bool result, Exception ex = null)
         {
             SignalRMessageModel msg = new()
             {

diff --git a/src/platform/mix.library/ViewModels/MixTemplateViewModel.cs b/src/platform/mix.library/ViewModels/MixTemplateViewModel.cs
@@ -9,7 +9,7 @@ public sealed class MixTemplateViewModel
         public int MixTenantId { get; set; }
         public string Content { get; set; }
         public string Extension { get; set; }
-        public string? FileFolder { get; set; }
+        public string FileFolder { get; set; }
         public string FileName { get; set; }
         public MixTemplateFolderType FolderType { get; set; }
         public string Scripts { get; set; }

diff --git a/src/platform/mix.log/ViewModels/AuditLogViewModel.cs b/src/platform/mix.log/ViewModels/AuditLogViewModel.cs
@@ -25,7 +25,7 @@ public AuditLogViewModel()
         {
         }
 
-        public AuditLogViewModel(AuditLog entity, UnitOfWorkInfo<AuditLogDbContext>? uowInfo)
+        public AuditLogViewModel(AuditLog entity, UnitOfWorkInfo uowInfo)
             : base(entity, uowInfo)
         {
         }

diff --git a/src/platform/mix.mixdb/Services/RuntimeDbContextService.cs b/src/platform/mix.mixdb/Services/RuntimeDbContextService.cs
@@ -80,7 +80,7 @@ public void LoadDbContextAssembly()
             }
         }
 
-        public DbContext GetMixDatabaseDbContext()
+        public DbContext? GetMixDatabaseDbContext()
         {
             if (!string.IsNullOrEmpty(_databaseService.GetConnectionString(MixConstants.CONST_MIXDB_CONNECTION)))
             {
@@ -90,17 +90,15 @@ public DbContext GetMixDatabaseDbContext()
                 }
                 if (_assembly != null)
                 {
-
-                    _dbContextType = _assembly.GetType("TypedDataContext.Context.DataContext");
-                    _ = _dbContextType ?? throw new Exception("DataContext type not found");
-
+                    _dbContextType = _assembly.GetType("TypedDataContext.Context.DataContext") ?? throw new Exception("DataContext type not found");
                     var constr = _dbContextType.GetConstructor(Type.EmptyTypes);
                     _ = constr ?? throw new Exception("DataContext ctor not found");
                     var ctx = (DbContext)constr.Invoke(null);
                     ctx.Database.EnsureCreated();
                     return ctx;
                 }
             }
+
             return default;
         }
 
@@ -139,10 +137,10 @@ public List<string> CreateDynamicDbContext()
             string contextFileCode = scaffoldedModelSources.ContextFile.Code;
             foreach (var item in scaffoldedModelSources.AdditionalFiles)
             {
-                string name = item.Path.Substring(0, item.Path.LastIndexOf('.'));
+                string name = item.Path[..item.Path.LastIndexOf('.')];
                 if (databaseNames.Any(m => string.Equals(m, name, StringComparison.OrdinalIgnoreCase)))
                 {
-                    ReplaceEntityNaming(databaseNames, item, ref contextFileCode);
+                    ReplaceEntityNaming(item, ref contextFileCode);
                 }
                 sourceFiles.Add(item.Code);
             }
@@ -154,9 +152,9 @@ public List<string> CreateDynamicDbContext()
             return sourceFiles;
         }
 
-        private void ReplaceEntityNaming(List<string> databaseNames, ScaffoldedFile item, ref string contextFileCode)
+        private void ReplaceEntityNaming(ScaffoldedFile item, ref string contextFileCode)
         {
-            string name = item.Path.Substring(0, item.Path.LastIndexOf('.'));
+            string name = item.Path[..item.Path.LastIndexOf('.')];
             string newName = name.ToLower();
             contextFileCode = contextFileCode.Replace($"Entity<{name}>", $"Entity<{newName}>")
                 .Replace($"DbSet<{name}>", $"DbSet<{newName}>");

diff --git a/src/platform/mix.queue/Engines/Google/GoogleQueuePublisher.cs b/src/platform/mix.queue/Engines/Google/GoogleQueuePublisher.cs
@@ -33,21 +33,27 @@ private void InitializeQueue(string topicName)
                 CreateTopic(topicName);
 
                 var googleCredential = GoogleCredential.FromFile(_queueSetting.CredentialFile);
-                var createSettings = new PublisherClient.ClientCreationSettings(credentials: googleCredential.ToChannelCredentials());
-                var toppicName = new TopicName(_queueSetting.ProjectId, topicName);
-                var publisher = PublisherClient.CreateAsync(toppicName, createSettings);
-                _publisher = publisher.Result;
+                var publisherClientBuilder = new PublisherClientBuilder
+                {
+                    Credential = googleCredential,
+                    TopicName = new TopicName(_queueSetting.ProjectId, topicName)
+                };
+
+                _publisher = publisherClientBuilder.Build();
             }
         }
 
         private Topic CreateTopic(string topicId)
         {
             try
             {
-                PublisherServiceApiClientBuilder builder = new PublisherServiceApiClientBuilder();
-                builder.CredentialsPath = _queueSetting.CredentialFile;
-                PublisherServiceApiClient publisher = builder.Build();
-                TopicName topicName = new TopicName(_queueSetting.ProjectId, topicId);
+                var builder = new PublisherServiceApiClientBuilder
+                {
+                    CredentialsPath = _queueSetting.CredentialFile
+                };
+
+                var publisher = builder.Build();
+                var topicName = new TopicName(_queueSetting.ProjectId, topicId);
                 return publisher.CreateTopic(topicName);
             }
             catch (RpcException e) when (e.Status.StatusCode == StatusCode.AlreadyExists)

diff --git a/src/platform/mix.queue/Engines/Google/GoogleQueueSubscriber.cs b/src/platform/mix.queue/Engines/Google/GoogleQueueSubscriber.cs
@@ -40,10 +40,14 @@ private void InitializeQueue(string topicId, string subscriptionId)
                 CreateSubscription(topicId, subscriptionId);
                 _subscriptionName = new SubscriptionName(_queueSetting.ProjectId, subscriptionId);
                 var googleCredential = GoogleCredential.FromFile(_queueSetting.CredentialFile);
-                var createSettings = new SubscriberClient.ClientCreationSettings(
-                    credentials: googleCredential.ToChannelCredentials());
-                var subscriber = SubscriberClient.CreateAsync(_subscriptionName, createSettings);
-                _subscriber = subscriber.Result;
+
+                var builder = new SubscriberClientBuilder
+                {
+                    Credential = googleCredential,
+                    SubscriptionName = _subscriptionName
+                };
+
+                _subscriber = builder.Build();
             }
         }
 

diff --git a/src/platform/mix.repodb/Interfaces/IMixDbDataService.cs b/src/platform/mix.repodb/Interfaces/IMixDbDataService.cs
@@ -8,13 +8,13 @@
 
 namespace Mix.RepoDb.Interfaces
 {
-    public interface IMixDbDataService: IDisposable
+    public interface IMixDbDataService : IDisposable
     {
         public Task<JObject?> GetSingleByParent(string tableName, MixContentType parentType, object parentId, bool loadNestedData = false);
 
         public Task<PagingResponseModel<JObject>> GetMyData(string tableName, SearchMixDbRequestDto req, string username);
 
-        public Task<JObject> GetMyDataById(string tableName, string username, int id, bool loadNestedData);
+        public Task<JObject?> GetMyDataById(string tableName, string username, int id, bool loadNestedData);
 
         public Task<JObject?> GetById(string tableName, int id, bool loadNestedData);
 

diff --git a/src/platform/mix.repodb/Interfaces/IMixDbService.cs b/src/platform/mix.repodb/Interfaces/IMixDbService.cs
@@ -9,7 +9,7 @@ public interface IMixDbService
     {
         public Task<PagingResponseModel<JObject>> GetMyData(string tableName, SearchMixDbRequestDto req, string username);
 
-        public Task<JObject> GetMyDataById(string tableName, string username, int id, bool loadNestedData);
+        public Task<JObject?> GetMyDataById(string tableName, string username, int id, bool loadNestedData);
 
         public Task<JObject?> GetById(string tableName, int id, bool loadNestedData);