Merge pull request #324 from DevKor-github/319-default-preparation-step-및-spare-time-수정-기능

319 default preparation step 및 spare time 수정 기능

Author: jjoonleo

assets/appleid_button.png

@@ -56,6 +56,9 @@ class Endpoint {
 
   static get updateDefaultPreparation => _defaultPreparation;
 
+  static const _updateSpareTime = '/users/me/spare-time';
+  static get updateSpareTime => _updateSpareTime;
+
   static const _fcmToken = '/firebase-token'; // 사용자 fcm 토큰 등록
   static get fcmTokenRegister => _fcmToken;
 }

lib/core/constants/endpoint.dart

@@ -8,6 +8,7 @@ import 'package:on_time_front/domain/entities/preparation_entity.dart';
 import 'package:on_time_front/data/models/create_preparation_schedule_request_model.dart';
 import 'package:on_time_front/data/models/create_defualt_preparation_request_model.dart';
 import 'package:on_time_front/data/models/get_preparation_step_response_model.dart';
+import 'package:on_time_front/data/models/update_spare_time_request_model.dart';
 
 abstract interface class PreparationRemoteDataSource {
   Future<void> createDefaultPreparation(
@@ -24,6 +25,8 @@ abstract interface class PreparationRemoteDataSource {
   Future<PreparationEntity> getPreparationByScheduleId(String scheduleId);
 
   Future<PreparationEntity> getDefualtPreparation();
+
+  Future<void> updateSpareTime(Duration newSpareTime);
 }
 
 @Injectable(as: PreparationRemoteDataSource)
@@ -121,7 +124,7 @@ class PreparationRemoteDataSourceImpl implements PreparationRemoteDataSource {
           PreparationUserModifyRequestModelListExtension.fromEntityList(
               preparationEntity.preparationStepList);
 
-      final result = await dio.post(
+      final result = await dio.put(
         Endpoint.updateDefaultPreparation,
         data: updateModel.map((model) => model.toJson()).toList(),
       );
@@ -154,4 +157,20 @@ class PreparationRemoteDataSourceImpl implements PreparationRemoteDataSource {
       rethrow;
     }
   }
+
+  @override
+  Future<void> updateSpareTime(Duration newSpareTime) async {
+    try {
+      final body = UpdateSpareTimeRequestModel.fromDuration(newSpareTime);
+      final result = await dio.put(
+        Endpoint.updateSpareTime,
+        data: body.toJson(),
+      );
+      if (result.statusCode != 200) {
+        throw Exception('Error updating spare time');
+      }
+    } catch (e) {
+      rethrow;
+    }
+  }
 }

lib/data/data_sources/preparation_remote_data_source.dart

@@ -0,0 +1,13 @@
+class UpdateSpareTimeRequestModel {
+  final int newSpareTime;
+
+  UpdateSpareTimeRequestModel({required this.newSpareTime});
+
+  Map<String, dynamic> toJson() => {
+        'newSpareTime': newSpareTime,
+      };
+
+  factory UpdateSpareTimeRequestModel.fromDuration(Duration duration) {
+    return UpdateSpareTimeRequestModel(newSpareTime: duration.inMinutes);
+  }
+}

lib/data/models/update_spare_time_request_model.dart

@@ -91,4 +91,12 @@ class PreparationRepositoryImpl implements PreparationRepository {
       rethrow;
     }
   }
+
+  Future<void> updateSpareTime(Duration newSpareTime) async {
+    try {
+      await preparationRemoteDataSource.updateSpareTime(newSpareTime);
+    } catch (e) {
+      rethrow;
+    }
+  }
 }

lib/data/repositories/preparation_repository_impl.dart

@@ -168,6 +168,16 @@ class UserRepositoryImpl implements UserRepository {
     }
   }
 
+  @override
+  Future<void> disconnectGoogleSignIn() async {
+    try {
+      await _googleSignIn.disconnect();
+      debugPrint('Google Sign-In disconnected');
+    } catch (e) {
+      debugPrint('Google Sign-In disconnect failed: $e');
+    }
+  }
+
   @override
   Stream<UserEntity> get userStream =>
       _userStreamController.asBroadcastStream();

lib/data/repositories/user_repository_impl.dart

@@ -17,4 +17,6 @@ abstract interface class PreparationRepository {
 
   Future<void> updatePreparationByScheduleId(
       PreparationEntity preparationEntity, String scheduleId);
+
+  Future<void> updateSpareTime(Duration newSpareTime);
 }

lib/domain/repositories/preparation_repository.dart

@@ -33,4 +33,6 @@ abstract interface class UserRepository {
   Future<void> postFeedback(String message);
 
   Future<String?> getUserSocialType();
+
+  Future<void> disconnectGoogleSignIn();
 }

lib/domain/repositories/user_repository.dart

@@ -15,7 +15,9 @@ class DeleteUserUseCase {
 
     final socialTypeString = await _userRepository.getUserSocialType();
     final socialType = socialTypeFromString(socialTypeString);
+
     if (socialType == SocialType.google) {
+      await _userRepository.disconnectGoogleSignIn();
       await _userRepository.deleteGoogleUser();
     } else if (socialType == SocialType.apple) {
       await _userRepository.deleteAppleUser();

lib/domain/use-cases/delete_user_use_case.dart

@@ -0,0 +1,13 @@
+import 'package:injectable/injectable.dart';
+import 'package:on_time_front/domain/repositories/preparation_repository.dart';
+
+@Injectable()
+class UpdateSpareTimeUseCase {
+  final PreparationRepository _preparationRepository;
+
+  UpdateSpareTimeUseCase(this._preparationRepository);
+
+  Future<void> call(Duration newSpareTime) async {
+    await _preparationRepository.updateSpareTime(newSpareTime);
+  }
+}