feat : profile and map

2025-07-28 15:57:30 +03:30
parent 6057976b46
commit d9724f681c
67 changed files with 2835 additions and 444 deletions
--- a/packages/inspection/lib/data/data_source/remote/auth/auth_remote.dart
+++ b/packages/inspection/lib/data/data_source/remote/auth/auth_remote.dart
@@ -0,0 +1,14 @@
+import 'package:rasadyar_inspection/data/model/response/auth/auth_response_model.dart';
+import 'package:rasadyar_inspection/data/model/response/captcha/captcha_response_model.dart';
+
+abstract class AuthRemote {
+  Future<AuthResponseModel?> login({required Map<String, dynamic> authRequest});
+
+  Future<CaptchaResponseModel?> captcha();
+
+  Future<void> logout();
+
+  Future<bool> hasAuthenticated();
+
+  Future<AuthResponseModel?> loginWithRefreshToken({required Map<String, dynamic> authRequest});
+}
--- a/packages/inspection/lib/data/data_source/remote/auth/auth_remote_imp.dart
+++ b/packages/inspection/lib/data/data_source/remote/auth/auth_remote_imp.dart
@@ -1,22 +1,22 @@
 import 'package:rasadyar_core/core.dart';
-import 'package:rasadyar_core/data/model/response/auth/auth_response_model.dart';
-import 'package:rasadyar_core/data/model/response/captcha/captcha_response_model.dart';
-import 'package:rasadyar_core/data/model/response/user_info/user_info_model.dart';
-import 'package:rasadyar_core/data/model/response/user_profile_model/user_profile_model.dart';
-import 'auth_repository.dart';
+import 'package:rasadyar_inspection/data/model/response/auth/auth_response_model.dart';
+import 'package:rasadyar_inspection/data/model/response/captcha/captcha_response_model.dart';
+import 'package:rasadyar_inspection/data/model/response/user_profile/user_profile_model.dart';

