fix: event date logic

lemonadesocial · Oct 10, 2024 · 6b4666c · 6b4666c
1 parent 87f91cf
commit 6b4666c
Show file tree

Hide file tree

Showing 8 changed files with 206 additions and 170 deletions.
diff --git a/lib/core/application/event/create_event_bloc/create_event_bloc.dart b/lib/core/application/event/create_event_bloc/create_event_bloc.dart
@@ -157,8 +157,8 @@ class CreateEventBloc extends Bloc<CreateEventEvent, CreateEventState> {
         description: state.description,
         private: state.private,
         approval_required: state.approvalRequired,
-        start: DateTime.parse(event.start.toIso8601String()),
-        end: DateTime.parse(event.end.toIso8601String()),
+        start: event.start.toUtc(),
+        end: event.end.toUtc(),
         timezone: event.timezone,
         guest_limit:
             state.guestLimit != null ? double.parse(state.guestLimit!) : null,

diff --git a/lib/core/application/event/event_datetime_settings_bloc/event_datetime_settings_bloc.dart b/lib/core/application/event/event_datetime_settings_bloc/event_datetime_settings_bloc.dart
@@ -10,7 +10,7 @@ import 'package:formz/formz.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:injectable/injectable.dart';
 import 'package:app/core/utils/date_utils.dart' as date_utils;
-import 'package:timezone/timezone.dart';
+import 'package:timezone/timezone.dart' as tz;
 
 part 'event_datetime_settings_bloc.freezed.dart';
 
@@ -32,10 +32,13 @@ class EventDateTimeSettingsBloc
     emit(state.copyWith(status: FormzSubmissionStatus.initial));
     final finalTimezone =
         event.timezone ?? date_utils.DateUtils.getUserTimezoneOptionValue();
+    final location = tz.getLocation(finalTimezone);
+    final start = tz.TZDateTime.from(event.startDateTime, location);
+    final end = tz.TZDateTime.from(event.endDateTime, location);
     emit(
       state.copyWith(
-        start: DateTimeFormz.dirty(event.startDateTime),
-        end: DateTimeFormz.dirty(event.endDateTime),
+        start: DateTimeFormz.dirty(start),
+        end: DateTimeFormz.dirty(end),
         timezone: finalTimezone,
       ),
     );
@@ -48,16 +51,7 @@ class EventDateTimeSettingsBloc
     emit(state.copyWith(status: FormzSubmissionStatus.inProgress));
     final newStart = event.newStart;
     final newEnd = event.newEnd;
-    final location = getLocation(state.timezone ?? '');
-    final startUtcDateTime = newStart
-        .add(Duration(milliseconds: location.currentTimeZone.offset * -1));
-    final endUtcDateTime = newEnd
-        .add(Duration(milliseconds: location.currentTimeZone.offset * -1));
-
-    final now = DateTime.now();
-    final tomorrowMidnight = DateTime.utc(now.year, now.month, now.day + 1);
-    if (newStart.isBefore(tomorrowMidnight) ||
-        newEnd.isBefore(tomorrowMidnight)) {
+    if (newStart.isBefore(DateTime.now())) {
       emit(
         state.copyWith(
           start: DateTimeFormz.dirty(newStart),
@@ -82,8 +76,8 @@ class EventDateTimeSettingsBloc
       if (event.event != null) {
         final result = await eventRepository.updateEvent(
           input: Input$EventInput(
-            start: DateTime.parse(startUtcDateTime.toIso8601String()),
-            end: DateTime.parse(endUtcDateTime.toIso8601String()),
+            start: newStart.toUtc(),
+            end: newEnd.toUtc(),
           ),
           id: event.event?.id ?? '',
         );
@@ -117,18 +111,30 @@ class EventDateTimeSettingsBloc
     Emitter emit,
   ) async {
     emit(state.copyWith(status: FormzSubmissionStatus.inProgress));
+    final location = tz.getLocation(event.timezone);
+    final newStart = tz.TZDateTime(
+      location,
+      state.start.value!.year,
+      state.start.value!.month,
+      state.start.value!.day,
+      state.start.value!.hour,
+      state.start.value!.minute,
+    );
+
+    final newEnd = tz.TZDateTime(
+      location,
+      state.end.value!.year,
+      state.end.value!.month,
+      state.end.value!.day,
+      state.end.value!.hour,
+      state.end.value!.minute,
+    );
     // Edit mode
     if (event.event != null) {
-      final location = getLocation(event.timezone);
-      final startUtcDateTime = state.start.value!
-          .add(Duration(milliseconds: location.currentTimeZone.offset * -1));
-      final endUtcDateTime = state.end.value!
-          .add(Duration(milliseconds: location.currentTimeZone.offset * -1));
-
       final result = await eventRepository.updateEvent(
         input: Input$EventInput(
-          start: DateTime.parse(startUtcDateTime.toIso8601String()),
-          end: DateTime.parse(endUtcDateTime.toIso8601String()),
+          start: newStart.toUtc(),
+          end: newEnd.toUtc(),
           timezone: event.timezone,
         ),
         id: event.event?.id ?? '',
@@ -147,6 +153,8 @@ class EventDateTimeSettingsBloc
     } else {
       emit(
         state.copyWith(
+          start: DateTimeFormz.dirty(newStart),
+          end: DateTimeFormz.dirty(newEnd),
           timezone: event.timezone,
           isValid: true,
           status: FormzSubmissionStatus.success,

diff --git a/lib/core/constants/event/event_constants.dart b/lib/core/constants/event/event_constants.dart
@@ -1,4 +1,5 @@
 import 'package:timezone/timezone.dart' as tz;
+import 'package:app/core/utils/date_utils.dart' as date_utils;
 
 class EventConstants {
   /// Guest limit per 2
@@ -287,19 +288,25 @@ class EventConstants {
 }
 
 class EventDateTimeConstants {
-  static final DateTime currentDateTime = DateTime.now();
+  static DateTime get currentDateTime => tz.TZDateTime.now(
+        tz.getLocation(date_utils.DateUtils.getUserTimezoneOptionValue()),
+      );
 
-  static final DateTime defaultStartDateTime = DateTime.utc(
-    currentDateTime.year,
-    currentDateTime.month,
-    currentDateTime.day + 3,
-    10,
-  );
+  static DateTime get defaultStartDateTime {
+    return DateTime(
+      currentDateTime.year,
+      currentDateTime.month,
+      currentDateTime.day + 3,
+      10,
+    );
+  }
 
-  static final DateTime defaultEndDateTime = DateTime.utc(
-    currentDateTime.year,
-    currentDateTime.month,
-    currentDateTime.day + 6,
-    18,
-  );
+  static DateTime get defaultEndDateTime {
+    return DateTime(
+      currentDateTime.year,
+      currentDateTime.month,
+      currentDateTime.day + 6,
+      18,
+    );
+  }
 }
diff --git a/lib/core/presentation/pages/event/create_event/create_event_page.dart b/lib/core/presentation/pages/event/create_event/create_event_page.dart
@@ -6,7 +6,6 @@ import 'package:app/core/application/event/event_location_setting_bloc/event_loc
 import 'package:app/core/constants/event/event_constants.dart';
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
-
 import 'package:flutter_bloc/flutter_bloc.dart';
 
 @RoutePage()