change qr code to barcode

.github/workflows/dotnet-developPublish.yml

@@ -1,48 +0,0 @@
-name: Deploy Development ASP.NET Core App to IIS
-
-on:
-  push:
-    branches:
-      - Main
-
-env:
-  DOTNET_ENVIRONMENT: Development
-
-jobs:
-  build-and-deploy:
-    runs-on: windows-latest
-
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-
-    - name: Setup .NET SDK
-      uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: '8.0.x' # یا نسخه پروژه‌ت
-
-    - name: Restore dependencies
-      run: dotnet restore
-
-    - name: Build
-      run: dotnet build --configuration Release 
-
-    - name: Publish
-      run: dotnet publish --configuration Release --output ./publish /p:EnvironmentName=Development --no-build
-
-    - name: Deploy to IIS via Web Deploy
-      shell: powershell
-      run: |
-        $publishFolder = Resolve-Path ./publish
-        & "C:\Program Files\IIS\Microsoft Web Deploy V3\msdeploy.exe" `
-          -verb:sync `
-          -source:contentPath="$publishFolder" `
-          -dest:contentPath="dadmehrg",computerName="https://171.22.24.15:8172/msdeploy.axd?site=dadmehrg",userName="Administrator",password="R2rNpdnetP3j>q5b18",authType="Basic" `
-          -allowUntrusted `
-          -enableRule:AppOffline
-
-
-      env:
-        SERVER_HOST: your-server-ip-or-domain
-        DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
-        DEPLOY_PASSWORD: ${{ secrets.DEPLOY_PASSWORD }}

.gitignore

@@ -361,4 +361,4 @@ MigrationBackup/
 
 # # Fody - auto-generated XML schema
 # FodyWeavers.xsd
-.idea
+

0_Framework/0_Framework.csproj

@@ -15,25 +15,8 @@
     <PackageReference Include="PersianTools.Core" Version="2.0.4" />
     <PackageReference Include="System.Drawing.Common" Version="9.0.0" />
     <PackageReference Include="MD.PersianDateTime.Standard" Version="2.5.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="7.2.0" />
 
 
-
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Remove="Application\UID\UidService.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Remove="Application\AuthorizedPerson\AuthorizedPersonApplication.cs" />
-    <Compile Remove="Application\AuthorizedPerson\IAuthorizedPersonApplication.cs" />
-    <Compile Remove="Domain\AuthorizedPersonAgg\IAuthorizedPersonRepository.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="Domain\AuthorizedPersonAgg\" />
-    <Folder Include="InfraStructure\AuthorizedPerson\" />
   </ItemGroup>
 
 </Project>

0_Framework/Application/AppSettingConfiguration.cs

@@ -1,8 +0,0 @@
-namespace _0_Framework.Application;
-
-public class AppSettingConfiguration
-{
-    public string Domain { get; set; }
-    public string ClientDomain =>"client"+Domain;
-    public string AdminDomain =>"admin"+Domain;
-}

0_Framework/Application/AuthHelper.cs

@@ -12,72 +12,69 @@ namespace _0_Framework.Application;
 
 public class AuthHelper : IAuthHelper
 {
-	private readonly IHttpContextAccessor _contextAccessor;
+    private readonly IHttpContextAccessor _contextAccessor;
+        
+    public AuthHelper(IHttpContextAccessor contextAccessor)
+    {
+        _contextAccessor = contextAccessor;
+    }
 
-	public AuthHelper(IHttpContextAccessor contextAccessor)
-	{
-		_contextAccessor = contextAccessor;
-	}
+    public AuthViewModel CurrentAccountInfo()
+    {
+        var result = new AuthViewModel();
+        if (!IsAuthenticated())
+            return result;
 
-	public AuthViewModel CurrentAccountInfo()
-	{
-		var result = new AuthViewModel();
-		if (!IsAuthenticated())
-			return result;
-
-		var claims = _contextAccessor.HttpContext.User.Claims.ToList();
-		result.Id = long.Parse(claims.FirstOrDefault(x => x.Type == "AccountId").Value);
-		result.Username = claims.FirstOrDefault(x => x.Type == "Username")?.Value;
-		result.ProfilePhoto = claims.FirstOrDefault(x => x.Type == "ProfilePhoto")?.Value;
-		result.RoleId = long.Parse(claims.FirstOrDefault(x => x.Type == ClaimTypes.Role)?.Value);
-		result.Fullname = claims.FirstOrDefault(x => x.Type == ClaimTypes.Name)?.Value;
-		result.Role = claims.FirstOrDefault(x => x.Type == "RoleName")?.Value;
-		result.ClientAriaPermission = claims.FirstOrDefault(x => x.Type == "ClientAriaPermission").Value;
-		result.AdminAreaPermission = claims.FirstOrDefault(x => x.Type == "AdminAreaPermission").Value;
-		result.PositionValue = !string.IsNullOrWhiteSpace(claims.FirstOrDefault(x => x.Type == "PositionValue")?.Value) ? int.Parse(claims.FirstOrDefault(x => x.Type == "PositionValue")?.Value) : 0;
-		result.WorkshopList = Tools.DeserializeFromBsonList<WorkshopClaim>(claims.FirstOrDefault(x => x is { Type: "workshopList" })?.Value);
-		result.WorkshopSlug = claims.FirstOrDefault(x => x is { Type: "WorkshopSlug" }).Value;
-		result.Mobile = claims.FirstOrDefault(x => x is { Type: "Mobile" }).Value;
+        var claims = _contextAccessor.HttpContext.User.Claims.ToList();
+        result.Id = long.Parse(claims.FirstOrDefault(x => x.Type == "AccountId").Value);
+        result.Username = claims.FirstOrDefault(x => x.Type == "Username")?.Value;
+        result.ProfilePhoto = claims.FirstOrDefault(x => x.Type == "ProfilePhoto")?.Value;
+        result.RoleId = long.Parse(claims.FirstOrDefault(x => x.Type == ClaimTypes.Role)?.Value);
+        result.Fullname = claims.FirstOrDefault(x => x.Type == ClaimTypes.Name)?.Value;
+        result.Role = claims.FirstOrDefault(x => x.Type == "RoleName")?.Value;
+        result.ClientAriaPermission =claims.FirstOrDefault(x => x.Type == "ClientAriaPermission").Value;
+        result.AdminAreaPermission = claims.FirstOrDefault(x => x.Type == "AdminAreaPermission").Value;
+        result.PositionValue = !string.IsNullOrWhiteSpace(claims.FirstOrDefault(x => x.Type == "PositionValue")?.Value) ? int.Parse(claims.FirstOrDefault(x => x.Type == "PositionValue")?.Value) : 0;
+        result.WorkshopList = Tools.DeserializeFromBsonList<WorkshopClaim>(claims.FirstOrDefault(x => x is { Type: "workshopList" })?.Value);
+        result.WorkshopSlug = claims.FirstOrDefault(x => x is { Type: "WorkshopSlug" }).Value;
+        result.Mobile = claims.FirstOrDefault(x => x is { Type: "Mobile" }).Value;
 		result.SubAccountId = long.Parse(claims.FirstOrDefault(x => x.Type == "SubAccountId").Value);
 		result.WorkshopName = claims.FirstOrDefault(x => x is { Type: "WorkshopName" })?.Value;
-		result.Permissions = Tools.DeserializeFromBsonList<int>(claims.FirstOrDefault(x => x is { Type: "permissions" })?.Value);
-        result.RoleName = claims.FirstOrDefault(x => x is { Type: "RoleName" })?.Value;
-        result.WorkshopId = long.Parse(claims.FirstOrDefault(x => x.Type == "WorkshopId")?.Value??"0");
-        return result;
-	}
+		return result;
+    }
 
-	public List<int> GetPermissions()
-	{
-		if (!IsAuthenticated())
-			return new List<int>();
+    public List<int> GetPermissions()
+    {
+        if (!IsAuthenticated())
+            return new List<int>();
 
-		var permissions = _contextAccessor.HttpContext.User.Claims.FirstOrDefault(x => x.Type == "permissions")
-			?.Value;
-		return Tools.DeserializeFromBsonList<int>(permissions); //Mahan
-	}
+        var permissions = _contextAccessor.HttpContext.User.Claims.FirstOrDefault(x => x.Type == "permissions")
+            ?.Value;
+        return Tools.DeserializeFromBsonList<int>(permissions); //Mahan
+    }
 
-	public long CurrentAccountId()
-	{
-		return IsAuthenticated()
-			? long.Parse(_contextAccessor.HttpContext.User.Claims.First(x => x.Type == "AccountId")?.Value)
-			: 0;
-	}
-	public long CurrentSubAccountId()
-	{
-		return IsAuthenticated()
-			? long.Parse(_contextAccessor.HttpContext.User.Claims.First(x => x.Type == "SubAccountId")?.Value)
-			: 0;
-	}
+    public long CurrentAccountId()
+    {
+        return IsAuthenticated()
+            ? long.Parse(_contextAccessor.HttpContext.User.Claims.First(x => x.Type == "AccountId")?.Value)
+            : 0;
+    }
+    public long CurrentSubAccountId()
+    {
+	    return IsAuthenticated()
+		    ? long.Parse(_contextAccessor.HttpContext.User.Claims.First(x => x.Type == "SubAccountId")?.Value)
+		    : 0;
+    }
 	public string CurrentAccountMobile()
-	{
-		return IsAuthenticated()
-			? _contextAccessor.HttpContext.User.Claims.First(x => x.Type == "Mobile")?.Value
-			: "";
-	}
+    {
+        return IsAuthenticated()
+            ? _contextAccessor.HttpContext.User.Claims.First(x => x.Type == "Mobile")?.Value
+            : "";
+    }
 
 	#region Vafa
 
-	public void UpdateWorkshopSlugClaim(string newWorkshopSlug, string newWorkshopName,long newWorkshopId)
+	public void UpdateWorkshopSlugClaim(string newWorkshopSlug, string newWorkshopName)
 	{
 		var user = _contextAccessor.HttpContext.User;
 
@@ -86,7 +83,6 @@ public class AuthHelper : IAuthHelper
 			var claimsIdentity = (ClaimsIdentity)user.Identity;
 			var existingClaimSlug = claimsIdentity.FindFirst("WorkshopSlug");
 			var existingClaimName = claimsIdentity.FindFirst("WorkshopName");
-			var existingWorkshopId = claimsIdentity.FindFirst("WorkshopId");
 
 			if (existingClaimSlug != null)
 			{
@@ -98,14 +94,9 @@ public class AuthHelper : IAuthHelper
 				claimsIdentity.RemoveClaim(existingClaimName);
 			}
 
-			if (existingWorkshopId != null)
-			{
-				claimsIdentity.RemoveClaim(existingWorkshopId);
-			}
 
 			claimsIdentity.AddClaim(new Claim("WorkshopSlug", newWorkshopSlug));
 			claimsIdentity.AddClaim(new Claim("WorkshopName", newWorkshopName));
-			claimsIdentity.AddClaim(new Claim("WorkshopId",newWorkshopId.ToString()));
 
 
 			var authProperties = new AuthenticationProperties
@@ -120,175 +111,160 @@ public class AuthHelper : IAuthHelper
 	}
 
 	public string GetWorkshopSlug()
-	{
-		return CurrentAccountInfo().ClientAriaPermission == "true"
-			? _contextAccessor.HttpContext.User.Claims.First(x => x.Type == "WorkshopSlug")?.Value
-			: "";
-	}
-	public string GetWorkshopName()
-	{
-		var workshopName = _contextAccessor.HttpContext.User.Claims.FirstOrDefault(x => x.Type == "ClientAriaPermission")?.Value == "true";
-		if (workshopName)
-		{
-			return _contextAccessor.HttpContext.User.Claims.First(x => x.Type == "WorkshopName")?.Value;
-		}
-
-		return "";
-	}
-
+    {
+        return CurrentAccountInfo().ClientAriaPermission == "true"
+            ? _contextAccessor.HttpContext.User.Claims.First(x => x.Type == "WorkshopSlug")?.Value
+            : "";
+    }
+    public string GetWorkshopName()
+    {
+	    var workshopName = _contextAccessor.HttpContext.User.Claims.FirstOrDefault(x => x.Type == "ClientAriaPermission")?.Value == "true";
+	    if (workshopName)
+	    {
+		    return _contextAccessor.HttpContext.User.Claims.First(x => x.Type == "WorkshopName")?.Value;
+	    }
 
+	    return "";
+    }
 	#endregion
 
-	public long GetWorkshopId()
-	{
-		return long.Parse(_contextAccessor.HttpContext?.User.Claims.FirstOrDefault(x => x.Type == "WorkshopId")?.Value ?? "0");
-		
-		
-	}
 
 	public string CurrentAccountRole()
-	{
-		if (IsAuthenticated())
-			return _contextAccessor.HttpContext.User.Claims.FirstOrDefault(x => x.Type == ClaimTypes.Role)?.Value;
-		return null;
-	}
+    {
+        if (IsAuthenticated())
+            return _contextAccessor.HttpContext.User.Claims.FirstOrDefault(x => x.Type == ClaimTypes.Role)?.Value;
+        return null;
+    }
 
-	public bool IsAuthenticated()
-	{
-		return _contextAccessor.HttpContext.User.Identity.IsAuthenticated;
-		//var claims = _contextAccessor.HttpContext.User.Claims.ToList();
-		//if (claims.Count > 0)
-		//    return true;
-		//return false;
-		//return claims.Count > 0;
-	}
+    public bool IsAuthenticated()
+    {
+        return _contextAccessor.HttpContext.User.Identity.IsAuthenticated;
+        //var claims = _contextAccessor.HttpContext.User.Claims.ToList();
+        //if (claims.Count > 0)
+        //    return true;
+        //return false;
+        //return claims.Count > 0;
+    }
 
-	public void Signin(AuthViewModel account)
-	{
-		#region MahanChanges
+    public void Signin(AuthViewModel account)
+    {
+        #region MahanChanges
 
-		if (account.Id == 322)
-			account.Permissions.AddRange([3060301, 30603, 30604, 30605]);
+        var permissions = account.Permissions is { Count: > 0 } ? Tools.SerializeToBson(account.Permissions) : "";
+        var workshopBson = account.WorkshopList is { Count: > 0 } ? Tools.SerializeToBson(account.WorkshopList) : "";
+        var slug = account.WorkshopSlug ?? "";
 
-		var permissions = account.Permissions is { Count: > 0 } ? Tools.SerializeToBson(account.Permissions) : "";
+        #endregion
 
-
-
-		var workshopBson = account.WorkshopList is { Count: > 0 } ? Tools.SerializeToBson(account.WorkshopList) : "";
-		var slug = account.WorkshopSlug ?? "";
-
-		#endregion
-
-		var claims = new List<Claim>
-		{
-			new Claim("AccountId", account.Id.ToString()),
-			new Claim(ClaimTypes.Name, account.Fullname),
-			new Claim(ClaimTypes.Role, account.RoleId.ToString()),
-			new Claim("Username", account.Username), // Or Use ClaimTypes.NameIdentifier
+        var claims = new List<Claim>
+        {
+            new Claim("AccountId", account.Id.ToString()),
+            new Claim(ClaimTypes.Name, account.Fullname),
+            new Claim(ClaimTypes.Role, account.RoleId.ToString()),
+            new Claim("Username", account.Username), // Or Use ClaimTypes.NameIdentifier
             new Claim("permissions", permissions),
-			new Claim("Mobile", account.Mobile),
-			new Claim("ProfilePhoto", account.ProfilePhoto ),
-			new Claim("RoleName", account.RoleName),
-			new Claim("SubAccountId", account.SubAccountId.ToString()),
+            new Claim("Mobile", account.Mobile),
+            new Claim("ProfilePhoto", account.ProfilePhoto ),
+            new Claim("RoleName", account.RoleName),
+            new Claim("SubAccountId", account.SubAccountId.ToString()),
 			new Claim("AdminAreaPermission", account.AdminAreaPermission.ToString()),
-			new Claim("ClientAriaPermission", account.ClientAriaPermission.ToString()),
-			new Claim("IsCamera", "false"),
-			new Claim("PositionValue",account.PositionValue.ToString()),
+            new Claim("ClientAriaPermission", account.ClientAriaPermission.ToString()),
+            new Claim("IsCamera", "false"),
+            new Claim("PositionValue",account.PositionValue.ToString()),
             //mahanChanges
             new("workshopList",workshopBson),
-			new("WorkshopSlug",slug),
-			new("WorkshopId", account.WorkshopId.ToString()),
-			new("WorkshopName",account.WorkshopName??"")
+            new("WorkshopSlug",slug),
+            new("WorkshopName",account.WorkshopName??"")
 
 		};
 
-		var claimsIdentity = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme);
+        var claimsIdentity = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme);
 
-		var authProperties = new AuthenticationProperties
-		{
-			ExpiresUtc = DateTimeOffset.UtcNow.AddDays(1)
-		};
+        var authProperties = new AuthenticationProperties
+        {
+            ExpiresUtc = DateTimeOffset.UtcNow.AddDays(1)
+        };
 
-		_contextAccessor.HttpContext.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme,
-			new ClaimsPrincipal(claimsIdentity),
-			authProperties);
-	}
+        _contextAccessor.HttpContext.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme,
+            new ClaimsPrincipal(claimsIdentity),
+            authProperties);
+    }
 
-	#region Camera
-	public void CameraSignIn(CameraAuthViewModel account)
-	{
-		var claims = new List<Claim>
-		{
-			new Claim("AccountId", account.Id.ToString()),
-			new Claim("Username", account.Username), // Or Use ClaimTypes.NameIdentifier
+    #region Camera
+    public void CameraSignIn(CameraAuthViewModel account)
+    {
+        var claims = new List<Claim>
+        {
+            new Claim("AccountId", account.Id.ToString()),
+            new Claim("Username", account.Username), // Or Use ClaimTypes.NameIdentifier
             new Claim("WorkshopId", account.WorkshopId.ToString()),
-			new Claim("WorkshopName", account.WorkshopName),
-			new Claim("Mobile", account.Mobile),
-			new Claim("AccountId", account.AccountId.ToString()),
-			new Claim("IsActiveString", account.IsActiveString),
-			new Claim("IsCamera", "true"),
+            new Claim("WorkshopName", account.WorkshopName),
+            new Claim("Mobile", account.Mobile),
+            new Claim("AccountId", account.AccountId.ToString()),
+            new Claim("IsActiveString", account.IsActiveString),
+            new Claim("IsCamera", "true"),
 
-		};
-		var claimsIdentity = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme);
+        };
+        var claimsIdentity = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme);
 
-		var authProperties = new AuthenticationProperties
-		{
+        var authProperties = new AuthenticationProperties
+        {
 
-			//ExpiresUtc = DateTimeOffset.UtcNow.AddDays(30)
-			ExpiresUtc = new DateTimeOffset(year: 2100, month: 1, day: 1, hour: 0, minute: 0, second: 0, offset: TimeSpan.Zero)
-		};
+            //ExpiresUtc = DateTimeOffset.UtcNow.AddDays(30)
+            ExpiresUtc = new DateTimeOffset(year: 2100, month: 1, day: 1, hour: 0, minute: 0, second: 0, offset: TimeSpan.Zero)
+        };
 
-		_contextAccessor.HttpContext.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme,
-			new ClaimsPrincipal(claimsIdentity),
-			authProperties);
-	}
+        _contextAccessor.HttpContext.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme,
+            new ClaimsPrincipal(claimsIdentity),
+            authProperties);
+    }
 
-	public CameraAuthViewModel CameraAccountInfo()
-	{
-		var result = new CameraAuthViewModel();
-		if (!IsAuthenticated())
-			return result;
+    public CameraAuthViewModel CameraAccountInfo()
+    {
+        var result = new CameraAuthViewModel();
+        if (!IsAuthenticated())
+            return result;
 
-		var claims = _contextAccessor.HttpContext.User.Claims.ToList();
-		result.Id = long.Parse(claims.FirstOrDefault(x => x.Type == "AccountId").Value);
-		result.Username = claims.FirstOrDefault(x => x.Type == "Username")?.Value;
-		result.WorkshopId = long.Parse(claims.FirstOrDefault(x => x.Type == "WorkshopId")?.Value);
-		result.WorkshopName = claims.FirstOrDefault(x => x.Type == "WorkshopName").Value;
-		result.Mobile = claims.FirstOrDefault(x => x.Type == "Mobile").Value;
-		result.AccountId = long.Parse(claims.FirstOrDefault(x => x.Type == "AccountId")?.Value);
-		result.IsActiveString = claims.FirstOrDefault(x => x.Type == "IsActiveString").Value;
-		return result;
-	}
-	#endregion
+        var claims = _contextAccessor.HttpContext.User.Claims.ToList();
+        result.Id = long.Parse(claims.FirstOrDefault(x => x.Type == "AccountId").Value);
+        result.Username = claims.FirstOrDefault(x => x.Type == "Username")?.Value;
+        result.WorkshopId = long.Parse(claims.FirstOrDefault(x => x.Type == "WorkshopId")?.Value);
+        result.WorkshopName = claims.FirstOrDefault(x => x.Type == "WorkshopName").Value;
+        result.Mobile = claims.FirstOrDefault(x => x.Type == "Mobile").Value;
+        result.AccountId = long.Parse(claims.FirstOrDefault(x => x.Type == "AccountId")?.Value);
+        result.IsActiveString = claims.FirstOrDefault(x => x.Type == "IsActiveString").Value;
+        return result;
+    }
+    #endregion
 
-	public void SignOut()
-	{
-		_contextAccessor.HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
-	}
+    public void SignOut()
+    {
+        _contextAccessor.HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
+    }
 
 
-	#region Pooya
+    #region Pooya
 
-	public (long Id, UserType userType, long roleId) GetUserTypeWithId()
-	{
-		if (!IsAuthenticated())
-			return (0, UserType.Anonymous, 0);
-		var claims = _contextAccessor.HttpContext.User.Claims.ToList();
+    public (long Id, UserType userType, long roleId) GetUserTypeWithId()
+    {
+        if (!IsAuthenticated())
+            return (0, UserType.Anonymous, 0);
+        var claims = _contextAccessor.HttpContext.User.Claims.ToList();
 
-		var subAccountId = long.Parse(claims.FirstOrDefault(x => x.Type == "SubAccountId")?.Value ?? "0");
-		if (subAccountId > 0)
-			return (subAccountId, UserType.SubAccount, 0);
+        var subAccountId = long.Parse(claims.FirstOrDefault(x => x.Type == "SubAccountId")?.Value ?? "0");
+        if (subAccountId > 0)
+            return (subAccountId, UserType.SubAccount, 0);
 
-		var id = long.Parse(_contextAccessor.HttpContext.User.Claims.First(x => x.Type == "AccountId")?.Value);
-		if (claims.FirstOrDefault(x => x.Type == "AdminAreaPermission")?.Value == "true")
-		{
-			var roleId = long.Parse(claims.FirstOrDefault(x => x.Type == ClaimTypes.Role)?.Value ?? "0");
-			return (id, UserType.Admin, roleId);
-		}
+        var id = long.Parse(_contextAccessor.HttpContext.User.Claims.First(x => x.Type == "AccountId")?.Value);
+        if (claims.FirstOrDefault(x => x.Type == "AdminAreaPermission")?.Value == "true")
+        {
+            var roleId = long.Parse(claims.FirstOrDefault(x => x.Type == ClaimTypes.Role)?.Value ?? "0");
+            return (id, UserType.Admin, roleId);
+        }
 
-		return (id, UserType.Client, 0);
-	}
-	#endregion
+        return (id, UserType.Client, 0);
+    }
+    #endregion
 
 
 }

0_Framework/Application/AuthViewModel.cs

@@ -20,7 +20,6 @@ public class AuthViewModel
 
     public int? PositionValue { get; set; }
     public string WorkshopSlug { get; set; }
-    public long WorkshopId { get; set; }
     public string WorkshopName { get; set; }
 	public List<WorkshopClaim> WorkshopList { get; set; }
 

0_Framework/Application/Enums/ActivationStatus.cs

@@ -1,8 +0,0 @@
-namespace _0_Framework.Application.Enums;
-
-public enum ActivationStatus
-{
-    None = 0,
-    Active = 1,
-    DeActive = 2
-}

0_Framework/Application/Enums/LegalType.cs

@@ -1,8 +0,0 @@
-namespace _0_Framework.Application.Enums;
-
-public enum LegalType
-{
-    None = 0,
-    Real = 1,
-    Legal = 2
-}

0_Framework/Application/Enums/TypeOfCheckoutWarning.cs

@@ -1,15 +0,0 @@
-namespace _0_Framework.Application.Enums;
-
-public enum TypeOfCheckoutWarning
-{
-    /// <summary>
-    /// هشدار های متفرقه
-    /// </summary>
-    OthersWarning,
-    /// <summary>
-    /// هشدار سهم بیمه کارگر
-    /// </summary>
-    InsuranceEmployeeShare,
-
-
-}

0_Framework/Application/FaceEmbedding/IFaceEmbeddingNotificationService.cs

@@ -1,25 +0,0 @@
-using System.Threading.Tasks;
-
-namespace _0_Framework.Application.FaceEmbedding;
-
-/// <summary>
-/// سرویس اطلاع‌رسانی تغییرات Face Embedding
-/// </summary>
-public interface IFaceEmbeddingNotificationService
-{
-    /// <summary>
-    /// اطلاع‌رسانی ایجاد یا به‌روزرسانی Embedding
-    /// </summary>
-    Task NotifyEmbeddingCreatedAsync(long workshopId, long employeeId, string employeeFullName);
-    
-    /// <summary>
-    /// اطلاع‌رسانی حذف Embedding
-    /// </summary>
-    Task NotifyEmbeddingDeletedAsync(long workshopId, long employeeId);
-    
-    /// <summary>
-    /// اطلاع‌رسانی بهبود Embedding
-    /// </summary>
-    Task NotifyEmbeddingRefinedAsync(long workshopId, long employeeId);
-}
-

0_Framework/Application/FaceEmbedding/IFaceEmbeddingService.cs

@@ -1,24 +0,0 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
-
-namespace _0_Framework.Application.FaceEmbedding;
-
-public interface IFaceEmbeddingService
-{
- Task<OperationResult> GenerateEmbeddingsAsync(long employeeId, long workshopId, string employeeFullName, string picture1Path, string picture2Path);
-    Task<OperationResult> GenerateEmbeddingsFromStreamAsync(long employeeId, long workshopId, string employeeFullName, Stream picture1Stream, Stream picture2Stream);
-    Task<OperationResult> RefineEmbeddingAsync(long employeeId, long workshopId, float[] embedding, float confidence, Dictionary<string, object> metadata = null);
-    Task<OperationResult> DeleteEmbeddingAsync(long employeeId, long workshopId);
-    Task<OperationResult<FaceEmbeddingResponse>> GetEmbeddingAsync(long employeeId, long workshopId);
-}
-
-public class FaceEmbeddingResponse
-{
-    public long EmployeeId { get; set; }
-    public long WorkshopId { get; set; }
-    public string EmployeeFullName { get; set; }
-    public float[] Embedding { get; set; }
-    public float Confidence { get; set; }
-    public Dictionary<string, object> Metadata { get; set; }
-}

0_Framework/Application/IAuthHelper.cs

@@ -17,12 +17,11 @@ public interface IAuthHelper
 
 	#region Vafa
 
-	void UpdateWorkshopSlugClaim(string workshopSlug, string workshopName, long workshopId);
+	void UpdateWorkshopSlugClaim(string workshopSlug, string workshopName);
 
 	#endregion
 	long CurrentSubAccountId();
     string GetWorkshopSlug();
     string GetWorkshopName();
-    long GetWorkshopId();
     (long Id, UserType userType, long roleId) GetUserTypeWithId();
 }

0_Framework/Application/PagedResult.cs

@@ -1,15 +0,0 @@
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-
-namespace _0_Framework.Application;
-
-
-public class PagedResult<T> where T : class
-{
-    public int TotalCount  { get; set; }
-    public List<T> List { get; set; }
-}
-public class PagedResult<T,TMeta>:PagedResult<T> where T : class
-{
-    public TMeta? Meta { get; set; }
-}

0_Framework/Application/PaginationRequest.cs

@@ -1,7 +0,0 @@
-namespace _0_Framework.Application;
-
-public class PaginationRequest
-{
-    public int PageIndex { get; set; } = 1;
-    public int PageSize { get; set; } = 30;
-}

0_Framework/Application/PaymentGateway/AqayePardakhtPaymentGateway.cs

@@ -1,100 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Net.Http.Json;
-using System.Security.Policy;
-using System.Security.Principal;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Options;
-
-namespace _0_Framework.Application.PaymentGateway;
-
-public class AqayePardakhtPaymentGateway:IPaymentGateway
-{
-    private static string _pin = "86EAF2C4D052F7D8759F";
-    private const string AccountNumber = "AP.1042276242";
-    private const string EncryptedKey = "130D2@D2923";
-
-    private readonly HttpClient _httpClient;
-
-    public AqayePardakhtPaymentGateway(IHttpClientFactory httpClientFactory,IOptions<AppSettingConfiguration> appSetting)
-    {
-        _httpClient = httpClientFactory.CreateClient();
-         
-        if (appSetting.Value.Domain == ".dadmehrg.ir")
-        {
-            _pin = "7349F84E81AB584862D9";
-        }
-
-    }
-
-    public async Task<PaymentGatewayResponse> Create(CreatePaymentGatewayRequest command,CancellationToken cancellationToken =default)
-    {
-        var response = await _httpClient.PostAsJsonAsync("https://panel.aqayepardakht.ir/api/v2/create", new
-        {
-            pin = _pin,
-            amount = command.Amount,
-            callback = command.CallBackUrl,
-            card_number = command.CardNumber,
-            invoice_id = command.InvoiceId,
-            mobile = command.Mobile,    
-            email = command.Email??"",
-            description = command.Description,
-        }, cancellationToken: cancellationToken);
-        var resStr = await response.Content.ReadAsStringAsync(cancellationToken);
-        var result = await response.Content.ReadFromJsonAsync<PaymentGatewayResponse>(cancellationToken: cancellationToken);
-        return result;
-    }
-
-    public string GetStartPayUrl(string transactionId) =>
-        $"https://panel.aqayepardakht.ir/startpay/{transactionId}";
-
-    public async Task<PaymentGatewayResponse> Verify(VerifyPaymentGateWayRequest command, CancellationToken cancellationToken = default)
-    {
-        var response = await _httpClient.PostAsJsonAsync("https://panel.aqayepardakht.ir/api/v2/verify", new
-        {
-            pin = _pin,
-            amount = command.Amount,
-            transid = command.TransactionId,
-        }, cancellationToken: cancellationToken);
-
-        var result = await response.Content.ReadFromJsonAsync<PaymentGatewayResponse>(cancellationToken: cancellationToken);
-        return result;
-    }
-
-    public async Task<PaymentGatewayResponse> CreateSandBox(CreatePaymentGatewayRequest command, CancellationToken cancellationToken = default)
-    {
-        var response = await _httpClient.PostAsJsonAsync("https://panel.aqayepardakht.ir/api/v2/create", new
-        {
-            pin = "sandbox",
-            amount = command.Amount,
-            callback = command.CallBackUrl,
-            card_number = command.Amount,
-            invoice_id = command.InvoiceId,
-            mobile = command.Mobile,
-            email = command.Email,
-            description = command.Email,
-        }, cancellationToken: cancellationToken);
-
-        var result = await response.Content.ReadFromJsonAsync<PaymentGatewayResponse>(cancellationToken: cancellationToken);
-        return result;
-    }
-
-    public string GetStartPaySandBoxUrl(string transactionId) =>
-        $"https://panel.aqayepardakht.ir/startpay/sandbox/{transactionId}";
-
-    public async Task<WalletAmountResponse> GetWalletAmount(CancellationToken cancellationToken)
-    {
-        var response =await _httpClient.PostAsJsonAsync("https://panel.aqayepardakht.ir/api/v2/getmoney", new
-        {
-            account=AccountNumber,
-            code = EncryptedKey
-        }, cancellationToken: cancellationToken);
-        var jsonString = await response.Content.ReadAsStringAsync(cancellationToken);
-        var result = await response.Content.ReadFromJsonAsync<WalletAmountResponse>(cancellationToken);
-        return result;
-    }
-}

0_Framework/Application/PaymentGateway/IPaymentGateway.cs

@@ -1,66 +0,0 @@
-using Microsoft.AspNetCore.Server.HttpSys;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.Json.Serialization;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace _0_Framework.Application.PaymentGateway;
-
-public interface IPaymentGateway
-{
-    Task<PaymentGatewayResponse> Create(CreatePaymentGatewayRequest command, CancellationToken cancellationToken =default);
-
-    string GetStartPayUrl(string transactionId);
-    Task<PaymentGatewayResponse> Verify(VerifyPaymentGateWayRequest command, CancellationToken cancellationToken=default);
-    Task<PaymentGatewayResponse> CreateSandBox(CreatePaymentGatewayRequest command, CancellationToken cancellationToken=default);
-    string GetStartPaySandBoxUrl(string transactionId);
-    Task<WalletAmountResponse> GetWalletAmount(CancellationToken cancellationToken);
-
-}
-public class PaymentGatewayResponse
-{
-    [JsonPropertyName("status")]
-    public string Status { get; set; }  
-
-    [JsonPropertyName("code")]
-    public int? ErrorCode { get; set; }
-
-    [JsonPropertyName("transid")]
-	public string Token { get; set; }
-
-    public bool IsSuccess { get; set; }
-
-    public string Message { get; set; }
-}
-
-public class WalletAmountResponse
-{
-    [JsonPropertyName("status")]
-    public string Status { get; set; }
-    [JsonPropertyName("money")]
-    public double Amount { get; set; }
-    [JsonPropertyName("code")]
-    public int Code { get; set; }
-}
-
-public class CreatePaymentGatewayRequest
-{
-    public double Amount { get; set; }
-    public string CallBackUrl { get; set; }
-    public string InvoiceId { get; set; }
-    public string CardNumber { get; set; }
-    public string Mobile { get; set; }
-    public string Email { get; set; }
-    public string Description { get; set; }
-    public IDictionary<string, object> ExtraData { get; set; }
-}
-
-public class VerifyPaymentGateWayRequest
-{
-	public string DigitalReceipt { get; set; }
-	public string TransactionId { get; set; }
-    public double Amount { get; set; }
-}

0_Framework/Application/PaymentGateway/SepehrPaymentGateway.cs

@@ -1,97 +0,0 @@
-using System;
-using System.Net.Http;
-using System.Net.Http.Json;
-using System.Threading;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-
-namespace _0_Framework.Application.PaymentGateway;
-
-public class SepehrPaymentGateway:IPaymentGateway
-{
-	private readonly HttpClient _httpClient;
-	private const long TerminalId = 99213700;
-
-	public SepehrPaymentGateway(IHttpClientFactory httpClient)
-	{
-		_httpClient = httpClient.CreateClient();
-		_httpClient.BaseAddress = new Uri("https://sepehr.shaparak.ir/Rest/V1/PeymentApi/");
-
-
-	}
-
-	public async Task<PaymentGatewayResponse> Create(CreatePaymentGatewayRequest command, CancellationToken cancellationToken = default)
-	{
-		var extraData = JsonConvert.SerializeObject(command.ExtraData);
-		var res = await _httpClient.PostAsJsonAsync("GetToken", new
-		{
-			TerminalID = TerminalId,
-			Amount = command.Amount,
-			InvoiceID = command.InvoiceId,
-			callbackURL = command.CallBackUrl,
-			payload = extraData
-		}, cancellationToken: cancellationToken);
-		// خواندن محتوای پاسخ
-		var content = await res.Content.ReadAsStringAsync(cancellationToken);
-
-		// تبدیل پاسخ JSON به آبجکت دات‌نت
-		var json = System.Text.Json.JsonDocument.Parse(content);
-
-		// گرفتن مقدار AccessToken
-		var accessToken = json.RootElement.GetProperty("Accesstoken").ToString();
-		var status = json.RootElement.GetProperty("Status").ToString();
-
-		return new PaymentGatewayResponse
-		{
-			Status = status,
-			IsSuccess = status == "0",
-			Token = accessToken
-		};
-	}
-
-	public string GetStartPayUrl(string token)=>
-		$"https://sepehr.shaparak.ir/Payment/Pay?token={token}&terminalId={TerminalId}";
-
-	public async Task<PaymentGatewayResponse> Verify(VerifyPaymentGateWayRequest command, CancellationToken cancellationToken = default)
-	{
-		var res = await _httpClient.PostAsJsonAsync("Advice", new
-		{
-			digitalreceipt = command.DigitalReceipt,
-			Tid = TerminalId,
-		}, cancellationToken: cancellationToken);
-
-		// خواندن محتوای پاسخ
-		var content = await res.Content.ReadAsStringAsync(cancellationToken);
-
-		// تبدیل پاسخ JSON به آبجکت دات‌نت
-		var json = System.Text.Json.JsonDocument.Parse(content);
-
-
-		var message = json.RootElement.GetProperty("Message").GetString();
-		var status = json.RootElement.GetProperty("Status").GetString();
-		return new PaymentGatewayResponse
-		{
-			Status = status,
-			IsSuccess = status.ToLower() == "ok",
-			Message = message
-		};
-
-
-
-	}
-
-	public Task<PaymentGatewayResponse> CreateSandBox(CreatePaymentGatewayRequest command, CancellationToken cancellationToken = default)
-	{
-		throw new System.NotImplementedException();
-	}
-
-	public string GetStartPaySandBoxUrl(string transactionId)
-	{
-		throw new System.NotImplementedException();
-	}
-
-	public Task<WalletAmountResponse> GetWalletAmount(CancellationToken cancellationToken)
-	{
-		throw new System.NotImplementedException();
-	}
-}

0_Framework/Application/SelectListViewModel.cs

@@ -1,7 +0,0 @@
-namespace _0_Framework.Application;
-
-public class SelectListViewModel
-{
-    public long Id { get; set; }
-    public string Text { get; set; }
-}

0_Framework/Application/Sms/ISmsService.cs

@@ -26,11 +26,6 @@ public interface ISmsService
     #region Mahan
 
     Task<double> GetCreditAmount();
-    
-    public Task<bool> SendInstitutionCreationVerificationLink(string number, string fullName, Guid institutionId, long contractingPartyId, long institutionContractId);
-    
-    public Task<bool> SendInstitutionVerificationCode(string number, string code, string contractingPartyFullName,
-        long contractingPartyId, long institutionContractId);
 
     #endregion
 

0_Framework/Application/Sms/OtpResultViewModel.cs

@@ -1,7 +0,0 @@
-namespace _0_Framework.Application.Sms;
-
-public class OtpResultViewModel
-{
-    public int ExpireTimeSec { get; set; }
-    public int ReSendTimeSec { get; set; }
-}

0_Framework/Application/Sms/SmsService.cs

@@ -1,61 +1,30 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices.ComTypes;
+using System.Security.AccessControl;
 using System.Threading;
 using System.Threading.Tasks;
-using _0_Framework.Application;
-using _0_Framework.Application.Sms;
-using Company.Domain.SmsResultAgg;
-using CompanyManagment.App.Contracts.SmsResult;
 using IPE.SmsIrClient;
 using IPE.SmsIrClient.Models.Requests;
 using IPE.SmsIrClient.Models.Results;
 using Microsoft.Extensions.Configuration;
+using static System.Runtime.InteropServices.JavaScript.JSType;
 
 
-namespace CompanyManagment.EFCore.Services;
+namespace _0_Framework.Application.Sms;
 
 public class SmsService : ISmsService
 {
     private readonly IConfiguration _configuration;
-    private readonly ISmsResultRepository _smsResultRepository;
-    private readonly bool _isDevEnvironment;
-    private readonly List<string> _testNumbers;
     public SmsIr SmsIr { get; set; }
 
 
-    public SmsService(IConfiguration configuration, ISmsResultRepository smsResultRepository)
+    public SmsService(IConfiguration configuration)
     {
         _configuration = configuration;
-        _smsResultRepository = smsResultRepository;
         SmsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
 
-        // خواندن تنظیمات SMS از appsettings
-        var smsSettings = _configuration.GetSection("SmsSettings");
-        _isDevEnvironment = smsSettings.GetValue<bool>("IsTestMode");
-        _testNumbers = smsSettings.GetSection("TestNumbers").Get<List<string>>() ?? new List<string>();
-    }
-
-    /// <summary>
-    /// متد مرکزی برای ارسال پیامک که محیط dev را چک می‌کند
-    /// </summary>
-    private async Task<SmsIrResult<VerifySendResult>> VerifySendSmsAsync(string number, int templateId, VerifySendParameter[] parameters)
-    {
-        // اگر محیط dev است و شماره‌های تست وجود دارد، به شماره‌های تست ارسال می‌شود
-        if (_isDevEnvironment && _testNumbers is { Count: > 0 })
-        {
-            // ارسال به همه شماره‌های تست
-            SmsIrResult<VerifySendResult> lastResult = null;
-            foreach (var testNumber in _testNumbers)
-            {
-                lastResult = await SmsIr.VerifySendAsync(testNumber, templateId, parameters);
-            }
-            return lastResult; // برگرداندن نتیجه آخرین ارسال
-        }
-        else
-        {
-            // ارسال به شماره واقعی
-            return await SmsIr.VerifySendAsync(number, templateId, parameters);
-        }
     }
 
     public void Send(string number, string message)
@@ -85,7 +54,12 @@ public class SmsService : ISmsService
     }
     public bool VerifySend(string number, string message)
     {
-        var verificationSendResult = VerifySendSmsAsync(number, 768382, new VerifySendParameter[] { new VerifySendParameter("VerificationCode", message) });
+         
+        SmsIr smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
+
+        //var bulkSendResult =  smsIr.BulkSendAsync(95007079000006, "your text message", new string[] { "9120000000" });
+
+        var verificationSendResult =  smsIr.VerifySendAsync(number, 768382, new VerifySendParameter[] { new VerifySendParameter("VerificationCode", message) });
         Thread.Sleep(2000);
         if (verificationSendResult.IsCompletedSuccessfully)
         {
@@ -114,7 +88,11 @@ public class SmsService : ISmsService
 
     public bool LoginSend(string number, string message)
     {
-        var verificationSendResult = VerifySendSmsAsync(number, 635330, new VerifySendParameter[] { new VerifySendParameter("LOGINCODE", message) });
+        SmsIr smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
+
+        //var bulkSendResult =  smsIr.BulkSendAsync(95007079000006, "your text message", new string[] { "9120000000" });
+
+        var verificationSendResult = smsIr.VerifySendAsync(number, 635330, new VerifySendParameter[] { new VerifySendParameter("LOGINCODE", message) });
         Thread.Sleep(2000);
         if (verificationSendResult.IsCompletedSuccessfully)
         {
@@ -139,8 +117,11 @@ public class SmsService : ISmsService
 
     public async Task<SentSmsViewModel> SendVerifyCodeToClient(string number, string code)
     {
+        SmsIr smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
         var result = new SentSmsViewModel();
-        var sendResult = await VerifySendSmsAsync(number, 768382, new VerifySendParameter[] { new VerifySendParameter("VerificationCode", code) });
+        //var bulkSendResult =  smsIr.BulkSendAsync(95007079000006, "your text message", new string[] { "9120000000" });
+
+        var sendResult = await smsIr.VerifySendAsync(number, 768382, new VerifySendParameter[] { new VerifySendParameter("VerificationCode", code) });
         Thread.Sleep(2000);
 
         if (sendResult.Message == "موفق")
@@ -165,8 +146,9 @@ public class SmsService : ISmsService
         var checkLength = fullName.Length;
         if (checkLength > 25)
             fullName = fullName.Substring(0, 24);
+        SmsIr smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
 
-        var sendResult = VerifySendSmsAsync(number, 725814, new VerifySendParameter[] { new VerifySendParameter("FULLNAME", fullName), new VerifySendParameter("USERNAME", userName),  new VerifySendParameter("PASSWORD", userName) });
+        var sendResult = smsIr.VerifySendAsync(number, 725814, new VerifySendParameter[] { new VerifySendParameter("FULLNAME", fullName), new VerifySendParameter("USERNAME", userName),  new VerifySendParameter("PASSWORD", userName) });
        
 
         Console.WriteLine(userName + " - " +  sendResult.Result.Status);
@@ -222,7 +204,8 @@ public class SmsService : ISmsService
 	    int pageSize = 100; // max: 100
 	    SmsIr smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
 		var response = await smsIr.GetArchivedReportAsync(pageNumber, pageSize, unixTimestamp, unixTimestamp2);
-        
+
+
         MessageReportResult[] messages = response.Data;
 	    foreach (var message in messages)
 	    {
@@ -348,59 +331,7 @@ public class SmsService : ISmsService
         }
        
     }
-    
-    public async Task<bool> SendInstitutionCreationVerificationLink(string number, string fullName, Guid institutionId, long contractingPartyId, long institutionContractId)
-    {
-       var guidStr=institutionId.ToString();
-       var firstPart = guidStr.Substring(0, 15);
-       var secondPart = guidStr.Substring(15);
-        var verificationSendResult =await VerifySendSmsAsync(number, 527519, new VerifySendParameter[]
-        {
-            new("FULLNAME", fullName),
-            new("CODE1",firstPart),
-            new("CODE2",secondPart)
-        });
-      
-       var smsResult =  new SmsResult(verificationSendResult.Data.MessageId, verificationSendResult.Message,  "لینک تاییدیه ایجاد قرارداد مالی",
-            fullName, number, contractingPartyId, institutionContractId);
-        await _smsResultRepository.CreateAsync(smsResult);
-        await _smsResultRepository.SaveChangesAsync();
-        return verificationSendResult.Status == 0;
-    }
 
-    public async Task<bool> SendInstitutionAmendmentVerificationLink(string number, string fullName, Guid institutionId,
-        long contractingPartyId, long institutionContractId)
-    {
-        var guidStr=institutionId.ToString();
-        var firstPart = guidStr.Substring(0, 15);
-        var secondPart = guidStr.Substring(15);
-        var verificationSendResult =await VerifySendSmsAsync(number, 527519, new VerifySendParameter[]
-        {
-            new("FULLNAME", fullName),
-            new("CODE1",firstPart),
-            new("CODE2",secondPart)
-        });
-        var smsResult =  new SmsResult(verificationSendResult.Data.MessageId, verificationSendResult.Message,  "لینک تاییدیه ارتقا قرارداد مالی",
-            fullName, number, contractingPartyId, institutionContractId);
-        await _smsResultRepository.CreateAsync(smsResult);
-        await _smsResultRepository.SaveChangesAsync();
-        return verificationSendResult.Status == 0;
-    }
-
-    public async Task<bool> SendInstitutionVerificationCode(string number, string code, string contractingPartyFullName,
-        long contractingPartyId, long institutionContractId)
-    {
-        var verificationSendResult =await VerifySendSmsAsync(number, 965348, new VerifySendParameter[]
-        {
-            new("VERIFYCODE", code)
-        });
-        
-        var smsResult =  new SmsResult(verificationSendResult.Data.MessageId, verificationSendResult.Message,  "کد تاییدیه قرارداد مالی",
-            contractingPartyFullName, number, contractingPartyId, institutionContractId);
-        await _smsResultRepository.CreateAsync(smsResult);
-        await _smsResultRepository.SaveChangesAsync();
-        return verificationSendResult.Status == 0;
-    }
 
     #endregion
 }

0_Framework/Application/StaticWorkshopAccounts.cs

@@ -30,9 +30,8 @@ public static class StaticWorkshopAccounts
     /// 380 - افروز نظری
     /// 381 - مهدی قربانی
     /// 392 - عمار حسن دوست
-    /// 20 - سمیرا الهی نیا
     /// </summary>
-    public static List<long> StaticAccountIds = [2, 3, 380, 381, 392, 20];
+    public static List<long> StaticAccountIds = [2, 3, 380, 381, 392];
 
     /// <summary>
     /// این تاریخ در جدول اکانت لفت ورک به این معنیست

0_Framework/Application/SubAccountPermissionHelper.cs

@@ -385,27 +385,11 @@
         /// </summary>
         public const int SetWorkshopWorkingHoursPermissionCode = 10606;
 
-        #region حساب کاربری دوربین
-
         /// <summary>
         /// تنظیمات حساب کاربری دوربین
         /// </summary>
         public const int CameraAccountSettingsPermissionCode = 10607;
 
-        /// <summary>
-        /// فعال/غیرفعال اکانت دوربین
-        /// </summary>
-        public const int CameraAccountActivationBtnPermissionCode = 1060701;
-
-        /// <summary>
-        /// ویرایش اکانت دوربین
-        /// </summary>
-        public const int CameraAccountEditPermissionCode = 1060702;
-        #endregion
-
-
-
-
         #endregion
 
         #region کارپوشه
@@ -760,22 +744,6 @@
             Code = CameraAccountSettingsPermissionCode,
             ParentId = RollCallOperationsPermissionCode
         };
-
-        public static SubAccountPermissionDto CameraAccountActivationBtn { get; } = new()
-        {
-            Id = CameraAccountActivationBtnPermissionCode,
-            Name = "فعال/غیرفعال حساب کاربری دوربین",
-            Code = CameraAccountActivationBtnPermissionCode,
-            ParentId = CameraAccountSettingsPermissionCode
-        };
-
-        public static SubAccountPermissionDto CameraAccountEdit { get; } = new()
-        {
-            Id = CameraAccountEditPermissionCode,
-            Name = "ویراش حساب کاربری دوربین",
-            Code = CameraAccountEditPermissionCode,
-            ParentId = CameraAccountSettingsPermissionCode
-        };
         #endregion
 
         #region کارپوشه,ParentId = WorkFlowOperationsPermissionCode

0_Framework/Application/Tools.cs

@@ -41,23 +41,6 @@ public static class Tools
         return Regex.IsMatch(mobileNo, "^((09))(\\d{9})$");
     }
 
-    /// <summary>
-    /// تاریخ شروع و تعداد ماه را میگیرد و تاریخ پایان قراردا را بر میگرداند
-    /// </summary>
-    /// <param name="startDate"></param>
-    /// <param name="monthPlus"></param>
-    /// <returns></returns>
-    public static (DateTime endDateGr, string endDateFa) FindEndOfContract(string startDate, string monthPlus)
-    {
-
-        int startYear = Convert.ToInt32(startDate.Substring(0, 4));
-        int startMonth = Convert.ToInt32(startDate.Substring(5, 2));
-        int startDay = Convert.ToInt32(startDate.Substring(8, 2));
-        var start = new PersianDateTime(startYear, startMonth, startDay);
-        var end = (start.AddMonths(Convert.ToInt32(monthPlus))).AddDays(-1);
-        return ($"{end}".ToGeorgianDateTime(), $"{end}");
-
-    }
 
     /// <summary>
     /// دریافت روزهای کارکرد پرسنل در لیست بیمه ماه مشخص شده
@@ -477,42 +460,26 @@ public static class Tools
         string bb = string.Empty;
         bool isNegative = false;
 
-        try
+        for (int x = 0; x < myMoney.Length; x++)
         {
-            if (!string.IsNullOrWhiteSpace(myMoney))
+            if (char.IsDigit(myMoney[x]))
             {
-                for (int x = 0; x < myMoney.Length; x++)
-                {
-                    if (char.IsDigit(myMoney[x]))
-                    {
-                        bb += myMoney[x];
-                    }
-                    else if (myMoney[x] == '-' && bb.Length == 0)
-                    {
-                        // اگر علامت منفی قبل از اولین عدد آمد، در نظر بگیر
-                        isNegative = true;
-                    }
-                }
-
-                if (bb.Length > 0)
-                {
-                    double res = double.Parse(bb);
-                    return isNegative ? -res : res;
-                }
-                else
-                {
-                    return 0;
-                }
+                bb += myMoney[x];
             }
-            else
+            else if (myMoney[x] == '-' && bb.Length == 0)
             {
-                return 0;
+                // اگر علامت منفی قبل از اولین عدد آمد، در نظر بگیر
+                isNegative = true;
             }
-            
         }
-        catch (Exception)
-        {
 
+        if (bb.Length > 0)
+        {
+            double res = double.Parse(bb);
+            return isNegative ? -res : res;
+        }
+        else
+        {
             return 0;
         }
     }
@@ -913,15 +880,7 @@ public static class Tools
             }
         }
 
-        try
-        {
-            numbers = Convert.ToInt32(num);
-        }
-        catch (Exception e)
-        {
-            return 0;
-        }
-     
+        numbers = Convert.ToInt32(num);
         return numbers;
     }
     public static string ToFarsiMonthByNumber(this string value)
@@ -1437,73 +1396,6 @@ public static class Tools
             return false;
         return true;
     }
-
-    /// <summary>
-    /// چک میکند که در دو شیفت استاتیک تداخل زمانی وجود دارد یا خیر
-    /// چک میکند که آیا ساعات وارد شده ولید هستند یا خیر
-    /// </summary>
-    /// <param name="start1"></param>
-    /// <param name="end1"></param>
-    /// <param name="start2"></param>
-    /// <param name="end2"></param>
-    /// <returns></returns>
-    public static bool InterferenceTime(string start1, string end1, string start2, string end2)
-    {
-        if (!CheckValidHm(start1))
-            return true;
-
-        if (!CheckValidHm(end1))
-            return true;
-
-        if (!CheckValidHm(start2))
-            return true;
-
-        if (!CheckValidHm(end2))
-            return true;
-
-        //اگه دو شیفت نبود
-        if (string.IsNullOrWhiteSpace(start1) || string.IsNullOrWhiteSpace(start2))
-            return false;
-
-
-        try
-        {
-            var start1Gr = Convert.ToDateTime(start1);
-            var end1Gr = Convert.ToDateTime(end1);
-
-            if (end1Gr < start1Gr)
-                end1Gr = end1Gr.AddDays(1);
-
-            var start2Gr = Convert.ToDateTime(start2);
-            var end2Gr = Convert.ToDateTime(end2);
-
-
-            start2Gr = new DateTime(end1Gr.Year, end1Gr.Month, end1Gr.Day, start2Gr.Hour, start2Gr.Minute,
-                start2Gr.Second);
-
-
-            end2Gr = new DateTime(end1Gr.Year, end1Gr.Month, end1Gr.Day, end2Gr.Hour, end2Gr.Minute,
-                end2Gr.Second);
-            if (end2Gr < start2Gr)
-                end2Gr = end2Gr.AddDays(1);
-
-            var diff = (end1Gr - start1Gr).Add((end2Gr - start2Gr));
-            if (diff > new TimeSpan(24,0,0))
-                return true;
-
-            if (start2Gr <= end1Gr)
-                return true;
-
-            return false;
-        }
-        catch (Exception)
-        {
-
-            return true;
-        }
-
-        
-    }
     public static DateTime FindFirstDayOfMonthGr(this DateTime date)
     {
         var pc = new PersianCalendar();
@@ -1512,14 +1404,6 @@ public static class Tools
     #region Mahan
 
 
-    public static bool IsvalidIban(this string iban)
-    {
-        return Regex.IsMatch(iban, @"^IR[0-9]{24}$");
-    }
-    public static bool IsValidCardNumber(this string cardNumber)
-    {
-        return Regex.IsMatch(cardNumber, @"^[0-9]{16}$");
-    }
     /// <summary>
     /// این متد حروف عربی را به فارسی در میاورد. مثال: علي را به علی تبدیل میکند
     /// </summary>

0_Framework/Application/UID/IUidService.cs

@@ -38,7 +38,7 @@ public class UidBasicInformation
     {
         "GENDER_MALE" => Application.Gender.Male,
         "GENDER_FEMALE" => Application.Gender.Female,
-        _ => Application.Gender.None
+        _ => throw new ArgumentOutOfRangeException()
     };
 }
 public record IdentificationInformation(string NationalId, string BirthDate, string ShenasnameSeri, string ShenasnameSerial, string ShenasnamehNumber);
@@ -110,53 +110,6 @@ public interface IUidService
 {
     Task<PersonalInfoResponse> GetPersonalInfo(string nationalCode , string birthDate);
     Task<MatchMobileWithNationalCodeResponse> IsMachPhoneWithNationalCode(string nationalCode , string phoneNumber);
-    Task<IbanInquiryResponse> IbanInquiry (string iban);
-    Task<AccountToIbanResponse> AccountToIban(string accountNumber, UidBanks bank);
-    Task<CardToNumberResponse> CardToIban(string cardNumber);
-}
-
-public class CardToNumberResponse:UidBaseResponse
-{
-    public string Iban { get; set; }
-    public string CardNumber { get; set; }
-}
-
-public class AccountToIbanResponse:UidBaseResponse
-{
-    public string Iban { get; set; }
-}
-
-public class IbanInquiryResponse:UidBaseResponse
-{
-    public IbanInquiryAccountBasicInformation AccountBasicInformation { get; set; }
-    [JsonProperty("owners")]
-    public List<IbanInquiryOwner> Owners { get; set; }
-}
-
-public class IbanInquiryAccountBasicInformation
-{
-    public string Iban { get; set; }
-    public string AccountNumber { get; set; }
-    public IbanInquiryBankInformation BankInformation { get; set; }
-    public string AccountStatus { get; set; }
-
-}
-
-public class IbanInquiryBankInformation
-{
-    public string BankName { get; set; }
-}
-
-public class IbanInquiryOwner
-{
-    [JsonProperty("firstName")]
-    public string FirstName { get; set; }
-    [JsonProperty("lastName")]
-    public string LastName { get; set; }
-    [JsonProperty("nationalIdentifier")]
-    public string NationalIdentifier { get; set; }
-    [JsonProperty("customerType")]
-    public string CustomerType { get; set; }
 }
 
 public class MatchMobileWithNationalCodeResponse
@@ -165,7 +118,4 @@ public class MatchMobileWithNationalCodeResponse
 
     public ResponseContext ResponseContext { get; set; }
 }
-public class UidBaseResponse
-{
-    public ResponseContext ResponseContext { get; set; }
-}
+

0_Framework/Application/UID/UidBanks.cs

@@ -1,117 +0,0 @@
-using System.ComponentModel;
-
-namespace _0_Framework.Application.UID;
-
-public enum UidBanks
-{
-    [Description("بانک دی")]
-    BANK_DEY = 66,
-    
-    [Description("بانک سپه")]
-    BANK_SEPAH = 15,
-    
-    [Description("بانک شهر")]
-    BANK_SHAHR = 61,
-    
-    [Description("بانک ملت")]
-    BANK_MELAT = 12,
-    
-    [Description("بانک ملی")]
-    BANK_MELLI = 17,
-    
-    [Description("بانک رفاه کارگران")]
-    BANK_REFAH = 13,
-    
-    [Description("بانک سینا")]
-    BANK_SINA = 59,
-    
-    [Description("بانک مسکن")]
-    BANK_MASKAN = 14,
-    
-    [Description("بانک آینده")]
-    BANK_AYANDEH = 62,
-    
-    [Description("بانک انصار")]
-    BANK_ANSAR = 63,
-    
-    [Description("بانک تجارت")]
-    BANK_TEJARAT = 18,
-    
-    [Description("بانک رسالت")]
-    BANK_RESALAT = 70,
-    
-    [Description("بانک سامان")]
-    BANK_SAMAN = 56,
-    
-    [Description("بانک مرکزی")]
-    BANK_MARKAZI = 10,
-    
-    [Description("بانک سرمایه")]
-    BANK_SARMAYEH = 58,
-    
-    [Description("بانک صادرات")]
-    BANK_SADERAT = 19,
-    
-    [Description("بانک قوامین")]
-    BANK_GHAVAMIN = 52,
-    
-    [Description("بانک پارسیان")]
-    BANK_PARSIAN = 54,
-    
-    [Description("بانک کشاورزی")]
-    BANK_KESHAVARZI = 16,
-    
-    [Description("بانک گردشگری")]
-    BANK_GARDESHGARI = 64,
-    
-    [Description("پست بانک")]
-    BANK_POST_BANK = 21,
-    
-    [Description("بانک پاسارگاد")]
-    BANK_PASARGAD = 57,
-    
-    [Description("بانک کارآفرین")]
-    BANK_KARAFARIN = 53,
-    
-    [Description("بانک خاورمیانه")]
-    BANK_KHAVARMIANEH = 78,
-    
-    [Description("بانک ایران زمین")]
-    BANK_IRAN_ZAMIN = 69,
-    
-    [Description("بانک مهر اقتصاد")]
-    BANK_MEHR_EQTESAD = 79,
-    
-    [Description("بانک صنعت و معدن")]
-    BANK_SANAT_MADAN = 11,
-    
-    [Description("بانک اقتصاد نوین")]
-    BANK_EGHTESAD_NOVIN = 55,
-    
-    [Description("بانک توسعه تعاون")]
-    BANK_TOSSE_TAAVON = 22,
-    
-    [Description("بانک توسعه صادرات")]
-    BANK_TOSSE_SADERAT = 20,
-    
-    [Description("بانک ایران و ونزوئلا")]
-    BANK_IRAN_VENEZUELA = 95,
-    
-    [Description("بانک حکمت ایرانیان")]
-    BANK_HEKMAT_IRANIAN = 65,
-    
-    [Description("بانک قرض الحسنه مهر")]
-    BANK_GHARZOLHASANEH_MEHR = 60,
-    
-    [Description("موسسه مالی و اعتباری ملل")]
-    BANK_MOASSASE_MELLAL = 75,
-    
-    [Description("موسسه مالی و اعتباری نور")]
-    BANK_MOASSASE_NOOR = 80,
-    
-    [Description("موسسه مالی و اعتباری کوثر")]
-    BANK_MOASSASE_KOSAR = 73,
-    
-    [Description("موسسه مالی و اعتباری توسعه")]
-    BANK_MOASSASE_TOSSE = 51
-}

0_Framework/Application/UID/UidBanksExtension.cs

@@ -1,27 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Reflection;
-
-namespace _0_Framework.Application.UID
-{
-    public static class UidBanksExtension
-    {
-        /// <summary>
-        /// دریافت نام فارسی بانک
-        /// </summary>
-        /// <param name="bank">بانک</param>
-        /// <returns>نام فارسی بانک</returns>
-        public static string GetPersianName(this UidBanks bank)
-        {
-            var fieldInfo = bank.GetType().GetField(bank.ToString());
-            
-            if (fieldInfo == null) 
-                return string.Empty;
-            
-            var attribute = (DescriptionAttribute)Attribute.GetCustomAttribute(
-                fieldInfo, typeof(DescriptionAttribute));
-            
-            return attribute?.Description ?? bank.ToString();
-        }
-    }
-}

0_Framework/Application/UID/UidService.cs

@@ -0,0 +1,76 @@
+using System;
+using System.Net.Http;
+using System.Net.Http.Json;
+using System.Text;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+
+namespace _0_Framework.Application.UID;
+
+public class UidService : IUidService
+{
+    private readonly HttpClient _httpClient;
+    private const string BaseUrl= "https://json-api.uid.ir/api/inquiry/";
+
+    public UidService()
+    {
+        _httpClient = new HttpClient()
+        {
+            BaseAddress = new Uri(BaseUrl)
+        };
+    }
+
+    public async Task<PersonalInfoResponse> GetPersonalInfo(string nationalCode, string birthDate)
+    {
+        var request = new PersonalInfoRequest
+        {
+            BirthDate = birthDate ,
+            NationalId = nationalCode,
+            RequestContext = new UidRequestContext()
+        };
+        var json = JsonConvert.SerializeObject(request);
+        var contentType = new StringContent(json, Encoding.UTF8, "application/json");
+
+       var requestResult = await _httpClient.PostAsync("person/v2", contentType);
+        try
+        {
+            if (!requestResult.IsSuccessStatusCode)
+                return null;
+            var responseResult = await requestResult.Content.ReadFromJsonAsync<PersonalInfoResponse>();
+            if (responseResult.BasicInformation != null)
+            {
+                responseResult.BasicInformation.FirstName = responseResult.BasicInformation.FirstName?.ToPersian();
+                responseResult.BasicInformation.LastName = responseResult.BasicInformation.LastName?.ToPersian();
+                responseResult.BasicInformation.FatherName = responseResult.BasicInformation.FatherName?.ToPersian();
+            }
+
+            return responseResult;
+        }
+        catch 
+        {
+
+            return null;
+        }
+    }
+
+
+    public async Task<MatchMobileWithNationalCodeResponse> IsMachPhoneWithNationalCode(string nationalCode, string phoneNumber)
+    {
+        var request = new PersonalInfoRequest
+        {
+            MobileNumber = phoneNumber,
+            NationalId = nationalCode,
+            RequestContext = new UidRequestContext()
+        };
+        var json = JsonConvert.SerializeObject(request);
+        var contentType = new StringContent(json, Encoding.UTF8, "application/json");
+
+        var requestResult = await _httpClient.PostAsync("mobile/owner/v2", contentType);
+        if (!requestResult.IsSuccessStatusCode)
+            return null;
+
+        var responseResult = await requestResult.Content.ReadFromJsonAsync<MatchMobileWithNationalCodeResponse>();
+        return responseResult;
+    }
+}

0_Framework/Domain/CustomizeCheckoutShared/Base/BaseCustomizeEntity.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections.Generic;
 using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
 using _0_Framework.Domain.CustomizeCheckoutShared.ValueObjects;
 using Microsoft.EntityFrameworkCore.Design.Internal;
@@ -14,7 +12,8 @@ public class BaseCustomizeEntity : EntityBase
     }
     public BaseCustomizeEntity(FridayPay fridayPay, OverTimePay overTimePay,
         BaseYearsPay baseYearsPay, BonusesPay bonusesPay, NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, ShiftPay shiftPay,
-        FamilyAllowance familyAllowance, LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit, HolidayWork holidayWork, BreakTime breakTime,int leavePermittedDays,List<WeeklyOffDay> weeklyOffDays)
+        FamilyAllowance familyAllowance, LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit,
+        FridayWork fridayWork, HolidayWork holidayWork, BreakTime breakTime,int leavePermittedDays)
     {
 
         FridayPay = fridayPay;
@@ -30,10 +29,10 @@ public class BaseCustomizeEntity : EntityBase
         FineAbsenceDeduction = fineAbsenceDeduction;
         LateToWork = lateToWork;
         EarlyExit = earlyExit;
+        FridayWork = fridayWork;
         HolidayWork = holidayWork;
         BreakTime = breakTime;
         LeavePermittedDays = leavePermittedDays;
-        WeeklyOffDays = weeklyOffDays.Select(x=> new WeeklyOffDay(x.DayOfWeek)).ToList();
     }
 
     /// <summary>
@@ -118,28 +117,4 @@ public class BaseCustomizeEntity : EntityBase
 
 
 	public BreakTime BreakTime { get; protected set; }
-
-    public List<WeeklyOffDay> WeeklyOffDays { get; set; } = [];
-
-	public void FridayWorkToWeeklyDayOfWeek()
-	{
-		if (FridayWork == FridayWork.Default && !WeeklyOffDays.Any(x => x.DayOfWeek == DayOfWeek.Friday))
-		{
-            WeeklyOffDays.Add(new WeeklyOffDay(DayOfWeek.Friday));
-		}
-            
-
-	}
-}
-
-public class WeeklyOffDay
-{
-	public WeeklyOffDay(DayOfWeek dayOfWeek)
-	{
-		DayOfWeek = dayOfWeek;
-	}
-
-	public long Id { get; set; }
-	public DayOfWeek DayOfWeek { get; set; }
-	public long ParentId { get; set; }
 }

0_Framework/Domain/IRepository.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using System.Linq.Expressions;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore.Storage;
 
 namespace _0_Framework.Domain;
 
@@ -18,6 +17,4 @@ public interface IRepository<TKey, T> where  T:class
     bool Exists(Expression<Func<T, bool>> expression);
     void SaveChanges();
     Task SaveChangesAsync();
-	Task<IDbContextTransaction> BeginTransactionAsync();
-    
 }

0_Framework/Exceptions/BadRequestException.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 
 namespace _0_Framework.Exceptions;
 
@@ -15,13 +14,5 @@ public class BadRequestException:Exception
         Details = details;
     }
 
-    public BadRequestException(string message,  Dictionary<string, object?> extra) :
-        base(message)
-    {
-        Extra = extra;
-    }
-
     public string Details { get; }
-    public  Dictionary<string,object> Extra { get; set; }
-    
 }

0_Framework/Exceptions/Handler/CustomExceptionHandler.cs

@@ -1,84 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Diagnostics;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-
-
-namespace _0_Framework.Exceptions.Handler;
-
-public class CustomExceptionHandler : IExceptionHandler
-{
-    private readonly ILogger<CustomExceptionHandler> _logger;
-
-    public CustomExceptionHandler(ILogger<CustomExceptionHandler> logger)
-    {
-        _logger = logger;
-    }
-
-    public async ValueTask<bool> TryHandleAsync(HttpContext context, Exception exception, CancellationToken cancellationToken)
-    {
-        _logger.LogError(
-            "Error Message: {exceptionMessage}, Time of occurrence {time}",
-            exception.Message, DateTime.UtcNow);
-
-        (string Detail, string Title, int StatusCode, Dictionary<string, object>? Extra) details = exception switch
-        {
-            InternalServerException =>
-            (
-                exception.Message,
-                exception.GetType().Name,
-                context.Response.StatusCode = StatusCodes.Status500InternalServerError,
-                null
-            ),
-            BadRequestException bre =>
-            (
-                exception.Message,
-                exception.GetType().Name,
-                context.Response.StatusCode = StatusCodes.Status400BadRequest,
-                bre.Extra
-            ),
-            NotFoundException =>
-            (
-                exception.Message,
-                exception.GetType().Name,
-                context.Response.StatusCode = StatusCodes.Status404NotFound,
-                null
-            ),
-            UnAuthorizeException =>
-            (
-                exception.Message,
-                exception.GetType().Name,
-                context.Response.StatusCode = StatusCodes.Status401Unauthorized,
-                null
-            ),
-            _ =>
-            (
-                exception.Message,
-                exception.GetType().Name,
-                context.Response.StatusCode = StatusCodes.Status500InternalServerError,
-                null
-            )
-        };
-
-        var problemDetails = new ProblemDetails
-        {
-            Title = details.Title,
-            Detail = details.Detail,
-            Status = details.StatusCode,
-            Instance = context.Request.Path,
-            Extensions = details.Extra ?? new Dictionary<string, object>()
-        };
-        
-
-        
-        problemDetails.Extensions.Add("traceId", context.TraceIdentifier);
-
-        await context.Response.WriteAsJsonAsync(problemDetails, cancellationToken: cancellationToken);
-
-        return true;
-    }
-}

0_Framework/Exceptions/UnAuthorizeException.cs

@@ -1,10 +0,0 @@
-using System;
-
-namespace _0_Framework.Exceptions;
-
-public class UnAuthorizeException:Exception
-{
-    public UnAuthorizeException(string message) : base(message)
-    {
-    }
-}

0_Framework/InfraStructure/FaceEmbeddingService.cs

@@ -1,346 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Net.Http.Json;
-using System.Text.Json;
-using _0_Framework.Application;
-using _0_Framework.Application.FaceEmbedding;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Http;
-using System.Threading.Tasks;
-
-namespace _0_Framework.Infrastructure;
-
-/// <summary>
-/// پیاده‌سازی سرویس ارتباط با API پایتون برای مدیریت Embeddings چهره
-/// </summary>
-public class FaceEmbeddingService : IFaceEmbeddingService
-{
-	private readonly IHttpClientFactory _httpClientFactory;
-	private readonly ILogger<FaceEmbeddingService> _logger;
-	private readonly IFaceEmbeddingNotificationService _notificationService;
-	private readonly string _apiBaseUrl;
-
-	public FaceEmbeddingService(IHttpClientFactory httpClientFactory, ILogger<FaceEmbeddingService> logger, 
-		IFaceEmbeddingNotificationService notificationService = null)
-	{
-		_httpClientFactory = httpClientFactory;
-		_logger = logger;
-		_notificationService = notificationService;
-		_apiBaseUrl = "http://localhost:8000";
-	}
-
-	public async Task<OperationResult> GenerateEmbeddingsAsync(long employeeId, long workshopId,
-		string employeeFullName, string picture1Path, string picture2Path)
-	{
-		try
-		{
-			var httpClient = _httpClientFactory.CreateClient();
-			httpClient.BaseAddress = new Uri(_apiBaseUrl);
-			httpClient.Timeout = TimeSpan.FromSeconds(30);
-
-			using var content = new MultipartFormDataContent();
-
-			// Add form fields
-			content.Add(new StringContent(employeeId.ToString()), "employee_id");
-			content.Add(new StringContent(workshopId.ToString()), "workshop_id");
-			content.Add(new StringContent(employeeFullName ?? ""), "employee_full_name");
-
-			// Add picture files
-			if (File.Exists(picture1Path))
-			{
-				var picture1Bytes = await File.ReadAllBytesAsync(picture1Path);
-				var picture1Content = new ByteArrayContent(picture1Bytes);
-				picture1Content.Headers.ContentType = new MediaTypeHeaderValue("image/jpeg");
-				content.Add(picture1Content, "picture1", "1.jpg");
-			}
-			else
-			{
-				_logger.LogWarning("Picture1 not found at path: {Path}", picture1Path);
-				return new OperationResult { IsSuccedded = false, Message = "تصویر اول یافت نشد" };
-			}
-
-			if (File.Exists(picture2Path))
-			{
-				var picture2Bytes = await File.ReadAllBytesAsync(picture2Path);
-				var picture2Content = new ByteArrayContent(picture2Bytes);
-				picture2Content.Headers.ContentType = new MediaTypeHeaderValue("image/jpeg");
-				content.Add(picture2Content, "picture2", "2.jpg");
-			}
-			else
-			{
-				_logger.LogWarning("Picture2 not found at path: {Path}", picture2Path);
-				return new OperationResult { IsSuccedded = false, Message = "تصویر دوم یافت نشد" };
-			}
-
-			// Send request to Python API
-			var response = await httpClient.PostAsync("embeddings", content);
-
-			if (response.IsSuccessStatusCode)
-			{
-				var responseContent = await response.Content.ReadAsStringAsync();
-				_logger.LogInformation("Embeddings generated successfully for Employee {EmployeeId}, Workshop {WorkshopId}",
-	employeeId, workshopId);
-
-				// ارسال اطلاع‌رسانی به سایر سیستم‌ها
-				if (_notificationService != null)
-				{
-					await _notificationService.NotifyEmbeddingCreatedAsync(workshopId, employeeId, employeeFullName);
-				}
-
-				return new OperationResult
-				{
-					IsSuccedded = true,
-					Message = "Embedding با موفقیت ایجاد شد"
-				};
-			}
-			else
-			{
-				var errorContent = await response.Content.ReadAsStringAsync();
-				_logger.LogError("Failed to generate embeddings. Status: {StatusCode}, Error: {Error}",
-				  response.StatusCode, errorContent);
-
-				return new OperationResult
-				{
-					IsSuccedded = false,
-					Message = $"خطا در تولید Embedding: {response.StatusCode}"
-				};
-			}
-		}
-		catch (HttpRequestException ex)
-		{
-			_logger.LogError(ex, "HTTP error while calling embeddings API for Employee {EmployeeId}", employeeId);
-			return new OperationResult
-			{
-				IsSuccedded = false,
-				Message = "خطا در ارتباط با سرور Embedding"
-			};
-		}
-		catch (Exception ex)
-		{
-			_logger.LogError(ex, "Error while calling embeddings API for Employee {EmployeeId}", employeeId);
-			return new OperationResult
-			{
-				IsSuccedded = false,
-				Message = "خطای غیرمنتظره در تولید Embedding"
-			};
-		}
-	}
-
-	public async Task<OperationResult> GenerateEmbeddingsFromStreamAsync(long employeeId, long workshopId,
-		string employeeFullName, Stream picture1Stream, Stream picture2Stream)
-	{
-		try
-		{
-			var httpClient = _httpClientFactory.CreateClient();
-			httpClient.BaseAddress = new Uri(_apiBaseUrl);
-			httpClient.Timeout = TimeSpan.FromSeconds(30);
-
-			using var content = new MultipartFormDataContent();
-
-			// Add form fields
-			content.Add(new StringContent(employeeId.ToString()), "employee_id");
-			content.Add(new StringContent(workshopId.ToString()), "workshop_id");
-			content.Add(new StringContent(employeeFullName ?? ""), "employee_full_name");
-
-			// Add picture streams
-			var picture1Content = new StreamContent(picture1Stream);
-			picture1Content.Headers.ContentType = new MediaTypeHeaderValue("image/jpeg");
-			content.Add(picture1Content, "picture1", "1.jpg");
-
-			var picture2Content = new StreamContent(picture2Stream);
-			picture2Content.Headers.ContentType = new MediaTypeHeaderValue("image/jpeg");
-			content.Add(picture2Content, "picture2", "2.jpg");
-
-			// Send request to Python API
-			var response = await httpClient.PostAsync("embeddings", content);
-
-			if (response.IsSuccessStatusCode)
-			{
-				_logger.LogInformation("Embeddings generated successfully from streams for Employee {EmployeeId}", employeeId);
-				
-				// ارسال اطلاع‌رسانی به سایر سیستم‌ها
-				if (_notificationService != null)
-				{
-					await _notificationService.NotifyEmbeddingCreatedAsync(workshopId, employeeId, employeeFullName);
-				}
-				
-				return new OperationResult { IsSuccedded = true, Message = "Embedding با موفقیت ایجاد شد" };
-			}
-			else
-			{
-				var errorContent = await response.Content.ReadAsStringAsync();
-				_logger.LogError("Failed to generate embeddings from streams. Status: {StatusCode}, Error: {Error}",
-						 response.StatusCode, errorContent);
-
-				return new OperationResult
-				{
-					IsSuccedded = false,
-					Message = $"خطا در تولید Embedding: {response.StatusCode}"
-				};
-			}
-		}
-		catch (Exception ex)
-		{
-			_logger.LogError(ex, "Error while generating embeddings from streams for Employee {EmployeeId}", employeeId);
-			return new OperationResult
-			{
-				IsSuccedded = false,
-				Message = "خطا در تولید Embedding"
-			};
-		}
-	}
-
-	public async Task<OperationResult> RefineEmbeddingAsync(long employeeId, long workshopId, float[] embedding,
-		float confidence, Dictionary<string, object> metadata = null)
-	{
-		try
-		{
-			var httpClient = _httpClientFactory.CreateClient();
-			httpClient.BaseAddress = new Uri(_apiBaseUrl);
-			httpClient.Timeout = TimeSpan.FromSeconds(30);
-
-			var requestBody = new
-			{
-				employeeId,
-				workshopId,
-				embedding,
-				confidence,
-				metadata = metadata ?? new Dictionary<string, object>()
-			};
-
-			var response = await httpClient.PostAsJsonAsync("embeddings/refine", requestBody);
-
-			if (response.IsSuccessStatusCode)
-			{
-				_logger.LogInformation("Embedding refined successfully for Employee {EmployeeId}", employeeId);
-				
-				// ارسال اطلاع‌رسانی به سایر سیستم‌ها
-				if (_notificationService != null)
-				{
-					await _notificationService.NotifyEmbeddingRefinedAsync(workshopId, employeeId);
-				}
-				
-				return new OperationResult { IsSuccedded = true, Message = "Embedding بهبود یافت" };
-			}
-			else
-			{
-				var errorContent = await response.Content.ReadAsStringAsync();
-				_logger.LogError("Failed to refine embedding. Status: {StatusCode}, Error: {Error}",
-				response.StatusCode, errorContent);
-
-				return new OperationResult
-				{
-					IsSuccedded = false,
-					Message = $"خطا در بهبود Embedding: {response.StatusCode}"
-				};
-			}
-		}
-		catch (Exception ex)
-		{
-			_logger.LogError(ex, "Error while refining embedding for Employee {EmployeeId}", employeeId);
-			return new OperationResult
-			{
-				IsSuccedded = false,
-				Message = "خطا در بهبود Embedding"
-			};
-		}
-	}
-
-	public async Task<OperationResult> DeleteEmbeddingAsync(long employeeId, long workshopId)
-	{
-		try
-		{
-			var httpClient = _httpClientFactory.CreateClient();
-			httpClient.BaseAddress = new Uri(_apiBaseUrl);
-			httpClient.Timeout = TimeSpan.FromSeconds(30);
-
-			var response = await httpClient.DeleteAsync($"embeddings/{workshopId}/{employeeId}");
-
-			if (response.IsSuccessStatusCode)
-			{
-				_logger.LogInformation("Embedding deleted successfully for Employee {EmployeeId}", employeeId);
-				
-				// ارسال اطلاع‌رسانی به سایر سیستم‌ها
-				if (_notificationService != null)
-				{
-					await _notificationService.NotifyEmbeddingDeletedAsync(workshopId, employeeId);
-				}
-				
-				return new OperationResult { IsSuccedded = true, Message = "Embedding حذف شد" };
-			}
-			else
-			{
-				var errorContent = await response.Content.ReadAsStringAsync();
-				_logger.LogError("Failed to delete embedding. Status: {StatusCode}, Error: {Error}",
-								response.StatusCode, errorContent);
-
-				return new OperationResult
-				{
-					IsSuccedded = false,
-					Message = $"خطا در حذف Embedding: {response.StatusCode}"
-				};
-			}
-		}
-		catch (Exception ex)
-		{
-			_logger.LogError(ex, "Error while deleting embedding for Employee {EmployeeId}", employeeId);
-			return new OperationResult
-			{
-				IsSuccedded = false,
-				Message = "خطا در حذف Embedding"
-			};
-		}
-	}
-
-	public async Task<OperationResult<FaceEmbeddingResponse>> GetEmbeddingAsync(long employeeId, long workshopId)
-	{
-		try
-		{
-			var httpClient = _httpClientFactory.CreateClient();
-			httpClient.BaseAddress = new Uri(_apiBaseUrl);
-			httpClient.Timeout = TimeSpan.FromSeconds(30);
-
-			var response = await httpClient.GetAsync($"embeddings/{workshopId}/{employeeId}");
-
-			if (response.IsSuccessStatusCode)
-			{
-				var content = await response.Content.ReadAsStringAsync();
-				var embeddingData = JsonSerializer.Deserialize<FaceEmbeddingResponse>(content,
-		   new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
-
-				_logger.LogInformation("Embedding retrieved successfully for Employee {EmployeeId}", employeeId);
-
-				return new OperationResult<FaceEmbeddingResponse>
-				{
-					IsSuccedded = true,
-					Message = "Embedding دریافت شد",
-					Data = embeddingData
-				};
-			}
-			else
-			{
-				var errorContent = await response.Content.ReadAsStringAsync();
-				_logger.LogError("Failed to get embedding. Status: {StatusCode}, Error: {Error}",
-						response.StatusCode, errorContent);
-					
-				return new OperationResult<FaceEmbeddingResponse>
-				{
-					IsSuccedded = false,
-					Message = $"خطا در دریافت Embedding: {response.StatusCode}"
-				};
-			}
-		}
-		catch (Exception ex)
-		{
-			_logger.LogError(ex, "Error while getting embedding for Employee {EmployeeId}", employeeId);
-			return new OperationResult<FaceEmbeddingResponse>
-			{
-				IsSuccedded = false,
-				Message = "خطا در دریافت Embedding"
-			};
-		}
-	}
-}

0_Framework/InfraStructure/Mongo/MongoDbConfig.cs

@@ -1,8 +0,0 @@
-namespace _0_Framework.InfraStructure.Mongo;
-
-public class MongoDbConfig
-{
-    public string ConnectionString { get; set; } = null!;
-
-    public string DatabaseName { get; set; } = null!;
-}

0_Framework/InfraStructure/NullFaceEmbeddingNotificationService.cs

@@ -1,30 +0,0 @@
-using System.Threading.Tasks;
-using _0_Framework.Application.FaceEmbedding;
-
-namespace _0_Framework.InfraStructure;
-
-/// <summary>
-/// پیاده‌سازی پیش‌فرض (بدون عملیات) برای IFaceEmbeddingNotificationService
-/// این کلاس زمانی استفاده می‌شود که SignalR در دسترس نباشد
-/// </summary>
-public class NullFaceEmbeddingNotificationService : IFaceEmbeddingNotificationService
-{
-    public Task NotifyEmbeddingCreatedAsync(long workshopId, long employeeId, string employeeFullName)
-    {
-        // هیچ عملیاتی انجام نمی‌دهد
-        return Task.CompletedTask;
-    }
-
-    public Task NotifyEmbeddingDeletedAsync(long workshopId, long employeeId)
-    {
-        // هیچ عملیاتی انجام نمی‌دهد
-        return Task.CompletedTask;
-    }
-
-    public Task NotifyEmbeddingRefinedAsync(long workshopId, long employeeId)
-    {
-        // هیچ عملیاتی انجام نمی‌دهد
-        return Task.CompletedTask;
-    }
-}
-

0_Framework/InfraStructure/QueryableExtensions.cs

@@ -1,22 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-
-namespace _0_Framework.InfraStructure;
-
-public static class QueryableExtensions
-{
-    public static IQueryable<T> ApplyPagination<T>(this IQueryable<T> query, int page, int pageSize = 30)
-    {
-        if (page <= 0) page = 1;
-        if (pageSize <= 0) pageSize = 10;
-
-        return query.Skip((page - 1) * pageSize).Take(pageSize);
-    }
-    public static IEnumerable<T> ApplyPagination<T>(this IEnumerable<T> source, int page, int pageSize = 30)
-    {
-        if (page <= 0) page = 1;
-        if (pageSize <= 0) pageSize = 10;
-
-        return source.Skip((page - 1) * pageSize).Take(pageSize);
-    }
-}

0_Framework/InfraStructure/RepositoryBase.cs

@@ -6,7 +6,6 @@ using System.Text;
 using System.Threading.Tasks;
 using _0_Framework.Domain;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Storage;
 
 namespace _0_Framework.InfraStructure
 {
@@ -71,10 +70,5 @@ namespace _0_Framework.InfraStructure
         {
             await _context.SaveChangesAsync();
         }
-
-        public async Task<IDbContextTransaction> BeginTransactionAsync()
-        {
-            return await _context.Database.BeginTransactionAsync();
-        }
     }
 }

ANDROID_SIGNALR_GUIDE.md

@@ -1,624 +0,0 @@
-# راهنمای اتصال اپلیکیشن Android به SignalR برای Face Embedding
-
-## 1. افزودن کتابخانه SignalR به پروژه Android
-
-در فایل `build.gradle` (Module: app) خود، dependency زیر را اضافه کنید:
-
-```gradle
-dependencies {
-    // SignalR for Android
-    implementation 'com.microsoft.signalr:signalr:7.0.0'
-    
-    // اگر از Kotlin استفاده می‌کنید:
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1'
-    
-    // برای JSON پردازش:
-    implementation 'com.google.code.gson:gson:2.10.1'
-}
-```
-
-## 2. اضافه کردن Permission در AndroidManifest.xml
-
-```xml
-<uses-permission android:name="android.permission.INTERNET" />
-<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-```
-
-## 3. کد Java/Kotlin برای اتصال به SignalR
-
-### نسخه Java:
-
-```java
-import com.microsoft.signalr.HubConnection;
-import com.microsoft.signalr.HubConnectionBuilder;
-import com.microsoft.signalr.HubConnectionState;
-import com.google.gson.JsonObject;
-import android.util.Log;
-
-public class FaceEmbeddingSignalRClient {
-    private static final String TAG = "FaceEmbeddingHub";
-    private HubConnection hubConnection;
-    private String serverUrl = "http://YOUR_SERVER_IP:PORT/trackingFaceEmbeddingHub"; // آدرس سرور خود را وارد کنید
-    private long workshopId;
-
-    public FaceEmbeddingSignalRClient(long workshopId) {
-        this.workshopId = workshopId;
-        initializeSignalR();
-    }
-
-    private void initializeSignalR() {
-        // ایجاد اتصال SignalR
-        hubConnection = HubConnectionBuilder
-                .create(serverUrl)
-                .build();
-
-        // دریافت رویداد ایجاد Embedding
-        hubConnection.on("EmbeddingCreated", (data) -> {
-            JsonObject jsonData = (JsonObject) data;
-            long employeeId = jsonData.get("employeeId").getAsLong();
-            String employeeFullName = jsonData.get("employeeFullName").getAsString();
-            String timestamp = jsonData.get("timestamp").getAsString();
-            
-            Log.d(TAG, "Embedding Created - Employee: " + employeeFullName + " (ID: " + employeeId + ")");
-            
-            // اینجا می‌توانید داده‌های جدید را از سرور بگیرید یا UI را بروزرسانی کنید
-            onEmbeddingCreated(employeeId, employeeFullName, timestamp);
-            
-        }, JsonObject.class);
-
-        // دریافت رویداد حذف Embedding
-        hubConnection.on("EmbeddingDeleted", (data) -> {
-            JsonObject jsonData = (JsonObject) data;
-            long employeeId = jsonData.get("employeeId").getAsLong();
-            String timestamp = jsonData.get("timestamp").getAsString();
-            
-            Log.d(TAG, "Embedding Deleted - Employee ID: " + employeeId);
-            onEmbeddingDeleted(employeeId, timestamp);
-            
-        }, JsonObject.class);
-
-        // دریافت رویداد بهبود Embedding
-        hubConnection.on("EmbeddingRefined", (data) -> {
-            JsonObject jsonData = (JsonObject) data;
-            long employeeId = jsonData.get("employeeId").getAsLong();
-            String timestamp = jsonData.get("timestamp").getAsString();
-            
-            Log.d(TAG, "Embedding Refined - Employee ID: " + employeeId);
-            onEmbeddingRefined(employeeId, timestamp);
-            
-        }, JsonObject.class);
-    }
-
-    public void connect() {
-        if (hubConnection.getConnectionState() == HubConnectionState.DISCONNECTED) {
-            hubConnection.start()
-                .doOnComplete(() -> {
-                    Log.d(TAG, "Connected to SignalR Hub");
-                    joinWorkshopGroup();
-                })
-                .doOnError(error -> {
-                    Log.e(TAG, "Error connecting to SignalR: " + error.getMessage());
-                })
-                .subscribe();
-        }
-    }
-
-    private void joinWorkshopGroup() {
-        // عضویت در گروه مخصوص این کارگاه
-        hubConnection.send("JoinWorkshopGroup", workshopId);
-        Log.d(TAG, "Joined workshop group: " + workshopId);
-    }
-
-    public void disconnect() {
-        if (hubConnection.getConnectionState() == HubConnectionState.CONNECTED) {
-            // خروج از گروه
-            hubConnection.send("LeaveWorkshopGroup", workshopId);
-            
-            hubConnection.stop();
-            Log.d(TAG, "Disconnected from SignalR Hub");
-        }
-    }
-
-    // این متدها را در Activity/Fragment خود override کنید
-    protected void onEmbeddingCreated(long employeeId, String employeeFullName, String timestamp) {
-        // اینجا UI را بروزرسانی کنید یا داده جدید را بگیرید
-    }
-
-    protected void onEmbeddingDeleted(long employeeId, String timestamp) {
-        // اینجا UI را بروزرسانی کنید
-    }
-
-    protected void onEmbeddingRefined(long employeeId, String timestamp) {
-        // اینجا UI را بروزرسانی کنید
-    }
-}
-```
-
-### نسخه Kotlin:
-
-```kotlin
-import com.microsoft.signalr.HubConnection
-import com.microsoft.signalr.HubConnectionBuilder
-import com.microsoft.signalr.HubConnectionState
-import com.google.gson.JsonObject
-import android.util.Log
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-
-class FaceEmbeddingSignalRClient(private val workshopId: Long) {
-    
-    companion object {
-        private const val TAG = "FaceEmbeddingHub"
-    }
-    
-    private lateinit var hubConnection: HubConnection
-    private val serverUrl = "http://YOUR_SERVER_IP:PORT/trackingFaceEmbeddingHub" // آدرس سرور خود را وارد کنید
-    
-    init {
-        initializeSignalR()
-    }
-    
-    private fun initializeSignalR() {
-        hubConnection = HubConnectionBuilder
-            .create(serverUrl)
-            .build()
-            
-        // دریافت رویداد ایجاد Embedding
-        hubConnection.on("EmbeddingCreated", { data: JsonObject ->
-            val employeeId = data.get("employeeId").asLong
-            val employeeFullName = data.get("employeeFullName").asString
-            val timestamp = data.get("timestamp").asString
-            
-            Log.d(TAG, "Embedding Created - Employee: $employeeFullName (ID: $employeeId)")
-            onEmbeddingCreated(employeeId, employeeFullName, timestamp)
-        }, JsonObject::class.java)
-        
-        // دریافت رویداد حذف Embedding
-        hubConnection.on("EmbeddingDeleted", { data: JsonObject ->
-            val employeeId = data.get("employeeId").asLong
-            val timestamp = data.get("timestamp").asString
-            
-            Log.d(TAG, "Embedding Deleted - Employee ID: $employeeId")
-            onEmbeddingDeleted(employeeId, timestamp)
-        }, JsonObject::class.java)
-        
-        // دریافت رویداد بهبود Embedding
-        hubConnection.on("EmbeddingRefined", { data: JsonObject ->
-            val employeeId = data.get("employeeId").asLong
-            val timestamp = data.get("timestamp").asString
-            
-            Log.d(TAG, "Embedding Refined - Employee ID: $employeeId")
-            onEmbeddingRefined(employeeId, timestamp)
-        }, JsonObject::class.java)
-    }
-    
-    fun connect() {
-        if (hubConnection.connectionState == HubConnectionState.DISCONNECTED) {
-            CoroutineScope(Dispatchers.IO).launch {
-                try {
-                    hubConnection.start().blockingAwait()
-                    Log.d(TAG, "Connected to SignalR Hub")
-                    joinWorkshopGroup()
-                } catch (e: Exception) {
-                    Log.e(TAG, "Error connecting to SignalR: ${e.message}")
-                }
-            }
-        }
-    }
-    
-    private fun joinWorkshopGroup() {
-        hubConnection.send("JoinWorkshopGroup", workshopId)
-        Log.d(TAG, "Joined workshop group: $workshopId")
-    }
-    
-    fun disconnect() {
-        if (hubConnection.connectionState == HubConnectionState.CONNECTED) {
-            hubConnection.send("LeaveWorkshopGroup", workshopId)
-            hubConnection.stop()
-            Log.d(TAG, "Disconnected from SignalR Hub")
-        }
-    }
-    
-    // این متدها را override کنید
-    open fun onEmbeddingCreated(employeeId: Long, employeeFullName: String, timestamp: String) {
-        // اینجا UI را بروزرسانی کنید یا داده جدید را بگیرید
-    }
-    
-    open fun onEmbeddingDeleted(employeeId: Long, timestamp: String) {
-        // اینجا UI را بروزرسانی کنید
-    }
-    
-    open fun onEmbeddingRefined(employeeId: Long, timestamp: String) {
-        // اینجا UI را بروزرسانی کنید
-    }
-}
-```
-
-## 4. استفاده در Activity یا Fragment
-
-### مثال با Login و دریافت WorkshopId
-
-#### Java:
-```java
-public class LoginActivity extends AppCompatActivity {
-    
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_login);
-        
-        Button btnLogin = findViewById(R.id.btnLogin);
-        btnLogin.setOnClickListener(v -> performLogin());
-    }
-    
-    private void performLogin() {
-        // فراخوانی API لاگین
-        // فرض کنید response شامل workshopId است
-        
-        // مثال ساده (باید از Retrofit یا کتابخانه مشابه استفاده کنید):
-        // LoginResponse response = apiService.login(username, password);
-        // long workshopId = response.getWorkshopId();
-        
-        long workshopId = 123; // این را از response دریافت کنید
-        
-        // ذخیره workshopId
-        SharedPreferences prefs = getSharedPreferences("AppPrefs", MODE_PRIVATE);
-        prefs.edit().putLong("workshopId", workshopId).apply();
-        
-        // رفتن به صفحه اصلی
-        Intent intent = new Intent(this, MainActivity.class);
-        startActivity(intent);
-        finish();
-    }
-}
-
-public class MainActivity extends AppCompatActivity {
-    private FaceEmbeddingSignalRClient signalRClient;
-    
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-        
-        // دریافت workshopId از SharedPreferences
-        SharedPreferences prefs = getSharedPreferences("AppPrefs", MODE_PRIVATE);
-        long workshopId = prefs.getLong("workshopId", 0);
-        
-        if (workshopId == 0) {
-            // اگر workshopId وجود نداره، برگرد به صفحه لاگین
-            Intent intent = new Intent(this, LoginActivity.class);
-            startActivity(intent);
-            finish();
-            return;
-        }
-        
-        // ایجاد و اتصال SignalR
-        signalRClient = new FaceEmbeddingSignalRClient(workshopId) {
-            @Override
-            protected void onEmbeddingCreated(long employeeId, String employeeFullName, String timestamp) {
-                runOnUiThread(() -> {
-                    // بروزرسانی UI
-                    Toast.makeText(MainActivity.this, 
-                        "Embedding ایجاد شد برای: " + employeeFullName, 
-                        Toast.LENGTH_SHORT).show();
-                    
-                    // دریافت داده‌های جدید از API
-                    refreshEmployeeList();
-                });
-            }
-            
-            @Override
-            protected void onEmbeddingDeleted(long employeeId, String timestamp) {
-                runOnUiThread(() -> {
-                    // بروزرسانی UI
-                    refreshEmployeeList();
-                });
-            }
-            
-            @Override
-            protected void onEmbeddingRefined(long employeeId, String timestamp) {
-                runOnUiThread(() -> {
-                    // بروزرسانی UI
-                    refreshEmployeeList();
-                });
-            }
-        };
-        
-        signalRClient.connect();
-    }
-    
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        if (signalRClient != null) {
-            signalRClient.disconnect();
-        }
-    }
-    
-    private void refreshEmployeeList() {
-        // دریافت لیست جدید کارمندان از API
-    }
-}
-```
-
-#### Kotlin:
-```kotlin
-class LoginActivity : AppCompatActivity() {
-    
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_login)
-        
-        val btnLogin = findViewById<Button>(R.id.btnLogin)
-        btnLogin.setOnClickListener { performLogin() }
-    }
-    
-    private fun performLogin() {
-        // فراخوانی API لاگین
-        // فرض کنید response شامل workshopId است
-        
-        // مثال ساده (باید از Retrofit یا کتابخانه مشابه استفاده کنید):
-        // val response = apiService.login(username, password)
-        // val workshopId = response.workshopId
-        
-        val workshopId = 123L // این را از response دریافت کنید
-        
-        // ذخیره workshopId
-        val prefs = getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
-        prefs.edit().putLong("workshopId", workshopId).apply()
-        
-        // رفتن به صفحه اصلی
-        val intent = Intent(this, MainActivity::class.java)
-        startActivity(intent)
-        finish()
-    }
-}
-
-class MainActivity : AppCompatActivity() {
-    private lateinit var signalRClient: FaceEmbeddingSignalRClient
-    
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-        
-        // دریافت workshopId از SharedPreferences
-        val prefs = getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
-        val workshopId = prefs.getLong("workshopId", 0L)
-        
-        if (workshopId == 0L) {
-            // اگر workshopId وجود نداره، برگرد به صفحه لاگین
-            val intent = Intent(this, LoginActivity::class.java)
-            startActivity(intent)
-            finish()
-            return
-        }
-        
-        // ایجاد و اتصال SignalR
-        signalRClient = object : FaceEmbeddingSignalRClient(workshopId) {
-            override fun onEmbeddingCreated(employeeId: Long, employeeFullName: String, timestamp: String) {
-                runOnUiThread {
-                    // بروزرسانی UI
-                    Toast.makeText(this@MainActivity, 
-                        "Embedding ایجاد شد برای: $employeeFullName", 
-                        Toast.LENGTH_SHORT).show()
-                    
-                    // دریافت داده‌های جدید از API
-                    refreshEmployeeList()
-                }
-            }
-            
-            override fun onEmbeddingDeleted(employeeId: Long, timestamp: String) {
-                runOnUiThread {
-                    // بروزرسانی UI
-                    refreshEmployeeList()
-                }
-            }
-            
-            override fun onEmbeddingRefined(employeeId: Long, timestamp: String) {
-                runOnUiThread {
-                    // بروزرسانی UI
-                    refreshEmployeeList()
-                }
-            }
-        }
-        
-        signalRClient.connect()
-    }
-    
-    override fun onDestroy() {
-        super.onDestroy()
-        signalRClient.disconnect()
-    }
-    
-    private fun refreshEmployeeList() {
-        // دریافت لیست جدید کارمندان از API
-    }
-}
-```
-
-### مثال ساده بدون Login:
-اگر workshopId را از قبل می‌دانید:
-
-#### Java:
-```java
-public class MainActivity extends AppCompatActivity {
-    private FaceEmbeddingSignalRClient signalRClient;
-    
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-        
-        long workshopId = 123; // شناسه کارگاه خود را وارد کنید
-        
-        signalRClient = new FaceEmbeddingSignalRClient(workshopId) {
-            @Override
-            protected void onEmbeddingCreated(long employeeId, String employeeFullName, String timestamp) {
-                runOnUiThread(() -> {
-                    // بروزرسانی UI
-                    Toast.makeText(MainActivity.this, 
-                        "Embedding ایجاد شد برای: " + employeeFullName, 
-                        Toast.LENGTH_SHORT).show();
-                    
-                    // دریافت داده‌های جدید از API
-                    refreshEmployeeList();
-                });
-            }
-            
-            @Override
-            protected void onEmbeddingDeleted(long employeeId, String timestamp) {
-                runOnUiThread(() -> {
-                    // بروزرسانی UI
-                    refreshEmployeeList();
-                });
-            }
-        };
-        
-        signalRClient.connect();
-    }
-    
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        if (signalRClient != null) {
-            signalRClient.disconnect();
-        }
-    }
-    
-    private void refreshEmployeeList() {
-        // دریافت لیست جدید کارمندان از API
-    }
-}
-```
-
-#### Kotlin:
-```kotlin
-class MainActivity : AppCompatActivity() {
-    private lateinit var signalRClient: FaceEmbeddingSignalRClient
-    
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-        
-        val workshopId = 123L // شناسه کارگاه خود را وارد کنید
-        
-        signalRClient = object : FaceEmbeddingSignalRClient(workshopId) {
-            override fun onEmbeddingCreated(employeeId: Long, employeeFullName: String, timestamp: String) {
-                runOnUiThread {
-                    // بروزرسانی UI
-                    Toast.makeText(this@MainActivity, 
-                        "Embedding ایجاد شد برای: $employeeFullName", 
-                        Toast.LENGTH_SHORT).show()
-                    
-                    // دریافت داده‌های جدید از API
-                    refreshEmployeeList()
-                }
-            }
-            
-            override fun onEmbeddingDeleted(employeeId: Long, timestamp: String) {
-                runOnUiThread {
-                    // بروزرسانی UI
-                    refreshEmployeeList()
-                }
-            }
-        }
-        
-        signalRClient.connect()
-    }
-    
-    override fun onDestroy() {
-        super.onDestroy()
-        signalRClient.disconnect()
-    }
-    
-    private fun refreshEmployeeList() {
-        // دریافت لیست جدید کارمندان از API
-    }
-}
-```
-
-## 5. نکات مهم
-
-### آدرس سرور
-- اگر روی شبیه‌ساز اندروید تست می‌کنید و سرور روی localhost اجرا می‌شود، از آدرس `http://10.0.2.2:PORT` استفاده کنید
-- اگر روی دستگاه فیزیکی تست می‌کنید، از آدرس IP شبکه محلی سرور استفاده کنید (مثل `http://192.168.1.100:PORT`)
-- PORT پیش‌فرض معمولاً 5000 یا 5001 است (بسته به کانفیگ پروژه شما)
-
-### دریافت WorkshopId از Login
-بعد از login موفق، workshopId را از سرور دریافت کنید و در SharedPreferences یا یک Singleton ذخیره کنید:
-
-```java
-// بعد از login موفق
-SharedPreferences prefs = getSharedPreferences("AppPrefs", MODE_PRIVATE);
-prefs.edit().putLong("workshopId", workshopId).apply();
-
-// استفاده در Activity
-long workshopId = prefs.getLong("workshopId", 0);
-```
-
-یا در Kotlin:
-
-```kotlin
-// بعد از login موفق
-val prefs = getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
-prefs.edit().putLong("workshopId", workshopId).apply()
-
-// استفاده در Activity
-val workshopId = prefs.getLong("workshopId", 0L)
-```
-
-### مدیریت اتصال
-برای reconnection خودکار:
-
-```java
-hubConnection.onClosed(exception -> {
-    Log.e(TAG, "Connection closed. Attempting to reconnect...");
-    new Handler().postDelayed(() -> connect(), 5000); // تلاش مجدد بعد از 5 ثانیه
-});
-```
-
-### Thread Safety
-همیشه UI updates را در main thread انجام دهید:
-
-```java
-runOnUiThread(() -> {
-    // UI updates here
-});
-```
-
-## 6. تست اتصال
-
-برای تست می‌توانید:
-1. اپلیکیشن را اجرا کنید
-2. از طریق Postman یا Swagger یک Embedding ایجاد کنید
-3. باید در Logcat پیام "Embedding Created" را ببینید
-
-## 7. خطایابی (Debugging)
-
-برای دیدن جزئیات بیشتر:
-
-```java
-hubConnection = HubConnectionBuilder
-    .create(serverUrl)
-    .withHttpConnectionOptions(options -> {
-        options.setLogging(LogLevel.TRACE);
-    })
-    .build();
-```
-
----
-
-## خلاصه Endpoints
-
-| نوع رویداد | متد SignalR | پارامترهای دریافتی |
-|-----------|-------------|---------------------|
-| ایجاد Embedding | `EmbeddingCreated` | workshopId, employeeId, employeeFullName, timestamp |
-| حذف Embedding | `EmbeddingDeleted` | workshopId, employeeId, timestamp |
-| بهبود Embedding | `EmbeddingRefined` | workshopId, employeeId, timestamp |
-
-| متد ارسالی | پارامتر | توضیحات |
-|-----------|---------|---------|
-| `JoinWorkshopGroup` | workshopId | عضویت در گروه کارگاه |
-| `LeaveWorkshopGroup` | workshopId | خروج از گروه کارگاه |
-