-class AuthRepositoryImpl implements AuthRepository {
+import 'auth_remote.dart';
+
+class AuthRemoteImp extends AuthRemote {
  final DioRemote _httpClient;
  final String _BASE_URL = 'auth/api/v1/';

-  AuthRepositoryImpl(this._httpClient);
+  AuthRemoteImp(this._httpClient);

  @override
-  Future<UserProfileModel?> login({required Map<String, dynamic> authRequest}) async {
-    var res = await _httpClient.post<UserProfileModel?>(
-      '/api/login/',
+  Future<AuthResponseModel?> login({required Map<String, dynamic> authRequest}) async {
+    var res = await _httpClient.post<AuthResponseModel?>(
+      '${_BASE_URL}login/',
      data: authRequest,
-      fromJson: UserProfileModel.fromJson,
+      fromJson: AuthResponseModel.fromJson,
      headers: {'Content-Type': 'application/json'},
    );
    return res.data;
@@ -59,14 +59,14 @@ class AuthRepositoryImpl implements AuthRepository {
    return response.data ?? false;
  }

-  @override
-  Future<UserInfoModel?> getUserInfo(String phoneNumber) async {
-    var res = await _httpClient.post<UserInfoModel?>(
+/*  @override
+  Future<UserProfileModel?> getUserInfo(String phoneNumber) async {
+    var res = await _httpClient.post<UserProfileModel?>(
      'https://userbackend.rasadyaar.ir/api/send_otp/',
      data: {"mobile": phoneNumber, "state": ""},
-      fromJson: UserInfoModel.fromJson,
+      fromJson: UserProfileModel.fromJson,
      headers: {'Content-Type': 'application/json'},
    );
    return res.data;
-  }
+  }*/
 }
--- a/packages/inspection/lib/data/data_source/remote/inspection/inspection_remote.dart
+++ b/packages/inspection/lib/data/data_source/remote/inspection/inspection_remote.dart
@@ -0,0 +1,22 @@
+import 'package:rasadyar_inspection/data/model/response/poultry_location/poultry_location_model.dart';
+
+abstract class InspectionRemoteDataSource {
+  /// Fetches the inspection data for a given [inspectionId].
+  ///
+  /// Returns a `Future` that resolves to a `Map<String, dynamic>` containing
+  /// the inspection data.
+  Future<Map<String, dynamic>> fetchInspectionData(String inspectionId);
+
+  /// Fetches the list of inspections for a given [userId].
+  ///
+  /// Returns a `Future` that resolves to a `List<Map<String, dynamic>>`
+  /// containing the list of inspections.
+  Future<List<Map<String, dynamic>>> fetchInspections(String userId);
+
+
+  Future<List<PoultryLocationModel>?> getNearbyLocation({
+ double? centerLat,
+ double? centerLng,
+ double? radius,
+  });
+}
--- a/packages/inspection/lib/data/data_source/remote/inspection/inspection_remote_imp.dart
+++ b/packages/inspection/lib/data/data_source/remote/inspection/inspection_remote_imp.dart
@@ -0,0 +1,42 @@
+import 'package:rasadyar_core/core.dart';
+import 'package:rasadyar_inspection/data/data_source/remote/inspection/inspection_remote.dart';
+import 'package:rasadyar_inspection/data/model/response/poultry_location/poultry_location_model.dart';
+
+class InspectionRemoteDataSourceImp implements InspectionRemoteDataSource {
+  final DioRemote _httpClient;
+  final String _BASE_URL = 'auth/api/v1/';
+
+  InspectionRemoteDataSourceImp(this._httpClient);
+
+  @override
+  Future<Map<String, dynamic>> fetchInspectionData(String inspectionId) {
+    // TODO: implement fetchInspectionData
+    throw UnimplementedError();
+  }
+
+  @override
+  Future<List<Map<String, dynamic>>> fetchInspections(String userId) {
+    // TODO: implement fetchInspections
+    throw UnimplementedError();
+  }
+
+  @override
+  Future<List<PoultryLocationModel>?> getNearbyLocation({
+    double? centerLat,
+    double? centerLng,
+    double? radius,
+  }) async {
+    DioRemote dioRemote = DioRemote(baseUrl: 'https://habackend.rasadyaar.ir/');
+    await dioRemote.init();
+
+    var res = await dioRemote.get<List<PoultryLocationModel>>(
+      'poultry-loc/',
+      queryParameters: {'center_lat': centerLat, 'center_lng': centerLng, 'radius': radius},
+      headers: {'Content-Type': 'application/json'},
+      fromJsonList: (json) =>
+          json.map((item) => PoultryLocationModel.fromJson(item as Map<String, dynamic>)).toList(),
+    );
+
+    return res.data;
+  }
+}
--- a/packages/inspection/lib/data/data_source/remote/user/user_data_source.dart
+++ b/packages/inspection/lib/data/data_source/remote/user/user_data_source.dart
@@ -0,0 +1,8 @@
+
+import 'package:rasadyar_inspection/data/model/response/user_profile/user_profile_model.dart';
+
+abstract class UserRemoteDataSource {
+
+  Future<UserProfileModel?> getProfile({required String token});
+
+}
--- a/packages/inspection/lib/data/data_source/remote/user/user_data_source_imp.dart
+++ b/packages/inspection/lib/data/data_source/remote/user/user_data_source_imp.dart
@@ -0,0 +1,25 @@
+import 'package:rasadyar_core/core.dart';
+import 'package:rasadyar_inspection/data/data_source/remote/user/user_data_source.dart';
+import 'package:rasadyar_inspection/data/model/response/user_profile/user_profile_model.dart';
+
+class UserRemoteDataSourceImp extends UserRemoteDataSource {
+  final DioRemote _httpClient;
+  final String _BASE_URL = 'auth/api/v1/';
+
+  UserRemoteDataSourceImp(this._httpClient);
+
+  @override
+  Future<UserProfileModel?> getProfile({required String token}) async {
+    var res = await _httpClient.get<UserProfileModel>(
+      '${_BASE_URL}user/profile/',
+      fromJson: UserProfileModel.fromJson,
+      headers: {'Content-Type': 'application/json', 'Authorization': 'Bearer $token'},
+    );
+
+    if (res.data == null) {
+      throw Exception('Failed to load user profile');
+    }
+
+    return res.data!;
+  }
+}
--- a/packages/inspection/lib/data/model/request/login_request/login_request_model.dart
+++ b/packages/inspection/lib/data/model/request/login_request/login_request_model.dart
@@ -0,0 +1,34 @@
+import 'package:rasadyar_core/core.dart';
+
+part 'login_request_model.freezed.dart';
+part 'login_request_model.g.dart';
+
+@freezed
+abstract class LoginRequestModel with _$LoginRequestModel {
+  const factory LoginRequestModel({
+    String? username,
+    String? password,
+    String? captchaCode,
+    String? captchaKey,
+  }) = _LoginRequestModel;
+
+  factory LoginRequestModel.createWithCaptcha({
+    required String username,
+    required String password,
+    required String captchaCode,
+    required String captchaKey,
+  }) {
+    return LoginRequestModel(
+      username: username,
+      password: password,
+      captchaCode: captchaCode,
+      captchaKey: 'rest_captcha_$captchaKey.0',
+    );
+  }
+
+  factory LoginRequestModel.fromJson(Map<String, dynamic> json) =>
+      _$LoginRequestModelFromJson(json);
+
+  const LoginRequestModel._();
+
+}
--- a/packages/inspection/lib/data/model/request/login_request/login_request_model.freezed.dart
+++ b/packages/inspection/lib/data/model/request/login_request/login_request_model.freezed.dart
@@ -0,0 +1,286 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// coverage:ignore-file
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'login_request_model.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+
+/// @nodoc
+mixin _$LoginRequestModel {
+
+ String? get username; String? get password; String? get captchaCode; String? get captchaKey;
+/// Create a copy of LoginRequestModel
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$LoginRequestModelCopyWith<LoginRequestModel> get copyWith => _$LoginRequestModelCopyWithImpl<LoginRequestModel>(this as LoginRequestModel, _$identity);
+
+  /// Serializes this LoginRequestModel to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is LoginRequestModel&&(identical(other.username, username) || other.username == username)&&(identical(other.password, password) || other.password == password)&&(identical(other.captchaCode, captchaCode) || other.captchaCode == captchaCode)&&(identical(other.captchaKey, captchaKey) || other.captchaKey == captchaKey));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,username,password,captchaCode,captchaKey);
+
+@override
+String toString() {
+  return 'LoginRequestModel(username: $username, password: $password, captchaCode: $captchaCode, captchaKey: $captchaKey)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $LoginRequestModelCopyWith<$Res>  {
+  factory $LoginRequestModelCopyWith(LoginRequestModel value, $Res Function(LoginRequestModel) _then) = _$LoginRequestModelCopyWithImpl;
+@useResult
+$Res call({
+ String? username, String? password, String? captchaCode, String? captchaKey
+});
+
+
+
+
+}
+/// @nodoc
+class _$LoginRequestModelCopyWithImpl<$Res>
+    implements $LoginRequestModelCopyWith<$Res> {
+  _$LoginRequestModelCopyWithImpl(this._self, this._then);
+
+  final LoginRequestModel _self;
+  final $Res Function(LoginRequestModel) _then;
+
+/// Create a copy of LoginRequestModel
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? username = freezed,Object? password = freezed,Object? captchaCode = freezed,Object? captchaKey = freezed,}) {
+  return _then(_self.copyWith(
+username: freezed == username ? _self.username : username // ignore: cast_nullable_to_non_nullable
+as String?,password: freezed == password ? _self.password : password // ignore: cast_nullable_to_non_nullable
+as String?,captchaCode: freezed == captchaCode ? _self.captchaCode : captchaCode // ignore: cast_nullable_to_non_nullable
+as String?,captchaKey: freezed == captchaKey ? _self.captchaKey : captchaKey // ignore: cast_nullable_to_non_nullable
+as String?,
+  ));
+}
+
+}
+
+
+/// Adds pattern-matching-related methods to [LoginRequestModel].
+extension LoginRequestModelPatterns on LoginRequestModel {
+/// A variant of `map` that fallback to returning `orElse`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _LoginRequestModel value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _LoginRequestModel() when $default != null:
+return $default(_that);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// Callbacks receives the raw object, upcasted.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case final Subclass2 value:
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _LoginRequestModel value)  $default,){
+final _that = this;
+switch (_that) {
+case _LoginRequestModel():
+return $default(_that);case _:
+  throw StateError('Unexpected subclass');
+
+}
+}
+/// A variant of `map` that fallback to returning `null`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _LoginRequestModel value)?  $default,){
+final _that = this;
+switch (_that) {
+case _LoginRequestModel() when $default != null:
+return $default(_that);case _:
+  return null;
+
+}
+}
+/// A variant of `when` that fallback to an `orElse` callback.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String? username,  String? password,  String? captchaCode,  String? captchaKey)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _LoginRequestModel() when $default != null:
+return $default(_that.username,_that.password,_that.captchaCode,_that.captchaKey);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// As opposed to `map`, this offers destructuring.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case Subclass2(:final field2):
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String? username,  String? password,  String? captchaCode,  String? captchaKey)  $default,) {final _that = this;
+switch (_that) {
+case _LoginRequestModel():
+return $default(_that.username,_that.password,_that.captchaCode,_that.captchaKey);case _:
+  throw StateError('Unexpected subclass');
+
+}
+}
+/// A variant of `when` that fallback to returning `null`
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String? username,  String? password,  String? captchaCode,  String? captchaKey)?  $default,) {final _that = this;
+switch (_that) {
+case _LoginRequestModel() when $default != null:
+return $default(_that.username,_that.password,_that.captchaCode,_that.captchaKey);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _LoginRequestModel extends LoginRequestModel {
+  const _LoginRequestModel({this.username, this.password, this.captchaCode, this.captchaKey}): super._();
+  factory _LoginRequestModel.fromJson(Map<String, dynamic> json) => _$LoginRequestModelFromJson(json);
+
+@override final  String? username;
+@override final  String? password;
+@override final  String? captchaCode;
+@override final  String? captchaKey;
+
+/// Create a copy of LoginRequestModel
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$LoginRequestModelCopyWith<_LoginRequestModel> get copyWith => __$LoginRequestModelCopyWithImpl<_LoginRequestModel>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$LoginRequestModelToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _LoginRequestModel&&(identical(other.username, username) || other.username == username)&&(identical(other.password, password) || other.password == password)&&(identical(other.captchaCode, captchaCode) || other.captchaCode == captchaCode)&&(identical(other.captchaKey, captchaKey) || other.captchaKey == captchaKey));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,username,password,captchaCode,captchaKey);
+
+@override
+String toString() {
+  return 'LoginRequestModel(username: $username, password: $password, captchaCode: $captchaCode, captchaKey: $captchaKey)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$LoginRequestModelCopyWith<$Res> implements $LoginRequestModelCopyWith<$Res> {
+  factory _$LoginRequestModelCopyWith(_LoginRequestModel value, $Res Function(_LoginRequestModel) _then) = __$LoginRequestModelCopyWithImpl;
+@override @useResult
+$Res call({
+ String? username, String? password, String? captchaCode, String? captchaKey
+});
+
+
+
+
+}
+/// @nodoc
+class __$LoginRequestModelCopyWithImpl<$Res>
+    implements _$LoginRequestModelCopyWith<$Res> {
+  __$LoginRequestModelCopyWithImpl(this._self, this._then);
+
+  final _LoginRequestModel _self;
+  final $Res Function(_LoginRequestModel) _then;
+
+/// Create a copy of LoginRequestModel
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? username = freezed,Object? password = freezed,Object? captchaCode = freezed,Object? captchaKey = freezed,}) {
+  return _then(_LoginRequestModel(
+username: freezed == username ? _self.username : username // ignore: cast_nullable_to_non_nullable
+as String?,password: freezed == password ? _self.password : password // ignore: cast_nullable_to_non_nullable
+as String?,captchaCode: freezed == captchaCode ? _self.captchaCode : captchaCode // ignore: cast_nullable_to_non_nullable
+as String?,captchaKey: freezed == captchaKey ? _self.captchaKey : captchaKey // ignore: cast_nullable_to_non_nullable
+as String?,
+  ));
+}
+
+
+}
+
+// dart format on
--- a/packages/inspection/lib/data/model/request/login_request/login_request_model.g.dart
+++ b/packages/inspection/lib/data/model/request/login_request/login_request_model.g.dart
@@ -0,0 +1,23 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'login_request_model.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_LoginRequestModel _$LoginRequestModelFromJson(Map<String, dynamic> json) =>
+    _LoginRequestModel(
+      username: json['username'] as String?,
+      password: json['password'] as String?,
+      captchaCode: json['captcha_code'] as String?,
+      captchaKey: json['captcha_key'] as String?,
+    );
+
+Map<String, dynamic> _$LoginRequestModelToJson(_LoginRequestModel instance) =>
+    <String, dynamic>{
+      'username': instance.username,
+      'password': instance.password,
+      'captcha_code': instance.captchaCode,
+      'captcha_key': instance.captchaKey,
+    };
--- a/packages/inspection/lib/data/model/response/auth/auth_response_model.dart
+++ b/packages/inspection/lib/data/model/response/auth/auth_response_model.dart
@@ -0,0 +1,20 @@
+
+
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'auth_response_model.freezed.dart';
+part 'auth_response_model.g.dart';
+
+@freezed
+abstract class AuthResponseModel with _$AuthResponseModel {
+  const factory AuthResponseModel({
+    String? refresh,
+    String? access,
+    bool? otpStatus,
+  }) = _AuthResponseModel;
+
+  factory AuthResponseModel.fromJson(Map<String, dynamic> json) =>
+      _$AuthResponseModelFromJson(json);
+
+}
+
--- a/packages/inspection/lib/data/model/response/auth/auth_response_model.freezed.dart
+++ b/packages/inspection/lib/data/model/response/auth/auth_response_model.freezed.dart
@@ -0,0 +1,283 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// coverage:ignore-file
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'auth_response_model.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+
+/// @nodoc
+mixin _$AuthResponseModel {
+
+ String? get refresh; String? get access; bool? get otpStatus;
+/// Create a copy of AuthResponseModel
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$AuthResponseModelCopyWith<AuthResponseModel> get copyWith => _$AuthResponseModelCopyWithImpl<AuthResponseModel>(this as AuthResponseModel, _$identity);
+
+  /// Serializes this AuthResponseModel to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is AuthResponseModel&&(identical(other.refresh, refresh) || other.refresh == refresh)&&(identical(other.access, access) || other.access == access)&&(identical(other.otpStatus, otpStatus) || other.otpStatus == otpStatus));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,refresh,access,otpStatus);
+
+@override
+String toString() {
+  return 'AuthResponseModel(refresh: $refresh, access: $access, otpStatus: $otpStatus)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $AuthResponseModelCopyWith<$Res>  {
+  factory $AuthResponseModelCopyWith(AuthResponseModel value, $Res Function(AuthResponseModel) _then) = _$AuthResponseModelCopyWithImpl;
+@useResult
+$Res call({
+ String? refresh, String? access, bool? otpStatus
+});
+
+
+
+
+}
+/// @nodoc
+class _$AuthResponseModelCopyWithImpl<$Res>
+    implements $AuthResponseModelCopyWith<$Res> {
+  _$AuthResponseModelCopyWithImpl(this._self, this._then);
+
+  final AuthResponseModel _self;
+  final $Res Function(AuthResponseModel) _then;
+
+/// Create a copy of AuthResponseModel
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? refresh = freezed,Object? access = freezed,Object? otpStatus = freezed,}) {
+  return _then(_self.copyWith(
+refresh: freezed == refresh ? _self.refresh : refresh // ignore: cast_nullable_to_non_nullable
+as String?,access: freezed == access ? _self.access : access // ignore: cast_nullable_to_non_nullable
+as String?,otpStatus: freezed == otpStatus ? _self.otpStatus : otpStatus // ignore: cast_nullable_to_non_nullable
+as bool?,
+  ));
+}
+
+}
+
+
+/// Adds pattern-matching-related methods to [AuthResponseModel].
+extension AuthResponseModelPatterns on AuthResponseModel {
+/// A variant of `map` that fallback to returning `orElse`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _AuthResponseModel value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _AuthResponseModel() when $default != null:
+return $default(_that);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// Callbacks receives the raw object, upcasted.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case final Subclass2 value:
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _AuthResponseModel value)  $default,){
+final _that = this;
+switch (_that) {
+case _AuthResponseModel():
+return $default(_that);case _:
+  throw StateError('Unexpected subclass');
+
+}
+}
+/// A variant of `map` that fallback to returning `null`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _AuthResponseModel value)?  $default,){
+final _that = this;
+switch (_that) {
+case _AuthResponseModel() when $default != null:
+return $default(_that);case _:
+  return null;
+
+}
+}
+/// A variant of `when` that fallback to an `orElse` callback.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String? refresh,  String? access,  bool? otpStatus)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _AuthResponseModel() when $default != null:
+return $default(_that.refresh,_that.access,_that.otpStatus);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// As opposed to `map`, this offers destructuring.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case Subclass2(:final field2):
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String? refresh,  String? access,  bool? otpStatus)  $default,) {final _that = this;
+switch (_that) {
+case _AuthResponseModel():
+return $default(_that.refresh,_that.access,_that.otpStatus);case _:
+  throw StateError('Unexpected subclass');
+
+}
+}
+/// A variant of `when` that fallback to returning `null`
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String? refresh,  String? access,  bool? otpStatus)?  $default,) {final _that = this;
+switch (_that) {
+case _AuthResponseModel() when $default != null:
+return $default(_that.refresh,_that.access,_that.otpStatus);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _AuthResponseModel implements AuthResponseModel {
+  const _AuthResponseModel({this.refresh, this.access, this.otpStatus});
+  factory _AuthResponseModel.fromJson(Map<String, dynamic> json) => _$AuthResponseModelFromJson(json);
+
+@override final  String? refresh;
+@override final  String? access;
+@override final  bool? otpStatus;
+
+/// Create a copy of AuthResponseModel
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$AuthResponseModelCopyWith<_AuthResponseModel> get copyWith => __$AuthResponseModelCopyWithImpl<_AuthResponseModel>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$AuthResponseModelToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _AuthResponseModel&&(identical(other.refresh, refresh) || other.refresh == refresh)&&(identical(other.access, access) || other.access == access)&&(identical(other.otpStatus, otpStatus) || other.otpStatus == otpStatus));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,refresh,access,otpStatus);
+
+@override
+String toString() {
+  return 'AuthResponseModel(refresh: $refresh, access: $access, otpStatus: $otpStatus)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$AuthResponseModelCopyWith<$Res> implements $AuthResponseModelCopyWith<$Res> {
+  factory _$AuthResponseModelCopyWith(_AuthResponseModel value, $Res Function(_AuthResponseModel) _then) = __$AuthResponseModelCopyWithImpl;
+@override @useResult
+$Res call({
+ String? refresh, String? access, bool? otpStatus
+});
+
+
+
+
+}
+/// @nodoc
+class __$AuthResponseModelCopyWithImpl<$Res>
+    implements _$AuthResponseModelCopyWith<$Res> {
+  __$AuthResponseModelCopyWithImpl(this._self, this._then);
+
+  final _AuthResponseModel _self;
+  final $Res Function(_AuthResponseModel) _then;
+
+/// Create a copy of AuthResponseModel
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? refresh = freezed,Object? access = freezed,Object? otpStatus = freezed,}) {
+  return _then(_AuthResponseModel(
+refresh: freezed == refresh ? _self.refresh : refresh // ignore: cast_nullable_to_non_nullable
+as String?,access: freezed == access ? _self.access : access // ignore: cast_nullable_to_non_nullable
+as String?,otpStatus: freezed == otpStatus ? _self.otpStatus : otpStatus // ignore: cast_nullable_to_non_nullable
+as bool?,
+  ));
+}
+
+
+}
+
+// dart format on
--- a/packages/inspection/lib/data/model/response/auth/auth_response_model.g.dart
+++ b/packages/inspection/lib/data/model/response/auth/auth_response_model.g.dart
@@ -0,0 +1,21 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'auth_response_model.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_AuthResponseModel _$AuthResponseModelFromJson(Map<String, dynamic> json) =>
+    _AuthResponseModel(
+      refresh: json['refresh'] as String?,
+      access: json['access'] as String?,
+      otpStatus: json['otp_status'] as bool?,
+    );
+
+Map<String, dynamic> _$AuthResponseModelToJson(_AuthResponseModel instance) =>
+    <String, dynamic>{
+      'refresh': instance.refresh,
+      'access': instance.access,
+      'otp_status': instance.otpStatus,
+    };
--- a/packages/inspection/lib/data/model/response/captcha/captcha_response_model.dart
+++ b/packages/inspection/lib/data/model/response/captcha/captcha_response_model.dart
@@ -0,0 +1,17 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'captcha_response_model.freezed.dart';
+part 'captcha_response_model.g.dart';
+
+@freezed
+abstract class CaptchaResponseModel with _$CaptchaResponseModel {
+  const factory CaptchaResponseModel({
+    String? captchaKey,
+    String? captchaImage,
+    String? imageType,
+    String? imageDecode,
+  }) = _CaptchaResponseModel;
+
+  factory CaptchaResponseModel.fromJson(Map<String, dynamic> json) =>
+      _$CaptchaResponseModelFromJson(json);
+}
--- a/packages/inspection/lib/data/model/response/captcha/captcha_response_model.freezed.dart
+++ b/packages/inspection/lib/data/model/response/captcha/captcha_response_model.freezed.dart
@@ -0,0 +1,286 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// coverage:ignore-file
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'captcha_response_model.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+// dart format off
+T _$identity<T>(T value) => value;
+
+/// @nodoc
+mixin _$CaptchaResponseModel {
+
+ String? get captchaKey; String? get captchaImage; String? get imageType; String? get imageDecode;
+/// Create a copy of CaptchaResponseModel
+/// with the given fields replaced by the non-null parameter values.
+@JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+$CaptchaResponseModelCopyWith<CaptchaResponseModel> get copyWith => _$CaptchaResponseModelCopyWithImpl<CaptchaResponseModel>(this as CaptchaResponseModel, _$identity);
+
+  /// Serializes this CaptchaResponseModel to a JSON map.
+  Map<String, dynamic> toJson();
+
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is CaptchaResponseModel&&(identical(other.captchaKey, captchaKey) || other.captchaKey == captchaKey)&&(identical(other.captchaImage, captchaImage) || other.captchaImage == captchaImage)&&(identical(other.imageType, imageType) || other.imageType == imageType)&&(identical(other.imageDecode, imageDecode) || other.imageDecode == imageDecode));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,captchaKey,captchaImage,imageType,imageDecode);
+
+@override
+String toString() {
+  return 'CaptchaResponseModel(captchaKey: $captchaKey, captchaImage: $captchaImage, imageType: $imageType, imageDecode: $imageDecode)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $CaptchaResponseModelCopyWith<$Res>  {
+  factory $CaptchaResponseModelCopyWith(CaptchaResponseModel value, $Res Function(CaptchaResponseModel) _then) = _$CaptchaResponseModelCopyWithImpl;
+@useResult
+$Res call({
+ String? captchaKey, String? captchaImage, String? imageType, String? imageDecode
+});
+
+
+
+
+}
+/// @nodoc
+class _$CaptchaResponseModelCopyWithImpl<$Res>
+    implements $CaptchaResponseModelCopyWith<$Res> {
+  _$CaptchaResponseModelCopyWithImpl(this._self, this._then);
+
+  final CaptchaResponseModel _self;
+  final $Res Function(CaptchaResponseModel) _then;
+
+/// Create a copy of CaptchaResponseModel
+/// with the given fields replaced by the non-null parameter values.
+@pragma('vm:prefer-inline') @override $Res call({Object? captchaKey = freezed,Object? captchaImage = freezed,Object? imageType = freezed,Object? imageDecode = freezed,}) {
+  return _then(_self.copyWith(
+captchaKey: freezed == captchaKey ? _self.captchaKey : captchaKey // ignore: cast_nullable_to_non_nullable
+as String?,captchaImage: freezed == captchaImage ? _self.captchaImage : captchaImage // ignore: cast_nullable_to_non_nullable
+as String?,imageType: freezed == imageType ? _self.imageType : imageType // ignore: cast_nullable_to_non_nullable
+as String?,imageDecode: freezed == imageDecode ? _self.imageDecode : imageDecode // ignore: cast_nullable_to_non_nullable
+as String?,
+  ));
+}
+
+}
+
+
+/// Adds pattern-matching-related methods to [CaptchaResponseModel].
+extension CaptchaResponseModelPatterns on CaptchaResponseModel {
+/// A variant of `map` that fallback to returning `orElse`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _CaptchaResponseModel value)?  $default,{required TResult orElse(),}){
+final _that = this;
+switch (_that) {
+case _CaptchaResponseModel() when $default != null:
+return $default(_that);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// Callbacks receives the raw object, upcasted.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case final Subclass2 value:
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _CaptchaResponseModel value)  $default,){
+final _that = this;
+switch (_that) {
+case _CaptchaResponseModel():
+return $default(_that);case _:
+  throw StateError('Unexpected subclass');
+
+}
+}
+/// A variant of `map` that fallback to returning `null`.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case final Subclass value:
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _CaptchaResponseModel value)?  $default,){
+final _that = this;
+switch (_that) {
+case _CaptchaResponseModel() when $default != null:
+return $default(_that);case _:
+  return null;
+
+}
+}
+/// A variant of `when` that fallback to an `orElse` callback.
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return orElse();
+/// }
+/// ```
+
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String? captchaKey,  String? captchaImage,  String? imageType,  String? imageDecode)?  $default,{required TResult orElse(),}) {final _that = this;
+switch (_that) {
+case _CaptchaResponseModel() when $default != null:
+return $default(_that.captchaKey,_that.captchaImage,_that.imageType,_that.imageDecode);case _:
+  return orElse();
+
+}
+}
+/// A `switch`-like method, using callbacks.
+///
+/// As opposed to `map`, this offers destructuring.
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case Subclass2(:final field2):
+///     return ...;
+/// }
+/// ```
+
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String? captchaKey,  String? captchaImage,  String? imageType,  String? imageDecode)  $default,) {final _that = this;
+switch (_that) {
+case _CaptchaResponseModel():
+return $default(_that.captchaKey,_that.captchaImage,_that.imageType,_that.imageDecode);case _:
+  throw StateError('Unexpected subclass');
+
+}
+}
+/// A variant of `when` that fallback to returning `null`
+///
+/// It is equivalent to doing:
+/// ```dart
+/// switch (sealedClass) {
+///   case Subclass(:final field):
+///     return ...;
+///   case _:
+///     return null;
+/// }
+/// ```
+
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String? captchaKey,  String? captchaImage,  String? imageType,  String? imageDecode)?  $default,) {final _that = this;
+switch (_that) {
+case _CaptchaResponseModel() when $default != null:
+return $default(_that.captchaKey,_that.captchaImage,_that.imageType,_that.imageDecode);case _:
+  return null;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _CaptchaResponseModel implements CaptchaResponseModel {
+  const _CaptchaResponseModel({this.captchaKey, this.captchaImage, this.imageType, this.imageDecode});
+  factory _CaptchaResponseModel.fromJson(Map<String, dynamic> json) => _$CaptchaResponseModelFromJson(json);
+
+@override final  String? captchaKey;
+@override final  String? captchaImage;
+@override final  String? imageType;
+@override final  String? imageDecode;
+
+/// Create a copy of CaptchaResponseModel
+/// with the given fields replaced by the non-null parameter values.
+@override @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline')
+_$CaptchaResponseModelCopyWith<_CaptchaResponseModel> get copyWith => __$CaptchaResponseModelCopyWithImpl<_CaptchaResponseModel>(this, _$identity);
+
+@override
+Map<String, dynamic> toJson() {
+  return _$CaptchaResponseModelToJson(this, );
+}
+
+@override
+bool operator ==(Object other) {
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _CaptchaResponseModel&&(identical(other.captchaKey, captchaKey) || other.captchaKey == captchaKey)&&(identical(other.captchaImage, captchaImage) || other.captchaImage == captchaImage)&&(identical(other.imageType, imageType) || other.imageType == imageType)&&(identical(other.imageDecode, imageDecode) || other.imageDecode == imageDecode));
+}
+
+@JsonKey(includeFromJson: false, includeToJson: false)
+@override
+int get hashCode => Object.hash(runtimeType,captchaKey,captchaImage,imageType,imageDecode);
+
+@override
+String toString() {
+  return 'CaptchaResponseModel(captchaKey: $captchaKey, captchaImage: $captchaImage, imageType: $imageType, imageDecode: $imageDecode)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class _$CaptchaResponseModelCopyWith<$Res> implements $CaptchaResponseModelCopyWith<$Res> {
+  factory _$CaptchaResponseModelCopyWith(_CaptchaResponseModel value, $Res Function(_CaptchaResponseModel) _then) = __$CaptchaResponseModelCopyWithImpl;
+@override @useResult
+$Res call({
+ String? captchaKey, String? captchaImage, String? imageType, String? imageDecode
+});
+
+
+
+
+}
+/// @nodoc
+class __$CaptchaResponseModelCopyWithImpl<$Res>
+    implements _$CaptchaResponseModelCopyWith<$Res> {
+  __$CaptchaResponseModelCopyWithImpl(this._self, this._then);
+
+  final _CaptchaResponseModel _self;
+  final $Res Function(_CaptchaResponseModel) _then;
+
+/// Create a copy of CaptchaResponseModel
+/// with the given fields replaced by the non-null parameter values.
+@override @pragma('vm:prefer-inline') $Res call({Object? captchaKey = freezed,Object? captchaImage = freezed,Object? imageType = freezed,Object? imageDecode = freezed,}) {
+  return _then(_CaptchaResponseModel(
+captchaKey: freezed == captchaKey ? _self.captchaKey : captchaKey // ignore: cast_nullable_to_non_nullable
+as String?,captchaImage: freezed == captchaImage ? _self.captchaImage : captchaImage // ignore: cast_nullable_to_non_nullable
+as String?,imageType: freezed == imageType ? _self.imageType : imageType // ignore: cast_nullable_to_non_nullable
+as String?,imageDecode: freezed == imageDecode ? _self.imageDecode : imageDecode // ignore: cast_nullable_to_non_nullable
+as String?,
+  ));
+}
+
+
+}
+
+// dart format on
--- a/packages/inspection/lib/data/model/response/captcha/captcha_response_model.g.dart
+++ b/packages/inspection/lib/data/model/response/captcha/captcha_response_model.g.dart
@@ -0,0 +1,25 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'captcha_response_model.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_CaptchaResponseModel _$CaptchaResponseModelFromJson(
+  Map<String, dynamic> json,
+) => _CaptchaResponseModel(
+  captchaKey: json['captcha_key'] as String?,
+  captchaImage: json['captcha_image'] as String?,
+  imageType: json['image_type'] as String?,
+  imageDecode: json['image_decode'] as String?,
+);
+
+Map<String, dynamic> _$CaptchaResponseModelToJson(
+  _CaptchaResponseModel instance,
+) => <String, dynamic>{
+  'captcha_key': instance.captchaKey,
+  'captcha_image': instance.captchaImage,
+  'image_type': instance.imageType,
+  'image_decode': instance.imageDecode,
+};
--- a/packages/inspection/lib/data/model/response/poultry_location/poultry_location_model.dart
+++ b/packages/inspection/lib/data/model/response/poultry_location/poultry_location_model.dart
@@ -0,0 +1,68 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'poultry_location_model.freezed.dart';
+part 'poultry_location_model.g.dart';
+
+@freezed
+abstract class PoultryLocationModel with _$PoultryLocationModel {
+  const factory PoultryLocationModel({
+    int? id,
+    String? unitName,
+    @JsonKey(name: 'Lat')
+    double? lat,
+    @JsonKey(name: 'Long')
+    double? long,
+    User? user,
+    List<Hatching>? hatching,
+    Address? address,
+  }) = _PoultryLocationModel;
+
+  factory PoultryLocationModel.fromJson(Map<String, dynamic> json) =>
+      _$PoultryLocationModelFromJson(json);
+}
+
+@freezed
+abstract class User with _$User {
+  const factory User({
+    String? fullname,
+    String? mobile,
+  }) = _User;
+
+  factory User.fromJson(Map<String, dynamic> json) => _$UserFromJson(json);
+}
+
+@freezed
+abstract class Hatching with _$Hatching {
+  const factory Hatching({
+    int? quantity,
+    int? leftOver,
+    int? period,
+    int? chickenAge,
+    DateTime? date,
+    bool?violation,
+    bool?archive,
+  }) = _Hatching;
+
+  factory Hatching.fromJson(Map<String, dynamic> json) =>
+      _$HatchingFromJson(json);
+}
+
+@freezed
+abstract class Address with _$Address {
+  const factory Address({
+     City? city,
+    String? address,
+  }) = _Address;
+
+  factory Address.fromJson(Map<String, dynamic> json) =>
+      _$AddressFromJson(json);
+}
+
+@freezed
+abstract class City with _$City {
+  const factory City({
+     String? name,
+  }) = _City;
+
+  factory City.fromJson(Map<String, dynamic> json) => _$CityFromJson(json);
+}
--- a/packages/inspection/lib/data/model/response/user_profile/user_profile_model.dart
+++ b/packages/inspection/lib/data/model/response/user_profile/user_profile_model.dart
@@ -0,0 +1,73 @@
+import 'package:rasadyar_core/core.dart';
+
+part 'user_profile_model.freezed.dart';
+
+part 'user_profile_model.g.dart';
+
+@freezed
+abstract class UserProfileModel with _$UserProfileModel {
+  const factory UserProfileModel({
+    required User user,
+    required Role role,
+    required List<Permission> permissions,
+  }) = _UserProfileModel;
+
+  factory UserProfileModel.fromJson(Map<String, dynamic> json) => _$UserProfileModelFromJson(json);
+}
+
+@freezed
+abstract class User with _$User {
+  const factory User({
+    required int id,
+    required String username,
+    required String password,
+    required String firstName,
+    required String lastName,
+    required bool isActive,
+    required String mobile,
+    required String phone,
+    required String nationalCode,
+    required DateTime birthdate,
+    required String nationality,
+    required String ownership,
+    required String address,
+    required String photo,
+    required int province,
+    required int city,
+    required bool otpStatus,
+    required String cityName,
+    required String provinceName,
+  }) = _User;
+
+
+
+  factory User.fromJson(Map<String, dynamic> json) => _$UserFromJson(json);
+}
+
+@freezed
+abstract class Role with _$Role {
+  const factory Role({
+    required int id,
+    required String roleName,
+    required String description,
+    required RoleType type,
+    required List<dynamic> permissions,
+  }) = _Role;
+
+  factory Role.fromJson(Map<String, dynamic> json) => _$RoleFromJson(json);
+}
+
+@freezed
+abstract class RoleType with _$RoleType {
+  const factory RoleType({String? key, required String name}) = _RoleType;
+
+  factory RoleType.fromJson(Map<String, dynamic> json) => _$RoleTypeFromJson(json);
+}
+
+@freezed
+abstract class Permission with _$Permission {
+  const factory Permission({required String pageName, required List<String> pageAccess}) =
+  _Permission;
+
+  factory Permission.fromJson(Map<String, dynamic> json) => _$PermissionFromJson(json);
+}
--- a/packages/inspection/lib/data/repositories/auth/auth_repository.dart
+++ b/packages/inspection/lib/data/repositories/auth/auth_repository.dart
@@ -0,0 +1,17 @@
+
+import 'package:rasadyar_inspection/data/model/response/auth/auth_response_model.dart';
+import 'package:rasadyar_inspection/data/model/response/captcha/captcha_response_model.dart';
+
+abstract class AuthRepository {
+  Future<AuthResponseModel?> login({required Map<String, dynamic> authRequest});
+
+  Future<CaptchaResponseModel?> captcha();
+
+  Future<void> logout();
+
+  Future<bool> hasAuthenticated();
+
+  Future<AuthResponseModel?> loginWithRefreshToken({required Map<String, dynamic> authRequest});
+
+
+}
--- a/packages/inspection/lib/data/repositories/auth/auth_repository_imp.dart
+++ b/packages/inspection/lib/data/repositories/auth/auth_repository_imp.dart
@@ -0,0 +1,37 @@
+import 'package:rasadyar_inspection/data/data_source/remote/auth/auth_remote.dart';
+import 'package:rasadyar_inspection/data/model/response/auth/auth_response_model.dart';
+import 'package:rasadyar_inspection/data/model/response/captcha/captcha_response_model.dart';
+
+import 'auth_repository.dart';
+
+class AuthRepositoryImpl implements AuthRepository {
+  final AuthRemote authRemote;
+
+  AuthRepositoryImpl(this.authRemote);
+
+  @override
+  Future<AuthResponseModel?> login({required Map<String, dynamic> authRequest}) async =>
+      await authRemote.login(authRequest: authRequest);
+
+  @override
+  Future<CaptchaResponseModel?> captcha() async {
+    return await authRemote.captcha();
+  }
+
+  @override
+  Future<AuthResponseModel?> loginWithRefreshToken({
+    required Map<String, dynamic> authRequest,
+  }) async {
+    return await authRemote.loginWithRefreshToken(authRequest: authRequest);
+  }
+
+  @override
+  Future<void> logout() async {
+    await authRemote.logout();
+  }
+
+  @override
+  Future<bool> hasAuthenticated() async {
+    return await authRemote.hasAuthenticated();
+  }
+}
--- a/packages/inspection/lib/data/repositories/auth_repository.dart
+++ b/packages/inspection/lib/data/repositories/auth_repository.dart
@@ -1,18 +0,0 @@
-import 'package:rasadyar_core/data/model/response/auth/auth_response_model.dart';
-import 'package:rasadyar_core/data/model/response/captcha/captcha_response_model.dart';
-import 'package:rasadyar_core/data/model/response/user_info/user_info_model.dart';
-import 'package:rasadyar_core/data/model/response/user_profile_model/user_profile_model.dart';
-
-abstract class AuthRepository {
-  Future<UserProfileModel?> login({required Map<String, dynamic> authRequest});
-
-  Future<CaptchaResponseModel?> captcha();
-
-  Future<void> logout();
-
-  Future<bool> hasAuthenticated();
-
-  Future<AuthResponseModel?> loginWithRefreshToken({required Map<String, dynamic> authRequest});
-
-  Future<UserInfoModel?> getUserInfo(String phoneNumber);
-}
--- a/packages/inspection/lib/data/repositories/inspection/inspection_repository.dart
+++ b/packages/inspection/lib/data/repositories/inspection/inspection_repository.dart
@@ -0,0 +1,24 @@
+import 'package:rasadyar_inspection/data/model/response/poultry_location/poultry_location_model.dart';
+
+abstract class InspectionRepository {
+  /// Fetches the inspection data for a given [inspectionId].
+  ///
+  /// Returns a `Future` that resolves to a `Map<String, dynamic>` containing
+  /// the inspection data.
+  Future<Map<String, dynamic>> fetchInspectionData(String inspectionId);
+
+  /// Fetches the list of inspections for a given [userId].
+  ///
+  /// Returns a `Future` that resolves to a `List<Map<String, dynamic>>`
+  /// containing the list of inspections.
+  Future<List<Map<String, dynamic>>> fetchInspections(String userId);
+
+  /// Fetches nearby poultry locations based on the provided coordinates and radius.
+  ///
+  /// Returns a `Future` that resolves to a `List<PoultryLocationModel>?`.
+  Future<List<PoultryLocationModel>?> getNearbyLocation({
+    double? centerLat,
+    double? centerLng,
+    double? radius,
+  });
+}
--- a/packages/inspection/lib/data/repositories/inspection/inspection_repository_imp.dart
+++ b/packages/inspection/lib/data/repositories/inspection/inspection_repository_imp.dart
@@ -0,0 +1,34 @@
+import 'package:rasadyar_inspection/data/data_source/remote/inspection/inspection_remote.dart';
+import 'package:rasadyar_inspection/data/model/response/poultry_location/poultry_location_model.dart';
+import 'package:rasadyar_inspection/data/repositories/inspection/inspection_repository.dart';
+
+class InspectionRepositoryImp implements InspectionRepository {
+  final InspectionRemoteDataSource remoteDataSource;
+
+  InspectionRepositoryImp({required this.remoteDataSource});
+
+  @override
+  Future<Map<String, dynamic>> fetchInspectionData(String inspectionId) {
+    // TODO: implement fetchInspectionData
+    throw UnimplementedError();
+  }
+
+  @override
+  Future<List<Map<String, dynamic>>> fetchInspections(String userId) {
+    // TODO: implement fetchInspections
+    throw UnimplementedError();
+  }
+
+  @override
+  Future<List<PoultryLocationModel>?> getNearbyLocation({
+    double? centerLat,
+    double? centerLng,
+    double? radius,
+  }) async {
+    return remoteDataSource.getNearbyLocation(
+      centerLat: centerLat,
+      centerLng: centerLng,
+      radius: radius,
+    );
+  }
+}
--- a/packages/inspection/lib/data/repositories/user/user_repository.dart
+++ b/packages/inspection/lib/data/repositories/user/user_repository.dart
@@ -0,0 +1,19 @@
+
+import 'package:rasadyar_inspection/data/model/response/user_profile/user_profile_model.dart';
+
+abstract class UserRepository {
+  /// Fetches the user profile from the remote data source.
+  ///
+  /// Returns a [Future] that resolves to a [UserProfileModel].
+  Future<UserProfileModel?> fetchUserProfile({required String token});
+
+  /// Updates the user profile in the remote data source.
+  ///
+  /// Takes a [UserProfileModel] as an argument and returns a [Future] that resolves to a boolean indicating success or failure.
+  Future<bool> updateUserProfile(UserProfileModel userProfile);
+
+  /// Changes the password of the user in the remote data source.
+  ///
+  /// Takes the old password, new password, and confirm password as arguments and returns a [Future] that resolves to a boolean indicating success or failure.
+  Future<bool> changePassword(String oldPassword, String newPassword, String confirmPassword);
+}
--- a/packages/inspection/lib/data/repositories/user/user_repository_imp.dart
+++ b/packages/inspection/lib/data/repositories/user/user_repository_imp.dart
@@ -0,0 +1,28 @@
+
+import 'package:rasadyar_inspection/data/data_source/remote/user/user_data_source_imp.dart';
+import 'package:rasadyar_inspection/data/model/response/user_profile/user_profile_model.dart';
+
+import 'user_repository.dart';
+
+class UserRepositoryImp implements UserRepository {
+  final UserRemoteDataSourceImp _remoteDataSource;
+
+  UserRepositoryImp(this._remoteDataSource);
+
+  @override
+  Future<bool> changePassword(String oldPassword, String newPassword, String confirmPassword) {
+    // TODO: implement changePassword
+    throw UnimplementedError();
+  }
+
+  @override
+  Future<UserProfileModel?> fetchUserProfile({required String token}) async {
+    return await _remoteDataSource.getProfile(token: token);
+  }
+
+  @override
+  Future<bool> updateUserProfile(UserProfileModel userProfile) {
+    // TODO: implement updateUserProfile
+    throw UnimplementedError();
+  }
+}
--- a/packages/inspection/lib/data/utils/dio_exception_handeler.dart
+++ b/packages/inspection/lib/data/utils/dio_exception_handeler.dart
@@ -0,0 +1,58 @@
+import 'package:flutter/material.dart';
+import 'package:rasadyar_core/core.dart';
+
+class DioErrorHandler {
+  void handle(DioException error) {
+    switch (error.response?.statusCode) {
+      case 401:
+        _handleGeneric(error);
+        break;
+      case 403:
+        _handleGeneric(error);
+        break;
+
+      case 410:
+        _handle410();
+        break;
+      default:
+        _handleGeneric(error);
+    }
+  }
+
+  //wrong password/user name => "detail": "No active account found with the given credentials" - 401
+  void _handle410() {
+    Get.showSnackbar(_errorSnackBar('نام کاربری یا رمز عبور اشتباه است'));
+  }
+
+  //wrong captcha => "detail": "Captcha code is incorrect" - 403
+  void _handle403() {}
+
+  void _handleGeneric(DioException error) {
+    Get.showSnackbar(
+      _errorSnackBar(
+        error.response?.data.keys.first == 'is_user'
+            ? 'کاربر با این شماره تلفن وجود ندارد'
+            : error.response?.data[error.response?.data.keys.first] ??
+            'خطا در برقراری ارتباط با سرور',
+      ),
+    );
+  }
+
+  GetSnackBar _errorSnackBar(String message) {
+    return GetSnackBar(
+      titleText: Text(
+        'خطا',
+        style: AppFonts.yekan14.copyWith(color: Colors.white),
+      ),
+      messageText: Text(
+        message,
+        style: AppFonts.yekan12.copyWith(color: Colors.white),
+      ),
+      backgroundColor: AppColor.error,
+      margin: EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+      borderRadius: 12,
+      duration: Duration(milliseconds: 3500),
+      snackPosition: SnackPosition.TOP,
+    );
+  }
+}
--- a/packages/inspection/lib/injection/inspection_di.dart
+++ b/packages/inspection/lib/injection/inspection_di.dart
@@ -0,0 +1,71 @@
+import 'package:rasadyar_core/core.dart';
+import 'package:rasadyar_inspection/data/data_source/remote/auth/auth_remote.dart';
+import 'package:rasadyar_inspection/data/data_source/remote/auth/auth_remote_imp.dart';
+import 'package:rasadyar_inspection/data/data_source/remote/inspection/inspection_remote_imp.dart';
+import 'package:rasadyar_inspection/data/data_source/remote/user/user_data_source_imp.dart';
+import 'package:rasadyar_inspection/data/repositories/auth/auth_repository_imp.dart';
+import 'package:rasadyar_inspection/data/repositories/inspection/inspection_repository_imp.dart';
+import 'package:rasadyar_inspection/data/repositories/user/user_repository_imp.dart';
+import 'package:rasadyar_inspection/data/utils/dio_exception_handeler.dart';
+import 'package:rasadyar_inspection/presentation/routes/app_routes.dart';
+
+GetIt diInspection = GetIt.instance;
+
+Future<void> setupInspectionDI() async {
+  diInspection.registerSingleton(DioErrorHandler());
+  var tokenService = Get.find<TokenStorageService>();
+  if (tokenService.baseurl.value == null) {
+    await tokenService.saveBaseUrl('https://bazrasbackend.rasadyaar.ir/');
+  }
+  diInspection.registerLazySingleton<AppInterceptor>(
+    () => AppInterceptor(
+      //TODO : Update the base URL to the correct one for inspection module
+      refreshTokenCallback: () async => null,
+      saveTokenCallback: (String newToken) async {
+        await tokenService.saveAccessToken(newToken);
+      },
+      clearTokenCallback: () async {
+        await tokenService.deleteTokens();
+        Get.offAllNamed(InspectionRoutes.auth, arguments: Module.inspection);
+      },
+      authArguments: Module.inspection,
+    ),
+    instanceName: 'inspectionInterceptor',
+  );
+
+  diInspection.registerLazySingleton<DioRemote>(() {
+    return DioRemote(
+      baseUrl: tokenService.baseurl.value,
+      interceptors: diInspection.get<AppInterceptor>(instanceName: 'inspectionInterceptor'),
+    );
+  }, instanceName: 'inspectionDioRemote');
+
+  var dioRemote = diInspection.get<DioRemote>(instanceName: 'inspectionDioRemote');
+  await dioRemote.init();
+
+  diInspection.registerLazySingleton<AuthRemote>(
+    () => AuthRemoteImp(diInspection.get<DioRemote>(instanceName: 'inspectionDioRemote')),
+  );
+
+  diInspection.registerSingleton<AuthRepositoryImpl>(
+    AuthRepositoryImpl(diInspection.get<AuthRemote>()),
+  );
+
+  diInspection.registerSingleton<UserRemoteDataSourceImp>(
+    UserRemoteDataSourceImp(diInspection.get<DioRemote>(instanceName: 'inspectionDioRemote')),
+  );
+
+  diInspection.registerSingleton<UserRepositoryImp>(
+    UserRepositoryImp(diInspection.get<UserRemoteDataSourceImp>()),
+  );
+
+  diInspection.registerSingleton<InspectionRemoteDataSourceImp>(
+    InspectionRemoteDataSourceImp(diInspection.get<DioRemote>(instanceName: 'inspectionDioRemote')),
+  );
+
+  diInspection.registerSingleton<InspectionRepositoryImp>(
+    InspectionRepositoryImp(remoteDataSource: diInspection.get<InspectionRemoteDataSourceImp>()),
+  );
+
+  diInspection.registerSingleton(ImagePicker());
+}
--- a/packages/inspection/lib/presentation/pages/auth/logic.dart
+++ b/packages/inspection/lib/presentation/pages/auth/logic.dart
@@ -2,10 +2,12 @@ import 'dart:async';

 import 'package:flutter/material.dart';
 import 'package:rasadyar_core/core.dart';
-import 'package:rasadyar_core/data/model/request/login_request/login_request_model.dart';
-import 'package:rasadyar_core/data/model/response/user_info/user_info_model.dart';
-import 'package:rasadyar_core/data/model/response/user_profile_model/user_profile_model.dart';
-import 'package:rasadyar_inspection/data/repositories/auth_repository_imp.dart';
+import 'package:rasadyar_inspection/data/model/request/login_request/login_request_model.dart';
+import 'package:rasadyar_inspection/data/model/response/auth/auth_response_model.dart';
+import 'package:rasadyar_inspection/data/repositories/auth/auth_repository_imp.dart';
+import 'package:rasadyar_inspection/data/utils/dio_exception_handeler.dart';
+import 'package:rasadyar_inspection/injection/inspection_di.dart';
+import 'package:rasadyar_inspection/presentation/routes/app_routes.dart';
 import 'package:rasadyar_inspection/presentation/widget/captcha/logic.dart';

 enum AuthType { useAndPass, otp }
@@ -38,7 +40,7 @@ class AuthLogic extends GetxController {
  RxInt secondsRemaining = 120.obs;
  Timer? _timer;

-  //AuthRepositoryImpl authRepository = diAuth.get<AuthRepositoryImpl>();
+  AuthRepositoryImpl authRepository = diInspection.get<AuthRepositoryImpl>();

  final Module _module = Get.arguments;

@@ -97,33 +99,34 @@ class AuthLogic extends GetxController {
    );
  }

-  /*Future<void> submitLoginForm() async {
+  Future<void> submitLoginForm() async {
    if (!_isFormValid()) return;
-    iLog('module222 : ${_module.toString()}');
+
    final loginRequestModel = _buildLoginRequest();
    isLoading.value = true;
    await safeCall<AuthResponseModel?>(
-      call: () => authRepository.login(authRequest: loginRequestModel.toJson()),
+      call: () async => authRepository.login(authRequest: loginRequestModel.toJson()),
      onSuccess: (result) async {
        await tokenStorageService.saveModule(_module);
        await tokenStorageService.saveRefreshToken(result?.refresh ?? '');
        await tokenStorageService.saveAccessToken(result?.access ?? '');
+        Get.offAllNamed(InspectionRoutes.init);
      },
      onError: (error, stackTrace) {
        if (error is DioException) {
-          diAuth.get<DioErrorHandler>().handle(error);
+          diInspection.get<DioErrorHandler>().handle(error);
        }
        captchaController.getCaptcha();
      },
    );
    isLoading.value = false;
-  }*/
+  }

  Future<void> submitLoginForm2() async {
    if (!_isFormValid()) return;
    //AuthRepositoryImpl authTmp = diAuth.get<AuthRepositoryImpl>(instanceName: 'newUrl');
    isLoading.value = true;
-  /*  await safeCall<UserProfileModel?>(
+    /*  await safeCall<UserProfileModel?>(
      call: () => authTmp.login(
        authRequest: {
          "username": usernameController.value.text,
--- a/packages/inspection/lib/presentation/pages/auth/view.dart
+++ b/packages/inspection/lib/presentation/pages/auth/view.dart
@@ -184,7 +184,7 @@ class AuthPage extends GetView<AuthLogic> {
                  onPressed: controller.isDisabled.value
                      ? null
                      : () async {
-                          await controller.submitLoginForm2();
+                          await controller.submitLoginForm();
                        },
                  width: Get.width,
                  height: 48,
--- a/packages/inspection/lib/presentation/pages/inspection_map/logic.dart
+++ b/packages/inspection/lib/presentation/pages/inspection_map/logic.dart
@@ -1,20 +1,23 @@
-
 import 'dart:async';

 import 'package:flutter/material.dart';
 import 'package:rasadyar_core/core.dart';
-import 'package:rasadyar_inspection/data/utils/marker_generator.dart';
+import 'package:rasadyar_inspection/data/model/response/poultry_location/poultry_location_model.dart';
+import 'package:rasadyar_inspection/data/repositories/inspection/inspection_repository_imp.dart';
+import 'package:rasadyar_inspection/injection/inspection_di.dart';
 import 'package:rasadyar_inspection/presentation/widget/base_page/logic.dart';

 import '../filter/view.dart';

 class InspectionMapLogic extends GetxController with GetTickerProviderStateMixin {
-
  final BaseLogic baseLogic = Get.find<BaseLogic>();

-  Rx<LatLng> currentLocation = LatLng(35.824891, 50.948025).obs;
-  RxList<LatLng> allMarkers = <LatLng>[].obs;
-  RxList<LatLng> markers = <LatLng>[].obs;
+  Rx<LatLng> currentLocation = LatLng(34.798315281272544, 48.51479142983491).obs;
+  Rx<Resource<List<PoultryLocationModel>>> allPoultryLocation =
+      Resource<List<PoultryLocationModel>>.loading().obs;
+
+  RxList<PoultryLocationModel> markers = <PoultryLocationModel>[].obs;
+
  Timer? _debounceTimer;
  RxBool isLoading = false.obs;
  RxBool isSelectedDetailsLocation = false.obs;
@@ -33,55 +36,7 @@ class InspectionMapLogic extends GetxController with GetTickerProviderStateMixin
  late DraggableBottomSheetController detailsLocationBottomSheetController;
  late final BottomSheetManager bottomSheetManager;

-  Future<void> determineCurrentPosition() async {
-    isLoading.value = true;
-    final position = await Geolocator.getCurrentPosition(
-      locationSettings: AndroidSettings(accuracy: LocationAccuracy.best),
-    );
-    final latLng = LatLng(position.latitude, position.longitude);
-
-    currentLocation.value = latLng;
-    markers.add(latLng);
-    animatedMapController.animateTo(
-      dest: latLng,
-      zoom: 18,
-      curve: Curves.easeInOut,
-      duration: const Duration(seconds: 1),
-    );
-    isLoading.value = false;
-  }
-
-  void debouncedUpdateVisibleMarkers({required LatLng center}) {
-    _debounceTimer?.cancel();
-    _debounceTimer = Timer(const Duration(milliseconds: 300), () {
-      final filtered = filterNearbyMarkers({
-        'markers': allMarkers,
-        'centerLat': center.latitude,
-        'centerLng': center.longitude,
-        'radius': 2000.0,
-      });
-
-      markers.addAll(filtered);
-    });
-  }
-
-  List<LatLng> filterNearbyMarkers(Map<String, dynamic> args) {
-    final List<LatLng> rawMarkers = args['markers'];
-    final double centerLat = args['centerLat'];
-    final double centerLng = args['centerLng'];
-    final double radiusInMeters = args['radius'];
-    final center = LatLng(centerLat, centerLng);
-    final distance = Distance();
-
-    return rawMarkers
-        .where((marker) => distance(center, marker) <= radiusInMeters)
-        .toList();
-  }
-
-  Future<void> generatedMarkers() async {
-    final generatedMarkers = await generateLocationsUsingCompute(100000);
-    allMarkers.value = generatedMarkers;
-  }
+  InspectionRepositoryImp inspectionRepository = diInspection.get<InspectionRepositoryImp>();

  @override
  void onInit() {
@@ -92,6 +47,7 @@ class InspectionMapLogic extends GetxController with GetTickerProviderStateMixin
      curve: Curves.easeInOut,
      cancelPreviousAnimations: true,
    );
+    fetchAllPoultryLocations();

    filterBottomSheetController = DraggableBottomSheetController(
      initialHeight: 350,
@@ -105,7 +61,6 @@ class InspectionMapLogic extends GetxController with GetTickerProviderStateMixin
      maxHeight: 200,
    );

-
    detailsLocationBottomSheetController = DraggableBottomSheetController(
      initialHeight: Get.height * 0.5,
      minHeight: Get.height * 0.37,
@@ -114,13 +69,10 @@ class InspectionMapLogic extends GetxController with GetTickerProviderStateMixin

    slidController = SlidableController(this).obs;
    bottomSheetManager = BottomSheetManager({
-      filterBottomSheetController:
-          () => filterWidget(filterIndex: filterIndex, showIndex: showIndex),
-      selectedLocationBottomSheetController:
-          () => selectedLocationWidget(
-        showHint:
-        selectedLocationBottomSheetController.isVisible.value &&
-            showSlideHint,
+      filterBottomSheetController: () =>
+          filterWidget(filterIndex: filterIndex, showIndex: showIndex),
+      selectedLocationBottomSheetController: () => selectedLocationWidget(
+        showHint: selectedLocationBottomSheetController.isVisible.value && showSlideHint,
        sliderController: slidController.value,
        trigger: triggerSlidableAnimation,
        toggle: selectedLocationBottomSheetController.toggle,
@@ -132,8 +84,63 @@ class InspectionMapLogic extends GetxController with GetTickerProviderStateMixin
  @override
  void onReady() {
    super.onReady();
-    determineCurrentPosition();
-    generatedMarkers();
+    //determineCurrentPosition();
+  }
+
+  @override
+  void onClose() {
+    slidController.close();
+    super.onClose();
+  }
+
+  Future<void> determineCurrentPosition() async {
+    isLoading.value = true;
+    final position = await Geolocator.getCurrentPosition(
+      locationSettings: AndroidSettings(accuracy: LocationAccuracy.best),
+    );
+    final latLng = LatLng(position.latitude, position.longitude);
+
+    /*currentLocation.value = latLng;
+    markers.add(PoultryLocationModel(
+      lat: latLng.latitude,
+      long: latLng.longitude
+    ));*/
+    animatedMapController.animateTo(
+      dest: latLng,
+      zoom: 18,
+      curve: Curves.easeInOut,
+      duration: const Duration(seconds: 1),
+    );
+    isLoading.value = false;
+  }
+
+  void debouncedUpdateVisibleMarkers({required LatLng center}) {
+    _debounceTimer?.cancel();
+    _debounceTimer = Timer(const Duration(milliseconds: 300), () {
+      final filtered = filterNearbyMarkers(
+        allPoultryLocation.value.data ?? [],
+        center.latitude,
+        center.longitude,
+        10000, // Radius in meters
+      );
+
+      markers.addAll(filtered);
+    });
+  }
+
+  List<PoultryLocationModel> filterNearbyMarkers(
+    List<PoultryLocationModel> allMarkers,
+    double centerLat,
+    double centerLng,
+    double radiusInMeters,
+  ) {
+    final center = LatLng(centerLat, centerLng);
+    final distance = Distance();
+
+    return allMarkers.where((marker) {
+      var tmp =LatLng(marker.lat ?? 0, marker.long ?? 0);
+      return distance(center,tmp ) <= radiusInMeters;
+    }).toList();
  }

  Future<void> triggerSlidableAnimation() async {
@@ -144,9 +151,23 @@ class InspectionMapLogic extends GetxController with GetTickerProviderStateMixin
    showSlideHint = false;
  }

