set leftWork

2025-04-05 21:44:05 +03:30
1741 changed files with 105117 additions and 1610139 deletions
--- a/.github/workflows/dotnet-developPublish.yml
+++ b/.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 }}
--- a/.gitignore
+++ b/.gitignore
@@ -361,4 +361,4 @@ MigrationBackup/

 # # Fody - auto-generated XML schema
 # FodyWeavers.xsd
-.idea
+
--- a/0_Framework/0_Framework.csproj
+++ b/0_Framework/0_Framework.csproj
@@ -14,26 +14,7 @@
    <PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
    <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>
--- a/0_Framework/Application/AppSettingConfiguration.cs
+++ b/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;
-}
--- a/0_Framework/Application/AuthHelper.cs
+++ b/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,157 @@ 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) GetUserTypeWithId()
+    {
+        if (!IsAuthenticated())
+            return (0, UserType.Anonymous);
+        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);

-		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")
+            return (id, UserType.Admin);

-		return (id, UserType.Client, 0);
-	}
-	#endregion
+        return (id, UserType.Client);
+    }
+    #endregion


 }
--- a/0_Framework/Application/AuthViewModel.cs
+++ b/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; }

--- a/0_Framework/Application/Enums/ActivationStatus.cs
+++ b/0_Framework/Application/Enums/ActivationStatus.cs
@@ -1,8 +0,0 @@
-namespace _0_Framework.Application.Enums;
-
-public enum ActivationStatus
-{
-    None = 0,
-    Active = 1,
-    DeActive = 2
-}
--- a/0_Framework/Application/Enums/InstitutionContractVerificationStatus.cs
+++ b/0_Framework/Application/Enums/InstitutionContractVerificationStatus.cs
@@ -1,22 +0,0 @@
-namespace _0_Framework.Application.Enums;
-
-/// <summary>
-/// وضعیت تایید قرادا مالی
-/// </summary>
-public enum InstitutionContractVerificationStatus
-{
-    /// <summary>
-    /// در انتظار تایید
-    /// </summary>
-    PendingForVerify = 0,
-
-    /// <summary>
-    ///  در انتظار کارپوشه
-    /// </summary>
-    PendingWorkflow = 1,
-
-    /// <summary>
-    /// تایید شده
-    /// </summary>
-    Verified = 2
-}
--- a/0_Framework/Application/Enums/LegalType.cs
+++ b/0_Framework/Application/Enums/LegalType.cs
@@ -1,8 +0,0 @@
-namespace _0_Framework.Application.Enums;
-
-public enum LegalType
-{
-    None = 0,
-    Real = 1,
-    Legal = 2
-}
--- a/0_Framework/Application/Enums/TypeOfCheckoutWarning.cs
+++ b/0_Framework/Application/Enums/TypeOfCheckoutWarning.cs
@@ -1,15 +0,0 @@
-namespace _0_Framework.Application.Enums;
-
-public enum TypeOfCheckoutWarning
-{
-    /// <summary>
-    /// هشدار های متفرقه
-    /// </summary>
-    OthersWarning,
-    /// <summary>
-    /// هشدار سهم بیمه کارگر
-    /// </summary>
-    InsuranceEmployeeShare,
-
-
-}
--- a/0_Framework/Application/Enums/TypeOfSmsSetting.cs
+++ b/0_Framework/Application/Enums/TypeOfSmsSetting.cs
@@ -1,36 +0,0 @@
-namespace _0_Framework.Application.Enums;
-
-public enum TypeOfSmsSetting
-{
-
-    /// <summary>
-    /// پیامک
-    /// یادآور بدهی ماهیانه قرارداد مالی
-    /// </summary>
-    InstitutionContractDebtReminder,
-
-    /// <summary>
-    /// پیامک
-    /// صورت حساب ماهانه قرارداد مالی
-    /// </summary>
-    MonthlyInstitutionContract,
-
-    /// <summary>
-    /// پیامک
-    /// اعلام مسدودی طرف حساب
-    /// </summary>
-    BlockContractingParty,
-
-    /// <summary>
-    /// پیامک
-    /// هشدار اول
-    /// </summary>
-    Warning,
-
-
-    /// <summary>
-    ///پیامک اقدام قضائی
-    /// </summary>
-    LegalAction,
-
-}
--- a/0_Framework/Application/FaceEmbedding/IFaceEmbeddingNotificationService.cs
+++ b/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);
-}
-
--- a/0_Framework/Application/FaceEmbedding/IFaceEmbeddingService.cs
+++ b/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; }
-}
--- a/0_Framework/Application/IAuthHelper.cs
+++ b/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();
+    (long Id, UserType userType) GetUserTypeWithId();
 }
--- a/0_Framework/Application/IsActive.cs
+++ b/0_Framework/Application/IsActive.cs
@@ -4,5 +4,5 @@ public enum IsActive
 {
 	False,
 	True,
-    None
+   
 }
--- a/0_Framework/Application/OperationResult.cs
+++ b/0_Framework/Application/OperationResult.cs
@@ -51,11 +51,4 @@ public class OperationResult<T>
        Message = message;
        return this;
    }
-    public OperationResult<T> Failed(string message, T data)
-    {
-        IsSuccedded = false;
-        Message = message;
-        Data = data;
-        return this;
-    }
 }
--- a/0_Framework/Application/PagedResult.cs
+++ b/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; }
-}
--- a/0_Framework/Application/PaginationRequest.cs
+++ b/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;
-}
--- a/0_Framework/Application/PaymentGateway/AqayePardakhtPaymentGateway.cs
+++ b/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.TransactionId,
-            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.TransactionId,
-            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;
-    }
-}
--- a/0_Framework/Application/PaymentGateway/IPaymentGateway.cs
+++ b/0_Framework/Application/PaymentGateway/IPaymentGateway.cs
@@ -1,67 +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 TransactionId { get; set; }
-    public string CallBackUrl { get; set; }
-    public string CardNumber { get; set; }
-    public string Mobile { get; set; }
-    public string Email { get; set; }
-    public string Description { get; set; }
-    public long FinancialInvoiceId { 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; }
-}
--- a/0_Framework/Application/PaymentGateway/SepehrPaymentGateway.cs
+++ b/0_Framework/Application/PaymentGateway/SepehrPaymentGateway.cs
@@ -1,98 +0,0 @@
-using System;
-using System.Collections.Generic;
-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)
-	{
-		command.ExtraData ??= new Dictionary<string, object>();
-		command.ExtraData.Add("financialInvoiceId", command.FinancialInvoiceId);
-		var extraData = JsonConvert.SerializeObject(command.ExtraData);
-		var res = await _httpClient.PostAsJsonAsync("GetToken", new
-		{
-			TerminalID = TerminalId,
-			Amount = command.Amount,
-			InvoiceID = command.TransactionId,
-			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();
-	}
-}
--- a/0_Framework/Application/SelectListViewModel.cs
+++ b/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; }
-}
--- a/0_Framework/Application/Sms/ISmsService.cs
+++ b/0_Framework/Application/Sms/ISmsService.cs
@@ -9,83 +9,10 @@ public interface ISmsService
    void Send(string number, string message);
    bool VerifySend(string number, string message);
    bool LoginSend(string number, string message);
-    /// <summary>
-    /// ارسال کد به کلاینت برای تکمیل فرایند ثبت نام
-    /// </summary>
-    /// <param name="number"></param>
-    /// <param name="code"></param>
-    /// <returns></returns>
-    Task<SentSmsViewModel> SendVerifyCodeToClient(string number, string code);
    bool SendAccountsInfo(string number,string fullName, string userName);
    Task<ApiResultViewModel> GetByMessageId(int messId);
    Task<List<ApiResultViewModel>> GetApiResult(string startDate, string endDate);
    string DeliveryStatus(byte? dv);
    string DeliveryColorStatus(byte? dv);
    string UnixTimeStampToDateTime(int? unixTimeStamp);
-
-    #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);
-
-    SmsResult TaskReminderSms(string number, string taskCount);
-
-    #endregion
-
-
-    #region InstitutionContractSMS
-    /// <summary>
-    /// پیامک اهانه جدید
-    /// </summary>
-    /// <param name="number"></param>
-    /// <param name="tamplateId"></param>
-    /// <param name="fullname"></param>
-    /// <param name="amount"></param>
-    /// <param name="code1"></param>
-    /// <param name="code2"></param>
-    /// <returns></returns>
-    Task<(byte status, string message, int messaeId, bool isSucceded)> MonthlyBillNew(string number, int tamplateId, string fullname, string amount, string code1,
-        string code2);
-    /// <summary>
-    /// پیامک ماهانه قدیم
-    /// </summary>
-    /// <param name="number"></param>
-    /// <param name="tamplateId"></param>
-    /// <param name="fullname"></param>
-    /// <param name="amount"></param>
-    /// <param name="id"></param>
-    /// <param name="aprove"></param>
-    /// <returns></returns>
-    Task<(byte status, string message, int messaeId, bool isSucceded)> MonthlyBill(string number, int tamplateId, string fullname, string amount, string id, string aprove);
-   
-    /// <summary>
-    /// پیامک مسدودی طرف حساب
-    /// </summary>
-    /// <param name="number"></param>
-    /// <param name="fullname"></param>
-    /// <param name="amount"></param>
-    /// <param name="accountType"></param>
-    /// <param name="id"></param>
-    /// <param name="aprove"></param>
-    /// <returns></returns>
-    Task<(byte status, string message, int messaeId, bool isSucceded)> BlockMessage(string number, string fullname, string amount, string accountType, string id, string aprove);
-
-    #endregion
-
-    #region AlarmMessage
-
-    /// <summary>
-    /// ارسال پیامک های خطا یا اعمال ارسال
-    /// </summary>
-    /// <param name="number"></param>
-    /// <param name="message"></param>
-    /// <returns></returns>
-    Task<bool> Alarm(string number, string message);
-
-    #endregion
-
 }
--- a/0_Framework/Application/Sms/OtpResultViewModel.cs
+++ b/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; }
-}
--- a/0_Framework/Application/Sms/SentSmsViewModel.cs
+++ b/0_Framework/Application/Sms/SentSmsViewModel.cs
@@ -1,32 +0,0 @@
-namespace _0_Framework.Application;
-
-public class SentSmsViewModel
-{
-    public SentSmsViewModel()
-    {
-        IsSuccedded = false;
-    }
-
-    public bool IsSuccedded { get; set; }
-    public string Message { get; set; }
-    public byte StatusCode { get; set; }
-    public int MessageId { get; set; }
-
-    public SentSmsViewModel Succedded(byte statusCode, string message, int messageId)
-    {
-        IsSuccedded = true;
-        Message = message;
-        StatusCode = statusCode;
-        MessageId = messageId;
-        return this;
-    }
-
-    public SentSmsViewModel Failed(byte statusCode, string message, int messageId)
-    {
-        IsSuccedded = false;
-        Message = message;
-        StatusCode = statusCode;
-        MessageId = messageId;
-        return this;
-    }
-}
--- a/0_Framework/Application/Sms/SmsResult.cs
+++ b/0_Framework/Application/Sms/SmsResult.cs
@@ -1,32 +0,0 @@
-namespace _0_Framework.Application.Sms;
-
-public class SmsResult
-{
-    public SmsResult()
-    {
-        IsSuccedded = false;
-    }
-
-    public bool IsSuccedded { get; set; }
-    public string Message { get; set; }
-    public byte StatusCode { get; set; }
-    public int MessageId { get; set; }
-
-    public SmsResult Succedded(byte statusCode, string message, int messageId)
-    {
-        IsSuccedded = true;
-        Message = message;
-        StatusCode = statusCode;
-        MessageId = messageId;
-        return this;
-    }
-
-    public SmsResult Failed(byte statusCode, string message, int messageId)
-    {
-        IsSuccedded = false;
-        Message = message;
-        StatusCode = statusCode;
-        MessageId = messageId;
-        return this;
-    }
-}
--- a/0_Framework/Application/Sms/SmsService.cs
+++ b/0_Framework/Application/Sms/SmsService.cs
@@ -0,0 +1,288 @@
+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 IPE.SmsIrClient;
+using IPE.SmsIrClient.Models.Requests;
+using IPE.SmsIrClient.Models.Results;
+using Microsoft.Extensions.Configuration;
+
+
+namespace _0_Framework.Application.Sms;
+
+public class SmsService : ISmsService
+{
+    private readonly IConfiguration _configuration;
+
+    public SmsService(IConfiguration configuration)
+    {
+        _configuration = configuration;
+    }
+
+    public void Send(string number, string message)
+    {
+        //var token = GetToken();
+        //var lines = new SmsLine().GetSmsLines(token);
+        //if (lines == null) return;
+
+        //var line = lines.SMSLines.Last().LineNumber.ToString();
+        //var data = new MessageSendObject
+        //{
+        //    Messages = new List<string>
+        //        {message}.ToArray(),
+        //    MobileNumbers = new List<string> {number}.ToArray(),
+        //    LineNumber = line,
+        //    SendDateTime = DateTime.Now,
+        //    CanContinueInCaseOfError = true
+        //};
+        //var messageSendResponseObject = 
+        //    new MessageSend().Send(token, data);
+
+        //if (messageSendResponseObject.IsSuccessful) return;
+
+        //line = lines.SMSLines.First().LineNumber.ToString();
+        //data.LineNumber = line;
+        //new MessageSend().Send(token, data);
+    }
+    public bool VerifySend(string number, string 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)
+        {
+                
+            var resStartStatus = verificationSendResult.Result;
+            var b = resStartStatus.Status;
+            var resResult = verificationSendResult.Status;
+            var a = verificationSendResult.IsCompleted;
+            var reseExceptiont = verificationSendResult.Exception;
+            return true;
+        }
+        else
+        {
+               
+            var resStartStatus = verificationSendResult.Status;
+            var resResult = verificationSendResult.Status;
+            var reseExceptiont = verificationSendResult.Exception;
+
+            return false;
+        }
+
+
+
+
+    }
+
+    public bool LoginSend(string number, string 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)
+        {
+
+            var resStartStatus = verificationSendResult.Result;
+            var b = resStartStatus.Status;
+            var resResult = verificationSendResult.Status;
+            var a = verificationSendResult.IsCompleted;
+            var reseExceptiont = verificationSendResult.Exception;
+            return true;
+        }
+        else
+        {
+
+            var resStartStatus = verificationSendResult.Status;
+            var resResult = verificationSendResult.Status;
+            var reseExceptiont = verificationSendResult.Exception;
+
+            return false;
+        }
+    }
+
+    public bool SendAccountsInfo(string number, string fullName, string userName)
+    {
+
+        var checkLength = fullName.Length;
+        if (checkLength > 25)
+            fullName = fullName.Substring(0, 24);
+        SmsIr smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
+
+        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);
+        if (sendResult.IsCompletedSuccessfully)
+        {
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+
+    }
+
+    public async Task<ApiResultViewModel> GetByMessageId(int messId)
+    {
+
+        SmsIr smsIr = new SmsIr("Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
+        var response = await smsIr.GetReportAsync(messId);
+        MessageReportResult messages = response.Data;
+       
+        var appendData = new ApiResultViewModel()
+            {
+                MessageId = messages.MessageId,
+                LineNumber = messages.LineNumber,
+                Mobile = messages.Mobile,
+                MessageText = messages.MessageText,
+                SendUnixTime = UnixTimeStampToDateTime(messages.SendDateTime),
+                DeliveryState = DeliveryStatus(messages.DeliveryState),
+                DeliveryUnixTime = UnixTimeStampToDateTime(messages.DeliveryDateTime),
+                DeliveryColor = DeliveryColorStatus(messages.DeliveryState),
+            };
+            return appendData;
+    }
+    public async Task<List<ApiResultViewModel>> GetApiResult(string startDate, string endDate)
+    {
+        var st = new DateTime(2024, 6, 2);
+        var ed = new DateTime(2024, 7, 1);
+        if (!string.IsNullOrWhiteSpace(startDate) && startDate.Length == 10)
+        {
+            st = startDate.ToGeorgianDateTime();
+        }
+        if (!string.IsNullOrWhiteSpace(endDate) && endDate.Length == 10)
+        {
+            ed = endDate.ToGeorgianDateTime();
+        }
+        var res = new List<ApiResultViewModel>();
+        Int32 unixTimestamp = (int)st.Subtract(new DateTime(1970,1,1)).TotalSeconds;
+        Int32 unixTimestamp2 = (int)ed.Subtract(new DateTime(1970, 1, 1)).TotalSeconds;
+     //   int? fromDateUnixTime = null; // unix time - for instance: 1700598600
+	    //int? toDateUnixTime = null; // unix time - for instance: 1703190600
+	    int pageNumber = 2;
+	    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)
+	    {
+		    var appendData =  new ApiResultViewModel()
+		    { 
+                MessageId = message.MessageId,
+                LineNumber = message.LineNumber,
+                Mobile = message.Mobile,
+                MessageText = message.MessageText,
+                SendUnixTime = UnixTimeStampToDateTime(message.SendDateTime),
+                DeliveryState = DeliveryStatus(message.DeliveryState),
+                DeliveryUnixTime = UnixTimeStampToDateTime(message.DeliveryDateTime),
+                DeliveryColor = DeliveryColorStatus(message.DeliveryState),
+            };
+		    res.Add(appendData);
+	    }
+
+       
+        return res;
+	}
+
+    public string DeliveryStatus(byte? dv)
+    {
+        string mess = "";
+        switch (dv)
+        {
+            case 1:
+                mess = "رسیده به گوشی";
+                break;
+            case 2:
+                mess = "نرسیده به گوشی";
+                break;
+            case 3:
+                mess = "پردازش در مخابرات";
+                break;
+            case 4:
+                mess = "نرسیده به مخابرات";
+                break;
+            case 5:
+                mess = "سیده به مخابرات";
+                break;
+            case 6:
+                mess = "خطا";
+                break;
+            case 7:
+                mess = "لیست سیاه";
+                break;
+            default:
+                mess="";
+                break;
+
+        }
+
+        return mess;
+    }
+    public string DeliveryColorStatus(byte? dv)
+    {
+        string mess = "";
+        switch (dv)
+        {
+            case 1:
+                mess = "successSend";
+                break;
+            case 2:
+                mess = "errSend";
+                break;
+            case 3:
+                mess = "pSend";
+                break;
+            case 4:
+                mess = "noSend";
+                break;
+            case 5:
+                mess = "itcSend";
+                break;
+            case 6:
+                mess = "redSend";
+                break;
+            case 7:
+                mess = "blockSend";
+                break;
+            default:
+                mess = "";
+                break;
+
+        }
+
+        return mess;
+    }
+    public string UnixTimeStampToDateTime(int? unixTimeStamp)
+    {
+        if (unixTimeStamp != null)
+        {
+            // Unix timestamp is seconds past epoch
+            DateTime dateTime = new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc);
+            dateTime = dateTime.AddSeconds(Convert.ToDouble(unixTimeStamp)).ToLocalTime();
+            var time = dateTime.ToFarsiFull();
+            return time;
+        }
+
+        return "";
+    }
+    private string GetToken()
+    {
+        return "";
+        //var smsSecrets = _configuration.GetSection("SmsSecrets");
+        //var tokenService = new Token();
+        //return tokenService.GetToken("x-api-key", "Og5M562igmzJRhQPnq0GdtieYdLgtfikjzxOmeQBPxJjZtyge5Klc046Lfw1mxSa");
+    }
+}
--- a/0_Framework/Application/StaticWorkshopAccounts.cs
+++ b/0_Framework/Application/StaticWorkshopAccounts.cs
@@ -14,25 +14,14 @@ public static class StaticWorkshopAccounts
    /// </summary>
    public static List<long> SelectedAccountsRoleIds = [3, 5, 7, 8];

-    /// <summary>
-    /// لیستی آی دی نقش هایی که دردسترسی به تب افزودن پرسنل و مدارک کلاینت دارند
-    /// 3 : قرارداد ارشد
-    /// 5 : قرارداد ساده
-    /// 19 : برنامه نویسان
-    /// 1 : مدیر سیستم 
-    /// </summary>
-    public static List<long> EmployeeDocumentWorkFlowRoleIds = [1,3, 5, 19];
-
    /// <summary>
    /// لیست اکانتهایی که به همه کارگاه ها باید دسترسی داشته باشند
    /// 2 - صادق فرخی
    /// 3 - میلاد مصباح
    /// 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];

    /// <summary>
    /// این تاریخ در جدول اکانت لفت ورک به این معنیست
--- a/0_Framework/Application/SubAccountPermissionHelper.cs
+++ b/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
--- a/0_Framework/Application/Tools.cs
+++ b/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>
    /// دریافت روزهای کارکرد پرسنل در لیست بیمه ماه مشخص شده
