some changes

APP_SIZE_OPTIMIZATION.md

@@ -0,0 +1,193 @@
+# راهنمای کاهش حجم اپلیکیشن Flutter
+
+## چرا حجم اپ زیاد می‌شه؟
+
+### 1. **Assets (تصاویر و آیکون‌ها)**
+- هر فایل تصویر/آیکون که از Figma اضافه می‌کنید، مستقیماً به حجم اپ اضافه می‌شه
+- در حال حاضر شما **119 SVG** و **119 VEC** دارید (احتمالاً تکراری!)
+- همه assets در `pubspec.yaml` به صورت کلی اضافه شدن (`assets/icons/`)
+
+### 2. **کد Dart**
+- خود کد Dart حجم کمی داره
+- اما dependencies و packages حجم زیادی اضافه می‌کنن
+- کدهای generate شده (freezed, json_serializable) هم حجم دارن
+
+### 3. **مشکلات فعلی پروژه:**
+- ✅ **تکرار assets**: هم SVG و هم VEC دارید
+- ❌ **عدم بهینه‌سازی تصاویر**: PNG به جای WebP
+- ❌ **شامل شدن همه assets**: حتی اونایی که استفاده نمی‌شن
+
+---
+
+## راه‌حل‌ها
+
+### ✅ 1. حذف Assets تکراری
+
+**مشکل**: شما هم `assets/icons/*.svg` و هم `assets/vec/*.svg.vec` دارید
+
+**راه‌حل**: 
+- اگر از VEC استفاده می‌کنید، SVG ها رو حذف کنید
+- یا برعکس، اگر SVG استفاده می‌کنید، VEC ها رو حذف کنید
+
+### ✅ 2. بهینه‌سازی تصاویر
+
+**قبل از اضافه کردن از Figma:**
+1. تصاویر رو به **WebP** تبدیل کنید (حجم 30-50% کمتر)
+2. از ابزارهای فشرده‌سازی استفاده کنید:
+   - [TinyPNG](https://tinypng.com/) برای PNG
+   - [Squoosh](https://squoosh.app/) برای همه فرمت‌ها
+
+**تبدیل PNG به WebP:**
+```bash
+# نصب cwebp (Google WebP tools)
+# سپس:
+cwebp -q 80 input.png -o output.webp
+```
+
+### ✅ 3. حذف Assets استفاده نشده
+
+**استفاده از ابزار:**
+```bash
+# نصب flutter_unused_assets
+dart pub global activate flutter_unused_assets
+
+# بررسی assets استفاده نشده
+flutter_unused_assets
+```
+
+### ✅ 4. بهینه‌سازی pubspec.yaml
+
+**به جای:**
+```yaml
+assets:
+  - assets/icons/      # همه فایل‌ها
+  - assets/images/
+```
+
+**استفاده کنید:**
+```yaml
+assets:
+  - assets/icons/add.svg          # فقط فایل‌های استفاده شده
+  - assets/icons/home.svg
+  - assets/images/inner_splash.webp
+```
+
+### ✅ 5. استفاده از Asset Variants
+
+برای تصاویر بزرگ، از variants استفاده کنید:
+```
+assets/images/
+  splash.png          # برای density 1.0
+  2.0x/splash.png     # برای density 2.0
+  3.0x/splash.png     # برای density 3.0
+```
+
+### ✅ 6. Lazy Loading برای Assets بزرگ
+
+برای تصاویر بزرگ که همیشه استفاده نمی‌شن:
+```dart
+// به جای Image.asset
+FutureBuilder(
+  future: rootBundle.load('assets/images/large_image.webp'),
+  builder: (context, snapshot) {
+    if (snapshot.hasData) {
+      return Image.memory(snapshot.data!);
+    }
+    return CircularProgressIndicator();
+  },
+)
+```
+
+### ✅ 7. بهینه‌سازی Build
+
+در `android/app/build.gradle.kts` شما این تنظیمات رو دارید (خوبه!):
+```kotlin
+isMinifyEnabled = true
+isShrinkResources = true
+```
+
+اما می‌تونید اضافه کنید:
+```kotlin
+buildTypes {
+    release {
+        // ...
+        // اضافه کردن این خط:
+        isDebuggable = false
+    }
+}
+```
+
+---
+
+## چک‌لیست قبل از اضافه کردن Asset از Figma
+
+- [ ] آیا این asset قبلاً وجود داره؟
+- [ ] آیا واقعاً نیاز به این asset دارم؟
+- [ ] آیا می‌تونم از asset موجود استفاده کنم؟
+- [ ] آیا تصویر رو به WebP تبدیل کردم؟
+- [ ] آیا تصویر رو فشرده کردم؟
+- [ ] آیا فقط فایل‌های لازم رو به pubspec.yaml اضافه کردم؟
+
+---
+
+## ابزارهای مفید
+
+1. **بررسی حجم اپ:**
+   ```bash
+   flutter build apk --analyze-size
+   ```
+
+2. **بررسی Assets استفاده نشده:**
+   ```bash
+   flutter_unused_assets
+   ```
+
+3. **فشرده‌سازی تصاویر:**
+   - [TinyPNG](https://tinypng.com/)
+   - [Squoosh](https://squoosh.app/)
+   - [ImageOptim](https://imageoptim.com/)
+
+4. **تبدیل فرمت:**
+   - PNG → WebP: [CloudConvert](https://cloudconvert.com/)
+   - SVG → Optimized SVG: [SVGOMG](https://jakearchibald.github.io/svgomg/)
+
+---
+
+## نکات مهم
+
+1. **همیشه از WebP استفاده کنید** به جای PNG/JPG (حجم 30-50% کمتر)
+2. **SVG ها رو optimize کنید** قبل از اضافه کردن
+3. **Assets استفاده نشده رو حذف کنید** به صورت منظم
+4. **از Asset Variants استفاده کنید** برای تصاویر با resolution بالا
+5. **Build Release رو بررسی کنید** نه Debug (Debug حجم بیشتری داره)
+
+---
+
+## مثال: کاهش حجم
+
+**قبل:**
+- 119 SVG × 10KB = ~1.2 MB
+- 119 VEC × 8KB = ~950 KB
+- **جمع: ~2.15 MB فقط برای آیکون‌ها!**
+
+**بعد از بهینه‌سازی:**
+- حذف تکرار: فقط 119 فایل = ~1 MB
+- بهینه‌سازی SVG: ~500 KB
+- **صرفه‌جویی: ~1.65 MB!**
+
+---
+
+## سوالات متداول
+
+**Q: چرا با اضافه کردن 50 صفحه Dart حجم زیاد می‌شه؟**
+A: خود کد Dart حجم کمی داره، اما:
+- Dependencies جدید اضافه می‌شن
+- Assets جدید برای صفحات اضافه می‌شن
+- Build artifacts بیشتر می‌شن
+
+**Q: آیا باید همه assets رو حذف کنم؟**
+A: نه! فقط اونایی که استفاده نمی‌شن رو حذف کنید.
+
+**Q: چطور بفهمم کدوم assets استفاده نمی‌شن؟**
+A: از `flutter_unused_assets` استفاده کنید یا به صورت دستی جستجو کنید.
+

android/build.gradle.kts

@@ -2,6 +2,7 @@ allprojects {
     repositories {
         google()
         mavenCentral()
+        maven { url = uri("https://archive.ito.gov.ir/gradle/maven_central/") }
     }
 }
 

android/local.properties

@@ -1,5 +1,5 @@
 sdk.dir=C:\\Users\\Housh11\\AppData\\Local\\Android\\sdk
 flutter.sdk=C:\\src\\flutter
-flutter.buildMode=release
-flutter.versionName=1.3.34
-flutter.versionCode=31
+flutter.buildMode=debug
+flutter.versionName=1.3.42
+flutter.versionCode=38

android/settings.gradle.kts

@@ -10,9 +10,10 @@ pluginManagement {
     includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
     repositories {
-        google()
-        mavenCentral()
-        gradlePluginPortal()
+                google()
+                mavenCentral()
+                gradlePluginPortal()
+        maven { url = uri("https://archive.ito.gov.ir/gradle/maven_central/") }
     }
 }
 

devtools_options.yaml

@@ -2,3 +2,5 @@ description: This file stores settings for Dart & Flutter DevTools.
 documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
 extensions:
   - hive_ce: true
+  - provider: true
+  - shared_preferences: true

lib/infrastructure/utils/local_storage_utils.dart

@@ -1,6 +1,6 @@
 import 'package:rasadyar_app/presentation/routes/app_pages.dart';
 import 'package:rasadyar_chicken/data/di/chicken_di.dart';
-import 'package:rasadyar_chicken/presentation/routes/routes.dart';
+import 'package:rasadyar_chicken/features/steward/presentation/routes/routes.dart';
 import 'package:rasadyar_core/core.dart';
 import 'package:rasadyar_inspection/injection/inspection_di.dart';
 import 'package:rasadyar_inspection/inspection.dart';
@@ -22,7 +22,7 @@ Future<void> seedTargetPage() async {
         functions: ["setupLiveStockDI"],
       ),
       TargetPage(
-        route: ChickenRoutes.initSteward,
+        route: StewardRoutes.initSteward,
         module: Module.chicken,
         functions: ["setupChickenDI"],
       ),

lib/presentation/pages/splash/logic.dart

@@ -1,5 +1,6 @@
 import 'dart:io';
 
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:rasadyar_app/data/model/app_info_model.dart';
@@ -35,9 +36,15 @@ class SplashLogic extends GetxController with GetTickerProviderStateMixin {
       duration: const Duration(milliseconds: 8000),
     );
 
-    scaleAnimation.value = Tween<double>(begin: 0.8, end: 1.2).animate(scaleController);
+    scaleAnimation.value = Tween<double>(
+      begin: 0.8,
+      end: 1.2,
+    ).animate(scaleController);
 
-    rotationAnimation.value = Tween<double>(begin: 0.0, end: 1).animate(rotateController);
+    rotationAnimation.value = Tween<double>(
+      begin: 0.0,
+      end: 1,
+    ).animate(rotateController);
 
     rotateController.forward();
     rotateController.addStatusListener((status) {
@@ -152,8 +159,10 @@ class SplashLogic extends GetxController with GetTickerProviderStateMixin {
 
     Future.delayed(const Duration(milliseconds: 250), () async {
       try {
-        final isUpdateNeeded = await checkVersion();
-        if (isUpdateNeeded) return;
+        if (!kDebugMode) {
+          final isUpdateNeeded = await checkVersion();
+          if (isUpdateNeeded) return;
+        }
 
         final module = gService.getSelectedModule();
         final target = gService.getTargetPage(module);
@@ -164,8 +173,6 @@ class SplashLogic extends GetxController with GetTickerProviderStateMixin {
         if (target != null) {
           var mFuns = getFunctionsList(target.functions);
           await Future.wait(mFuns ?? []);
-
-          iLog("target.route ===>${target.route!}");
           Get.offAndToNamed(target.route!);
         }
       } catch (e, st) {
@@ -185,7 +192,9 @@ class SplashLogic extends GetxController with GetTickerProviderStateMixin {
     try {
       final info = await PackageInfo.fromPlatform();
       int version = info.version.versionNumber;
-      var res = await _dio.get("https://rsibackend.rasadyar.com/app/rasadyar-app-info/");
+      var res = await _dio.get(
+        "https://rsibackend.rasadyar.com/app/rasadyar-app-info/",
+      );
 
       appInfoModel = AppInfoModel.fromJson(res.data);
 
@@ -244,7 +253,9 @@ class SplashLogic extends GetxController with GetTickerProviderStateMixin {
   Future<void> installApk() async {
     try {
       eLog(_updateFilePath.value);
-      await platform.invokeMethod('apk_installer', {'appPath': _updateFilePath.value});
+      await platform.invokeMethod('apk_installer', {
+        'appPath': _updateFilePath.value,
+      });
     } catch (e) {
       eLog(e);
     }

output.json

@@ -0,0 +1,74 @@
+{
+  "lat": 35.8245784,
+  "log": 50.9479516,
+  "hatching_id": 4560,
+  "role": "SuperAdmin",
+  "report_information": {
+    "general_condition_hall": {
+      "images": [
+        "https://s3.rasadyar.com/rasadyar/202512141551550.jpg",
+        "https://s3.rasadyar.com/rasadyar/202512141551560.jpg"
+      ],
+      "health_status": "عالی",
+      "ventilation_status": "عالی",
+      "bed_condition": "خشک",
+      "temperature": 25,
+      "drinking_water_source": null,
+      "drinking_water_quality": null
+    },
+    "casualties": {
+      "normal_losses": null,
+      "abnormal_losses": null,
+      "source_of_hatching": null,
+      "cause_abnormal_losses": null,
+      "type_disease": null,
+      "sampling_done": null,
+      "type_sampling": null,
+      "images": null
+    },
+    "technical_officer": {
+      "technical_health_officer": "",
+      "technical_engineering_officer": ""
+    },
+    "input_status": {
+      "input_status": null,
+      "company_name": null,
+      "tracking_code": "",
+      "type_of_grain": null,
+      "inventory_in_warehouse": "",
+      "inventory_until_visit": "",
+      "grade_grain": null,
+      "images": null
+    },
+    "infrastructure_energy": {
+      "generator_type": "",
+      "generator_model": "",
+      "generator_count": "",
+      "generator_capacity": "",
+      "fuel_type": null,
+      "generator_performance": null,
+      "emergency_fuel_inventory": "",
+      "has_power_cut_history": null,
+      "power_cut_duration": "",
+      "power_cut_hour": "",
+      "additional_notes": ""
+    },
+    "hr": {
+      "number_employed": null,
+      "number_indigenous": null,
+      "number_non_indigenous": null,
+      "contract_status": null,
+      "trained": null
+    },
+    "facilities": {
+      "has_facilities": null,
+      "type_of_facility": null,
+      "amount": null,
+      "date": null,
+      "repayment_status": null,
+      "request_facilities": null
+    },
+    "inspection_status": "تایید شده",
+    "inspection_notes": "تست"
+  }
+}

packages/chicken/build/native_assets/windows/native_assets.json

@@ -1 +0,0 @@
-{"format-version":[1,0,0],"native-assets":{}}

packages/chicken/build/unit_test_assets/AssetManifest.bin

@@ -1 +0,0 @@
-

packages/chicken/build/unit_test_assets/AssetManifest.json

@@ -1 +0,0 @@
-{"packages/cupertino_icons/assets/CupertinoIcons.ttf":["packages/cupertino_icons/assets/CupertinoIcons.ttf"],"packages/flutter_map/lib/assets/flutter_map_logo.png":["packages/flutter_map/lib/assets/flutter_map_logo.png"]}

packages/chicken/build/unit_test_assets/FontManifest.json

@@ -1 +0,0 @@
-[{"family":"packages/cupertino_icons/CupertinoIcons","fonts":[{"asset":"packages/cupertino_icons/assets/CupertinoIcons.ttf"}]}]

packages/chicken/build/unit_test_assets/NativeAssetsManifest.json

@@ -1 +0,0 @@
-{"format-version":[1,0,0],"native-assets":{}}

packages/chicken/devtools_options.yaml

@@ -2,3 +2,5 @@ description: This file stores settings for Dart & Flutter DevTools.
 documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
 extensions:
   - hive_ce: true
+  - provider: true
+  - shared_preferences: true

packages/chicken/lib/data/common/fa_user_role.dart

@@ -1,3 +1,12 @@
+import 'package:rasadyar_chicken/features/city_jahad/presentation/routes/routes.dart';
+import 'package:rasadyar_chicken/features/poultry_science/presentation/routes/routes.dart';
+import 'package:rasadyar_chicken/features/province_inspector/presentation/routes/routes.dart';
+import 'package:rasadyar_chicken/features/province_operator/presentation/routes/routes.dart';
+import 'package:rasadyar_chicken/features/province_supervisor/presentation/routes/routes.dart';
+import 'package:rasadyar_chicken/features/steward/presentation/routes/routes.dart';
+import 'package:rasadyar_chicken/features/super_admin/presentation/routes/routes.dart';
+import 'package:rasadyar_chicken/features/jahad/presentation/routes/routes.dart';
+import 'package:rasadyar_chicken/features/vet_farm/presentation/routes/routes.dart';
 import 'package:rasadyar_chicken/presentation/routes/routes.dart';
 
 String getFaUserRole(String? role) {
@@ -88,7 +97,7 @@ Map<String, String?> getFaUserRoleWithOnTap(String? role) {
     case "Poultry":
       return {"مرغدار": null};
     case "ProvinceOperator":
-      return {"مدیر اجرایی": null};
+      return {"مدیر اجرایی": ProvinceOperatorRoutes.initProvinceOperator};
     case "ProvinceFinancial":
       return {"مالی اتحادیه": null};
     case "KillHouse":
@@ -96,17 +105,17 @@ Map<String, String?> getFaUserRoleWithOnTap(String? role) {
     case "KillHouseVet":
       return {"دامپزشک کشتارگاه": null};
     case "VetFarm":
-      return {"دامپزشک فارم": null};
+      return {"دامپزشک فارم": VetFarmRoutes.initVetFarm};
     case "Driver":
       return {"راننده": null};
     case "ProvinceInspector":
-      return {"بازرس اتحادیه": null};
+      return {"بازرس اتحادیه": ProvinceInspectorRoutes.initProvinceInspector};
     case "VetSupervisor":
       return {"دامپزشک کل": null};
     case "Jahad":
-      return {"جهاد کشاورزی استان": null};
+      return {"جهاد کشاورزی استان": JahadRoutes.initJahad};
     case "CityJahad":
-      return {"جهاد کشاورزی شهرستان": null};
+      return {"جهاد کشاورزی شهرستان": CityJahadRoutes.initCityJahad};
     case "ProvincialGovernment":
       return {"استانداری": null};
     case "Guilds":
@@ -122,7 +131,7 @@ Map<String, String?> getFaUserRoleWithOnTap(String? role) {
     case "Observatory":
       return {"رصدخانه": null};
     case "ProvinceSupervisor":
-      return {"ناظر استان": null};
+      return {"ناظر استان": ProvinceSupervisorRoutes.initProvinceSupervisor};
     case "GuildRoom":
       return {"اتاق اصناف": null};
     case "PosCompany":
@@ -130,7 +139,7 @@ Map<String, String?> getFaUserRoleWithOnTap(String? role) {
     case "LiveStockSupport":
       return {"پشتیبانی امور دام": null};
     case "SuperAdmin":
-      return {"ادمین کل": null};
+      return {"ادمین کل": SuperAdminRoutes.initSuperAdmin};
     case "ChainCompany":
       return {"شرکت زنجیره": null};
     case "AdminX":
@@ -150,9 +159,9 @@ Map<String, String?> getFaUserRoleWithOnTap(String? role) {
     case "LiveStockProvinceJahad":
       return {"جهاد استان": null};
     case "Steward":
-      return {"مباشر": ChickenRoutes.initSteward};
+      return {"مباشر": StewardRoutes.initSteward};
     case "PoultryScience":
-      return {"کارشناس طیور": ChickenRoutes.initPoultryScience};
+      return {"کارشناس طیور": PoultryScienceRoutes.initPoultryScience};
     default:
       return {"نامشخص": null};
   }

packages/chicken/lib/data/data_source/remote/chicken/chicken_remote.dart

@@ -1,180 +0,0 @@
-import 'package:rasadyar_chicken/data/models/request/change_password/change_password_request_model.dart';
-import 'package:rasadyar_chicken/data/models/request/conform_allocation/conform_allocation.dart';
-import 'package:rasadyar_chicken/data/models/request/create_steward_free_bar/create_steward_free_bar.dart';
-import 'package:rasadyar_chicken/data/models/request/steward_free_sale_bar/steward_free_sale_bar_request.dart';
-import 'package:rasadyar_chicken/data/models/request/submit_steward_allocation/submit_steward_allocation.dart';
-import 'package:rasadyar_chicken/data/models/response/allocated_made/allocated_made.dart';
-import 'package:rasadyar_chicken/data/models/response/bar_information/bar_information.dart';
-import 'package:rasadyar_chicken/data/models/response/broadcast_price/broadcast_price.dart';
-import 'package:rasadyar_chicken/data/models/response/dashboard_kill_house_free_bar/dashboard_kill_house_free_bar.dart';
-import 'package:rasadyar_chicken/data/models/response/guild/guild_model.dart';
-import 'package:rasadyar_chicken/data/models/response/guild_profile/guild_profile.dart';
-import 'package:rasadyar_chicken/data/models/response/imported_loads_model/imported_loads_model.dart';
-import 'package:rasadyar_chicken/data/models/response/inventory/inventory_model.dart';
-import 'package:rasadyar_chicken/data/models/response/iran_province_city/iran_province_city_model.dart';
-import 'package:rasadyar_chicken/data/models/response/kill_house_distribution_info/kill_house_distribution_info.dart';
-import 'package:rasadyar_chicken/data/models/response/out_province_carcasses_buyer/out_province_carcasses_buyer.dart';
-import 'package:rasadyar_chicken/data/models/response/roles_products/roles_products.dart';
-import 'package:rasadyar_chicken/data/models/response/segmentation_model/segmentation_model.dart';
-import 'package:rasadyar_chicken/data/models/response/steward_free_bar/steward_free_bar.dart';
-import 'package:rasadyar_chicken/data/models/response/steward_free_bar_dashboard/steward_free_bar_dashboard.dart';
-import 'package:rasadyar_chicken/data/models/response/steward_free_sale_bar/steward_free_sale_bar.dart';
-import 'package:rasadyar_chicken/data/models/response/steward_remain_weight/steward_remain_weight.dart';
-import 'package:rasadyar_chicken/data/models/response/steward_sales_info_dashboard/steward_sales_info_dashboard.dart';
-import 'package:rasadyar_chicken/data/models/response/user_profile/user_profile.dart';
-import 'package:rasadyar_chicken/data/models/response/waiting_arrival/waiting_arrival.dart'
-    hide ProductModel;
-import 'package:rasadyar_core/core.dart';
-
-abstract class ChickenRemoteDatasource {
-  Future<List<InventoryModel>?> getInventory({required String token, CancelToken? cancelToken});
-
-  Future<KillHouseDistributionInfo?> getKillHouseDistributionInfo({required String token});
-
-  Future<BarInformation?> getGeneralBarInformation({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<PaginationModel<WaitingArrivalModel>?> getWaitingArrivals({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<void> setSateForArrivals({required String token, required Map<String, dynamic> request});
-
-  Future<PaginationModel<ImportedLoadsModel>?> getImportedLoadsModel({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<PaginationModel<AllocatedMadeModel>?> getAllocatedMade({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<void> confirmAllocation({required String token, required Map<String, dynamic> allocation});
-
-  Future<void> denyAllocation({required String token, required String allocationToken});
-
-  Future<void> confirmAllAllocation({
-    required String token,
-    required List<String> allocationTokens,
-  });
-
-  Future<List<ProductModel>?> getRolesProducts({required String token});
-
-  Future<List<GuildModel>?> getGuilds({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<GuildProfile?> getProfile({required String token});
-
-  Future<void> postSubmitStewardAllocation({
-    required String token,
-    required SubmitStewardAllocation request,
-  });
-
-  Future<void> deleteStewardAllocation({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<void> updateStewardAllocation({required String token, required ConformAllocation request});
-
-  Future<StewardFreeBarDashboard?> getStewardDashboard({
-    required String token,
-    required String stratDate,
-    required String endDate,
-  });
-
-  Future<DashboardKillHouseFreeBar?> getDashboardKillHouseFreeBar({
-    required String token,
-    required String stratDate,
-    required String endDate,
-  });
-
-  Future<PaginationModel<StewardFreeBar>?> getStewardPurchasesOutSideOfTheProvince({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<void> createStewardPurchasesOutSideOfTheProvince({
-    required String token,
-    required CreateStewardFreeBar body,
-  });
-
-  Future<void> deleteStewardPurchasesOutSideOfTheProvince({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<CreateStewardFreeBar?> editStewardPurchasesOutSideOfTheProvince({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-
-  Future<PaginationModel<OutProvinceCarcassesBuyer>?> getOutProvinceCarcassesBuyer({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<void> createOutProvinceCarcassesBuyer({
-    required String token,
-    required OutProvinceCarcassesBuyer body,
-  });
-
-  Future<List<IranProvinceCityModel>?> getProvince({CancelToken? cancelToken});
-
-  Future<List<IranProvinceCityModel>?> getCity({required String provinceName});
-
-  Future<PaginationModel<StewardFreeSaleBar>?> getStewardFreeSaleBar({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<void> createOutProvinceStewardFreeBar({
-    required String token,
-    required StewardFreeSaleBarRequest body,
-  });
-
-  Future<void> updateOutProvinceStewardFreeBar({
-    required String token,
-    required StewardFreeSaleBarRequest body,
-  });
-
-
-  Future<void> deleteOutProvinceStewardFreeBar({
-    required String token,
-    required String key
-  });
-
-
-  Future<UserProfile?> getUserProfile({required String token});
-
-  Future<void> updateUserProfile({required String token, required UserProfile userProfile});
-
-  Future<void> updatePassword({required String token, required ChangePasswordRequestModel model});
-
-  Future<PaginationModel<SegmentationModel>?> getSegmentation({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<void> createSegmentation({required String token, required SegmentationModel model});
-
-  Future<void> editSegmentation({required String token, required SegmentationModel model});
-
-  Future<SegmentationModel?> deleteSegmentation({required String token, required String key});
-
-  Future<BroadcastPrice?> getBroadcastPrice({required String token});
-
-  Future<StewardSalesInfoDashboard?> getStewardSalesInfoDashboard({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<StewardRemainWeight?> getStewardRemainWeight({required String token});
-}

packages/chicken/lib/data/data_source/remote/chicken/chicken_remote_imp.dart

@@ -1,548 +0,0 @@
-import 'package:rasadyar_chicken/data/models/request/change_password/change_password_request_model.dart';
-import 'package:rasadyar_chicken/data/models/request/conform_allocation/conform_allocation.dart';
-import 'package:rasadyar_chicken/data/models/request/create_steward_free_bar/create_steward_free_bar.dart';
-import 'package:rasadyar_chicken/data/models/request/steward_free_sale_bar/steward_free_sale_bar_request.dart';
-import 'package:rasadyar_chicken/data/models/request/submit_steward_allocation/submit_steward_allocation.dart';
-import 'package:rasadyar_chicken/data/models/response/allocated_made/allocated_made.dart';
-import 'package:rasadyar_chicken/data/models/response/bar_information/bar_information.dart';
-import 'package:rasadyar_chicken/data/models/response/broadcast_price/broadcast_price.dart';
-import 'package:rasadyar_chicken/data/models/response/dashboard_kill_house_free_bar/dashboard_kill_house_free_bar.dart';
-import 'package:rasadyar_chicken/data/models/response/guild/guild_model.dart';
-import 'package:rasadyar_chicken/data/models/response/guild_profile/guild_profile.dart';
-import 'package:rasadyar_chicken/data/models/response/imported_loads_model/imported_loads_model.dart';
-import 'package:rasadyar_chicken/data/models/response/inventory/inventory_model.dart';
-import 'package:rasadyar_chicken/data/models/response/iran_province_city/iran_province_city_model.dart';
-import 'package:rasadyar_chicken/data/models/response/kill_house_distribution_info/kill_house_distribution_info.dart';
-import 'package:rasadyar_chicken/data/models/response/out_province_carcasses_buyer/out_province_carcasses_buyer.dart';
-import 'package:rasadyar_chicken/data/models/response/roles_products/roles_products.dart';
-import 'package:rasadyar_chicken/data/models/response/segmentation_model/segmentation_model.dart';
-import 'package:rasadyar_chicken/data/models/response/steward_free_bar/steward_free_bar.dart';
-import 'package:rasadyar_chicken/data/models/response/steward_free_bar_dashboard/steward_free_bar_dashboard.dart';
-import 'package:rasadyar_chicken/data/models/response/steward_free_sale_bar/steward_free_sale_bar.dart';
-import 'package:rasadyar_chicken/data/models/response/steward_remain_weight/steward_remain_weight.dart';
-import 'package:rasadyar_chicken/data/models/response/steward_sales_info_dashboard/steward_sales_info_dashboard.dart';
-import 'package:rasadyar_chicken/data/models/response/user_profile/user_profile.dart';
-import 'package:rasadyar_chicken/data/models/response/waiting_arrival/waiting_arrival.dart'
-    hide ProductModel;
-import 'package:rasadyar_core/core.dart';
-
-import 'chicken_remote.dart';
-
-class ChickenRemoteDatasourceImp implements ChickenRemoteDatasource {
-  final DioRemote _httpClient;
-
-  ChickenRemoteDatasourceImp(this._httpClient);
-
-  @override
-  Future<List<InventoryModel>?> getInventory({
-    required String token,
-    CancelToken? cancelToken,
-  }) async {
-    var res = await _httpClient.get(
-      '/roles-products/?role=Steward',
-      headers: {'Authorization': 'Bearer $token'},
-
-      fromJsonList: (json) =>
-          (json).map((item) => InventoryModel.fromJson(item as Map<String, dynamic>)).toList(),
-    );
-
-    return res.data;
-  }
-
-  @override
-  Future<KillHouseDistributionInfo?> getKillHouseDistributionInfo({required String token}) async {
-    var res = await _httpClient.get(
-      '/kill-house-distribution-info/?role=Steward',
-      headers: {'Authorization': 'Bearer $token'},
-      fromJson: KillHouseDistributionInfo.fromJson,
-    );
-
-    return res.data;
-  }
-
-  @override
-  Future<BarInformation?> getGeneralBarInformation({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    var res = await _httpClient.get(
-      '/bars_for_kill_house_dashboard/',
-      queryParameters: queryParameters,
-      headers: {'Authorization': 'Bearer $token'},
-      fromJson: BarInformation.fromJson,
-    );
-    return res.data;
-  }
-
-  @override
-  Future<PaginationModel<WaitingArrivalModel>?> getWaitingArrivals({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    var res = await _httpClient.get(
-      '/steward-allocation/',
-      headers: {'Authorization': 'Bearer $token'},
-      queryParameters: queryParameters,
-      fromJson: (json) => PaginationModel<WaitingArrivalModel>.fromJson(
-        json,
-        (json) => WaitingArrivalModel.fromJson(json as Map<String, dynamic>),
-      ),
-    );
-    return res.data;
-  }
-
-  @override
-  Future<void> setSateForArrivals({
-    required String token,
-    required Map<String, dynamic> request,
-  }) async {
-    await _httpClient.put(
-      '/steward-allocation/0/',
-      headers: {'Authorization': 'Bearer $token'},
-      data: request,
-    );
-  }
-
-  @override
-  Future<PaginationModel<ImportedLoadsModel>?> getImportedLoadsModel({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    var res = await _httpClient.get(
-      '/steward-allocation/',
-      queryParameters: queryParameters,
-      headers: {'Authorization': 'Bearer $token'},
-      fromJson: (json) => PaginationModel.fromJson(
-        json,
-        (data) => ImportedLoadsModel.fromJson(data as Map<String, dynamic>),
-      ),
-    );
-    return res.data;
-  }
-
-  @override
-  Future<PaginationModel<AllocatedMadeModel>?> getAllocatedMade({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    var res = await _httpClient.get(
-      '/steward-allocation/',
-      queryParameters: queryParameters,
-      headers: {'Authorization': 'Bearer $token'},
-      fromJson: (json) => PaginationModel<AllocatedMadeModel>.fromJson(
-        json,
-        (json) => AllocatedMadeModel.fromJson(json as Map<String, dynamic>),
-      ),
-    );
-    return res.data;
-  }
-
-  @override
-  Future<void> confirmAllocation({
-    required String token,
-    required Map<String, dynamic> allocation,
-  }) async {
-    await _httpClient.put(
-      '/steward-allocation/0/',
-      headers: {'Authorization': 'Bearer $token'},
-      data: allocation,
-    );
-  }
-
-  @override
-  Future<void> denyAllocation({required String token, required String allocationToken}) async {
-    await _httpClient.delete(
-      '/steward-allocation/0/?steward_allocation_key=$allocationToken',
-      headers: {'Authorization': 'Bearer $token'},
-    );
-  }
-
-  @override
-  Future<void> confirmAllAllocation({
-    required String token,
-    required List<String> allocationTokens,
-  }) async {
-    await _httpClient.put(
-      '/steward-allocation/0/',
-      headers: {'Authorization': 'Bearer $token'},
-      data: {'steward_allocation_list': allocationTokens},
-    );
-  }
-
-  @override
-  Future<List<ProductModel>?> getRolesProducts({required String token}) async {
-    var res = await _httpClient.get(
-      '/roles-products/?role=Steward',
-      headers: {'Authorization': 'Bearer $token'},
-      fromJsonList: (json) =>
-          json.map((item) => ProductModel.fromJson(item as Map<String, dynamic>)).toList(),
-    );
-    return res.data;
-  }
-
-  @override
-  Future<List<GuildModel>?> getGuilds({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    var res = await _httpClient.get(
-      '/guilds/',
-      queryParameters: queryParameters,
-      headers: {'Authorization': 'Bearer $token'},
-      fromJsonList: (json) =>
-          json.map((item) => GuildModel.fromJson(item as Map<String, dynamic>)).toList(),
-    );
-    return res.data;
-  }
-
-  @override
-  Future<GuildProfile?> getProfile({required String token}) async {
-    var res = await _httpClient.get(
-      '/guilds/0/?profile',
-      headers: {'Authorization': 'Bearer $token'},
-      fromJson: GuildProfile.fromJson,
-    );
-    return res.data;
-  }
-
-  @override
-  Future<void> postSubmitStewardAllocation({
-    required String token,
-    required SubmitStewardAllocation request,
-  }) async {
-    await _httpClient.post(
-      '/steward-allocation/',
-      headers: {'Authorization': 'Bearer $token'},
-      data: request.toJson(),
-    );
-  }
-
-  @override
-  Future<void> deleteStewardAllocation({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    await _httpClient.delete(
-      '/steward-allocation/0/',
-      headers: {'Authorization': 'Bearer $token'},
-      queryParameters: queryParameters,
-    );
-  }
-
-  @override
-  Future<void> updateStewardAllocation({
-    required String token,
-    required ConformAllocation request,
-  }) async {
-    await _httpClient.put(
-      '/steward-allocation/0/',
-      headers: {'Authorization': 'Bearer $token'},
-      data: request.toJson(),
-    );
-  }
-
-  @override
-  Future<StewardFreeBarDashboard?> getStewardDashboard({
-    required String token,
-    required String stratDate,
-    required String endDate,
-  }) async {
-    var res = await _httpClient.get(
-      '/steward_free_bar_dashboard/?date1=$stratDate&date2=$endDate&search=filter',
-      headers: {'Authorization': 'Bearer $token'},
-      fromJson: StewardFreeBarDashboard.fromJson,
-    );
-    return res.data;
-  }
-
-  @override
-  Future<DashboardKillHouseFreeBar?> getDashboardKillHouseFreeBar({
-    required String token,
-    required String stratDate,
-    required String endDate,
-  }) async {
-    var res = await _httpClient.get(
-      '/dashboard_kill_house_free_bar/?date1=$stratDate&date2=$endDate&search=filter',
-      headers: {'Authorization': 'Bearer $token'},
-      fromJson: DashboardKillHouseFreeBar.fromJson,
-    );
-    return res.data;
-  }
-
-  @override
-  Future<PaginationModel<StewardFreeBar>?> getStewardPurchasesOutSideOfTheProvince({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    var res = await _httpClient.get(
-      '/steward_free_bar/',
-      queryParameters: queryParameters,
-      headers: {'Authorization': 'Bearer $token'},
-      fromJson: (json) => PaginationModel<StewardFreeBar>.fromJson(
-        json,
-        (json) => StewardFreeBar.fromJson(json as Map<String, dynamic>),
-      ),
-    );
-    return res.data;
-  }
-
-  @override
-  Future<List<IranProvinceCityModel>?> getCity({required String provinceName}) async {
-    var res = await _httpClient.get(
-      '/iran_city/',
-      queryParameters: {'name': provinceName},
-      fromJsonList: (json) =>
-          json.map((item) => IranProvinceCityModel.fromJson(item as Map<String, dynamic>)).toList(),
-    );
-    return res.data;
-  }
-
-  @override
-  Future<List<IranProvinceCityModel>?> getProvince({CancelToken? cancelToken}) async {
-    var res = await _httpClient.get(
-      '/iran_province/',
-      fromJsonList: (json) =>
-          json.map((item) => IranProvinceCityModel.fromJson(item as Map<String, dynamic>)).toList(),
-    );
-    return res.data;
-  }
-
-  @override
-  Future<void> createStewardPurchasesOutSideOfTheProvince({
-    required String token,
-    required CreateStewardFreeBar body,
-  }) async {
-    await _httpClient.post(
-      '/steward_free_bar/',
-      headers: {'Authorization': 'Bearer $token'},
-      data: body.toJson()..removeWhere((key, value) => value==null,),
-    );
-  }
-
-  @override
-  Future<CreateStewardFreeBar?> editStewardPurchasesOutSideOfTheProvince({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    var data = await _httpClient.put(
-      '/steward_free_bar/0/',
-      headers: {'Authorization': 'Bearer $token'},
-      data: queryParameters,
-      fromJson: CreateStewardFreeBar.fromJson,
-    );
-    return data.data;
-  }
-
-  @override
-  Future<void> deleteStewardPurchasesOutSideOfTheProvince({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    await _httpClient.delete(
-      '/steward_free_bar/0/',
-      headers: {'Authorization': 'Bearer $token'},
-      queryParameters: queryParameters,
-    );
-  }
-
-  @override
-  Future<PaginationModel<OutProvinceCarcassesBuyer>?> getOutProvinceCarcassesBuyer({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    var res = await _httpClient.get(
-      '/out-province-carcasses-buyer/',
-      queryParameters: queryParameters,
-      headers: {'Authorization': 'Bearer $token'},
-      fromJson: (json) => PaginationModel<OutProvinceCarcassesBuyer>.fromJson(
-        json,
-        (json) => OutProvinceCarcassesBuyer.fromJson(json as Map<String, dynamic>),
-      ),
-    );
-    return res.data;
-  }
-
-  @override
-  Future<void> createOutProvinceCarcassesBuyer({
-    required String token,
-    required OutProvinceCarcassesBuyer body,
-  }) async {
-    await _httpClient.post(
-      '/out-province-carcasses-buyer/',
-      data: body.toJson()..removeWhere((key, value) => value == null),
-      headers: {'Authorization': 'Bearer $token'},
-    );
-  }
-
-  @override
-  Future<PaginationModel<StewardFreeSaleBar>?> getStewardFreeSaleBar({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    var res = await _httpClient.get(
-      '/steward_free_sale_bar/',
-      queryParameters: queryParameters,
-      headers: {'Authorization': 'Bearer $token'},
-      fromJson: (json) => PaginationModel<StewardFreeSaleBar>.fromJson(
-        json,
-        (json) => StewardFreeSaleBar.fromJson(json as Map<String, dynamic>),
-      ),
-    );
-    return res.data;
-  }
-
-  @override
-  Future<void> createOutProvinceStewardFreeBar({
-    required String token,
-    required StewardFreeSaleBarRequest body,
-  }) async {
-    await _httpClient.post(
-      '/steward_free_sale_bar/',
-      data: body.toJson()..removeWhere((key, value) => value == null),
-      headers: {'Authorization': 'Bearer $token'},
-    );
-  }
-
-  @override
-  Future<void> updateOutProvinceStewardFreeBar({
-    required String token,
-    required StewardFreeSaleBarRequest body,
-  }) async {
-    await _httpClient.put(
-      '/steward_free_sale_bar/0/',
-      data: body.toJson()
-        ..removeWhere((key, value) => value == null)
-        ..addAll({'carcassWeight': body.weightOfCarcasses, 'carcassCount': body.numberOfCarcasses}),
-      headers: {'Authorization': 'Bearer $token'},
-    );
-  }
-
-  @override
-  Future<void> deleteOutProvinceStewardFreeBar({required String token, required String key}) async {
-    await _httpClient.delete(
-      '/steward_free_sale_bar/0/',
-      queryParameters: {'key': key},
-      headers: {'Authorization': 'Bearer $token'},
-    );
-  }
-
-  @override
-  Future<UserProfile?> getUserProfile({required String token}) async {
-    var res = await _httpClient.get(
-      '/system_user_profile/?self-profile',
-      headers: {'Authorization': 'Bearer $token'},
-      fromJson: (json) => UserProfile.fromJson(json),
-    );
-
-    return res.data;
-  }
-
-  @override
-  Future<void> updateUserProfile({required String token, required UserProfile userProfile}) async {
-    await _httpClient.put(
-      '/system_user_profile/0/',
-      headers: {'Authorization': 'Bearer $token'},
-      data: userProfile.toJson()..removeWhere((key, value) => value == null),
-    );
-  }
-
-  @override
-  Future<void> updatePassword({
-    required String token,
-    required ChangePasswordRequestModel model,
-  }) async {
-    await _httpClient.post(
-      '/api/change_password/',
-      headers: {'Authorization': 'Bearer $token'},
-      data: model.toJson()..removeWhere((key, value) => value == null),
-    );
-  }
-
-  @override
-  Future<PaginationModel<SegmentationModel>?> getSegmentation({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    var res = await _httpClient.get(
-      '/app-segmentation/',
-      queryParameters: queryParameters,
-      headers: {'Authorization': 'Bearer $token'},
-      fromJson: (json) => PaginationModel<SegmentationModel>.fromJson(
-        json,
-        (json) => SegmentationModel.fromJson(json as Map<String, dynamic>),
-      ),
-    );
-    return res.data;
-  }
-
-  @override
-  Future<void> createSegmentation({required String token, required SegmentationModel model}) async {
-    await _httpClient.post(
-      '/app-segmentation/',
-      data: model.toJson()..removeWhere((key, value) => value == null),
-      headers: {'Authorization': 'Bearer $token'},
-    );
-  }
-
-  @override
-  Future<void> editSegmentation({required String token, required SegmentationModel model}) async {
-    await _httpClient.put(
-      '/app-segmentation/0/',
-      data: model.toJson()..removeWhere((key, value) => value == null),
-      headers: {'Authorization': 'Bearer $token'},
-    );
-  }
-
-  @override
-  Future<SegmentationModel?> deleteSegmentation({
-    required String token,
-    required String key,
-  }) async {
-    var res = await _httpClient.delete<SegmentationModel?>(
-      '/app-segmentation/0/',
-      queryParameters: {'key': key},
-      headers: {'Authorization': 'Bearer $token'},
-      fromJson: (json) => SegmentationModel.fromJson(json),
-    );
-
-    return res.data;
-  }
-
-  @override
-  Future<BroadcastPrice?> getBroadcastPrice({required String token}) async {
-    var res = await _httpClient.get(
-      '/broadcast-price/',
-      headers: {'Authorization': 'Bearer $token'},
-
-      fromJson: (json) => BroadcastPrice.fromJson(json),
-    );
-
-    return res.data;
-  }
-
-  @override
-  Future<StewardSalesInfoDashboard?> getStewardSalesInfoDashboard({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    var res = await _httpClient.get(
-      '/steward-sales-info-dashboard/',
-      queryParameters: queryParameters,
-      headers: {'Authorization': 'Bearer $token'},
-      fromJson: (json) => StewardSalesInfoDashboard.fromJson(json),
-    );
-
-    return res.data;
-  }
-
-  @override
-  Future<StewardRemainWeight?> getStewardRemainWeight({required String token}) async {
-    var res = await _httpClient.get(
-      '/steward-remain-weight/',
-      headers: {'Authorization': 'Bearer $token'},
-      fromJson: StewardRemainWeight.fromJson,
-    );
-
-    return res.data;
-  }
-}

packages/chicken/lib/data/data_source/remote/kill_house/kill_house_remote.dart

@@ -1,25 +0,0 @@
-import 'package:rasadyar_chicken/data/models/kill_house_module/register_request/response/chicken_commission_prices/chicken_commission_prices.dart';
-import 'package:rasadyar_chicken/data/models/kill_house_module/register_request/response/kill_house/kill_house_response.dart';
-import 'package:rasadyar_chicken/data/models/kill_house_module/register_request/response/kill_request_list/kill_request_list.dart'
-    as listModel;
-
-abstract class KillHouseRemoteDataSource {
-  Future<List<KillHouseResponse>?> getKillHouseList({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<ChickenCommissionPrices?> getCommissionPrice({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<void> submitKillHouseRequest({required String token, required Map<String, dynamic> data});
-
-  Future<List<listModel.KillRequestList>?> getListKillRequest({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<void> deleteKillRequest({required String token, required int requestId});
-}

packages/chicken/lib/data/data_source/remote/kill_house/kill_house_remote_impl.dart

@@ -1,80 +0,0 @@
-import 'package:rasadyar_chicken/data/data_source/remote/kill_house/kill_house_remote.dart';
-import 'package:rasadyar_chicken/data/models/kill_house_module/register_request/response/chicken_commission_prices/chicken_commission_prices.dart';
-import 'package:rasadyar_chicken/data/models/kill_house_module/register_request/response/kill_house/kill_house_response.dart';
-import 'package:rasadyar_chicken/data/models/kill_house_module/register_request/response/kill_request_list/kill_request_list.dart'
-    as listModel;
-import 'package:rasadyar_core/core.dart';
-
-class KillHouseRemoteDataSourceImpl extends KillHouseRemoteDataSource {
-  final DioRemote _httpClient;
-
-  KillHouseRemoteDataSourceImpl(this._httpClient);
-
-  @override
-  Future<ChickenCommissionPrices?> getCommissionPrice({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    var res = await _httpClient.get(
-      '/chicken-commission-prices/',
-      headers: {'Authorization': 'Bearer $token'},
-      fromJson: (json) {
-        var data = json['results'] as List<dynamic>;
-        return ChickenCommissionPrices.fromJson(data.first as Map<String, dynamic>);
-      },
-    );
-
-    return res.data;
-  }
-
-  @override
-  Future<List<KillHouseResponse>?> getKillHouseList({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    var res = await _httpClient.get(
-      '/kill_house/?kill_house',
-      headers: {'Authorization': 'Bearer $token'},
-      fromJsonList: (json) =>
-          json.map((e) => KillHouseResponse.fromJson(e as Map<String, dynamic>)).toList(),
-    );
-
-    return res.data;
-  }
-
-  @override
-  Future<void> submitKillHouseRequest({
-    required String token,
-    required Map<String, dynamic> data,
-  }) async {
-    await _httpClient.post(
-      '/kill_request/',
-      headers: {'Authorization': 'Bearer $token'},
-      data: data,
-    );
-  }
-
-  @override
-  Future<List<listModel.KillRequestList>?> getListKillRequest({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    var res = await _httpClient.get(
-      '/kill_request/',
-      headers: {'Authorization': 'Bearer $token'},
-      queryParameters: queryParameters,
-      fromJsonList: (json) =>
-          json.map((e) => listModel.KillRequestList.fromJson(e as Map<String, dynamic>)).toList(),
-    );
-
-    return res.data;
-  }
-
-  @override
-  Future<void> deleteKillRequest({required String token, required int requestId}) async {
-    await _httpClient.delete(
-      '/kill_request/$requestId/',
-      headers: {'Authorization': 'Bearer $token'},
-    );
-  }
-}

packages/chicken/lib/data/data_source/remote/poultry_science/poultry_science_remote.dart

@@ -1,94 +0,0 @@
-import 'package:rasadyar_chicken/data/models/poultry_export/poultry_export.dart';
-import 'package:rasadyar_chicken/data/models/request/kill_registration/kill_registration.dart';
-import 'package:rasadyar_chicken/data/models/response/all_poultry/all_poultry.dart';
-import 'package:rasadyar_chicken/data/models/response/approved_price/approved_price.dart';
-import 'package:rasadyar_chicken/data/models/response/hatching/hatching_models.dart';
-import 'package:rasadyar_chicken/data/models/response/hatching_report/hatching_report.dart';
-import 'package:rasadyar_chicken/data/models/response/kill_house_poultry/kill_house_poultry.dart';
-import 'package:rasadyar_chicken/data/models/response/kill_request_poultry/kill_request_poultry.dart';
-import 'package:rasadyar_chicken/data/models/response/poultry_farm/poultry_farm.dart';
-import 'package:rasadyar_chicken/data/models/response/poultry_hatching/poultry_hatching.dart';
-import 'package:rasadyar_chicken/data/models/response/poultry_order/poultry_order.dart';
-import 'package:rasadyar_chicken/data/models/response/poultry_science/home_poultry_science/home_poultry_science_model.dart';
-import 'package:rasadyar_chicken/data/models/response/sell_for_freezing/sell_for_freezing.dart';
-import 'package:rasadyar_core/core.dart';
-
-abstract class PoultryScienceRemoteDatasource {
-  Future<HomePoultryScienceModel?> getHomePoultryScience({
-    required String token,
-    required String type,
-  });
-
-  Future<PaginationModel<HatchingModel>?> getHatchingPoultry({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<void> submitPoultryScienceReport({
-    required String token,
-    required FormData data,
-    ProgressCallback? onSendProgress,
-  });
-
-  Future<PaginationModel<HatchingReport>?> getPoultryScienceReport({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<PaginationModel<PoultryFarm>?> getPoultryScienceFarmList({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<ApprovedPrice?> getApprovedPrice({  required String token,
-    Map<String, dynamic>? queryParameters,});
-
-  Future<List<AllPoultry>?> getAllPoultry({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-
-  Future<SellForFreezing?> getSellForFreezing({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-
-  Future<PoultryExport?> getPoultryExport({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-
-  Future<List<KillRequestPoultry>?> getUserPoultry({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<List<PoultryHatching>?> getPoultryHatching({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<List<KillHousePoultry>?> getKillHouseList({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<void> submitKillRegistration({
-    required String token,
-    required KillRegistrationRequest request,
-  });
-
-
-  Future<PaginationModel<PoultryOrder>?> getPoultryOderList({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<void> deletePoultryOder({
-    required String token,
-    required String orderId,
-  });
-}

packages/chicken/lib/data/di/chicken_di.dart

@@ -1,23 +1,15 @@
-import 'package:rasadyar_chicken/chicken.dart';
 import 'package:rasadyar_chicken/data/common/dio_error_handler.dart';
-import 'package:rasadyar_chicken/data/data_source/local/chicken_local.dart';
-import 'package:rasadyar_chicken/data/data_source/local/chicken_local_imp.dart';
-import 'package:rasadyar_chicken/data/data_source/remote/auth/auth_remote.dart';
-import 'package:rasadyar_chicken/data/data_source/remote/auth/auth_remote_imp.dart';
-import 'package:rasadyar_chicken/data/data_source/remote/chicken/chicken_remote.dart';
-import 'package:rasadyar_chicken/data/data_source/remote/chicken/chicken_remote_imp.dart';
-import 'package:rasadyar_chicken/data/data_source/remote/kill_house/kill_house_remote.dart';
-import 'package:rasadyar_chicken/data/data_source/remote/kill_house/kill_house_remote_impl.dart';
-import 'package:rasadyar_chicken/data/data_source/remote/poultry_science/poultry_science_remote.dart';
-import 'package:rasadyar_chicken/data/data_source/remote/poultry_science/poultry_science_remote_imp.dart';
-import 'package:rasadyar_chicken/data/repositories/auth/auth_repository.dart';
-import 'package:rasadyar_chicken/data/repositories/auth/auth_repository_imp.dart';
-import 'package:rasadyar_chicken/data/repositories/chicken/chicken_repository.dart';
-import 'package:rasadyar_chicken/data/repositories/chicken/chicken_repository_imp.dart';
-import 'package:rasadyar_chicken/data/repositories/kill_house/kill_house_repository.dart';
-import 'package:rasadyar_chicken/data/repositories/kill_house/kill_house_repository_impl.dart';
-import 'package:rasadyar_chicken/data/repositories/poultry_science/poultry_science_repository.dart';
-import 'package:rasadyar_chicken/data/repositories/poultry_science/poultry_science_repository_imp.dart';
+import 'package:rasadyar_chicken/features/common/presentation/routes/routes.dart';
+import 'package:rasadyar_chicken/features/common/data/di/common_di.dart';
+import 'package:rasadyar_chicken/features/poultry_science/data/di/poultry_science_di.dart';
+import 'package:rasadyar_chicken/features/steward/data/di/steward_di.dart';
+import 'package:rasadyar_chicken/features/province_operator/data/di/province_operator_di.dart';
+import 'package:rasadyar_chicken/features/province_inspector/data/di/province_inspector_di.dart';
+import 'package:rasadyar_chicken/features/city_jahad/data/di/city_jahad_di.dart';
+import 'package:rasadyar_chicken/features/vet_farm/data/di/vet_farm_di.dart';
+import 'package:rasadyar_chicken/features/super_admin/data/di/super_admin_di.dart';
+import 'package:rasadyar_chicken/features/province_supervisor/data/di/province_supervisor_di.dart';
+import 'package:rasadyar_chicken/features/jahad/data/di/jahad_di.dart';
 import 'package:rasadyar_core/core.dart';
 
 GetIt diChicken = GetIt.asNewInstance();
@@ -40,7 +32,7 @@ Future<void> setupChickenDI() async {
       },
       clearTokenCallback: () async {
         await tokenService.deleteModuleTokens(Module.chicken);
-        Get.offAllNamed(ChickenRoutes.auth, arguments: Module.chicken);
+        Get.offAllNamed(CommonRoutes.auth, arguments: Module.chicken);
       },
     ),
     instanceName: 'chickenInterceptor',
@@ -51,105 +43,94 @@ Future<void> setupChickenDI() async {
   diChicken.registerLazySingleton<DioRemote>(
     () => DioRemote(
       baseUrl: baseUrl,
-      interceptors: diChicken.get<AppInterceptor>(instanceName: 'chickenInterceptor'),
+      interceptors: diChicken.get<AppInterceptor>(
+        instanceName: 'chickenInterceptor',
+      ),
     ),
   );
 
   final dioRemote = diChicken.get<DioRemote>();
   await dioRemote.init();
 
-  diChicken.registerLazySingleton<AuthRemoteDataSource>(() => AuthRemoteDataSourceImp(dioRemote));
+  // Setup common feature DI
+  await setupCommonDI(diChicken, dioRemote);
 
-  diChicken.registerLazySingleton<AuthRepository>(
-    () => AuthRepositoryImpl(diChicken.get<AuthRemoteDataSource>()),
-  );
+  // Setup poultry_science feature DI
+  await setupPoultryScienceDI(diChicken, dioRemote);
 
-  diChicken.registerLazySingleton<ChickenRemoteDatasource>(
-    () => ChickenRemoteDatasourceImp(diChicken.get<DioRemote>()),
-  );
+  // Setup steward feature DI
+  await setupStewardDI(diChicken, dioRemote);
 
-  diChicken.registerLazySingleton<ChickenLocalDataSource>(() => ChickenLocalDataSourceImp());
+  // Setup province_operator feature DI
+  await setupProvinceOperatorDI(diChicken, dioRemote);
 
-  diChicken.registerLazySingleton<ChickenRepository>(
-    () => ChickenRepositoryImp(
-      remote: diChicken.get<ChickenRemoteDatasource>(),
-      local: diChicken.get<ChickenLocalDataSource>(),
-    ),
-  );
+  // Setup province_inspector feature DI
+  await setupProvinceInspectorDI(diChicken, dioRemote);
 
-  diChicken.registerLazySingleton<PoultryScienceRemoteDatasource>(
-    () => PoultryScienceRemoteDatasourceImp(diChicken.get<DioRemote>()),
-  );
+  // Setup city_jahad feature DI
+  await setupCityJahadDI(diChicken, dioRemote);
+
+  // Setup vet_farm feature DI
+  await setupVetFarmDI(diChicken, dioRemote);
+
+  // Setup super_admin feature DI
+  await setupSuperAdminDI(diChicken, dioRemote);
+
+  // Setup province_supervisor feature DI
+  await setupProvinceSupervisorDI(diChicken, dioRemote);
+
+  // Setup jahad feature DI
+  await setupJahadDI(diChicken, dioRemote);
 
-  diChicken.registerLazySingleton<PoultryScienceRepository>(
-    () => PoultryScienceRepositoryImp(diChicken.get<PoultryScienceRemoteDatasource>()),
-  );
  
-  //region kill house module DI
-  diChicken.registerLazySingleton<KillHouseRemoteDataSource>(
-    () => KillHouseRemoteDataSourceImpl(diChicken.get<DioRemote>()),
-  );
-  diChicken.registerLazySingleton<KillHouseRepository>(
-    () => KillHouseRepositoryImpl(diChicken.get<KillHouseRemoteDataSource>()),
-  );
-  //endregion
 }
 
 Future<void> newSetupAuthDI(String newUrl) async {
   var tokenService = Get.find<TokenStorageService>();
 
-  // همیشه baseUrl جدید رو ذخیره کن
   await tokenService.saveBaseUrl(Module.chicken, newUrl);
 
-  // Re-register AppInterceptor
-  if (diChicken.isRegistered<AppInterceptor>(instanceName: 'chickenInterceptor')) {
-    await diChicken.unregister<AppInterceptor>(instanceName: 'chickenInterceptor');
-  }
+  // پاک‌سازی DI مخصوص ماژول مرغ
+  await diChicken.resetScope();
+  diChicken.pushNewScope();
+
+  // --- Re-register AppInterceptor
   diChicken.registerLazySingleton<AppInterceptor>(
     () => AppInterceptor(
       refreshTokenCallback: () async => null,
-      saveTokenCallback: (String newToken) async {
-        //  await tokenService.saveAccessToken(newToken);
-      },
+      saveTokenCallback: (newToken) async {},
       clearTokenCallback: () async {
         await tokenService.deleteModuleTokens(Module.chicken);
-        Get.offAllNamed(ChickenRoutes.auth, arguments: Module.chicken);
+        Get.offAllNamed(CommonRoutes.auth, arguments: Module.chicken);
       },
     ),
     instanceName: 'chickenInterceptor',
   );
 
-  // Re-register DioRemote
-  if (diChicken.isRegistered<DioRemote>()) {
-    await diChicken.unregister<DioRemote>();
-  }
+  // --- Re-register DioRemote
   diChicken.registerLazySingleton<DioRemote>(
     () => DioRemote(
       baseUrl: newUrl,
-      interceptors: diChicken.get<AppInterceptor>(instanceName: 'chickenInterceptor'),
+      interceptors: diChicken.get<AppInterceptor>(
+        instanceName: 'chickenInterceptor',
+      ),
     ),
   );
+
   final dioRemote = diChicken.get<DioRemote>();
   await dioRemote.init();
 
-  // Re-register dependent layers
-  await reRegister<AuthRemoteDataSource>(() => AuthRemoteDataSourceImp(dioRemote));
-  await reRegister<AuthRepository>(() => AuthRepositoryImpl(diChicken.get<AuthRemoteDataSource>()));
-  await reRegister<ChickenRemoteDatasource>(() => ChickenRemoteDatasourceImp(dioRemote));
-  await reRegister<ChickenLocalDataSource>(() => ChickenLocalDataSourceImp());
-  await reRegister<ChickenRepository>(
-    () => ChickenRepositoryImp(
-      remote: diChicken.get<ChickenRemoteDatasource>(),
-      local: diChicken.get<ChickenLocalDataSource>(),
-    ),
-  );
-
-  await reRegister<PoultryScienceRemoteDatasource>(
-    () => PoultryScienceRemoteDatasourceImp(dioRemote),
-  );
-  await reRegister<PoultryScienceRepository>(
-    () => PoultryScienceRepositoryImp(diChicken.get<PoultryScienceRemoteDatasource>()),
-  );
+  // --- common, poultry_science, steward, and other features
+  await setupCommonDI(diChicken, dioRemote);
+  await setupPoultryScienceDI(diChicken, dioRemote);
+  await setupStewardDI(diChicken, dioRemote);
+  await setupProvinceOperatorDI(diChicken, dioRemote);
+  await setupProvinceInspectorDI(diChicken, dioRemote);
+  await setupCityJahadDI(diChicken, dioRemote);
+  await setupVetFarmDI(diChicken, dioRemote);
+  await setupSuperAdminDI(diChicken, dioRemote);
+  await setupProvinceSupervisorDI(diChicken, dioRemote);
+  await setupJahadDI(diChicken, dioRemote);
 }
 
 Future<void> reRegister<T extends Object>(T Function() factory) async {

packages/chicken/lib/data/repositories/chicken/chicken_repository.dart

@@ -1,200 +0,0 @@
-import 'package:rasadyar_chicken/data/models/local/widely_used_local_model.dart';
-import 'package:rasadyar_chicken/data/models/request/change_password/change_password_request_model.dart';
-import 'package:rasadyar_chicken/data/models/request/conform_allocation/conform_allocation.dart';
-import 'package:rasadyar_chicken/data/models/request/steward_free_sale_bar/steward_free_sale_bar_request.dart';
-import 'package:rasadyar_chicken/data/models/request/submit_steward_allocation/submit_steward_allocation.dart';
-import 'package:rasadyar_chicken/data/models/response/allocated_made/allocated_made.dart';
-import 'package:rasadyar_chicken/data/models/response/bar_information/bar_information.dart';
-import 'package:rasadyar_chicken/data/models/response/broadcast_price/broadcast_price.dart';
-import 'package:rasadyar_chicken/data/models/response/dashboard_kill_house_free_bar/dashboard_kill_house_free_bar.dart';
-import 'package:rasadyar_chicken/data/models/response/guild/guild_model.dart';
-import 'package:rasadyar_chicken/data/models/response/guild_profile/guild_profile.dart';
-import 'package:rasadyar_chicken/data/models/response/imported_loads_model/imported_loads_model.dart';
-import 'package:rasadyar_chicken/data/models/response/inventory/inventory_model.dart';
-import 'package:rasadyar_chicken/data/models/response/iran_province_city/iran_province_city_model.dart';
-import 'package:rasadyar_chicken/data/models/response/kill_house_distribution_info/kill_house_distribution_info.dart';
-import 'package:rasadyar_chicken/data/models/response/out_province_carcasses_buyer/out_province_carcasses_buyer.dart';
-import 'package:rasadyar_chicken/data/models/response/roles_products/roles_products.dart';
-import 'package:rasadyar_chicken/data/models/response/segmentation_model/segmentation_model.dart';
-import 'package:rasadyar_chicken/data/models/response/steward_free_bar/steward_free_bar.dart';
-import 'package:rasadyar_chicken/data/models/response/steward_free_bar_dashboard/steward_free_bar_dashboard.dart';
-import 'package:rasadyar_chicken/data/models/response/steward_free_sale_bar/steward_free_sale_bar.dart';
-import 'package:rasadyar_chicken/data/models/response/steward_remain_weight/steward_remain_weight.dart';
-import 'package:rasadyar_chicken/data/models/response/steward_sales_info_dashboard/steward_sales_info_dashboard.dart';
-import 'package:rasadyar_chicken/data/models/response/user_profile/user_profile.dart';
-import 'package:rasadyar_chicken/data/models/response/waiting_arrival/waiting_arrival.dart'
-    hide ProductModel;
-import 'package:rasadyar_core/core.dart';
-
-import '../../models/request/create_steward_free_bar/create_steward_free_bar.dart';
-
-abstract class ChickenRepository {
-  //region Remote
-
-  //region Steward
-  Future<List<InventoryModel>?> getInventory({required String token, CancelToken? cancelToken});
-
-  Future<KillHouseDistributionInfo?> getKillHouseDistributionInfo({required String token});
-
-  Future<BarInformation?> getGeneralBarInformation({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<PaginationModel<WaitingArrivalModel>?> getWaitingArrivals({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<void> setSateForArrivals({required String token, required Map<String, dynamic> request});
-
-  Future<PaginationModel<ImportedLoadsModel>?> getImportedLoadsModel({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<PaginationModel<AllocatedMadeModel>?> getAllocatedMade({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<void> confirmAllocation({required String token, required Map<String, dynamic> allocation});
-
-  Future<void> denyAllocation({required String token, required String allocationToken});
-
-  Future<void> confirmAllAllocation({
-    required String token,
-    required List<String> allocationTokens,
-  });
-
-  Future<List<ProductModel>?> getRolesProducts({required String token});
-
-  Future<List<GuildModel>?> getGuilds({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<GuildProfile?> getProfile({required String token});
-
-  Future<void> postSubmitStewardAllocation({
-    required String token,
-    required SubmitStewardAllocation request,
-  });
-
-  Future<void> deleteStewardAllocation({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<void> updateStewardAllocation({required String token, required ConformAllocation request});
-
-  Future<StewardFreeBarDashboard?> getStewardDashboard({
-    required String token,
-    required String stratDate,
-    required String endDate,
-  });
-
-  Future<DashboardKillHouseFreeBar?> getDashboardKillHouseFreeBar({
-    required String token,
-    required String stratDate,
-    required String endDate,
-  });
-
-  Future<PaginationModel<StewardFreeBar>?> getStewardPurchasesOutSideOfTheProvince({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<void> createStewardPurchasesOutSideOfTheProvince({
-    required String token,
-    required CreateStewardFreeBar body,
-  });
-
-
-  Future<CreateStewardFreeBar?> editStewardPurchasesOutSideOfTheProvince({
-    required String token,
-    required CreateStewardFreeBar body,
-  });
-
-
-
-  Future<void> deleteStewardPurchasesOutSideOfTheProvince({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<PaginationModel<OutProvinceCarcassesBuyer>?> getOutProvinceCarcassesBuyer({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<void> createOutProvinceCarcassesBuyer({
-    required String token,
-    required OutProvinceCarcassesBuyer body,
-  });
-
-  Future<List<IranProvinceCityModel>?> getProvince({CancelToken? cancelToken});
-
-  Future<List<IranProvinceCityModel>?> getCity({required String provinceName});
-
-  Future<PaginationModel<StewardFreeSaleBar>?> getStewardFreeSaleBar({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<void> createOutProvinceStewardFreeBar({
-    required String token,
-    required StewardFreeSaleBarRequest body,
-  });
-
-  Future<void> updateOutProvinceStewardFreeBar({
-    required String token,
-    required StewardFreeSaleBarRequest body,
-  });
-
-  Future<void> deleteOutProvinceStewardFreeBar({
-    required String token,
-    required String key
-  });
-
-
-
-  Future<UserProfile?> getUserProfile({required String token});
-
-  Future<void> updateUserProfile({required String token, required UserProfile userProfile});
-
-  Future<void> updatePassword({required String token, required ChangePasswordRequestModel model});
-
-  Future<PaginationModel<SegmentationModel>?> getSegmentation({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<void> createSegmentation({required String token, required SegmentationModel model});
-
-  Future<void> editSegmentation({required String token, required SegmentationModel model});
-
-  Future<SegmentationModel?> deleteSegmentation({required String token, required String key});
-
-  Future<BroadcastPrice?> getBroadcastPrice({required String token});
-
-  Future<StewardSalesInfoDashboard?> getStewardSalesInfoDashboard({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<StewardRemainWeight?> getStewardRemainWeight({required String token});
-
-  //endregion
-
-
-
-
-  //endregion
-
-  //region local
-  Future<void> initWidleyUsed();
-
-  WidelyUsedLocalModel? getAllWidely();
-  //endregion
-}

packages/chicken/lib/data/repositories/chicken/chicken_repository_imp.dart

@@ -1,433 +0,0 @@
-import 'package:rasadyar_chicken/data/data_source/local/chicken_local.dart';
-import 'package:rasadyar_chicken/data/data_source/remote/chicken/chicken_remote.dart';
-import 'package:rasadyar_chicken/data/models/local/widely_used_local_model.dart';
-import 'package:rasadyar_chicken/data/models/request/change_password/change_password_request_model.dart';
-import 'package:rasadyar_chicken/data/models/request/conform_allocation/conform_allocation.dart';
-import 'package:rasadyar_chicken/data/models/request/create_steward_free_bar/create_steward_free_bar.dart';
-import 'package:rasadyar_chicken/data/models/request/steward_free_sale_bar/steward_free_sale_bar_request.dart';
-import 'package:rasadyar_chicken/data/models/request/submit_steward_allocation/submit_steward_allocation.dart';
-import 'package:rasadyar_chicken/data/models/response/allocated_made/allocated_made.dart';
-import 'package:rasadyar_chicken/data/models/response/bar_information/bar_information.dart';
-import 'package:rasadyar_chicken/data/models/response/broadcast_price/broadcast_price.dart';
-import 'package:rasadyar_chicken/data/models/response/dashboard_kill_house_free_bar/dashboard_kill_house_free_bar.dart';
-import 'package:rasadyar_chicken/data/models/response/guild/guild_model.dart';
-import 'package:rasadyar_chicken/data/models/response/guild_profile/guild_profile.dart';
-import 'package:rasadyar_chicken/data/models/response/imported_loads_model/imported_loads_model.dart';
-import 'package:rasadyar_chicken/data/models/response/inventory/inventory_model.dart';
-import 'package:rasadyar_chicken/data/models/response/iran_province_city/iran_province_city_model.dart';
-import 'package:rasadyar_chicken/data/models/response/kill_house_distribution_info/kill_house_distribution_info.dart';
-import 'package:rasadyar_chicken/data/models/response/out_province_carcasses_buyer/out_province_carcasses_buyer.dart';
-import 'package:rasadyar_chicken/data/models/response/roles_products/roles_products.dart';
-import 'package:rasadyar_chicken/data/models/response/segmentation_model/segmentation_model.dart';
-import 'package:rasadyar_chicken/data/models/response/steward_free_bar/steward_free_bar.dart';
-import 'package:rasadyar_chicken/data/models/response/steward_free_bar_dashboard/steward_free_bar_dashboard.dart';
-import 'package:rasadyar_chicken/data/models/response/steward_free_sale_bar/steward_free_sale_bar.dart';
-import 'package:rasadyar_chicken/data/models/response/steward_remain_weight/steward_remain_weight.dart';
-import 'package:rasadyar_chicken/data/models/response/steward_sales_info_dashboard/steward_sales_info_dashboard.dart';
-import 'package:rasadyar_chicken/data/models/response/user_profile/user_profile.dart';
-import 'package:rasadyar_chicken/data/models/response/waiting_arrival/waiting_arrival.dart'
-    hide ProductModel;
-import 'package:rasadyar_core/core.dart';
-
-import 'chicken_repository.dart';
-
-class ChickenRepositoryImp implements ChickenRepository {
-  final ChickenRemoteDatasource remote;
-  final ChickenLocalDataSource local;
-
-  ChickenRepositoryImp({required this.remote, required this.local});
-
-  //region Remote
-  @override
-  Future<List<InventoryModel>?> getInventory({
-    required String token,
-    CancelToken? cancelToken,
-  }) async {
-    var res = await remote.getInventory(token: token, cancelToken: cancelToken);
-    return res;
-  }
-
-  @override
-  Future<KillHouseDistributionInfo?> getKillHouseDistributionInfo({
-    required String token,
-  }) async {
-    var res = await remote.getKillHouseDistributionInfo(token: token);
-    return res;
-  }
-
-  @override
-  Future<BarInformation?> getGeneralBarInformation({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    var res = await remote.getGeneralBarInformation(
-      token: token,
-      queryParameters: queryParameters,
-    );
-    return res;
-  }
-
-  @override
-  Future<PaginationModel<WaitingArrivalModel>?> getWaitingArrivals({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    var res = await remote.getWaitingArrivals(
-      token: token,
-      queryParameters: queryParameters,
-    );
-    return res;
-  }
-
-  @override
-  Future<void> setSateForArrivals({
-    required String token,
-    required Map<String, dynamic> request,
-  }) async {
-    await remote.setSateForArrivals(token: token, request: request);
-  }
-
-  @override
-  Future<PaginationModel<ImportedLoadsModel>?> getImportedLoadsModel({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    var res = await remote.getImportedLoadsModel(
-      token: token,
-      queryParameters: queryParameters,
-    );
-    return res;
-  }
-
-  @override
-  Future<PaginationModel<AllocatedMadeModel>?> getAllocatedMade({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    var res = await remote.getAllocatedMade(
-      token: token,
-      queryParameters: queryParameters,
-    );
-    return res;
-  }
-
-  @override
-  Future<void> confirmAllocation({
-    required String token,
-    required Map<String, dynamic> allocation,
-  }) async {
-    await remote.confirmAllocation(token: token, allocation: allocation);
-  }
-
-  @override
-  Future<void> denyAllocation({
-    required String token,
-    required String allocationToken,
-  }) async {
-    await remote.denyAllocation(token: token, allocationToken: allocationToken);
-  }
-
-  @override
-  Future<void> confirmAllAllocation({
-    required String token,
-    required List<String> allocationTokens,
-  }) async {
-    await remote.confirmAllAllocation(
-      token: token,
-      allocationTokens: allocationTokens,
-    );
-  }
-
-  @override
-  Future<List<ProductModel>?> getRolesProducts({required String token}) async {
-    var res = await remote.getRolesProducts(token: token);
-    return res;
-  }
-
-  @override
-  Future<List<GuildModel>?> getGuilds({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    var res = await remote.getGuilds(
-      token: token,
-      queryParameters: queryParameters,
-    );
-    return res;
-  }
-
-  @override
-  Future<GuildProfile?> getProfile({required String token}) async {
-    var res = await remote.getProfile(token: token);
-    return res;
-  }
-
-  @override
-  Future<void> postSubmitStewardAllocation({
-    required String token,
-    required SubmitStewardAllocation request,
-  }) async {
-    await remote.postSubmitStewardAllocation(token: token, request: request);
-  }
-
-  @override
-  Future<void> deleteStewardAllocation({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    await remote.deleteStewardAllocation(
-      token: token,
-      queryParameters: queryParameters,
-    );
-  }
-
-  @override
-  Future<void> updateStewardAllocation({
-    required String token,
-    required ConformAllocation request,
-  }) async {
-    await remote.updateStewardAllocation(token: token, request: request);
-  }
-
-  @override
-  Future<StewardFreeBarDashboard?> getStewardDashboard({
-    required String token,
-    required String stratDate,
-    required String endDate,
-  }) async {
-    var res = await remote.getStewardDashboard(
-      token: token,
-      stratDate: stratDate,
-      endDate: endDate,
-    );
-    return res;
-  }
-
-  @override
-  Future<DashboardKillHouseFreeBar?> getDashboardKillHouseFreeBar({
-    required String token,
-    required String stratDate,
-    required String endDate,
-  }) async {
-    var res = await remote.getDashboardKillHouseFreeBar(
-      token: token,
-      stratDate: stratDate,
-      endDate: endDate,
-    );
-    return res;
-  }
-
-  @override
-  Future<PaginationModel<StewardFreeBar>?>
-  getStewardPurchasesOutSideOfTheProvince({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    var res = await remote.getStewardPurchasesOutSideOfTheProvince(
-      token: token,
-      queryParameters: queryParameters,
-    );
-    return res;
-  }
-
-  @override
-  Future<List<IranProvinceCityModel>?> getCity({
-    required String provinceName,
-  }) async {
-    var res = await remote.getCity(provinceName: provinceName);
-    return res;
-  }
-
-  @override
-  Future<List<IranProvinceCityModel>?> getProvince({
-    CancelToken? cancelToken,
-  }) async {
-    var res = await remote.getProvince(cancelToken: cancelToken);
-    return res;
-  }
-
-  @override
-  Future<void> createStewardPurchasesOutSideOfTheProvince({
-    required String token,
-    required CreateStewardFreeBar body,
-  }) async {
-    await remote.createStewardPurchasesOutSideOfTheProvince(
-      token: token,
-      body: body,
-    );
-  }
-
-  @override
-  Future<CreateStewardFreeBar?> editStewardPurchasesOutSideOfTheProvince({
-    required String token,
-    required CreateStewardFreeBar body,
-  }) async {
-    return await remote.editStewardPurchasesOutSideOfTheProvince(
-      token: token,
-      queryParameters: body.toJson()
-        ..removeWhere((key, value) => value == null),
-    );
-  }
-
-  @override
-  Future<void> deleteStewardPurchasesOutSideOfTheProvince({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    await remote.deleteStewardPurchasesOutSideOfTheProvince(
-      token: token,
-      queryParameters: queryParameters,
-    );
-  }
-
-  @override
-  Future<PaginationModel<OutProvinceCarcassesBuyer>?>
-  getOutProvinceCarcassesBuyer({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    var res = await remote.getOutProvinceCarcassesBuyer(
-      token: token,
-      queryParameters: queryParameters,
-    );
-    return res;
-  }
-
-  @override
-  Future<void> createOutProvinceCarcassesBuyer({
-    required String token,
-    required OutProvinceCarcassesBuyer body,
-  }) async {
-    await remote.createOutProvinceCarcassesBuyer(token: token, body: body);
-  }
-
-  @override
-  Future<PaginationModel<StewardFreeSaleBar>?> getStewardFreeSaleBar({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    var res = await remote.getStewardFreeSaleBar(
-      token: token,
-      queryParameters: queryParameters,
-    );
-    return res;
-  }
-
-  @override
-  Future<void> createOutProvinceStewardFreeBar({
-    required String token,
-    required StewardFreeSaleBarRequest body,
-  }) async {
-    await remote.createOutProvinceStewardFreeBar(token: token, body: body);
-  }
-
-  @override
-  Future<void> updateOutProvinceStewardFreeBar({
-    required String token,
-    required StewardFreeSaleBarRequest body,
-  }) async {
-    await remote.updateOutProvinceStewardFreeBar(token: token, body: body);
-  }
-
-  @override
-  Future<void> deleteOutProvinceStewardFreeBar({
-    required String token,
-    required String key,
-  }) async {
-    await remote.deleteOutProvinceStewardFreeBar(token: token, key: key);
-  }
-
-  @override
-  Future<UserProfile?> getUserProfile({required String token}) async {
-    var res = await remote.getUserProfile(token: token);
-    return res;
-  }
-
-  @override
-  Future<void> updateUserProfile({
-    required String token,
-    required UserProfile userProfile,
-  }) async {
-    await remote.updateUserProfile(token: token, userProfile: userProfile);
-  }
-
-  @override
-  Future<void> updatePassword({
-    required String token,
-    required ChangePasswordRequestModel model,
-  }) async {
-    await remote.updatePassword(token: token, model: model);
-  }
-
-  @override
-  Future<PaginationModel<SegmentationModel>?> getSegmentation({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    var res = await remote.getSegmentation(
-      token: token,
-      queryParameters: queryParameters,
-    );
-    return res;
-  }
-
-  @override
-  Future<void> createSegmentation({
-    required String token,
-    required SegmentationModel model,
-  }) async {
-    await remote.createSegmentation(token: token, model: model);
-  }
-
-  @override
-  Future<void> editSegmentation({
-    required String token,
-    required SegmentationModel model,
-  }) async {
-    await remote.editSegmentation(token: token, model: model);
-  }
-
-  @override
-  Future<SegmentationModel?> deleteSegmentation({
-    required String token,
-    required String key,
-  }) async {
-    var res = await remote.deleteSegmentation(token: token, key: key);
-    return res;
-  }
-
-  @override
-  Future<BroadcastPrice?> getBroadcastPrice({required String token}) async {
-    var res = await remote.getBroadcastPrice(token: token);
-    return res;
-  }
-
-  //endregion
-
-  //region local
-  @override
-  WidelyUsedLocalModel? getAllWidely() => local.getAllWidely();
-
-  @override
-  Future<void> initWidleyUsed() async {
-    await local.initWidleyUsed();
-  }
-
-  @override
-  Future<StewardSalesInfoDashboard?> getStewardSalesInfoDashboard({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    return await remote.getStewardSalesInfoDashboard(
-      token: token,
-      queryParameters: queryParameters,
-    );
-  }
-
-  @override
-  Future<StewardRemainWeight?> getStewardRemainWeight({required String token}) async {
-    return await remote.getStewardRemainWeight(token: token);
-  }
-
-  //endregion
-}

packages/chicken/lib/data/repositories/kill_house/kill_house_repository.dart

@@ -1,27 +0,0 @@
-import 'package:rasadyar_chicken/data/models/kill_house_module/register_request/request/kill_request_response.dart';
-import 'package:rasadyar_chicken/data/models/kill_house_module/register_request/response/chicken_commission_prices/chicken_commission_prices.dart';
-import 'package:rasadyar_chicken/data/models/kill_house_module/register_request/response/kill_house/kill_house_response.dart';
-import 'package:rasadyar_chicken/data/models/kill_house_module/register_request/response/kill_request_list/kill_request_list.dart'
-    as listModel
-    show KillRequestList;
-
-abstract class KillHouseRepository {
-  Future<List<KillHouseResponse>?> getKillHouseList({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<ChickenCommissionPrices?> getCommissionPrice({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<void> submitKillHouseRequest({required String token, required KillRequestResponse data});
-
-  Future<List<listModel.KillRequestList>?> getListKillRequest({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<void> deleteKillRequest({required String token, required int requestId});
-}

packages/chicken/lib/data/repositories/kill_house/kill_house_repository_impl.dart

@@ -1,58 +0,0 @@
-import 'package:rasadyar_chicken/data/data_source/remote/kill_house/kill_house_remote.dart';
-import 'package:rasadyar_chicken/data/models/kill_house_module/register_request/request/kill_request_response.dart';
-import 'package:rasadyar_chicken/data/models/kill_house_module/register_request/response/chicken_commission_prices/chicken_commission_prices.dart';
-import 'package:rasadyar_chicken/data/models/kill_house_module/register_request/response/kill_house/kill_house_response.dart';
-import 'package:rasadyar_chicken/data/models/kill_house_module/register_request/response/kill_request_list/kill_request_list.dart'
-    as listModel;
-
-import 'kill_house_repository.dart';
-
-class KillHouseRepositoryImpl extends KillHouseRepository {
-  final KillHouseRemoteDataSource remoteDataSource;
-
-  KillHouseRepositoryImpl(this.remoteDataSource);
-
-  @override
-  Future<List<KillHouseResponse>?> getKillHouseList({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    return await remoteDataSource.getKillHouseList(token: token, queryParameters: queryParameters);
-  }
-
-  @override
-  Future<ChickenCommissionPrices?> getCommissionPrice({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    return await remoteDataSource.getCommissionPrice(
-      token: token,
-      queryParameters: queryParameters,
-    );
-  }
-
-  @override
-  Future<void> submitKillHouseRequest({
-    required String token,
-    required KillRequestResponse data,
-  }) async {
-    var jsonData = data.toJson();
-    return await remoteDataSource.submitKillHouseRequest(token: token, data: jsonData);
-  }
-
-  @override
-  Future<List<listModel.KillRequestList>?> getListKillRequest({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    return await remoteDataSource.getListKillRequest(
-      token: token,
-      queryParameters: queryParameters,
-    );
-  }
-
-  @override
-  Future<void> deleteKillRequest({required String token, required int requestId}) async {
-    await remoteDataSource.deleteKillRequest(token: token, requestId: requestId);
-  }
-}

packages/chicken/lib/data/repositories/poultry_science/poultry_science_repository.dart

@@ -1,91 +0,0 @@
-import 'package:rasadyar_chicken/data/models/poultry_export/poultry_export.dart';
-import 'package:rasadyar_chicken/data/models/request/kill_registration/kill_registration.dart';
-import 'package:rasadyar_chicken/data/models/response/all_poultry/all_poultry.dart';
-import 'package:rasadyar_chicken/data/models/response/approved_price/approved_price.dart';
-import 'package:rasadyar_chicken/data/models/response/hatching/hatching_models.dart';
-import 'package:rasadyar_chicken/data/models/response/hatching_report/hatching_report.dart';
-import 'package:rasadyar_chicken/data/models/response/kill_house_poultry/kill_house_poultry.dart';
-import 'package:rasadyar_chicken/data/models/response/kill_request_poultry/kill_request_poultry.dart';
-import 'package:rasadyar_chicken/data/models/response/poultry_farm/poultry_farm.dart';
-import 'package:rasadyar_chicken/data/models/response/poultry_hatching/poultry_hatching.dart';
-import 'package:rasadyar_chicken/data/models/response/poultry_order/poultry_order.dart';
-import 'package:rasadyar_chicken/data/models/response/poultry_science/home_poultry_science/home_poultry_science_model.dart';
-import 'package:rasadyar_chicken/data/models/response/sell_for_freezing/sell_for_freezing.dart';
-import 'package:rasadyar_core/core.dart';
-
-abstract class PoultryScienceRepository {
-  Future<HomePoultryScienceModel?> getHomePoultry({required String token, required String type});
-
-  Future<PaginationModel<HatchingModel>?> getHatchingPoultry({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-
-  Future<void> submitPoultryScienceReport({
-    required String token,
-    required FormData data,
-    ProgressCallback? onSendProgress,
-  });
-
-
-  Future<PaginationModel<HatchingReport>?> getHatchingPoultryReport({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<PaginationModel<PoultryFarm>?> getPoultryScienceFarmList({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<ApprovedPrice?> getApprovedPrice({  required String token,
-    Map<String, dynamic>? queryParameters,});
-
-
-  Future<List<AllPoultry>?> getAllPoultry({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-
-  Future<SellForFreezing?> getSellForFreezing({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-
-  Future<PoultryExport?> getPoultryExport({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<List<KillRequestPoultry>?> getUserPoultry({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<List<PoultryHatching>?> getPoultryHatching({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<List<KillHousePoultry>?> getKillHouseList({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-
-  Future<void> submitKillRegistration({
-    required String token,
-    required KillRegistrationRequest request,
-  });
-
-  Future<PaginationModel<PoultryOrder>?> getPoultryOderList({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  });
-  Future<void> deletePoultryOder({
-    required String token,
-    required String orderId,
-  });
-}

packages/chicken/lib/data/repositories/poultry_science/poultry_science_repository_imp.dart

@@ -1,145 +0,0 @@
-import 'package:rasadyar_chicken/data/data_source/remote/poultry_science/poultry_science_remote.dart';
-import 'package:rasadyar_chicken/data/models/poultry_export/poultry_export.dart';
-import 'package:rasadyar_chicken/data/models/request/kill_registration/kill_registration.dart';
-import 'package:rasadyar_chicken/data/models/response/all_poultry/all_poultry.dart';
-import 'package:rasadyar_chicken/data/models/response/approved_price/approved_price.dart';
-import 'package:rasadyar_chicken/data/models/response/hatching/hatching_models.dart';
-import 'package:rasadyar_chicken/data/models/response/hatching_report/hatching_report.dart';
-import 'package:rasadyar_chicken/data/models/response/kill_house_poultry/kill_house_poultry.dart';
-import 'package:rasadyar_chicken/data/models/response/kill_request_poultry/kill_request_poultry.dart';
-import 'package:rasadyar_chicken/data/models/response/poultry_farm/poultry_farm.dart';
-import 'package:rasadyar_chicken/data/models/response/poultry_hatching/poultry_hatching.dart';
-import 'package:rasadyar_chicken/data/models/response/poultry_order/poultry_order.dart';
-import 'package:rasadyar_chicken/data/models/response/poultry_science/home_poultry_science/home_poultry_science_model.dart';
-import 'package:rasadyar_chicken/data/models/response/sell_for_freezing/sell_for_freezing.dart';
-import 'package:rasadyar_core/core.dart';
-
-import 'poultry_science_repository.dart';
-
-class PoultryScienceRepositoryImp implements PoultryScienceRepository {
-  final PoultryScienceRemoteDatasource datasource;
-
-  PoultryScienceRepositoryImp(this.datasource);
-
-  @override
-  Future<HomePoultryScienceModel?> getHomePoultry({
-    required String token,
-    required String type,
-  }) async => await datasource.getHomePoultryScience(token: token, type: type);
-
-  @override
-  Future<PaginationModel<HatchingModel>?> getHatchingPoultry({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async => await datasource.getHatchingPoultry(token: token, queryParameters: queryParameters);
-
-  @override
-  Future<void> submitPoultryScienceReport({
-    required String token,
-    required FormData data,
-    ProgressCallback? onSendProgress,
-  }) async => await datasource.submitPoultryScienceReport(
-    token: token,
-    data: data,
-    onSendProgress: onSendProgress,
-  );
-
-  @override
-  Future<PaginationModel<HatchingReport>?> getHatchingPoultryReport({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    return await datasource.getPoultryScienceReport(token: token, queryParameters: queryParameters);
-  }
-
-  @override
-  Future<PaginationModel<PoultryFarm>?> getPoultryScienceFarmList({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    return await datasource.getPoultryScienceFarmList(
-      token: token,
-      queryParameters: queryParameters,
-    );
-  }
-
-  @override
-  Future<ApprovedPrice?> getApprovedPrice({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    return await datasource.getApprovedPrice(token: token, queryParameters: queryParameters);
-  }
-
-  @override
-  Future<List<AllPoultry>?> getAllPoultry({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    return await datasource.getAllPoultry(token: token, queryParameters: queryParameters);
-  }
-
-  @override
-  Future<PoultryExport?> getPoultryExport({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    return await datasource.getPoultryExport(token: token, queryParameters: queryParameters);
-  }
-
-  @override
-  Future<SellForFreezing?> getSellForFreezing({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    return await datasource.getSellForFreezing(token: token, queryParameters: queryParameters);
-  }
-
-  @override
-  Future<List<KillRequestPoultry>?> getUserPoultry({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    return await datasource.getUserPoultry(token: token, queryParameters: queryParameters);
-  }
-
-  @override
-  Future<List<PoultryHatching>?> getPoultryHatching({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    return await datasource.getPoultryHatching(token: token, queryParameters: queryParameters);
-  }
-
-  @override
-  Future<List<KillHousePoultry>?> getKillHouseList({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    return await datasource.getKillHouseList(token: token, queryParameters: queryParameters);
-  }
-
-  @override
-  Future<void> submitKillRegistration({
-    required String token,
-    required KillRegistrationRequest request,
-  }) async {
-    await datasource.submitKillRegistration(token: token, request: request);
-  }
-
-  @override
-  Future<PaginationModel<PoultryOrder>?> getPoultryOderList({
-    required String token,
-    Map<String, dynamic>? queryParameters,
-  }) async {
-    return await datasource.getPoultryOderList(token: token, queryParameters: queryParameters);
-  }
-
-  @override
-  Future<void> deletePoultryOder({
-    required String token,
-    required String orderId,
-  }) async {
-    await datasource.deletePoultryOder(token: token, orderId: orderId);
-  }
-}

packages/chicken/lib/features/city_jahad/city_jahad.dart

@@ -0,0 +1,3 @@
+export 'data/di/city_jahad_di.dart';
+export 'presentation/routes/routes.dart';
+export 'presentation/routes/pages.dart';

packages/chicken/lib/features/city_jahad/data/datasources/remote/city_jahad_remote_data_source.dart

@@ -0,0 +1,15 @@
+import 'package:rasadyar_chicken/features/poultry_science/data/model/response/poultry_science_report/poultry_science_report.dart';
+import 'package:rasadyar_chicken/features/poultry_science/data/model/request/submit_inspection/submit_inspection_response.dart';
+import 'package:rasadyar_core/core.dart';
+
+abstract class CityJahadRemoteDataSource {
+  Future<PaginationModel<PoultryScienceReport>?> getSubmitInspectionList({
+    required String token,
+    Map<String, dynamic>? queryParameters,
+  });
+
+  Future<void> submitInspection({
+    required String token,
+    required SubmitInspectionResponse request,
+  });
+}

packages/chicken/lib/features/city_jahad/data/datasources/remote/city_jahad_remote_data_source_impl.dart

@@ -0,0 +1,39 @@
+import 'package:rasadyar_chicken/features/poultry_science/data/model/response/poultry_science_report/poultry_science_report.dart';
+import 'package:rasadyar_chicken/features/poultry_science/data/model/request/submit_inspection/submit_inspection_response.dart';
+import 'package:rasadyar_chicken/features/city_jahad/data/datasources/remote/city_jahad_remote_data_source.dart';
+import 'package:rasadyar_core/core.dart';
+
+class CityJahadRemoteDataSourceImpl implements CityJahadRemoteDataSource {
+  final DioRemote _httpClient;
+
+  CityJahadRemoteDataSourceImpl(this._httpClient);
+
+  @override
+  Future<PaginationModel<PoultryScienceReport>?> getSubmitInspectionList({
+    required String token,
+    Map<String, dynamic>? queryParameters,
+  }) async {
+    var res = await _httpClient.get(
+      '/poultry_science_report/',
+      headers: {'Authorization': 'Bearer $token'},
+      queryParameters: queryParameters,
+      fromJson: (json) => PaginationModel<PoultryScienceReport>.fromJson(
+        json,
+        (json) => PoultryScienceReport.fromJson(json as Map<String, dynamic>),
+      ),
+    );
+    return res.data;
+  }
+
+  @override
+  Future<void> submitInspection({
+    required String token,
+    required SubmitInspectionResponse request,
+  }) async {
+    await _httpClient.post(
+      '/poultry_science_report/',
+      headers: {'Authorization': 'Bearer $token'},
+      data: request.toJson(),
+    );
+  }
+}

packages/chicken/lib/features/city_jahad/data/di/city_jahad_di.dart

@@ -0,0 +1,36 @@
+import 'package:rasadyar_chicken/features/city_jahad/data/datasources/remote/city_jahad_remote_data_source.dart';
+import 'package:rasadyar_chicken/features/city_jahad/data/datasources/remote/city_jahad_remote_data_source_impl.dart';
+import 'package:rasadyar_chicken/features/city_jahad/data/repositories/city_jahad_repository.dart';
+import 'package:rasadyar_chicken/features/city_jahad/data/repositories/city_jahad_repository_impl.dart';
+import 'package:rasadyar_core/core.dart';
+
+/// Setup dependency injection for city_jahad feature
+Future<void> setupCityJahadDI(GetIt di, DioRemote dioRemote) async {
+  di.registerLazySingleton<CityJahadRemoteDataSource>(
+    () => CityJahadRemoteDataSourceImpl(dioRemote),
+  );
+
+  di.registerLazySingleton<CityJahadRepository>(
+    () => CityJahadRepositoryImpl(di.get<CityJahadRemoteDataSource>()),
+  );
+}
+
+/// Re-register city_jahad dependencies (used when base URL changes)
+Future<void> reRegisterCityJahadDI(GetIt di, DioRemote dioRemote) async {
+  await reRegister(di, () => CityJahadRemoteDataSourceImpl(dioRemote));
+  await reRegister(
+    di,
+    () => CityJahadRepositoryImpl(di.get<CityJahadRemoteDataSource>()),
+  );
+}
+
+/// Helper function to re-register a dependency
+Future<void> reRegister<T extends Object>(
+  GetIt di,
+  T Function() factory,
+) async {
+  if (di.isRegistered<T>()) {
+    await di.unregister<T>();
+  }
+  di.registerLazySingleton<T>(factory);
+}

packages/chicken/lib/features/city_jahad/data/repositories/city_jahad_repository.dart

@@ -0,0 +1,15 @@
+import 'package:rasadyar_chicken/features/poultry_science/data/model/response/poultry_science_report/poultry_science_report.dart';
+import 'package:rasadyar_chicken/features/poultry_science/data/model/request/submit_inspection/submit_inspection_response.dart';
+import 'package:rasadyar_core/core.dart';
+
+abstract class CityJahadRepository {
+  Future<PaginationModel<PoultryScienceReport>?> getSubmitInspectionList({
+    required String token,
+    Map<String, dynamic>? queryParameters,
+  });
+
+  Future<void> submitInspection({
+    required String token,
+    required SubmitInspectionResponse request,
+  });
+}

packages/chicken/lib/features/city_jahad/data/repositories/city_jahad_repository_impl.dart

@@ -0,0 +1,30 @@
+import 'package:rasadyar_chicken/features/poultry_science/data/model/response/poultry_science_report/poultry_science_report.dart';
+import 'package:rasadyar_chicken/features/poultry_science/data/model/request/submit_inspection/submit_inspection_response.dart';
+import 'package:rasadyar_chicken/features/city_jahad/data/datasources/remote/city_jahad_remote_data_source.dart';
+import 'package:rasadyar_chicken/features/city_jahad/data/repositories/city_jahad_repository.dart';
+import 'package:rasadyar_core/core.dart';
+
+class CityJahadRepositoryImpl implements CityJahadRepository {
+  final CityJahadRemoteDataSource _remote;
+
+  CityJahadRepositoryImpl(this._remote);
+
+  @override
+  Future<PaginationModel<PoultryScienceReport>?> getSubmitInspectionList({
+    required String token,
+    Map<String, dynamic>? queryParameters,
+  }) async {
+    return await _remote.getSubmitInspectionList(
+      token: token,
+      queryParameters: queryParameters,
+    );
+  }
+
+  @override
+  Future<void> submitInspection({
+    required String token,
+    required SubmitInspectionResponse request,
+  }) async {
+    return await _remote.submitInspection(token: token, request: request);
+  }
+}

packages/chicken/lib/features/city_jahad/presentation/pages/active_hatching/logic.dart

@@ -0,0 +1,95 @@
+import 'package:rasadyar_chicken/data/di/chicken_di.dart';
+import 'package:rasadyar_chicken/features/poultry_science/data/model/response/hatching/hatching_models.dart';
+import 'package:rasadyar_chicken/features/poultry_science/data/repositories/poultry_science_repository.dart';
+import 'package:rasadyar_chicken/features/city_jahad/presentation/pages/root/logic.dart';
+import 'package:rasadyar_core/core.dart';
+
+class ActiveHatchingLogic extends GetxController {
+  CityJahadRootLogic rootLogic = Get.find<CityJahadRootLogic>();
+  BaseLogic baseLogic = Get.find<BaseLogic>();
+  late PoultryScienceRepository poultryScienceRepository;
+  Rx<Resource<PaginationModel<HatchingModel>>> activeHatchingList =
+      Resource<PaginationModel<HatchingModel>>.loading().obs;
+
+  final RxBool isLoadingMoreList = false.obs;
+  RxInt currentPage = 1.obs;
+  RxInt expandedIndex = RxInt(-1);
+  List<String> routesName = ['اقدام', 'جوجه ریزی فعال'];
+
+  Rx<Jalali> fromDateFilter = Jalali.now().obs;
+  Rx<Jalali> toDateFilter = Jalali.now().obs;
+  RxnString searchedValue = RxnString();
+
+  @override
+  void onInit() {
+    super.onInit();
+    poultryScienceRepository = diChicken.get<PoultryScienceRepository>();
+  }
+
+  @override
+  void onReady() {
+    super.onReady();
+    getHatchingList();
+  }
+
+  @override
+  void onClose() {
+    super.onClose();
+    baseLogic.clearSearch();
+  }
+
+  Future<void> getHatchingList([bool isLoadingMore = false]) async {
+    if (isLoadingMore) {
+      isLoadingMoreList.value = true;
+    } else {
+      activeHatchingList.value =
+          Resource<PaginationModel<HatchingModel>>.loading();
+    }
+
+    if (searchedValue.value != null &&
+        searchedValue.value!.trim().isNotEmpty &&
+        currentPage.value > 1) {
+      currentPage.value = 1;
+    }
+
+    safeCall(
+      call: () async => await poultryScienceRepository.getHatchingPoultry(
+        token: rootLogic.tokenService.accessToken.value!,
+        queryParameters: buildQueryParams(
+          queryParams: {'type': 'hatching'},
+          role: 'CityJahad',
+          pageSize: 50,
+          page: currentPage.value,
+        ),
+      ),
+      onSuccess: (res) {
+        if ((res?.count ?? 0) == 0) {
+          activeHatchingList.value =
+              Resource<PaginationModel<HatchingModel>>.empty();
+        } else {
+          activeHatchingList.value =
+              Resource<PaginationModel<HatchingModel>>.success(
+                PaginationModel<HatchingModel>(
+                  count: res?.count ?? 0,
+                  next: res?.next,
+                  previous: res?.previous,
+                  results: [
+                    ...(activeHatchingList.value.data?.results ?? []),
+                    ...(res?.results ?? []),
+                  ],
+                ),
+              );
+        }
+      },
+    );
+  }
+
+  void toggleExpanded(int index) {
+    expandedIndex.value = expandedIndex.value == index ? -1 : index;
+  }
+
+  Future<void> onRefresh() async {
+    currentPage.value = 1;
+    await getHatchingList();
+  }
+}

packages/chicken/lib/features/city_jahad/presentation/pages/active_hatching/view.dart

@@ -0,0 +1,239 @@
+import 'package:flutter/material.dart';
+import 'package:rasadyar_chicken/features/poultry_science/data/model/response/hatching/hatching_models.dart';
+import 'package:rasadyar_chicken/features/city_jahad/presentation/pages/active_hatching/logic.dart';
+import 'package:rasadyar_chicken/features/poultry_science/presentation/widgets/submit_inspection_bottom_sheet/create_inspection_bottom_sheet.dart';
+import 'package:rasadyar_chicken/features/poultry_science/presentation/widgets/submit_inspection_bottom_sheet/create_inspection_bottom_sheet_logic.dart';
+import 'package:rasadyar_chicken/presentation/utils/nested_keys_utils.dart';
+import 'package:rasadyar_chicken/presentation/widget/base_page/view.dart';
+import 'package:rasadyar_core/core.dart';
+
+class ActiveHatchingPage extends GetView<ActiveHatchingLogic> {
+  const ActiveHatchingPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return ChickenBasePage(
+      hasSearch: true,
+      hasFilter: false,
+      backId: cityJahadActionKey,
+      routes: controller.routesName,
+      onSearchChanged: (data) {
+        controller.searchedValue.value = data;
+        controller.getHatchingList();
+      },
+      child: hatchingWidget(),
+      /*widgets: [
+        hatchingWidget()
+      ],*/
+    );
+  }
+
+  Widget hatchingWidget() {
+    return ObxValue((data) {
+      return RPaginatedListView(
+        listType: ListType.separated,
+        resource: data.value,
+        hasMore: data.value.data?.next != null,
+        padding: EdgeInsets.fromLTRB(8, 8, 8, 80),
+        itemBuilder: (context, index) {
+          var item = data.value.data!.results![index];
+          return ObxValue((val) {
+            return ExpandableListItem2(
+              selected: val.value.isEqual(index),
+              onTap: () => controller.toggleExpanded(index),
+              index: index,
+              child: itemListWidget(item),
+              secondChild: itemListExpandedWidget(item),
+              labelColor: AppColor.blueLight,
+              labelIcon: Assets.vec.activeFramSvg.path,
+            );
+          }, controller.expandedIndex);
+        },
+        itemCount: data.value.data?.results?.length ?? 0,
+        separatorBuilder: (context, index) => SizedBox(height: 8.h),
+        onLoadMore: () async => controller.getHatchingList(true),
+      );
+    }, controller.activeHatchingList);
+  }
+
+  Container itemListExpandedWidget(HatchingModel item) {
+    return Container(
+      padding: EdgeInsets.symmetric(horizontal: 8),
+      decoration: BoxDecoration(
+        color: Colors.white,
+        borderRadius: BorderRadius.circular(8),
+      ),
+      child: Column(
+        spacing: 8,
+        children: [
+          Row(
+            mainAxisAlignment: MainAxisAlignment.start,
+            children: [
+              Text(
+                item.poultry?.user?.fullname ?? 'N/A',
+                textAlign: TextAlign.center,
+                style: AppFonts.yekan16.copyWith(color: AppColor.greenDark),
+              ),
+              Spacer(),
+
+              Visibility(
+                child: Text(
+                  item.violation == true ? 'پیگیری' : 'عادی',
+                  textAlign: TextAlign.center,
+                  style: AppFonts.yekan10.copyWith(color: AppColor.redDark),
+                ),
+              ),
+            ],
+          ),
+          Container(
+            height: 32,
+            padding: EdgeInsets.symmetric(horizontal: 8),
+            decoration: ShapeDecoration(
+              color: AppColor.blueLight,
+              shape: RoundedRectangleBorder(
+                side: BorderSide(width: 1, color: AppColor.blueLightHover),
+                borderRadius: BorderRadius.circular(8),
+              ),
+            ),
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Text(
+                  'نژاد:${item.breed?.first.breed ?? 'N/A'}',
+                  style: AppFonts.yekan14.copyWith(color: AppColor.textColor),
+                ),
+                Text(
+                  ' سن${item.age} (روز)',
+
+                  style: AppFonts.yekan14.copyWith(color: AppColor.blueNormal),
+                ),
+                Text(
+                  ' دوره جوجه ریزی:${item.period}',
+                  style: AppFonts.yekan14.copyWith(color: AppColor.textColor),
+                ),
+              ],
+            ),
+          ),
+
+          buildRow(
+            title: 'شماره مجوز جوجه ریزی',
+            value: item.licenceNumber ?? 'N/A',
+          ),
+          buildUnitRow(
+            title: 'حجم جوجه ریزی',
+            value: item.quantity.separatedByCommaFa,
+            unit: '(قطعه)',
+          ),
+          buildUnitRow(
+            title: 'مانده در سالن',
+            value: item.leftOver.separatedByCommaFa,
+            unit: '(قطعه)',
+          ),
+          buildUnitRow(
+            title: 'تلفات',
+            value: item.losses.separatedByCommaFa,
+            unit: '(قطعه)',
+          ),
+          buildRow(
+            title: 'دامپزشک فارم',
+            value:
+                '${item.vetFarm?.vetFarmFullName}(${item.vetFarm?.vetFarmMobile})',
+          ),
+          buildRow(
+            title: 'شرح بازرسی',
+            value: item.reportInfo?.image == false
+                ? 'ارسال تصویر جوجه ریزی فارم '
+                : 'تکمیل شده',
+            titleStyle: AppFonts.yekan14.copyWith(
+              color: (item.reportInfo?.image ?? false)
+                  ? AppColor.greenNormal
+                  : AppColor.redDark,
+            ),
+            valueStyle: AppFonts.yekan14.copyWith(
+              color: (item.reportInfo?.image ?? false)
+                  ? AppColor.greenNormal
+                  : AppColor.redDark,
+            ),
+          ),
+
+          RElevated(
+            height: 40.h,
+            isFullWidth: true,
+            onPressed: () {
+              Get.find<CreateInspectionBottomSheetLogic>().setHatchingModel(
+                item,
+              );
+              Get.bottomSheet(
+                CreateInspectionBottomSheet(),
+                isScrollControlled: true,
+                ignoreSafeArea: false,
+              ).then((value) {
+                if (Get.isRegistered<CreateInspectionBottomSheetLogic>()) {
+                  Get.find<CreateInspectionBottomSheetLogic>().clearForm();
+                }
+              });
+            },
+            child: Text('ثبت بازرسی'),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget itemListWidget(HatchingModel item) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+      children: [
+        SizedBox(width: 20),
+        Expanded(
+          flex: 2,
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            spacing: 3,
+            children: [
+              Text(
+                item.poultry?.user?.fullname ?? 'N/A',
+                textAlign: TextAlign.start,
+                style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal),
+              ),
+              Text(
+                item.poultry?.user?.mobile ?? 'N/A',
+                textAlign: TextAlign.center,
+                style: AppFonts.yekan14.copyWith(color: AppColor.bgDark),
+              ),
+            ],
+          ),
+        ),
+        Expanded(
+          flex: 3,
+          child: Column(
+            spacing: 3,
+            mainAxisAlignment: MainAxisAlignment.center,
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              Text(
+                item.poultry?.unitName ?? 'N/A',
+                textAlign: TextAlign.start,
+                style: AppFonts.yekan12.copyWith(color: AppColor.bgDark),
+              ),
+              Text(
+                item.poultry?.licenceNumber ?? 'N/A',
+                textAlign: TextAlign.left,
+                style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal),
+              ),
+            ],
+          ),
+        ),
+        Expanded(
+          flex: 1,
+          child: Assets.vec.scanSvg.svg(
+            width: 32.w,
+            height: 32.h,
+            colorFilter: ColorFilter.mode(AppColor.blueNormal, BlendMode.srcIn),
+          ),
+        ),
+      ],
+    );
+  }
+}

packages/chicken/lib/features/city_jahad/presentation/pages/home/logic.dart

@@ -0,0 +1,29 @@
+import 'package:rasadyar_chicken/features/city_jahad/presentation/routes/routes.dart';
+import 'package:rasadyar_core/core.dart';
+
+class CityJahadActionItem {
+  final String title;
+  final String route;
+  final String icon;
+
+  CityJahadActionItem({
+    required this.title,
+    required this.route,
+    required this.icon,
+  });
+}
+
+class CityJahadHomeLogic extends GetxController {
+  RxList<CityJahadActionItem> items = [
+    CityJahadActionItem(
+      title: "جوجه ریزی فعال",
+      route: CityJahadRoutes.activeHatchingCityJahad,
+      icon: Assets.vec.activeFramSvg.path,
+    ),
+    CityJahadActionItem(
+      title: "بازرسی مزارع طیور",
+      route: CityJahadRoutes.newInspectionCityJahad,
+      icon: Assets.vec.activeFramSvg.path,
+    ),
+  ].obs;
+}

packages/chicken/lib/features/city_jahad/presentation/pages/home/view.dart

@@ -0,0 +1,46 @@
+import 'package:flutter/material.dart';
+import 'package:rasadyar_chicken/presentation/utils/nested_keys_utils.dart';
+import 'package:rasadyar_chicken/presentation/widget/base_page/view.dart';
+import 'package:rasadyar_core/core.dart';
+
+import 'logic.dart';
+
+class CityJahadHomePage extends GetView<CityJahadHomeLogic> {
+  CityJahadHomePage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return ChickenBasePage(
+      isBase: true,
+      hasNews: true,
+      hasNotification: true,
+      child: gridWidget(),
+    );
+  }
+
+  Widget gridWidget() {
+    return ObxValue((data) {
+      return GridView.builder(
+        physics: BouncingScrollPhysics(),
+        padding: EdgeInsets.symmetric(vertical: 18.h, horizontal: 32.w),
+        gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+          crossAxisCount: 2,
+          mainAxisSpacing: 24.h,
+          crossAxisSpacing: 24.w,
+        ),
+        itemCount: data.length,
+        hitTestBehavior: HitTestBehavior.opaque,
+        itemBuilder: (BuildContext context, int index) {
+          var item = data[index];
+          return GlassMorphismCardIcon(
+            title: item.title,
+            vecIcon: item.icon,
+            onTap: () async {
+              Get.toNamed(item.route, id: cityJahadActionKey);
+            },
+          );
+        },
+      );
+    }, controller.items);
+  }
+}

packages/chicken/lib/features/city_jahad/presentation/pages/new_inspection/logic.dart

@@ -0,0 +1,160 @@
+import 'package:flutter/material.dart';
+import 'package:rasadyar_chicken/features/city_jahad/presentation/pages/root/logic.dart';
+import 'package:rasadyar_chicken/features/poultry_science/data/model/response/poultry_science_report/poultry_science_report.dart';
+import 'package:rasadyar_chicken/presentation/widget/base_page/logic.dart';
+import 'package:rasadyar_core/core.dart';
+
+class NewInspectionLogic extends GetxController {
+  BaseLogic baseLogic = Get.find<BaseLogic>();
+
+  Rx<Resource<PaginationModel<PoultryScienceReport>>> submitInspectionList =
+      Resource<PaginationModel<PoultryScienceReport>>.loading().obs;
+
+  CityJahadRootLogic rootLogic = Get.find<CityJahadRootLogic>();
+
+  final RxBool isLoadingMoreAllocationsMade = false.obs;
+  RxInt currentPage = 1.obs;
+  RxInt expandedIndex = RxInt(-1);
+  RxList<XFile> pickedImages = <XFile>[].obs;
+  final List<MultipartFile> _multiPartPickedImages = <MultipartFile>[];
+
+  RxBool isOnUpload = false.obs;
+
+  RxDouble presentUpload = 0.0.obs;
+  RxList<String> routesName = RxList();
+  RxInt selectedSegmentIndex = 0.obs;
+
+  RxnString searchedValue = RxnString();
+  Rx<Jalali> fromDateFilter = Jalali.now().obs;
+  Rx<Jalali> toDateFilter = Jalali.now().obs;
+    
+  @override
+  void onInit() {
+    super.onInit();
+
+    routesName.value = ['اقدام'].toList();
+
+    ever(selectedSegmentIndex, (callback) {
+      routesName.removeLast();
+      routesName.add(callback == 0 ? 'بازرسی' : 'بایگانی');
+    });
+  }
+
+  @override
+  void onReady() {
+    super.onReady();
+
+    getReport();
+  }
+
+  @override
+  void onClose() {
+    super.onClose();
+    baseLogic.clearSearch();
+  }
+
+  Future<void> getReport([bool isLoadingMore = false]) async {
+    if (isLoadingMore) {
+      isLoadingMoreAllocationsMade.value = true;
+    } else {
+      submitInspectionList.value =
+          Resource<PaginationModel<PoultryScienceReport>>.loading();
+    }
+
+    if (searchedValue.value != null &&
+        searchedValue.value!.trim().isNotEmpty &&
+        currentPage.value > 1) {
+      currentPage.value = 1;
+    }
+
+    safeCall(
+      call: () async =>
+          await rootLogic.cityJahadRepository.getSubmitInspectionList(
+            token: rootLogic.tokenService.accessToken.value!,
+            queryParameters: buildQueryParams(
+              role: 'CityJahad',
+              pageSize: 50,
+              search: 'filter',
+
+              page: currentPage.value,
+            ),
+          ),
+      onSuccess: (res) {
+        if ((res?.count ?? 0) == 0) {
+          submitInspectionList.value =
+              Resource<PaginationModel<PoultryScienceReport>>.empty();
+        } else {
+          submitInspectionList.value =
+              Resource<PaginationModel<PoultryScienceReport>>.success(
+                PaginationModel<PoultryScienceReport>(
+                  count: res?.count ?? 0,
+                  next: res?.next,
+                  previous: res?.previous,
+                  results: [
+                    ...(submitInspectionList.value.data?.results ?? []),
+                    ...(res?.results ?? []),
+                  ],
+                ),
+              );
+        }
+      },
+    );
+  }
+
+  Future<void> pickImages() async {
+    determineCurrentPosition();
+    var tmp = await pickCameraImage();
+    if (tmp?.path != null && pickedImages.length < 7) {
+      pickedImages.add(tmp!);
+    }
+  }
+
+  void removeImage(int index) {
+    pickedImages.removeAt(index);
+  }
+
+  void closeBottomSheet() {
+    Get.back();
+  }
+
+  double calculateUploadProgress({required int sent, required int total}) {
+    if (total != 0) {
+      double progress = (sent * 100 / total) / 100;
+      return progress;
+    } else {
+      return 0.0;
+    }
+  }
+
+  void toggleExpanded(int index) {
+    expandedIndex.value = expandedIndex.value == index ? -1 : index;
+  }
+
+  void setSearchValue(String? data) {
+    dLog('Search Value: $data');
+    searchedValue.value = data?.trim();
+    getReport();
+  }
+
+  Future<void> onRefresh() async {
+    currentPage.value = 1;
+    await getReport();
+  }
+
+  String getStatus(PoultryScienceReport item) {
+    final status = item.reportInformation?.inspectionStatus ?? item.state;
+    if (status == null || status.isEmpty) {
+      return 'در حال بررسی';
+    }
+    return status;
+  }
+
+  Color getStatusColor(PoultryScienceReport item) {
+    final status = item.reportInformation?.inspectionStatus ?? item.state;
+    if (status == null || status.isEmpty) {
+      return AppColor.yellowNormal;
+    }
+    // می‌توانید منطق رنگ را بر اساس inspectionStatus تنظیم کنید
+    return AppColor.greenNormal;
+  }
+}

packages/chicken/lib/features/city_jahad/presentation/pages/root/logic.dart

@@ -0,0 +1,84 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:rasadyar_chicken/data/di/chicken_di.dart';
+import 'package:rasadyar_chicken/features/city_jahad/data/repositories/city_jahad_repository.dart';
+import 'package:rasadyar_chicken/features/city_jahad/presentation/routes/pages.dart';
+import 'package:rasadyar_chicken/features/city_jahad/presentation/routes/routes.dart';
+import 'package:rasadyar_chicken/features/city_jahad/presentation/pages/home/view.dart';
+import 'package:rasadyar_chicken/features/common/presentation/page/profile/view.dart';
+import 'package:rasadyar_chicken/presentation/utils/nested_keys_utils.dart';
+import 'package:rasadyar_chicken/presentation/utils/utils.dart';
+import 'package:rasadyar_core/core.dart';
+
+enum ErrorLocationType { serviceDisabled, permissionDenied, none }
+
+class CityJahadRootLogic extends GetxController {
+  var tokenService = Get.find<TokenStorageService>();
+
+  late CityJahadRepository cityJahadRepository;
+
+  RxList<ErrorLocationType> errorLocationType = RxList();
+  RxMap<int, dynamic> homeExpandedList = RxMap();
+  DateTime? _lastBackPressed;
+
+  RxInt currentPage = 0.obs;
+
+  final pages = [
+    Navigator(
+      key: Get.nestedKey(cityJahadActionKey),
+      onGenerateRoute: (settings) {
+        final page = CityJahadPages.pages.firstWhere(
+          (e) => e.name == settings.name,
+          orElse: () => CityJahadPages.pages.firstWhere(
+            (e) => e.name == CityJahadRoutes.homeCityJahad,
+          ),
+        );
+
+        return buildRouteFromGetPage(page);
+      },
+    ),
+
+    ProfilePage(),
+  ];
+
+  @override
+  void onInit() {
+    super.onInit();
+    cityJahadRepository = diChicken.get<CityJahadRepository>();
+  }
+
+  void toggleExpanded(int index) {
+    if (homeExpandedList.keys.contains(index)) {
+      homeExpandedList.remove(index);
+    } else {
+      homeExpandedList[index] = false;
+    }
+  }
+
+  void rootErrorHandler(DioException error) {
+    handleGeneric(error, () {
+      tokenService.deleteModuleTokens(Module.chicken);
+    });
+  }
+
+  void changePage(int index) {
+    currentPage.value = index;
+  }
+
+  void popBackTaped() async {
+    final now = DateTime.now();
+    if (_lastBackPressed == null ||
+        now.difference(_lastBackPressed!) > Duration(seconds: 2)) {
+      _lastBackPressed = now;
+      Get.snackbar(
+        'خروج از برنامه',
+        'برای خروج دوباره بازگشت را بزنید',
+        snackPosition: SnackPosition.TOP,
+        duration: Duration(seconds: 2),
+        backgroundColor: AppColor.warning,
+      );
+    } else {
+      await SystemNavigator.pop();
+    }
+  }
+}

packages/chicken/lib/features/city_jahad/presentation/pages/root/view.dart

@@ -0,0 +1,58 @@
+import 'package:flutter/material.dart';
+import 'package:rasadyar_chicken/presentation/utils/nested_keys_utils.dart';
+import 'package:rasadyar_chicken/presentation/widget/base_page/view.dart';
+import 'package:rasadyar_core/core.dart';
+
+import 'logic.dart';
+
+class CityJahadRootPage extends GetView<CityJahadRootLogic> {
+  const CityJahadRootPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return ChickenBasePage(
+      isFullScreen: true,
+      onPopScopTaped: controller.popBackTaped,
+      child: ObxValue((data) {
+        return Stack(
+          children: [
+            IndexedStack(children: controller.pages, index: data.value),
+            Positioned(
+              right: 0,
+              left: 0,
+              bottom: 0,
+              child: RBottomNavigation(
+                mainAxisAlignment: MainAxisAlignment.spaceAround,
+                items: [
+       
+                  RBottomNavigationItem(
+                    label: 'خانه',
+                    icon: Assets.vec.homeSvg.path,
+                    isSelected: controller.currentPage.value == 0,
+                    onTap: () {
+                      Get.nestedKey(
+                        cityJahadActionKey,
+                      )?.currentState?.popUntil((route) => route.isFirst);
+                      controller.changePage(0);
+                    },
+                  ),
+                  RBottomNavigationItem(
+                    label: 'پروفایل',
+                    icon: Assets.vec.profileCircleSvg.path,
+                    isSelected: controller.currentPage.value == 1,
+                    onTap: () {
+                      Get.nestedKey(
+                        cityJahadActionKey,
+                      )?.currentState?.popUntil((route) => route.isFirst);
+                      controller.changePage(1);
+                    },
+                  ),
+                ],
+              ),
+            ),
+          ],
+        );
+      }, controller.currentPage),
+    );
+  }
+}

packages/chicken/lib/features/city_jahad/presentation/routes/pages.dart

@@ -0,0 +1,66 @@
+import 'package:rasadyar_chicken/features/city_jahad/presentation/pages/home/logic.dart';
+import 'package:rasadyar_chicken/features/city_jahad/presentation/pages/home/view.dart';
+import 'package:rasadyar_chicken/features/city_jahad/presentation/pages/root/logic.dart';
+import 'package:rasadyar_chicken/features/city_jahad/presentation/pages/root/view.dart';
+import 'package:rasadyar_chicken/features/city_jahad/presentation/pages/active_hatching/logic.dart';
+import 'package:rasadyar_chicken/features/city_jahad/presentation/pages/active_hatching/view.dart';
+import 'package:rasadyar_chicken/features/city_jahad/presentation/pages/new_inspection/logic.dart';
+import 'package:rasadyar_chicken/features/city_jahad/presentation/pages/new_inspection/view.dart';
+import 'package:rasadyar_chicken/features/city_jahad/presentation/routes/routes.dart';
+import 'package:rasadyar_chicken/features/poultry_science/presentation/widgets/submit_inspection_bottom_sheet/create_inspection_bottom_sheet_logic.dart';
+import 'package:rasadyar_chicken/presentation/routes/global_binding.dart';
+import 'package:rasadyar_chicken/presentation/widget/base_page/logic.dart';
+import 'package:rasadyar_core/core.dart';
+
+class CityJahadPages {
+  CityJahadPages._();
+
+  static List<GetPage> get pages => [
+    GetPage(
+      name: CityJahadRoutes.initCityJahad,
+      page: () => CityJahadRootPage(),
+      middlewares: [AuthMiddleware()],
+      bindings: [
+        GlobalBinding(),
+        BindingsBuilder(() {
+          Get.lazyPut(() => ChickenBaseLogic(), fenix: true);
+          Get.lazyPut(() => CityJahadRootLogic());
+          Get.lazyPut(() => CityJahadHomeLogic());
+        }),
+      ],
+    ),
+    GetPage(
+      name: CityJahadRoutes.homeCityJahad,
+      page: () => CityJahadHomePage(),
+      middlewares: [AuthMiddleware()],
+      binding: BindingsBuilder(() {
+        Get.put(CityJahadHomeLogic());
+        Get.lazyPut(() => ChickenBaseLogic());
+      }),
+    ),
+
+    GetPage(
+      name: CityJahadRoutes.activeHatchingCityJahad,
+      page: () => ActiveHatchingPage(),
+      middlewares: [AuthMiddleware()],
+      bindings: [
+        GlobalBinding(),
+        BindingsBuilder(() {
+          Get.lazyPut(() => ActiveHatchingLogic());
+          Get.lazyPut(() => CreateInspectionBottomSheetLogic());
+        }),
+      ],
+    ),
+    GetPage(
+      name: CityJahadRoutes.newInspectionCityJahad,
+      page: () => NewInspectionPage(),
+      middlewares: [AuthMiddleware()],
+      bindings: [
+        GlobalBinding(),
+        BindingsBuilder(() {
+          Get.lazyPut(() => NewInspectionLogic());
+        }),
+      ],
+    ),
+  ];
+}

packages/chicken/lib/features/city_jahad/presentation/routes/routes.dart

@@ -0,0 +1,10 @@
+sealed class CityJahadRoutes {
+  CityJahadRoutes._();
+
+  static const _base = '/chicken/cityJahad';
+  static const initCityJahad = '$_base/';
+  static const homeCityJahad = '$_base/home';
+  static const actionCityJahad = '$_base/action';
+  static const activeHatchingCityJahad = '$_base/activeHatching';
+  static const newInspectionCityJahad = '$_base/newInspection';
+}

packages/chicken/lib/features/common/common.dart

@@ -0,0 +1,2 @@
+export 'presentation/routes/routes.dart';
+export 'presentation/routes/pages.dart';

packages/chicken/lib/features/common/data/datasources/local/chicken_local.dart

@@ -1,4 +1,4 @@
-import 'package:rasadyar_chicken/data/models/local/widely_used_local_model.dart';
+import 'package:rasadyar_chicken/features/common/data/model/local/widely_used_local_model.dart';
 
 abstract class ChickenLocalDataSource {
   Future<void> openBox();

packages/chicken/lib/features/common/data/datasources/local/chicken_local_imp.dart

@@ -1,4 +1,5 @@
-import 'package:rasadyar_chicken/data/models/local/widely_used_local_model.dart';
+import 'package:rasadyar_chicken/features/common/data/model/local/widely_used_local_model.dart';
+import 'package:rasadyar_chicken/features/steward/presentation/routes/routes.dart';
 import 'package:rasadyar_core/core.dart';
 
 import 'chicken_local.dart';
@@ -22,7 +23,7 @@ class ChickenLocalDataSourceImp implements ChickenLocalDataSource {
         color: AppColor.greenLightActive.toARGB32(),
         iconColor: AppColor.greenNormal.toARGB32(),
         iconPath: Assets.vec.cubeSearchSvg.path,
-        path: ChickenRoutes.buysInProvinceSteward,
+        path: StewardRoutes.buysInProvinceSteward,
       ),
       WidelyUsedLocalItem(
         index: 1,
@@ -31,7 +32,7 @@ class ChickenLocalDataSourceImp implements ChickenLocalDataSource {
         color: AppColor.blueLightActive.toARGB32(),
         iconColor: AppColor.blueNormal.toARGB32(),
         iconPath: Assets.vec.cubeSvg.path,
-        path: ChickenRoutes.salesInProvinceSteward,
+        path: StewardRoutes.salesInProvinceSteward,
       ),
 
       WidelyUsedLocalItem(
@@ -40,7 +41,7 @@ class ChickenLocalDataSourceImp implements ChickenLocalDataSource {
         color: AppColor.blueLightActive.toARGB32(),
         iconColor: AppColor.blueNormal.toARGB32(),
         iconPath: Assets.vec.cubeRotateSvg.path,
-        path: ChickenRoutes.buysInProvinceSteward,
+        path: StewardRoutes.buysInProvinceSteward,
       ),
     ]; */
   }

packages/chicken/lib/features/common/data/datasources/remote/auth/auth_remote.dart

@@ -1,6 +1,6 @@
 
-import 'package:rasadyar_chicken/data/models/response/user_info/user_info_model.dart';
-import 'package:rasadyar_chicken/data/models/response/user_profile_model/user_profile_model.dart';
+import 'package:rasadyar_chicken/features/common/data/model/response/user_info/user_info_model.dart';
+import 'package:rasadyar_chicken/features/common/data/model/response/user_profile_model/user_profile_model.dart';
 
 abstract class AuthRemoteDataSource {
   Future<UserProfileModel?> login({required Map<String, dynamic> authRequest});
@@ -11,6 +11,6 @@ abstract class AuthRemoteDataSource {
 
   Future<UserInfoModel?> getUserInfo(String phoneNumber);
 
-  /// Calls `/steward-app-login/` endpoint with required token and `server` as query param, plus optional extra query parameters.
+  
   Future<void> stewardAppLogin({required String token, Map<String, dynamic>? queryParameters});
 }

packages/chicken/lib/features/common/data/datasources/remote/auth/auth_remote_imp.dart

@@ -1,5 +1,5 @@
-import 'package:rasadyar_chicken/data/models/response/user_info/user_info_model.dart';
-import 'package:rasadyar_chicken/data/models/response/user_profile_model/user_profile_model.dart';
+import 'package:rasadyar_chicken/features/common/data/model/response/user_info/user_info_model.dart';
+import 'package:rasadyar_chicken/features/common/data/model/response/user_profile_model/user_profile_model.dart';
 import 'package:rasadyar_core/core.dart';
 
 import 'auth_remote.dart';

packages/chicken/lib/features/common/data/datasources/remote/common/common_remote.dart

@@ -0,0 +1,75 @@
+import 'package:rasadyar_chicken/features/common/data/model/request/change_password/change_password_request_model.dart';
+import 'package:rasadyar_chicken/features/common/data/model/response/bar_information/bar_information.dart';
+import 'package:rasadyar_chicken/features/common/data/model/response/broadcast_price/broadcast_price.dart';
+import 'package:rasadyar_chicken/features/common/data/model/response/guild/guild_model.dart';
+import 'package:rasadyar_chicken/features/common/data/model/response/guild_profile/guild_profile.dart';
+import 'package:rasadyar_chicken/features/common/data/model/response/inventory/inventory_model.dart';
+import 'package:rasadyar_chicken/features/common/data/model/response/iran_province_city/iran_province_city_model.dart';
+import 'package:rasadyar_chicken/features/common/data/model/response/kill_house_distribution_info/kill_house_distribution_info.dart';
+import 'package:rasadyar_chicken/features/common/data/model/response/roles_products/roles_products.dart';
+import 'package:rasadyar_chicken/features/steward/data/model/response/segmentation_model/segmentation_model.dart';
+import 'package:rasadyar_chicken/features/common/data/model/response/user_profile/user_profile.dart';
+import 'package:rasadyar_core/core.dart';
+
+abstract class CommonRemoteDatasource {
+  Future<List<InventoryModel>?> getInventory({
+    required String token,
+    CancelToken? cancelToken,
+  });
+
+  Future<KillHouseDistributionInfo?> getKillHouseDistributionInfo({
+    required String token,
+  });
+
+  Future<BarInformation?> getGeneralBarInformation({
+    required String token,
+    Map<String, dynamic>? queryParameters,
+  });
+
+  Future<List<ProductModel>?> getRolesProducts({required String token});
+
+  Future<List<GuildModel>?> getGuilds({
+    required String token,
+    Map<String, dynamic>? queryParameters,
+  });
+
+  Future<GuildProfile?> getProfile({required String token});
+
+  Future<List<IranProvinceCityModel>?> getProvince({CancelToken? cancelToken});
+
+  Future<List<IranProvinceCityModel>?> getCity({required String provinceName});
+
+  Future<UserProfile?> getUserProfile({required String token});
+
+  Future<void> updateUserProfile({
+    required String token,
+    required UserProfile userProfile,
+  });
+
+  Future<void> updatePassword({
+    required String token,
+    required ChangePasswordRequestModel model,
+  });
+
+  Future<PaginationModel<SegmentationModel>?> getSegmentation({
+    required String token,
+    Map<String, dynamic>? queryParameters,
+  });
+
+  Future<void> createSegmentation({
+    required String token,
+    required SegmentationModel model,
+  });
+
+  Future<void> editSegmentation({
+    required String token,
+    required SegmentationModel model,
+  });
+
+  Future<SegmentationModel?> deleteSegmentation({
+    required String token,
+    required String key,
+  });
+
+  Future<BroadcastPrice?> getBroadcastPrice({required String token});
+}

packages/chicken/lib/features/common/data/datasources/remote/common/common_remote_imp.dart

@@ -0,0 +1,238 @@
+import 'package:rasadyar_chicken/features/common/data/model/request/change_password/change_password_request_model.dart';
+import 'package:rasadyar_chicken/features/common/data/model/response/bar_information/bar_information.dart';
+import 'package:rasadyar_chicken/features/common/data/model/response/broadcast_price/broadcast_price.dart';
+import 'package:rasadyar_chicken/features/common/data/model/response/guild/guild_model.dart';
+import 'package:rasadyar_chicken/features/common/data/model/response/guild_profile/guild_profile.dart';
+import 'package:rasadyar_chicken/features/common/data/model/response/inventory/inventory_model.dart';
+import 'package:rasadyar_chicken/features/common/data/model/response/iran_province_city/iran_province_city_model.dart';
+import 'package:rasadyar_chicken/features/common/data/model/response/kill_house_distribution_info/kill_house_distribution_info.dart';
+import 'package:rasadyar_chicken/features/common/data/model/response/roles_products/roles_products.dart';
+import 'package:rasadyar_chicken/features/steward/data/model/response/segmentation_model/segmentation_model.dart';
+import 'package:rasadyar_chicken/features/common/data/model/response/user_profile/user_profile.dart';
+import 'package:rasadyar_core/core.dart';
+
+import 'common_remote.dart';
+
+class CommonRemoteDatasourceImp implements CommonRemoteDatasource {
+  final DioRemote _httpClient;
+
+  CommonRemoteDatasourceImp(this._httpClient);
+
+  @override
+  Future<List<InventoryModel>?> getInventory({
+    required String token,
+    CancelToken? cancelToken,
+  }) async {
+    var res = await _httpClient.get(
+      '/roles-products/?role=Steward',
+      headers: {'Authorization': 'Bearer $token'},
+
+      fromJsonList: (json) => (json)
+          .map((item) => InventoryModel.fromJson(item as Map<String, dynamic>))
+          .toList(),
+    );
+
+    return res.data;
+  }
+
+  @override
+  Future<KillHouseDistributionInfo?> getKillHouseDistributionInfo({
+    required String token,
+  }) async {
+    var res = await _httpClient.get(
+      '/kill-house-distribution-info/?role=Steward',
+      headers: {'Authorization': 'Bearer $token'},
+      fromJson: KillHouseDistributionInfo.fromJson,
+    );
+
+    return res.data;
+  }
+
+  @override
+  Future<BarInformation?> getGeneralBarInformation({
+    required String token,
+    Map<String, dynamic>? queryParameters,
+  }) async {
+    var res = await _httpClient.get(
+      '/bars_for_kill_house_dashboard/',
+      queryParameters: queryParameters,
+      headers: {'Authorization': 'Bearer $token'},
+      fromJson: BarInformation.fromJson,
+    );
+    return res.data;
+  }
+
+  @override
+  Future<List<ProductModel>?> getRolesProducts({required String token}) async {
+    var res = await _httpClient.get(
+      '/roles-products/?role=Steward',
+      headers: {'Authorization': 'Bearer $token'},
+      fromJsonList: (json) => json
+          .map((item) => ProductModel.fromJson(item as Map<String, dynamic>))
+          .toList(),
+    );
+    return res.data;
+  }
+
+  @override
+  Future<List<GuildModel>?> getGuilds({
+    required String token,
+    Map<String, dynamic>? queryParameters,
+  }) async {
+    var res = await _httpClient.get(
+      '/guilds/',
+      queryParameters: queryParameters,
+      headers: {'Authorization': 'Bearer $token'},
+      fromJsonList: (json) => json
+          .map((item) => GuildModel.fromJson(item as Map<String, dynamic>))
+          .toList(),
+    );
+    return res.data;
+  }
+
+  @override
+  Future<GuildProfile?> getProfile({required String token}) async {
+    var res = await _httpClient.get(
+      '/guilds/0/?profile',
+      headers: {'Authorization': 'Bearer $token'},
+      fromJson: GuildProfile.fromJson,
+    );
+    return res.data;
+  }
+
+  @override
+  Future<List<IranProvinceCityModel>?> getCity({
+    required String provinceName,
+  }) async {
+    var res = await _httpClient.get(
+      '/iran_city/',
+      queryParameters: {'name': provinceName},
+      fromJsonList: (json) => json
+          .map(
+            (item) =>
+                IranProvinceCityModel.fromJson(item as Map<String, dynamic>),
+          )
+          .toList(),
+    );
+    return res.data;
+  }
+
+  @override
+  Future<List<IranProvinceCityModel>?> getProvince({
+    CancelToken? cancelToken,
+  }) async {
+    var res = await _httpClient.get(
+      '/iran_province/',
+      fromJsonList: (json) => json
+          .map(
+            (item) =>
+                IranProvinceCityModel.fromJson(item as Map<String, dynamic>),
+          )
+          .toList(),
+    );
+    return res.data;
+  }
+
+  @override
+  Future<UserProfile?> getUserProfile({required String token}) async {
+    var res = await _httpClient.get(
+      '/system_user_profile/?self-profile',
+      headers: {'Authorization': 'Bearer $token'},
+      fromJson: (json) => UserProfile.fromJson(json),
+    );
+
+    return res.data;
+  }
+
+  @override
+  Future<void> updateUserProfile({
+    required String token,
+    required UserProfile userProfile,
+  }) async {
+    await _httpClient.put(
+      '/system_user_profile/0/',
+      headers: {'Authorization': 'Bearer $token'},
+      data: userProfile.toJson()..removeWhere((key, value) => value == null),
+    );
+  }
+
+  @override
+  Future<void> updatePassword({
+    required String token,
+    required ChangePasswordRequestModel model,
+  }) async {
+    await _httpClient.post(
+      '/api/change_password/',
+      headers: {'Authorization': 'Bearer $token'},
+      data: model.toJson()..removeWhere((key, value) => value == null),
+    );
+  }
+
+  @override
+  Future<PaginationModel<SegmentationModel>?> getSegmentation({
+    required String token,
+    Map<String, dynamic>? queryParameters,
+  }) async {
+    var res = await _httpClient.get(
+      '/app-segmentation/',
+      queryParameters: queryParameters,
+      headers: {'Authorization': 'Bearer $token'},
+      fromJson: (json) => PaginationModel<SegmentationModel>.fromJson(
+        json,
+        (json) => SegmentationModel.fromJson(json as Map<String, dynamic>),
+      ),
+    );
+    return res.data;
+  }
+
+  @override
+  Future<void> createSegmentation({
+    required String token,
+    required SegmentationModel model,
+  }) async {
+    await _httpClient.post(
+      '/app-segmentation/',
+      data: model.toJson()..removeWhere((key, value) => value == null),
+      headers: {'Authorization': 'Bearer $token'},
+    );
+  }
+
+  @override
+  Future<void> editSegmentation({
+    required String token,
+    required SegmentationModel model,
+  }) async {
+    await _httpClient.put(
+      '/app-segmentation/0/',
+      data: model.toJson()..removeWhere((key, value) => value == null),
+      headers: {'Authorization': 'Bearer $token'},
+    );
+  }
+
+  @override
+  Future<SegmentationModel?> deleteSegmentation({
+    required String token,
+    required String key,
+  }) async {
+    var res = await _httpClient.delete<SegmentationModel?>(
+      '/app-segmentation/0/',
+      queryParameters: {'key': key},
+      headers: {'Authorization': 'Bearer $token'},
+      fromJson: (json) => SegmentationModel.fromJson(json),
+    );
+
+    return res.data;
+  }
+
+  @override
+  Future<BroadcastPrice?> getBroadcastPrice({required String token}) async {
+    var res = await _httpClient.get(
+      '/broadcast-price/',
+      headers: {'Authorization': 'Bearer $token'},
+
+      fromJson: (json) => BroadcastPrice.fromJson(json),
+    );
+
+    return res.data;
+  }
+}

packages/chicken/lib/features/common/data/di/common_di.dart

@@ -0,0 +1,66 @@
+import 'package:rasadyar_chicken/features/common/data/datasources/local/chicken_local.dart';
+import 'package:rasadyar_chicken/features/common/data/datasources/local/chicken_local_imp.dart';
+import 'package:rasadyar_chicken/features/common/data/datasources/remote/auth/auth_remote.dart';
+import 'package:rasadyar_chicken/features/common/data/datasources/remote/auth/auth_remote_imp.dart';
+import 'package:rasadyar_chicken/features/common/data/datasources/remote/common/common_remote.dart';
+import 'package:rasadyar_chicken/features/common/data/datasources/remote/common/common_remote_imp.dart';
+import 'package:rasadyar_chicken/features/common/data/repositories/auth/auth_repository.dart';
+import 'package:rasadyar_chicken/features/common/data/repositories/auth/auth_repository_imp.dart';
+import 'package:rasadyar_chicken/features/common/data/repositories/common/common_repository.dart';
+import 'package:rasadyar_chicken/features/common/data/repositories/common/common_repository_imp.dart';
+import 'package:rasadyar_core/core.dart';
+
+/// Setup dependency injection for common feature
+Future<void> setupCommonDI(GetIt di, DioRemote dioRemote) async {
+  di.registerLazySingleton<AuthRemoteDataSource>(
+    () => AuthRemoteDataSourceImp(dioRemote),
+  );
+
+  di.registerLazySingleton<AuthRepository>(
+    () => AuthRepositoryImpl(di.get<AuthRemoteDataSource>()),
+  );
+
+  di.registerLazySingleton<CommonRemoteDatasource>(
+    () => CommonRemoteDatasourceImp(dioRemote),
+  );
+
+  di.registerLazySingleton<ChickenLocalDataSource>(
+    () => ChickenLocalDataSourceImp(),
+  );
+
+  di.registerLazySingleton<CommonRepository>(
+    () => CommonRepositoryImp(
+      remote: di.get<CommonRemoteDatasource>(),
+      local: di.get<ChickenLocalDataSource>(),
+    ),
+  );
+}
+
+/// Re-register common dependencies (used when base URL changes)
+Future<void> reRegisterCommonDI(GetIt di, DioRemote dioRemote) async {
+  await reRegister(di, () => AuthRemoteDataSourceImp(dioRemote));
+  await reRegister(
+    di,
+    () => AuthRepositoryImpl(di.get<AuthRemoteDataSource>()),
+  );
+  await reRegister(di, () => CommonRemoteDatasourceImp(dioRemote));
+  await reRegister(di, () => ChickenLocalDataSourceImp());
+  await reRegister(
+    di,
+    () => CommonRepositoryImp(
+      remote: di.get<CommonRemoteDatasource>(),
+      local: di.get<ChickenLocalDataSource>(),
+    ),
+  );
+}
+
+/// Helper function to re-register a dependency
+Future<void> reRegister<T extends Object>(
+  GetIt di,
+  T Function() factory,
+) async {
+  if (di.isRegistered<T>()) {
+    await di.unregister<T>();
+  }
+  di.registerLazySingleton<T>(factory);
+}