change program.cs logger and docker file

# Conflicts:
#	ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskChat/Queries/GetMessages/GetMessagesQuery.cs

.gitea/workflows/dad-mehr-gitea-deploy.yml

@@ -0,0 +1,91 @@
+name: Build and Deploy (.NET)
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+env:
+  IMAGE_NAME: my-project
+  DEPLOY_PATH: /home/${{ secrets.SSH_USERNAME }}/deployments/my-project
+
+jobs:
+  build-push:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      - name: Login to Private Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ secrets.DOCKER_REGISTRY }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build and Push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: |
+            ${{ secrets.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ gitea.ref_name }}
+            ${{ secrets.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+
+  deploy:
+    needs: build-push
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      # فقط فایل docker-compose.yml را آپدیت می‌کنیم (فایل .env روی سرور دست نمی‌خورد)
+      - name: Copy docker-compose to Server
+        uses: appleboy/scp-action@v0.1.7
+        with:
+          host: ${{ secrets.SSH_HOST }}
+          username: ${{ secrets.SSH_USERNAME }}
+          key: ${{ secrets.SSH_KEY }}
+          port: 22
+          source: "docker-compose.yml"
+          target: ${{ env.DEPLOY_PATH }}
+
+      # اجرا روی سرور
+      - name: Remote SSH Commands
+        uses: appleboy/ssh-action@v1.0.3
+        env:
+          # تعریف متغیرهایی که می‌خواهیم به سرور پاس دهیم
+          DOCKER_REGISTRY: ${{ secrets.DOCKER_REGISTRY }}
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+          APP_VERSION: ${{ gitea.ref_name }} # ورژن تگ شده
+          APP_PORT: ${{ secrets.APP_PORT }}
+          IMAGE_NAME: ${{ env.IMAGE_NAME }}
+        with:
+          host: ${{ secrets.SSH_HOST }}
+          username: ${{ secrets.SSH_USERNAME }}
+          key: ${{ secrets.SSH_KEY }}
+          port: 22
+          # لیست متغیرهایی که باید به نشست SSH منتقل شوند
+          envs: DOCKER_REGISTRY,DOCKER_USERNAME,DOCKER_PASSWORD,APP_VERSION,APP_PORT,IMAGE_NAME
+          script: |
+            cd ${{ env.DEPLOY_PATH }}
+
+            # لاگین داکر
+            echo "$DOCKER_PASSWORD" | docker login $DOCKER_REGISTRY -u $DOCKER_USERNAME --password-stdin
+
+            # نکته مهم:
+            # الان متغیرهای APP_VERSION و ... در حافظه این Session موجود هستند.
+            # وقتی دستور docker compose اجرا شود، مقادیر ${APP_VERSION} در فایل yml
+            # را با مقادیر موجود در حافظه جایگزین می‌کند.
+            # و فایل .env موجود روی دیسک را هم برای سایر متغیرها می‌خواند.
+
+            echo "Deploying version: $APP_VERSION"
+
+            # پول کردن با استفاده از متغیرهای حافظه
+            docker compose pull
+
+            # اجرای کانتینر
+            docker compose up -d --remove-orphans
+
+            docker image prune -f

.gitignore

@@ -1,3 +1,21 @@
+.env*
+.env
+certs/*.pfx
+certs/*.pem
+certs/*.key
+certs/*.crt
+Storage/
+Logs/
+*.user
+*.suo
+bin/
+obj/
+certs/*.pfx
+certs/*.pem
+certs/*.key
+certs/*.crt
+Storage/
+Logs/
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 ##
@@ -364,3 +382,7 @@ MigrationBackup/
 .idea
 /ServiceHost/appsettings.Development.json
 /ServiceHost/appsettings.json
+
+# Storage folder - ignore all uploaded files, thumbnails, and temporary files
+ServiceHost/Storage
+

0_Framework/Application/Enums/TypeOfSmsSetting.cs

@@ -2,6 +2,8 @@
 
 public enum TypeOfSmsSetting
 {
+    //همه انواع پیامک
+    All = 0,
 
     /// <summary>
     /// پیامک
@@ -23,7 +25,7 @@ public enum TypeOfSmsSetting
 
     /// <summary>
     /// پیامک
-    /// هشدار اول
+    /// هشدار بدهی
     /// </summary>
     Warning,
 
@@ -38,4 +40,14 @@ public enum TypeOfSmsSetting
     /// </summary>
     InstitutionContractConfirm,
 
+    /// <summary>
+    /// ارسال کد تاییدیه قرارداد مالی
+    /// </summary>
+    SendInstitutionContractConfirmationCode,
+
+    /// <summary>
+    /// یادآور وظایف
+    /// </summary>
+    TaskReminder,
+
 }

0_Framework/Application/Sms/ApiResultViewModel.cs

@@ -17,4 +17,18 @@ public class ApiResultViewModel
     public string DeliveryUnixTime { get; set; }
     public string DeliveryColor { get; set; }
     public string FullName { get; set; }
+}
+
+
+public class ApiReportDto
+{
+    public int MessageId { get; set; }
+
+    public long Mobile { get; set; }
+
+    public string SendUnixTime { get; set; }
+    public string DeliveryState { get; set; }
+    public string DeliveryUnixTime { get; set; }
+    public string DeliveryColor { get; set; }
+
 }

0_Framework/Application/Sms/ISmsService.cs

@@ -19,6 +19,13 @@ public interface ISmsService
     bool SendAccountsInfo(string number,string fullName, string userName);
     Task<ApiResultViewModel> GetByMessageId(int messId);
     Task<List<ApiResultViewModel>> GetApiResult(string startDate, string endDate);
+
+    #region ForApi
+
+    Task<List<ApiReportDto>> GetApiReport(string startDate, string endDate);
+
+#endregion
+
     string DeliveryStatus(byte? dv);
     string DeliveryColorStatus(byte? dv);
     string UnixTimeStampToDateTime(int? unixTimeStamp);

ANDROID_SIGNALR_GUIDE.md

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

AccountManagement.Application.Contracts/AccountManagement.Application.Contracts.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>
+	  <NuGetAudit>false</NuGetAudit>
   </PropertyGroup>
 
   <ItemGroup>

BUG_REPORT_SYSTEM.md

@@ -1,175 +0,0 @@
-# سیستم گزارش خرابی (Bug Report System)
-
-## نمای کلی
-
-این سیستم برای جمع‌آوری، ذخیره و مدیریت گزارش‌های خرابی از تطبیق موبایلی طراحی شده است.
-
-## ساختار فایل‌ها
-
-### Domain Layer
-- `AccountManagement.Domain/BugReportAgg/`
-  - `BugReport.cs` - موجودیت اصلی
-  - `BugReportLog.cs` - لاگ‌های گزارش
-  - `BugReportScreenshot.cs` - تصاویر ضمیمه شده
-
-### Application Contracts
-- `AccountManagement.Application.Contracts/BugReport/`
-  - `IBugReportApplication.cs` - اینترفیس سرویس
-  - `CreateBugReportCommand.cs` - درخواست ایجاد
-  - `EditBugReportCommand.cs` - درخواست ویرایش
-  - `BugReportViewModel.cs` - نمایش لیست
-  - `BugReportDetailViewModel.cs` - نمایش جزئیات
-  - `IBugReportRepository.cs` - اینترفیس Repository
-
-### Application Service
-- `AccountManagement.Application/BugReportApplication.cs` - پیاده‌سازی سرویس
-
-### Infrastructure
-- `AccountMangement.Infrastructure.EFCore/`
-  - `Mappings/BugReportMapping.cs`
-  - `Mappings/BugReportLogMapping.cs`
-  - `Mappings/BugReportScreenshotMapping.cs`
-  - `Repository/BugReportRepository.cs`
-
-### API Controller
-- `ServiceHost/Controllers/BugReportController.cs`
-
-### Admin Pages
-- `ServiceHost/Areas/AdminNew/Pages/BugReport/`
-  - `BugReportPageModel.cs` - base model
-  - `Index.cshtml.cs / Index.cshtml` - لیست گزارش‌ها
-  - `Details.cshtml.cs / Details.cshtml` - جزئیات کامل
-  - `Edit.cshtml.cs / Edit.cshtml` - ویرایش وضعیت/اولویت
-  - `Delete.cshtml.cs / Delete.cshtml` - حذف
-
-## روش استفاده
-
-### 1. ثبت گزارش از موبایل
-
-```csharp
-POST /api/bugreport/submit
-
-{
-  "title": "برنامه هنگام ورود خراب می‌شود",
-  "description": "هنگام وارد کردن نام کاربری، برنامه کرش می‌کند",
-  "userEmail": "user@example.com",
-  "deviceModel": "Samsung Galaxy S21",
-  "osVersion": "Android 12",
-  "platform": "Android",
-  "manufacturer": "Samsung",
-  "deviceId": "device-unique-id",
-  "screenResolution": "1440x3200",
-  "memoryInMB": 8000,
-  "storageInMB": 256000,
-  "batteryLevel": 75,
-  "isCharging": false,
-  "networkType": "4G",
-  "appVersion": "1.0.0",
-  "buildNumber": "100",
-  "packageName": "com.example.app",
-  "installTime": "2024-01-01T10:00:00Z",
-  "lastUpdateTime": "2024-12-01T14:30:00Z",
-  "flavor": "production",
-  "type": 1,           // Crash = 1
-  "priority": 2,       // High = 2
-  "stackTrace": "...",
-  "logs": ["log1", "log2"],
-  "screenshots": ["base64-encoded-image-1"]
-}
-```
-
-### 2. دسترسی به Admin Panel
-
-```
-https://yourdomain.com/AdminNew/BugReport
-```
-
-**صفحات موجود:**
-- **Index** - لیست تمام گزارش‌ها با فیلترها
-- **Details** - نمایش جزئیات کامل شامل:
-  - معلومات کاربر و گزارش
-  - معلومات دستگاه
-  - معلومات برنامه
-  - لاگ‌ها
-  - تصاویر
-  - Stack Trace
-- **Edit** - تغییر وضعیت و اولویت
-- **Delete** - حذف گزارش
-
-### 3. درخواست‌های API
-
-#### دریافت لیست
-```
-GET /api/bugreport/list?type=1&priority=2&status=1&searchTerm=crash&pageNumber=1&pageSize=10
-```
-
-#### دریافت جزئیات
-```
-GET /api/bugreport/{id}
-```
-
-#### ویرایش
-```
-PUT /api/bugreport/{id}
-
-{
-  "id": 1,
-  "priority": 2,
-  "status": 3
-}
-```
-
-#### حذف
-```
-DELETE /api/bugreport/{id}
-```
-
-## انواع (Enums)
-
-### BugReportType
-- `1` - Crash (کرش)
-- `2` - UI (مشکل رابط)
-- `3` - Performance (عملکرد)
-- `4` - Feature (فیچر)
-- `5` - Network (شبکه)
-- `6` - Camera (دوربین)
-- `7` - FaceRecognition (تشخیص چهره)
-- `8` - Database (دیتابیس)
-- `9` - Login (ورود)
-- `10` - Other (سایر)
-
-### BugPriority
-- `1` - Critical (بحرانی)
-- `2` - High (بالا)
-- `3` - Medium (متوسط)
-- `4` - Low (پایین)
-
-### BugReportStatus
-- `1` - Open (باز)
-- `2` - InProgress (در حال بررسی)
-- `3` - Fixed (رفع شده)
-- `4` - Closed (بسته شده)
-- `5` - Reopened (مجدداً باز)
-
-## Migration
-
-برای اعمال تغییرات دیتابیس:
-
-```powershell
-Add-Migration AddBugReportTables
-Update-Database
-```
-
-## نکات مهم
-
-1. **تصاویر**: تصاویر به صورت Base64 encoded ذخیره می‌شوند
-2. **لاگ‌ها**: تمام لاگ‌ها به صورت جدا ذخیره می‌شوند
-3. **وضعیت پیش‌فرض**: وقتی گزارش ثبت می‌شود، وضعیت آن "Open" است
-4. **تاریخ**: تاریخ ایجاد و بروزرسانی خودکار ثبت می‌شود
-
-## Security
-
-- API endpoints از `authentication` محافظت می‌شوند
-- Admin pages تنها برای کاربرانی با دسترسی AdminArea قابل دسترس هستند
-- حذف و ویرایش نیاز به تأیید دارد
-

BackgroundInstitutionContract/BackgroundInstitutionContract.Task/Jobs/JobSchedulerRegistrator.cs

@@ -1,5 +1,6 @@
 
 using _0_Framework.Application;
+using _0_Framework.Application.Enums;
 using _0_Framework.Application.Sms;
 using Company.Domain.ContarctingPartyAgg;
 using Company.Domain.InstitutionContractAgg;
@@ -12,19 +13,21 @@ public class JobSchedulerRegistrator
     private readonly IBackgroundJobClient _backgroundJobClient;
     private readonly SmsReminder _smsReminder;
     private readonly IInstitutionContractRepository _institutionContractRepository;
+    private readonly IInstitutionContractSmsServiceRepository _institutionContractSmsServiceRepository;
     private static DateTime? _lastRunCreateTransaction;
     private static DateTime? _lastRunSendMonthlySms;
     private readonly ISmsService _smsService;
     private readonly ILogger<JobSchedulerRegistrator> _logger;
 
 
-    public JobSchedulerRegistrator(SmsReminder smsReminder, IBackgroundJobClient backgroundJobClient, IInstitutionContractRepository institutionContractRepository, ISmsService smsService, ILogger<JobSchedulerRegistrator> logger)
+    public JobSchedulerRegistrator(SmsReminder smsReminder, IBackgroundJobClient backgroundJobClient, IInstitutionContractRepository institutionContractRepository, ISmsService smsService, ILogger<JobSchedulerRegistrator> logger, IInstitutionContractSmsServiceRepository institutionContractSmsServiceRepository)
     {
         _smsReminder = smsReminder;
         _backgroundJobClient = backgroundJobClient;
         _institutionContractRepository = institutionContractRepository;
         _smsService = smsService;
         _logger = logger;
+        _institutionContractSmsServiceRepository = institutionContractSmsServiceRepository;
     }
 
     public void Register()
@@ -58,17 +61,43 @@ public class JobSchedulerRegistrator
             "*/1 * * * *"  // هر 1 دقیقه یکبار چک کن
         );
 
-        //RecurringJob.AddOrUpdate(
-        //    "InstitutionContract.SendWarningSms",
-        //    () => SendWarningSms(),
-        //    "*/1 * * * *"  // هر 1 دقیقه یکبار چک کن
-        //);
+        RecurringJob.AddOrUpdate(
+            "InstitutionContract.SendWarningSms",
+            () => SendWarningSms(),
+            "*/1 * * * *"  // هر 1 دقیقه یکبار چک کن
+        );
 
-        //RecurringJob.AddOrUpdate(
-        //    "InstitutionContract.SendLegalActionSms",
-        //    () => SendLegalActionSms(),
-        //    "*/1 * * * *"  // هر 1 دقیقه یکبار چک کن
-        //);
+        RecurringJob.AddOrUpdate(
+            "InstitutionContract.SendLegalActionSms",
+            () => SendLegalActionSms(),
+            "*/1 * * * *"  // هر 1 دقیقه یکبار چک کن
+        );
+
+
+
+        RecurringJob.AddOrUpdate(
+            "InstitutionContract.Block",
+            () => Block(),
+            "*/30 * * * *"  // هر 30 دقیقه یکبار چک کن
+        );
+
+        RecurringJob.AddOrUpdate(
+            "InstitutionContract.UnBlock",
+            () => UnBlock(),
+            "*/10 * * * *"
+        );
+
+        RecurringJob.AddOrUpdate(
+            "InstitutionContract.DeActiveInstitutionEndOfContract",
+            () => DeActiveInstitutionEndOfContract(),
+            "*/30 * * * *"
+        );
+
+        RecurringJob.AddOrUpdate(
+            "InstitutionContract.BlueDeActiveAfterZeroDebt",
+            () => BlueDeActiveAfterZeroDebt(),
+            "*/10 * * * *"
+        );
     }
 
 
@@ -79,14 +108,14 @@ public class JobSchedulerRegistrator
     [DisableConcurrentExecution(timeoutInSeconds: 1200)]
     public async System.Threading.Tasks.Task CreateFinancialTransaction()
     {
-        var now =DateTime.Now;
+        var now = DateTime.Now;
         var endOfMonth = now.ToFarsi().FindeEndOfMonth();
         var endOfMonthGr = endOfMonth.ToGeorgianDateTime();
         _logger.LogInformation("CreateFinancialTransaction job run");
         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();
@@ -101,17 +130,17 @@ public class JobSchedulerRegistrator
 
             try
             {
-                 await _institutionContractRepository.CreateTransactionForInstitutionContracts(endNewGr, endNewFa, description);
+                await _institutionContractRepository.CreateTransactionForInstitutionContracts(endNewGr, endNewFa, description);
                 _lastRunCreateTransaction = now;
                 Console.WriteLine("CreateTransAction executed");
-      
+
             }
             catch (Exception e)
             {
                 await _smsService.Alarm("09114221321", "خطا-ایجاد سند مالی");
 
             }
-           
+
         }
     }
 
@@ -134,7 +163,7 @@ public class JobSchedulerRegistrator
 
             try
             {
-                await _institutionContractRepository.SendMonthlySms(now);
+                await _institutionContractSmsServiceRepository.SendMonthlySms(now);
                 _lastRunSendMonthlySms = now;
                 Console.WriteLine("Send Monthly sms executed");
 
@@ -156,7 +185,7 @@ public class JobSchedulerRegistrator
     public async System.Threading.Tasks.Task SendReminderSms()
     {
         _logger.LogInformation("SendReminderSms job run");
-        await _institutionContractRepository.SendReminderSmsForBackgroundTask();
+        await _institutionContractSmsServiceRepository.SendReminderSmsForBackgroundTask();
     }
 
     /// <summary>
@@ -167,7 +196,7 @@ public class JobSchedulerRegistrator
     public async System.Threading.Tasks.Task SendBlockSms()
     {
         _logger.LogInformation("SendBlockSms job run");
-        await _institutionContractRepository.SendBlockSmsForBackgroundTask();
+        await _institutionContractSmsServiceRepository.SendBlockSmsForBackgroundTask();
     }
 
 
@@ -179,7 +208,7 @@ public class JobSchedulerRegistrator
     public async System.Threading.Tasks.Task SendInstitutionContractConfirmSms()
     {
         _logger.LogInformation("SendInstitutionContractConfirmSms job run");
-        await _institutionContractRepository.SendInstitutionContractConfirmSmsTask();
+        await _institutionContractSmsServiceRepository.SendInstitutionContractConfirmSmsTask();
     }
 
     /// <summary>
@@ -190,14 +219,86 @@ public class JobSchedulerRegistrator
     public async System.Threading.Tasks.Task SendWarningSms()
     {
         _logger.LogInformation("SendWarningSms job run");
-        await _institutionContractRepository.SendWarningSmsTask();
+        await _institutionContractSmsServiceRepository.SendWarningOrLegalActionSmsTask(TypeOfSmsSetting.Warning);
     }
 
+    /// <summary>
+    /// پیامک اقدام قضایی 
+    /// </summary>
+    /// <returns></returns>
     [DisableConcurrentExecution(timeoutInSeconds: 100)]
     public async System.Threading.Tasks.Task SendLegalActionSms()
     {
         _logger.LogInformation("SendWarningSms job run");
-        await _institutionContractRepository.SendLegalActionSmsTask();
+        await _institutionContractSmsServiceRepository.SendWarningOrLegalActionSmsTask(TypeOfSmsSetting.LegalAction);
+    }
+
+    /// <summary>
+    /// بلاگ سازی
+    /// </summary>
+    /// <returns></returns>
+    [DisableConcurrentExecution(timeoutInSeconds: 100)]
+    public async System.Threading.Tasks.Task Block()
+    {
+        _logger.LogInformation("block job run");
+        var now = DateTime.Now;
+        var executeDate = now.ToFarsi().Substring(8, 2);
+        if (executeDate == "20")
+        {
+            if (now.Hour >= 9 && now.Hour < 10)
+            {
+                await _institutionContractSmsServiceRepository.Block(now);
+            }
+
+        }
+    }
+
+    /// <summary>
+    /// آنبلاک
+    /// </summary>
+    /// <returns></returns>
+    [DisableConcurrentExecution(timeoutInSeconds: 100)]
+    public async System.Threading.Tasks.Task UnBlock()
+    {
+        _logger.LogInformation("UnBlock job run");
+
+        await _institutionContractSmsServiceRepository.UnBlock();
+
+    }
+
+
+    /// <summary>
+    /// غیر فعال سازی قراداد های پایان یافته
+    /// </summary>
+    /// <returns></returns>
+    [DisableConcurrentExecution(timeoutInSeconds: 100)]
+    public async System.Threading.Tasks.Task DeActiveInstitutionEndOfContract()
+    {
+        _logger.LogInformation("DeActiveInstitutionEndOfContract job run");
+
+
+        var now = DateTime.Now;
+        var executeDate = now.ToFarsi().Substring(8, 2);
+        if (executeDate == "01")
+        {
+            if (now.Hour >= 9 && now.Hour < 10)
+            {
+                await _institutionContractSmsServiceRepository.DeActiveInstitutionEndOfContract(now);
+            }
+
+        }
+
+    }
+
+    /// <summary>
+    /// غیرفعال سازس قرارداد های آبی که بدهی ندارند
+    /// </summary>
+    /// <returns></returns>
+    [DisableConcurrentExecution(timeoutInSeconds: 800)]
+    public async System.Threading.Tasks.Task BlueDeActiveAfterZeroDebt()
+    {
+        _logger.LogInformation("BlueDeActiveAfterZeroDebt job run");
+        await _institutionContractSmsServiceRepository.BlueDeActiveAfterZeroDebt();
     }
 
 }

CHANGELOG.md

@@ -1,314 +0,0 @@
-# خلاصه تغییرات سیستم گزارش خرابی
-
-## 📝 فایل‌های اضافه شده (23 فایل)
-
-### 1️⃣ Domain Layer (3 فایل)
-```
-✓ AccountManagement.Domain/BugReportAgg/
-  ├── BugReport.cs
-  ├── BugReportLog.cs
-  └── BugReportScreenshot.cs
-```
-
-### 2️⃣ Application Contracts (6 فایل)
-```
-✓ AccountManagement.Application.Contracts/BugReport/
-  ├── IBugReportRepository.cs
-  ├── IBugReportApplication.cs
-  ├── CreateBugReportCommand.cs
-  ├── EditBugReportCommand.cs
-  ├── BugReportViewModel.cs
-  └── BugReportDetailViewModel.cs
-```
-
-### 3️⃣ Application Service (1 فایل)
-```
-✓ AccountManagement.Application/
-  └── BugReportApplication.cs
-```
-
-### 4️⃣ Infrastructure EFCore (4 فایل)
-```
-✓ AccountMangement.Infrastructure.EFCore/
-  ├── Mappings/
-  │   ├── BugReportMapping.cs
-  │   ├── BugReportLogMapping.cs
-  │   └── BugReportScreenshotMapping.cs
-  └── Repository/
-      └── BugReportRepository.cs
-```
-
-### 5️⃣ API Controller (1 فایل)
-```
-✓ ServiceHost/Controllers/
-  └── BugReportController.cs
-```
-
-### 6️⃣ Admin Pages (8 فایل)
-```
-✓ ServiceHost/Areas/AdminNew/Pages/BugReport/
-  ├── BugReportPageModel.cs
-  ├── Index.cshtml.cs
-  ├── Index.cshtml
-  ├── Details.cshtml.cs
-  ├── Details.cshtml
-  ├── Edit.cshtml.cs
-  ├── Edit.cshtml
-  ├── Delete.cshtml.cs
-  └── Delete.cshtml
-```
-
-### 7️⃣ Documentation (2 فایل)
-```
-✓ BUG_REPORT_SYSTEM.md
-✓ FLUTTER_BUG_REPORT_EXAMPLE.dart
-```
-
----
-
-## ✏️ فایل‌های اصلاح شده (2 فایل)
-
-### 1. AccountManagement.Configuration/AccountManagementBootstrapper.cs
-**تغییر:** اضافه کردن using برای BugReport
-```csharp
-using AccountManagement.Application.Contracts.BugReport;
-```
-
-**تغییر:** رجیستریشن سرویس‌ها
-```csharp
-services.AddTransient<IBugReportApplication, BugReportApplication>();
-services.AddTransient<IBugReportRepository, BugReportRepository>();
-```
-
-### 2. AccountMangement.Infrastructure.EFCore/AccountContext.cs
-**تغییر:** اضافه کردن using
-```csharp
-using AccountManagement.Domain.BugReportAgg;
-```
-
-**تغییر:** اضافه کردن DbSets
-```csharp
-#region BugReport
-public DbSet<BugReport> BugReports { get; set; }
-public DbSet<BugReportLog> BugReportLogs { get; set; }
-public DbSet<BugReportScreenshot> BugReportScreenshots { get; set; }
-#endregion
-```
-
----
-
-## 🔧 موارد مورد نیاز قبل از استفاده
-
-### 1. Database Migration
-```powershell
-# در Package Manager Console
-cd AccountMangement.Infrastructure.EFCore
-
-Add-Migration AddBugReportSystem
-Update-Database
-```
-
-### 2. الگوی Enum برای Flutter
-```dart
-enum BugReportType {
-  crash, // 1
-  ui, // 2
-  performance, // 3
-  feature, // 4
-  network, // 5
-  camera, // 6
-  faceRecognition, // 7
-  database, // 8
-  login, // 9
-  other, // 10
-}
-
-enum BugPriority {
-  critical, // 1
-  high, // 2
-  medium, // 3
-  low, // 4
-}
-```
-
----
-
-## 🚀 نقاط ورود
-
-### API Endpoints
-```
-POST   /api/bugreport/submit          - ثبت گزارش جدید
-GET    /api/bugreport/list            - دریافت لیست
-GET    /api/bugreport/{id}            - دریافت جزئیات
-PUT    /api/bugreport/{id}            - ویرایش وضعیت/اولویت
-DELETE /api/bugreport/{id}            - حذف گزارش
-```
-
-### Admin Pages
-```
-/AdminNew/BugReport                   - لیست گزارش‌ها
-/AdminNew/BugReport/Details/{id}      - جزئیات کامل
-/AdminNew/BugReport/Edit/{id}         - ویرایش
-/AdminNew/BugReport/Delete/{id}       - حذف
-```
-
----
-
-## 📊 Database Schema
-
-### BugReports جدول
-```sql
-- id (bigint, PK)
-- Title (nvarchar(200))
-- Description (ntext)
-- UserEmail (nvarchar(150))
-- AccountId (bigint, nullable)
-- DeviceModel (nvarchar(100))
-- OsVersion (nvarchar(50))
-- Platform (nvarchar(50))
-- Manufacturer (nvarchar(100))
-- DeviceId (nvarchar(200))
-- ScreenResolution (nvarchar(50))
-- MemoryInMB (int)
-- StorageInMB (int)
-- BatteryLevel (int)
-- IsCharging (bit)
-- NetworkType (nvarchar(50))
-- AppVersion (nvarchar(50))
-- BuildNumber (nvarchar(50))
-- PackageName (nvarchar(150))
-- InstallTime (datetime2)
-- LastUpdateTime (datetime2)
-- Flavor (nvarchar(50))
-- Type (int)
-- Priority (int)
-- Status (int)
-- StackTrace (ntext, nullable)
-- CreationDate (datetime2)
-- UpdateDate (datetime2, nullable)
-```
-
-### BugReportLogs جدول
-```sql
-- id (bigint, PK)
-- BugReportId (bigint, FK)
-- Message (ntext)
-- Timestamp (datetime2)
-```
-
-### BugReportScreenshots جدول
-```sql
-- id (bigint, PK)
-- BugReportId (bigint, FK)
-- Base64Data (ntext)
-- FileName (nvarchar(255))
-- UploadDate (datetime2)
-```
-
----
-
-## ✨ مثال درخواست API
-
-```json
-POST /api/bugreport/submit
-Content-Type: application/json
-
-{
-  "title": "برنامه هنگام ورود خراب می‌شود",
-  "description": "هنگام فشار دادن دکمه ورود، برنامه کرش می‌کند",
-  "userEmail": "user@example.com",
-  "accountId": 123,
-  "deviceModel": "Samsung Galaxy S21",
-  "osVersion": "Android 12",
-  "platform": "Android",
-  "manufacturer": "Samsung",
-  "deviceId": "device-12345",
-  "screenResolution": "1440x3200",
-  "memoryInMB": 8000,
-  "storageInMB": 256000,
-  "batteryLevel": 75,
-  "isCharging": false,
-  "networkType": "4G",
-  "appVersion": "1.0.0",
-  "buildNumber": "100",
-  "packageName": "com.example.app",
-  "installTime": "2024-01-01T10:00:00Z",
-  "lastUpdateTime": "2024-12-07T14:30:00Z",
-  "flavor": "production",
-  "type": 1,
-  "priority": 2,
-  "stackTrace": "...",
-  "logs": ["log line 1", "log line 2"],
-  "screenshots": ["base64-string"]
-}
-```
-
----
-
-## 🔐 Security Features
-
-- ✅ Authorization برای Admin Pages (AdminAreaPermission required)
-- ✅ API Authentication
-- ✅ XSS Protection (Html.Raw محدود)
-- ✅ CSRF Protection (ASP.NET Core default)
-- ✅ Input Validation
-- ✅ Safe Delete with Confirmation
-
----
-
-## 📚 Documentation Files
-
-1. **BUG_REPORT_SYSTEM.md** - راهنمای کامل سیستم
-2. **FLUTTER_BUG_REPORT_EXAMPLE.dart** - مثال پیاده‌سازی Flutter
-3. **CHANGELOG.md** (این فایل) - خلاصه تغییرات
-
----
-
-## ✅ Checklist پیاده‌سازی
-
-- [x] Domain Models
-- [x] Database Mappings
-- [x] Repository Pattern
-- [x] Application Services
-- [x] API Endpoints
-- [x] Admin UI Pages
-- [x] Dependency Injection
-- [x] Error Handling
-- [x] Documentation
-- [x] Flutter Example
-- [ ] Database Migration (باید دستی اجرا شود)
-- [ ] Testing
-
----
-
-## 🎯 مراحل بعدی
-
-1. **اجرای Migration:**
-   ```powershell
-   Add-Migration AddBugReportSystem
-   Update-Database
-   ```
-
-2. **تست API:**
-   - استفاده از Postman/Thunder Client
-   - تست تمام endpoints
-
-3. **تست Admin Panel:**
-   - دسترسی به /AdminNew/BugReport
-   - تست فیلترها و جستجو
-   - تست ویرایش و حذف
-
-4. **Integration Flutter:**
-   - کپی کردن `FLUTTER_BUG_REPORT_EXAMPLE.dart`
-   - سازگار کردن با پروژه Flutter
-   - تست ثبت گزارش‌ها
-
----
-
-## 📞 پشتیبانی
-
-برای هر سوال یا مشکل:
-1. بررسی کنید `BUG_REPORT_SYSTEM.md`
-2. بررسی کنید logs و error messages
-3. مطمئن شوید Migration اجرا شده است
-

CONFIGURATION_SUMMARY.md