@@ -69,81 +52,81 @@ public static class Tools
    /// <param name="endDate"></param>
    /// <param name="employeeId"></param>
    /// <returns></returns>
-    public static (int countWorkingDays, DateTime startWork, DateTime endWork, bool hasStartWorkInMonth, bool hasLeftWorkInMonth) GetEmployeeInsuranceWorkingDays(DateTime startWork, DateTime? leftWork, DateTime startDate,
-        DateTime endDate, long employeeId)
+    public static (int countWorkingDays,DateTime startWork,DateTime endWork,bool hasStartWorkInMonth,bool hasLeftWorkInMonth) GetEmployeeInsuranceWorkingDays(DateTime startWork,DateTime? leftWork,DateTime startDate,
+	    DateTime endDate,long employeeId)
    {
-        DateTime start = startDate;
+	    DateTime start = startDate;
        DateTime end = endDate;
        bool startWorkInMonth = false;
        bool endWorkInMonth = false;
-
+    
        //اگر شروع بکار پرسنل در ماه مشخص شده لیست بیمه بود
        if (startWork >= startDate)
        {
-            start = startWork;
-            startWorkInMonth = true;
+	        start = startWork;
+	        startWorkInMonth = true;
        }

-        if (leftWork == null)
+        if(leftWork == null)
            leftWork = DateTime.MinValue;
        //اگر ترک کار پرسنل در ماه مشخص شده لیست بیمه بود
        if (leftWork != DateTime.MinValue && leftWork.Value < endDate)
        {
-            end = leftWork.Value;
+	        end = leftWork.Value;
            endWorkInMonth = true;
        }

-        int countDays = (int)(end - start).TotalDays + 1;
+        int countDays = (int)(end - start).TotalDays +1;


        //روزهای کارکرد پرسنل با آی دی های زیر دستی تعریف شد
        switch (employeeId)
        {

-            //case 3812://ثابت- کسری حاجی پور
-            //    countWorkingDays = 15;
-            //    break;
-            case 40463://ثابت
-                countDays = 10;
-                break;
-            case 40469://ثابت
-                countDays = 7;
-                break;
-            //case 9950://ثابت
-            // countDays = 15;
-            //break;
-            case 9640://ثابت
-                countDays = 15;
-                break;
-            case 40998://ثابت
-                countDays = 15;
-                break;
-            case 6219://ثابت
-                countDays = 15;
-                break;
-                //case 7897://ثابت
-                //    countWorkingDays = 15;
+	        //case 3812://ثابت- کسری حاجی پور
+	        //    countWorkingDays = 15;
+	        //    break;
+	        case 40463://ثابت
+		        countDays = 10;
+		        break;
+	        case 40469://ثابت
+		        countDays = 7;
+		        break;
+	        //case 9950://ثابت
+		       // countDays = 15;
+		        //break;
+	        case 9640://ثابت
+		        countDays = 15;
+		        break;
+	        case 40998://ثابت
+		        countDays = 15;
+		        break;
+	        case 6219://ثابت
+		        countDays = 15;
+		        break;
+		        //case 7897://ثابت
+		        //    countWorkingDays = 15;
        }


-        return (countDays, start, end, startWorkInMonth, endWorkInMonth);
+		return (countDays,start,end,startWorkInMonth,endWorkInMonth);
    }
-    /// <summary>
-    /// محاسبه سن 
-    /// </summary>
-    /// <param name="startDate"></param>
-    /// <param name="endDate"></param>
-    /// <returns></returns>
-    public static (int yearCount, int monthCount, int dayCount) GetAge(DateTime startDate, DateTime endDate)
+	/// <summary>
+	/// محاسبه سن 
+	/// </summary>
+	/// <param name="startDate"></param>
+	/// <param name="endDate"></param>
+	/// <returns></returns>
+	public static (int yearCount, int monthCount, int dayCount) GetAge(DateTime startDate, DateTime endDate)
    {
-
+  
        var startFa = startDate.ToFarsi();
        int startYear = Convert.ToInt32(startFa.Substring(0, 4));
        int startMonth = Convert.ToInt32(startFa.Substring(5, 2));
        int startDay = Convert.ToInt32(startFa.Substring(8, 2));
        var start = new PersianDateTime(startYear, startMonth, startDay);

-
+     
        var endFa = endDate.ToFarsi();
        int endYear = Convert.ToInt32(endFa.Substring(0, 4));
        int endMonth = Convert.ToInt32(endFa.Substring(5, 2));
@@ -158,7 +141,7 @@ public static class Tools
        if (firstYearCounter > end)
        {
            start = start.AddYears(-1);
-
+          
            var endMonthCounter = new PersianDateTime(end.Year, end.Month, start.Day);

            for (var monthCounter = start; monthCounter <= end; monthCounter = monthCounter.AddMonths(1))
@@ -210,7 +193,7 @@ public static class Tools
                if (yearCouner.Year == end.Year)
                {

-                    var endMonthCounter = new PersianDateTime(end.Year, end.Month, (yearCouner.Day > end.Day ? end.Day : yearCouner.Day));
+                    var endMonthCounter = new PersianDateTime(end.Year, end.Month, (yearCouner.Day > end.Day ? end.Day :  yearCouner.Day));

                    if (yearCouner.Day <= end.Day)
                    {
@@ -261,7 +244,7 @@ public static class Tools

        Console.ResetColor();
        Console.WriteLine($"old: [{years} year] ، [{months} month] ، [{days} day]");
-        return (years, months, days);
+        return (years,months,days);
    }

    public static string ToFarsi(this DateTime? date)
@@ -414,9 +397,9 @@ public static class Tools

    public static DateTime ToGeorgianDateTime(this string persianDate)
    {
+        persianDate = persianDate.ToEnglishNumber();
        try
        {
-            persianDate = persianDate.ToEnglishNumber();
            var year = Convert.ToInt32(persianDate.Substring(0, 4));
            var month = Convert.ToInt32(persianDate.Substring(5, 2));
            var day = Convert.ToInt32(persianDate.Substring(8, 2));
@@ -475,46 +458,25 @@ public static class Tools
    public static double MoneyToDouble(this string myMoney)
    {
        string bb = string.Empty;
-        bool isNegative = false;

-        try
+        for (int x = 0; x < myMoney.Length; x++)
        {
-            if (!string.IsNullOrWhiteSpace(myMoney))
-            {
-                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;
-                }
-            }
-            else
-            {
-                return 0;
-            }
-            
+            if (char.IsDigit(myMoney[x]))
+                bb += myMoney[x];
        }
-        catch (Exception)
-        {

+        if (bb.Length > 0)
+        {
+            double res = double.Parse(bb);
+            return res;
+        }
+        else
+        {
            return 0;
        }
+
+
+
    }
    public static string ToFileName(this DateTime date)
    {
@@ -636,90 +598,90 @@ public static class Tools
    /// <returns></returns>
    public static int YearTotalDays(this string date)
    {
-        int y2 = 366;
+        int y2 = 365;
        var year = Convert.ToInt32(date.Substring(0, 4));


        switch (year)
        {
            case 1346:
-                y2 = 367;
+                y2 = 366;
                break;
            case 1350:
-                y2 = 367;
+                y2 = 366;
                break;
            case 1354:
-                y2 = 367;
+                y2 = 366;
                break;
            case 1358:
-                y2 = 367;
+                y2 = 366;
                break;
            case 1362:
-                y2 = 367;
+                y2 = 366;
                break;
            case 1366:
-                y2 = 367;
+                y2 = 366;
                break;
            case 1370:
-                y2 = 367;
+                y2 = 366;
                break;
            case 1375:
-                y2 = 367;
+                y2 = 366;
                break;
            case 1379:
-                y2 = 367;
+                y2 = 366;
                break;
            case 1383:
-                y2 = 367;
+                y2 = 366;
                break;
            case 1387:
-                y2 = 367;
+                y2 = 366;
                break;
            case 1391:
-                y2 = 367;
+                y2 = 366;
                break;
            case 1395:
-                y2 = 367;
+                y2 = 366;
                break;
            case 1399:
-                y2 = 367;
+                y2 = 366;
                break;
            case 1403:
-                y2 = 367;
+                y2 = 366;
                break;
            case 1408:
-                y2 = 367;
+                y2 = 366;
                break;
            case 1412:
-                y2 = 367;
+                y2 = 366;
                break;
            case 1416:
-                y2 = 367;
+                y2 = 366;
                break;
            case 1420:
-                y2 = 367;
+                y2 = 366;
                break;
            case 1424:
-                y2 = 367;
+                y2 = 366;
                break;
            case 1428:
-                y2 = 367;
+                y2 = 366;
                break;
            case 1432:
-                y2 = 367;
+                y2 = 366;
                break;
            case 1436:
-                y2 = 367;
+                y2 = 366;
                break;
            case 1441:
-                y2 = 367;
+                y2 = 366;
                break;
            case 1445:
-                y2 = 367;
+                y2 = 366;
                break;

            default:
-                y2 = 366;
+                y2 = 365;
                break;

        }
@@ -913,15 +875,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)
@@ -930,39 +884,30 @@ public static class Tools
        string result = "";
        switch (value)
        {
-            case "1":
            case "01":
                result = "فروردین";
                break;
-            case "2":
            case "02":
                result = "اردیبهشت";
                break;
-            case "3":
            case "03":
                result = "خرداد";
                break;
-            case "4":
            case "04":
                result = "تیر";
                break;
-            case "5":
            case "05":
                result = "مرداد";
                break;
-            case "6":
            case "06":
                result = "شهریور";
                break;
-            case "7":
            case "07":
                result = "مهر";
                break;
-            case "8":
            case "08":
                result = "آبان";
                break;
-            case "9":
            case "09":
                result = "آذر";
                break;
@@ -1322,16 +1267,16 @@ public static class Tools
            var part5 = parts[5].Substring(0, 2);


-            try
+			try
            {
                PersianCalendar pc = new PersianCalendar();
-                dateTime = pc.ToDateTime(int.Parse(parts[1]), int.Parse(parts[2]), int.Parse(parts[3]), int.Parse(parts[4]), int.Parse(part5), 0, 0, 0);
-
+                 dateTime = pc.ToDateTime(int.Parse(parts[1]), int.Parse(parts[2]), int.Parse(parts[3]), int.Parse(parts[4]), int.Parse(part5), 0, 0, 0);
+             
            }
            catch (Exception e)
            {

-
+               
            }

        }
@@ -1437,89 +1382,14 @@ 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();
-        return ($"{pc.GetYear(date)}/{pc.GetMonth(date):00}/01").ToGeorgianDateTime();
+	    var pc = new PersianCalendar();
+	    return ($"{pc.GetYear(date)}/{pc.GetMonth(date):00}/01").ToGeorgianDateTime();
    }
    #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>
@@ -1533,8 +1403,6 @@ public static class Tools

            if (@char == char.Parse("ي"))
                res += "ی";
-            else if (@char == char.Parse("ك"))
-                res += "ک";
            else
                res += @char;
        }
@@ -1720,19 +1588,19 @@ public static class Tools

    public static TimeOnly CalculateOffset(ICollection<CustomizeSifts> shiftDetailsRegularShifts)
    {
-        if (!shiftDetailsRegularShifts.Any())
-        {
-            return TimeOnly.MinValue;
-        }
-        var date = new DateOnly();
-        var firstStartShift = new DateTime(date, shiftDetailsRegularShifts.MinBy(x => x.Placement).StartTime);
-        var lastEndShift = new DateTime(date, shiftDetailsRegularShifts.MaxBy(x => x.Placement).EndTime);
-        if (lastEndShift > firstStartShift)
-            firstStartShift = firstStartShift.AddDays(1);
-        var offSet = (firstStartShift - lastEndShift).Divide(2);
-        return TimeOnly.FromDateTime(lastEndShift.Add(offSet));
+	    if (!shiftDetailsRegularShifts.Any())
+	    {
+		    return TimeOnly.MinValue;
+	    }
+	    var date = new DateOnly();
+	    var firstStartShift = new DateTime(date, shiftDetailsRegularShifts.MinBy(x => x.Placement).StartTime);
+	    var lastEndShift = new DateTime(date, shiftDetailsRegularShifts.MaxBy(x => x.Placement).EndTime);
+	    if (lastEndShift > firstStartShift)
+		    firstStartShift = firstStartShift.AddDays(1);
+	    var offSet = (firstStartShift - lastEndShift).Divide(2);
+	    return TimeOnly.FromDateTime(lastEndShift.Add(offSet));
    }
-    public static DateTime GetNextDayOfWeek(this DateTime date, DayOfWeek dayOfWeek)
+	public static DateTime GetNextDayOfWeek(this DateTime date, DayOfWeek dayOfWeek)
    {
        int numberOfNextDayOfWeek = ((int)dayOfWeek - (int)date.DayOfWeek + 7) % 7;
        return date.AddDays(numberOfNextDayOfWeek == 0 ? 7 : numberOfNextDayOfWeek);
@@ -1812,10 +1680,6 @@ public static class Tools

    }

-
-
-
-
    #endregion

    #region Pooya
@@ -1908,75 +1772,75 @@ public static class Tools
    public static string ToFarsiHoursAndMinutes(int hours, int minutes, string emptyValue = "")
    {

-        string message = emptyValue;
-        if (hours > 0 && minutes > 0)
-        {
+	    string message = emptyValue;
+	    if (hours > 0 && minutes > 0)
+	    {

-            message = hours + " " + "ساعت و" + " " + minutes + " " + "دقیقه";
-        }
-        else if (hours > 0 && minutes == 0)
-        {
+		    message = hours + " " + "ساعت و" + " " + minutes + " " + "دقیقه";
+	    }
+	    else if (hours > 0 && minutes == 0)
+	    {

-            message = hours + " " + "ساعت ";
-        }
-        else if (hours == 0 && minutes > 0)
-        {
+		    message = hours + " " + "ساعت ";
+	    }
+	    else if (hours == 0 && minutes > 0)
+	    {

-            message = minutes + " " + "دقیقه";
-        }
+		    message = minutes + " " + "دقیقه";
+	    }

-        return message;
+	    return message;
    }
-    public static string ToFarsiHoursAndMinutes(this TimeSpan timeSpan, string emptyValue = "")
+	public static string ToFarsiHoursAndMinutes(this TimeSpan timeSpan, string emptyValue = "")
    {
-        var hours = (int)timeSpan.TotalHours;
-        var minutes = timeSpan.Minutes;
-        string message = emptyValue;
-        if (hours > 0 && minutes > 0)
-        {
+	    var hours = (int)timeSpan.TotalHours;
+	    var minutes = timeSpan.Minutes;
+	    string message = emptyValue;
+	    if (hours > 0 && minutes > 0)
+	    {

-            message = hours + " " + "ساعت و" + " " + minutes + " " + "دقیقه";
-        }
-        else if (hours > 0 && minutes == 0)
-        {
+		    message = hours + " " + "ساعت و" + " " + minutes + " " + "دقیقه";
+	    }
+	    else if (hours > 0 && minutes == 0)
+	    {

-            message = hours + " " + "ساعت ";
-        }
-        else if (hours == 0 && minutes > 0)
-        {
+		    message = hours + " " + "ساعت ";
+	    }
+	    else if (hours == 0 && minutes > 0)
+	    {

-            message = minutes + " " + "دقیقه";
-        }
+		    message = minutes + " " + "دقیقه";
+	    }

-        return message;
+	    return message;
    }
-    public static string ToFarsiDaysAndHoursAndMinutes(this TimeSpan timeSpan, string emptyValue = "")
-    {
-        var hours = (int)timeSpan.TotalHours;
-        var minutes = timeSpan.Minutes;
-        var days = hours / 24;
-        hours = hours % 24;
-        string message = "";
+	public static string ToFarsiDaysAndHoursAndMinutes(this TimeSpan timeSpan, string emptyValue = "")
+	{
+		var hours = (int)timeSpan.TotalHours;
+		var minutes = timeSpan.Minutes;
+		var days = hours / 24;
+		hours = hours % 24;
+		string message = "";

-        if (days > 0)
-            message += days + " " + "روز";
-        if (hours > 0)
-            if (message == "")
-                message += hours + " " + "ساعت";
-            else
-                message += " و " + hours + " " + "ساعت";
-        if (minutes > 0)
-            if (message == "")
-                message += minutes + " " + "دقیقه";
-            else
-                message += " و " + minutes + " " + "دقیقه";
+		if (days > 0)
+			message += days + " " + "روز";
+		if (hours > 0)
+			if (message == "")
+				message += hours + " " + "ساعت";
+			else
+				message += " و " + hours + " " + "ساعت";
+		if (minutes > 0)
+			if (message == "")
+				message += minutes + " " + "دقیقه";
+			else
+				message += " و " + minutes + " " + "دقیقه";

-        if (message == "")
-            message = emptyValue;
-        return message;
-    }
+		if (message == "")
+			message = emptyValue;
+		return message;
+	}

-    public static bool ArePropertiesEqual<T>(this T obj1, T obj2)
+	public static bool ArePropertiesEqual<T>(this T obj1, T obj2)
    {
        // If either object is null, they can't be equal
        if (obj1 == null || obj2 == null)
@@ -2009,44 +1873,5 @@ public static class Tools
        return true;
    }

-    #endregion
-
-    #region Davoodi
-
-    public static List<string> GetDaysBetweenDateGeorgian(DateTime startDate, DateTime? endDate)
-    {
-        var days = new List<string>();
-
-        if (endDate == null)
-            endDate = DateTime.Now;
-
-        var persianStartDate = new MD.PersianDateTime.Standard.PersianDateTime(startDate);
-        var persianEndDate = new MD.PersianDateTime.Standard.PersianDateTime(endDate);
-
-
-        while (persianEndDate - persianStartDate >= TimeSpan.FromDays(0))
-        {
-            days.Add(persianStartDate.ToShortDateString());
-            persianStartDate = persianStartDate.AddDays(1);
-        }
-
-        return days;
-    }
-
-    public static int GetWorkingDaysDifference(DateTime? fromDate, DateTime? toDate)
-    {
-        //var workingDays = PersianDateExtensions.GetWorkingDays(new PersianDateTime(fromDate.ToFarsi()), new PersianDateTime(toDate.ToFarsi()), true);
-        var workingDays = PersianDateExtensions.GetWorkingDays((DateTime)fromDate, (DateTime)toDate, true);
-
-
-        if (fromDate > toDate)
-            workingDays *= -1;
-
-
-        return workingDays;
-    }
-
-
-
    #endregion
 }
--- a/0_Framework/Application/UID/IUidService.cs
+++ b/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; }
-}
+
--- a/0_Framework/Application/UID/UidBanks.cs
+++ b/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
-}
--- a/0_Framework/Application/UID/UidBanksExtension.cs
+++ b/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();
-        }
-    }
-}
--- a/0_Framework/Application/UID/UidService.cs
+++ b/0_Framework/Application/UID/UidService.cs
@@ -0,0 +1,81 @@
+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");
+
+        try
+        {
+            var requestResult = await _httpClient.PostAsync("person/v2", contentType);
+            if (!requestResult.IsSuccessStatusCode)
+                return null;
+            var responseResult = await requestResult.Content.ReadFromJsonAsync<PersonalInfoResponse>();
+            responseResult.BasicInformation.FirstName = responseResult.BasicInformation.FirstName.ToPersian();
+            responseResult.BasicInformation.LastName = responseResult.BasicInformation.LastName.ToPersian();
+            responseResult.BasicInformation.FatherName = responseResult.BasicInformation.FatherName.ToPersian();
+
+
+            return responseResult;
+        }
+        catch (Exception)
+        {
+
+            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");
+        try
+        {
+            var requestResult = await _httpClient.PostAsync("mobile/owner/v2", contentType);
+            if (!requestResult.IsSuccessStatusCode)
+                return null;
+
+            var responseResult = await requestResult.Content.ReadFromJsonAsync<MatchMobileWithNationalCodeResponse>();
+            return responseResult;
+        }
+        catch (Exception e)
+        {
+            return null;
+        }
+
+    }
+}
--- a/0_Framework/Application/UserType.cs
+++ b/0_Framework/Application/UserType.cs
@@ -8,8 +8,7 @@ namespace _0_Framework.Application
        Client,
        SubAccount,
        Camera,
-        Admin,
-        System
+        Admin
    }

 }
--- a/0_Framework/Domain/CustomizeCheckoutShared/Base/BaseCustomizeEntity.cs
+++ b/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; }
 }
