update

Author: nhathoang989

src/mix.heart/Entities/AuditEntityBase.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace Mix.Heart.Entities
+{
+    public abstract class AuditEntityBase<TPrimaryKey> : SimpleEntityBase<TPrimaryKey> where TPrimaryKey : IComparable
+    {
+        public DateTime CreatedDateTime { get; set; }
+        public DateTime? LastModified { get; set; }
+        public string CreatedBy { get; set; }
+        public string ModifiedBy { get; set; }
+    }
+}

src/mix.heart/Entities/Cache/MixCacheDbContext.cs

@@ -1,17 +1,17 @@
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
 using Mix.Heart.Enums;
 using Mix.Heart.Models;
-using Mix.Shared.Services;
 
 namespace Mix.Heart.Entities.Cache
 {
     public partial class MixCacheDbContext : DbContext
     {
         private readonly MixHeartConfigurationModel _configs;
 
-        public MixCacheDbContext()
+        public MixCacheDbContext(IConfiguration configuration)
         {
-            _configs = MixHeartConfigService.Instance.AppSettings;
+            _configs = configuration.Get<MixHeartConfigurationModel>();
         }
 
         public virtual DbSet<MixCache> MixCache { get; set; }

src/mix.heart/Entities/Cache/MsSqlCacheDbContext.cs

@@ -1,11 +1,12 @@
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
 using Mix.Heart.EntityFrameworkCore.Extensions;
 
 namespace Mix.Heart.Entities.Cache
 {
     public partial class MsSqlCacheDbContext : MixCacheDbContext
     {
-        public MsSqlCacheDbContext() : base()
+        public MsSqlCacheDbContext(IConfiguration configuration) : base(configuration)
         {
 
         }

src/mix.heart/Entities/Cache/MySqlCacheDbContext.cs

@@ -1,12 +1,13 @@
 
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
 using Mix.Heart.EntityFrameworkCore.Extensions;
 
 namespace Mix.Heart.Entities.Cache
 {
     public partial class MySqlCacheDbContext : MixCacheDbContext
     {
-        public MySqlCacheDbContext() : base()
+        public MySqlCacheDbContext(IConfiguration configuration) : base(configuration)
         {
 
         }

src/mix.heart/Entities/Cache/PostgresCacheDbContext.cs

@@ -1,12 +1,13 @@
 
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
 using Mix.Heart.EntityFrameworkCore.Extensions;
 
 namespace Mix.Heart.Entities.Cache
 {
     public partial class PostgresCacheDbContext : MixCacheDbContext
     {
-        public PostgresCacheDbContext() : base()
+        public PostgresCacheDbContext(IConfiguration configuration) : base(configuration)
         {
 
         }

src/mix.heart/Entities/Cache/SqliteCacheDbContext.cs

@@ -1,11 +1,12 @@
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
 using Mix.Heart.EntityFrameworkCore.Extensions;
 
 namespace Mix.Heart.Entities.Cache
 {
     public partial class SqliteCacheDbContext : MixCacheDbContext
     {
-        public SqliteCacheDbContext() : base()
+        public SqliteCacheDbContext(IConfiguration configuration) : base(configuration)
         {
 
         }

src/mix.heart/Entities/EntityBase.cs

@@ -1,16 +1,10 @@
 using Mix.Heart.Enums;
 using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Mix.Heart.Entities
 {
-    public abstract class EntityBase<TPrimaryKey> : IEntity<TPrimaryKey>
-      where TPrimaryKey : IComparable
+    public abstract class EntityBase<TPrimaryKey> : SimpleEntityBase<TPrimaryKey> where TPrimaryKey : IComparable
     {
-        [Key]
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        public TPrimaryKey Id { get; set; }
         public DateTime CreatedDateTime { get; set; }
         public DateTime? LastModified { get; set; }
         public string CreatedBy { get; set; }

src/mix.heart/Entities/SimpleEntityBase.cs

@@ -0,0 +1,13 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Mix.Heart.Entities
+{
+    public abstract class SimpleEntityBase<TPrimaryKey> : IEntity<TPrimaryKey> where TPrimaryKey : IComparable
+    {
+        [Key]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public TPrimaryKey Id { get; set; }
+    }
+}

src/mix.heart/Enums/ExpressionMethod.cs

@@ -4,6 +4,8 @@ public enum ExpressionMethod
     {
         Equal,
         Like,
+        ILike,
+        ILikeUnaccent,
         In,
         NotIn,
         NotEqual,

src/mix.heart/Enums/MixCacheMode.cs

@@ -3,7 +3,6 @@
     public enum MixCacheMode
     {
         JSON,
-        DATABASE,
         REDIS
     }
 }