AccountManagement.Application.Contracts/Account/IAccountApplication.cs

@@ -64,13 +64,4 @@ public interface IAccountApplication
     /// <param name="userName"></param>
     /// <returns></returns>
     public bool CheckExistClientAccount(string userName);
-    List<AccountViewModel> GetAdminAccountsNew();
-
-    void CameraLogin(CameraLoginRequest request);
-}
-
-public class CameraLoginRequest
-{
-    public string UserName { get; set; }
-    public string Password { get; set; }
 }

AccountManagement.Application.Contracts/Media/IMediaApplication.cs

@@ -4,13 +4,12 @@ using System.Collections.Generic;
 
 namespace AccountManagement.Application.Contracts.Media
 {
-    public interface IMediaApplication
-    {
-        MediaViewModel Get(long id);
-        OperationResult UploadFile(IFormFile file, string fileLabel, string relativePath, int maximumFileLength,
-            List<string> allowedExtensions, string category);
-        OperationResult MoveFile(long mediaId, string newRelativePath);
-        OperationResult DeleteFile(long mediaId);
-        List<MediaViewModel> GetRange(IEnumerable<long> select);
-    }
-}
+	public interface IMediaApplication
+	{
+		MediaViewModel Get(long id);
+		OperationResult UploadFile(IFormFile file, string fileLabel, string relativePath, int maximumFileLength, List<string> allowedExtensions);
+		OperationResult MoveFile(long mediaId, string newRelativePath);
+		OperationResult DeleteFile(long mediaId);
+		List<MediaViewModel> GetRange(IEnumerable<long> select);
+	}
+}

