Browse Source

评价列表提交,资讯服务详情提交

“shanwenxin” 1 month ago
parent
commit
e978f8e383
61 changed files with 1726 additions and 767 deletions
  1. 2 1
      packages/cpt_services/lib/modules/services/service_evaluate_create/service_evaluate_create_page.dart
  2. 36 8
      packages/cpt_services/lib/modules/services/service_evaluate_create/service_evaluate_create_vm.dart
  3. 7 7
      packages/cpt_services/lib/modules/services/service_evaluate_list/service_evaluate_list_page.dart
  4. 111 125
      packages/cpt_services/lib/modules/services/service_evaluate_list/service_evaluate_list_vm.dart
  5. 159 144
      packages/cpt_services/lib/modules/services/service_repair_detail/service_repair_detail_page.dart
  6. 3 2
      packages/cpt_services/lib/modules/services/service_repair_detail/service_repair_detail_state.dart
  7. 74 64
      packages/cpt_services/lib/modules/services/service_repair_detail/service_repair_detail_vm.dart
  8. 4 2
      packages/cpt_services/lib/respository/services_respository.dart
  9. 65 0
      packages/cs_domain/lib/entity/service_evaluate_list_entity.dart
  10. 62 0
      packages/cs_domain/lib/entity/service_repair_detail_entity.dart
  11. 322 142
      packages/cs_domain/lib/generated/json/base/json_convert_content.dart
  12. 31 14
      packages/cs_domain/lib/generated/json/facility_book_entity.g.dart
  13. 4 2
      packages/cs_domain/lib/generated/json/facility_index_entity.g.dart
  14. 40 20
      packages/cs_domain/lib/generated/json/facility_page_entity.g.dart
  15. 14 6
      packages/cs_domain/lib/generated/json/feedback_detail_entity.g.dart
  16. 7 3
      packages/cs_domain/lib/generated/json/feedback_list_entity.g.dart
  17. 46 23
      packages/cs_domain/lib/generated/json/form_content_entity.g.dart
  18. 2 1
      packages/cs_domain/lib/generated/json/form_detail_entity.g.dart
  19. 2 1
      packages/cs_domain/lib/generated/json/form_list_entity.g.dart
  20. 4 2
      packages/cs_domain/lib/generated/json/form_option_entity.g.dart
  21. 12 6
      packages/cs_domain/lib/generated/json/form_submitted_entity.g.dart
  22. 9 4
      packages/cs_domain/lib/generated/json/form_submitted_page_entity.g.dart
  23. 10 5
      packages/cs_domain/lib/generated/json/garage_sale_rent_detail_entity.g.dart
  24. 11 5
      packages/cs_domain/lib/generated/json/garage_sale_rent_entity.g.dart
  25. 34 13
      packages/cs_domain/lib/generated/json/home_list_entity.g.dart
  26. 4 2
      packages/cs_domain/lib/generated/json/latest_news_detail_entity.g.dart
  27. 4 2
      packages/cs_domain/lib/generated/json/latest_news_page_entity.g.dart
  28. 4 2
      packages/cs_domain/lib/generated/json/myfollowing_list_entity.g.dart
  29. 15 7
      packages/cs_domain/lib/generated/json/myposts_newsfeed_entity.g.dart
  30. 9 4
      packages/cs_domain/lib/generated/json/myposts_sale_rent_entity.g.dart
  31. 4 2
      packages/cs_domain/lib/generated/json/newsfeed_comment_publish_entity.g.dart
  32. 28 13
      packages/cs_domain/lib/generated/json/newsfeed_detail_entity.g.dart
  33. 19 9
      packages/cs_domain/lib/generated/json/newsfeed_following_entity.g.dart
  34. 11 5
      packages/cs_domain/lib/generated/json/newsfeed_foryou_entity.g.dart
  35. 10 5
      packages/cs_domain/lib/generated/json/newsfeed_news_entity.g.dart
  36. 4 2
      packages/cs_domain/lib/generated/json/notice_board_announ_detail_entity.g.dart
  37. 13 6
      packages/cs_domain/lib/generated/json/notice_board_announ_entity.g.dart
  38. 14 6
      packages/cs_domain/lib/generated/json/notice_board_documents_entity.g.dart
  39. 4 2
      packages/cs_domain/lib/generated/json/notice_board_event_detail_entity.g.dart
  40. 9 4
      packages/cs_domain/lib/generated/json/notice_board_event_entity.g.dart
  41. 4 2
      packages/cs_domain/lib/generated/json/payment_page_entity.g.dart
  42. 4 2
      packages/cs_domain/lib/generated/json/property_news_detail_entity.g.dart
  43. 4 2
      packages/cs_domain/lib/generated/json/property_news_entity.g.dart
  44. 9 4
      packages/cs_domain/lib/generated/json/property_sale_rent_entity.g.dart
  45. 26 13
      packages/cs_domain/lib/generated/json/rewards_active_detail_entity.g.dart
  46. 14 6
      packages/cs_domain/lib/generated/json/rewards_buy_entity.g.dart
  47. 4 2
      packages/cs_domain/lib/generated/json/rewards_category_entity.g.dart
  48. 11 5
      packages/cs_domain/lib/generated/json/rewards_detail_entity.g.dart
  49. 16 7
      packages/cs_domain/lib/generated/json/rewards_history_earned_entity.g.dart
  50. 14 6
      packages/cs_domain/lib/generated/json/rewards_home_entity.g.dart
  51. 12 5
      packages/cs_domain/lib/generated/json/rewards_home_tes_entity.g.dart
  52. 4 2
      packages/cs_domain/lib/generated/json/rewards_home_test_entity.g.dart
  53. 11 5
      packages/cs_domain/lib/generated/json/rewards_index_entity.g.dart
  54. 4 2
      packages/cs_domain/lib/generated/json/rewards_list_entity.g.dart
  55. 18 9
      packages/cs_domain/lib/generated/json/rewards_my_detail_entity.g.dart
  56. 8 4
      packages/cs_domain/lib/generated/json/rewards_my_entity.g.dart
  57. 6 2
      packages/cs_domain/lib/generated/json/rewards_search_entity.g.dart
  58. 164 0
      packages/cs_domain/lib/generated/json/service_evaluate_list_entity.g.dart
  59. 131 0
      packages/cs_domain/lib/generated/json/service_repair_detail_entity.g.dart
  60. 33 15
      packages/cs_domain/lib/generated/json/user_me_entity.g.dart
  61. 6 3
      packages/cs_domain/lib/generated/json/visitor_page_entity.g.dart

+ 2 - 1
packages/cpt_services/lib/modules/services/service_evaluate_create/service_evaluate_create_page.dart

