Adapt to changes to the TOSTI api (#414)

svthalia · Apr 26, 2023 · 313bf4e · 313bf4e
1 parent 22c8adc
commit 313bf4e
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 8 deletions.
diff --git a/lib/tosti/blocs/home_cubit.dart b/lib/tosti/blocs/home_cubit.dart
@@ -29,7 +29,7 @@ class TostiHomeCubit extends Cubit<TostiHomeState> {
 
       final venues = venuesResponse.results.map((final venue) {
         final shift = shiftsResponse.results.firstWhereOrNull(
-          (final shift) => shift.venue == venue.id,
+          (final shift) => shift.venue.venue.id == venue.id,
         );
 
         return shift != null ? venue.copyWithShift(shift) : venue;

diff --git a/lib/tosti/models/shift.dart b/lib/tosti/models/shift.dart
@@ -1,13 +1,13 @@
 import 'package:json_annotation/json_annotation.dart';
 import 'package:reaxit/tosti/models/user.dart';
+import 'package:reaxit/tosti/models/venue.dart';
 
 part 'shift.g.dart';
 
 @JsonSerializable(fieldRename: FieldRename.snake)
 class TostiShift {
   final int id;
-  final int venue;
-  final String venueName;
+  final TostiOrderVenue venue;
   final DateTime start;
   final DateTime end;
   final bool canOrder;
@@ -21,7 +21,6 @@ class TostiShift {
   TostiShift(
     this.id,
     this.venue,
-    this.venueName,
     this.start,
     this.end,
     this.canOrder,

diff --git a/lib/tosti/models/shift.g.dart b/lib/tosti/models/shift.g.dart
diff --git a/lib/tosti/models/venue.dart b/lib/tosti/models/venue.dart
@@ -37,3 +37,13 @@ class TostiVenue {
   TostiVenue copyWithPlayer(ThaliedjePlayer? player) =>
       TostiVenue(id, name, slug, colorInCalendar, canBeReserved, shift, player);
 }
+
+@JsonSerializable(fieldRename: FieldRename.snake)
+class TostiOrderVenue {
+  final TostiVenue venue;
+
+  TostiOrderVenue(this.venue);
+
+  factory TostiOrderVenue.fromJson(Map<String, dynamic> json) =>
+      _$TostiOrderVenueFromJson(json);
+}
diff --git a/lib/tosti/models/venue.g.dart b/lib/tosti/models/venue.g.dart
diff --git a/lib/tosti/tosti_shift_screen.dart b/lib/tosti/tosti_shift_screen.dart
@@ -57,7 +57,7 @@ class TostiShiftScreen extends StatelessWidget {
                             children: [
                               const SizedBox(height: 16),
                               Text(
-                                shift.venueName.toUpperCase(),
+                                shift.venue.venue.name.toUpperCase(),
                                 style: textTheme.titleLarge,
                               ),
                               const Divider(height: 24),