AccountManagement.Application/AccountApplication.cs

@@ -18,7 +18,6 @@ using Microsoft.AspNetCore.Mvc.Rendering;
 using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
 using Company.Domain.WorkshopAgg;
 using System.Security.Claims;
-using _0_Framework.Exceptions;
 using AccountManagement.Domain.PositionAgg;
 using AccountManagement.Domain.SubAccountAgg;
 using AccountManagement.Domain.SubAccountPermissionSubtitle1Agg;
@@ -260,8 +259,7 @@ public class AccountApplication : IAccountApplication
 					var workshop = workshopList.First();
 					authViewModel.WorkshopName = workshop.Name;
 					authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.Id);
-                    authViewModel.WorkshopId = workshop.Id;
-                }
+				}
 			}
 
             _authHelper.Signin(authViewModel);
@@ -319,7 +317,6 @@ public class AccountApplication : IAccountApplication
 				var workshop = workshopList.First();
 				authViewModel.WorkshopName = workshop.WorkshopName;
 				authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.WorkshopId);
-                authViewModel.WorkshopId = workshop.WorkshopId;
 			}
 			_authHelper.Signin(authViewModel);
 			idAutoriz = 2;
@@ -371,7 +368,6 @@ public class AccountApplication : IAccountApplication
 				var workshop = workshopList.First();
 				authViewModel.WorkshopName = workshop.Name;
 				authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.Id);
