From d41b12cdc874d464de67131982afeb71df4f46bc Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Wed, 14 Oct 2020 12:59:37 +0300
Subject: [PATCH] DbTenant: fix

---
 common/ASC.Core.Common/Data/DbTenantService.cs     | 2 +-
 common/ASC.Core.Common/EF/Model/Tenant/DbTenant.cs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/ASC.Core.Common/Data/DbTenantService.cs b/common/ASC.Core.Common/Data/DbTenantService.cs
index 083d9a76c9..d032a60efc 100644
--- a/common/ASC.Core.Common/Data/DbTenantService.cs
+++ b/common/ASC.Core.Common/Data/DbTenantService.cs
@@ -93,7 +93,7 @@ namespace ASC.Core.Data
                 PaymentId = r.PaymentId,
                 Spam = r.Spam,
                 Status = r.Status,
-                StatusChangeDate = r.StatusChangedHack ?? DateTime.MinValue,
+                StatusChangeDate = r.StatusChangedHack,
                 TenantAlias = r.Alias,
                 TenantId = r.Id,
                 MappedDomain = r.MappedDomain,
diff --git a/common/ASC.Core.Common/EF/Model/Tenant/DbTenant.cs b/common/ASC.Core.Common/EF/Model/Tenant/DbTenant.cs
index f11fee8a0b..f0cdeae378 100644
--- a/common/ASC.Core.Common/EF/Model/Tenant/DbTenant.cs
+++ b/common/ASC.Core.Common/EF/Model/Tenant/DbTenant.cs
@@ -30,7 +30,7 @@ namespace ASC.Core.Common.EF.Model
 
         //hack for DateTime?
         [NotMapped]
-        public DateTime? StatusChangedHack { get { return StatusChanged; } set { StatusChanged = value; } }
+        public DateTime StatusChangedHack { get { return StatusChanged ?? DateTime.MinValue; } set { StatusChanged = value; } }
 
         public DateTime CreationDateTime { get; set; }
 
@@ -186,7 +186,7 @@ namespace ASC.Core.Common.EF.Model
                     .HasColumnName("version")
                     .HasDefaultValueSql("'2'");
 
-                entity.Property(e => e.VersionChanged)
+                entity.Property(e => e.Version_Changed)
                     .HasColumnName("version_changed")
                     .HasColumnType("datetime");
             });
@@ -289,7 +289,7 @@ namespace ASC.Core.Common.EF.Model
                     .HasColumnName("version")
                     .HasDefaultValueSql("2");
 
-                entity.Property(e => e.VersionChanged).HasColumnName("version_changed");
+                entity.Property(e => e.Version_Changed).HasColumnName("version_changed");
             });
         }
     }