chore: merge latest main into schedule session branch

Author: jjoonleo

CONTEXT.md

@@ -86,12 +86,12 @@ An allowlisted non-content value attached to a Product Usage Event.
 _Avoid_: Event payload, arbitrary metadata, raw detail
 
 **Schedule**:
-A planned commitment the user wants to arrive at or complete on time.
-_Avoid_: Event, appointment, alarm target
+A planned commitment with a place, appointment time, travel time, optional buffer time, and preparation.
+_Avoid_: Event, appointment record
 
 **Preparation**:
-The ordered set of steps a user intends to complete before a Schedule.
-_Avoid_: Routine, checklist, template instance
+An ordered set of steps and durations used to get ready for a Schedule.
+_Avoid_: Routine, prep checklist
 
 **Preparation Step**:
 One named action in a Preparation with its own expected duration.
@@ -117,6 +117,18 @@ _Avoid_: Total duration, travel time, buffer time
 A user buffer before a Schedule's appointment time, separate from travel time and Preparation Duration.
 _Avoid_: Preparation time, move time
 
+**Default Preparation**:
+The user's fallback Preparation for new Schedules.
+_Avoid_: Base preparation, global preparation
+
+**Custom Preparation**:
+A Schedule-specific Preparation that differs from the user's fallback or selected template.
+_Avoid_: Changed preparation, edited default
+
+**Preparation Mode**:
+The category describing whether a Schedule uses Default Preparation, a preparation template, or Custom Preparation.
+_Avoid_: Preparation type, preparation source
+
 **Schedule Notification**:
 A user-facing notification that starts preparation for a scheduled commitment at the intended moment.
 _Avoid_: Schedule alarm, alarm, push
@@ -191,6 +203,11 @@ _Avoid_: Loaded range, stream range, cached range
 
 ## Relationships
 
+- A **Product Usage Event** may describe a **Schedule**, **Preparation**, notification, alarm, onboarding, or account action without storing the user's raw schedule names, notes, place names, credentials, tokens, or free text.
+- A **Schedule** has one effective **Preparation** for calculating preparation timing.
+- A **Default Preparation** may seed a new **Schedule** before the user chooses a different preparation.
+- A **Custom Preparation** belongs to one **Schedule**.
+- **Preparation Mode** may appear as an **Analytics Event Parameter** without exposing preparation step names.
 - A **Monthly Calendar** displays **Schedules** grouped by calendar day.
 - A **Calendar Month Range** starts at the first day of its first month and ends before the first day of the month after its last month.
 - A **Monthly Calendar** may extend a **Calendar Month Range** when the user moves to an adjacent month.
@@ -200,7 +217,6 @@ _Avoid_: Loaded range, stream range, cached range
 - A **Preparation** contains zero or more **Preparation Steps** in user-defined order.
 - A **Preparation Step** belongs to exactly one **Preparation**.
 - A **Schedule Notification** uses **Schedule** and **Preparation** timing, but is not itself a **Schedule** or **Preparation**.
-- A **Product Usage Event** may describe a schedule, preparation, notification, alarm, onboarding, or account action without storing the user's raw schedule names, notes, place names, credentials, tokens, or free text.
 - First-release **Product Usage Events** are **Workflow Milestone Events**, not every tap or raw navigation step.
 - First-release **Workflow Milestone Events** cover analytics preference, onboarding, authentication, schedule, notification permission, alarm, and schedule-finish outcomes.
 - **Provider Authentication Completed** precedes **OnTime Session Established** during Apple or Google sign-in.
@@ -286,6 +302,7 @@ _Avoid_: Loaded range, stream range, cached range
 - "Event payload" was too open-ended; resolved: events use allowlisted **Analytics Event Parameters** only.
 - "Schedule preparation session" was implicit in code but not in the glossary; resolved: the canonical term is **Schedule Preparation Session**, with **Early Start Session** for sessions started before the **Preparation Start Moment**.
 - "Login completed" was ambiguous for Apple and Google sign-in; resolved: external account prompt completion is **Provider Authentication Completed**, while usable OnTime sign-in is **OnTime Session Established**.