-                authViewModel.WorkshopId = workshop.Id;
 			}
 		}
 
@@ -519,7 +515,6 @@ public class AccountApplication : IAccountApplication
 			var workshop = authViewModel.WorkshopList.First();
 			authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshop.Id);
 			authViewModel.WorkshopName = workshop.Name;
-            authViewModel.WorkshopId = workshop.Id;
 		}
 		_authHelper.Signin(authViewModel);
         return operation.Succcedded(2);
@@ -800,33 +795,4 @@ public class AccountApplication : IAccountApplication
         return _accountRepository.CheckExistClientAccount(userName);
     }
 
-    public List<AccountViewModel> GetAdminAccountsNew()
-    {
-        return _accountRepository.GetAdminAccountsNew();
-    }
-
-    public void CameraLogin(CameraLoginRequest request)
-    {
-        var cameraAccount = _cameraAccountRepository.GetBy(request.UserName);
-
-        if (cameraAccount == null)
-        {
-            throw new BadRequestException(ApplicationMessages.WrongUserPass);
-        }
-
-        (bool Verified, bool NeedUpgrade) result = _passwordHasher.Check(cameraAccount.Password, request.Password);
-        
-        if (!result.Verified)
-            throw new BadRequestException(ApplicationMessages.WrongUserPass);
-
-        var mobile = string.IsNullOrWhiteSpace(cameraAccount.Mobile) ? " " : cameraAccount.Mobile;
-        
-        var authViewModel = new CameraAuthViewModel(cameraAccount.id, cameraAccount.WorkshopId,
-            cameraAccount.Username, mobile, cameraAccount.WorkshopName, cameraAccount.AccountId,
-            cameraAccount.IsActiveSting);
-        if (cameraAccount.IsActiveSting != "true")
-            throw new BadRequestException(ApplicationMessages.WrongUserPass);
-
-        _authHelper.CameraSignIn(authViewModel);
-    }
 }

AccountManagement.Application/MediaApplication.cs

@@ -9,113 +9,147 @@ using Microsoft.AspNetCore.Http;
 
 namespace AccountManagement.Application
 {
-    public class MediaApplication : IMediaApplication
-    {
+	public class MediaApplication:IMediaApplication
+	{
 
 
-        private const string _basePath = "Medias";
-        private readonly IMediaRepository _mediaRepository;
+		private const string _basePath = "Medias";
+		private readonly IMediaRepository _mediaRepository;
 
-        public MediaApplication(IMediaRepository mediaRepository)
-        {
-            _mediaRepository = mediaRepository;
-        }
+		public MediaApplication(IMediaRepository mediaRepository)
+		{
+			_mediaRepository = mediaRepository;
+		}
 
 
-        /// <summary>
-        /// دریافت فایل و نوشتن آن در مسیر داده شده، و ثبت مدیا
-        /// </summary>
-        /// <param name="file">فایل</param>
-        /// <param name="fileLabel">برچسب فایل که در نام فایل ظاهر می شود</param>
-        /// <param name="relativePath">مسیر فایل</param>
-        /// <param name="maximumFileLength">حداکثر حجم فایل به مگابایت</param>
-        /// <param name="allowedExtensions">[.png,.jpg,.jpeg] پسوند های مجاز مثلا </param>
-        /// <param name="category"></param>
-        /// <returns></returns>
-        public OperationResult UploadFile(IFormFile file, string fileLabel, string relativePath, int maximumFileLength,
-            List<string> allowedExtensions, string category)
-        {
-            return _mediaRepository.UploadFile(file, fileLabel, relativePath, maximumFileLength, allowedExtensions, category);
-        }
+		/// <summary>
+		/// دریافت فایل و نوشتن آن در مسیر داده شده، و ثبت مدیا
+		/// </summary>
+		/// <param name="file">فایل</param>
+		/// <param name="fileLabel">برچسب فایل که در نام فایل ظاهر می شود</param>
+		/// <param name="relativePath">مسیر فایل</param>
+		/// <param name="allowedExtensions">[.png,.jpg,.jpeg] پسوند های مجاز مثلا </param>
+		/// <param name="maximumFileLength">حداکثر حجم فایل به مگابایت</param>
+		/// <returns></returns>
+		public OperationResult UploadFile(IFormFile file, string fileLabel, string relativePath,int maximumFileLength,List<string> allowedExtensions)
+		{
+			OperationResult op = new();
+			var path = Path.Combine(_basePath, relativePath);
+			var fileExtension = Path.GetExtension(file.FileName);
+
+			if (file == null || file.Length == 0)
+				return op.Failed("خطای سیستمی");
+
+			if (file.Length > (maximumFileLength * 1024 * 1024))
+				return op.Failed($"حجم فایل نمی تواند بیشتر از " +
+				                 $"{maximumFileLength}" +
+				                 $"مگابایت باشد");
+
+			if (!allowedExtensions.Contains(fileExtension.ToLower()))
+			{
+				var operationMessage = ":فرمت فایل باید یکی از موارد زیر باشد";
+				operationMessage += "\n";
+				operationMessage += string.Join(" ", allowedExtensions);
+				return op.Failed(operationMessage);
+			}
 
 
-        /// <summary>
-        /// حذف فایل
-        /// </summary>
-        public OperationResult DeleteFile(long mediaId)
-        {
-            OperationResult op = new();
-            var media = _mediaRepository.Get(mediaId);
-            if (media == null)
-                return op.Failed("رکورد مورد نظر یافت نشد");
-            try
-            {
-                if (File.Exists(media.Path))
-                    File.Delete(media.Path);
-                else
-                    return op.Failed("فایل یافت نشد");
-            }
-            catch
-            {
-                return op.Failed("خطایی در حذف فایل رخ داده است");
-            }
+			Directory.CreateDirectory(path);
 
-            _mediaRepository.Remove(media.id);
-            _mediaRepository.SaveChanges();
-            return op.Succcedded();
-        }
+			var extension = Path.GetExtension(file.FileName);
 
-        /// <summary>
-        /// جابجا کردن فایل 
-        /// </summary>
-        public OperationResult MoveFile(long mediaId, string newRelativePath)
-        {
-            OperationResult op = new();
-            var media = _mediaRepository.Get(mediaId);
-            var oldPath = media.Path;
-            var path = Path.Combine(_basePath, newRelativePath);
-            Directory.CreateDirectory(path);
+			var uniqueFileName = $"{fileLabel}-{DateTime.Now.Ticks}{extension}";
+			var filePath = Path.Combine(path, uniqueFileName);
+			using (var fileStream = new FileStream(filePath, FileMode.CreateNew))
+			{
+				file.CopyTo(fileStream);
+			}
+			var mediaEntity = new Media(filePath, extension, "فایل", "EmployeeDocuments");
+			_mediaRepository.Create(mediaEntity);
+			_mediaRepository.SaveChanges();
 
-            string filepath = Path.Combine(path, Path.GetFileName(oldPath));
-            try
-            {
-                File.Move(oldPath, filepath);
-            }
-            catch
-            {
-                return op.Failed("در جابجایی فایل خطایی رخ داده است");
-            }
+			return op.Succcedded(mediaEntity.id);
 
-            media.Edit(filepath, media.Type, media.Category);
-            _mediaRepository.SaveChanges();
-            return op.Succcedded();
-        }
+		}
 
-        public MediaViewModel Get(long id)
-        {
-            var media = _mediaRepository.Get(id);
-            if (media == null)
-                return new();
-            return new MediaViewModel()
-            {
-                Category = media.Category,
-                Path = media.Path,
-                Id = media.id,
-                Type = media.Type
-            };
-        }
 
-        public List<MediaViewModel> GetRange(IEnumerable<long> ids)
-        {
-            var medias = _mediaRepository.GetRange(ids);
-            return medias.Select(x => new MediaViewModel()
-            {
-                Category = x.Category,
-                Path = x.Path,
-                Id = x.id,
-                Type = x.Type,
-            }).ToList();
-        }
+		/// <summary>
+		/// حذف فایل
+		/// </summary>
+		public OperationResult DeleteFile(long mediaId)
+		{
+			OperationResult op = new();
+			var media = _mediaRepository.Get(mediaId);
+			if (media == null)
+				return op.Failed("رکورد مورد نظر یافت نشد");
+			try
+			{
+				if (File.Exists(media.Path))
+					File.Delete(media.Path);
+				else
+					return op.Failed("فایل یافت نشد");
+			}
+			catch
+			{
+				return op.Failed("خطایی در حذف فایل رخ داده است");
+			}
 
-    }
+			_mediaRepository.Remove(media.id);
+			_mediaRepository.SaveChanges();
+			return op.Succcedded();
+		}
+
+		/// <summary>
+		/// جابجا کردن فایل 
+		/// </summary>
+		public OperationResult MoveFile(long mediaId, string newRelativePath)
+		{
+			OperationResult op = new();
+			var media = _mediaRepository.Get(mediaId);
+			var oldPath = media.Path;
+			var path = Path.Combine(_basePath, newRelativePath);
+			Directory.CreateDirectory(path);
+
+			string filepath = Path.Combine(path, Path.GetFileName(oldPath));
+			try
+			{
+				File.Move(oldPath, filepath);
+			}
+			catch
+			{
+				return op.Failed("در جابجایی فایل خطایی رخ داده است");
+			}
+
+			media.Edit(filepath, media.Type, media.Category);
+			_mediaRepository.SaveChanges();
+			return op.Succcedded();
+		}
+
+		public MediaViewModel Get(long id)
+		{
+			var media = _mediaRepository.Get(id);
+			if (media == null)
+				return new();
+			return new MediaViewModel()
+			{
+				Category = media.Category,
+				Path = media.Path,
+				Id = media.id,
+				Type = media.Type
+			};
+		}
+
+		public List<MediaViewModel> GetRange(IEnumerable<long> ids)
+		{
+			var medias = _mediaRepository.GetRange(ids);
+			return medias.Select(x=>new MediaViewModel()
+			{
+				Category = x.Category,
+				Path = x.Path,
+				Id = x.id,
+				Type = x.Type,
+			}).ToList();
+		}
+
+	}
 }

AccountManagement.Domain/AssignAgg/Assign.cs

@@ -2,7 +2,6 @@
 using AccountManagement.Domain.TaskAgg;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using AccountManagement.Domain.TaskMessageAgg;
 
 namespace AccountManagement.Domain.AssignAgg;
@@ -159,24 +158,4 @@ public class Assign : EntityBase
 		IsDoneRequest=isDoneRequest;
 		DoneDescription=doneDescription;
 	}
-
-	public void ChangeAssignedId(long assignedId)
-	{
-		AssignedId = assignedId;
-	}
-
-	public void SetAssignerId(long assignerId)
-	{
-		AssignerId = assignerId;
-	}
-
-	public void ChangeSender(long senderId)
-	{
-		Task.SetSender(senderId);
-		var taskMessageItemsEnumerable =TaskMessageList.SelectMany(m => m.TaskMessageItemsList);
-		foreach (var taskMessageItems in taskMessageItemsEnumerable)
-		{
-			taskMessageItems.SetSenderId(senderId);
-		}
-	}
 }

AccountManagement.Domain/MediaAgg/IMediaRepository.cs

@@ -1,15 +1,12 @@
 using System.Collections.Generic;
-using _0_Framework.Application;
 using _0_Framework.Domain;
 using AccountManagement.Application.Contracts.Media;
-using Microsoft.AspNetCore.Http;
 
 
 namespace AccountManagement.Domain.MediaAgg;
 
-public interface IMediaRepository : IRepository<long, Media>
+public interface IMediaRepository:IRepository<long,Media>
 {
-    public string BasePath { get; protected set; }
     void CreateMediaWithTaskMedia(long taskId, long mediaId);
     List<MediaViewModel> GetMediaByTaskId(long taskId);
     void Remove(long id);
@@ -26,6 +23,4 @@ public interface IMediaRepository : IRepository<long, Media>
 
     #endregion
 
-    OperationResult UploadFile(IFormFile file, string fileLabel, string relativePath, int maximumFileLength,
-        List<string> allowedExtensions, string category);
 }

AccountManagement.Domain/TaskAgg/Tasks.cs

@@ -1,12 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Security.AccessControl;
 using _0_Framework.Domain;
 using AccountManagement.Domain.AssignAgg;
 using AccountManagement.Domain.TaskMediaAgg;
 using AccountManagement.Domain.TaskScheduleAgg;
-using OfficeOpenXml.Style;
 
 namespace AccountManagement.Domain.TaskAgg;
 
@@ -82,40 +80,4 @@ public class Tasks : EntityBase
         TaskScheduleId = taskScheduleId;
     }
 
-    public void ChangeSender(long senderId)
-    {
-	    var prevSender = SenderId;
-
-	    var assigners = Assigns.Where(x => x.AssignerId == prevSender).ToList();
-
-	    foreach (var assigner in assigners)
-	    {
-		    assigner.SetAssignerId(senderId);
-	    }
-
-	    var senderMessageItem = Assigns
-		    .SelectMany(x=>x.TaskMessageList
-		    .SelectMany(m=>m.TaskMessageItemsList)).Where(x=>x.SenderAccountId == prevSender).ToList();
-
-	    var receiverMessageItem = Assigns.SelectMany(x=>x.TaskMessageList
-		    .SelectMany(m=>m.TaskMessageItemsList)).Where(x=>x.ReceiverAccountId == prevSender).ToList();
-
-
-	    SenderId = senderId;
-
-	    foreach (var taskMessageItems in senderMessageItem)
-	    {
-		    taskMessageItems.SetSenderId(senderId);
-	    }
-	    foreach (var taskMessageItems in receiverMessageItem)
-	    {
-		    taskMessageItems.SetReceiver(senderId);
-	    }
-
-	}
-
-    public void SetSender(long senderId)
-    {
-	    SenderId = senderId;
-    }
 }

AccountManagement.Domain/TaskMessageItemsAgg/TaskMessageItems.cs

@@ -19,13 +19,4 @@ public class TaskMessageItems:EntityBase
     public TaskMessage TaskMessage { get; set; }
 
 
-    public void SetSenderId(long senderId)
-    {
-	    SenderAccountId = senderId;
-    }
-
-    public void SetReceiver(long receiverId)
-    {
-	    ReceiverAccountId = receiverId;
-    }
 }

AccountManagement.Domain/TaskScheduleAgg/TaskSchedule.cs

@@ -16,7 +16,7 @@ public class TaskSchedule:EntityBase
         UnitType = unitType;
         UnitNumber = unitNumber;
         LastEndTaskDate = lastEndTaskDate;
-        IsActive = IsActive.True;
+        IsActive = IsActive.False;
     }
     public string Count { get; private set; }
     public TaskScheduleType Type { get; private set; }

AccountMangement.Infrastructure.EFCore/Repository/MediaRepository.cs

@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
+using System.Collections.Generic;
 using System.Linq;
-using _0_Framework.Application;
 using _0_Framework.InfraStructure;
 using AccountManagement.Application.Contracts.Media;
 using AccountManagement.Domain.AdminResponseMediaAgg;
@@ -10,35 +7,27 @@ using AccountManagement.Domain.ClientResponseMediaAgg;
 using AccountManagement.Domain.MediaAgg;
 using AccountManagement.Domain.TaskMediaAgg;
 using AccountManagement.Domain.TicketMediasAgg;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
 
 namespace AccountMangement.Infrastructure.EFCore.Repository;
 
-public class MediaRepository : RepositoryBase<long, Media>, IMediaRepository
+public class MediaRepository:RepositoryBase<long,Media>,IMediaRepository
 {
-    private const string _basePath = "Storage/Medias";
-    public string BasePath { get; set; }
-
-
     private readonly AccountContext _accountContext;
-    public MediaRepository(AccountContext taskManagerContext, IWebHostEnvironment webHostEnvironment) : base(taskManagerContext)
+    public MediaRepository( AccountContext taskManagerContext) : base(taskManagerContext)
     {
         _accountContext = taskManagerContext;
-        BasePath = webHostEnvironment.ContentRootPath + "/Storage";
     }
     //ساخت جدول واسط بین مدیا و نسک
     //نکته: این متد ذخیره انجام نمیدهد
-
     public void CreateMediaWithTaskMedia(long taskId, long mediaId)
     {
-        var Taskmedias = new TaskMedia(taskId, mediaId);
+        var Taskmedias = new TaskMedia(taskId,mediaId);
         _accountContext.Add(Taskmedias);
     }
     public void Remove(long id)
     {
-        var media = Get(id);
+	    var media = Get(id);
         Remove(media);
     }
 
@@ -88,48 +77,6 @@ public class MediaRepository : RepositoryBase<long, Media>, IMediaRepository
     {
         return _accountContext.Medias.Where(x => mediaIds.Contains(x.id)).ToList();
     }
-
-    public OperationResult UploadFile(IFormFile file, string fileLabel, string relativePath, int maximumFileLength,
-        List<string> allowedExtensions, string category)
-    {
-        OperationResult op = new();
-        var path = Path.Combine(_basePath, relativePath);
-        var fileExtension = Path.GetExtension(file.FileName);
-
-        if (file == null || file.Length == 0)
-            return op.Failed("خطای سیستمی");
-
-        if (file.Length > (maximumFileLength * 1024 * 1024))
-            return op.Failed($"حجم فایل نمی تواند بیشتر از " +
-                             $"{maximumFileLength}" +
-                             $"مگابایت باشد");
-
-        if (!allowedExtensions.Contains(fileExtension.ToLower()))
-        {
-            var operationMessage = ":فرمت فایل باید یکی از موارد زیر باشد";
-            operationMessage += "\n";
-            operationMessage += string.Join(" ", allowedExtensions);
-            return op.Failed(operationMessage);
-        }
-
-
-        Directory.CreateDirectory(path);
-
-        var extension = Path.GetExtension(file.FileName);
-
-        var uniqueFileName = $"{fileLabel}-{DateTime.Now.Ticks}{extension}";
-        var filePath = Path.Combine(path, uniqueFileName);
-        using (var fileStream = new FileStream(filePath, FileMode.CreateNew))
-        {
-            file.CopyTo(fileStream);
-        }
-        var mediaEntity = new Media(filePath, extension, "فایل", category);
-        Create(mediaEntity);
-        SaveChanges();
-
-        return op.Succcedded(mediaEntity.id);
-
-    }
 }
 
 #endregion

Company.Domain/AndroidApkVersionAgg/AndroidApkVersion.cs

@@ -1,7 +1,6 @@
 using System;
 using _0_Framework.Application;
 using _0_Framework.Domain;
-using CompanyManagment.App.Contracts.AndroidApkVersion;
 
 namespace Company.Domain.AndroidApkVersionAgg;
 
@@ -9,17 +8,14 @@ public class AndroidApkVersion:EntityBase
 {
     private AndroidApkVersion () { }
 
-    public AndroidApkVersion( string versionName,string versionCode, IsActive isActive, string path, ApkType apkType, bool isForce = false)
+    public AndroidApkVersion( string versionName,string versionCode, IsActive isActive, string path)
     {
         
         VersionName = versionName;
         VersionCode = versionCode;
         IsActive = isActive;
         Path = path;
-        ApkType = apkType;
-        IsForce = isForce;
-        var appName = apkType == ApkType.WebView ? "Gozareshgir-WebView" : "Gozareshgir-FaceDetection";
-        Title = $"{appName}-{versionName}-{CreationDate:g}";
+        Title = $"Gozareshgir-{versionName}-{CreationDate:g}";
     }
 
     public string Title { get; private set; }
@@ -27,9 +23,6 @@ public class AndroidApkVersion:EntityBase
     public string VersionCode{ get; private set; }
     public IsActive IsActive { get; private set; }
     public string Path { get; set; }
-    public ApkType ApkType { get; private set; }
-    public bool IsForce { get; private set; }
-    
 
     public void Active()
     {
@@ -40,4 +33,4 @@ public class AndroidApkVersion:EntityBase
     {
         IsActive = IsActive.False;
     }
-}
+}

Company.Domain/AndroidApkVersionAgg/IAndroidApkVersionRepository.cs

@@ -1,14 +1,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using _0_Framework_b.Domain;
-using CompanyManagment.App.Contracts.AndroidApkVersion;
 
 namespace Company.Domain.AndroidApkVersionAgg;
 
 public interface IAndroidApkVersionRepository:IRepository<long,AndroidApkVersion>
 {
-    IQueryable<AndroidApkVersion> GetActives(ApkType apkType);
-    AndroidApkVersion GetLatestActive(ApkType apkType);
+    IQueryable<AndroidApkVersion> GetActives();
     void Remove(AndroidApkVersion entity);
-    System.Threading.Tasks.Task<string> GetLatestActiveVersionPath(ApkType apkType);
+    System.Threading.Tasks.Task<string> GetLatestActiveVersionPath();
 }

Company.Domain/AuthorizedBankDetailsAgg/AuthorizedBankDetails.cs

@@ -1,46 +0,0 @@
-using System.Collections.Generic;
-using _0_Framework_b.Domain;
-
-namespace Company.Domain.AuthorizedBankDetailsAgg
-{
-    public class AuthorizedBankDetails : EntityBase
-    {
-        private AuthorizedBankDetails() 
-        {
-            OwnersList = new List<AuthorizedBankDetailsOwner>();
-        }
-
-        public AuthorizedBankDetails(string cardNumber, string accountNumber, string ban, string bankName, List<AuthorizedBankDetailsOwner> ownersList)
-        {
-            CardNumber = cardNumber;
-            AccountNumber = accountNumber;
-            IBan = ban;
-            BankName = bankName;
-            OwnersList = ownersList ?? new List<AuthorizedBankDetailsOwner>();
-        }
-
-        public string CardNumber { get; private set; }
-        public string AccountNumber { get; private set; }
-        public string IBan { get; private set; }
-        public string BankName { get; private set; }
-        public List<AuthorizedBankDetailsOwner> OwnersList { get; private set; }
-    }
-
-    public class AuthorizedBankDetailsOwner // Value Object - not inheriting from EntityBase
-    {
-        private AuthorizedBankDetailsOwner() { }
-
-        public AuthorizedBankDetailsOwner(string fName, string lName, string nationalIdentifier, string customerType)
-        {
-            FName = fName;
-            LName = lName;
-            NationalIdentifier = nationalIdentifier;
-            CustomerType = customerType;
-        }
-        
-        public string FName { get; private set; }
-        public string LName { get; private set; }
-        public string NationalIdentifier { get; private set; }
-        public string CustomerType { get; private set; }
-    }
-}

Company.Domain/AuthorizedBankDetailsAgg/IAuthorizedBankDetailsRepository.cs

@@ -1,13 +0,0 @@
-using _0_Framework_b.Domain;
-using System.Collections.Generic;
-using Company.Application.Contracts.AuthorizedBankDetails;
-
-namespace Company.Domain.AuthorizedBankDetailsAgg
-{
-    public interface IAuthorizedBankDetailsRepository : IRepository<long, AuthorizedBankDetails>
-    {
-        EditAuthorizedBankDetails GetDetails(long id);
-        List<AuthorizedBankDetailsViewModel> Search(AuthorizedBankDetailsSearchModel searchModel);
-        AuthorizedBankDetailsViewModel GetByIban(string iban);
-    }
-}

Company.Domain/AuthorizedPersonAgg/AuthorizedPerson.cs

@@ -1,51 +0,0 @@
-using System;
-using _0_Framework.Domain;
-
-namespace Company.Domain.AuthorizedPersonAgg;
-
-public class AuthorizedPerson : EntityBase
-{
-    public string NationalCode { get; private set; }
-    public string FirstName { get; private set; }
-    public string LastName { get; private set; }
-    public string FatherName { get; private set; }
-    public string BirthDate { get; private set; }
-    public string Gender { get; private set; }
-    public string DeathStatus { get; private set; }
-    public string ShenasnameSeri { get; private set; }
-    public string ShenasnameSerial { get; private set; }
-    public string ShenasnamehNumber { get; private set; }
-    public bool IsVerified { get; private set; }
-    public DateTime? VerificationDate { get; private set; }
-
-    public AuthorizedPerson(string nationalCode, string firstName, string lastName, string fatherName, 
-        string birthDate, string gender, string deathStatus, string shenasnameSeri, 
-        string shenasnameSerial, string shenasnamehNumber)
-    {
-        NationalCode = nationalCode;
-        FirstName = firstName;
-        LastName = lastName;
-        FatherName = fatherName;
-        BirthDate = birthDate;
-        Gender = gender;
-        DeathStatus = deathStatus;
-        ShenasnameSeri = shenasnameSeri;
-        ShenasnameSerial = shenasnameSerial;
-        ShenasnamehNumber = shenasnamehNumber;
-        IsVerified = true;
-        VerificationDate = DateTime.Now;
-    }
-
-    public void UpdatePersonalInfo(string firstName, string lastName, string fatherName, 
-        string gender, string deathStatus)
-    {
-        FirstName = firstName;
-        LastName = lastName;
-        FatherName = fatherName;
-        Gender = gender;
-        DeathStatus = deathStatus;
-        VerificationDate = DateTime.Now;
-    }
-
-    protected AuthorizedPerson() { }
-}

Company.Domain/AuthorizedPersonAgg/IAuthorizedPersonRepository.cs

@@ -1,9 +0,0 @@
-using _0_Framework.Domain;
-
-namespace Company.Domain.AuthorizedPersonAgg;
-
-public interface IAuthorizedPersonRepository : IRepository<long, AuthorizedPerson>
-{
-    AuthorizedPerson GetByNationalCode(string nationalCode);
-    bool ExistsByNationalCode(string nationalCode);
-}

Company.Domain/CheckoutAgg/Checkout.cs

@@ -1,10 +1,8 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Security.AccessControl;
 using _0_Framework.Application;
 using _0_Framework.Domain;
-using _0_Framework.Domain.CustomizeCheckoutShared.Enums;
 using Company.Domain.CheckoutAgg.ValueObjects;
 using Company.Domain.CustomizeCheckoutAgg.ValueObjects;
 using Company.Domain.WorkshopAgg;
@@ -13,25 +11,25 @@ namespace Company.Domain.CheckoutAgg;
 
 public class Checkout : EntityBase
 {
-    public Checkout()
-    {
-    }
-
+	private Checkout()
+	{
+	
+	}
     public Checkout(string employeeFullName, string fathersName, string nationalCode, string dateOfBirth,
         long employeeId, string workshopName, long workshopId, string contractNo, DateTime contractStart,
-        DateTime contractEnd, string month, string year, long contractId, long workingHoursId,
+        DateTime contractEnd, string month, string year, long contractId, long workingHoursId, 
         double monthlySalary, double baseYearsPay, double consumableItems, double housingAllowance,
         double overtimePay, double nightworkPay, double fridayPay, double missionPay, double shiftPay,
         double familyAllowance, double bonusesPay, double yearsPay, double leavePay,
         double insuranceDeduction, double taxDeducation, double installmentDeduction,
         double salaryAidDeduction, double absenceDeduction, string sumOfWorkingDays
-        , string archiveCode, string personnelCode,
+        , string archiveCode, string personnelCode, 
         string totalClaims, string totalDeductions, double totalPayment, string signature, double marriedAllowance, bool leaveCheckout,
         double creditLeaves, double absencePeriod, double averageHoursPerDay, bool hasRollCall, string overTimeWorkvalue,
         string overNightWorkValue, string fridayWorkValue, string rotatingShifValue, string absenceValue,
         string totalDayOfLeaveCompute, string totalDayOfYearsCompute, string totalDayOfBunosesCompute,
         ICollection<CheckoutLoanInstallment> loanInstallments,
-        ICollection<CheckoutSalaryAid> salaryAids, CheckoutRollCall checkoutRollCall, TimeSpan employeeMandatoryHours, bool hasInsuranceShareTheSameAsList)
+        ICollection<CheckoutSalaryAid> salaryAids)
     {
         EmployeeFullName = employeeFullName;
         FathersName = fathersName;
@@ -90,18 +88,14 @@ public class Checkout : EntityBase
         TotalDayOfBunosesCompute = totalDayOfBunosesCompute;
         LoanInstallments = loanInstallments;
         SalaryAids = salaryAids;
-        CheckoutRollCall = checkoutRollCall;
-        EmployeeMandatoryHours = employeeMandatoryHours;
-        HasInsuranceShareTheSameAsList = hasInsuranceShareTheSameAsList;
     }
 
-
     public string EmployeeFullName { get; private set; }
     public string IsActiveString { get; private set; }
     public string Signature { get; private set; }
     public string FathersName { get; private set; }
     public string NationalCode { get; private set; }
-    public string DateOfBirth { get; private set; }
+    public string DateOfBirth { get; private set; } 
     public long EmployeeId { get; private set; }
 
     public string WorkshopName { get; private set; }
@@ -137,7 +131,7 @@ public class Checkout : EntityBase
     public double SalaryAidDeduction { get; private set; }
 
     public double AbsenceDeduction { get; private set; }
-
+    
     public string SumOfWorkingDays { get; private set; }
     public string ArchiveCode { get; private set; }
     public string PersonnelCode { get; private set; }
@@ -159,72 +153,50 @@ public class Checkout : EntityBase
     //میانگین ساعت کار در یک روز
     public double AverageHoursPerDay { get; private set; }
     public bool HasRollCall { get; private set; }
-    /// <summary>
-    /// مقدار اضافه کار
-    /// </summary>
+   /// <summary>
+   /// مقدار اضافه کار
+   /// </summary>
     public string OverTimeWorkValue { get; private set; }
-
-    /// <summary>
-    /// مقدار شبکاری
-    /// </summary>
+   
+   /// <summary>
+   /// مقدار شبکاری
+   /// </summary>
     public string OverNightWorkValue { get; private set; }
-
-    /// <summary>
-    /// مقدار جمعه کاری
-    /// </summary>
-    public string FridayWorkValue { get; private set; }
-
-    /// <summary>
-    /// درصد نوبت کاری
-    /// </summary>
-    public string RotatingShiftValue { get; private set; }
-
-    /// <summary>
+ 
+   /// <summary>
+   /// مقدار جمعه کاری
+   /// </summary>
+   public string FridayWorkValue { get; private set; }
+ 
+   /// <summary>
+   /// درصد نوبت کاری
+   /// </summary>
+   public string RotatingShiftValue { get; private set; }
+    
+   /// <summary>
     /// مقدار غیبت  
     /// </summary>
-    public string AbsenceValue { get; private set; }
+   public string AbsenceValue { get; private set; }
 
-    /// <summary>
-    /// تعداد روزهای محاسبه شده برای مزد مرخصی
-    /// </summary>
-    public string TotalDayOfLeaveCompute { get; private set; }
-    /// <summary>
-    /// تعداد روزهای محاسبه شده برای سنوات
-    /// </summary>
-    public string TotalDayOfYearsCompute { get; private set; }
-    /// <summary>
-    /// تعداد روزهای محاسبه شده برای عیدی و پاداش
-    /// </summary>
-    public string TotalDayOfBunosesCompute { get; private set; }
+   /// <summary>
+   /// تعداد روزهای محاسبه شده برای مزد مرخصی
+   /// </summary>
+   public string TotalDayOfLeaveCompute { get; private set; }
+   /// <summary>
+   /// تعداد روزهای محاسبه شده برای سنوات
+   /// </summary>
+   public string TotalDayOfYearsCompute { get; private set; }
+   /// <summary>
+   /// تعداد روزهای محاسبه شده برای عیدی و پاداش
+   /// </summary>
+   public string TotalDayOfBunosesCompute { get; private set; }
 
-    /// <summary>
-    /// دارای تداخل مبلغ است. این در زمانی اتفاق می افتد که فیش مبلغ آن تغییر کرده ولی به دلیل مسائل قانونی امکان صدور دوباره آن وجود ندارد
-    /// </summary>
-    public bool HasAmountConflict { get; private set; }
 
-    /// <summary>
-    /// ساعت موظفی پرسنل در ماه
-    /// </summary>
-    public TimeSpan EmployeeMandatoryHours { get; set; }
+   #region valueObjects
 
-    /// <summary>
-    /// آیا حق بیمه مشابه لیست بیمه حساب شده؟
-    /// </summary>
-    public bool HasInsuranceShareTheSameAsList { get; private set; }
-
-    /// <summary>
-    /// آیا فیش  نیاز به بروزرسانی دارد
-    /// </summary>
-    public bool IsUpdateNeeded { get; private set; }
-
-    public List<CheckoutWarningMessage> CheckoutWarningMessageList { get; set; }
-
-    #region valueObjects
-
-    public ICollection<CheckoutLoanInstallment> LoanInstallments { get; set; } = [];
-    public ICollection<CheckoutSalaryAid> SalaryAids { get; set; } = [];
-    public CheckoutRollCall CheckoutRollCall { get; private set; }
-    #endregion
+   public ICollection<CheckoutLoanInstallment> LoanInstallments { get; set; } = [];
+   public ICollection<CheckoutSalaryAid> SalaryAids { get; set; } = [];
+   #endregion
 
 
     public Workshop Workshop { get; set; }
