ammar/syncrow-web
1
0
Fork 0
mirror of https://github.com/SyncrowIOT/web.git synced 2025-08-25 11:39:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor calendar event loading: replace parameters with LoadEventsParam class and implement memory caching for improved performance

Browse Source
This commit is contained in:
mohammad
2025-07-17 11:20:32 +03:00
parent c6729f476f
commit c9b8fbb0c2
8 changed files with 100 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/pages/access_management/booking_system/data/services/remote_calendar_service.dart
View File

@ -1,4 +1,5 @@
import 'package:dio/dio.dart';
import 'package:syncrow_web/pages/access_management/booking_system/domain/LoadEventsParam.dart';
import 'package:syncrow_web/pages/access_management/booking_system/domain/models/calendar_event_booking.dart';
import 'package:syncrow_web/pages/access_management/booking_system/domain/services/calendar_system_service.dart';
import 'package:syncrow_web/services/api/api_exception.dart';
@ -13,17 +14,17 @@ class RemoteCalendarService implements CalendarSystemService {
@override
Future<CalendarEventsResponse> getCalendarEvents({
required String spaceId,
required String month,
required String year,
required LoadEventsParam params,
}) async {
final month = params.startDate.month.toString().padLeft(2, '0');
final year = params.startDate.year.toString();
try {
return await _httpService.get<CalendarEventsResponse>(
path: ApiEndpoints.getBookings
.replaceAll('{mm}', month)
.replaceAll('{yyyy}', year)
.replaceAll('{space}', spaceId),
.replaceAll('{space}', params.id),
expectedResponseModel: (json) {
return CalendarEventsResponse.fromJson(json as Map<String, dynamic>);
},

28
lib/pages/access_management/booking_system/domain/LoadEventsParam.dart Normal file
View File

@ -0,0 +1,28 @@
import 'package:equatable/equatable.dart';
class LoadEventsParam extends Equatable {
final DateTime startDate;
final DateTime endDate;
final String id;
const LoadEventsParam({
required this.startDate,
required this.endDate,
required this.id,
});
@override
List<Object?> get props => [startDate, endDate, id];
LoadEventsParam copyWith({
DateTime? startDate,
DateTime? endDate,
String? id,
}) {
return LoadEventsParam(
startDate: startDate ?? this.startDate,
endDate: endDate ?? this.endDate,
id: id ?? this.id,
);
}
}

5
lib/pages/access_management/booking_system/domain/services/calendar_system_service.dart
View File

@ -1,9 +1,8 @@
import 'package:syncrow_web/pages/access_management/booking_system/domain/LoadEventsParam.dart';
import 'package:syncrow_web/pages/access_management/booking_system/domain/models/calendar_event_booking.dart';
abstract class CalendarSystemService {
Future<CalendarEventsResponse> getCalendarEvents({
required String spaceId,
required String month,
required String year,
required LoadEventsParam params,
});
}

45
lib/pages/access_management/booking_system/presentation/bloc/calendar/events_bloc.dart
View File

@ -2,8 +2,10 @@ import 'dart:async';
import 'package:bloc/bloc.dart';
import 'package:calendar_view/calendar_view.dart';
import 'package:flutter/material.dart';
import 'package:syncrow_web/pages/access_management/booking_system/domain/LoadEventsParam.dart';
import 'package:syncrow_web/pages/access_management/booking_system/domain/models/calendar_event_booking.dart';
import 'package:syncrow_web/pages/access_management/booking_system/domain/services/calendar_system_service.dart';
import 'package:syncrow_web/pages/access_management/booking_system/presentation/model/memory_bookable_space_service.dart';
part 'events_event.dart';
part 'events_state.dart';
@ -11,12 +13,14 @@ class CalendarEventsBloc extends Bloc<CalendarEventsEvent, CalendarEventState> {
final EventController eventController = EventController();
final CalendarSystemService calendarService;
final Map<String, List<CalendarEventData>> _eventsCache = {};
final MemoryBookableSpaceService memoryService;
String? _lastSpaceId;
int? _lastMonth;
int? _lastYear;
CalendarEventsBloc({required this.calendarService}) : super(EventsInitial()) {
CalendarEventsBloc({
required this.calendarService,
required this.memoryService,
}) : super(EventsInitial()) {
on<LoadEvents>(_onLoadEvents);
on<AddEvent>(_onAddEvent);
on<DisposeResources>(_onDisposeResources);
@ -26,45 +30,32 @@ class CalendarEventsBloc extends Bloc<CalendarEventsEvent, CalendarEventState> {
LoadEvents event,
Emitter<CalendarEventState> emit,
) async {
final month = event.weekEnd.month;
final year = event.weekEnd.year;
final cacheKey =
'${event.spaceId}-$year-${month.toString().padLeft(2, '0')}';
if (_eventsCache.containsKey(cacheKey)) {
final cachedEvents = _eventsCache[cacheKey]!;
final param = event.param;
final month = param.endDate.month;
final year = param.endDate.year;
final spaceId = param.id;
final cachedEvents = memoryService.getEvents(spaceId, year, month);
if (cachedEvents != null) {
eventController.addAll(cachedEvents);
emit(EventsLoaded(
events: cachedEvents,
spaceId: event.spaceId,
spaceId: spaceId,
month: month,
year: year,
));
return;
}
if (_lastSpaceId == event.spaceId &&
_lastMonth == month &&
_lastYear == year) {
return;
}
emit(EventsLoading());
try {
final response = await calendarService.getCalendarEvents(
month: month.toString().padLeft(2, '0'),
year: year.toString(),
spaceId: event.spaceId,
);
final response = await calendarService.getCalendarEvents(params: param);
final events = response.data.map(_toCalendarEventData).toList();
_eventsCache[cacheKey] = events;
memoryService.setEvents(spaceId, year, month, events);
eventController.addAll(events);
_lastSpaceId = event.spaceId;
_lastMonth = month;
_lastYear = year;
emit(EventsLoaded(
events: events,
spaceId: event.spaceId,
spaceId: spaceId,
month: month,
year: year,
));

12
lib/pages/access_management/booking_system/presentation/bloc/calendar/events_event.dart
View File

@ -6,17 +6,11 @@ abstract class CalendarEventsEvent {
}
class LoadEvents extends CalendarEventsEvent {
final String spaceId;
final DateTime weekStart;
final DateTime weekEnd;
const LoadEvents({
required this.spaceId,
required this.weekStart,
required this.weekEnd,
});
final LoadEventsParam param;
const LoadEvents(this.param);
}
class AddEvent extends CalendarEventsEvent {
final CalendarEventData event;
const AddEvent(this.event);

35
lib/pages/access_management/booking_system/presentation/model/memory_bookable_space_service.dart Normal file
View File

@ -0,0 +1,35 @@
import 'package:calendar_view/calendar_view.dart';
class MemoryBookableSpaceService {
final Map<String, List<CalendarEventData>> _eventsCache = {};
List<CalendarEventData>? getEvents(String spaceId, int year, int month) {
final key = _generateKey(spaceId, year, month);
return _eventsCache[key];
}
void setEvents(
String spaceId,
int year,
int month,
List<CalendarEventData> events,
) {
final key = _generateKey(spaceId, year, month);
_eventsCache[key] = events;
}
void addEvent(String spaceId, int year, int month, CalendarEventData event) {
final key = _generateKey(spaceId, year, month);
final events = _eventsCache[key] ?? [];
events.add(event);
_eventsCache[key] = events;
}
void clear() {
_eventsCache.clear();
}
String _generateKey(String spaceId, int year, int month) {
return '$spaceId-$year-${month.toString().padLeft(2, '0')}';
}
}

11
lib/pages/access_management/booking_system/presentation/view/booking_page.dart
View File

@ -2,11 +2,13 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:calendar_view/calendar_view.dart';
import 'package:syncrow_web/pages/access_management/booking_system/data/services/remote_calendar_service.dart';
import 'package:syncrow_web/pages/access_management/booking_system/domain/LoadEventsParam.dart';
import 'package:syncrow_web/pages/access_management/booking_system/presentation/bloc/calendar/events_bloc.dart';
import 'package:syncrow_web/pages/access_management/booking_system/presentation/bloc/date_selection/date_selection_bloc.dart';
import 'package:syncrow_web/pages/access_management/booking_system/presentation/bloc/date_selection/date_selection_event.dart';
import 'package:syncrow_web/pages/access_management/booking_system/presentation/bloc/date_selection/date_selection_state.dart';
import 'package:syncrow_web/pages/access_management/booking_system/presentation/bloc/selected_bookable_space_bloc/selected_bookable_space_bloc.dart';
import 'package:syncrow_web/pages/access_management/booking_system/presentation/model/memory_bookable_space_service.dart';
import 'package:syncrow_web/pages/access_management/booking_system/presentation/view/widgets/booking_sidebar.dart';
import 'package:syncrow_web/pages/access_management/booking_system/presentation/view/widgets/custom_calendar_page.dart';
import 'package:syncrow_web/pages/access_management/booking_system/presentation/view/widgets/icon_text_button.dart';
@ -46,9 +48,11 @@ class _BookingPageState extends State<BookingPage> {
if (selectedRoom != null) {
context.read<CalendarEventsBloc>().add(
LoadEvents(
spaceId: selectedRoom.uuid,
weekStart: dateState.weekStart,
weekEnd: dateState.weekStart.add(const Duration(days: 6)),
LoadEventsParam(
startDate: dateState.weekStart,
endDate: dateState.weekStart.add(const Duration(days: 6)),
id: selectedRoom.uuid,
),
),
);
}
@ -62,6 +66,7 @@ class _BookingPageState extends State<BookingPage> {
BlocProvider(create: (_) => DateSelectionBloc()),
BlocProvider(
create: (_) => CalendarEventsBloc(
memoryService: MemoryBookableSpaceService(),
calendarService: RemoteCalendarService(
HTTPService(),
),

2
lib/pages/access_management/booking_system/presentation/view/widgets/weekly_calendar_page.dart
View File

@ -24,7 +24,7 @@ class WeeklyCalendarPage extends StatelessWidget {
});
static const double timeLineWidth = 65;
static const int totalDays = 7;
static const double dayColumnWidth = 220; // or any width you want
static const double dayColumnWidth = 220;
final double calendarContentWidth =
timeLineWidth + (totalDays * dayColumnWidth);