--- a/0_Framework/Domain/CustomizeCheckoutShared/ValueObjects/CheckoutDynamicDeductionItem.cs
+++ b/0_Framework/Domain/CustomizeCheckoutShared/ValueObjects/CheckoutDynamicDeductionItem.cs
@@ -1,9 +0,0 @@
-namespace _0_Framework.Application.Enums
-{
-    public class CheckoutDynamicDeductionItem
-    {
-        public string Name { get; set; }
-        public int Count { get; set; }
-        public string Amount { get; set; }
-    }
-}
--- a/0_Framework/Domain/IRepository.cs
+++ b/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();
-    
 }
--- a/0_Framework/Exceptions/BadRequestException.cs
+++ b/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; }
-    
 }
--- a/0_Framework/Exceptions/Handler/CustomExceptionHandler.cs
+++ b/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;
-    }
-}
--- a/0_Framework/Exceptions/UnAuthorizeException.cs
+++ b/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)
-    {
-    }
-}
--- a/0_Framework/InfraStructure/FaceEmbeddingService.cs
+++ b/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"
-			};
-		}
-	}
-}
--- a/0_Framework/InfraStructure/Mongo/MongoDbConfig.cs
+++ b/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!;
-}
--- a/0_Framework/InfraStructure/NullFaceEmbeddingNotificationService.cs
+++ b/0_Framework/InfraStructure/NullFaceEmbeddingNotificationService.cs
@@ -1,29 +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;
-    }
-}
--- a/0_Framework/InfraStructure/QueryableExtensions.cs
+++ b/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);
-    }
-}
--- a/0_Framework/InfraStructure/RepositoryBase.cs
+++ b/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();
-        }
    }
 }
--- a/ANDROID_SIGNALR_GUIDE.md
+++ b/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 | خروج از گروه کارگاه |
-
--- a/AccountManagement.Application.Contracts/Account/AccountSelectListViewModel.cs
+++ b/AccountManagement.Application.Contracts/Account/AccountSelectListViewModel.cs
@@ -1,9 +0,0 @@
-namespace AccountManagement.Application.Contracts.Account;
-
-public class AccountSelectListViewModel
-{
-    public long Id { get; set; }
-    public string Name { get; set; }
-
-    public long RoleId { get; set; }
-}
--- a/AccountManagement.Application.Contracts/Account/IAccountApplication.cs
+++ b/AccountManagement.Application.Contracts/Account/IAccountApplication.cs
@@ -41,8 +41,6 @@ public interface IAccountApplication
    List<AccountViewModel> GetAccountsByPositionId(long positionId);

    List<AccountViewModel> GetAccountEqualToLowerPositionValue();
-    Task<List<AccountSelectListViewModel>> GetAdminSelectList();
-
    OperationResult ReLogin();

    #endregion
@@ -57,20 +55,4 @@ public interface IAccountApplication
 	#endregion

 	OperationResult DirectCameraLogin(long cameraAccountId);
-
-    /// <summary>
-    /// چک میکند که آیا اکانتی با این نام کاربری وجود دارد یا نه
-    /// </summary>
-    /// <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; }
 }
--- a/AccountManagement.Application.Contracts/Media/IMediaApplication.cs
+++ b/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);
+	}
+}
--- a/AccountManagement.Application.Contracts/SubAccount/CreateSubAccount.cs
+++ b/AccountManagement.Application.Contracts/SubAccount/CreateSubAccount.cs
@@ -15,6 +15,6 @@ namespace AccountManagement.Application.Contracts.SubAccount
        public string PhoneNumber { get; set; }
        public string Username { get; set; }
        public string ProfilePhoto { get; set; }
-        //public List<long> WorkshopIds { get; set; }
+        public List<long> WorkshopIds { get; set; }
    }
 }
--- a/AccountManagement.Application.Contracts/SubAccount/CreateSubAccountRole.cs
+++ b/AccountManagement.Application.Contracts/SubAccount/CreateSubAccountRole.cs
@@ -8,6 +8,5 @@ namespace AccountManagement.Application.Contracts.SubAccount
        public string Title { get; set; }
        public long AccountId { get; set; }
        public List<int> Permissions { get; set; }
-        public List<long> WorkshopIds { get; set; }
    }
 }
--- a/AccountManagement.Application.Contracts/SubAccount/EditSubAccount.cs
+++ b/AccountManagement.Application.Contracts/SubAccount/EditSubAccount.cs
@@ -13,7 +13,7 @@ namespace AccountManagement.Application.Contracts.SubAccount
        public string PhoneNumber { get; set; }
        public string RePassword { get; set; }
        public long SubAccountRoleId { get; set; }
-        //public List<long> WorkshopIds { get; set; }
+        public List<long> WorkshopIds { get; set; }


    }
--- a/AccountManagement.Application.Contracts/SubAccount/SubAccountRoleViewModel.cs
+++ b/AccountManagement.Application.Contracts/SubAccount/SubAccountRoleViewModel.cs
@@ -7,6 +7,5 @@ namespace AccountManagement.Application.Contracts.SubAccount
        public long Id { get; set; }
        public string Title { get; set; }
        public List<int> Permissions { get; set; }
-        public List<long> WorkshopIds { get; set; }
    }
 }
--- a/AccountManagement.Application.Contracts/Task/CreateTask.cs
+++ b/AccountManagement.Application.Contracts/Task/CreateTask.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using IPE.SmsIrClient.Models.Results;
 using Microsoft.AspNetCore.Http;

 namespace AccountManagement.Application.Contracts.Task;
@@ -20,9 +19,9 @@ public class CreateTask
    #region Task Schedule

    public string ScheduleCount { get; set; }
-    public TaskScheduleType ScheduleType { get; set; }
+    public string ScheduleType{ get; set; }
    public bool HasSchedule { get; set; }
-    public TaskScheduleUnitType ScheduleUnitType { get; set; }
+    public string ScheduleUnitType { get; set; }
    public string ScheduleUnitNumber { get; set; }
    public long TaskScheduleId { get; set; }
    
@@ -31,18 +30,4 @@ public class CreateTask



-}
-
-public enum TaskScheduleType
-{
-    Limited,
-    Unlimited
-}
-
-public enum TaskScheduleUnitType
-{
-    Day,
-    Week,
-    Month,
-    Year
 }
--- a/AccountManagement.Application.Contracts/Task/EditTask.cs
+++ b/AccountManagement.Application.Contracts/Task/EditTask.cs
@@ -20,6 +20,4 @@ public class EditTask:CreateTask
    public long? TicketId { get; set; }
    public List<AccountViewModel> AssignsLists { get; set; }
    public bool  HasTicket { get; set; }
-    public long TaskScheduleId { get; set; }
-    public bool HasRequest { get; set; }
 }
--- a/AccountManagement.Application.Contracts/Task/ITaskApplication.cs
+++ b/AccountManagement.Application.Contracts/Task/ITaskApplication.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using _0_Framework.Application;
 using AccountManagement.Application.Contracts.Assign;
 using AccountManagement.Application.Contracts.TaskMessage;
@@ -25,13 +24,6 @@ public interface ITaskApplication
    List<TaskViewModel> GetSentTasks(TaskSearchModel searchModel);
    List<TaskViewModel> GetTasksHaveTicket(TaskSearchModel searchModel);

-    /// <summary>
-    /// لیست تسک های دوره ای ایجاد شده توسط کاربر
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    List<TaskViewModel> GetTaskScheduleList(TaskSearchModel searchModel);
-
    // گرفتن مهلت برای یک وظیفه
    OperationResult CreateRequestTime(CreateTaskTimeRequest command);
    List<TaskViewModel> GetRequestTaskHasTicket(TaskSearchModel searchModel);
@@ -54,10 +46,10 @@ public interface ITaskApplication
    OperationResult CreateTaskByPosition(CreateTask command, List<long> positionIds);
    List<TaskViewModel> GetRequestedTasks(TaskSearchModel searchModel);
    List<TaskViewModel> AllRequestedTasks(TaskSearchModel searchModel);
-    Task<int> GetRequestedTasksCount();
+    int GetRequestedTasksCount();

-    Task<int> TasksHaveTicketCounts(long userId);
-    Task<int> TasksHaveTicketRequestsCount(long userId);
+    int TasksHaveTicketCounts(long userId);
+    int TasksHaveTicketRequestsCount(long userId);

    List<TaskMessageViewModel> GetTaskMessages(long assignId);

@@ -71,14 +63,16 @@ public interface ITaskApplication

    List<AssignViewModel> GetAssignsByTaskId(long taskId);

-    Task<int> RequestedAndOverdueTasksCount(long userId);
+    int RequestedAndOverdueTasksCount(long userId);

-    ///  <summary>
-    /// تعداد تسک های شخصی و دریافتی برای امروز و یا عقب افتاده
-    ///  </summary>
-    ///  <param name="userId"></param>
-    ///  <returns></returns>
-    Task<int> OverdueTasksCount(long userId);
+    /// <summary>
+    ///تعداد تسک های شخصی و دریافتی برای امروز و یا عقب افتاده
+    /// </summary>
+    /// <param name="userId"></param>
+    /// <returns></returns>
+    int OverdueTasksCount(long userId);


-}
+    //متد انتقال داده از تسک به ارجاعی ها
+    //OperationResult MoveDataFRomTaskToAssign();
+}
--- a/AccountManagement.Application.Contracts/Task/TaskViewModel.cs
+++ b/AccountManagement.Application.Contracts/Task/TaskViewModel.cs
@@ -48,10 +48,7 @@ public class TaskViewModel
    public bool CanDelete { get; set; }
    public bool CanAssign { get; set; }
    public bool CanCheckRequests { get; set; }
-    public bool HasRequest { get; set; }
    public AssignViewModel AssignedReceiverViewModel { get; set; }

-    public TaskScheduleType ScheduleType { get; set; }
-    public TaskScheduleUnitType ScheduleUnitType { get; set; }
-    public long TaskScheduleId { get; set; }
+
 }
--- a/AccountManagement.Application.Contracts/TaskSchedule/ITaskScheduleApplication.cs
+++ b/AccountManagement.Application.Contracts/TaskSchedule/ITaskScheduleApplication.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using _0_Framework.Application;
+using _0_Framework.Application;
 using AccountManagement.Application.Contracts.Task;

 namespace AccountManagement.Application.Contracts.TaskSchedule;
@@ -8,8 +6,7 @@ namespace AccountManagement.Application.Contracts.TaskSchedule;
 public interface ITaskScheduleApplication
 {
    OperationResult Create(CreateTask command);
+    OperationResult CreateLimitedTasks(CreateTask command);
+    OperationResult CreateUnlimitedTasks(CreateTask command);

-    Task<TaskScheduleDetailsViewModel> GetDetails(long id);
-
-    OperationResult Remove(long taskScheduleId);
 }
--- a/AccountManagement.Application.Contracts/TaskSchedule/TaskScheduleDetailsViewModel.cs
+++ b/AccountManagement.Application.Contracts/TaskSchedule/TaskScheduleDetailsViewModel.cs
@@ -1,22 +0,0 @@
-using System.Collections.Generic;
-using AccountManagement.Application.Contracts.Media;
-using AccountManagement.Application.Contracts.Task;
-
-namespace AccountManagement.Application.Contracts.TaskSchedule;
-
-public class TaskScheduleDetailsViewModel
-{
-    public string SenderName { get; set; }
-    public List<string> AssignedName { get; set; }
-    public TaskScheduleType TaskScheduleType { get; set; }
-    public TaskScheduleUnitType TaskScheduleUnitType { get; set; }
-    public string UnitNumber { get; set; }
-    public string CreationDateFa { get; set; }
-    public string ContractingPartyName { get; set; }
-    public string Title { get; set; }
-    public string Description { get; set; }
-    public string Count { get; set; }
-    public string FirstEndTaskDate { get; set; }
-    public List<MediaViewModel> Medias { get; set; }
-
-}
--- a/AccountManagement.Application/AccountApplication.cs
+++ b/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);
@@ -310,7 +308,7 @@ public class AccountApplication : IAccountApplication
 			{
 				Slug = _passwordHasher.SlugHasher(x.WorkshopId),
 				Name = x.WorkshopName,
-				PersonnelCount = x.PersonnelCount,
+				PersonnelCount = 0,
 				Id = x.WorkshopId
 			}).ToList();

@@ -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);
@@ -554,8 +549,7 @@ public class AccountApplication : IAccountApplication
 		return operation.Succcedded(2);
    }

-  
-    public AccountLeftWorkViewModel WorkshopList(long accountId)
+	public AccountLeftWorkViewModel WorkshopList(long accountId)
    {
        string fullname = this._accountRepository.GetById(accountId).Fullname;
        List<WorkshopAccountlistViewModel> source =_accountLeftworkRepository.WorkshopList(accountId);
@@ -632,10 +626,7 @@ public class AccountApplication : IAccountApplication

    }

-    public async Task<List<AccountSelectListViewModel>> GetAdminSelectList()
-    {
-        return await _accountRepository.GetAdminSelectList();
-    }
+

    #endregion
    #region Pooya
@@ -794,39 +785,4 @@ public class AccountApplication : IAccountApplication
    //}
    #endregion

-
-    public bool CheckExistClientAccount(string userName)
-    {
-        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);
-    }
 }
--- a/AccountManagement.Application/MediaApplication.cs
+++ b/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();
+		}
+
+	}
 }
--- a/AccountManagement.Application/SubAccountApplication.cs
+++ b/AccountManagement.Application/SubAccountApplication.cs
@@ -113,12 +113,12 @@ namespace AccountManagement.Application
            if (cmd.PhoneNumber.Length != 11)
                return op.Failed("شماره تلفن همراه نامعتبر است");

-            //if (!cmd.WorkshopIds.Any())
-            //    return op.Failed("حداقل یک کارگاه را انتخاب کنید");
+            if (!cmd.WorkshopIds.Any())
+                return op.Failed("حداقل یک کارگاه را انتخاب کنید");


-            //if (!cmd.WorkshopIds.All(x => accountWorkshopsList.Contains(x)))
-            //    return op.Failed("خطای سیستمی");
+            if (!cmd.WorkshopIds.All(x => accountWorkshopsList.Contains(x)))
+                return op.Failed("خطای سیستمی");


            if (cmd.SubAccountRoleId == 0 || !_subAccountRoleRepository.Exists(x => cmd.SubAccountRoleId == x.id))
@@ -131,10 +131,6 @@ namespace AccountManagement.Application
            _cameraAccountRepository.Exists(x => x.Username == cmd.Username))
                return op.Failed("نام کاربری نمی تواند تکراری باشد");

-            var role = _subAccountRoleRepository.Get(cmd.SubAccountRoleId);
-            var workshopId = role.RoleWorkshops.Select(x => x.WorkshopId).ToList();
-
-
            var entity = new SubAccount(cmd.AccountId, cmd.SubAccountRoleId, cmd.NationalCode, cmd.FName, cmd.LName, cmd.PhoneNumber, cmd.Username, _passwordHasher.Hash(cmd.Password),
                 cmd.ProfilePhoto);

@@ -146,7 +142,7 @@ namespace AccountManagement.Application
            _subAccountRepository.SaveChanges();


-            var workshops = workshopId.Select(x => new WorkshopSubAccount(x, entity.id));
+            var workshops = cmd.WorkshopIds.Select(x => new WorkshopSubAccount(x, entity.id));

            foreach (var w in workshops)
                _workshopSubAccountRepository.Create(w);
@@ -179,22 +175,22 @@ namespace AccountManagement.Application



-            //if (!cmd.WorkshopIds.All(x => accountWorkshopsList.Contains(x)))
-            //    return op.Failed("خطای سیستمی");
+            if (!cmd.WorkshopIds.All(x => accountWorkshopsList.Contains(x)))
+                return op.Failed("خطای سیستمی");


            if (cmd.SubAccountRoleId == 0 || !_subAccountRoleRepository.Exists(x => cmd.SubAccountRoleId == x.id))
                return op.Failed("نقش مورد نظر وجود ندارد");

-            //var workshopSubAccounts = _workshopSubAccountRepository.GetWorkshopsSubAccountEntityBySubAccountId(entity.id);
-            //foreach (var workshopSubAccount in workshopSubAccounts)
-            //    _workshopSubAccountRepository.Remove(workshopSubAccount);
+            var workshopSubAccounts = _workshopSubAccountRepository.GetWorkshopsSubAccountEntityBySubAccountId(entity.id);
+            foreach (var workshopSubAccount in workshopSubAccounts)
+                _workshopSubAccountRepository.Remove(workshopSubAccount);


-            //var workshops = cmd.WorkshopIds.Select(x => new WorkshopSubAccount(x, entity.id));
+            var workshops = cmd.WorkshopIds.Select(x => new WorkshopSubAccount(x, entity.id));

-            //foreach (var w in workshops)
-            //    _workshopSubAccountRepository.Create(w);
+            foreach (var w in workshops)
+                _workshopSubAccountRepository.Create(w);

            entity.Edit(cmd.SubAccountRoleId, cmd.NationalCode, cmd.FName, cmd.LName, cmd.ProfilePhoto);
            _workshopSubAccountRepository.SaveChanges();
@@ -231,8 +227,7 @@ namespace AccountManagement.Application
            {
                Id = entity.id,
                Title = entity.Title,
-                Permissions = entity.RolePermissions.Select(x => x.PermissionCode).ToList(),
-                WorkshopIds = entity.RoleWorkshops.Select(x=>x.WorkshopId).ToList()
+                Permissions = entity.RolePermissions.Select(x => x.PermissionCode).ToList()
            };
        }

@@ -246,7 +241,7 @@ namespace AccountManagement.Application
            OperationResult op = new();
            if (_subAccountRoleRepository.Exists(x => x.AccountId == command.AccountId && x.Title.Trim() == command.Title.Trim()))
                return op.Failed("یک نقش با این عنوان وجود دارد");
-            var role = new SubAccountRole(command.Title, command.Permissions, command.AccountId,command.WorkshopIds);
+            var role = new SubAccountRole(command.Title, command.Permissions, command.AccountId);
            _subAccountRoleRepository.Create(role);
            _subAccountRoleRepository.SaveChanges();
            return op.Succcedded(role.id);
@@ -259,26 +254,8 @@ namespace AccountManagement.Application
            var entity = _subAccountRoleRepository.Get(cmd.Id);
            if (entity == null)
                return op.Failed(ApplicationMessages.RecordNotFound);
-            entity.Edit(cmd.Title, cmd.Permissions,cmd.WorkshopIds);
-
-            var subAccountRoles = _subAccountRepository.GetBySubAccountRole(cmd.Id);
-
-            foreach (var subAccount in subAccountRoles)
-            {
-                var workshopSubAccounts = _workshopSubAccountRepository.GetWorkshopsSubAccountEntityBySubAccountId(subAccount.id);
-                foreach (var workshopSubAccount in workshopSubAccounts)
-                    _workshopSubAccountRepository.Remove(workshopSubAccount);
-
-
-                var workshops = cmd.WorkshopIds.Select(x => new WorkshopSubAccount(x, subAccount.id));
-
-                foreach (var w in workshops)
-                    _workshopSubAccountRepository.Create(w);
-            }
-
-			_subAccountRoleRepository.SaveChanges();
-            _workshopSubAccountRepository.SaveChanges();
-
+            entity.Edit(cmd.Title, cmd.Permissions);
+            _subAccountRoleRepository.SaveChanges();
            return op.Succcedded();
        }
        public OperationResult AssignRoleToSubAccount(AssignSubAccountRole command)
--- a/AccountManagement.Application/TaskApplication.cs
+++ b/AccountManagement.Application/TaskApplication.cs
@@ -16,7 +16,6 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Threading.Tasks;


 namespace AccountManagement.Application;
@@ -509,11 +508,6 @@ public class TaskApplication : ITaskApplication
        return _taskRepository.GetTasksHaveTicket(searchModel);
    }

