6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit 2ce15bc3

AuthorNKL<nikolaj.king@gmail.com>

Date2026-03-16 09:30:06 +0100

cleaned pr

Changed files

.gitignore                                         |   1 +
 .../choose_share_room_repository.dart              |   1 -
 .../repositories/booking_details_repository.dart   |   2 +-
 .../repositories/housekeeping_repository.dart      |   2 -
 .../domain/repositories/profile_repository.dart    |   3 -
 .../repositories/profile_settings_repository.dart  |   3 -
 comwell_key_app/lib/routing/app_router.dart        |   1 -
 .../interceptors/mappers/booking_mapper.dart       | 142 ---------------------
 .../lib/services/mappers/booking_mapper.dart       |   1 -
 .../lib/services/mappers/user_mapper.dart          |   1 -
 .../lib/share/share_booking_repository.dart        |   2 +-
 11 files changed, 3 insertions(+), 156 deletions(-)

Diff

diff --git a/.gitignore b/.gitignore

index c081b867..6c7a1cd0 100644

--- a/.gitignore

+++ b/.gitignore

@@ -21,3 +21,4 @@ common/env/

common/build/

common/.dart_tool

+comwell_key_app/.fvmrc

diff --git a/comwell_key_app/lib/choose_share_room/choose_share_room_repository.dart b/comwell_key_app/lib/choose_share_room/choose_share_room_repository.dart

index 6a741749..d2c4ee06 100644

--- a/comwell_key_app/lib/choose_share_room/choose_share_room_repository.dart

+++ b/comwell_key_app/lib/choose_share_room/choose_share_room_repository.dart

@@ -1,7 +1,6 @@

import 'package:comwell_key_app/overview/models/room.dart';

import 'package:comwell_key_app/services/api.dart';

import 'package:comwell_key_app/services/mappers/room_mapper.dart';

import 'package:comwell_key_app/services/models/room_dto.dart';