@@ -291,7 +263,7 @@ public class Checkout : EntityBase
         var year = contarctStart.ToFarsiYear();
         var sumYear = year.Substring(Math.Max(0, year.Length - 2));
 
-
+          
         ContractNo = archiveCode + "/" + personnelCode + "/" + sumYear + "/" + month;
     }
     public void Active()
@@ -326,7 +298,7 @@ public class Checkout : EntityBase
     }
 
 
-    public void SetSalaryAid(ICollection<CheckoutSalaryAid> salaryAids, double salaryAidAmount)
+    public void SetSalaryAid(ICollection<CheckoutSalaryAid> salaryAids,double salaryAidAmount)
     {
         SalaryAids = salaryAids;
         SalaryAidDeduction = salaryAidAmount;
@@ -336,174 +308,4 @@ public class Checkout : EntityBase
         LoanInstallments = lonaInstallments;
         InstallmentDeduction = installmentsAmount;
     }
-
-    public void SetCheckoutRollCall(CheckoutRollCall checkoutRollCall)
-    {
-        CheckoutRollCall = checkoutRollCall;
-    }
-
-    public void SetAmountConflict(bool hasAmountConflict)
-    {
-        HasAmountConflict = hasAmountConflict;
-    }
-
-    public void SetEmployeeMandatoryHours(TimeSpan employeeMandatoryHours)
-    {
-        EmployeeMandatoryHours = employeeMandatoryHours;
-    }
-
-    public void SetInsuranceShare()
-    {
-        HasInsuranceShareTheSameAsList = true;
-    }
-
-    /// <summary>
-    /// نیاز به آپدیت 
-    /// </summary>
-    public void SetUpdateNeeded()
-    {
-        IsUpdateNeeded = true;
-    }
-
-
-}
-
-public class CheckoutRollCall
-{
-    private CheckoutRollCall() { }
-    public CheckoutRollCall(TimeSpan totalMandatoryTimeSpan, TimeSpan totalPresentTimeSpan, TimeSpan totalBreakTimeSpan,
-        TimeSpan totalWorkingTimeSpan, TimeSpan totalPaidLeaveTmeSpan, TimeSpan totalSickLeaveTimeSpan,
-        ICollection<CheckoutRollCallDay> rollCallDaysCollection)
-    {
-        TotalMandatoryTimeSpan = totalMandatoryTimeSpan;
-        TotalPresentTimeSpan = totalPresentTimeSpan;
-        TotalBreakTimeSpan = totalBreakTimeSpan;
-        TotalWorkingTimeSpan = totalWorkingTimeSpan;
-        TotalPaidLeaveTmeSpan = totalPaidLeaveTmeSpan;
-        TotalSickLeaveTimeSpan = totalSickLeaveTimeSpan;
-        RollCallDaysCollection = rollCallDaysCollection;
-    }
-
-
-    /// <summary>
-    /// مجموع ساعت موظفی
-    /// </summary>
-	public TimeSpan TotalMandatoryTimeSpan { get; private set; }
-
-    /// <summary>
-    /// مجموع ساعت حضور
-    /// </summary>
-	public TimeSpan TotalPresentTimeSpan { get; private set; }
-
-    /// <summary>
-    /// مجموع ساعت استراحت
-    /// </summary>
-	public TimeSpan TotalBreakTimeSpan { get; private set; }
-
-    /// <summary>
-    /// مجموع ساعت کارکرد
-    /// </summary>
-	public TimeSpan TotalWorkingTimeSpan { get; private set; }
-
-    /// <summary>
-    /// مجموع ساعت مرخصی استحقاقی
-    /// </summary>
-	public TimeSpan TotalPaidLeaveTmeSpan { get; private set; }
-
-    /// <summary>
-    /// مجموع ساعت مرخصی استعلاجی
-    /// </summary>
-    public TimeSpan TotalSickLeaveTimeSpan { get; private set; }
-
-    /// <summary>
-    /// روز های حضور غیاب
-    /// </summary>
-    public ICollection<CheckoutRollCallDay> RollCallDaysCollection { get; private set; }
-}
-
-public class CheckoutRollCallDay
-{
-    private CheckoutRollCallDay() { }
-    public CheckoutRollCallDay(DateTime date, string firstStartDate, string firstEndDate,
-        string secondStartDate, string secondEndDate, TimeSpan breakTimeSpan,
-        bool isSliced, TimeSpan workingTimeSpan, bool isAbsent, bool isFriday,
-        bool isHoliday, string leaveType)
-    {
-        Date = date;
-        FirstStartDate = firstStartDate;
-        FirstEndDate = firstEndDate;
-        SecondStartDate = secondStartDate;
-        SecondEndDate = secondEndDate;
-        BreakTimeSpan = breakTimeSpan;
-        IsSliced = isSliced;
-        WorkingTimeSpan = workingTimeSpan;
-        IsAbsent = isAbsent;
-        IsFriday = isFriday;
-        IsHoliday = isHoliday;
-        LeaveType = leaveType;
-    }
-
-    public long Id { get; set; }
-
-    /// <summary>
-    /// تاریخ
-    /// </summary>
-	public DateTime Date { get; private set; }
-    /// <summary>
-    /// ورود اول 
-    /// </summary>
-	public string FirstStartDate { get; private set; }
-
-    /// <summary>
-    /// خروج اول
-    /// </summary>
-	public string FirstEndDate { get; private set; }
-
-    /// <summary>
-    /// ورود دوم
-    /// </summary>
-	public string SecondStartDate { get; private set; }
-
-    /// <summary>
-    /// خروج دوم
-    /// </summary>
-	public string SecondEndDate { get; private set; }
-
-    /// <summary>
-    /// ساعت استراحت
-    /// </summary>
-	public TimeSpan BreakTimeSpan { get; private set; }
-
-    /// <summary>
-    /// مقدار زمان کارکرد
-    /// </summary>
-	public TimeSpan WorkingTimeSpan { get; private set; }
-
-    /// <summary>
-    /// آیا منقطع است؟
-    /// </summary>
-	public bool IsSliced { get; private set; }
-
-    /// <summary>
-    /// آیا غیبت است
-    /// </summary>
-	public bool IsAbsent { get; private set; }
-
-    /// <summary>
-    /// آیا جمعه است
-    /// </summary>
-    public bool IsFriday { get; private set; }
-
-    /// <summary>
-    /// آیا تعطیل رسمی است
-    /// </summary>
-	public bool IsHoliday { get; private set; }
-
-    /// <summary>
-    /// نوع مرخصی - درصورت نداشتن مرخصی مقدارش null میباشد
-    /// </summary>
-	public string LeaveType { get; private set; }
-
-    public long CheckoutId { get; set; }
-
 }

Company.Domain/CheckoutAgg/CheckoutWarningMessage.cs

@@ -1,32 +0,0 @@
-using _0_Framework.Application.Enums;
-using _0_Framework.Domain;
-
-namespace Company.Domain.CheckoutAgg;
-
-public class CheckoutWarningMessage : EntityBaseWithoutCreationDate
-{
-    public CheckoutWarningMessage(string warningMessage, long checkoutId, TypeOfCheckoutWarning typeOfCheckoutWarning)
-    {
-        WarningMessage = warningMessage;
-        CheckoutId = checkoutId;
-        TypeOfCheckoutWarning = typeOfCheckoutWarning;
-    }
-
-    /// <summary>
-    /// پیام هشدار
-    /// </summary>
-    public string WarningMessage { get; private set; }
-
-
-    /// <summary>
-    /// آی دی فیش حقوقی
-    /// </summary>
-    public long CheckoutId { get; private set; }
-
-    /// <summary>
-    /// نوع هشدار فیش حقوقی
-    /// </summary>
-    public TypeOfCheckoutWarning TypeOfCheckoutWarning { get; private set; }
-
-    public Checkout Checkout { get; set; }
-}

Company.Domain/CheckoutAgg/ICheckoutRepository.cs

@@ -18,7 +18,7 @@ public interface ICheckoutRepository : IRepository<long, Checkout>
     /// <param name="سال به صورت رشته عددی"></param>
     /// <param name="ماه بصورت رشته عددی"></param>
     /// <returns></returns>
-    (bool hasChekout, double FamilyAlloance, double OverTimePay, double RotatingShift, double Nightwork, double Fridaywork, double YraesPay) HasCheckout(long workshopId, long employeId,
+    (bool hasChekout, double FamilyAlloance, double OverTimePay) HasCheckout(long workshopId, long employeId,
         string year, string month);
     EditCheckout GetDetails(long id);
 
@@ -59,16 +59,6 @@ public interface ICheckoutRepository : IRepository<long, Checkout>
     OperationResult DeleteAllCheckouts(List<long> ids);
     OperationResult DeleteCheckout(long id);
     List<long> CheckHasSignature(List<long> ids);
-
-    /// <summary>
-    /// لیست تصفیه حساب
-    /// جدید
-    ///
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    Task<List<CheckoutViewModel>> SearchCheckoutOptimized(CheckoutSearchModel searchModel);
-
     Task<List<CheckoutViewModel>> SearchForMainCheckout(CheckoutSearchModel searchModel);
     #endregion
 
@@ -78,6 +68,4 @@ public interface ICheckoutRepository : IRepository<long, Checkout>
         long workshopId, DateTime start, DateTime end);
 
     #endregion
-
-    Task<Checkout> GetByWorkshopIdEmployeeIdInDate(long workshopId, long employeeId, DateTime inDate);
 }

Company.Domain/ClassifiedSalaryAgg/ClassifiedSalary.cs

@@ -10,7 +10,6 @@ namespace Company.Domain.ClassifiedSalaryAgg
 {
     public class ClassifiedSalary : EntityBase
     {
-        //test//test
         public ClassifiedSalary(double group1, double group2, double group3, double group4, double group5, double group6, double group7, double group8, double group9, double group10, double group11, double group12, double group13, double group14, double group15, double group16, double group17, double group18, double group19, double group20, DateTime startDate, DateTime endDate, int year)
         {
             Group1 = group1;

Company.Domain/Company.Domain.csproj

@@ -18,8 +18,4 @@
     <Folder Include="CheckoutAgg\ValueObjects\" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="MongoDB.Bson" Version="3.5.0" />
-  </ItemGroup>
-
 </Project>

Company.Domain/ContactUsAgg/ContactUs.cs

@@ -1,26 +0,0 @@
-using _0_Framework.Domain;
-
-namespace Company.Domain.ContactUsAgg;
-
-public class ContactUs:EntityBase
-{
-    public ContactUs(string firstName, string lastName, string email, string phoneNumber, string title, string message)
-    {
-        FirstName = firstName.Trim();
-        LastName = lastName.Trim();
-        Email = email;
-        PhoneNumber = phoneNumber;
-        Title = title;
-        Message = message;
-        FullName = FirstName + " " + LastName;
-    }
-
-    public string FirstName { get; private set; }
-    public string LastName { get; private set; }
-    public string Email { get; private set; }
-    public string PhoneNumber { get; private set; }
-    public string Title { get; private set; }   
-    public string Message { get; private set; }
-    public string FullName { get; private set; }
-    
-}

Company.Domain/ContactUsAgg/IContactUsRepository.cs

@@ -1,8 +0,0 @@
-using _0_Framework.Domain;
-
-namespace Company.Domain.ContactUsAgg;
-
-public interface IContactUsRepository : IRepository<long, ContactUs>
-{
-
-}

Company.Domain/ContarctingPartyAgg/IPersonalContractingPartyRepository.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using _0_Framework.Application;
 using _0_Framework.Domain;
 using AccountManagement.Application.Contracts.Account;
-using System.Threading.Tasks;
 
 namespace Company.Domain.ContarctingPartyAgg;
 
@@ -15,7 +14,7 @@ public interface IPersonalContractingPartyRepository :IRepository<long, Personal
     EditPersonalContractingParty GetDetailsToEdit(long id);
     string GetFullName(long id);
     List<PersonalContractingPartyViewModel> Search(PersonalContractingPartySearchModel searchModel2);
-    int GetLastNewArchiveCode();
+    int GetLastArchiveCode();
 	#region Mahan
 
 	List<string> SearchByName(string name);
@@ -43,37 +42,6 @@ public interface IPersonalContractingPartyRepository :IRepository<long, Personal
 
     #endregion
 
-    /// <summary>
-    /// لیست طرف حساب ها
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    Task<ICollection<ContractingPartyGetListViewModel>> GetList(ContractingPartyGetListSearchModel searchModel);
 
-    /// <summary>
-    /// لیست طرف حساب برای سلکت لیست سرچ
-    /// </summary>
-    /// <param name="search"></param>
-    /// <returns></returns>
-    Task<List<ContractingPartySelectListViewModel>> GetSelectList(string search,long id);
 
-    /// <summary>
-    /// لیستی از شماره ملی یا شناسه ملی بر اساس حقیقی یا حقوقی بودن
-    /// </summary>
-    /// <returns></returns>
-    Task<List<GetContractingPartyNationalCodeOrNationalIdViewModel>> GetNationalCodeOrNationalId();
-
-    /// <summary>
-    /// غیرفعال کردن طرف حساب و زیرمجموعه های آن
-    /// </summary>
-    /// <param name="id"></param>
-    /// <returns></returns>
-    Task<OperationResult<string>> DeactivateWithSubordinates(long id);
-
-    void Remove(PersonalContractingParty entity);
-    Task<GetRealContractingPartyDetailsViewModel> GetRealDetails(long id);
-    Task<GetLegalContractingPartyDetailsViewModel> GetLegalDetails(long id);
-
-    Task<PersonalContractingParty> GetByNationalCode(string nationalCode);
-    Task<PersonalContractingParty> GetByRegisterId(string registerId);
 }

Company.Domain/ContarctingPartyAgg/PersonalContractingParty.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Security.Cryptography.X509Certificates;
 using _0_Framework.Application;
 using _0_Framework.Domain;
-using Company.Domain.ContractingPartyBankAccountsAgg;
 using Company.Domain.empolyerAgg;
 using Company.Domain.RepresentativeAgg;
 
@@ -73,33 +72,17 @@ public class PersonalContractingParty : EntityBase
     /// آیا از طریق ای پی ای احراز هویت شده است
     /// </summary>
     public bool IsAuthenticated { get; private set; }
-    
+
+
     /// <summary>
     /// جنسیت
     /// </summary>
     public Gender Gender { get; private set; }
-
-    /// <summary>
-    /// سمت و صاحب امضاء اوراق (فقط برای طرف حقوقی)
-    /// </summary>
-    public string LegalPosition { get; private set; }
-
-    /// <summary>
-    /// نام مدیر عامل (فقط برای طرف حقوقی)
-    /// </summary>
-    public string CeoFName { get; private set; }
-    
-    /// <summary>
-    /// نام خانوادگی مدیر عامل (فقط برای طرف حقوقی)
-    /// </summary>
-    public string CeoLName { get; private set; }
-    
     #endregion
 
 
     public List<Employer> Employers { get; private set; }
     public Representative Representative { get; set; }
-    public List<ContractingPartyBankAccount> ContractingPartyBankAccounts { get; set; }
 
     public PersonalContractingParty()
     {
@@ -109,8 +92,7 @@ public class PersonalContractingParty : EntityBase
     public PersonalContractingParty(string fName, string lName, string nationalcode, string idNumber,
         /*string legalName,*/ string registerId, string nationalId, string isLegal,
         string phone, string agentPhone, string address,long representativeId,
-        string representativeFullName, int archiveCode, string state,string city,
-        string zone, string sureName,string ceoFName,string ceoLName,string legalPosition=null)
+        string representativeFullName, int archiveCode, string state,string city, string zone, string sureName)
     {
 
         FName = fName;
@@ -136,9 +118,8 @@ public class PersonalContractingParty : EntityBase
         IsActiveString = "true";
         IsBlock = "false";
         BlockTimes = 0;
-        LegalPosition = legalPosition;
-        CeoFName = ceoFName;
-        CeoLName = ceoLName;
+                
+
     }
 
 
@@ -168,7 +149,7 @@ public class PersonalContractingParty : EntityBase
     }
 
     public void EditLegal(string lName, string registerId, string nationalId, string phone, string agentPhone, string address, long representativeId, string representativeFullName, int archiveCode, 
-        string state, string city, string zone, string sureName,string legalPosition = null)
+        string state, string city, string zone, string sureName)
     {
 
         LName = lName;
@@ -185,8 +166,6 @@ public class PersonalContractingParty : EntityBase
         State = state;
         City = city;
         Zone = zone;
-        if (legalPosition != null)
-            LegalPosition = legalPosition;
 
 
     }
@@ -222,8 +201,7 @@ public class PersonalContractingParty : EntityBase
         IsAuthenticated = true;
     }
 
-    public void Authentication(string fName, string lName, string fatherName,string idNumber,
-        string idNumberSeri, string idNumberSerial, string dateOfBirth, Gender gender,string phone)
+    public void Authentication(string fName, string lName, string fatherName,string idNumber, string idNumberSeri, string idNumberSerial, string dateOfBirth, Gender gender)
     {
         this.FName = fName;
         this.LName = lName;
@@ -234,31 +212,5 @@ public class PersonalContractingParty : EntityBase
         this.IdNumber = idNumber;
         this.Gender = gender;
         this.IsAuthenticated = true;
-        Phone = phone;
-    }
-
-    public void LegalAuthentication(string fName, string lName, string fatherName,string idNumber, string idNumberSeri,
-        string idNumberSerial, string dateOfBirth, Gender gender,string phone)
-    {
-        CeoFName = fName;
-        CeoLName = lName;
-        this.FatherName = fatherName;
-        this.IdNumberSeri = idNumberSeri;
-        this.IdNumberSerial = idNumberSerial;
-        this.DateOfBirth = !string.IsNullOrWhiteSpace(dateOfBirth) ? dateOfBirth.ToGeorgianDateTime() : null;
-        this.IdNumber = idNumber;
-        this.Gender = gender;
-        this.IsAuthenticated = true;
-        Phone = phone;
-    }
-
-    public void RegisterComplete(string fatherName, string idNumberSeri, string idNumberSerial, DateTime dateOfBirth, Gender gender)
-    {
-        this.FatherName = fatherName;
-        this.IdNumberSeri = idNumberSeri;
-        this.IdNumberSerial = idNumberSerial;
-        this.DateOfBirth = dateOfBirth;
-        this.Gender = gender;
-        this.IsAuthenticated = true;
     }
 }

Company.Domain/ContractAgg/Contract.cs

@@ -17,7 +17,7 @@ public class Contract : EntityBase
     public Contract(long personnelCode, long employeeId, long employerId, 
         long workshopIds, long yearlySalaryId, DateTime contarctStart, DateTime contractEnd, string dayliWage,
         string archiveCode, DateTime getWorkDate, DateTime setContractDate, string jobType,
-        string contractType, string workshopAddress1, string workshopAddress2, string consumableItems, long jobTypeId, string housingAllowance, string agreementSalary, string workingHoursWeekly, string familyAllowance, string contractPeriod, double dailySalaryAffected, double baseYearAffected, double dailySalaryUnAffected, double baseYearUnAffected, bool hasManualDailyWage, string dailyWageType)
+        string contractType, string workshopAddress1, string workshopAddress2, string consumableItems, long jobTypeId, string housingAllowance, string agreementSalary, string workingHoursWeekly, string familyAllowance, string contractPeriod)
     {
         PersonnelCode = personnelCode;
         EmployeeId = employeeId;
@@ -45,19 +45,6 @@ public class Contract : EntityBase
         WorkingHoursWeekly = workingHoursWeekly;
         FamilyAllowance = familyAllowance;
         ContractPeriod = contractPeriod;
-        
-        //پراپرتی های جدید برای دستمزد دلخواه
-        #region NewManualDailyWage
-        DailySalaryAffected = dailySalaryAffected;
-        BaseYearAffected = baseYearAffected;
-        DailySalaryUnAffected = dailySalaryUnAffected;
-        BaseYearUnAffected = baseYearUnAffected;
-        HasManualDailyWage = hasManualDailyWage;
-        DailyWageType = dailyWageType;
-
-        #endregion
-
-
         Signature = "0";
 
 
@@ -78,42 +65,7 @@ public class Contract : EntityBase
     public DateTime SetContractDate { get; private set; }
     public string JobType { get; private set; }
     public string ContractType { get; private set; }
-    /// <summary>
-    /// مزد تجمیعی یعد از تاثیر ساعت کار
-    /// </summary>
     public string DayliWage { get; private set; }
-
-    /// <summary>
-    ///  دستمزد روزانه خام بعد از تاثیر ساعت کار
-    /// </summary>
-    public double DailySalaryAffected { get; set; }
-
-    /// <summary>
-    /// پایه سنوات بعد از تاثیر ساعت کار
-    /// </summary>
-    public double BaseYearAffected { get; set; }
-
-
-    /// <summary>
-    /// دستمزد روزانه قبل از تاثیر ساعت کار
-    /// </summary>
-    public double DailySalaryUnAffected { get; set; }
-
-    /// <summary>
-    /// پایه سنوات قبل از تاثیر ساعت کار
-    /// </summary>
-    public double BaseYearUnAffected { get; set; }
-
-    /// <summary>
-    /// آیا دستمزد روزانه دستی وارد شده است؟
-    /// </summary>
-    public bool HasManualDailyWage { get; set; }
-
-    /// <summary>
-    /// نوع دستمزد انتخاب شده
-    /// </summary>
-    public string DailyWageType { get; set; }
-
     public string IsActiveString { get; private set; }
     public string ArchiveCode { get; private set; }
     public string WorkshopAddress1 { get; private set; }
@@ -137,7 +89,6 @@ public class Contract : EntityBase
 
     public Contract()
     {
-     
         WorkingHoursList = new List<WorkingHours>();
     }
     public void Edit(long pesrsonnelCode, long employeeId, long employerId, long workshopId, long yearlySalaryId,

Company.Domain/ContractAgg/IContractRepository.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using _0_Framework.Application;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.Contract;
@@ -10,24 +9,6 @@ namespace Company.Domain.ContractAgg;
 
 public interface IContractRepository : IRepository<long, Contract>
 {
-    /// <summary>
-    /// دریافت مزد ارتقاء یافته
-    /// </summary>
-    /// <param name="workshopId"></param>
-    /// <param name="employeeId"></param>
-    /// <param name="yearlySalaryId"></param>
-    /// <returns></returns>
-    Task<double> GetManualDailWage(long workshopId, long employeeId, long yearlySalaryId, DateTime contractStart);
-
-    /// <summary>
-    /// دریافت لیست مزد ارتقاء یافته
-    /// </summary>
-    /// <param name="workshopId"></param>
-    /// <param name="employeeId"></param>
-    /// <param name="contractStart"></param>
-    /// <returns></returns>
-    Task<UpgradeManualDailyWageModel> GetManualDailWageList(long workshopId, long employeeId,
-        DateTime contractStart);
     EditContract GetDetails(long id);
     EditContract GetContractByStartEnd(DateTime start, DateTime end, long workshopId, long employeeId);
 

Company.Domain/ContractingPartyBankAccountsAgg/ContractingPartyBankAccount.cs

@@ -1,27 +0,0 @@
-using _0_Framework.Domain;
-using Company.Domain.ContarctingPartyAgg;
-
-namespace Company.Domain.ContractingPartyBankAccountsAgg;
-
-public class ContractingPartyBankAccount : EntityBase
-{
-    public long ContractingPartyId { get; private set; }
-
-    public PersonalContractingParty ContractingParty { get; private set; }
-    public string CardNumber { get; private set; }
-    public string AccountHolderName { get; private set; }
-    public string AccountNumber { get; private set; }
-    public string IBan { get; private set; }
-    public bool IsAuth { get; private set; }
-
-    public ContractingPartyBankAccount(long contractingPartyId, string cardNumber, string accountHolderName,
-        string accountNumber, string iBan , bool isAuth)
-    {
-        ContractingPartyId = contractingPartyId;
-        CardNumber = cardNumber;
-        AccountHolderName = accountHolderName;
-        AccountNumber = accountNumber;
-        IBan = iBan;
-        IsAuth = isAuth;
-    }
-}

Company.Domain/ContractingPartyBankAccountsAgg/IContractingPartyBankAccountsRepository.cs

@@ -1,19 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using _0_Framework.Application;
-using _0_Framework.Domain;
-using CompanyManagment.App.Contracts.ContractingPartyBankAccounts;
-
-namespace Company.Domain.ContractingPartyBankAccountsAgg;
-
-public interface IContractingPartyBankAccountsRepository:IRepository<long,ContractingPartyBankAccount>
-{
-    Task<GetContractingPartyBankAccountViewModel> GetList(ContractingPartyBankAccountSearchModel searchModel);
-    Task<List<string>> ContractingPartyOrAccountHolderNameSelectList(string search, string selected);
-    Task<List<string>> IBanSelectList(string search, string selected);
-
-    Task<List<string>> CardNumberSelectList(string search, string selected);
-    Task<List<string>> AccountNumberSelectList(string search, string selected);
-    Task<List<string>> GetAccountHolderNameSelectList(string search, string selected);
-    Task<List<string>> ContractingPartyNamesSelectList(string search, string selected);
-}

Company.Domain/CustomizeCheckoutAgg/CustomizeCheckout.cs

@@ -374,13 +374,6 @@ public class CustomizeCheckout : EntityBase
         TotalPayment = TotalPayment - previousAmount + newAmount;
     }
 
-    /// <summary>
-    /// آیا مغایرت مبلغ دارد
-    /// </summary>
-    public bool HasAmountConflict { get; private set; }
 
-    public void SetHasAmountConflict(bool hasConflict)
-    {
-        HasAmountConflict = hasConflict;
-    }
+
 }

Company.Domain/CustomizeCheckoutTempAgg/CustomizeCheckoutTemp.cs

@@ -377,16 +377,4 @@ public class CustomizeCheckoutTemp : EntityBase
     {
         TotalPayment = TotalPayment - previousAmount + newAmount;
     }
-	
-    /// <summary>
-    /// آیا مغایرت مبلغ دارد
-    /// </summary>
-    public bool HasAmountConflict { get; private set; }
-
-    
-
-    public void SetHasAmountConflict(bool hasConflict)
-    {
-        HasAmountConflict = hasConflict;
-    }
 }

Company.Domain/CustomizeWorkshopEmployeeSettingsAgg/Entities/CustomizeWorkshopEmployeeSettings.cs

@@ -27,13 +27,12 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
         FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit, long employeeId,
         long workshopId, double salary, long customizeWorkshopGroupSettingId,
         ICollection<CustomizeWorkshopEmployeeSettingsShift> customizeWorkshopEmployeeSettingsShifts,
-        HolidayWork holidayWork, IrregularShift irregularShift, WorkshopShiftStatus workshopShiftStatus, BreakTime breakTime,
-        int leavePermittedDays, ICollection<CustomizeRotatingShift> rotatingShifts
-        , List<WeeklyOffDay> weeklyOffDays) :
+        FridayWork fridayWork,
+        HolidayWork holidayWork, IrregularShift irregularShift, WorkshopShiftStatus workshopShiftStatus, BreakTime breakTime, int leavePermittedDays, ICollection<CustomizeRotatingShift> rotatingShifts) :
         base(fridayPay, overTimePay,
         baseYearsPay, bonusesPay, nightWorkPay,
         marriedAllowance, shiftPay, familyAllowance, leavePay, insuranceDeduction, fineAbsenceDeduction, lateToWork,
-        earlyExit, holidayWork, breakTime, leavePermittedDays,weeklyOffDays)
+        earlyExit, fridayWork, holidayWork, breakTime, leavePermittedDays)
     {
         CustomizeWorkshopGroupSettingId = customizeWorkshopGroupSettingId;
         IsSettingChanged = false;
@@ -83,6 +82,7 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
     /// <param name="fineAbsenceDeduction">جریمه غیبت</param>
     /// <param name="lateToWork">تاخیر در ورود</param>
     /// <param name="earlyExit">تعجیل درخروج</param>
+    /// <param name="fridayWork">آیا در روز های جمعه موظف به کار است</param>
     /// <param name="holidayWork">آیا در تعطیلات رسمی موظف به کار است</param>
     /// <param name="workshopIrregularShifts">نوع شیفت کاری </param>
     /// <param name="workshopShiftStatus">آیا شیفت منظم است یا نا منظم</param>
@@ -91,7 +91,7 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
         NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, ShiftPay shiftPay,
         FamilyAllowance familyAllowance, LeavePay leavePay, InsuranceDeduction insuranceDeduction,
         FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit,
-        HolidayWork holidayWork, IrregularShift irregularShift, bool isSettingChange, int leavePermittedDays)
+        FridayWork fridayWork, HolidayWork holidayWork, IrregularShift irregularShift, bool isSettingChange, int leavePermittedDays)
     {
         SetValueObjects(fridayPay, overTimePay, baseYearsPay, bonusesPay
             , nightWorkPay, marriedAllowance, shiftPay, familyAllowance, leavePay, insuranceDeduction, fineAbsenceDeduction,
@@ -99,6 +99,7 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
 
         Salary = salary;
         IsSettingChanged = isSettingChange;
+        FridayWork = fridayWork;
         HolidayWork = holidayWork;
         LeavePermittedDays = leavePermittedDays;
     }
@@ -111,8 +112,8 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
     public void SimpleEdit(
         ICollection<CustomizeWorkshopEmployeeSettingsShift> employeeSettingsShift,
         IrregularShift irregularShift,
-        WorkshopShiftStatus workshopShiftStatus, BreakTime breakTime, bool isShiftChange,HolidayWork holidayWork,
-        ICollection<CustomizeRotatingShift> rotatingShifts,List<WeeklyOffDay> weeklyOffDays)
+        WorkshopShiftStatus workshopShiftStatus, BreakTime breakTime, bool isShiftChange, FridayWork fridayWork, HolidayWork holidayWork,
+        ICollection<CustomizeRotatingShift> rotatingShifts)
     {
         BreakTime = new BreakTime(breakTime.HasBreakTimeValue, breakTime.BreakTimeValue);
         IsShiftChanged = isShiftChange;
@@ -125,8 +126,9 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
             : new IrregularShift(irregularShift.StartTime, irregularShift.EndTime, irregularShift.WorkshopIrregularShifts);
 
         CustomizeRotatingShifts = workshopShiftStatus == WorkshopShiftStatus.Rotating ? rotatingShifts : [];
+
+        FridayWork = fridayWork;
         HolidayWork = holidayWork;
-        WeeklyOffDays = weeklyOffDays;
     }
 
 
@@ -267,6 +269,4 @@ public class CustomizeWorkshopEmployeeSettings : BaseCustomizeEntity
 
         IsShiftChanged = isShiftChange;
     }
-
-   
 }

Company.Domain/CustomizeWorkshopGroupSettingsAgg/Entities/CustomizeWorkshopGroupSettings.cs