-    public List<TaskViewModel> GetTaskScheduleList(TaskSearchModel searchModel)
-    {
-        return _taskRepository.GetTaskScheduleList(searchModel);
-    }
-
    //ساخت درخواست مهلت
    public OperationResult CreateRequestTime(CreateTaskTimeRequest command)
    {
@@ -595,9 +589,6 @@ public class TaskApplication : ITaskApplication
        {
            return operation.Failed("تاریخی برای درخواست وظیفه ثبت نشده است");
        }
-
-     
-        
        assign.AcceptTimeRequest();
        message = string.IsNullOrWhiteSpace(message) ? "درخواست شما مورد تایید قرار گرفت" : message;
        var messageEntity = new TaskMessage(message, "تایید درخواست مهلت", assign.id);
@@ -622,7 +613,6 @@ public class TaskApplication : ITaskApplication
        {
            return operation.Failed("چنین وظیفه ای درخواستی برای مهلت ندارد");
        }
-
        assign.RejectTimeRequest();
        if (assign.EndTaskDate.Date <= DateTime.Now.Date)
        {
@@ -875,14 +865,14 @@ public class TaskApplication : ITaskApplication
        return _taskRepository.AllRequestedTasks(searchModel);
    }

-    public async Task<int> TasksHaveTicketCounts(long userId)
+    public int TasksHaveTicketCounts(long userId)
    {
-        return await _taskRepository.TasksHaveTicketCounts(userId);
+        return _taskRepository.TasksHaveTicketCounts(userId);
    }

-    public async Task<int> TasksHaveTicketRequestsCount(long userId)
+    public int TasksHaveTicketRequestsCount(long userId)
    {
-        return await _taskRepository.TasksHaveTicketRequestsCount(userId);
+        return _taskRepository.TasksHaveTicketRequestsCount(userId);
    }


@@ -891,9 +881,9 @@ public class TaskApplication : ITaskApplication
        return _taskMessageRepository.GetTaskMessages(assignId);
    }

-    public async Task<int> GetRequestedTasksCount()
+    public int GetRequestedTasksCount()
    {
-        return await _taskRepository.GetRequestedTasksCount();
+        return _taskRepository.GetRequestedTasksCount();
    }

    public OperationResult ChangeRequestTimeAndAccept(string time, long taskId, long assignedId, string message)
@@ -1017,15 +1007,15 @@ public class TaskApplication : ITaskApplication
        return _assignRepository.GetAssignsByTaskId(taskId);
    }

-    public async Task<int> RequestedAndOverdueTasksCount(long userId)
+    public int RequestedAndOverdueTasksCount(long userId)
    {
-        return await _taskRepository.RequestedAndOverdueTasksCount(userId);
+        return _taskRepository.RequestedAndOverdueTasksCount(userId);

    }

-    public async Task<int> OverdueTasksCount(long userId)
+    public int OverdueTasksCount(long userId)
    {
-        return await _taskRepository.OverdueTasksCount(userId);
+        return _taskRepository.OverdueTasksCount(userId);
    }

    //public OperationResult MoveDataFRomTaskToAssign()
--- a/AccountManagement.Application/TaskScheduleApplication.cs
+++ b/AccountManagement.Application/TaskScheduleApplication.cs
@@ -4,355 +4,222 @@ using AccountManagement.Application.Contracts.TaskSchedule;
 using AccountManagement.Domain.TaskScheduleAgg;
 using System;
 using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Transactions;
-using AccountManagement.Domain.TaskAgg;
 using Company.Domain.HolidayItemAgg;

 namespace AccountManagement.Application;

 public class TaskScheduleApplication : ITaskScheduleApplication
 {
-    private readonly ITaskApplication _taskApplication;
-    private readonly ITaskScheduleRepository _taskScheduleRepository;
-    private readonly IHolidayItemRepository _holidayItemRepository;
-    private readonly ITaskRepository _taskRepository;
-    public TaskScheduleApplication(ITaskApplication taskApplication, ITaskScheduleRepository taskScheduleRepository, IHolidayItemRepository holidayItemRepository, ITaskRepository taskRepository)
-    {
-        _taskApplication = taskApplication;
-        _taskScheduleRepository = taskScheduleRepository;
-        _holidayItemRepository = holidayItemRepository;
-        _taskRepository = taskRepository;
-    }
+	private readonly ITaskApplication _taskApplication;
+	private readonly ITaskScheduleRepository _taskScheduleRepository;
+	private readonly IHolidayItemRepository _holidayItemRepository;

-    public OperationResult Create(CreateTask command)
-    {
-        OperationResult operation = new OperationResult();
+	public TaskScheduleApplication(ITaskApplication taskApplication, ITaskScheduleRepository taskScheduleRepository, IHolidayItemRepository holidayItemRepository)
+	{
+		_taskApplication = taskApplication;
+		_taskScheduleRepository = taskScheduleRepository;
+		_holidayItemRepository = holidayItemRepository;
+	}
+
+	public OperationResult Create(CreateTask command)
+	{
+		OperationResult operation = new OperationResult();


-        if (command.HasSchedule)
-        {
-            switch (command.ScheduleType)
-            {
-                case TaskScheduleType.Limited:
-                    if (Convert.ToInt32(command.ScheduleCount) > 60)
-                    {
-                        return operation.Failed("تعداد وارد شده بیشتر از حد مجاز است");
-                    }
-                    return CreateLimitedTasks(command);
-                    break;
+		if (command.HasSchedule)
+		{
+			switch (command.ScheduleType)
+			{
+				case "limited":
+					if (Convert.ToInt32(command.ScheduleCount) > 60)
+					{
+						return operation.Failed("تعداد وارد شده بیشتر از حد مجاز است");
+					}
+					return CreateLimitedTasks(command);
+					break;

-                case TaskScheduleType.Unlimited:
-                    return CreateUnlimitedTasks(command);
-                    break;
+				case "unlimited":
+					return CreateUnlimitedTasks(command);
+					break;

-                default:
-                    return operation.Failed("نوع وظیفه محول شده مشخص نمیباشد");
+				default:
+					return operation.Failed("خطای سیستمی!");

-            }
-        }
-        else
-        {
-            return operation.Failed("این تسک بصورت دوره ای نمیباشد");
-        }
-    }
+			}
+		}
+		else
+		{
+			return operation.Failed("این تسک بصورت زمان بندی شده نمیباشد");
+		}
+	}

-    public async Task<TaskScheduleDetailsViewModel> GetDetails(long id)
-    {
-        return await _taskScheduleRepository.GetDetails(id);
-    }
+	public OperationResult CreateLimitedTasks(CreateTask command)
+	{
+		OperationResult operation = new OperationResult();
+		if (Convert.ToInt32(command.ScheduleCount) < 1 || string.IsNullOrWhiteSpace(command.ScheduleCount))
+		{
+			return operation.Failed("تعداد وارد شده باید بیشتر از 2 باشد");
+		}

-    public OperationResult Remove(long taskScheduleId)
-    {
-        var op = new OperationResult();
-        var taskSchedule = _taskScheduleRepository.Get(taskScheduleId);
-        if (taskSchedule == null)
-            return op.Failed("وظیفه مورد نظر یافت نشد");
-        var tasks = _taskRepository.GetTasksByTaskScheduleId(taskScheduleId);
-        var assigns = tasks.SelectMany(x => x.Assigns);
-        if (assigns.Any(x => x.IsCanceledRequest || x.IsDone || x.IsCancel || x.TimeRequest || x.AcceptedTimeRequest > 0))
-        {
-            taskSchedule.DeActive();
+		switch (command.ScheduleUnitType)
+		{
+			case "year":
+				if (Convert.ToInt32(command.ScheduleCount) != 1)
+				{
+					return operation.Failed("دوره نمیتواند بیشتر از 1 سال باشد");
+				}
+				break;
+			case "month":
+				if (Convert.ToInt32(command.ScheduleCount) > 12)
+				{
+					return operation.Failed("بازه وارد شده نا معتبر است");
+				}
+				break;
+			case "week":
+				if (command.ScheduleUnitNumber != "first" && command.ScheduleUnitNumber != "last")
+				{
+					return operation.Failed("بازه وارد شده نا معتبر است");
+				}
+				break;
+			case "day":
+				if (Convert.ToInt32(command.ScheduleUnitNumber) > 29)
+				{
+					return operation.Failed("بازه وارد شده نا معتبر است");
+				}
+				break;
+			default:
+				return operation.Failed("نوع بازه مشخص نمیباشد");
+				break;

-            var removableTask = tasks.Where(x=>x.Assigns.All(a=>a.IsDone==false && a.IsCancel == false)).ToList();
-            _taskRepository.RemoveRange(removableTask);
-            
-        }
-        else
-        {
-            _taskScheduleRepository.Remove(taskSchedule);
-            _taskRepository.RemoveRange(tasks);
-        }
-        _taskRepository.SaveChanges();
-        return op.Succcedded();
-    }
+		}
+		try
+		{
+			DateTime previousDateRaw = command.EndTaskDate.ToEndDayOfGeorgianDateTime();
+			DateTime previousDateEdited = command.EndTaskDate.ToEndDayOfGeorgianDateTime();

-    private OperationResult CreateLimitedTasks(CreateTask command)
-    {
-        OperationResult operation = new OperationResult();
-        if (Convert.ToInt32(command.ScheduleCount) < 1 || string.IsNullOrWhiteSpace(command.ScheduleCount))
-        {
-            return operation.Failed("تعداد وارد شده باید بیشتر از 2 باشد");
-        }
-        if (string.IsNullOrWhiteSpace(command.ScheduleUnitNumber))
-        {
-            return operation.Failed("لطفا تعداد بازه خود را مشخص کنید");
-        }
+			int count = Convert.ToInt32(command.ScheduleCount);
+			bool isInt = int.TryParse(command.ScheduleUnitNumber, out int unitNumber);
+			string kindOfWeekUnit = isInt ? "" : command.ScheduleUnitNumber;
+			var taskSchedule = new TaskSchedule(command.ScheduleCount, command.ScheduleType, command.ScheduleUnitType,
+				command.ScheduleUnitNumber, previousDateEdited);
+			_taskScheduleRepository.Create(taskSchedule);
+			_taskScheduleRepository.SaveChanges();
+			command.TaskScheduleId = taskSchedule.id;

-        switch (command.ScheduleUnitType)
-        {
-            case TaskScheduleUnitType.Year:
-                if (Convert.ToInt32(command.ScheduleCount) != 1)
-                {
-                    return operation.Failed("دوره نمیتواند بیشتر از 1 سال باشد");
-                }
-                break;
-            case TaskScheduleUnitType.Month:
+			switch (command.ScheduleUnitType)
+			{
+				case "year":
+					for (int i = 1; i <= count; i++)
+					{
+						command.EndTaskDate = previousDateEdited.ToFarsi();
+						operation = _taskApplication.CreateTask(command);
+						taskSchedule.SetLastEndTaskDate(previousDateEdited);

-                if (Convert.ToInt32(command.ScheduleUnitNumber) is > 12 or < 1)
-                {
-                    return operation.Failed("بازه وارد شده نا معتبر است");
-                }
+						bool isHoliday = _holidayItemRepository.GetHoliday(previousDateRaw);
+						while (isHoliday || previousDateEdited.DayOfWeek == DayOfWeek.Friday)
+						{
+							previousDateEdited = previousDateRaw.AddDays(1);
+							isHoliday = _holidayItemRepository.GetHoliday(previousDateEdited);

-                if (Convert.ToInt32(command.ScheduleCount) is > 60 or < 1)
-                {
-                    return operation.Failed("تعداد دفعات وارد شده نامعتبر است");
-                }
-                break;
-            case TaskScheduleUnitType.Week:
-                if (command.ScheduleUnitNumber != "first" && command.ScheduleUnitNumber != "last")
-                {
-                    return operation.Failed("بازه وارد شده نا معتبر است");
-                }
-                break;
-            case TaskScheduleUnitType.Day:
-                if (Convert.ToInt32(command.ScheduleUnitNumber) is > 29 or < 1)
-                {
-                    return operation.Failed("بازه وارد شده نا معتبر است");
-                }
-                break;
-            default:
-                return operation.Failed("نوع بازه مشخص نمیباشد");
-                break;
+						}
+						previousDateRaw = previousDateRaw.AddYears(unitNumber);
+						previousDateEdited = previousDateRaw;

-        }
-        try
-        {
-            //using var transaction = new TransactionScope();
-            DateTime previousDateRaw = command.EndTaskDate.ToEndDayOfGeorgianDateTime();
-            DateTime previousDateEdited = command.EndTaskDate.ToEndDayOfGeorgianDateTime();
-            var day = Convert.ToInt32(command.EndTaskDate.Substring(8, 2));
-            var month = Convert.ToInt32(command.EndTaskDate.Substring(5, 2));
-            var year = Convert.ToInt32(command.EndTaskDate.Substring(0, 4));
+					}
+					break;

-            int count = Convert.ToInt32(command.ScheduleCount);
-            bool isInt = int.TryParse(command.ScheduleUnitNumber, out int unitNumber);
-            string kindOfWeekUnit = isInt ? "" : command.ScheduleUnitNumber;
-            var taskSchedule = new TaskSchedule(command.ScheduleCount, command.ScheduleType, command.ScheduleUnitType,
-                command.ScheduleUnitNumber, previousDateEdited);
-            _taskScheduleRepository.Create(taskSchedule);
-            _taskScheduleRepository.SaveChanges();
-            command.TaskScheduleId = taskSchedule.id;
+				case "month":
+					for (int i = 1; i <= count; i++)
+					{
+						command.EndTaskDate = previousDateEdited.ToFarsi();
+						operation = _taskApplication.CreateTask(command);
+						taskSchedule.SetLastEndTaskDate(previousDateEdited);
+						bool isHoliday = _holidayItemRepository.GetHoliday(previousDateRaw);
+						while (isHoliday || previousDateEdited.DayOfWeek == DayOfWeek.Friday)
+						{
+							previousDateEdited = previousDateRaw.AddDays(1);
+							isHoliday = _holidayItemRepository.GetHoliday(previousDateEdited);

-            switch (command.ScheduleUnitType)
-            {
-                case TaskScheduleUnitType.Year:
-                    for (int i = 1; i <= count; i++)
-                    {
-                        command.EndTaskDate = previousDateEdited.ToFarsi();
-                        operation = _taskApplication.CreateTask(command);
-                        taskSchedule.SetLastEndTaskDate(previousDateEdited);
+						}
+						previousDateRaw = previousDateRaw.AddMonths(unitNumber);
+						previousDateEdited = previousDateRaw;

-                        bool isHoliday = _holidayItemRepository.GetHoliday(previousDateRaw);
-                        while (isHoliday || previousDateEdited.DayOfWeek == DayOfWeek.Friday)
-                        {
-                            previousDateEdited = previousDateRaw.AddDays(1);
-                            isHoliday = _holidayItemRepository.GetHoliday(previousDateEdited);
-                        }
-                        previousDateRaw = previousDateRaw.AddYears(unitNumber);
-                        previousDateEdited = previousDateRaw;
-                    }
-                    break;
+					}
+					break;

-                case TaskScheduleUnitType.Month:
-                    bool endOfMonth = day == 31;
+				case "week":
+					for (int i = 1; i <= count; i++)
+					{
+						if (string.IsNullOrWhiteSpace(kindOfWeekUnit))
+						{
+							throw new InvalidDataException();
+						}

-                    if (endOfMonth)
-                    {
-                        for (int i = 1; i <= count; i++)
-                        {
-                            command.EndTaskDate = previousDateEdited.ToFarsi();
-                            operation = _taskApplication.CreateTask(command);
-                            taskSchedule.SetLastEndTaskDate(previousDateEdited);
-                            if (month >= 12)
-                            {
-                                var extra = month - 12;
-                                year++;
-                                month = extra + unitNumber;
-                            }
-                            else
-                            {
-                                month = unitNumber + month;
-                            }
-                            previousDateRaw = $"{year:0000}/{month:00}/01".FindeEndOfMonth().ToGeorgianDateTime();
-                            bool isHoliday = _holidayItemRepository.GetHoliday(previousDateRaw);
-                            while (isHoliday || previousDateEdited.DayOfWeek == DayOfWeek.Friday)
-                            {
-                                previousDateEdited = previousDateRaw.AddDays(1);
-                                isHoliday = _holidayItemRepository.GetHoliday(previousDateEdited);
+						command.EndTaskDate = kindOfWeekUnit switch
+						{
+							"first" => previousDateRaw.GetNextDayOfWeek(DayOfWeek.Saturday).ToFarsi(),
+							"last" => previousDateRaw.GetNextDayOfWeek(DayOfWeek.Thursday).ToFarsi(),
+							_ => throw new InvalidDataException()
+						};
+						operation = _taskApplication.CreateTask(command);
+						taskSchedule.SetLastEndTaskDate(previousDateEdited);
+						bool isHoliday = _holidayItemRepository.GetHoliday(previousDateRaw);
+						while (isHoliday || previousDateEdited.DayOfWeek == DayOfWeek.Friday)
+						{
+							previousDateEdited = previousDateRaw.AddDays(1);
+							isHoliday = _holidayItemRepository.GetHoliday(previousDateEdited);

-                            }
+						}
+						previousDateRaw = command.EndTaskDate.ToGeorgianDateTime();
+						previousDateEdited = previousDateRaw;


+					}
+					break;

-                            previousDateEdited = previousDateRaw;
+				case "day":

-                        }
-                    }
-                    else
-                    {
-                        for (int i = 1; i < count; i++)
-                        {
-                            command.EndTaskDate = previousDateEdited.ToFarsi();
-                            operation = _taskApplication.CreateTask(command);
-                            taskSchedule.SetLastEndTaskDate(previousDateEdited);
-                            var endDay = 0;
+					for (int i = 1; i <= count; i++)
+					{
+						command.EndTaskDate = previousDateEdited.ToFarsi();
+						operation = _taskApplication.CreateTask(command);
+						taskSchedule.SetLastEndTaskDate(previousDateEdited);
+						previousDateRaw = previousDateRaw.AddDays(unitNumber);
+						bool isHoliday = _holidayItemRepository.GetHoliday(previousDateRaw);
+						while (isHoliday || previousDateEdited.DayOfWeek == DayOfWeek.Friday)
+						{
+							previousDateEdited = previousDateRaw.AddDays(1);
+							isHoliday = _holidayItemRepository.GetHoliday(previousDateEdited);

-                            if (month >= 12)
-                            {
-                                var extra = month - 12;
-                                year++;
-                                month = extra + unitNumber;
+						}

-                            }
-                            else
-                            {
-                                month = unitNumber + month;
-                            }
+						previousDateEdited = previousDateRaw;
+					}
+					break;

-                            if (day == 30)
-                            {
-                                if (month == 12)
-                                {
-                                    var lastYearDay = Convert.ToInt32($"{year:0000}/{month:00}/1".FindeEndOfMonth()
-                                        .Substring(8, 2));
-                                    endDay = lastYearDay == 30 ? lastYearDay : 29;
-                                }
+			}
+			_taskScheduleRepository.SaveChanges();
+			operation = operation.Succcedded();
+			return operation;
+		}
+		catch (Exception e)
+		{
+			return operation.Failed(e.ToString());
+		}
+	}

-                            }
+	public OperationResult CreateUnlimitedTasks(CreateTask command)
+	{
+		var operation = _taskApplication.CreateTask(command);
+		if (!operation.IsSuccedded)
+			return operation;
+		var lastDate = command.EndTaskDate.ToGeorgianDateTime();
+		var taskSchedule = new TaskSchedule(command.ScheduleCount, command.ScheduleType, command.ScheduleUnitType,
+			command.ScheduleUnitNumber, lastDate);
+		_taskScheduleRepository.Create(taskSchedule);
+		_taskScheduleRepository.SaveChanges();
+		return operation.Succcedded();

-                            previousDateEdited = endDay == 0
-                                ? $"{year:0000}/{month:00}/{day:00}".ToGeorgianDateTime()
-                                : $"{year:0000}/{month:00}/{endDay:00}".ToGeorgianDateTime();
-                        }
-
-
-                        //for (int i = 1; i <= count; i++)
-                        //{
-                        //    command.EndTaskDate = previousDateEdited.ToFarsi();
-                        //    operation = _taskApplication.CreateTask(command);
-                        //    taskSchedule.SetLastEndTaskDate(previousDateEdited);
-                        //    previousDateRaw = $"{year:0000}/{month:00}/01".FindeEndOfMonth().ToGeorgianDateTime();
-                        //    bool isHoliday = _holidayItemRepository.GetHoliday(previousDateRaw);
-                        //    while (isHoliday || previousDateEdited.DayOfWeek == DayOfWeek.Friday)
-                        //    {
-                        //        previousDateEdited = previousDateRaw.AddDays(1);
-                        //        isHoliday = _holidayItemRepository.GetHoliday(previousDateEdited);
-
-                        //    }
-                        //    previousDateEdited = previousDateRaw;
-
-                        //}
-                    }
-
-                    break;
-
-                case TaskScheduleUnitType.Week:
-                    for (int i = 1; i <= count; i++)
-                    {
-                        if (string.IsNullOrWhiteSpace(kindOfWeekUnit))
-                        {
-                            throw new InvalidDataException();
-                        }
-
-                        command.EndTaskDate = kindOfWeekUnit switch
-                        {
-                            "first" => previousDateRaw.GetNextDayOfWeek(DayOfWeek.Saturday).ToFarsi(),
-                            "last" => previousDateRaw.GetNextDayOfWeek(DayOfWeek.Thursday).ToFarsi(),
-                            _ => throw new InvalidDataException()
-                        };
-                        operation = _taskApplication.CreateTask(command);
-                        taskSchedule.SetLastEndTaskDate(previousDateEdited);
-                        bool isHoliday = _holidayItemRepository.GetHoliday(previousDateRaw);
-                        while (isHoliday || previousDateEdited.DayOfWeek == DayOfWeek.Friday)
-                        {
-                            previousDateEdited = previousDateRaw.AddDays(1);
-                            isHoliday = _holidayItemRepository.GetHoliday(previousDateEdited);
-
-                        }
-                        previousDateRaw = command.EndTaskDate.ToGeorgianDateTime();
-                        previousDateEdited = previousDateRaw;
-
-
-                    }
-                    break;
-
-                case TaskScheduleUnitType.Day:
-
-                    for (int i = 1; i <= count; i++)
-                    {
-                        command.EndTaskDate = previousDateEdited.ToFarsi();
-                        operation = _taskApplication.CreateTask(command);
-                        taskSchedule.SetLastEndTaskDate(previousDateEdited);
-                        previousDateRaw = previousDateRaw.AddDays(unitNumber);
-                        bool isHoliday = _holidayItemRepository.GetHoliday(previousDateRaw);
-                        while (isHoliday || previousDateEdited.DayOfWeek == DayOfWeek.Friday)
-                        {
-                            previousDateEdited = previousDateRaw.AddDays(1);
-                            isHoliday = _holidayItemRepository.GetHoliday(previousDateEdited);
-
-                        }
-
-                        previousDateEdited = previousDateRaw;
-                    }
-                    break;
-
-            }
-            _taskScheduleRepository.SaveChanges();
-            //transaction.Complete();
-            operation = operation.Succcedded();
-            return operation;
-        }
-        catch (Exception e)
-        {
-            return operation.Failed(e.ToString());
-        }
-    }
-
-    private OperationResult CreateUnlimitedTasks(CreateTask command)
-    {
-        using var transaction = new TransactionScope();
-
-        var lastDate = command.EndTaskDate.ToGeorgianDateTime();
-
-        var taskSchedule = new TaskSchedule(command.ScheduleCount, command.ScheduleType, command.ScheduleUnitType,
-            command.ScheduleUnitNumber, lastDate);
-
-        _taskScheduleRepository.Create(taskSchedule);
-        _taskScheduleRepository.SaveChanges();
-
-        command.TaskScheduleId = taskSchedule.id;
-
-        var operation = _taskApplication.CreateTask(command);
-        if (!operation.IsSuccedded)
-            return operation;
-
-
-        _taskScheduleRepository.SaveChanges();
-        transaction.Complete();
-        return operation.Succcedded();
-
-    }
+	}

 }
