backup: 사용하지 않는 파일 삭제 전 복구 지점

- 전체 371개 파일 중 82개 미사용 파일 식별 - Phase 1: 33개 파일 삭제 예정 (100% 안전) - Phase 2: 30개 파일 삭제 검토 예정 - Phase 3: 19개 파일 수동 검토 예정 🤖 Generated with Claude Code Co-Authored-By: Claude <noreply@anthropic.com>
2025-09-02 19:51:40 +09:00
parent 650cd4be55
commit c419f8f458
149 changed files with 12934 additions and 3644 deletions
--- a/lib/data/models/equipment/equipment_dto.dart
+++ b/lib/data/models/equipment/equipment_dto.dart
@@ -37,15 +37,15 @@ class EquipmentDto with _$EquipmentDto {
@freezed
 class EquipmentRequestDto with _$EquipmentRequestDto {
  const factory EquipmentRequestDto({
-    @JsonKey(name: 'companies_id') required int companiesId,
-    @JsonKey(name: 'models_id') required int modelsId,
+    @JsonKey(name: 'companies_id') int? companiesId,               // 백엔드: Option<i32>
+    @JsonKey(name: 'models_id') int? modelsId,                    // 백엔드: Option<i32>
    @JsonKey(name: 'serial_number') required String serialNumber,
    String? barcode,
-    @JsonKey(name: 'purchased_at') DateTime? purchasedAt,
+    @JsonKey(name: 'purchased_at') required DateTime purchasedAt,  // UTC로 미리 변환해서 전달
    @JsonKey(name: 'purchase_price') @Default(0) int purchasePrice,
    @JsonKey(name: 'warranty_number') required String warrantyNumber,
-    @JsonKey(name: 'warranty_started_at') required DateTime warrantyStartedAt,
-    @JsonKey(name: 'warranty_ended_at') required DateTime warrantyEndedAt,
+    @JsonKey(name: 'warranty_started_at') required DateTime warrantyStartedAt,  // UTC로 미리 변환해서 전달
+    @JsonKey(name: 'warranty_ended_at') required DateTime warrantyEndedAt,      // UTC로 미리 변환해서 전달
    String? remark,
  }) = _EquipmentRequestDto;

--- a/lib/data/models/equipment/equipment_dto.freezed.dart
+++ b/lib/data/models/equipment/equipment_dto.freezed.dart
@@ -582,22 +582,26 @@ EquipmentRequestDto _$EquipmentRequestDtoFromJson(Map<String, dynamic> json) {
 /// @nodoc
 mixin _$EquipmentRequestDto {
  @JsonKey(name: 'companies_id')
-  int get companiesId => throw _privateConstructorUsedError;
+  int? get companiesId =>
+      throw _privateConstructorUsedError; // 백엔드: Option<i32>
  @JsonKey(name: 'models_id')
-  int get modelsId => throw _privateConstructorUsedError;
+  int? get modelsId => throw _privateConstructorUsedError; // 백엔드: Option<i32>
  @JsonKey(name: 'serial_number')
  String get serialNumber => throw _privateConstructorUsedError;
  String? get barcode => throw _privateConstructorUsedError;
  @JsonKey(name: 'purchased_at')
-  DateTime? get purchasedAt => throw _privateConstructorUsedError;
+  DateTime get purchasedAt =>
+      throw _privateConstructorUsedError; // UTC로 미리 변환해서 전달
  @JsonKey(name: 'purchase_price')
  int get purchasePrice => throw _privateConstructorUsedError;
  @JsonKey(name: 'warranty_number')
  String get warrantyNumber => throw _privateConstructorUsedError;
  @JsonKey(name: 'warranty_started_at')
-  DateTime get warrantyStartedAt => throw _privateConstructorUsedError;
+  DateTime get warrantyStartedAt =>
+      throw _privateConstructorUsedError; // UTC로 미리 변환해서 전달
  @JsonKey(name: 'warranty_ended_at')
-  DateTime get warrantyEndedAt => throw _privateConstructorUsedError;
+  DateTime get warrantyEndedAt =>
+      throw _privateConstructorUsedError; // UTC로 미리 변환해서 전달
  String? get remark => throw _privateConstructorUsedError;

  /// Serializes this EquipmentRequestDto to a JSON map.
@@ -617,11 +621,11 @@ abstract class $EquipmentRequestDtoCopyWith<$Res> {
      _$EquipmentRequestDtoCopyWithImpl<$Res, EquipmentRequestDto>;
  @useResult
  $Res call(
-      {@JsonKey(name: 'companies_id') int companiesId,
-      @JsonKey(name: 'models_id') int modelsId,
+      {@JsonKey(name: 'companies_id') int? companiesId,
+      @JsonKey(name: 'models_id') int? modelsId,
      @JsonKey(name: 'serial_number') String serialNumber,
      String? barcode,
-      @JsonKey(name: 'purchased_at') DateTime? purchasedAt,
+      @JsonKey(name: 'purchased_at') DateTime purchasedAt,
      @JsonKey(name: 'purchase_price') int purchasePrice,
      @JsonKey(name: 'warranty_number') String warrantyNumber,
      @JsonKey(name: 'warranty_started_at') DateTime warrantyStartedAt,
@@ -644,11 +648,11 @@ class _$EquipmentRequestDtoCopyWithImpl<$Res, $Val extends EquipmentRequestDto>
  @pragma('vm:prefer-inline')
  @override
  $Res call({
-    Object? companiesId = null,
-    Object? modelsId = null,
+    Object? companiesId = freezed,
+    Object? modelsId = freezed,
    Object? serialNumber = null,
    Object? barcode = freezed,
-    Object? purchasedAt = freezed,
+    Object? purchasedAt = null,
    Object? purchasePrice = null,
    Object? warrantyNumber = null,
    Object? warrantyStartedAt = null,
@@ -656,14 +660,14 @@ class _$EquipmentRequestDtoCopyWithImpl<$Res, $Val extends EquipmentRequestDto>
    Object? remark = freezed,
  }) {
    return _then(_value.copyWith(
-      companiesId: null == companiesId
+      companiesId: freezed == companiesId
          ? _value.companiesId
          : companiesId // ignore: cast_nullable_to_non_nullable
-              as int,
-      modelsId: null == modelsId
+              as int?,
+      modelsId: freezed == modelsId
          ? _value.modelsId
          : modelsId // ignore: cast_nullable_to_non_nullable
-              as int,
+              as int?,
      serialNumber: null == serialNumber
          ? _value.serialNumber
          : serialNumber // ignore: cast_nullable_to_non_nullable
@@ -672,10 +676,10 @@ class _$EquipmentRequestDtoCopyWithImpl<$Res, $Val extends EquipmentRequestDto>
          ? _value.barcode
          : barcode // ignore: cast_nullable_to_non_nullable
              as String?,
-      purchasedAt: freezed == purchasedAt
+      purchasedAt: null == purchasedAt
          ? _value.purchasedAt
          : purchasedAt // ignore: cast_nullable_to_non_nullable
-              as DateTime?,
+              as DateTime,
      purchasePrice: null == purchasePrice
          ? _value.purchasePrice
          : purchasePrice // ignore: cast_nullable_to_non_nullable
@@ -709,11 +713,11 @@ abstract class _$$EquipmentRequestDtoImplCopyWith<$Res>
  @override
  @useResult
  $Res call(
-      {@JsonKey(name: 'companies_id') int companiesId,
-      @JsonKey(name: 'models_id') int modelsId,
+      {@JsonKey(name: 'companies_id') int? companiesId,
+      @JsonKey(name: 'models_id') int? modelsId,
      @JsonKey(name: 'serial_number') String serialNumber,
      String? barcode,
-      @JsonKey(name: 'purchased_at') DateTime? purchasedAt,
+      @JsonKey(name: 'purchased_at') DateTime purchasedAt,
      @JsonKey(name: 'purchase_price') int purchasePrice,
      @JsonKey(name: 'warranty_number') String warrantyNumber,
      @JsonKey(name: 'warranty_started_at') DateTime warrantyStartedAt,
@@ -734,11 +738,11 @@ class __$$EquipmentRequestDtoImplCopyWithImpl<$Res>
  @pragma('vm:prefer-inline')
  @override
  $Res call({
-    Object? companiesId = null,
-    Object? modelsId = null,
+    Object? companiesId = freezed,
+    Object? modelsId = freezed,
    Object? serialNumber = null,
    Object? barcode = freezed,
-    Object? purchasedAt = freezed,
+    Object? purchasedAt = null,
    Object? purchasePrice = null,
    Object? warrantyNumber = null,
    Object? warrantyStartedAt = null,
@@ -746,14 +750,14 @@ class __$$EquipmentRequestDtoImplCopyWithImpl<$Res>
    Object? remark = freezed,
  }) {
    return _then(_$EquipmentRequestDtoImpl(
-      companiesId: null == companiesId
+      companiesId: freezed == companiesId
          ? _value.companiesId
          : companiesId // ignore: cast_nullable_to_non_nullable
-              as int,
-      modelsId: null == modelsId
+              as int?,
+      modelsId: freezed == modelsId
          ? _value.modelsId
          : modelsId // ignore: cast_nullable_to_non_nullable
-              as int,
+              as int?,
      serialNumber: null == serialNumber
          ? _value.serialNumber
          : serialNumber // ignore: cast_nullable_to_non_nullable
@@ -762,10 +766,10 @@ class __$$EquipmentRequestDtoImplCopyWithImpl<$Res>
          ? _value.barcode
          : barcode // ignore: cast_nullable_to_non_nullable
              as String?,
-      purchasedAt: freezed == purchasedAt
+      purchasedAt: null == purchasedAt
          ? _value.purchasedAt
          : purchasedAt // ignore: cast_nullable_to_non_nullable
-              as DateTime?,
+              as DateTime,
      purchasePrice: null == purchasePrice
          ? _value.purchasePrice
          : purchasePrice // ignore: cast_nullable_to_non_nullable
@@ -794,11 +798,11 @@ class __$$EquipmentRequestDtoImplCopyWithImpl<$Res>
@JsonSerializable()
 class _$EquipmentRequestDtoImpl implements _EquipmentRequestDto {
  const _$EquipmentRequestDtoImpl(
-      {@JsonKey(name: 'companies_id') required this.companiesId,
-      @JsonKey(name: 'models_id') required this.modelsId,
+      {@JsonKey(name: 'companies_id') this.companiesId,
+      @JsonKey(name: 'models_id') this.modelsId,
      @JsonKey(name: 'serial_number') required this.serialNumber,
      this.barcode,
-      @JsonKey(name: 'purchased_at') this.purchasedAt,
+      @JsonKey(name: 'purchased_at') required this.purchasedAt,
      @JsonKey(name: 'purchase_price') this.purchasePrice = 0,
      @JsonKey(name: 'warranty_number') required this.warrantyNumber,
      @JsonKey(name: 'warranty_started_at') required this.warrantyStartedAt,
@@ -810,10 +814,12 @@ class _$EquipmentRequestDtoImpl implements _EquipmentRequestDto {

  @override
  @JsonKey(name: 'companies_id')
-  final int companiesId;
+  final int? companiesId;
+// 백엔드: Option<i32>
  @override
  @JsonKey(name: 'models_id')
-  final int modelsId;
+  final int? modelsId;
+// 백엔드: Option<i32>
  @override
  @JsonKey(name: 'serial_number')
  final String serialNumber;
@@ -821,7 +827,8 @@ class _$EquipmentRequestDtoImpl implements _EquipmentRequestDto {
  final String? barcode;
  @override
  @JsonKey(name: 'purchased_at')
-  final DateTime? purchasedAt;
+  final DateTime purchasedAt;
+// UTC로 미리 변환해서 전달
  @override
  @JsonKey(name: 'purchase_price')
  final int purchasePrice;
@@ -831,9 +838,11 @@ class _$EquipmentRequestDtoImpl implements _EquipmentRequestDto {
  @override
  @JsonKey(name: 'warranty_started_at')
  final DateTime warrantyStartedAt;
+// UTC로 미리 변환해서 전달
  @override
  @JsonKey(name: 'warranty_ended_at')
  final DateTime warrantyEndedAt;
+// UTC로 미리 변환해서 전달
  @override
  final String? remark;

@@ -901,11 +910,11 @@ class _$EquipmentRequestDtoImpl implements _EquipmentRequestDto {

 abstract class _EquipmentRequestDto implements EquipmentRequestDto {
  const factory _EquipmentRequestDto(
-      {@JsonKey(name: 'companies_id') required final int companiesId,
-      @JsonKey(name: 'models_id') required final int modelsId,
+      {@JsonKey(name: 'companies_id') final int? companiesId,
+      @JsonKey(name: 'models_id') final int? modelsId,
      @JsonKey(name: 'serial_number') required final String serialNumber,
      final String? barcode,
-      @JsonKey(name: 'purchased_at') final DateTime? purchasedAt,
+      @JsonKey(name: 'purchased_at') required final DateTime purchasedAt,
      @JsonKey(name: 'purchase_price') final int purchasePrice,
      @JsonKey(name: 'warranty_number') required final String warrantyNumber,
      @JsonKey(name: 'warranty_started_at')
@@ -919,10 +928,10 @@ abstract class _EquipmentRequestDto implements EquipmentRequestDto {

  @override
  @JsonKey(name: 'companies_id')
-  int get companiesId;
+  int? get companiesId; // 백엔드: Option<i32>
  @override
  @JsonKey(name: 'models_id')
-  int get modelsId;
+  int? get modelsId; // 백엔드: Option<i32>
  @override
  @JsonKey(name: 'serial_number')
  String get serialNumber;
@@ -930,7 +939,7 @@ abstract class _EquipmentRequestDto implements EquipmentRequestDto {
  String? get barcode;
  @override
  @JsonKey(name: 'purchased_at')
-  DateTime? get purchasedAt;
+  DateTime get purchasedAt; // UTC로 미리 변환해서 전달
  @override
  @JsonKey(name: 'purchase_price')
  int get purchasePrice;
@@ -939,10 +948,10 @@ abstract class _EquipmentRequestDto implements EquipmentRequestDto {
  String get warrantyNumber;
  @override
  @JsonKey(name: 'warranty_started_at')
-  DateTime get warrantyStartedAt;
+  DateTime get warrantyStartedAt; // UTC로 미리 변환해서 전달
  @override
  @JsonKey(name: 'warranty_ended_at')
-  DateTime get warrantyEndedAt;
+  DateTime get warrantyEndedAt; // UTC로 미리 변환해서 전달
  @override
  String? get remark;

--- a/lib/data/models/equipment/equipment_dto.g.dart
+++ b/lib/data/models/equipment/equipment_dto.g.dart
@@ -54,13 +54,11 @@ Map<String, dynamic> _$$EquipmentDtoImplToJson(_$EquipmentDtoImpl instance) =>
 _$EquipmentRequestDtoImpl _$$EquipmentRequestDtoImplFromJson(
        Map<String, dynamic> json) =>
    _$EquipmentRequestDtoImpl(
-      companiesId: (json['companies_id'] as num).toInt(),
-      modelsId: (json['models_id'] as num).toInt(),
+      companiesId: (json['companies_id'] as num?)?.toInt(),
+      modelsId: (json['models_id'] as num?)?.toInt(),
      serialNumber: json['serial_number'] as String,
      barcode: json['barcode'] as String?,
-      purchasedAt: json['purchased_at'] == null
-          ? null
-          : DateTime.parse(json['purchased_at'] as String),
+      purchasedAt: DateTime.parse(json['purchased_at'] as String),
      purchasePrice: (json['purchase_price'] as num?)?.toInt() ?? 0,
      warrantyNumber: json['warranty_number'] as String,
      warrantyStartedAt: DateTime.parse(json['warranty_started_at'] as String),
@@ -75,7 +73,7 @@ Map<String, dynamic> _$$EquipmentRequestDtoImplToJson(
      'models_id': instance.modelsId,
      'serial_number': instance.serialNumber,
      'barcode': instance.barcode,
-      'purchased_at': instance.purchasedAt?.toIso8601String(),
+      'purchased_at': instance.purchasedAt.toIso8601String(),
      'purchase_price': instance.purchasePrice,
      'warranty_number': instance.warrantyNumber,
      'warranty_started_at': instance.warrantyStartedAt.toIso8601String(),
--- a/lib/data/models/equipment/equipment_list_dto.dart
+++ b/lib/data/models/equipment/equipment_list_dto.dart
@@ -8,18 +8,22 @@ part 'equipment_list_dto.g.dart';
 class EquipmentListDto with _$EquipmentListDto {
  const factory EquipmentListDto({
    required int id,
-    @JsonKey(name: 'equipment_number') required String equipmentNumber,
-    // Sprint 3: Replaced manufacturer, modelName with models_id and model
-    @JsonKey(name: 'models_id') int? modelsId,
-    @JsonKey(name: 'serial_number') String? serialNumber,
-    required String status,
-    @JsonKey(name: 'company_id') int? companyId,
-    @JsonKey(name: 'warehouse_location_id') int? warehouseLocationId,
-    @JsonKey(name: 'created_at') required DateTime createdAt,
-    // 추가 필드 (조인된 데이터)
+    @JsonKey(name: 'companies_id') int? companiesId,
    @JsonKey(name: 'company_name') String? companyName,
-    @JsonKey(name: 'warehouse_name') String? warehouseName,
-    // Sprint 3: Added model relationship (includes vendor info)
+    @JsonKey(name: 'models_id') int? modelsId,
+    @JsonKey(name: 'model_name') String? modelName,
+    @JsonKey(name: 'vendor_name') String? vendorName,
+    @JsonKey(name: 'serial_number') String? serialNumber,
+    String? barcode,
+    @JsonKey(name: 'purchased_at') DateTime? purchasedAt,
+    @JsonKey(name: 'purchase_price') int? purchasePrice,
+    @JsonKey(name: 'warranty_number') String? warrantyNumber,
+    @JsonKey(name: 'warranty_started_at') DateTime? warrantyStartedAt,
+    @JsonKey(name: 'warranty_ended_at') DateTime? warrantyEndedAt,
+    String? remark,
+    @JsonKey(name: 'is_deleted') bool? isDeleted,
+    @JsonKey(name: 'registered_at') DateTime? registeredAt,
+    @JsonKey(name: 'updated_at') DateTime? updatedAt,
    ModelDto? model,
  }) = _EquipmentListDto;

--- a/lib/data/models/equipment/equipment_list_dto.freezed.dart
+++ b/lib/data/models/equipment/equipment_list_dto.freezed.dart
@@ -21,26 +21,36 @@ EquipmentListDto _$EquipmentListDtoFromJson(Map<String, dynamic> json) {
 /// @nodoc
 mixin _$EquipmentListDto {
  int get id => throw _privateConstructorUsedError;
-  @JsonKey(name: 'equipment_number')
-  String get equipmentNumber =>
-      throw _privateConstructorUsedError; // Sprint 3: Replaced manufacturer, modelName with models_id and model
-  @JsonKey(name: 'models_id')
-  int? get modelsId => throw _privateConstructorUsedError;
-  @JsonKey(name: 'serial_number')
-  String? get serialNumber => throw _privateConstructorUsedError;
-  String get status => throw _privateConstructorUsedError;
-  @JsonKey(name: 'company_id')
-  int? get companyId => throw _privateConstructorUsedError;
-  @JsonKey(name: 'warehouse_location_id')
-  int? get warehouseLocationId => throw _privateConstructorUsedError;
-  @JsonKey(name: 'created_at')
-  DateTime get createdAt =>
-      throw _privateConstructorUsedError; // 추가 필드 (조인된 데이터)
+  @JsonKey(name: 'companies_id')
+  int? get companiesId => throw _privateConstructorUsedError;
  @JsonKey(name: 'company_name')
  String? get companyName => throw _privateConstructorUsedError;
-  @JsonKey(name: 'warehouse_name')
-  String? get warehouseName =>
-      throw _privateConstructorUsedError; // Sprint 3: Added model relationship (includes vendor info)
+  @JsonKey(name: 'models_id')
+  int? get modelsId => throw _privateConstructorUsedError;
+  @JsonKey(name: 'model_name')
+  String? get modelName => throw _privateConstructorUsedError;
+  @JsonKey(name: 'vendor_name')
+  String? get vendorName => throw _privateConstructorUsedError;
+  @JsonKey(name: 'serial_number')
+  String? get serialNumber => throw _privateConstructorUsedError;
+  String? get barcode => throw _privateConstructorUsedError;
+  @JsonKey(name: 'purchased_at')
+  DateTime? get purchasedAt => throw _privateConstructorUsedError;
+  @JsonKey(name: 'purchase_price')
+  int? get purchasePrice => throw _privateConstructorUsedError;
+  @JsonKey(name: 'warranty_number')
+  String? get warrantyNumber => throw _privateConstructorUsedError;
+  @JsonKey(name: 'warranty_started_at')
+  DateTime? get warrantyStartedAt => throw _privateConstructorUsedError;
+  @JsonKey(name: 'warranty_ended_at')
+  DateTime? get warrantyEndedAt => throw _privateConstructorUsedError;
+  String? get remark => throw _privateConstructorUsedError;
+  @JsonKey(name: 'is_deleted')
+  bool? get isDeleted => throw _privateConstructorUsedError;
+  @JsonKey(name: 'registered_at')
+  DateTime? get registeredAt => throw _privateConstructorUsedError;
+  @JsonKey(name: 'updated_at')
+  DateTime? get updatedAt => throw _privateConstructorUsedError;
  ModelDto? get model => throw _privateConstructorUsedError;

  /// Serializes this EquipmentListDto to a JSON map.
@@ -61,15 +71,22 @@ abstract class $EquipmentListDtoCopyWith<$Res> {
  @useResult
  $Res call(
      {int id,
-      @JsonKey(name: 'equipment_number') String equipmentNumber,
-      @JsonKey(name: 'models_id') int? modelsId,
-      @JsonKey(name: 'serial_number') String? serialNumber,
-      String status,
-      @JsonKey(name: 'company_id') int? companyId,
-      @JsonKey(name: 'warehouse_location_id') int? warehouseLocationId,
-      @JsonKey(name: 'created_at') DateTime createdAt,
+      @JsonKey(name: 'companies_id') int? companiesId,
      @JsonKey(name: 'company_name') String? companyName,
-      @JsonKey(name: 'warehouse_name') String? warehouseName,
+      @JsonKey(name: 'models_id') int? modelsId,
+      @JsonKey(name: 'model_name') String? modelName,
+      @JsonKey(name: 'vendor_name') String? vendorName,
+      @JsonKey(name: 'serial_number') String? serialNumber,
+      String? barcode,
+      @JsonKey(name: 'purchased_at') DateTime? purchasedAt,
+      @JsonKey(name: 'purchase_price') int? purchasePrice,
+      @JsonKey(name: 'warranty_number') String? warrantyNumber,
+      @JsonKey(name: 'warranty_started_at') DateTime? warrantyStartedAt,
+      @JsonKey(name: 'warranty_ended_at') DateTime? warrantyEndedAt,
+      String? remark,
+      @JsonKey(name: 'is_deleted') bool? isDeleted,
+      @JsonKey(name: 'registered_at') DateTime? registeredAt,
+      @JsonKey(name: 'updated_at') DateTime? updatedAt,
      ModelDto? model});

  $ModelDtoCopyWith<$Res>? get model;
@@ -91,15 +108,22 @@ class _$EquipmentListDtoCopyWithImpl<$Res, $Val extends EquipmentListDto>
  @override
  $Res call({
    Object? id = null,
-    Object? equipmentNumber = null,
-    Object? modelsId = freezed,
-    Object? serialNumber = freezed,
-    Object? status = null,
-    Object? companyId = freezed,
-    Object? warehouseLocationId = freezed,
-    Object? createdAt = null,
+    Object? companiesId = freezed,
    Object? companyName = freezed,
-    Object? warehouseName = freezed,
+    Object? modelsId = freezed,
+    Object? modelName = freezed,
+    Object? vendorName = freezed,
+    Object? serialNumber = freezed,
+    Object? barcode = freezed,
+    Object? purchasedAt = freezed,
+    Object? purchasePrice = freezed,
+    Object? warrantyNumber = freezed,
+    Object? warrantyStartedAt = freezed,
+    Object? warrantyEndedAt = freezed,
+    Object? remark = freezed,
+    Object? isDeleted = freezed,
+    Object? registeredAt = freezed,
+    Object? updatedAt = freezed,
    Object? model = freezed,
  }) {
    return _then(_value.copyWith(
@@ -107,42 +131,70 @@ class _$EquipmentListDtoCopyWithImpl<$Res, $Val extends EquipmentListDto>
          ? _value.id
          : id // ignore: cast_nullable_to_non_nullable
              as int,
-      equipmentNumber: null == equipmentNumber
-          ? _value.equipmentNumber
-          : equipmentNumber // ignore: cast_nullable_to_non_nullable
-              as String,
-      modelsId: freezed == modelsId
-          ? _value.modelsId
-          : modelsId // ignore: cast_nullable_to_non_nullable
+      companiesId: freezed == companiesId
+          ? _value.companiesId
+          : companiesId // ignore: cast_nullable_to_non_nullable
              as int?,
-      serialNumber: freezed == serialNumber
-          ? _value.serialNumber
-          : serialNumber // ignore: cast_nullable_to_non_nullable
-              as String?,
-      status: null == status
-          ? _value.status
-          : status // ignore: cast_nullable_to_non_nullable
-              as String,
-      companyId: freezed == companyId
-          ? _value.companyId
-          : companyId // ignore: cast_nullable_to_non_nullable
-              as int?,
-      warehouseLocationId: freezed == warehouseLocationId
-          ? _value.warehouseLocationId
-          : warehouseLocationId // ignore: cast_nullable_to_non_nullable
-              as int?,
-      createdAt: null == createdAt
-          ? _value.createdAt
-          : createdAt // ignore: cast_nullable_to_non_nullable
-              as DateTime,
      companyName: freezed == companyName
          ? _value.companyName
          : companyName // ignore: cast_nullable_to_non_nullable
              as String?,
-      warehouseName: freezed == warehouseName
-          ? _value.warehouseName
-          : warehouseName // ignore: cast_nullable_to_non_nullable
+      modelsId: freezed == modelsId
+          ? _value.modelsId
+          : modelsId // ignore: cast_nullable_to_non_nullable
+              as int?,
+      modelName: freezed == modelName
+          ? _value.modelName
+          : modelName // ignore: cast_nullable_to_non_nullable
              as String?,
+      vendorName: freezed == vendorName
+          ? _value.vendorName
+          : vendorName // ignore: cast_nullable_to_non_nullable
+              as String?,
+      serialNumber: freezed == serialNumber
+          ? _value.serialNumber
+          : serialNumber // ignore: cast_nullable_to_non_nullable
+              as String?,
+      barcode: freezed == barcode
+          ? _value.barcode
+          : barcode // ignore: cast_nullable_to_non_nullable
+              as String?,
+      purchasedAt: freezed == purchasedAt
+          ? _value.purchasedAt
+          : purchasedAt // ignore: cast_nullable_to_non_nullable
+              as DateTime?,
+      purchasePrice: freezed == purchasePrice
+          ? _value.purchasePrice
+          : purchasePrice // ignore: cast_nullable_to_non_nullable
+              as int?,
+      warrantyNumber: freezed == warrantyNumber
+          ? _value.warrantyNumber
+          : warrantyNumber // ignore: cast_nullable_to_non_nullable
+              as String?,
+      warrantyStartedAt: freezed == warrantyStartedAt
+          ? _value.warrantyStartedAt
+          : warrantyStartedAt // ignore: cast_nullable_to_non_nullable
+              as DateTime?,
+      warrantyEndedAt: freezed == warrantyEndedAt
+          ? _value.warrantyEndedAt
+          : warrantyEndedAt // ignore: cast_nullable_to_non_nullable
+              as DateTime?,
+      remark: freezed == remark
+          ? _value.remark
+          : remark // ignore: cast_nullable_to_non_nullable
+              as String?,
+      isDeleted: freezed == isDeleted
+          ? _value.isDeleted
+          : isDeleted // ignore: cast_nullable_to_non_nullable
+              as bool?,
+      registeredAt: freezed == registeredAt
+          ? _value.registeredAt
+          : registeredAt // ignore: cast_nullable_to_non_nullable
+              as DateTime?,
+      updatedAt: freezed == updatedAt
+          ? _value.updatedAt
+          : updatedAt // ignore: cast_nullable_to_non_nullable
+              as DateTime?,
      model: freezed == model
          ? _value.model
          : model // ignore: cast_nullable_to_non_nullable
@@ -175,15 +227,22 @@ abstract class _$$EquipmentListDtoImplCopyWith<$Res>
  @useResult
  $Res call(
      {int id,
-      @JsonKey(name: 'equipment_number') String equipmentNumber,
-      @JsonKey(name: 'models_id') int? modelsId,
-      @JsonKey(name: 'serial_number') String? serialNumber,
-      String status,
-      @JsonKey(name: 'company_id') int? companyId,
-      @JsonKey(name: 'warehouse_location_id') int? warehouseLocationId,
-      @JsonKey(name: 'created_at') DateTime createdAt,
+      @JsonKey(name: 'companies_id') int? companiesId,
      @JsonKey(name: 'company_name') String? companyName,
-      @JsonKey(name: 'warehouse_name') String? warehouseName,
+      @JsonKey(name: 'models_id') int? modelsId,
+      @JsonKey(name: 'model_name') String? modelName,
+      @JsonKey(name: 'vendor_name') String? vendorName,
+      @JsonKey(name: 'serial_number') String? serialNumber,
+      String? barcode,
+      @JsonKey(name: 'purchased_at') DateTime? purchasedAt,
+      @JsonKey(name: 'purchase_price') int? purchasePrice,
+      @JsonKey(name: 'warranty_number') String? warrantyNumber,
+      @JsonKey(name: 'warranty_started_at') DateTime? warrantyStartedAt,
+      @JsonKey(name: 'warranty_ended_at') DateTime? warrantyEndedAt,
+      String? remark,
+      @JsonKey(name: 'is_deleted') bool? isDeleted,
+      @JsonKey(name: 'registered_at') DateTime? registeredAt,
+      @JsonKey(name: 'updated_at') DateTime? updatedAt,
      ModelDto? model});

  @override
@@ -204,15 +263,22 @@ class __$$EquipmentListDtoImplCopyWithImpl<$Res>
  @override
  $Res call({
    Object? id = null,
-    Object? equipmentNumber = null,
-    Object? modelsId = freezed,
-    Object? serialNumber = freezed,
-    Object? status = null,
-    Object? companyId = freezed,
-    Object? warehouseLocationId = freezed,
-    Object? createdAt = null,
+    Object? companiesId = freezed,
    Object? companyName = freezed,
-    Object? warehouseName = freezed,
+    Object? modelsId = freezed,
+    Object? modelName = freezed,
+    Object? vendorName = freezed,
+    Object? serialNumber = freezed,
+    Object? barcode = freezed,
+    Object? purchasedAt = freezed,
+    Object? purchasePrice = freezed,
+    Object? warrantyNumber = freezed,
+    Object? warrantyStartedAt = freezed,
+    Object? warrantyEndedAt = freezed,
+    Object? remark = freezed,
+    Object? isDeleted = freezed,
+    Object? registeredAt = freezed,
+    Object? updatedAt = freezed,
    Object? model = freezed,
  }) {
    return _then(_$EquipmentListDtoImpl(
@@ -220,42 +286,70 @@ class __$$EquipmentListDtoImplCopyWithImpl<$Res>
          ? _value.id
          : id // ignore: cast_nullable_to_non_nullable
              as int,
-      equipmentNumber: null == equipmentNumber
-          ? _value.equipmentNumber
-          : equipmentNumber // ignore: cast_nullable_to_non_nullable
-              as String,
-      modelsId: freezed == modelsId
-          ? _value.modelsId
-          : modelsId // ignore: cast_nullable_to_non_nullable
+      companiesId: freezed == companiesId
+          ? _value.companiesId
+          : companiesId // ignore: cast_nullable_to_non_nullable
              as int?,
-      serialNumber: freezed == serialNumber
-          ? _value.serialNumber
-          : serialNumber // ignore: cast_nullable_to_non_nullable
-              as String?,
-      status: null == status
-          ? _value.status
-          : status // ignore: cast_nullable_to_non_nullable
-              as String,
-      companyId: freezed == companyId
-          ? _value.companyId
-          : companyId // ignore: cast_nullable_to_non_nullable
-              as int?,
-      warehouseLocationId: freezed == warehouseLocationId
-          ? _value.warehouseLocationId
-          : warehouseLocationId // ignore: cast_nullable_to_non_nullable
-              as int?,
-      createdAt: null == createdAt
-          ? _value.createdAt
-          : createdAt // ignore: cast_nullable_to_non_nullable
-              as DateTime,
      companyName: freezed == companyName
          ? _value.companyName
          : companyName // ignore: cast_nullable_to_non_nullable
              as String?,
-      warehouseName: freezed == warehouseName
-          ? _value.warehouseName
-          : warehouseName // ignore: cast_nullable_to_non_nullable
+      modelsId: freezed == modelsId
+          ? _value.modelsId
+          : modelsId // ignore: cast_nullable_to_non_nullable
+              as int?,
+      modelName: freezed == modelName
+          ? _value.modelName
+          : modelName // ignore: cast_nullable_to_non_nullable
              as String?,
+      vendorName: freezed == vendorName
+          ? _value.vendorName
+          : vendorName // ignore: cast_nullable_to_non_nullable
+              as String?,
+      serialNumber: freezed == serialNumber
+          ? _value.serialNumber
+          : serialNumber // ignore: cast_nullable_to_non_nullable
+              as String?,
+      barcode: freezed == barcode
+          ? _value.barcode
+          : barcode // ignore: cast_nullable_to_non_nullable
+              as String?,
+      purchasedAt: freezed == purchasedAt
+          ? _value.purchasedAt
+          : purchasedAt // ignore: cast_nullable_to_non_nullable
+              as DateTime?,
+      purchasePrice: freezed == purchasePrice
+          ? _value.purchasePrice
+          : purchasePrice // ignore: cast_nullable_to_non_nullable
+              as int?,
+      warrantyNumber: freezed == warrantyNumber
+          ? _value.warrantyNumber
+          : warrantyNumber // ignore: cast_nullable_to_non_nullable
+              as String?,
+      warrantyStartedAt: freezed == warrantyStartedAt
+          ? _value.warrantyStartedAt
+          : warrantyStartedAt // ignore: cast_nullable_to_non_nullable
+              as DateTime?,
+      warrantyEndedAt: freezed == warrantyEndedAt
+          ? _value.warrantyEndedAt
+          : warrantyEndedAt // ignore: cast_nullable_to_non_nullable
+              as DateTime?,
+      remark: freezed == remark
+          ? _value.remark
+          : remark // ignore: cast_nullable_to_non_nullable
+              as String?,
+      isDeleted: freezed == isDeleted
+          ? _value.isDeleted
+          : isDeleted // ignore: cast_nullable_to_non_nullable
+              as bool?,
+      registeredAt: freezed == registeredAt
+          ? _value.registeredAt
+          : registeredAt // ignore: cast_nullable_to_non_nullable
+              as DateTime?,
+      updatedAt: freezed == updatedAt
+          ? _value.updatedAt
+          : updatedAt // ignore: cast_nullable_to_non_nullable
+              as DateTime?,
      model: freezed == model
          ? _value.model
          : model // ignore: cast_nullable_to_non_nullable
@@ -269,15 +363,22 @@ class __$$EquipmentListDtoImplCopyWithImpl<$Res>
 class _$EquipmentListDtoImpl implements _EquipmentListDto {
  const _$EquipmentListDtoImpl(
      {required this.id,
-      @JsonKey(name: 'equipment_number') required this.equipmentNumber,
-      @JsonKey(name: 'models_id') this.modelsId,
-      @JsonKey(name: 'serial_number') this.serialNumber,
-      required this.status,
-      @JsonKey(name: 'company_id') this.companyId,
-      @JsonKey(name: 'warehouse_location_id') this.warehouseLocationId,
-      @JsonKey(name: 'created_at') required this.createdAt,
+      @JsonKey(name: 'companies_id') this.companiesId,
      @JsonKey(name: 'company_name') this.companyName,
-      @JsonKey(name: 'warehouse_name') this.warehouseName,
+      @JsonKey(name: 'models_id') this.modelsId,
+      @JsonKey(name: 'model_name') this.modelName,
+      @JsonKey(name: 'vendor_name') this.vendorName,
+      @JsonKey(name: 'serial_number') this.serialNumber,
+      this.barcode,
+      @JsonKey(name: 'purchased_at') this.purchasedAt,
+      @JsonKey(name: 'purchase_price') this.purchasePrice,
+      @JsonKey(name: 'warranty_number') this.warrantyNumber,
+      @JsonKey(name: 'warranty_started_at') this.warrantyStartedAt,
+      @JsonKey(name: 'warranty_ended_at') this.warrantyEndedAt,
+      this.remark,
+      @JsonKey(name: 'is_deleted') this.isDeleted,
+      @JsonKey(name: 'registered_at') this.registeredAt,
+      @JsonKey(name: 'updated_at') this.updatedAt,
      this.model});

  factory _$EquipmentListDtoImpl.fromJson(Map<String, dynamic> json) =>
@@ -286,40 +387,57 @@ class _$EquipmentListDtoImpl implements _EquipmentListDto {
  @override
  final int id;
  @override
-  @JsonKey(name: 'equipment_number')
-  final String equipmentNumber;
-// Sprint 3: Replaced manufacturer, modelName with models_id and model
-  @override
-  @JsonKey(name: 'models_id')
-  final int? modelsId;
-  @override
-  @JsonKey(name: 'serial_number')
-  final String? serialNumber;
-  @override
-  final String status;
-  @override
-  @JsonKey(name: 'company_id')
-  final int? companyId;
-  @override
-  @JsonKey(name: 'warehouse_location_id')
-  final int? warehouseLocationId;
-  @override
-  @JsonKey(name: 'created_at')
-  final DateTime createdAt;
-// 추가 필드 (조인된 데이터)
+  @JsonKey(name: 'companies_id')
+  final int? companiesId;
  @override
  @JsonKey(name: 'company_name')
  final String? companyName;
  @override
-  @JsonKey(name: 'warehouse_name')
-  final String? warehouseName;
-// Sprint 3: Added model relationship (includes vendor info)
+  @JsonKey(name: 'models_id')
+  final int? modelsId;
+  @override
+  @JsonKey(name: 'model_name')
+  final String? modelName;
+  @override
+  @JsonKey(name: 'vendor_name')
+  final String? vendorName;
+  @override
+  @JsonKey(name: 'serial_number')
+  final String? serialNumber;
+  @override
+  final String? barcode;
+  @override
+  @JsonKey(name: 'purchased_at')
+  final DateTime? purchasedAt;
+  @override
+  @JsonKey(name: 'purchase_price')
+  final int? purchasePrice;
+  @override
+  @JsonKey(name: 'warranty_number')
+  final String? warrantyNumber;
+  @override
+  @JsonKey(name: 'warranty_started_at')
+  final DateTime? warrantyStartedAt;
+  @override
+  @JsonKey(name: 'warranty_ended_at')
+  final DateTime? warrantyEndedAt;
+  @override
+  final String? remark;
+  @override
+  @JsonKey(name: 'is_deleted')
+  final bool? isDeleted;
+  @override
+  @JsonKey(name: 'registered_at')
+  final DateTime? registeredAt;
+  @override
+  @JsonKey(name: 'updated_at')
+  final DateTime? updatedAt;
  @override
  final ModelDto? model;

  @override
  String toString() {
-    return 'EquipmentListDto(id: $id, equipmentNumber: $equipmentNumber, modelsId: $modelsId, serialNumber: $serialNumber, status: $status, companyId: $companyId, warehouseLocationId: $warehouseLocationId, createdAt: $createdAt, companyName: $companyName, warehouseName: $warehouseName, model: $model)';
+    return 'EquipmentListDto(id: $id, companiesId: $companiesId, companyName: $companyName, modelsId: $modelsId, modelName: $modelName, vendorName: $vendorName, serialNumber: $serialNumber, barcode: $barcode, purchasedAt: $purchasedAt, purchasePrice: $purchasePrice, warrantyNumber: $warrantyNumber, warrantyStartedAt: $warrantyStartedAt, warrantyEndedAt: $warrantyEndedAt, remark: $remark, isDeleted: $isDeleted, registeredAt: $registeredAt, updatedAt: $updatedAt, model: $model)';
  }

  @override
@@ -328,23 +446,36 @@ class _$EquipmentListDtoImpl implements _EquipmentListDto {
        (other.runtimeType == runtimeType &&
            other is _$EquipmentListDtoImpl &&
            (identical(other.id, id) || other.id == id) &&
-            (identical(other.equipmentNumber, equipmentNumber) ||
-                other.equipmentNumber == equipmentNumber) &&
-            (identical(other.modelsId, modelsId) ||
-                other.modelsId == modelsId) &&
-            (identical(other.serialNumber, serialNumber) ||
-                other.serialNumber == serialNumber) &&
-            (identical(other.status, status) || other.status == status) &&
-            (identical(other.companyId, companyId) ||
-                other.companyId == companyId) &&
-            (identical(other.warehouseLocationId, warehouseLocationId) ||
-                other.warehouseLocationId == warehouseLocationId) &&
-            (identical(other.createdAt, createdAt) ||
-                other.createdAt == createdAt) &&
+            (identical(other.companiesId, companiesId) ||
+                other.companiesId == companiesId) &&
            (identical(other.companyName, companyName) ||
                other.companyName == companyName) &&
-            (identical(other.warehouseName, warehouseName) ||
-                other.warehouseName == warehouseName) &&
+            (identical(other.modelsId, modelsId) ||
+                other.modelsId == modelsId) &&
+            (identical(other.modelName, modelName) ||
+                other.modelName == modelName) &&
+            (identical(other.vendorName, vendorName) ||
+                other.vendorName == vendorName) &&
+            (identical(other.serialNumber, serialNumber) ||
+                other.serialNumber == serialNumber) &&
+            (identical(other.barcode, barcode) || other.barcode == barcode) &&
+            (identical(other.purchasedAt, purchasedAt) ||
+                other.purchasedAt == purchasedAt) &&
+            (identical(other.purchasePrice, purchasePrice) ||
+                other.purchasePrice == purchasePrice) &&
+            (identical(other.warrantyNumber, warrantyNumber) ||
+                other.warrantyNumber == warrantyNumber) &&
+            (identical(other.warrantyStartedAt, warrantyStartedAt) ||
+                other.warrantyStartedAt == warrantyStartedAt) &&
+            (identical(other.warrantyEndedAt, warrantyEndedAt) ||
+                other.warrantyEndedAt == warrantyEndedAt) &&
+            (identical(other.remark, remark) || other.remark == remark) &&
+            (identical(other.isDeleted, isDeleted) ||
+                other.isDeleted == isDeleted) &&
+            (identical(other.registeredAt, registeredAt) ||
+                other.registeredAt == registeredAt) &&
+            (identical(other.updatedAt, updatedAt) ||
+                other.updatedAt == updatedAt) &&
            (identical(other.model, model) || other.model == model));
  }

@@ -353,15 +484,22 @@ class _$EquipmentListDtoImpl implements _EquipmentListDto {
  int get hashCode => Object.hash(
      runtimeType,
      id,
-      equipmentNumber,
-      modelsId,
-      serialNumber,
-      status,
-      companyId,
-      warehouseLocationId,
-      createdAt,
+      companiesId,
      companyName,
-      warehouseName,
+      modelsId,
+      modelName,
+      vendorName,
+      serialNumber,
+      barcode,
+      purchasedAt,
+      purchasePrice,
+      warrantyNumber,
+      warrantyStartedAt,
+      warrantyEndedAt,
+      remark,
+      isDeleted,
+      registeredAt,
+      updatedAt,
      model);

  /// Create a copy of EquipmentListDto
@@ -384,15 +522,22 @@ class _$EquipmentListDtoImpl implements _EquipmentListDto {
 abstract class _EquipmentListDto implements EquipmentListDto {
  const factory _EquipmentListDto(
      {required final int id,
-      @JsonKey(name: 'equipment_number') required final String equipmentNumber,
-      @JsonKey(name: 'models_id') final int? modelsId,
-      @JsonKey(name: 'serial_number') final String? serialNumber,
-      required final String status,
-      @JsonKey(name: 'company_id') final int? companyId,
-      @JsonKey(name: 'warehouse_location_id') final int? warehouseLocationId,
-      @JsonKey(name: 'created_at') required final DateTime createdAt,
+      @JsonKey(name: 'companies_id') final int? companiesId,
      @JsonKey(name: 'company_name') final String? companyName,
-      @JsonKey(name: 'warehouse_name') final String? warehouseName,
+      @JsonKey(name: 'models_id') final int? modelsId,
+      @JsonKey(name: 'model_name') final String? modelName,
+      @JsonKey(name: 'vendor_name') final String? vendorName,
+      @JsonKey(name: 'serial_number') final String? serialNumber,
+      final String? barcode,
+      @JsonKey(name: 'purchased_at') final DateTime? purchasedAt,
+      @JsonKey(name: 'purchase_price') final int? purchasePrice,
+      @JsonKey(name: 'warranty_number') final String? warrantyNumber,
+      @JsonKey(name: 'warranty_started_at') final DateTime? warrantyStartedAt,
+      @JsonKey(name: 'warranty_ended_at') final DateTime? warrantyEndedAt,
+      final String? remark,
+      @JsonKey(name: 'is_deleted') final bool? isDeleted,
+      @JsonKey(name: 'registered_at') final DateTime? registeredAt,
+      @JsonKey(name: 'updated_at') final DateTime? updatedAt,
      final ModelDto? model}) = _$EquipmentListDtoImpl;

  factory _EquipmentListDto.fromJson(Map<String, dynamic> json) =
@@ -401,33 +546,51 @@ abstract class _EquipmentListDto implements EquipmentListDto {
  @override
  int get id;
  @override
-  @JsonKey(name: 'equipment_number')
-  String
-      get equipmentNumber; // Sprint 3: Replaced manufacturer, modelName with models_id and model
-  @override
-  @JsonKey(name: 'models_id')
-  int? get modelsId;
-  @override
-  @JsonKey(name: 'serial_number')
-  String? get serialNumber;
-  @override
-  String get status;
-  @override
-  @JsonKey(name: 'company_id')
-  int? get companyId;
-  @override
-  @JsonKey(name: 'warehouse_location_id')
-  int? get warehouseLocationId;
-  @override
-  @JsonKey(name: 'created_at')
-  DateTime get createdAt; // 추가 필드 (조인된 데이터)
+  @JsonKey(name: 'companies_id')
+  int? get companiesId;
  @override
  @JsonKey(name: 'company_name')
  String? get companyName;
  @override
-  @JsonKey(name: 'warehouse_name')
-  String?
-      get warehouseName; // Sprint 3: Added model relationship (includes vendor info)
+  @JsonKey(name: 'models_id')
+  int? get modelsId;
+  @override
+  @JsonKey(name: 'model_name')
+  String? get modelName;
+  @override
+  @JsonKey(name: 'vendor_name')
+  String? get vendorName;
+  @override
+  @JsonKey(name: 'serial_number')
+  String? get serialNumber;
+  @override
+  String? get barcode;
+  @override
+  @JsonKey(name: 'purchased_at')
+  DateTime? get purchasedAt;
+  @override
+  @JsonKey(name: 'purchase_price')
+  int? get purchasePrice;
+  @override
+  @JsonKey(name: 'warranty_number')
+  String? get warrantyNumber;
+  @override
+  @JsonKey(name: 'warranty_started_at')
+  DateTime? get warrantyStartedAt;
+  @override
+  @JsonKey(name: 'warranty_ended_at')
+  DateTime? get warrantyEndedAt;
+  @override
+  String? get remark;
+  @override
+  @JsonKey(name: 'is_deleted')
+  bool? get isDeleted;
+  @override
+  @JsonKey(name: 'registered_at')
+  DateTime? get registeredAt;
+  @override
+  @JsonKey(name: 'updated_at')
+  DateTime? get updatedAt;
  @override
  ModelDto? get model;

--- a/lib/data/models/equipment/equipment_list_dto.g.dart
+++ b/lib/data/models/equipment/equipment_list_dto.g.dart
@@ -10,15 +10,32 @@ _$EquipmentListDtoImpl _$$EquipmentListDtoImplFromJson(
        Map<String, dynamic> json) =>
    _$EquipmentListDtoImpl(
      id: (json['id'] as num).toInt(),
-      equipmentNumber: json['equipment_number'] as String,
-      modelsId: (json['models_id'] as num?)?.toInt(),
-      serialNumber: json['serial_number'] as String?,
-      status: json['status'] as String,
-      companyId: (json['company_id'] as num?)?.toInt(),
-      warehouseLocationId: (json['warehouse_location_id'] as num?)?.toInt(),
-      createdAt: DateTime.parse(json['created_at'] as String),
+      companiesId: (json['companies_id'] as num?)?.toInt(),
      companyName: json['company_name'] as String?,
-      warehouseName: json['warehouse_name'] as String?,
+      modelsId: (json['models_id'] as num?)?.toInt(),
+      modelName: json['model_name'] as String?,
+      vendorName: json['vendor_name'] as String?,
+      serialNumber: json['serial_number'] as String?,
+      barcode: json['barcode'] as String?,
+      purchasedAt: json['purchased_at'] == null
+          ? null
+          : DateTime.parse(json['purchased_at'] as String),
+      purchasePrice: (json['purchase_price'] as num?)?.toInt(),
+      warrantyNumber: json['warranty_number'] as String?,
+      warrantyStartedAt: json['warranty_started_at'] == null
+          ? null
+          : DateTime.parse(json['warranty_started_at'] as String),
+      warrantyEndedAt: json['warranty_ended_at'] == null
+          ? null
+          : DateTime.parse(json['warranty_ended_at'] as String),
+      remark: json['remark'] as String?,
+      isDeleted: json['is_deleted'] as bool?,
+      registeredAt: json['registered_at'] == null
+          ? null
+          : DateTime.parse(json['registered_at'] as String),
+      updatedAt: json['updated_at'] == null
+          ? null
+          : DateTime.parse(json['updated_at'] as String),
      model: json['model'] == null
          ? null
          : ModelDto.fromJson(json['model'] as Map<String, dynamic>),
@@ -28,15 +45,22 @@ Map<String, dynamic> _$$EquipmentListDtoImplToJson(
        _$EquipmentListDtoImpl instance) =>
    <String, dynamic>{
      'id': instance.id,
-      'equipment_number': instance.equipmentNumber,
-      'models_id': instance.modelsId,
-      'serial_number': instance.serialNumber,
-      'status': instance.status,
-      'company_id': instance.companyId,
-      'warehouse_location_id': instance.warehouseLocationId,
-      'created_at': instance.createdAt.toIso8601String(),
+      'companies_id': instance.companiesId,
      'company_name': instance.companyName,
-      'warehouse_name': instance.warehouseName,
+      'models_id': instance.modelsId,
+      'model_name': instance.modelName,
+      'vendor_name': instance.vendorName,
+      'serial_number': instance.serialNumber,
+      'barcode': instance.barcode,
+      'purchased_at': instance.purchasedAt?.toIso8601String(),
+      'purchase_price': instance.purchasePrice,
+      'warranty_number': instance.warrantyNumber,
+      'warranty_started_at': instance.warrantyStartedAt?.toIso8601String(),
+      'warranty_ended_at': instance.warrantyEndedAt?.toIso8601String(),
+      'remark': instance.remark,
+      'is_deleted': instance.isDeleted,
+      'registered_at': instance.registeredAt?.toIso8601String(),
+      'updated_at': instance.updatedAt?.toIso8601String(),
      'model': instance.model,
    };