@@ -17,344 +17,340 @@ namespace Company.Domain.CustomizeWorkshopGroupSettingsAgg.Entities;
 
 public class CustomizeWorkshopGroupSettings : BaseCustomizeEntity
 {
-	public CustomizeWorkshopGroupSettings()
-	{
+    public CustomizeWorkshopGroupSettings()
+    {
 
-	}
+    }
 
-	public CustomizeWorkshopGroupSettings(string groupName, double salary,
-		long customizeWorkshopSettingId, ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts,
-		 FridayPay fridayPay, OverTimePay overTimePay, BaseYearsPay baseYearsPay,
-		BonusesPay bonusesPay, NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, ShiftPay shiftPay,
-		FamilyAllowance familyAllowance, LeavePay leavePay, InsuranceDeduction insuranceDeduction,
-		FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit,
-		HolidayWork holidayWork, BreakTime breakTime, WorkshopShiftStatus workshopShiftStatus, IrregularShift irregularShift, int leavePermittedDays,
-		ICollection<CustomizeRotatingShift> rotatingShifts, List<WeeklyOffDay> weeklyOffDays) :
-		base(fridayPay, overTimePay, baseYearsPay, bonusesPay, nightWorkPay,
-		marriedAllowance, shiftPay, familyAllowance, leavePay, insuranceDeduction, fineAbsenceDeduction, lateToWork,
-		earlyExit, holidayWork, breakTime, leavePermittedDays, weeklyOffDays)
-	{
-		GroupName = groupName;
-		Salary = salary;
-		CustomizeWorkshopSettingId = customizeWorkshopSettingId;
-		GuardGroupShifts(customizeWorkshopGroupSettingsShifts);
-		WorkshopShiftStatus = workshopShiftStatus;
+    public CustomizeWorkshopGroupSettings(string groupName, double salary,
+        long customizeWorkshopSettingId, ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts,
+         FridayPay fridayPay, OverTimePay overTimePay, BaseYearsPay baseYearsPay,
+        BonusesPay bonusesPay, NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, ShiftPay shiftPay,
+        FamilyAllowance familyAllowance, LeavePay leavePay, InsuranceDeduction insuranceDeduction,
+        FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit, FridayWork fridayWork,
+        HolidayWork holidayWork, BreakTime breakTime, WorkshopShiftStatus workshopShiftStatus, IrregularShift irregularShift, int leavePermittedDays, ICollection<CustomizeRotatingShift> rotatingShifts) :
+        base(fridayPay, overTimePay, baseYearsPay, bonusesPay, nightWorkPay,
+        marriedAllowance, shiftPay, familyAllowance, leavePay, insuranceDeduction, fineAbsenceDeduction, lateToWork,
+        earlyExit, fridayWork, holidayWork, breakTime, leavePermittedDays)
+    {
+        GroupName = groupName;
+        Salary = salary;
+        CustomizeWorkshopSettingId = customizeWorkshopSettingId;
+        GuardGroupShifts(customizeWorkshopGroupSettingsShifts);
+        WorkshopShiftStatus = workshopShiftStatus;
 
-		CustomizeRotatingShifts = workshopShiftStatus == WorkshopShiftStatus.Rotating ? rotatingShifts : [];
+        CustomizeRotatingShifts = workshopShiftStatus == WorkshopShiftStatus.Rotating ? rotatingShifts : [];
 
-		CustomizeWorkshopGroupSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopGroupSettingsShifts : [];
+        CustomizeWorkshopGroupSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopGroupSettingsShifts : [];
 
-		IrregularShift = workshopShiftStatus == WorkshopShiftStatus.Regular ?
-			new IrregularShift(new TimeOnly(), new TimeOnly(), WorkshopIrregularShifts.None)
-			: new IrregularShift(irregularShift.StartTime, irregularShift.EndTime, irregularShift.WorkshopIrregularShifts);
-	}
+        IrregularShift = workshopShiftStatus == WorkshopShiftStatus.Regular ?
+            new IrregularShift(new TimeOnly(), new TimeOnly(), WorkshopIrregularShifts.None)
+            : new IrregularShift(irregularShift.StartTime, irregularShift.EndTime, irregularShift.WorkshopIrregularShifts);
+    }
 
-	private void GuardGroupShifts(ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts)
-	{
-		if (customizeWorkshopGroupSettingsShifts.Count >= 4)
-		{
-			throw new InvalidDataException("شما نمیتوانید بیشتر از سه ساعت کاری در کارگاه بگذارید");
-		}
-	}
+    private void GuardGroupShifts(ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts)
+    {
+        if (customizeWorkshopGroupSettingsShifts.Count >= 4)
+        {
+            throw new InvalidDataException("شما نمیتوانید بیشتر از سه ساعت کاری در کارگاه بگذارید");
+        }
+    }
 
-	public string GroupName { get; private set; }
-	public double Salary { get; private set; }
-	public long CustomizeWorkshopSettingId { get; private set; }
-	public WorkshopShiftStatus WorkshopShiftStatus { get; private set; }
-	public bool MainGroup { get; private set; }
-	public bool IsShiftChange { get; private set; }
-	public bool IsSettingChange { get; private set; }
-	public IrregularShift IrregularShift { get; set; }
-	public ICollection<CustomizeWorkshopGroupSettingsShift> CustomizeWorkshopGroupSettingsShifts { get; set; }
-	public ICollection<CustomizeWorkshopEmployeeSettings> CustomizeWorkshopEmployeeSettingsCollection { get; set; }
-	public ICollection<CustomizeRotatingShift> CustomizeRotatingShifts { get; set; }
-	public CustomizeWorkshopSettings CustomizeWorkshopSettings { get; set; }
+    public string GroupName { get; private set; }
+    public double Salary { get; private set; }
+    public long CustomizeWorkshopSettingId { get; private set; }
+    public WorkshopShiftStatus WorkshopShiftStatus { get; private set; }
+    public bool MainGroup { get; private set; }
+    public bool IsShiftChange { get; private set; }
+    public bool IsSettingChange { get; private set; }
+    public IrregularShift IrregularShift { get; set; }
+    public ICollection<CustomizeWorkshopGroupSettingsShift> CustomizeWorkshopGroupSettingsShifts { get; set; }
+    public ICollection<CustomizeWorkshopEmployeeSettings> CustomizeWorkshopEmployeeSettingsCollection { get; set; }
+    public ICollection<CustomizeRotatingShift> CustomizeRotatingShifts { get; set; }
+    public CustomizeWorkshopSettings CustomizeWorkshopSettings { get; set; }
 
 
 
-	public CustomizeWorkshopGroupSettings CreateMainGroup(FridayPay fridayPay,
-		OverTimePay overTimePay, BaseYearsPay baseYearsPay, BonusesPay bonusesPay, ShiftPay shiftPay,
-		NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, FamilyAllowance familyAllowance,
-		LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction,
-		LateToWork lateToWork, EarlyExit earlyExit,
-		ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts,
-		HolidayWork holidayWork, IrregularShift irregularShift, ICollection<CustomizeRotatingShift> rotatingShifts,
-		WorkshopShiftStatus workshopShiftStatus, long customizeWorkshopSettingId, BreakTime breakTime, int leavePermittedDays)
-	{
-		GuardGroupShifts(customizeWorkshopGroupSettingsShifts);
-		GroupName = "اصلی";
-		Salary = 0;
-		FridayPay = fridayPay;
-		OverTimePay = overTimePay;
-		BaseYearsPay = baseYearsPay;
-		BonusesPay = bonusesPay;
-		NightWorkPay = nightWorkPay;
-		MarriedAllowance = marriedAllowance;
-		ShiftPay = shiftPay;
-		FamilyAllowance = familyAllowance;
-		LeavePay = leavePay;
-		InsuranceDeduction = insuranceDeduction;
-		FineAbsenceDeduction = fineAbsenceDeduction;
-		LateToWork = lateToWork;
-		EarlyExit = earlyExit;
-		HolidayWork = holidayWork;
-		LeavePermittedDays = leavePermittedDays;
-		CustomizeWorkshopGroupSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopGroupSettingsShifts : [];
+    public CustomizeWorkshopGroupSettings CreateMainGroup(FridayPay fridayPay,
+        OverTimePay overTimePay, BaseYearsPay baseYearsPay, BonusesPay bonusesPay, ShiftPay shiftPay,
+        NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, FamilyAllowance familyAllowance,
+        LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction,
+        LateToWork lateToWork, EarlyExit earlyExit,
+        ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts, FridayWork fridayWork,
+        HolidayWork holidayWork, IrregularShift irregularShift, ICollection<CustomizeRotatingShift> rotatingShifts,
+        WorkshopShiftStatus workshopShiftStatus, long customizeWorkshopSettingId, BreakTime breakTime, int leavePermittedDays)
+    {
+        GuardGroupShifts(customizeWorkshopGroupSettingsShifts);
+        GroupName = "اصلی";
+        Salary = 0;
+        FridayPay = fridayPay;
+        OverTimePay = overTimePay;
+        BaseYearsPay = baseYearsPay;
+        BonusesPay = bonusesPay;
+        NightWorkPay = nightWorkPay;
+        MarriedAllowance = marriedAllowance;
+        ShiftPay = shiftPay;
+        FamilyAllowance = familyAllowance;
+        LeavePay = leavePay;
+        InsuranceDeduction = insuranceDeduction;
+        FineAbsenceDeduction = fineAbsenceDeduction;
+        LateToWork = lateToWork;
+        EarlyExit = earlyExit;
+        FridayWork = fridayWork;
+        HolidayWork = holidayWork;
+        LeavePermittedDays = leavePermittedDays;
+        CustomizeWorkshopGroupSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopGroupSettingsShifts : [];
 
-		CustomizeRotatingShifts = workshopShiftStatus == WorkshopShiftStatus.Rotating ? rotatingShifts : [];
+        CustomizeRotatingShifts = workshopShiftStatus == WorkshopShiftStatus.Rotating ? rotatingShifts : [];
 
-		IrregularShift = workshopShiftStatus == WorkshopShiftStatus.Regular ?
-			new IrregularShift(new TimeOnly(), new TimeOnly(), WorkshopIrregularShifts.None)
-			: new IrregularShift(irregularShift.StartTime, irregularShift.EndTime, irregularShift.WorkshopIrregularShifts);
-		WorkshopShiftStatus = workshopShiftStatus;
-		CustomizeWorkshopSettingId = customizeWorkshopSettingId;
-		MainGroup = true;
-		BreakTime = breakTime;
-		CustomizeWorkshopEmployeeSettingsCollection = [];
+        IrregularShift = workshopShiftStatus == WorkshopShiftStatus.Regular ?
+            new IrregularShift(new TimeOnly(), new TimeOnly(), WorkshopIrregularShifts.None)
+            : new IrregularShift(irregularShift.StartTime, irregularShift.EndTime, irregularShift.WorkshopIrregularShifts);
+        WorkshopShiftStatus = workshopShiftStatus;
+        CustomizeWorkshopSettingId = customizeWorkshopSettingId;
+        MainGroup = true;
+        BreakTime = breakTime;
+        CustomizeWorkshopEmployeeSettingsCollection = [];
 
-		return this;
+        return this;
 
-	}
+    }
 
 
 
-	public void EditAndOverwriteOnEmployees(string groupName, double salary, IEnumerable<long> employeeIds,
-		FridayPay fridayPay,
-		OverTimePay overTimePay, BaseYearsPay baseYearsPay, BonusesPay bonusesPay, ShiftPay shiftPay,
-		NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, FamilyAllowance familyAllowance,
-		LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction,
-		LateToWork lateToWork, EarlyExit earlyExit, HolidayWork holidayWork, bool isSettingChange, int leavePermittedDays)
-	{
-		GroupName = groupName;
-		Salary = salary;
-		FridayPay = fridayPay;
-		OverTimePay = overTimePay;
-		BaseYearsPay = baseYearsPay;
-		BonusesPay = bonusesPay;
-		NightWorkPay = nightWorkPay;
-		MarriedAllowance = marriedAllowance;
-		ShiftPay = shiftPay;
-		FamilyAllowance = familyAllowance;
-		LeavePay = leavePay;
-		InsuranceDeduction = insuranceDeduction;
-		FineAbsenceDeduction = fineAbsenceDeduction;
-		LateToWork = lateToWork;
-		EarlyExit = earlyExit;
-		HolidayWork = holidayWork;
-		IsSettingChange = isSettingChange;
-		LeavePermittedDays = leavePermittedDays;
+    public void EditAndOverwriteOnEmployees(string groupName, double salary, IEnumerable<long> employeeIds,
+        FridayPay fridayPay,
+        OverTimePay overTimePay, BaseYearsPay baseYearsPay, BonusesPay bonusesPay, ShiftPay shiftPay,
+        NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, FamilyAllowance familyAllowance,
+        LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction,
+        LateToWork lateToWork, EarlyExit earlyExit, FridayWork fridayWork, HolidayWork holidayWork, bool isSettingChange, int leavePermittedDays)
+    {
+        GroupName = groupName;
+        Salary = salary;
+        FridayPay = fridayPay;
+        OverTimePay = overTimePay;
+        BaseYearsPay = baseYearsPay;
+        BonusesPay = bonusesPay;
+        NightWorkPay = nightWorkPay;
+        MarriedAllowance = marriedAllowance;
+        ShiftPay = shiftPay;
+        FamilyAllowance = familyAllowance;
+        LeavePay = leavePay;
+        InsuranceDeduction = insuranceDeduction;
+        FineAbsenceDeduction = fineAbsenceDeduction;
+        LateToWork = lateToWork;
+        EarlyExit = earlyExit;
+        FridayWork = fridayWork;
+        HolidayWork = holidayWork;
+        IsSettingChange = isSettingChange;
+        LeavePermittedDays = leavePermittedDays;
 
 
-		var employeeSettingsShift = CustomizeWorkshopGroupSettingsShifts
-			.Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
+        var employeeSettingsShift = CustomizeWorkshopGroupSettingsShifts
+            .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
 
-		var permittedToOverWrite = CustomizeWorkshopEmployeeSettingsCollection.Where(x => employeeIds.Contains(x.EmployeeId));
-		foreach (var item in permittedToOverWrite)
-		{
-			item.EditEmployees(Salary, FridayPay, OverTimePay, BaseYearsPay, BonusesPay
-				, NightWorkPay, MarriedAllowance, ShiftPay, FamilyAllowance, LeavePay, InsuranceDeduction, FineAbsenceDeduction,
-				LateToWork, EarlyExit, HolidayWork, IrregularShift, false, leavePermittedDays);
-		}
-	}
-	public void EditAndOverwriteOnAllEmployees(string groupName, double salary,
-		FridayPay fridayPay,
-		OverTimePay overTimePay, BaseYearsPay baseYearsPay, BonusesPay bonusesPay, ShiftPay shiftPay,
-		NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, FamilyAllowance familyAllowance,
-		LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction,
-		LateToWork lateToWork, EarlyExit earlyExit, HolidayWork holidayWork, bool isSettingChange, int leavePermittedDays)
-	{
-		SetValueObjects(fridayPay, overTimePay, baseYearsPay, bonusesPay
-			, nightWorkPay, marriedAllowance, shiftPay, familyAllowance, leavePay, insuranceDeduction, fineAbsenceDeduction,
-			lateToWork, earlyExit);
-		GroupName = groupName;
-		Salary = salary;
-		HolidayWork = holidayWork;
-		IsSettingChange = isSettingChange;
-		LeavePermittedDays = leavePermittedDays;
+        var permittedToOverWrite = CustomizeWorkshopEmployeeSettingsCollection.Where(x => employeeIds.Contains(x.EmployeeId));
+        foreach (var item in permittedToOverWrite)
+        {
+            item.EditEmployees(Salary, FridayPay, OverTimePay, BaseYearsPay, BonusesPay
+                , NightWorkPay, MarriedAllowance, ShiftPay, FamilyAllowance, LeavePay, InsuranceDeduction, FineAbsenceDeduction,
+                LateToWork, EarlyExit, FridayWork, HolidayWork, IrregularShift, false, leavePermittedDays);
+        }
+    }
+    public void EditAndOverwriteOnAllEmployees(string groupName, double salary,
+        FridayPay fridayPay,
+        OverTimePay overTimePay, BaseYearsPay baseYearsPay, BonusesPay bonusesPay, ShiftPay shiftPay,
+        NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, FamilyAllowance familyAllowance,
+        LeavePay leavePay, InsuranceDeduction insuranceDeduction, FineAbsenceDeduction fineAbsenceDeduction,
+        LateToWork lateToWork, EarlyExit earlyExit, FridayWork fridayWork, HolidayWork holidayWork, bool isSettingChange, int leavePermittedDays)
+    {
+        SetValueObjects(fridayPay, overTimePay, baseYearsPay, bonusesPay
+            , nightWorkPay, marriedAllowance, shiftPay, familyAllowance, leavePay, insuranceDeduction, fineAbsenceDeduction,
+            lateToWork, earlyExit);
+        GroupName = groupName;
+        Salary = salary;
+        FridayWork = fridayWork;
+        HolidayWork = holidayWork;
+        IsSettingChange = isSettingChange;
+        LeavePermittedDays = leavePermittedDays;
 
 
-		var employeeSettingsShift = CustomizeWorkshopGroupSettingsShifts
-			.Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
+        var employeeSettingsShift = CustomizeWorkshopGroupSettingsShifts
+            .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
 
-		foreach (var item in CustomizeWorkshopEmployeeSettingsCollection)
-		{
-			item.EditEmployees(Salary, FridayPay, OverTimePay, BaseYearsPay, BonusesPay
-				, NightWorkPay, MarriedAllowance, ShiftPay, FamilyAllowance, LeavePay, InsuranceDeduction, FineAbsenceDeduction,
-				LateToWork, EarlyExit, HolidayWork, IrregularShift, false, leavePermittedDays);
-		}
-	}
+        foreach (var item in CustomizeWorkshopEmployeeSettingsCollection)
+        {
+            item.EditEmployees(Salary, FridayPay, OverTimePay, BaseYearsPay, BonusesPay
+                , NightWorkPay, MarriedAllowance, ShiftPay, FamilyAllowance, LeavePay, InsuranceDeduction, FineAbsenceDeduction,
+                LateToWork, EarlyExit, FridayWork, HolidayWork, IrregularShift, false, leavePermittedDays);
+        }
+    }
 
-	public void RemoveEmployeeFromGroup(long employeeId)
-	{
-		var currentItem = CustomizeWorkshopEmployeeSettingsCollection.FirstOrDefault(x => x.EmployeeId == employeeId);
-		if (currentItem != null)
-			CustomizeWorkshopEmployeeSettingsCollection.Remove(currentItem);
-	}
+    public void RemoveEmployeeFromGroup(long employeeId)
+    {
+        var currentItem = CustomizeWorkshopEmployeeSettingsCollection.FirstOrDefault(x => x.EmployeeId == employeeId);
+        if (currentItem != null)
+            CustomizeWorkshopEmployeeSettingsCollection.Remove(currentItem);
+    }
 
-	public void EditSimpleAndOverwriteOnEmployee(string groupName, IEnumerable<long> employeeIds,
-		ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts, WorkshopShiftStatus workshopShiftStatus,
-		IrregularShift irregularShift, BreakTime breakTime, bool isShiftChange, HolidayWork holidayWork, ICollection<CustomizeRotatingShift> rotatingShifts, List<WeeklyOffDay> weeklyOffDays)
-	{
-		GroupName = groupName;
-		CustomizeWorkshopGroupSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopGroupSettingsShifts : [];
-		WorkshopShiftStatus = workshopShiftStatus;
+    public void EditSimpleAndOverwriteOnEmployee(string groupName, IEnumerable<long> employeeIds,
+        ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts, WorkshopShiftStatus workshopShiftStatus,
+        IrregularShift irregularShift, BreakTime breakTime, bool isShiftChange, FridayWork fridayWork, HolidayWork holidayWork, ICollection<CustomizeRotatingShift> rotatingShifts)
+    {
+        GroupName = groupName;
+        CustomizeWorkshopGroupSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopGroupSettingsShifts : [];
+        WorkshopShiftStatus = workshopShiftStatus;
 
-		IrregularShift = workshopShiftStatus == WorkshopShiftStatus.Regular ?
-			new IrregularShift(new TimeOnly(), new TimeOnly(), WorkshopIrregularShifts.None)
-			: new IrregularShift(irregularShift.StartTime, irregularShift.EndTime, irregularShift.WorkshopIrregularShifts);
-		CustomizeRotatingShifts = workshopShiftStatus == WorkshopShiftStatus.Rotating ? rotatingShifts : [];
+        IrregularShift = workshopShiftStatus == WorkshopShiftStatus.Regular ?
+            new IrregularShift(new TimeOnly(), new TimeOnly(), WorkshopIrregularShifts.None)
+            : new IrregularShift(irregularShift.StartTime, irregularShift.EndTime, irregularShift.WorkshopIrregularShifts);
+        CustomizeRotatingShifts = workshopShiftStatus == WorkshopShiftStatus.Rotating ? rotatingShifts : [];
 
 
-		BreakTime = new BreakTime(breakTime.HasBreakTimeValue, breakTime.BreakTimeValue);
-		IsShiftChange = isShiftChange;
+        BreakTime = new BreakTime(breakTime.HasBreakTimeValue, breakTime.BreakTimeValue);
+        IsShiftChange = isShiftChange;
+        FridayWork = fridayWork;
+        HolidayWork = holidayWork;
 
-		HolidayWork = holidayWork;
+        //var employeeSettingsShift = customizeWorkshopGroupSettingsShifts
+        // .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
+        if (isShiftChange)
+        {
 
-		WeeklyOffDays = weeklyOffDays;
+        }
 
-		//var employeeSettingsShift = customizeWorkshopGroupSettingsShifts
-		// .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
-		if (isShiftChange)
-		{
+        var permittedToOverWrite = CustomizeWorkshopEmployeeSettingsCollection.Where(x => employeeIds.Contains(x.EmployeeId));
 
-		}
+        foreach (var item in permittedToOverWrite)
+        {
+            var newRotatingShifts = CustomizeRotatingShifts.Select(x => new CustomizeRotatingShift(x.StartTime, x.EndTime))
+                .ToList();
+            item.SimpleEdit(customizeWorkshopGroupSettingsShifts
+                .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList(),
+                IrregularShift, WorkshopShiftStatus, BreakTime, false, FridayWork, HolidayWork, newRotatingShifts);
+        }
 
-		var permittedToOverWrite = CustomizeWorkshopEmployeeSettingsCollection.Where(x => employeeIds.Contains(x.EmployeeId));
+    }
 
-		foreach (var item in permittedToOverWrite)
-		{
-			var employeeWeeklyOffDays = WeeklyOffDays.Select(x => new WeeklyOffDay(x.DayOfWeek)).ToList();
-			var newRotatingShifts = CustomizeRotatingShifts.Select(x => new CustomizeRotatingShift(x.StartTime, x.EndTime))
-				.ToList();
-			item.SimpleEdit(customizeWorkshopGroupSettingsShifts
-				.Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList(),
-				IrregularShift, WorkshopShiftStatus, BreakTime, false, HolidayWork, newRotatingShifts, employeeWeeklyOffDays);
-		}
+    public void EditSimpleAndOverwriteOnAllEmployees(string groupName,
+        ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts,
+        WorkshopShiftStatus workshopShiftStatus, IrregularShift irregularShift, BreakTime breakTime, bool isShiftChange,
+        FridayWork fridayWork, HolidayWork holidayWork, ICollection<CustomizeRotatingShift> rotatingShifts)
+    {
+        GroupName = groupName;
+        CustomizeWorkshopGroupSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopGroupSettingsShifts : [];
+        WorkshopShiftStatus = workshopShiftStatus;
 
-	}
+        IrregularShift = workshopShiftStatus == WorkshopShiftStatus.Regular ?
+            new IrregularShift(new TimeOnly(), new TimeOnly(), WorkshopIrregularShifts.None)
+            : new IrregularShift(irregularShift.StartTime, irregularShift.EndTime, irregularShift.WorkshopIrregularShifts);
 
-	public void EditSimpleAndOverwriteOnAllEmployees(string groupName,
-		ICollection<CustomizeWorkshopGroupSettingsShift> customizeWorkshopGroupSettingsShifts,
-		WorkshopShiftStatus workshopShiftStatus, IrregularShift irregularShift, BreakTime breakTime, bool isShiftChange,
-		HolidayWork holidayWork, ICollection<CustomizeRotatingShift> rotatingShifts, List<WeeklyOffDay> weeklyOffDays)
-	{
-		GroupName = groupName;
-		CustomizeWorkshopGroupSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopGroupSettingsShifts : [];
-		WorkshopShiftStatus = workshopShiftStatus;
-
-		IrregularShift = workshopShiftStatus == WorkshopShiftStatus.Regular ?
-			new IrregularShift(new TimeOnly(), new TimeOnly(), WorkshopIrregularShifts.None)
-			: new IrregularShift(irregularShift.StartTime, irregularShift.EndTime, irregularShift.WorkshopIrregularShifts);
-
-		CustomizeRotatingShifts = workshopShiftStatus == WorkshopShiftStatus.Rotating ? rotatingShifts : [];
+        CustomizeRotatingShifts = workshopShiftStatus == WorkshopShiftStatus.Rotating ? rotatingShifts : [];
 
 
-		BreakTime = new BreakTime(breakTime.HasBreakTimeValue, breakTime.BreakTimeValue);
-		IsShiftChange = isShiftChange;
-		HolidayWork = holidayWork;
+        BreakTime = new BreakTime(breakTime.HasBreakTimeValue, breakTime.BreakTimeValue);
+        IsShiftChange = isShiftChange;
+        HolidayWork = holidayWork;
+        FridayWork = fridayWork;
 
-		WeeklyOffDays = weeklyOffDays;
-		//var employeeSettingsShift = customizeWorkshopGroupSettingsShifts
-		// .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
+        //var employeeSettingsShift = customizeWorkshopGroupSettingsShifts
+        // .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
+
+        foreach (var item in CustomizeWorkshopEmployeeSettingsCollection)
+        {
+            var newRotatingShifts = CustomizeRotatingShifts.Select(x => new CustomizeRotatingShift(x.StartTime, x.EndTime))
+                .ToList();
+            item.SimpleEdit(customizeWorkshopGroupSettingsShifts
+                .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList(),
+                irregularShift, workshopShiftStatus, breakTime, false, FridayWork, HolidayWork, newRotatingShifts);
+        }
+
+    }
+
+    public void AddEmployeeSettingToGroupWithGroupData(long employeeId, long workshopId)
+    {
+        var shifts = CustomizeWorkshopGroupSettingsShifts
+            .Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
+
+        FridayPay fridayPay = new(FridayPay.FridayPayType, FridayPay.Value);
+        OverTimePay overTimePay = new(OverTimePay.OverTimePayType, OverTimePay.Value);
+        BaseYearsPay baseYearsPay = new(BaseYearsPay.BaseYearsPayType, BaseYearsPay.Value, BaseYearsPay.PaymentType);
+        BonusesPay bonusesPay = new(BonusesPay.BonusesPayType, BonusesPay.Value, BonusesPay.PaymentType);
+        NightWorkPay nightWorkPay = new(NightWorkPay.NightWorkingType, NightWorkPay.Value);
+        MarriedAllowance marriedAllowance = new(MarriedAllowance.MarriedAllowanceType, MarriedAllowance.Value);
+        ShiftPay shiftPay = new(ShiftType.None, ShiftPayType.None, 0);
+        FamilyAllowance familyAllowance = new(FamilyAllowance.FamilyAllowanceType, FamilyAllowance.Value);
+        LeavePay leavePay = new(LeavePay.LeavePayType, LeavePay.Value);
+        InsuranceDeduction insuranceDeduction = new(InsuranceDeduction.InsuranceDeductionType, InsuranceDeduction.Value);
+        FineAbsenceDeduction fineAbsenceDeduction = new(
+            FineAbsenceDeduction.FineAbsenceDeductionType, FineAbsenceDeduction.Value,
+            FineAbsenceDeduction.FineAbsenceDayOfWeekCollection
+                .Select(x => new FineAbsenceDayOfWeek(x.DayOfWeek)).ToList()
+        );
+        LateToWork lateToWork = new(
+            LateToWork.LateToWorkType,
+            LateToWork.LateToWorkTimeFines.Select(x => new LateToWorkTimeFine(x.Minute, x.FineMoney))
+                .ToList(), LateToWork.Value
+        );
+        EarlyExit earlyExit = new(EarlyExit.EarlyExitType,
+            EarlyExit.EarlyExitTimeFines.Select(x => new EarlyExitTimeFine(x.Minute, x.FineMoney))
+                .ToList(), EarlyExit.Value);
+        IrregularShift irregularShift = new(IrregularShift.StartTime, IrregularShift.EndTime,
+            IrregularShift.WorkshopIrregularShifts);
+        BreakTime breakTime = new(BreakTime.HasBreakTimeValue, BreakTime.BreakTimeValue);
+
+        var rotatingShift = CustomizeRotatingShifts.Select(x => new CustomizeRotatingShift(x.StartTime, x.EndTime)).ToList();
+
+        var customizeWorkshopEmployeeSettings = new CustomizeWorkshopEmployeeSettings(fridayPay, overTimePay, baseYearsPay, bonusesPay, nightWorkPay,
+            marriedAllowance, shiftPay, familyAllowance, leavePay, insuranceDeduction, fineAbsenceDeduction, lateToWork,
+            earlyExit, employeeId, workshopId, Salary, id, shifts, FridayWork, HolidayWork, irregularShift,
+            WorkshopShiftStatus, breakTime, LeavePermittedDays, rotatingShift);
+
+        CustomizeWorkshopEmployeeSettingsCollection.Add(customizeWorkshopEmployeeSettings);
+    }
 
 
-		foreach (var item in CustomizeWorkshopEmployeeSettingsCollection)
-		{
-			var employeeWeeklyOffDays = WeeklyOffDays.Select(x => new WeeklyOffDay(x.DayOfWeek)).ToList();
-			var newRotatingShifts = CustomizeRotatingShifts.Select(x => new CustomizeRotatingShift(x.StartTime, x.EndTime))
-				.ToList();
-			item.SimpleEdit(customizeWorkshopGroupSettingsShifts
-				.Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList(),
-				irregularShift, workshopShiftStatus, breakTime, false, HolidayWork, newRotatingShifts, employeeWeeklyOffDays);
-		}
-
-	}
-
-	public void AddEmployeeSettingToGroupWithGroupData(long employeeId, long workshopId)
-	{
-		var shifts = CustomizeWorkshopGroupSettingsShifts
-			.Select(x => new CustomizeWorkshopEmployeeSettingsShift(x.StartTime, x.EndTime, x.Placement)).ToList();
-
-		FridayPay fridayPay = new(FridayPay.FridayPayType, FridayPay.Value);
-		OverTimePay overTimePay = new(OverTimePay.OverTimePayType, OverTimePay.Value);
-		BaseYearsPay baseYearsPay = new(BaseYearsPay.BaseYearsPayType, BaseYearsPay.Value, BaseYearsPay.PaymentType);
-		BonusesPay bonusesPay = new(BonusesPay.BonusesPayType, BonusesPay.Value, BonusesPay.PaymentType);
-		NightWorkPay nightWorkPay = new(NightWorkPay.NightWorkingType, NightWorkPay.Value);
-		MarriedAllowance marriedAllowance = new(MarriedAllowance.MarriedAllowanceType, MarriedAllowance.Value);
-		ShiftPay shiftPay = new(ShiftType.None, ShiftPayType.None, 0);
-		FamilyAllowance familyAllowance = new(FamilyAllowance.FamilyAllowanceType, FamilyAllowance.Value);
-		LeavePay leavePay = new(LeavePay.LeavePayType, LeavePay.Value);
-		InsuranceDeduction insuranceDeduction = new(InsuranceDeduction.InsuranceDeductionType, InsuranceDeduction.Value);
-		FineAbsenceDeduction fineAbsenceDeduction = new(
-			FineAbsenceDeduction.FineAbsenceDeductionType, FineAbsenceDeduction.Value,
-			FineAbsenceDeduction.FineAbsenceDayOfWeekCollection
-				.Select(x => new FineAbsenceDayOfWeek(x.DayOfWeek)).ToList()
-		);
-		LateToWork lateToWork = new(
-			LateToWork.LateToWorkType,
-			LateToWork.LateToWorkTimeFines.Select(x => new LateToWorkTimeFine(x.Minute, x.FineMoney))
-				.ToList(), LateToWork.Value
-		);
-		EarlyExit earlyExit = new(EarlyExit.EarlyExitType,
-			EarlyExit.EarlyExitTimeFines.Select(x => new EarlyExitTimeFine(x.Minute, x.FineMoney))
-				.ToList(), EarlyExit.Value);
-		IrregularShift irregularShift = new(IrregularShift.StartTime, IrregularShift.EndTime,
-			IrregularShift.WorkshopIrregularShifts);
-		BreakTime breakTime = new(BreakTime.HasBreakTimeValue, BreakTime.BreakTimeValue);
-		List<WeeklyOffDay> weeklyOffDays = WeeklyOffDays.Select(x => new WeeklyOffDay(x.DayOfWeek)).ToList();
-
-		var rotatingShift = CustomizeRotatingShifts.Select(x => new CustomizeRotatingShift(x.StartTime, x.EndTime)).ToList();
-
-		var customizeWorkshopEmployeeSettings = new CustomizeWorkshopEmployeeSettings(fridayPay, overTimePay, baseYearsPay, bonusesPay, nightWorkPay,
-			marriedAllowance, shiftPay, familyAllowance, leavePay, insuranceDeduction, fineAbsenceDeduction, lateToWork,
-			earlyExit, employeeId, workshopId, Salary, id, shifts, HolidayWork, irregularShift,
-			WorkshopShiftStatus, breakTime, LeavePermittedDays, rotatingShift, weeklyOffDays);
-
-		CustomizeWorkshopEmployeeSettingsCollection.Add(customizeWorkshopEmployeeSettings);
-	}
+    private void SetValueObjects(FridayPay fridayPay, OverTimePay overTimePay, BaseYearsPay baseYearsPay,
+        BonusesPay bonusesPay
+        , NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, ShiftPay shiftPay,
+        FamilyAllowance familyAllowance, LeavePay leavePay, InsuranceDeduction insuranceDeduction,
+        FineAbsenceDeduction fineAbsenceDeduction,
+        LateToWork lateToWork, EarlyExit earlyExit)
+    {
+        FridayPay = new(fridayPay.FridayPayType, fridayPay.Value);
+        OverTimePay = new(overTimePay.OverTimePayType, overTimePay.Value);
+        BaseYearsPay = new(baseYearsPay.BaseYearsPayType, baseYearsPay.Value, baseYearsPay.PaymentType);
+        BonusesPay = new(bonusesPay.BonusesPayType, bonusesPay.Value, bonusesPay.PaymentType);
+        NightWorkPay = new(nightWorkPay.NightWorkingType, nightWorkPay.Value);
+        MarriedAllowance = new(marriedAllowance.MarriedAllowanceType, marriedAllowance.Value);
+        ShiftPay = new(shiftPay.ShiftType, shiftPay.ShiftPayType, shiftPay.Value);
+        FamilyAllowance = new(familyAllowance.FamilyAllowanceType, familyAllowance.Value);
+        LeavePay = new(leavePay.LeavePayType, leavePay.Value);
+        InsuranceDeduction = new(insuranceDeduction.InsuranceDeductionType, insuranceDeduction.Value);
+        FineAbsenceDeduction = new(
+            fineAbsenceDeduction.FineAbsenceDeductionType, fineAbsenceDeduction.Value,
+            fineAbsenceDeduction.FineAbsenceDayOfWeekCollection
+                .Select(x => new FineAbsenceDayOfWeek(x.DayOfWeek)).ToList()
+        );
+        LateToWork = new(
+            lateToWork.LateToWorkType,
+            lateToWork.LateToWorkTimeFines.Select(x => new LateToWorkTimeFine(x.Minute, x.FineMoney))
+                .ToList(), lateToWork.Value
+        );
+        EarlyExit = new(earlyExit.EarlyExitType,
+            earlyExit.EarlyExitTimeFines.Select(x => new EarlyExitTimeFine(x.Minute, x.FineMoney))
+                .ToList(), earlyExit.Value);
+    }
 
 
-	private void SetValueObjects(FridayPay fridayPay, OverTimePay overTimePay, BaseYearsPay baseYearsPay,
-		BonusesPay bonusesPay
-		, NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, ShiftPay shiftPay,
-		FamilyAllowance familyAllowance, LeavePay leavePay, InsuranceDeduction insuranceDeduction,
-		FineAbsenceDeduction fineAbsenceDeduction,
-		LateToWork lateToWork, EarlyExit earlyExit)
-	{
-		FridayPay = new(fridayPay.FridayPayType, fridayPay.Value);
-		OverTimePay = new(overTimePay.OverTimePayType, overTimePay.Value);
-		BaseYearsPay = new(baseYearsPay.BaseYearsPayType, baseYearsPay.Value, baseYearsPay.PaymentType);
-		BonusesPay = new(bonusesPay.BonusesPayType, bonusesPay.Value, bonusesPay.PaymentType);
-		NightWorkPay = new(nightWorkPay.NightWorkingType, nightWorkPay.Value);
-		MarriedAllowance = new(marriedAllowance.MarriedAllowanceType, marriedAllowance.Value);
-		ShiftPay = new(shiftPay.ShiftType, shiftPay.ShiftPayType, shiftPay.Value);
-		FamilyAllowance = new(familyAllowance.FamilyAllowanceType, familyAllowance.Value);
-		LeavePay = new(leavePay.LeavePayType, leavePay.Value);
-		InsuranceDeduction = new(insuranceDeduction.InsuranceDeductionType, insuranceDeduction.Value);
-		FineAbsenceDeduction = new(
-			fineAbsenceDeduction.FineAbsenceDeductionType, fineAbsenceDeduction.Value,
-			fineAbsenceDeduction.FineAbsenceDayOfWeekCollection
-				.Select(x => new FineAbsenceDayOfWeek(x.DayOfWeek)).ToList()
-		);
-		LateToWork = new(
-			lateToWork.LateToWorkType,
-			lateToWork.LateToWorkTimeFines.Select(x => new LateToWorkTimeFine(x.Minute, x.FineMoney))
-				.ToList(), lateToWork.Value
-		);
-		EarlyExit = new(earlyExit.EarlyExitType,
-			earlyExit.EarlyExitTimeFines.Select(x => new EarlyExitTimeFine(x.Minute, x.FineMoney))
-				.ToList(), earlyExit.Value);
-	}
-
-
-	//public void OverWriteEmployeesShiftAndSalary(IEnumerable<long> ids,ICollection<RollCallWorkshopEmployeeSettingsShift> employeeSettingsShifts,double salary)
-	//{
-	//    var  permittedToOverWrite= RollCallWorkshopEmployeeSettingsCollection.Where(x => ids.Contains(x.id));
-	//    foreach (var item in permittedToOverWrite)
-	//    {
-	//        item.OverWriteSalaryAndShift(employeeSettingsShifts, salary);
-	//    }
-	//}
+    //public void OverWriteEmployeesShiftAndSalary(IEnumerable<long> ids,ICollection<RollCallWorkshopEmployeeSettingsShift> employeeSettingsShifts,double salary)
+    //{
+    //    var  permittedToOverWrite= RollCallWorkshopEmployeeSettingsCollection.Where(x => ids.Contains(x.id));
+    //    foreach (var item in permittedToOverWrite)
+    //    {
+    //        item.OverWriteSalaryAndShift(employeeSettingsShifts, salary);
+    //    }
+    //}
 
 
 }

Company.Domain/CustomizeWorkshopSettingsAgg/Entities/CustomizeWorkshopSettings.cs