+- "Preparation" was ambiguous between the user's fallback steps and a schedule-specific edited set; resolved: use **Default Preparation** for the fallback and **Custom Preparation** for the schedule-specific version.
 - "Alarm permission" was ambiguous between **Exact Timing Permission** and notification permission; resolved: notification permission may enable a **Fallback Notification**, but does not mean **Exact Timing Permission** is granted.
 - "Pending" was ambiguous for notification status; resolved: the canonical state is **No Scheduled Notification** when notifications are enabled but no upcoming Schedule Notification is armed.
 - "Allowed" was ambiguous for permission requests; resolved: a request action is not the same as granted **Exact Timing Permission**.

lib/core/services/google_authentication_service.dart

@@ -0,0 +1,101 @@
+import 'package:flutter/foundation.dart';
+import 'package:google_sign_in/google_sign_in.dart';
+import 'package:injectable/injectable.dart';
+import 'package:on_time_front/core/logging/app_logger.dart';
+import 'package:on_time_front/domain/entities/google_auth_credential.dart';
+
+abstract interface class GoogleAuthenticationService {
+  Stream<GoogleAuthCredential> get authenticationCredentials;
+
+  bool get supportsAuthenticate;
+
+  Future<void> initialize();
+
+  Future<GoogleAuthCredential> authenticate();
+
+  Future<void> disconnect();
+}
+
+class GoogleAuthenticationCanceledException implements Exception {
+  const GoogleAuthenticationCanceledException();
+}
+
+@Singleton(as: GoogleAuthenticationService)
+class GoogleSignInAuthenticationService implements GoogleAuthenticationService {
+  GoogleSignInAuthenticationService({@ignoreParam GoogleSignIn? googleSignIn})
+    : _googleSignIn = googleSignIn ?? GoogleSignIn.instance;
+
+  static const _googleIosClientId =
+      '456571312261-r35ah9qi0qaq7al007e2db0e0jmjcmb4.apps.googleusercontent.com';
+  static const _googleServerClientId =
+      '456571312261-5kuf2r6i5i7lqjr7qealv06sdgkn3hcp.apps.googleusercontent.com';
+  static const _googleScopes = ['email', 'profile'];
+
+  final GoogleSignIn _googleSignIn;
+  Future<void>? _initialization;
+
+  @override
+  Stream<GoogleAuthCredential> get authenticationCredentials => _googleSignIn
+      .authenticationEvents
+      .where((event) => event is GoogleSignInAuthenticationEventSignIn)
+      .cast<GoogleSignInAuthenticationEventSignIn>()
+      .map((event) => _credentialFromAccount(event.user));
+
+  @override
+  bool get supportsAuthenticate => _googleSignIn.supportsAuthenticate();
+
+  @override
+  Future<void> initialize() {
+    return _initialization ??= _initialize();
+  }
+
+  Future<void> _initialize() async {
+    await _googleSignIn.initialize(
+      clientId: _googleClientId,
+      serverClientId: _googleServerClientId,
+    );
+  }
+
+  @override
+  Future<GoogleAuthCredential> authenticate() async {
+    try {
+      await initialize();
+      final account = await _googleSignIn.authenticate(
+        scopeHint: _googleScopes,
+      );
+      return _credentialFromAccount(account);
+    } on GoogleSignInException catch (error) {
+      if (error.code == GoogleSignInExceptionCode.canceled) {
+        throw const GoogleAuthenticationCanceledException();
+      }
+      rethrow;
+    }
+  }
+
+  @override
+  Future<void> disconnect() async {
+    try {
+      await _googleSignIn.disconnect();
+      AppLogger.debug('Google Sign-In disconnected');
+    } catch (error) {
+      AppLogger.debug(
+        'Google Sign-In disconnect failed errorType=${error.runtimeType}',
+      );
+    }
+  }
+
+  GoogleAuthCredential _credentialFromAccount(GoogleSignInAccount account) {
+    final idToken = account.authentication.idToken;
+    if (idToken == null) {
+      throw Exception('Google ID Token is null');
+    }
+    return GoogleAuthCredential(idToken: idToken);
+  }
+
+  String? get _googleClientId {
+    if (kIsWeb) return null;
+    return defaultTargetPlatform == TargetPlatform.iOS
+        ? _googleIosClientId
+        : null;
+  }
+}