class ChooseShareRoomRepository {

diff --git a/comwell_key_app/lib/domain/repositories/booking_details_repository.dart b/comwell_key_app/lib/domain/repositories/booking_details_repository.dart

index 16d67c7b..fba8efa1 100644

--- a/comwell_key_app/lib/domain/repositories/booking_details_repository.dart

+++ b/comwell_key_app/lib/domain/repositories/booking_details_repository.dart

@@ -1,7 +1,7 @@

import 'package:comwell_key_app/database/comwell_db.dart';

import 'package:comwell_key_app/overview/models/booking.dart';

import 'package:comwell_key_app/services/api.dart';

-import 'package:comwell_key_app/services/interceptors/mappers/booking_mapper.dart';

+import 'package:comwell_key_app/services/mappers/booking_mapper.dart';

import 'package:comwell_key_app/services/models/bookings_dto.dart';

import 'package:comwell_key_app/utils/locator.dart';

import 'package:comwell_key_app/utils/secure_storage.dart';

diff --git a/comwell_key_app/lib/domain/repositories/housekeeping_repository.dart b/comwell_key_app/lib/domain/repositories/housekeeping_repository.dart

index 14f953e9..6c0968c8 100644

--- a/comwell_key_app/lib/domain/repositories/housekeeping_repository.dart

+++ b/comwell_key_app/lib/domain/repositories/housekeeping_repository.dart

@@ -1,9 +1,7 @@

import 'package:comwell_key_app/domain/models/housekeeping.dart';

import 'package:comwell_key_app/services/api.dart';

import 'package:comwell_key_app/utils/locator.dart';

import '../../utils/secure_storage.dart';

class HouseKeepingRepository {

final secureStorage = locator<SecureStorage>();

final api = Api();

diff --git a/comwell_key_app/lib/domain/repositories/profile_repository.dart b/comwell_key_app/lib/domain/repositories/profile_repository.dart

index bf89a039..904ab48e 100644

--- a/comwell_key_app/lib/domain/repositories/profile_repository.dart

+++ b/comwell_key_app/lib/domain/repositories/profile_repository.dart

@@ -2,14 +2,11 @@ import 'package:comwell_key_app/authentication/authentication_repository.dart';

import 'package:comwell_key_app/database/comwell_db.dart';

import 'package:comwell_key_app/domain/models/user.dart';

import 'package:comwell_key_app/services/api.dart';

import 'package:comwell_key_app/services/models/user_dto.dart';

import 'package:comwell_key_app/utils/json.dart';

import 'package:comwell_key_app/utils/locator.dart';

import 'package:flutter/material.dart';

import '../../services/mappers/user_mapper.dart';

class ProfileRepository {

final AuthenticationRepository _authenticationRepository;

final Api _api;

diff --git a/comwell_key_app/lib/domain/repositories/profile_settings_repository.dart b/comwell_key_app/lib/domain/repositories/profile_settings_repository.dart

index fc35d588..12280a4e 100644

--- a/comwell_key_app/lib/domain/repositories/profile_settings_repository.dart

+++ b/comwell_key_app/lib/domain/repositories/profile_settings_repository.dart

@@ -1,13 +1,10 @@

import 'package:comwell_key_app/database/comwell_db.dart';

import 'package:comwell_key_app/domain/models/user.dart';

import 'package:comwell_key_app/services/api.dart';

import '../../services/mappers/user_mapper.dart';

import 'package:comwell_key_app/services/models/user_dto.dart';

import 'package:comwell_key_app/utils/json.dart';

import 'package:comwell_key_app/utils/locator.dart';

class ProfileSettingsRepository {

final Api api = Api();

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

index 3ca09171..dbad8578 100644

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

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

@@ -28,7 +28,6 @@ import 'package:comwell_key_app/up_sales/up_sales_route.dart';

import 'package:comwell_key_app/utils/context_utils.dart';

import 'package:comwell_key_app/utils/firebase.dart';

import 'package:concierge/concierge_route.dart';

-import 'package:concierge/flavors.dart';

import 'package:go_router/go_router.dart';

import 'package:flutter/material.dart';

import '../presentation/screens/login/login_route.dart';

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

deleted file mode 100644

index 9d5e5c58..00000000

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

+++ /dev/null

@@ -1,142 +0,0 @@

-import 'package:comwell_key_app/overview/models/booking.dart';

-import 'package:comwell_key_app/overview/models/guest.dart';

-import 'package:comwell_key_app/overview/models/room.dart';

-import 'package:comwell_key_app/services/models/booking_dto.dart';

-import 'package:comwell_key_app/services/models/room_dto.dart';

-import '../../mappers/room_mapper.dart';

-//TODO: Fix actual image

-extension BookingDTOMapper on BookingDTO {

- Booking toBooking() {

- final startDate = DateTime.parse(dayIn);

- final endDate = DateTime.parse(dayOut);

- final mappedGuests = guests.map(

- (guest) => Guest(

- firstName: guest.firstName,

- lastName: guest.lastName,

- id: guest.id,

- ),

- ).toList();

- return Booking(

- id: confirmationNumber,

- confirmationNumber: confirmationNumber,

- roomNumber: roomNumber ?? "",

- startDate: startDate,

- endDate: endDate,

- reservationStatus: ReservationStatus.fromString(status),

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

- hotelName: "Hotel $hotelCode",

- roomType: roomType ?? '',

- addOnItems: addOnItems,

- balance: balance ?? 0,

- children: children,

- firstName: firstName,

- lastName: lastName,

- bookerFirstName: bookerFirstName,

- bookerLastName: bookerLastName,

- adults: adults,

- hotelCode: hotelCode,

- bookingDate: startDate,

- digitalCard: true,

- isPrimaryGuest: isPrimaryGuest,

- maskedCardNumber: maskedCardNumber,

- guests: mappedGuests,

- );

- }

-extension BookingMapper on Booking {

- BookingDTO toDTO() {

- final firstName = this.firstName;

- final lastName = this.lastName;

- final mappedGuests = guests

- .map(

- (guest) => GuestDTO(

- id: guest.id,

- firstName: guest.firstName,

- lastName: guest.lastName,

- ),

- )

- .toList();

- return BookingDTO(

- roomNumber: roomNumber,

- hotelCode: hotelCode,

- firstName: firstName,

- lastName: lastName,

- bookerFirstName: firstName,

- bookerLastName: lastName,

- guests: mappedGuests,

- confirmationNumber: confirmationNumber,

- dayIn: startDate.toIso8601String(),

- dayOut: endDate.toIso8601String(),

- cancelTime: null,

- isCancelled: false,

- bookTime: startDate.toIso8601String(),

- status: reservationStatus.name,

- roomType: roomType,

- adults: adults,

- children: children,

- balance: balance ?? 0,

- isPrimaryGuest: isPrimaryGuest,

- addOnItems: addOnItems ?? [],

- );

- }

-extension BookingWithRoomsMapper on Booking {

- Booking withRooms(List<Room> rooms) {

- return Booking(

- id: id,

- confirmationNumber: confirmationNumber,

- roomNumber: roomNumber,

- startDate: startDate,

- endDate: endDate,

- reservationStatus: reservationStatus,

- image: image,

- hotelName: hotelName,

- roomType: roomType,

- addOnItems: addOnItems,

- balance: balance,

- children: children,

- firstName: firstName,

- lastName: lastName,

- bookerFirstName: bookerFirstName,

- bookerLastName: bookerLastName,

- adults: adults,

- hotelCode: hotelCode,

- bookingDate: bookingDate,

- digitalCard: digitalCard,

- isPrimaryGuest: isPrimaryGuest,

- maskedCardNumber: maskedCardNumber,

- );

- }

-extension ListRoomMapper on List<RoomDto> {

- List<Room> toRooms() => map((dto) => dto.toRoom()).toList();

-extension ListBookingMapper on Iterable<BookingDTO> {

- Iterable<Booking> toBookings() => map((dto) => dto.toBooking());

-extension RoomTypeMapper on Booking {

- String toRoomType() {

- switch (roomType) {

- case "SDPBO":

- return "Standard Double Plus Room";

- case "SDBO":

- return "Standard Double Room";

- case "STPBO":

- return "Standard Twin Plus Room";

- case "STPO":

- return "Standard Twin Room";

- case "SUBO":

- return "Suite";

- default:

- return "Room";

- }

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

index 3b29e4cd..bda1f973 100644

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

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

@@ -3,7 +3,6 @@ import 'package:comwell_key_app/overview/models/guest.dart';

import 'package:comwell_key_app/overview/models/room.dart';

import 'package:comwell_key_app/services/models/booking_dto.dart';

import 'package:comwell_key_app/services/models/room_dto.dart';

import 'room_mapper.dart';

//TODO: Fix actual image

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

index 2d7d6fc6..ab13e7df 100644

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

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

@@ -2,7 +2,6 @@ import 'package:comwell_key_app/domain/models/address.dart';

import 'package:comwell_key_app/domain/models/user.dart';

import 'package:comwell_key_app/services/models/simple_user_dto.dart';

import 'package:comwell_key_app/services/models/user_dto.dart';

extension UserMapper on UserDto {

User toUser() {

return User(

diff --git a/comwell_key_app/lib/share/share_booking_repository.dart b/comwell_key_app/lib/share/share_booking_repository.dart

index 7f497157..d52d6ce6 100644

--- a/comwell_key_app/lib/share/share_booking_repository.dart

+++ b/comwell_key_app/lib/share/share_booking_repository.dart

@@ -1,6 +1,6 @@

import 'package:comwell_key_app/overview/models/booking.dart';

import 'package:comwell_key_app/services/api.dart';

-import 'package:comwell_key_app/services/interceptors/mappers/booking_mapper.dart';

+import 'package:comwell_key_app/services/mappers/booking_mapper.dart';

import 'package:flutter/material.dart';

class ShareBookingRepository {