@@ -17,7 +17,7 @@ public class CustomizeWorkshopSettings : BaseCustomizeEntity
 
 	public CustomizeWorkshopSettings(long workshopId,
 		ICollection<CustomizeWorkshopSettingsShift> customizeWorkshopSettingsShifts, int leavePermittedDays,
-		WorkshopShiftStatus workshopShiftStatus,HolidayWork holidayWork, List<WeeklyOffDay> weeklyOffDays)
+		WorkshopShiftStatus workshopShiftStatus,FridayWork fridayWork,HolidayWork holidayWork)
 	{
 		FridayPay = new FridayPay(FridayPayType.None, 0);
 		OverTimePay = new OverTimePay(OverTimePayType.None, 0);
@@ -38,10 +38,11 @@ public class CustomizeWorkshopSettings : BaseCustomizeEntity
 		OverTimeThresholdMinute = 0;
 		Currency = Currency.Rial;
 		MaxMonthDays = MaxMonthDays.Default;
+		FridayWork = fridayWork;
+		HolidayWork = holidayWork;
 		BonusesPaysInEndOfMonth = BonusesPaysInEndOfYear.EndOfYear;
 		WorkshopShiftStatus = workshopShiftStatus;
-		WeeklyOffDays = weeklyOffDays;
-		HolidayWork = holidayWork;
+
 		if (workshopShiftStatus == WorkshopShiftStatus.Irregular)
 			return;
 
@@ -91,7 +92,8 @@ public class CustomizeWorkshopSettings : BaseCustomizeEntity
 	public void Edit(FridayPay fridayPay, OverTimePay overTimePay, BaseYearsPay baseYearsPay, BonusesPay bonusesPay,
 		NightWorkPay nightWorkPay, MarriedAllowance marriedAllowance, ShiftPay shiftPay,
 		FamilyAllowance familyAllowance, LeavePay leavePay, InsuranceDeduction insuranceDeduction,
-		FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit, HolidayWork holidayWork, BonusesPaysInEndOfYear bonusesPaysInEndOfYear,
+		FineAbsenceDeduction fineAbsenceDeduction, LateToWork lateToWork, EarlyExit earlyExit,
+		FridayWork fridayWork, HolidayWork holidayWork, BonusesPaysInEndOfYear bonusesPaysInEndOfYear,
 		int leavePermittedDays, BaseYearsPayInEndOfYear baseYearsPayInEndOfYear, int overTimeThresholdMinute)
 	{
 		FridayPay = fridayPay;
@@ -107,6 +109,7 @@ public class CustomizeWorkshopSettings : BaseCustomizeEntity
 		FineAbsenceDeduction = fineAbsenceDeduction;
 		LateToWork = lateToWork;
 		EarlyExit = earlyExit;
+		FridayWork = fridayWork;
 		HolidayWork = holidayWork;
 		BonusesPaysInEndOfMonth = bonusesPaysInEndOfYear;
 		LeavePermittedDays = leavePermittedDays;
@@ -124,18 +127,19 @@ public class CustomizeWorkshopSettings : BaseCustomizeEntity
 	}
 
 	public void ChangeWorkshopShifts(ICollection<CustomizeWorkshopSettingsShift> customizeWorkshopSettingsShifts,
-        WorkshopShiftStatus workshopShiftStatus,HolidayWork holidayWork, List<WeeklyOffDay> weeklyOffDays)
+        WorkshopShiftStatus workshopShiftStatus,FridayWork fridayWork,HolidayWork holidayWork)
 	{
 		WorkshopShiftStatus = workshopShiftStatus;
         HolidayWork = holidayWork;
+        FridayWork = fridayWork;
 		CustomizeWorkshopSettingsShifts = workshopShiftStatus == WorkshopShiftStatus.Regular ? customizeWorkshopSettingsShifts : new List<CustomizeWorkshopSettingsShift>();
-		WeeklyOffDays = weeklyOffDays;
-
 		if (workshopShiftStatus == WorkshopShiftStatus.Regular)
 		{
 			var date = new DateOnly();
 			var firstStartShift = new DateTime(date, CustomizeWorkshopSettingsShifts.MinBy(x => x.Placement).StartTime);
 			var lastEndShift = new DateTime(date, CustomizeWorkshopSettingsShifts.MaxBy(x => x.Placement).EndTime);
+         
+          
             if (lastEndShift > firstStartShift)
                 firstStartShift = firstStartShift.AddDays(1);
             var offSet = (firstStartShift - lastEndShift).Divide(2);

Company.Domain/EmployeeAgg/IEmployeeRepository.cs

@@ -71,12 +71,7 @@ public interface IEmployeeRepository : IRepository<long, Employee>
     Task<GetEditEmployeeInEmployeeDocumentViewModel> GetEmployeeEditInEmployeeDocumentWorkFlow(long employeeId,
         long workshopId);
 
-	#endregion
-
-	#region Api
-	Task<List<EmployeeSelectListViewModel>> GetSelectList(string searchText,long id);
-	Task<List<GetEmployeeListViewModel>> GetList(GetEmployeeListSearchModel searchModel);
-	#endregion
+    #endregion
 
 
 }

Company.Domain/EmployeeComputeOptionsAgg/EmployeeComputeOptions.cs

@@ -3,110 +3,36 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using _0_Framework.Application;
 using _0_Framework.Domain;
 
 namespace Company.Domain.EmployeeComputeOptionsAgg
 {
     public class EmployeeComputeOptions : EntityBase
     {
-		public EmployeeComputeOptions(long workshopId, long employeeId, string computeOptions, string bonusesOptions, string yearsOptions,
-		   bool createContract, bool signContract, bool createCheckout, bool signCheckout, string contractTerm, IsActive cutContractEndOfYear)
-		{
-			WorkshopId = workshopId;
-			EmployeeId = employeeId;
-			ComputeOptions = computeOptions;
-			BonusesOptions = bonusesOptions;
-			YearsOptions = yearsOptions;
-            ContractTerm = contractTerm;
-            CutContractEndOfYear = contractTerm == "1" ? IsActive.None : cutContractEndOfYear;
+        public EmployeeComputeOptions(long workshopId, long employeeId, string computeOptions, string bonusesOptions, string yearsOptions)
+        {
+            WorkshopId = workshopId;
+            EmployeeId = employeeId;
+            ComputeOptions = computeOptions;
+            BonusesOptions = bonusesOptions;
+            YearsOptions = yearsOptions;
+        }
 
-            SetContractAndCheckoutOptions(createContract, signContract, createCheckout, signCheckout);
-		}
+        public long WorkshopId { get; private set;}
+        public long EmployeeId { get; private set;}
 
+        //نحوه محاسبه مزد مرخصی
+        public string ComputeOptions { get; private set; }
+        //نحوه محاسبه عیدی
+        public string BonusesOptions { get; private set; }
+        //نحوه محاسبه سنوات
+        public string YearsOptions { get; private set; }
 
-
-		public long WorkshopId { get; private set; }
-		public long EmployeeId { get; private set; }
-
-		//نحوه محاسبه مزد مرخصی
-		public string ComputeOptions { get; private set; }
-		//نحوه محاسبه عیدی
-		public string BonusesOptions { get; private set; }
-		//نحوه محاسبه سنوات
-		public string YearsOptions { get; private set; }
-
-		/// <summary>
-		/// ایجاد قرارداد
-		/// </summary>
-		public bool CreateContract { get; private set; }
-
-		/// <summary>
-		/// امضای قرارداد
-		/// </summary>
-		public bool SignContract { get; private set; }
-		/// <summary>
-		/// ایجاد تصفیه
-		/// </summary>
-		public bool CreateCheckout { get; private set; }
-		/// <summary>
-		/// امضای تصفیه
-		/// </summary>
-		public bool SignCheckout { get; private set; }
-
-		/// <summary>
-		/// مدت قرارداد
-		/// </summary>
-        public string ContractTerm { get; private set; }
-
-        /// <summary>
-        /// اگر قرارداد بیش از یک ماه باشد و  گزینه انتخاب شده منتهی به پایان سال باشد
-        /// این آیتم
-        /// True
-        /// است
-        /// </summary>
-        public IsActive CutContractEndOfYear { get; private set; }
-
-    
-
-        public void Edit(string computeOptions, string bonusesOptions, string yearsOptions, bool createContract, bool signContract, bool createCheckout,
-			bool signCheckout, string contractTerm, IsActive cutContractEndOfYear)
-		{
-			ComputeOptions = computeOptions;
-			BonusesOptions = bonusesOptions;
-			YearsOptions = yearsOptions;
-
-            ContractTerm = contractTerm;
-            CutContractEndOfYear = contractTerm == "1" ? IsActive.None : cutContractEndOfYear;
-            SetContractAndCheckoutOptions(createContract, signContract, createCheckout, signCheckout);
-		}
-
-
-
-		private void SetContractAndCheckoutOptions(bool createContract, bool signContract, bool createCheckout,
-			bool signCheckout)
-		{
-			CreateContract = createContract;
-			if (createContract)
-			{
-				SignContract = signContract;
-				CreateCheckout = createCheckout;
-				if (createCheckout)
-				{
-					SignCheckout = signCheckout;
-				}
-				else
-				{
-					SignCheckout = false;
-				}
-			}
-			else
-			{
-				SignContract = false;
-				CreateCheckout = false;
-				SignCheckout = false;
-			}
-		}
-	}
+        public void Edit(string computeOptions, string bonusesOptions, string yearsOptions)
+        {
+            ComputeOptions = computeOptions;
+            BonusesOptions = bonusesOptions;
+            YearsOptions = yearsOptions;
+        }
+    }
 }
-

Company.Domain/EmployeeFaceEmbeddingAgg/EmployeeFaceEmbedding.cs

@@ -1,189 +0,0 @@
-using System;
-using System.Collections.Generic;
-using MongoDB.Bson;
-using MongoDB.Bson.Serialization.Attributes;
-
-namespace Company.Domain.EmployeeFaceEmbeddingAgg;
-
-public class EmployeeFaceEmbedding
-    {
-        public EmployeeFaceEmbedding()
-        {
-            EmbeddingHistory = new List<EmbeddingHistoryItem>();
-            MetadataHistory = new List<MetadataHistoryItem>();
-        }
-
-        public EmployeeFaceEmbedding(string employeeFullName, long employeeId, long workshopId, 
-            List<double> embeddings, EmployeeFaceEmbeddingMetadata metadata)
-        {
-            Id = Guid.NewGuid().ToString();
-            EmployeeFullName = employeeFullName;
-            EmployeeId = employeeId;
-            WorkshopId = workshopId;
-            Embeddings = embeddings;
-            Metadata = metadata;
-            EmbeddingHistory = new List<EmbeddingHistoryItem>();
-            MetadataHistory = new List<MetadataHistoryItem>();
-            CreatedAt = DateTime.UtcNow;
-            UpdatedAt = DateTime.UtcNow;
-        }
-
-        [BsonId]
-        [BsonRepresentation(BsonType.String)]
-        public string Id { get; set; }
-
-        [BsonElement("employeeFullName")]
-        public string EmployeeFullName { get; set; }
-        
-        [BsonElement("employeeId")]
-        public long EmployeeId { get; set; }
-        
-        [BsonElement("workshopId")]
-        public long WorkshopId { get; set; }
-
-        [BsonElement("embeddings")]
-        public List<double> Embeddings { get; set; }
-        
-        [BsonElement("metadata")]
-        public EmployeeFaceEmbeddingMetadata Metadata { get; set; }
-
-        [BsonElement("embeddingHistory")]
-        public List<EmbeddingHistoryItem> EmbeddingHistory { get; set; }
-        
-        [BsonElement("metadataHistory")]
-        public List<MetadataHistoryItem> MetadataHistory { get; set; }
-
-        [BsonElement("createdAt")]
-        public DateTime CreatedAt { get; set; }
-        
-        [BsonElement("updatedAt")]
-        public DateTime UpdatedAt { get; set; }
-
-        public void UpdateEmbedding(List<double> newEmbedding, double confidence, double refinementPercentage)
-        {
-            if (Embeddings != null)
-            {
-                EmbeddingHistory.Add(new EmbeddingHistoryItem
-                {
-                    Embedding = new List<double>(Embeddings),
-                    Timestamp = DateTime.UtcNow,
-                    Confidence = confidence,
-                    RefinementPercentage = refinementPercentage
-                });
-            }
-
-            Embeddings = newEmbedding;
-            UpdatedAt = DateTime.UtcNow;
-        }
-
-        public void UpdateMetadata(EmployeeFaceEmbeddingMetadata newMetadata, double confidence, double refinementPercentage)
-        {
-            if (Metadata != null)
-            {
-                MetadataHistory.Add(new MetadataHistoryItem
-                {
-                    Metadata = Metadata,
-                    Timestamp = DateTime.UtcNow,
-                    Confidence = confidence,
-                    RefinementPercentage = refinementPercentage
-                });
-            }
-
-            Metadata = newMetadata;
-            UpdatedAt = DateTime.UtcNow;
-        }
-
-        public void UpdateEmployeeInfo(string employeeFullName, long workshopId)
-        {
-            EmployeeFullName = employeeFullName;
-            WorkshopId = workshopId;
-            UpdatedAt = DateTime.UtcNow;
-        }
-    }
-
-    public class EmployeeFaceEmbeddingMetadata
-    {
-        [BsonElement("avg_eye_distance_normalized")]
-        public double AvgEyeDistanceNormalized { get; set; }
-
-        [BsonElement("avg_eye_to_face_ratio")]
-        public double AvgEyeToFaceRatio { get; set; }
-
-        [BsonElement("avg_face_aspect_ratio")]
-        public double AvgFaceAspectRatio { get; set; }
-
-        [BsonElement("avg_detection_confidence")]
-        public double AvgDetectionConfidence { get; set; }
-
-        [BsonElement("avg_keypoints_normalized")]
-        public EmployeeFaceEmbeddingKeypoints AvgKeypointsNormalized { get; set; }
-
-        [BsonElement("per_image_metadata")]
-        public List<ImageMetadata> PerImageMetadata { get; set; }
-    }
-
-    public class EmployeeFaceEmbeddingKeypoints
-    {
-        [BsonElement("left_eye")]
-        public double[] LeftEye { get; set; }
-
-        [BsonElement("right_eye")]
-        public double[] RightEye { get; set; }
-
-        [BsonElement("nose")]
-        public double[] Nose { get; set; }
-
-        [BsonElement("mouth_left")]
-        public double[] MouthLeft { get; set; }
-
-        [BsonElement("mouth_right")]
-        public double[] MouthRight { get; set; }
-    }
-
-    public class ImageMetadata
-    {
-        [BsonElement("face_aspect_ratio")]
-        public double FaceAspectRatio { get; set; }
-
-        [BsonElement("eye_distance_normalized")]
-        public double EyeDistanceNormalized { get; set; }
-
-        [BsonElement("eye_to_face_ratio")]
-        public double EyeToFaceRatio { get; set; }
-
-        [BsonElement("detection_confidence")]
-        public double DetectionConfidence { get; set; }
-
-        [BsonElement("keypoints_normalized")]
-        public EmployeeFaceEmbeddingKeypoints KeypointsNormalized { get; set; }
-    }
-
-    public class EmbeddingHistoryItem
-    {
-        [BsonElement("embedding")]
-        public List<double> Embedding { get; set; }
-
-        [BsonElement("timestamp")]
-        public DateTime Timestamp { get; set; }
-
-        [BsonElement("confidence")]
-        public double Confidence { get; set; }
-
-        [BsonElement("refinementPercentage")]
-        public double RefinementPercentage { get; set; }
-    }
-
-    public class MetadataHistoryItem
-    {
-        [BsonElement("metadata")]
-        public EmployeeFaceEmbeddingMetadata Metadata { get; set; }
-
-        [BsonElement("timestamp")]
-        public DateTime Timestamp { get; set; }
-
-        [BsonElement("confidence")]
-        public double Confidence { get; set; }
-
-        [BsonElement("refinementPercentage")]
-        public double RefinementPercentage { get; set; }
-    }

Company.Domain/EmployeeFaceEmbeddingAgg/IEmployeeFaceEmbeddingRepository.cs

@@ -1,15 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace Company.Domain.EmployeeFaceEmbeddingAgg;
-
-public interface IEmployeeFaceEmbeddingRepository
-{
-    Task CreateAsync(EmployeeFaceEmbedding employeeFaceEmbedding);
-    Task UpdateAsync(EmployeeFaceEmbedding employeeFaceEmbedding);
-    Task<EmployeeFaceEmbedding> GetByIdAsync(string id);
-    Task<EmployeeFaceEmbedding> GetByEmployeeIdAsync(long employeeId);
-    Task<List<EmployeeFaceEmbedding>> GetByWorkshopIdAsync(long workshopId);
-    Task<List<EmployeeFaceEmbedding>> GetByWorkshopIdsAsync(List<long> workshopIds);
-    Task DeleteAsync(string id);
-}

Company.Domain/FinancialStatmentAgg/FinancialStatment.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -16,8 +15,7 @@ public class FinancialStatment : EntityBase
     {
         ContractingPartyId = contractingPartyId;
         ContractingPartyName = contractingPartyName;
-        PublicId = Guid.NewGuid();
-        FinancialTransactionList = [];
+ 
     }
 
     public FinancialStatment()
@@ -26,24 +24,9 @@ public class FinancialStatment : EntityBase
     }
     public long ContractingPartyId { get; private set; }
     public string ContractingPartyName { get; private set; }
-    public Guid PublicId { get; private set; }
 
-    [NotMapped]
-    public string PublicIdStr => PublicId.ToString("N");
 
     public List<FinancialTransaction> FinancialTransactionList { get; set; }
 
-
-    public void SetPublicId()
-    {
-        PublicId = Guid.NewGuid();
-    }
-    
-    public void AddFinancialTransaction(FinancialTransaction financialTransaction)
-    {
-        if (financialTransaction == null)
-            throw new ArgumentNullException(nameof(financialTransaction));
-        FinancialTransactionList.Add(financialTransaction);
-    }
-    
+  
 }

Company.Domain/FinancialStatmentAgg/IFinancialStatmentRepository.cs

@@ -3,25 +3,14 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using _0_Framework.Application;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.FinancialStatment;
-using Microsoft.AspNetCore.Mvc;
 
 namespace Company.Domain.FinancialStatmentAgg;
 
 public interface IFinancialStatmentRepository : IRepository<long, FinancialStatment>
 {
 
-    [Obsolete("این متد منسوخ شده است. لطفاً از متد GetDetailsByContractingParty استفاده کنید.")]
     FinancialStatmentViewModel GetDetailsByContractingPartyId(long contractingPartyId);
     List<FinancialStatmentViewModel> Search(FinancialStatmentSearchModel searchModel);
-    Task<ClientFinancialStatementViewModel> GetClientFinancialStatement(long accountId,
-        FinancialStatementSearchModel searchModel);
-
-    Task<OperationResult<ClientFinancialStatementViewModel>> GetDetailsByPublicId(string publicId);
-    Task<GetFinancialStatementBalanceAmount> GetBalanceAmount(long id);
-    Task<double> GetClientDebtAmount(long accountId);
-    Task<FinancialStatmentDetailsByContractingPartyViewModel> GetDetailsByContractingParty(long contractingPartyId,FinancialStatementSearchModel searchModel);
-    Task<FinancialStatment> GetByContractingPartyId(long contractingPartyId);
 }

Company.Domain/FinancialTransactionAgg/IFinancialTransactionRepository.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using _0_Framework.Application;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.FinancilTransaction;
 
@@ -14,15 +13,4 @@ public interface IFinancialTransactionRepository : IRepository<long, FinancialTr
 {
     EditFinancialTransaction GetDetails(long id);
     void RemoveFinancialTransaction(long id);
-
-    /// <summary>
-    /// ایجاد بدهی استند حضور غیاب برای اکسل
-    /// </summary>
-    /// <param name="contractingPartyId"></param>
-    /// <param name="transactionDate"></param>
-    /// <param name="debt"></param>
-    /// <param name="description"></param>
-    /// <returns></returns>
-    OperationResult CreateDebtFromExcel(long contractingPartyId, string transactionDate, double debt,
-        string description);
 }

Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs

@@ -2,11 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using _0_Framework.Application;
 using _0_Framework.Domain;
 using CompanyManagment.App.Contracts.InstitutionContract;
 using CompanyManagment.App.Contracts.Workshop;
-using Microsoft.AspNetCore.Mvc;
 
 namespace Company.Domain.InstitutionContractAgg;
 
@@ -15,8 +13,7 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
     
     EditInstitutionContract GetDetails(long id);
     EditInstitutionContract GetFirstContract(long contractingPartyId, string typeOfContract);
-    List<InstitutionContractViewModel> InstitutionContractsWithoutAccount();
-    List<InstitutionContractViewModel> ContractWithoutValidContactInfo();
+
     List<InstitutionContractViewModel> Search(InstitutionContractSearchModel searchModel);
     List<InstitutionContractViewModel> NewSearch(InstitutionContractSearchModel searchModel);
     List<InstitutionContractViewModel> PrintAll(List<long> id);
@@ -35,47 +32,4 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
 
     int ArchiveCodeFinder(List<WorkshopViewModel> workshopViewModels);
     InstitutionContract InstitutionContractByEmployerId(long employerId);
-
-
-    /// <summary>
-    /// ایجاد سند مالی حضور غیاب
-    /// </summary>
-    /// <param name="now"></param>
-    /// <param name="endOfMonthGr"></param>
-    /// <param name="endOfMonth"></param>
-    /// <param name="description"></param>
-    void RollcallServiceCreateTransaction();
-
-    Task<PagedResult<GetInstitutionContractListItemsViewModel>> GetList(InstitutionContractListSearchModel searchModel);
-    Task<GetInstitutionContractListStatsViewModel> GetListStats(InstitutionContractListSearchModel searchModel);
-    Task<List<RegistrationWorkflowMainListViewModel>> RegistrationWorkflowMainList();
-    Task<List<RegistrationWorkflowItemsViewModel>> RegistrationWorkflowItems(long institutionContractId);
-    Task<InstitutionContractWorkshopInitial> GetInstitutionWorkshopInitialDetails(long institutionWorkshopInitialId);
-    Task<InstitutionContract> GetIncludeWorkshopDetailsAsync(long institutionContractId);
-    void UpdateStatusIfNeeded(long institutionContractId);
-    Task<GetInstitutionVerificationDetailsViewModel> GetVerificationDetails(Guid id);
-    Task<InstitutionContract> GetByPublicIdAsync(Guid id);
-
-    #region Extension
-
-    Task<InstitutionContractExtensionInquiryResult> GetExtensionInquiry(long previousContractId);
-    Task<InstitutionContractExtensionWorkshopsResponse> GetExtensionWorkshops(InstitutionContractExtensionWorkshopsRequest request);
-    Task<InstitutionContractExtensionPlanResponse> GetExtensionInstitutionPlan(InstitutionContractExtensionPlanRequest request);
-    Task<InstitutionContractExtensionPaymentResponse> GetExtensionPaymentMethod(InstitutionContractExtensionPaymentRequest request);
-    Task<OperationResult> ExtensionComplete(InstitutionContractExtensionCompleteRequest request);
-
-        #endregion
-
-    #region Upgrade(Amendment)
-
-        Task<InstitutionContractAmendmentWorkshopsResponse> GetAmendmentWorkshops(long institutionContractId);
-        Task<InsitutionContractAmendmentPaymentResponse> GetAmendmentPaymentDetails(InsitutionContractAmendmentPaymentRequest request);
-
-        Task<InsertAmendmentTempWorkshopResponse> InsertAmendmentTempWorkshops(InstitutionContractAmendmentTempWorkshopViewModel request);
-        Task RemoveAmendmentWorkshops(Guid workshopTempId);
-        #endregion
-
-    Task<List<InstitutionContractSelectListViewModel>> GetInstitutionContractSelectList(string search, string selected);
-    Task<List<InstitutionContractPrintViewModel>> PrintAllAsync(List<long> ids);
-    Task<GetInstitutionContractWorkshopsDetails> GetContractWorkshopsDetails(long id);
 }

Company.Domain/InstitutionContractAgg/InstitutionContract.cs

@@ -1,24 +1,17 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using System.Security.Cryptography;
 using _0_Framework.Domain;
 using Company.Domain.InstitutionContractContactInfoAgg;
