From 9c2db207298cc643093a5b6e3f2b051f1e001f90 Mon Sep 17 00:00:00 2001 From: bannzai Date: Fri, 4 Aug 2023 21:23:38 +0900 Subject: [PATCH] =?UTF-8?q?Revert=20"=E5=B1=A5=E6=AD=B4=E3=81=AE=E9=96=B2?= =?UTF-8?q?=E8=A6=A7=E3=82=92180=E6=97=A5=E9=96=93=E3=81=AB=E5=88=B6?= =?UTF-8?q?=E9=99=90=E3=81=99=E3=82=8B"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pill_sheet_modified_history.codegen.dart | 9 ++++----- lib/provider/pill_sheet_modified_history.dart | 16 ---------------- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/lib/entity/pill_sheet_modified_history.codegen.dart b/lib/entity/pill_sheet_modified_history.codegen.dart index bcbf9629ba..651571ac14 100644 --- a/lib/entity/pill_sheet_modified_history.codegen.dart +++ b/lib/entity/pill_sheet_modified_history.codegen.dart @@ -50,7 +50,8 @@ extension PillSheetModifiedActionTypeFunctions on PillSheetModifiedActionType { class PillSheetModifiedHistory with _$PillSheetModifiedHistory { @JsonSerializable(explicitToJson: true) const factory PillSheetModifiedHistory({ - @JsonKey(includeIfNull: false, toJson: toNull) required String? id, + @JsonKey(includeIfNull: false, toJson: toNull) + required String? id, required String actionType, required PillSheetModifiedHistoryValue value, // This is deprecated property. @@ -68,12 +69,12 @@ class PillSheetModifiedHistory with _$PillSheetModifiedHistory { fromJson: NonNullTimestampConverter.timestampToDateTime, toJson: NonNullTimestampConverter.dateTimeToTimestamp, ) - required DateTime estimatedEventCausingDate, + required DateTime estimatedEventCausingDate, @JsonKey( fromJson: NonNullTimestampConverter.timestampToDateTime, toJson: NonNullTimestampConverter.dateTimeToTimestamp, ) - required DateTime createdAt, + required DateTime createdAt, }) = _PillSheetModifiedHistory; const PillSheetModifiedHistory._(); @@ -84,8 +85,6 @@ class PillSheetModifiedHistory with _$PillSheetModifiedHistory { // Factories abstract class PillSheetModifiedHistoryServiceActionFactory { - static const limitDays = 180; - static PillSheetModifiedHistory _create({ required PillSheet? before, required PillSheet? after, diff --git a/lib/provider/pill_sheet_modified_history.dart b/lib/provider/pill_sheet_modified_history.dart index a70d115360..fbc2d294c8 100644 --- a/lib/provider/pill_sheet_modified_history.dart +++ b/lib/provider/pill_sheet_modified_history.dart @@ -2,18 +2,12 @@ import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:pilll/provider/database.dart'; import 'package:pilll/entity/pill_sheet_modified_history.codegen.dart'; -import 'package:pilll/utils/datetime/day.dart'; final pillSheetModifiedHistoriesProvider = StreamProvider.family.autoDispose((ref, DateTime? afterCursor) { if (afterCursor != null) { return ref .watch(databaseProvider) .pillSheetModifiedHistoriesReference() - .where( - PillSheetModifiedHistoryFirestoreKeys.estimatedEventCausingDate, - isLessThanOrEqualTo: today().add(const Duration(days: 1)), - isGreaterThanOrEqualTo: today().subtract(const Duration(days: PillSheetModifiedHistoryServiceActionFactory.limitDays)), - ) .orderBy(PillSheetModifiedHistoryFirestoreKeys.estimatedEventCausingDate, descending: true) .startAfter([afterCursor]) .limit(20) @@ -24,11 +18,6 @@ final pillSheetModifiedHistoriesProvider = StreamProvider.family.autoDispose((re return ref .watch(databaseProvider) .pillSheetModifiedHistoriesReference() - .where( - PillSheetModifiedHistoryFirestoreKeys.estimatedEventCausingDate, - isLessThanOrEqualTo: today().add(const Duration(days: 1)), - isGreaterThanOrEqualTo: today().subtract(const Duration(days: PillSheetModifiedHistoryServiceActionFactory.limitDays)), - ) .orderBy(PillSheetModifiedHistoryFirestoreKeys.estimatedEventCausingDate, descending: true) .limit(20) .snapshots() @@ -40,11 +29,6 @@ final pillSheetModifiedHistoriesWithLimitProvider = StreamProvider.family((ref, return ref .watch(databaseProvider) .pillSheetModifiedHistoriesReference() - .where( - PillSheetModifiedHistoryFirestoreKeys.estimatedEventCausingDate, - isLessThanOrEqualTo: today().add(const Duration(days: 1)), - isGreaterThanOrEqualTo: today().subtract(const Duration(days: PillSheetModifiedHistoryServiceActionFactory.limitDays)), - ) .orderBy(PillSheetModifiedHistoryFirestoreKeys.estimatedEventCausingDate, descending: true) .limit(limit) .snapshots()