Skip to content

Commit e5b19f7

Browse files
authored
Merge pull request #894 from bannzai/revert-892-fix/limit/history
Revert "履歴の閲覧を180日間に制限する"
2 parents d780b1d + 9c2db20 commit e5b19f7

File tree

2 files changed

+4
-21
lines changed

2 files changed

+4
-21
lines changed

lib/entity/pill_sheet_modified_history.codegen.dart

+4-5
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ extension PillSheetModifiedActionTypeFunctions on PillSheetModifiedActionType {
5050
class PillSheetModifiedHistory with _$PillSheetModifiedHistory {
5151
@JsonSerializable(explicitToJson: true)
5252
const factory PillSheetModifiedHistory({
53-
@JsonKey(includeIfNull: false, toJson: toNull) required String? id,
53+
@JsonKey(includeIfNull: false, toJson: toNull)
54+
required String? id,
5455
required String actionType,
5556
required PillSheetModifiedHistoryValue value,
5657
// This is deprecated property.
@@ -68,12 +69,12 @@ class PillSheetModifiedHistory with _$PillSheetModifiedHistory {
6869
fromJson: NonNullTimestampConverter.timestampToDateTime,
6970
toJson: NonNullTimestampConverter.dateTimeToTimestamp,
7071
)
71-
required DateTime estimatedEventCausingDate,
72+
required DateTime estimatedEventCausingDate,
7273
@JsonKey(
7374
fromJson: NonNullTimestampConverter.timestampToDateTime,
7475
toJson: NonNullTimestampConverter.dateTimeToTimestamp,
7576
)
76-
required DateTime createdAt,
77+
required DateTime createdAt,
7778
}) = _PillSheetModifiedHistory;
7879
const PillSheetModifiedHistory._();
7980

@@ -84,8 +85,6 @@ class PillSheetModifiedHistory with _$PillSheetModifiedHistory {
8485

8586
// Factories
8687
abstract class PillSheetModifiedHistoryServiceActionFactory {
87-
static const limitDays = 180;
88-
8988
static PillSheetModifiedHistory _create({
9089
required PillSheet? before,
9190
required PillSheet? after,

lib/provider/pill_sheet_modified_history.dart

-16
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,12 @@ import 'package:cloud_firestore/cloud_firestore.dart';
22
import 'package:hooks_riverpod/hooks_riverpod.dart';
33
import 'package:pilll/provider/database.dart';
44
import 'package:pilll/entity/pill_sheet_modified_history.codegen.dart';
5-
import 'package:pilll/utils/datetime/day.dart';
65

76
final pillSheetModifiedHistoriesProvider = StreamProvider.family.autoDispose((ref, DateTime? afterCursor) {
87
if (afterCursor != null) {
98
return ref
109
.watch(databaseProvider)
1110
.pillSheetModifiedHistoriesReference()
12-
.where(
13-
PillSheetModifiedHistoryFirestoreKeys.estimatedEventCausingDate,
14-
isLessThanOrEqualTo: today().add(const Duration(days: 1)),
15-
isGreaterThanOrEqualTo: today().subtract(const Duration(days: PillSheetModifiedHistoryServiceActionFactory.limitDays)),
16-
)
1711
.orderBy(PillSheetModifiedHistoryFirestoreKeys.estimatedEventCausingDate, descending: true)
1812
.startAfter([afterCursor])
1913
.limit(20)
@@ -24,11 +18,6 @@ final pillSheetModifiedHistoriesProvider = StreamProvider.family.autoDispose((re
2418
return ref
2519
.watch(databaseProvider)
2620
.pillSheetModifiedHistoriesReference()
27-
.where(
28-
PillSheetModifiedHistoryFirestoreKeys.estimatedEventCausingDate,
29-
isLessThanOrEqualTo: today().add(const Duration(days: 1)),
30-
isGreaterThanOrEqualTo: today().subtract(const Duration(days: PillSheetModifiedHistoryServiceActionFactory.limitDays)),
31-
)
3221
.orderBy(PillSheetModifiedHistoryFirestoreKeys.estimatedEventCausingDate, descending: true)
3322
.limit(20)
3423
.snapshots()
@@ -40,11 +29,6 @@ final pillSheetModifiedHistoriesWithLimitProvider = StreamProvider.family((ref,
4029
return ref
4130
.watch(databaseProvider)
4231
.pillSheetModifiedHistoriesReference()
43-
.where(
44-
PillSheetModifiedHistoryFirestoreKeys.estimatedEventCausingDate,
45-
isLessThanOrEqualTo: today().add(const Duration(days: 1)),
46-
isGreaterThanOrEqualTo: today().subtract(const Duration(days: PillSheetModifiedHistoryServiceActionFactory.limitDays)),
47-
)
4832
.orderBy(PillSheetModifiedHistoryFirestoreKeys.estimatedEventCausingDate, descending: true)
4933
.limit(limit)
5034
.snapshots()

0 commit comments

Comments
 (0)