--- a/AccountManagement.Application/TaskSubjectApplication.cs
+++ b/AccountManagement.Application/TaskSubjectApplication.cs
@@ -1,9 +1,7 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using _0_Framework.Application;
 using AccountManagement.Application.Contracts.TaskSubject;
 using AccountManagement.Domain.TaskSubjectAgg;
-using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;

 namespace AccountManagement.Application;

--- a/AccountManagement.Configuration/AccountManagementBootstrapper.cs
+++ b/AccountManagement.Configuration/AccountManagementBootstrapper.cs
@@ -7,7 +7,6 @@ using AccountManagement.Application.Contracts.Role;
 using AccountManagement.Application.Contracts.SubAccount;
 using AccountManagement.Application.Contracts.SubAccountPermissionSubtitle;
 using AccountManagement.Application.Contracts.Task;
-using AccountManagement.Application.Contracts.TaskSchedule;
 using AccountManagement.Application.Contracts.TaskSubject;
 using AccountManagement.Application.Contracts.Ticket;
 using AccountManagement.Application.Contracts.TicketAccessAccount;
@@ -26,7 +25,6 @@ using AccountManagement.Domain.SubAccountPermissionSubtitle4Agg;
 using AccountManagement.Domain.SubAccountRoleAgg;
 using AccountManagement.Domain.TaskAgg;
 using AccountManagement.Domain.TaskMessageAgg;
-using AccountManagement.Domain.TaskScheduleAgg;
 using AccountManagement.Domain.TaskSubjectAgg;
 using AccountManagement.Domain.TicketAccessAccountAgg;
 using AccountManagement.Domain.TicketAgg;
@@ -64,8 +62,6 @@ namespace AccountManagement.Configuration
            services.AddScoped<ITaskRepository, TaskRepository>();
            services.AddTransient<ITaskApplication, TaskApplication>();

-            services.AddTransient<ITaskScheduleApplication, TaskScheduleApplication>();
-            services.AddTransient<ITaskScheduleRepository, TaskScheduleRepository>();

            services.AddTransient<ITaskSubjectRepository, TaskSubjectRepository>();
            services.AddTransient<ITaskSubjectApplication, TaskSubjectApplication>();
--- a/AccountManagement.Domain/AccountAgg/IAccountRepository.cs
+++ b/AccountManagement.Domain/AccountAgg/IAccountRepository.cs
@@ -27,21 +27,12 @@ namespace AccountManagement.Domain.AccountAgg
        List<AccountViewModel> GetAccountEqualToLowerPositionValue();
        AccountViewModel GetAccountViewModel(long id);
        List<AccountViewModel> GetAccountsDeactivePositionValue(long Positionid);
-        Task<List<AccountSelectListViewModel>> GetAdminSelectList();
-
        #endregion

        List<AccountViewModel> GetAdminAccountsNew();

        List<AccountViewModel> GetAccountsToEditWorkshop(long workshopId);

-        /// <summary>
-        /// چک میکند که اکانتی با این ام کاربری وجود دارد یا نه
-        /// </summary>
-        /// <param name="userName"></param>
-        /// <returns></returns>
-        public bool CheckExistClientAccount(string userName);
-
    }

 }
--- a/AccountManagement.Domain/AssignAgg/Assign.cs
+++ b/AccountManagement.Domain/AssignAgg/Assign.cs
@@ -2,14 +2,13 @@
 using AccountManagement.Domain.TaskAgg;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using AccountManagement.Domain.TaskMessageAgg;

 namespace AccountManagement.Domain.AssignAgg;

 public class Assign : EntityBase
 {
-    public Assign(long taskId, long assignerId, long assignedId, int assignerPositionValue, string assignedName, int assignedPositionValue, DateTime endTaskDate, bool firstTimeCreation=false)
+    public Assign(long taskId, long assignerId, long assignedId, int assignerPositionValue, string assignedName, int assignedPositionValue, DateTime endTaskDate, bool firstTimeCreation = false)
    {
        TaskId = taskId;
        AssignerId = assignerId;
@@ -19,7 +18,7 @@ public class Assign : EntityBase
        AssignedPositionValue = assignedPositionValue;
        EndTaskDate = endTaskDate;
        FirstTimeCreation = firstTimeCreation;
-    }
+	}

 	//آیدی شخص ارسال کننده
 	public long TaskId { get; private set; }
@@ -53,9 +52,7 @@ public class Assign : EntityBase

    public string? DoneDescription { get; private set; }
    public bool IsCanceledRequest { get; private set; }
-
    public bool FirstTimeCreation { get; private set; }
-
 	public Tasks Task { get; set; }
    public List<TaskMessage> TaskMessageList { get; set; }

@@ -72,16 +69,14 @@ public class Assign : EntityBase

 	public void AcceptTimeRequest()
 	{
-        ClearRequests();
-        TimeRequest = false;
+		TimeRequest = false;
 		AcceptedTimeRequest++;
-        EndTaskDate = RequestDate < DateTime.Today ? DateTime.Today : RequestDate.Value;
+		EndTaskDate = RequestDate.Value;

-    }
+	}
 	public void RejectTimeRequest()
 	{
-        ClearRequests();
-        TimeRequest = false;
+		TimeRequest = false;
 		TimeRequestDescription = null;
 		RequestDate = null;
 	}
@@ -95,36 +90,31 @@ public class Assign : EntityBase
 	}
 	public void AcceptCancelRequest()
 	{
-        ClearRequests();
-        IsCanceledRequest = false;
+		IsCanceledRequest = false;
 		IsCancel = true;


 	}
 	public void RejectCancel()
 	{
-        ClearRequests();
-        CancelDescription = null;
+		CancelDescription = null;
 		IsCanceledRequest = false;
 	}

 	public void CompleteRequest(string? doneDescription)
 	{
-        ClearRequests();
-        DoneDescription = doneDescription;
+		DoneDescription = doneDescription;
 		IsDoneRequest = true;
 	}

 	public void RejectCompleteRequest()
 	{
-        ClearRequests();
-        IsDoneRequest = false;
+		IsDoneRequest = false;
 		DoneDescription = null;
 	}
 	public void Completed()
 	{
-        ClearRequests();
-        IsDoneRequest = false;
+		IsDoneRequest = false;
 		IsDone = true;
 	}

@@ -136,13 +126,6 @@ public class Assign : EntityBase
 		TimeRequest = false;
 	}

-    public void ClearRequests()
-    {
-        IsDoneRequest = false;
-        IsCanceledRequest = false;
-        TimeRequest = false;
-    }
-
 	public void InsertNewData(DateTime endTaskDate,bool timeRequest,int acceptedTimeRequest,DateTime? requestDate, string timeRequestDescription, bool isCanceledRequest,
 		bool isCancel,string cancelDescription,bool isDone,bool isDoneRequest,string? doneDescription)
 	{
@@ -159,24 +142,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);
-		}
-	}
 }
--- a/AccountManagement.Domain/MediaAgg/IMediaRepository.cs
+++ b/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);
 }
--- a/AccountManagement.Domain/SubAccountAgg/ISubAccountRepository.cs
+++ b/AccountManagement.Domain/SubAccountAgg/ISubAccountRepository.cs
@@ -2,7 +2,6 @@
 using _0_Framework.Domain;
 using AccountManagement.Application.Contracts.SubAccount;
 using System.Collections.Generic;
-using System.Collections.Specialized;

 namespace AccountManagement.Domain.SubAccountAgg
 {
@@ -14,6 +13,5 @@ namespace AccountManagement.Domain.SubAccountAgg
        SubAccount GetDetails(long subAccountId);
        SubAccount GetBy(string commandUsername);
        SubAccountViewModel GetByVerifyCodeAndPhoneNumber(string code, string phone);
-        List<SubAccount> GetBySubAccountRole(long subAccountRoleId);
    }
 }
--- a/AccountManagement.Domain/SubAccountRoleAgg/SubAccountRole.cs
+++ b/AccountManagement.Domain/SubAccountRoleAgg/SubAccountRole.cs
@@ -13,21 +13,17 @@ namespace AccountManagement.Domain.SubAccountRoleAgg

        public List<SubAccountRolePermission> RolePermissions { get; private set; }
        public List<SubAccount> SubAccounts { get; private set; }
-        public List<SubAccountRoleWorkshop> RoleWorkshops { get; set; }

        private SubAccountRole()
        {
        }

-        public SubAccountRole(string title, List<int> permissions, long accountId, List<long> workshopIds)
+        public SubAccountRole(string title, List<int> permissions, long accountId)
        {
            Title = title;
            RolePermissions = permissions.Select(x => new SubAccountRolePermission(x, id)).ToList();
            AccountId = accountId;
-            RoleWorkshops = workshopIds.Select(x => new SubAccountRoleWorkshop(x, id)).ToList();
-
        }
-
        public void ChangeTitle(string title)
        {
            Title = title;
@@ -36,12 +32,10 @@ namespace AccountManagement.Domain.SubAccountRoleAgg
        {
            RolePermissions.AddRange(permissionIds.Select(x => new SubAccountRolePermission(x, id)));
        }
-        public void Edit(string title, List<int> permissions,List<long> workshopIds)
+        public void Edit(string title, List<int> permissions)
        {
            Title = title;
            RolePermissions = permissions.Select(x => new SubAccountRolePermission(x, id)).ToList();
-            RoleWorkshops = workshopIds.Select(x => new SubAccountRoleWorkshop(x, id)).ToList();
-
-		}
-	}
+        }
+    }
 }
--- a/AccountManagement.Domain/SubAccountRoleAgg/SubAccountRoleWorkshop.cs
+++ b/AccountManagement.Domain/SubAccountRoleAgg/SubAccountRoleWorkshop.cs
@@ -1,16 +0,0 @@
-using _0_Framework.Domain;
-
-namespace AccountManagement.Domain.SubAccountRoleAgg;
-
-public class SubAccountRoleWorkshop:EntityBase
-{
-	public SubAccountRoleWorkshop(long workshopId, long subAccountId)
-	{
-		WorkshopId = workshopId;
-		SubAccountId = subAccountId;
-	}
-
-	public long WorkshopId { get; set; }
-	public long SubAccountId { get; set; }
-	public SubAccountRole SubAccountRole { get; set; }
-}
--- a/AccountManagement.Domain/TaskAgg/ITaskRepository.cs
+++ b/AccountManagement.Domain/TaskAgg/ITaskRepository.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using _0_Framework.Application;
 using _0_Framework.Domain;
 using AccountManagement.Application.Contracts.Task;
@@ -89,22 +88,11 @@ public interface ITaskRepository:IRepository<long,Tasks>
    /// <returns></returns>
    List<TaskViewModel> GetTasksHaveTicket(TaskSearchModel searchModel);

-
-
-
-    /// <summary>
-    /// لیست تسک های دوره ای ایجاد شده توسط کاربر
-    /// </summary>
-    /// <param name="searchModel"></param>
-    /// <returns></returns>
-    List<TaskViewModel> GetTaskScheduleList(TaskSearchModel searchModel);
-
-
    /// <summary>
    /// تعداد تسک های درخواستی. بدون تیکت
    /// </summary>
    /// <returns></returns>
-    Task<int> GetRequestedTasksCount();
+    int GetRequestedTasksCount();

    /// <summary>
    /// گرفتن جزئیات درخواست وظیفه 
@@ -126,38 +114,39 @@ public interface ITaskRepository:IRepository<long,Tasks>
    /// <returns></returns>
    bool HasOverdueTasks(long userId);

-    ///  <summary>
-    /// مجوع تعداد تسک های عقب افتاده و درخواستی
-    ///  </summary>
-    ///  <param name="userId"></param>
-    ///  <returns></returns>
-    Task<int> RequestedAndOverdueTasksCount(long userId);
+    /// <summary>
+    ///مجوع تعداد تسک های عقب افتاده و درخواستی
+    /// </summary>
+    /// <param name="userId"></param>
+    /// <returns></returns>
+    int RequestedAndOverdueTasksCount(long userId);

    /// <summary>
    /// تعداد تسک های دارای تیکت
    /// </summary>
    /// <param name="userId"></param>
    /// <returns></returns>
-    Task<int> TasksHaveTicketCounts(long userId);
+    int TasksHaveTicketCounts(long userId);

    /// <summary>
    /// تعداد درخواست های تسک های دارا تیکت
    /// </summary>
    /// <param name="userId"></param>
    /// <returns></returns>
-    Task<int> TasksHaveTicketRequestsCount(long userId);
+    int TasksHaveTicketRequestsCount(long userId);

-    ///  <summary>
-    /// تعداد تسک های شخصی و دریافتی برای امروز و یا عقب افتاده
-    ///  </summary>
-    ///  <param name="userId"></param>
-    ///  <returns></returns>
-    Task<int> OverdueTasksCount(long userId);
+    /// <summary>
+    ///تعداد تسک های شخصی و دریافتی برای امروز و یا عقب افتاده
+    /// </summary>
+    /// <param name="userId"></param>
+    /// <returns></returns>
+    int OverdueTasksCount(long userId);


    // گرفتن پیام های مربوط به هر تسک

-    List<Tasks> GetTasksByTaskScheduleId(long taskScheduleId);

-    void RemoveRange(IEnumerable<Tasks>  tasks);
+
+    //OperationResult MoveDataFRomTaskToAssign();
+
 }
--- a/AccountManagement.Domain/TaskAgg/Tasks.cs
+++ b/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;
-    }
 }
--- a/AccountManagement.Domain/TaskMessageItemsAgg/TaskMessageItems.cs
+++ b/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;
-    }
 }
--- a/AccountManagement.Domain/TaskScheduleAgg/ITaskScheduleRepository.cs
+++ b/AccountManagement.Domain/TaskScheduleAgg/ITaskScheduleRepository.cs
@@ -1,11 +1,8 @@
-using System.Threading.Tasks;
-using _0_Framework.Domain;
-using AccountManagement.Application.Contracts.TaskSchedule;
+using _0_Framework.Domain;

 namespace AccountManagement.Domain.TaskScheduleAgg;

-public interface ITaskScheduleRepository : IRepository<long, TaskSchedule>
+public interface ITaskScheduleRepository:IRepository<long,TaskSchedule>
 {
-    Task<TaskScheduleDetailsViewModel> GetDetails(long id);
-    void Remove(TaskSchedule entity);
+    
 }
--- a/AccountManagement.Domain/TaskScheduleAgg/TaskSchedule.cs
+++ b/AccountManagement.Domain/TaskScheduleAgg/TaskSchedule.cs
@@ -1,38 +1,29 @@
 using System;
 using System.Collections.Generic;
-using _0_Framework.Application;
 using _0_Framework.Domain;
-using AccountManagement.Application.Contracts.Task;
 using AccountManagement.Domain.TaskAgg;

 namespace AccountManagement.Domain.TaskScheduleAgg;

 public class TaskSchedule:EntityBase
 {
-    public TaskSchedule(string count, TaskScheduleType type, TaskScheduleUnitType unitType, string unitNumber, DateTime lastEndTaskDate)
+    public TaskSchedule(string count, string type, string unitType, string unitNumber, DateTime lastEndTaskDate)
    {
        Count = count;
        Type = type;
        UnitType = unitType;
        UnitNumber = unitNumber;
        LastEndTaskDate = lastEndTaskDate;
-        IsActive = IsActive.True;
    }
    public string Count { get; private set; }
-    public TaskScheduleType Type { get; private set; }
-    public TaskScheduleUnitType UnitType { get; private set; }
+    public string Type { get; private set; }
+    public string UnitType { get; private set; }
    public string UnitNumber { get; private set; }
    public DateTime LastEndTaskDate { get; private set; }
-    public IsActive IsActive { get; private set; }
    public List<Tasks> TasksList { get; set; }

    public void SetLastEndTaskDate(DateTime lastEndTaskDate)
    {
        LastEndTaskDate = lastEndTaskDate;
    }
-
-    public void DeActive()
-    {
-	    IsActive = IsActive.False;
-    }
 }
--- a/AccountMangement.Infrastructure.EFCore/AccountContext.cs
+++ b/AccountMangement.Infrastructure.EFCore/AccountContext.cs
@@ -27,7 +27,6 @@ using AccountManagement.Domain.SubAccountPermissionSubtitle3Agg;
 using AccountManagement.Domain.SubAccountPermissionSubtitle4Agg;
 using AccountManagement.Domain.SubAccountRoleAgg;
 using AccountMangement.Infrastructure.EFCore.Seed;
-using AccountManagement.Domain.TaskScheduleAgg;

 namespace AccountMangement.Infrastructure.EFCore
 {
@@ -58,9 +57,6 @@ namespace AccountMangement.Infrastructure.EFCore

        public DbSet<TicketAccessAccount> TicketAccessAccounts { get; set; }

-        public DbSet<TaskSchedule> TaskSchedules { get; set; }
-
-
        #endregion

        #region Pooya
--- a/AccountMangement.Infrastructure.EFCore/Mappings/SubAccountRoleMapping.cs
+++ b/AccountMangement.Infrastructure.EFCore/Mappings/SubAccountRoleMapping.cs
@@ -21,10 +21,6 @@ namespace AccountMangement.Infrastructure.EFCore.Mappings
                opt.WithOwner(x => x.SubAccountRole);
            });

-            builder.OwnsMany(x => x.RoleWorkshops, roleWorkshop =>
-            {
-	            roleWorkshop.WithOwner(x => x.SubAccountRole).HasForeignKey(x => x.SubAccountId);
-            });
        }
    }
 }
--- a/AccountMangement.Infrastructure.EFCore/Mappings/TaskScheduleMapping.cs
+++ b/AccountMangement.Infrastructure.EFCore/Mappings/TaskScheduleMapping.cs
@@ -12,10 +12,9 @@ public class TaskScheduleMapping : IEntityTypeConfiguration<TaskSchedule>
        builder.HasKey(x => x.id);

        builder.Property(x => x.Count).HasMaxLength(10);