-using CompanyManagment.App.Contracts.InstitutionContract;
 
 namespace Company.Domain.InstitutionContractAgg;
 
 public class InstitutionContract : EntityBase
 {
-    public InstitutionContract(string contractNo, long representativeId, string representativeName,
-        long contractingPartyId,
+    public InstitutionContract(string contractNo, long representativeId, string representativeName, long contractingPartyId, 
         string contractingPartyName, DateTime contractDateGr, string contractDateFa, string state, string city,
         string address, DateTime contractStartGr, string contractStartFa, DateTime contractEndGr,
         string contractEndFa, double contractAmount, double dailyCompenseation, double obligation,
-        double totalAmount, int extensionNo, string workshopManualCount, string employeeManualCount, string description,
-        string officialCompany, string typeOfcontract, string hasValueAddedTax, double valueAddedTax,
-        List<InstitutionContractWorkshopInitial> workshopDetails, long lawId)
+        double totalAmount, int extensionNo, string workshopManualCount, string employeeManualCount, string description, string officialCompany,string typeOfcontract, string hasValueAddedTax, double valueAddedTax)
     {
         ContractNo = contractNo;
         RepresentativeId = representativeId;
@@ -50,123 +43,67 @@ public class InstitutionContract : EntityBase
         TypeOfContract = typeOfcontract;
         HasValueAddedTax = hasValueAddedTax;
         ValueAddedTax = valueAddedTax;
-        VerificationStatus = InstitutionContractVerificationStatus.PendingForVerify;
-        ContactInfoList = [];
-        Installments = [];
-        WorkshopGroup = new InstitutionContractWorkshopGroup(id, workshopDetails);
-        PublicId = Guid.NewGuid();
-        LawId = lawId;
     }
 
-    public long LawId { get; private set; }
-
     public string ContractNo { get; private set; }
 
     public long RepresentativeId { get; private set; }
-
     public string RepresentativeName { get; private set; }
-
     public long ContractingPartyId { get; private set; }
-
     public string ContractingPartyName { get; private set; }
-
     public DateTime ContractDateGr { get; private set; }
-
     public string ContractDateFa { get; private set; }
-
     public string State { get; private set; }
-
     public string City { get; private set; }
-
     public string Address { get; private set; }
-
     //public long ContactInfoId { get; private set; }
     public DateTime ContractStartGr { get; private set; }
-
     public string ContractStartFa { get; private set; }
-
     public DateTime ContractEndGr { get; private set; }
-
     public string ContractEndFa { get; private set; }
-
+        
     // مبلغ قرارداد
     public double ContractAmount { get; private set; }
-
+        
     //خسارت روزانه
     public double DailyCompenseation { get; private set; }
 
     //وجه التزام
     public double Obligation { get; private set; }
-
     // مبلغ کل قرارداد
     public double TotalAmount { get; private set; }
-
     public string WorkshopManualCount { get; private set; }
-
     public string EmployeeManualCount { get; private set; }
-
     public string IsActiveString { get; private set; }
-
     public int ExtensionNo { get; private set; }
-
     public string Description { get; private set; }
-
     public string Signature { get; private set; }
-
     public string OfficialCompany { get; private set; }
-
     public string TypeOfContract { get; private set; }
-
-    public string HasValueAddedTax { get; private set; }
-
-    public double ValueAddedTax { get; private set; }
-
-    public Guid PublicId { get; private set; }
-
-    public string VerifyCode { get; private set; }
-    public DateTime VerifyCodeCreation { get; private set; }
-    public string VerifierFullName { get; private set; }
-    public string VerifierPhoneNumber { get; private set; }
-
-    [NotMapped] public bool VerifyCodeExpired => VerifyCodeCreation.Add(ExpireTime) <= DateTime.Now;
-
-    [NotMapped] public bool CanResendVerifyCode => VerifyCodeCreation.Add(ReSendTime) <= DateTime.Now;
-
-    [NotMapped] public TimeSpan ExpireTime => TimeSpan.FromMinutes(5);
-
-
-    [NotMapped] public TimeSpan ReSendTime => TimeSpan.FromMinutes(2);
-
-    public bool IsInstallment { get; set; }
-
-    public InstitutionContractVerificationStatus VerificationStatus { get; private set; }
-
-    public InstitutionContractWorkshopGroup WorkshopGroup { get; private set; }
+    public string HasValueAddedTax { get; set; }
+    public double ValueAddedTax { get; set; }
 
     public List<InstitutionContractContactInfo> ContactInfoList { get; set; }
 
-    public List<InstitutionContractInstallment> Installments { get; set; }
-
-    public List<InstitutionContractAmendment> Amendments { get; private set; }
-
     public InstitutionContract()
     {
-        ContactInfoList = [];
-        Installments = [];
+
+        ContactInfoList = new List<InstitutionContractContactInfo>();
     }
 
     public void Edit(DateTime contractDateGr, string contractDateFa, string state, string city, string address,
         DateTime contractStartGr, string contractStartFa, DateTime contractEndGr, string contractEndFa,
         double contractAmount, double dailyCompenseation, double obligation, double totalAmount,
-        string workshopManualCount, string employeeManualCount, string description, string officialCompany,
+        string workshopManualCount, string employeeManualCount, string description, string officialCompany, 
         string typeOfcontract, double valueAddedTax, string hasValueAddedTax)
     {
+          
         ContractDateGr = contractDateGr;
         ContractDateFa = contractDateFa;
         State = state;
         City = city;
         Address = address;
-
+    
         ContractStartGr = contractStartGr;
         ContractStartFa = contractStartFa;
         ContractEndGr = contractEndGr;
@@ -187,11 +124,13 @@ public class InstitutionContract : EntityBase
 
     public void Active()
     {
+
         this.IsActiveString = "true";
     }
 
     public void DeActive()
     {
+
         this.IsActiveString = "false";
     }
 
@@ -209,182 +148,4 @@ public class InstitutionContract : EntityBase
     {
         this.Signature = "0";
     }
-
-    public void Verified()
-    {
-        VerificationStatus = InstitutionContractVerificationStatus.Verified;
-    }
-
-    public void SetPendingWorkflow()
-    {
-        VerificationStatus = InstitutionContractVerificationStatus.PendingWorkflow;
-    }
-
-    public void SetInstallments(List<InstitutionContractInstallment> installments)
-    {
-        Installments = installments;
-        IsInstallment = true;
-    }
-
-
-    public void SetVerifyCode(string code,string verifierFullName, string verifierPhoneNumber)
-    {
-        VerifyCode = code;
-        VerifyCodeCreation = DateTime.Now;
-        VerifierFullName = verifierFullName;
-        VerifierPhoneNumber = verifierPhoneNumber;
-    }
-
-    public void SetWorkshopGroup(InstitutionContractWorkshopGroup workshopGroup)
-    {
-        WorkshopGroup = workshopGroup;
-    }
-
-    public void SetAmount(double totalAmount, double tax, double oneMonthPayment)
-    {
-        ContractAmount = oneMonthPayment;
-        TotalAmount = totalAmount;
-        ValueAddedTax = tax;
-        HasValueAddedTax = tax > 0 ? "true" : "false";
-    }
-
-    public void ClearGroup()
-    {
-        WorkshopGroup = null;
-    }
-}
-
-public class InstitutionContractAmendment : EntityBase
-{
-    private InstitutionContractAmendment(){}
-    public InstitutionContractAmendment(long institutionContractId,
-        List<InstitutionContractInstallment> installments, double amount, bool hasInstallment,
-        InstitutionContractAmendmentChange amendmentChange, long lawId)
-    {
-        InstitutionContractId = institutionContractId;
-        Installments = installments is { Count: > 0} ? installments : [];
-        Amount = amount;
-        HasInstallment = hasInstallment;
-        AmendmentChanges = [amendmentChange];
-        LawId = lawId;
-    }
-
-    public long InstitutionContractId { get; set; }
-    public InstitutionContract InstitutionContract { get; set; }
-    public List<InstitutionContractInstallment> Installments { get; set; }
-    public double Amount { get; set; }
-    public bool HasInstallment { get; set; }
-    public string VerifyCode { get; set; }
-    public DateTime VerificationCreation { get; set; }
-    public List<InstitutionContractAmendmentChange> AmendmentChanges { get; set; }
-
-    public long LawId { get; set; }
-
-    public void SetVerifyCode(string code,string verifierFullName, string verifierPhoneNumber)
-    {
-        VerifyCode = code;
-        VerifyCodeCreation = DateTime.Now;
-        VerifierFullName = verifierFullName;
-        VerifierPhoneNumber = verifierPhoneNumber;
-    }
-
-    public string VerifierPhoneNumber { get; private set; }
-
-    public string VerifierFullName { get; private set; }
-
-    public DateTime VerifyCodeCreation { get; set; }
-}
-
-public class InstitutionContractAmendmentChange : EntityBase
-{
-    private InstitutionContractAmendmentChange() { }
-    private InstitutionContractAmendmentChange(long institutionContractAmendmentId,
-        InstitutionContractAmendment institutionContractAmendment, InstitutionContractAmendmentChangeType changeType,
-        DateTime changeDateGr, bool? hasRollCallPlan, bool? hasCustomizeCheckoutPlan, bool? hasContractPlan,
-        bool? hasContractPlanInPerson, bool? hasInsurancePlan, bool? hasInsurancePlanInPerson, int? personnelCount,
-        long? workshopDetailsId)
-    {
-        InstitutionContractAmendmentId = institutionContractAmendmentId;
-        InstitutionContractAmendment = institutionContractAmendment;
-        ChangeType = changeType;
-        ChangeDateGr = changeDateGr;
-        HasRollCallPlan = hasRollCallPlan;
-        HasCustomizeCheckoutPlan = hasCustomizeCheckoutPlan;
-        HasContractPlan = hasContractPlan;
-        HasContractPlanInPerson = hasContractPlanInPerson;
-        HasInsurancePlan = hasInsurancePlan;
-        HasInsurancePlanInPerson = hasInsurancePlanInPerson;
-        PersonnelCount = personnelCount;
-        WorkshopDetailsId = workshopDetailsId;
-    }
-
-    public long InstitutionContractAmendmentId { get; private set; }
-    public InstitutionContractAmendment InstitutionContractAmendment { get; private set; }
-    public InstitutionContractAmendmentChangeType ChangeType { get; private set; }
-    public DateTime ChangeDateGr { get; private set; }
-
-    /// <summary>
-    /// پلن حضور و غیاب
-    /// </summary>
-    public bool? HasRollCallPlan { get; private set; }
-
-    /// <summary>
-    /// پلن فیش غیر رسمی
-    /// </summary>
-    public bool? HasCustomizeCheckoutPlan { get; private set; }
-
-    /// <summary>
-    /// پلن قرارداد و تصفیه
-    /// </summary>
-    public bool? HasContractPlan { get; private set; }
-
-    /// <summary>
-    /// پلن قرارداد و تصفیه حضوری
-    /// </summary>
-    public bool? HasContractPlanInPerson { get; private set; }
-
-    /// <summary>
-    /// پلن بیمه
-    /// </summary>
-    public bool? HasInsurancePlan { get; private set; }
-
-    /// <summary>
-    /// پلن بیمه حضوری
-    /// </summary>
-    public bool? HasInsurancePlanInPerson { get; private set; }
-
-    /// <summary>
-    /// تعداد پرسنل
-    /// </summary>
-    public int? PersonnelCount { get; private set; }
-
-    /// <summary>
-    /// تعداد کارگاه
-    /// </summary>
-    public long? WorkshopDetailsId { get; private set; }
-}
-
-public enum InstitutionContractAmendmentChangeType
-{
-    PersonCount,
-    Services,
-    WorkshopCreated
-}
-
-public enum InstitutionContractVerificationStatus
-{
-    /// <summary>
-    /// در انتظار تایید
-    /// </summary>
-    PendingForVerify = 0,
-
-    /// <summary>
-    ///  در انتظار کارپوشه
-    /// </summary>
-    PendingWorkflow = 1,
-
-    /// <summary>
-    /// تایید شده
-    /// </summary>
-    Verified = 2
 }

Company.Domain/InstitutionContractAgg/InstitutionContractInstallment.cs

@@ -1,28 +0,0 @@
-using System;
-using _0_Framework.Application;
-
-namespace Company.Domain.InstitutionContractAgg;
-
-public class InstitutionContractInstallment
-{
-    public InstitutionContractInstallment(DateTime installmentDateGr, double amount,
-        string description)
-    {
-        InstallmentDateGr = installmentDateGr;
-        InstallmentDateFa = installmentDateGr.ToFarsi();
-        Amount = amount;
-        Description = description;
-    }
-
-    public long Id { get; private set; }
-    public DateTime InstallmentDateGr { get; private set; }
-    public string InstallmentDateFa { get; private set; }
-    public double Amount { get; private set; }
-    public string Description { get; private set; }
-    
-    public long InstitutionContractId { get; private set; }
-    public long? InstitutionContractAmendmentId { get; private set; }
-    
-    public InstitutionContract InstitutionContract { get; private set; }
-    public InstitutionContractAmendment InstitutionContractAmendment { get; set; }
-}

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopBase.cs

@@ -1,84 +0,0 @@
-using System;
-using System.Collections.Generic;
-using _0_Framework.Domain;
-
-namespace Company.Domain.InstitutionContractAgg;
-
-public class InstitutionContractWorkshopBase:EntityBase
-{
-    protected InstitutionContractWorkshopBase(){}
-    public InstitutionContractWorkshopBase(string workshopName, bool hasRollCallPlan,bool hasRollCallPlanInPerson,
-        bool hasCustomizeCheckoutPlan, bool hasContractPlan,bool hasContractPlanInPerson,bool hasInsurancePlan,bool hasInsurancePlanInPerson,
-        int personnelCount, double price )
-    {
-        WorkshopName = workshopName;
-        Services = new WorkshopServices(hasInsurancePlan, hasInsurancePlanInPerson,
-            hasContractPlan, hasContractPlanInPerson, hasRollCallPlan, hasRollCallPlanInPerson,hasCustomizeCheckoutPlan);
-        PersonnelCount = personnelCount;
-        Price = price;
-        Employers = [];
-    }
-    /// <summary>
-    /// شناسه کارگاه
-    /// </summary>
-    public long? WorkshopId { get; protected set; }
-
-    /// <summary>
-    /// نام کارگاه
-    /// </summary>
-    public string WorkshopName { get; private set; }
-
-    public WorkshopServices Services { get; set; }  = new (false, false, 
-        false, false, false, 
-        false, false);
-    public int PersonnelCount { get; private set; }
-
-
-
-    /// <summary>
-    /// شناسه قرارداد نهاد مرتبط
-    /// </summary>
-    public long InstitutionContractId { get; private set; }
-    
-
-    public double Price { get; private set; }
-
-    
-    public List<InstitutionContractWorkshopDetailEmployer> Employers { get; private set; } = new();
-
-    public void SetEmployers(List<long> employerIds)
-    {
-        Employers.Clear();
-        foreach (var employerId in employerIds)
-        {
-            Employers.Add(new InstitutionContractWorkshopDetailEmployer(employerId));
-        }
-    }
-    public void AddEmployer(long employerId)
-    {
-        if (Employers.Exists(x => x.EmployerId == employerId))
-            return;
-
-        Employers.Add(new InstitutionContractWorkshopDetailEmployer(employerId));
-    }
-    
-    // ⚡️ Equality Implementation
-    public override bool Equals(object? obj)
-    {
-        if (obj is not InstitutionContractWorkshopBase other)
-            return false;
-
-        return WorkshopName == other.WorkshopName &&
-               PersonnelCount == other.PersonnelCount &&
-               Price == other.Price &&
-               Services == other.Services;
-    }
-
-    public override int GetHashCode()
-    {
-        return HashCode.Combine(WorkshopName, PersonnelCount, Price, Services);
-    }
-    
-    
-
-}

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopCurrent.cs

@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using _0_Framework_b.Domain;
-
-namespace Company.Domain.InstitutionContractAgg;
-
-public class InstitutionContractWorkshopCurrent:InstitutionContractWorkshopBase
-{
-    private InstitutionContractWorkshopCurrent(){}
-    public InstitutionContractWorkshopCurrent(string workshopName, bool hasRollCallPlan,
-        bool hasRollCallPlanInPerson, bool hasCustomizeCheckoutPlan, bool hasContractPlan,
-        bool hasContractPlanInPerson, bool hasInsurancePlan, bool hasInsurancePlanInPerson,
-        int personnelCount, double price,long institutionContractWorkshopGroupId,InstitutionContractWorkshopGroup workshopGroup,long workshopId) : base(workshopName, hasRollCallPlan, 
-        hasRollCallPlanInPerson, hasCustomizeCheckoutPlan, hasContractPlan,
-        hasContractPlanInPerson, hasInsurancePlan, hasInsurancePlanInPerson, personnelCount, price)
-    {
-        InstitutionContractWorkshopGroupId = institutionContractWorkshopGroupId;
-        WorkshopGroup = workshopGroup;
-        WorkshopId = workshopId;
-    }
-    public long InstitutionContractWorkshopGroupId { get; private set; }
-    public InstitutionContractWorkshopGroup WorkshopGroup { get; private set; }
-    public long InitialWorkshopId { get; private set; }
-    public InstitutionContractWorkshopInitial WorkshopInitial { get; private set; }
-    
-    
-}

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopGroup.cs

@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using _0_Framework_b.Domain;
-
-namespace Company.Domain.InstitutionContractAgg;
-
-public class InstitutionContractWorkshopGroup : EntityBase
-{
-    private InstitutionContractWorkshopGroup()
-    {
-    }
-
-    public long InstitutionContractId { get; private set; }
-    public InstitutionContract InstitutionContract { get; set; }
-    public List<InstitutionContractWorkshopInitial> InitialWorkshops { get; private set; }
-    public List<InstitutionContractWorkshopCurrent> CurrentWorkshops { get; private set; }
-    public DateTime LastModifiedDate { get; private set; }
-    
-    [NotMapped]
-    public bool HasChanges =>
-        !InitialWorkshops.Cast<InstitutionContractWorkshopBase>()
-            .SequenceEqual(CurrentWorkshops.Cast<InstitutionContractWorkshopBase>());
-
-    public InstitutionContractWorkshopGroup(long institutionContractId,
-        List<InstitutionContractWorkshopInitial> initialDetails)
-    {
-        InstitutionContractId = institutionContractId;
-        var initialWorkshops = initialDetails.ToList();
-        InitialWorkshops = initialWorkshops.ToList();
-        LastModifiedDate = DateTime.Now;
-    }
-
-    public void UpdateCurrentWorkshops(List<InstitutionContractWorkshopCurrent> updatedDetails)
-    {
-        CurrentWorkshops = updatedDetails.ToList();
-        LastModifiedDate = DateTime.Now;
-    }
-}

Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopInitial.cs

@@ -1,70 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using _0_Framework.Domain;
-using CompanyManagment.App.Contracts.InstitutionContract;
-
-namespace Company.Domain.InstitutionContractAgg;
-
-public class InstitutionContractWorkshopInitial:InstitutionContractWorkshopBase
-{
-    private InstitutionContractWorkshopInitial(){}
-    public InstitutionContractWorkshopInitial(string workshopName, bool hasRollCallPlan, 
-        bool hasRollCallPlanInPerson, bool hasCustomizeCheckoutPlan, bool hasContractPlan,
-        bool hasContractPlanInPerson, bool hasInsurancePlan, bool hasInsurancePlanInPerson, 
-        int personnelCount, double price) : base(workshopName, hasRollCallPlan,
-        hasRollCallPlanInPerson, hasCustomizeCheckoutPlan, hasContractPlan, hasContractPlanInPerson,
-        hasInsurancePlan, hasInsurancePlanInPerson, personnelCount, price)
-    {
-        WorkshopCreated = false;
-    }
-
-    public long InstitutionContractWorkshopGroupId { get; private set; }
-    public InstitutionContractWorkshopGroup WorkshopGroup { get; private set; }
-    public bool WorkshopCreated { get; private set; }
-    
-    public InstitutionContractWorkshopCurrent? WorkshopCurrent { get; private set; }
-    public long? InstitutionContractWorkshopCurrentId { get; private set; }
-    
-    public void SetWorkshopId(long workshopId)
-    {
-        WorkshopId = workshopId;
-        WorkshopCreated = true;
-        WorkshopCurrent = new InstitutionContractWorkshopCurrent(WorkshopName,Services.RollCall,Services.RollCallInPerson,
-            Services.CustomizeCheckout,Services.Contract,Services.ContractInPerson,Services.Insurance,
-            Services.InsuranceInPerson,PersonnelCount,Price,InstitutionContractWorkshopGroupId,WorkshopGroup,workshopId);
-        WorkshopCurrent.SetEmployers(Employers.Select(x=>x.EmployerId).ToList());
-    }
-
-    public static InstitutionContractWorkshopInitial CreateManual(string workshopName, bool hasRollCallPlan, 
-        bool hasRollCallPlanInPerson, bool hasCustomizeCheckoutPlan, bool hasContractPlan,
-        bool hasContractPlanInPerson, bool hasInsurancePlan, bool hasInsurancePlanInPerson, 
-        int personnelCount, double price, long workshopId,List<long> employerIds)
-    {
-
-        var entity = new InstitutionContractWorkshopInitial(workshopName, hasRollCallPlan,
-            hasRollCallPlanInPerson, hasCustomizeCheckoutPlan, hasContractPlan, hasContractPlanInPerson,
-            hasInsurancePlan, hasInsurancePlanInPerson, personnelCount, price);
-        entity.WorkshopCreated = true;
-        entity.WorkshopId = workshopId;
-        entity.SetEmployers(employerIds);
-        return entity;
-    }
-
-    public void SetWorkshopGroup(InstitutionContractWorkshopGroup entityWorkshopGroup)
-    {
-        InstitutionContractWorkshopGroupId = entityWorkshopGroup.id;
-        WorkshopGroup = entityWorkshopGroup;
-    }
-}
-
-public class InstitutionContractWorkshopDetailEmployer : EntityBase
-{
-    public long EmployerId { get; private set; }
-    
-    public InstitutionContractWorkshopDetailEmployer(long employerId)
-    {
-        EmployerId = employerId;
-    }
-    
-    private InstitutionContractWorkshopDetailEmployer() { }
-}

Company.Domain/InstitutionContractAgg/WorkshopServices.cs

@@ -1,23 +0,0 @@
-namespace Company.Domain.InstitutionContractAgg;
-public record WorkshopServices
-{
-    public WorkshopServices(bool insurance, bool insuranceInPerson, bool contract, bool contractInPerson, bool rollCall, bool rollCallInPerson, bool customizeCheckout)
-    {
-        Insurance = insurance;
-        InsuranceInPerson = insuranceInPerson;
-        Contract = contract;
-        ContractInPerson = contractInPerson;
-        RollCall = rollCall;
-        CustomizeCheckout = customizeCheckout;
-        RollCallInPerson = rollCallInPerson;
-    }
-
-    public bool Insurance { get; private set; }
-    public bool InsuranceInPerson { get; private set; }
-    public bool Contract { get; private set; }
-    public bool  ContractInPerson { get; private set; }
-    public bool RollCall { get; private set; }
-
-    public bool RollCallInPerson { get; private set; }
-    public bool CustomizeCheckout { get; private set; }
-} 

Company.Domain/InstitutionContractAmendmentTempAgg/InstitutionContractAmendmentTemp.cs

@@ -1,151 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using MongoDB.Bson;
-using MongoDB.Bson.Serialization.Attributes;
-
-namespace Company.Domain.InstitutionContractAmendmentTempAgg;
-
-public class InstitutionContractAmendmentTemp
-{
-    public InstitutionContractAmendmentTemp(List<InstitutionContractAmendmentTempPrevWorkshop> prevWorkshops,
-        long institutionContractId)
-    {
-        Id = Guid.NewGuid();
-        PrevWorkshops = prevWorkshops;
-        NewWorkshops = prevWorkshops.Select(x=> new InstitutionContractAmendmentTempNewWorkshop(
-            x.WorkshopName, x.CountPerson, x.ContractAndCheckout, x.ContractAndCheckoutInPerson, x.Insurance,
-            x.InsuranceInPerson, x.RollCall, x.RollCallInPerson, x.CustomizeCheckout, x.Price, x.WorkshopId,
-            x.CurrentWorkshopId, 0)).ToList();
-        InstitutionContractId = institutionContractId;
-    }
-
-    [BsonId]
-    [BsonRepresentation(BsonType.String)]
-    public Guid Id { get; private set; }
-    public List<InstitutionContractAmendmentTempPrevWorkshop> PrevWorkshops { get; private set; }
-    public List<InstitutionContractAmendmentTempNewWorkshop> NewWorkshops { get; private set; }
-    public long InstitutionContractId { get; private set; }
-}
-
-public class InstitutionContractAmendmentTempNewWorkshop : InstitutionContractAmendmentTempPrevWorkshop
-{
-    public InstitutionContractAmendmentTempNewWorkshop(string workshopName, int countPerson, bool contractAndCheckout,
-        bool contractAndCheckoutInPerson, bool insurance, bool insuranceInPerson, bool rollCall, bool rollCallInPerson,
-        bool customizeCheckout, double price, long workshopId, long currentWorkshopId,double priceDifference) : base(
-        workshopName, countPerson, contractAndCheckout, contractAndCheckoutInPerson, insurance, insuranceInPerson,
-        rollCall, rollCallInPerson, customizeCheckout, price, workshopId, currentWorkshopId)
-    {
-        PriceDifference = priceDifference;
-    }
-
-    /// <summary>
-    /// مبلغ اختلاف کارگاه جدید با کارگاه قبلی(مبلغ اصلی ارتقاء)
-    /// </summary>
-    public double PriceDifference { get; private set; }
-    
-    
-    public void Edit(string workshopName, int countPerson, bool contractAndCheckout,
-        bool contractAndCheckoutInPerson,
-        bool insurance, bool insuranceInPerson, bool rollCall, bool customizeCheckout,
-        double price,double priceDifference)
-    {
-        base.Edit(workshopName, countPerson, contractAndCheckout, contractAndCheckoutInPerson, insurance,
-            insuranceInPerson, rollCall, customizeCheckout, price);
-        PriceDifference = priceDifference;
-    }
-}
-
-public class InstitutionContractAmendmentTempPrevWorkshop
-{
-    public InstitutionContractAmendmentTempPrevWorkshop(string workshopName, int countPerson, bool contractAndCheckout,
-        bool contractAndCheckoutInPerson,
-        bool insurance, bool insuranceInPerson,
-        bool rollCall, bool rollCallInPerson, bool customizeCheckout, double price, long workshopId,
-        long currentWorkshopId)
-    {
-        Id = Guid.NewGuid();
-        WorkshopName = workshopName;
-        CountPerson = countPerson;
-        ContractAndCheckout = contractAndCheckout;
-        Insurance = insurance;
-        RollCall = rollCall;
-        CustomizeCheckout = customizeCheckout;
-        ContractAndCheckoutInPerson = contractAndCheckoutInPerson;
-        InsuranceInPerson = insuranceInPerson;
-        RollCallInPerson = rollCallInPerson;
-        Price = price;
-        WorkshopId = workshopId;
-        CurrentWorkshopId = currentWorkshopId;
-    }
-
-    [BsonRepresentation(BsonType.String)]
-    public Guid Id { get; set; }
-
-    public long CurrentWorkshopId { get; private set; }
-    public long WorkshopId { get; set; }
-
-    /// <summary>
-    /// نام کارگاه
-    /// </summary>
-    public string WorkshopName { get; private set; }
-
-    /// <summary>
-    /// تعداد پرسنل 
-    /// </summary>
-    public int CountPerson { get; private set; }
-
-
-    #region ServiceSelection
-
-    /// <summary>
-    /// قرارداد و تصفیه
-    /// </summary>
-    public bool ContractAndCheckout { get; private set; }
-
-    /// <summary>
-    /// بیمه
-    /// </summary>
-    public bool Insurance { get; private set; }
-
-    /// <summary>
-    /// حضورغباب
-    /// </summary>
-    public bool RollCall { get; private set; }
-
-    public bool RollCallInPerson { get; set; }
-
-    /// <summary>
-    /// فیش غیر رسمی
-    /// </summary>
-    public bool CustomizeCheckout { get; private set; }
-
-    /// <summary>
-    /// خدمات حضوری قرداد و تصفیه
-    /// </summary>
-    public bool ContractAndCheckoutInPerson { get; private set; }
-
-    /// <summary>
-    /// خدمات حضوری بیمه
-    /// </summary>
-    public bool InsuranceInPerson { get; private set; }
-
-    public double Price { get; private set; }
-
-    #endregion
-
-    public void Edit(string workshopName, int countPerson, bool contractAndCheckout, bool contractAndCheckoutInPerson,
-        bool insurance, bool insuranceInPerson, bool rollCall, bool customizeCheckout,
-        double price)
-    {
-        WorkshopName = workshopName;
-        CountPerson = countPerson;
-        ContractAndCheckout = contractAndCheckout;
-        Insurance = insurance;
-        RollCall = rollCall;
-        CustomizeCheckout = customizeCheckout;
-        ContractAndCheckoutInPerson = contractAndCheckoutInPerson;
-        InsuranceInPerson = insuranceInPerson;
-        Price = price;
-    }
-}

Company.Domain/InstitutionContractExtensionTempAgg/IInstitutionContractExtenstionTempRepository.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Threading.Tasks;
-
-namespace Company.Domain.InstitutionContractExtensionTempAgg;
-
-public interface IInstitutionContractExtenstionTempRepository
-{
-    Task Create(InstitutionContractExtensionTemp institutionContract);
-
-    Task<InstitutionContractExtensionTemp> GetPreviousExtenstionData(long contractingPartyId);
-    Task Remove(Guid id);
-}

Company.Domain/InstitutionContractExtensionTempAgg/InstitutionContractExtensionTemp.cs

@@ -1,168 +0,0 @@
-using System;
-using System.Collections.Generic;
-using CompanyManagment.App.Contracts.InstitutionContract;
-using CompanyManagment.App.Contracts.InstitutionContractContactinfo;
-using MongoDB.Bson;
-using MongoDB.Bson.Serialization.Attributes;
-
-namespace Company.Domain.InstitutionContractExtensionTempAgg;
-
-public class InstitutionContractExtensionTemp
-{
-    public InstitutionContractExtensionTemp(long previousContractingPartyId)
-    {
-        Id = Guid.NewGuid();
-        PreviousId = previousContractingPartyId;
-    }
-    
-    [BsonId] // Specifies this field as the _id in MongoDB
-    [BsonRepresentation(BsonType.String)] // Ensures the GUID is stored as a string
-    public Guid Id { get; set; }
-    public long PreviousId { get; set; }
-    public string Address { get; set; }
-    public string City { get; set; }
-    public string Province { get; set; }
-    public List<EditContactInfo> ContactInfos { get; set; }
-
-    public List<InstitutionContractExtensionTempWorkshop> Workshops { get; set; }
-
-    public InstitutionContractExtensionPlanDetail OneMonth { get; set; }
-    public InstitutionContractExtensionPlanDetail ThreeMonths { get; set; }
-    public InstitutionContractExtensionPlanDetail SixMonths { get; set; }
-    public InstitutionContractExtensionPlanDetail TwelveMonths { get; set; }
-    public InstitutionContractPaymentMonthlyViewModel MonthlyPayment { get; set; }
-    public InstitutionContractPaymentOneTimeViewModel OneTimePayment { get; set; }
-
-    public bool HasContractInPerson { get; set; }
-
-    public InstitutionContractDuration? Duration { get; set; }
-    
-    public void SetContractingPartyInfos(string address, string city, string province, List<EditContactInfo> contactInfos)
-    {
-        Address = address;
-        City = city;
-        Province = province;
-        ContactInfos = contactInfos;
-    }
-
-    public void SetWorkshopsAndPlanAmounts(List<InstitutionContractExtensionTempWorkshop> workshops,
-        InstitutionContractExtensionPlanDetail oneMonth,
-        InstitutionContractExtensionPlanDetail threeMonth, InstitutionContractExtensionPlanDetail sixMonth,
-        InstitutionContractExtensionPlanDetail twelveMonth, bool hasContractInPerson)
-    {
-        Workshops = workshops;
-        OneMonth = oneMonth;
-        ThreeMonths = threeMonth;
-        SixMonths = sixMonth;
-        TwelveMonths = twelveMonth;
-        HasContractInPerson = hasContractInPerson;
-    }
-
-    public void SetAmountAndDuration(InstitutionContractDuration duration,InstitutionContractPaymentMonthlyViewModel monthly,
-        InstitutionContractPaymentOneTimeViewModel oneTime)
-    {
-        Duration = duration;
-        MonthlyPayment = monthly;
-        OneTimePayment = oneTime;
-    }
-    
-}
-
-public class InstitutionContractExtenstionTempPlan
-{
-    public InstitutionContractExtenstionTempPlan(string contractStart, string contractEnd, 
-        string oneMonthPaymentDiscounted, string oneMonthDiscount, string oneMonthOriginalPayment,
-        string totalPayment, string dailyCompensation, string obligation)
-    {
-        ContractStart = contractStart;
-        ContractEnd = contractEnd;
-        OneMonthPaymentDiscounted = oneMonthPaymentDiscounted;
-        OneMonthDiscount = oneMonthDiscount;
-        OneMonthOriginalPayment = oneMonthOriginalPayment;
-        TotalPayment = totalPayment;
-        DailyCompensation = dailyCompensation;
-        Obligation = obligation;
-    }
-
-    public string ContractStart { get; set; }
-    public string ContractEnd { get; set; }
-    public string OneMonthPaymentDiscounted { get; set; }
-    public string OneMonthDiscount { get; set; }
-    public string OneMonthOriginalPayment { get; set; }
-    public string TotalPayment { get; set; }
-    public string DailyCompensation { get; set; }
-    public string Obligation { get; set; }
-}
-
-public class InstitutionContractExtensionTempWorkshop
-{
-    public InstitutionContractExtensionTempWorkshop(string workshopName, int countPerson, bool contractAndCheckout, bool contractAndCheckoutInPerson, 
-        bool insurance, bool insuranceInPerson,
-        bool rollCall,bool rollCallInPerson, bool customizeCheckout,double price,long workshopId)
-    {
-        WorkshopName = workshopName;
-        CountPerson = countPerson;
-        ContractAndCheckout = contractAndCheckout;
-        Insurance = insurance;
-        RollCall = rollCall;
-        CustomizeCheckout = customizeCheckout;
-        ContractAndCheckoutInPerson = contractAndCheckoutInPerson;
-        InsuranceInPerson = insuranceInPerson;
-        RollCallInPerson = rollCallInPerson;
-        Price = price;
-        WorkshopId = workshopId;
-    }
-
-    public long WorkshopId { get; set; }
-
-    /// <summary>
-    /// نام کارگاه
-    /// </summary>
-    public string WorkshopName { get; private set; }
-
-    /// <summary>
-    /// تعداد پرسنل 
-    /// </summary>
-    public int CountPerson { get; private  set; }
-    
-    
-    #region ServiceSelection
-
-    /// <summary>
-    /// قرارداد و تصفیه
-    /// </summary>
-    public bool ContractAndCheckout { get; private  set; }
-
-    /// <summary>
-    /// بیمه
-    /// </summary>
-    public bool Insurance { get; private  set; }
-
-    /// <summary>
-    /// حضورغباب
-    /// </summary>
-    public bool RollCall { get; private  set; }
-
-    public bool RollCallInPerson { get; set; }
-
-    /// <summary>
-    /// فیش غیر رسمی
-    /// </summary>
-    public bool CustomizeCheckout { get;private  set; }
-
-    /// <summary>
-    /// خدمات حضوری قرداد و تصفیه
-    /// </summary>
-    public bool ContractAndCheckoutInPerson { get; private  set; }
-
-    /// <summary>
-    /// خدمات حضوری بیمه
-    /// </summary>
-    public bool InsuranceInPerson { get; private  set; }
-
-    public double Price{ get; set; }
-
-    #endregion    
-}
-
-

Company.Domain/InsurancJobAgg/IInsuranceJobRepositpry.cs

@@ -25,6 +25,5 @@ public interface IInsuranceJobRepositpry:IRepository<long, InsuranceJob>
     OperationResult EditInsuranceJob(EditInsuranceJob command);
 
 
-    Task<List<InsuranceJobSelectListViewModel>> GetSelectList();
 }
 

Company.Domain/InsuranceListAgg/IInsuranceListRepository.cs

@@ -51,14 +51,6 @@ public interface IInsuranceListRepository:IRepository<long, InsuranceList>
     List<EmployeeInsurancListDataViewModel> GetEmployeeInsuranceDataAmonthAgo(DateTime currentMonthStartDate, long workshopId);
     #endregion
 
-    /// <summary>
-    /// دریافت اطلاعات بیمه کارکنان برای استفاده در فیش حقوقی
-    /// </summary>
-    /// <param name="startDate"></param>
-    /// <param name="workshopId"></param>
-    /// <returns></returns>
-    List<EmployeeInsurancListDataViewModel> EmployeeInsuranceDataBy(DateTime startDate, long workshopId);
-
     /// <summary>
     /// بدست آوردن اطلاعات محاسباتی ماه پرسنل برای ویرایش
     /// </summary>
@@ -68,15 +60,4 @@ public interface IInsuranceListRepository:IRepository<long, InsuranceList>
     #region client
     List<InsuranceListViewModel> SearchForClient(InsuranceListSearchModel searchModel);
     #endregion
-
-    #region Mahan
-    Task<InsuranceListConfirmOperation> GetInsuranceOperationDetails(long id);
-
-	Task<InsuranceListTabsCountViewModel> GetTabCounts(InsuranceListSearchModel searchModel);
-
-	#endregion
-
-	Task<List<InsuranceListViewModel>> GetNotCreatedWorkshop(InsuranceListSearchModel searchModel);
-}
-
-
+}

Company.Domain/InsuranceListAgg/InsuranceList.cs

@@ -4,9 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using _0_Framework.Domain;
-using Company.Domain.InsuranceListAgg.ValueObjects;
 using Company.Domain.InsuranceWorkshopAgg;
-using CompanyManagment.App.Contracts.InsuranceList.Enums;
 
 namespace Company.Domain.InsuranceListAgg;
 
@@ -153,21 +151,6 @@ public class InsuranceList : EntityBase
     /// </summary>
     public double SumOfMarriedAllowance { get; private set; }
 
-    #region Mahan
-    /// <summary>
-    /// بازرسی
-    /// </summary>
-    public InsuranceListInspection Inspection { get; set; }  =new (InsuranceListInspectionType.None,DateTime.MinValue, 0);
-    /// <summary>
-    /// بدهی
-    /// </summary>
-    public InsuranceListDebt Debt { get; set; } = new(InsuranceListDebtType.None, DateTime.MinValue, 0, 0);
-    /// <summary>
-    /// تاییدیه کارفرما
-    /// </summary>
-    public InsuranceListEmployerApproval EmployerApproval { get; set; } = new(InsuranceListEmployerApprovalStatus.None, string.Empty);
-    #endregion
-
     public List<InsuranceListWorkshop> InsuranceListWorkshops { get; set; }
 
     public void Edit(int sumOfEmployees, int sumOfWorkingDays, double sumOfSalaries, double sumOfBenefitsIncluded, double included, 
@@ -191,22 +174,4 @@ public class InsuranceList : EntityBase
         SumOfDailyWagePlusBaseYears = sumOfDailyWage + sumOfBaseYears;
     }
 
-
-    public void SetDebt(InsuranceListDebt debt)
-    {
-        Debt = debt;
-    }
-    public void SetInspection(InsuranceListInspection inspection)
-    {
-        Inspection = inspection;
-    }
-    public void SetEmployerApproval(InsuranceListEmployerApproval employerApproval)
-    {
-        EmployerApproval = employerApproval;
-    }
-    public void SetConfirmSentlist(bool confirmSentlist)
-    {
-        ConfirmSentlist = confirmSentlist;
-    }
-
-}
+}

Company.Domain/InsuranceListAgg/ValueObjects/InsuranceListDebt.cs

@@ -1,31 +0,0 @@
-using System;
-using CompanyManagment.App.Contracts.InsuranceList.Enums;
-
-namespace Company.Domain.InsuranceListAgg.ValueObjects;
-
-public class InsuranceListDebt
-{
-    public InsuranceListDebt(InsuranceListDebtType type, DateTime debtDate, double amount, long mediaId)
-    {
-        Type = type;
-        if (type == InsuranceListDebtType.None)
-        {
-            DebtDate = DateTime.MinValue;
-            Amount = 0;
-            MediaId = 0;
-        }
-        else
-        {
-            DebtDate = debtDate;
-            Amount = amount;
-            MediaId = mediaId;
-            IsDone = true;
-        }
-    }
-
-    public InsuranceListDebtType Type { get; set; }
-    public DateTime DebtDate { get; set; }
-    public double Amount { get; set; }
-    public long MediaId { get; set; }
-    public bool IsDone { get; set; }
-}

Company.Domain/InsuranceListAgg/ValueObjects/InsuranceListEmployerApproval.cs

@@ -1,26 +0,0 @@
-using System.Security.Cryptography;
-using CompanyManagment.App.Contracts.InsuranceList.Enums;
-
-namespace Company.Domain.InsuranceListAgg.ValueObjects;
-
-public class InsuranceListEmployerApproval
-{
-    public InsuranceListEmployerApproval(InsuranceListEmployerApprovalStatus status, string description)
-    {
-        Status = status;
-        if (status == InsuranceListEmployerApprovalStatus.None)
-        {
-            Description = string.Empty;
-        }
-        else
-        {
-            
-            Description = description;
-            IsDone = true;
-        }
-    }
-
-    public InsuranceListEmployerApprovalStatus Status { get; set; }
-    public string Description { get; set; }
-    public bool IsDone { get; set; }
-}

Company.Domain/InsuranceListAgg/ValueObjects/InsuranceListInspection.cs

@@ -1,29 +0,0 @@
-using System;
-using CompanyManagment.App.Contracts.InsuranceList.Enums;
-
-namespace Company.Domain.InsuranceListAgg.ValueObjects;
-
-public class InsuranceListInspection
-{
-    public InsuranceListInspection(InsuranceListInspectionType type, DateTime lastInspectionDateTime, long mediaId)
-    {
-        Type = type;
-        if (type == InsuranceListInspectionType.None)
-        {
-            LastInspectionDateTime = DateTime.MinValue;
-            MediaId = 0;
-        }
-        else
-        {
-            LastInspectionDateTime = lastInspectionDateTime;
-            MediaId = mediaId;
-            IsDone = true;
-        }
-    }
-
-    public InsuranceListInspectionType Type { get; set; }
-    public DateTime LastInspectionDateTime { get; set; }
-    public long MediaId { get; set; }
-    public bool IsDone { get; set; }
-
-}

Company.Domain/LawAgg/ILawRepository.cs

@@ -1,15 +0,0 @@
-using _0_Framework.Domain;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using CompanyManagment.App.Contracts.Law;
-
-namespace Company.Domain.LawAgg
-{
-    public interface ILawRepository : IRepository<long, Law>
-    {
-        Task<Law> GetWithItems(long id);
-        Task<List<Law>> GetActive();
-        Task<LawViewModel> GetByType(LawType type);
-        Task<List<LawViewModel>> GetList(LawSearchModel searchModel);
-    }
-}

Company.Domain/LawAgg/Law.cs

@@ -1,116 +0,0 @@
-using System;
-using System.Collections.Generic;
-using _0_Framework.Domain;
-using CompanyManagment.App.Contracts.Law;
-using System.Text.Json;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Company.Domain.LawAgg
-{
-    public class Law : EntityBase
-    {
-        private Law(){}
-        public string Title { get; private set; }
-        public bool IsActive { get; private set; }
-        public  List<LawItem> Items { get; private set; }
-        public LawType Type { get; private set; }
-        public string HeadTitle { get; private set; }
-        public string NotificationsJson { get; private set; }
-        public int Version { get; private set; }
-
-        [NotMapped]
-        public List<string> Notifications
-        {
-            get => string.IsNullOrEmpty(NotificationsJson)
-                ? new List<string>()
-                : JsonSerializer.Deserialize<List<string>>(NotificationsJson);
-            set => NotificationsJson = JsonSerializer.Serialize(value);
-        }
-
-        public Law(string title, LawType lawType, List<string> notifications, string headTitle, int version = 1)
-        {
-            Title = title;
-            IsActive = true; // آخرین نسخه فعال است
-            Items = new List<LawItem>();
-            Type = lawType;
-            Notifications = notifications ?? new List<string>();
-            HeadTitle = headTitle;
-            Version = version;
-        }
-
-        public void Edit(string title)
-        {
-            Title = title;
-        }
-
-        public void AddItem(string header, string details, int orderNumber)
-        {
-            Items.Add(new LawItem(header, details, orderNumber));
-        }
-
-        public void SetItem(List<LawItem> items)
-        {
-            Items = items ?? new List<LawItem>();
-        }
-        public void RemoveItem(int orderNumber)
-        {
-            var item = Items.Find(x => x.OrderNumber == orderNumber);
-            if (item != null)
-                Items.Remove(item);
-        }
-
-        public void Activate()
-        {
-            IsActive = true;
-        }
-
-        public void Deactivate()
-        {
-            IsActive = false;
-        }
-
-        public void SetAsLatestVersion()
-        {
-            IsActive = true;
-        }
-
-        public void SetAsOldVersion()
-        {
-            IsActive = false;
-        }
-
-        public Law CreateNewVersion(string title, List<string> notifications, string headTitle, List<LawItem> items)
-        {
-            var newVersion = new Law(
-                title,
-                this.Type,
-                notifications,
-                headTitle,
-                this.Version + 1
-            );
-            
-            newVersion.SetItem(items);
-            newVersion.SetAsLatestVersion();
-            
-            return newVersion;
-        }
-    }
-
-    public class LawItem
-    {
-        public long Id { get; set; }
-        public string Header { get; private set; }
-        public string Details { get; private set; }
-        public int OrderNumber { get; private set; }
-        public long LawId { get; set; }
-
-        protected LawItem() { }
-
-        public LawItem(string header, string details, int orderNumber)
-        {
-            Header = header;
-            Details = details;
-            OrderNumber = orderNumber;
-        }
-    }
-}

Company.Domain/LeaveAgg/ILeaveRepository.cs

@@ -22,7 +22,7 @@ public interface ILeaveRepository : IRepository<long, Leave>
 
     bool CheckContractExist(DateTime myDate,long employeeId, long workshopId);
 
-    LeavErrorViewModel CheckErrors(DateTime startLeav, DateTime endLeav, long employeeId, long workshopId,bool isInvalid);
+    LeavErrorViewModel CheckErrors(DateTime startLeav, DateTime endLeav, long employeeId, long workshopId);
     LeaveViewModel LeavOnChekout(DateTime starContract, DateTime endContract, long employeeId, long workshopId);
     List<LeaveMainViewModel> searchClient(LeaveSearchModel searchModel);
     LeavePrintViewModel PrintOne(long id);