fix : some bug

2025-10-11 17:16:26 +03:30
parent be6e16f54e
commit 9a29b0ea58
20 changed files with 1962 additions and 300 deletions
--- a/packages/chicken/lib/data/data_source/remote/chicken/chicken_remote.dart
+++ b/packages/chicken/lib/data/data_source/remote/chicken/chicken_remote.dart
@@ -104,9 +104,9 @@ abstract class ChickenRemoteDatasource {
    required CreateStewardFreeBar body,
  });

-  Future<void> deleteStewardPurchasesOutSideOfTheProvince({
+  Future<void> editStewardPurchasesOutSideOfTheProvince({
    required String token,
-    required String stewardFreeBarKey,
+    Map<String, dynamic>? queryParameters,
  });

  Future<PaginationModel<OutProvinceCarcassesBuyer>?> getOutProvinceCarcassesBuyer({
--- a/packages/chicken/lib/data/data_source/remote/chicken/chicken_remote_imp.dart
+++ b/packages/chicken/lib/data/data_source/remote/chicken/chicken_remote_imp.dart
@@ -318,15 +318,16 @@ class ChickenRemoteDatasourceImp implements ChickenRemoteDatasource {
    );
  }

+  //todo fix this
  @override
-  Future<void> deleteStewardPurchasesOutSideOfTheProvince({
+  Future<void> editStewardPurchasesOutSideOfTheProvince({
    required String token,
-    required String stewardFreeBarKey,
+    Map<String, dynamic>? queryParameters,
  }) async {
    await _httpClient.delete(
      '/steward_free_bar/0/',
      headers: {'Authorization': 'Bearer $token'},
-      queryParameters: {'key': stewardFreeBarKey},
+      queryParameters: queryParameters
    );
  }

--- a/packages/chicken/lib/data/models/response/waiting_arrival/waiting_arrival.dart
+++ b/packages/chicken/lib/data/models/response/waiting_arrival/waiting_arrival.dart
@@ -8,7 +8,7 @@ abstract class WaitingArrivalModel with _$WaitingArrivalModel {
  factory WaitingArrivalModel({
    int? id,
    ProductModel? product,
-    dynamic killHouse,
+    KillHouseModel? killHouse,
    dynamic toKillHouse,
    StewardModel? steward,
    StewardModel? toSteward,
@@ -56,12 +56,10 @@ abstract class WaitingArrivalModel with _$WaitingArrivalModel {
    bool? temporaryTrash,
    bool? temporaryDeleted,
    bool? overhead,
-    dynamic createdBy,
-    dynamic modifiedBy,
-    dynamic wareHouse,
-    dynamic stewardWareHouse,
-    dynamic car,
-    dynamic dispenser,
+    bool? warehouse,
+    bool? stewardWarehouse,
+    String? quota,
+
  }) = _WaitingArrivalModel;

  factory WaitingArrivalModel.fromJson(Map<String, dynamic> json) =>
@@ -70,22 +68,99 @@ abstract class WaitingArrivalModel with _$WaitingArrivalModel {

@freezed
 abstract class ProductModel with _$ProductModel {
-  factory ProductModel({String? name, double? weightAverage}) = _ProductModel;
+  factory ProductModel({
+    String? name,
+    double? weightAverage,
+  }) = _ProductModel;

-  factory ProductModel.fromJson(Map<String, dynamic> json) => _$ProductModelFromJson(json);
+  factory ProductModel.fromJson(Map<String, dynamic> json) =>
+      _$ProductModelFromJson(json);
 }

+/// =======================
+/// KILL HOUSE SECTION
+/// =======================
+@freezed
+abstract class KillHouseModel with _$KillHouseModel {
+  factory KillHouseModel({
+    String? key,
+    String? name,
+    bool? killer,
+    KillHouseOperatorModel? killHouseOperator,
+  }) = _KillHouseModel;
+
+  factory KillHouseModel.fromJson(Map<String, dynamic> json) =>
+      _$KillHouseModelFromJson(json);
+}
+
+@freezed
+abstract class KillHouseOperatorModel with _$KillHouseOperatorModel {
+  factory KillHouseOperatorModel({
+    KillHouseUserModel? user,
+  }) = _KillHouseOperatorModel;
+
+  factory KillHouseOperatorModel.fromJson(Map<String, dynamic> json) =>
+      _$KillHouseOperatorModelFromJson(json);
+}
+
+@freezed
+abstract class KillHouseUserModel with _$KillHouseUserModel {
+  factory KillHouseUserModel({
+    String? fullname,
+    String? firstName,
+    String? lastName,
+    int? baseOrder,
+    String? mobile,
+    String? nationalId,
+    String? nationalCode,
+    String? key,
+    CityDetailModel? city,
+    String? unitName,
+    String? unitNationalId,
+    String? unitRegistrationNumber,
+    String? unitEconomicalNumber,
+    String? unitProvince,
+    String? unitCity,
+    String? unitPostalCode,
+    String? unitAddress,
+  }) = _KillHouseUserModel;
+
+  factory KillHouseUserModel.fromJson(Map<String, dynamic> json) =>
+      _$KillHouseUserModelFromJson(json);
+}
+
+@freezed
+abstract class CityDetailModel with _$CityDetailModel {
+  factory CityDetailModel({
+    int? id,
+    String? key,
+    String? createDate,
+    String? modifyDate,
+    bool? trash,
+    int? provinceIdForeignKey,
+    int? cityIdKey,
+    String? name,
+    double? productPrice,
+    bool? provinceCenter,
+    int? cityNumber,
+    String? cityName,
+    int? provinceNumber,
+    String? provinceName,
+  }) = _CityDetailModel;
+
+  factory CityDetailModel.fromJson(Map<String, dynamic> json) =>
+      _$CityDetailModelFromJson(json);
+}
+
+/// =======================
+/// TO STEWARD SECTION
+/// =======================
@freezed
 abstract class StewardModel with _$StewardModel {
  factory StewardModel({
    int? id,
    StewardUserModel? user,
    AddressModel? address,
-    dynamic guildAreaActivity,
-    dynamic guildTypeActivity,
-    List<dynamic>? killHouse,
-    List<dynamic>? stewardKillHouse,
-    List<dynamic>? stewards,
    GetPosStatusModel? getPosStatus,
    String? key,
    String? createDate,
@@ -111,11 +186,10 @@ abstract class StewardModel with _$StewardModel {
    bool? stewardLimitationAllocation,
    bool? license,
    int? wallet,
-    List<dynamic>? cars,
-    List<dynamic>? userLevel,
  }) = _StewardModel;

-  factory StewardModel.fromJson(Map<String, dynamic> json) => _$StewardModelFromJson(json);
+  factory StewardModel.fromJson(Map<String, dynamic> json) =>
+      _$StewardModelFromJson(json);
 }

@freezed
@@ -129,7 +203,8 @@ abstract class StewardUserModel with _$StewardUserModel {
    String? city,
  }) = _StewardUserModel;

-  factory StewardUserModel.fromJson(Map<String, dynamic> json) => _$StewardUserModelFromJson(json);
+  factory StewardUserModel.fromJson(Map<String, dynamic> json) =>
+      _$StewardUserModelFromJson(json);
 }

@freezed
@@ -141,27 +216,39 @@ abstract class AddressModel with _$AddressModel {
    String? postalCode,
  }) = _AddressModel;

-  factory AddressModel.fromJson(Map<String, dynamic> json) => _$AddressModelFromJson(json);
+  factory AddressModel.fromJson(Map<String, dynamic> json) =>
+      _$AddressModelFromJson(json);
 }

@freezed
 abstract class ProvinceModel with _$ProvinceModel {
-  factory ProvinceModel({String? key, String? name}) = _ProvinceModel;
+  factory ProvinceModel({
+    String? key,
+    String? name,
+  }) = _ProvinceModel;

-  factory ProvinceModel.fromJson(Map<String, dynamic> json) => _$ProvinceModelFromJson(json);
+  factory ProvinceModel.fromJson(Map<String, dynamic> json) =>
+      _$ProvinceModelFromJson(json);
 }

@freezed
 abstract class CityModel with _$CityModel {
-  factory CityModel({String? key, String? name}) = _CityModel;
+  factory CityModel({
+    String? key,
+    String? name,
+  }) = _CityModel;

-  factory CityModel.fromJson(Map<String, dynamic> json) => _$CityModelFromJson(json);
+  factory CityModel.fromJson(Map<String, dynamic> json) =>
+      _$CityModelFromJson(json);
 }

@freezed
 abstract class GetPosStatusModel with _$GetPosStatusModel {
-  factory GetPosStatusModel({int? lenActiveSessions, bool? hasPons, bool? hasActivePons}) =
-      _GetPosStatusModel;
+  factory GetPosStatusModel({
+    int? lenActiveSessions,
+    bool? hasPons,
+    bool? hasActivePons,
+  }) = _GetPosStatusModel;

  factory GetPosStatusModel.fromJson(Map<String, dynamic> json) =>
      _$GetPosStatusModelFromJson(json);
--- a/packages/chicken/lib/data/models/response/waiting_arrival/waiting_arrival.freezed.dart
+++ b/packages/chicken/lib/data/models/response/waiting_arrival/waiting_arrival.freezed.dart
--- a/packages/chicken/lib/data/models/response/waiting_arrival/waiting_arrival.g.dart
+++ b/packages/chicken/lib/data/models/response/waiting_arrival/waiting_arrival.g.dart
@@ -13,7 +13,9 @@ _WaitingArrivalModel _$WaitingArrivalModelFromJson(
  product: json['product'] == null
      ? null
      : ProductModel.fromJson(json['product'] as Map<String, dynamic>),
-  killHouse: json['kill_house'],
+  killHouse: json['kill_house'] == null
+      ? null
+      : KillHouseModel.fromJson(json['kill_house'] as Map<String, dynamic>),
  toKillHouse: json['to_kill_house'],
  steward: json['steward'] == null
      ? null
@@ -67,12 +69,9 @@ _WaitingArrivalModel _$WaitingArrivalModelFromJson(
  temporaryTrash: json['temporary_trash'] as bool?,
  temporaryDeleted: json['temporary_deleted'] as bool?,
  overhead: json['overhead'] as bool?,
-  createdBy: json['created_by'],
-  modifiedBy: json['modified_by'],
-  wareHouse: json['ware_house'],
-  stewardWareHouse: json['steward_ware_house'],
-  car: json['car'],
-  dispenser: json['dispenser'],
+  warehouse: json['warehouse'] as bool?,
+  stewardWarehouse: json['steward_warehouse'] as bool?,
+  quota: json['quota'] as String?,
 );

 Map<String, dynamic> _$WaitingArrivalModelToJson(
@@ -128,12 +127,9 @@ Map<String, dynamic> _$WaitingArrivalModelToJson(
  'temporary_trash': instance.temporaryTrash,
  'temporary_deleted': instance.temporaryDeleted,
  'overhead': instance.overhead,
-  'created_by': instance.createdBy,
-  'modified_by': instance.modifiedBy,
-  'ware_house': instance.wareHouse,
-  'steward_ware_house': instance.stewardWareHouse,
-  'car': instance.car,
-  'dispenser': instance.dispenser,
+  'warehouse': instance.warehouse,
+  'steward_warehouse': instance.stewardWarehouse,
+  'quota': instance.quota,
 };

 _ProductModel _$ProductModelFromJson(Map<String, dynamic> json) =>
@@ -148,6 +144,118 @@ Map<String, dynamic> _$ProductModelToJson(_ProductModel instance) =>
      'weight_average': instance.weightAverage,
    };

+_KillHouseModel _$KillHouseModelFromJson(Map<String, dynamic> json) =>
+    _KillHouseModel(
+      key: json['key'] as String?,
+      name: json['name'] as String?,
+      killer: json['killer'] as bool?,
+      killHouseOperator: json['kill_house_operator'] == null
+          ? null
+          : KillHouseOperatorModel.fromJson(
+              json['kill_house_operator'] as Map<String, dynamic>,
+            ),
+    );
+
+Map<String, dynamic> _$KillHouseModelToJson(_KillHouseModel instance) =>
+    <String, dynamic>{
+      'key': instance.key,
+      'name': instance.name,
+      'killer': instance.killer,
+      'kill_house_operator': instance.killHouseOperator,
+    };
+
+_KillHouseOperatorModel _$KillHouseOperatorModelFromJson(
+  Map<String, dynamic> json,
+) => _KillHouseOperatorModel(
+  user: json['user'] == null
+      ? null
+      : KillHouseUserModel.fromJson(json['user'] as Map<String, dynamic>),
+);
+
+Map<String, dynamic> _$KillHouseOperatorModelToJson(
+  _KillHouseOperatorModel instance,
+) => <String, dynamic>{'user': instance.user};
+
+_KillHouseUserModel _$KillHouseUserModelFromJson(Map<String, dynamic> json) =>
+    _KillHouseUserModel(
+      fullname: json['fullname'] as String?,
+      firstName: json['first_name'] as String?,
+      lastName: json['last_name'] as String?,
+      baseOrder: (json['base_order'] as num?)?.toInt(),
+      mobile: json['mobile'] as String?,
+      nationalId: json['national_id'] as String?,
+      nationalCode: json['national_code'] as String?,
+      key: json['key'] as String?,
+      city: json['city'] == null
+          ? null
+          : CityDetailModel.fromJson(json['city'] as Map<String, dynamic>),
+      unitName: json['unit_name'] as String?,
+      unitNationalId: json['unit_national_id'] as String?,
+      unitRegistrationNumber: json['unit_registration_number'] as String?,
+      unitEconomicalNumber: json['unit_economical_number'] as String?,
+      unitProvince: json['unit_province'] as String?,
+      unitCity: json['unit_city'] as String?,
+      unitPostalCode: json['unit_postal_code'] as String?,
+      unitAddress: json['unit_address'] as String?,
+    );
+
+Map<String, dynamic> _$KillHouseUserModelToJson(_KillHouseUserModel instance) =>
+    <String, dynamic>{
+      'fullname': instance.fullname,
+      'first_name': instance.firstName,
+      'last_name': instance.lastName,
+      'base_order': instance.baseOrder,
+      'mobile': instance.mobile,
+      'national_id': instance.nationalId,
+      'national_code': instance.nationalCode,
+      'key': instance.key,
+      'city': instance.city,
+      'unit_name': instance.unitName,
+      'unit_national_id': instance.unitNationalId,
+      'unit_registration_number': instance.unitRegistrationNumber,
+      'unit_economical_number': instance.unitEconomicalNumber,
+      'unit_province': instance.unitProvince,
+      'unit_city': instance.unitCity,
+      'unit_postal_code': instance.unitPostalCode,
+      'unit_address': instance.unitAddress,
+    };
+
+_CityDetailModel _$CityDetailModelFromJson(Map<String, dynamic> json) =>
+    _CityDetailModel(
+      id: (json['id'] as num?)?.toInt(),
+      key: json['key'] as String?,
+      createDate: json['create_date'] as String?,
+      modifyDate: json['modify_date'] as String?,
+      trash: json['trash'] as bool?,
+      provinceIdForeignKey: (json['province_id_foreign_key'] as num?)?.toInt(),
+      cityIdKey: (json['city_id_key'] as num?)?.toInt(),
+      name: json['name'] as String?,
+      productPrice: (json['product_price'] as num?)?.toDouble(),
+      provinceCenter: json['province_center'] as bool?,
+      cityNumber: (json['city_number'] as num?)?.toInt(),
+      cityName: json['city_name'] as String?,
+      provinceNumber: (json['province_number'] as num?)?.toInt(),
+      provinceName: json['province_name'] as String?,
+    );
+
+Map<String, dynamic> _$CityDetailModelToJson(_CityDetailModel instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'key': instance.key,
+      'create_date': instance.createDate,
+      'modify_date': instance.modifyDate,
+      'trash': instance.trash,
+      'province_id_foreign_key': instance.provinceIdForeignKey,
+      'city_id_key': instance.cityIdKey,
+      'name': instance.name,
+      'product_price': instance.productPrice,
+      'province_center': instance.provinceCenter,
+      'city_number': instance.cityNumber,
+      'city_name': instance.cityName,
+      'province_number': instance.provinceNumber,
+      'province_name': instance.provinceName,
+    };
+
 _StewardModel _$StewardModelFromJson(Map<String, dynamic> json) =>
    _StewardModel(
      id: (json['id'] as num?)?.toInt(),
@@ -157,11 +265,6 @@ _StewardModel _$StewardModelFromJson(Map<String, dynamic> json) =>
      address: json['address'] == null
          ? null
          : AddressModel.fromJson(json['address'] as Map<String, dynamic>),
-      guildAreaActivity: json['guild_area_activity'],
-      guildTypeActivity: json['guild_type_activity'],
-      killHouse: json['kill_house'] as List<dynamic>?,
-      stewardKillHouse: json['steward_kill_house'] as List<dynamic>?,
-      stewards: json['stewards'] as List<dynamic>?,
      getPosStatus: json['get_pos_status'] == null
          ? null
          : GetPosStatusModel.fromJson(
@@ -192,8 +295,6 @@ _StewardModel _$StewardModelFromJson(Map<String, dynamic> json) =>
          json['steward_limitation_allocation'] as bool?,
      license: json['license'] as bool?,
      wallet: (json['wallet'] as num?)?.toInt(),
-      cars: json['cars'] as List<dynamic>?,
-      userLevel: json['user_level'] as List<dynamic>?,
    );

 Map<String, dynamic> _$StewardModelToJson(_StewardModel instance) =>
@@ -201,11 +302,6 @@ Map<String, dynamic> _$StewardModelToJson(_StewardModel instance) =>
      'id': instance.id,
      'user': instance.user,
      'address': instance.address,
-      'guild_area_activity': instance.guildAreaActivity,
-      'guild_type_activity': instance.guildTypeActivity,
-      'kill_house': instance.killHouse,
-      'steward_kill_house': instance.stewardKillHouse,
-      'stewards': instance.stewards,
      'get_pos_status': instance.getPosStatus,
      'key': instance.key,
      'create_date': instance.createDate,
@@ -231,8 +327,6 @@ Map<String, dynamic> _$StewardModelToJson(_StewardModel instance) =>
      'steward_limitation_allocation': instance.stewardLimitationAllocation,
      'license': instance.license,
      'wallet': instance.wallet,
-      'cars': instance.cars,
-      'user_level': instance.userLevel,
    };

 _StewardUserModel _$StewardUserModelFromJson(Map<String, dynamic> json) =>
--- a/packages/chicken/lib/data/repositories/chicken/chicken_repository.dart
+++ b/packages/chicken/lib/data/repositories/chicken/chicken_repository.dart
@@ -109,9 +109,9 @@ abstract class ChickenRepository {
    required CreateStewardFreeBar body,
  });

-  Future<void> deleteStewardPurchasesOutSideOfTheProvince({
+  Future<void> editStewardPurchasesOutSideOfTheProvince({
    required String token,
-    required String stewardFreeBarKey,
+    Map<String, dynamic>? queryParameters,
  });

  Future<PaginationModel<OutProvinceCarcassesBuyer>?> getOutProvinceCarcassesBuyer({
--- a/packages/chicken/lib/data/repositories/chicken/chicken_repository_imp.dart
+++ b/packages/chicken/lib/data/repositories/chicken/chicken_repository_imp.dart
@@ -223,13 +223,13 @@ class ChickenRepositoryImp implements ChickenRepository {
  }

  @override
-  Future<void> deleteStewardPurchasesOutSideOfTheProvince({
+  Future<void> editStewardPurchasesOutSideOfTheProvince({
    required String token,
-    required String stewardFreeBarKey,
+    Map<String, dynamic>? queryParameters,
  }) async {
-    await remote.deleteStewardPurchasesOutSideOfTheProvince(
+    await remote.editStewardPurchasesOutSideOfTheProvince(
      token: token,
-      stewardFreeBarKey: stewardFreeBarKey,
+     queryParameters: queryParameters
    );
  }