-        builder.Property(x => x.Type).HasConversion<string>().HasMaxLength(12);
+        builder.Property(x => x.Type).HasMaxLength(12);
        builder.Property(x => x.UnitNumber).HasMaxLength(10);
-        builder.Property(x => x.UnitType).HasConversion<string>().HasMaxLength(10);
-        builder.Property(x => x.IsActive).HasConversion<string>().HasMaxLength(5);
+        builder.Property(x => x.UnitType).HasMaxLength(10);

        builder.HasMany(x => x.TasksList).WithOne(x => x.TaskSchedule)
                                                                                .HasForeignKey(x => x.TaskScheduleId);
--- a/AccountMangement.Infrastructure.EFCore/Migrations/20250407150638_add
+++ b/AccountMangement.Infrastructure.EFCore/Migrations/20250407150638_add
--- a/AccountMangement.Infrastructure.EFCore/Migrations/20250407150638_add
+++ b/AccountMangement.Infrastructure.EFCore/Migrations/20250407150638_add
@@ -1,74 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace AccountMangement.Infrastructure.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class addTaskSchedule : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AlterColumn<string>(
-                name: "UnitType",
-                table: "TaskSchedules",
-                type: "nvarchar(10)",
-                maxLength: 10,
-                nullable: false,
-                defaultValue: "",
-                oldClrType: typeof(string),
-                oldType: "nvarchar(10)",
-                oldMaxLength: 10,
-                oldNullable: true);
-
-            migrationBuilder.AlterColumn<string>(
-                name: "Type",
-                table: "TaskSchedules",
-                type: "nvarchar(12)",
-                maxLength: 12,
-                nullable: false,
-                defaultValue: "",
-                oldClrType: typeof(string),
-                oldType: "nvarchar(12)",
-                oldMaxLength: 12,
-                oldNullable: true);
-
-            migrationBuilder.AddColumn<string>(
-                name: "IsCanceled",
-                table: "TaskSchedules",
-                type: "nvarchar(5)",
-                maxLength: 5,
-                nullable: false,
-                defaultValue: "");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "IsCanceled",
-                table: "TaskSchedules");
-
-            migrationBuilder.AlterColumn<string>(
-                name: "UnitType",
-                table: "TaskSchedules",
-                type: "nvarchar(10)",
-                maxLength: 10,
-                nullable: true,
-                oldClrType: typeof(string),
-                oldType: "nvarchar(10)",
-                oldMaxLength: 10);
-
-            migrationBuilder.AlterColumn<string>(
-                name: "Type",
-                table: "TaskSchedules",
-                type: "nvarchar(12)",
-                maxLength: 12,
-                nullable: true,
-                oldClrType: typeof(string),
-                oldType: "nvarchar(12)",
-                oldMaxLength: 12);
-        }
-    }
-}
--- a/AccountMangement.Infrastructure.EFCore/Migrations/20250416121822_taskSchedule
+++ b/AccountMangement.Infrastructure.EFCore/Migrations/20250416121822_taskSchedule
--- a/AccountMangement.Infrastructure.EFCore/Migrations/20250416121822_taskSchedule
+++ b/AccountMangement.Infrastructure.EFCore/Migrations/20250416121822_taskSchedule
@@ -1,28 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace AccountMangement.Infrastructure.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class taskSchedulerenameisActive : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.RenameColumn(
-                name: "IsCanceled",
-                table: "TaskSchedules",
-                newName: "IsActive");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.RenameColumn(
-                name: "IsActive",
-                table: "TaskSchedules",
-                newName: "IsCanceled");
-        }
-    }
-}
--- a/AccountMangement.Infrastructure.EFCore/Migrations/20250530133036_add
+++ b/AccountMangement.Infrastructure.EFCore/Migrations/20250530133036_add
--- a/AccountMangement.Infrastructure.EFCore/Migrations/20250530133036_add
+++ b/AccountMangement.Infrastructure.EFCore/Migrations/20250530133036_add
@@ -1,43 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace AccountMangement.Infrastructure.EFCore.Migrations
-{
-    /// <inheritdoc />
-    public partial class addworkshoptosubAccountRole : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "SubAccountRoleWorkshop",
-                columns: table => new
-                {
-                    id = table.Column<long>(type: "bigint", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    SubAccountId = table.Column<long>(type: "bigint", nullable: false),
-                    WorkshopId = table.Column<long>(type: "bigint", nullable: false),
-                    CreationDate = table.Column<DateTime>(type: "datetime2", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_SubAccountRoleWorkshop", x => new { x.SubAccountId, x.id });
-                    table.ForeignKey(
-                        name: "FK_SubAccountRoleWorkshop_SubAccountRoles_SubAccountId",
-                        column: x => x.SubAccountId,
-                        principalTable: "SubAccountRoles",
-                        principalColumn: "id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "SubAccountRoleWorkshop");
-        }
-    }
-}
--- a/AccountMangement.Infrastructure.EFCore/Migrations/AccountContextModelSnapshot.cs
+++ b/AccountMangement.Infrastructure.EFCore/Migrations/AccountContextModelSnapshot.cs
@@ -759,16 +759,10 @@ namespace AccountMangement.Infrastructure.EFCore.Migrations
                    b.Property<DateTime>("CreationDate")
                        .HasColumnType("datetime2");

-                    b.Property<string>("IsActive")
-                        .IsRequired()
-                        .HasMaxLength(5)
-                        .HasColumnType("nvarchar(5)");
-
                    b.Property<DateTime>("LastEndTaskDate")
                        .HasColumnType("datetime2");

                    b.Property<string>("Type")
-                        .IsRequired()
                        .HasMaxLength(12)
                        .HasColumnType("nvarchar(12)");

@@ -777,7 +771,6 @@ namespace AccountMangement.Infrastructure.EFCore.Migrations
                        .HasColumnType("nvarchar(10)");

                    b.Property<string>("UnitType")
-                        .IsRequired()
                        .HasMaxLength(10)
                        .HasColumnType("nvarchar(10)");

@@ -1078,33 +1071,6 @@ namespace AccountMangement.Infrastructure.EFCore.Migrations

            modelBuilder.Entity("AccountManagement.Domain.SubAccountRoleAgg.SubAccountRole", b =>
                {
-                    b.OwnsMany("AccountManagement.Domain.SubAccountRoleAgg.SubAccountRoleWorkshop", "RoleWorkshops", b1 =>
-                        {
-                            b1.Property<long>("SubAccountId")
-                                .HasColumnType("bigint");
-
-                            b1.Property<long>("id")
-                                .ValueGeneratedOnAdd()
-                                .HasColumnType("bigint");
-
-                            SqlServerPropertyBuilderExtensions.UseIdentityColumn(b1.Property<long>("id"));
-
-                            b1.Property<DateTime>("CreationDate")
-                                .HasColumnType("datetime2");
-
-                            b1.Property<long>("WorkshopId")
-                                .HasColumnType("bigint");
-
-                            b1.HasKey("SubAccountId", "id");
-
-                            b1.ToTable("SubAccountRoleWorkshop");
-
-                            b1.WithOwner("SubAccountRole")
-                                .HasForeignKey("SubAccountId");
-
-                            b1.Navigation("SubAccountRole");
-                        });
-
                    b.OwnsMany("AccountManagement.Domain.SubAccountRoleAgg.SubAccountRolePermission", "RolePermissions", b1 =>
                        {
                            b1.Property<long>("id")
@@ -1132,8 +1098,6 @@ namespace AccountMangement.Infrastructure.EFCore.Migrations
                        });

                    b.Navigation("RolePermissions");
-
-                    b.Navigation("RoleWorkshops");
                });

            modelBuilder.Entity("AccountManagement.Domain.TaskAgg.Tasks", b =>
--- a/AccountMangement.Infrastructure.EFCore/Repository/AccountRepository.cs
+++ b/AccountMangement.Infrastructure.EFCore/Repository/AccountRepository.cs
@@ -312,17 +312,6 @@ public class AccountRepository : RepositoryBase<long, Account>, IAccountReposito
                IsActiveString = x.IsActive ? "true" : "false",
            }).ToList();
    }
-
-    public async Task<List<AccountSelectListViewModel>> GetAdminSelectList()
-    {
-        return await _context.Accounts.Where(x => x.AdminAreaPermission == "true").Select(x => new AccountSelectListViewModel()
-        {
-            Id = x.id,
-            Name = x.Fullname,
-            RoleId = x.RoleId
-        }).ToListAsync();
-    }
-
    //public List<AccountViewModel> GetAdminAccounts()
    //{
    // return _context.Accounts.Where(x=>x.AdminAreaPermission == "true" && x.IsActiveString == "true").Select(x => new AccountViewModel()
@@ -343,9 +332,4 @@ public class AccountRepository : RepositoryBase<long, Account>, IAccountReposito

    #endregion

-
-    public bool CheckExistClientAccount(string userName)
-    {
-        return _context.Accounts.Any(x => x.Username == userName);
-    }
 }
--- a/AccountMangement.Infrastructure.EFCore/Repository/MediaRepository.cs
+++ b/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
--- a/AccountMangement.Infrastructure.EFCore/Repository/SubAccountRepository.cs
+++ b/AccountMangement.Infrastructure.EFCore/Repository/SubAccountRepository.cs
@@ -77,10 +77,5 @@ namespace AccountMangement.Infrastructure.EFCore.Repository
                Username = entity.Username
            };
        }
-
-        public List<SubAccount> GetBySubAccountRole(long subAccountRoleId)
-        {
-	        return _context.SubAccounts.Where(x => x.SubAccountRoleId == subAccountRoleId).ToList();
-        }
    }
 }
--- a/AccountMangement.Infrastructure.EFCore/Repository/TaskRepository.cs
+++ b/AccountMangement.Infrastructure.EFCore/Repository/TaskRepository.cs
@@ -4,7 +4,6 @@ using _0_Framework.InfraStructure;
 using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
 using System.Linq;
-using System.Threading.Tasks;
 using _0_Framework.Application;
 using AccountManagement.Application.Contracts.Account;
 using AccountManagement.Application.Contracts.Assign;
@@ -47,6 +46,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository

    public EditTask GetDetails(long TaskId)
    {
+        var task = Get(TaskId);

        var userId = _authHelper.CurrentAccountId();

@@ -94,8 +94,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
                        Fullname = a.Fullname,
                        Id = a.id,

-                    }).FirstOrDefault(),
-                TaskScheduleId = x.TaskScheduleId ?? 0
+                    }).FirstOrDefault()

            }).FirstOrDefault();

@@ -106,26 +105,13 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
        {
            res.EndTaskDate = _accountContext.Assigns.First(a => a.TaskId == res.Id && a.AssignedId == userId)
                .EndTaskDate.ToFarsi();
-            var userAssign = res.AssignViewModels.First(x => x.AssignedId == userId);
+

            res.AssignViewModels = res.AssignViewModels.Where(x => x.AssignedId == userId).ToList();
-            res.IsDone = userAssign.IsDone;
-            res.IsCancel = userAssign.IsCancel;
-            res.HasRequest = userAssign.IsCanceledRequest || userAssign.TimeRequest ||
-                             userAssign.IsDoneRequest;
+            res.IsDone = res.AssignViewModels.First(x => x.AssignedId == userId).IsDone;
+            res.IsCancel = res.AssignViewModels.First(x => x.AssignedId == userId).IsCancel;
        }

-        if (res.TaskScheduleId > 0)
-        {
-            var taskSchedule = _accountContext.TaskSchedules.FirstOrDefault(x => x.id == res.TaskScheduleId);
-
-            res.ScheduleUnitType = taskSchedule.UnitType;
-            res.ScheduleType = taskSchedule.Type;
-            res.ScheduleCount = taskSchedule.Count;
-            res.ScheduleUnitNumber = taskSchedule.UnitNumber;
-        }
-
-
        //_accountContext.Tasks.Where(x => x.id == TaskId).Select(x => new EditTask()
        //{
        //    EndTaskDate = x.EndTaskDate.ToFarsi(),
@@ -162,6 +148,8 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
        Remove(task);
    }

+
+
    public List<TaskViewModel> GetRequestedTasks(TaskSearchModel searchModel)
    {
        var accountId = long.Parse(_contextAccessor.HttpContext.User.FindFirst("AccountId").Value);
@@ -900,7 +888,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
            AcceptedTimeRequest = x.AcceptedTimeRequest,
            IsCancelRequest = x.IsCancelRequest,
            ContractingPartyName = x.ContractingPartyName,
-            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel,false),
+            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel),
            MediaCount = x.MediaCount,
            HasAttachment = x.MediaCount > 0,
            SelfName = x.SelfName,
@@ -980,7 +968,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
                .ThenInclude(x => x.Media)
                .Where(x =>
                    x.Task.IsActiveString == "true" && (x.AssignerId == accountId && x.AssignedId != accountId) && (!x.IsCanceledRequest && !x.TimeRequest && !x.IsDoneRequest) && x.Task.TicketId == null &&
-                    x.Task.SenderId == accountId && x.Task.TaskScheduleId == null)
+                    x.Task.SenderId == accountId)
                .Select(x =>
                    new TaskViewModel()
                    {
@@ -1229,7 +1217,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
            AcceptedTimeRequest = x.AcceptedTimeRequest,
            IsCancelRequest = x.IsCancelRequest,
            ContractingPartyName = x.ContractingPartyName,
-            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel, false),
+            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel),
            MediaCount = x.MediaCount,
            HasAttachment = x.MediaCount > 0,
            SelfName = x.SelfName,
@@ -1788,7 +1776,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
            AcceptedTimeRequest = x.AcceptedTimeRequest,
            IsCancelRequest = x.IsCancelRequest,
            ContractingPartyName = x.ContractingPartyName,
-            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel, false),
+            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel),
            MediaCount = x.MediaCount,
            HasAttachment = x.MediaCount > 0,
            SelfName = x.SelfName,
@@ -1851,313 +1839,10 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
        return final;
    }