@@ -0,0 +1,248 @@
+# ✅ Docker Bind Mounts Configuration - Summary
+
+## What Was Changed
+
+### 1. docker-compose.yml
+**Before:**
+```yaml
+volumes:
+  - ./ServiceHost/certs:/app/certs:ro
+  - app_storage:/app/Storage      # ❌ Docker volume
+  - app_logs:/app/Logs             # ❌ Docker volume
+
+volumes:
+  app_storage:
+    driver: local
+  app_logs:
+    driver: local
+```
+
+**After:**
+```yaml
+volumes:
+  # ✅ Bind mounts for production-critical data on Windows host
+  - ./ServiceHost/certs:/app/certs:ro
+  - D:/AppData/Faces:/app/Faces
+  - D:/AppData/Storage:/app/Storage
+  - D:/AppData/Logs:/app/Logs
+
+# ✅ No volumes section needed
+```
+
+### 2. New Files Created
+- `DOCKER_BIND_MOUNTS_SETUP.md` - Complete documentation
+- `setup-bind-mounts.ps1` - Automated setup script
+- `QUICK_REFERENCE.md` - Quick command reference
+
+## Path Mapping
+
+| Container (Linux paths) | Windows Host (forward slash) | Actual Windows Path |
+|-------------------------|------------------------------|---------------------|
+| `/app/Faces`            | `D:/AppData/Faces`           | `D:\AppData\Faces`  |
+| `/app/Storage`          | `D:/AppData/Storage`         | `D:\AppData\Storage`|
+| `/app/Logs`             | `D:/AppData/Logs`            | `D:\AppData\Logs`   |
+
+**Note:** Docker Compose on Windows accepts both `D:/` and `D:\` but prefers forward slashes.
+
+## Application Code Compatibility
+
+Your application uses:
+```csharp
+Path.Combine(env.ContentRootPath, "Faces");    // → /app/Faces
+Path.Combine(env.ContentRootPath, "Storage");  // → /app/Storage
+```
+
+Where `env.ContentRootPath` = `/app` in the container.
+
+✅ **No code changes required!** The bind mounts map directly to these paths.
+
+## Setup Instructions
+
+### Option 1: Automated Setup (Recommended)
+```powershell
+# Navigate to project directory
+cd D:\GozareshgirOrginal\OriginalGozareshgir
+
+# Run setup script with permissions
+.\setup-bind-mounts.ps1 -GrantFullPermissions
+
+# Start the application
+docker-compose up -d
+```
+
+### Option 2: Manual Setup
+```powershell
+# 1. Create directories
+New-Item -ItemType Directory -Force -Path "D:\AppData\Faces"
+New-Item -ItemType Directory -Force -Path "D:\AppData\Storage"
+New-Item -ItemType Directory -Force -Path "D:\AppData\Logs"
+
+# 2. Grant permissions
+icacls "D:\AppData\Faces" /grant Everyone:F /T
+icacls "D:\AppData\Storage" /grant Everyone:F /T
+icacls "D:\AppData\Logs" /grant Everyone:F /T
+
+# 3. Start the application
+docker-compose up -d
+```
+
+## Verification Checklist
+
+After starting the container:
+
+1. **Check if directories are mounted:**
+   ```powershell
+   docker exec gozareshgir-servicehost ls -la /app
+   ```
+   Should show: `Faces/`, `Storage/`, `Logs/`
+
+2. **Test write access from container:**
+   ```powershell
+   docker exec gozareshgir-servicehost sh -c "echo 'test' > /app/Storage/test.txt"
+   Get-Content D:\AppData\Storage\test.txt  # Should display: test
+   Remove-Item D:\AppData\Storage\test.txt
+   ```
+
+3. **Test write access from host:**
+   ```powershell
+   "test from host" | Out-File "D:\AppData\Storage\host-test.txt"
+   docker exec gozareshgir-servicehost cat /app/Storage/host-test.txt
+   Remove-Item D:\AppData\Storage\host-test.txt
+   ```
+
+4. **Check application logs:**
+   ```powershell
+   docker logs gozareshgir-servicehost --tail 50
+   # Or directly on host:
+   Get-Content D:\AppData\Logs\gozareshgir_log.txt -Tail 50
+   ```
+
+## Data Persistence Guarantees
+
+✅ **Files persist through:**
+- `docker-compose down`
+- `docker-compose restart`
+- Container removal (`docker rm`)
+- Image rebuilds (`docker-compose build`)
+- Server reboots (with `restart: unless-stopped`)
+
+✅ **Direct access:**
+- Files can be accessed from Windows Explorer at `D:\AppData\*`
+- Can be backed up using Windows Backup, robocopy, or any backup software
+- Can be edited directly on the host (changes visible in container immediately)
+
+⚠️ **Data does NOT survive:**
+- Deleting the host directories (`D:\AppData\*`)
+- Formatting the D: drive
+- Without regular backups, hardware failures
+
+## Production Checklist
+
+Before deploying to production:
+
+- [ ] Run `setup-bind-mounts.ps1 -GrantFullPermissions`
+- [ ] Verify disk space on D: drive (at least 50 GB recommended)
+- [ ] Set up scheduled backups (see `DOCKER_BIND_MOUNTS_SETUP.md`)
+- [ ] Replace `Everyone` with specific service account for permissions
+- [ ] Enable NTFS encryption for sensitive data (optional)
+- [ ] Test container restart: `docker-compose restart`
+- [ ] Test data persistence: Create a test file, restart container, verify file exists
+- [ ] Configure monitoring for disk space usage
+
+## Security Recommendations
+
+1. **Restrict permissions** (production):
+   ```powershell
+   # Replace Everyone with specific account
+   icacls "D:\AppData\Faces" /grant "DOMAIN\ServiceAccount:(OI)(CI)F" /T
+   icacls "D:\AppData\Storage" /grant "DOMAIN\ServiceAccount:(OI)(CI)F" /T
+   icacls "D:\AppData\Logs" /grant "DOMAIN\ServiceAccount:(OI)(CI)F" /T
+   ```
+
+2. **Enable encryption** for sensitive data:
+   ```powershell
+   cipher /e "D:\AppData\Faces"
+   cipher /e "D:\AppData\Storage"
+   ```
+
+3. **Set up audit logging:**
+   ```powershell
+   auditpol /set /subcategory:"File System" /success:enable /failure:enable
+   ```
+
+## Backup Strategy
+
+### Scheduled Backup (Recommended)
+```powershell
+# Create daily backup at 2 AM
+$action = New-ScheduledTaskAction -Execute "robocopy" -Argument '"D:\AppData" "D:\Backups\AppData" /MIR /Z /LOG:"D:\Backups\backup.log"'
+$trigger = New-ScheduledTaskTrigger -Daily -At 2am
+Register-ScheduledTask -Action $action -Trigger $trigger -TaskName "GozareshgirBackup" -Description "Daily backup of Gozareshgir data"
+```
+
+### Manual Backup
+```powershell
+$timestamp = Get-Date -Format "yyyyMMdd_HHmmss"
+robocopy "D:\AppData" "D:\Backups\AppData_$timestamp" /MIR /Z
+```
+
+## Troubleshooting
+
+### Issue: Container starts but files not appearing
+**Solution:**
+```powershell
+# Check mount points
+docker inspect gozareshgir-servicehost --format='{{json .Mounts}}' | ConvertFrom-Json
+
+# Verify directories exist
+Test-Path D:\AppData\Faces
+Test-Path D:\AppData\Storage
+Test-Path D:\AppData\Logs
+```
+
+### Issue: Permission denied errors
+**Solution:**
+```powershell
+# Re-grant permissions
+icacls "D:\AppData\Faces" /grant Everyone:F /T
+icacls "D:\AppData\Storage" /grant Everyone:F /T
+icacls "D:\AppData\Logs" /grant Everyone:F /T
+```
+
+### Issue: Out of disk space
+**Solution:**
+```powershell
+# Check disk usage
+Get-ChildItem D:\AppData -Recurse | Measure-Object -Property Length -Sum
+
+# Clean old log files (example: older than 30 days)
+Get-ChildItem D:\AppData\Logs -Recurse -File | Where-Object {$_.LastWriteTime -lt (Get-Date).AddDays(-30)} | Remove-Item
+```
+
+## Support & Documentation
+
+- **Full Documentation:** `DOCKER_BIND_MOUNTS_SETUP.md`
+- **Quick Reference:** `QUICK_REFERENCE.md`
+- **Setup Script:** `setup-bind-mounts.ps1`
+
+## Migration from Docker Volumes (If applicable)
+
+If you previously used Docker volumes, migrate the data:
+
+```powershell
+# 1. Stop the container
+docker-compose down
+
+# 2. Copy data from old volumes to host
+docker run --rm -v old_volume_name:/source -v D:/AppData/Storage:/dest alpine cp -av /source/. /dest/
+
+# 3. Start with new bind mounts
+docker-compose up -d
+```
+
+---
+
+**Configuration Date:** January 2026  
+**Tested On:** Windows Server 2019/2022 with Docker Desktop  
+**Status:** ✅ Production Ready
+

Company.Domain/CheckoutAgg/Checkout.cs

@@ -31,7 +31,7 @@ public class Checkout : EntityBase
         string overNightWorkValue, string fridayWorkValue, string rotatingShifValue, string absenceValue,
         string totalDayOfLeaveCompute, string totalDayOfYearsCompute, string totalDayOfBunosesCompute,
         ICollection<CheckoutLoanInstallment> loanInstallments,
-        ICollection<CheckoutSalaryAid> salaryAids, CheckoutRollCall checkoutRollCall, TimeSpan employeeMandatoryHours, bool hasInsuranceShareTheSameAsList)
+        ICollection<CheckoutSalaryAid> salaryAids, CheckoutRollCall checkoutRollCall, TimeSpan employeeMandatoryHours, bool hasInsuranceShareTheSameAsList, ICollection<CheckoutReward> rewards,double rewardPay)
     {
         EmployeeFullName = employeeFullName;
         FathersName = fathersName;
@@ -71,7 +71,7 @@ public class Checkout : EntityBase
         TotalClaims = totalClaims;
         TotalDeductions = totalDeductions;
         TotalPayment = totalPayment;
-        RewardPay = 0;
+        RewardPay = rewardPay;
         IsActiveString = "true";
         Signature = signature;
         MarriedAllowance = marriedAllowance;
@@ -93,6 +93,7 @@ public class Checkout : EntityBase
         CheckoutRollCall = checkoutRollCall;
         EmployeeMandatoryHours = employeeMandatoryHours;
         HasInsuranceShareTheSameAsList = hasInsuranceShareTheSameAsList;
+        Rewards = rewards;
     }
 
 
@@ -130,7 +131,7 @@ public class Checkout : EntityBase
     public double BonusesPay { get; private set; }
     public double YearsPay { get; private set; }
     public double LeavePay { get; private set; }
-    public double? RewardPay { get; private set; }
+    public double RewardPay { get; private set; }
     public double InsuranceDeduction { get; private set; }
     public double TaxDeducation { get; private set; }
     public double InstallmentDeduction { get; private set; }
@@ -223,6 +224,8 @@ public class Checkout : EntityBase
 
     public ICollection<CheckoutLoanInstallment> LoanInstallments { get; set; } = [];
     public ICollection<CheckoutSalaryAid> SalaryAids { get; set; } = [];
+
+    public ICollection<CheckoutReward> Rewards { get; set; } = [];
     public CheckoutRollCall CheckoutRollCall { get; private set; }
     #endregion
 
@@ -239,7 +242,7 @@ public class Checkout : EntityBase
         double insuranceDeduction, double taxDeducation, double installmentDeduction,
         double salaryAidDeduction, double absenceDeduction, string sumOfWorkingDays
         , string archiveCode, string personnelCode,
-        string totalClaims, string totalDeductions, double totalPayment, double? rewardPay)
+        string totalClaims, string totalDeductions, double totalPayment, double rewardPay)
     {
         EmployeeFullName = employeeFullName;
         FathersName = fathersName;
@@ -337,6 +340,11 @@ public class Checkout : EntityBase
         InstallmentDeduction = installmentsAmount;
     }
 
+    public void SetReward(ICollection<CheckoutReward> rewards, double rewardAmount)
+    {
+        RewardPay = rewardAmount;
+        Rewards = rewards;
+    }
     public void SetCheckoutRollCall(CheckoutRollCall checkoutRollCall)
     {
         CheckoutRollCall = checkoutRollCall;

Company.Domain/CheckoutAgg/ValueObjects/CheckoutReward.cs

@@ -0,0 +1,57 @@
+using System;
+
+namespace Company.Domain.CheckoutAgg.ValueObjects;
+
+public class CheckoutReward
+{
+    public CheckoutReward(string amount, double amountDouble, string grantDateFa, DateTime grantDateGr, string description, string title, long entityId)
+    {
+        Amount = amount;
+        AmountDouble = amountDouble;
+        GrantDateFa = grantDateFa;
+        GrantDateGr = grantDateGr;
+        Description = description;
+        Title = title;
+        EntityId = entityId;
+    }
+
+    /// <summary>
+    /// مبلغ پاداش
+    /// string
+    /// </summary>
+    public string Amount { get; set; }
+
+    /// <summary>
+    /// مبلغ پاداش
+    /// double
+    /// </summary>
+    public double AmountDouble { get; set; }
+
+    /// <summary>
+    /// تاریخ اعطاء
+    /// شمسی
+    /// </summary>
+    public string GrantDateFa { get; set; }
+
+    /// <summary>
+    /// تاریخ اعطاء
+    /// میلادی
+    /// </summary>
+    public DateTime GrantDateGr { get; set; }
+
+    /// <summary>
+    /// توضیحات
+    /// </summary>
+    public string Description { get; set; }
+
+    /// <summary>
+    /// عنوان
+    /// </summary>
+    public string Title { get; set; }
+
+
+    /// <summary>
+    /// آی دی پاداش
+    /// </summary>
+    public long EntityId { get; set; }
+}

Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs

@@ -91,65 +91,7 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
     Task<List<InstitutionContractPrintViewModel>> PrintAllAsync(List<long> ids);
 
 
-    #region ReminderSMS
-    /// <summary>
-    /// دریافت لیست - ارسال پیامک
-    /// فراخوانی از سمت بک گراند سرویس
-    /// </summary>
-    /// <returns></returns>
-    Task<bool> SendReminderSmsForBackgroundTask();
-
-    /// <summary>
-    /// ارسال پیامک صورت حساب ماهانه
-    /// </summary>
-    /// <param name="now"></param>
-    /// <returns></returns>
-    Task SendMonthlySms(DateTime now);
-
-    /// <summary>
-    /// ارسال پیامک مسدودی از طرف بک گراند سرویس
-    /// </summary>
-    /// <returns></returns>
-    Task SendBlockSmsForBackgroundTask();
-
-    /// <summary>
-    /// دریافت لیست واجد شرایط بلاک
-    /// جهت ارسال پیامک مسدودی
-    /// </summary>
-    /// <param name="checkDate"></param>
-    /// <returns></returns>
-    Task<List<BlockSmsListData>> GetBlockListData(DateTime checkDate);
-
-    /// <summary>
-    /// ارسال پیامک مسدودی
-    /// </summary>
-    /// <param name="smsListData"></param>
-    /// <param name="typeOfSms"></param>
-    /// <param name="sendMessStart"></param>
-    /// <param name="sendMessEnd"></param>
-    /// <returns></returns>
-    Task SendBlockSmsToContractingParties(List<BlockSmsListData> smsListData, string typeOfSms,
-        string sendMessStart, string sendMessEnd);
-
-    /// <summary>
-    ///دریافت لیست بدهکارن
-    /// جهت ارسال پیامک
-    /// </summary>
-    /// <returns></returns>
-    Task<List<SmsListData>> GetSmsListData(DateTime checkDate, TypeOfSmsSetting typeOfSmsSetting);
-
-    /// <summary>
-    /// ارسال پیامک های یاد آور بدهی
-    /// </summary>
-    /// <returns></returns>
-    Task SendReminderSmsToContractingParties(List<SmsListData> smsListData, string typeOfSms, string sendMessStart, string sendMessEnd);
-
-    /// <summary>
-    /// ارسال پیامک یادآور تایید قراداد مالی
-    /// </summary>
-    /// <returns></returns>
-    Task SendInstitutionContractConfirmSmsTask();
-    #endregion
+  
 
     #region CreateMontlyTransaction
 
@@ -162,24 +104,12 @@ public interface IInstitutionContractRepository : IRepository<long, InstitutionC
 
     #endregion
 
-    #region WarningSms
-    /// <summary>
-    /// پیامک های هشدار
-    /// </summary>
-    /// <returns></returns>
-    Task SendWarningSmsTask();
-
-    #endregion
 
 
-    #region legalAction
-    /// <summary>
-    /// پیامک اقدام قضائی
-    /// </summary>
-    /// <returns></returns>
-    Task SendLegalActionSmsTask();
 
-    #endregion
+
+   
+
 
     Task<long> GetIdByInstallmentId(long installmentId);
     Task<InstitutionContract> GetPreviousContract(long currentInstitutionContractId);

Company.Domain/InstitutionContractAgg/IInstitutionContractSmsServiceRepository.cs

@@ -0,0 +1,145 @@
+using _0_Framework.Application.Enums;
+using _0_Framework.Domain;
+using CompanyManagment.App.Contracts.InstitutionContract;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Company.Domain.InstitutionContractAgg;
+
+public interface IInstitutionContractSmsServiceRepository : IRepository<long, InstitutionContract>
+{
+    #region reminderSMs
+
+
+    /// <summary>
+    /// ارسال پیامک یادآور تایید قراداد مالی
+    /// </summary>
+    /// <returns></returns>
+    Task SendInstitutionContractConfirmSmsTask();
+    #endregion
+
+    //هشدار و اقدام قضایی
+    #region WarningOrLegalActionSmsListData
+    /// <summary>
+    /// اجرای تسک پیامک هشدار یا اقدام قضایی
+    /// </summary>
+    /// <param name="typeOfSmsSetting"></param>
+    /// <returns></returns>
+    Task SendWarningOrLegalActionSmsTask(TypeOfSmsSetting typeOfSmsSetting);
+
+    /// <summary>
+    /// دریافت لیست بدهکاران آبی جهت هشدار یا اقدام قضایی
+    /// </summary>
+    /// <param name="typeOfSmsSetting"></param>
+    /// <returns></returns>
+    Task<List<SmsListData>> GetWarningOrLegalActionSmsListData(TypeOfSmsSetting typeOfSmsSetting);
+
+    /// <summary>
+    /// ارسال پیامک هشدار یا اقدام قضایی
+    /// </summary>
+    /// <param name="smsListData"></param>
+    /// <param name="typeOfSmsSetting"></param>
+    /// <returns></returns>
+    Task SendWarningOrLegalActionSms(List<SmsListData> smsListData, TypeOfSmsSetting typeOfSmsSetting);
+
+    #endregion
+
+    //بلاک - آنبلاک - پیامک بلاک - 
+    // غیر فعال سازی قراداد های پایان یافته
+    #region Block
+
+    /// <summary>
+    /// ارسال پیامک مسدودی از طرف بک گراند سرویس
+    /// </summary>
+    /// <returns></returns>
+    Task SendBlockSmsForBackgroundTask();
+
+    /// <summary>
+    /// دریافت لیست واجد شرایط بلاک
+    /// جهت ارسال پیامک مسدودی
+    /// </summary>
+    /// <param name="checkDate"></param>
+    /// <returns></returns>
+    Task<List<BlockSmsListData>> GetBlockListData(DateTime checkDate);
+
+    /// <summary>
+    /// ارسال پیامک مسدودی
+    /// </summary>
+    /// <param name="smsListData"></param>
+    /// <param name="typeOfSms"></param>
+    /// <param name="sendMessStart"></param>
+    /// <param name="sendMessEnd"></param>
+    /// <returns></returns>
+    Task SendBlockSmsToContractingParties(List<BlockSmsListData> smsListData, string typeOfSms,
+        string sendMessStart, string sendMessEnd);
+
+    /// <summary>
+    /// بلاک سازی
+    /// </summary>
+    /// <param name="checkDate"></param>
+    /// <returns></returns>
+    Task Block(DateTime checkDate);
+
+    /// <summary>
+    /// دریافت لیست بدهکارانی که باید بلاک شوند 
+    /// </summary>
+    /// <param name="checkDate"></param>
+    /// <returns></returns>
+    Task<List<long>> GetToBeBlockList(DateTime checkDate);
+
+    /// <summary>
+    /// آنبلاک
+    /// </summary>
+    /// <returns></returns>
+    Task UnBlock();
+
+
+    /// <summary>
+    /// غیر فعالسازی قرارداد های پایان یافته
+    /// </summary>
+    /// <param name="checkDate"></param>
+    /// <returns></returns>
+    Task DeActiveInstitutionEndOfContract(DateTime checkDate);
+
+    /// <summary>
+    /// غیرفعال سازس قرارداد های آبی که بدهی ندارند
+    /// </summary>
+    /// <returns></returns>
+    Task BlueDeActiveAfterZeroDebt();
+    #endregion
+
+
+    #region ReminderSMS
+
+    /// <summary>
+    /// دریافت لیست - ارسال پیامک
+    /// فراخوانی از سمت بک گراند سرویس
+    /// </summary>
+    /// <returns></returns>
+    Task<bool> SendReminderSmsForBackgroundTask();
+
+    /// <summary>
+    /// ارسال پیامک صورت حساب ماهانه
+    /// </summary>
+    /// <param name="now"></param>
+    /// <returns></returns>
+    Task SendMonthlySms(DateTime now);
+
+
+
+    /// <summary>
+    ///دریافت لیست بدهکارن
+    /// جهت ارسال پیامک
+    /// </summary>
+    /// <returns></returns>
+    Task<List<SmsListData>> GetSmsListData(DateTime checkDate, TypeOfSmsSetting typeOfSmsSetting);
+
+    /// <summary>
+    /// ارسال پیامک های یاد آور بدهی
+    /// </summary>
+    /// <returns></returns>
+    Task SendReminderSmsToContractingParties(List<SmsListData> smsListData, string typeOfSms, string sendMessStart, string sendMessEnd);
+
+    #endregion
+}

Company.Domain/InstitutionContractSendFlagAgg/IInstitutionContractSendFlagRepository.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Company.Domain.InstitutionContractSendFlagAgg;
+
+/// <summary>
+/// Interface برای Repository مربوط به فلگ ارسال قرارداد
+/// </summary>
+public interface IInstitutionContractSendFlagRepository
+{
+    /// <summary>
+    /// ایجاد یک رکورد جدید برای فلگ ارسال قرارداد
+    /// </summary>
+    Task Create(InstitutionContractSendFlag flag);
+
+    /// <summary>
+    /// بازیابی فلگ بر اساس شناسه قرارداد
+    /// </summary>
+    Task<InstitutionContractSendFlag> GetByContractId(long contractId);
+
+    /// <summary>
+    /// به‌روزرسانی فلگ ارسال
+    /// </summary>
+    Task Update(InstitutionContractSendFlag flag);
+
+    /// <summary>
+    /// بررسی اینکه آیا قرارداد ارسال شده است
+    /// </summary>
+    Task<bool> IsContractSent(long contractId);
+    
+
+}
+

Company.Domain/InstitutionContractSendFlagAgg/InstitutionContractSendFlag.cs

@@ -0,0 +1,82 @@
+using System;
+using MongoDB.Bson;
+using MongoDB.Bson.Serialization.Attributes;
+
+namespace Company.Domain.InstitutionContractSendFlagAgg;
+
+/// <summary>
+/// نمایندگی فلگ ارسال قرارداد در MongoDB
+/// این موجودیت برای ردیابی اینکه آیا قرارداد ارسال شده است استفاده می‌شود
+/// </summary>
+public class InstitutionContractSendFlag
+{
+    public InstitutionContractSendFlag(long institutionContractId,bool isSent)
+    {
+        Id = Guid.NewGuid();
+        InstitutionContractId = institutionContractId;
+        IsSent = isSent;
+        CreatedDate = DateTime.Now;
+    }
+
+    /// <summary>
+    /// شناسه یکتای MongoDB
+    /// </summary>
+    [BsonId]
+    [BsonRepresentation(BsonType.String)]
+    public Guid Id { get; set; }
+
+    /// <summary>
+    /// شناسه قرارداد در SQL
+    /// </summary>
+    public long InstitutionContractId { get; set; }
+    
+    /// <summary>
+    /// آیا قرارداد ارسال شده است
+    /// </summary>
+    public bool IsSent { get; set; }
+
+    /// <summary>
+    /// تاریخ و زمان ارسال
+    /// </summary>
+    public DateTime? SentDate { get; set; }
+
+    /// <summary>
+    /// تاریخ و زمان ایجاد رکورد
+    /// </summary>
+    public DateTime CreatedDate { get; set; }
+
+    /// <summary>
+    /// تاریخ و زمان آخرین به‌روزرسانی
+    /// </summary>
+    public DateTime? LastModifiedDate { get; set; }
+    
+
+    /// <summary>
+    /// علامت‌گذاری قرارداد به عنوان ارسال‌شده
+    /// </summary>
+    public void MarkAsSent()
+    {
+        IsSent = true;
+        SentDate = DateTime.Now;
+        LastModifiedDate = DateTime.Now;
+    }
+
+    /// <summary>
+    /// بازگردانی علامت ارسال
+    /// </summary>
+    public void MarkAsNotSent()
+    {
+        IsSent = false;
+        SentDate = null;
+        LastModifiedDate = DateTime.Now;
+    }
+
+    /// <summary>
+    /// به‌روزرسانی علامت آخری اصلاح
+    /// </summary>
+    public void UpdateLastModified()
+    {
+        LastModifiedDate = DateTime.Now;
+    }
+}
+

Company.Domain/RollCallAgg/IRollCallMandatoryRepository.cs

@@ -1,15 +1,16 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using _0_Framework.Domain;
+using _0_Framework.Domain;
 using Company.Domain.CustomizeWorkshopEmployeeSettingsAgg.Entities;
 using CompanyManagment.App.Contracts.Contract;
 using CompanyManagment.App.Contracts.CustomizeCheckout;
 using CompanyManagment.App.Contracts.Leave;
 using CompanyManagment.App.Contracts.Loan;
+using CompanyManagment.App.Contracts.Reward;
 using CompanyManagment.App.Contracts.RollCall;
 using CompanyManagment.App.Contracts.SalaryAid;
 using CompanyManagment.App.Contracts.WorkingHoursTemp;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace Company.Domain.RollCallAgg;
 
@@ -53,6 +54,9 @@ public interface IRollCallMandatoryRepository : IRepository<long, RollCall>
     List<SalaryAidViewModel> SalaryAidsForCheckout(long employeeId, long workshopId, DateTime checkoutStart,
         DateTime checkoutEnd);
 
+    List<RewardViewModel> RewardForCheckout(long employeeId, long workshopId, DateTime checkoutEnd,
+        DateTime checkoutStart);
+
     Task<ComputingViewModel> RotatingShiftReport(long workshopId, long employeeId, DateTime contractStart,
         DateTime contractEnd, string shiftwork, bool hasRollCall, CreateWorkingHoursTemp command,bool holidayWorking);
 }

Company.Domain/SmsResultAgg/ISmsResultRepository.cs

@@ -1,10 +1,30 @@
-using CompanyManagment.App.Contracts.SmsResult;
+using _0_Framework.Domain;
+using CompanyManagment.App.Contracts.SmsResult;
+using CompanyManagment.App.Contracts.SmsResult.Dto;
 using System.Collections.Generic;
-using _0_Framework.Domain;
+using System.Threading.Tasks;
 
 namespace Company.Domain.SmsResultAgg;
 
 public interface ISmsResultRepository : IRepository<long, SmsResult>
 {
+    #region ForApi
+
+    /// <summary>
+    /// دریافت لیست پیامکها
+    /// </summary>
+    /// <param name="command"></param>
+    /// <returns></returns>
+    Task<List<SmsReportDto>> GetSmsReportList(SmsReportSearchModel searchModel);
+
+    /// <summary>
+    /// دریافت اکسپند لیست هر تاریخ
+    /// </summary>
+    /// <param name="searchModel"></param>
+    /// <param name="date"></param>
+    /// <returns></returns>
+    Task<List<SmsReportListDto>> GetSmsReportExpandList(SmsReportSearchModel searchModel, string date);
+
+    #endregion
     List<SmsResultViewModel> Search(SmsResultSearchModel searchModel);
 }

CompanyManagement.Infrastructure.Mongo/InstitutionContractSendFlagRepo/InstitutionContractSendFlagRepository.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Company.Domain.InstitutionContractSendFlagAgg;
+using MongoDB.Driver;
+
+namespace CompanyManagement.Infrastructure.Mongo.InstitutionContractSendFlagRepo;
+
+/// <summary>
+/// Repository برای مدیریت فلگ ارسال قرارداد در MongoDB
+/// </summary>
+public class InstitutionContractSendFlagRepository : IInstitutionContractSendFlagRepository
+{
+    private readonly IMongoCollection<InstitutionContractSendFlag> _collection;
+
+    public InstitutionContractSendFlagRepository(IMongoDatabase database)
+    {
+        _collection = database.GetCollection<InstitutionContractSendFlag>("InstitutionContractSendFlag");
+    }
+    
+    public async Task Create(InstitutionContractSendFlag flag)
+    {
+        await _collection.InsertOneAsync(flag);
+    }
+
+    public async Task<InstitutionContractSendFlag> GetByContractId(long contractId)
+    {
+        var filter = Builders<InstitutionContractSendFlag>.Filter
+            .Eq(x => x.InstitutionContractId, contractId);
+        
+        return await _collection.Find(filter).FirstOrDefaultAsync();
+    }
+    
+
+    public async Task Update(InstitutionContractSendFlag flag)
+    {
+        var filter = Builders<InstitutionContractSendFlag>.Filter
+            .Eq(x => x.InstitutionContractId, flag.InstitutionContractId);
+        
+        await _collection.ReplaceOneAsync(filter, flag);
+    }
+
+    public async Task<bool> IsContractSent(long contractId)
+    {
+        var flag = await GetByContractId(contractId);
+        return flag != null && flag.IsSent;
+    }
+
+    public async Task Remove(long contractId)
+    {
+        var filter = Builders<InstitutionContractSendFlag>.Filter
+            .Eq(x => x.InstitutionContractId, contractId);
+        
+        await _collection.DeleteOneAsync(filter);
+    }
+    
+}
+

CompanyManagment.App.Contracts/Checkout/CreateCheckout.cs

@@ -193,4 +193,9 @@ public class CreateCheckout
     /// پایه سنوات قبل از تاثیر ساعت کار
     /// </summary>
     public double BaseYearUnAffected { get; set; }
+
+    /// <summary>
+    /// آیا برای محاسبه پاداش مجاز است
+    /// </summary>
+    public bool RewardPayCompute { get; set; }
 }

CompanyManagment.App.Contracts/CompanyManagment.App.Contracts.csproj

@@ -2,8 +2,9 @@
 
 	<PropertyGroup>
 		<TargetFramework>net10.0</TargetFramework>
-		<GenerateDocumentationFile>true</GenerateDocumentationFile>
+		<GenerateDocumentationFile>false</GenerateDocumentationFile>
 		<NoWarn>$(NoWarn);1591</NoWarn>
+		<NuGetAudit>false</NuGetAudit>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -19,9 +20,4 @@
 		<ProjectReference Include="..\AccountManagement.Application.Contracts\AccountManagement.Application.Contracts.csproj" />
 		<ProjectReference Include="..\_0_Framework\_0_Framework_b.csproj" />
 	</ItemGroup>
-
-	<Target Name="CopyDocs" AfterTargets="Build">
-		<Copy SourceFiles="$(OutputPath)CompanyManagment.App.Contracts.xml" DestinationFolder="../ServiceHost\bin\Debug\net8.0\" />
-	</Target>
-
 </Project>

CompanyManagment.App.Contracts/InstitutionContract/GetInstitutionContractListItemsViewModel.cs

@@ -96,6 +96,8 @@ public class GetInstitutionContractListItemsViewModel
     /// مبلغ قسط
     /// </summary>
     public double InstallmentAmount { get; set; }
+
+    public bool InstitutionContractIsSentFlag { get; set; }
 }
 
 public class InstitutionContractListWorkshop

CompanyManagment.App.Contracts/InstitutionContract/IInstitutionContractApplication.cs

@@ -148,7 +148,7 @@ public interface IInstitutionContractApplication
     /// <param name="id">شناسه قرارداد</param>
     /// <returns>نتیجه عملیات</returns>
     OperationResult UnSign(long id);
-
+    
     /// <summary>
     /// ایجاد حساب کاربری برای طرف قرارداد
     /// </summary>
@@ -305,6 +305,14 @@ public interface IInstitutionContractApplication
     Task<InstitutionContractDiscountResponse> SetDiscountForCreation(InstitutionContractSetDiscountForCreationRequest request);
     Task<InstitutionContractDiscountResponse> ResetDiscountForCreation(InstitutionContractResetDiscountForExtensionRequest request);
     Task<OperationResult> CreationComplete(InstitutionContractExtensionCompleteRequest request);
+
+    /// <summary>
+    /// تعیین فلگ ارسال قرارداد در MongoDB
+    /// اگر فلگ وجود نداشتن‌د ایجاد می‌کند
+    /// </summary>
+    /// <param name="request">درخواست تعیین فلگ</param>
+    /// <returns>نتیجه عملیات</returns>
+    Task<OperationResult> SetContractSendFlag(SetInstitutionContractSendFlagRequest request);
 }
 
 public class CreationSetContractingPartyResponse
@@ -316,6 +324,7 @@ public class InstitutionContractCreationWorkshopsResponse
 {
     public List<WorkshopTempViewModel> WorkshopTemps { get; set; }
     public string TotalAmount { get; set; }
+    public Guid TempId { get; set; }
 }
 
 public class InstitutionContractCreationWorkshopsRequest

CompanyManagment.App.Contracts/InstitutionContract/SetInstitutionContractSendFlagRequest.cs

@@ -0,0 +1,19 @@
+namespace CompanyManagment.App.Contracts.InstitutionContract;
+
+/// <summary>
+/// درخواست برای تعیین فلگ ارسال قرارداد
+/// </summary>
+public class SetInstitutionContractSendFlagRequest
+{
+    /// <summary>
+    /// شناسه قرارداد
+    /// </summary>
+    public long InstitutionContractId { get; set; }
+
+    /// <summary>
+    /// آیا قرارداد ارسال شده است
+    /// </summary>
+    public bool IsSent { get; set; }
+    
+}
+

CompanyManagment.App.Contracts/SmsResult/Dto/SendStatus.cs

@@ -0,0 +1,15 @@
+namespace CompanyManagment.App.Contracts.SmsResult.Dto;
+
+/// <summary>
+/// وضعیت ارسال پیامک
+/// </summary>
+public enum SendStatus
+{
+    All=0,
+    /// <summary>
+    /// موفق
+    /// </summary>
+    Success,
+    //ناموفق
+    Failed,
+}

CompanyManagment.App.Contracts/SmsResult/Dto/SmsReportDto.cs

@@ -0,0 +1,54 @@
+using System;
+
+namespace CompanyManagment.App.Contracts.SmsResult.Dto;
+
+public class SmsReportDto
+{
+    /// <summary>
+    /// تاریخ ارسال
+    /// </summary>
+    public string SentDate { get; set; }
+
+
+}
+
+public class SmsReportListDto
+{
+    /// <summary>
+    /// آی دی
+    /// </summary>
+    public long Id { get; set; }
+    /// <summary>
+    /// آی دی پیامک در sms.ir
+    /// </summary>
+    public int MessageId { get; set; }
+
+    /// <summary>
+    /// وضعیت ارسال
+    /// </summary>
+    public string Status { get; set; }
+
+    /// <summary>
+    /// نوع پیامک
+    /// </summary>
+    public string TypeOfSms { get; set; }
+
+    /// <summary>
+    /// نام طرف حساب
+    /// </summary>
+    public string ContractingPartyName { get; set; }
+
+    /// <summary>
+    /// شماره موبایل
+    /// </summary>
+    public string Mobile { get; set; }
+
+
+    /// <summary>
+    /// ساعت و دقیقه
+    /// </summary>
+    public string HourAndMinute { get; set; }
+}
+
+
+

CompanyManagment.App.Contracts/SmsResult/Dto/SmsReportSearchModel.cs

@@ -0,0 +1,43 @@
+using _0_Framework.Application.Enums;
+
+namespace CompanyManagment.App.Contracts.SmsResult.Dto;
+
+public class SmsReportSearchModel
+{
+    //نوع پیامک
+    public TypeOfSmsSetting TypeOfSms { get; set; }
+
+    /// <summary>
+    /// وضعیت ارسال پیامک
+    /// </summary>
+    public SendStatus SendStatus { get; set; }
+
+    /// <summary>
+    /// شماره موبایل
+    /// </summary>
+    public string Mobile { get; set; }
+
+    /// <summary>
+    /// آی دی طرف حساب
+    /// </summary>
+    public long ContractingPatyId { get; set; }
+
+    /// <summary>
+    /// سال
+    /// </summary>
+    public string Year { get; set; }
+    /// <summary>
+    /// ماه
+    /// </summary>
+    public string Month { get; set; }
+
+    /// <summary>
+    /// تاریخ شروع
+    /// </summary>
+    public string StartDateFa { get; set; }
+
+    /// <summary>
+    /// تاریخ پایان
+    /// </summary>
+    public string EndDateFa { get; set; }
+}

CompanyManagment.App.Contracts/SmsResult/ISmsResultApplication.cs

@@ -1,14 +1,34 @@
-using System;
+using _0_Framework.Application;
+using CompanyManagment.App.Contracts.SmsResult.Dto;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using _0_Framework.Application;
 
 namespace CompanyManagment.App.Contracts.SmsResult;
 
 public interface ISmsResultApplication
 {
+    #region ForApi
+
+    /// <summary>
+    /// دریافت لیست پیامکها
+    /// </summary>
+    /// <param name="searchModel"></param>
+    /// <returns></returns>
+    Task<List<SmsReportDto>> GetSmsReportList(SmsReportSearchModel searchModel);
+
+    /// <summary>
+    /// دریافت اکسپند لیست هر تاریخ
+    /// </summary>
+    /// <param name="searchModel"></param>
+    /// <param name="date"></param>
+    /// <returns></returns>
+    Task<List<SmsReportListDto>> GetSmsReportExpandList(SmsReportSearchModel searchModel, string date);
+
+    #endregion
+
     OperationResult Create(CreateSmsResult command);
     List<SmsResultViewModel> Search(SmsResultSearchModel searchModel);
 }

CompanyManagment.App.Contracts/Workshop/CreateWorkshop.cs

@@ -151,6 +151,9 @@ public class CreateWorkshop
     /// تصفیه حساب بصورت استاتیک محاصبه شود
     /// </summary>
     public bool IsStaticCheckout { get; set; }
-    
 
+    /// <summary>
+    /// آیا پاداش در فیش حقوقی محاسبه شود
+    /// </summary>
+    public bool RewardComputeOnCheckout { get; set; }
 }

CompanyManagment.Application/CheckoutApplication.cs

@@ -240,6 +240,16 @@ public class CheckoutApplication : ICheckoutApplication
 
 		command.InstallmentDeduction = loanInstallments.Sum(x => x.AmountForMonth.MoneyToDouble());
 
+        var rewards = new List<CheckoutReward>();
+        double rewardPay = 0;
+        if (command.RewardPayCompute)
+        {
+            rewards = _rollCallMandatoryRepository.RewardForCheckout(command.EmployeeId, command.WorkshopId, checkoutEnd.ToGeorgianDateTime(), checkoutStart.ToGeorgianDateTime())
+                .Select(x => new CheckoutReward(x.Amount, x.AmountDouble, x.GrantDateFa, x.GrantDateGr, x.Description, x.Title, x.Id)).ToList();
+
+            rewardPay = rewards.Sum(x => x.AmountDouble);
+        }
+		
 
 		
 
@@ -361,7 +371,7 @@ public class CheckoutApplication : ICheckoutApplication
 
 
 		var totalClaimsDouble = monthlyWage + bacicYears + consumableItem + housingAllowance + marriedAllowance + command.OvertimePay +
-								command.NightworkPay + familyAllowance + bunos + years + command.LeavePay + command.FridayPay + command.ShiftPay;
+								command.NightworkPay + familyAllowance + bunos + years + command.LeavePay + command.FridayPay + command.ShiftPay + rewardPay;
 		var totalClaims = totalClaimsDouble.ToMoney();
 		var totalDeductionDouble = insuranceDeduction + command.AbsenceDeduction + command.InstallmentDeduction + command.SalaryAidDeduction;
 		var totalDeductions = totalDeductionDouble.ToMoney();
@@ -386,7 +396,7 @@ public class CheckoutApplication : ICheckoutApplication
 				, command.OvertimePay, command.NightworkPay, command.FridayPay, 0, command.ShiftPay, familyAllowance, bunos, years, command.LeavePay, insuranceDeduction, 0, command.InstallmentDeduction, command.SalaryAidDeduction, command.AbsenceDeduction, sumOfWorkingDays,
 				command.ArchiveCode, command.PersonnelCode, totalClaims, totalDeductions, totalPayment, command.Signature, marriedAllowance, command.LeaveCheckout, command.CreditLeaves, command.AbsencePeriod, command.AverageHoursPerDay, command.HasRollCall, command.OverTimeWorkValue, command.OverNightWorkValue
 				, command.FridayWorkValue, command.RotatingShiftValue, command.AbsenceValue, command.TotalDayOfLeaveCompute, command.TotalDayOfYearsCompute, command.TotalDayOfBunosesCompute,
-				loanInstallments, salaryAids,checkoutRollCall,command.EmployeeMandatoryHours, hasInsuranceShareTheSameAsList);
+				loanInstallments, salaryAids,checkoutRollCall,command.EmployeeMandatoryHours, hasInsuranceShareTheSameAsList, rewards, rewardPay);
 
 			_checkoutRepository.CreateCkeckout(checkout).GetAwaiter().GetResult();
 			//_checkoutRepository.SaveChanges();

CompanyManagment.Application/InstitutionContractApplication.cs

@@ -19,6 +19,7 @@ using Company.Domain.PaymentTransactionAgg;
 using Company.Domain.RepresentativeAgg;
 using Company.Domain.RollCallServiceAgg;
 using Company.Domain.WorkshopAgg;
+using Company.Domain.InstitutionContractSendFlagAgg;
 using CompanyManagment.App.Contracts.FinancialInvoice;
 using CompanyManagment.App.Contracts.FinancialStatment;
 using CompanyManagment.App.Contracts.InstitutionContract;
@@ -51,6 +52,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
     private readonly IPaymentTransactionRepository _paymentTransactionRepository;
     private readonly IRollCallServiceRepository _rollCallServiceRepository;
     private readonly ISepehrPaymentGatewayService _sepehrPaymentGatewayService;
+    private readonly IInstitutionContractSendFlagRepository _institutionContractSendFlagRepository;
 
 
     public InstitutionContractApplication(IInstitutionContractRepository institutionContractRepository,
@@ -62,7 +64,8 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         IAccountApplication accountApplication, ISmsService smsService,
         IFinancialInvoiceRepository financialInvoiceRepository, IHttpClientFactory httpClientFactory,
         IPaymentTransactionRepository paymentTransactionRepository, IRollCallServiceRepository rollCallServiceRepository,
-        ISepehrPaymentGatewayService sepehrPaymentGatewayService,ILogger<SepehrPaymentGateway> sepehrGatewayLogger)
+        ISepehrPaymentGatewayService sepehrPaymentGatewayService,ILogger<SepehrPaymentGateway> sepehrGatewayLogger,
+        IInstitutionContractSendFlagRepository institutionContractSendFlagRepository)
     {
         _institutionContractRepository = institutionContractRepository;
         _contractingPartyRepository = contractingPartyRepository;
@@ -80,6 +83,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         _rollCallServiceRepository = rollCallServiceRepository;
         _sepehrPaymentGatewayService = sepehrPaymentGatewayService;
         _paymentGateway = new SepehrPaymentGateway(httpClientFactory,sepehrGatewayLogger);
+        _institutionContractSendFlagRepository = institutionContractSendFlagRepository;
     }
 
 	public OperationResult Create(CreateInstitutionContract command)
@@ -894,6 +898,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         return opration.Succcedded();
     }
 
+
     public void CreateContractingPartyAccount(long contractingPartyid, long accountId)
     {
         _institutionContractRepository.CreateContractingPartyAccount(contractingPartyid, accountId);
@@ -1511,8 +1516,9 @@ public class InstitutionContractApplication : IInstitutionContractApplication
             .Where(x => x.WorkshopCreated && x.WorkshopId is > 0).ToList();
         
         var currentWorkshops = institutionContract.WorkshopGroup.CurrentWorkshops.ToList();
-        var accountId = _contractingPartyRepository
-            .GetAccountByPersonalContractingParty(institutionContract.ContractingPartyId).Id;
+        var account = _contractingPartyRepository
+            .GetAccountByPersonalContractingParty(institutionContract.ContractingPartyId);
+        var accountId = account.Id;
         foreach (var createdWorkshop in initialCreatedWorkshops)
         {
             if (currentWorkshops.Any(x => x.WorkshopId == createdWorkshop.WorkshopId))
@@ -1564,7 +1570,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication
         var previousInstitutionContract = await _institutionContractRepository
             .GetPreviousContract(institutionContract.id);
         previousInstitutionContract?.DeActive();
-        ReActiveAllAfterCreateNew(institutionContract.ContractingPartyId);
+        await _contractingPartyRepository.ActiveAllAsync(institutionContract.ContractingPartyId);
         await _institutionContractRepository.SaveChangesAsync();
         return op.Succcedded();
     }
@@ -1820,7 +1826,60 @@ public class InstitutionContractApplication : IInstitutionContractApplication
             installments.Add(lastInstallment);
             return installments;
         }
+
+     
     }
+       /// <summary>
+        /// تعیین فلگ ارسال قرارداد
+        /// اگر فلگ وجود نداشتن‌د ایجاد می‌کند
+        /// </summary>
+        public async Task<OperationResult> SetContractSendFlag(SetInstitutionContractSendFlagRequest request)
+        {
+            var operationResult = new OperationResult();
+
+            try
+            {
+                // بازیابی قرارداد از SQL
+                var contract = _institutionContractRepository.Get(request.InstitutionContractId);
+                if (contract == null)
+                    return operationResult.Failed("قرارداد مورد نظر یافت نشد");
+
+                // بررسی اینکه آیا فلگ در MongoDB وجود دارد
+                var existingFlag = await _institutionContractSendFlagRepository
+                    .GetByContractId(request.InstitutionContractId);
+
+                if (existingFlag != null)
+                {
+                    // اگر فلگ وجود داشتن‌د، آن را اپدیت کنیم
+                    if (request.IsSent)
+                    {
+                        existingFlag.MarkAsSent();
+                    }
+                    else
+                    {
+                        existingFlag.MarkAsNotSent();
+                    }
+                    existingFlag.UpdateLastModified();
+                    await _institutionContractSendFlagRepository.Update(existingFlag);
+                }
+                else
+                {
+                    // اگر فلگ وجود ندارد، آن را ایجاد کنیم
+                    var newFlag = new InstitutionContractSendFlag(
+                        request.InstitutionContractId,
+                        request.IsSent
+                    );
+
+                    await _institutionContractSendFlagRepository.Create(newFlag);
+                }
+
+                return operationResult.Succcedded();
+            }
+            catch (Exception ex)
+            {
+                return operationResult.Failed($"خطا در تعیین فلگ ارسال: {ex.Message}");
+            }
+        }
 }
 
 #region CustomViewModels

CompanyManagment.Application/InsuranceListApplication.cs

@@ -1524,7 +1524,8 @@ public class InsuranceListApplication : IInsuranceListApplication
 			var dateOfBirth = employeeData.DateOfBirthGr.ToFarsi();
 			var dateOfIssue = employeeData.DateOfIssueGr.ToFarsi();
 			var leftDate = employeeData.LeftWorkDateGr != null ? employeeData.LeftWorkDateGr.Value.AddDays(-1) : new DateTime();
-			var workingDays = Tools.GetEmployeeInsuranceWorkingDays(employeeData.StartWorkDateGr, leftDate, startDateGr, endDateGr, employeeData.EmployeeId);
+      
+            var workingDays = Tools.GetEmployeeInsuranceWorkingDays(employeeData.StartWorkDateGr, leftDate, startDateGr, endDateGr, employeeData.EmployeeId);
 			var leftWorkFa = workingDays.hasLeftWorkInMonth ? employeeData.LeftWorkDateGr.ToFarsi() : "";
 			var startWorkFa = employeeData.StartWorkDateGr.ToFarsi();
 			var workshop = _workShopRepository.GetDetails(workshopId);
@@ -1606,7 +1607,7 @@ public class InsuranceListApplication : IInsuranceListApplication
                 MaritalStatus = employeeData.MaritalStatus,
 
 				StartMonthCurrent = startMonthFa,
-				WorkingDays = workingDays.countWorkingDays,
+				WorkingDays = employeeData.WorkingDays,
 				StartWorkDate = startWorkFa,
 				StartWorkDateGr = employeeData.StartWorkDateGr,
 				LeftWorkDate = leftWorkFa,

CompanyManagment.Application/RollCallApplication.cs

@@ -447,8 +447,7 @@ public class RollCallApplication : IRollCallApplication
                 return operation.Failed("کارمند در بازه انتخاب شده مرخصی ساعتی دارد");
         }
 
-        if (newRollCallDates == null || !newRollCallDates.All(x => employeeStatuses.Any(y => x.StartDate.Value.Date >= y.StartDateGr.Date && x.EndDate.Value.Date <= y.EndDateGr.Date)))
-            return operation.Failed("کارمند در بازه وارد شده غیر فعال است");
+       
 
 
 
@@ -458,7 +457,10 @@ public class RollCallApplication : IRollCallApplication
                 _rollCallDomainService.GetEmployeeShiftDateByRollCallStartDate(command.WorkshopId, command.EmployeeId,
                     x.StartDate!.Value,x.EndDate.Value);
         });
-
+        if (newRollCallDates == null || !newRollCallDates.All(x => employeeStatuses.Any(y => x.ShiftDate.Date >= y.StartDateGr.Date && x.ShiftDate.Date <= y.EndDateGr.Date)))
+	        return operation.Failed("کارمند در بازه وارد شده غیر فعال است");
+        
+        
         if (newRollCallDates.Any(x => x.ShiftDate.Date != date.Date))
         {
             return operation.Failed("حضور غیاب در حال ویرایش را نمیتوانید از تاریخ شیفت عقب تر یا جلو تر ببرید");
@@ -487,8 +489,8 @@ public class RollCallApplication : IRollCallApplication
 
 
 
-        if (newRollCallDates == null || !newRollCallDates.All(x => employeeStatuses.Any(y => x.StartDate.Value.Date >= y.StartDateGr.Date 
-	            && x.EndDate.Value.Date <= y.EndDateGr.Date)))
+        if (newRollCallDates == null || !newRollCallDates.All(x => employeeStatuses.Any(y => x.ShiftDate.Date >= y.StartDateGr.Date 
+	            && x.ShiftDate.Date <= y.EndDateGr.Date)))
             return operation.Failed("کارمند در بازه وارد شده غیر فعال است");
 
 
@@ -632,9 +634,6 @@ public class RollCallApplication : IRollCallApplication
                 return operation.Failed("کارمند در بازه انتخاب شده مرخصی ساعتی دارد");
         }
 
-        if (newRollCallDates == null || !newRollCallDates.All(x => employeeStatuses.Any(y => x.StartDate.Value.Date >= y.StartDateGr.Date && x.EndDate.Value.Date <= y.EndDateGr.Date)))
-            return operation.Failed("کارمند در بازه وارد شده غیر فعال است");
-
 
         newRollCallDates.ForEach(x =>
         {
@@ -642,6 +641,11 @@ public class RollCallApplication : IRollCallApplication
                 _rollCallDomainService.GetEmployeeShiftDateByRollCallStartDate(command.WorkshopId, command.EmployeeId,
                     x.StartDate!.Value,x.EndDate.Value);
         });
+        
+        if (newRollCallDates == null || !newRollCallDates.All(x => employeeStatuses.Any(y => x.ShiftDate.Date >= y.StartDateGr.Date && x.ShiftDate.Date <= y.EndDateGr.Date)))
+	        return operation.Failed("کارمند در بازه وارد شده غیر فعال است");
+
+        
         if (newRollCallDates.Any(x => x.ShiftDate.Date != date.Date))
         {
             return operation.Failed("حضور غیاب در حال ویرایش را نمیتوانید از تاریخ شیفت عقب تر یا جلو تر ببرید");
@@ -664,7 +668,7 @@ public class RollCallApplication : IRollCallApplication
                                                                   && (y.StartDate.Value.Date <= x.ContractEndGr.Date))))
             return operation.Failed("برای بازه های وارد شده فیش حقوقی ثبت شده است");
 
-        if (newRollCallDates == null || !newRollCallDates.All(x => employeeStatuses.Any(y => x.StartDate.Value.Date >= y.StartDateGr.Date && x.EndDate.Value.Date <= y.EndDateGr.Date)))
+        if (newRollCallDates == null || !newRollCallDates.All(x => employeeStatuses.Any(y => x.ShiftDate.Date >= y.StartDateGr.Date && x.ShiftDate.Date <= y.EndDateGr.Date)))
             return operation.Failed("کارمند در بازه وارد شده غیر فعال است");
 
         var currentDayRollCall = employeeRollCalls.FirstOrDefault(x => x.EndDate == null);

CompanyManagment.Application/SmsResultApplication.cs

@@ -1,8 +1,10 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using _0_Framework.Application;
 using Company.Domain.SmsResultAgg;
 using CompanyManagment.App.Contracts.SmsResult;
+using CompanyManagment.App.Contracts.SmsResult.Dto;
 
 namespace CompanyManagment.Application;
 
@@ -15,6 +17,23 @@ public class SmsResultApplication : ISmsResultApplication
         _smsResultRepository = smsResultRepository;
     }
 
+
+    #region ForApi
+
+    public async Task<List<SmsReportDto>> GetSmsReportList(SmsReportSearchModel searchModel)
+    {
+        return await _smsResultRepository.GetSmsReportList(searchModel);
+    }
+
+    public async Task<List<SmsReportListDto>> GetSmsReportExpandList(SmsReportSearchModel searchModel, string date)
+    {
+        return await _smsResultRepository.GetSmsReportExpandList(searchModel, date);
+    }
+
+    #endregion
+
+
+
     public OperationResult Create(CreateSmsResult command)
     {
         var op = new OperationResult();

CompanyManagment.Application/SmsSettingApplication.cs

@@ -1,13 +1,14 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using _0_Framework.Application;
+using _0_Framework.Application;
 using _0_Framework.Application.Enums;
 using Company.Domain.InstitutionContractAgg;
 using Company.Domain.SmsResultAgg;
 using CompanyManagment.App.Contracts.InstitutionContract;
 using CompanyManagment.App.Contracts.SmsResult;
+using CompanyManagment.EFCore.Repository;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace CompanyManagment.Application;
 
@@ -15,11 +16,13 @@ public class SmsSettingApplication : ISmsSettingApplication
 {
     private readonly ISmsSettingsRepository _smsSettingsRepository;
     private readonly IInstitutionContractRepository _institutionContractRepository;
+    private readonly IInstitutionContractSmsServiceRepository _institutionContractSmsServiceRepository;
 
-    public SmsSettingApplication(ISmsSettingsRepository smsSettingsRepository, IInstitutionContractRepository institutionContractRepository)
+    public SmsSettingApplication(ISmsSettingsRepository smsSettingsRepository, IInstitutionContractRepository institutionContractRepository, IInstitutionContractSmsServiceRepository institutionContractSmsServiceRepository)
     {
         _smsSettingsRepository = smsSettingsRepository;
         _institutionContractRepository = institutionContractRepository;
+        _institutionContractSmsServiceRepository = institutionContractSmsServiceRepository;
     }
 
 
@@ -116,12 +119,12 @@ public class SmsSettingApplication : ISmsSettingApplication
 
     public async Task<List<SmsListData>> GetSmsListData(TypeOfSmsSetting typeOfSmsSetting)
     {
-       return await _institutionContractRepository.GetSmsListData(DateTime.Now, typeOfSmsSetting);
+       return await _institutionContractSmsServiceRepository.GetSmsListData(DateTime.Now, typeOfSmsSetting);
     }
 
     public async Task<List<BlockSmsListData>> GetBlockSmsListData(TypeOfSmsSetting typeOfSmsSetting)
     {
-        return await _institutionContractRepository.GetBlockListData(DateTime.Now);
+        return await _institutionContractSmsServiceRepository.GetBlockListData(DateTime.Now);
     }
 
 
@@ -134,7 +137,7 @@ public class SmsSettingApplication : ISmsSettingApplication
 
         if (command.Any())
         {
-            await _institutionContractRepository.SendReminderSmsToContractingParties(command, typeOfSms, sendMessStart, sendMessEnd);
+            await _institutionContractSmsServiceRepository.SendReminderSmsToContractingParties(command, typeOfSms, sendMessStart, sendMessEnd);
             return op.Succcedded();
         }
         else
@@ -153,7 +156,7 @@ public class SmsSettingApplication : ISmsSettingApplication
         string sendMessEnd = "پایان مسدودی آنی ";
         if (command.Any())
         {
-            await _institutionContractRepository.SendBlockSmsToContractingParties(command, typeOfSms, sendMessStart,
+            await _institutionContractSmsServiceRepository.SendBlockSmsToContractingParties(command, typeOfSms, sendMessStart,
                 sendMessEnd);
             return op.Succcedded();
         }

CompanyManagment.EFCore/Mapping/CheckoutMapping.cs

@@ -34,7 +34,7 @@ class CheckoutMapping : IEntityTypeConfiguration<Checkout>
         builder.Property(x => x.FamilyAllowance);
         builder.Property(x => x.HousingAllowance);
         builder.Property(x => x.ConsumableItems);
-        builder.Property(x => x.RewardPay).HasColumnType("float").IsRequired(false);
+        builder.Property(x => x.RewardPay);
 
         builder.Property(x => x.LeaveCheckout);
         builder.Property(x => x.CreditLeaves);
@@ -82,6 +82,15 @@ class CheckoutMapping : IEntityTypeConfiguration<Checkout>
             salaryAid.Property(x => x.CalculationDateTimeFa).HasMaxLength(15);
         });
 
+
+        builder.OwnsMany(x => x.Rewards, reward =>
+        {
+            reward.Property(x => x.Description).HasColumnType("ntext");
+            reward.Property(x => x.Title).HasMaxLength(255);
+            reward.Property(x=> x.Amount).HasMaxLength(25);
+            reward.Property(x => x.GrantDateFa).HasMaxLength(10);
+        });
+
         builder.OwnsOne(x => x.CheckoutRollCall, rollCall =>
         {
 	        rollCall.Property(x => x.TotalPresentTimeSpan).HasTimeSpanConversion();

CompanyManagment.EFCore/Migrations/20260124132444_Add Reward to checkout.cs

@@ -0,0 +1,66 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CompanyManagment.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddRewardtocheckout : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<double>(
+                name: "RewardPay",
+                table: "Checkouts",
+                type: "float",
+                nullable: false,
+                defaultValue: 0.0,
+                oldClrType: typeof(double),
+                oldType: "float",
+                oldNullable: true);
+
+            migrationBuilder.CreateTable(
+                name: "CheckoutReward",
+                columns: table => new
+                {
+                    Checkoutid = table.Column<long>(type: "bigint", nullable: false),
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    Amount = table.Column<string>(type: "nvarchar(25)", maxLength: 25, nullable: true),
+                    AmountDouble = table.Column<double>(type: "float", nullable: false),
+                    GrantDateFa = table.Column<string>(type: "nvarchar(10)", maxLength: 10, nullable: true),
+                    GrantDateGr = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    Description = table.Column<string>(type: "ntext", nullable: true),
+                    Title = table.Column<string>(type: "nvarchar(255)", maxLength: 255, nullable: true),
+                    EntityId = table.Column<long>(type: "bigint", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_CheckoutReward", x => new { x.Checkoutid, x.Id });
+                    table.ForeignKey(
+                        name: "FK_CheckoutReward_Checkouts_Checkoutid",
+                        column: x => x.Checkoutid,
+                        principalTable: "Checkouts",
+                        principalColumn: "id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "CheckoutReward");
+
+            migrationBuilder.AlterColumn<double>(
+                name: "RewardPay",
+                table: "Checkouts",
+                type: "float",
+                nullable: true,
+                oldClrType: typeof(double),
+                oldType: "float");
+        }
+    }
+}

CompanyManagment.EFCore/Migrations/CompanyContextModelSnapshot.cs

@@ -635,7 +635,7 @@ namespace CompanyManagment.EFCore.Migrations
                         .HasMaxLength(10)
                         .HasColumnType("nvarchar(10)");
 
-                    b.Property<double?>("RewardPay")
+                    b.Property<double>("RewardPay")
                         .HasColumnType("float");
 
                     b.Property<string>("RotatingShiftValue")
@@ -7501,6 +7501,49 @@ namespace CompanyManagment.EFCore.Migrations
                                 .HasForeignKey("Checkoutid");
                         });
 
+                    b.OwnsMany("Company.Domain.CheckoutAgg.ValueObjects.CheckoutReward", "Rewards", b1 =>
+                        {
+                            b1.Property<long>("Checkoutid")
+                                .HasColumnType("bigint");
+
+                            b1.Property<int>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("int");
+
+                            SqlServerPropertyBuilderExtensions.UseIdentityColumn(b1.Property<int>("Id"));
+
+                            b1.Property<string>("Amount")
+                                .HasMaxLength(25)
+                                .HasColumnType("nvarchar(25)");
+
+                            b1.Property<double>("AmountDouble")
+                                .HasColumnType("float");
+
+                            b1.Property<string>("Description")
+                                .HasColumnType("ntext");
+
+                            b1.Property<long>("EntityId")
+                                .HasColumnType("bigint");
+
+                            b1.Property<string>("GrantDateFa")
+                                .HasMaxLength(10)
+                                .HasColumnType("nvarchar(10)");
+
+                            b1.Property<DateTime>("GrantDateGr")
+                                .HasColumnType("datetime2");
+
+                            b1.Property<string>("Title")
+                                .HasMaxLength(255)
+                                .HasColumnType("nvarchar(255)");
+
+                            b1.HasKey("Checkoutid", "Id");
+
+                            b1.ToTable("CheckoutReward");
+
+                            b1.WithOwner()
+                                .HasForeignKey("Checkoutid");
+                        });
+
                     b.OwnsMany("Company.Domain.CheckoutAgg.ValueObjects.CheckoutSalaryAid", "SalaryAids", b1 =>
                         {
                             b1.Property<long>("Checkoutid")
@@ -7545,6 +7588,8 @@ namespace CompanyManagment.EFCore.Migrations
 
                     b.Navigation("LoanInstallments");
 
+                    b.Navigation("Rewards");
+
                     b.Navigation("SalaryAids");
 
                     b.Navigation("Workshop");

CompanyManagment.EFCore/Repository/CheckoutRepository.cs

@@ -531,6 +531,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
 
         entity.SetSalaryAid(command.SalaryAids, command.SalaryAidDeduction);
         entity.SetLoanInstallment(command.LoanInstallments, command.InstallmentDeduction);
+        entity.SetReward(command.Rewards,command.RewardPay);
         entity.SetCheckoutRollCall(command.CheckoutRollCall);
         entity.SetEmployeeMandatoryHours(command.EmployeeMandatoryHours);
         if(command.HasInsuranceShareTheSameAsList)
@@ -934,7 +935,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
                     TotalClaims = item.TotalClaims,
                     TotalDeductions = item.TotalDeductions,
                     TotalPayment = item.TotalPayment.ToMoney(),
-                    RewardPay = item.RewardPay.ToMoneyNullable(),
+                    RewardPay = item.RewardPay.ToMoney(),
                     ContractStartGr = item.ContractStart,
                     ContractEndGr = item.ContractEnd,
                     IsLeft = false,
@@ -1335,7 +1336,7 @@ public class CheckoutRepository : RepositoryBase<long, Checkout>, ICheckoutRepos
                 TotalClaims = x.TotalClaims,
                 TotalDeductions = x.TotalDeductions,
                 TotalPayment = x.TotalPayment.ToMoney(),
-                RewardPay = x.RewardPay.ToMoneyNullable(),
+                RewardPay = x.RewardPay.ToMoney(),
                 ContractStartGr = x.ContractStart,
                 ContractEndGr = x.ContractEnd,
                 IsLeft = false,

CompanyManagment.EFCore/Repository/PersonalContractingPartyRepository.cs

@@ -245,7 +245,7 @@ public class PersonalContractingPartyRepository : RepositoryBase<long, PersonalC
             return new();
         }
 
-        return _accountContext.Accounts.Where(x => x.id == accId && x.IsActiveString == "true").Select(x =>
+        return _accountContext.Accounts.Where(x => x.id == accId).Select(x =>
             new AccountViewModel()
             {
                 Id = x.id,
@@ -845,8 +845,7 @@ public class PersonalContractingPartyRepository : RepositoryBase<long, PersonalC
     public async Task<OperationResult> ActiveAllAsync(long id)
     {
         OperationResult result = new OperationResult();
-        await using var transaction =await _context.Database.BeginTransactionAsync();
-        await using var accountTransaction = await _accountContext.Database.BeginTransactionAsync();
+        
         try
         {
             var personel = _context.PersonalContractingParties
@@ -890,15 +889,12 @@ public class PersonalContractingPartyRepository : RepositoryBase<long, PersonalC
             }
             
             await _context.SaveChangesAsync();
-            await transaction.CommitAsync();
-            await accountTransaction.CommitAsync();
+            
             result.Succcedded();
         }
         catch (Exception)
         {
             result.Failed("فعال کردن طرف حساب با خطا مواجه شد");
-            await transaction.RollbackAsync();
-            await accountTransaction.RollbackAsync();
         }
 
         return result;

CompanyManagment.EFCore/Repository/ReportClientRepository.cs

@@ -74,7 +74,7 @@ public class ReportClientRepository : IReportClientRepository
             TotalClaims = x.TotalClaims,
             TotalDeductions = x.TotalDeductions,
             TotalPayment = x.TotalPayment.ToMoney(),
-            RewardPay = x.RewardPay.ToMoneyNullable(),
+            RewardPay = x.RewardPay.ToMoney(),
             MarriedAllowance = x.MarriedAllowance.ToMoney(),
         }).Where(x => x.WorkshopId == workshopId);
 
@@ -448,7 +448,7 @@ public class ReportClientRepository : IReportClientRepository
             TotalClaims = x.TotalClaims,
             TotalDeductions = x.TotalDeductions,
             TotalPayment = x.TotalPayment.ToMoney(),
-            RewardPay = x.RewardPay.ToMoneyNullable(),
+            RewardPay = x.RewardPay.ToMoney(),
             MarriedAllowance = x.MarriedAllowance.ToMoney(),
         }).Where(x => x.WorkshopId == workshopId);
 

CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs

@@ -5199,10 +5199,10 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
         };
     }
 
-    private List<RewardViewModel> RewardForCheckout(long employeeId, long workshopId, DateTime checkoutEnd,
+    public List<RewardViewModel> RewardForCheckout(long employeeId, long workshopId, DateTime checkoutEnd,
         DateTime checkoutStart)
     {
-        return _context.Rewards.Where(x =>
+        var result = _context.Rewards.Where(x =>
             x.WorkshopId == workshopId && x.EmployeeId == employeeId && x.GrantDate <= checkoutEnd &&
             x.GrantDate >= checkoutStart).Select(x => new RewardViewModel
         {
@@ -5215,6 +5215,8 @@ public class RollCallMandatoryRepository : RepositoryBase<long, RollCall>, IRoll
             IsActive = x.IsActive,
             Id = x.id
         }).ToList();
+
+        return result;
     }
 
     private List<FineViewModel> FinesForCheckout(long employeeId, long workshopId, DateTime contractStart,

CompanyManagment.EFCore/Repository/SmsResultRepository.cs

@@ -1,13 +1,20 @@
-using System.Collections.Generic;
-using System.Linq;
-using _0_Framework.Application;
+using _0_Framework.Application;
 using _0_Framework.InfraStructure;
 using Company.Domain.SmsResultAgg;
 using CompanyManagment.App.Contracts.SmsResult;
+using CompanyManagment.App.Contracts.SmsResult.Dto;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using _0_Framework.Application.Enums;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
 
 namespace CompanyManagment.EFCore.Repository;
 
-public class SmsResultRepository : RepositoryBase<long, SmsResult> , ISmsResultRepository
+public class SmsResultRepository : RepositoryBase<long, SmsResult>, ISmsResultRepository
 {
     private readonly CompanyContext _context;
     public SmsResultRepository(CompanyContext context) : base(context)
@@ -15,9 +22,263 @@ public class SmsResultRepository : RepositoryBase<long, SmsResult> , ISmsResultR
         _context = context;
     }
 
+    #region ForApi
+
+
+
+    public async Task<List<SmsReportDto>> GetSmsReportList(SmsReportSearchModel searchModel)
+    {
+
+        // مرحله 1: همه رکوردها را با projection ساده بگیرید
+        var rawQuery = await _context.SmsResults
+            .Select(x => new
+            {
+                x.id,
+                x.ContractingPatyId,
+                x.Mobile,
+                x.Status,
+                x.TypeOfSms,
+                x.CreationDate,
+                DateOnly = x.CreationDate.Date // فقط تاریخ بدون ساعت
+            })
+            .AsNoTracking()
+            .ToListAsync(); // اینجا SQL اجرا می‌شود و همه داده‌ها به client می‌آیند
+
+        if (searchModel.ContractingPatyId > 0)
+        {
+            rawQuery = rawQuery.Where(x => x.ContractingPatyId == searchModel.ContractingPatyId).ToList();
+        }
+
+        if (!string.IsNullOrWhiteSpace(searchModel.Mobile))
+        {
+            rawQuery = rawQuery.Where(x => x.Mobile.Contains(searchModel.Mobile)).ToList();
+        }
+       
+        if (searchModel.TypeOfSms != TypeOfSmsSetting.All && searchModel.TypeOfSms != TypeOfSmsSetting.Warning)
+        {
+            var typeOfSms = "All";
+            switch (searchModel.TypeOfSms)
+            {
+                case TypeOfSmsSetting.InstitutionContractDebtReminder:
+                    typeOfSms = "یادآور بدهی ماهانه";
+                    break;
+                case TypeOfSmsSetting.MonthlyInstitutionContract:
+                    typeOfSms = "صورت حساب ماهانه";
+                    break;
+                case TypeOfSmsSetting.BlockContractingParty:
+                    typeOfSms = "اعلام مسدودی طرف حساب";
+                    break;
+                case TypeOfSmsSetting.LegalAction:
+                    typeOfSms = "اقدام قضایی";
+                    break;
+                case TypeOfSmsSetting.InstitutionContractConfirm:
+                    typeOfSms = "یادآور تایید قرارداد مالی";
+                    break;
+                case TypeOfSmsSetting.SendInstitutionContractConfirmationCode:
+                    typeOfSms = "کد تاییدیه قرارداد مالی";
+                    break;
+                case TypeOfSmsSetting.TaskReminder:
+                    typeOfSms = "یادآور وظایف";
+                    break;
+            }
+
+            rawQuery = rawQuery.Where(x => x.TypeOfSms == typeOfSms).ToList();
+        }
+
+        if (searchModel.TypeOfSms == TypeOfSmsSetting.Warning)
+        {
+            rawQuery = rawQuery.Where(x => x.TypeOfSms.Contains("هشدار")).ToList();
+        }
+
+        if (searchModel.SendStatus != SendStatus.All)
+        {
+            var status = "All";
+
+            switch (searchModel.SendStatus)
+            {
+                case SendStatus.Success: status = "موفق";
+                    break;
+                case SendStatus.Failed: status = "ناموفق";
+                    break;
+
+            
+            }
+
+            rawQuery = rawQuery.Where(x => x.Status == status).ToList();
+
+        }
+        #region searchByDate
+
+        if (!string.IsNullOrWhiteSpace(searchModel.StartDateFa) &&
+            !string.IsNullOrWhiteSpace(searchModel.EndDateFa))
+        {
+            if (searchModel.StartDateFa.TryToGeorgianDateTime(out var startGr) == false ||
+                searchModel.EndDateFa.TryToGeorgianDateTime(out var endGr) == false)
+                return new List<SmsReportDto>();
+
+            rawQuery = rawQuery.Where(x => x.CreationDate.Date >= startGr.Date && x.CreationDate.Date <= endGr.Date).ToList();
+
+        }
+        else
+        {
+            if (!string.IsNullOrWhiteSpace(searchModel.Year) && !string.IsNullOrWhiteSpace(searchModel.Month))
+            {
+                var start = searchModel.Year + "/" + searchModel.Month + "/01";
+                var end = start.FindeEndOfMonth();
+                var startGr = start.ToGeorgianDateTime();
+                var endGr = end.ToGeorgianDateTime();
+                rawQuery = rawQuery.Where(x => x.CreationDate.Date >= startGr.Date && x.CreationDate.Date <= endGr.Date).ToList();
+
+
+            }
+            else if (!string.IsNullOrWhiteSpace(searchModel.Year) && string.IsNullOrWhiteSpace(searchModel.Month))
+            {
+                var start = searchModel.Year + "/01/01";
+                var findEndOfYear = searchModel.Year + "/12/01";
+                var end = findEndOfYear.FindeEndOfMonth();
+                var startGr = start.ToGeorgianDateTime();
+                var endGr = end.ToGeorgianDateTime();
+                rawQuery = rawQuery.Where(x => x.CreationDate.Date >= startGr.Date && x.CreationDate.Date <= endGr.Date).ToList();
+
+            }
+        }
+
+        #endregion
+
+        // مرحله 2: گروه‌بندی و انتخاب آخرین رکورد هر روز روی Client
+        var grouped = rawQuery
+            .GroupBy(x => x.DateOnly)
+            .Select(g => g.OrderByDescending(x => x.CreationDate).First())
+            .OrderByDescending(x => x.CreationDate)
+            .ToList();
+
+        // مرحله 3: تبدیل به DTO و ToFarsi
+        var result = grouped.Select(x => new SmsReportDto
+        {
+            SentDate = x.CreationDate.ToFarsi()
+        }).ToList();
+        return result;
+    }
+
+
+    public async Task<List<SmsReportListDto>> GetSmsReportExpandList(SmsReportSearchModel searchModel, string date)
+    {
+        if(string.IsNullOrWhiteSpace(date))
+            return new List<SmsReportListDto>();
+
+        if (date.TryToGeorgianDateTime(out var searchDate) == false)
+            return new List<SmsReportListDto>();
+
+        var query = await _context.SmsResults.Where(x => x.CreationDate.Date == searchDate.Date)
+            .Select(x =>
+                new
+                {
+                    x.id,
+                    x.MessageId,
+                    x.Status,
+                    x.TypeOfSms,
+                    x.ContractingPartyName,
+                    x.Mobile,
+                    x.ContractingPatyId,
+                    x.InstitutionContractId,
+                    x.CreationDate,
+                    x.CreationDate.Hour,
+                    x.CreationDate.Minute
+
+                }).AsNoTracking()
+            .ToListAsync(); ;
+
+        if (searchModel.ContractingPatyId > 0)
+        {
+            query = query.Where(x => x.ContractingPatyId == searchModel.ContractingPatyId).ToList();
+        }
+
+        if (!string.IsNullOrWhiteSpace(searchModel.Mobile))
+        {
+            query = query.Where(x => x.Mobile.Contains(searchModel.Mobile)).ToList();
+        }
+
+        if (searchModel.TypeOfSms != TypeOfSmsSetting.All && searchModel.TypeOfSms != TypeOfSmsSetting.Warning)
+        {
+            var typeOfSms = "All";
+            switch (searchModel.TypeOfSms)
+            {
+                case TypeOfSmsSetting.InstitutionContractDebtReminder:
+                    typeOfSms = "یادآور بدهی ماهانه";
+                    break;
+                case TypeOfSmsSetting.MonthlyInstitutionContract:
+                    typeOfSms = "صورت حساب ماهانه";
+                    break;
+                case TypeOfSmsSetting.BlockContractingParty:
+                    typeOfSms = "اعلام مسدودی طرف حساب";
+                    break;
+                case TypeOfSmsSetting.LegalAction:
+                    typeOfSms = "اقدام قضایی";
+                    break;
+                case TypeOfSmsSetting.InstitutionContractConfirm:
+                    typeOfSms = "یادآور تایید قرارداد مالی";
+                    break;
+                case TypeOfSmsSetting.SendInstitutionContractConfirmationCode:
+                    typeOfSms = "کد تاییدیه قرارداد مالی";
+                    break;
+                case TypeOfSmsSetting.TaskReminder:
+                    typeOfSms = "یادآور وظایف";
+                    break;
+            }
+
+            query = query.Where(x => x.TypeOfSms == typeOfSms).ToList();
+        }
+
+        if (searchModel.TypeOfSms == TypeOfSmsSetting.Warning)
+        {
+            query = query.Where(x => x.TypeOfSms.Contains("هشدار")).ToList();
+        }
+
+        if (searchModel.SendStatus != SendStatus.All)
+        {
+            var status = "All";
+
+            switch (searchModel.SendStatus)
+            {
+                case SendStatus.Success:
+                    status = "موفق";
+                    break;
+                case SendStatus.Failed:
+                    status = "ناموفق";
+                    break;
+
+
+            }
+
+            query = query.Where(x => x.Status == status).ToList();
+
+        }
+
+        if (query.Count == 0)
+            return new List<SmsReportListDto>();
+
+        var result =  query.OrderByDescending(x => x.CreationDate.Hour)
+            .ThenByDescending(x => x.CreationDate.Minute).Select(x =>
+                new SmsReportListDto()
+                {
+                    Id = x.id,
+                    MessageId = x.MessageId,
+                    Status = x.Status,
+                    TypeOfSms = x.TypeOfSms,
+                    ContractingPartyName = x.ContractingPartyName,
+                    Mobile = x.Mobile,
+                    HourAndMinute = x.CreationDate.TimeOfDay.ToString(@"hh\:mm"),
+                }).ToList();
+
+        return result;
+
+    }
+
+    #endregion
+
     public List<App.Contracts.SmsResult.SmsResultViewModel> Search(SmsResultSearchModel searchModel)
     {
-       
+
         var query = _context.SmsResults.Select(x => new App.Contracts.SmsResult.SmsResultViewModel()
         {
             Id = x.id,
@@ -64,7 +325,7 @@ public class SmsResultRepository : RepositoryBase<long, SmsResult> , ISmsResultR
                 var endGr = end.ToGeorgianDateTime();
                 query = query.Where(x => x.CreationDate.Date >= startGr.Date && x.CreationDate.Date <= endGr.Date);
 
-                  
+
             }
             else if (!string.IsNullOrWhiteSpace(searchModel.Year) && string.IsNullOrWhiteSpace(searchModel.Month))
             {
@@ -74,7 +335,7 @@ public class SmsResultRepository : RepositoryBase<long, SmsResult> , ISmsResultR
                 var startGr = start.ToGeorgianDateTime();
                 var endGr = end.ToGeorgianDateTime();
                 query = query.Where(x => x.CreationDate.Date >= startGr.Date && x.CreationDate.Date <= endGr.Date);
-               
+
             }
         }
 
@@ -82,12 +343,12 @@ public class SmsResultRepository : RepositoryBase<long, SmsResult> , ISmsResultR
 
 
         query = query.OrderByDescending(x => x.CreationDate)
-            .ThenByDescending(x=>x.CreationDate.Hour).ThenByDescending(x=>x.CreationDate.Minute);
-          
+            .ThenByDescending(x => x.CreationDate.Hour).ThenByDescending(x => x.CreationDate.Minute);
+
         return query.Skip(searchModel.PageIndex).Take(30).ToList();
-            
-              
+
+
     }
 
-       
+
 }

CompanyManagment.EFCore/Repository/WorkshopRepository.cs

@@ -160,7 +160,9 @@ public class WorkshopRepository : RepositoryBase<long, Company.Domain.WorkshopAg
     public EditWorkshop GetDetails(long id)
     {
         var emp = _context.WorkshopEmployers.Where(x => x.WorkshopId == id)
-            .Select(x => x.EmployerId).ToList();
+            .Select(x => x.Employer).ToList();
+        var contractingPart = emp.Select(x => x.ContractingPartyId).ToList();
+        bool rewardCompute = contractingPart.Any(x=>x == 30804);
         return _context.Workshops.Select(x => new EditWorkshop
         {
             Id = x.id,
@@ -193,7 +195,7 @@ public class WorkshopRepository : RepositoryBase<long, Company.Domain.WorkshopAg
             BonusesOptions = string.IsNullOrWhiteSpace(x.BonusesOptions) ? "EndOfContract1402leftWork1403" : x.BonusesOptions,
             YearsOptions = x.YearsOptions,
             IsOldContract = x.IsOldContract,
-            EmployerIdList = emp,
+            EmployerIdList = emp.Select(e=>e.id).ToList(),
             HasRollCallFreeVip = x.HasRollCallFreeVip,
             WorkshopHolidayWorking = x.WorkshopHolidayWorking,
             InsuranceCheckoutOvertime = x.InsuranceCheckoutOvertime,
@@ -205,6 +207,7 @@ public class WorkshopRepository : RepositoryBase<long, Company.Domain.WorkshopAg
             SignCheckout = x.SignCheckout,
             RotatingShiftCompute = x.RotatingShiftCompute,
             IsStaticCheckout = x.IsStaticCheckout,
+            RewardComputeOnCheckout = rewardCompute
 
         }).FirstOrDefault(x => x.Id == id);
     }

CompanyManagment.EFCore/Services/SmsService.cs

@@ -207,16 +207,11 @@ public class SmsService : ISmsService
     }
     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();
-        }
+
+
+        if(startDate.TryToGeorgianDateTime(out var st) == false || endDate.TryToGeorgianDateTime(out var ed) == false)
+            return new List<ApiResultViewModel>();
+
         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;
@@ -248,6 +243,44 @@ public class SmsService : ISmsService
         return res;
     }
 
+    public async Task<List<ApiReportDto>> GetApiReport(string startDate, string endDate)
+    {
+
+
+        if (startDate.TryToGeorgianDateTime(out var st) == false || endDate.TryToGeorgianDateTime(out var ed) == false)
+            return new List<ApiReportDto>();
+
+        var res = new List<ApiReportDto>();
+        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 ApiReportDto()
+            {
+                MessageId = message.MessageId,
+    
+                Mobile = message.Mobile,
+
+                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 = "";

DELIVERY_CHECKLIST.md

@@ -1,297 +0,0 @@
-# 📋 Delivery Checklist - سیستم گزارش خرابی
-
-## ✅ تمام فایل‌ها ایجاد شده‌اند
-
-### Domain Models (3/3)
-- [x] BugReport.cs - اصلی
-- [x] BugReportLog.cs - لاگ‌ها
-- [x] BugReportScreenshot.cs - عکس‌ها
-
-### Application Contracts (6/6)
-- [x] IBugReportApplication.cs - اینترفیس
-- [x] IBugReportRepository.cs - Repository interface
-- [x] CreateBugReportCommand.cs - Create DTO
-- [x] EditBugReportCommand.cs - Edit DTO
-- [x] BugReportViewModel.cs - List view model
-- [x] BugReportDetailViewModel.cs - Detail view model
-
-### Application Service (1/1)
-- [x] BugReportApplication.cs - Service implementation
-
-### Infrastructure (4/4)
-- [x] BugReportMapping.cs - EFCore mapping
-- [x] BugReportLogMapping.cs - Log mapping
-- [x] BugReportScreenshotMapping.cs - Screenshot mapping
-- [x] BugReportRepository.cs - Repository implementation
-
-### API (1/1)
-- [x] BugReportController.cs - 5 endpoints
-
-### Admin Pages (9/9)
-- [x] BugReportPageModel.cs - Base page model
-- [x] Index.cshtml.cs + Index.cshtml - List
-- [x] Details.cshtml.cs + Details.cshtml - Details
-- [x] Edit.cshtml.cs + Edit.cshtml - Edit
-- [x] Delete.cshtml.cs + Delete.cshtml - Delete
-
-### Configuration (1/1)
-- [x] AccountManagementBootstrapper.cs - DI updated
-
-### Infrastructure Context (1/1)
-- [x] AccountContext.cs - DbSets updated
-
-### Documentation (4/4)
-- [x] BUG_REPORT_SYSTEM.md - کامل
-- [x] FLUTTER_BUG_REPORT_EXAMPLE.dart - مثال
-- [x] CHANGELOG.md - تغییرات
-- [x] QUICK_START.md - شروع سریع
-
----
-
-## 📊 خلاصه
-
-| موضوع | تعداد | وضعیت |
-|------|------|------|
-| Domain Models | 3 | ✅ کامل |
-| DTOs/Commands | 4 | ✅ کامل |
-| ViewModels | 2 | ✅ کامل |
-| Application Service | 1 | ✅ کامل |
-| Infrastructure Mapping | 3 | ✅ کامل |
-| Repository | 1 | ✅ کامل |
-| API Endpoints | 5 | ✅ کامل |
-| Admin Pages | 4 | ✅ کامل |
-| Documentation | 4 | ✅ کامل |
-| **کل** | **28** | **✅ کامل** |
-
----
-
-## 🎯 API Endpoints
-
-### ✅ 5 Endpoints
-
-```
-1. POST   /api/bugreport/submit    - ثبت
-2. GET    /api/bugreport/list      - لیست
-3. GET    /api/bugreport/{id}      - جزئیات
-4. PUT    /api/bugreport/{id}      - ویرایش
-5. DELETE /api/bugreport/{id}      - حذف
-```
-
----
-
-## 🖥️ Admin Pages
-
-### ✅ 4 Pages
-
-```
-1. Index   - لیست با فیلترها
-2. Details - جزئیات کامل
-3. Edit    - ویرایش وضعیت
-4. Delete  - حذف
-```
-
----
-
-## 🗄️ Database
-
-### ✅ 3 Tables
-
-```
-1. BugReports           - گزارش‌های اصلی
-2. BugReportLogs        - لاگ‌های گزارش
-3. BugReportScreenshots - عکس‌های گزارش
-```
-
----
-
-## 🔧 Configuration
-
-### ✅ Dependency Injection
-
-```csharp
-services.AddTransient<IBugReportApplication, BugReportApplication>();
-services.AddTransient<IBugReportRepository, BugReportRepository>();
-```
-
-### ✅ DbContext
-
-```csharp
-public DbSet<BugReport> BugReports { get; set; }
-public DbSet<BugReportLog> BugReportLogs { get; set; }
-public DbSet<BugReportScreenshot> BugReportScreenshots { get; set; }
-```
-
----
-
-## 📚 Documentation
-
-### ✅ 4 نوع Documentation
-
-1. **BUG_REPORT_SYSTEM.md**
-   - نمای کلی
-   - ساختار فایل‌ها
-   - روش استفاده
-   - Enums
-   - Security
-
-2. **FLUTTER_BUG_REPORT_EXAMPLE.dart**
-   - مثال Dart
-   - BugReportRequest class
-   - BugReportService class
-   - AppErrorHandler class
-   - Setup example
-
-3. **CHANGELOG.md**
-   - لیست تمام فایل‌های ایجاد شده
-   - فایل‌های اصلاح شده
-   - Database schema
-   - Endpoints
-   - Security features
-
-4. **QUICK_START.md**
-   - 9 مراحل
-   - Setup اولیه
-   - تست API
-   - Admin panel
-   - Flutter integration
-   - مشکل‌شناسی
-   - مثال عملی
-
----
-
-## ✨ Features
-
-### ✅ جمع‌آوری اطلاعات
-- معلومات دستگاه (مدل، OS، حافظه، باتری، شبکه)
-- معلومات برنامه (نسخه، بیلد، پکیج)
-- لاگ‌های برنامه
-- عکس‌های صفحه (Base64)
-- Stack Trace
-
-### ✅ مدیریت
-- ثبت خودکار
-- فیلترینگ (نوع، اولویت، وضعیت)
-- جستجو
-- Pagination
-
-### ✅ Admin Panel
-- لیست کامل
-- جزئیات پر اطلاعات
-- تغییر وضعیت و اولویت
-- حذف محفوظ
-- نمایش عکس‌ها
-- نمایش لاگ‌ها
-
----
-
-## 🔐 Security
-
-- ✅ Authorization (AdminAreaPermission required)
-- ✅ Authentication
-- ✅ Input Validation
-- ✅ XSS Protection
-- ✅ CSRF Protection
-- ✅ Safe Delete
-
----
-
-## 🚀 Ready to Deploy
-
-### Pre-Deployment Checklist
-
-- [x] تمام کد نوشته شده و تست شده
-- [x] Documentation کامل شده
-- [x] Error handling اضافه شده
-- [x] Security measures اضافه شده
-- [x] Examples و tutorials آماده شده
-
-### Deployment Steps
-
-1. ✅ Add-Migration AddBugReportSystem
-2. ✅ Update-Database
-3. ✅ Build project
-4. ✅ Deploy to server
-5. ✅ Test all endpoints
-6. ✅ Test admin pages
-7. ✅ Integrate with Flutter
-
----
-
-## 📞 Support Documentation
-
-### سوالات متداول پاسخ شده:
-- ✅ چگونه ثبت کنیم؟
-- ✅ چگونه لیست ببینیم؟
-- ✅ چگونه مشاهده کنیم؟
-- ✅ چگونه ویرایش کنیم؟
-- ✅ چگونه حذف کنیم؟
-- ✅ چگونه Flutter integrate کنیم؟
-- ✅ مشکل‌شناسی چگونه؟
-
----
-
-## 📦 Deliverables
-
-### Code Files (25)
-- 3 Domain Models
-- 6 Contracts
-- 1 Application Service
-- 4 Infrastructure
-- 1 API Controller
-- 9 Admin Pages
-- 1 Updated Bootstrapper
-- 1 Updated Context
-
-### Documentation (4)
-- BUG_REPORT_SYSTEM.md
-- FLUTTER_BUG_REPORT_EXAMPLE.dart
-- CHANGELOG.md
-- QUICK_START.md
-
----
-
-## 🎉 نتیجه نهایی
-
-✅ **سیستم گزارش خرابی (Bug Report System) کامل شده است**
-
-**وضعیت:** آماده برای استفاده  
-**Testing:** Ready  
-**Documentation:** Complete  
-**Security:** Implemented  
-**Flutter Integration:** Example provided  
-
----
-
-## ✅ تأیید
-
-- [x] کد quality: ✅ بالا
-- [x] Documentation: ✅ کامل
-- [x] Security: ✅ محفوظ
-- [x] Performance: ✅ بهینه
-- [x] User Experience: ✅ خوب
-
----
-
-## 🎯 Next Step
-
-**اجرای Database Migration:**
-
-```powershell
-Add-Migration AddBugReportSystem
-Update-Database
-```
-
-**سپس:**
-- ✅ API را تست کنید
-- ✅ Admin Panel را بررسی کنید
-- ✅ Flutter integration را انجام دهید
-- ✅ در production deploy کنید
-
----
-
-**تاریخ:** 7 دسامبر 2024  
-**نسخه:** 1.0  
-**وضعیت:** ✅ تکمیل شده
-
-🚀 **آماده برای استفاده!**
-

DOCKER_BIND_MOUNTS_SETUP.md

@@ -0,0 +1,255 @@
+# Docker Bind Mounts Setup for Windows Server
+
+## Overview
+This application uses **bind mounts** (not Docker volumes) to store business-critical files directly on the Windows host filesystem.
+
+## Directory Structure
+
+### Container Paths (inside Docker)
+- `/app/Faces` - User face recognition data
+- `/app/Storage` - Uploaded files and documents
+- `/app/Logs` - Application logs
+
+### Windows Host Paths
+- `D:\AppData\Faces`
+- `D:\AppData\Storage`
+- `D:\AppData\Logs`
+
+## Initial Setup
+
+### 1. Create Host Directories
+Before starting the container, create the required directories on the Windows host:
+
+```powershell
+# Create directories if they don't exist
+New-Item -ItemType Directory -Force -Path "D:\AppData\Faces"
+New-Item -ItemType Directory -Force -Path "D:\AppData\Storage"
+New-Item -ItemType Directory -Force -Path "D:\AppData\Logs"
+```
+
+### 2. Set Permissions (Windows Server)
+Grant full access to the directories for the Docker container:
+
+```powershell
+# Grant full control to Everyone (or specific user account)
+icacls "D:\AppData\Faces" /grant Everyone:F /T
+icacls "D:\AppData\Storage" /grant Everyone:F /T
+icacls "D:\AppData\Logs" /grant Everyone:F /T
+```
+
+**Note:** For production, replace `Everyone` with a specific service account:
+```powershell
+# Example with specific user
+icacls "D:\AppData\Faces" /grant "DOMAIN\ServiceAccount:(OI)(CI)F" /T
+icacls "D:\AppData\Storage" /grant "DOMAIN\ServiceAccount:(OI)(CI)F" /T
+icacls "D:\AppData\Logs" /grant "DOMAIN\ServiceAccount:(OI)(CI)F" /T
+```
+
+## Docker Compose Configuration
+
+The `docker-compose.yml` is already configured with bind mounts:
+
+```yaml
+volumes:
+  - ./ServiceHost/certs:/app/certs:ro
+  - D:/AppData/Faces:/app/Faces
+  - D:/AppData/Storage:/app/Storage
+  - D:/AppData/Logs:/app/Logs
+```
+
+### Start the Application
+```powershell
+docker-compose up -d
+```
+
+## Alternative: Docker Run Command
+
+If you prefer using `docker run` instead of docker-compose:
+
+```powershell
+docker run -d `
+  --name gozareshgir-servicehost `
+  -p 5003:80 `
+  -p 5004:443 `
+  -v "D:/AppData/Faces:/app/Faces" `
+  -v "D:/AppData/Storage:/app/Storage" `
+  -v "D:/AppData/Logs:/app/Logs" `
+  -v "${PWD}/ServiceHost/certs:/app/certs:ro" `
+  --env-file ./ServiceHost/.env `
+  --add-host=host.docker.internal:host-gateway `
+  --restart unless-stopped `
+  gozareshgir-servicehost:latest
+```
+
+## Verification
+
+### 1. Check if directories are mounted correctly
+```powershell
+docker exec gozareshgir-servicehost ls -la /app
+```
+
+You should see:
+```
+drwxr-xr-x  Faces
+drwxr-xr-x  Storage
+drwxr-xr-x  Logs
+```
+
+### 2. Test write access
+```powershell
+# Create a test file from within the container
+docker exec gozareshgir-servicehost sh -c "echo 'test' > /app/Storage/test.txt"
+
+# Verify it appears on the host
+Get-Content "D:\AppData\Storage\test.txt"
+
+# Clean up
+Remove-Item "D:\AppData\Storage\test.txt"
+```
+
+### 3. Verify from the host side
+```powershell
+# Create a file on the host
+"test from host" | Out-File -FilePath "D:\AppData\Storage\host-test.txt"
+
+# Check if visible in container
+docker exec gozareshgir-servicehost cat /app/Storage/host-test.txt
+
+# Clean up
+Remove-Item "D:\AppData\Storage\host-test.txt"
+```
+
+## Application Code Compatibility
+
+The application uses:
+```csharp
+Path.Combine(env.ContentRootPath, "Faces");
+Path.Combine(env.ContentRootPath, "Storage");
+```
+
+Where `env.ContentRootPath` = `/app` in the container.
+
+**No code changes required** - the bind mounts map exactly to these paths.
+
+## Data Persistence & Safety
+
+✅ **Benefits of Bind Mounts:**
+- Files persist on host even if container is removed
+- Direct backup from Windows Server (e.g., Windows Backup, robocopy)
+- Can be accessed by other applications/services on the host
+- No Docker volume management needed
+- Easy to migrate to a different server
+
+✅ **Safety:**
+- Data survives `docker-compose down`
+- Data survives `docker rm`
+- Data survives container rebuilds
+- Can be included in host backup solutions
+
+⚠️ **Important:**
+- Do NOT delete the host directories (`D:\AppData\*`)
+- Ensure adequate disk space on D: drive
+- Regular backups of `D:\AppData\` recommended
+
+## Backup Strategy
+
+### Manual Backup
+```powershell
+# Create a timestamped backup
+$timestamp = Get-Date -Format "yyyyMMdd_HHmmss"
+robocopy "D:\AppData" "D:\Backups\AppData_$timestamp" /MIR /Z /LOG:"D:\Backups\backup_$timestamp.log"
+```
+
+### Scheduled Backup (Task Scheduler)
+```powershell
+# Create a scheduled task for daily backups
+$action = New-ScheduledTaskAction -Execute "robocopy" -Argument '"D:\AppData" "D:\Backups\AppData" /MIR /Z'
+$trigger = New-ScheduledTaskTrigger -Daily -At 2am
+Register-ScheduledTask -Action $action -Trigger $trigger -TaskName "GozareshgirBackup" -Description "Daily backup of application data"
+```
+
+## Troubleshooting
+
+### Issue: Permission Denied
+```powershell
+# Fix permissions
+icacls "D:\AppData\Faces" /grant Everyone:F /T
+icacls "D:\AppData\Storage" /grant Everyone:F /T
+icacls "D:\AppData\Logs" /grant Everyone:F /T
+```
+
+### Issue: Directory Not Found
+```powershell
+# Ensure directories exist
+Test-Path "D:\AppData\Faces"
+Test-Path "D:\AppData\Storage"
+Test-Path "D:\AppData\Logs"
+
+# Create if missing
+New-Item -ItemType Directory -Force -Path "D:\AppData\Faces"
+New-Item -ItemType Directory -Force -Path "D:\AppData\Storage"
+New-Item -ItemType Directory -Force -Path "D:\AppData\Logs"
+```
+
+### Issue: Files Not Appearing
+1. Check container logs:
+   ```powershell
+   docker logs gozareshgir-servicehost
+   ```
+
+2. Verify mount points:
+   ```powershell
+   docker inspect gozareshgir-servicehost --format='{{json .Mounts}}' | ConvertFrom-Json
+   ```
+
+3. Test write access (see Verification section above)
+
+## Migration Notes
+
+### Moving to a Different Server
+1. Stop the container:
+   ```powershell
+   docker-compose down
+   ```
+
+2. Copy the data:
+   ```powershell
+   robocopy "D:\AppData" "\\NewServer\D$\AppData" /MIR /Z
+   ```
+
+3. On the new server, ensure directories exist and have correct permissions
+
+4. Start the container on the new server:
+   ```powershell
+   docker-compose up -d
+   ```
+
+## Performance Considerations
+
+- **Bind mounts on Windows** have good performance for most workloads
+- For high-frequency writes, consider using SSD storage for `D:\AppData`
+- Monitor disk space regularly:
+  ```powershell
+  Get-PSDrive D | Select-Object Used,Free
+  ```
+
+## Security Best Practices
+
+1. **Restrict permissions** to specific service accounts (not Everyone)
+2. **Enable NTFS encryption** for sensitive data:
+   ```powershell
+   cipher /e "D:\AppData\Faces"
+   cipher /e "D:\AppData\Storage"
+   ```
+3. **Regular backups** with retention policy
+4. **Firewall rules** to restrict access to the host
+5. **Audit logging** for file access:
+   ```powershell
+   auditpol /set /subcategory:"File System" /success:enable /failure:enable
+   ```
+
+---
+
+**Last Updated:** January 2026  
+**Tested On:** Windows Server 2019/2022 with Docker Desktop or Docker Engine
+

DadmehrGostar.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.1.32210.238
+# Visual Studio Version 18
+VisualStudioVersion = 18.2.11415.280 d18.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Company", "Company", "{FAF16FCC-F7E6-4F0B-AF35-95368A4A0736}"
 EndProject
@@ -89,6 +89,9 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BackgroundInstitutionContract.Task", "BackgroundInstitutionContract\BackgroundInstitutionContract.Task\BackgroundInstitutionContract.Task.csproj", "{F78FBB92-294B-88BA-168D-F0C578B0D7D6}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ProgramManager", "ProgramManager", "{67AFF7B6-4C4F-464C-A90D-9BDB644D83A9}"
+	ProjectSection(SolutionItems) = preProject
+		ProgramManager\appsettings.FileStorage.json = ProgramManager\appsettings.FileStorage.json
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{48F6F6A5-7340-42F8-9216-BEB7A4B7D5A1}"
 EndProject
@@ -234,6 +237,10 @@ Global
 		{08B234B6-783B-44E9-9961-4F97EAD16308}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{08B234B6-783B-44E9-9961-4F97EAD16308}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{08B234B6-783B-44E9-9961-4F97EAD16308}.Release|Any CPU.Build.0 = Release|Any CPU
+		{81DDED9D-158B-E303-5F62-77A2896D2A5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{81DDED9D-158B-E303-5F62-77A2896D2A5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{81DDED9D-158B-E303-5F62-77A2896D2A5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{81DDED9D-158B-E303-5F62-77A2896D2A5A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Dockerfile

@@ -0,0 +1,107 @@
+
+# Multi-stage build for ASP.NET Core 10
+FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
+
+WORKDIR /src
+
+# Copy solution and project files
+COPY ["DadmehrGostar.sln", "DadmehrGostar.sln"]
+COPY ["ServiceHost/ServiceHost.csproj", "ServiceHost/"]
+COPY ["0_Framework/0_Framework.csproj", "0_Framework/"]
+COPY ["_0_Framework/_0_Framework_b.csproj", "_0_Framework/"]
+COPY ["AccountManagement.Application/AccountManagement.Application.csproj", "AccountManagement.Application/"]
+COPY ["AccountManagement.Application.Contracts/AccountManagement.Application.Contracts.csproj", "AccountManagement.Application.Contracts/"]
+COPY ["AccountManagement.Configuration/AccountManagement.Configuration.csproj", "AccountManagement.Configuration/"]
+COPY ["AccountManagement.Domain/AccountManagement.Domain.csproj", "AccountManagement.Domain/"]
+COPY ["AccountMangement.Infrastructure.EFCore/AccountMangement.Infrastructure.EFCore.csproj", "AccountMangement.Infrastructure.EFCore/"]
+COPY ["BackgroundInstitutionContract/BackgroundInstitutionContract.Task/BackgroundInstitutionContract.Task.csproj", "BackgroundInstitutionContract/BackgroundInstitutionContract.Task/"]
+COPY ["Company.Domain/Company.Domain.csproj", "Company.Domain/"]
+COPY ["CompanyManagement.Infrastructure.Excel/CompanyManagement.Infrastructure.Excel.csproj", "CompanyManagement.Infrastructure.Excel/"]
+COPY ["CompanyManagement.Infrastructure.Mongo/CompanyManagement.Infrastructure.Mongo.csproj", "CompanyManagement.Infrastructure.Mongo/"]
+COPY ["CompanyManagment.App.Contracts/CompanyManagment.App.Contracts.csproj", "CompanyManagment.App.Contracts/"]
+COPY ["CompanyManagment.Application/CompanyManagment.Application.csproj", "CompanyManagment.Application/"]
+COPY ["CompanyManagment.EFCore/CompanyManagment.EFCore.csproj", "CompanyManagment.EFCore/"]
+COPY ["PersonalContractingParty.Config/PersonalContractingParty.Config.csproj", "PersonalContractingParty.Config/"]
+COPY ["ProgramManager/src/Application/GozareshgirProgramManager.Application/GozareshgirProgramManager.Application.csproj", "ProgramManager/src/Application/GozareshgirProgramManager.Application/"]
+COPY ["ProgramManager/src/Domain/GozareshgirProgramManager.Domain/GozareshgirProgramManager.Domain.csproj", "ProgramManager/src/Domain/GozareshgirProgramManager.Domain/"]
+COPY ["ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/GozareshgirProgramManager.Infrastructure.csproj", "ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/"]
+COPY ["Query/Query.csproj", "Query/"]
+COPY ["Query.Bootstrapper/Query.Bootstrapper.csproj", "Query.Bootstrapper/"]
+COPY ["Shared.Contracts/Shared.Contracts.csproj", "Shared.Contracts/"]
+COPY ["WorkFlow/Application/WorkFlow.Application/WorkFlow.Application.csproj", "WorkFlow/Application/WorkFlow.Application/"]
+COPY ["WorkFlow/Application/WorkFlow.Application.Contracts/WorkFlow.Application.Contracts.csproj", "WorkFlow/Application/WorkFlow.Application.Contracts/"]
+COPY ["WorkFlow/Domain/WorkFlow.Domain/WorkFlow.Domain.csproj", "WorkFlow/Domain/WorkFlow.Domain/"]
+COPY ["WorkFlow/Infrastructure/WorkFlow.Infrastructure.ACL/WorkFlow.Infrastructure.ACL.csproj", "WorkFlow/Infrastructure/WorkFlow.Infrastructure.ACL/"]
+COPY ["WorkFlow/Infrastructure/WorkFlow.Infrastructure.Config/WorkFlow.Infrastructure.Config.csproj", "WorkFlow/Infrastructure/WorkFlow.Infrastructure.Config/"]
+COPY ["WorkFlow/Infrastructure/WorkFlow.Infrastructure.EfCore/WorkFlow.Infrastructure.EfCore.csproj", "WorkFlow/Infrastructure/WorkFlow.Infrastructure.EfCore/"]
+COPY ["BackgroundJobs/BackgroundJobs.Task/BackgroundJobs.Task.csproj", "BackgroundJobs/BackgroundJobs.Task/"]
+COPY ["backService/backService.csproj", "backService/"]
+
+# Restore all projects
+RUN dotnet restore "ServiceHost/ServiceHost.csproj"
+
+# Copy source code
+COPY . .
+
+# Build the ServiceHost project
+WORKDIR /src/ServiceHost
+RUN dotnet build "ServiceHost.csproj" -c Release -o /app/build 
+
+# Publish stage
+FROM build AS publish
+RUN dotnet publish "ServiceHost.csproj" -c Release -o /app/publish /p:UseAppHost=false
+
+# Runtime stage
+FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS final
+
+WORKDIR /app
+
+# Install tzdata and set timezone
+ 
+# tzdata for timzone
+RUN apt-get update && apt-get install -y tzdata && \
+    cp /usr/share/zoneinfo/Asia/Tehran /etc/localtime && \
+    echo "Asia/Tehran" > /etc/timezone
+ 
+# timezone env with default
+ENV TZ='Asia/Tehran'
+
+# Install curl for health checks
+#RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/*
+
+# Copy published app
+COPY --from=publish /app/publish .
+
+
+# -------------------------------------------------------------------
+# ✅ روش اصلاح شده و امن برای هندل کردن فایل‌های دارای فاصله (Space)
+# -------------------------------------------------------------------
+RUN echo '#!/bin/bash' > /rename_script.sh && \
+    echo 'find /app/wwwroot -depth -name "*[A-Z]*" -print0 | while IFS= read -r -d "" file; do' >> /rename_script.sh && \
+    echo '  dir=$(dirname "$file")' >> /rename_script.sh && \
+    echo '  base=$(basename "$file")' >> /rename_script.sh && \
+    echo '  lower=$(echo "$base" | tr "[:upper:]" "[:lower:]")' >> /rename_script.sh && \
+    echo '  if [ "$base" != "$lower" ]; then' >> /rename_script.sh && \
+    echo '    mv -f "$file" "$dir/$lower"' >> /rename_script.sh && \
+    echo '  fi' >> /rename_script.sh && \
+    echo 'done' >> /rename_script.sh && \
+    chmod +x /rename_script.sh && \
+    /rename_script.sh && \
+    rm /rename_script.sh
+
+# Create directories for certificates, storage, faces, and logs
+# Note: Bind-mounted directories will override these, but we create them for consistency
+RUN mkdir -p /app/certs /app/Faces /app/Storage /app/Logs app/InsuranceList && \
+    chmod 777 /app/Faces /app/Storage /app/Logs app/InsuranceList && \
+    chmod 755 /app/certs
+
+# Expose ports
+EXPOSE 80 443
+
+# Health check - check both HTTP and HTTPS
+#HEALTHCHECK --interval=30s --timeout=10s --start-period=40s --retries=3 \
+#    CMD curl -f http://localhost:80/health || curl -f -k https://localhost:443/health || exit 1
+
+# Set entry point
+ENTRYPOINT ["dotnet", "ServiceHost.dll"]
+

FLUTTER_BUG_REPORT_EXAMPLE.dart

@@ -1,214 +0,0 @@
-/// مثال استفاده از Bug Report در Flutter
-
-/// ابتدا مدل‌های Dart را برای تطابق با API ایجاد کنید:
-
-class BugReportRequest {
-  final String title;
-  final String description;
-  final String userEmail;
-  final int? accountId;
-  final String deviceModel;
-  final String osVersion;
-  final String platform;
-  final String manufacturer;
-  final String deviceId;
-  final String screenResolution;
-  final int memoryInMB;
-  final int storageInMB;
-  final int batteryLevel;
-  final bool isCharging;
-  final String networkType;
-  final String appVersion;
-  final String buildNumber;
-  final String packageName;
-  final DateTime installTime;
-  final DateTime lastUpdateTime;
-  final String flavor;
-  final int type; // BugReportType enum value
-  final int priority; // BugPriority enum value
-  final String? stackTrace;
-  final List<String>? logs;
-  final List<String>? screenshots; // Base64 encoded
-
-  BugReportRequest({
-    required this.title,
-    required this.description,
-    required this.userEmail,
-    this.accountId,
-    required this.deviceModel,
-    required this.osVersion,
-    required this.platform,
-    required this.manufacturer,
-    required this.deviceId,
-    required this.screenResolution,
-    required this.memoryInMB,
-    required this.storageInMB,
-    required this.batteryLevel,
-    required this.isCharging,
-    required this.networkType,
-    required this.appVersion,
-    required this.buildNumber,
-    required this.packageName,
-    required this.installTime,
-    required this.lastUpdateTime,
-    required this.flavor,
-    required this.type,
-    required this.priority,
-    this.stackTrace,
-    this.logs,
-    this.screenshots,
-  });
-
-  Map<String, dynamic> toJson() {
-    return {
-      'title': title,
-      'description': description,
-      'userEmail': userEmail,
-      'accountId': accountId,
-      'deviceModel': deviceModel,
-      'osVersion': osVersion,
-      'platform': platform,
-      'manufacturer': manufacturer,
-      'deviceId': deviceId,
-      'screenResolution': screenResolution,
-      'memoryInMB': memoryInMB,
-      'storageInMB': storageInMB,
-      'batteryLevel': batteryLevel,
-      'isCharging': isCharging,
-      'networkType': networkType,
-      'appVersion': appVersion,
-      'buildNumber': buildNumber,
-      'packageName': packageName,
-      'installTime': installTime.toIso8601String(),
-      'lastUpdateTime': lastUpdateTime.toIso8601String(),
-      'flavor': flavor,
-      'type': type,
-      'priority': priority,
-      'stackTrace': stackTrace,
-      'logs': logs,
-      'screenshots': screenshots,
-    };
-  }
-}
-
-/// سرویس برای ارسال Bug Report:
-
-class BugReportService {
-  final Dio dio;
-
-  BugReportService(this.dio);
-
-  Future<bool> submitBugReport(BugReportRequest report) async {
-    try {
-      final response = await dio.post(
-        '/api/bugreport/submit',
-        data: report.toJson(),
-        options: Options(
-          validateStatus: (status) => status! < 500,
-          headers: {
-            'Content-Type': 'application/json',
-          },
-        ),
-      );
-
-      return response.statusCode == 200;
-    } catch (e) {
-      print('Error submitting bug report: $e');
-      return false;
-    }
-  }
-}
-
-/// استفاده در یک Error Handler:
-
-class AppErrorHandler {
-  final BugReportService bugReportService;
-  final DeviceInfoService deviceInfoService;
-
-  AppErrorHandler(this.bugReportService, this.deviceInfoService);
-
-  Future<void> handleError(
-    FlutterErrorDetails details, {
-    String? userEmail,
-    int? accountId,
-    String? bugTitle,
-    int bugType = 1, // Crash
-    int bugPriority = 1, // Critical
-  }) async {
-    try {
-      final deviceInfo = await deviceInfoService.getDeviceInfo();
-      final report = BugReportRequest(
-        title: bugTitle ?? 'برنامه کرش کرد',
-        description: details.exceptionAsString(),
-        userEmail: userEmail ?? 'unknown@example.com',
-        accountId: accountId,
-        deviceModel: deviceInfo['model'],
-        osVersion: deviceInfo['osVersion'],
-        platform: deviceInfo['platform'],
-        manufacturer: deviceInfo['manufacturer'],
-        deviceId: deviceInfo['deviceId'],
-        screenResolution: deviceInfo['screenResolution'],
-        memoryInMB: deviceInfo['memoryInMB'],
-        storageInMB: deviceInfo['storageInMB'],
-        batteryLevel: deviceInfo['batteryLevel'],
-        isCharging: deviceInfo['isCharging'],
-        networkType: deviceInfo['networkType'],
-        appVersion: deviceInfo['appVersion'],
-        buildNumber: deviceInfo['buildNumber'],
-        packageName: deviceInfo['packageName'],
-        installTime: deviceInfo['installTime'],
-        lastUpdateTime: deviceInfo['lastUpdateTime'],
-        flavor: deviceInfo['flavor'],
-        type: bugType,
-        priority: bugPriority,
-        stackTrace: details.stack.toString(),
-        logs: await _collectLogs(),
-        screenshots: await _captureScreenshots(),
-      );
-
-      await bugReportService.submitBugReport(report);
-    } catch (e) {
-      print('Error handling bug report: $e');
-    }
-  }
-
-  Future<List<String>> _collectLogs() async {
-    // جمع‌آوری لاگ‌های برنامه
-    return [];
-  }
-
-  Future<List<String>> _captureScreenshots() async {
-    // گرفتن عکس‌های صفحه به صورت Base64
-    return [];
-  }
-}
-
-/// مثال استفاده:
-
-void setupErrorHandling() {
-  final bugReportService = BugReportService(dio);
-  final errorHandler = AppErrorHandler(bugReportService, deviceInfoService);
-
-  FlutterError.onError = (FlutterErrorDetails details) {
-    errorHandler.handleError(
-      details,
-      userEmail: getCurrentUserEmail(),
-      accountId: getCurrentAccountId(),
-      bugTitle: 'خطای نامشخص',
-      bugType: 1, // Crash
-      bugPriority: 1, // Critical
-    );
-  };
-
-  PlatformDispatcher.instance.onError = (error, stack) {
-    errorHandler.handleError(
-      FlutterErrorDetails(
-        exception: error,
-        stack: stack,
-        context: ErrorDescription('Platform error'),
-      ),
-    );
-    return true;
-  };
-}
-

PersonalContractingParty.Config/PersonalBootstrapper.cs

@@ -61,6 +61,7 @@ using Company.Domain.HolidayItemAgg;
 using Company.Domain.InstitutionContractAgg;
 using Company.Domain.InstitutionContractContactInfoAgg;
 using Company.Domain.InstitutionContractExtensionTempAgg;
+using Company.Domain.InstitutionContractSendFlagAgg;
 using Company.Domain.InstitutionPlanAgg;
 using Company.Domain.InsuranceAgg;
 using Company.Domain.InsuranceEmployeeInfoAgg;
@@ -123,6 +124,7 @@ using Company.Domain.ZoneAgg;
 using CompanyManagement.Infrastructure.Excel.SalaryAid;
 using CompanyManagement.Infrastructure.Mongo.EmployeeFaceEmbeddingRepo;
 using CompanyManagement.Infrastructure.Mongo.InstitutionContractInsertTempRepo;
+using CompanyManagement.Infrastructure.Mongo.InstitutionContractSendFlagRepo;
 using CompanyManagment.App.Contracts.AdminMonthlyOverview;
 using CompanyManagment.App.Contracts.AndroidApkVersion;
 using CompanyManagment.App.Contracts.AuthorizedPerson;
@@ -561,6 +563,7 @@ public class PersonalBootstrapper
         services.AddTransient<ISmsSettingsRepository, SmsSettingsRepository>();
         services.AddTransient<ISmsSettingApplication, SmsSettingApplication>();
 
+        services.AddTransient<IInstitutionContractSmsServiceRepository, InstitutionContractSmsServiceRepository>();
         #endregion
 
 
@@ -658,6 +661,9 @@ public class PersonalBootstrapper
         services.AddTransient<ICameraBugReportApplication, CameraBugReportApplication>();
         services.AddTransient<ICameraBugReportRepository, CameraBugReportRepository>(); // MongoDB Implementation
 
+        // InstitutionContractSendFlag - MongoDB
+        services.AddTransient<IInstitutionContractSendFlagRepository, InstitutionContractSendFlagRepository>();
+
         services.AddDbContext<CompanyContext>(x => x.UseSqlServer(connectionString));
     }
 }

ProgramManager/src/Application/GozareshgirProgramManager.Application/GozareshgirProgramManager.Application.csproj

@@ -9,6 +9,7 @@
     <ItemGroup>
         <PackageReference Include="FluentValidation" Version="12.1.1" />
         <PackageReference Include="MediatR" Version="14.0.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.3.0" />
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.1" />
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.1" />
     </ItemGroup>
@@ -18,4 +19,10 @@
       <ProjectReference Include="..\..\Domain\GozareshgirProgramManager.Domain\GozareshgirProgramManager.Domain.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Reference Include="Microsoft.AspNetCore.Http.Features">
+        <HintPath>C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App\10.0.1\Microsoft.AspNetCore.Http.Features.dll</HintPath>
+      </Reference>
+    </ItemGroup>
+
 </Project>

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Checkouts/Commands/CreateCheckout/CreateOrEditCheckoutCommandHandler.cs

@@ -209,22 +209,38 @@ public class CreateOrEditCheckoutCommandHandler : IBaseCommandHandler<CreateOrEd
             }
 
         }
-        //حقوق نهایی
-        var monthlySalaryPay = (totalHoursWorked * monthlySalaryDefined) / mandatoryHours;
-        // اگر اضافه کار داشت حقوق تعین شده به عنوان حقوق نهایی در نظر گرفته میشود
-        monthlySalaryPay = monthlySalaryPay > monthlySalaryDefined ? monthlySalaryDefined : monthlySalaryPay;
+        ////حقوق نهایی
+        //var monthlySalaryPay = (totalHoursWorked * monthlySalaryDefined) / mandatoryHours;
+        //// اگر اضافه کار داشت حقوق تعین شده به عنوان حقوق نهایی در نظر گرفته میشود
+        //monthlySalaryPay = monthlySalaryPay > monthlySalaryDefined ? monthlySalaryDefined : monthlySalaryPay;
 
-        //حقوق کسر شده
-        var deductionFromSalary = monthlySalaryDefined - monthlySalaryPay;
+        ////حقوق کسر شده
+        //var deductionFromSalary = monthlySalaryDefined - monthlySalaryPay;
+
+        //new chang salary compute
+        var monthlySalaryPay = totalHoursWorked * monthlySalaryDefined;
 
         //زمان باقی مانده
         var remainingTime = totalHoursWorked - mandatoryHours;
 
+
+        //تناسب به دقیقه
+        #region MyRegion
+
+        //var monthlySalaryDefinedTest = monthlySalaryDefined * mandatoryHours;
+        //var monthlySalaryPayTest = totalHoursWorked * monthlySalaryDefined;
+        ////// اگر اضافه کار داشت حقوق تعین شده به عنوان حقوق نهایی در نظر گرفته میشود
+        //monthlySalaryPayTest = monthlySalaryPayTest > monthlySalaryDefinedTest ? monthlySalaryDefinedTest : monthlySalaryPayTest;
+        //////حقوق کسر شده
+        //var deductionFromSalaryTest = monthlySalaryDefinedTest - monthlySalaryPayTest;
+
+        #endregion
+
         var computeResult = new ComputeResultDto
         {
             MandatoryHours = mandatoryHours,
             MonthlySalaryPay = monthlySalaryPay,
-            DeductionFromSalary = deductionFromSalary,
+            DeductionFromSalary = 0 /*deductionFromSalary*/,
             RemainingHours = remainingTime
         };
         Console.WriteLine(mandatoryHours);

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Checkouts/Queries/GetUserToGropCreate/GetUserToGroupCreatingQueryHandler.cs

@@ -1,10 +1,11 @@
-using GozareshgirProgramManager.Application._Common.Interfaces;
+using DNTPersianUtils.Core;
+using GozareshgirProgramManager.Application._Common.Interfaces;
 using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Application.Modules.SalaryPaymentSettings.Queries.GetUserListWhoHaveSettings;
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain.CheckoutAgg.Enums;
 using Microsoft.EntityFrameworkCore;
-using PersianTools.Core;
+using PersianDateTime = PersianTools.Core.PersianDateTime;
 
 namespace GozareshgirProgramManager.Application.Modules.Checkouts.Queries.GetUserToGropCreate;
 
@@ -45,8 +46,8 @@ public class GetUserToGroupCreatingQueryHandler : IBaseQueryHandler<GetUserToGro
                 "ایجاد فیش فقط برای ماه های گذشته امکان پذیر است");
 
 
-        var lastMonthStart = lastMonth; 
-        var lastMonthEnd = lastMonth;  
+        //var lastMonthStart = lastMonth; 
+        var lastMonthEnd = ((selectedDate.ToFarsi().FindeEndOfMonth())).ToGeorgianDateTime();  
 
         var query =
             await (from u in _context.Users
@@ -60,8 +61,8 @@ public class GetUserToGroupCreatingQueryHandler : IBaseQueryHandler<GetUserToGro
                     // LEFT JOIN 
                     //فیش
                     join ch in _context.Checkouts
-                            .Where(x => x.CheckoutStartDate < lastMonthStart
-                                        && x.CheckoutEndDate >= lastMonthStart)
+                            .Where(x => x.CheckoutStartDate < lastMonthEnd
+                                        && x.CheckoutEndDate > selectedDate)
                         on u.Id equals ch.UserId into chJoin
                     from ch in chJoin.DefaultIfEmpty()
 

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/AddTaskToPhase/AddTaskToPhaseCommand.cs

@@ -1,16 +0,0 @@
-using GozareshgirProgramManager.Application._Common.Interfaces;
-using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
-
-namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.AddTaskToPhase;
-
-/// <summary>
-/// Command to add a task to an existing phase
-/// </summary>
-public record AddTaskToPhaseCommand(
-    Guid PhaseId,
-    string Name,
-    string? Description = null,
-    TaskPriority Priority = TaskPriority.Medium,
-    int OrderIndex = 0,
-    DateTime? DueDate = null
-) : IBaseCommand;

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/AddTaskToPhase/AddTaskToPhaseCommandHandler.cs

@@ -1,53 +0,0 @@
-using GozareshgirProgramManager.Application._Common.Interfaces;
-using GozareshgirProgramManager.Application._Common.Models;
-using GozareshgirProgramManager.Domain._Common;
-using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
-using MediatR;
-
-namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.AddTaskToPhase;
-
-public class AddTaskToPhaseCommandHandler : IRequestHandler<AddTaskToPhaseCommand, OperationResult>
-{
-    private readonly IProjectPhaseRepository _phaseRepository;
-    private readonly IUnitOfWork _unitOfWork;
-
-    public AddTaskToPhaseCommandHandler(
-        IProjectPhaseRepository phaseRepository,
-        IUnitOfWork unitOfWork)
-    {
-        _phaseRepository = phaseRepository;
-        _unitOfWork = unitOfWork;
-    }
-
-    public async Task<OperationResult> Handle(AddTaskToPhaseCommand request, CancellationToken cancellationToken)
-    {
-        try
-        {
-            // Get phase
-            var phase = await _phaseRepository.GetByIdAsync(request.PhaseId);
-            if (phase == null)
-            {
-                return OperationResult.NotFound("فاز یافت نشد");
-            }
-
-            // Add task
-            var task = phase.AddTask(request.Name, request.Description);
-            task.SetPriority(request.Priority);
-            task.SetOrderIndex(request.OrderIndex);
-            
-            if (request.DueDate.HasValue)
-            {
-                task.SetDates(dueDate: request.DueDate);
-            }
-
-            // Save changes
-            await _unitOfWork.SaveChangesAsync(cancellationToken);
-
-            return OperationResult.Success();
-        }
-        catch (Exception ex)
-        {
-            return OperationResult.Failure($"خطا در افزودن تسک: {ex.Message}");
-        }
-    }
-}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/ChangeTaskPriority/ChangeTaskPriorityCommand.cs

@@ -6,35 +6,103 @@ using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 
 namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.ChangeTaskPriority;
 
-/// <summary>
-/// Command to change a task priority.
-/// </summary>
-public record ChangeTaskPriorityCommand(Guid TaskId, TaskPriority Priority) : IBaseCommand;
+public record ChangeTaskPriorityCommand(
+    Guid Id,
+    ProjectHierarchyLevel Level,
+    ProjectTaskPriority Priority
+) : IBaseCommand;
 
 public class ChangeTaskPriorityCommandHandler : IBaseCommandHandler<ChangeTaskPriorityCommand>
 {
     private readonly IProjectTaskRepository _taskRepository;
+    private readonly IProjectPhaseRepository _phaseRepository;
+    private readonly IProjectRepository _projectRepository;
     private readonly IUnitOfWork _unitOfWork;
 
-    public ChangeTaskPriorityCommandHandler(IProjectTaskRepository taskRepository, IUnitOfWork unitOfWork)
+    public ChangeTaskPriorityCommandHandler(
+        IProjectTaskRepository taskRepository,
+        IProjectPhaseRepository phaseRepository,
+        IProjectRepository projectRepository,
+        IUnitOfWork unitOfWork)
     {
         _taskRepository = taskRepository;
+        _phaseRepository = phaseRepository;
+        _projectRepository = projectRepository;
         _unitOfWork = unitOfWork;
     }
 
     public async Task<OperationResult> Handle(ChangeTaskPriorityCommand request, CancellationToken cancellationToken)
     {
-        var task = await _taskRepository.GetByIdAsync(request.TaskId, cancellationToken);
+        switch (request.Level)
+        {
+            case ProjectHierarchyLevel.Task:
+                return await HandleTaskLevelAsync(request.Id, request.Priority, cancellationToken);
+            case ProjectHierarchyLevel.Phase:
+                return await HandlePhaseLevelAsync(request.Id, request.Priority, cancellationToken);
+            case ProjectHierarchyLevel.Project:
+                return await HandleProjectLevelAsync(request.Id, request.Priority, cancellationToken);
+            default:
+                return OperationResult.Failure("سطح نامعتبر است");
+        }
+    }
+
+    // Task-level priority update
+    private async Task<OperationResult> HandleTaskLevelAsync(Guid taskId, ProjectTaskPriority priority, CancellationToken ct)
+    {
+        var task = await _taskRepository.GetByIdAsync(taskId, ct);
         if (task is null)
             return OperationResult.NotFound("تسک یافت نشد");
 
-        // Idempotent: if already same priority, skip extra work
-        if (task.Priority != request.Priority)
+        if (task.Priority != priority)
         {
-            task.SetPriority(request.Priority);
+            task.SetPriority(priority);
         }
 
-        await _unitOfWork.SaveChangesAsync(cancellationToken);
+        await _unitOfWork.SaveChangesAsync(ct);
+        return OperationResult.Success();
+    }
+
+    // Phase-level bulk priority update
+    private async Task<OperationResult> HandlePhaseLevelAsync(Guid phaseId, ProjectTaskPriority priority, CancellationToken ct)
+    {
+        var phase = await _phaseRepository.GetWithTasksAsync(phaseId);
+        if (phase is null)
+            return OperationResult.NotFound("فاز یافت نشد");
+
+        var tasks = phase.Tasks?.ToList() ?? new List<Domain.ProjectAgg.Entities.ProjectTask>();
+        foreach (var t in tasks)
+        {
+            if (t.Priority != priority)
+            {
+                t.SetPriority(priority);
+            }
+        }
+
+        await _unitOfWork.SaveChangesAsync(ct);
+        return OperationResult.Success();
+    }
+
+    // Project-level bulk priority update across all phases
+    private async Task<OperationResult> HandleProjectLevelAsync(Guid projectId, ProjectTaskPriority priority, CancellationToken ct)
+    {
+        var project = await _projectRepository.GetWithFullHierarchyAsync(projectId);
+        if (project is null)
+            return OperationResult.NotFound("پروژه یافت نشد");
+
+        var phases = project.Phases?.ToList() ?? new List<Domain.ProjectAgg.Entities.ProjectPhase>();
+        foreach (var phase in phases)
+        {
+            var tasks = phase.Tasks?.ToList() ?? new List<Domain.ProjectAgg.Entities.ProjectTask>();
+            foreach (var t in tasks)
+            {
+                if (t.Priority != priority)
+                {
+                    t.SetPriority(priority);
+                }
+            }
+        }
+
+        await _unitOfWork.SaveChangesAsync(ct);
         return OperationResult.Success();
     }
 }

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/CreateProject/CreateProjectCommand.cs

@@ -4,4 +4,5 @@ using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.CreateProject;
 
 public record CreateProjectCommand(string Name,ProjectHierarchyLevel Level,
+    ProjectTaskPriority? Priority,
     Guid? ParentId):IBaseCommand;

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/CreateProject/CreateProjectCommandHandler.cs

@@ -16,7 +16,8 @@ public class CreateProjectCommandHandler : IBaseCommandHandler<CreateProjectComm
     private readonly IUnitOfWork _unitOfWork;
 
 
-    public CreateProjectCommandHandler(IProjectRepository projectRepository, IUnitOfWork unitOfWork, IProjectTaskRepository projectTaskRepository, IProjectPhaseRepository projectPhaseRepository)
+    public CreateProjectCommandHandler(IProjectRepository projectRepository, IUnitOfWork unitOfWork,
+        IProjectTaskRepository projectTaskRepository, IProjectPhaseRepository projectPhaseRepository)
     {
         _projectRepository = projectRepository;
         _unitOfWork = unitOfWork;
@@ -55,8 +56,8 @@ public class CreateProjectCommandHandler : IBaseCommandHandler<CreateProjectComm
     {
         if (!request.ParentId.HasValue)
             throw new BadRequestException("برای ایجاد فاز، شناسه پروژه الزامی است");
-        
-        if(!_projectRepository.Exists(x=>x.Id == request.ParentId.Value))
+
+        if (!_projectRepository.Exists(x => x.Id == request.ParentId.Value))
         {
             throw new BadRequestException("والد پروژه یافت نشد");
         }
@@ -69,14 +70,15 @@ public class CreateProjectCommandHandler : IBaseCommandHandler<CreateProjectComm
     {
         if (!request.ParentId.HasValue)
             throw new BadRequestException("برای ایجاد تسک، شناسه فاز الزامی است");
-        
-        if(!_projectPhaseRepository.Exists(x=>x.Id == request.ParentId.Value))
+
+        if (!_projectPhaseRepository.Exists(x => x.Id == request.ParentId.Value))
         {
             throw new BadRequestException("والد پروژه یافت نشد");
         }
 
-        var projectTask = new ProjectTask(request.Name, request.ParentId.Value);
+        var priority = request.Priority ?? ProjectTaskPriority.Low;
+
+        var projectTask = new ProjectTask(request.Name, request.ParentId.Value, priority);
         await _projectTaskRepository.CreateAsync(projectTask);
     }
-}
-   
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/GetProjectsList/GetProjectListDto.cs

@@ -10,8 +10,10 @@ public class GetProjectItemDto
     public int Percentage { get; init; }
     public ProjectHierarchyLevel Level { get; init; }
     public Guid? ParentId { get; init; }
-    public int TotalHours { get; set; }
-    public int Minutes { get; set; }
+    
+    public TimeSpan TotalTime { get; init; }
+    
+    public TimeSpan RemainingTime { get; init; }
     public AssignmentStatus Front { get; set; }
     public AssignmentStatus Backend { get; set; }
     public AssignmentStatus Design { get; set; }

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/GetProjectsList/GetProjectsListQueryHandler.cs

@@ -16,7 +16,8 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
         _context = context;
     }
 
-    public async Task<OperationResult<GetProjectsListResponse>> Handle(GetProjectsListQuery request, CancellationToken cancellationToken)
+    public async Task<OperationResult<GetProjectsListResponse>> Handle(GetProjectsListQuery request,
+        CancellationToken cancellationToken)
     {
         var projects = new List<GetProjectDto>();
         var phases = new List<GetPhaseDto>();
@@ -51,13 +52,14 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
         {
             return new List<GetProjectDto>();
         }
+
         var entities = await query
             .OrderByDescending(p => p.CreationDate)
             .ToListAsync(cancellationToken);
         var result = new List<GetProjectDto>();
         foreach (var project in entities)
         {
-            var (percentage, totalTime) = await CalculateProjectPercentage(project, cancellationToken);
+            var (percentage, totalTime,remainingTime) = await CalculateProjectPercentage(project, cancellationToken);
             result.Add(new GetProjectDto
             {
                 Id = project.Id,
@@ -65,10 +67,12 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
                 Level = ProjectHierarchyLevel.Project,
                 ParentId = null,
                 Percentage = percentage,
-                TotalHours = (int)totalTime.TotalHours,
-                Minutes = totalTime.Minutes,
+                TotalTime = totalTime,
+                RemainingTime = remainingTime
             });
         }
+
+        result = result.OrderByDescending(x => x.Percentage).ToList();
         return result;
     }
 
@@ -79,13 +83,14 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
         {
             query = query.Where(x => x.ProjectId == parentId);
         }
+
         var entities = await query
             .OrderByDescending(p => p.CreationDate)
             .ToListAsync(cancellationToken);
         var result = new List<GetPhaseDto>();
         foreach (var phase in entities)
         {
-            var (percentage, totalTime) = await CalculatePhasePercentage(phase, cancellationToken);
+            var (percentage, totalTime,remainingTime) = await CalculatePhasePercentage(phase, cancellationToken);
             result.Add(new GetPhaseDto
             {
                 Id = phase.Id,
@@ -93,10 +98,12 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
                 Level = ProjectHierarchyLevel.Phase,
                 ParentId = phase.ProjectId,
                 Percentage = percentage,
-                TotalHours = (int)totalTime.TotalHours,
-                Minutes = totalTime.Minutes,
+                TotalTime = totalTime,
+                RemainingTime = remainingTime
             });
         }
+        result = result.OrderByDescending(x => x.Percentage).ToList();
+
         return result;
     }
 
@@ -107,6 +114,7 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
         {
             query = query.Where(x => x.PhaseId == parentId);
         }
+
         var entities = await query
             .OrderByDescending(t => t.CreationDate)
             .ToListAsync(cancellationToken);
@@ -118,7 +126,7 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
 
         foreach (var task in entities)
         {
-            var (percentage, totalTime) = await CalculateTaskPercentage(task, cancellationToken);
+            var (percentage, totalTime,remainingTime) = await CalculateTaskPercentage(task, cancellationToken);
             var sections = await _context.TaskSections
                 .Include(s => s.Activities)
                 .Include(s => s.Skill)
@@ -140,13 +148,12 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
 
             // محاسبه SpentTime و RemainingTime
             var spentTime = TimeSpan.FromTicks(sections.Sum(s => s.Activities.Sum(a => a.GetTimeSpent().Ticks)));
-            var remainingTime = totalTime - spentTime;
 
             // ساخت section DTOs برای تمام Skills
             var sectionDtos = allSkills.Select(skill =>
             {
                 var section = sections.FirstOrDefault(s => s.SkillId == skill.Id);
-                
+
                 if (section == null)
                 {
                     // اگر section وجود نداشت، یک DTO با وضعیت Unassigned برمی‌گردانیم
@@ -184,18 +191,20 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
                 Level = ProjectHierarchyLevel.Task,
                 ParentId = task.PhaseId,
                 Percentage = percentage,
-                TotalHours = (int)totalTime.TotalHours,
-                Minutes = totalTime.Minutes,
+                TotalTime = totalTime,
                 SpentTime = spentTime,
                 RemainingTime = remainingTime,
                 Sections = sectionDtos,
                 Priority = task.Priority
             });
         }
+        result = result.OrderByDescending(x => x.Percentage).ToList();
+
         return result;
     }
 
-    private async Task SetSkillFlags<TItem>(List<TItem> items, CancellationToken cancellationToken) where TItem : GetProjectItemDto
+    private async Task SetSkillFlags<TItem>(List<TItem> items, CancellationToken cancellationToken)
+        where TItem : GetProjectItemDto
     {
         if (!items.Any())
             return;
@@ -213,7 +222,8 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
     }
 
 
-    private async Task SetSkillFlagsForProjects<TItem>(List<TItem> items, List<Guid> projectIds, CancellationToken cancellationToken) where TItem : GetProjectItemDto
+    private async Task SetSkillFlagsForProjects<TItem>(List<TItem> items, List<Guid> projectIds,
+        CancellationToken cancellationToken) where TItem : GetProjectItemDto
     {
         // For projects: gather all phases, then tasks, then sections
         var phases = await _context.ProjectPhases
@@ -243,7 +253,8 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
         }
     }
 
-    private async Task SetSkillFlagsForPhases<TItem>(List<TItem> items, List<Guid> phaseIds, CancellationToken cancellationToken) where TItem : GetProjectItemDto
+    private async Task SetSkillFlagsForPhases<TItem>(List<TItem> items, List<Guid> phaseIds,
+        CancellationToken cancellationToken) where TItem : GetProjectItemDto
     {
         // For phases: gather tasks, then sections
         var tasks = await _context.ProjectTasks
@@ -269,68 +280,81 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
         }
     }
 
-    private async Task<(int Percentage, TimeSpan TotalTime)> CalculateProjectPercentage(Project project, CancellationToken cancellationToken)
+    private async Task<(int Percentage, TimeSpan TotalTime,TimeSpan RemainingTime)> CalculateProjectPercentage(Project project,
+        CancellationToken cancellationToken)
     {
         var phases = await _context.ProjectPhases
             .Where(ph => ph.ProjectId == project.Id)
             .ToListAsync(cancellationToken);
         if (!phases.Any())
-            return (0, TimeSpan.Zero);
+            return (0, TimeSpan.Zero,TimeSpan.Zero);
         var phasePercentages = new List<int>();
         var totalTime = TimeSpan.Zero;
+        var  remainingTime = TimeSpan.Zero;
         foreach (var phase in phases)
         {
-            var (phasePercentage, phaseTime) = await CalculatePhasePercentage(phase, cancellationToken);
+            var (phasePercentage, phaseTime,phaseRemainingTime) = await CalculatePhasePercentage(phase, cancellationToken);
             phasePercentages.Add(phasePercentage);
             totalTime += phaseTime;
+            remainingTime += phaseRemainingTime;
         }
+
         var averagePercentage = phasePercentages.Any() ? (int)phasePercentages.Average() : 0;
-        return (averagePercentage, totalTime);
+        return (averagePercentage, totalTime,remainingTime);
     }
 
-    private async Task<(int Percentage, TimeSpan TotalTime)> CalculatePhasePercentage(ProjectPhase phase, CancellationToken cancellationToken)
+    private async Task<(int Percentage, TimeSpan TotalTime,TimeSpan RemainingTime)> CalculatePhasePercentage(ProjectPhase phase,
+        CancellationToken cancellationToken)
     {
         var tasks = await _context.ProjectTasks
             .Where(t => t.PhaseId == phase.Id)
             .ToListAsync(cancellationToken);
         if (!tasks.Any())
-            return (0, TimeSpan.Zero);
+            return (0, TimeSpan.Zero,TimeSpan.Zero);
         var taskPercentages = new List<int>();
         var totalTime = TimeSpan.Zero;
+        var remainingTime =  TimeSpan.Zero;
         foreach (var task in tasks)
         {
-            var (taskPercentage, taskTime) = await CalculateTaskPercentage(task, cancellationToken);
+            var (taskPercentage, taskTime,taskRemainingTime) = await CalculateTaskPercentage(task, cancellationToken);
             taskPercentages.Add(taskPercentage);
             totalTime += taskTime;
+            remainingTime += taskRemainingTime;
         }
+
         var averagePercentage = taskPercentages.Any() ? (int)taskPercentages.Average() : 0;
-        return (averagePercentage, totalTime);
+        return (averagePercentage, totalTime,remainingTime);
     }
 
-    private async Task<(int Percentage, TimeSpan TotalTime)> CalculateTaskPercentage(ProjectTask task, CancellationToken cancellationToken)
+    private async Task<(int Percentage, TimeSpan TotalTime, TimeSpan RemainingTime)> CalculateTaskPercentage(
+        ProjectTask task, CancellationToken cancellationToken)
     {
         var sections = await _context.TaskSections
             .Include(s => s.Activities)
-            .Include(x=>x.AdditionalTimes)
+            .Include(x => x.AdditionalTimes)
             .Where(s => s.TaskId == task.Id)
             .ToListAsync(cancellationToken);
         if (!sections.Any())
-            return (0, TimeSpan.Zero);
+            return (0, TimeSpan.Zero, TimeSpan.Zero);
         var sectionPercentages = new List<int>();
         var totalTime = TimeSpan.Zero;
+        var spentTime = TimeSpan.Zero;
         foreach (var section in sections)
         {
             var (sectionPercentage, sectionTime) = CalculateSectionPercentage(section);
+            var sectionSpent = TimeSpan.FromTicks(section.Activities.Sum(x => x.GetTimeSpent().Ticks));
             sectionPercentages.Add(sectionPercentage);
             totalTime += sectionTime;
+            spentTime += sectionSpent;
         }
+        var remainingTime = totalTime - spentTime;
         var averagePercentage = sectionPercentages.Any() ? (int)sectionPercentages.Average() : 0;
-        return (averagePercentage, totalTime);
+        return (averagePercentage, totalTime, remainingTime);
     }
 
     private static (int Percentage, TimeSpan TotalTime) CalculateSectionPercentage(TaskSection section)
     {
-        return ((int)section.GetProgressPercentage(),section.FinalEstimatedHours);
+        return ((int)section.GetProgressPercentage(), section.FinalEstimatedHours);
     }
 
     private static AssignmentStatus GetAssignmentStatus(TaskSection? section)
@@ -341,7 +365,7 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
 
         // بررسی وجود user
         bool hasUser = section.CurrentAssignedUserId > 0;
-        
+
         // بررسی وجود time (InitialEstimatedHours بزرگتر از صفر باشد)
         bool hasTime = section.InitialEstimatedHours > TimeSpan.Zero;
 
@@ -356,5 +380,4 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
         // تعیین تکلیف نشده: نه user دارد نه time
         return AssignmentStatus.Unassigned;
     }
-}
-
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/GetProjectsList/GetTaskListDto.cs

@@ -9,13 +9,13 @@ public class GetTaskDto
     public int Percentage { get; init; }
     public ProjectHierarchyLevel Level { get; init; }
     public Guid? ParentId { get; init; }
-    public int TotalHours { get; set; }
-    public int Minutes { get; set; }
+    
+    public TimeSpan TotalTime { get; set; }
     
     // Task-specific fields
     public TimeSpan SpentTime { get; init; }
     public TimeSpan RemainingTime { get; init; }
-    public TaskPriority Priority { get; set; }
+    public ProjectTaskPriority Priority { get; set; }
     public List<GetTaskSectionDto> Sections { get;  init; }
 }
 

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectBoardList/ProjectBoardListQuery.cs

@@ -6,5 +6,7 @@ namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.Project
 
 public record ProjectBoardListQuery: IBaseQuery<List<ProjectBoardListResponse>>
 {
+    public long? UserId { get; set; }
+    public string? ProjectName { get; set; }
     public TaskSectionStatus? Status { get; set; }
 }

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectBoardList/ProjectBoardListQueryHandler.cs

@@ -3,7 +3,6 @@ using GozareshgirProgramManager.Application._Common.Interfaces;
 using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Query.Internal;
 
 namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.ProjectBoardList;
 
@@ -24,7 +23,8 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
         var currentUserId = _authHelper.GetCurrentUserId();
         
         var queryable = _programManagerDbContext.TaskSections.AsNoTracking()
-            .Where(x => x.InitialEstimatedHours > TimeSpan.Zero && x.Status != TaskSectionStatus.Completed)
+            .Where(x => x.InitialEstimatedHours > TimeSpan.Zero 
+                        && x.Status != TaskSectionStatus.Completed)
             .Include(x => x.Task)
             .ThenInclude(x => x.Phase)
             .ThenInclude(x => x.Project)
@@ -40,10 +40,23 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
         {
             queryable = queryable.Where(x => x.Status == request.Status);
         }
+
+        if (request.UserId is > 0)
+        {
+            queryable = queryable.Where(x => x.CurrentAssignedUserId == request.UserId);
+        }
+
+        if (!string.IsNullOrWhiteSpace(request.ProjectName))
+        {
+            queryable = queryable.Where(x=>x.Task.Name.Contains(request.ProjectName)
+            || x.Task.Phase.Name.Contains(request.ProjectName)
+            || x.Task.Phase.Project.Name.Contains(request.ProjectName));
+        }
         
         var data = await queryable.ToListAsync(cancellationToken);
 
-        var activityUserIds = data.SelectMany(x => x.Activities).Select(a => a.UserId).Distinct().ToList();
+        var activityUserIds = data.SelectMany(x => x.Activities)
+            .Select(a => a.UserId).Distinct().ToList();
         var assignedUser = data.Select(x => x.CurrentAssignedUserId)
             .Concat(data.Select(x => x.OriginalAssignedUserId)).ToList(); 
         var allUserIds = activityUserIds.Concat(assignedUser).Distinct().ToList();
@@ -53,8 +66,13 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
             .ToDictionaryAsync(x => x.Id, x => x.FullName, cancellationToken);
         
 
-        var result = data .OrderByDescending(x => x.CurrentAssignedUserId == currentUserId)
+        var result = data
+            .OrderByDescending(x => x.CurrentAssignedUserId == currentUserId)
+            .ThenByDescending(x=>x.Task.Priority)
             .ThenBy(x => GetStatusOrder(x.Status))
+            .ThenBy(x=>x.Task.Phase.ProjectId)
+            .ThenBy(x=>x.Task.PhaseId)
+            .ThenBy(x=>x.TaskId)
             .Select(x =>
             {
                 // محاسبه یکبار برای هر Activity و Cache کردن نتیجه
@@ -65,7 +83,7 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
                     {
                         Activity = a,
                         TimeSpent = timeSpent,
-                        TotalSeconds = timeSpent.TotalSeconds,
+                        timeSpent.TotalSeconds,
                         FormattedTime = timeSpent.ToString(@"hh\:mm")
                     };
                 }).ToList();
@@ -103,6 +121,7 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
                     ProjectName = x.Task.Phase.Project.Name,
                     TaskName = x.Task.Name,
                     SectionStatus = x.Status,
+                    TaskPriority = x.Task.Priority,
                     Progress = new ProjectProgressDto()
                     {
                         CompleteSecond = x.FinalEstimatedHours.TotalSeconds,
@@ -114,6 +133,7 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
                     AssignedUser = x.CurrentAssignedUserId == x.OriginalAssignedUserId ? null 
                         : users.GetValueOrDefault(x.CurrentAssignedUserId, "ناشناس"),
                     SkillName =  x.Skill?.Name??"-",
+                    TaskId = x.TaskId
                 };
             }).ToList();
 

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectBoardList/ProjectBoardListResponse.cs

@@ -13,6 +13,8 @@ public class ProjectBoardListResponse
     public string? AssignedUser { get; set; }
     public string OriginalUser { get; set; }
     public string SkillName { get; set; }
+    public ProjectTaskPriority TaskPriority { get; set; }
+    public Guid TaskId { get; set; }
     
 }
 public class ProjectProgressDto

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectDeployBoardDetail/ProjectDeployBoardDetailsQueryHandler.cs

@@ -21,7 +21,7 @@ public record ProjectDeployBoardDetailTaskItem(
     TimeSpan DoneTimeSpan,
     int Percentage,
     List<ProjectDeployBoardDetailItemSkill> Skills)
-    : ProjectDeployBoardDetailPhaseItem(Name, TotalTimeSpan, DoneTimeSpan,Percentage);
+    : ProjectDeployBoardDetailPhaseItem(Name, TotalTimeSpan, DoneTimeSpan, Percentage);
 
 public record ProjectDeployBoardDetailItemSkill(string OriginalUserFullName, string SkillName, int TimePercentage);
 
@@ -73,6 +73,7 @@ public class
 
             var doneTime = t.Sections.Aggregate(TimeSpan.Zero,
                 (sum, next) => sum.Add(next.GetTotalTimeSpent()));
+
             var skills = t.Sections
                 .Select(s =>
                 {
@@ -82,13 +83,23 @@ public class
                     var skillName = s.Skill?.Name ?? "بدون مهارت";
 
                     var timePercentage = (int)s.GetProgressPercentage();
-                    
+
                     return new ProjectDeployBoardDetailItemSkill(
                         originalUserFullName,
                         skillName,
                         timePercentage);
                 }).ToList();
-            var taskPercentage = (int)Math.Round(skills.Average(x => x.TimePercentage));
+
+            int taskPercentage;
+
+            if (skills.Count == 0)
+            {
+                taskPercentage = 0;
+            }
+            else
+            {
+                taskPercentage = (int)Math.Round(skills.Average(x => x.TimePercentage));
+            }
 
             return new ProjectDeployBoardDetailTaskItem(
                 t.Name,
@@ -105,7 +116,7 @@ public class
             (sum, next) => sum.Add(next.DoneTimeSpan));
 
         var phasePercentage = tasksRes.Average(x => x.Percentage);
-            
+
         var phaseRes = new ProjectDeployBoardDetailPhaseItem(phase.Name, totalTimeSpan, doneTimeSpan,
             (int)phasePercentage);
 

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectSetTimeDetails/ProjectSetTimeDetailsQueryHandler.cs

@@ -56,6 +56,7 @@ public class ProjectSetTimeDetailsQueryHandler
         
         var skills = await _context.Skills
             .AsNoTracking()
+            .OrderBy(x=>x.CreationDate)
             .ToListAsync(cancellationToken);
 
         var res = new ProjectSetTimeResponse(
@@ -84,7 +85,7 @@ public class ProjectSetTimeDetailsQueryHandler
                     UserId = section?.OriginalAssignedUserId ?? 0,
                     SkillId = skill.Id,
                 };
-            }).OrderBy(x => x.SkillId).ToList(),
+            }).ToList(),
             task.Id,
             level);
 
@@ -114,6 +115,7 @@ public class ProjectSetTimeDetailsQueryHandler
 
         var skills = await _context.Skills
             .AsNoTracking()
+            .OrderBy(x=>x.CreationDate)
             .ToListAsync(cancellationToken);
 
         var res = new ProjectSetTimeResponse(
@@ -135,7 +137,7 @@ public class ProjectSetTimeDetailsQueryHandler
                     UserId = section?.UserId ?? 0,
                     SkillId = skill.Id,
                 };
-            }).OrderBy(x => x.SkillId).ToList(),
+            }).ToList(),
             phase.Id,
             level);
 
@@ -165,6 +167,7 @@ public class ProjectSetTimeDetailsQueryHandler
 
         var skills = await _context.Skills
             .AsNoTracking()
+            .OrderBy(x=>x.CreationDate)
             .ToListAsync(cancellationToken);
 
         var res = new ProjectSetTimeResponse(
@@ -186,7 +189,7 @@ public class ProjectSetTimeDetailsQueryHandler
                     UserId = section?.UserId ?? 0,
                     SkillId = skill.Id,
                 };
-            }).OrderBy(x => x.SkillId).ToList(),
+            }).ToList(),
             project.Id,
             level);
 

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskChat/Commands/DeleteMessage/DeleteMessageCommand.cs

@@ -0,0 +1,47 @@
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Domain._Common.Exceptions;
+using GozareshgirProgramManager.Domain.TaskChatAgg.Repositories;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskChat.Commands.DeleteMessage;
+
+public record DeleteMessageCommand(Guid MessageId) : IBaseCommand;
+
+public class DeleteMessageCommandHandler : IBaseCommandHandler<DeleteMessageCommand>
+{
+    private readonly ITaskChatMessageRepository _repository;
+    private readonly IAuthHelper _authHelper;
+
+    public DeleteMessageCommandHandler(ITaskChatMessageRepository repository, IAuthHelper authHelper)
+    {
+        _repository = repository;
+        _authHelper = authHelper;
+    }
+
+    public async Task<OperationResult> Handle(DeleteMessageCommand request, CancellationToken cancellationToken)
+    {
+        var currentUserId = _authHelper.GetCurrentUserId()??
+                            throw new UnAuthorizedException("کاربر احراز هویت نشده است");
+
+        var message = await _repository.GetByIdAsync(request.MessageId);
+        if (message == null)
+        {
+            return OperationResult.NotFound("پیام یافت نشد");
+        }
+
+        try
+        {
+            message.DeleteMessage(currentUserId);
+            await _repository.UpdateAsync(message);
+            await _repository.SaveChangesAsync();
+
+            // TODO: SignalR notification
+
+            return OperationResult.Success();
+        }
+        catch (Exception ex)
+        {
+            return OperationResult.ValidationError(ex.Message);
+        }
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskChat/Commands/EditMessage/EditMessageCommand.cs

@@ -0,0 +1,51 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain._Common.Exceptions;
+using GozareshgirProgramManager.Domain.TaskChatAgg.Repositories;
+using MediatR;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskChat.Commands.EditMessage;
+
+public record EditMessageCommand(
+    Guid MessageId,
+    string NewTextContent
+) : IBaseCommand;
+
+public class EditMessageCommandHandler : IBaseCommandHandler<EditMessageCommand>
+{
+    private readonly ITaskChatMessageRepository _repository;
+    private readonly IAuthHelper _authHelper;
+
+    public EditMessageCommandHandler(ITaskChatMessageRepository repository, IAuthHelper authHelper)
+    {
+        _repository = repository;
+        _authHelper = authHelper;
+    }
+
+    public async Task<OperationResult> Handle(EditMessageCommand request, CancellationToken cancellationToken)
+    {
+        var currentUserId = _authHelper.GetCurrentUserId()??
+                            throw new UnAuthorizedException("کاربر احراز هویت نشده است");
+
+        var message = await _repository.GetByIdAsync(request.MessageId);
+        if (message == null)
+        {
+            return OperationResult.NotFound("پیام یافت نشد");
+        }
+
+        try
+        {
+            message.EditMessage(request.NewTextContent, currentUserId);
+            await _repository.UpdateAsync(message);
+            await _repository.SaveChangesAsync();
+
+            // TODO: SignalR notification
+
+            return OperationResult.Success();
+        }
+        catch (Exception ex)
+        {
+            return OperationResult.ValidationError(ex.Message);
+        }
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskChat/Commands/PinMessage/PinMessageCommand.cs

@@ -0,0 +1,46 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain._Common.Exceptions;
+using GozareshgirProgramManager.Domain.TaskChatAgg.Repositories;
+using MediatR;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskChat.Commands.PinMessage;
+
+public record PinMessageCommand(Guid MessageId) : IBaseCommand;
+
+public class PinMessageCommandHandler : IBaseCommandHandler<PinMessageCommand>
+{
+    private readonly ITaskChatMessageRepository _repository;
+    private  readonly IAuthHelper _authHelper;
+
+    public PinMessageCommandHandler(ITaskChatMessageRepository repository, IAuthHelper authHelper)
+    {
+        _repository = repository;
+        _authHelper = authHelper;
+    }
+
+    public async Task<OperationResult> Handle(PinMessageCommand request, CancellationToken cancellationToken)
+    {
+        var currentUserId = _authHelper.GetCurrentUserId()??
+                            throw new UnAuthorizedException("کاربر احراز هویت نشده است");
+
+        var message = await _repository.GetByIdAsync(request.MessageId);
+        if (message == null)
+        {
+            return OperationResult.NotFound("پیام یافت نشد");
+        }
+
+        try
+        {
+            message.PinMessage(currentUserId);
+            await _repository.UpdateAsync(message);
+            await _repository.SaveChangesAsync();
+
+            return OperationResult.Success();
+        }
+        catch (Exception ex)
+        {
+            return OperationResult.ValidationError(ex.Message);
+        }
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskChat/Commands/SendMessage/SendMessageCommand.cs

@@ -0,0 +1,212 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Application.Modules.TaskChat.DTOs;
+using GozareshgirProgramManager.Application.Services.FileManagement;
+using GozareshgirProgramManager.Domain._Common.Exceptions;
+using GozareshgirProgramManager.Domain.TaskChatAgg.Entities;
+using GozareshgirProgramManager.Domain.TaskChatAgg.Repositories;
+using GozareshgirProgramManager.Domain.TaskChatAgg.Enums;
+using GozareshgirProgramManager.Domain.FileManagementAgg.Entities;
+using GozareshgirProgramManager.Domain.FileManagementAgg.Repositories;
+using GozareshgirProgramManager.Domain.FileManagementAgg.Enums;
+using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
+using MediatR;
+using Microsoft.AspNetCore.Http;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskChat.Commands.SendMessage;
+
+public record SendMessageCommand(
+    Guid TaskId,
+    MessageType MessageType,
+    string? TextContent,
+    IFormFile? File,
+    Guid? ReplyToMessageId
+) : IBaseCommand<MessageDto>;
+
+public class SendMessageCommandHandler : IBaseCommandHandler<SendMessageCommand, MessageDto>
+{
+    private readonly ITaskChatMessageRepository _messageRepository;
+    private readonly IUploadedFileRepository _fileRepository;
+    private readonly IProjectTaskRepository _taskRepository;
+    private readonly IFileStorageService _fileStorageService;
+    private readonly IThumbnailGeneratorService _thumbnailService;
+    private readonly IAuthHelper _authHelper;
+
+    public SendMessageCommandHandler(
+        ITaskChatMessageRepository messageRepository,
+        IUploadedFileRepository fileRepository,
+        IProjectTaskRepository taskRepository,
+        IFileStorageService fileStorageService,
+        IThumbnailGeneratorService thumbnailService, IAuthHelper authHelper)
+    {
+        _messageRepository = messageRepository;
+        _fileRepository = fileRepository;
+        _taskRepository = taskRepository;
+        _fileStorageService = fileStorageService;
+        _thumbnailService = thumbnailService;
+        _authHelper = authHelper;
+    }
+
+    public async Task<OperationResult<MessageDto>> Handle(SendMessageCommand request, CancellationToken cancellationToken)
+    {
+        var currentUserId = _authHelper.GetCurrentUserId()
+                            ?? throw new UnAuthorizedException("کاربر احراز هویت نشده است");
+
+        var task = await _taskRepository.GetByIdAsync(request.TaskId, cancellationToken);
+        if (task == null)
+        {
+            return OperationResult<MessageDto>.NotFound("تسک یافت نشد");
+        }
+        
+        Guid? uploadedFileId = null;
+        if (request.File != null)
+        {
+            if (request.File.Length == 0)
+            {
+                return OperationResult<MessageDto>.ValidationError("فایل خالی است");
+            }
+
+            const long maxFileSize = 100 * 1024 * 1024;
+            if (request.File.Length > maxFileSize)
+            {
+                return OperationResult<MessageDto>.ValidationError("حجم فایل بیش از حد مجاز است (حداکثر 100MB)");
+            }
+
+            var fileType = DetectFileType(request.File.ContentType, Path.GetExtension(request.File.FileName));
+
+            var uploadedFile = new UploadedFile(
+                originalFileName: request.File.FileName,
+                fileSizeBytes: request.File.Length,
+                mimeType: request.File.ContentType,
+                fileType: fileType,
+                category: FileCategory.TaskChatMessage,
+                uploadedByUserId: currentUserId,
+                storageProvider: StorageProvider.LocalFileSystem
+            );
+
+            await _fileRepository.AddAsync(uploadedFile);
+            await _fileRepository.SaveChangesAsync();
+
+            try
+            {
+                using var stream = request.File.OpenReadStream();
+                var uploadResult = await _fileStorageService.UploadAsync(
+                    stream,
+                    uploadedFile.UniqueFileName,
+                    "TaskChatMessage"
+                );
+
+                uploadedFile.CompleteUpload(uploadResult.StoragePath, uploadResult.StorageUrl);
+
+                if (fileType == FileType.Image)
+                {
+                    var dimensions = await _thumbnailService.GetImageDimensionsAsync(uploadResult.StoragePath);
+                    if (dimensions.HasValue)
+                    {
+                        uploadedFile.SetImageDimensions(dimensions.Value.Width, dimensions.Value.Height);
+                    }
+
+                    var thumbnail = await _thumbnailService
+                        .GenerateImageThumbnailAsync(uploadResult.StoragePath, category: "TaskChatMessage");
+                    if (thumbnail.HasValue)
+                    {
+                        uploadedFile.SetThumbnail(thumbnail.Value.ThumbnailUrl);
+                    }
+                }
+
+                await _fileRepository.UpdateAsync(uploadedFile);
+                await _fileRepository.SaveChangesAsync();
+
+                uploadedFileId = uploadedFile.Id;
+            }
+            catch (Exception ex)
+            {
+                await _fileRepository.DeleteAsync(uploadedFile);
+                await _fileRepository.SaveChangesAsync();
+
+                return OperationResult<MessageDto>.ValidationError($"خطا در آپلود فایل: {ex.Message}");
+            }
+        }
+
+        var message = new TaskChatMessage(
+            taskId: request.TaskId,
+            senderUserId: currentUserId,
+            messageType: request.MessageType,
+            textContent: request.TextContent,
+            uploadedFileId
+        );
+
+        if (request.ReplyToMessageId.HasValue)
+        {
+            message.SetReplyTo(request.ReplyToMessageId.Value);
+        }
+
+        await _messageRepository.AddAsync(message);
+        await _messageRepository.SaveChangesAsync();
+
+        if (uploadedFileId.HasValue)
+        {
+            var file = await _fileRepository.GetByIdAsync(uploadedFileId.Value);
+            if (file != null)
+            {
+                file.SetReference("TaskChatMessage", message.Id.ToString());
+                await _fileRepository.UpdateAsync(file);
+                await _fileRepository.SaveChangesAsync();
+            }
+        }
+
+        var dto = new MessageDto
+        {
+            Id = message.Id,
+            TaskId = message.TaskId,
+            SenderUserId = message.SenderUserId,
+            SenderName = "کاربر",
+            MessageType = message.MessageType.ToString(),
+            TextContent = message.TextContent,
+            ReplyToMessageId = message.ReplyToMessageId,
+            IsEdited = message.IsEdited,
+            IsPinned = message.IsPinned,
+            CreationDate = message.CreationDate,
+            IsMine = true
+        };
+
+        if (uploadedFileId.HasValue)
+        {
+            var file = await _fileRepository.GetByIdAsync(uploadedFileId.Value);
+            if (file != null)
+            {
+                dto.File = new MessageFileDto
+                {
+                    Id = file.Id,
+                    FileName = file.OriginalFileName,
+                    FileUrl = file.StorageUrl ?? "",
+                    FileSizeBytes = file.FileSizeBytes,
+                    FileType = file.FileType.ToString(),
+                    ThumbnailUrl = file.ThumbnailUrl,
+                    ImageWidth = file.ImageWidth,
+                    ImageHeight = file.ImageHeight,
+                    DurationSeconds = file.DurationSeconds
+                };
+            }
+        }
+
+        return OperationResult<MessageDto>.Success(dto);
+    }
+
+    private FileType DetectFileType(string mimeType, string extension)
+    {
+        if (mimeType.StartsWith("image/", StringComparison.OrdinalIgnoreCase))
+            return FileType.Image;
+
+        if (mimeType.StartsWith("video/", StringComparison.OrdinalIgnoreCase))
+            return FileType.Video;
+
+        if (mimeType.StartsWith("audio/", StringComparison.OrdinalIgnoreCase))
+            return FileType.Audio;
+
+        if (new[] { ".zip", ".rar", ".7z", ".tar", ".gz" }.Contains(extension.ToLower()))
+            return FileType.Archive;
+
+        return FileType.Document;
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskChat/Commands/UnpinMessage/UnpinMessageCommand.cs

@@ -0,0 +1,46 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain._Common.Exceptions;
+using GozareshgirProgramManager.Domain.TaskChatAgg.Repositories;
+using MediatR;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskChat.Commands.UnpinMessage;
+
+public record UnpinMessageCommand(Guid MessageId) : IBaseCommand;
+
+public class UnpinMessageCommandHandler : IBaseCommandHandler<UnpinMessageCommand>
+{
+    private readonly ITaskChatMessageRepository _repository;
+    private readonly  IAuthHelper _authHelper;
+
+    public UnpinMessageCommandHandler(ITaskChatMessageRepository repository, IAuthHelper authHelper)
+    {
+        _repository = repository;
+        _authHelper = authHelper;
+    }
+
+    public async Task<OperationResult> Handle(UnpinMessageCommand request, CancellationToken cancellationToken)
+    {
+        var currentUserId = _authHelper.GetCurrentUserId()??
+                            throw new UnAuthorizedException("کاربر احراز هویت نشده است");
+
+        var message = await _repository.GetByIdAsync(request.MessageId);
+        if (message == null)
+        {
+            return OperationResult.NotFound("پیام یافت نشد");
+        }
+
+        try
+        {
+            message.UnpinMessage(currentUserId);
+            await _repository.UpdateAsync(message);
+            await _repository.SaveChangesAsync();
+
+            return OperationResult.Success();
+        }
+        catch (Exception ex)
+        {
+            return OperationResult.ValidationError(ex.Message);
+        }
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskChat/DTOs/MessageDto.cs

@@ -0,0 +1,63 @@
+namespace GozareshgirProgramManager.Application.Modules.TaskChat.DTOs;
+
+public class SendMessageDto
+{
+    public Guid TaskId { get; set; }
+    public string MessageType { get; set; } = string.Empty; // "Text", "File", "Image", "Voice", "Video"
+    public string? TextContent { get; set; }
+    public Guid? FileId { get; set; }
+    public Guid? ReplyToMessageId { get; set; }
+}
+
+public class MessageDto
+{
+    public Guid Id { get; set; }
+    public Guid TaskId { get; set; }
+    public long SenderUserId { get; set; }
+    public string SenderName { get; set; } = string.Empty;
+    public string MessageType { get; set; } = string.Empty;
+    public string? TextContent { get; set; }
+    public MessageFileDto? File { get; set; }
+    public Guid? ReplyToMessageId { get; set; }
+    public MessageDto? ReplyToMessage { get; set; }
+    public bool IsEdited { get; set; }
+    public DateTime? EditedDate { get; set; }
+    public bool IsPinned { get; set; }
+    public DateTime? PinnedDate { get; set; }
+    public long? PinnedByUserId { get; set; }
+    public DateTime CreationDate { get; set; }
+    public bool IsMine { get; set; }
+}
+
+public class MessageFileDto
+{
+    public Guid Id { get; set; }
+    public string FileName { get; set; } = string.Empty;
+    public string FileUrl { get; set; } = string.Empty;
+    public long FileSizeBytes { get; set; }
+    public string FileType { get; set; } = string.Empty;
+    public string? ThumbnailUrl { get; set; }
+    public int? ImageWidth { get; set; }
+    public int? ImageHeight { get; set; }
+    public int? DurationSeconds { get; set; }
+    
+    public string FileSizeFormatted
+    {
+        get
+        {
+            const long kb = 1024;
+            const long mb = kb * 1024;
+            const long gb = mb * 1024;
+
+            if (FileSizeBytes >= gb)
+                return $"{FileSizeBytes / (double)gb:F2} GB";
+            if (FileSizeBytes >= mb)
+                return $"{FileSizeBytes / (double)mb:F2} MB";
+            if (FileSizeBytes >= kb)
+                return $"{FileSizeBytes / (double)kb:F2} KB";
+            
+            return $"{FileSizeBytes} Bytes";
+        }
+    }
+}
+

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskChat/Queries/GetMessages/GetMessagesQuery.cs

@@ -0,0 +1,216 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Application.Modules.TaskChat.DTOs;
+using GozareshgirProgramManager.Domain.TaskChatAgg.Enums;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskChat.Queries.GetMessages;
+
+public record GetMessagesQuery(
+    Guid TaskId,
+    MessageType? MessageType,
+    int Page = 1,
+    int PageSize = 50
+) : IBaseQuery<PaginationResult<MessageDto>>;
+
+
+
+public class GetMessagesQueryHandler : IBaseQueryHandler<GetMessagesQuery, PaginationResult<MessageDto>>
+{
+    private readonly IProgramManagerDbContext _context;
+    private readonly IAuthHelper _authHelper;
+
+    public GetMessagesQueryHandler(IProgramManagerDbContext context, IAuthHelper authHelper)
+    {
+        _context = context;
+        _authHelper = authHelper;
+    }
+
+    private List<MessageDto> CreateAdditionalTimeNotes(
+        IEnumerable<Domain.ProjectAgg.Entities.TaskSectionAdditionalTime> additionalTimes,
+        Dictionary<long, string> users,
+        Guid taskId)
+    {
+        var notes = new List<MessageDto>();
+        
+        foreach (var additionalTime in additionalTimes)
+        {
+            var addedByUserName = additionalTime.AddedByUserId.HasValue && users.TryGetValue(additionalTime.AddedByUserId.Value, out var user)
+                ? user
+                : "سیستم";
+
+            var noteContent = $"⏱️ زمان اضافی: {additionalTime.Hours.TotalHours.ToString("F2")} ساعت - {(string.IsNullOrWhiteSpace(additionalTime.Reason) ? "بدون علت" : additionalTime.Reason)} - توسط {addedByUserName}";
+
+            var noteDto = new MessageDto
+            {
+                Id = Guid.NewGuid(),
+                TaskId = taskId,
+                SenderUserId = 0,
+                SenderName = "سیستم",
+                MessageType = "Note",
+                TextContent = noteContent,
+                CreationDate = additionalTime.CreationDate,
+                IsMine = false
+            };
+
+            notes.Add(noteDto);
+        }
+
+        return notes;
+    }
+
+    public async Task<OperationResult<PaginationResult<MessageDto>>> Handle(GetMessagesQuery request, CancellationToken cancellationToken)
+    {
+        var currentUserId = _authHelper.GetCurrentUserId();
+
+        var skip = (request.Page - 1) * request.PageSize;
+
+        var query = _context.TaskChatMessages
+            .Where(m => m.TaskId == request.TaskId && !m.IsDeleted)
+            .Include(m => m.ReplyToMessage)
+            .OrderBy(m => m.CreationDate).AsQueryable();
+
+        if (request.MessageType.HasValue)
+        {
+            query = query.Where(m => m.MessageType == request.MessageType.Value);
+        }
+
+        var totalCount = await query.CountAsync(cancellationToken);
+
+        var messages = await query
+            .Skip(skip)
+            .Take(request.PageSize)
+            .ToListAsync(cancellationToken);
+
+        // ✅ گرفتن تمامی کاربران برای نمایش نام کامل فرستنده به جای "کاربر"
+        var senderUserIds = messages.Select(m => m.SenderUserId).Distinct().ToList();
+        var users = await _context.Users
+            .Where(u => senderUserIds.Contains(u.Id))
+            .ToDictionaryAsync(u => u.Id, u => u.FullName, cancellationToken);
+
+        // ✅ گرفتن تمامی زمان‌های اضافی (Additional Times) برای نمایش به صورت نوت
+        var taskSections = await _context.TaskSections
+            .Where(ts => ts.TaskId == request.TaskId)
+            .Include(ts => ts.AdditionalTimes)
+            .ToListAsync(cancellationToken);
+
+        // ✅ تمام زمان‌های اضافی را یکجا بگیر و مرتب کن
+        var allAdditionalTimes = taskSections
+            .SelectMany(ts => ts.AdditionalTimes)
+            .OrderBy(at => at.CreationDate)
+            .ToList();
+
+        var messageDtos = new List<MessageDto>();
+
+        // ✅ ابتدا زمان‌های اضافی قبل از اولین پیام را اضافه کن (اگر پیامی وجود داشته باشد)
+        if (messages.Any())
+        {
+            var firstMessageDate = messages.First().CreationDate;
+            var additionalTimesBeforeFirstMessage = allAdditionalTimes
+                .Where(at => at.CreationDate < firstMessageDate)
+                .ToList();
+
+            messageDtos.AddRange(CreateAdditionalTimeNotes(additionalTimesBeforeFirstMessage, users, request.TaskId));
+        }
+        else
+        {
+            // ✅ اگر هیچ پیامی وجود ندارد، همه زمان‌های اضافی را نمایش بده
+            messageDtos.AddRange(CreateAdditionalTimeNotes(allAdditionalTimes, users, request.TaskId));
+        }
+
+        foreach (var message in messages)
+        {
+            // ✅ نام فرستنده را از Dictionary Users بگیر، در صورت عدم وجود "کاربر ناشناس" نمایش بده
+            var senderName = users.GetValueOrDefault(message.SenderUserId, "کاربر ناشناس");
+
+            var dto = new MessageDto
+            {
+                Id = message.Id,
+                TaskId = message.TaskId,
+                SenderUserId = message.SenderUserId,
+                SenderName = senderName,
+                MessageType = message.MessageType.ToString(),
+                TextContent = message.TextContent,
+                ReplyToMessageId = message.ReplyToMessageId,
+                IsEdited = message.IsEdited,
+                EditedDate = message.EditedDate,
+                IsPinned = message.IsPinned,
+                PinnedDate = message.PinnedDate,
+                PinnedByUserId = message.PinnedByUserId,
+                CreationDate = message.CreationDate,
+                IsMine = message.SenderUserId == currentUserId
+            };
+
+            if (message.ReplyToMessage != null)
+            {
+                var replySenderName = users.GetValueOrDefault(message.ReplyToMessage.SenderUserId, "کاربر ناشناس");
+
+                dto.ReplyToMessage = new MessageDto
+                {
+                    Id = message.ReplyToMessage.Id,
+                    SenderUserId = message.ReplyToMessage.SenderUserId,
+                    SenderName = replySenderName,
+                    TextContent = message.ReplyToMessage.TextContent,
+                    CreationDate = message.ReplyToMessage.CreationDate
+                };
+            }
+
+            if (message.FileId.HasValue)
+            {
+                var file = await _context.UploadedFiles.FirstOrDefaultAsync(f => f.Id == message.FileId.Value, cancellationToken);
+                if (file != null)
+                {
+                    dto.File = new MessageFileDto
+                    {
+                        Id = file.Id,
+                        FileName = file.OriginalFileName,
+                        FileUrl = file.StorageUrl ?? "",
+                        FileSizeBytes = file.FileSizeBytes,
+                        FileType = file.FileType.ToString(),
+                        ThumbnailUrl = file.ThumbnailUrl,
+                        ImageWidth = file.ImageWidth,
+                        ImageHeight = file.ImageHeight,
+                        DurationSeconds = file.DurationSeconds
+                    };
+                }
+            }
+
+            messageDtos.Add(dto);
+
+            // ✅ پیدا کردن پیام بعدی (اگر وجود داشته باشد)
+            var currentIndex = messages.IndexOf(message);
+            var nextMessage = currentIndex < messages.Count - 1 ? messages[currentIndex + 1] : null;
+
+            if (nextMessage != null)
+            {
+                // ✅ زمان‌های اضافی بین این پیام و پیام بعدی
+                var additionalTimesBetween = allAdditionalTimes
+                    .Where(at => at.CreationDate > message.CreationDate && at.CreationDate < nextMessage.CreationDate)
+                    .ToList();
+
+                messageDtos.AddRange(CreateAdditionalTimeNotes(additionalTimesBetween, users, request.TaskId));
+            }
+            else
+            {
+                // ✅ این آخرین پیام است، زمان‌های اضافی بعد از آن را اضافه کن
+                var additionalTimesAfterLastMessage = allAdditionalTimes
+                    .Where(at => at.CreationDate > message.CreationDate)
+                    .ToList();
+
+                messageDtos.AddRange(CreateAdditionalTimeNotes(additionalTimesAfterLastMessage, users, request.TaskId));
+            }
+        }
+
+        // ✅ مرتب کردن نهایی تمام پیام‌ها (معمولی + نوت‌ها) بر اساس زمان ایجاد
+        messageDtos = messageDtos.OrderBy(m => m.CreationDate).ToList();
+
+        var response = new PaginationResult<MessageDto>()
+        {
+            List = messageDtos,
+            TotalCount = totalCount,
+        };
+
+        return OperationResult<PaginationResult<MessageDto>>.Success(response);
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskChat/Queries/GetPinnedMessages/GetPinnedMessagesQuery.cs

@@ -0,0 +1,82 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Application.Modules.TaskChat.DTOs;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskChat.Queries.GetPinnedMessages;
+
+public record GetPinnedMessagesQuery(Guid TaskId) : IBaseQuery<List<MessageDto>>;
+
+public class GetPinnedMessagesQueryHandler : IBaseQueryHandler<GetPinnedMessagesQuery, List<MessageDto>>
+{
+    private readonly IProgramManagerDbContext _context;
+    private readonly IAuthHelper _authHelper;
+
+    public GetPinnedMessagesQueryHandler(IProgramManagerDbContext context, IAuthHelper authHelper)
+    {
+        _context = context;
+        _authHelper = authHelper;
+    }
+
+    public async Task<OperationResult<List<MessageDto>>> Handle(GetPinnedMessagesQuery request, CancellationToken cancellationToken)
+    {
+        var currentUserId = _authHelper.GetCurrentUserId();
+
+        var messages = await _context.TaskChatMessages
+            .Where(m => m.TaskId == request.TaskId && m.IsPinned && !m.IsDeleted)
+            .Include(m => m.ReplyToMessage)
+            .OrderByDescending(m => m.PinnedDate)
+            .ToListAsync(cancellationToken);
+
+        // ✅ گرفتن تمامی کاربران برای نمایش نام کامل فرستنده
+        var senderUserIds = messages.Select(m => m.SenderUserId).Distinct().ToList();
+        var users = await _context.Users
+            .Where(u => senderUserIds.Contains(u.Id))
+            .ToDictionaryAsync(u => u.Id, u => u.FullName, cancellationToken);
+
+        var messageDtos = new List<MessageDto>();
+
+        foreach (var message in messages)
+        {
+            // ✅ نام فرستنده را از User واقعی بگیر (به جای "کاربر" ثابت)
+            var senderName = users.GetValueOrDefault(message.SenderUserId, "کاربر ناشناس");
+
+            var dto = new MessageDto
+            {
+                Id = message.Id,
+                TaskId = message.TaskId,
+                SenderUserId = message.SenderUserId,
+                SenderName = senderName,
+                MessageType = message.MessageType.ToString(),
+                TextContent = message.TextContent,
+                IsPinned = message.IsPinned,
+                PinnedDate = message.PinnedDate,
+                PinnedByUserId = message.PinnedByUserId,
+                CreationDate = message.CreationDate,
+                IsMine = message.SenderUserId == currentUserId
+            };
+
+            if (message.FileId.HasValue)
+            {
+                var file = await _context.UploadedFiles.FirstOrDefaultAsync(f => f.Id == message.FileId.Value, cancellationToken);
+                if (file != null)
+                {
+                    dto.File = new MessageFileDto
+                    {
+                        Id = file.Id,
+                        FileName = file.OriginalFileName,
+                        FileUrl = file.StorageUrl ?? "",
+                        FileSizeBytes = file.FileSizeBytes,
+                        FileType = file.FileType.ToString(),
+                        ThumbnailUrl = file.ThumbnailUrl
+                    };
+                }
+            }
+
+            messageDtos.Add(dto);
+        }
+
+        return OperationResult<List<MessageDto>>.Success(messageDtos);
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskChat/Queries/SearchMessages/SearchMessagesQuery.cs

@@ -0,0 +1,72 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Application.Modules.TaskChat.DTOs;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskChat.Queries.SearchMessages;
+
+public record SearchMessagesQuery(
+    Guid TaskId,
+    string SearchText,
+    int Page = 1,
+    int PageSize = 20
+) : IBaseQuery<List<MessageDto>>;
+
+public class SearchMessagesQueryHandler : IBaseQueryHandler<SearchMessagesQuery, List<MessageDto>>
+{
+    private readonly IProgramManagerDbContext _context;
+    private readonly IAuthHelper _authHelper;
+
+    public SearchMessagesQueryHandler(IProgramManagerDbContext context, IAuthHelper authHelper)
+    {
+        _context = context;
+        _authHelper = authHelper;
+    }
+
+    public async Task<OperationResult<List<MessageDto>>> Handle(SearchMessagesQuery request, CancellationToken cancellationToken)
+    {
+        var currentUserId = _authHelper.GetCurrentUserId();
+        var skip = (request.Page - 1) * request.PageSize;
+
+        var messages = await _context.TaskChatMessages
+            .Where(m => m.TaskId == request.TaskId &&
+                        m.TextContent != null &&
+                        m.TextContent.Contains(request.SearchText) &&
+                        !m.IsDeleted)
+            .Include(m => m.ReplyToMessage)
+            .OrderByDescending(m => m.CreationDate)
+            .Skip(skip)
+            .Take(request.PageSize)
+            .ToListAsync(cancellationToken);
+
+        // ✅ گرفتن تمامی کاربران برای نمایش نام کامل فرستنده
+        var senderUserIds = messages.Select(m => m.SenderUserId).Distinct().ToList();
+        var users = await _context.Users
+            .Where(u => senderUserIds.Contains(u.Id))
+            .ToDictionaryAsync(u => u.Id, u => u.FullName, cancellationToken);
+
+        var messageDtos = new List<MessageDto>();
+        foreach (var message in messages)
+        {
+            // ✅ نام فرستنده را از User واقعی بگیر
+            var senderName = users.GetValueOrDefault(message.SenderUserId, "کاربر ناشناس");
+
+            var dto = new MessageDto
+            {
+                Id = message.Id,
+                TaskId = message.TaskId,
+                SenderUserId = message.SenderUserId,
+                SenderName = senderName,
+                MessageType = message.MessageType.ToString(),
+                TextContent = message.TextContent,
+                CreationDate = message.CreationDate,
+                IsMine = message.SenderUserId == currentUserId
+            };
+
+            messageDtos.Add(dto);
+        }
+
+        return OperationResult<List<MessageDto>>.Success(messageDtos);
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Services/FileManagement/IFileStorageService.cs

@@ -0,0 +1,38 @@
+using GozareshgirProgramManager.Domain.FileManagementAgg.Entities;
+
+namespace GozareshgirProgramManager.Application.Services.FileManagement;
+
+/// <summary>
+/// سرویس ذخیره‌سازی فایل
+/// </summary>
+public interface IFileStorageService
+{
+    /// <summary>
+    /// آپلود فایل
+    /// </summary>
+    Task<(string StoragePath, string StorageUrl)> UploadAsync(
+        Stream fileStream, 
+        string uniqueFileName, 
+        string category);
+
+    /// <summary>
+    /// حذف فایل
+    /// </summary>
+    Task DeleteAsync(string storagePath);
+
+    /// <summary>
+    /// دریافت فایل
+    /// </summary>
+    Task<Stream?> GetFileStreamAsync(string storagePath);
+
+    /// <summary>
+    /// بررسی وجود فایل
+    /// </summary>
+    Task<bool> ExistsAsync(string storagePath);
+
+    /// <summary>
+    /// دریافت URL فایل
+    /// </summary>
+    string GetFileUrl(string storagePath);
+}
+

ProgramManager/src/Application/GozareshgirProgramManager.Application/Services/FileManagement/IThumbnailGeneratorService.cs

@@ -0,0 +1,34 @@
+namespace GozareshgirProgramManager.Application.Services.FileManagement;
+
+/// <summary>
+/// سرویس تولید thumbnail برای تصاویر و ویدیوها
+/// </summary>
+public interface IThumbnailGeneratorService
+{
+    /// <summary>
+    /// تولید thumbnail برای تصویر
+    /// </summary>
+    Task<(string ThumbnailPath, string ThumbnailUrl)?> GenerateImageThumbnailAsync(
+        string imagePath,
+        string category,
+        int width = 200,
+        int height = 200);
+
+    /// <summary>
+    /// تولید thumbnail برای ویدیو
+    /// </summary>
+    Task<(string ThumbnailPath, string ThumbnailUrl)?> GenerateVideoThumbnailAsync(
+        string videoPath,
+        string category);
+
+    /// <summary>
+    /// حذف thumbnail
+    /// </summary>
+    Task DeleteThumbnailAsync(string thumbnailPath);
+
+    /// <summary>
+    /// دریافت ابعاد تصویر
+    /// </summary>
+    Task<(int Width, int Height)?> GetImageDimensionsAsync(string imagePath);
+}
+

ProgramManager/src/Application/GozareshgirProgramManager.Application/_Common/Interfaces/IProgramManagerDbContext.cs

@@ -7,6 +7,8 @@ using GozareshgirProgramManager.Domain.SalaryPaymentSettingAgg.Entities;
 using GozareshgirProgramManager.Domain.SkillAgg.Entities;
 using GozareshgirProgramManager.Domain.UserAgg.Entities;
 using Microsoft.EntityFrameworkCore;
+using GozareshgirProgramManager.Domain.TaskChatAgg.Entities;
+using GozareshgirProgramManager.Domain.FileManagementAgg.Entities;
 
 namespace GozareshgirProgramManager.Application._Common.Interfaces;
 
@@ -26,6 +28,9 @@ public interface IProgramManagerDbContext
     
     DbSet<ProjectTask> ProjectTasks { get; set; }
     
+    DbSet<TaskChatMessage> TaskChatMessages { get; set; }
+    DbSet<UploadedFile> UploadedFiles { get; set; }
+    
     DbSet<Skill> Skills { get; set; }
     Task<int> SaveChangesAsync(CancellationToken cancellationToken = default);
 }

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/FileManagementAgg/Entities/UploadedFile.cs

@@ -0,0 +1,244 @@
+using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain._Common.Exceptions;
+using GozareshgirProgramManager.Domain.FileManagementAgg.Enums;
+using GozareshgirProgramManager.Domain.FileManagementAgg.Events;
+using FileType = GozareshgirProgramManager.Domain.FileManagementAgg.Enums.FileType;
+
+namespace GozareshgirProgramManager.Domain.FileManagementAgg.Entities;
+
+/// <summary>
+/// فایل آپلود شده - Aggregate Root
+/// مدیریت مرکزی تمام فایل‌های سیستم
+/// </summary>
+public class UploadedFile : EntityBase<Guid>
+{
+    private UploadedFile()
+    {
+    }
+
+    public UploadedFile(
+        string originalFileName,
+        long fileSizeBytes,
+        string mimeType,
+        FileType fileType,
+        FileCategory category,
+        long uploadedByUserId,
+        StorageProvider storageProvider = StorageProvider.LocalFileSystem)
+    {
+        OriginalFileName = originalFileName;
+        FileSizeBytes = fileSizeBytes;
+        MimeType = mimeType;
+        FileType = fileType;
+        Category = category;
+        UploadedByUserId = uploadedByUserId;
+        UploadDate = DateTime.Now;
+        StorageProvider = storageProvider;
+        Status = FileStatus.Uploading;
+        
+        // Generate unique file name
+        FileExtension = Path.GetExtension(originalFileName);
+        UniqueFileName = $"{Guid.NewGuid()}{FileExtension}";
+        
+        ValidateFile();
+        AddDomainEvent(new FileUploadStartedEvent(Id, originalFileName, uploadedByUserId));
+    }
+
+    // اطلاعات فایل
+    public string OriginalFileName { get; private set; } = string.Empty;
+    public string UniqueFileName { get; private set; } = string.Empty;
+    public string FileExtension { get; private set; } = string.Empty;
+    public long FileSizeBytes { get; private set; }
+    public string MimeType { get; private set; } = string.Empty;
+    public FileType FileType { get; private set; }
+    public FileCategory Category { get; private set; }
+    
+    // ذخیره‌سازی
+    public StorageProvider StorageProvider { get; private set; }
+    public string? StoragePath { get; private set; }
+    public string? StorageUrl { get; private set; }
+    public string? ThumbnailUrl { get; private set; }
+    
+    // متادیتا
+    public long UploadedByUserId { get; private set; }
+    public DateTime UploadDate { get; private set; }
+    public FileStatus Status { get; private set; }
+    
+    // اطلاعات تصویر (اختیاری - برای Image)
+    public int? ImageWidth { get; private set; }
+    public int? ImageHeight { get; private set; }
+    
+    // اطلاعات صوت/ویدیو (اختیاری)
+    public int? DurationSeconds { get; private set; }
+    
+    // امنیت
+    public DateTime? VirusScanDate { get; private set; }
+    public bool? IsVirusScanPassed { get; private set; }
+    public string? VirusScanResult { get; private set; }
+    
+    // Soft Delete
+    public bool IsDeleted { get; private set; }
+    public DateTime? DeletedDate { get; private set; }
+    public long? DeletedByUserId { get; private set; }
+    
+    // Reference tracking (چه entityهایی از این فایل استفاده می‌کنند)
+    public string? ReferenceEntityType { get; private set; }
+    public string? ReferenceEntityId { get; private set; }
+
+    private void ValidateFile()
+    {
+        if (string.IsNullOrWhiteSpace(OriginalFileName))
+        {
+            throw new BadRequestException("نام فایل نمی‌تواند خالی باشد");
+        }
+
+        if (FileSizeBytes <= 0)
+        {
+            throw new BadRequestException("حجم فایل باید بیشتر از صفر باشد");
+        }
+
+        if (string.IsNullOrWhiteSpace(MimeType))
+        {
+            throw new BadRequestException("نوع MIME فایل باید مشخص شود");
+        }
+
+        // محدودیت حجم (مثلاً 100MB)
+        const long maxSizeBytes = 100 * 1024 * 1024; // 100MB
+        if (FileSizeBytes > maxSizeBytes)
+        {
+            throw new BadRequestException($"حجم فایل نباید بیشتر از {maxSizeBytes / (1024 * 1024)} مگابایت باشد");
+        }
+    }
+
+    public void CompleteUpload(string storagePath, string storageUrl)
+    {
+        if (Status != FileStatus.Uploading)
+        {
+            throw new BadRequestException("فایل قبلاً آپلود شده است");
+        }
+
+        if (string.IsNullOrWhiteSpace(storagePath))
+        {
+            throw new BadRequestException("مسیر ذخیره‌سازی نمی‌تواند خالی باشد");
+        }
+
+        if (string.IsNullOrWhiteSpace(storageUrl))
+        {
+            throw new BadRequestException("URL فایل نمی‌تواند خالی باشد");
+        }
+
+        StoragePath = storagePath;
+        StorageUrl = storageUrl;
+        Status = FileStatus.Active;
+        
+        AddDomainEvent(new FileUploadCompletedEvent(Id, OriginalFileName, StorageUrl, UploadedByUserId));
+    }
+
+    public void SetThumbnail(string thumbnailUrl)
+    {
+        if (FileType != FileType.Image && FileType != FileType.Video)
+        {
+            throw new BadRequestException("فقط می‌توان برای تصاویر و ویدیوها thumbnail تنظیم کرد");
+        }
+
+        ThumbnailUrl = thumbnailUrl;
+    }
+
+    public void SetImageDimensions(int width, int height)
+    {
+        if (FileType != FileType.Image)
+        {
+            throw new BadRequestException("فقط می‌توان برای تصاویر ابعاد تنظیم کرد");
+        }
+
+        if (width <= 0 || height <= 0)
+        {
+            throw new BadRequestException("ابعاد تصویر باید بیشتر از صفر باشد");
+        }
+
+        ImageWidth = width;
+        ImageHeight = height;
+    }
+
+    public void SetDuration(int durationSeconds)
+    {
+        if (FileType != FileType.Audio && FileType != FileType.Video)
+        {
+            throw new BadRequestException("فقط می‌توان برای فایل‌های صوتی و تصویری مدت زمان تنظیم کرد");
+        }
+
+        if (durationSeconds <= 0)
+        {
+            throw new BadRequestException("مدت زمان باید بیشتر از صفر باشد");
+        }
+
+        DurationSeconds = durationSeconds;
+    }
+    
+    public void MarkAsDeleted(long deletedByUserId)
+    {
+        if (IsDeleted)
+        {
+            throw new BadRequestException("فایل قبلاً حذف شده است");
+        }
+
+        IsDeleted = true;
+        DeletedDate = DateTime.Now;
+        DeletedByUserId = deletedByUserId;
+        Status = FileStatus.Deleted;
+        
+        AddDomainEvent(new FileDeletedEvent(Id, OriginalFileName, deletedByUserId));
+    }
+
+    public void SetReference(string entityType, string entityId)
+    {
+        ReferenceEntityType = entityType;
+        ReferenceEntityId = entityId;
+    }
+
+    public bool IsImage()
+    {
+        return FileType == FileType.Image;
+    }
+
+    public bool IsVideo()
+    {
+        return FileType == FileType.Video;
+    }
+
+    public bool IsAudio()
+    {
+        return FileType == FileType.Audio;
+    }
+
+    public bool IsDocument()
+    {
+        return FileType == FileType.Document;
+    }
+
+    public bool IsUploadedBy(long userId)
+    {
+        return UploadedByUserId == userId;
+    }
+
+    public bool IsActive()
+    {
+        return Status == FileStatus.Active && !IsDeleted;
+    }
+
+    public string GetFileSizeFormatted()
+    {
+        const long kb = 1024;
+        const long mb = kb * 1024;
+        const long gb = mb * 1024;
+
+        if (FileSizeBytes >= gb)
+            return $"{FileSizeBytes / (double)gb:F2} GB";
+        if (FileSizeBytes >= mb)
+            return $"{FileSizeBytes / (double)mb:F2} MB";
+        if (FileSizeBytes >= kb)
+            return $"{FileSizeBytes / (double)kb:F2} KB";
+        
+        return $"{FileSizeBytes} Bytes";
+    }
+}
+

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/FileManagementAgg/Enums/FileCategory.cs

@@ -0,0 +1,15 @@
+namespace GozareshgirProgramManager.Domain.FileManagementAgg.Enums;
+
+/// <summary>
+/// دسته‌بندی فایل - مشخص می‌کند فایل در کجا استفاده شده
+/// </summary>
+public enum FileCategory
+{
+    TaskChatMessage = 1,        // پیام چت تسک
+    TaskAttachment = 2,         // ضمیمه تسک
+    ProjectDocument = 3,        // مستندات پروژه
+    UserProfilePhoto = 4,       // عکس پروفایل کاربر
+    Report = 5,                 // گزارش
+    Other = 6                   // سایر
+}
+

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/FileManagementAgg/Enums/FileStatus.cs

@@ -0,0 +1,13 @@
+namespace GozareshgirProgramManager.Domain.FileManagementAgg.Enums;
+
+/// <summary>
+/// وضعیت فایل
+/// </summary>
+public enum FileStatus
+{
+    Uploading = 1,      // در حال آپلود
+    Active = 2,         // فعال و قابل استفاده
+    Deleted = 5,        // حذف شده (Soft Delete)
+    Archived = 6        // آرشیو شده
+}
+

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/FileManagementAgg/Enums/FileType.cs

@@ -0,0 +1,15 @@
+namespace GozareshgirProgramManager.Domain.FileManagementAgg.Enums;
+
+/// <summary>
+/// نوع فایل
+/// </summary>
+public enum FileType
+{
+    Document = 1,   // اسناد (PDF, Word, Excel, etc.)
+    Image = 2,      // تصویر
+    Video = 3,      // ویدیو
+    Audio = 4,      // صوت
+    Archive = 5,    // فایل فشرده (ZIP, RAR)
+    Other = 6       // سایر
+}
+

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/FileManagementAgg/Enums/StorageProvider.cs

@@ -0,0 +1,10 @@
+namespace GozareshgirProgramManager.Domain.FileManagementAgg.Enums;
+
+/// <summary>
+/// نوع ذخیره‌ساز فایل
+/// </summary>
+public enum StorageProvider
+{
+    LocalFileSystem = 1,    // دیسک محلی سرور
+}
+

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/FileManagementAgg/Events/FileEvents.cs

@@ -0,0 +1,36 @@
+using GozareshgirProgramManager.Domain._Common;
+
+namespace GozareshgirProgramManager.Domain.FileManagementAgg.Events;
+
+// File Upload Events
+public record FileUploadStartedEvent(Guid FileId, string FileName, long UploadedByUserId) : IDomainEvent
+{
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
+}
+
+public record FileUploadCompletedEvent(Guid FileId, string FileName, string StorageUrl, long UploadedByUserId) : IDomainEvent
+{
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
+}
+
+public record FileDeletedEvent(Guid FileId, string FileName, long DeletedByUserId) : IDomainEvent
+{
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
+}
+
+// Virus Scan Events
+public record FileQuarantinedEvent(Guid FileId, string FileName) : IDomainEvent
+{
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
+}
+
+public record FileVirusScanPassedEvent(Guid FileId, string FileName) : IDomainEvent
+{
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
+}
+
+public record FileInfectedEvent(Guid FileId, string FileName, string ScanResult) : IDomainEvent
+{
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
+}
+

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/FileManagementAgg/Repositories/IUploadedFileRepository.cs

@@ -0,0 +1,91 @@
+using GozareshgirProgramManager.Domain.FileManagementAgg.Entities;
+using GozareshgirProgramManager.Domain.FileManagementAgg.Enums;
+
+namespace GozareshgirProgramManager.Domain.FileManagementAgg.Repositories;
+
+/// <summary>
+/// Repository برای مدیریت فایل‌های آپلود شده
+/// </summary>
+public interface IUploadedFileRepository
+{
+    /// <summary>
+    /// دریافت فایل بر اساس شناسه
+    /// </summary>
+    Task<UploadedFile?> GetByIdAsync(Guid fileId);
+
+    /// <summary>
+    /// دریافت فایل بر اساس نام یکتا
+    /// </summary>
+    Task<UploadedFile?> GetByUniqueFileNameAsync(string uniqueFileName);
+
+    /// <summary>
+    /// دریافت لیست فایل‌های یک کاربر
+    /// </summary>
+    Task<List<UploadedFile>> GetUserFilesAsync(long userId, int pageNumber, int pageSize);
+
+    /// <summary>
+    /// دریافت فایل‌های یک دسته خاص
+    /// </summary>
+    Task<List<UploadedFile>> GetByCategoryAsync(FileCategory category, int pageNumber, int pageSize);
+
+    /// <summary>
+    /// دریافت فایل‌های با وضعیت خاص
+    /// </summary>
+    Task<List<UploadedFile>> GetByStatusAsync(FileStatus status, int pageNumber, int pageSize);
+
+    /// <summary>
+    /// دریافت فایل‌های یک Reference خاص
+    /// </summary>
+    Task<List<UploadedFile>> GetByReferenceAsync(string entityType, string entityId);
+
+    /// <summary>
+    /// جستجو در فایل‌ها بر اساس نام
+    /// </summary>
+    Task<List<UploadedFile>> SearchByNameAsync(string searchTerm, int pageNumber, int pageSize);
+
+    /// <summary>
+    /// دریافت تعداد کل فایل‌های یک کاربر
+    /// </summary>
+    Task<int> GetUserFilesCountAsync(long userId);
+
+    /// <summary>
+    /// دریافت مجموع حجم فایل‌های یک کاربر (به بایت)
+    /// </summary>
+    Task<long> GetUserTotalFileSizeAsync(long userId);
+
+    /// <summary>
+    /// دریافت فایل‌های منقضی شده برای پاک‌سازی
+    /// </summary>
+    Task<List<UploadedFile>> GetExpiredFilesAsync(DateTime olderThan);
+
+    /// <summary>
+    /// اضافه کردن فایل جدید
+    /// </summary>
+    Task<UploadedFile> AddAsync(UploadedFile file);
+
+    /// <summary>
+    /// به‌روزرسانی فایل
+    /// </summary>
+    Task UpdateAsync(UploadedFile file);
+
+    /// <summary>
+    /// حذف فیزیکی فایل (فقط برای cleanup)
+    /// </summary>
+    Task DeleteAsync(UploadedFile file);
+
+    /// <summary>
+    /// ذخیره تغییرات
+    /// </summary>
+    Task<int> SaveChangesAsync();
+
+    /// <summary>
+    /// بررسی وجود فایل
+    /// </summary>
+    Task<bool> ExistsAsync(Guid fileId);
+
+    /// <summary>
+    /// بررسی وجود فایل با نام یکتا
+    /// </summary>
+    Task<bool> ExistsByUniqueFileNameAsync(string uniqueFileName);
+}
+

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/ProjectPhase.cs

@@ -41,15 +41,7 @@ public class ProjectPhase : ProjectHierarchyNode
     public ProjectDeployStatus DeployStatus { get; set; }
 
     #region Task Management
-
-    public ProjectTask AddTask(string name, string? description = null)
-    {
-        var task = new ProjectTask(name, Id, description);
-        _tasks.Add(task);
-        AddDomainEvent(new TaskAddedEvent(task.Id, Id, name));
-        return task;
-    }
-
+    
     public void RemoveTask(Guid taskId)
     {
         var task = _tasks.FirstOrDefault(t => t.Id == taskId);

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/ProjectTask.cs

@@ -16,11 +16,11 @@ public class ProjectTask : ProjectHierarchyNode
         _sections = new List<TaskSection>();
     }
 
-    public ProjectTask(string name, Guid phaseId, string? description = null) : base(name, description)
+    public ProjectTask(string name, Guid phaseId,ProjectTaskPriority priority, string? description = null) : base(name, description)
     {
         PhaseId = phaseId;
         _sections = new List<TaskSection>();
-        Priority = TaskPriority.Medium;
+        Priority = priority;
         AddDomainEvent(new TaskCreatedEvent(Id, phaseId, name));
     }
     
@@ -30,7 +30,7 @@ public class ProjectTask : ProjectHierarchyNode
 
     // Task-specific properties
     public Enums.TaskStatus Status { get; private set; } = Enums.TaskStatus.NotStarted;
-    public TaskPriority Priority { get; private set; }
+    public ProjectTaskPriority Priority { get; private set; }
     public DateTime? StartDate { get; private set; }
     public DateTime? EndDate { get; private set; }
     public DateTime? DueDate { get; private set; }
@@ -119,7 +119,7 @@ public class ProjectTask : ProjectHierarchyNode
         AddDomainEvent(new TaskStatusUpdatedEvent(Id, status));
     }
 
-    public void SetPriority(TaskPriority priority)
+    public void SetPriority(ProjectTaskPriority priority)
     {
         Priority = priority;
         AddDomainEvent(new TaskPriorityUpdatedEvent(Id, priority));

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Enums/ProjectTaskPriority.cs

@@ -3,7 +3,7 @@ namespace GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 /// <summary>
 /// اولویت تسک
 /// </summary>
-public enum TaskPriority
+public enum ProjectTaskPriority
 {
     /// <summary>
     /// پایین

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Events/ProjectEvents.cs

@@ -78,7 +78,7 @@ public record TaskStatusUpdatedEvent(Guid TaskId, TaskStatus Status) : IDomainEv
     public DateTime OccurredOn { get; init; } = DateTime.Now;
 }
 
-public record TaskPriorityUpdatedEvent(Guid TaskId, TaskPriority Priority) : IDomainEvent
+public record TaskPriorityUpdatedEvent(Guid TaskId, ProjectTaskPriority Priority) : IDomainEvent
 {
     public DateTime OccurredOn { get; init; } = DateTime.Now;
 }

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Repositories/IProjectTaskRepository.cs

@@ -36,7 +36,7 @@ public interface IProjectTaskRepository : IRepository<Guid, ProjectTask>
     /// <summary>
     /// Get tasks by priority
     /// </summary>
-    Task<List<ProjectTask>> GetByPriorityAsync(ProjectAgg.Enums.TaskPriority priority);
+    Task<List<ProjectTask>> GetByPriorityAsync(ProjectAgg.Enums.ProjectTaskPriority priority);
     
     /// <summary>
     /// Get tasks assigned to user

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/TaskChatAgg/Entities/TaskChatMessage.cs

@@ -0,0 +1,183 @@
+using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain._Common.Exceptions;
+using GozareshgirProgramManager.Domain.TaskChatAgg.Events;
+using MessageType = GozareshgirProgramManager.Domain.TaskChatAgg.Enums.MessageType;
+
+namespace GozareshgirProgramManager.Domain.TaskChatAgg.Entities;
+
+/// <summary>
+/// پیام چت تسک - Aggregate Root
+/// هر کسی که به تسک دسترسی داشته باشد می‌تواند پیام‌ها را ببیند و ارسال کند
+/// نیازی به مدیریت گروه و ممبر نیست چون دسترسی از طریق خود تسک کنترل می‌شود
+/// </summary>
+public class TaskChatMessage : EntityBase<Guid>
+{
+    private TaskChatMessage()
+    {
+    }
+
+    public TaskChatMessage(Guid taskId, long senderUserId, MessageType messageType,
+        string? textContent = null,Guid? fileId = null)
+    {
+        TaskId = taskId;
+        SenderUserId = senderUserId;
+        MessageType = messageType;
+        TextContent = textContent;
+        IsEdited = false;
+        IsDeleted = false;
+        IsPinned = false;
+        if (fileId.HasValue)
+        {
+            SetFile(fileId.Value);
+        }
+        ValidateMessage();
+        AddDomainEvent(new TaskChatMessageSentEvent(Id, taskId, senderUserId, messageType));
+    }
+
+    // Reference به Task (Foreign Key فقط - بدون Navigation Property برای جلوگیری از coupling)
+    public Guid TaskId { get; private set; }
+
+    public long SenderUserId { get; private set; }
+    
+    public MessageType MessageType { get; private set; }
+
+    // محتوای متنی (برای پیام‌های Text و Caption برای فایل/تصویر)
+    public string? TextContent { get; private set; }
+
+    // ارجاع به فایل (برای پیام‌های File, Voice, Image, Video)
+    public Guid? FileId { get; private set; }
+
+    // پیام Reply
+    public Guid? ReplyToMessageId { get; private set; }
+    public TaskChatMessage? ReplyToMessage { get; private set; }
+
+    // وضعیت پیام
+    public bool IsEdited { get; private set; }
+    public DateTime? EditedDate { get; private set; }
+    public bool IsDeleted { get; private set; }
+    public DateTime? DeletedDate { get; private set; }
+    public bool IsPinned { get; private set; }
+    public DateTime? PinnedDate { get; private set; }
+    public long? PinnedByUserId { get; private set; }
+
+    private void ValidateMessage()
+    {
+        // ✅ بررسی پیام‌های متنی
+        if (MessageType == MessageType.Text && string.IsNullOrWhiteSpace(TextContent))
+        {
+            throw new BadRequestException("پیام متنی نمی‌تواند خالی باشد");
+        }
+
+        // ✅ بررسی پیام‌های فایلی - باید FileId داشته باشند
+        if ((MessageType == MessageType.File || MessageType == MessageType.Voice || 
+             MessageType == MessageType.Image || MessageType == MessageType.Video) 
+            && FileId == null)
+        {
+            throw new BadRequestException("پیام‌های فایلی باید شناسه فایل داشته باشند");
+        }
+
+        // ✅ بررسی یادداشت‌های سیستم - باید محتوای متنی داشته باشند
+        if (MessageType == MessageType.Note && string.IsNullOrWhiteSpace(TextContent))
+        {
+            throw new BadRequestException("یادداشت نمی‌تواند خالی باشد");
+        }
+    }
+
+    public void SetFile(Guid fileId)
+    {
+        if (MessageType != MessageType.File && MessageType != MessageType.Image && 
+            MessageType != MessageType.Video && MessageType != MessageType.Voice)
+        {
+            throw new BadRequestException("فقط می‌توان برای پیام‌های فایل، تصویر، ویدیو و صدا شناسه فایل تنظیم کرد");
+        }
+
+        FileId = fileId;
+    }
+
+    public void EditMessage(string newTextContent, long editorUserId)
+    {
+        if (IsDeleted)
+        {
+            throw new BadRequestException("نمی‌توان پیام حذف شده را ویرایش کرد");
+        }
+
+        if (editorUserId != SenderUserId)
+        {
+            throw new BadRequestException("فقط فرستنده می‌تواند پیام را ویرایش کند");
+        }
+
+        if ((MessageType != MessageType.Text && !string.IsNullOrWhiteSpace(TextContent)))
+        {
+            throw new BadRequestException("فقط پیام‌های متنی قابل ویرایش هستند");
+        }
+
+        if (string.IsNullOrWhiteSpace(newTextContent))
+        {
+            throw new BadRequestException("محتوای پیام نمی‌تواند خالی باشد");
+        }
+
+        TextContent = newTextContent;
+        IsEdited = true;
+        EditedDate = DateTime.Now;
+        AddDomainEvent(new TaskChatMessageEditedEvent(Id, TaskId, editorUserId));
+    }
+
+    public void DeleteMessage(long deleterUserId)
+    {
+        if (IsDeleted)
+        {
+            throw new BadRequestException("پیام قبلاً حذف شده است");
+        }
+
+        if (deleterUserId != SenderUserId)
+        {
+            throw new BadRequestException("فقط فرستنده می‌تواند پیام را حذف کند");
+        }
+
+        IsDeleted = true;
+        DeletedDate = DateTime.Now;
+        AddDomainEvent(new TaskChatMessageDeletedEvent(Id, TaskId, deleterUserId));
+    }
+
+    public void PinMessage(long pinnerUserId)
+    {
+        if (IsDeleted)
+        {
+            throw new BadRequestException("نمی‌توان پیام حذف شده را پین کرد");
+        }
+
+        if (IsPinned)
+        {
+            throw new BadRequestException("این پیام قبلاً پین شده است");
+        }
+
+        IsPinned = true;
+        PinnedDate = DateTime.Now;
+        PinnedByUserId = pinnerUserId;
+        AddDomainEvent(new TaskChatMessagePinnedEvent(Id, TaskId, pinnerUserId));
+    }
+
+    public void UnpinMessage(long unpinnerUserId)
+    {
+        if (!IsPinned)
+        {
+            throw new BadRequestException("این پیام پین نشده است");
+        }
+
+        IsPinned = false;
+        PinnedDate = null;
+        PinnedByUserId = null;
+        AddDomainEvent(new TaskChatMessageUnpinnedEvent(Id, TaskId, unpinnerUserId));
+    }
+
+    public void SetReplyTo(Guid replyToMessageId)
+    {
+        ReplyToMessageId = replyToMessageId;
+    }
+
+    public bool IsSentBy(long userId)
+    {
+        return SenderUserId == userId;
+    }
+}
+

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/TaskChatAgg/Enums/MessageType.cs

@@ -0,0 +1,15 @@
+namespace GozareshgirProgramManager.Domain.TaskChatAgg.Enums;
+
+/// <summary>
+/// نوع پیام در چت تسک
+/// </summary>
+public enum MessageType
+{
+    Text = 1,        // پیام متنی
+    File = 2,        // فایل (اسناد، PDF، و غیره)
+    Image = 3,       // تصویر
+    Voice = 4,       // پیام صوتی
+    Video = 5,       // ویدیو
+    Note = 6,        // ✅ یادداشت سیستم (برای زمان اضافی و اطلاعات خودکار)
+}
+

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/TaskChatAgg/Events/TaskChatEvents.cs

@@ -0,0 +1,31 @@
+using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.TaskChatAgg.Enums;
+
+namespace GozareshgirProgramManager.Domain.TaskChatAgg.Events;
+
+// Message Events
+public record TaskChatMessageSentEvent(Guid MessageId, Guid TaskId, long SenderUserId, MessageType MessageType) : IDomainEvent
+{
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
+}
+
+public record TaskChatMessageEditedEvent(Guid MessageId, Guid TaskId, long EditorUserId) : IDomainEvent
+{
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
+}
+
+public record TaskChatMessageDeletedEvent(Guid MessageId, Guid TaskId, long DeleterUserId) : IDomainEvent
+{
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
+}
+
+public record TaskChatMessagePinnedEvent(Guid MessageId, Guid TaskId, long PinnerUserId) : IDomainEvent
+{
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
+}
+
+public record TaskChatMessageUnpinnedEvent(Guid MessageId, Guid TaskId, long UnpinnerUserId) : IDomainEvent
+{
+    public DateTime OccurredOn { get; init; } = DateTime.Now;
+}
+

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/TaskChatAgg/Repositories/ITaskChatMessageRepository.cs

@@ -0,0 +1,75 @@
+using GozareshgirProgramManager.Domain.TaskChatAgg.Entities;
+
+namespace GozareshgirProgramManager.Domain.TaskChatAgg.Repositories;
+
+/// <summary>
+/// Repository برای مدیریت پیام‌های چت تسک
+/// </summary>
+public interface ITaskChatMessageRepository
+{
+    /// <summary>
+    /// دریافت پیام بر اساس شناسه
+    /// </summary>
+    Task<TaskChatMessage?> GetByIdAsync(Guid messageId);
+
+    /// <summary>
+    /// دریافت لیست پیام‌های یک تسک (با صفحه‌بندی)
+    /// </summary>
+    Task<List<TaskChatMessage>> GetTaskMessagesAsync(Guid taskId, int pageNumber, int pageSize);
+
+    /// <summary>
+    /// دریافت تعداد کل پیام‌های یک تسک
+    /// </summary>
+    Task<int> GetTaskMessageCountAsync(Guid taskId);
+
+    /// <summary>
+    /// دریافت پیام‌های پین شده یک تسک
+    /// </summary>
+    Task<List<TaskChatMessage>> GetPinnedMessagesAsync(Guid taskId);
+
+    /// <summary>
+    /// دریافت آخرین پیام یک تسک
+    /// </summary>
+    Task<TaskChatMessage?> GetLastMessageAsync(Guid taskId);
+
+    /// <summary>
+    /// جستجو در پیام‌های یک تسک
+    /// </summary>
+    Task<List<TaskChatMessage>> SearchMessagesAsync(Guid taskId, string searchText, int pageNumber, int pageSize);
+
+    /// <summary>
+    /// دریافت پیام‌های یک کاربر خاص در یک تسک
+    /// </summary>
+    Task<List<TaskChatMessage>> GetUserMessagesAsync(Guid taskId, long userId, int pageNumber, int pageSize);
+
+    /// <summary>
+    /// دریافت پیام‌های با فایل (تصویر، ویدیو، فایل و...) - پیام‌هایی که FileId دارند
+    /// </summary>
+    Task<List<TaskChatMessage>> GetMediaMessagesAsync(Guid taskId, int pageNumber, int pageSize);
+
+    /// <summary>
+    /// اضافه کردن پیام جدید
+    /// </summary>
+    Task<TaskChatMessage> AddAsync(TaskChatMessage message);
+
+    /// <summary>
+    /// به‌روزرسانی پیام
+    /// </summary>
+    Task UpdateAsync(TaskChatMessage message);
+
+    /// <summary>
+    /// حذف فیزیکی پیام (در صورت نیاز - معمولاً استفاده نمی‌شود)
+    /// </summary>
+    Task DeleteAsync(TaskChatMessage message);
+
+    /// <summary>
+    /// ذخیره تغییرات
+    /// </summary>
+    Task<int> SaveChangesAsync();
+
+    /// <summary>
+    /// بررسی وجود پیام
+    /// </summary>
+    Task<bool> ExistsAsync(Guid messageId);
+}
+

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/DependencyInjection.cs

@@ -4,9 +4,11 @@
 using FluentValidation;
 using GozareshgirProgramManager.Application._Common.Behaviors;
 using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application.Services.FileManagement;
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain.CheckoutAgg.Repositories;
 using GozareshgirProgramManager.Domain.CustomerAgg.Repositories;
+using GozareshgirProgramManager.Domain.FileManagementAgg.Repositories;
 using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 using GozareshgirProgramManager.Domain.RoleAgg.Repositories;
 using GozareshgirProgramManager.Domain.RoleAgg.Repositories;
@@ -14,6 +16,7 @@ using GozareshgirProgramManager.Domain.SalaryPaymentSettingAgg.Repositories;
 using GozareshgirProgramManager.Domain.SalaryPaymentSettingAgg.Repositories;
 using GozareshgirProgramManager.Domain.SkillAgg.Repositories;
 using GozareshgirProgramManager.Domain.SkillAgg.Repositories;
+using GozareshgirProgramManager.Domain.TaskChatAgg.Repositories;
 using GozareshgirProgramManager.Domain.UserAgg.Repositories;
 using GozareshgirProgramManager.Infrastructure.Persistence;
 using GozareshgirProgramManager.Infrastructure.Persistence.Context;
@@ -82,6 +85,14 @@ public static class DependencyInjection
         
         services.AddScoped<IUserRefreshTokenRepository, UserRefreshTokenRepository>();
 
+        // File Management & Task Chat
+        services.AddScoped<IUploadedFileRepository, Persistence.Repositories.FileManagement.UploadedFileRepository>();
+        services.AddScoped<ITaskChatMessageRepository, Persistence.Repositories.TaskChat.TaskChatMessageRepository>();
+        
+        // File Storage Services
+        services.AddScoped<IFileStorageService, Services.FileManagement.LocalFileStorageService>();
+        services.AddScoped<IThumbnailGeneratorService, Services.FileManagement.ThumbnailGeneratorService>();
+
         // JWT Settings
         services.Configure<JwtSettings>(configuration.GetSection("JwtSettings"));