refacto: using swagger as user repository

aeecleclair · Nov 20, 2023 · ae160de · ae160de
1 parent c61e40b
commit ae160de
Show file tree

Hide file tree

Showing 31 changed files with 18,843 additions and 111 deletions.
diff --git a/build.yaml b/build.yaml
@@ -9,4 +9,18 @@ targets:
           output_folder: "lib/generated/"
           input_urls:
             - "https://hyperion.myecl.fr/openapi.json"
-          separate_models: true
+          separate_models: true
+          default_values_map:
+            - type_name: int
+              default_value: '0'
+            - type_name: String
+              default_value: ''
+            - type_name: bool
+              default_value: 'false'
+            - type_name: 'List'
+              default_value: '[]'
+            - type_name: 'Map'
+              default_value: '{}'
+            - type_name: 'double'
+              default_value: '0.0'
+
diff --git a/lib/adapters/users.dart b/lib/adapters/users.dart
@@ -0,0 +1,22 @@
+import 'package:myecl/generated/openapi.models.swagger.dart';
+
+CoreUserUpdateAdmin coreUserUpdateAdminAdapter(CoreUser coreUser) {
+  return CoreUserUpdateAdmin(
+    name: coreUser.name,
+    firstname: coreUser.firstname,
+    promo: coreUser.promo,
+    nickname: coreUser.nickname,
+    birthday: coreUser.birthday,
+    phone: coreUser.phone,
+    floor: coreUser.floor,
+  );
+}
+
+CoreUserUpdate coreUserUpdateAdapter(CoreUser coreUser) {
+  return CoreUserUpdate(
+    nickname: coreUser.nickname,
+    birthday: coreUser.birthday,
+    phone: coreUser.phone,
+    floor: coreUser.floor,
+  );
+}
diff --git a/lib/admin/providers/is_admin_provider.dart b/lib/admin/providers/is_admin_provider.dart
@@ -3,7 +3,7 @@ import 'package:myecl/user/providers/user_provider.dart';
 
 final isAdminProvider = StateProvider<bool>((ref) {
   final me = ref.watch(userProvider);
-  return me.groups
+  return me.groups!
       .map((e) => e.id)
       .contains("0a25cb76-4b63-4fd3-b939-da6d9feabf28");
 });
diff --git a/lib/amap/providers/is_amap_admin_provider.dart b/lib/amap/providers/is_amap_admin_provider.dart
@@ -3,7 +3,7 @@ import 'package:myecl/user/providers/user_provider.dart';
 
 final isAmapAdminProvider = StateProvider<bool>((ref) {
   final me = ref.watch(userProvider);
-  return me.groups
+  return me.groups!
       .map((e) => e.id)
       .contains("70db65ee-d533-4f6b-9ffa-a4d70a17b7ef");
 });
diff --git a/lib/amap/ui/pages/list_products_page/product_choice_button.dart b/lib/amap/ui/pages/list_products_page/product_choice_button.dart
@@ -11,6 +11,7 @@ import 'package:myecl/tools/ui/widgets/dialog.dart';
 import 'package:myecl/tools/functions.dart';
 import 'package:myecl/tools/token_expire_wrapper.dart';
 import 'package:myecl/tools/ui/builders/waiting_button.dart';
+import 'package:myecl/user/class/list_users.dart';
 import 'package:myecl/user/providers/user_provider.dart';
 import 'package:qlevar_router/qlevar_router.dart';
 
