6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit fee4c3ad

AuthorEdmir Suljic<esu@dwarf.dk>

Date2025-06-18 15:21:59 +0200

created temp update to booking

Changed files

.../lib/booking_details/bloc/booking_details_bloc.dart |  2 +-
 .../lib/booking_details/booking_details_page.dart      | 18 ++++++++++--------
 .../booking_details/booking_details_repository.dart    |  2 +-
 comwell_key_app/lib/check_in/check_in_repository.dart  |  2 +-
 comwell_key_app/lib/overview/cubit/overview_cubit.dart |  3 ++-
 comwell_key_app/lib/overview/models/booking.dart       | 12 ++++++------
 .../overview/past_cancelled_booking_detail_page.dart   |  4 ++--
 .../lib/overview/repository/overview_repository.dart   |  5 +++--
 comwell_key_app/lib/profile/profile_repository.dart    |  2 +-
 comwell_key_app/lib/routing/app_router.dart            | 16 +++++++++-------
 .../lib/services/mappers/booking_mapper.dart           | 10 +++++-----
 .../lib/services/mappers/bookings_mapper.dart          |  6 +++---
 12 files changed, 44 insertions(+), 38 deletions(-)

Diff

diff --git a/comwell_key_app/lib/booking_details/bloc/booking_details_bloc.dart b/comwell_key_app/lib/booking_details/bloc/booking_details_bloc.dart

index 434043d3..544bc723 100644

--- a/comwell_key_app/lib/booking_details/bloc/booking_details_bloc.dart

+++ b/comwell_key_app/lib/booking_details/bloc/booking_details_bloc.dart

@@ -39,7 +39,7 @@ class BookingDetailsBloc

_startTimer();

add(CheckIfHouseKeepingOrdered());

add(CheckMobileKeys());

- add(GetBookingDetailsEvent(booking.confirmationId));

+ //add(GetBookingDetailsEvent(booking.confirmationId));

add(GetUserEvent());

add(UpdateRemainingEvent(getCheckInTime().difference(DateTime.now())));

diff --git a/comwell_key_app/lib/booking_details/booking_details_page.dart b/comwell_key_app/lib/booking_details/booking_details_page.dart

index d2620369..d425c8ab 100644

--- a/comwell_key_app/lib/booking_details/booking_details_page.dart

+++ b/comwell_key_app/lib/booking_details/booking_details_page.dart

