diff --git a/android/settings.gradle b/android/settings.gradle index 42a51c65..a9f0eb13 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.7.2" apply false + id "com.android.application" version "8.7.3" apply false id "org.jetbrains.kotlin.android" version "2.0.21" apply false } diff --git a/lib/features/profile/models/profile_model.dart b/lib/features/profile/models/profile_model.dart index 3e4c1764..9e793a1b 100644 --- a/lib/features/profile/models/profile_model.dart +++ b/lib/features/profile/models/profile_model.dart @@ -43,7 +43,7 @@ class DiplomasAndCertificatesModel with _$DiplomasAndCertificatesModel { class EducationModel with _$EducationModel { const factory EducationModel({ @JsonKey(name: "has_medical_education") int? hasMedicalEducation, - @JsonKey(name: "completed_cources") Map? completedCourses, + @JsonKey(name: "completed_cources") List? completedCourses, @JsonKey(name: "vk_link") String? vkLink, @JsonKey(name: "insta_link") String? instaLink, @JsonKey(name: "fb_link") String? fbLink, diff --git a/lib/features/profile/models/profile_model.freezed.dart b/lib/features/profile/models/profile_model.freezed.dart index dc863ee9..a349c3f2 100644 --- a/lib/features/profile/models/profile_model.freezed.dart +++ b/lib/features/profile/models/profile_model.freezed.dart @@ -821,7 +821,7 @@ mixin _$EducationModel { @JsonKey(name: "has_medical_education") int? get hasMedicalEducation => throw _privateConstructorUsedError; @JsonKey(name: "completed_cources") - Map? get completedCourses => + List? get completedCourses => throw _privateConstructorUsedError; @JsonKey(name: "vk_link") String? get vkLink => throw _privateConstructorUsedError; @@ -855,7 +855,7 @@ abstract class $EducationModelCopyWith<$Res> { $Res call( {@JsonKey(name: "has_medical_education") int? hasMedicalEducation, @JsonKey(name: "completed_cources") - Map? completedCourses, + List? completedCourses, @JsonKey(name: "vk_link") String? vkLink, @JsonKey(name: "insta_link") String? instaLink, @JsonKey(name: "fb_link") String? fbLink, @@ -896,7 +896,7 @@ class _$EducationModelCopyWithImpl<$Res, $Val extends EducationModel> completedCourses: freezed == completedCourses ? _value.completedCourses : completedCourses // ignore: cast_nullable_to_non_nullable - as Map?, + as List?, vkLink: freezed == vkLink ? _value.vkLink : vkLink // ignore: cast_nullable_to_non_nullable @@ -936,7 +936,7 @@ abstract class _$$EducationModelImplCopyWith<$Res> $Res call( {@JsonKey(name: "has_medical_education") int? hasMedicalEducation, @JsonKey(name: "completed_cources") - Map? completedCourses, + List? completedCourses, @JsonKey(name: "vk_link") String? vkLink, @JsonKey(name: "insta_link") String? instaLink, @JsonKey(name: "fb_link") String? fbLink, @@ -975,7 +975,7 @@ class __$$EducationModelImplCopyWithImpl<$Res> completedCourses: freezed == completedCourses ? _value._completedCourses : completedCourses // ignore: cast_nullable_to_non_nullable - as Map?, + as List?, vkLink: freezed == vkLink ? _value.vkLink : vkLink // ignore: cast_nullable_to_non_nullable @@ -1010,7 +1010,7 @@ class _$EducationModelImpl implements _EducationModel { const _$EducationModelImpl( {@JsonKey(name: "has_medical_education") this.hasMedicalEducation, @JsonKey(name: "completed_cources") - final Map? completedCourses, + final List? completedCourses, @JsonKey(name: "vk_link") this.vkLink, @JsonKey(name: "insta_link") this.instaLink, @JsonKey(name: "fb_link") this.fbLink, @@ -1025,15 +1025,16 @@ class _$EducationModelImpl implements _EducationModel { @override @JsonKey(name: "has_medical_education") final int? hasMedicalEducation; - final Map? _completedCourses; + final List? _completedCourses; @override @JsonKey(name: "completed_cources") - Map? get completedCourses { + List? get completedCourses { final value = _completedCourses; if (value == null) return null; - if (_completedCourses is EqualUnmodifiableMapView) return _completedCourses; + if (_completedCourses is EqualUnmodifiableListView) + return _completedCourses; // ignore: implicit_dynamic_type - return EqualUnmodifiableMapView(value); + return EqualUnmodifiableListView(value); } @override @@ -1114,7 +1115,7 @@ abstract class _EducationModel implements EducationModel { const factory _EducationModel( {@JsonKey(name: "has_medical_education") final int? hasMedicalEducation, @JsonKey(name: "completed_cources") - final Map? completedCourses, + final List? completedCourses, @JsonKey(name: "vk_link") final String? vkLink, @JsonKey(name: "insta_link") final String? instaLink, @JsonKey(name: "fb_link") final String? fbLink, @@ -1131,7 +1132,7 @@ abstract class _EducationModel implements EducationModel { int? get hasMedicalEducation; @override @JsonKey(name: "completed_cources") - Map? get completedCourses; + List? get completedCourses; @override @JsonKey(name: "vk_link") String? get vkLink; diff --git a/lib/features/profile/models/profile_model.g.dart b/lib/features/profile/models/profile_model.g.dart index e8925091..75ff5889 100644 --- a/lib/features/profile/models/profile_model.g.dart +++ b/lib/features/profile/models/profile_model.g.dart @@ -83,11 +83,10 @@ Map _$$DiplomasAndCertificatesModelImplToJson( _$EducationModelImpl _$$EducationModelImplFromJson(Map json) => _$EducationModelImpl( hasMedicalEducation: (json['has_medical_education'] as num?)?.toInt(), - completedCourses: - (json['completed_cources'] as Map?)?.map( - (k, e) => MapEntry( - k, CompletedCoursesModel.fromJson(e as Map)), - ), + completedCourses: (json['completed_cources'] as List?) + ?.map( + (e) => CompletedCoursesModel.fromJson(e as Map)) + .toList(), vkLink: json['vk_link'] as String?, instaLink: json['insta_link'] as String?, fbLink: json['fb_link'] as String?, diff --git a/lib/features/profile/presentation/pages/profile_screen.dart b/lib/features/profile/presentation/pages/profile_screen.dart index 98ad0e81..25a16f98 100644 --- a/lib/features/profile/presentation/pages/profile_screen.dart +++ b/lib/features/profile/presentation/pages/profile_screen.dart @@ -487,7 +487,7 @@ class _ProfileScreenState extends State { child: Column( children: [ if (state.profile.educationResource?.completedCourses != null) - ...state.profile.educationResource!.completedCourses!.values.map((c) => _educationBlock(c.title, c.date)).toList(), + ...state.profile.educationResource!.completedCourses!.map((c) => _educationBlock(c.title, c.date)).toList(), ], ), ), diff --git a/test/features/profile/services/profile_service_test.mocks.dart b/test/features/profile/services/profile_service_test.mocks.dart index 2361099d..bb0c633a 100644 --- a/test/features/profile/services/profile_service_test.mocks.dart +++ b/test/features/profile/services/profile_service_test.mocks.dart @@ -1,5 +1,5 @@ // Mocks generated by Mockito 5.4.4 from annotations -// in eatvio_app/test/profile_service_test.dart. +// in eatvio_app/test/features/profile/services/profile_service_test.dart. // Do not manually edit this file. // ignore_for_file: no_leading_underscores_for_library_prefixes