Исправил десериализацию профиля сотрудника (#618)

Author: Namxobick

lib/core/models/profile/employee/employee_data.dart

@@ -66,16 +66,12 @@ class EmployeeData extends UserData {
   factory EmployeeData.fromJson(JsonMap json) => EmployeeData.withUserData(
         userData: UserData.fromJson(json),
         syncId: json[_EmployeeDataJsonKeys.syncId]! as String,
-        profiles: [
-          for (final item in json[_EmployeeDataJsonKeys.profiles]! as List)
-            EmployeeProfile.fromJson(item as JsonMap),
-        ],
-      );
-
-  factory EmployeeData.fromCurrentProfileJson(JsonMap json) =>
-      EmployeeData.withUserData(
-        userData: UserData.fromJson(json),
-        syncId: json[_EmployeeDataJsonKeys.syncId]! as String,
-        profiles: [EmployeeProfile.fromJson(json)],
+        profiles: json.containsKey(_EmployeeDataJsonKeys.profiles)
+            ? [
+                for (final item
+                    in json[_EmployeeDataJsonKeys.profiles]! as List)
+                  EmployeeProfile.fromJson(item as JsonMap),
+              ]
+            : [EmployeeProfile.fromJson(json)],
       );
 }

lib/core/providers/implementations/profile/user_data_provider_impl.dart

@@ -50,11 +50,17 @@ class UserDataProviderImpl implements UserDataProvider {
 
     final jsonMap = jsonDecode(userInfo) as Map<String, dynamic>;
 
-    return switch (userType) {
-      _student => StudentData.fromJson(jsonMap),
-      _employee => EmployeeData.fromCurrentProfileJson(jsonMap),
-      _ => UserData.fromJson(jsonMap),
-    };
+    try {
+      return switch (userType) {
+        _student => StudentData.fromJson(jsonMap),
+        _employee => EmployeeData.fromJson(jsonMap),
+        _ => UserData.fromJson(jsonMap),
+      };
+    } catch (e, stackTrace) {
+      _loggerService.logError(e, stackTrace, information: [jsonMap.toString()]);
+    }
+
+    return null;
   }
 
   @override

lib/core/services/implementations/profile/profile_of_current_user_service_impl.dart

@@ -43,7 +43,7 @@ class ProfileOfCurrentUserServiceImpl implements ProfileOfCurrentUserService {
           (jsonMap as JsonMap)[ProfilesStrings.type] == ProfilesStrings.student
               ? StudentData.fromJson(jsonMap)
               : jsonMap[ProfilesStrings.type] == ProfilesStrings.employee
-                  ? EmployeeData.fromCurrentProfileJson(jsonMap)
+                  ? EmployeeData.fromJson(jsonMap)
                   : null;
     } catch (e, stackTrace) {
       _loggerService.logError(e, stackTrace, information: [jsonMap.toString()]);

pubspec.yaml

@@ -2,7 +2,7 @@ name: unn_mobile
 description: A mobile application for UNN Portal website
 publish_to: 'none'
 
-version: 0.5.6+382
+version: 0.5.6+383
 
 environment:
   sdk: '>=3.1.2 <4.0.0'