lib/data/repositories/user_repository_impl.dart

@@ -1,65 +1,34 @@
 import 'dart:async';
 
 import 'package:dio/dio.dart';
-import 'package:flutter/foundation.dart';
-import 'package:google_sign_in/google_sign_in.dart';
 import 'package:injectable/injectable.dart';
 import 'package:on_time_front/core/logging/app_logger.dart';
+import 'package:on_time_front/core/services/google_authentication_service.dart';
 import 'package:on_time_front/core/validation/backend_constraints.dart';
 import 'package:on_time_front/data/data_sources/authentication_remote_data_source.dart';
 import 'package:on_time_front/data/data_sources/token_local_data_source.dart';
 import 'package:on_time_front/data/models/sign_in_with_google_request_model.dart';
 import 'package:on_time_front/data/models/sign_in_with_apple_request_model.dart';
+import 'package:on_time_front/domain/entities/google_auth_credential.dart';
 import 'package:on_time_front/domain/entities/user_entity.dart';
 import 'package:on_time_front/domain/repositories/user_repository.dart';
 import 'package:rxdart/subjects.dart';
 
 @Singleton(as: UserRepository)
 class UserRepositoryImpl implements UserRepository {
-  static const _googleIosClientId =
-      '456571312261-r35ah9qi0qaq7al007e2db0e0jmjcmb4.apps.googleusercontent.com';
-  static const _googleServerClientId =
-      '456571312261-5kuf2r6i5i7lqjr7qealv06sdgkn3hcp.apps.googleusercontent.com';
-  static const _googleScopes = ['email', 'profile'];
-
   final AuthenticationRemoteDataSource _authenticationRemoteDataSource;
   final TokenLocalDataSource _tokenLocalDataSource;
-  final GoogleSignIn _googleSignIn = GoogleSignIn.instance;
-  Future<void>? _googleSignInInitialization;
+  final GoogleAuthenticationService _googleAuthenticationService;
   late final _userStreamController = BehaviorSubject<UserEntity>.seeded(
     const UserEntity.empty(),
   );
 
-  @override
-  Stream<GoogleSignInAuthenticationEvent> get googleAuthenticationEvents =>
-      _googleSignIn.authenticationEvents;
-
-  @override
-  bool get supportsGoogleAuthenticate => _googleSignIn.supportsAuthenticate();
-
   UserRepositoryImpl(
     this._authenticationRemoteDataSource,
     this._tokenLocalDataSource,
+    this._googleAuthenticationService,
   );
 
-  @override
-  Future<void> initializeGoogleSignIn() {
-    return _googleSignInInitialization ??= _initializeGoogleSignIn();
-  }
-
-  Future<void> _initializeGoogleSignIn() async {
-    await _googleSignIn.initialize(
-      clientId: _googleClientId,
-      serverClientId: _googleServerClientId,
-    );
-  }
-
-  @override
-  Future<GoogleSignInAccount> authenticateWithGoogle() async {
-    await initializeGoogleSignIn();
-    return _googleSignIn.authenticate(scopeHint: _googleScopes);
-  }
-
   @override
   Future<UserEntity> getUser() async {
     try {
@@ -122,16 +91,14 @@ class UserRepositoryImpl implements UserRepository {
   }
 
   @override
-  Future<void> signInWithGoogle(GoogleSignInAccount googleUser) async {
+  Future<void> signInWithGoogle(GoogleAuthCredential credential) async {
     try {
-      final GoogleSignInAuthentication googleAuth = googleUser.authentication;
-      final String? idToken = googleAuth.idToken;
-      if (idToken == null) {
+      if (credential.idToken.isEmpty) {
         throw Exception('Google ID Token is null');
       }
       final signInWithGoogleRequestModel = SignInWithGoogleRequestModel(
-        idToken: idToken,
-        refreshToken: '',
+        idToken: credential.idToken,
+        refreshToken: credential.refreshToken,
       );
       await _tokenLocalDataSource.deleteToken();
       final result = await _authenticationRemoteDataSource.signInWithGoogle(
@@ -225,8 +192,7 @@ class UserRepositoryImpl implements UserRepository {
   @override
   Future<void> disconnectGoogleSignIn() async {
     try {
-      await _googleSignIn.disconnect();
-      AppLogger.debug('Google Sign-In disconnected');
+      await _googleAuthenticationService.disconnect();
     } catch (error) {
       AppLogger.debug(
         'Google Sign-In disconnect failed errorType=${error.runtimeType}',
@@ -237,11 +203,4 @@ class UserRepositoryImpl implements UserRepository {
   @override
   Stream<UserEntity> get userStream =>
       _userStreamController.asBroadcastStream();
-
-  String? get _googleClientId {
-    if (kIsWeb) return null;
-    return defaultTargetPlatform == TargetPlatform.iOS
-        ? _googleIosClientId
-        : null;
-  }
 }

lib/domain/entities/google_auth_credential.dart

@@ -0,0 +1,6 @@
+class GoogleAuthCredential {
+  const GoogleAuthCredential({required this.idToken, this.refreshToken = ''});
+
+  final String idToken;
+  final String refreshToken;
+}

lib/domain/repositories/user_repository.dart

@@ -1,17 +1,9 @@
-import 'package:google_sign_in/google_sign_in.dart';
+import 'package:on_time_front/domain/entities/google_auth_credential.dart';
 import 'package:on_time_front/domain/entities/user_entity.dart';
 
 abstract interface class UserRepository {
   Stream<UserEntity> get userStream;
 
-  Stream<GoogleSignInAuthenticationEvent> get googleAuthenticationEvents;
-
-  Future<void> initializeGoogleSignIn();
-
-  bool get supportsGoogleAuthenticate;
-
-  Future<GoogleSignInAccount> authenticateWithGoogle();
-
   Future<void> signUp({
     required String email,
     required String password,
@@ -22,7 +14,7 @@ abstract interface class UserRepository {
 
   Future<void> signOut();
 
-  Future<void> signInWithGoogle(GoogleSignInAccount account);
+  Future<void> signInWithGoogle(GoogleAuthCredential credential);
 
   Future<void> signInWithApple({
     required String idToken,

lib/domain/use-cases/create_schedule_form_submission_use_case.dart

@@ -0,0 +1,32 @@
+import 'package:injectable/injectable.dart';
+import 'package:on_time_front/domain/use-cases/create_custom_preparation_use_case.dart';
+import 'package:on_time_front/domain/use-cases/create_schedule_with_place_use_case.dart';
+import 'package:on_time_front/domain/use-cases/schedule_analytics_tracker.dart';
+import 'package:on_time_front/domain/use-cases/schedule_form_submission.dart';
+
+@Injectable()
+class CreateScheduleFormSubmissionUseCase {
+  final CreateScheduleWithPlaceUseCase _createScheduleWithPlaceUseCase;
+  final CreateCustomPreparationUseCase _createCustomPreparationUseCase;
+  final ScheduleAnalyticsTracker _scheduleAnalyticsTracker;
+
+  CreateScheduleFormSubmissionUseCase(
+    this._createScheduleWithPlaceUseCase,
+    this._createCustomPreparationUseCase,
+    this._scheduleAnalyticsTracker,
+  );
+
+  Future<void> call(ScheduleFormSubmission submission) async {
+    await _createScheduleWithPlaceUseCase(submission.schedule);
+    if (submission.preparationChanged) {
+      await _createCustomPreparationUseCase(
+        submission.preparation,
+        submission.schedule.id,
+      );
+    }
+    await _scheduleAnalyticsTracker.trackScheduleCreated(
+      schedule: submission.schedule,
+      preparation: submission.preparation,
+    );
+  }
+}