update models

lib/data/api/rest_client.g.dart

@@ -1,228 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'rest_client.dart';
-
-// **************************************************************************
-// RetrofitGenerator
-// **************************************************************************
-
-class _RestClient implements RestClient {
-  _RestClient(this._dio, {this.baseUrl}) {
-    ArgumentError.checkNotNull(_dio, '_dio');
-    this.baseUrl ??= 'http://tpf.aztrace.vn';
-  }
-
-  final Dio _dio;
-
-  String baseUrl;
-
-  @override
-  login(userRequest) async {
-    ArgumentError.checkNotNull(userRequest, 'userRequest');
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final _data = <String, dynamic>{};
-    _data.addAll(userRequest?.toJson() ?? <String, dynamic>{});
-    final Response<Map<String, dynamic>> _result = await _dio.request(
-        '/api/authenticate',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'POST',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    final value = User.fromJson(_result.data);
-    return value;
-  }
-
-  @override
-  getMe() async {
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final _data = <String, dynamic>{};
-    final Response<Map<String, dynamic>> _result = await _dio.request(
-        '/api/account',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'GET',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    final value = Account.fromJson(_result.data);
-    return value;
-  }
-
-  @override
-  forgotPassword(email) async {
-    ArgumentError.checkNotNull(email, 'email');
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final _data = email;
-    await _dio.request<void>('/api/account/reset-password/init',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'POST',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    return null;
-  }
-
-  @override
-  resetPassword(password) async {
-    ArgumentError.checkNotNull(password, 'password');
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final _data = <String, dynamic>{};
-    _data.addAll(password?.toJson() ?? <String, dynamic>{});
-    await _dio.request<void>('/api/account/reset-password/finish',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'POST',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    return null;
-  }
-
-  @override
-  changePassword(password) async {
-    ArgumentError.checkNotNull(password, 'password');
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final _data = <String, dynamic>{};
-    _data.addAll(password?.toJson() ?? <String, dynamic>{});
-    await _dio.request<void>('/api/account/change-password',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'POST',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    return null;
-  }
-
-  @override
-  updateProfile(account) async {
-    ArgumentError.checkNotNull(account, 'account');
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final _data = <String, dynamic>{};
-    _data.addAll(account?.toJson() ?? <String, dynamic>{});
-    final Response<Map<String, dynamic>> _result = await _dio.request(
-        '/api/update-my-profile',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'PUT',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    final value = Account.fromJson(_result.data);
-    return value;
-  }
-
-  @override
-  getSupplies(type) async {
-    ArgumentError.checkNotNull(type, 'type');
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final _data = <String, dynamic>{};
-    final Response<List<dynamic>> _result = await _dio.request(
-        '/api/tb-supplies-by-type/$type',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'GET',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    var value = _result.data
-        .map((dynamic i) => Supply.fromJson(i as Map<String, dynamic>))
-        .toList();
-    return value;
-  }
-
-  @override
-  updateFcmToken(token) async {
-    ArgumentError.checkNotNull(token, 'token');
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final _data = token;
-    await _dio.request<void>('/api/update-fcmToken',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'PUT',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    return null;
-  }
-
-  @override
-  getPlots({page = 0, size = 20, query = ""}) async {
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    queryParameters.removeWhere((k, v) => v == null);
-    final _data = <String, dynamic>{};
-    final Response<List<dynamic>> _result = await _dio.request(
-        '/api/tb-crops?page=$page&size=$size&query=$query',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'GET',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    var value = _result.data
-        .map((dynamic i) => Plot.fromJson(i as Map<String, dynamic>))
-        .toList();
-    return value;
-  }
-
-  @override
-  getActionTypes() async {
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    final _data = <String, dynamic>{};
-    final Response<List<dynamic>> _result = await _dio.request(
-        '/api/listActivityTypesOther',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'GET',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    var value = _result.data
-        .map((dynamic i) => ActionType.fromJson(i as Map<String, dynamic>))
-        .toList();
-    return value;
-  }
-
-  @override
-  getCropDetail(cropId, {page = 0, size = 20}) async {
-    ArgumentError.checkNotNull(cropId, 'cropId');
-    const _extra = <String, dynamic>{};
-    final queryParameters = <String, dynamic>{};
-    queryParameters.removeWhere((k, v) => v == null);
-    final _data = <String, dynamic>{};
-    final Response<Map<String, dynamic>> _result = await _dio.request(
-        '/api/tb-crops-detail/$cropId?page=$page&size=$size&sort=executeDate,DESC',
-        queryParameters: queryParameters,
-        options: RequestOptions(
-            method: 'GET',
-            headers: <String, dynamic>{},
-            extra: _extra,
-            baseUrl: baseUrl),
-        data: _data);
-    final value = Crop.fromJson(_result.data);
-    return value;
-  }
-}

lib/data/repository/authentication_repository.dart

@@ -1,13 +1,11 @@
 import 'dart:async';
 
-import 'package:farm_tpf/authentication/authentication.dart';
+import 'package:farm_tpf/custom_model/user.dart';
+import 'package:farm_tpf/custom_model/user_request.dart';
 import 'package:farm_tpf/data/api/dio_provider.dart';
 import 'package:farm_tpf/data/api/rest_client.dart';
-import 'package:farm_tpf/models/user.dart';
-import 'package:farm_tpf/models/user_request.dart';
 import 'package:farm_tpf/utils/const_common.dart';
 import 'package:farm_tpf/utils/pref.dart';
-import 'package:meta/meta.dart';
 
 enum AuthenticationStatus { unknown, authenticated, unauthenticated }
 

lib/data/repository/repository.dart

@@ -1,11 +1,11 @@
+import 'package:farm_tpf/custom_model/user.dart';
+import 'package:farm_tpf/custom_model/user_request.dart';
 import 'package:farm_tpf/data/api/dio_provider.dart';
 import 'package:farm_tpf/data/api/rest_client.dart';
 import 'package:farm_tpf/models/PagedResult.dart';
 import 'package:farm_tpf/models/Plot.dart';
 import 'package:farm_tpf/models/Supply.dart';
 import 'package:farm_tpf/models/index.dart';
-import 'package:farm_tpf/models/user.dart';
-import 'package:farm_tpf/models/user_request.dart';
 import 'package:farm_tpf/utils/const_common.dart';
 
 class Repository {

lib/data/repository/user_repository.dart

@@ -1,7 +1,7 @@
+import 'package:farm_tpf/custom_model/account.dart';
+import 'package:farm_tpf/custom_model/password.dart';
 import 'package:farm_tpf/data/api/dio_provider.dart';
 import 'package:farm_tpf/data/api/rest_client.dart';
-import 'package:farm_tpf/models/account.dart';
-import 'package:farm_tpf/models/password.dart';
 
 class UserRepository {
   final dio = DioProvider.instance();

lib/models/ActionType.g.dart

@@ -17,5 +17,5 @@ Map<String, dynamic> _$ActionTypeToJson(ActionType instance) =>
     <String, dynamic>{
       'id': instance.id,
       'name': instance.name,
-      'description': instance.description,
+      'description': instance.description
     };

lib/models/Crop.g.dart

@@ -26,5 +26,5 @@ Map<String, dynamic> _$CropToJson(Crop instance) => <String, dynamic>{
       'seedIncubationTime': instance.seedIncubationTime,
       'numberPlants': instance.numberPlants,
       'numberCurrentPlants': instance.numberCurrentPlants,
-      'endOfFarmingDate': instance.endOfFarmingDate,
+      'endOfFarmingDate': instance.endOfFarmingDate
     };

lib/models/HistoryAction.g.dart

@@ -25,5 +25,5 @@ Map<String, dynamic> _$HistoryActionToJson(HistoryAction instance) =>
       'executeDate': instance.executeDate,
       'description': instance.description,
       'activityTypeId': instance.activityTypeId,
-      'activityTypeName': instance.activityTypeName,
+      'activityTypeName': instance.activityTypeName
     };

lib/models/OtherAction.g.dart

@@ -23,5 +23,5 @@ Map<String, dynamic> _$OtherActionToJson(OtherAction instance) =>
       'executeDate': instance.executeDate,
       'description': instance.description,
       'activityTypeName': instance.activityTypeName,
-      'workerName': instance.workerName,
+      'workerName': instance.workerName
     };

lib/models/Plot.g.dart

@@ -44,5 +44,5 @@ Map<String, dynamic> _$PlotToJson(Plot instance) => <String, dynamic>{
       'netHouseId': instance.netHouseId,
       'netHouseName': instance.netHouseName,
       'areaId': instance.areaId,
-      'area': instance.area,
+      'area': instance.area
     };

lib/models/ResourceHelper.g.dart

@@ -19,5 +19,5 @@ Map<String, dynamic> _$ResourceHelperToJson(ResourceHelper instance) =>
       'id': instance.id,
       'name': instance.name,
       'description': instance.description,
-      'isSelected': instance.isSelected,
+      'isSelected': instance.isSelected
     };

lib/models/Supply.dart

@@ -13,7 +13,7 @@ class Supply {
   String unit;
   num tbSuppliesTypeId;
   num tbCustomerId;
-  bool isSelected = false;
+  bool isSelected;
 
   factory Supply.fromJson(Map<String, dynamic> json) => _$SupplyFromJson(json);
   Map<String, dynamic> toJson() => _$SupplyToJson(this);

lib/models/Supply.g.dart

@@ -14,8 +14,7 @@ Supply _$SupplyFromJson(Map<String, dynamic> json) {
     ..manufacturer = json['manufacturer'] as String
     ..unit = json['unit'] as String
     ..tbSuppliesTypeId = json['tbSuppliesTypeId'] as num
-    ..tbCustomerId = json['tbCustomerId'] as num
-    ..isSelected = false;
+    ..tbCustomerId = json['tbCustomerId'] as num;
 }
 
 Map<String, dynamic> _$SupplyToJson(Supply instance) => <String, dynamic>{
@@ -25,5 +24,5 @@ Map<String, dynamic> _$SupplyToJson(Supply instance) => <String, dynamic>{
       'manufacturer': instance.manufacturer,
       'unit': instance.unit,
       'tbSuppliesTypeId': instance.tbSuppliesTypeId,
-      'tbCustomerId': instance.tbCustomerId,
+      'tbCustomerId': instance.tbCustomerId
     };

lib/presentation/screens/profile/sc_change_password.dart

@@ -1,5 +1,5 @@
+import 'package:farm_tpf/custom_model/password.dart';
 import 'package:farm_tpf/data/repository/user_repository.dart';
-import 'package:farm_tpf/models/password.dart';
 import 'package:farm_tpf/presentation/custom_widgets/widget_loading.dart';
 import 'package:farm_tpf/presentation/custom_widgets/widget_toast.dart';
 import 'package:farm_tpf/utils/const_color.dart';

lib/presentation/screens/profile/sc_update_profile.dart

@@ -1,5 +1,5 @@
+import 'package:farm_tpf/custom_model/account.dart';
 import 'package:farm_tpf/data/repository/user_repository.dart';
-import 'package:farm_tpf/models/account.dart';
 import 'package:farm_tpf/presentation/custom_widgets/widget_loading.dart';
 import 'package:farm_tpf/presentation/custom_widgets/widget_toast.dart';
 import 'package:farm_tpf/presentation/screens/profile/sc_change_password.dart';

pubspec.lock

@@ -1,20 +1,13 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
-  _fe_analyzer_shared:
-    dependency: transitive
-    description:
-      name: _fe_analyzer_shared
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "6.0.0"
   analyzer:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.39.14"
+    version: "0.36.4"
   archive:
     dependency: transitive
     description:
@@ -63,14 +56,14 @@ packages:
       name: build
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.1.6"
   build_config:
     dependency: transitive
     description:
       name: build_config
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.2"
+    version: "0.4.1+1"
   build_daemon:
     dependency: transitive
     description:
@@ -84,21 +77,21 @@ packages:
       name: build_resolvers
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.11"
+    version: "1.2.1"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.0"
+    version: "1.6.9"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.2.0"
+    version: "3.1.1"
   built_collection:
     dependency: transitive
     description:
@@ -134,13 +127,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.2"
-  cli_util:
-    dependency: transitive
-    description:
-      name: cli_util
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.1.4"
   code_builder:
     dependency: transitive
     description:
@@ -189,7 +175,7 @@ packages:
       name: dart_style
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.6"
+    version: "1.2.9"
   dio:
     dependency: "direct main"
     description:
@@ -310,6 +296,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.3.0"
+  front_end:
+    dependency: transitive
+    description:
+      name: front_end
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.19"
   get:
     dependency: "direct main"
     description:
@@ -407,14 +400,28 @@ packages:
       name: json_annotation
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.1"
+    version: "2.3.0"
+  json_model:
+    dependency: "direct dev"
+    description:
+      name: json_model
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.0.2"
   json_serializable:
     dependency: "direct dev"
     description:
       name: json_serializable
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.4.1"
+    version: "2.3.0"
+  kernel:
+    dependency: transitive
+    description:
+      name: kernel
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.3.19"
   keyboard_dismisser:
     dependency: "direct main"
     description:
@@ -485,6 +492,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.4.3"
+  package_resolver:
+    dependency: transitive
+    description:
+      name: package_resolver
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.10"
   path:
     dependency: transitive
     description:
@@ -590,20 +604,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.3"
-  retrofit:
-    dependency: transitive
-    description:
-      name: retrofit
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.3.4"
-  retrofit_generator:
-    dependency: "direct dev"
-    description:
-      name: retrofit_generator
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.3.7+6"
   rxdart:
     dependency: "direct main"
     description:
@@ -678,7 +678,7 @@ packages:
       name: source_gen
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.6"
+    version: "0.9.4+4"
   source_span:
     dependency: transitive
     description:
@@ -735,13 +735,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.1.1+2"
-  tuple:
-    dependency: transitive
-    description:
-      name: tuple
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.3"
   typed_data:
     dependency: transitive
     description:

pubspec.yaml

@@ -37,15 +37,15 @@ dependencies:
   get: ^3.8.0
   intl: ^0.16.1
   flutter_datetime_picker: ^1.3.8
-  analyzer: ^0.39.14
+  # analyzer: ^0.39.14
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
   #flutter packages pub run build_runner build --delete-conflicting-outputs
-  retrofit_generator: ^1.3.7
+  # retrofit_generator: ^1.3.7
   # flutter packages pub run json_model
-  # json_model: ^0.0.2
+  json_model: ^0.0.2
   build_runner: any
   json_serializable: any