@@ -62,7 +63,12 @@ class ProductChoiceButton extends HookConsumerWidget {
                   } else {
                     Order newOrder = order.copyWith(
                         deliveryId: deliveryId,
-                        user: me.toSimpleUser(),
+                        user: SimpleUser(
+                          firstname: me.firstname,
+                          name: me.name,
+                          nickname: me.nickname,
+                          id: me.id,
+                        ),
                         lastAmount: order.amount);
                     await tokenExpireWrapper(ref, () async {
                       final value = isEdit

diff --git a/lib/auth/providers/openid_provider.dart b/lib/auth/providers/openid_provider.dart
@@ -68,7 +68,7 @@ final isLoggedInProvider =
   if (isConnected) {
     isLoggedInProvider.refresh(authToken);
   } else if (isCaching) {
-    return IsLoggedInProvider(true);
+    return IsLoggedInProvider(false);
   }
   return isLoggedInProvider;
 });

diff --git a/lib/booking/providers/is_admin_provider.dart b/lib/booking/providers/is_admin_provider.dart
@@ -3,7 +3,7 @@ import 'package:myecl/user/providers/user_provider.dart';
 
 final isAdminProvider = StateProvider<bool>((ref) {
   final me = ref.watch(userProvider);
-  return me.groups
+  return me.groups!
       .map((e) => e.id)
       .contains("0a25cb76-4b63-4fd3-b939-da6d9feabf28");
 });
diff --git a/lib/booking/ui/pages/booking_pages/add_edit_booking_page.dart b/lib/booking/ui/pages/booking_pages/add_edit_booking_page.dart
@@ -22,6 +22,7 @@ import 'package:myecl/tools/ui/widgets/date_entry.dart';
 import 'package:myecl/tools/ui/layouts/horizontal_list_view.dart';
 import 'package:myecl/tools/ui/builders/waiting_button.dart';
 import 'package:myecl/tools/ui/widgets/text_entry.dart';
+import 'package:myecl/user/class/applicant.dart';
 import 'package:myecl/user/providers/user_provider.dart';
 import 'package:qlevar_router/qlevar_router.dart';
 import 'package:syncfusion_flutter_calendar/calendar.dart';
@@ -329,7 +330,15 @@ class AddEditBookingPage extends HookConsumerWidget {
                                   decision: booking.decision,
                                   recurrenceRule: recurrenceRule,
                                   entity: entity.text,
-                                  applicant: user.toApplicant(),
+                                  applicant: Applicant(
+                                    name: user.name,
+                                    nickname: user.nickname,
+                                    firstname: user.firstname,
+                                    id: user.id,
+                                    email: user.email,
+                                    phone: user.phone,
+                                    promo: user.promo,
+                                  ),
                                   applicantId: user.id);
                               final value = isEdit
                                   ? await bookingsNotifier

diff --git a/lib/cinema/providers/is_cinema_admin.dart b/lib/cinema/providers/is_cinema_admin.dart
@@ -3,7 +3,7 @@ import 'package:myecl/user/providers/user_provider.dart';
 
 final isCinemaAdminProvider = StateProvider<bool>((ref) {
   final me = ref.watch(userProvider);
-  return me.groups
+  return me.groups!
       .map((e) => e.id)
       .contains("ce5f36e6-5377-489f-9696-de70e2477300");
 });
diff --git a/lib/drawer/ui/drawer_top_bar.dart b/lib/drawer/ui/drawer_top_bar.dart
@@ -12,8 +12,8 @@ import 'package:myecl/home/providers/scrolled_provider.dart';
 import 'package:myecl/settings/router.dart';
 import 'package:myecl/tools/constants.dart';
 import 'package:myecl/tools/providers/path_forwarding_provider.dart';
-import 'package:myecl/tools/ui/builders/async_child.dart';
 import 'package:myecl/user/providers/user_provider.dart';
+import 'package:myecl/tools/ui/builders/async_child.dart';
 import 'package:myecl/user/providers/profile_picture_provider.dart';
 import 'package:qlevar_router/qlevar_router.dart';
 

diff --git a/lib/event/providers/is_admin_provider.dart b/lib/event/providers/is_admin_provider.dart
@@ -3,7 +3,7 @@ import 'package:myecl/user/providers/user_provider.dart';
 
 final isEventAdminProvider = StateProvider<bool>((ref) {
   final me = ref.watch(userProvider);
-  return me.groups
+  return me.groups!
       .map((e) => e.id)
       .contains("53a669d6-84b1-4352-8d7c-421c1fbd9c6a");
 });
diff --git a/lib/event/ui/pages/event_pages/add_edit_event_page.dart b/lib/event/ui/pages/event_pages/add_edit_event_page.dart
@@ -23,6 +23,7 @@ import 'package:myecl/tools/ui/layouts/horizontal_list_view.dart';
 import 'package:myecl/tools/ui/layouts/item_chip.dart';
 import 'package:myecl/tools/ui/builders/waiting_button.dart';
 import 'package:myecl/tools/ui/widgets/text_entry.dart';
+import 'package:myecl/user/class/applicant.dart';
 import 'package:myecl/user/providers/user_provider.dart';
 import 'package:qlevar_router/qlevar_router.dart';
 import 'package:syncfusion_flutter_calendar/calendar.dart';
@@ -420,7 +421,15 @@ class AddEditEventPage extends HookConsumerWidget {
                                       type: eventType.value,
                                       recurrenceRule: recurrenceRule,
                                       applicantId: user.id,
-                                      applicant: user.toApplicant(),
+                                      applicant: Applicant(
+                                        name: user.name,
+                                        nickname: user.nickname,
+                                        firstname: user.firstname,
+                                        id: user.id,
+                                        email: user.email,
+                                        phone: user.phone,
+                                        promo: user.promo,
+                                      ),
                                       decision: Decision.pending,
                                       roomId: roomId);
                                   final value = isEdit

diff --git a/lib/generated/client_index.dart b/lib/generated/client_index.dart
@@ -0,0 +1,2 @@
+export 'openapi.swagger.dart' show Openapi;
+export 'openapi.swagger.dart' show Openapi;
diff --git a/lib/generated/client_mapping.dart b/lib/generated/client_mapping.dart
@@ -0,0 +1 @@
+final Map<Type, Object Function(Map<String, dynamic>)> generatedMapping = {};