-    public List<TaskViewModel> GetTaskScheduleList(TaskSearchModel searchModel)
+
+
+    public string SetTasksColors(DateTime date, bool isCancel)
    {
-        var accountId = long.Parse(_contextAccessor.HttpContext.User.FindFirst("AccountId").Value);
-        var positionValue = int.Parse(_contextAccessor.HttpContext.User.FindFirst("PositionValue").Value);
-        var emptyAcc = new AccountViewModel()
-        {
-            Fullname = "-",
-            PositionValue = 0
-        };
-
-        var raw = _accountContext.Assigns.Include(x => x.Task).ThenInclude(x => x.TaskMedias)
-            .ThenInclude(x => x.Media)
-            .Include(x => x.Task).ThenInclude(x => x.TaskSchedule)
-            .Where(x =>
-                x.Task.IsActiveString == "true" && x.Task.SenderId == accountId
-                                                && x.Task.TaskScheduleId != null && x.Task.TaskScheduleId > 0 && (!x.IsCanceledRequest && !x.TimeRequest && !x.IsDoneRequest) && x.Task.TaskSchedule.IsActive== IsActive.True);
-        if (!string.IsNullOrWhiteSpace(searchModel.GeneralSearch))
-        {
-            raw = raw.Where(x =>
-                (x.Task.Description != null && x.Task.Description.Contains(searchModel.GeneralSearch))
-                || x.Task.ContractingPartyName.Contains(searchModel.GeneralSearch)
-                || x.Task.Title.Contains(searchModel.GeneralSearch));
-        }
-
-
-
-
-        var query = raw.GroupBy(x => x.Task.TaskScheduleId).Select(x =>
-             new TaskViewModel()
-             {
-                 AssignedId = x.First().AssignedId,
-                 AssignerId = x.First().AssignerId,
-                 CreateDate = x.First().Task.CreationDate.ToFarsi(),
-                 EndTaskDateFA = x.First().EndTaskDate.ToFarsi(),
-                 IsDone = x.First().IsDone,
-                 EndTaskDateGE = x.First().EndTaskDate,
-                 Name = x.First().Task.Title,
-                 RequestCancel = x.First().IsCanceledRequest,
-                 RequestTime = x.First().TimeRequest,
-                 Id = x.First().Task.id,
-                 CreateTaskDateGE = x.First().Task.CreationDate,
-                 IsCancel = x.First().IsCancel,
-                 AcceptedTimeRequest = x.First().AcceptedTimeRequest,
-                 IsCancelRequest = x.First().IsCanceledRequest,
-                 ContractingPartyName = x.First().Task.ContractingPartyName,
-                 MediaCount = _accountContext.TaskMedias.Count(m => m.TaskId == x.First().Task.id),
-                 Description = x.First().Task.Description,
-                 IsDoneRequest = x.First().IsDoneRequest,
-                 ScheduleType = x.First().Task.TaskSchedule.Type,
-                 ScheduleUnitType = x.First().Task.TaskSchedule.UnitType,
-                 TaskScheduleId = (long)x.First().Task.TaskScheduleId
-
-             }
-        );
-
-        if (!string.IsNullOrWhiteSpace(searchModel.GeneralSearch))
-        {
-            query = query.Where(x =>
-                (x.Description != null && x.Description.Contains(searchModel.GeneralSearch))
-                || x.ContractingPartyName.Contains(searchModel.GeneralSearch)
-                || x.Name.Contains(searchModel.GeneralSearch));
-        }
-
-        var res = query.Select(x => new TaskViewModel()
-        {
-            Sender = _accountContext.Accounts.Include(a => a.Position).Select(a => new AccountViewModel()
-            {
-                PositionValue = a.Position.PositionValue,
-                Id = a.id,
-                Fullname = a.Fullname,
-            }).FirstOrDefault(a => a.Id == x.AssignerId),
-
-            SelfName = _accountContext.Accounts.FirstOrDefault(a => a.id == accountId).Fullname,
-
-            Assigned = _accountContext.Assigns.Where(a => a.TaskId == x.Id)
-                .Where(a => a.AssignedPositionValue >= positionValue).Select(a => a.AssignedId)
-                .ToList(),
-            CreateDate = x.CreateDate,
-            EndTaskDateFA = x.EndTaskDateFA,
-            IsDone = x.IsDone,
-            EndTaskDateGE = x.EndTaskDateGE,
-            Name = x.Name,
-            RequestCancel = x.RequestCancel,
-            RequestTime = x.RequestTime,
-            Id = x.Id,
-            CreateTaskDateGE = x.CreateTaskDateGE,
-            IsCancel = x.IsCancel,
-            AcceptedTimeRequest = x.AcceptedTimeRequest,
-            IsCancelRequest = x.IsCancelRequest,
-            ContractingPartyName = x.ContractingPartyName,
-            MediaCount = x.MediaCount,
-            Description = x.Description,
-            IsDoneRequest = x.IsDoneRequest,
-            ScheduleType = x.ScheduleType,
-            ScheduleUnitType = x.ScheduleUnitType,
-            TaskScheduleId = x.TaskScheduleId
-        });
-        if (!string.IsNullOrWhiteSpace(searchModel.StartDate) && !string.IsNullOrWhiteSpace(searchModel.EndDate))
-        {
-            var start = searchModel.StartDate.ToGeorgianDateTime();
-            var end = searchModel.EndDate.ToGeorgianDateTime();
-            res = res.Where(x =>
-                ((start > x.CreateTaskDateGE && x.CreateTaskDateGE < end) &&
-
-                 (end > x.EndTaskDateGE && x.EndTaskDateGE > start))
-                || ((start < x.CreateTaskDateGE && x.CreateTaskDateGE < end) &&
-
-                    (end < x.EndTaskDateGE && x.EndTaskDateGE > start))
-                || ((start < x.CreateTaskDateGE && x.CreateTaskDateGE < end) &&
-
-                    (end > x.EndTaskDateGE && x.EndTaskDateGE > start))
-                || ((start > x.CreateTaskDateGE && x.CreateTaskDateGE < end) &&
-
-                    (end < x.EndTaskDateGE && x.EndTaskDateGE > end)));
-        }
-
-        if (!string.IsNullOrWhiteSpace(searchModel.IsDoneRequest))
-        {
-            bool isDoneReq = bool.Parse(searchModel.IsDoneRequest);
-            res = res.Where(x => x.IsDoneRequest == isDoneReq);
-        }
-
-        if (!string.IsNullOrWhiteSpace(searchModel.IsDone))
-        {
-            bool isDone = bool.Parse(searchModel.IsDone);
-            res = res.Where(x => x.IsDone == isDone);
-        }
-
-        if (!string.IsNullOrWhiteSpace(searchModel.IsCanceled))
-        {
-            bool isCancel = bool.Parse(searchModel.IsCanceled);
-            res = res.Where(x => x.IsCancel == isCancel);
-        }
-
-        if (!string.IsNullOrWhiteSpace(searchModel.IsTimeRequest))
-        {
-            bool isTimeRequest = bool.Parse(searchModel.IsTimeRequest);
-            res = res.Where(x => x.RequestTime == isTimeRequest);
-        }
-
-        if (!string.IsNullOrWhiteSpace(searchModel.TimeRequestAccepted))
-        {
-            res = res.Where(x => x.AcceptedTimeRequest > 0);
-        }
-
-        if (!string.IsNullOrWhiteSpace(searchModel.IsCancelRequest))
-        {
-            bool isCancelReq = bool.Parse(searchModel.IsCancelRequest);
-            res = res.Where(x => x.IsCancelRequest == isCancelReq);
-
-        }
-
-
-
-        var result = res.AsEnumerable();
-
-
-        if (searchModel.AccountId > 0)
-        {
-            result = result.Where(x =>
-                x.Sender.Id == searchModel.AccountId || x.Assigned.Contains(searchModel.AccountId));
-        }
-
-
-        var orderResult = result.OrderByDescending(x => x.IsCancel ? 0 : 1).ThenBy(x => x.IsDone ? 1 : 0)
-            .ThenBy(x => x.EndTaskDateGE);
-
-
-        var final = orderResult.Skip(searchModel.PageIndex).Take(30).ToList();
-
-        final = final.Select(x => new TaskViewModel()
-        {
-            AssignViewModels = _accountContext.Accounts.Include(x => x.Position)
-                .Where(a => x.Assigned.Contains(a.id) && accountId != a.id)
-                .Select(a => new AssignViewModel()
-                {
-                    AssignedName = a.Fullname,
-                    AssignedPositionValue = a.Position.PositionValue
-                }).ToList(),
-            Sender = x.Sender,
-            SelfAssigner = x.Sender.Id == accountId ? true : false,
-            Assigned = x.Assigned,
-            SelfAssigned = x.Assigned.Any(a => a == accountId) ? true : false,
-            CreateDate = x.CreateDate,
-            EndTaskDateFA = x.EndTaskDateFA,
-            IsDone = x.IsDone,
-            EndTaskDateGE = x.EndTaskDateGE,
-            Name = x.Name,
-            RequestCancel = x.RequestCancel,
-            RequestTime = x.RequestTime,
-            Id = x.Id,
-            CreateTaskDateGE = x.CreateTaskDateGE,
-            IsCancel = x.IsCancel,
-            AcceptedTimeRequest = x.AcceptedTimeRequest,
-            IsCancelRequest = x.IsCancelRequest,
-            ContractingPartyName = x.ContractingPartyName,
-            MediaCount = x.MediaCount,
-            SelfName = x.SelfName,
-            Description = x.Description,
-            IsDoneRequest = x.IsDoneRequest,
-            ScheduleType = x.ScheduleType,
-            ScheduleUnitType = x.ScheduleUnitType,
-            TaskScheduleId = x.TaskScheduleId
-
-
-        }).ToList();
-
-
-        final = final.Select(x => new TaskViewModel()
-        {
-
-            AssignList = x.AssignViewModels.GroupBy(a => a.AssignedPositionValue).Select(a => new AssignList()
-            {
-                AssignViewModels = a.ToList(),
-                PosValue = a.Key
-            }).ToList(),
-            Sender = x.Sender,
-            Assigned = x.Assigned,
-            CreateDate = x.CreateDate,
-            EndTaskDateFA = x.EndTaskDateFA,
-            IsDone = x.IsDone,
-            EndTaskDateGE = x.EndTaskDateGE,
-            Name = x.Name,
-            RequestCancel = x.RequestCancel,
-            RequestTime = x.RequestTime,
-            Id = x.Id,
-            CreateTaskDateGE = x.CreateTaskDateGE,
-            IsCancel = x.IsCancel,
-            AcceptedTimeRequest = x.AcceptedTimeRequest,
-            IsCancelRequest = x.IsCancelRequest,
-            ContractingPartyName = x.ContractingPartyName,
-            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel, false),
-            MediaCount = x.MediaCount,
-            HasAttachment = x.MediaCount > 0,
-            SelfName = x.SelfName,
-            SelfAssigned = x.SelfAssigned,
-            SelfAssigner = x.SelfAssigner,
-            Description = x.Description,
-            IsDoneRequest = x.IsDoneRequest,
-            AssignViewModels = x.AssignViewModels,
-            ScheduleType = x.ScheduleType,
-            ScheduleUnitType = x.ScheduleUnitType,
-            TaskScheduleId = x.TaskScheduleId
-
-        }).ToList();
-
-        final = final.Select(x => new TaskViewModel()
-        {
-
-            AssignList = !(x.SelfAssigned || x.SelfAssigner)
-                ? AddAssign(x.AssignList, x.Sender)
-                : x.AssignList,
-            Sender = !(x.SelfAssigned || x.SelfAssigner)
-                ? new AccountViewModel()
-                {
-                    PositionValue = 0,
-                    Fullname = "-"
-                }
-                : x.Sender,
-            Assigned = x.Assigned,
-            CreateDate = x.CreateDate,
-            EndTaskDateFA = x.EndTaskDateFA,
-            IsDone = x.IsDone,
-            EndTaskDateGE = x.EndTaskDateGE,
-            Name = x.Name,
-            RequestCancel = x.RequestCancel,
-            RequestTime = x.RequestTime,
-            Id = x.Id,
-            CreateTaskDateGE = x.CreateTaskDateGE,
-            IsCancel = x.IsCancel,
-            AcceptedTimeRequest = x.AcceptedTimeRequest,
-            IsCancelRequest = x.IsCancelRequest,
-            ContractingPartyName = x.ContractingPartyName,
-            Color = x.Color,
-            MediaCount = x.MediaCount,
-            HasAttachment = x.HasAttachment,
-            SelfName = !(x.SelfAssigned || x.SelfAssigner) ? "-" : x.SelfName,
-            EndTaskTime = $"{x.EndTaskDateGE.Hour}:{x.EndTaskDateGE.Minute}:{x.EndTaskDateGE.Second}" != "23:59:59"
-                ? $"{x.EndTaskDateGE.Hour}:{x.EndTaskDateGE.Minute}"
-                : "",
-            Description = x.Description,
-            IsDoneRequest = x.IsDoneRequest,
-            CanAssign = _positionRepository.GetLastPositionValue() != positionValue,
-            CanDelete = x.Sender.Id == accountId,
-            CanEdit = x.Sender.Id == accountId && !(_accountContext.Assigns.Any(a => a.TaskId == x.Id && (a.AcceptedTimeRequest > 0 || a.IsCanceledRequest
-                || a.IsDoneRequest || a.TimeRequest || a.IsCancel || a.IsDone))),
-            Assigner = x.Sender.Id == accountId ? emptyAcc.Fullname : x.Sender.Fullname,
-            AssignedReceiverViewModel = x.AssignViewModels.Any()
-                ? x.AssignViewModels.MinBy(a => a.AssignedPositionValue)
-                : new()
-                {
-                    AssignedName = "-",
-                    AssignedPositionValue = 0
-                },
-            ScheduleType = x.ScheduleType,
-            ScheduleUnitType = x.ScheduleUnitType,
-            TaskScheduleId = x.TaskScheduleId
-
-        }).ToList();
-        return final;
-    }
-
-    public string SetTasksColors(DateTime date, bool isCancel,bool hasRequest)
-    {
-        if (hasRequest)
-            return "red";
-
        if (isCancel)
        {
            //return "brown";
@@ -2203,23 +1888,23 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository

    }

-    public async Task<int> GetRequestedTasksCount()
+    public int GetRequestedTasksCount()
    {
        var positionValue = int.Parse(_contextAccessor.HttpContext.User.FindFirst("PositionValue").Value);
        var accountId = long.Parse(_contextAccessor.HttpContext.User.FindFirst("AccountId").Value);
        if (positionValue == 1)
        {
-            return await _accountContext.Assigns.Include(x => x.Task).Where(x =>
+            return _accountContext.Assigns.Include(x => x.Task).Where(x =>
                    !x.IsDone && x.Task.IsActiveString == "true" && !x.IsCancel &&
                    (x.IsCanceledRequest || x.TimeRequest || x.IsDoneRequest) && (accountId == x.Task.SenderId) && x.Task.TicketId == null).GroupBy(x => x.TaskId)
-                .Select(x => x.First()).CountAsync();
+                .Select(x => x.First()).Count();
        }
        else
        {
-            return await _accountContext.Assigns.Include(x => x.Task).Where(x =>
+            return _accountContext.Assigns.Include(x => x.Task).Where(x =>
                    !x.IsDone && x.Task.IsActiveString == "true" && !x.IsCancel &&
                    (x.IsCanceledRequest || x.TimeRequest || x.IsDoneRequest) && (accountId == x.Task.SenderId) && x.Task.TicketId == null).GroupBy(x => x.TaskId)
-                .Select(x => x.First()).CountAsync();
+                .Select(x => x.First()).Count();
        }
    }

@@ -2316,7 +2001,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository

    }

-    public async Task<int> RequestedAndOverdueTasksCount(long userId)
+    public int RequestedAndOverdueTasksCount(long userId)
    {
        var account = _accountRepository.GetIncludePositions(userId);
        if (account.Position == null)
@@ -2324,7 +2009,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository

        DateTime now = DateTime.Now;

-        var overdueTasksCount = await OverdueTasksCount(userId);
+        var overdueTasksCount = OverdueTasksCount(userId);


        //overdueTasksCount = _accountContext.Tasks.Include(x =>
@@ -2333,10 +2018,10 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
        //	                      !x.Assigns.Any(a => a.TimeRequest)
        //	                      && x.Assigns.Any(a => a.AssignedId == userId) &&
        //	                      (x.Assigns.First(a => a.AssignedId == userId).EndTaskDate.Date <= DateTime.Now.Date));
-        var overdueRequestsCount = await GetRequestedTasksCount();
+        var overdueRequestsCount = GetRequestedTasksCount();

-        var ticketRequested = await TasksHaveTicketRequestsCount(userId);
-        var overdueTicket = await TasksHaveTicketCounts(userId);
+        var ticketRequested = TasksHaveTicketRequestsCount(userId);
+        var overdueTicket = TasksHaveTicketCounts(userId);

        return overdueTasksCount + overdueRequestsCount + ticketRequested + overdueTicket;
    }
@@ -2351,7 +2036,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
        return overdueRequestsCount;
    }

-    public async Task<int> OverdueTasksCount(long userId)
+    public int OverdueTasksCount(long userId)
    {
        var account = _accountRepository.GetIncludePositions(userId);

@@ -2363,12 +2048,12 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
        int overdueTasksCount;
        if (positionValue == 1)
        {
-            overdueTasksCount = await _accountContext.Assigns.Include(x => x.Task).Where(x => x.AssignedId == userId &&
+            overdueTasksCount = _accountContext.Assigns.Include(x => x.Task).Where(x => x.AssignedId == userId &&
                    x.AssignerId == userId && x.Task.Assigns.Count == 1 &&
                    !x.IsCancel && !x.IsCanceledRequest &&
                    !x.IsDone && !x.TimeRequest && !x.IsDoneRequest && x.EndTaskDate.Date <= DateTime.Now.Date &&
                    x.Task.IsActiveString == "true" && x.Task.TicketId == null)
-                .GroupBy(x => x.TaskId).Select(x => x.First()).CountAsync();
+                .GroupBy(x => x.TaskId).Select(x => x.First()).Count();

            //overdueTasksCount = _accountContext.Tasks.Include(x =>
            //	x.Assigns).Count(x => !x.Assigns.Any(a => a.IsCancel) && !x.Assigns.Any(a => a.IsCanceledRequest) &&
@@ -2380,49 +2065,43 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
        }
        else
        {
-            overdueTasksCount = await _accountContext.Assigns.Include(x => x.Task).Where(x => x.AssignedId == userId &&
+            overdueTasksCount = _accountContext.Assigns.Include(x => x.Task).Where(x => x.AssignedId == userId &&
                    !x.IsCancel && !x.IsCanceledRequest &&
                    !x.IsDone && !x.TimeRequest && !x.IsDoneRequest && x.EndTaskDate.Date <= DateTime.Now.Date &&
                    x.Task.IsActiveString == "true" && x.Task.TicketId == null)
-                .GroupBy(x => x.TaskId).Select(x => x.First()).CountAsync();
+                .GroupBy(x => x.TaskId).Select(x => x.First()).Count();
            ;
        }

        return overdueTasksCount;
    }

-    public List<Tasks> GetTasksByTaskScheduleId(long taskScheduleId)
+    public int TasksHaveTicketCounts(long userId)
    {
-        return _accountContext.Tasks.Include(x => x.Assigns).Where(x => x.TaskScheduleId != null && x.TaskScheduleId == taskScheduleId).ToList();
-    }
-
-
-    public async Task<int> TasksHaveTicketCounts(long userId)
-    {
-        return await _accountContext.Assigns.Include(x => x.Task).Where(x =>
+        return _accountContext.Assigns.Include(x => x.Task).Where(x =>
            !x.IsDone && x.Task.IsActiveString == "true" && !x.IsCancel &&
            !x.IsCanceledRequest && !x.IsDoneRequest &&
            !x.TimeRequest && (x.AssignerId == userId || x.AssignedId == userId) &&
-            (x.Task.TicketId != null && x.Task.TicketId > 0)).GroupBy(x => x.TaskId).CountAsync();
+            (x.Task.TicketId != null && x.Task.TicketId > 0)).GroupBy(x => x.TaskId).Count();
    }

-    public async Task<int> TasksHaveTicketRequestsCount(long userId)
+    public int TasksHaveTicketRequestsCount(long userId)
    {
        var positionValue = int.Parse(_contextAccessor.HttpContext.User.FindFirst("PositionValue").Value);
        var accountId = long.Parse(_contextAccessor.HttpContext.User.FindFirst("AccountId").Value);
        if (positionValue == 1)
        {
-            return await _accountContext.Assigns.Include(x => x.Task).Where(x =>
+            return _accountContext.Assigns.Include(x => x.Task).Where(x =>
                    !x.IsDone && x.Task.IsActiveString == "true" && !x.IsCancel &&
                    (x.IsCanceledRequest || x.TimeRequest || x.IsDoneRequest) && (accountId == x.Task.SenderId) && x.Task.TicketId != null && x.Task.TicketId > 0).GroupBy(x => x.TaskId)
-                .Select(x => x.First()).CountAsync();
+                .Select(x => x.First()).Count();
        }
        else
        {
-            return await _accountContext.Assigns.Include(x => x.Task).Where(x =>
+            return _accountContext.Assigns.Include(x => x.Task).Where(x =>
                    !x.IsDone && x.Task.IsActiveString == "true" && !x.IsCancel &&
                    (x.IsCanceledRequest || x.TimeRequest || x.IsDoneRequest) && (accountId == x.Task.SenderId) && x.Task.TicketId != null && x.Task.TicketId > 0).GroupBy(x => x.TaskId)
-                .Select(x => x.First()).CountAsync();
+                .Select(x => x.First()).Count();
        }
    }

@@ -2661,7 +2340,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
            AcceptedTimeRequest = x.AcceptedTimeRequest,
            IsCancelRequest = x.IsCancelRequest,
            ContractingPartyName = x.ContractingPartyName,
-            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel, false),
+            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel),
            MediaCount = x.MediaCount,
            HasAttachment = x.MediaCount > 0,
            SelfName = x.SelfName,
@@ -2725,7 +2404,6 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
    {
        var accountId = long.Parse(_contextAccessor.HttpContext.User.FindFirst("AccountId").Value);
        var positionValue = int.Parse(_contextAccessor.HttpContext.User.FindFirst("PositionValue").Value);
-        var today = DateTime.Today;
        var emptyAcc = new AccountViewModel()
        {
            Fullname = "-",
@@ -2735,7 +2413,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
        var raw = _accountContext.Assigns.Include(x => x.Task).ThenInclude(x => x.TaskMedias)
            .ThenInclude(x => x.Media)
            .Where(x =>
-                x.Task.IsActiveString == "true" && x.AssignedId == accountId  && x.Task.TicketId == null &&!x.IsDoneRequest && !x.IsCanceledRequest);
+                x.Task.IsActiveString == "true" && x.AssignedId == accountId && (!x.IsCanceledRequest && !x.TimeRequest && !x.IsDoneRequest) && x.Task.TicketId == null);
        if (!string.IsNullOrWhiteSpace(searchModel.GeneralSearch))
        {
            raw = raw.Where(x =>
@@ -2768,7 +2446,6 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
                MediaCount = _accountContext.TaskMedias.Count(m => m.TaskId == x.Task.id),
                Description = x.Task.Description,
                IsDoneRequest = x.IsDoneRequest,
-                
            });
        if (!string.IsNullOrWhiteSpace(searchModel.GeneralSearch))
        {
@@ -2807,8 +2484,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
            ContractingPartyName = x.ContractingPartyName,
            MediaCount = x.MediaCount,
            Description = x.Description,
-            IsDoneRequest = x.IsDoneRequest,
-            HasRequest = x.IsCancelRequest || x.RequestTime || x.IsDoneRequest
+            IsDoneRequest = x.IsDoneRequest
        });
        if (!string.IsNullOrWhiteSpace(searchModel.StartDate) && !string.IsNullOrWhiteSpace(searchModel.EndDate))
        {
@@ -2877,10 +2553,8 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
        }


-        var orderResult = result.OrderBy(x => x.IsDone || x.IsCancel)
-            .ThenByDescending(x => x.EndTaskDateGE <= today.AddDays(1) && !x.RequestTime)
-            .ThenByDescending(x => x.RequestTime)
-            .ThenBy(x => x.EndTaskDateGE); // مرتب‌سازی داخلی بر اساس تاریخ
+        var orderResult = result.OrderByDescending(x => x.IsCancel ? 0 : 1).ThenBy(x => x.IsDone ? 1 : 0)
+            .ThenBy(x => x.EndTaskDateGE);


        var final = orderResult.Skip(searchModel.PageIndex).Take(30).ToList();
@@ -2914,7 +2588,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
            MediaCount = x.MediaCount,
            SelfName = x.SelfName,
            Description = x.Description,
-            IsDoneRequest = x.IsDoneRequest,
+            IsDoneRequest = x.IsDoneRequest

        }).ToList();

@@ -2942,7 +2616,7 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
            AcceptedTimeRequest = x.AcceptedTimeRequest,
            IsCancelRequest = x.IsCancelRequest,
            ContractingPartyName = x.ContractingPartyName,
-            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel,x.RequestTime),
+            Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel),
            MediaCount = x.MediaCount,
            HasAttachment = x.MediaCount > 0,
            SelfName = x.SelfName,
@@ -3001,8 +2675,6 @@ public class TaskRepository : RepositoryBase<long, Tasks>, ITaskRepository
                    AssignedName = "-",
                    AssignedPositionValue = 0
                },
-            HasRequest = x.IsCancelRequest || x.RequestTime || x.IsDoneRequest
-
        }).ToList();
        return final;
    }