-  @override
-  void onClose() {
-    slidController.close();
-    super.onClose();
+  Future<void> fetchAllPoultryLocations() async {
+    isLoading.value = true;
+    allPoultryLocation.value = Resource<List<PoultryLocationModel>>.loading();
+    await safeCall(
+      call: () => inspectionRepository.getNearbyLocation(),
+      onSuccess: (result) {
+        if (result != null) {
+          allPoultryLocation.value = Resource<List<PoultryLocationModel>>.success(result);
+        } else {
+          allPoultryLocation.value = Resource<List<PoultryLocationModel>>.error(
+            'No locations found',
+          );
+        }
+      },
+      onError: (error, stackTrace) {
+        allPoultryLocation.value = Resource<List<PoultryLocationModel>>.error(error.toString());
+      },
+    );
  }
 }
--- a/packages/inspection/lib/presentation/pages/inspection_map/view.dart
+++ b/packages/inspection/lib/presentation/pages/inspection_map/view.dart
@@ -54,7 +54,7 @@ class InspectionMapPage extends GetView<InspectionMapLogic> {
                    markers: markers
                        .map(
                          (e) => markerWidget(
-                            marker: e,
+                            marker: LatLng(e.lat??0, e.long??0),
                            onTap: () {
                              Get.bottomSheet(
                                selectedLocationWidget2(
@@ -295,6 +295,7 @@ class InspectionMapPage extends GetView<InspectionMapLogic> {
 }

 Marker markerWidget({required LatLng marker, required VoidCallback onTap}) {
+  iLog('lat: ${marker.latitude}, lng: ${marker.longitude}');
  return Marker(
    point: marker,
    child: GestureDetector(
--- a/packages/inspection/lib/presentation/pages/profile/logic.dart
+++ b/packages/inspection/lib/presentation/pages/profile/logic.dart
@@ -1,28 +1,27 @@
 import 'package:rasadyar_core/core.dart';
+import 'package:rasadyar_inspection/data/model/response/user_profile/user_profile_model.dart';
+import 'package:rasadyar_inspection/data/repositories/user/user_repository_imp.dart';
+import 'package:rasadyar_inspection/injection/inspection_di.dart';
+import 'package:rasadyar_inspection/inspection.dart';

 class ProfileLogic extends GetxController {
-
-
-  List<String> roles = <String>[
-    'کاربر عادی',
-    'کاربر ویژه',
-    'کاربر VIP',
-    'کاربر نقره ای',
-    'کاربر طلایی',
-
-  ];
-
-
-
+  RootLogic rootLogic = Get.find<RootLogic>();
+  UserRepositoryImp userRepository = diInspection.get<UserRepositoryImp>();
+  Rx<Resource<UserProfileModel>> userProfile = Resource<UserProfileModel>.loading().obs;

  RxInt selectedRole = 0.obs;
  RxInt selectedInformationType = 0.obs;

-
  @override
  void onReady() {
-    // TODO: implement onReady
    super.onReady();
+    rootLogic.userProfile.listen((data) {
+      if (data != null) {
+        userProfile.value = Resource<UserProfileModel>.success(data);
+      } else {
+        userProfile.value = Resource<UserProfileModel>.error('Failed to load user profile');
+      }
+    });
  }

  @override
@@ -30,4 +29,26 @@ class ProfileLogic extends GetxController {
    // TODO: implement onClose
    super.onClose();
  }
+
+  Future<void> fetchUserProfile() async {
+    userProfile.value = Resource<UserProfileModel>.loading();
+
+    await safeCall(
+      call: () => userRepository.fetchUserProfile(
+        token: rootLogic.tokenStorageService.accessToken.value ?? '',
+      ),
+      onSuccess: (profile) {
+        if (profile != null) {
+          userProfile.value = Resource<UserProfileModel>.success(profile);
+        } else {
+          userProfile.value = Resource<UserProfileModel>.error('Failed to load user profile');
+        }
+      },
+      onError: (error, stackTrace) {
+        userProfile.value = Resource<UserProfileModel>.error(
+          'Failed to load user profile: ${error.toString()}',
+        );
+      },
+    );
+  }
 }
--- a/packages/inspection/lib/presentation/pages/profile/view.dart
+++ b/packages/inspection/lib/presentation/pages/profile/view.dart
@@ -1,5 +1,7 @@
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:rasadyar_core/core.dart';
+import 'package:rasadyar_inspection/data/model/response/user_profile/user_profile_model.dart';

 import 'logic.dart';

@@ -9,124 +11,96 @@ class ProfilePage extends GetView<ProfileLogic> {
  @override
  Widget build(BuildContext context) {
    return Column(
-      spacing: 30,
      children: [
-        SizedBox(
-          height: Get.height * 0.3,
-          child: Stack(
-            fit: StackFit.expand,
-            alignment: Alignment.center,
-            clipBehavior: Clip.none,
-            children: [
-              Assets.vec.bgHeaderUserProfileSvg.svg(),
-              Positioned(
-                bottom: -20,
-                left: 0,
-                right: 0,
-                child: SizedBox(
-                  width: 110,
-                  height: 110,
-                  child: CircleAvatar(
-                    backgroundColor: AppColor.blueLightHover,
-                    child: FaIcon(
-                      FontAwesomeIcons.user,
-                      size: 45,
-                      color: Colors.white,
+        Expanded(
+          flex: 1,
+          child: Container(
+            color: AppColor.blueNormal,
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              crossAxisAlignment: CrossAxisAlignment.center,
+              children: [
+                Row(),
+                ObxValue((data) {
+                  final status = data.value.status;
+
+                  if (status == ResourceStatus.loading) {
+                    return Container(
+                      width: 128.w,
+                      height: 128.h,
+                      child: Center(child: CupertinoActivityIndicator(color: AppColor.greenNormal)),
+                    );
+                  }
+
+                  if (status == ResourceStatus.error) {
+                    return Container(
+                      width: 128.w,
+                      height: 128.h,
+                      child: Center(child: Text('خطا در دریافت اطلاعات')),
+                    );
+                  }
+
+                  // Default UI
+                  return Container(
+                    width: 128.w,
+                    height: 128.h,
+                    decoration: BoxDecoration(
+                      shape: BoxShape.circle,
+                      color: AppColor.blueLightActive,
                    ),
-                  ),
-                ),
-              ),
-            ],
+                    child: Center(
+                      child: CircleAvatar(
+                        radius: 64.w,
+                        backgroundImage: NetworkImage(data.value.data?.user.photo ?? ''),
+                      ),
+                    ),
+                  );
+                }, controller.userProfile),
+              ],
+            ),
          ),
        ),
        Expanded(
+          flex: 3,
          child: Column(
            crossAxisAlignment: CrossAxisAlignment.start,
            spacing: 16,
            children: [
-              SizedBox(
-                height: 75,
-                child: ListView.separated(
-                  shrinkWrap: true,
-                  padding: EdgeInsets.all(16),
-                  scrollDirection: Axis.horizontal,
-                  itemBuilder:
-                      (context, index) => ObxValue((data) {
-                        return ChoiceChip(
-                          onSelected: (value) {
-                            data.value = index;
-                          },
-                          selectedColor: AppColor.blueNormal,
-                          labelStyle:
-                              data.value == index
-                                  ? AppFonts.yekan13.copyWith(
-                                    color: AppColor.whiteLight,
-                                  )
-                                  : AppFonts.yekan12.copyWith(
-                                    color: AppColor.darkGreyNormalActive,
-                                  ),
-                          checkmarkColor: Colors.white,
-                          label: Text(controller.roles[index]),
-                          selected: index == data.value,
-                        );
-                      }, controller.selectedRole),
-
-                  separatorBuilder: (context, index) => SizedBox(width: 8),
-                  itemCount: controller.roles.length,
-                ),
-              ),
              Expanded(
                child: Padding(
-                  padding: const EdgeInsets.symmetric(
-                    horizontal: 30,
-                    vertical: 10,
-                  ),
-                  child: ObxValue((data) {
-                    return switch (data.value) {
-                      0 => userProfileInformation(),
-                      1 => bankInformationWidget(),
-                      2 => invoiceIssuanceInformation(),
-                      int() => Placeholder(),
-                    };
-                  }, controller.selectedInformationType),
+                  padding: const EdgeInsets.symmetric(horizontal: 30, vertical: 10),
+                  child: userProfileInformation(),
                ),
              ),

-              ObxValue((data) {
-                return Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 20),
-                  child: Wrap(
-                    spacing: 20,
-                    runSpacing: 10,
-                    children: [
-                      cardActionWidget(
-                        title: 'اطلاعات کاربری',
-                        onPressed: () {
-                          data.value = 0;
-                        },
-                        icon: Assets.vec.profileUserSvg.path,
-                        selected: data.value == 0,
-                      ),
-                      cardActionWidget(
-                        title: 'اطلاعات بانکی',
-                        onPressed: () {
-                          data.value = 1;
-                        },
-                        icon: Assets.vec.informationSvg.path,
-                        selected: data.value == 1,
-                      ),
-                      cardActionWidget(
-                        title: 'اطلاعات \nصدور فاکتور',
-                        onPressed: () {
-                          data.value = 2;
-                        },
-                        icon: Assets.vec.receiptDiscountSvg.path,
-                        selected: data.value == 2,
-                      ),
-                    ],
-                  ),
-                );
-              }, controller.selectedInformationType),
+              Center(
+                child: Wrap(
+                  alignment: WrapAlignment.center,
+                  spacing: 20,
+                  runSpacing: 10,
+                  children: [
+                    cardActionWidget(
+                      title: 'تغییر رمز عبور',
+                      selected: true,
+                      onPressed: () {
+                        Get.bottomSheet(changePasswordBottomSheet(), isScrollControlled: true);
+                      },
+                      icon: Assets.vec.lockSvg.path,
+                    ),
+                    cardActionWidget(
+                      title: 'خروج',
+                      selected: true,
+                      color: ColorFilter.mode(Colors.redAccent, BlendMode.srcIn),
+                      cardColor: Color(0xFFEFEFEF),
+                      textColor: AppColor.redDarkerText,
+                      onPressed: () {
+                        Get.bottomSheet(exitBottomSheet(), isScrollControlled: true);
+                      },
+                      icon: Assets.vec.logoutSvg.path,
+                    ),
+                  ],
+                ),
+              ),

              SizedBox(height: 100),
            ],
@@ -149,72 +123,113 @@ class ProfilePage extends GetView<ProfileLogic> {
    ],
  );

-  Column userProfileInformation() {
-    return Column(
-      spacing: 10,
-      children: [
-        itemList(
-          title: 'نام و نام خانوادگی',
-          content: 'آیدا گل محمدی',
-          icon: Assets.vec.userSvg.path,
-        ),
-        itemList(
-          title: 'موبایل',
-          content: '09302654896',
-          icon: Assets.vec.callSvg.path,
-        ),
-        itemList(
-          title: 'کدملی',
-          content: 'نا مشخص',
-          icon: Assets.vec.tagUserSvg.path,
-        ),
-        itemList(
-          title: 'شماره شناسنامه',
-          content: 'نا مشخص',
-          icon: Assets.vec.userSquareSvg.path,
-        ),
-        itemList(
-          title: 'تاریخ تولد',
-          content: '1404/10/12',
-          icon: Assets.vec.calendarSvg.path,
-        ),
-        itemList(
-          title: 'استان',
-          content: 'لرستان',
-          icon: Assets.vec.pictureFrameSvg.path,
-        ),
-        itemList(
-          title: 'شهر',
-          content: 'خرم آباد',
-          icon: Assets.vec.mapSvg.path,
-        ),
-      ],
-    );
+  Widget userProfileInformation() {
+    return ObxValue((data) {
+      if (data.value.status == ResourceStatus.loading) {
+        return LoadingWidget();
+      } else if (data.value.status == ResourceStatus.error) {
+        return ErrorWidget('خطا در دریافت اطلاعات کاربر');
+      } else if (data.value.status == ResourceStatus.success) {
+        User item = data.value.data!.user;
+        return Column(
+          spacing: 6,
+          children: [
+            buildRowOnTapped(
+              onTap: () {
+                Get.bottomSheet(
+                  userInformationBottomSheet(),
+                  isScrollControlled: true,
+                  ignoreSafeArea: false,
+                );
+              },
+              titleWidget: Column(
+                spacing: 3,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    'اطلاعات هویتی',
+                    style: AppFonts.yekan16Bold.copyWith(color: AppColor.blueNormal),
+                  ),
+                  Container(width: 37.w, height: 1.h, color: AppColor.greenNormal),
+                ],
+              ),
+              valueWidget: Assets.vec.editSvg.svg(
+                width: 24.w,
+                height: 24.h,
+                colorFilter: ColorFilter.mode(AppColor.blueNormal, BlendMode.srcIn),
+              ),
+            ),
+            itemList(
+              title: 'نام و نام خانوادگی',
+              content: '${item.firstName} ${item.lastName}',
+              icon: Assets.vec.userSvg.path,
+              hasColoredBox: true,
+            ),
+            itemList(
+              title: 'موبایل',
+              content: item.mobile ?? 'نامشخص',
+              icon: Assets.vec.callSvg.path,
+            ),
+            itemList(
+              title: 'کدملی',
+              content: item.nationalCode ?? 'نامشخص',
+              icon: Assets.vec.tagUserSvg.path,
+            ),
+            itemList(
+              title: 'شماره شناسنامه',
+              content: item.nationalCode ?? 'نامشخص',
+              icon: Assets.vec.userSquareSvg.path,
+            ),
+
+            itemList(
+              title: 'استان',
+              content: item.provinceName ?? 'نامشخص',
+              icon: Assets.vec.pictureFrameSvg.path,
+            ),
+            itemList(
+              title: 'شهر',
+              content: item.cityName ?? 'نامشخص',
+              icon: Assets.vec.mapSvg.path,
+            ),
+          ],
+        );
+      } else {
+        return SizedBox.shrink();
+      }
+    }, controller.userProfile);
  }

  Widget itemList({
    required String title,
    required String content,
    String? icon,
-  }) => Row(
-    spacing: 4,
-    children: [
-      if (icon != null)
-        Padding(
-          padding: const EdgeInsets.only(left: 8.0),
-          child: SvgGenImage.vec(icon).svg(
-            width: 20,
-            height: 20,
-            colorFilter: ColorFilter.mode(AppColor.blueNormal, BlendMode.srcIn),
+    bool hasColoredBox = false,
+  }) => Container(
+    padding: EdgeInsets.symmetric(horizontal: 12.h, vertical: 6.h),
+    decoration: BoxDecoration(
+      color: hasColoredBox ? AppColor.greenLight : Colors.transparent,
+      borderRadius: BorderRadius.circular(8),
+      border: hasColoredBox
+          ? Border.all(width: 0.25, color: AppColor.bgDark)
+          : Border.all(width: 0, color: Colors.transparent),
+    ),
+    child: Row(
+      spacing: 4,
+      children: [
+        if (icon != null)
+          Padding(
+            padding: const EdgeInsets.only(left: 8.0),
+            child: SvgGenImage.vec(icon).svg(
+              width: 20.w,
+              height: 20.h,
+              colorFilter: ColorFilter.mode(AppColor.mediumGreyNormalActive, BlendMode.srcIn),
+            ),
          ),
-        ),
-      Text(title, style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal)),
-      Spacer(),
-      Text(
-        content,
-        style: AppFonts.yekan13.copyWith(color: AppColor.darkGreyNormalHover),
-      ),
-    ],
+        Text(title, style: AppFonts.yekan12.copyWith(color: AppColor.mediumGreyNormalActive)),
+        Spacer(),
+        Text(content, style: AppFonts.yekan13.copyWith(color: AppColor.mediumGreyNormalHover)),
+      ],
+    ),
  );

  Widget cardActionWidget({
@@ -222,6 +237,9 @@ class ProfilePage extends GetView<ProfileLogic> {
    required VoidCallback onPressed,
    required String icon,
    bool selected = false,
+    ColorFilter? color,
+    Color? cardColor,
+    Color? textColor,
  }) {
    return GestureDetector(
      onTap: onPressed,
@@ -233,25 +251,25 @@ class ProfilePage extends GetView<ProfileLogic> {
            height: 52,
            padding: EdgeInsets.all(8),
            decoration: ShapeDecoration(
-              color: selected ? AppColor.blueLightActive : AppColor.blueLight,
-              shape: RoundedRectangleBorder(
-                borderRadius: BorderRadius.circular(8),
-              ),
+              color: cardColor ?? AppColor.blueLight,
+              shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
            ),
            child: SvgGenImage.vec(icon).svg(
              width: 40,
              height: 40,
-              colorFilter: ColorFilter.mode(
-                selected ? AppColor.whiteLight : AppColor.blueNormal,
-                BlendMode.srcIn,
-              ),
+              colorFilter:
+                  color ??
+                  ColorFilter.mode(
+                    selected ? AppColor.blueNormal : AppColor.whiteLight,
+                    BlendMode.srcIn,
+                  ),
            ),
          ),
          SizedBox(height: 2),
          Text(
            title,
            style: AppFonts.yekan10.copyWith(
-              color: selected ? AppColor.blueNormal : AppColor.blueLightActive,
+              color: textColor ?? (selected ? AppColor.blueNormal : AppColor.blueLightActive),
            ),
            textAlign: TextAlign.center,
          ),
@@ -259,4 +277,359 @@ class ProfilePage extends GetView<ProfileLogic> {
      ),
    );
  }
+
+  Widget userInformationBottomSheet() {
+    return Container(color: Colors.red);
+    /*    return BaseBottomSheet(
+      height: 750.h,
+      child: SingleChildScrollView(
+        child: Column(
+          spacing: 8,
+          children: [
+            Text(
+              'ویرایش اطلاعات هویتی',
+              style: AppFonts.yekan16Bold.copyWith(color: AppColor.darkGreyDarkHover),
+            ),
+
+            Container(
+              padding: EdgeInsets.all(8),
+              decoration: BoxDecoration(
+                color: Colors.white,
+                borderRadius: BorderRadius.circular(8),
+                border: Border.all(color: AppColor.darkGreyLight, width: 1),
+              ),
+              child: Column(
+                spacing: 12,
+                children: [
+                  RTextField(
+                    controller: controller.nameController,
+                    label: 'نام',
+                    borderColor: AppColor.darkGreyLight,
+                    filledColor: AppColor.bgLight,
+                    filled: true,
+                  ),
+                  RTextField(
+                    controller: controller.lastNameController,
+                    label: 'نام خانوادگی',
+                    borderColor: AppColor.darkGreyLight,
+                    filledColor: AppColor.bgLight,
+                    filled: true,
+                  ),
+                  RTextField(
+                    controller: controller.nationalCodeController,
+                    label: 'شماره شناسنامه',
+                    borderColor: AppColor.darkGreyLight,
+                    filledColor: AppColor.bgLight,
+                    filled: true,
+                  ),
+                  RTextField(
+                    controller: controller.nationalIdController,
+                    label: 'کد ملی',
+                    borderColor: AppColor.darkGreyLight,
+                    filledColor: AppColor.bgLight,
+                    filled: true,
+                  ),
+
+                  ObxValue((data) {
+                    return RTextField(
+                      controller: controller.birthdayController,
+                      label: 'تاریخ تولد',
+                      initText: data.value?.formatCompactDate() ?? '',
+                      borderColor: AppColor.darkGreyLight,
+                      filledColor: AppColor.bgLight,
+                      filled: true,
+                      onTap: () {},
+                    );
+                  }, controller.birthDate),
+
+                  SizedBox(),
+                ],
+              ),
+            ),
+            SizedBox(),
+
+            Container(
+              padding: EdgeInsets.all(8),
+              decoration: BoxDecoration(
+                color: Colors.white,
+                borderRadius: BorderRadius.circular(8),
+                border: Border.all(color: AppColor.darkGreyLight, width: 1),
+              ),
+              child: Column(
+                spacing: 8,
+                children: [
+                  Text(
+                    'عکس پروفایل',
+                    style: AppFonts.yekan16Bold.copyWith(color: AppColor.blueNormal),
+                  ),
+                  ObxValue((data) {
+                    return Container(
+                      width: Get.width,
+                      height: 270,
+                      decoration: BoxDecoration(
+                        color: AppColor.lightGreyNormal,
+                        borderRadius: BorderRadius.circular(8),
+                        border: Border.all(width: 1, color: AppColor.blackLight),
+                      ),
+                      child: Center(
+                        child: data.value == null
+                            ? Padding(
+                                padding: const EdgeInsets.fromLTRB(30, 10, 10, 30),
+                                child: Image.network(
+                                  controller.userProfile.value.data?.image ?? '',
+                                ),
+                              )
+                            : Image.file(File(data.value!.path), fit: BoxFit.cover),
+                      ),
+                    );
+                  }, controller.selectedImage),
+
+                  Row(
+                    crossAxisAlignment: CrossAxisAlignment.center,
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+                      RElevated(
+                        text: 'گالری',
+                        width: 150.w,
+                        height: 40.h,
+                        textStyle: AppFonts.yekan20.copyWith(color: Colors.white),
+                        onPressed: () async {
+                          controller.selectedImage.value = await controller.imagePicker.pickImage(
+                            source: ImageSource.gallery,
+                            imageQuality: 60,
+                            maxWidth: 1080,
+                            maxHeight: 720,
+                          );
+                        },
+                      ),
+                      SizedBox(width: 16),
+                      ROutlinedElevated(
+                        text: 'دوربین',
+                        width: 150.w,
+                        height: 40.h,
+                        textStyle: AppFonts.yekan20.copyWith(color: AppColor.blueNormal),
+                        onPressed: () async {
+                          controller.selectedImage.value = await controller.imagePicker.pickImage(
+                            source: ImageSource.camera,
+                            imageQuality: 60,
+                            maxWidth: 1080,
+                            maxHeight: 720,
+                          );
+                        },
+                      ),
+                    ],
+                  ),
+                ],
+              ),
+            ),
+            Row(
+              spacing: 16,
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                ObxValue((data) {
+                  return RElevated(
+                    height: 40.h,
+                    text: 'ویرایش',
+                    isLoading: data.value,
+                    onPressed: () async {
+                      await controller.updateUserProfile();
+                      controller.getUserProfile();
+                      Get.back();
+                    },
+                  );
+                }, controller.isOnLoading),
+                ROutlinedElevated(
+                  height: 40.h,
+                  text: 'انصراف',
+                  borderColor: AppColor.blueNormal,
+                  onPressed: () {
+                    Get.back();
+                  },
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );*/
+  }
+
+  /*  Widget _provinceWidget() {
+    return Obx(() {
+      return OverlayDropdownWidget<IranProvinceCityModel>(
+        items: controller.rootLogic.provinces,
+        onChanged: (value) {
+          controller.selectedProvince.value = value;
+        },
+        selectedItem: controller.selectedProvince.value,
+        itemBuilder: (item) => Text(item.name ?? 'بدون نام'),
+        labelBuilder: (item) => Text(item?.name ?? 'انتخاب استان'),
+      );
+    });
+  }
+
+  Widget _cityWidget() {
+    return ObxValue((data) {
+      return OverlayDropdownWidget<IranProvinceCityModel>(
+        items: data,
+        onChanged: (value) {
+          controller.selectedCity.value = value;
+        },
+        selectedItem: controller.selectedCity.value,
+        itemBuilder: (item) => Text(item.name ?? 'بدون نام'),
+        labelBuilder: (item) => Text(item?.name ?? 'انتخاب شهر'),
+      );
+    }, controller.cites);
+  }*/
+
+  Widget changePasswordBottomSheet() {
+    return Container(color: Colors.red);
+    /*    return BaseBottomSheet(
+      height: 400.h,
+      child: SingleChildScrollView(
+        child: Form(
+          key: controller.formKey,
+          child: Column(
+            spacing: 8,
+            children: [
+              Text(
+                'تغییر رمز عبور',
+                style: AppFonts.yekan16Bold.copyWith(color: AppColor.darkGreyDarkHover),
+              ),
+              SizedBox(),
+              RTextField(
+                controller: controller.oldPasswordController,
+                hintText: 'رمز عبور قبلی',
+                borderColor: AppColor.darkGreyLight,
+                filledColor: AppColor.bgLight,
+                filled: true,
+                validator: (value) {
+                  if (value == null || value.isEmpty) {
+                    return 'رمز عبور را وارد کنید';
+                  } else if (controller.userProfile.value.data?.password != value) {
+                    return 'رمز عبور  صحیح نیست';
+                  }
+                  return null;
+                },
+              ),
+              RTextField(
+                controller: controller.newPasswordController,
+                hintText: 'رمز عبور جدید',
+                borderColor: AppColor.darkGreyLight,
+                filledColor: AppColor.bgLight,
+                filled: true,
+                validator: (value) {
+                  if (value == null || value.isEmpty) {
+                    return 'رمز عبور را وارد کنید';
+                  } else if (value.length < 6) {
+                    return 'رمز عبور باید بیش از 6 کارکتر باشد.';
+                  }
+                  return null;
+                },
+              ),
+              RTextField(
+                controller: controller.retryNewPasswordController,
+                hintText: 'تکرار رمز عبور جدید',
+                borderColor: AppColor.darkGreyLight,
+                filledColor: AppColor.bgLight,
+                filled: true,
+                validator: (value) {
+                  if (value == null || value.isEmpty) {
+                    return 'رمز عبور را وارد کنید';
+                  } else if (value.length < 6) {
+                    return 'رمز عبور باید بیش از 6 کارکتر باشد.';
+                  } else if (controller.newPasswordController.text != value) {
+                    return 'رمز عبور جدید یکسان نیست';
+                  }
+                  return null;
+                },
+              ),
+
+              SizedBox(),
+
+              Row(
+                spacing: 16,
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  RElevated(
+                    height: 40.h,
+                    text: 'ویرایش',
+                    onPressed: () async {
+                      if (controller.formKey.currentState?.validate() != true) {
+                        return;
+                      }
+                      await controller.updatePassword();
+                      controller.getUserProfile();
+                      controller.clearPasswordForm();
+                      Get.back();
+                    },
+                  ),
+                  ROutlinedElevated(
+                    height: 40.h,
+                    text: 'انصراف',
+                    borderColor: AppColor.blueNormal,
+                    onPressed: () {
+                      Get.back();
+                    },
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ),
+      ),
+    );*/
+  }
+
+  Widget exitBottomSheet() {
+    return Container(color: Colors.red);
+    /*    return BaseBottomSheet(
+      height: 220.h,
+      child: SingleChildScrollView(
+        child: Form(
+          key: controller.formKey,
+          child: Column(
+            spacing: 8,
+            children: [
+              Text('خروج', style: AppFonts.yekan16Bold.copyWith(color: AppColor.error)),
+              SizedBox(),
+              Text(
+                'آیا مطمئن هستید که می‌خواهید از حساب کاربری خود خارج شوید؟',
+                textAlign: TextAlign.center,
+                style: AppFonts.yekan16Bold.copyWith(color: AppColor.textColor),
+              ),
+
+              SizedBox(),
+
+              Row(
+                spacing: 16,
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  RElevated(
+                    height: 40.h,
+                    text: 'خروج',
+                    backgroundColor: AppColor.error,
+                    onPressed: () async {
+                      await controller.rootLogic.tokenService.deleteTokens().then((value) {
+                        Get.back();
+                        Get.offAllNamed(ChickenRoutes.auth, arguments: Module.chicken);
+                      });
+                    },
+                  ),
+                  ROutlinedElevated(
+                    height: 40.h,
+                    text: 'انصراف',
+                    borderColor: AppColor.blueNormal,
+                    onPressed: () {
+                      Get.back();
+                    },
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ),
+      ),
+    );*/
+  }
 }
--- a/packages/inspection/lib/presentation/pages/root/logic.dart
+++ b/packages/inspection/lib/presentation/pages/root/logic.dart
@@ -1,16 +1,60 @@
 import 'package:flutter/material.dart';
 import 'package:rasadyar_core/core.dart';
+import 'package:rasadyar_inspection/data/model/response/user_profile/user_profile_model.dart';
+import 'package:rasadyar_inspection/data/repositories/user/user_repository_imp.dart';
+import 'package:rasadyar_inspection/injection/inspection_di.dart';
 import 'package:rasadyar_inspection/presentation/pages/action/view.dart';
 import 'package:rasadyar_inspection/presentation/pages/inspection_map/view.dart';
 import 'package:rasadyar_inspection/presentation/pages/profile/view.dart';

-
 enum ErrorLocationType { serviceDisabled, permissionDenied, none }

 class RootLogic extends GetxController {
  RxInt currentIndex = 0.obs;
  List<Widget> pages = [InspectionMapPage(), ActionPage(), ProfilePage()];
  RxList<ErrorLocationType> errorLocationType = RxList();
+  TokenStorageService tokenStorageService = Get.find<TokenStorageService>();
+  UserRepositoryImp userRepository = diInspection.get<UserRepositoryImp>();
+  Rxn<UserProfileModel> userProfile = Rxn<UserProfileModel>();
+
+  @override
+  void onInit() {
+    super.onInit();
+    userRepository
+        .fetchUserProfile(token: tokenStorageService.accessToken.value ?? '')
+        .then((value) => userProfile.value = value);
+  }
+
+  @override
+  void onReady() {
+    super.onReady();
+
+    locationServiceEnabled().then((value) {
+      if (!value) {
+        errorLocationType.add(ErrorLocationType.serviceDisabled);
+      }
+    });
+
+    checkPermission().then((value) {
+      if (!value) {
+        errorLocationType.add(ErrorLocationType.permissionDenied);
+      }
+    });
+
+    listenToLocationServiceStatus().listen((event) {
+      if (!event) {
+        errorLocationType.add(ErrorLocationType.serviceDisabled);
+      } else {
+        errorLocationType.remove(ErrorLocationType.serviceDisabled);
+      }
+    });
+  }
+
+  @override
+  void onClose() {
+    // TODO: implement onClose
+    super.onClose();
+  }

  Stream<bool> listenToLocationServiceStatus() {
    return Geolocator.getServiceStatusStream().map((status) {
@@ -52,38 +96,7 @@ class RootLogic extends GetxController {
    }
  }

-  @override
-  void onReady() {
-    super.onReady();
-
-    locationServiceEnabled().then((value) {
-      if (!value) {
-        errorLocationType.add(ErrorLocationType.serviceDisabled);
-      }
-    });
-
-    checkPermission().then((value) {
-      if (!value) {
-        errorLocationType.add(ErrorLocationType.permissionDenied);
-      }
-    });
-
-    listenToLocationServiceStatus().listen((event) {
-      if (!event) {
-        errorLocationType.add(ErrorLocationType.serviceDisabled);
-      } else {
-        errorLocationType.remove(ErrorLocationType.serviceDisabled);
-      }
-    });
-  }
-
  void changePage(int index) {
    currentIndex.value = index;
  }
-
-  @override
-  void onClose() {
-    // TODO: implement onClose
-    super.onClose();
-  }
 }
--- a/packages/inspection/lib/presentation/pages/root/view.dart
+++ b/packages/inspection/lib/presentation/pages/root/view.dart
@@ -9,46 +9,46 @@ class RootPage extends GetView<RootLogic> {
  @override
  Widget build(BuildContext context) {
    return ObxValue((currentIndex) {
-      return Scaffold(
-        body: ObxValue(
-          (currentIndex) => IndexedStack(index: currentIndex.value, children: controller.pages),
-          controller.currentIndex,
-        ),
-        bottomNavigationBar: RBottomNavigation(
-          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-          items: [
-            RBottomNavigationItem(
-              label: 'نقشه',
-              icon: Assets.vec.mapSvg.path,
-              isSelected: currentIndex.value == 0,
-              onTap: () {
-                Get.nestedKey(1)?.currentState?.popUntil((route) => route.isFirst);
+      return PopScope(
+        canPop: false,
+        child: Scaffold(
+          backgroundColor: AppColor.bgLight,
+          body: IndexedStack(index: currentIndex.value, children: controller.pages),
+          bottomNavigationBar: RBottomNavigation(
+            mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+            items: [
+              RBottomNavigationItem(
+                label: 'نقشه',
+                icon: Assets.vec.mapSvg.path,
+                isSelected: currentIndex.value == 0,
+                onTap: () {
+                  Get.nestedKey(1)?.currentState?.popUntil((route) => route.isFirst);
+                  controller.changePage(0);
+                },
+              ),
+              RBottomNavigationItem(
+                label: 'اقدام',
+                icon: Assets.vec.settingSvg.path,
+                isSelected: currentIndex.value == 1,
+                onTap: () {
+                  Get.nestedKey(0)?.currentState?.popUntil((route) => route.isFirst);
+                  controller.changePage(1);
+                },
+              ),

-                controller.changePage(0);
-              },
-            ),
-            RBottomNavigationItem(
-              label: 'اقدام',
-              icon: Assets.vec.settingSvg.path,
-              isSelected: currentIndex.value == 1,
-              onTap: () {
-                Get.nestedKey(0)?.currentState?.popUntil((route) => route.isFirst);
-                controller.changePage(1);
-              },
-            ),
+              RBottomNavigationItem(
+                label: 'پروفایل',
+                icon: Assets.vec.profileCircleSvg.path,
+                isSelected: currentIndex.value == 2,
+                onTap: () {
+                  Get.nestedKey(1)?.currentState?.popUntil((route) => route.isFirst);
+                  Get.nestedKey(0)?.currentState?.popUntil((route) => route.isFirst);

-            RBottomNavigationItem(
-              label: 'پروفایل',
-              icon: Assets.vec.profileCircleSvg.path,
-              isSelected: currentIndex.value == 4,
-              onTap: () {
-                Get.nestedKey(1)?.currentState?.popUntil((route) => route.isFirst);
-                Get.nestedKey(0)?.currentState?.popUntil((route) => route.isFirst);
-
-                controller.changePage(4);
-              },
-            ),
-          ],
+                  controller.changePage(2);
+                },
+              ),
+            ],
+          ),
        ),
      );
    }, controller.currentIndex);
--- a/packages/inspection/lib/presentation/routes/app_pages.dart
+++ b/packages/inspection/lib/presentation/routes/app_pages.dart
@@ -6,6 +6,7 @@ import 'package:rasadyar_inspection/presentation/pages/pages.dart';
 import 'package:rasadyar_inspection/presentation/pages/users/logic.dart';
 import 'package:rasadyar_inspection/presentation/routes/app_routes.dart';
 import 'package:rasadyar_inspection/presentation/widget/base_page/logic.dart';
+import 'package:rasadyar_inspection/presentation/widget/captcha/logic.dart';

 sealed class InspectionPages {
  InspectionPages._();
@@ -64,7 +65,10 @@ sealed class InspectionPages {
    GetPage(
      name: InspectionRoutes.auth,
      page: () => AuthPage(),
-      binding: BindingsBuilder.put(() => AuthLogic()),
+      binding: BindingsBuilder(() {
+        Get.lazyPut(() => AuthLogic());
+        Get.lazyPut(() =>CaptchaWidgetLogic());
+      }),
    ),
  ];
 }
--- a/packages/inspection/lib/presentation/widget/captcha/logic.dart
+++ b/packages/inspection/lib/presentation/widget/captcha/logic.dart
@@ -1,16 +1,14 @@
-import 'dart:math';
-
 import 'package:flutter/material.dart';
 import 'package:rasadyar_core/core.dart';
-import 'package:rasadyar_core/data/model/response/captcha/captcha_response_model.dart';
-import 'package:rasadyar_inspection/data/repositories/auth_repository_imp.dart';
+import 'package:rasadyar_inspection/data/model/response/captcha/captcha_response_model.dart';
+import 'package:rasadyar_inspection/data/repositories/auth/auth_repository_imp.dart';
+import 'package:rasadyar_inspection/injection/inspection_di.dart';

 class CaptchaWidgetLogic extends GetxController with StateMixin<CaptchaResponseModel> {
  TextEditingController textController = TextEditingController();
  RxnString captchaKey = RxnString();
  GlobalKey<FormState> formKey = GlobalKey<FormState>();
-  //AuthRepositoryImpl authRepository = .get<AuthRepositoryImpl>();
-  final Random random = Random();
+  AuthRepositoryImpl authRepository = diInspection.get<AuthRepositoryImpl>();

  @override
  void onInit() {
@@ -29,8 +27,21 @@ class CaptchaWidgetLogic extends GetxController with StateMixin<CaptchaResponseM
  Future<void> getCaptcha() async {
    change(null, status: RxStatus.loading());
    textController.clear();
-    await Future.delayed(Duration(milliseconds: 800));
-    captchaKey.value = (random.nextInt(900000) + 100000).toString();
+    formKey.currentState?.reset();
+    await Future.delayed(Duration(milliseconds: 200));
+    await safeCall(
+      call: () async => authRepository.captcha(),
+      onSuccess: (result) {
+        if (result == null) {
+          change(null, status: RxStatus.error('Failed to load captcha'));
+          return;
+        }
+        captchaKey.value = result.captchaKey;
+        change(result, status: RxStatus.success());
+      },
+      onError: (error, stackTrace) {},
+    );
+
    change(value, status: RxStatus.success());
  }
 }
--- a/packages/inspection/lib/presentation/widget/captcha/view.dart
+++ b/packages/inspection/lib/presentation/widget/captcha/view.dart
@@ -1,3 +1,4 @@
+import 'dart:convert';
 import 'dart:math';

 import 'package:flutter/cupertino.dart';
@@ -28,12 +29,7 @@ class CaptchaWidget extends GetView<CaptchaWidgetLogic> {
              borderRadius: BorderRadius.circular(8),
            ),
            child: controller.obx(
-              (state) => Center(
-                child: Text(
-                  controller.captchaKey.value ?? 'دوباره سعی کنید',
-                  style: AppFonts.yekan24Bold,
-                ),
-              ),
+              (state) => Image.memory(base64Decode(state?.captchaImage ?? ''), fit: BoxFit.cover),
              onLoading: const Center(
                child: CupertinoActivityIndicator(color: AppColor.blueNormal),
              ),
@@ -64,9 +60,6 @@ class CaptchaWidget extends GetView<CaptchaWidgetLogic> {
              validator: (value) {
                if (value == null || value.isEmpty) {
                  return 'کد امنیتی را وارد کنید';
-                } else if (controller.captchaKey.value != null &&
-                    controller.captchaKey.value != value) {
-                  return 'کد امنیتی اشتباه است';
                }
                return null;
              },