@@ -25,10 +25,11 @@ class BookingDetailsPage extends StatelessWidget {

builder: (context, state) {

final cubit = context.read<BookingDetailsBloc>();

+ print("booking details page ${cubit.booking}");

if (state.status == BookingDetailsStatus.initial) {

cubit.add(InitialEvent());

- cubit.add(GetBookingDetailsEvent(cubit.booking.confirmationId));

+ //cubit.add(GetBookingDetailsEvent(cubit.booking.confirmationId));

}

return Scaffold(

@@ -37,13 +38,14 @@ class BookingDetailsPage extends StatelessWidget {

appBar: const ComwellAppBar(),

body: Builder(

builder: (context) {

- if (state.status == BookingDetailsStatus.loading) {

- return const Center(

- child: CircularProgressIndicator(),

- );

- } else {

- return _buildBookingDetailsPage(context, state, cubit);

- }

+ // if (state.status == BookingDetailsStatus.loading) {

+ // return const Center(

+ // child: CircularProgressIndicator(),

+ // );

+ // } else {

+ // return _buildBookingDetailsPage(context, state, cubit);

+ return _buildBookingDetailsPage(context, state, cubit);

+ //}

));

diff --git a/comwell_key_app/lib/booking_details/booking_details_repository.dart b/comwell_key_app/lib/booking_details/booking_details_repository.dart

index 9e4d148c..92b7561a 100644

--- a/comwell_key_app/lib/booking_details/booking_details_repository.dart

+++ b/comwell_key_app/lib/booking_details/booking_details_repository.dart

@@ -40,7 +40,7 @@ class BookingDetailsRepository {

Booking booking,

) async {

//await api.updateBooking(booking);

- await database.bookingsDao.insert([booking.toDTO()], booking.status);

+ await database.bookingsDao.insert([booking.toDTO()], booking.bookingStatus);

return booking;

}

diff --git a/comwell_key_app/lib/check_in/check_in_repository.dart b/comwell_key_app/lib/check_in/check_in_repository.dart

index c43673d9..193d39e4 100644

--- a/comwell_key_app/lib/check_in/check_in_repository.dart

+++ b/comwell_key_app/lib/check_in/check_in_repository.dart

@@ -57,7 +57,7 @@ class CheckInRepository {

roomNumber: "1234",

startDate: DateTime.now(),

endDate: DateTime.now(),

- status: BookingStatus.current,

+ bookingStatus: BookingStatus.current,

reservationStatus: ReservationStatus.newreservation,

image: "",

hotelName: "hotelName",

diff --git a/comwell_key_app/lib/overview/cubit/overview_cubit.dart b/comwell_key_app/lib/overview/cubit/overview_cubit.dart

index 165b98f2..1fef56e3 100644

--- a/comwell_key_app/lib/overview/cubit/overview_cubit.dart

+++ b/comwell_key_app/lib/overview/cubit/overview_cubit.dart

@@ -16,6 +16,7 @@ class OverviewCubit extends Cubit<OverviewState> {

try {

final bookings = await overviewRepository.fetchAllBookingsForUser();

+ print("bookings: ${bookings.current.first.reservationStatus}");

emit(OverviewLoaded(bookings: bookings));

} catch (e, st) {

@@ -32,7 +33,7 @@ class OverviewCubit extends Cubit<OverviewState> {

final updatedCancelled =

List<Booking>.from(currentState.bookings.cancelled);

- switch (newBooking.status) {

+ switch (newBooking.bookingStatus) {

case BookingStatus.current:

updatedCurrent.add(newBooking);

break;

diff --git a/comwell_key_app/lib/overview/models/booking.dart b/comwell_key_app/lib/overview/models/booking.dart

index 79eda974..dacc36bd 100644

--- a/comwell_key_app/lib/overview/models/booking.dart

+++ b/comwell_key_app/lib/overview/models/booking.dart

@@ -8,7 +8,7 @@ class Booking extends Equatable {

final String roomNumber;

final DateTime startDate;

final DateTime endDate;

- final BookingStatus status;

+ final BookingStatus bookingStatus;

final ReservationStatus reservationStatus;

final String image;

final String hotelName;

@@ -30,7 +30,7 @@ class Booking extends Equatable {

required this.roomNumber,

required this.startDate,

required this.endDate,

- required this.status,

+ required this.bookingStatus,

required this.reservationStatus,

required this.image,

required this.hotelName,

@@ -61,7 +61,7 @@ class Booking extends Equatable {

@override

String toString() {

- return "Booking(id: $id, confirmationId: $confirmationId, roomNumber: $roomNumber, startDate: $startDate, endDate: $endDate, status: $status, reservationStatus: $reservationStatus, image: $image, hotelName: $hotelName, hotelCode: $hotelCode, roomType: $roomType, adults: $adults, children: $children, booker: $booker, bookingDate: $bookingDate, digitalCard: $digitalCard, guests: $guests)";

+ return "Booking(id: $id, confirmationId: $confirmationId, roomNumber: $roomNumber, startDate: $startDate, endDate: $endDate, status: $bookingStatus, reservationStatus: $reservationStatus, image: $image, hotelName: $hotelName, hotelCode: $hotelCode, roomType: $roomType, adults: $adults, children: $children, booker: $booker, bookingDate: $bookingDate, digitalCard: $digitalCard, guests: $guests)";

}

@override

@@ -70,7 +70,7 @@ class Booking extends Equatable {

roomNumber,

startDate,

endDate,

- status,

+ bookingStatus,

image,

hotelName,

roomType,

@@ -92,7 +92,7 @@ class Booking extends Equatable {

String? roomNumber,

DateTime? startDate,

DateTime? endDate,

- BookingStatus? status,

+ BookingStatus? bookingStatus,

ReservationStatus? reservationStatus,

String? image,

String? hotelName,

@@ -112,7 +112,7 @@ class Booking extends Equatable {

roomNumber: roomNumber ?? this.roomNumber,

startDate: startDate ?? this.startDate,

endDate: endDate ?? this.endDate,

- status: status ?? this.status,

+ bookingStatus: bookingStatus ?? this.bookingStatus,

reservationStatus: reservationStatus ?? this.reservationStatus,

image: image ?? this.image,

hotelName: hotelName ?? this.hotelName,

diff --git a/comwell_key_app/lib/overview/past_cancelled_booking_detail_page.dart b/comwell_key_app/lib/overview/past_cancelled_booking_detail_page.dart

index 6b767fdd..5cb6c5d6 100644

--- a/comwell_key_app/lib/overview/past_cancelled_booking_detail_page.dart

+++ b/comwell_key_app/lib/overview/past_cancelled_booking_detail_page.dart

@@ -118,7 +118,7 @@ class PastCancelledBookingDetailPage extends StatelessWidget {

.toString(),

style: theme.textTheme.headlineSmall)),

const Divider(color: colorDivider),

- booking.status != BookingStatus.cancelled

+ booking.bookingStatus != BookingStatus.cancelled

? ListTile(

contentPadding: const EdgeInsets.symmetric(horizontal: 0),

title: Row(

@@ -137,7 +137,7 @@ class PastCancelledBookingDetailPage extends StatelessWidget {

))

: const SizedBox(),

- booking.status != BookingStatus.cancelled

+ booking.bookingStatus != BookingStatus.cancelled

? const Divider(color: colorDivider)

: const SizedBox(),

diff --git a/comwell_key_app/lib/overview/repository/overview_repository.dart b/comwell_key_app/lib/overview/repository/overview_repository.dart

index df9c0fa3..f98ffe18 100644

--- a/comwell_key_app/lib/overview/repository/overview_repository.dart

+++ b/comwell_key_app/lib/overview/repository/overview_repository.dart

@@ -19,6 +19,7 @@ class OverviewRepository {

Future<Bookings> fetchAllBookingsForUser() async {

try {

final response = await api.fetchAllBookingsForUser();

final user = await profileRepository.fetchProfileSettings();

await database.bookingsDao.insertBookings(response);

return response.toBookings(user.id);

@@ -53,7 +54,7 @@ class OverviewRepository {

totalCharge: 12345,

balance: 0,

maskedCardNumber: "1234567890");

- return dto.toBooking(user.id, BookingStatus.current, ReservationStatus.newreservation);

+ return dto.toBooking(user.id, BookingStatus.current);

}

@@ -63,7 +64,7 @@ final mockBookings = [1, 2, 3].map((i) => Booking(

roomNumber: "roomNumber$i",

startDate: DateTime.now(),

endDate: DateTime.now(),

- status: BookingStatus.current,

+ bookingStatus: BookingStatus.current,

reservationStatus: ReservationStatus.newreservation,

image: "assets/images/no_current_bookings_background.jpeg",

hotelName: "hotelName$i",

diff --git a/comwell_key_app/lib/profile/profile_repository.dart b/comwell_key_app/lib/profile/profile_repository.dart

index d622f9fa..96132980 100644

--- a/comwell_key_app/lib/profile/profile_repository.dart

+++ b/comwell_key_app/lib/profile/profile_repository.dart

@@ -52,7 +52,7 @@ class ProfileRepository {

user = await fetchProfileSettings();

final response = await api.getBookingDetails(bookingId);

await db.bookingsDao.insertBookings(BookingsDTO(current: [response!], past: [], cancelled: []));

- final booking = response.toBooking(user.id, BookingStatus.current, ReservationStatus.fromString(response.status));

+ final booking = response.toBooking(user.id, BookingStatus.current);

return booking;

}

diff --git a/comwell_key_app/lib/routing/app_router.dart b/comwell_key_app/lib/routing/app_router.dart

index edf105ab..d4ee551f 100644

--- a/comwell_key_app/lib/routing/app_router.dart

+++ b/comwell_key_app/lib/routing/app_router.dart

@@ -50,6 +50,8 @@ import 'package:comwell_key_app/share/cubit/share_booking_cubit.dart';

import 'package:comwell_key_app/share/share_booking_page.dart';

import 'package:comwell_key_app/up_sales/cubit/up_sales_cubit.dart';

import 'package:comwell_key_app/up_sales/models/room_upgrade.dart';

+import 'package:comwell_key_app/up_sales/models/room_upgrade_extra.dart';

+import 'package:comwell_key_app/up_sales/models/room_upgrade_list.dart';

import 'package:comwell_key_app/up_sales/pages/other_upgrade_page.dart';

import 'package:comwell_key_app/up_sales/pages/room_upgrade_page.dart';

import 'package:comwell_key_app/up_sales/up_sale_repository.dart';

@@ -193,7 +195,7 @@ GoRouter goRouter() {

builder: (context, state) {

final booking = state.extra as Booking;

return BlocProvider(

- create: (BuildContext context) => ShareBookingCubit(),

+ create: (context) => ShareBookingCubit(),

child: ShareBookingPage(booking: booking),

);

@@ -397,11 +399,11 @@ GoRouter goRouter() {

path: "/${AppRoutes.roomUpgrade.name}",

name: AppRoutes.roomUpgrade.name,

builder: (context, state) {

- final roomUpgrade = state.extra as RoomUpgrade;

+ final roomUpgradeList = state.extra as RoomUpgradeList;

return BlocProvider(

create: (context) =>

- UpSalesCubit(upSaleRepository: locator<UpSaleRepository>()),

- child: RoomUpgradePage(roomUpgrade: roomUpgrade),

+ UpSalesCubit(upSaleRepository: locator<UpSaleRepository>())..init(),

+ child: RoomUpgradePage(roomUpgradeList: roomUpgradeList),

);

@@ -409,11 +411,11 @@ GoRouter goRouter() {

path: "/${AppRoutes.otherUpgrade.name}",

name: AppRoutes.otherUpgrade.name,

builder: (context, state) {

- final roomUpgrade = state.extra as RoomUpgrade;

+ final roomUpgrade = state.extra as RoomUpgradeExtra;

return BlocProvider(

create: (context) =>

- UpSalesCubit(upSaleRepository: locator<UpSaleRepository>()),

- child: OtherUpgradePage(roomUpgrade: roomUpgrade),

+ UpSalesCubit.withExtra(upSaleRepository: locator<UpSaleRepository>(), extra: roomUpgrade),

+ child: OtherUpgradePage(extra: roomUpgrade),

);

}),

/* GoRoute(

diff --git a/comwell_key_app/lib/services/mappers/booking_mapper.dart b/comwell_key_app/lib/services/mappers/booking_mapper.dart

index c8129d47..47195266 100644

--- a/comwell_key_app/lib/services/mappers/booking_mapper.dart

+++ b/comwell_key_app/lib/services/mappers/booking_mapper.dart

@@ -4,7 +4,7 @@ import 'package:comwell_key_app/services/models/booking_dto.dart';

//TODO: Fix actual image

extension BookingDTOMapper on BookingDTO {

- Booking toBooking(int userId, BookingStatus status, ReservationStatus reservationStatus) {

+ Booking toBooking(int userId, BookingStatus status) {

final startDate = DateTime.parse(dayIn);

final endDate = DateTime.parse(dayOut!);

return Booking(

@@ -13,8 +13,8 @@ extension BookingDTOMapper on BookingDTO {

roomNumber: roomNumber ?? "",

startDate: startDate,

endDate: endDate,

- status: status,

- reservationStatus: reservationStatus,

+ bookingStatus: status,

+ reservationStatus: ReservationStatus.fromString(this.status),

image: "assets/images/no_current_bookings_background.jpeg",

hotelName: "Hotel $hotelCode",

roomType: roomType ?? '',

@@ -56,6 +56,6 @@ extension BookingMapper on Booking {

}

extension ListBookingMapper on Iterable<BookingDTO> {

- Iterable<Booking> toBookings(int userId, BookingStatus status, ReservationStatus reservationStatus) =>

- map((dto) => dto.toBooking(userId, status, reservationStatus));

+ Iterable<Booking> toBookings(int userId, BookingStatus status) =>

+ map((dto) => dto.toBooking(userId, status));

}

diff --git a/comwell_key_app/lib/services/mappers/bookings_mapper.dart b/comwell_key_app/lib/services/mappers/bookings_mapper.dart

index 194f34ca..46e5462c 100644

--- a/comwell_key_app/lib/services/mappers/bookings_mapper.dart

+++ b/comwell_key_app/lib/services/mappers/bookings_mapper.dart

@@ -6,9 +6,9 @@ import 'package:comwell_key_app/services/models/bookings_dto.dart';

extension BookingsMapper on BookingsDTO {

Bookings toBookings(int userId) {

return Bookings(

- current: current.toBookings(userId, BookingStatus.current, ReservationStatus.newreservation),

- past: past.toBookings(userId, BookingStatus.past, ReservationStatus.newreservation),

- cancelled: cancelled.toBookings(userId, BookingStatus.cancelled, ReservationStatus.newreservation),

+ current: current.toBookings(userId, BookingStatus.current),

+ past: past.toBookings(userId, BookingStatus.past),

+ cancelled: cancelled.toBookings(userId, BookingStatus.cancelled),

);

}