--- a/AccountMangement.Infrastructure.EFCore/Repository/TaskScheduleRepository.cs
+++ b/AccountMangement.Infrastructure.EFCore/Repository/TaskScheduleRepository.cs
@@ -1,69 +0,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using _0_Framework.Application;
-using _0_Framework.InfraStructure;
-using AccountManagement.Application.Contracts.Media;
-using AccountManagement.Application.Contracts.Task;
-using AccountManagement.Application.Contracts.TaskSchedule;
-using AccountManagement.Domain.TaskScheduleAgg;
-using Microsoft.EntityFrameworkCore;
-
-namespace AccountMangement.Infrastructure.EFCore.Repository;
-
-public class TaskScheduleRepository : RepositoryBase<long, TaskSchedule>, ITaskScheduleRepository
-{
-    private readonly AccountContext _accountContext;
-
-    public TaskScheduleRepository(AccountContext accountContext) : base(accountContext)
-    {
-        _accountContext = accountContext;
-    }
-
-    public async Task<TaskScheduleDetailsViewModel> GetDetails(long id)
-    {
-        var taskSchedule = await _accountContext.TaskSchedules.Include(x => x.TasksList).ThenInclude(x => x.Assigns)
-            .Include(x => x.TasksList).ThenInclude(x => x.TaskMedias).ThenInclude(x => x.Media).FirstOrDefaultAsync(x => x.id == id);
-        if (taskSchedule == null)
-        {
-            return null;
-        }
-
-        var firstTaskDetails = taskSchedule.TasksList.First();
-
-        var firstTimeAssigns = firstTaskDetails.Assigns.Where(x => x.FirstTimeCreation).ToList();
-
-        var assignedIds = firstTimeAssigns.Select(x => x.AssignedId).ToList();
-
-        var senderId = firstTaskDetails.SenderId;
-
-
-        var assignedAccounts = await _accountContext.Accounts.Where(x => assignedIds.Contains(x.id)).ToListAsync();
-
-        var sender =
-            await _accountContext.Accounts.FirstOrDefaultAsync(x => senderId == x.id);
-
-        var viewModel = new TaskScheduleDetailsViewModel()
-        {
-            Title = firstTaskDetails.Title,
-            Description = firstTaskDetails.Description,
-            ContractingPartyName = firstTaskDetails.ContractingPartyName,
-            AssignedName = assignedAccounts.Select(x => x.Fullname).ToList(),
-            CreationDateFa = firstTaskDetails.CreationDate.ToFarsi(),
-            SenderName = sender.Fullname,
-            TaskScheduleType = taskSchedule.Type,
-            TaskScheduleUnitType = taskSchedule.UnitType,
-            UnitNumber = taskSchedule.UnitNumber,
-            Count = taskSchedule.Type == TaskScheduleType.Limited ? taskSchedule.Count : "نامحدود",
-            FirstEndTaskDate = firstTaskDetails.Assigns.FirstOrDefault()?.EndTaskDate.ToFarsi() ?? "",
-            Medias = firstTaskDetails.TaskMedias.Select(x => new MediaViewModel()
-            {
-                Category = x.Media.Category,
-                Id = x.MediaId,
-                Type = x.Media.Type,
-                Path = x.Media.Path,
-            }).ToList(),
-        };
-        return viewModel;
-
-    }
-}
--- a/BackgroundInstitutionContract/BackgroundInstitutionContract.Task/BackgroundInstitutionContract.Task.csproj
+++ b/BackgroundInstitutionContract/BackgroundInstitutionContract.Task/BackgroundInstitutionContract.Task.csproj
@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
- <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <AssemblyName>BackgroundInstitutionContract.Task</AssemblyName>
-    <RootNamespace>BackgroundInstitutionContract.Task</RootNamespace>
-  </PropertyGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\..\0_Framework\0_Framework.csproj" />
-      <ProjectReference Include="..\..\AccountManagement.Configuration\AccountManagement.Configuration.csproj" />
-      <ProjectReference Include="..\..\PersonalContractingParty.Config\PersonalContractingParty.Config.csproj" />
-      <ProjectReference Include="..\..\Query.Bootstrapper\Query.Bootstrapper.csproj" />
-      <ProjectReference Include="..\..\WorkFlow\Infrastructure\WorkFlow.Infrastructure.Config\WorkFlow.Infrastructure.Config.csproj" />
-    </ItemGroup>
-
-</Project>
--- a/BackgroundInstitutionContract/BackgroundInstitutionContract.Task/FileUploader.cs
+++ b/BackgroundInstitutionContract/BackgroundInstitutionContract.Task/FileUploader.cs
@@ -1,32 +0,0 @@
-using _0_Framework.Application;
-
-namespace BackgroundInstitutionContract.Task
-{
-    public class FileUploader : IFileUploader
-    {
-        private readonly IWebHostEnvironment _webHostEnvironment;
-
-        public FileUploader(IWebHostEnvironment webHostEnvironment)
-        {
-            _webHostEnvironment = webHostEnvironment;
-        }
-    
-        public string Upload(IFormFile file, string path)
-        {
-            if (file == null) return "";
-
-            var directoryPath = $"{_webHostEnvironment.WebRootPath}\\ProductPictures\\{path}";
-
-            if (!Directory.Exists(directoryPath))
-                Directory.CreateDirectory(directoryPath);
-
-            var fileName = $"{DateTime.Now.ToFileName()}-{file.FileName}";
-            var filePath = $"{directoryPath}\\{fileName}";
-            var output = System.IO.File.Create(filePath);
-            file.CopyTo(output);
-            return $"{path}/{fileName}";
-        }
-
-      
-    }
-}
--- a/BackgroundInstitutionContract/BackgroundInstitutionContract.Task/Jobs/JobSchedulerRegistrator.cs
+++ b/BackgroundInstitutionContract/BackgroundInstitutionContract.Task/Jobs/JobSchedulerRegistrator.cs
@@ -1,149 +0,0 @@
-
-using _0_Framework.Application;
-using Company.Domain.ContarctingPartyAgg;
-using Company.Domain.InstitutionContractAgg;
-using Hangfire;
-
-namespace BackgroundInstitutionContract.Task.Jobs;
-
-public class JobSchedulerRegistrator
-{
-    private readonly IBackgroundJobClient _backgroundJobClient;
-    private readonly SmsReminder _smsReminder;
-    private readonly IInstitutionContractRepository _institutionContractRepository;
-    private static DateTime? _lastRunCreateTransaction;
-    private static DateTime? _lastRunSendMonthlySms;
-
-
-    public JobSchedulerRegistrator(SmsReminder smsReminder, IBackgroundJobClient backgroundJobClient, IInstitutionContractRepository institutionContractRepository)
-    {
-        _smsReminder = smsReminder;
-        _backgroundJobClient = backgroundJobClient;
-        _institutionContractRepository = institutionContractRepository;
-    }
-
-    public void Register()
-    {
-
-        RecurringJob.AddOrUpdate(
-            "InstitutionContract.CreateFinancialTransaction",
-            () => CreateFinancialTransaction(),
-            "*/30 * * * *"  // هر 30 دقیقه یکبار چک کن
-        );
-
-        RecurringJob.AddOrUpdate(
-            "InstitutionContract.SendMonthlySms",
-            () => SendFirstDayOfMonthSms(),
-            "*/20 * * * *"  // هر 30 دقیقه یکبار چک کن
-        );
-
-        RecurringJob.AddOrUpdate(
-            "InstitutionContract.SendReminderSms",
-            () => SendReminderSms(),
-            "*/1 * * * *"  // هر 1 دقیقه یکبار چک کن
-        );
-        RecurringJob.AddOrUpdate(
-            "InstitutionContract.SendBlockSms",
-            () => SendBlockSms(),
-            "*/1 * * * *"  // هر 1 دقیقه یکبار چک کن
-        );
-    }
-
-
-    /// <summary>
-    /// ایجاد سند بدهی ماهیانه برای قراداد مالی
-    /// </summary>
-    /// <returns></returns>
-    [DisableConcurrentExecution(timeoutInSeconds: 1200)]
-    public async System.Threading.Tasks.Task CreateFinancialTransaction()
-    {
-        var now =DateTime.Now;
-        var endOfMonth = now.ToFarsi().FindeEndOfMonth();
-        var endOfMonthGr = endOfMonth.ToGeorgianDateTime();
-
-        if (now.Date == endOfMonthGr.Date && now.Hour >= 2 && now.Hour < 4 &&
-            now.Date != _lastRunCreateTransaction?.Date)
-        {
-            
-            var month = endOfMonth.Substring(5, 2);
-            var year = endOfMonth.Substring(0, 4);
-            var monthName = month.ToFarsiMonthByNumber();
-            var description = $"{monthName} {year}";
-
-
-
-            var endnew = ($"{endOfMonth.Substring(0, 8)}01").FindeEndOfMonth();
-
-            var endNewGr = endnew.ToGeorgianDateTime();
-            var endNewFa = endNewGr.ToFarsi();
-
-            try
-            {
-                 await _institutionContractRepository.CreateTransactionForInstitutionContracts(endNewGr, endNewFa, description);
-                _lastRunCreateTransaction = now;
-                Console.WriteLine("CreateTransAction executed");
-      
-            }
-            catch (Exception e)
-            {
-                //_smsService.Alarm("09114221321", "خطا-ایجاد سند مالی");
-          
-            }
-           
-        }
-    }
-
-
-    /// <summary>
-    /// ارسال پیامک صورت حساب ماهانه
-    /// </summary>
-    /// <returns></returns>
-    [DisableConcurrentExecution(timeoutInSeconds: 600)]
-    public async System.Threading.Tasks.Task SendFirstDayOfMonthSms()
-    {
-        //var now = new DateTime(2025,11,21, 10,30,0);
-        var now = DateTime.Now;
-        var endOfMonth = now.ToFarsi().FindeEndOfMonth();
-        var endOfMonthGr = endOfMonth.ToGeorgianDateTime();
-
-        if (now.Date == endOfMonthGr.Date && now.Hour >= 10 && now.Hour < 11 &&
-            now.Date != _lastRunSendMonthlySms?.Date)
-        {
-
-            try
-            {
-                await _institutionContractRepository.SendMonthlySms(now);
-                _lastRunSendMonthlySms = now;
-                Console.WriteLine("Send Monthly sms executed");
-
-            }
-            catch (Exception e)
-            {
-                //_smsService.Alarm("09114221321", "خطا-ایجاد سند مالی");
-
-            }
-
-        }
-    }
-
-    /// <summary>
-    /// ارسال پیامک یاد آور بدهی
-    /// </summary>
-    /// <returns></returns>
-    [DisableConcurrentExecution(timeoutInSeconds: 1200)]
-    public async System.Threading.Tasks.Task SendReminderSms()
-    {
-        await _institutionContractRepository.SendReminderSmsForBackgroundTask();
-    }
-
-    /// <summary>
-    /// ارسال پیامک مسدودی
-    /// </summary>
-    /// <returns></returns>
-    [DisableConcurrentExecution(timeoutInSeconds: 100)]
-    public async System.Threading.Tasks.Task SendBlockSms()
-    {
-        await _institutionContractRepository.SendBlockSmsForBackgroundTask();
-    }
-
-}
--- a/BackgroundInstitutionContract/BackgroundInstitutionContract.Task/Jobs/SmsReminder.cs
+++ b/BackgroundInstitutionContract/BackgroundInstitutionContract.Task/Jobs/SmsReminder.cs
@@ -1,116 +0,0 @@
-using _0_Framework.Application.Sms;
-using AccountManagement.Application.Contracts.Account;
-using AccountMangement.Infrastructure.EFCore;
-using Company.Domain.SmsResultAgg;
-using Microsoft.EntityFrameworkCore;
-using SmsResult = Company.Domain.SmsResultAgg.SmsResult;
-
-namespace BackgroundInstitutionContract.Task.Jobs;
-public class SmsReminder
-{
-    private readonly AccountContext _accountContext;
-    private readonly ISmsService _smsService;
-    private readonly ISmsResultRepository _smsResultRepository;
-
-    public SmsReminder(ISmsService smsService, AccountContext accountContext, ISmsResultRepository smsResultRepository)
-    {
-        _smsService = smsService;
-        _accountContext = accountContext;
-        _smsResultRepository = smsResultRepository;
-    }
-
-    public void Execute()
-    {
-        //var accounts = _accountContext.Accounts.Where(x => x.PositionId > 0 && x.IsActiveString == "true").Select(x => new AccountViewModel() { Id = x.id, Mobile = x.Mobile, Fullname = x.Fullname }).ToList();
-        //Thread.Sleep(300);
-         //var accounts = new List<AccountViewModel>() { new AccountViewModel() { Mobile = "09114221321", Id = 2 } };
-        var accounts= _accountContext.Accounts.Where(x => x.Username.ToLower()=="mahan").Select(x => new AccountViewModel() { Id = x.id, Mobile = x.Mobile, Fullname = x.Fullname }).ToList();
-        var smsVM = accounts.Select(x => new AccountSmsTaskViewModel()
-        {
-            Mobile = x.Mobile,
-            AccountId = x.Id,
-            FullName = x.Fullname,
-            TaskCount = GetLateTasksCount(x.Id)
-        }).Where(x => x.TaskCount > 0 && !string.IsNullOrEmpty(x.Mobile) && x.Mobile.Length == 11).ToList();
-        Thread.Sleep(300);
-
-
-        foreach (var viewmodel in smsVM)
-        {
-            var smsResult = _smsService.TaskReminderSms(viewmodel.Mobile, $"{viewmodel.TaskCount}");
-            Thread.Sleep(1000);
-            var createSmsResult = new SmsResult(smsResult.MessageId, smsResult.Message, "یادآور وظایف",
-                viewmodel.FullName, viewmodel.Mobile, viewmodel.AccountId, viewmodel.AccountId);
-            _smsResultRepository.Create(createSmsResult);
-            _smsResultRepository.SaveChanges();
-            Thread.Sleep(1000);
-        }
-    }
-     private int GetLateTasksCount(long accountId)
-    {
-        var positionValue = _accountContext.Accounts
-            .Where(x => x.id == accountId)
-            .Include(p => p.Position)
-            .Select(x => x.Position.PositionValue)
-            .FirstOrDefault();
-
-        if (positionValue == 0)
-            return 0;
-
-
-        DateTime now = DateTime.Now;
-        int overdueTasksCount;
-
-        if (positionValue == 1)
-        {
-            overdueTasksCount = _accountContext.Assigns.Include(x => x.Task).Where(x => x.AssignedId == accountId &&
-                    x.AssignerId == accountId && x.Task.Assigns.Count == 1 &&
-                    !x.IsCancel && !x.IsCanceledRequest &&
-                    !x.IsDone && !x.TimeRequest && !x.IsDoneRequest && x.EndTaskDate.Date <= DateTime.Now.Date && x.Task.IsActiveString == "true")
-                .GroupBy(x => x.TaskId).Select(x => x.First()).Count();
-
-            //overdueTasksCount = _accountContext.Tasks.Include(x =>
-            //	x.Assigns).Count(x => !x.Assigns.Any(a => a.IsCancel) && !x.Assigns.Any(a => a.IsCanceledRequest) &&
-            //						  !x.Assigns.Any(a => a.IsDone) && !x.Assigns.Any(a => a.IsDoneRequest) &&
-            //						  !x.Assigns.Any(a => a.TimeRequest)
-            //						  && x.Assigns.Any(a => a.AssignedId == accountId && a.AssignerId == accountId) &&
-            //						  (x.Assigns.First(a => a.AssignedId == accountId && a.AssignerId == accountId)
-            //							  .EndTaskDate.Date <= DateTime.Now.Date) && x.Assigns.Count == 1);
-        }
-        else
-        {
-
-            overdueTasksCount = _accountContext.Assigns
-                .Include(x => x.Task)
-                .Where(x => x.AssignedId == accountId &&
-                            !x.IsCancel && !x.IsCanceledRequest &&
-                            !x.IsDone && !x.TimeRequest && !x.IsDoneRequest && x.EndTaskDate.Date <= DateTime.Now.Date && x.Task.IsActiveString == "true")
-                .GroupBy(x => x.TaskId).Select(x => x.First()).Count();
-        }
-
-
-        //overdueTasksCount = _accountContext.Tasks.Include(x =>
-        //	x.Assigns).Count(x => !x.Assigns.Any(a => a.IsCancel) && !x.Assigns.Any(a => a.IsCanceledRequest) &&
-        //	                      !x.Assigns.Any(a => a.IsDone) && !x.Assigns.Any(a => a.IsDoneRequest) &&
-        //	                      !x.Assigns.Any(a => a.TimeRequest)
-        //	                      && x.Assigns.Any(a => a.AssignedId == accountId) &&
-        //	                      (x.Assigns.First(a => a.AssignedId == accountId).EndTaskDate.Date <= DateTime.Now.Date));
-
-
-        var overdueRequestsCount = _accountContext.Assigns.Include(x => x.Task)
-            .Where(x => (x.IsCanceledRequest
-                         || x.IsDoneRequest || x.TimeRequest) && !x.IsCancel && !x.IsDone &&
-                        x.Task.IsActiveString == "true" &&
-                        x.Task.SenderId == accountId).GroupBy(x => x.TaskId).Select(x => x.First()).Count();
-
-        return overdueTasksCount + overdueRequestsCount;
-    }
-    
-}
-public class AccountSmsTaskViewModel
-{
-    public int TaskCount { get; set; }
-    public long AccountId { get; set; }
-    public string Mobile { get; set; }
-    public string FullName { get; set; }
-}
--- a/BackgroundInstitutionContract/BackgroundInstitutionContract.Task/JobsBootstrapper.cs
+++ b/BackgroundInstitutionContract/BackgroundInstitutionContract.Task/JobsBootstrapper.cs
@@ -1,25 +0,0 @@
-using BackgroundInstitutionContract.Task.Jobs;
-
-
-namespace BackgroundInstitutionContract.Task;
-
-public class JobsBootstrapper
-{
-    public static void Configure(IServiceCollection services)
-    {
-        var currentNamespace = typeof(JobSchedulerRegistrator).Namespace; // همون namespace کلاس
-
-        var assembly = typeof(JobSchedulerRegistrator).Assembly;
-
-        var jobTypes = assembly.GetTypes()
-            .Where(t =>
-                t is { IsClass: true, IsAbstract: false, Namespace: not null } &&
-                t.Namespace.StartsWith(currentNamespace, StringComparison.Ordinal))
-            .ToList();
-
-        foreach (var jobType in jobTypes)
-        {
-            services.AddTransient(jobType);
-        }
-    }
-}
--- a/BackgroundInstitutionContract/BackgroundInstitutionContract.Task/Program.cs
+++ b/BackgroundInstitutionContract/BackgroundInstitutionContract.Task/Program.cs
@@ -1,63 +0,0 @@
-using _0_Framework.Application;
-using _0_Framework.Application.Sms;
-using _0_Framework.Application.UID;
-using _0_Framework.InfraStructure.Mongo;
-using AccountManagement.Configuration;
-using BackgroundInstitutionContract.Task;
-using BackgroundInstitutionContract.Task.Jobs;
-using CompanyManagment.App.Contracts.Hubs;
-using CompanyManagment.EFCore.Services;
-using Hangfire;
-using Microsoft.AspNetCore.Identity;
-using MongoDB.Driver;
-using PersonalContractingParty.Config;
-using Query.Bootstrapper;
-using WorkFlow.Infrastructure.Config;
-
-var builder = WebApplication.CreateBuilder(args);
-var hangfireConnectionString = builder.Configuration.GetConnectionString("HangfireDb");
-builder.Services.AddHangfire(x => x.UseSqlServerStorage(hangfireConnectionString));
-builder.Services.AddHangfireServer();
-var connectionString = builder.Configuration.GetConnectionString("MesbahDb");
-var connectionStringTestDb = builder.Configuration.GetConnectionString("TestDb");
-builder.Services.AddSingleton<IPasswordHasher, PasswordHasher>();
-builder.Services.AddTransient<IAuthHelper, AuthHelper>();
-builder.Services.AddTransient<ISmsService, SmsService>();
-builder.Services.AddTransient<IUidService, UidService>();
-builder.Services.AddTransient<IFileUploader, FileUploader>();
-builder.Services.Configure<AppSettingConfiguration>(builder.Configuration);
-
-#region MongoDb
-
-var mongoConnectionSection = builder.Configuration.GetSection("MongoDb");
-var mongoDbSettings = mongoConnectionSection.Get<MongoDbConfig>();
-var mongoClient = new MongoClient(mongoDbSettings.ConnectionString);
-var mongoDatabase = mongoClient.GetDatabase(mongoDbSettings.DatabaseName);
-
-builder.Services.AddSingleton<IMongoDatabase>(mongoDatabase);
-
-#endregion
-
-PersonalBootstrapper.Configure(builder.Services, connectionString);
-TestDbBootStrapper.Configure(builder.Services, connectionStringTestDb);
-AccountManagementBootstrapper.Configure(builder.Services, connectionString);
-WorkFlowBootstrapper.Configure(builder.Services, connectionString);
-QueryBootstrapper.Configure(builder.Services);
-JobsBootstrapper.Configure(builder.Services);
-builder.Services.AddHttpClient();
-builder.Services.AddHttpContextAccessor();
-builder.Services.AddSignalR();
-
-var app = builder.Build();
-app.MapHub<SendSmsHub>("/sendSmsHub");
-
-app.MapHangfireDashboard();
-app.MapGet("/", () => "Hello World!");
-
-using (var scope = app.Services.CreateScope())
-{
-    var jobScheduler = scope.ServiceProvider.GetRequiredService<JobSchedulerRegistrator>();
-    jobScheduler.Register();
-}
-
-app.Run();
--- a/BackgroundInstitutionContract/BackgroundInstitutionContract.Task/Properties/launchSettings.json
+++ b/BackgroundInstitutionContract/BackgroundInstitutionContract.Task/Properties/launchSettings.json
@@ -1,38 +0,0 @@
-{
-  "$schema": "http://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:56492",
-      "sslPort": 44378
-    }
-  },
-  "profiles": {
-    "http": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "applicationUrl": "http://localhost:5216",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "https": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "applicationUrl": "https://localhost:7223;http://localhost:5217",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}
--- a/Show More
+++ b/Show More