Fix error on type of user organisations in user entity

udsm-dhis2-lab · Sep 4, 2024 · 0270da1 · 0270da1
1 parent d253269
commit 0270da1
Show file tree

Hide file tree

Showing 3 changed files with 153 additions and 90 deletions.
diff --git a/lib/modules/auth/entities/user.entity.dart b/lib/modules/auth/entities/user.entity.dart
@@ -136,7 +136,9 @@ class User extends IdentifiableEntity {
         lastUpdated: jsonData['lastUpdated'],
         teiSearchOrganisationUnits:
             jsonData['teiSearchOrganisationUnits'].toString(),
-        organisationUnits: jsonData['organisationUnits'],
+        organisationUnits: (jsonData['organisationUnits'] ?? [])
+            .map((ou) => UserOrganisationUnit.fromJson(ou))
+            .toList(),
         authorities: (jsonData['authorities'] ?? [])
             .map<UserAuthority>((authority) => UserAuthority(
                 id: authority['id'],

diff --git a/lib/shared/utilities/http_client.util.dart b/lib/shared/utilities/http_client.util.dart
@@ -200,7 +200,7 @@ class HttpClient {
               }));
 
       final response = await dioClient.delete(
-          '${httpDetails.baseUrl}/api/${resourceUrl!.split('.').first}/$id');\
+          '${httpDetails.baseUrl}/api/${resourceUrl!.split('.').first}/$id');
 
       return HttpResponse(
           statusCode: response.statusCode ?? 500, body: response.data);