@@ -58,7 +58,7 @@ class ServiceEvaluateCreatePage extends HookConsumerWidget {
 
     useEffect(() {
       // 组件挂载时执行 - 执行接口请求
-      Future.microtask(() => vm.initPageData());
+      Future.microtask(() => vm.initPageData(id: id));
       return () {
         // 组件卸载时执行
       };
@@ -302,6 +302,7 @@ class ServiceEvaluateCreatePage extends HookConsumerWidget {
             expands: true,
             onChanged: (text) {
               // 当文本改变时,更新字符数量
+              vm.setNotes(context, text);
               noteCount.value = text.length;
             },
           ),

+ 36 - 8
packages/cpt_services/lib/modules/services/service_evaluate_create/service_evaluate_create_vm.dart

@@ -58,6 +58,7 @@ class ServiceEvaluateCreateVm extends _$ServiceEvaluateCreateVm {
   @override
   ServiceEvaluateCreateState build() {
     // 初始化状态
+    servicesRespositoryInstance = ref.read(servicesRespositoryProvider);
     ServiceEvaluateCreateState state = initState();
 
     // 当前渲染完成后执行一次
@@ -85,7 +86,8 @@ class ServiceEvaluateCreateVm extends _$ServiceEvaluateCreateVm {
     _serviceTypeCode = serviceTypeCode;
   }
   // 初始化页面数据
-  initPageData() {
+  initPageData({int? id,}) {
+    _id = id;
     // changeLoadingState(LoadState.State_Success, null);
 
     // onRefresh();
@@ -468,12 +470,38 @@ class ServiceEvaluateCreateVm extends _$ServiceEvaluateCreateVm {
   setScore(BuildContext context, double score){
     state = state.copyWith(score: score);
   }
-
-  handlerEvaluateSubmit(BuildContext context,){
-    Log.d("handlerEvaluateSubmit");
-    context.appRouter.pushAndPopUntil(const EvaluateCreateSuccessPageRoute(), predicate: (Route<dynamic> route) {       // 根据具体条件返回 true 或 false
-      // Log.d("888 ${route.settings}");
-      return route.settings.name != 'ServiceEvaluateCreatePageRoute';
-    });
+  setNotes(BuildContext context, String notes){
+    state = state.copyWith(notes: notes);
+  }
+  handlerEvaluateSubmit(BuildContext context,) async {
+     try {
+      //请求网络
+      Map<String, dynamic>  params = {
+        "order_id": _id,
+        "score": state.score??5.0,
+        "comment":state.notes,
+        "resources": state.imgList,
+      };
+      Log.d("请求参数------$params");
+      final result = await servicesRespositoryInstance.fetchPublishEvaluation(params);
+      //校验成功失败
+      if (result.isSuccess) {
+        Log.d("handlerEvaluateSubmit");
+        context.appRouter
+            .pushAndPopUntil(const EvaluateCreateSuccessPageRoute(),
+                predicate: (Route<dynamic> route) {
+          // 根据具体条件返回 true 或 false
+          // Log.d("888 ${route.settings}");
+          return route.settings.name != 'ServiceEvaluateCreatePageRoute';
+        });
+      } else {
+        String errorMessage = result.errorMsg!;
+        changeLoadingState(LoadState.State_Error, errorMessage);
+        ToastEngine.show(result.errorMsg ?? "Network Load Error");
+      }
+    } catch (e) {
+      ToastEngine.show("Error: $e");
+    }
+    
   }
 }

+ 7 - 7
packages/cpt_services/lib/modules/services/service_evaluate_list/service_evaluate_list_page.dart

@@ -55,7 +55,7 @@ class ServiceEvaluateListPage extends HookConsumerWidget {
 
     useEffect(() {
       // 组件挂载时执行 - 执行接口请求
-      Future.microtask(() => vm.initPageData());
+      Future.microtask(() => vm.initPageData(id: id));
       return () {
         // 组件卸载时执行
         Log.d("serviceEvaluateList_page 组件卸载时执行");
@@ -108,11 +108,11 @@ class ServiceEvaluateListPage extends HookConsumerWidget {
   }
 
   Widget _buildserviceEvaluateListItem(BuildContext context, WidgetRef ref, Map<String, dynamic> item, vm){
-    String card_name = item?['name']?? "User Sandy";
-    String card_avatar = item?['avatar']?? "";
-    double card_score = item?['score']?? 5.0;
-    String card_created_at = item?['card_created_at']?? "14 Oct 2024 15:00";
-    String card_content = item.getValue("content", "This aunt is very careful because I haven't been home for three or four months. The house is");
+    String card_name = item?['account']['name']?? "User Sandy";
+    String card_avatar = item?['account']['avatar']?? "";
+    int card_score = item?['score']?? 5.0;
+    String card_created_at = item?['created_at']?? "14 Oct 2024 15:00";
+    String card_content = item?['comment']??"";
     List? card_resources = item.getValue<List>("resources", [])?? [];
     return Container(
       margin: const EdgeInsets.only(top: 10),
@@ -134,7 +134,7 @@ class ServiceEvaluateListPage extends HookConsumerWidget {
           key: UniqueKey(),
           name: card_name,
           avator: card_avatar,
-          score: card_score,
+          score: card_score.toDouble(),
           time: card_created_at,
           content: card_content,
           contentTextMaxLines: 9999,

+ 111 - 125
packages/cpt_services/lib/modules/services/service_evaluate_list/service_evaluate_list_vm.dart

@@ -1,7 +1,7 @@
-
 import 'package:cs_resources/generated/assets.dart';
 import 'package:domain/entity/garage_sale_rent_entity.dart';
 import 'package:domain/entity/newsfeed_detail_entity.dart';
+import 'package:domain/entity/service_evaluate_list_entity.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:plugin_platform/engine/toast/toast_engine.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
@@ -20,50 +20,40 @@ part 'service_evaluate_list_vm.g.dart';
 class ServiceEvaluateListVm extends _$ServiceEvaluateListVm {
   late ServicesRespository servicesRespositoryInstance;
   bool _needShowPlaceholder = false; //是否展示LoadingView
-  int _page = 1;  // 当前页
+  int _page = 1; // 当前页
   int _limit = 10; // 每页数量
   int _count = 0; // 总条数
-
-  Map<String, dynamic> _queryParams = {
-    'category_id': null,
-    'keyword': null,
-    'is_liked': null,
-  };
+  int serviceId = 0;
 
   // Refresh 控制器
   final EasyRefreshController refreshController = EasyRefreshController(
-    controlFinishRefresh: true,  //允许刷新
-    controlFinishLoad: true,   //允许加载
+    controlFinishRefresh: true, //允许刷新
+    controlFinishLoad: true, //允许加载
   );
 
   ServiceEvaluateListState initState() {
-    return ServiceEvaluateListState(
-        list: []
-    );
+    return ServiceEvaluateListState(list: []);
   }
 
   @override
-  ServiceEvaluateListState build(){
+  ServiceEvaluateListState build() {
     // 引入数据仓库
-    // servicesRespositoryInstance = ref.read(commonGarageRespositoryProvider);
+    servicesRespositoryInstance = ref.read(servicesRespositoryProvider);
     final state = initState();
     Log.d("--------------------------build---------------------");
 
     return state;
   }
 
-
   //刷新页面状态
   void changeLoadingState(LoadState loadState, String? errorMsg) {
-    state = state.copyWith(
-        loadingState: loadState,
-        errorMessage: errorMsg
-    );
+    state = state.copyWith(loadingState: loadState, errorMessage: errorMsg);
   }
 
   // 初始化页面数据
-  initPageData() {
+  initPageData({int? id}) {
     Log.d("----home_service_vm-----initPageData   ${state.loadingState}");
+    serviceId = id!;
     onRefresh();
   }
 
@@ -74,7 +64,6 @@ class ServiceEvaluateListVm extends _$ServiceEvaluateListVm {
     getListData();
   }
 
-
   // 下拉刷新
   Future onRefresh() async {
     // 当前pageView 页面正处于显示状态
@@ -84,7 +73,6 @@ class ServiceEvaluateListVm extends _$ServiceEvaluateListVm {
     getListData();
   }
 
-
   // 手动进行刷新
   Future triggerRefresh() async {
     Log.d("trggerRefresh");
@@ -93,7 +81,7 @@ class ServiceEvaluateListVm extends _$ServiceEvaluateListVm {
 
   // 手动进行刷新
   Future directRefresh() async {
-    state = state.copyWith(list:[]);
+    state = state.copyWith(list: []);
     // 注意:由于 nestedscrollview 嵌套easyfresh 组件  refreshController.callRefresh() 自动刷新只能滚动顶部但是不会触发下拉刷新,这里调用是 用到了将其滚动到顶部的作用,进而刷新操作主动掉接口
     // https://github.com/xuelongqy/flutter_easy_refresh/issues/692
     refreshController.callRefresh();
@@ -103,7 +91,6 @@ class ServiceEvaluateListVm extends _$ServiceEvaluateListVm {
     getListData();
   }
 
-
   // 重试请求
   Future retryRequest() async {
     _page = 1;
@@ -111,125 +98,123 @@ class ServiceEvaluateListVm extends _$ServiceEvaluateListVm {
     getListData();
   }
 
-
   // 获取list 列表数据
   Future getListData<T>({bool? isLoadMore}) async {
     if (_needShowPlaceholder) {
       changeLoadingState(LoadState.State_Loading, null);
     }
 
-    List<Map<String, dynamic>> list = [
-      {
-        'id':1,
-        'service_type': 0,  // 0 房屋保洁 1 空调保洁  2 维修
-        'cover_img':  'https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500',
-        'resources': ['https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500','https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500','https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500','https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500'],
-        'title': 'House Cleaning Services',
-        'duration': 'Daily cleaning for 2 hours',
-        'totalPrice': 66,
-        'visit_time': '14 0ct 2024 15:00',
-        'order_time': '13 0ct 2024 12:00',
-        'status_text': 'In Progress',
-        'status_code': 2,
-        'company_name': 'HONG YE GROUP PTE LTD',
-      },
-      {
-        'id':2,
-        'service_type': 0,  // 0 房屋保洁 1 空调保洁  2 维修
-        'cover_img':  'https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500',
-        'resources': ['https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500'],
-        'title': 'House Cleaning Services',
-        'duration': 'Daily cleaning for 2 hours',
-        'totalPrice': 66,
-        'visit_time': '14 0ct 2024 15:00',
-        'order_time': '13 0ct 2024 12:00',
-        'status_text': 'In Progress',
-        'status_code': 2,
-        'company_name': 'HONG YE GROUP PTE LTD',
-      },
-      {
-        'id':3,
-        'service_type': 0,  // 0 房屋保洁 1 空调保洁  2 维修
-        'cover_img':  'https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500',
-        'resources': ['https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500'],
-        'title': 'House Cleaning Services',
-        'duration': 'Daily cleaning for 2 hours',
-        'totalPrice': 66,
-        'visit_time': '14 0ct 2024 15:00',
-        'order_time': '13 0ct 2024 12:00',
-        'status_text': 'In Progress',
-        'status_code': 3,
-        'company_name': 'HONG YE GROUP PTE LTD',
-      },
-    ];
-    handlerResultData(true, list:list);
+    // List<Map<String, dynamic>> list = [
+    //   {
+    //     'id':1,
+    //     'service_type': 0,  // 0 房屋保洁 1 空调保洁  2 维修
+    //     'cover_img':  'https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500',
+    //     'resources': ['https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500','https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500','https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500','https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500'],
+    //     'title': 'House Cleaning Services',
+    //     'duration': 'Daily cleaning for 2 hours',
+    //     'totalPrice': 66,
+    //     'visit_time': '14 0ct 2024 15:00',
+    //     'order_time': '13 0ct 2024 12:00',
+    //     'status_text': 'In Progress',
+    //     'status_code': 2,
+    //     'company_name': 'HONG YE GROUP PTE LTD',
+    //   },
+    //   {
+    //     'id':2,
+    //     'service_type': 0,  // 0 房屋保洁 1 空调保洁  2 维修
+    //     'cover_img':  'https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500',
+    //     'resources': ['https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500'],
+    //     'title': 'House Cleaning Services',
+    //     'duration': 'Daily cleaning for 2 hours',
+    //     'totalPrice': 66,
+    //     'visit_time': '14 0ct 2024 15:00',
+    //     'order_time': '13 0ct 2024 12:00',
+    //     'status_text': 'In Progress',
+    //     'status_code': 2,
+    //     'company_name': 'HONG YE GROUP PTE LTD',
+    //   },
+    //   {
+    //     'id':3,
+    //     'service_type': 0,  // 0 房屋保洁 1 空调保洁  2 维修
+    //     'cover_img':  'https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500',
+    //     'resources': ['https://img2.baidu.com/it/u=3489233687,2364672159&fm=253&fmt=auto&app=120&f=JPEG?w=507&h=500'],
+    //     'title': 'House Cleaning Services',
+    //     'duration': 'Daily cleaning for 2 hours',
+    //     'totalPrice': 66,
+    //     'visit_time': '14 0ct 2024 15:00',
+    //     'order_time': '13 0ct 2024 12:00',
+    //     'status_text': 'In Progress',
+    //     'status_code': 3,
+    //     'company_name': 'HONG YE GROUP PTE LTD',
+    //   },
+    // ];
+    // handlerResultData(true, list:list);
 
-    // try {
-    //   //请求网络
-    //   Map<String, dynamic>  params = {
-    //     "type": 1,  // 类型(1=Sale,2=Rent)
-    //     "category_id": _queryParams['category_id'],
-    //     "keyword": _queryParams['keyword'],
-    //     "page": _page,
-    //     "limit": _limit,
-    //   };
-    //   Log.d("请求参数------$params");
-    //   final result = await servicesRespositoryInstance.fetchGarageDataList(params);
-    //   //校验成功失败
-    //   if (result.isSuccess) {
-    //     // handlerResultList((result.data as GarageSaleRentEntity).list as List<GarageSaleRentList>, isLoadMore ?? false);
-    //   } else {
-    //     String errorMessage = result.errorMsg!;
-    //     changeLoadingState(LoadState.State_Error, errorMessage);
-    //     ToastEngine.show(result.errorMsg ?? "Network Load Error");
-    //   }
-    // } catch (e) {
-    //   ToastEngine.show("Error: $e");
-    // }
+    try {
+      //请求网络
+      Map<String, dynamic> params = {
+        "service_id":serviceId,
+        "page": _page,
+        "limit": _limit,
+      };
+      Log.d("请求参数------$params");
+      final result =
+          await servicesRespositoryInstance.fetchEvaluationDataList(params);
+      //校验成功失败
+      if (result.isSuccess) {
+        handlerResultList((result.data as ServiceEvaluateListEntity).list, isLoadMore ?? false);
+      } else {
+        String errorMessage = result.errorMsg!;
+        changeLoadingState(LoadState.State_Error, errorMessage);
+        ToastEngine.show(result.errorMsg ?? "Network Load Error");
+      }
+    } catch (e) {
+      ToastEngine.show("Error: $e");
+    }
 
     // 最后赋值
     _needShowPlaceholder = false;
-
   }
 
-  handlerResultData(bool isList, {List<Map<String, dynamic>>? list, dynamic? data}){
+  handlerResultData(bool isList,
+      {List<Map<String, dynamic>>? list, dynamic? data}) {
     Future.delayed(const Duration(seconds: 1)).then((value) {
-      if(isList){
+      if (isList) {
         // list 数据模式
-        if(list != null && list.isNotEmpty){
-          if(_page == 1){
+        if (list != null && list.isNotEmpty) {
+          if (_page == 1) {
             state.list.clear();
             state.list!.addAll(list);
             refreshController.finishRefresh();
             changeLoadingState(LoadState.State_Success, null);
-          }else {
+          } else {
             final allList = state.list;
             allList!.addAll(list);
             state = state.copyWith(list: allList);
             refreshController.finishLoad();
           }
-        }else {
-          if(_page == 1){
+        } else {
+          if (_page == 1) {
             state.list.clear();
             changeLoadingState(LoadState.State_Empty, null);
             refreshController.finishRefresh();
-          }else {
+          } else {
             refreshController.finishLoad(IndicatorResult.noMore);
           }
         }
-      }else {
+      } else {
         // 单个数据模式
-        if(data!=null){
-          if(_page == 1){
+        if (data != null) {
+          if (_page == 1) {
             refreshController.finishRefresh();
-          }else{
+          } else {
             refreshController.finishLoad();
           }
           changeLoadingState(LoadState.State_Success, null);
-        }else {
-          if(_page == 1){
+        } else {
+          if (_page == 1) {
             refreshController.finishRefresh();
-          }else{
+          } else {
             refreshController.finishLoad();
           }
           changeLoadingState(LoadState.State_Empty, null);
@@ -238,7 +223,7 @@ class ServiceEvaluateListVm extends _$ServiceEvaluateListVm {
     });
   }
 
-  void handlerResultList(List<GarageSaleRentList>? list, bool isLoadMore) {
+  void handlerResultList(List<ServiceEvaluateListList>? list, bool isLoadMore) {
     if (list != null && list.isNotEmpty) {
       //有数据,判断是刷新还是加载更多的数据
       if (_page == 1) {
@@ -270,11 +255,11 @@ class ServiceEvaluateListVm extends _$ServiceEvaluateListVm {
           refreshController.finishRefresh();
         } else {
           //展示加载完成,没有更多数据了
-          if(state.list!.length == 0){
+          if (state.list!.length == 0) {
             changeLoadingState(LoadState.State_Empty, null);
             refreshController.finishLoad();
-          }else {
-            if(_needShowPlaceholder){
+          } else {
+            if (_needShowPlaceholder) {
               changeLoadingState(LoadState.State_Success, null);
             }
           }
@@ -286,21 +271,22 @@ class ServiceEvaluateListVm extends _$ServiceEvaluateListVm {
   }
 
   // 设置当前的 _queryParams
-  setCurrentQueryParams(Map<String, dynamic> params){
-    _queryParams.addAll(params);
-  }
+  // setCurrentQueryParams(Map<String, dynamic> params) {
+  //   _queryParams.addAll(params);
+  // }
 
-  // 获取当前的 _queryParams
-  Map<String, dynamic> getCurrentQueryParams(String? key){
-    if(key!=null && key!.isNotEmpty){
-      return _queryParams[key];
-    }
-    return _queryParams;
-  }
+  // // 获取当前的 _queryParams
+  // Map<String, dynamic> getCurrentQueryParams(String? key) {
+  //   if (key != null && key!.isNotEmpty) {
+  //     return _queryParams[key];
+  //   }
+  //   return _queryParams;
+  // }
 
   // 去详情页面
-  void handlerGotoDetail({BuildContext? context, required int id, String type='forSale'}){
+  void handlerGotoDetail(
+      {BuildContext? context, required int id, String type = 'forSale'}) {
     Log.d("去详情页面");
     // appRouter.push(GaragesaleDetailPageRoute(id: id, type: 'forSale'));
   }
-}
+}

+ 159 - 144
packages/cpt_services/lib/modules/services/service_repair_detail/service_repair_detail_page.dart

@@ -3,6 +3,7 @@ import 'package:cs_resources/generated/assets.dart';
 import 'package:cs_resources/theme/app_colors_theme.dart';
 import 'package:domain/entity/garage_sale_rent_detail_entity.dart';
 import 'package:domain/entity/garage_sale_rent_entity.dart';
+import 'package:domain/entity/service_repair_detail_entity.dart';
 import 'package:flutter/material.dart';
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
@@ -33,37 +34,47 @@ class ServiceRepairDetailPage extends HookConsumerWidget {
   final int id;
   final int serviceTypeCode;
 
-  const ServiceRepairDetailPage({Key? key,@PathParam('id') required this.id, @PathParam('serviceTypeCode') required this.serviceTypeCode}) : super(key: key);
+  const ServiceRepairDetailPage(
+      {Key? key,
+      @PathParam('id') required this.id,
+      @PathParam('serviceTypeCode') required this.serviceTypeCode})
+      : super(key: key);
   // 启动当前页面
-  static void startInstance({BuildContext? context, int? id, int? serviceTypeCode = 0}) {
+  static void startInstance(
+      {BuildContext? context, int? id, int? serviceTypeCode = 0}) {
     if (context != null) {
-      context.router.push(ServiceRepairDetailPageRoute(id: id!, serviceTypeCode: serviceTypeCode!));
+      context.router.push(ServiceRepairDetailPageRoute(
+          id: id!, serviceTypeCode: serviceTypeCode!));
     } else {
-      appRouter.push(ServiceRepairDetailPageRoute(id: id!, serviceTypeCode: serviceTypeCode!));
+      appRouter.push(ServiceRepairDetailPageRoute(
+          id: id!, serviceTypeCode: serviceTypeCode!));
     }
   }
 
-
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final state = ref.watch(serviceRepairDetailVmProvider);
     final vm = ref.read(serviceRepairDetailVmProvider.notifier);
     final String pageTitle = 'Repair Details';
 
-    Map<String, dynamic>? detailInfo = state.datas?? {};
+    ServiceRepairDetailEntity? detailInfo =
+        (state.datas ?? {}) as ServiceRepairDetailEntity?;
 
-    String contactType =  detailInfo?['contact']??'';
+    // String contactType =  detailInfo?['contact']??'';
 
     String description = '';
 
-    useEffect((){
-      vm.setInitPageData(id: id, serviceTypeCode: serviceTypeCode,);
+    useEffect(() {
+      vm.setInitPageData(
+        id: id,
+        serviceTypeCode: serviceTypeCode,
+      );
       // 组件挂载时执行 - 执行接口请求
       Future.microtask(() => vm.initPageData());
       return () {
         // 组件卸载时执行
       };
-    },[]);
+    }, []);
 
     return Scaffold(
       appBar: MyAppBar.appBar(
@@ -80,38 +91,34 @@ class ServiceRepairDetailPage extends HookConsumerWidget {
               // 上拉加载
               onLoad: null,
               // 下拉刷新
-              onRefresh: () async{
+              onRefresh: () async {
                 Log.d("----onRefresh");
                 vm.onRefresh();
               },
               // header: MaterialHeader(),
-              child: Stack(
-                  children:[
-                    LoadStateLayout(
-                      state: state.loadingState,
-                      errorMessage: state.errorMessage,
-                      errorRetry: () {
-                        vm.retryRequest();
-                      },
-                      // successWidget: SingleChildScrollView(
-                      //   scrollDirection: Axis.vertical,
-                      //   physics: const BouncingScrollPhysics(),
-                      //   clipBehavior: Clip.none,
-                      //   child: _buildContentBox(context, ref, detailInfo,),
-                      // ),
-                      successSliverWidget: [
-                        SliverList(
-                          delegate: SliverChildBuilderDelegate(
-                                  (context, index){
-                                return _buildContentBox(context, ref, detailInfo!, state, vm);
-                              },
-                              childCount: 1
-                          ),
-                        )
-                      ],
-                    ),
-                  ]
-              ),
+              child: Stack(children: [
+                LoadStateLayout(
+                  state: state.loadingState,
+                  errorMessage: state.errorMessage,
+                  errorRetry: () {
+                    vm.retryRequest();
+                  },
+                  // successWidget: SingleChildScrollView(
+                  //   scrollDirection: Axis.vertical,
+                  //   physics: const BouncingScrollPhysics(),
+                  //   clipBehavior: Clip.none,
+                  //   child: _buildContentBox(context, ref, detailInfo,),
+                  // ),
+                  successSliverWidget: [
+                    SliverList(
+                      delegate: SliverChildBuilderDelegate((context, index) {
+                        return _buildContentBox(
+                            context, ref, detailInfo, state, vm);
+                      }, childCount: 1),
+                    )
+                  ],
+                ),
+              ]),
             ),
           ),
         ],
@@ -119,93 +126,99 @@ class ServiceRepairDetailPage extends HookConsumerWidget {
     );
   }
 
-
-  Widget _buildContentBox(BuildContext context, WidgetRef ref, Map<String, dynamic>? detailInfo, ServiceRepairDetailState state, ServiceRepairDetailVm vm) {
+  Widget _buildContentBox(
+      BuildContext context,
+      WidgetRef ref,
+      ServiceRepairDetailEntity? detailInfo,
+      ServiceRepairDetailState state,
+      ServiceRepairDetailVm vm) {
     // List<String> resources = detailInfo?['resources'].cast<String>()??[];
-    // String title =  detailInfo?['title']??'';
-    double score = detailInfo?['score']?? 5.0;
+    String title = detailInfo?.name ?? '';
+    double score = 5.0;
     // String description = detailInfo?['description']??'';
 
-    return Column(
+    return Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
+      Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
+          //  评分
           Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              //  评分
-              Column(
-                children: [
-                  Container(
-                    width: double.infinity,
-                    padding: const EdgeInsets.only(left: 16, right: 16, top: 16,bottom: 16),
-                    color: context.appColors.whiteBG,
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        MyTextView(
-                          "House Cleaning Services",
-                          textColor: context.appColors.textBlack,
-                          fontSize: 18,
-                          isFontBold: true,
-                          marginBottom: 5,
-                        ),
-                        Row(
-                          mainAxisAlignment: MainAxisAlignment.start,
-                          crossAxisAlignment: CrossAxisAlignment.center,
-                          children: [
-                            AnimatedRatingStars(
-                              initialRating: score,
-                              onChanged: (rating) {
-                              },
-                              readOnly: true,
-                              displayRatingValue: true, // Display the rating value
-                              interactiveTooltips: true, // Allow toggling half-star state
-                              customFilledIcon: Icons.star,
-                              customHalfFilledIcon: Icons.star_half,
-                              customEmptyIcon: Icons.star_border,
-                              filledColor: ColorUtils.string2Color("#FF0000"),
-                              starSize: 16.5,
-                              animationDuration: const Duration(milliseconds: 0),
-                              animationCurve: Curves.easeInOut,
-                            ),
-                            MyTextView(
-                              "${score}",
-                              textColor: context.appColors.textBlack,
-                              fontSize: 16,
-                              isFontMedium: true,
-                              marginLeft: 15,
-                            ),
-                          ],
-                        ),
-                        MyTextView(
-                          "HONG YE GROUP PTE LTD",
-                          textColor: context.appColors.textDarkGray999,
-                          fontSize: 12,
-                          isFontRegular: true,
-                          marginTop: 10,
-                          marginBottom: 5,
-                        ),
-                      ],
-                    ),
-                  ),
-                ],
-              ),
-              // profile信息
               Container(
                 width: double.infinity,
-                margin: const EdgeInsets.only(left: 0, right: 0, top: 5, bottom: 0),
-                padding: const EdgeInsets.only(left: 10, right: 10, top: 18.5, bottom: 18.5),
-                decoration: BoxDecoration(
-                  color: context.appColors.whiteBG,
+                padding: const EdgeInsets.only(
+                    left: 16, right: 16, top: 16, bottom: 16),
+                color: context.appColors.whiteBG,
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    MyTextView(
+                      title,
+                      textColor: context.appColors.textBlack,
+                      fontSize: 18,
+                      isFontBold: true,
+                      marginBottom: 5,
+                    ),
+                    // Row(
+                    //   mainAxisAlignment: MainAxisAlignment.start,
+                    //   crossAxisAlignment: CrossAxisAlignment.center,
+                    //   children: [
+                    //     AnimatedRatingStars(
+                    //       initialRating: score,
+                    //       onChanged: (rating) {
+                    //       },
+                    //       readOnly: true,
+                    //       displayRatingValue: true, // Display the rating value
+                    //       interactiveTooltips: true, // Allow toggling half-star state
+                    //       customFilledIcon: Icons.star,
+                    //       customHalfFilledIcon: Icons.star_half,
+                    //       customEmptyIcon: Icons.star_border,
+                    //       filledColor: ColorUtils.string2Color("#FF0000"),
+                    //       starSize: 16.5,
+                    //       animationDuration: const Duration(milliseconds: 0),
+                    //       animationCurve: Curves.easeInOut,
+                    //     ),
+                    //     MyTextView(
+                    //       "${score}",
+                    //       textColor: context.appColors.textBlack,
+                    //       fontSize: 16,
+                    //       isFontMedium: true,
+                    //       marginLeft: 15,
+                    //     ),
+                    //   ],
+                    // ),
+                    detailInfo?.name != ''
+                        ? MyTextView(
+                            detailInfo?.merchant.name ?? '',
+                            textColor: context.appColors.textDarkGray999,
+                            fontSize: 12,
+                            isFontRegular: true,
+                            marginTop: 10,
+                            marginBottom: 5,
+                          )
+                        : Container(),
+                  ],
                 ),
-                child: _buildOrderProfile(context, state, vm),
               ),
-              // quote 按钮
-              Container(
-                width: double.infinity,
-                padding: const EdgeInsets.only(left: 16, right: 16, top: 20,bottom: 20),
-                color: Colors.transparent,
-                child: Column(
+            ],
+          ),
+          // profile信息
+          // Container(
+          //   width: double.infinity,
+          //   margin: const EdgeInsets.only(left: 0, right: 0, top: 5, bottom: 0),
+          //   padding: const EdgeInsets.only(left: 10, right: 10, top: 18.5, bottom: 18.5),
+          //   decoration: BoxDecoration(
+          //     color: context.appColors.whiteBG,
+          //   ),
+          //   child: _buildOrderProfile(context, state, vm),
+          // ),
+          // quote 按钮
+          Container(
+              width: double.infinity,
+              padding: const EdgeInsets.only(
+                  left: 16, right: 16, top: 20, bottom: 20),
+              color: Colors.transparent,
+              child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
                     Center(
@@ -218,7 +231,7 @@ class ServiceRepairDetailPage extends HookConsumerWidget {
                         minHeight: 44.5,
                         fontWeight: FontWeight.w400,
                         onPressed: () {
-                          vm.handlerClickQuoteBtn(context, id, serviceTypeCode);
+                          vm.RepairServiceSubmit(context, id, serviceTypeCode);
                         },
                       ),
                     ),
@@ -235,36 +248,39 @@ class ServiceRepairDetailPage extends HookConsumerWidget {
                         textAlign: TextAlign.center,
                       ),
                     )
-                  ]
-                )
-              ),
-              // 介绍图
-              Padding(
-                  padding: const EdgeInsets.only(left: 16, right: 16, top: 16),
-                  child: Column(
-                    children: List.generate(2, (index) {
-                      // 创建一个映射来关联字符串和资源
-                      final Map<String, String> assetMap = {
-                        'serviceDetail01': Assets.serviceRepairDetail01,
-                        'serviceDetail02': Assets.serviceRepairDetail02,
-                      };
-                      String curDetailStr = 'serviceDetail0${(index + 1)}';
-                      Log.d("curDetailStr   $curDetailStr");
-                      return MyAssetImage(
-                        assetMap[curDetailStr]!,
-                        width: SizeConfig().screenWidth,
-                        fit: BoxFit.cover,
-                      );
-                    }).toList(),
-                  )
-              ),
-            ],
-          ),
-        ]
-    );
+                  ])),
+          // 介绍图
+          Padding(
+              padding: const EdgeInsets.only(left: 16, right: 16, top: 16),
+              child: Column(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  children: [Html(data: detailInfo?.description)]
+                  // List.generate(2, (index) {
+                  //   // 创建一个映射来关联字符串和资源
+                  //   final Map<String, String> assetMap = {
+                  //     'serviceDetail01': Assets.serviceRepairDetail01,
+                  //     'serviceDetail02': Assets.serviceRepairDetail02,
+                  //   };
+                  //   String curDetailStr = 'serviceDetail0${(index + 1)}';
+                  //   Log.d("curDetailStr   $curDetailStr");
+                  //   return MyAssetImage(
+                  //     assetMap[curDetailStr]!,
+                  //     width: SizeConfig().screenWidth,
+                  //     fit: BoxFit.cover,
+                  //   );
+                  // }).toList(),
+                  )),
+        ],
+      ),
+    ]);
   }
 
-  Widget _buildOrderProfile(BuildContext context, ServiceRepairDetailState state, ServiceRepairDetailVm vm,) {
+  Widget _buildOrderProfile(
+    BuildContext context,
+    ServiceRepairDetailState state,
+    ServiceRepairDetailVm vm,
+  ) {
     return Column(
       children: [
         Row(
@@ -314,5 +330,4 @@ class ServiceRepairDetailPage extends HookConsumerWidget {
       ],
     );
   }
-
 }

+ 3 - 2
packages/cpt_services/lib/modules/services/service_repair_detail/service_repair_detail_state.dart

@@ -1,4 +1,5 @@
 import 'package:domain/entity/garage_sale_rent_detail_entity.dart';
+import 'package:domain/entity/service_repair_detail_entity.dart';
 import 'package:widgets/load_state_layout.dart';
 
 class ServiceRepairDetailState {
@@ -9,7 +10,7 @@ class ServiceRepairDetailState {
   final int? id;
   final String? type;
 
-  Map<String, dynamic>? datas;
+  ServiceRepairDetailEntity? datas;
 
   ServiceRepairDetailState({
     this.loadingState = LoadState.State_Loading,
@@ -20,7 +21,7 @@ class ServiceRepairDetailState {
   });
 
   ServiceRepairDetailState copyWith({
-    Map<String, dynamic>? datas,
+    ServiceRepairDetailEntity? datas,
     LoadState? loadingState,
     String? errorMessage,
     int? id,

+ 74 - 64
packages/cpt_services/lib/modules/services/service_repair_detail/service_repair_detail_vm.dart

@@ -1,7 +1,7 @@
-
 import 'package:cpt_services/components/chooseAirConditionContent.dart';
 import 'package:cs_resources/generated/assets.dart';
 import 'package:domain/entity/garage_sale_rent_detail_entity.dart';
+import 'package:domain/entity/service_repair_detail_entity.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:plugin_basic/basic_export.dart';
 import 'package:plugin_platform/engine/dialog/dialog_engine.dart';
@@ -30,24 +30,24 @@ class ServiceRepairDetailVm extends _$ServiceRepairDetailVm {
   int _detailServiceTypeCode = 0;
 
   bool _needShowPlaceholder = false; //是否展示LoadingView
-  int _page = 1;  // 当前页
+  int _page = 1; // 当前页
   int _limit = 10; // 每页数量
   int _count = 0; // 总条数
 
   // Refresh 控制器
   final EasyRefreshController refreshController = EasyRefreshController(
-    controlFinishRefresh: true,  //允许刷新
-    controlFinishLoad: true,   //允许加载
+    controlFinishRefresh: true, //允许刷新
+    controlFinishLoad: true, //允许加载
   );
 
   ServiceRepairDetailState initState() {
     return ServiceRepairDetailState(
-      datas: null,
+      datas: ServiceRepairDetailEntity(),
     );
   }
 
   @override
-  ServiceRepairDetailState build(){
+  ServiceRepairDetailState build() {
     // 引入数据仓库
     serviceRespositoryInstance = ref.read(servicesRespositoryProvider);
     final state = initState();
@@ -56,19 +56,15 @@ class ServiceRepairDetailVm extends _$ServiceRepairDetailVm {
     return state;
   }
 
-
   //刷新页面状态
   void changeLoadingState(LoadState loadState, String? errorMsg) {
-    state = state.copyWith(
-        loadingState: loadState,
-        errorMessage: errorMsg
-    );
+    state = state.copyWith(loadingState: loadState, errorMessage: errorMsg);
   }
 
   // 初始化页面数据
   initPageData() {
     Log.d("----for_sale_vm-----initPageData   ${state.loadingState}");
-    // onRefresh();
+    onRefresh();
     changeLoadingState(LoadState.State_Success, null);
   }
 
@@ -78,14 +74,12 @@ class ServiceRepairDetailVm extends _$ServiceRepairDetailVm {
     getDetailData();
   }
 
-
   // 下拉刷新
   Future onRefresh() async {
     _page = 1;
     getDetailData();
   }
 
-
   // 手动进行刷新
   Future triggerRefresh() async {
     Log.d("trggerRefresh");
@@ -94,7 +88,7 @@ class ServiceRepairDetailVm extends _$ServiceRepairDetailVm {
 
   // 手动进行刷新
   Future directRefresh() async {
-    state = state.copyWith(datas:null);
+    state = state.copyWith(datas: null);
     // 注意:由于 nestedscrollview 嵌套easyfresh 组件  refreshController.callRefresh() 自动刷新只能滚动顶部但是不会触发下拉刷新,这里调用是 用到了将其滚动到顶部的作用,进而刷新操作主动掉接口
     // https://github.com/xuelongqy/flutter_easy_refresh/issues/692
     refreshController.callRefresh();
@@ -104,7 +98,6 @@ class ServiceRepairDetailVm extends _$ServiceRepairDetailVm {
     getDetailData();
   }
 
-
   // 重试请求
   Future retryRequest() async {
     _page = 1;
@@ -112,8 +105,7 @@ class ServiceRepairDetailVm extends _$ServiceRepairDetailVm {
     getDetailData();
   }
 
-
-  setInitPageData({required int id, required int serviceTypeCode}){
+  setInitPageData({required int id, required int serviceTypeCode}) {
     _detailId = id;
     _detailServiceTypeCode = serviceTypeCode;
   }
@@ -123,7 +115,6 @@ class ServiceRepairDetailVm extends _$ServiceRepairDetailVm {
       changeLoadingState(LoadState.State_Loading, null);
     }
 
-
     // await Future.delayed(const Duration(milliseconds: 1500));
     //
     // final Map<String, dynamic> detailData = {
@@ -151,32 +142,32 @@ class ServiceRepairDetailVm extends _$ServiceRepairDetailVm {
     // // 最后赋值
     // _needShowPlaceholder = false;
 
+    try {
+      Map<String, dynamic> params = {
+        "id": _detailId,
+      };
+      final result =
+          await serviceRespositoryInstance.fetchServiceRepairDetailInfo(params);
+      if (result.isSuccess) {
+        state = state.copyWith(datas: result.data as ServiceRepairDetailEntity);
+        changeLoadingState(LoadState.State_Success, null);
+        refreshController.finishRefresh();
+      } else {
+        String errorMessage = result.errorMsg!;
+        changeLoadingState(LoadState.State_Error, errorMessage);
+        ToastEngine.show(result.errorMsg ?? "Network Load Error");
+      }
+    } catch (e) {
+      ToastEngine.show("Error: $e");
+    }
 
-    // try {
-    //   Map<String, dynamic> params = {
-    //     "id": _detailId,
-    //   };
-    //   final result = await serviceRespositoryInstance.fetchServiceRepairDetailInfo(params);
-    //   if(result.isSuccess){
-    //     state = state.copyWith(datas: result.data as GarageSaleRentDetailEntity);
-    //     changeLoadingState(LoadState.State_Success, null);
-    //     refreshController.finishRefresh();
-    //   } else {
-    //     String errorMessage = result.errorMsg!;
-    //     changeLoadingState(LoadState.State_Error, errorMessage);
-    //     ToastEngine.show(result.errorMsg ?? "Network Load Error");
-    //   }
-    // } catch (e) {
-    //   ToastEngine.show("Error: $e");
-    // }
-    //
-    // // 最后赋值
-    // _needShowPlaceholder = false;
+    // 最后赋值
+    _needShowPlaceholder = false;
   }
 
-
   // 点击了底部的收藏按钮
-  Future<bool?> handlerClickCollection(BuildContext? context, int id, bool isCollection) async{
+  Future<bool?> handlerClickCollection(
+      BuildContext? context, int id, bool isCollection) async {
     // var vm;
     // if(_detailServiceTypeCode == "forSale"){
     //   // vm = ref.read(forsaleVmProvider.notifier);
@@ -192,30 +183,34 @@ class ServiceRepairDetailVm extends _$ServiceRepairDetailVm {
   }
 
   // 判断是whatsapp 还是 mobile  (通过 contact: whatsapp:+8617671757687)
-  String getContactType(String contactType){
+  String getContactType(String contactType) {
     // whatsapp:+8617671757687  截取:前面的字符串
     String type = contactType.split(":")[0];
     return type;
   }
 
-  isContactWhatsApp(String contactType){
+  isContactWhatsApp(String contactType) {
     return contactType.contains("whatsapp");
   }
 
-  isContactMobile(String contactType){
+  isContactMobile(String contactType) {
     return contactType.contains("mobile");
   }
-  String getContactNumber(String contactType){
+
+  String getContactNumber(String contactType) {
     // whatsapp:+8617671757687     mobile:+8617671757687  截取:后面的字符串
     String number = contactType.split(":")[1];
     return number;
   }
+
   // 点击 whatsapp
-  handlerClickWhatsapp(BuildContext? context,String contactType, String title, int price){
+  handlerClickWhatsapp(
+      BuildContext? context, String contactType, String title, int price) {
     // 假设你有一个获取 WhatsApp 号码的方法
     String whatsappNumber = getContactNumber(contactType); // 你需要实现这个方法
     // 构建消息并进行编码
-    String message = Uri.encodeComponent("Hello, I am interested in your listing: $title for $price.");
+    String message = Uri.encodeComponent(
+        "Hello, I am interested in your listing: $title for $price.");
     // 打开WhatsApp
     openWhatsApp(whatsappNumber, message);
   }
@@ -223,7 +218,7 @@ class ServiceRepairDetailVm extends _$ServiceRepairDetailVm {
   // 打开whatsapp
   openWhatsApp(String phoneNumber, String message) async {
     final url = "https://wa.me/$phoneNumber/?text=${Uri.parse(message)}";
-    if (await  canLaunchUrl(Uri.parse(url))) {
+    if (await canLaunchUrl(Uri.parse(url))) {
       await launchUrl(Uri.parse(url));
     } else {
       ToastEngine.show("Could not launch $url");
@@ -232,7 +227,7 @@ class ServiceRepairDetailVm extends _$ServiceRepairDetailVm {
   }
 
   // 点击 电话
-  handlerClickMobile(BuildContext? context,String contactType){
+  handlerClickMobile(BuildContext? context, String contactType) {
     String mobileNumber = getContactNumber(contactType);
     // 拨打电话
     makePhoneCall(mobileNumber);
@@ -253,7 +248,24 @@ class ServiceRepairDetailVm extends _$ServiceRepairDetailVm {
     }
   }
 
-  handlerClickQuoteBtn(BuildContext context, int id, int serviceTypeCode) async{
+  Future RepairServiceSubmit<T>(
+      BuildContext context, int id, int serviceTypeCode) async {
+    try {
+      Map<String, dynamic> params = {"service_id": id, "user_notes": ""};
+      final result =
+          await serviceRespositoryInstance.fetchRepairServiceSubmit(params);
+      if (result.isSuccess) {
+        handlerClickQuoteBtn(context, id, serviceTypeCode);
+      } else {
+        ToastEngine.show(result.errorMsg ?? "Network Load Error");
+      }
+    } catch (e) {
+      ToastEngine.show("Error: $e");
+    }
+  }
+
+  handlerClickQuoteBtn(
+      BuildContext context, int id, int serviceTypeCode) async {
     await DialogEngine.show(
         tag: "gotoQuote",
         position: DialogPosition.center,
@@ -265,20 +277,21 @@ class ServiceRepairDetailVm extends _$ServiceRepairDetailVm {
           // contentBoxMinHeight: 300,
           isShowConfirmBtn: true,
           confirmTxt: "Confirm",
-          isShowCancelBtn:false,
-          messageBuilder: (BuildContext context){
+          isShowCancelBtn: false,
+          messageBuilder: (BuildContext context) {
             return Container(
-              padding: EdgeInsets.symmetric(horizontal: 30),
-              child: Column(
-                children: [
+                padding: EdgeInsets.symmetric(horizontal: 30),
+                child: Column(children: [
                   MyTextView(
-                    "Please select the category of the service you want to quote:",
+                    "We have received your quotation inquiry",
                     fontSize: 16,
                     isFontMedium: true,
                     textAlign: TextAlign.center,
                     textColor: ColorUtils.string2Color("#4161D0"),
                   ),
-                  SizedBox(height: 20,),
+                  SizedBox(
+                    height: 20,
+                  ),
                   MyTextView(
                     "We will contact you as soon as possible. Please keep your phone open",
                     fontSize: 16,
@@ -287,15 +300,12 @@ class ServiceRepairDetailVm extends _$ServiceRepairDetailVm {
                     textColor: ColorUtils.string2Color("#000000"),
                     // textColor: context.appColors.textPrimary,
                   ),
-                ]
-              )
-            );
+                ]));
           },
-          confirmAction: (){
+          confirmAction: () {
             // 点击了确定
             Log.d("----点击了确定按钮");
           },
-        )
-    );
+        ));
   }
-}
+}

+ 4 - 2
packages/cpt_services/lib/respository/services_respository.dart

@@ -5,6 +5,8 @@ import 'package:domain/entity/myposts_sale_rent_entity.dart';
 import 'package:domain/entity/newsfeed_foryou_entity.dart';
 import 'package:domain/entity/newsfeed_news_entity.dart';
 import 'package:domain/entity/server_time.dart';
+import 'package:domain/entity/service_evaluate_list_entity.dart';
+import 'package:domain/entity/service_repair_detail_entity.dart';
 import 'package:plugin_platform/engine/toast/toast_engine.dart';
 import 'package:plugin_platform/platform_export.dart';
 import 'package:plugin_platform/http/dio_engine.dart';
@@ -220,7 +222,7 @@ class ServicesRespository {
     if (result.isSuccess) {
       //重新赋值data或list
       final json = result.getDataJson();
-      var data = GarageSaleRentEntity.fromJson(json!);
+      var data = ServiceEvaluateListEntity.fromJson(json!);
       //重新赋值data或list
       return result.convert(data: data);
     }else {
@@ -522,7 +524,7 @@ class ServicesRespository {
     if (result.isSuccess) {
       //重新赋值data或list
       final json = result.getDataJson();
-      var data = GarageSaleRentDetailEntity.fromJson(json!);
+      var data = ServiceRepairDetailEntity.fromJson(json!);
       //重新赋值data或list
       return result.convert(data: data);
     }else {

+ 65 - 0
packages/cs_domain/lib/entity/service_evaluate_list_entity.dart

@@ -0,0 +1,65 @@
+import 'package:domain/generated/json/base/json_field.dart';
+import 'package:domain/generated/json/service_evaluate_list_entity.g.dart';
+import 'dart:convert';
+export 'package:domain/generated/json/service_evaluate_list_entity.g.dart';
+
+@JsonSerializable()
+class ServiceEvaluateListEntity {
+	late int count = 0;
+	late int page = 0;
+	late int limit = 0;
+	@JSONField(name: "count_page")
+	late int countPage = 0;
+	late List<ServiceEvaluateListList> list = [];
+
+	ServiceEvaluateListEntity();
+
+	factory ServiceEvaluateListEntity.fromJson(Map<String, dynamic> json) => $ServiceEvaluateListEntityFromJson(json);
+
+	Map<String, dynamic> toJson() => $ServiceEvaluateListEntityToJson(this);
+
+	@override
+	String toString() {
+		return jsonEncode(this);
+	}
+}
+
+@JsonSerializable()
+class ServiceEvaluateListList {
+	late int id = 0;
+	late ServiceEvaluateListListAccount account;
+	late int score = 0;
+	late String comment = '';
+	late List<dynamic> resources = [];
+	@JSONField(name: "created_at")
+	late String createdAt = '';
+
+	ServiceEvaluateListList();
+
+	factory ServiceEvaluateListList.fromJson(Map<String, dynamic> json) => $ServiceEvaluateListListFromJson(json);
+
+	Map<String, dynamic> toJson() => $ServiceEvaluateListListToJson(this);
+
+	@override
+	String toString() {
+		return jsonEncode(this);
+	}
+}
+
+@JsonSerializable()
+class ServiceEvaluateListListAccount {
+	late int id = 0;
+	late String name = '';
+	late String avatar = '';
+
+	ServiceEvaluateListListAccount();
+
+	factory ServiceEvaluateListListAccount.fromJson(Map<String, dynamic> json) => $ServiceEvaluateListListAccountFromJson(json);
+
+	Map<String, dynamic> toJson() => $ServiceEvaluateListListAccountToJson(this);
+
+	@override
+	String toString() {
+		return jsonEncode(this);
+	}
+}

+ 62 - 0
packages/cs_domain/lib/entity/service_repair_detail_entity.dart

@@ -0,0 +1,62 @@
+import 'package:domain/generated/json/base/json_field.dart';
+import 'package:domain/generated/json/service_repair_detail_entity.g.dart';
+import 'dart:convert';
+export 'package:domain/generated/json/service_repair_detail_entity.g.dart';
+
+@JsonSerializable()
+class ServiceRepairDetailEntity {
+  late int id = 0;
+  late String name = '';
+  late String description = '';
+  late ServiceRepairDetailMerchant merchant;
+  late ServiceRepairDetailCategory category;
+
+  ServiceRepairDetailEntity();
+
+  factory ServiceRepairDetailEntity.fromJson(Map<String, dynamic> json) =>
+      $ServiceRepairDetailEntityFromJson(json);
+
+  Map<String, dynamic> toJson() => $ServiceRepairDetailEntityToJson(this);
+
+  @override
+  String toString() {
+    return jsonEncode(this);
+  }
+}
+
+@JsonSerializable()
+class ServiceRepairDetailMerchant {
+  late int id = 0;
+  late String name = '';
+
+  ServiceRepairDetailMerchant();
+
+  factory ServiceRepairDetailMerchant.fromJson(Map<String, dynamic> json) =>
+      $ServiceRepairDetailMerchantFromJson(json);
+
+  Map<String, dynamic> toJson() => $ServiceRepairDetailMerchantToJson(this);
+
+  @override
+  String toString() {
+    return jsonEncode(this);
+  }
+}
+
+@JsonSerializable()
+class ServiceRepairDetailCategory {
+  late int id = 0;
+  late String name = '';
+  late String type = '';
+
+  ServiceRepairDetailCategory();
+
+  factory ServiceRepairDetailCategory.fromJson(Map<String, dynamic> json) =>
+      $ServiceRepairDetailCategoryFromJson(json);
+
+  Map<String, dynamic> toJson() => $ServiceRepairDetailCategoryToJson(this);
+
+  @override
+  String toString() {
+    return jsonEncode(this);
+  }
+}

+ 322 - 142
packages/cs_domain/lib/generated/json/base/json_convert_content.dart

@@ -55,6 +55,8 @@ import 'package:domain/entity/rewards_my_detail_entity.dart';
 import 'package:domain/entity/rewards_my_entity.dart';
 import 'package:domain/entity/rewards_search_entity.dart';
 import 'package:domain/entity/server_time.dart';
+import 'package:domain/entity/service_evaluate_list_entity.dart';
+import 'package:domain/entity/service_repair_detail_entity.dart';
 import 'package:domain/entity/text_kon_entity.dart';
 import 'package:domain/entity/user_me_entity.dart';
 import 'package:domain/entity/visitor_page_entity.dart';
@@ -115,12 +117,14 @@ class JsonConvert {
     }
   }
 
-  List<T?>? convertList<T>(List<dynamic>? value, {EnumConvertFunction? enumConvert}) {
+  List<T?>? convertList<T>(List<dynamic>? value,
+      {EnumConvertFunction? enumConvert}) {
     if (value == null) {
       return null;
     }
     try {
-      return value.map((dynamic e) => _asT<T>(e, enumConvert: enumConvert)).toList();
+      return value.map((dynamic e) => _asT<T>(e, enumConvert: enumConvert))
+          .toList();
     } catch (e, stackTrace) {
       debugPrint('asT<$T> $e $stackTrace');
       if (onError != null) {
@@ -130,12 +134,14 @@ class JsonConvert {
     }
   }
 
-  List<T>? convertListNotNull<T>(dynamic value, {EnumConvertFunction? enumConvert}) {
+  List<T>? convertListNotNull<T>(dynamic value,
+      {EnumConvertFunction? enumConvert}) {
     if (value == null) {
       return null;
     }
     try {
-      return (value as List<dynamic>).map((dynamic e) => _asT<T>(e, enumConvert: enumConvert)!).toList();
+      return (value as List<dynamic>).map((dynamic e) =>
+      _asT<T>(e, enumConvert: enumConvert)!).toList();
     } catch (e, stackTrace) {
       debugPrint('asT<$T> $e $stackTrace');
       if (onError != null) {
@@ -183,7 +189,8 @@ class JsonConvert {
           return covertFunc(Map<String, dynamic>.from(value)) as T;
         }
       } else {
-        throw UnimplementedError('$type unimplemented,you can try running the app again');
+        throw UnimplementedError(
+            '$type unimplemented,you can try running the app again');
       }
     }
   }
@@ -191,355 +198,499 @@ class JsonConvert {
   //list is returned by type
   static M? _getListChildType<M>(List<Map<String, dynamic>> data) {
     if (<AuthLoginEntity>[] is M) {
-      return data.map<AuthLoginEntity>((Map<String, dynamic> e) => AuthLoginEntity.fromJson(e)).toList() as M;
+      return data.map<AuthLoginEntity>((Map<String, dynamic> e) =>
+          AuthLoginEntity.fromJson(e)).toList() as M;
     }
     if (<CaptchaImgEntity>[] is M) {
-      return data.map<CaptchaImgEntity>((Map<String, dynamic> e) => CaptchaImgEntity.fromJson(e)).toList() as M;
+      return data.map<CaptchaImgEntity>((Map<String, dynamic> e) =>
+          CaptchaImgEntity.fromJson(e)).toList() as M;
     }
     if (<FacilityBookEntity>[] is M) {
-      return data.map<FacilityBookEntity>((Map<String, dynamic> e) => FacilityBookEntity.fromJson(e)).toList() as M;
+      return data.map<FacilityBookEntity>((Map<String, dynamic> e) =>
+          FacilityBookEntity.fromJson(e)).toList() as M;
     }
     if (<FacilityBookFacilityType>[] is M) {
-      return data.map<FacilityBookFacilityType>((Map<String, dynamic> e) => FacilityBookFacilityType.fromJson(e)).toList() as M;
+      return data.map<FacilityBookFacilityType>((Map<String, dynamic> e) =>
+          FacilityBookFacilityType.fromJson(e)).toList() as M;
     }
     if (<FacilityBookFacilities>[] is M) {
-      return data.map<FacilityBookFacilities>((Map<String, dynamic> e) => FacilityBookFacilities.fromJson(e)).toList() as M;
+      return data.map<FacilityBookFacilities>((Map<String, dynamic> e) =>
+          FacilityBookFacilities.fromJson(e)).toList() as M;
     }
     if (<FacilityBookFacilitiesPeriods>[] is M) {
-      return data.map<FacilityBookFacilitiesPeriods>((Map<String, dynamic> e) => FacilityBookFacilitiesPeriods.fromJson(e)).toList() as M;
+      return data.map<FacilityBookFacilitiesPeriods>((Map<String, dynamic> e) =>
+          FacilityBookFacilitiesPeriods.fromJson(e)).toList() as M;
     }
     if (<FacilityIndexEntity>[] is M) {
-      return data.map<FacilityIndexEntity>((Map<String, dynamic> e) => FacilityIndexEntity.fromJson(e)).toList() as M;
+      return data.map<FacilityIndexEntity>((Map<String, dynamic> e) =>
+          FacilityIndexEntity.fromJson(e)).toList() as M;
     }
     if (<FacilityPageEntity>[] is M) {
-      return data.map<FacilityPageEntity>((Map<String, dynamic> e) => FacilityPageEntity.fromJson(e)).toList() as M;
+      return data.map<FacilityPageEntity>((Map<String, dynamic> e) =>
+          FacilityPageEntity.fromJson(e)).toList() as M;
     }
     if (<FacilityDetail>[] is M) {
-      return data.map<FacilityDetail>((Map<String, dynamic> e) => FacilityDetail.fromJson(e)).toList() as M;
+      return data.map<FacilityDetail>((Map<String, dynamic> e) =>
+          FacilityDetail.fromJson(e)).toList() as M;
     }
     if (<FacilityPageListBooking>[] is M) {
-      return data.map<FacilityPageListBooking>((Map<String, dynamic> e) => FacilityPageListBooking.fromJson(e)).toList() as M;
+      return data.map<FacilityPageListBooking>((Map<String, dynamic> e) =>
+          FacilityPageListBooking.fromJson(e)).toList() as M;
     }
     if (<FacilityPageListFacility>[] is M) {
-      return data.map<FacilityPageListFacility>((Map<String, dynamic> e) => FacilityPageListFacility.fromJson(e)).toList() as M;
+      return data.map<FacilityPageListFacility>((Map<String, dynamic> e) =>
+          FacilityPageListFacility.fromJson(e)).toList() as M;
     }
     if (<FacilityPageListFacilityType>[] is M) {
-      return data.map<FacilityPageListFacilityType>((Map<String, dynamic> e) => FacilityPageListFacilityType.fromJson(e)).toList() as M;
+      return data.map<FacilityPageListFacilityType>((Map<String, dynamic> e) =>
+          FacilityPageListFacilityType.fromJson(e)).toList() as M;
     }
     if (<FacilityPageListTimePeriod>[] is M) {
-      return data.map<FacilityPageListTimePeriod>((Map<String, dynamic> e) => FacilityPageListTimePeriod.fromJson(e)).toList() as M;
+      return data.map<FacilityPageListTimePeriod>((Map<String, dynamic> e) =>
+          FacilityPageListTimePeriod.fromJson(e)).toList() as M;
     }
     if (<FacilityPageListAccount>[] is M) {
-      return data.map<FacilityPageListAccount>((Map<String, dynamic> e) => FacilityPageListAccount.fromJson(e)).toList() as M;
+      return data.map<FacilityPageListAccount>((Map<String, dynamic> e) =>
+          FacilityPageListAccount.fromJson(e)).toList() as M;
     }
     if (<FeedbackDetailEntity>[] is M) {
-      return data.map<FeedbackDetailEntity>((Map<String, dynamic> e) => FeedbackDetailEntity.fromJson(e)).toList() as M;
+      return data.map<FeedbackDetailEntity>((Map<String, dynamic> e) =>
+          FeedbackDetailEntity.fromJson(e)).toList() as M;
     }
     if (<FeedbackDetailReplies>[] is M) {
-      return data.map<FeedbackDetailReplies>((Map<String, dynamic> e) => FeedbackDetailReplies.fromJson(e)).toList() as M;
+      return data.map<FeedbackDetailReplies>((Map<String, dynamic> e) =>
+          FeedbackDetailReplies.fromJson(e)).toList() as M;
     }
     if (<FeedbackListEntity>[] is M) {
-      return data.map<FeedbackListEntity>((Map<String, dynamic> e) => FeedbackListEntity.fromJson(e)).toList() as M;
+      return data.map<FeedbackListEntity>((Map<String, dynamic> e) =>
+          FeedbackListEntity.fromJson(e)).toList() as M;
     }
     if (<FeedbackItemEntity>[] is M) {
-      return data.map<FeedbackItemEntity>((Map<String, dynamic> e) => FeedbackItemEntity.fromJson(e)).toList() as M;
+      return data.map<FeedbackItemEntity>((Map<String, dynamic> e) =>
+          FeedbackItemEntity.fromJson(e)).toList() as M;
     }
     if (<FormContentEntity>[] is M) {
-      return data.map<FormContentEntity>((Map<String, dynamic> e) => FormContentEntity.fromJson(e)).toList() as M;
+      return data.map<FormContentEntity>((Map<String, dynamic> e) =>
+          FormContentEntity.fromJson(e)).toList() as M;
     }
     if (<FormDetailEntity>[] is M) {
-      return data.map<FormDetailEntity>((Map<String, dynamic> e) => FormDetailEntity.fromJson(e)).toList() as M;
+      return data.map<FormDetailEntity>((Map<String, dynamic> e) =>
+          FormDetailEntity.fromJson(e)).toList() as M;
     }
     if (<FormListEntity>[] is M) {
-      return data.map<FormListEntity>((Map<String, dynamic> e) => FormListEntity.fromJson(e)).toList() as M;
+      return data.map<FormListEntity>((Map<String, dynamic> e) =>
+          FormListEntity.fromJson(e)).toList() as M;
     }
     if (<FormOptionEntity>[] is M) {
-      return data.map<FormOptionEntity>((Map<String, dynamic> e) => FormOptionEntity.fromJson(e)).toList() as M;
+      return data.map<FormOptionEntity>((Map<String, dynamic> e) =>
+          FormOptionEntity.fromJson(e)).toList() as M;
     }
     if (<FormSubmittedEntity>[] is M) {
-      return data.map<FormSubmittedEntity>((Map<String, dynamic> e) => FormSubmittedEntity.fromJson(e)).toList() as M;
+      return data.map<FormSubmittedEntity>((Map<String, dynamic> e) =>
+          FormSubmittedEntity.fromJson(e)).toList() as M;
     }
     if (<FormSubmittedEstateOnlineForm>[] is M) {
-      return data.map<FormSubmittedEstateOnlineForm>((Map<String, dynamic> e) => FormSubmittedEstateOnlineForm.fromJson(e)).toList() as M;
+      return data.map<FormSubmittedEstateOnlineForm>((Map<String, dynamic> e) =>
+          FormSubmittedEstateOnlineForm.fromJson(e)).toList() as M;
     }
     if (<FormSubmittedPageEntity>[] is M) {
-      return data.map<FormSubmittedPageEntity>((Map<String, dynamic> e) => FormSubmittedPageEntity.fromJson(e)).toList() as M;
+      return data.map<FormSubmittedPageEntity>((Map<String, dynamic> e) =>
+          FormSubmittedPageEntity.fromJson(e)).toList() as M;
     }
     if (<GarageSaleRentDetailEntity>[] is M) {
-      return data.map<GarageSaleRentDetailEntity>((Map<String, dynamic> e) => GarageSaleRentDetailEntity.fromJson(e)).toList() as M;
+      return data.map<GarageSaleRentDetailEntity>((Map<String, dynamic> e) =>
+          GarageSaleRentDetailEntity.fromJson(e)).toList() as M;
     }
     if (<GarageSaleRentDetailAccount>[] is M) {
-      return data.map<GarageSaleRentDetailAccount>((Map<String, dynamic> e) => GarageSaleRentDetailAccount.fromJson(e)).toList() as M;
+      return data.map<GarageSaleRentDetailAccount>((Map<String, dynamic> e) =>
+          GarageSaleRentDetailAccount.fromJson(e)).toList() as M;
     }
     if (<GarageSaleRentEntity>[] is M) {
-      return data.map<GarageSaleRentEntity>((Map<String, dynamic> e) => GarageSaleRentEntity.fromJson(e)).toList() as M;
+      return data.map<GarageSaleRentEntity>((Map<String, dynamic> e) =>
+          GarageSaleRentEntity.fromJson(e)).toList() as M;
     }
     if (<GarageSaleRentList>[] is M) {
-      return data.map<GarageSaleRentList>((Map<String, dynamic> e) => GarageSaleRentList.fromJson(e)).toList() as M;
+      return data.map<GarageSaleRentList>((Map<String, dynamic> e) =>
+          GarageSaleRentList.fromJson(e)).toList() as M;
     }
     if (<GarageSaleRentListAccount>[] is M) {
-      return data.map<GarageSaleRentListAccount>((Map<String, dynamic> e) => GarageSaleRentListAccount.fromJson(e)).toList() as M;
+      return data.map<GarageSaleRentListAccount>((Map<String, dynamic> e) =>
+          GarageSaleRentListAccount.fromJson(e)).toList() as M;
     }
     if (<HomeListEntity>[] is M) {
-      return data.map<HomeListEntity>((Map<String, dynamic> e) => HomeListEntity.fromJson(e)).toList() as M;
+      return data.map<HomeListEntity>((Map<String, dynamic> e) =>
+          HomeListEntity.fromJson(e)).toList() as M;
     }
     if (<HomeListBanners>[] is M) {
-      return data.map<HomeListBanners>((Map<String, dynamic> e) => HomeListBanners.fromJson(e)).toList() as M;
+      return data.map<HomeListBanners>((Map<String, dynamic> e) =>
+          HomeListBanners.fromJson(e)).toList() as M;
     }
     if (<HomeListLatestTransactions>[] is M) {
-      return data.map<HomeListLatestTransactions>((Map<String, dynamic> e) => HomeListLatestTransactions.fromJson(e)).toList() as M;
+      return data.map<HomeListLatestTransactions>((Map<String, dynamic> e) =>
+          HomeListLatestTransactions.fromJson(e)).toList() as M;
     }
     if (<HomeListPropertyNews>[] is M) {
-      return data.map<HomeListPropertyNews>((Map<String, dynamic> e) => HomeListPropertyNews.fromJson(e)).toList() as M;
+      return data.map<HomeListPropertyNews>((Map<String, dynamic> e) =>
+          HomeListPropertyNews.fromJson(e)).toList() as M;
     }
     if (<IdNameEntity>[] is M) {
-      return data.map<IdNameEntity>((Map<String, dynamic> e) => IdNameEntity.fromJson(e)).toList() as M;
+      return data.map<IdNameEntity>((Map<String, dynamic> e) =>
+          IdNameEntity.fromJson(e)).toList() as M;
     }
     if (<LatestNewsDetailEntity>[] is M) {
-      return data.map<LatestNewsDetailEntity>((Map<String, dynamic> e) => LatestNewsDetailEntity.fromJson(e)).toList() as M;
+      return data.map<LatestNewsDetailEntity>((Map<String, dynamic> e) =>
+          LatestNewsDetailEntity.fromJson(e)).toList() as M;
     }
     if (<LatestNewsPageEntity>[] is M) {
-      return data.map<LatestNewsPageEntity>((Map<String, dynamic> e) => LatestNewsPageEntity.fromJson(e)).toList() as M;
+      return data.map<LatestNewsPageEntity>((Map<String, dynamic> e) =>
+          LatestNewsPageEntity.fromJson(e)).toList() as M;
     }
     if (<LatestNewsList>[] is M) {
-      return data.map<LatestNewsList>((Map<String, dynamic> e) => LatestNewsList.fromJson(e)).toList() as M;
+      return data.map<LatestNewsList>((Map<String, dynamic> e) =>
+          LatestNewsList.fromJson(e)).toList() as M;
     }
     if (<MyfollowingListEntity>[] is M) {
-      return data.map<MyfollowingListEntity>((Map<String, dynamic> e) => MyfollowingListEntity.fromJson(e)).toList() as M;
+      return data.map<MyfollowingListEntity>((Map<String, dynamic> e) =>
+          MyfollowingListEntity.fromJson(e)).toList() as M;
     }
     if (<MypostsNewsfeedEntity>[] is M) {
-      return data.map<MypostsNewsfeedEntity>((Map<String, dynamic> e) => MypostsNewsfeedEntity.fromJson(e)).toList() as M;
+      return data.map<MypostsNewsfeedEntity>((Map<String, dynamic> e) =>
+          MypostsNewsfeedEntity.fromJson(e)).toList() as M;
     }
     if (<MypostsNewsfeedList>[] is M) {
-      return data.map<MypostsNewsfeedList>((Map<String, dynamic> e) => MypostsNewsfeedList.fromJson(e)).toList() as M;
+      return data.map<MypostsNewsfeedList>((Map<String, dynamic> e) =>
+          MypostsNewsfeedList.fromJson(e)).toList() as M;
     }
     if (<MypostsNewsfeedListAccount>[] is M) {
-      return data.map<MypostsNewsfeedListAccount>((Map<String, dynamic> e) => MypostsNewsfeedListAccount.fromJson(e)).toList() as M;
+      return data.map<MypostsNewsfeedListAccount>((Map<String, dynamic> e) =>
+          MypostsNewsfeedListAccount.fromJson(e)).toList() as M;
     }
     if (<MypostsSaleRentEntity>[] is M) {
-      return data.map<MypostsSaleRentEntity>((Map<String, dynamic> e) => MypostsSaleRentEntity.fromJson(e)).toList() as M;
+      return data.map<MypostsSaleRentEntity>((Map<String, dynamic> e) =>
+          MypostsSaleRentEntity.fromJson(e)).toList() as M;
     }
     if (<MypostsSaleRentList>[] is M) {
-      return data.map<MypostsSaleRentList>((Map<String, dynamic> e) => MypostsSaleRentList.fromJson(e)).toList() as M;
+      return data.map<MypostsSaleRentList>((Map<String, dynamic> e) =>
+          MypostsSaleRentList.fromJson(e)).toList() as M;
     }
     if (<NewsfeedCommentPublishEntity>[] is M) {
-      return data.map<NewsfeedCommentPublishEntity>((Map<String, dynamic> e) => NewsfeedCommentPublishEntity.fromJson(e)).toList() as M;
+      return data.map<NewsfeedCommentPublishEntity>((Map<String, dynamic> e) =>
+          NewsfeedCommentPublishEntity.fromJson(e)).toList() as M;
     }
     if (<NewsfeedDetailEntity>[] is M) {
-      return data.map<NewsfeedDetailEntity>((Map<String, dynamic> e) => NewsfeedDetailEntity.fromJson(e)).toList() as M;
+      return data.map<NewsfeedDetailEntity>((Map<String, dynamic> e) =>
+          NewsfeedDetailEntity.fromJson(e)).toList() as M;
     }
     if (<NewsfeedDetailAccount>[] is M) {
-      return data.map<NewsfeedDetailAccount>((Map<String, dynamic> e) => NewsfeedDetailAccount.fromJson(e)).toList() as M;
+      return data.map<NewsfeedDetailAccount>((Map<String, dynamic> e) =>
+          NewsfeedDetailAccount.fromJson(e)).toList() as M;
     }
     if (<NewsfeedDetailComments>[] is M) {
-      return data.map<NewsfeedDetailComments>((Map<String, dynamic> e) => NewsfeedDetailComments.fromJson(e)).toList() as M;
+      return data.map<NewsfeedDetailComments>((Map<String, dynamic> e) =>
+          NewsfeedDetailComments.fromJson(e)).toList() as M;
     }
     if (<NewsfeedDetailCommentsAccount>[] is M) {
-      return data.map<NewsfeedDetailCommentsAccount>((Map<String, dynamic> e) => NewsfeedDetailCommentsAccount.fromJson(e)).toList() as M;
+      return data.map<NewsfeedDetailCommentsAccount>((Map<String, dynamic> e) =>
+          NewsfeedDetailCommentsAccount.fromJson(e)).toList() as M;
     }
     if (<NewsfeedDetailCommentsToAccount>[] is M) {
-      return data.map<NewsfeedDetailCommentsToAccount>((Map<String, dynamic> e) => NewsfeedDetailCommentsToAccount.fromJson(e)).toList() as M;
+      return data.map<NewsfeedDetailCommentsToAccount>((
+          Map<String, dynamic> e) =>
+          NewsfeedDetailCommentsToAccount.fromJson(e)).toList() as M;
     }
     if (<NewsfeedFollowingEntity>[] is M) {
-      return data.map<NewsfeedFollowingEntity>((Map<String, dynamic> e) => NewsfeedFollowingEntity.fromJson(e)).toList() as M;
+      return data.map<NewsfeedFollowingEntity>((Map<String, dynamic> e) =>
+          NewsfeedFollowingEntity.fromJson(e)).toList() as M;
     }
     if (<NewsfeedFollowingList>[] is M) {
-      return data.map<NewsfeedFollowingList>((Map<String, dynamic> e) => NewsfeedFollowingList.fromJson(e)).toList() as M;
+      return data.map<NewsfeedFollowingList>((Map<String, dynamic> e) =>
+          NewsfeedFollowingList.fromJson(e)).toList() as M;
     }
     if (<NewsfeedFollowingListAccount>[] is M) {
-      return data.map<NewsfeedFollowingListAccount>((Map<String, dynamic> e) => NewsfeedFollowingListAccount.fromJson(e)).toList() as M;
+      return data.map<NewsfeedFollowingListAccount>((Map<String, dynamic> e) =>
+          NewsfeedFollowingListAccount.fromJson(e)).toList() as M;
     }
     if (<NewsfeedForyouEntity>[] is M) {
-      return data.map<NewsfeedForyouEntity>((Map<String, dynamic> e) => NewsfeedForyouEntity.fromJson(e)).toList() as M;
+      return data.map<NewsfeedForyouEntity>((Map<String, dynamic> e) =>
+          NewsfeedForyouEntity.fromJson(e)).toList() as M;
     }
     if (<NewsfeedForyouList>[] is M) {
-      return data.map<NewsfeedForyouList>((Map<String, dynamic> e) => NewsfeedForyouList.fromJson(e)).toList() as M;
+      return data.map<NewsfeedForyouList>((Map<String, dynamic> e) =>
+          NewsfeedForyouList.fromJson(e)).toList() as M;
     }
     if (<NewsfeedForyouListAccount>[] is M) {
-      return data.map<NewsfeedForyouListAccount>((Map<String, dynamic> e) => NewsfeedForyouListAccount.fromJson(e)).toList() as M;
+      return data.map<NewsfeedForyouListAccount>((Map<String, dynamic> e) =>
+          NewsfeedForyouListAccount.fromJson(e)).toList() as M;
     }
     if (<NewsfeedNewsEntity>[] is M) {
-      return data.map<NewsfeedNewsEntity>((Map<String, dynamic> e) => NewsfeedNewsEntity.fromJson(e)).toList() as M;
+      return data.map<NewsfeedNewsEntity>((Map<String, dynamic> e) =>
+          NewsfeedNewsEntity.fromJson(e)).toList() as M;
     }
     if (<NewsfeedNewsList>[] is M) {
-      return data.map<NewsfeedNewsList>((Map<String, dynamic> e) => NewsfeedNewsList.fromJson(e)).toList() as M;
+      return data.map<NewsfeedNewsList>((Map<String, dynamic> e) =>
+          NewsfeedNewsList.fromJson(e)).toList() as M;
     }
     if (<NewsfeedNewsListAccount>[] is M) {
-      return data.map<NewsfeedNewsListAccount>((Map<String, dynamic> e) => NewsfeedNewsListAccount.fromJson(e)).toList() as M;
+      return data.map<NewsfeedNewsListAccount>((Map<String, dynamic> e) =>
+          NewsfeedNewsListAccount.fromJson(e)).toList() as M;
     }
     if (<NoticeBoardAnnounDetailEntity>[] is M) {
-      return data.map<NoticeBoardAnnounDetailEntity>((Map<String, dynamic> e) => NoticeBoardAnnounDetailEntity.fromJson(e)).toList() as M;
+      return data.map<NoticeBoardAnnounDetailEntity>((Map<String, dynamic> e) =>
+          NoticeBoardAnnounDetailEntity.fromJson(e)).toList() as M;
     }
     if (<NoticeBoardAnnounEntity>[] is M) {
-      return data.map<NoticeBoardAnnounEntity>((Map<String, dynamic> e) => NoticeBoardAnnounEntity.fromJson(e)).toList() as M;
+      return data.map<NoticeBoardAnnounEntity>((Map<String, dynamic> e) =>
+          NoticeBoardAnnounEntity.fromJson(e)).toList() as M;
     }
     if (<NoticeBoardAnnounList>[] is M) {
-      return data.map<NoticeBoardAnnounList>((Map<String, dynamic> e) => NoticeBoardAnnounList.fromJson(e)).toList() as M;
+      return data.map<NoticeBoardAnnounList>((Map<String, dynamic> e) =>
+          NoticeBoardAnnounList.fromJson(e)).toList() as M;
     }
     if (<NoticeBoardDocumentsEntity>[] is M) {
-      return data.map<NoticeBoardDocumentsEntity>((Map<String, dynamic> e) => NoticeBoardDocumentsEntity.fromJson(e)).toList() as M;
+      return data.map<NoticeBoardDocumentsEntity>((Map<String, dynamic> e) =>
+          NoticeBoardDocumentsEntity.fromJson(e)).toList() as M;
     }
     if (<NoticeBoardDocumentsList>[] is M) {
-      return data.map<NoticeBoardDocumentsList>((Map<String, dynamic> e) => NoticeBoardDocumentsList.fromJson(e)).toList() as M;
+      return data.map<NoticeBoardDocumentsList>((Map<String, dynamic> e) =>
+          NoticeBoardDocumentsList.fromJson(e)).toList() as M;
     }
     if (<NoticeBoardEventDetailEntity>[] is M) {
-      return data.map<NoticeBoardEventDetailEntity>((Map<String, dynamic> e) => NoticeBoardEventDetailEntity.fromJson(e)).toList() as M;
+      return data.map<NoticeBoardEventDetailEntity>((Map<String, dynamic> e) =>
+          NoticeBoardEventDetailEntity.fromJson(e)).toList() as M;
     }
     if (<NoticeBoardEventEntity>[] is M) {
-      return data.map<NoticeBoardEventEntity>((Map<String, dynamic> e) => NoticeBoardEventEntity.fromJson(e)).toList() as M;
+      return data.map<NoticeBoardEventEntity>((Map<String, dynamic> e) =>
+          NoticeBoardEventEntity.fromJson(e)).toList() as M;
     }
     if (<NoticeBoardEventList>[] is M) {
-      return data.map<NoticeBoardEventList>((Map<String, dynamic> e) => NoticeBoardEventList.fromJson(e)).toList() as M;
+      return data.map<NoticeBoardEventList>((Map<String, dynamic> e) =>
+          NoticeBoardEventList.fromJson(e)).toList() as M;
     }
     if (<PaymentPageEntity>[] is M) {
-      return data.map<PaymentPageEntity>((Map<String, dynamic> e) => PaymentPageEntity.fromJson(e)).toList() as M;
+      return data.map<PaymentPageEntity>((Map<String, dynamic> e) =>
+          PaymentPageEntity.fromJson(e)).toList() as M;
     }
     if (<PaymentPageList>[] is M) {
-      return data.map<PaymentPageList>((Map<String, dynamic> e) => PaymentPageList.fromJson(e)).toList() as M;
+      return data.map<PaymentPageList>((Map<String, dynamic> e) =>
+          PaymentPageList.fromJson(e)).toList() as M;
     }
     if (<PropertyNewsDetailEntity>[] is M) {
-      return data.map<PropertyNewsDetailEntity>((Map<String, dynamic> e) => PropertyNewsDetailEntity.fromJson(e)).toList() as M;
+      return data.map<PropertyNewsDetailEntity>((Map<String, dynamic> e) =>
+          PropertyNewsDetailEntity.fromJson(e)).toList() as M;
     }
     if (<PropertyNewsEntity>[] is M) {
-      return data.map<PropertyNewsEntity>((Map<String, dynamic> e) => PropertyNewsEntity.fromJson(e)).toList() as M;
+      return data.map<PropertyNewsEntity>((Map<String, dynamic> e) =>
+          PropertyNewsEntity.fromJson(e)).toList() as M;
     }
     if (<PropertyNewsList>[] is M) {
-      return data.map<PropertyNewsList>((Map<String, dynamic> e) => PropertyNewsList.fromJson(e)).toList() as M;
+      return data.map<PropertyNewsList>((Map<String, dynamic> e) =>
+          PropertyNewsList.fromJson(e)).toList() as M;
     }
     if (<PropertySaleRentEntity>[] is M) {
-      return data.map<PropertySaleRentEntity>((Map<String, dynamic> e) => PropertySaleRentEntity.fromJson(e)).toList() as M;
+      return data.map<PropertySaleRentEntity>((Map<String, dynamic> e) =>
+          PropertySaleRentEntity.fromJson(e)).toList() as M;
     }
     if (<PropertySaleRentList>[] is M) {
-      return data.map<PropertySaleRentList>((Map<String, dynamic> e) => PropertySaleRentList.fromJson(e)).toList() as M;
+      return data.map<PropertySaleRentList>((Map<String, dynamic> e) =>
+          PropertySaleRentList.fromJson(e)).toList() as M;
     }
     if (<RewardsActiveDetailEntity>[] is M) {
-      return data.map<RewardsActiveDetailEntity>((Map<String, dynamic> e) => RewardsActiveDetailEntity.fromJson(e)).toList() as M;
+      return data.map<RewardsActiveDetailEntity>((Map<String, dynamic> e) =>
+          RewardsActiveDetailEntity.fromJson(e)).toList() as M;
     }
     if (<RewardsActiveDetailData>[] is M) {
-      return data.map<RewardsActiveDetailData>((Map<String, dynamic> e) => RewardsActiveDetailData.fromJson(e)).toList() as M;
+      return data.map<RewardsActiveDetailData>((Map<String, dynamic> e) =>
+          RewardsActiveDetailData.fromJson(e)).toList() as M;
     }
     if (<RewardsActiveDetailDataAccount>[] is M) {
-      return data.map<RewardsActiveDetailDataAccount>((Map<String, dynamic> e) => RewardsActiveDetailDataAccount.fromJson(e)).toList() as M;
+      return data.map<RewardsActiveDetailDataAccount>((
+          Map<String, dynamic> e) => RewardsActiveDetailDataAccount.fromJson(e))
+          .toList() as M;
     }
     if (<RewardsActiveDetailDataReward>[] is M) {
-      return data.map<RewardsActiveDetailDataReward>((Map<String, dynamic> e) => RewardsActiveDetailDataReward.fromJson(e)).toList() as M;
+      return data.map<RewardsActiveDetailDataReward>((Map<String, dynamic> e) =>
+          RewardsActiveDetailDataReward.fromJson(e)).toList() as M;
     }
     if (<RewardsBuyEntity>[] is M) {
-      return data.map<RewardsBuyEntity>((Map<String, dynamic> e) => RewardsBuyEntity.fromJson(e)).toList() as M;
+      return data.map<RewardsBuyEntity>((Map<String, dynamic> e) =>
+          RewardsBuyEntity.fromJson(e)).toList() as M;
     }
     if (<RewardsBuyReward>[] is M) {
-      return data.map<RewardsBuyReward>((Map<String, dynamic> e) => RewardsBuyReward.fromJson(e)).toList() as M;
+      return data.map<RewardsBuyReward>((Map<String, dynamic> e) =>
+          RewardsBuyReward.fromJson(e)).toList() as M;
     }
     if (<RewardsBuyRewardRedeemable>[] is M) {
-      return data.map<RewardsBuyRewardRedeemable>((Map<String, dynamic> e) => RewardsBuyRewardRedeemable.fromJson(e)).toList() as M;
+      return data.map<RewardsBuyRewardRedeemable>((Map<String, dynamic> e) =>
+          RewardsBuyRewardRedeemable.fromJson(e)).toList() as M;
     }
     if (<RewardsCategoryEntity>[] is M) {
-      return data.map<RewardsCategoryEntity>((Map<String, dynamic> e) => RewardsCategoryEntity.fromJson(e)).toList() as M;
+      return data.map<RewardsCategoryEntity>((Map<String, dynamic> e) =>
+          RewardsCategoryEntity.fromJson(e)).toList() as M;
     }
     if (<RewardsDetailEntity>[] is M) {
-      return data.map<RewardsDetailEntity>((Map<String, dynamic> e) => RewardsDetailEntity.fromJson(e)).toList() as M;
+      return data.map<RewardsDetailEntity>((Map<String, dynamic> e) =>
+          RewardsDetailEntity.fromJson(e)).toList() as M;
     }
     if (<RewardsDetailRedeemable>[] is M) {
-      return data.map<RewardsDetailRedeemable>((Map<String, dynamic> e) => RewardsDetailRedeemable.fromJson(e)).toList() as M;
+      return data.map<RewardsDetailRedeemable>((Map<String, dynamic> e) =>
+          RewardsDetailRedeemable.fromJson(e)).toList() as M;
     }
     if (<RewardsHistoryEarnedEntity>[] is M) {
-      return data.map<RewardsHistoryEarnedEntity>((Map<String, dynamic> e) => RewardsHistoryEarnedEntity.fromJson(e)).toList() as M;
+      return data.map<RewardsHistoryEarnedEntity>((Map<String, dynamic> e) =>
+          RewardsHistoryEarnedEntity.fromJson(e)).toList() as M;
     }
     if (<RewardsHistoryEarnedList>[] is M) {
-      return data.map<RewardsHistoryEarnedList>((Map<String, dynamic> e) => RewardsHistoryEarnedList.fromJson(e)).toList() as M;
+      return data.map<RewardsHistoryEarnedList>((Map<String, dynamic> e) =>
+          RewardsHistoryEarnedList.fromJson(e)).toList() as M;
     }
     if (<RewardsHomeEntity>[] is M) {
-      return data.map<RewardsHomeEntity>((Map<String, dynamic> e) => RewardsHomeEntity.fromJson(e)).toList() as M;
+      return data.map<RewardsHomeEntity>((Map<String, dynamic> e) =>
+          RewardsHomeEntity.fromJson(e)).toList() as M;
     }
     if (<RewardsHomeData>[] is M) {
-      return data.map<RewardsHomeData>((Map<String, dynamic> e) => RewardsHomeData.fromJson(e)).toList() as M;
+      return data.map<RewardsHomeData>((Map<String, dynamic> e) =>
+          RewardsHomeData.fromJson(e)).toList() as M;
     }
     if (<RewardsHomeDataRewards>[] is M) {
-      return data.map<RewardsHomeDataRewards>((Map<String, dynamic> e) => RewardsHomeDataRewards.fromJson(e)).toList() as M;
+      return data.map<RewardsHomeDataRewards>((Map<String, dynamic> e) =>
+          RewardsHomeDataRewards.fromJson(e)).toList() as M;
     }
     if (<RewardsHomeTesEntity>[] is M) {
-      return data.map<RewardsHomeTesEntity>((Map<String, dynamic> e) => RewardsHomeTesEntity.fromJson(e)).toList() as M;
+      return data.map<RewardsHomeTesEntity>((Map<String, dynamic> e) =>
+          RewardsHomeTesEntity.fromJson(e)).toList() as M;
     }
     if (<RewardsHomeTesRewards>[] is M) {
-      return data.map<RewardsHomeTesRewards>((Map<String, dynamic> e) => RewardsHomeTesRewards.fromJson(e)).toList() as M;
+      return data.map<RewardsHomeTesRewards>((Map<String, dynamic> e) =>
+          RewardsHomeTesRewards.fromJson(e)).toList() as M;
     }
     if (<RewardsHomeTestEntity>[] is M) {
-      return data.map<RewardsHomeTestEntity>((Map<String, dynamic> e) => RewardsHomeTestEntity.fromJson(e)).toList() as M;
+      return data.map<RewardsHomeTestEntity>((Map<String, dynamic> e) =>
+          RewardsHomeTestEntity.fromJson(e)).toList() as M;
     }
     if (<RewardsHomeTxEntity>[] is M) {
-      return data.map<RewardsHomeTxEntity>((Map<String, dynamic> e) => RewardsHomeTxEntity.fromJson(e)).toList() as M;
+      return data.map<RewardsHomeTxEntity>((Map<String, dynamic> e) =>
+          RewardsHomeTxEntity.fromJson(e)).toList() as M;
     }
     if (<RewardsIndexEntity>[] is M) {
-      return data.map<RewardsIndexEntity>((Map<String, dynamic> e) => RewardsIndexEntity.fromJson(e)).toList() as M;
+      return data.map<RewardsIndexEntity>((Map<String, dynamic> e) =>
+          RewardsIndexEntity.fromJson(e)).toList() as M;
     }
     if (<RewardsIndexContinuous>[] is M) {
-      return data.map<RewardsIndexContinuous>((Map<String, dynamic> e) => RewardsIndexContinuous.fromJson(e)).toList() as M;
+      return data.map<RewardsIndexContinuous>((Map<String, dynamic> e) =>
+          RewardsIndexContinuous.fromJson(e)).toList() as M;
     }
     if (<RewardsIndexTasks>[] is M) {
-      return data.map<RewardsIndexTasks>((Map<String, dynamic> e) => RewardsIndexTasks.fromJson(e)).toList() as M;
+      return data.map<RewardsIndexTasks>((Map<String, dynamic> e) =>
+          RewardsIndexTasks.fromJson(e)).toList() as M;
     }
     if (<RewardsListEntity>[] is M) {
-      return data.map<RewardsListEntity>((Map<String, dynamic> e) => RewardsListEntity.fromJson(e)).toList() as M;
+      return data.map<RewardsListEntity>((Map<String, dynamic> e) =>
+          RewardsListEntity.fromJson(e)).toList() as M;
     }
     if (<RewardsListList>[] is M) {
-      return data.map<RewardsListList>((Map<String, dynamic> e) => RewardsListList.fromJson(e)).toList() as M;
+      return data.map<RewardsListList>((Map<String, dynamic> e) =>
+          RewardsListList.fromJson(e)).toList() as M;
     }
     if (<RewardsMyDetailEntity>[] is M) {
-      return data.map<RewardsMyDetailEntity>((Map<String, dynamic> e) => RewardsMyDetailEntity.fromJson(e)).toList() as M;
+      return data.map<RewardsMyDetailEntity>((Map<String, dynamic> e) =>
+          RewardsMyDetailEntity.fromJson(e)).toList() as M;
     }
     if (<RewardsMyDetailAccount>[] is M) {
-      return data.map<RewardsMyDetailAccount>((Map<String, dynamic> e) => RewardsMyDetailAccount.fromJson(e)).toList() as M;
+      return data.map<RewardsMyDetailAccount>((Map<String, dynamic> e) =>
+          RewardsMyDetailAccount.fromJson(e)).toList() as M;
     }
     if (<RewardsMyDetailReward>[] is M) {
-      return data.map<RewardsMyDetailReward>((Map<String, dynamic> e) => RewardsMyDetailReward.fromJson(e)).toList() as M;
+      return data.map<RewardsMyDetailReward>((Map<String, dynamic> e) =>
+          RewardsMyDetailReward.fromJson(e)).toList() as M;
     }
     if (<RewardsMyEntity>[] is M) {
-      return data.map<RewardsMyEntity>((Map<String, dynamic> e) => RewardsMyEntity.fromJson(e)).toList() as M;
+      return data.map<RewardsMyEntity>((Map<String, dynamic> e) =>
+          RewardsMyEntity.fromJson(e)).toList() as M;
     }
     if (<RewardsMyList>[] is M) {
-      return data.map<RewardsMyList>((Map<String, dynamic> e) => RewardsMyList.fromJson(e)).toList() as M;
+      return data.map<RewardsMyList>((Map<String, dynamic> e) =>
+          RewardsMyList.fromJson(e)).toList() as M;
     }
     if (<RewardsMyListReward>[] is M) {
-      return data.map<RewardsMyListReward>((Map<String, dynamic> e) => RewardsMyListReward.fromJson(e)).toList() as M;
+      return data.map<RewardsMyListReward>((Map<String, dynamic> e) =>
+          RewardsMyListReward.fromJson(e)).toList() as M;
     }
     if (<RewardsSearchEntity>[] is M) {
-      return data.map<RewardsSearchEntity>((Map<String, dynamic> e) => RewardsSearchEntity.fromJson(e)).toList() as M;
+      return data.map<RewardsSearchEntity>((Map<String, dynamic> e) =>
+          RewardsSearchEntity.fromJson(e)).toList() as M;
     }
     if (<RewardsSearchRewards>[] is M) {
-      return data.map<RewardsSearchRewards>((Map<String, dynamic> e) => RewardsSearchRewards.fromJson(e)).toList() as M;
+      return data.map<RewardsSearchRewards>((Map<String, dynamic> e) =>
+          RewardsSearchRewards.fromJson(e)).toList() as M;
     }
     if (<ServerTime>[] is M) {
-      return data.map<ServerTime>((Map<String, dynamic> e) => ServerTime.fromJson(e)).toList() as M;
+      return data.map<ServerTime>((Map<String, dynamic> e) =>
+          ServerTime.fromJson(e)).toList() as M;
+    }
+    if (<ServiceEvaluateListEntity>[] is M) {
+      return data.map<ServiceEvaluateListEntity>((Map<String, dynamic> e) =>
+          ServiceEvaluateListEntity.fromJson(e)).toList() as M;
+    }
+    if (<ServiceEvaluateListList>[] is M) {
+      return data.map<ServiceEvaluateListList>((Map<String, dynamic> e) =>
+          ServiceEvaluateListList.fromJson(e)).toList() as M;
+    }
+    if (<ServiceEvaluateListListAccount>[] is M) {
+      return data.map<ServiceEvaluateListListAccount>((
+          Map<String, dynamic> e) => ServiceEvaluateListListAccount.fromJson(e))
+          .toList() as M;
+    }
+    if (<ServiceRepairDetailEntity>[] is M) {
+      return data.map<ServiceRepairDetailEntity>((Map<String, dynamic> e) =>
+          ServiceRepairDetailEntity.fromJson(e)).toList() as M;
+    }
+    if (<ServiceRepairDetailMerchant>[] is M) {
+      return data.map<ServiceRepairDetailMerchant>((Map<String, dynamic> e) =>
+          ServiceRepairDetailMerchant.fromJson(e)).toList() as M;
+    }
+    if (<ServiceRepairDetailCategory>[] is M) {
+      return data.map<ServiceRepairDetailCategory>((Map<String, dynamic> e) =>
+          ServiceRepairDetailCategory.fromJson(e)).toList() as M;
     }
     if (<TextKonEntity>[] is M) {
-      return data.map<TextKonEntity>((Map<String, dynamic> e) => TextKonEntity.fromJson(e)).toList() as M;
+      return data.map<TextKonEntity>((Map<String, dynamic> e) =>
+          TextKonEntity.fromJson(e)).toList() as M;
     }
     if (<UserMeEntity>[] is M) {
-      return data.map<UserMeEntity>((Map<String, dynamic> e) => UserMeEntity.fromJson(e)).toList() as M;
+      return data.map<UserMeEntity>((Map<String, dynamic> e) =>
+          UserMeEntity.fromJson(e)).toList() as M;
     }
     if (<UserMeHouseholds>[] is M) {
-      return data.map<UserMeHouseholds>((Map<String, dynamic> e) => UserMeHouseholds.fromJson(e)).toList() as M;
+      return data.map<UserMeHouseholds>((Map<String, dynamic> e) =>
+          UserMeHouseholds.fromJson(e)).toList() as M;
     }
     if (<UserMeEstates>[] is M) {
-      return data.map<UserMeEstates>((Map<String, dynamic> e) => UserMeEstates.fromJson(e)).toList() as M;
+      return data.map<UserMeEstates>((Map<String, dynamic> e) =>
+          UserMeEstates.fromJson(e)).toList() as M;
     }
     if (<UserMeEstatesAccounts>[] is M) {
-      return data.map<UserMeEstatesAccounts>((Map<String, dynamic> e) => UserMeEstatesAccounts.fromJson(e)).toList() as M;
+      return data.map<UserMeEstatesAccounts>((Map<String, dynamic> e) =>
+          UserMeEstatesAccounts.fromJson(e)).toList() as M;
     }
     if (<UserMeEstatesAccountsUnit>[] is M) {
-      return data.map<UserMeEstatesAccountsUnit>((Map<String, dynamic> e) => UserMeEstatesAccountsUnit.fromJson(e)).toList() as M;
+      return data.map<UserMeEstatesAccountsUnit>((Map<String, dynamic> e) =>
+          UserMeEstatesAccountsUnit.fromJson(e)).toList() as M;
     }
     if (<UserMeDefaultUnit>[] is M) {
-      return data.map<UserMeDefaultUnit>((Map<String, dynamic> e) => UserMeDefaultUnit.fromJson(e)).toList() as M;
+      return data.map<UserMeDefaultUnit>((Map<String, dynamic> e) =>
+          UserMeDefaultUnit.fromJson(e)).toList() as M;
     }
     if (<UserMeInformation>[] is M) {
-      return data.map<UserMeInformation>((Map<String, dynamic> e) => UserMeInformation.fromJson(e)).toList() as M;
+      return data.map<UserMeInformation>((Map<String, dynamic> e) =>
+          UserMeInformation.fromJson(e)).toList() as M;
     }
     if (<VisitorPageEntity>[] is M) {
-      return data.map<VisitorPageEntity>((Map<String, dynamic> e) => VisitorPageEntity.fromJson(e)).toList() as M;
+      return data.map<VisitorPageEntity>((Map<String, dynamic> e) =>
+          VisitorPageEntity.fromJson(e)).toList() as M;
     }
     if (<VisitorPageList>[] is M) {
-      return data.map<VisitorPageList>((Map<String, dynamic> e) => VisitorPageList.fromJson(e)).toList() as M;
+      return data.map<VisitorPageList>((Map<String, dynamic> e) =>
+          VisitorPageList.fromJson(e)).toList() as M;
     }
 
     debugPrint("$M not found");
@@ -552,7 +703,8 @@ class JsonConvert {
       return json;
     }
     if (json is List) {
-      return _getListChildType<M>(json.map((dynamic e) => e as Map<String, dynamic>).toList());
+      return _getListChildType<M>(
+          json.map((dynamic e) => e as Map<String, dynamic>).toList());
     } else {
       return jsonConvert.convert<M>(json);
     }
@@ -566,14 +718,17 @@ class JsonConvertClassCollection {
     (FacilityBookEntity).toString(): FacilityBookEntity.fromJson,
     (FacilityBookFacilityType).toString(): FacilityBookFacilityType.fromJson,
     (FacilityBookFacilities).toString(): FacilityBookFacilities.fromJson,
-    (FacilityBookFacilitiesPeriods).toString(): FacilityBookFacilitiesPeriods.fromJson,
+    (FacilityBookFacilitiesPeriods).toString(): FacilityBookFacilitiesPeriods
+        .fromJson,
     (FacilityIndexEntity).toString(): FacilityIndexEntity.fromJson,
     (FacilityPageEntity).toString(): FacilityPageEntity.fromJson,
     (FacilityDetail).toString(): FacilityDetail.fromJson,
     (FacilityPageListBooking).toString(): FacilityPageListBooking.fromJson,
     (FacilityPageListFacility).toString(): FacilityPageListFacility.fromJson,
-    (FacilityPageListFacilityType).toString(): FacilityPageListFacilityType.fromJson,
-    (FacilityPageListTimePeriod).toString(): FacilityPageListTimePeriod.fromJson,
+    (FacilityPageListFacilityType).toString(): FacilityPageListFacilityType
+        .fromJson,
+    (FacilityPageListTimePeriod).toString(): FacilityPageListTimePeriod
+        .fromJson,
     (FacilityPageListAccount).toString(): FacilityPageListAccount.fromJson,
     (FeedbackDetailEntity).toString(): FeedbackDetailEntity.fromJson,
     (FeedbackDetailReplies).toString(): FeedbackDetailReplies.fromJson,
@@ -584,16 +739,20 @@ class JsonConvertClassCollection {
     (FormListEntity).toString(): FormListEntity.fromJson,
     (FormOptionEntity).toString(): FormOptionEntity.fromJson,
     (FormSubmittedEntity).toString(): FormSubmittedEntity.fromJson,
-    (FormSubmittedEstateOnlineForm).toString(): FormSubmittedEstateOnlineForm.fromJson,
+    (FormSubmittedEstateOnlineForm).toString(): FormSubmittedEstateOnlineForm
+        .fromJson,
     (FormSubmittedPageEntity).toString(): FormSubmittedPageEntity.fromJson,
-    (GarageSaleRentDetailEntity).toString(): GarageSaleRentDetailEntity.fromJson,
-    (GarageSaleRentDetailAccount).toString(): GarageSaleRentDetailAccount.fromJson,
+    (GarageSaleRentDetailEntity).toString(): GarageSaleRentDetailEntity
+        .fromJson,
+    (GarageSaleRentDetailAccount).toString(): GarageSaleRentDetailAccount
+        .fromJson,
     (GarageSaleRentEntity).toString(): GarageSaleRentEntity.fromJson,
     (GarageSaleRentList).toString(): GarageSaleRentList.fromJson,
     (GarageSaleRentListAccount).toString(): GarageSaleRentListAccount.fromJson,
     (HomeListEntity).toString(): HomeListEntity.fromJson,
     (HomeListBanners).toString(): HomeListBanners.fromJson,
-    (HomeListLatestTransactions).toString(): HomeListLatestTransactions.fromJson,
+    (HomeListLatestTransactions).toString(): HomeListLatestTransactions
+        .fromJson,
     (HomeListPropertyNews).toString(): HomeListPropertyNews.fromJson,
     (IdNameEntity).toString(): IdNameEntity.fromJson,
     (LatestNewsDetailEntity).toString(): LatestNewsDetailEntity.fromJson,
@@ -602,30 +761,38 @@ class JsonConvertClassCollection {
     (MyfollowingListEntity).toString(): MyfollowingListEntity.fromJson,
     (MypostsNewsfeedEntity).toString(): MypostsNewsfeedEntity.fromJson,
     (MypostsNewsfeedList).toString(): MypostsNewsfeedList.fromJson,
-    (MypostsNewsfeedListAccount).toString(): MypostsNewsfeedListAccount.fromJson,
+    (MypostsNewsfeedListAccount).toString(): MypostsNewsfeedListAccount
+        .fromJson,
     (MypostsSaleRentEntity).toString(): MypostsSaleRentEntity.fromJson,
     (MypostsSaleRentList).toString(): MypostsSaleRentList.fromJson,
-    (NewsfeedCommentPublishEntity).toString(): NewsfeedCommentPublishEntity.fromJson,
+    (NewsfeedCommentPublishEntity).toString(): NewsfeedCommentPublishEntity
+        .fromJson,
     (NewsfeedDetailEntity).toString(): NewsfeedDetailEntity.fromJson,
     (NewsfeedDetailAccount).toString(): NewsfeedDetailAccount.fromJson,
     (NewsfeedDetailComments).toString(): NewsfeedDetailComments.fromJson,
-    (NewsfeedDetailCommentsAccount).toString(): NewsfeedDetailCommentsAccount.fromJson,
-    (NewsfeedDetailCommentsToAccount).toString(): NewsfeedDetailCommentsToAccount.fromJson,
+    (NewsfeedDetailCommentsAccount).toString(): NewsfeedDetailCommentsAccount
+        .fromJson,
+    (NewsfeedDetailCommentsToAccount)
+        .toString(): NewsfeedDetailCommentsToAccount.fromJson,
     (NewsfeedFollowingEntity).toString(): NewsfeedFollowingEntity.fromJson,
     (NewsfeedFollowingList).toString(): NewsfeedFollowingList.fromJson,
-    (NewsfeedFollowingListAccount).toString(): NewsfeedFollowingListAccount.fromJson,
+    (NewsfeedFollowingListAccount).toString(): NewsfeedFollowingListAccount
+        .fromJson,
     (NewsfeedForyouEntity).toString(): NewsfeedForyouEntity.fromJson,
     (NewsfeedForyouList).toString(): NewsfeedForyouList.fromJson,
     (NewsfeedForyouListAccount).toString(): NewsfeedForyouListAccount.fromJson,
     (NewsfeedNewsEntity).toString(): NewsfeedNewsEntity.fromJson,
     (NewsfeedNewsList).toString(): NewsfeedNewsList.fromJson,
     (NewsfeedNewsListAccount).toString(): NewsfeedNewsListAccount.fromJson,
-    (NoticeBoardAnnounDetailEntity).toString(): NoticeBoardAnnounDetailEntity.fromJson,
+    (NoticeBoardAnnounDetailEntity).toString(): NoticeBoardAnnounDetailEntity
+        .fromJson,
     (NoticeBoardAnnounEntity).toString(): NoticeBoardAnnounEntity.fromJson,
     (NoticeBoardAnnounList).toString(): NoticeBoardAnnounList.fromJson,
-    (NoticeBoardDocumentsEntity).toString(): NoticeBoardDocumentsEntity.fromJson,
+    (NoticeBoardDocumentsEntity).toString(): NoticeBoardDocumentsEntity
+        .fromJson,
     (NoticeBoardDocumentsList).toString(): NoticeBoardDocumentsList.fromJson,
-    (NoticeBoardEventDetailEntity).toString(): NoticeBoardEventDetailEntity.fromJson,
+    (NoticeBoardEventDetailEntity).toString(): NoticeBoardEventDetailEntity
+        .fromJson,
     (NoticeBoardEventEntity).toString(): NoticeBoardEventEntity.fromJson,
     (NoticeBoardEventList).toString(): NoticeBoardEventList.fromJson,
     (PaymentPageEntity).toString(): PaymentPageEntity.fromJson,
@@ -637,15 +804,19 @@ class JsonConvertClassCollection {
     (PropertySaleRentList).toString(): PropertySaleRentList.fromJson,
     (RewardsActiveDetailEntity).toString(): RewardsActiveDetailEntity.fromJson,
     (RewardsActiveDetailData).toString(): RewardsActiveDetailData.fromJson,
-    (RewardsActiveDetailDataAccount).toString(): RewardsActiveDetailDataAccount.fromJson,
-    (RewardsActiveDetailDataReward).toString(): RewardsActiveDetailDataReward.fromJson,
+    (RewardsActiveDetailDataAccount).toString(): RewardsActiveDetailDataAccount
+        .fromJson,
+    (RewardsActiveDetailDataReward).toString(): RewardsActiveDetailDataReward
+        .fromJson,
     (RewardsBuyEntity).toString(): RewardsBuyEntity.fromJson,
     (RewardsBuyReward).toString(): RewardsBuyReward.fromJson,
-    (RewardsBuyRewardRedeemable).toString(): RewardsBuyRewardRedeemable.fromJson,
+    (RewardsBuyRewardRedeemable).toString(): RewardsBuyRewardRedeemable
+        .fromJson,
     (RewardsCategoryEntity).toString(): RewardsCategoryEntity.fromJson,
     (RewardsDetailEntity).toString(): RewardsDetailEntity.fromJson,
     (RewardsDetailRedeemable).toString(): RewardsDetailRedeemable.fromJson,
-    (RewardsHistoryEarnedEntity).toString(): RewardsHistoryEarnedEntity.fromJson,
+    (RewardsHistoryEarnedEntity).toString(): RewardsHistoryEarnedEntity
+        .fromJson,
     (RewardsHistoryEarnedList).toString(): RewardsHistoryEarnedList.fromJson,
     (RewardsHomeEntity).toString(): RewardsHomeEntity.fromJson,
     (RewardsHomeData).toString(): RewardsHomeData.fromJson,
@@ -668,6 +839,15 @@ class JsonConvertClassCollection {
     (RewardsSearchEntity).toString(): RewardsSearchEntity.fromJson,
     (RewardsSearchRewards).toString(): RewardsSearchRewards.fromJson,
     (ServerTime).toString(): ServerTime.fromJson,
+    (ServiceEvaluateListEntity).toString(): ServiceEvaluateListEntity.fromJson,
+    (ServiceEvaluateListList).toString(): ServiceEvaluateListList.fromJson,
+    (ServiceEvaluateListListAccount).toString(): ServiceEvaluateListListAccount
+        .fromJson,
+    (ServiceRepairDetailEntity).toString(): ServiceRepairDetailEntity.fromJson,
+    (ServiceRepairDetailMerchant).toString(): ServiceRepairDetailMerchant
+        .fromJson,
+    (ServiceRepairDetailCategory).toString(): ServiceRepairDetailCategory
+        .fromJson,
     (TextKonEntity).toString(): TextKonEntity.fromJson,
     (UserMeEntity).toString(): UserMeEntity.fromJson,
     (UserMeHouseholds).toString(): UserMeHouseholds.fromJson,

+ 31 - 14
packages/cs_domain/lib/generated/json/facility_book_entity.g.dart

@@ -7,16 +7,22 @@ FacilityBookEntity $FacilityBookEntityFromJson(Map<String, dynamic> json) {
   if (remainQuota != null) {
     facilityBookEntity.remainQuota = remainQuota;
   }
-  final String? quotaResetOn = jsonConvert.convert<String>(json['quota_reset_on']);
+  final String? quotaResetOn = jsonConvert.convert<String>(
+      json['quota_reset_on']);
   if (quotaResetOn != null) {
     facilityBookEntity.quotaResetOn = quotaResetOn;
   }
-  final FacilityBookFacilityType? facilityType = jsonConvert.convert<FacilityBookFacilityType>(json['facility_type']);
+  final FacilityBookFacilityType? facilityType = jsonConvert.convert<
+      FacilityBookFacilityType>(json['facility_type']);
   if (facilityType != null) {
     facilityBookEntity.facilityType = facilityType;
   }
-  final List<FacilityBookFacilities>? facilities = (json['facilities'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<FacilityBookFacilities>(e) as FacilityBookFacilities).toList();
+  final List<FacilityBookFacilities>? facilities = (json['facilities'] as List<
+      dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<FacilityBookFacilities>(e) as FacilityBookFacilities)
+      .toList();
   if (facilities != null) {
     facilityBookEntity.facilities = facilities;
   }
@@ -47,9 +53,11 @@ extension FacilityBookEntityExtension on FacilityBookEntity {
   }
 }
 
-FacilityBookFacilityType $FacilityBookFacilityTypeFromJson(Map<String, dynamic> json) {
+FacilityBookFacilityType $FacilityBookFacilityTypeFromJson(
+    Map<String, dynamic> json) {
   final FacilityBookFacilityType facilityBookFacilityType = FacilityBookFacilityType();
-  final int? bookAdvanceDays = jsonConvert.convert<int>(json['book_advance_days']);
+  final int? bookAdvanceDays = jsonConvert.convert<int>(
+      json['book_advance_days']);
   if (bookAdvanceDays != null) {
     facilityBookFacilityType.bookAdvanceDays = bookAdvanceDays;
   }
@@ -57,14 +65,16 @@ FacilityBookFacilityType $FacilityBookFacilityTypeFromJson(Map<String, dynamic>
   if (quota != null) {
     facilityBookFacilityType.quota = quota;
   }
-  final String? quotaResetType = jsonConvert.convert<String>(json['quota_reset_type']);
+  final String? quotaResetType = jsonConvert.convert<String>(
+      json['quota_reset_type']);
   if (quotaResetType != null) {
     facilityBookFacilityType.quotaResetType = quotaResetType;
   }
   return facilityBookFacilityType;
 }
 
-Map<String, dynamic> $FacilityBookFacilityTypeToJson(FacilityBookFacilityType entity) {
+Map<String, dynamic> $FacilityBookFacilityTypeToJson(
+    FacilityBookFacilityType entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['book_advance_days'] = entity.bookAdvanceDays;
   data['quota'] = entity.quota;
@@ -85,7 +95,8 @@ extension FacilityBookFacilityTypeExtension on FacilityBookFacilityType {
   }
 }
 
-FacilityBookFacilities $FacilityBookFacilitiesFromJson(Map<String, dynamic> json) {
+FacilityBookFacilities $FacilityBookFacilitiesFromJson(
+    Map<String, dynamic> json) {
   final FacilityBookFacilities facilityBookFacilities = FacilityBookFacilities();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -95,15 +106,19 @@ FacilityBookFacilities $FacilityBookFacilitiesFromJson(Map<String, dynamic> json
   if (name != null) {
     facilityBookFacilities.name = name;
   }
-  final List<FacilityBookFacilitiesPeriods>? periods = (json['periods'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<FacilityBookFacilitiesPeriods>(e) as FacilityBookFacilitiesPeriods).toList();
+  final List<FacilityBookFacilitiesPeriods>? periods = (json['periods'] as List<
+      dynamic>?)?.map(
+          (e) =>
+      jsonConvert.convert<FacilityBookFacilitiesPeriods>(
+          e) as FacilityBookFacilitiesPeriods).toList();
   if (periods != null) {
     facilityBookFacilities.periods = periods;
   }
   return facilityBookFacilities;
 }
 
-Map<String, dynamic> $FacilityBookFacilitiesToJson(FacilityBookFacilities entity) {
+Map<String, dynamic> $FacilityBookFacilitiesToJson(
+    FacilityBookFacilities entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -124,7 +139,8 @@ extension FacilityBookFacilitiesExtension on FacilityBookFacilities {
   }
 }
 
-FacilityBookFacilitiesPeriods $FacilityBookFacilitiesPeriodsFromJson(Map<String, dynamic> json) {
+FacilityBookFacilitiesPeriods $FacilityBookFacilitiesPeriodsFromJson(
+    Map<String, dynamic> json) {
   final FacilityBookFacilitiesPeriods facilityBookFacilitiesPeriods = FacilityBookFacilitiesPeriods();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -157,7 +173,8 @@ FacilityBookFacilitiesPeriods $FacilityBookFacilitiesPeriodsFromJson(Map<String,
   return facilityBookFacilitiesPeriods;
 }
 
-Map<String, dynamic> $FacilityBookFacilitiesPeriodsToJson(FacilityBookFacilitiesPeriods entity) {
+Map<String, dynamic> $FacilityBookFacilitiesPeriodsToJson(
+    FacilityBookFacilitiesPeriods entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['start'] = entity.start;

+ 4 - 2
packages/cs_domain/lib/generated/json/facility_index_entity.g.dart

@@ -15,8 +15,10 @@ FacilityIndexEntity $FacilityIndexEntityFromJson(Map<String, dynamic> json) {
   if (name != null) {
     facilityIndexEntity.name = name;
   }
-  final List<String>? mapResources = (json['map_resources'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<String>(e) as String).toList();
+  final List<String>? mapResources = (json['map_resources'] as List<dynamic>?)
+      ?.map(
+          (e) => jsonConvert.convert<String>(e) as String)
+      .toList();
   if (mapResources != null) {
     facilityIndexEntity.mapResources = mapResources;
   }

+ 40 - 20
packages/cs_domain/lib/generated/json/facility_page_entity.g.dart

@@ -19,12 +19,15 @@ FacilityPageEntity $FacilityPageEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     facilityPageEntity.countPage = countPage;
   }
-  final String? totalDeposit = jsonConvert.convert<String>(json['total_deposit']);
+  final String? totalDeposit = jsonConvert.convert<String>(
+      json['total_deposit']);
   if (totalDeposit != null) {
     facilityPageEntity.totalDeposit = totalDeposit;
   }
-  final List<FacilityDetail>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<FacilityDetail>(e) as FacilityDetail).toList();
+  final List<FacilityDetail>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) => jsonConvert.convert<FacilityDetail>(e) as FacilityDetail)
+      .toList();
   if (list != null) {
     facilityPageEntity.list = list;
   }
@@ -63,19 +66,23 @@ extension FacilityPageEntityExtension on FacilityPageEntity {
 
 FacilityDetail $FacilityDetailFromJson(Map<String, dynamic> json) {
   final FacilityDetail facilityDetail = FacilityDetail();
-  final FacilityPageListBooking? booking = jsonConvert.convert<FacilityPageListBooking>(json['booking']);
+  final FacilityPageListBooking? booking = jsonConvert.convert<
+      FacilityPageListBooking>(json['booking']);
   if (booking != null) {
     facilityDetail.booking = booking;
   }
-  final FacilityPageListFacility? facility = jsonConvert.convert<FacilityPageListFacility>(json['facility']);
+  final FacilityPageListFacility? facility = jsonConvert.convert<
+      FacilityPageListFacility>(json['facility']);
   if (facility != null) {
     facilityDetail.facility = facility;
   }
-  final FacilityPageListTimePeriod? timePeriod = jsonConvert.convert<FacilityPageListTimePeriod>(json['time_period']);
+  final FacilityPageListTimePeriod? timePeriod = jsonConvert.convert<
+      FacilityPageListTimePeriod>(json['time_period']);
   if (timePeriod != null) {
     facilityDetail.timePeriod = timePeriod;
   }
-  final FacilityPageListAccount? account = jsonConvert.convert<FacilityPageListAccount>(json['account']);
+  final FacilityPageListAccount? account = jsonConvert.convert<
+      FacilityPageListAccount>(json['account']);
   if (account != null) {
     facilityDetail.account = account;
   }
@@ -106,7 +113,8 @@ extension FacilityDetailExtension on FacilityDetail {
   }
 }
 
-FacilityPageListBooking $FacilityPageListBookingFromJson(Map<String, dynamic> json) {
+FacilityPageListBooking $FacilityPageListBookingFromJson(
+    Map<String, dynamic> json) {
   final FacilityPageListBooking facilityPageListBooking = FacilityPageListBooking();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -128,18 +136,21 @@ FacilityPageListBooking $FacilityPageListBookingFromJson(Map<String, dynamic> js
   if (depositPaid != null) {
     facilityPageListBooking.depositPaid = depositPaid;
   }
-  final String? depositRefund = jsonConvert.convert<String>(json['deposit_refund']);
+  final String? depositRefund = jsonConvert.convert<String>(
+      json['deposit_refund']);
   if (depositRefund != null) {
     facilityPageListBooking.depositRefund = depositRefund;
   }
-  final String? depositRefundAt = jsonConvert.convert<String>(json['deposit_refund_at']);
+  final String? depositRefundAt = jsonConvert.convert<String>(
+      json['deposit_refund_at']);
   if (depositRefundAt != null) {
     facilityPageListBooking.depositRefundAt = depositRefundAt;
   }
   return facilityPageListBooking;
 }
 
-Map<String, dynamic> $FacilityPageListBookingToJson(FacilityPageListBooking entity) {
+Map<String, dynamic> $FacilityPageListBookingToJson(
+    FacilityPageListBooking entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['date'] = entity.date;
@@ -172,7 +183,8 @@ extension FacilityPageListBookingExtension on FacilityPageListBooking {
   }
 }
 
-FacilityPageListFacility $FacilityPageListFacilityFromJson(Map<String, dynamic> json) {
+FacilityPageListFacility $FacilityPageListFacilityFromJson(
+    Map<String, dynamic> json) {
   final FacilityPageListFacility facilityPageListFacility = FacilityPageListFacility();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -182,14 +194,16 @@ FacilityPageListFacility $FacilityPageListFacilityFromJson(Map<String, dynamic>
   if (name != null) {
     facilityPageListFacility.name = name;
   }
-  final FacilityPageListFacilityType? type = jsonConvert.convert<FacilityPageListFacilityType>(json['type']);
+  final FacilityPageListFacilityType? type = jsonConvert.convert<
+      FacilityPageListFacilityType>(json['type']);
   if (type != null) {
     facilityPageListFacility.type = type;
   }
   return facilityPageListFacility;
 }
 
-Map<String, dynamic> $FacilityPageListFacilityToJson(FacilityPageListFacility entity) {
+Map<String, dynamic> $FacilityPageListFacilityToJson(
+    FacilityPageListFacility entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -210,7 +224,8 @@ extension FacilityPageListFacilityExtension on FacilityPageListFacility {
   }
 }
 
-FacilityPageListFacilityType $FacilityPageListFacilityTypeFromJson(Map<String, dynamic> json) {
+FacilityPageListFacilityType $FacilityPageListFacilityTypeFromJson(
+    Map<String, dynamic> json) {
   final FacilityPageListFacilityType facilityPageListFacilityType = FacilityPageListFacilityType();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -223,7 +238,8 @@ FacilityPageListFacilityType $FacilityPageListFacilityTypeFromJson(Map<String, d
   return facilityPageListFacilityType;
 }
 
-Map<String, dynamic> $FacilityPageListFacilityTypeToJson(FacilityPageListFacilityType entity) {
+Map<String, dynamic> $FacilityPageListFacilityTypeToJson(
+    FacilityPageListFacilityType entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -241,7 +257,8 @@ extension FacilityPageListFacilityTypeExtension on FacilityPageListFacilityType
   }
 }
 
-FacilityPageListTimePeriod $FacilityPageListTimePeriodFromJson(Map<String, dynamic> json) {
+FacilityPageListTimePeriod $FacilityPageListTimePeriodFromJson(
+    Map<String, dynamic> json) {
   final FacilityPageListTimePeriod facilityPageListTimePeriod = FacilityPageListTimePeriod();
   final String? price = jsonConvert.convert<String>(json['price']);
   if (price != null) {
@@ -254,7 +271,8 @@ FacilityPageListTimePeriod $FacilityPageListTimePeriodFromJson(Map<String, dynam
   return facilityPageListTimePeriod;
 }
 
-Map<String, dynamic> $FacilityPageListTimePeriodToJson(FacilityPageListTimePeriod entity) {
+Map<String, dynamic> $FacilityPageListTimePeriodToJson(
+    FacilityPageListTimePeriod entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['price'] = entity.price;
   data['deposit'] = entity.deposit;
@@ -272,7 +290,8 @@ extension FacilityPageListTimePeriodExtension on FacilityPageListTimePeriod {
   }
 }
 
-FacilityPageListAccount $FacilityPageListAccountFromJson(Map<String, dynamic> json) {
+FacilityPageListAccount $FacilityPageListAccountFromJson(
+    Map<String, dynamic> json) {
   final FacilityPageListAccount facilityPageListAccount = FacilityPageListAccount();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -285,7 +304,8 @@ FacilityPageListAccount $FacilityPageListAccountFromJson(Map<String, dynamic> js
   return facilityPageListAccount;
 }
 
-Map<String, dynamic> $FacilityPageListAccountToJson(FacilityPageListAccount entity) {
+Map<String, dynamic> $FacilityPageListAccountToJson(
+    FacilityPageListAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

+ 14 - 6
packages/cs_domain/lib/generated/json/feedback_detail_entity.g.dart

@@ -30,12 +30,17 @@ FeedbackDetailEntity $FeedbackDetailEntityFromJson(Map<String, dynamic> json) {
   if (createdAt != null) {
     feedbackDetailEntity.createdAt = createdAt;
   }
-  final IdNameEntity? category = jsonConvert.convert<IdNameEntity>(json['category']);
+  final IdNameEntity? category = jsonConvert.convert<IdNameEntity>(
+      json['category']);
   if (category != null) {
     feedbackDetailEntity.category = category;
   }
-  final List<FeedbackDetailReplies>? replies = (json['replies'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<FeedbackDetailReplies>(e) as FeedbackDetailReplies).toList();
+  final List<FeedbackDetailReplies>? replies = (json['replies'] as List<
+      dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<FeedbackDetailReplies>(e) as FeedbackDetailReplies)
+      .toList();
   if (replies != null) {
     feedbackDetailEntity.replies = replies;
   }
@@ -78,7 +83,8 @@ extension FeedbackDetailEntityExtension on FeedbackDetailEntity {
   }
 }
 
-FeedbackDetailReplies $FeedbackDetailRepliesFromJson(Map<String, dynamic> json) {
+FeedbackDetailReplies $FeedbackDetailRepliesFromJson(
+    Map<String, dynamic> json) {
   final FeedbackDetailReplies feedbackDetailReplies = FeedbackDetailReplies();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -97,14 +103,16 @@ FeedbackDetailReplies $FeedbackDetailRepliesFromJson(Map<String, dynamic> json)
   if (createdAt != null) {
     feedbackDetailReplies.createdAt = createdAt;
   }
-  final IdNameEntity? accountable = jsonConvert.convert<IdNameEntity>(json['accountable']);
+  final IdNameEntity? accountable = jsonConvert.convert<IdNameEntity>(
+      json['accountable']);
   if (accountable != null) {
     feedbackDetailReplies.accountable = accountable;
   }
   return feedbackDetailReplies;
 }
 
-Map<String, dynamic> $FeedbackDetailRepliesToJson(FeedbackDetailReplies entity) {
+Map<String, dynamic> $FeedbackDetailRepliesToJson(
+    FeedbackDetailReplies entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['content'] = entity.content;

+ 7 - 3
packages/cs_domain/lib/generated/json/feedback_list_entity.g.dart

@@ -21,8 +21,11 @@ FeedbackListEntity $FeedbackListEntityFromJson(Map<String, dynamic> json) {
   if (limit != null) {
     feedbackListEntity.limit = limit;
   }
-  final List<FeedbackItemEntity>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<FeedbackItemEntity>(e) as FeedbackItemEntity).toList();
+  final List<FeedbackItemEntity>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<FeedbackItemEntity>(e) as FeedbackItemEntity)
+      .toList();
   if (list != null) {
     feedbackListEntity.list = list;
   }
@@ -78,7 +81,8 @@ FeedbackItemEntity $FeedbackItemEntityFromJson(Map<String, dynamic> json) {
   if (createdAt != null) {
     feedbackItemEntity.createdAt = createdAt;
   }
-  final IdNameEntity? category = jsonConvert.convert<IdNameEntity>(json['category']);
+  final IdNameEntity? category = jsonConvert.convert<IdNameEntity>(
+      json['category']);
   if (category != null) {
     feedbackItemEntity.category = category;
   }

+ 46 - 23
packages/cs_domain/lib/generated/json/form_content_entity.g.dart

@@ -5,20 +5,25 @@ import 'dart:typed_data';
 
 FormContentEntity $FormContentEntityFromJson(Map<String, dynamic> json) {
   final FormContentEntity formContentEntity = FormContentEntity();
-  final String? typeOfApplication = jsonConvert.convert<String>(json['type_of_application']);
+  final String? typeOfApplication = jsonConvert.convert<String>(
+      json['type_of_application']);
   if (typeOfApplication != null) {
     formContentEntity.typeOfApplication = typeOfApplication;
   }
-  final String? notesToRecipient = jsonConvert.convert<String>(json['notes_to_recipient']);
+  final String? notesToRecipient = jsonConvert.convert<String>(
+      json['notes_to_recipient']);
   if (notesToRecipient != null) {
     formContentEntity.notesToRecipient = notesToRecipient;
   }
-  final String? notesToManagement = jsonConvert.convert<String>(json['notes_to_management']);
+  final String? notesToManagement = jsonConvert.convert<String>(
+      json['notes_to_management']);
   if (notesToManagement != null) {
     formContentEntity.notesToManagement = notesToManagement;
   }
-  final List<String>? attachments = (json['attachments'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<String>(e) as String).toList();
+  final List<String>? attachments = (json['attachments'] as List<dynamic>?)
+      ?.map(
+          (e) => jsonConvert.convert<String>(e) as String)
+      .toList();
   if (attachments != null) {
     formContentEntity.attachments = attachments;
   }
@@ -30,11 +35,13 @@ FormContentEntity $FormContentEntityFromJson(Map<String, dynamic> json) {
   if (signatureByteData != null) {
     formContentEntity.signatureByteData = signatureByteData;
   }
-  final String? ownershipStatus = jsonConvert.convert<String>(json['ownership_status']);
+  final String? ownershipStatus = jsonConvert.convert<String>(
+      json['ownership_status']);
   if (ownershipStatus != null) {
     formContentEntity.ownershipStatus = ownershipStatus;
   }
-  final String? vehicleNumber = jsonConvert.convert<String>(json['vehicle_number']);
+  final String? vehicleNumber = jsonConvert.convert<String>(
+      json['vehicle_number']);
   if (vehicleNumber != null) {
     formContentEntity.vehicleNumber = vehicleNumber;
   }
@@ -42,7 +49,8 @@ FormContentEntity $FormContentEntityFromJson(Map<String, dynamic> json) {
   if (iuNumber != null) {
     formContentEntity.iuNumber = iuNumber;
   }
-  final String? vehicleMakeModelColour = jsonConvert.convert<String>(json['vehicle_make_model_colour']);
+  final String? vehicleMakeModelColour = jsonConvert.convert<String>(
+      json['vehicle_make_model_colour']);
   if (vehicleMakeModelColour != null) {
     formContentEntity.vehicleMakeModelColour = vehicleMakeModelColour;
   }
@@ -54,27 +62,33 @@ FormContentEntity $FormContentEntityFromJson(Map<String, dynamic> json) {
   if (endDate != null) {
     formContentEntity.endDate = endDate;
   }
-  final String? timeOrArrival = jsonConvert.convert<String>(json['time_or_arrival']);
+  final String? timeOrArrival = jsonConvert.convert<String>(
+      json['time_or_arrival']);
   if (timeOrArrival != null) {
     formContentEntity.timeOrArrival = timeOrArrival;
   }
-  final String? movingCompany = jsonConvert.convert<String>(json['moving_company']);
+  final String? movingCompany = jsonConvert.convert<String>(
+      json['moving_company']);
   if (movingCompany != null) {
     formContentEntity.movingCompany = movingCompany;
   }
-  final String? personInCharge = jsonConvert.convert<String>(json['person_in_charge']);
+  final String? personInCharge = jsonConvert.convert<String>(
+      json['person_in_charge']);
   if (personInCharge != null) {
     formContentEntity.personInCharge = personInCharge;
   }
-  final String? mobileNumber = jsonConvert.convert<String>(json['mobile_number']);
+  final String? mobileNumber = jsonConvert.convert<String>(
+      json['mobile_number']);
   if (mobileNumber != null) {
     formContentEntity.mobileNumber = mobileNumber;
   }
-  final String? companyAddress = jsonConvert.convert<String>(json['company_address']);
+  final String? companyAddress = jsonConvert.convert<String>(
+      json['company_address']);
   if (companyAddress != null) {
     formContentEntity.companyAddress = companyAddress;
   }
-  final String? dateOfEntry = jsonConvert.convert<String>(json['date_of_entry']);
+  final String? dateOfEntry = jsonConvert.convert<String>(
+      json['date_of_entry']);
   if (dateOfEntry != null) {
     formContentEntity.dateOfEntry = dateOfEntry;
   }
@@ -82,31 +96,38 @@ FormContentEntity $FormContentEntityFromJson(Map<String, dynamic> json) {
   if (guestName != null) {
     formContentEntity.guestName = guestName;
   }
-  final String? guestMobileNumber = jsonConvert.convert<String>(json['guest_mobile_number']);
+  final String? guestMobileNumber = jsonConvert.convert<String>(
+      json['guest_mobile_number']);
   if (guestMobileNumber != null) {
     formContentEntity.guestMobileNumber = guestMobileNumber;
   }
-  final String? renovationStartDate = jsonConvert.convert<String>(json['renovation_start_date']);
+  final String? renovationStartDate = jsonConvert.convert<String>(
+      json['renovation_start_date']);
   if (renovationStartDate != null) {
     formContentEntity.renovationStartDate = renovationStartDate;
   }
-  final String? renovationEndDate = jsonConvert.convert<String>(json['renovation_end_date']);
+  final String? renovationEndDate = jsonConvert.convert<String>(
+      json['renovation_end_date']);
   if (renovationEndDate != null) {
     formContentEntity.renovationEndDate = renovationEndDate;
   }
-  final String? hackingStartDate = jsonConvert.convert<String>(json['hacking_start_date']);
+  final String? hackingStartDate = jsonConvert.convert<String>(
+      json['hacking_start_date']);
   if (hackingStartDate != null) {
     formContentEntity.hackingStartDate = hackingStartDate;
   }
-  final String? hackingEndDate = jsonConvert.convert<String>(json['hacking_end_date']);
+  final String? hackingEndDate = jsonConvert.convert<String>(
+      json['hacking_end_date']);
   if (hackingEndDate != null) {
     formContentEntity.hackingEndDate = hackingEndDate;
   }
-  final String? renovationCompany = jsonConvert.convert<String>(json['renovation_company']);
+  final String? renovationCompany = jsonConvert.convert<String>(
+      json['renovation_company']);
   if (renovationCompany != null) {
     formContentEntity.renovationCompany = renovationCompany;
   }
-  final String? listOfRenovationWorks = jsonConvert.convert<String>(json['list_of_renovation_works']);
+  final String? listOfRenovationWorks = jsonConvert.convert<String>(
+      json['list_of_renovation_works']);
   if (listOfRenovationWorks != null) {
     formContentEntity.listOfRenovationWorks = listOfRenovationWorks;
   }
@@ -183,7 +204,8 @@ extension FormContentEntityExtension on FormContentEntity {
       ..ownershipStatus = ownershipStatus ?? this.ownershipStatus
       ..vehicleNumber = vehicleNumber ?? this.vehicleNumber
       ..iuNumber = iuNumber ?? this.iuNumber
-      ..vehicleMakeModelColour = vehicleMakeModelColour ?? this.vehicleMakeModelColour
+      ..vehicleMakeModelColour = vehicleMakeModelColour ??
+          this.vehicleMakeModelColour
       ..startDate = startDate ?? this.startDate
       ..endDate = endDate ?? this.endDate
       ..timeOrArrival = timeOrArrival ?? this.timeOrArrival
@@ -199,6 +221,7 @@ extension FormContentEntityExtension on FormContentEntity {
       ..hackingStartDate = hackingStartDate ?? this.hackingStartDate
       ..hackingEndDate = hackingEndDate ?? this.hackingEndDate
       ..renovationCompany = renovationCompany ?? this.renovationCompany
-      ..listOfRenovationWorks = listOfRenovationWorks ?? this.listOfRenovationWorks;
+      ..listOfRenovationWorks = listOfRenovationWorks ??
+          this.listOfRenovationWorks;
   }
 }

+ 2 - 1
packages/cs_domain/lib/generated/json/form_detail_entity.g.dart

@@ -13,7 +13,8 @@ FormDetailEntity $FormDetailEntityFromJson(Map<String, dynamic> json) {
   if (userId != null) {
     formDetailEntity.userId = userId;
   }
-  final FormContentEntity? content = jsonConvert.convert<FormContentEntity>(json['content']);
+  final FormContentEntity? content = jsonConvert.convert<FormContentEntity>(
+      json['content']);
   if (content != null) {
     formDetailEntity.content = content;
   }

+ 2 - 1
packages/cs_domain/lib/generated/json/form_list_entity.g.dart

@@ -7,7 +7,8 @@ FormListEntity $FormListEntityFromJson(Map<String, dynamic> json) {
   if (id != null) {
     formListEntity.id = id;
   }
-  final String? typeId = jsonConvert.convert<String>(json['online_form_type_id']);
+  final String? typeId = jsonConvert.convert<String>(
+      json['online_form_type_id']);
   if (typeId != null) {
     formListEntity.typeId = typeId;
   }

+ 4 - 2
packages/cs_domain/lib/generated/json/form_option_entity.g.dart

@@ -3,12 +3,14 @@ import 'package:domain/entity/form_option_entity.dart';
 
 FormOptionEntity $FormOptionEntityFromJson(Map<String, dynamic> json) {
   final FormOptionEntity formOptionEntity = FormOptionEntity();
-  final List<String>? typeOfApplication = (json['type_of_application'] as List<dynamic>?)?.map(
+  final List<String>? typeOfApplication = (json['type_of_application'] as List<
+      dynamic>?)?.map(
           (e) => jsonConvert.convert<String>(e) as String).toList();
   if (typeOfApplication != null) {
     formOptionEntity.typeOfApplication = typeOfApplication;
   }
-  final List<String>? ownershipStatus = (json['ownership_status'] as List<dynamic>?)?.map(
+  final List<String>? ownershipStatus = (json['ownership_status'] as List<
+      dynamic>?)?.map(
           (e) => jsonConvert.convert<String>(e) as String).toList();
   if (ownershipStatus != null) {
     formOptionEntity.ownershipStatus = ownershipStatus;

+ 12 - 6
packages/cs_domain/lib/generated/json/form_submitted_entity.g.dart

@@ -15,11 +15,13 @@ FormSubmittedEntity $FormSubmittedEntityFromJson(Map<String, dynamic> json) {
   if (userId != null) {
     formSubmittedEntity.userId = userId;
   }
-  final String? estateOnlineFormId = jsonConvert.convert<String>(json['estate_online_form_id']);
+  final String? estateOnlineFormId = jsonConvert.convert<String>(
+      json['estate_online_form_id']);
   if (estateOnlineFormId != null) {
     formSubmittedEntity.estateOnlineFormId = estateOnlineFormId;
   }
-  final FormContentEntity? content = jsonConvert.convert<FormContentEntity>(json['content']);
+  final FormContentEntity? content = jsonConvert.convert<FormContentEntity>(
+      json['content']);
   if (content != null) {
     formSubmittedEntity.content = content;
   }
@@ -35,11 +37,13 @@ FormSubmittedEntity $FormSubmittedEntityFromJson(Map<String, dynamic> json) {
   if (approvedOn != null) {
     formSubmittedEntity.approvedOn = approvedOn;
   }
-  final FormSubmittedEstateOnlineForm? estateOnlineForm = jsonConvert.convert<FormSubmittedEstateOnlineForm>(json['estate_online_form']);
+  final FormSubmittedEstateOnlineForm? estateOnlineForm = jsonConvert.convert<
+      FormSubmittedEstateOnlineForm>(json['estate_online_form']);
   if (estateOnlineForm != null) {
     formSubmittedEntity.estateOnlineForm = estateOnlineForm;
   }
-  final IdNameEntity? account = jsonConvert.convert<IdNameEntity>(json['account']);
+  final IdNameEntity? account = jsonConvert.convert<IdNameEntity>(
+      json['account']);
   if (account != null) {
     formSubmittedEntity.account = account;
   }
@@ -85,7 +89,8 @@ extension FormSubmittedEntityExtension on FormSubmittedEntity {
   }
 }
 
-FormSubmittedEstateOnlineForm $FormSubmittedEstateOnlineFormFromJson(Map<String, dynamic> json) {
+FormSubmittedEstateOnlineForm $FormSubmittedEstateOnlineFormFromJson(
+    Map<String, dynamic> json) {
   final FormSubmittedEstateOnlineForm formSubmittedEstateOnlineForm = FormSubmittedEstateOnlineForm();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -106,7 +111,8 @@ FormSubmittedEstateOnlineForm $FormSubmittedEstateOnlineFormFromJson(Map<String,
   return formSubmittedEstateOnlineForm;
 }
 
-Map<String, dynamic> $FormSubmittedEstateOnlineFormToJson(FormSubmittedEstateOnlineForm entity) {
+Map<String, dynamic> $FormSubmittedEstateOnlineFormToJson(
+    FormSubmittedEstateOnlineForm entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['icon'] = entity.icon;

+ 9 - 4
packages/cs_domain/lib/generated/json/form_submitted_page_entity.g.dart

@@ -3,7 +3,8 @@ import 'package:domain/entity/form_submitted_page_entity.dart';
 import 'package:domain/entity/form_submitted_entity.dart';
 
 
-FormSubmittedPageEntity $FormSubmittedPageEntityFromJson(Map<String, dynamic> json) {
+FormSubmittedPageEntity $FormSubmittedPageEntityFromJson(
+    Map<String, dynamic> json) {
   final FormSubmittedPageEntity formSubmittedPageEntity = FormSubmittedPageEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -21,15 +22,19 @@ FormSubmittedPageEntity $FormSubmittedPageEntityFromJson(Map<String, dynamic> js
   if (countPage != null) {
     formSubmittedPageEntity.countPage = countPage;
   }
-  final List<FormSubmittedEntity>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<FormSubmittedEntity>(e) as FormSubmittedEntity).toList();
+  final List<FormSubmittedEntity>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<FormSubmittedEntity>(e) as FormSubmittedEntity)
+      .toList();
   if (list != null) {
     formSubmittedPageEntity.list = list;
   }
   return formSubmittedPageEntity;
 }
 
-Map<String, dynamic> $FormSubmittedPageEntityToJson(FormSubmittedPageEntity entity) {
+Map<String, dynamic> $FormSubmittedPageEntityToJson(
+    FormSubmittedPageEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;

+ 10 - 5
packages/cs_domain/lib/generated/json/garage_sale_rent_detail_entity.g.dart

@@ -1,7 +1,8 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/garage_sale_rent_detail_entity.dart';
 
-GarageSaleRentDetailEntity $GarageSaleRentDetailEntityFromJson(Map<String, dynamic> json) {
+GarageSaleRentDetailEntity $GarageSaleRentDetailEntityFromJson(
+    Map<String, dynamic> json) {
   final GarageSaleRentDetailEntity garageSaleRentDetailEntity = GarageSaleRentDetailEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -36,14 +37,16 @@ GarageSaleRentDetailEntity $GarageSaleRentDetailEntityFromJson(Map<String, dynam
   if (contact != null) {
     garageSaleRentDetailEntity.contact = contact;
   }
-  final GarageSaleRentDetailAccount? account = jsonConvert.convert<GarageSaleRentDetailAccount>(json['account']);
+  final GarageSaleRentDetailAccount? account = jsonConvert.convert<
+      GarageSaleRentDetailAccount>(json['account']);
   if (account != null) {
     garageSaleRentDetailEntity.account = account;
   }
   return garageSaleRentDetailEntity;
 }
 
-Map<String, dynamic> $GarageSaleRentDetailEntityToJson(GarageSaleRentDetailEntity entity) {
+Map<String, dynamic> $GarageSaleRentDetailEntityToJson(
+    GarageSaleRentDetailEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['title'] = entity.title;
@@ -82,7 +85,8 @@ extension GarageSaleRentDetailEntityExtension on GarageSaleRentDetailEntity {
   }
 }
 
-GarageSaleRentDetailAccount $GarageSaleRentDetailAccountFromJson(Map<String, dynamic> json) {
+GarageSaleRentDetailAccount $GarageSaleRentDetailAccountFromJson(
+    Map<String, dynamic> json) {
   final GarageSaleRentDetailAccount garageSaleRentDetailAccount = GarageSaleRentDetailAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -99,7 +103,8 @@ GarageSaleRentDetailAccount $GarageSaleRentDetailAccountFromJson(Map<String, dyn
   return garageSaleRentDetailAccount;
 }
 
-Map<String, dynamic> $GarageSaleRentDetailAccountToJson(GarageSaleRentDetailAccount entity) {
+Map<String, dynamic> $GarageSaleRentDetailAccountToJson(
+    GarageSaleRentDetailAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

+ 11 - 5
packages/cs_domain/lib/generated/json/garage_sale_rent_entity.g.dart

@@ -19,8 +19,11 @@ GarageSaleRentEntity $GarageSaleRentEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     garageSaleRentEntity.countPage = countPage;
   }
-  final List<GarageSaleRentList>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<GarageSaleRentList>(e) as GarageSaleRentList).toList();
+  final List<GarageSaleRentList>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<GarageSaleRentList>(e) as GarageSaleRentList)
+      .toList();
   if (list != null) {
     garageSaleRentEntity.list = list;
   }
@@ -85,7 +88,8 @@ GarageSaleRentList $GarageSaleRentListFromJson(Map<String, dynamic> json) {
   if (likesCount != null) {
     garageSaleRentList.likesCount = likesCount;
   }
-  final GarageSaleRentListAccount? account = jsonConvert.convert<GarageSaleRentListAccount>(json['account']);
+  final GarageSaleRentListAccount? account = jsonConvert.convert<
+      GarageSaleRentListAccount>(json['account']);
   if (account != null) {
     garageSaleRentList.account = account;
   }
@@ -128,7 +132,8 @@ extension GarageSaleRentListExtension on GarageSaleRentList {
   }
 }
 
-GarageSaleRentListAccount $GarageSaleRentListAccountFromJson(Map<String, dynamic> json) {
+GarageSaleRentListAccount $GarageSaleRentListAccountFromJson(
+    Map<String, dynamic> json) {
   final GarageSaleRentListAccount garageSaleRentListAccount = GarageSaleRentListAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -145,7 +150,8 @@ GarageSaleRentListAccount $GarageSaleRentListAccountFromJson(Map<String, dynamic
   return garageSaleRentListAccount;
 }
 
-Map<String, dynamic> $GarageSaleRentListAccountToJson(GarageSaleRentListAccount entity) {
+Map<String, dynamic> $GarageSaleRentListAccountToJson(
+    GarageSaleRentListAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

+ 34 - 13
packages/cs_domain/lib/generated/json/home_list_entity.g.dart

@@ -3,23 +3,39 @@ import 'package:domain/entity/home_list_entity.dart';
 
 HomeListEntity $HomeListEntityFromJson(Map<String, dynamic> json) {
   final HomeListEntity homeListEntity = HomeListEntity();
-  final List<HomeListBanners>? banners = (json['banners'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<HomeListBanners>(e) as HomeListBanners).toList();
+  final List<HomeListBanners>? banners = (json['banners'] as List<dynamic>?)
+      ?.map(
+          (e) => jsonConvert.convert<HomeListBanners>(e) as HomeListBanners)
+      .toList();
   if (banners != null) {
     homeListEntity.banners = banners;
   }
-  final List<HomeListLatestTransactions>? latestTransactions = (json['latest_transactions'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<HomeListLatestTransactions>(e) as HomeListLatestTransactions).toList();
+  final List<
+      HomeListLatestTransactions>? latestTransactions = (json['latest_transactions'] as List<
+      dynamic>?)?.map(
+          (e) =>
+      jsonConvert.convert<HomeListLatestTransactions>(
+          e) as HomeListLatestTransactions).toList();
   if (latestTransactions != null) {
     homeListEntity.latestTransactions = latestTransactions;
   }
-  final List<HomeListPropertyNews>? propertyNews = (json['property_news'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<HomeListPropertyNews>(e) as HomeListPropertyNews).toList();
+  final List<
+      HomeListPropertyNews>? propertyNews = (json['property_news'] as List<
+      dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<HomeListPropertyNews>(e) as HomeListPropertyNews)
+      .toList();
   if (propertyNews != null) {
     homeListEntity.propertyNews = propertyNews;
   }
-  final List<HomeListPropertyNews>? strataManagementGuides = (json['strata_management_guides'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<HomeListPropertyNews>(e) as HomeListPropertyNews).toList();
+  final List<
+      HomeListPropertyNews>? strataManagementGuides = (json['strata_management_guides'] as List<
+      dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<HomeListPropertyNews>(e) as HomeListPropertyNews)
+      .toList();
   if (strataManagementGuides != null) {
     homeListEntity.strataManagementGuides = strataManagementGuides;
   }
@@ -29,9 +45,11 @@ HomeListEntity $HomeListEntityFromJson(Map<String, dynamic> json) {
 Map<String, dynamic> $HomeListEntityToJson(HomeListEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['banners'] = entity.banners.map((v) => v.toJson()).toList();
-  data['latest_transactions'] = entity.latestTransactions.map((v) => v.toJson()).toList();
+  data['latest_transactions'] =
+      entity.latestTransactions.map((v) => v.toJson()).toList();
   data['property_news'] = entity.propertyNews.map((v) => v.toJson()).toList();
-  data['strata_management_guides'] = entity.strataManagementGuides.map((v) => v.toJson()).toList();
+  data['strata_management_guides'] =
+      entity.strataManagementGuides.map((v) => v.toJson()).toList();
   return data;
 }
 
@@ -46,7 +64,8 @@ extension HomeListEntityExtension on HomeListEntity {
       ..banners = banners ?? this.banners
       ..latestTransactions = latestTransactions ?? this.latestTransactions
       ..propertyNews = propertyNews ?? this.propertyNews
-      ..strataManagementGuides = strataManagementGuides ?? this.strataManagementGuides;
+      ..strataManagementGuides = strataManagementGuides ??
+          this.strataManagementGuides;
   }
 }
 
@@ -88,7 +107,8 @@ extension HomeListBannersExtension on HomeListBanners {
   }
 }
 
-HomeListLatestTransactions $HomeListLatestTransactionsFromJson(Map<String, dynamic> json) {
+HomeListLatestTransactions $HomeListLatestTransactionsFromJson(
+    Map<String, dynamic> json) {
   final HomeListLatestTransactions homeListLatestTransactions = HomeListLatestTransactions();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -113,7 +133,8 @@ HomeListLatestTransactions $HomeListLatestTransactionsFromJson(Map<String, dynam
   return homeListLatestTransactions;
 }
 
-Map<String, dynamic> $HomeListLatestTransactionsToJson(HomeListLatestTransactions entity) {
+Map<String, dynamic> $HomeListLatestTransactionsToJson(
+    HomeListLatestTransactions entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['type'] = entity.type;

+ 4 - 2
packages/cs_domain/lib/generated/json/latest_news_detail_entity.g.dart

@@ -1,7 +1,8 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/latest_news_detail_entity.dart';
 
-LatestNewsDetailEntity $LatestNewsDetailEntityFromJson(Map<String, dynamic> json) {
+LatestNewsDetailEntity $LatestNewsDetailEntityFromJson(
+    Map<String, dynamic> json) {
   final LatestNewsDetailEntity latestNewsDetailEntity = LatestNewsDetailEntity();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -30,7 +31,8 @@ LatestNewsDetailEntity $LatestNewsDetailEntityFromJson(Map<String, dynamic> json
   return latestNewsDetailEntity;
 }
 
-Map<String, dynamic> $LatestNewsDetailEntityToJson(LatestNewsDetailEntity entity) {
+Map<String, dynamic> $LatestNewsDetailEntityToJson(
+    LatestNewsDetailEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['type'] = entity.type;

+ 4 - 2
packages/cs_domain/lib/generated/json/latest_news_page_entity.g.dart

@@ -19,8 +19,10 @@ LatestNewsPageEntity $LatestNewsPageEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     latestNewsPageEntity.countPage = countPage;
   }
-  final List<LatestNewsList>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<LatestNewsList>(e) as LatestNewsList).toList();
+  final List<LatestNewsList>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) => jsonConvert.convert<LatestNewsList>(e) as LatestNewsList)
+      .toList();
   if (list != null) {
     latestNewsPageEntity.list = list;
   }

+ 4 - 2
packages/cs_domain/lib/generated/json/myfollowing_list_entity.g.dart

@@ -1,7 +1,8 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/myfollowing_list_entity.dart';
 
-MyfollowingListEntity $MyfollowingListEntityFromJson(Map<String, dynamic> json) {
+MyfollowingListEntity $MyfollowingListEntityFromJson(
+    Map<String, dynamic> json) {
   final MyfollowingListEntity myfollowingListEntity = MyfollowingListEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -18,7 +19,8 @@ MyfollowingListEntity $MyfollowingListEntityFromJson(Map<String, dynamic> json)
   return myfollowingListEntity;
 }
 
-Map<String, dynamic> $MyfollowingListEntityToJson(MyfollowingListEntity entity) {
+Map<String, dynamic> $MyfollowingListEntityToJson(
+    MyfollowingListEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

+ 15 - 7
packages/cs_domain/lib/generated/json/myposts_newsfeed_entity.g.dart

@@ -1,7 +1,8 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/myposts_newsfeed_entity.dart';
 
-MypostsNewsfeedEntity $MypostsNewsfeedEntityFromJson(Map<String, dynamic> json) {
+MypostsNewsfeedEntity $MypostsNewsfeedEntityFromJson(
+    Map<String, dynamic> json) {
   final MypostsNewsfeedEntity mypostsNewsfeedEntity = MypostsNewsfeedEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -19,15 +20,19 @@ MypostsNewsfeedEntity $MypostsNewsfeedEntityFromJson(Map<String, dynamic> json)
   if (countPage != null) {
     mypostsNewsfeedEntity.countPage = countPage;
   }
-  final List<MypostsNewsfeedList>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<MypostsNewsfeedList>(e) as MypostsNewsfeedList).toList();
+  final List<MypostsNewsfeedList>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<MypostsNewsfeedList>(e) as MypostsNewsfeedList)
+      .toList();
   if (list != null) {
     mypostsNewsfeedEntity.list = list;
   }
   return mypostsNewsfeedEntity;
 }
 
-Map<String, dynamic> $MypostsNewsfeedEntityToJson(MypostsNewsfeedEntity entity) {
+Map<String, dynamic> $MypostsNewsfeedEntityToJson(
+    MypostsNewsfeedEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;
@@ -85,7 +90,8 @@ MypostsNewsfeedList $MypostsNewsfeedListFromJson(Map<String, dynamic> json) {
   if (createdAt != null) {
     mypostsNewsfeedList.createdAt = createdAt;
   }
-  final MypostsNewsfeedListAccount? account = jsonConvert.convert<MypostsNewsfeedListAccount>(json['account']);
+  final MypostsNewsfeedListAccount? account = jsonConvert.convert<
+      MypostsNewsfeedListAccount>(json['account']);
   if (account != null) {
     mypostsNewsfeedList.account = account;
   }
@@ -128,7 +134,8 @@ extension MypostsNewsfeedListExtension on MypostsNewsfeedList {
   }
 }
 
-MypostsNewsfeedListAccount $MypostsNewsfeedListAccountFromJson(Map<String, dynamic> json) {
+MypostsNewsfeedListAccount $MypostsNewsfeedListAccountFromJson(
+    Map<String, dynamic> json) {
   final MypostsNewsfeedListAccount mypostsNewsfeedListAccount = MypostsNewsfeedListAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -149,7 +156,8 @@ MypostsNewsfeedListAccount $MypostsNewsfeedListAccountFromJson(Map<String, dynam
   return mypostsNewsfeedListAccount;
 }
 
-Map<String, dynamic> $MypostsNewsfeedListAccountToJson(MypostsNewsfeedListAccount entity) {
+Map<String, dynamic> $MypostsNewsfeedListAccountToJson(
+    MypostsNewsfeedListAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

+ 9 - 4
packages/cs_domain/lib/generated/json/myposts_sale_rent_entity.g.dart

@@ -1,7 +1,8 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/myposts_sale_rent_entity.dart';
 
-MypostsSaleRentEntity $MypostsSaleRentEntityFromJson(Map<String, dynamic> json) {
+MypostsSaleRentEntity $MypostsSaleRentEntityFromJson(
+    Map<String, dynamic> json) {
   final MypostsSaleRentEntity mypostsSaleRentEntity = MypostsSaleRentEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -19,15 +20,19 @@ MypostsSaleRentEntity $MypostsSaleRentEntityFromJson(Map<String, dynamic> json)
   if (countPage != null) {
     mypostsSaleRentEntity.countPage = countPage;
   }
-  final List<MypostsSaleRentList>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<MypostsSaleRentList>(e) as MypostsSaleRentList).toList();
+  final List<MypostsSaleRentList>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<MypostsSaleRentList>(e) as MypostsSaleRentList)
+      .toList();
   if (list != null) {
     mypostsSaleRentEntity.list = list;
   }
   return mypostsSaleRentEntity;
 }
 
-Map<String, dynamic> $MypostsSaleRentEntityToJson(MypostsSaleRentEntity entity) {
+Map<String, dynamic> $MypostsSaleRentEntityToJson(
+    MypostsSaleRentEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;

+ 4 - 2
packages/cs_domain/lib/generated/json/newsfeed_comment_publish_entity.g.dart

@@ -1,7 +1,8 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/newsfeed_comment_publish_entity.dart';
 
-NewsfeedCommentPublishEntity $NewsfeedCommentPublishEntityFromJson(Map<String, dynamic> json) {
+NewsfeedCommentPublishEntity $NewsfeedCommentPublishEntityFromJson(
+    Map<String, dynamic> json) {
   final NewsfeedCommentPublishEntity newsfeedCommentPublishEntity = NewsfeedCommentPublishEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -18,7 +19,8 @@ NewsfeedCommentPublishEntity $NewsfeedCommentPublishEntityFromJson(Map<String, d
   return newsfeedCommentPublishEntity;
 }
 
-Map<String, dynamic> $NewsfeedCommentPublishEntityToJson(NewsfeedCommentPublishEntity entity) {
+Map<String, dynamic> $NewsfeedCommentPublishEntityToJson(
+    NewsfeedCommentPublishEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['content'] = entity.content;

+ 28 - 13
packages/cs_domain/lib/generated/json/newsfeed_detail_entity.g.dart

@@ -40,12 +40,17 @@ NewsfeedDetailEntity $NewsfeedDetailEntityFromJson(Map<String, dynamic> json) {
   if (liked != null) {
     newsfeedDetailEntity.liked = liked;
   }
-  final NewsfeedDetailAccount? account = jsonConvert.convert<NewsfeedDetailAccount>(json['account']);
+  final NewsfeedDetailAccount? account = jsonConvert.convert<
+      NewsfeedDetailAccount>(json['account']);
   if (account != null) {
     newsfeedDetailEntity.account = account;
   }
-  final List<NewsfeedDetailComments>? comments = (json['comments'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<NewsfeedDetailComments>(e) as NewsfeedDetailComments).toList();
+  final List<NewsfeedDetailComments>? comments = (json['comments'] as List<
+      dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<NewsfeedDetailComments>(e) as NewsfeedDetailComments)
+      .toList();
   if (comments != null) {
     newsfeedDetailEntity.comments = comments;
   }
@@ -97,7 +102,8 @@ extension NewsfeedDetailEntityExtension on NewsfeedDetailEntity {
   }
 }
 
-NewsfeedDetailAccount $NewsfeedDetailAccountFromJson(Map<String, dynamic> json) {
+NewsfeedDetailAccount $NewsfeedDetailAccountFromJson(
+    Map<String, dynamic> json) {
   final NewsfeedDetailAccount newsfeedDetailAccount = NewsfeedDetailAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -118,7 +124,8 @@ NewsfeedDetailAccount $NewsfeedDetailAccountFromJson(Map<String, dynamic> json)
   return newsfeedDetailAccount;
 }
 
-Map<String, dynamic> $NewsfeedDetailAccountToJson(NewsfeedDetailAccount entity) {
+Map<String, dynamic> $NewsfeedDetailAccountToJson(
+    NewsfeedDetailAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -142,7 +149,8 @@ extension NewsfeedDetailAccountExtension on NewsfeedDetailAccount {
   }
 }
 
-NewsfeedDetailComments $NewsfeedDetailCommentsFromJson(Map<String, dynamic> json) {
+NewsfeedDetailComments $NewsfeedDetailCommentsFromJson(
+    Map<String, dynamic> json) {
   final NewsfeedDetailComments newsfeedDetailComments = NewsfeedDetailComments();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -156,18 +164,21 @@ NewsfeedDetailComments $NewsfeedDetailCommentsFromJson(Map<String, dynamic> json
   if (createdAt != null) {
     newsfeedDetailComments.createdAt = createdAt;
   }
-  final NewsfeedDetailCommentsAccount? account = jsonConvert.convert<NewsfeedDetailCommentsAccount>(json['account']);
+  final NewsfeedDetailCommentsAccount? account = jsonConvert.convert<
+      NewsfeedDetailCommentsAccount>(json['account']);
   if (account != null) {
     newsfeedDetailComments.account = account;
   }
-  final NewsfeedDetailCommentsToAccount? toAccount = jsonConvert.convert<NewsfeedDetailCommentsToAccount>(json['to_account']);
+  final NewsfeedDetailCommentsToAccount? toAccount = jsonConvert.convert<
+      NewsfeedDetailCommentsToAccount>(json['to_account']);
   if (toAccount != null) {
     newsfeedDetailComments.toAccount = toAccount;
   }
   return newsfeedDetailComments;
 }
 
-Map<String, dynamic> $NewsfeedDetailCommentsToJson(NewsfeedDetailComments entity) {
+Map<String, dynamic> $NewsfeedDetailCommentsToJson(
+    NewsfeedDetailComments entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['content'] = entity.content;
@@ -194,7 +205,8 @@ extension NewsfeedDetailCommentsExtension on NewsfeedDetailComments {
   }
 }
 
-NewsfeedDetailCommentsAccount $NewsfeedDetailCommentsAccountFromJson(Map<String, dynamic> json) {
+NewsfeedDetailCommentsAccount $NewsfeedDetailCommentsAccountFromJson(
+    Map<String, dynamic> json) {
   final NewsfeedDetailCommentsAccount newsfeedDetailCommentsAccount = NewsfeedDetailCommentsAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -211,7 +223,8 @@ NewsfeedDetailCommentsAccount $NewsfeedDetailCommentsAccountFromJson(Map<String,
   return newsfeedDetailCommentsAccount;
 }
 
-Map<String, dynamic> $NewsfeedDetailCommentsAccountToJson(NewsfeedDetailCommentsAccount entity) {
+Map<String, dynamic> $NewsfeedDetailCommentsAccountToJson(
+    NewsfeedDetailCommentsAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -232,7 +245,8 @@ extension NewsfeedDetailCommentsAccountExtension on NewsfeedDetailCommentsAccoun
   }
 }
 
-NewsfeedDetailCommentsToAccount $NewsfeedDetailCommentsToAccountFromJson(Map<String, dynamic> json) {
+NewsfeedDetailCommentsToAccount $NewsfeedDetailCommentsToAccountFromJson(
+    Map<String, dynamic> json) {
   final NewsfeedDetailCommentsToAccount newsfeedDetailCommentsToAccount = NewsfeedDetailCommentsToAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -249,7 +263,8 @@ NewsfeedDetailCommentsToAccount $NewsfeedDetailCommentsToAccountFromJson(Map<Str
   return newsfeedDetailCommentsToAccount;
 }
 
-Map<String, dynamic> $NewsfeedDetailCommentsToAccountToJson(NewsfeedDetailCommentsToAccount entity) {
+Map<String, dynamic> $NewsfeedDetailCommentsToAccountToJson(
+    NewsfeedDetailCommentsToAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

+ 19 - 9
packages/cs_domain/lib/generated/json/newsfeed_following_entity.g.dart

@@ -1,7 +1,8 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/newsfeed_following_entity.dart';
 
-NewsfeedFollowingEntity $NewsfeedFollowingEntityFromJson(Map<String, dynamic> json) {
+NewsfeedFollowingEntity $NewsfeedFollowingEntityFromJson(
+    Map<String, dynamic> json) {
   final NewsfeedFollowingEntity newsfeedFollowingEntity = NewsfeedFollowingEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -19,15 +20,19 @@ NewsfeedFollowingEntity $NewsfeedFollowingEntityFromJson(Map<String, dynamic> js
   if (countPage != null) {
     newsfeedFollowingEntity.countPage = countPage;
   }
-  final List<NewsfeedFollowingList>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<NewsfeedFollowingList>(e) as NewsfeedFollowingList).toList();
+  final List<NewsfeedFollowingList>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<NewsfeedFollowingList>(e) as NewsfeedFollowingList)
+      .toList();
   if (list != null) {
     newsfeedFollowingEntity.list = list;
   }
   return newsfeedFollowingEntity;
 }
 
-Map<String, dynamic> $NewsfeedFollowingEntityToJson(NewsfeedFollowingEntity entity) {
+Map<String, dynamic> $NewsfeedFollowingEntityToJson(
+    NewsfeedFollowingEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;
@@ -54,7 +59,8 @@ extension NewsfeedFollowingEntityExtension on NewsfeedFollowingEntity {
   }
 }
 
-NewsfeedFollowingList $NewsfeedFollowingListFromJson(Map<String, dynamic> json) {
+NewsfeedFollowingList $NewsfeedFollowingListFromJson(
+    Map<String, dynamic> json) {
   final NewsfeedFollowingList newsfeedFollowingList = NewsfeedFollowingList();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -85,14 +91,16 @@ NewsfeedFollowingList $NewsfeedFollowingListFromJson(Map<String, dynamic> json)
   if (createdAt != null) {
     newsfeedFollowingList.createdAt = createdAt;
   }
-  final NewsfeedFollowingListAccount? account = jsonConvert.convert<NewsfeedFollowingListAccount>(json['account']);
+  final NewsfeedFollowingListAccount? account = jsonConvert.convert<
+      NewsfeedFollowingListAccount>(json['account']);
   if (account != null) {
     newsfeedFollowingList.account = account;
   }
   return newsfeedFollowingList;
 }
 
-Map<String, dynamic> $NewsfeedFollowingListToJson(NewsfeedFollowingList entity) {
+Map<String, dynamic> $NewsfeedFollowingListToJson(
+    NewsfeedFollowingList entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['content'] = entity.content;
@@ -128,7 +136,8 @@ extension NewsfeedFollowingListExtension on NewsfeedFollowingList {
   }
 }
 
-NewsfeedFollowingListAccount $NewsfeedFollowingListAccountFromJson(Map<String, dynamic> json) {
+NewsfeedFollowingListAccount $NewsfeedFollowingListAccountFromJson(
+    Map<String, dynamic> json) {
   final NewsfeedFollowingListAccount newsfeedFollowingListAccount = NewsfeedFollowingListAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -149,7 +158,8 @@ NewsfeedFollowingListAccount $NewsfeedFollowingListAccountFromJson(Map<String, d
   return newsfeedFollowingListAccount;
 }
 
-Map<String, dynamic> $NewsfeedFollowingListAccountToJson(NewsfeedFollowingListAccount entity) {
+Map<String, dynamic> $NewsfeedFollowingListAccountToJson(
+    NewsfeedFollowingListAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

+ 11 - 5
packages/cs_domain/lib/generated/json/newsfeed_foryou_entity.g.dart

@@ -19,8 +19,11 @@ NewsfeedForyouEntity $NewsfeedForyouEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     newsfeedForyouEntity.countPage = countPage;
   }
-  final List<NewsfeedForyouList>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<NewsfeedForyouList>(e) as NewsfeedForyouList).toList();
+  final List<NewsfeedForyouList>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<NewsfeedForyouList>(e) as NewsfeedForyouList)
+      .toList();
   if (list != null) {
     newsfeedForyouEntity.list = list;
   }
@@ -85,7 +88,8 @@ NewsfeedForyouList $NewsfeedForyouListFromJson(Map<String, dynamic> json) {
   if (createdAt != null) {
     newsfeedForyouList.createdAt = createdAt;
   }
-  final NewsfeedForyouListAccount? account = jsonConvert.convert<NewsfeedForyouListAccount>(json['account']);
+  final NewsfeedForyouListAccount? account = jsonConvert.convert<
+      NewsfeedForyouListAccount>(json['account']);
   if (account != null) {
     newsfeedForyouList.account = account;
   }
@@ -128,7 +132,8 @@ extension NewsfeedForyouListExtension on NewsfeedForyouList {
   }
 }
 
-NewsfeedForyouListAccount $NewsfeedForyouListAccountFromJson(Map<String, dynamic> json) {
+NewsfeedForyouListAccount $NewsfeedForyouListAccountFromJson(
+    Map<String, dynamic> json) {
   final NewsfeedForyouListAccount newsfeedForyouListAccount = NewsfeedForyouListAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -149,7 +154,8 @@ NewsfeedForyouListAccount $NewsfeedForyouListAccountFromJson(Map<String, dynamic
   return newsfeedForyouListAccount;
 }
 
-Map<String, dynamic> $NewsfeedForyouListAccountToJson(NewsfeedForyouListAccount entity) {
+Map<String, dynamic> $NewsfeedForyouListAccountToJson(
+    NewsfeedForyouListAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

+ 10 - 5
packages/cs_domain/lib/generated/json/newsfeed_news_entity.g.dart

@@ -19,8 +19,10 @@ NewsfeedNewsEntity $NewsfeedNewsEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     newsfeedNewsEntity.countPage = countPage;
   }
-  final List<NewsfeedNewsList>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<NewsfeedNewsList>(e) as NewsfeedNewsList).toList();
+  final List<NewsfeedNewsList>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) => jsonConvert.convert<NewsfeedNewsList>(e) as NewsfeedNewsList)
+      .toList();
   if (list != null) {
     newsfeedNewsEntity.list = list;
   }
@@ -85,7 +87,8 @@ NewsfeedNewsList $NewsfeedNewsListFromJson(Map<String, dynamic> json) {
   if (createdAt != null) {
     newsfeedNewsList.createdAt = createdAt;
   }
-  final NewsfeedNewsListAccount? account = jsonConvert.convert<NewsfeedNewsListAccount>(json['account']);
+  final NewsfeedNewsListAccount? account = jsonConvert.convert<
+      NewsfeedNewsListAccount>(json['account']);
   if (account != null) {
     newsfeedNewsList.account = account;
   }
@@ -128,7 +131,8 @@ extension NewsfeedNewsListExtension on NewsfeedNewsList {
   }
 }
 
-NewsfeedNewsListAccount $NewsfeedNewsListAccountFromJson(Map<String, dynamic> json) {
+NewsfeedNewsListAccount $NewsfeedNewsListAccountFromJson(
+    Map<String, dynamic> json) {
   final NewsfeedNewsListAccount newsfeedNewsListAccount = NewsfeedNewsListAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -149,7 +153,8 @@ NewsfeedNewsListAccount $NewsfeedNewsListAccountFromJson(Map<String, dynamic> js
   return newsfeedNewsListAccount;
 }
 
-Map<String, dynamic> $NewsfeedNewsListAccountToJson(NewsfeedNewsListAccount entity) {
+Map<String, dynamic> $NewsfeedNewsListAccountToJson(
+    NewsfeedNewsListAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

+ 4 - 2
packages/cs_domain/lib/generated/json/notice_board_announ_detail_entity.g.dart

@@ -1,7 +1,8 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/notice_board_announ_detail_entity.dart';
 
-NoticeBoardAnnounDetailEntity $NoticeBoardAnnounDetailEntityFromJson(Map<String, dynamic> json) {
+NoticeBoardAnnounDetailEntity $NoticeBoardAnnounDetailEntityFromJson(
+    Map<String, dynamic> json) {
   final NoticeBoardAnnounDetailEntity noticeBoardAnnounDetailEntity = NoticeBoardAnnounDetailEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -27,7 +28,8 @@ NoticeBoardAnnounDetailEntity $NoticeBoardAnnounDetailEntityFromJson(Map<String,
   return noticeBoardAnnounDetailEntity;
 }
 
-Map<String, dynamic> $NoticeBoardAnnounDetailEntityToJson(NoticeBoardAnnounDetailEntity entity) {
+Map<String, dynamic> $NoticeBoardAnnounDetailEntityToJson(
+    NoticeBoardAnnounDetailEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['title'] = entity.title;

+ 13 - 6
packages/cs_domain/lib/generated/json/notice_board_announ_entity.g.dart

@@ -1,7 +1,8 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/notice_board_announ_entity.dart';
 
-NoticeBoardAnnounEntity $NoticeBoardAnnounEntityFromJson(Map<String, dynamic> json) {
+NoticeBoardAnnounEntity $NoticeBoardAnnounEntityFromJson(
+    Map<String, dynamic> json) {
   final NoticeBoardAnnounEntity noticeBoardAnnounEntity = NoticeBoardAnnounEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -19,15 +20,19 @@ NoticeBoardAnnounEntity $NoticeBoardAnnounEntityFromJson(Map<String, dynamic> js
   if (countPage != null) {
     noticeBoardAnnounEntity.countPage = countPage;
   }
-  final List<NoticeBoardAnnounList>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<NoticeBoardAnnounList>(e) as NoticeBoardAnnounList).toList();
+  final List<NoticeBoardAnnounList>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<NoticeBoardAnnounList>(e) as NoticeBoardAnnounList)
+      .toList();
   if (list != null) {
     noticeBoardAnnounEntity.list = list;
   }
   return noticeBoardAnnounEntity;
 }
 
-Map<String, dynamic> $NoticeBoardAnnounEntityToJson(NoticeBoardAnnounEntity entity) {
+Map<String, dynamic> $NoticeBoardAnnounEntityToJson(
+    NoticeBoardAnnounEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;
@@ -54,7 +59,8 @@ extension NoticeBoardAnnounEntityExtension on NoticeBoardAnnounEntity {
   }
 }
 
-NoticeBoardAnnounList $NoticeBoardAnnounListFromJson(Map<String, dynamic> json) {
+NoticeBoardAnnounList $NoticeBoardAnnounListFromJson(
+    Map<String, dynamic> json) {
   final NoticeBoardAnnounList noticeBoardAnnounList = NoticeBoardAnnounList();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -71,7 +77,8 @@ NoticeBoardAnnounList $NoticeBoardAnnounListFromJson(Map<String, dynamic> json)
   return noticeBoardAnnounList;
 }
 
-Map<String, dynamic> $NoticeBoardAnnounListToJson(NoticeBoardAnnounList entity) {
+Map<String, dynamic> $NoticeBoardAnnounListToJson(
+    NoticeBoardAnnounList entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['title'] = entity.title;

+ 14 - 6
packages/cs_domain/lib/generated/json/notice_board_documents_entity.g.dart

@@ -1,7 +1,8 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/notice_board_documents_entity.dart';
 
-NoticeBoardDocumentsEntity $NoticeBoardDocumentsEntityFromJson(Map<String, dynamic> json) {
+NoticeBoardDocumentsEntity $NoticeBoardDocumentsEntityFromJson(
+    Map<String, dynamic> json) {
   final NoticeBoardDocumentsEntity noticeBoardDocumentsEntity = NoticeBoardDocumentsEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -19,15 +20,20 @@ NoticeBoardDocumentsEntity $NoticeBoardDocumentsEntityFromJson(Map<String, dynam
   if (countPage != null) {
     noticeBoardDocumentsEntity.countPage = countPage;
   }
-  final List<NoticeBoardDocumentsList>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<NoticeBoardDocumentsList>(e) as NoticeBoardDocumentsList).toList();
+  final List<NoticeBoardDocumentsList>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<NoticeBoardDocumentsList>(
+          e) as NoticeBoardDocumentsList)
+      .toList();
   if (list != null) {
     noticeBoardDocumentsEntity.list = list;
   }
   return noticeBoardDocumentsEntity;
 }
 
-Map<String, dynamic> $NoticeBoardDocumentsEntityToJson(NoticeBoardDocumentsEntity entity) {
+Map<String, dynamic> $NoticeBoardDocumentsEntityToJson(
+    NoticeBoardDocumentsEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;
@@ -54,7 +60,8 @@ extension NoticeBoardDocumentsEntityExtension on NoticeBoardDocumentsEntity {
   }
 }
 
-NoticeBoardDocumentsList $NoticeBoardDocumentsListFromJson(Map<String, dynamic> json) {
+NoticeBoardDocumentsList $NoticeBoardDocumentsListFromJson(
+    Map<String, dynamic> json) {
   final NoticeBoardDocumentsList noticeBoardDocumentsList = NoticeBoardDocumentsList();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -75,7 +82,8 @@ NoticeBoardDocumentsList $NoticeBoardDocumentsListFromJson(Map<String, dynamic>
   return noticeBoardDocumentsList;
 }
 
-Map<String, dynamic> $NoticeBoardDocumentsListToJson(NoticeBoardDocumentsList entity) {
+Map<String, dynamic> $NoticeBoardDocumentsListToJson(
+    NoticeBoardDocumentsList entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['parent_id'] = entity.parentId;

+ 4 - 2
packages/cs_domain/lib/generated/json/notice_board_event_detail_entity.g.dart

@@ -1,7 +1,8 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/notice_board_event_detail_entity.dart';
 
-NoticeBoardEventDetailEntity $NoticeBoardEventDetailEntityFromJson(Map<String, dynamic> json) {
+NoticeBoardEventDetailEntity $NoticeBoardEventDetailEntityFromJson(
+    Map<String, dynamic> json) {
   final NoticeBoardEventDetailEntity noticeBoardEventDetailEntity = NoticeBoardEventDetailEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -31,7 +32,8 @@ NoticeBoardEventDetailEntity $NoticeBoardEventDetailEntityFromJson(Map<String, d
   return noticeBoardEventDetailEntity;
 }
 
-Map<String, dynamic> $NoticeBoardEventDetailEntityToJson(NoticeBoardEventDetailEntity entity) {
+Map<String, dynamic> $NoticeBoardEventDetailEntityToJson(
+    NoticeBoardEventDetailEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['title'] = entity.title;

+ 9 - 4
packages/cs_domain/lib/generated/json/notice_board_event_entity.g.dart

@@ -1,7 +1,8 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/notice_board_event_entity.dart';
 
-NoticeBoardEventEntity $NoticeBoardEventEntityFromJson(Map<String, dynamic> json) {
+NoticeBoardEventEntity $NoticeBoardEventEntityFromJson(
+    Map<String, dynamic> json) {
   final NoticeBoardEventEntity noticeBoardEventEntity = NoticeBoardEventEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -19,15 +20,19 @@ NoticeBoardEventEntity $NoticeBoardEventEntityFromJson(Map<String, dynamic> json
   if (countPage != null) {
     noticeBoardEventEntity.countPage = countPage;
   }
-  final List<NoticeBoardEventList>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<NoticeBoardEventList>(e) as NoticeBoardEventList).toList();
+  final List<NoticeBoardEventList>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<NoticeBoardEventList>(e) as NoticeBoardEventList)
+      .toList();
   if (list != null) {
     noticeBoardEventEntity.list = list;
   }
   return noticeBoardEventEntity;
 }
 
-Map<String, dynamic> $NoticeBoardEventEntityToJson(NoticeBoardEventEntity entity) {
+Map<String, dynamic> $NoticeBoardEventEntityToJson(
+    NoticeBoardEventEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;

+ 4 - 2
packages/cs_domain/lib/generated/json/payment_page_entity.g.dart

@@ -19,8 +19,10 @@ PaymentPageEntity $PaymentPageEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     paymentPageEntity.countPage = countPage;
   }
-  final List<PaymentPageList>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<PaymentPageList>(e) as PaymentPageList).toList();
+  final List<PaymentPageList>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) => jsonConvert.convert<PaymentPageList>(e) as PaymentPageList)
+      .toList();
   if (list != null) {
     paymentPageEntity.list = list;
   }

+ 4 - 2
packages/cs_domain/lib/generated/json/property_news_detail_entity.g.dart

@@ -1,7 +1,8 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/property_news_detail_entity.dart';
 
-PropertyNewsDetailEntity $PropertyNewsDetailEntityFromJson(Map<String, dynamic> json) {
+PropertyNewsDetailEntity $PropertyNewsDetailEntityFromJson(
+    Map<String, dynamic> json) {
   final PropertyNewsDetailEntity propertyNewsDetailEntity = PropertyNewsDetailEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -34,7 +35,8 @@ PropertyNewsDetailEntity $PropertyNewsDetailEntityFromJson(Map<String, dynamic>
   return propertyNewsDetailEntity;
 }
 
-Map<String, dynamic> $PropertyNewsDetailEntityToJson(PropertyNewsDetailEntity entity) {
+Map<String, dynamic> $PropertyNewsDetailEntityToJson(
+    PropertyNewsDetailEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['title'] = entity.title;

+ 4 - 2
packages/cs_domain/lib/generated/json/property_news_entity.g.dart

@@ -19,8 +19,10 @@ PropertyNewsEntity $PropertyNewsEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     propertyNewsEntity.countPage = countPage;
   }
-  final List<PropertyNewsList>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<PropertyNewsList>(e) as PropertyNewsList).toList();
+  final List<PropertyNewsList>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) => jsonConvert.convert<PropertyNewsList>(e) as PropertyNewsList)
+      .toList();
   if (list != null) {
     propertyNewsEntity.list = list;
   }

+ 9 - 4
packages/cs_domain/lib/generated/json/property_sale_rent_entity.g.dart

@@ -1,7 +1,8 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/property_sale_rent_entity.dart';
 
-PropertySaleRentEntity $PropertySaleRentEntityFromJson(Map<String, dynamic> json) {
+PropertySaleRentEntity $PropertySaleRentEntityFromJson(
+    Map<String, dynamic> json) {
   final PropertySaleRentEntity propertySaleRentEntity = PropertySaleRentEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -19,15 +20,19 @@ PropertySaleRentEntity $PropertySaleRentEntityFromJson(Map<String, dynamic> json
   if (countPage != null) {
     propertySaleRentEntity.countPage = countPage;
   }
-  final List<PropertySaleRentList>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<PropertySaleRentList>(e) as PropertySaleRentList).toList();
+  final List<PropertySaleRentList>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<PropertySaleRentList>(e) as PropertySaleRentList)
+      .toList();
   if (list != null) {
     propertySaleRentEntity.list = list;
   }
   return propertySaleRentEntity;
 }
 
-Map<String, dynamic> $PropertySaleRentEntityToJson(PropertySaleRentEntity entity) {
+Map<String, dynamic> $PropertySaleRentEntityToJson(
+    PropertySaleRentEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;

+ 26 - 13
packages/cs_domain/lib/generated/json/rewards_active_detail_entity.g.dart

@@ -1,16 +1,19 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/rewards_active_detail_entity.dart';
 
-RewardsActiveDetailEntity $RewardsActiveDetailEntityFromJson(Map<String, dynamic> json) {
+RewardsActiveDetailEntity $RewardsActiveDetailEntityFromJson(
+    Map<String, dynamic> json) {
   final RewardsActiveDetailEntity rewardsActiveDetailEntity = RewardsActiveDetailEntity();
-  final RewardsActiveDetailData? data = jsonConvert.convert<RewardsActiveDetailData>(json['data']);
+  final RewardsActiveDetailData? data = jsonConvert.convert<
+      RewardsActiveDetailData>(json['data']);
   if (data != null) {
     rewardsActiveDetailEntity.data = data;
   }
   return rewardsActiveDetailEntity;
 }
 
-Map<String, dynamic> $RewardsActiveDetailEntityToJson(RewardsActiveDetailEntity entity) {
+Map<String, dynamic> $RewardsActiveDetailEntityToJson(
+    RewardsActiveDetailEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['data'] = entity.data.toJson();
   return data;
@@ -25,13 +28,15 @@ extension RewardsActiveDetailEntityExtension on RewardsActiveDetailEntity {
   }
 }
 
-RewardsActiveDetailData $RewardsActiveDetailDataFromJson(Map<String, dynamic> json) {
+RewardsActiveDetailData $RewardsActiveDetailDataFromJson(
+    Map<String, dynamic> json) {
   final RewardsActiveDetailData rewardsActiveDetailData = RewardsActiveDetailData();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
     rewardsActiveDetailData.id = id;
   }
-  final String? redemptionCode = jsonConvert.convert<String>(json['redemption_code']);
+  final String? redemptionCode = jsonConvert.convert<String>(
+      json['redemption_code']);
   if (redemptionCode != null) {
     rewardsActiveDetailData.redemptionCode = redemptionCode;
   }
@@ -51,18 +56,21 @@ RewardsActiveDetailData $RewardsActiveDetailDataFromJson(Map<String, dynamic> js
   if (quantity != null) {
     rewardsActiveDetailData.quantity = quantity;
   }
-  final RewardsActiveDetailDataAccount? account = jsonConvert.convert<RewardsActiveDetailDataAccount>(json['account']);
+  final RewardsActiveDetailDataAccount? account = jsonConvert.convert<
+      RewardsActiveDetailDataAccount>(json['account']);
   if (account != null) {
     rewardsActiveDetailData.account = account;
   }
-  final RewardsActiveDetailDataReward? reward = jsonConvert.convert<RewardsActiveDetailDataReward>(json['reward']);
+  final RewardsActiveDetailDataReward? reward = jsonConvert.convert<
+      RewardsActiveDetailDataReward>(json['reward']);
   if (reward != null) {
     rewardsActiveDetailData.reward = reward;
   }
   return rewardsActiveDetailData;
 }
 
-Map<String, dynamic> $RewardsActiveDetailDataToJson(RewardsActiveDetailData entity) {
+Map<String, dynamic> $RewardsActiveDetailDataToJson(
+    RewardsActiveDetailData entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['redemption_code'] = entity.redemptionCode;
@@ -98,7 +106,8 @@ extension RewardsActiveDetailDataExtension on RewardsActiveDetailData {
   }
 }
 
-RewardsActiveDetailDataAccount $RewardsActiveDetailDataAccountFromJson(Map<String, dynamic> json) {
+RewardsActiveDetailDataAccount $RewardsActiveDetailDataAccountFromJson(
+    Map<String, dynamic> json) {
   final RewardsActiveDetailDataAccount rewardsActiveDetailDataAccount = RewardsActiveDetailDataAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -115,7 +124,8 @@ RewardsActiveDetailDataAccount $RewardsActiveDetailDataAccountFromJson(Map<Strin
   return rewardsActiveDetailDataAccount;
 }
 
-Map<String, dynamic> $RewardsActiveDetailDataAccountToJson(RewardsActiveDetailDataAccount entity) {
+Map<String, dynamic> $RewardsActiveDetailDataAccountToJson(
+    RewardsActiveDetailDataAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -136,7 +146,8 @@ extension RewardsActiveDetailDataAccountExtension on RewardsActiveDetailDataAcco
   }
 }
 
-RewardsActiveDetailDataReward $RewardsActiveDetailDataRewardFromJson(Map<String, dynamic> json) {
+RewardsActiveDetailDataReward $RewardsActiveDetailDataRewardFromJson(
+    Map<String, dynamic> json) {
   final RewardsActiveDetailDataReward rewardsActiveDetailDataReward = RewardsActiveDetailDataReward();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -159,7 +170,8 @@ RewardsActiveDetailDataReward $RewardsActiveDetailDataRewardFromJson(Map<String,
   if (point != null) {
     rewardsActiveDetailDataReward.point = point;
   }
-  final String? redeemedStart = jsonConvert.convert<String>(json['redeemed_start']);
+  final String? redeemedStart = jsonConvert.convert<String>(
+      json['redeemed_start']);
   if (redeemedStart != null) {
     rewardsActiveDetailDataReward.redeemedStart = redeemedStart;
   }
@@ -170,7 +182,8 @@ RewardsActiveDetailDataReward $RewardsActiveDetailDataRewardFromJson(Map<String,
   return rewardsActiveDetailDataReward;
 }
 
-Map<String, dynamic> $RewardsActiveDetailDataRewardToJson(RewardsActiveDetailDataReward entity) {
+Map<String, dynamic> $RewardsActiveDetailDataRewardToJson(
+    RewardsActiveDetailDataReward entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['title'] = entity.title;

+ 14 - 6
packages/cs_domain/lib/generated/json/rewards_buy_entity.g.dart

@@ -11,7 +11,8 @@ RewardsBuyEntity $RewardsBuyEntityFromJson(Map<String, dynamic> json) {
   if (createdAt != null) {
     rewardsBuyEntity.createdAt = createdAt;
   }
-  final RewardsBuyReward? reward = jsonConvert.convert<RewardsBuyReward>(json['reward']);
+  final RewardsBuyReward? reward = jsonConvert.convert<RewardsBuyReward>(
+      json['reward']);
   if (reward != null) {
     rewardsBuyEntity.reward = reward;
   }
@@ -78,7 +79,8 @@ RewardsBuyReward $RewardsBuyRewardFromJson(Map<String, dynamic> json) {
   if (end != null) {
     rewardsBuyReward.end = end;
   }
-  final String? redeemedStart = jsonConvert.convert<String>(json['redeemed_start']);
+  final String? redeemedStart = jsonConvert.convert<String>(
+      json['redeemed_start']);
   if (redeemedStart != null) {
     rewardsBuyReward.redeemedStart = redeemedStart;
   }
@@ -98,8 +100,12 @@ RewardsBuyReward $RewardsBuyRewardFromJson(Map<String, dynamic> json) {
   if (createdAt != null) {
     rewardsBuyReward.createdAt = createdAt;
   }
-  final List<RewardsBuyRewardRedeemable>? redeemable = (json['redeemable'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<RewardsBuyRewardRedeemable>(e) as RewardsBuyRewardRedeemable).toList();
+  final List<
+      RewardsBuyRewardRedeemable>? redeemable = (json['redeemable'] as List<
+      dynamic>?)?.map(
+          (e) =>
+      jsonConvert.convert<RewardsBuyRewardRedeemable>(
+          e) as RewardsBuyRewardRedeemable).toList();
   if (redeemable != null) {
     rewardsBuyReward.redeemable = redeemable;
   }
@@ -163,7 +169,8 @@ extension RewardsBuyRewardExtension on RewardsBuyReward {
   }
 }
 
-RewardsBuyRewardRedeemable $RewardsBuyRewardRedeemableFromJson(Map<String, dynamic> json) {
+RewardsBuyRewardRedeemable $RewardsBuyRewardRedeemableFromJson(
+    Map<String, dynamic> json) {
   final RewardsBuyRewardRedeemable rewardsBuyRewardRedeemable = RewardsBuyRewardRedeemable();
   final String? day = jsonConvert.convert<String>(json['day']);
   if (day != null) {
@@ -176,7 +183,8 @@ RewardsBuyRewardRedeemable $RewardsBuyRewardRedeemableFromJson(Map<String, dynam
   return rewardsBuyRewardRedeemable;
 }
 
-Map<String, dynamic> $RewardsBuyRewardRedeemableToJson(RewardsBuyRewardRedeemable entity) {
+Map<String, dynamic> $RewardsBuyRewardRedeemableToJson(
+    RewardsBuyRewardRedeemable entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['day'] = entity.day;
   data['time'] = entity.time;

+ 4 - 2
packages/cs_domain/lib/generated/json/rewards_category_entity.g.dart

@@ -1,7 +1,8 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/rewards_category_entity.dart';
 
-RewardsCategoryEntity $RewardsCategoryEntityFromJson(Map<String, dynamic> json) {
+RewardsCategoryEntity $RewardsCategoryEntityFromJson(
+    Map<String, dynamic> json) {
   final RewardsCategoryEntity rewardsCategoryEntity = RewardsCategoryEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -18,7 +19,8 @@ RewardsCategoryEntity $RewardsCategoryEntityFromJson(Map<String, dynamic> json)
   return rewardsCategoryEntity;
 }
 
-Map<String, dynamic> $RewardsCategoryEntityToJson(RewardsCategoryEntity entity) {
+Map<String, dynamic> $RewardsCategoryEntityToJson(
+    RewardsCategoryEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['icon'] = entity.icon;

+ 11 - 5
packages/cs_domain/lib/generated/json/rewards_detail_entity.g.dart

@@ -40,7 +40,8 @@ RewardsDetailEntity $RewardsDetailEntityFromJson(Map<String, dynamic> json) {
   if (end != null) {
     rewardsDetailEntity.end = end;
   }
-  final String? redeemedStart = jsonConvert.convert<String>(json['redeemed_start']);
+  final String? redeemedStart = jsonConvert.convert<String>(
+      json['redeemed_start']);
   if (redeemedStart != null) {
     rewardsDetailEntity.redeemedStart = redeemedStart;
   }
@@ -60,8 +61,11 @@ RewardsDetailEntity $RewardsDetailEntityFromJson(Map<String, dynamic> json) {
   if (createdAt != null) {
     rewardsDetailEntity.createdAt = createdAt;
   }
-  final List<RewardsDetailRedeemable>? redeemable = (json['redeemable'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<RewardsDetailRedeemable>(e) as RewardsDetailRedeemable).toList();
+  final List<RewardsDetailRedeemable>? redeemable = (json['redeemable'] as List<
+      dynamic>?)?.map(
+          (e) =>
+      jsonConvert.convert<RewardsDetailRedeemable>(
+          e) as RewardsDetailRedeemable).toList();
   if (redeemable != null) {
     rewardsDetailEntity.redeemable = redeemable;
   }
@@ -125,7 +129,8 @@ extension RewardsDetailEntityExtension on RewardsDetailEntity {
   }
 }
 
-RewardsDetailRedeemable $RewardsDetailRedeemableFromJson(Map<String, dynamic> json) {
+RewardsDetailRedeemable $RewardsDetailRedeemableFromJson(
+    Map<String, dynamic> json) {
   final RewardsDetailRedeemable rewardsDetailRedeemable = RewardsDetailRedeemable();
   final String? day = jsonConvert.convert<String>(json['day']);
   if (day != null) {
@@ -138,7 +143,8 @@ RewardsDetailRedeemable $RewardsDetailRedeemableFromJson(Map<String, dynamic> js
   return rewardsDetailRedeemable;
 }
 
-Map<String, dynamic> $RewardsDetailRedeemableToJson(RewardsDetailRedeemable entity) {
+Map<String, dynamic> $RewardsDetailRedeemableToJson(
+    RewardsDetailRedeemable entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['day'] = entity.day;
   data['time'] = entity.time;

+ 16 - 7
packages/cs_domain/lib/generated/json/rewards_history_earned_entity.g.dart

@@ -1,7 +1,8 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/rewards_history_earned_entity.dart';
 
-RewardsHistoryEarnedEntity $RewardsHistoryEarnedEntityFromJson(Map<String, dynamic> json) {
+RewardsHistoryEarnedEntity $RewardsHistoryEarnedEntityFromJson(
+    Map<String, dynamic> json) {
   final RewardsHistoryEarnedEntity rewardsHistoryEarnedEntity = RewardsHistoryEarnedEntity();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
@@ -19,15 +20,20 @@ RewardsHistoryEarnedEntity $RewardsHistoryEarnedEntityFromJson(Map<String, dynam
   if (countPage != null) {
     rewardsHistoryEarnedEntity.countPage = countPage;
   }
-  final List<RewardsHistoryEarnedList>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<RewardsHistoryEarnedList>(e) as RewardsHistoryEarnedList).toList();
+  final List<RewardsHistoryEarnedList>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<RewardsHistoryEarnedList>(
+          e) as RewardsHistoryEarnedList)
+      .toList();
   if (list != null) {
     rewardsHistoryEarnedEntity.list = list;
   }
   return rewardsHistoryEarnedEntity;
 }
 
-Map<String, dynamic> $RewardsHistoryEarnedEntityToJson(RewardsHistoryEarnedEntity entity) {
+Map<String, dynamic> $RewardsHistoryEarnedEntityToJson(
+    RewardsHistoryEarnedEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['page'] = entity.page;
@@ -54,7 +60,8 @@ extension RewardsHistoryEarnedEntityExtension on RewardsHistoryEarnedEntity {
   }
 }
 
-RewardsHistoryEarnedList $RewardsHistoryEarnedListFromJson(Map<String, dynamic> json) {
+RewardsHistoryEarnedList $RewardsHistoryEarnedListFromJson(
+    Map<String, dynamic> json) {
   final RewardsHistoryEarnedList rewardsHistoryEarnedList = RewardsHistoryEarnedList();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -64,7 +71,8 @@ RewardsHistoryEarnedList $RewardsHistoryEarnedListFromJson(Map<String, dynamic>
   if (point != null) {
     rewardsHistoryEarnedList.point = point;
   }
-  final String? shortDescription = jsonConvert.convert<String>(json['short_description']);
+  final String? shortDescription = jsonConvert.convert<String>(
+      json['short_description']);
   if (shortDescription != null) {
     rewardsHistoryEarnedList.shortDescription = shortDescription;
   }
@@ -75,7 +83,8 @@ RewardsHistoryEarnedList $RewardsHistoryEarnedListFromJson(Map<String, dynamic>
   return rewardsHistoryEarnedList;
 }
 
-Map<String, dynamic> $RewardsHistoryEarnedListToJson(RewardsHistoryEarnedList entity) {
+Map<String, dynamic> $RewardsHistoryEarnedListToJson(
+    RewardsHistoryEarnedList entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['point'] = entity.point;

+ 14 - 6
packages/cs_domain/lib/generated/json/rewards_home_entity.g.dart

@@ -3,8 +3,10 @@ import 'package:domain/entity/rewards_home_entity.dart';
 
 RewardsHomeEntity $RewardsHomeEntityFromJson(Map<String, dynamic> json) {
   final RewardsHomeEntity rewardsHomeEntity = RewardsHomeEntity();
-  final List<RewardsHomeData>? data = (json['data'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<RewardsHomeData>(e) as RewardsHomeData).toList();
+  final List<RewardsHomeData>? data = (json['data'] as List<dynamic>?)
+      ?.map(
+          (e) => jsonConvert.convert<RewardsHomeData>(e) as RewardsHomeData)
+      .toList();
   if (data != null) {
     rewardsHomeEntity.data = data;
   }
@@ -50,8 +52,12 @@ RewardsHomeData $RewardsHomeDataFromJson(Map<String, dynamic> json) {
   if (name != null) {
     rewardsHomeData.name = name;
   }
-  final List<RewardsHomeDataRewards>? rewards = (json['rewards'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<RewardsHomeDataRewards>(e) as RewardsHomeDataRewards).toList();
+  final List<RewardsHomeDataRewards>? rewards = (json['rewards'] as List<
+      dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<RewardsHomeDataRewards>(e) as RewardsHomeDataRewards)
+      .toList();
   if (rewards != null) {
     rewardsHomeData.rewards = rewards;
   }
@@ -79,7 +85,8 @@ extension RewardsHomeDataExtension on RewardsHomeData {
   }
 }
 
-RewardsHomeDataRewards $RewardsHomeDataRewardsFromJson(Map<String, dynamic> json) {
+RewardsHomeDataRewards $RewardsHomeDataRewardsFromJson(
+    Map<String, dynamic> json) {
   final RewardsHomeDataRewards rewardsHomeDataRewards = RewardsHomeDataRewards();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -105,7 +112,8 @@ RewardsHomeDataRewards $RewardsHomeDataRewardsFromJson(Map<String, dynamic> json
   return rewardsHomeDataRewards;
 }
 
-Map<String, dynamic> $RewardsHomeDataRewardsToJson(RewardsHomeDataRewards entity) {
+Map<String, dynamic> $RewardsHomeDataRewardsToJson(
+    RewardsHomeDataRewards entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

+ 12 - 5
packages/cs_domain/lib/generated/json/rewards_home_tes_entity.g.dart

@@ -11,8 +11,12 @@ RewardsHomeTesEntity $RewardsHomeTesEntityFromJson(Map<String, dynamic> json) {
   if (name != null) {
     rewardsHomeTesEntity.name = name;
   }
-  final List<RewardsHomeTesRewards>? rewards = (json['rewards'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<RewardsHomeTesRewards>(e) as RewardsHomeTesRewards).toList();
+  final List<RewardsHomeTesRewards>? rewards = (json['rewards'] as List<
+      dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<RewardsHomeTesRewards>(e) as RewardsHomeTesRewards)
+      .toList();
   if (rewards != null) {
     rewardsHomeTesEntity.rewards = rewards;
   }
@@ -40,7 +44,8 @@ extension RewardsHomeTesEntityExtension on RewardsHomeTesEntity {
   }
 }
 
-RewardsHomeTesRewards $RewardsHomeTesRewardsFromJson(Map<String, dynamic> json) {
+RewardsHomeTesRewards $RewardsHomeTesRewardsFromJson(
+    Map<String, dynamic> json) {
   final RewardsHomeTesRewards rewardsHomeTesRewards = RewardsHomeTesRewards();
   final double? id = jsonConvert.convert<double>(json['id']);
   if (id != null) {
@@ -55,7 +60,8 @@ RewardsHomeTesRewards $RewardsHomeTesRewardsFromJson(Map<String, dynamic> json)
   if (resources != null) {
     rewardsHomeTesRewards.resources = resources;
   }
-  final double? originalPoint = jsonConvert.convert<double>(json['original_point']);
+  final double? originalPoint = jsonConvert.convert<double>(
+      json['original_point']);
   if (originalPoint != null) {
     rewardsHomeTesRewards.originalPoint = originalPoint;
   }
@@ -66,7 +72,8 @@ RewardsHomeTesRewards $RewardsHomeTesRewardsFromJson(Map<String, dynamic> json)
   return rewardsHomeTesRewards;
 }
 
-Map<String, dynamic> $RewardsHomeTesRewardsToJson(RewardsHomeTesRewards entity) {
+Map<String, dynamic> $RewardsHomeTesRewardsToJson(
+    RewardsHomeTesRewards entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

+ 4 - 2
packages/cs_domain/lib/generated/json/rewards_home_test_entity.g.dart

@@ -1,7 +1,8 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/rewards_home_test_entity.dart';
 
-RewardsHomeTestEntity $RewardsHomeTestEntityFromJson(Map<String, dynamic> json) {
+RewardsHomeTestEntity $RewardsHomeTestEntityFromJson(
+    Map<String, dynamic> json) {
   final RewardsHomeTestEntity rewardsHomeTestEntity = RewardsHomeTestEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -19,7 +20,8 @@ RewardsHomeTestEntity $RewardsHomeTestEntityFromJson(Map<String, dynamic> json)
   return rewardsHomeTestEntity;
 }
 
-Map<String, dynamic> $RewardsHomeTestEntityToJson(RewardsHomeTestEntity entity) {
+Map<String, dynamic> $RewardsHomeTestEntityToJson(
+    RewardsHomeTestEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;

+ 11 - 5
packages/cs_domain/lib/generated/json/rewards_index_entity.g.dart

@@ -7,11 +7,13 @@ RewardsIndexEntity $RewardsIndexEntityFromJson(Map<String, dynamic> json) {
   if (points != null) {
     rewardsIndexEntity.points = points;
   }
-  final RewardsIndexContinuous? continuous = jsonConvert.convert<RewardsIndexContinuous>(json['continuous']);
+  final RewardsIndexContinuous? continuous = jsonConvert.convert<
+      RewardsIndexContinuous>(json['continuous']);
   if (continuous != null) {
     rewardsIndexEntity.continuous = continuous;
   }
-  final RewardsIndexTasks? tasks = jsonConvert.convert<RewardsIndexTasks>(json['tasks']);
+  final RewardsIndexTasks? tasks = jsonConvert.convert<RewardsIndexTasks>(
+      json['tasks']);
   if (tasks != null) {
     rewardsIndexEntity.tasks = tasks;
   }
@@ -47,13 +49,16 @@ extension RewardsIndexEntityExtension on RewardsIndexEntity {
   }
 }
 
-RewardsIndexContinuous $RewardsIndexContinuousFromJson(Map<String, dynamic> json) {
+RewardsIndexContinuous $RewardsIndexContinuousFromJson(
+    Map<String, dynamic> json) {
   final RewardsIndexContinuous rewardsIndexContinuous = RewardsIndexContinuous();
   final int? count = jsonConvert.convert<int>(json['count']);
   if (count != null) {
     rewardsIndexContinuous.count = count;
   }
-  final List<dynamic>? currentWeekCheckin = (json['current_week_checkin'] as List<dynamic>?)?.map(
+  final List<
+      dynamic>? currentWeekCheckin = (json['current_week_checkin'] as List<
+      dynamic>?)?.map(
           (e) => e).toList();
   if (currentWeekCheckin != null) {
     rewardsIndexContinuous.currentWeekCheckin = currentWeekCheckin;
@@ -61,7 +66,8 @@ RewardsIndexContinuous $RewardsIndexContinuousFromJson(Map<String, dynamic> json
   return rewardsIndexContinuous;
 }
 
-Map<String, dynamic> $RewardsIndexContinuousToJson(RewardsIndexContinuous entity) {
+Map<String, dynamic> $RewardsIndexContinuousToJson(
+    RewardsIndexContinuous entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['count'] = entity.count;
   data['current_week_checkin'] = entity.currentWeekCheckin;

+ 4 - 2
packages/cs_domain/lib/generated/json/rewards_list_entity.g.dart

@@ -19,8 +19,10 @@ RewardsListEntity $RewardsListEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     rewardsListEntity.countPage = countPage;
   }
-  final List<RewardsListList>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<RewardsListList>(e) as RewardsListList).toList();
+  final List<RewardsListList>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) => jsonConvert.convert<RewardsListList>(e) as RewardsListList)
+      .toList();
   if (list != null) {
     rewardsListEntity.list = list;
   }

+ 18 - 9
packages/cs_domain/lib/generated/json/rewards_my_detail_entity.g.dart

@@ -1,7 +1,8 @@
 import 'package:domain/generated/json/base/json_convert_content.dart';
 import 'package:domain/entity/rewards_my_detail_entity.dart';
 
-RewardsMyDetailEntity $RewardsMyDetailEntityFromJson(Map<String, dynamic> json) {
+RewardsMyDetailEntity $RewardsMyDetailEntityFromJson(
+    Map<String, dynamic> json) {
   final RewardsMyDetailEntity rewardsMyDetailEntity = RewardsMyDetailEntity();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -27,18 +28,21 @@ RewardsMyDetailEntity $RewardsMyDetailEntityFromJson(Map<String, dynamic> json)
   if (quantity != null) {
     rewardsMyDetailEntity.quantity = quantity;
   }
-  final RewardsMyDetailReward? reward = jsonConvert.convert<RewardsMyDetailReward>(json['reward']);
+  final RewardsMyDetailReward? reward = jsonConvert.convert<
+      RewardsMyDetailReward>(json['reward']);
   if (reward != null) {
     rewardsMyDetailEntity.reward = reward;
   }
-  final RewardsMyDetailAccount? account = jsonConvert.convert<RewardsMyDetailAccount>(json['account']);
+  final RewardsMyDetailAccount? account = jsonConvert.convert<
+      RewardsMyDetailAccount>(json['account']);
   if (account != null) {
     rewardsMyDetailEntity.account = account;
   }
   return rewardsMyDetailEntity;
 }
 
-Map<String, dynamic> $RewardsMyDetailEntityToJson(RewardsMyDetailEntity entity) {
+Map<String, dynamic> $RewardsMyDetailEntityToJson(
+    RewardsMyDetailEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['redemption_code'] = entity.redemptionCode;
@@ -74,7 +78,8 @@ extension RewardsMyDetailEntityExtension on RewardsMyDetailEntity {
   }
 }
 
-RewardsMyDetailAccount $RewardsMyDetailAccountFromJson(Map<String, dynamic> json) {
+RewardsMyDetailAccount $RewardsMyDetailAccountFromJson(
+    Map<String, dynamic> json) {
   final RewardsMyDetailAccount rewardsMyDetailAccount = RewardsMyDetailAccount();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -91,7 +96,8 @@ RewardsMyDetailAccount $RewardsMyDetailAccountFromJson(Map<String, dynamic> json
   return rewardsMyDetailAccount;
 }
 
-Map<String, dynamic> $RewardsMyDetailAccountToJson(RewardsMyDetailAccount entity) {
+Map<String, dynamic> $RewardsMyDetailAccountToJson(
+    RewardsMyDetailAccount entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -112,7 +118,8 @@ extension RewardsMyDetailAccountExtension on RewardsMyDetailAccount {
   }
 }
 
-RewardsMyDetailReward $RewardsMyDetailRewardFromJson(Map<String, dynamic> json) {
+RewardsMyDetailReward $RewardsMyDetailRewardFromJson(
+    Map<String, dynamic> json) {
   final RewardsMyDetailReward rewardsMyDetailReward = RewardsMyDetailReward();
   final int? id = jsonConvert.convert<int>(json['id']);
   if (id != null) {
@@ -135,7 +142,8 @@ RewardsMyDetailReward $RewardsMyDetailRewardFromJson(Map<String, dynamic> json)
   if (point != null) {
     rewardsMyDetailReward.point = point;
   }
-  final String? redeemedStart = jsonConvert.convert<String>(json['redeemed_start']);
+  final String? redeemedStart = jsonConvert.convert<String>(
+      json['redeemed_start']);
   if (redeemedStart != null) {
     rewardsMyDetailReward.redeemedStart = redeemedStart;
   }
@@ -146,7 +154,8 @@ RewardsMyDetailReward $RewardsMyDetailRewardFromJson(Map<String, dynamic> json)
   return rewardsMyDetailReward;
 }
 
-Map<String, dynamic> $RewardsMyDetailRewardToJson(RewardsMyDetailReward entity) {
+Map<String, dynamic> $RewardsMyDetailRewardToJson(
+    RewardsMyDetailReward entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['title'] = entity.title;

+ 8 - 4
packages/cs_domain/lib/generated/json/rewards_my_entity.g.dart

@@ -19,8 +19,10 @@ RewardsMyEntity $RewardsMyEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     rewardsMyEntity.countPage = countPage;
   }
-  final List<RewardsMyList>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<RewardsMyList>(e) as RewardsMyList).toList();
+  final List<RewardsMyList>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) => jsonConvert.convert<RewardsMyList>(e) as RewardsMyList)
+      .toList();
   if (list != null) {
     rewardsMyEntity.list = list;
   }
@@ -68,7 +70,8 @@ RewardsMyList $RewardsMyListFromJson(Map<String, dynamic> json) {
   if (usedAt != null) {
     rewardsMyList.usedAt = usedAt;
   }
-  final RewardsMyListReward? reward = jsonConvert.convert<RewardsMyListReward>(json['reward']);
+  final RewardsMyListReward? reward = jsonConvert.convert<RewardsMyListReward>(
+      json['reward']);
   if (reward != null) {
     rewardsMyList.reward = reward;
   }
@@ -122,7 +125,8 @@ RewardsMyListReward $RewardsMyListRewardFromJson(Map<String, dynamic> json) {
   if (point != null) {
     rewardsMyListReward.point = point;
   }
-  final String? redeemedStart = jsonConvert.convert<String>(json['redeemed_start']);
+  final String? redeemedStart = jsonConvert.convert<String>(
+      json['redeemed_start']);
   if (redeemedStart != null) {
     rewardsMyListReward.redeemedStart = redeemedStart;
   }

+ 6 - 2
packages/cs_domain/lib/generated/json/rewards_search_entity.g.dart

@@ -13,8 +13,12 @@ RewardsSearchEntity $RewardsSearchEntityFromJson(Map<String, dynamic> json) {
   if (trending != null) {
     rewardsSearchEntity.trending = trending;
   }
-  final List<RewardsSearchRewards>? rewards = (json['rewards'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<RewardsSearchRewards>(e) as RewardsSearchRewards).toList();
+  final List<RewardsSearchRewards>? rewards = (json['rewards'] as List<
+      dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<RewardsSearchRewards>(e) as RewardsSearchRewards)
+      .toList();
   if (rewards != null) {
     rewardsSearchEntity.rewards = rewards;
   }

+ 164 - 0
packages/cs_domain/lib/generated/json/service_evaluate_list_entity.g.dart

@@ -0,0 +1,164 @@
+import 'package:domain/generated/json/base/json_convert_content.dart';
+import 'package:domain/entity/service_evaluate_list_entity.dart';
+
+ServiceEvaluateListEntity $ServiceEvaluateListEntityFromJson(
+    Map<String, dynamic> json) {
+  final ServiceEvaluateListEntity serviceEvaluateListEntity = ServiceEvaluateListEntity();
+  final int? count = jsonConvert.convert<int>(json['count']);
+  if (count != null) {
+    serviceEvaluateListEntity.count = count;
+  }
+  final int? page = jsonConvert.convert<int>(json['page']);
+  if (page != null) {
+    serviceEvaluateListEntity.page = page;
+  }
+  final int? limit = jsonConvert.convert<int>(json['limit']);
+  if (limit != null) {
+    serviceEvaluateListEntity.limit = limit;
+  }
+  final int? countPage = jsonConvert.convert<int>(json['count_page']);
+  if (countPage != null) {
+    serviceEvaluateListEntity.countPage = countPage;
+  }
+  final List<ServiceEvaluateListList>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<ServiceEvaluateListList>(
+          e) as ServiceEvaluateListList)
+      .toList();
+  if (list != null) {
+    serviceEvaluateListEntity.list = list;
+  }
+  return serviceEvaluateListEntity;
+}
+
+Map<String, dynamic> $ServiceEvaluateListEntityToJson(
+    ServiceEvaluateListEntity entity) {
+  final Map<String, dynamic> data = <String, dynamic>{};
+  data['count'] = entity.count;
+  data['page'] = entity.page;
+  data['limit'] = entity.limit;
+  data['count_page'] = entity.countPage;
+  data['list'] = entity.list.map((v) => v.toJson()).toList();
+  return data;
+}
+
+extension ServiceEvaluateListEntityExtension on ServiceEvaluateListEntity {
+  ServiceEvaluateListEntity copyWith({
+    int? count,
+    int? page,
+    int? limit,
+    int? countPage,
+    List<ServiceEvaluateListList>? list,
+  }) {
+    return ServiceEvaluateListEntity()
+      ..count = count ?? this.count
+      ..page = page ?? this.page
+      ..limit = limit ?? this.limit
+      ..countPage = countPage ?? this.countPage
+      ..list = list ?? this.list;
+  }
+}
+
+ServiceEvaluateListList $ServiceEvaluateListListFromJson(
+    Map<String, dynamic> json) {
+  final ServiceEvaluateListList serviceEvaluateListList = ServiceEvaluateListList();
+  final int? id = jsonConvert.convert<int>(json['id']);
+  if (id != null) {
+    serviceEvaluateListList.id = id;
+  }
+  final ServiceEvaluateListListAccount? account = jsonConvert.convert<
+      ServiceEvaluateListListAccount>(json['account']);
+  if (account != null) {
+    serviceEvaluateListList.account = account;
+  }
+  final int? score = jsonConvert.convert<int>(json['score']);
+  if (score != null) {
+    serviceEvaluateListList.score = score;
+  }
+  final String? comment = jsonConvert.convert<String>(json['comment']);
+  if (comment != null) {
+    serviceEvaluateListList.comment = comment;
+  }
+  final List<dynamic>? resources = (json['resources'] as List<dynamic>?)?.map(
+          (e) => e).toList();
+  if (resources != null) {
+    serviceEvaluateListList.resources = resources;
+  }
+  final String? createdAt = jsonConvert.convert<String>(json['created_at']);
+  if (createdAt != null) {
+    serviceEvaluateListList.createdAt = createdAt;
+  }
+  return serviceEvaluateListList;
+}
+
+Map<String, dynamic> $ServiceEvaluateListListToJson(
+    ServiceEvaluateListList entity) {
+  final Map<String, dynamic> data = <String, dynamic>{};
+  data['id'] = entity.id;
+  data['account'] = entity.account.toJson();
+  data['score'] = entity.score;
+  data['comment'] = entity.comment;
+  data['resources'] = entity.resources;
+  data['created_at'] = entity.createdAt;
+  return data;
+}
+
+extension ServiceEvaluateListListExtension on ServiceEvaluateListList {
+  ServiceEvaluateListList copyWith({
+    int? id,
+    ServiceEvaluateListListAccount? account,
+    int? score,
+    String? comment,
+    List<dynamic>? resources,
+    String? createdAt,
+  }) {
+    return ServiceEvaluateListList()
+      ..id = id ?? this.id
+      ..account = account ?? this.account
+      ..score = score ?? this.score
+      ..comment = comment ?? this.comment
+      ..resources = resources ?? this.resources
+      ..createdAt = createdAt ?? this.createdAt;
+  }
+}
+
+ServiceEvaluateListListAccount $ServiceEvaluateListListAccountFromJson(
+    Map<String, dynamic> json) {
+  final ServiceEvaluateListListAccount serviceEvaluateListListAccount = ServiceEvaluateListListAccount();
+  final int? id = jsonConvert.convert<int>(json['id']);
+  if (id != null) {
+    serviceEvaluateListListAccount.id = id;
+  }
+  final String? name = jsonConvert.convert<String>(json['name']);
+  if (name != null) {
+    serviceEvaluateListListAccount.name = name;
+  }
+  final String? avatar = jsonConvert.convert<String>(json['avatar']);
+  if (avatar != null) {
+    serviceEvaluateListListAccount.avatar = avatar;
+  }
+  return serviceEvaluateListListAccount;
+}
+
+Map<String, dynamic> $ServiceEvaluateListListAccountToJson(
+    ServiceEvaluateListListAccount entity) {
+  final Map<String, dynamic> data = <String, dynamic>{};
+  data['id'] = entity.id;
+  data['name'] = entity.name;
+  data['avatar'] = entity.avatar;
+  return data;
+}
+
+extension ServiceEvaluateListListAccountExtension on ServiceEvaluateListListAccount {
+  ServiceEvaluateListListAccount copyWith({
+    int? id,
+    String? name,
+    String? avatar,
+  }) {
+    return ServiceEvaluateListListAccount()
+      ..id = id ?? this.id
+      ..name = name ?? this.name
+      ..avatar = avatar ?? this.avatar;
+  }
+}

+ 131 - 0
packages/cs_domain/lib/generated/json/service_repair_detail_entity.g.dart

@@ -0,0 +1,131 @@
+import 'package:domain/generated/json/base/json_convert_content.dart';
+import 'package:domain/entity/service_repair_detail_entity.dart';
+
+ServiceRepairDetailEntity $ServiceRepairDetailEntityFromJson(
+    Map<String, dynamic> json) {
+  final ServiceRepairDetailEntity serviceRepairDetailEntity = ServiceRepairDetailEntity();
+  final int? id = jsonConvert.convert<int>(json['id']);
+  if (id != null) {
+    serviceRepairDetailEntity.id = id;
+  }
+  final String? name = jsonConvert.convert<String>(json['name']);
+  if (name != null) {
+    serviceRepairDetailEntity.name = name;
+  }
+  final String? description = jsonConvert.convert<String>(json['description']);
+  if (description != null) {
+    serviceRepairDetailEntity.description = description;
+  }
+  final ServiceRepairDetailMerchant? merchant = jsonConvert.convert<
+      ServiceRepairDetailMerchant>(json['merchant']);
+  if (merchant != null) {
+    serviceRepairDetailEntity.merchant = merchant;
+  }
+  final ServiceRepairDetailCategory? category = jsonConvert.convert<
+      ServiceRepairDetailCategory>(json['category']);
+  if (category != null) {
+    serviceRepairDetailEntity.category = category;
+  }
+  return serviceRepairDetailEntity;
+}
+
+Map<String, dynamic> $ServiceRepairDetailEntityToJson(
+    ServiceRepairDetailEntity entity) {
+  final Map<String, dynamic> data = <String, dynamic>{};
+  data['id'] = entity.id;
+  data['name'] = entity.name;
+  data['description'] = entity.description;
+  data['merchant'] = entity.merchant.toJson();
+  data['category'] = entity.category.toJson();
+  return data;
+}
+
+extension ServiceRepairDetailEntityExtension on ServiceRepairDetailEntity {
+  ServiceRepairDetailEntity copyWith({
+    int? id,
+    String? name,
+    String? description,
+    ServiceRepairDetailMerchant? merchant,
+    ServiceRepairDetailCategory? category,
+  }) {
+    return ServiceRepairDetailEntity()
+      ..id = id ?? this.id
+      ..name = name ?? this.name
+      ..description = description ?? this.description
+      ..merchant = merchant ?? this.merchant
+      ..category = category ?? this.category;
+  }
+}
+
+ServiceRepairDetailMerchant $ServiceRepairDetailMerchantFromJson(
+    Map<String, dynamic> json) {
+  final ServiceRepairDetailMerchant serviceRepairDetailMerchant = ServiceRepairDetailMerchant();
+  final int? id = jsonConvert.convert<int>(json['id']);
+  if (id != null) {
+    serviceRepairDetailMerchant.id = id;
+  }
+  final String? name = jsonConvert.convert<String>(json['name']);
+  if (name != null) {
+    serviceRepairDetailMerchant.name = name;
+  }
+  return serviceRepairDetailMerchant;
+}
+
+Map<String, dynamic> $ServiceRepairDetailMerchantToJson(
+    ServiceRepairDetailMerchant entity) {
+  final Map<String, dynamic> data = <String, dynamic>{};
+  data['id'] = entity.id;
+  data['name'] = entity.name;
+  return data;
+}
+
+extension ServiceRepairDetailMerchantExtension on ServiceRepairDetailMerchant {
+  ServiceRepairDetailMerchant copyWith({
+    int? id,
+    String? name,
+  }) {
+    return ServiceRepairDetailMerchant()
+      ..id = id ?? this.id
+      ..name = name ?? this.name;
+  }
+}
+
+ServiceRepairDetailCategory $ServiceRepairDetailCategoryFromJson(
+    Map<String, dynamic> json) {
+  final ServiceRepairDetailCategory serviceRepairDetailCategory = ServiceRepairDetailCategory();
+  final int? id = jsonConvert.convert<int>(json['id']);
+  if (id != null) {
+    serviceRepairDetailCategory.id = id;
+  }
+  final String? name = jsonConvert.convert<String>(json['name']);
+  if (name != null) {
+    serviceRepairDetailCategory.name = name;
+  }
+  final String? type = jsonConvert.convert<String>(json['type']);
+  if (type != null) {
+    serviceRepairDetailCategory.type = type;
+  }
+  return serviceRepairDetailCategory;
+}
+
+Map<String, dynamic> $ServiceRepairDetailCategoryToJson(
+    ServiceRepairDetailCategory entity) {
+  final Map<String, dynamic> data = <String, dynamic>{};
+  data['id'] = entity.id;
+  data['name'] = entity.name;
+  data['type'] = entity.type;
+  return data;
+}
+
+extension ServiceRepairDetailCategoryExtension on ServiceRepairDetailCategory {
+  ServiceRepairDetailCategory copyWith({
+    int? id,
+    String? name,
+    String? type,
+  }) {
+    return ServiceRepairDetailCategory()
+      ..id = id ?? this.id
+      ..name = name ?? this.name
+      ..type = type ?? this.type;
+  }
+}

+ 33 - 15
packages/cs_domain/lib/generated/json/user_me_entity.g.dart

@@ -23,11 +23,13 @@ UserMeEntity $UserMeEntityFromJson(Map<String, dynamic> json) {
   if (email != null) {
     userMeEntity.email = email;
   }
-  final String? followsCount = jsonConvert.convert<String>(json['follows_count']);
+  final String? followsCount = jsonConvert.convert<String>(
+      json['follows_count']);
   if (followsCount != null) {
     userMeEntity.followsCount = followsCount;
   }
-  final String? flowersCount = jsonConvert.convert<String>(json['flowers_count']);
+  final String? flowersCount = jsonConvert.convert<String>(
+      json['flowers_count']);
   if (flowersCount != null) {
     userMeEntity.flowersCount = flowersCount;
   }
@@ -35,21 +37,28 @@ UserMeEntity $UserMeEntityFromJson(Map<String, dynamic> json) {
   if (postsCount != null) {
     userMeEntity.postsCount = postsCount;
   }
-  final List<UserMeHouseholds>? households = (json['households'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<UserMeHouseholds>(e) as UserMeHouseholds).toList();
+  final List<UserMeHouseholds>? households = (json['households'] as List<
+      dynamic>?)
+      ?.map(
+          (e) => jsonConvert.convert<UserMeHouseholds>(e) as UserMeHouseholds)
+      .toList();
   if (households != null) {
     userMeEntity.households = households;
   }
-  final List<UserMeEstates>? estates = (json['estates'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<UserMeEstates>(e) as UserMeEstates).toList();
+  final List<UserMeEstates>? estates = (json['estates'] as List<dynamic>?)
+      ?.map(
+          (e) => jsonConvert.convert<UserMeEstates>(e) as UserMeEstates)
+      .toList();
   if (estates != null) {
     userMeEntity.estates = estates;
   }
-  final UserMeDefaultUnit? defaultUnit = jsonConvert.convert<UserMeDefaultUnit>(json['default_unit']);
+  final UserMeDefaultUnit? defaultUnit = jsonConvert.convert<UserMeDefaultUnit>(
+      json['default_unit']);
   if (defaultUnit != null) {
     userMeEntity.defaultUnit = defaultUnit;
   }
-  final UserMeInformation? information = jsonConvert.convert<UserMeInformation>(json['information']);
+  final UserMeInformation? information = jsonConvert.convert<UserMeInformation>(
+      json['information']);
   if (information != null) {
     userMeEntity.information = information;
   }
@@ -152,8 +161,12 @@ UserMeEstates $UserMeEstatesFromJson(Map<String, dynamic> json) {
   if (name != null) {
     userMeEstates.name = name;
   }
-  final List<UserMeEstatesAccounts>? accounts = (json['accounts'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<UserMeEstatesAccounts>(e) as UserMeEstatesAccounts).toList();
+  final List<UserMeEstatesAccounts>? accounts = (json['accounts'] as List<
+      dynamic>?)
+      ?.map(
+          (e) =>
+      jsonConvert.convert<UserMeEstatesAccounts>(e) as UserMeEstatesAccounts)
+      .toList();
   if (accounts != null) {
     userMeEstates.accounts = accounts;
   }
@@ -181,7 +194,8 @@ extension UserMeEstatesExtension on UserMeEstates {
   }
 }
 
-UserMeEstatesAccounts $UserMeEstatesAccountsFromJson(Map<String, dynamic> json) {
+UserMeEstatesAccounts $UserMeEstatesAccountsFromJson(
+    Map<String, dynamic> json) {
   final UserMeEstatesAccounts userMeEstatesAccounts = UserMeEstatesAccounts();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -207,14 +221,16 @@ UserMeEstatesAccounts $UserMeEstatesAccountsFromJson(Map<String, dynamic> json)
   if (status != null) {
     userMeEstatesAccounts.status = status;
   }
-  final UserMeEstatesAccountsUnit? unit = jsonConvert.convert<UserMeEstatesAccountsUnit>(json['unit']);
+  final UserMeEstatesAccountsUnit? unit = jsonConvert.convert<
+      UserMeEstatesAccountsUnit>(json['unit']);
   if (unit != null) {
     userMeEstatesAccounts.unit = unit;
   }
   return userMeEstatesAccounts;
 }
 
-Map<String, dynamic> $UserMeEstatesAccountsToJson(UserMeEstatesAccounts entity) {
+Map<String, dynamic> $UserMeEstatesAccountsToJson(
+    UserMeEstatesAccounts entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['name'] = entity.name;
@@ -247,7 +263,8 @@ extension UserMeEstatesAccountsExtension on UserMeEstatesAccounts {
   }
 }
 
-UserMeEstatesAccountsUnit $UserMeEstatesAccountsUnitFromJson(Map<String, dynamic> json) {
+UserMeEstatesAccountsUnit $UserMeEstatesAccountsUnitFromJson(
+    Map<String, dynamic> json) {
   final UserMeEstatesAccountsUnit userMeEstatesAccountsUnit = UserMeEstatesAccountsUnit();
   final String? id = jsonConvert.convert<String>(json['id']);
   if (id != null) {
@@ -272,7 +289,8 @@ UserMeEstatesAccountsUnit $UserMeEstatesAccountsUnitFromJson(Map<String, dynamic
   return userMeEstatesAccountsUnit;
 }
 
-Map<String, dynamic> $UserMeEstatesAccountsUnitToJson(UserMeEstatesAccountsUnit entity) {
+Map<String, dynamic> $UserMeEstatesAccountsUnitToJson(
+    UserMeEstatesAccountsUnit entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['id'] = entity.id;
   data['block'] = entity.block;

+ 6 - 3
packages/cs_domain/lib/generated/json/visitor_page_entity.g.dart

@@ -19,8 +19,10 @@ VisitorPageEntity $VisitorPageEntityFromJson(Map<String, dynamic> json) {
   if (countPage != null) {
     visitorPageEntity.countPage = countPage;
   }
-  final List<VisitorPageList>? list = (json['list'] as List<dynamic>?)?.map(
-          (e) => jsonConvert.convert<VisitorPageList>(e) as VisitorPageList).toList();
+  final List<VisitorPageList>? list = (json['list'] as List<dynamic>?)
+      ?.map(
+          (e) => jsonConvert.convert<VisitorPageList>(e) as VisitorPageList)
+      .toList();
   if (list != null) {
     visitorPageEntity.list = list;
   }
@@ -72,7 +74,8 @@ VisitorPageList $VisitorPageListFromJson(Map<String, dynamic> json) {
   if (nric != null) {
     visitorPageList.nric = nric;
   }
-  final String? vehicleNumber = jsonConvert.convert<String>(json['vehicle_number']);
+  final String? vehicleNumber = jsonConvert.convert<String>(
+      json['vehicle_number']);
   if (vehicleNumber != null) {
     visitorPageList.vehicleNumber = vehicleNumber;
   }