Merge pull request #1275 from bannzai/remove/property/appliedShareRew…

…ardPremiumTrialCount remove/property/appliedShareRewardPremiumTrialCount
bannzai · Dec 3, 2024 · 1ac4eae · 1ac4eae
2 parents a20f7e4 + 9babf4a
commit 1ac4eae
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 645 deletions.
diff --git a/lib/entity/user.codegen.dart b/lib/entity/user.codegen.dart
@@ -98,7 +98,6 @@ class User with _$User {
     )
     // 初期設定が完了していない or 古いバージョンのアプリではトライアル終了後にバックエンドの定期実行でdiscountEntitlementDeadlineDateの値が入るがそれより前のデータ(=トライアル中) の場合はdiscountEntitlementDeadlineDateがnullになる
     DateTime? discountEntitlementDeadlineDate,
-    @Default(0) appliedShareRewardPremiumTrialCount,
   }) = _User;
 
   factory User.fromJson(Map<String, dynamic> json) => _$UserFromJson(json);

diff --git a/lib/entity/user.codegen.freezed.dart b/lib/entity/user.codegen.freezed.dart
@@ -157,7 +157,6 @@ mixin _$User {
   DateTime? get trialDeadlineDate => throw _privateConstructorUsedError;
   @JsonKey(fromJson: TimestampConverter.timestampToDateTime, toJson: TimestampConverter.dateTimeToTimestamp)
   DateTime? get discountEntitlementDeadlineDate => throw _privateConstructorUsedError;
-  dynamic get appliedShareRewardPremiumTrialCount => throw _privateConstructorUsedError;
 
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
   @JsonKey(ignore: true)
@@ -182,8 +181,7 @@ abstract class $UserCopyWith<$Res> {
       @JsonKey(fromJson: TimestampConverter.timestampToDateTime, toJson: TimestampConverter.dateTimeToTimestamp) DateTime? beginTrialDate,
       @JsonKey(fromJson: TimestampConverter.timestampToDateTime, toJson: TimestampConverter.dateTimeToTimestamp) DateTime? trialDeadlineDate,
       @JsonKey(fromJson: TimestampConverter.timestampToDateTime, toJson: TimestampConverter.dateTimeToTimestamp)
-      DateTime? discountEntitlementDeadlineDate,
-      dynamic appliedShareRewardPremiumTrialCount});
+      DateTime? discountEntitlementDeadlineDate});
 
   $SettingCopyWith<$Res>? get setting;
 }
@@ -213,7 +211,6 @@ class _$UserCopyWithImpl<$Res, $Val extends User> implements $UserCopyWith<$Res>
     Object? beginTrialDate = freezed,
     Object? trialDeadlineDate = freezed,
     Object? discountEntitlementDeadlineDate = freezed,
-    Object? appliedShareRewardPremiumTrialCount = freezed,
   }) {
     return _then(_value.copyWith(
       id: freezed == id
@@ -268,10 +265,6 @@ class _$UserCopyWithImpl<$Res, $Val extends User> implements $UserCopyWith<$Res>
           ? _value.discountEntitlementDeadlineDate
           : discountEntitlementDeadlineDate // ignore: cast_nullable_to_non_nullable
               as DateTime?,
-      appliedShareRewardPremiumTrialCount: freezed == appliedShareRewardPremiumTrialCount
-          ? _value.appliedShareRewardPremiumTrialCount
-          : appliedShareRewardPremiumTrialCount // ignore: cast_nullable_to_non_nullable
-              as dynamic,
     ) as $Val);
   }
 
@@ -307,8 +300,7 @@ abstract class _$$UserImplCopyWith<$Res> implements $UserCopyWith<$Res> {
       @JsonKey(fromJson: TimestampConverter.timestampToDateTime, toJson: TimestampConverter.dateTimeToTimestamp) DateTime? beginTrialDate,
       @JsonKey(fromJson: TimestampConverter.timestampToDateTime, toJson: TimestampConverter.dateTimeToTimestamp) DateTime? trialDeadlineDate,
       @JsonKey(fromJson: TimestampConverter.timestampToDateTime, toJson: TimestampConverter.dateTimeToTimestamp)
-      DateTime? discountEntitlementDeadlineDate,
-      dynamic appliedShareRewardPremiumTrialCount});
+      DateTime? discountEntitlementDeadlineDate});
 
   @override
   $SettingCopyWith<$Res>? get setting;
@@ -334,7 +326,6 @@ class __$$UserImplCopyWithImpl<$Res> extends _$UserCopyWithImpl<$Res, _$UserImpl
     Object? beginTrialDate = freezed,
     Object? trialDeadlineDate = freezed,
     Object? discountEntitlementDeadlineDate = freezed,
-    Object? appliedShareRewardPremiumTrialCount = freezed,
   }) {
     return _then(_$UserImpl(
       id: freezed == id
@@ -389,8 +380,6 @@ class __$$UserImplCopyWithImpl<$Res> extends _$UserCopyWithImpl<$Res, _$UserImpl
           ? _value.discountEntitlementDeadlineDate
           : discountEntitlementDeadlineDate // ignore: cast_nullable_to_non_nullable
               as DateTime?,
-      appliedShareRewardPremiumTrialCount:
-          freezed == appliedShareRewardPremiumTrialCount ? _value.appliedShareRewardPremiumTrialCount! : appliedShareRewardPremiumTrialCount,
     ));
   }
 }
@@ -412,8 +401,8 @@ class _$UserImpl extends _User {
       this.analyticsDebugIsEnabled = false,
       @JsonKey(fromJson: TimestampConverter.timestampToDateTime, toJson: TimestampConverter.dateTimeToTimestamp) this.beginTrialDate,
       @JsonKey(fromJson: TimestampConverter.timestampToDateTime, toJson: TimestampConverter.dateTimeToTimestamp) this.trialDeadlineDate,
-      @JsonKey(fromJson: TimestampConverter.timestampToDateTime, toJson: TimestampConverter.dateTimeToTimestamp) this.discountEntitlementDeadlineDate,
-      this.appliedShareRewardPremiumTrialCount = 0})
+      @JsonKey(fromJson: TimestampConverter.timestampToDateTime, toJson: TimestampConverter.dateTimeToTimestamp)
+      this.discountEntitlementDeadlineDate})
       : _userDocumentIDSets = userDocumentIDSets,
         _anonymousUserIDSets = anonymousUserIDSets,
         _firebaseCurrentUserIDSets = firebaseCurrentUserIDSets,
@@ -475,13 +464,10 @@ class _$UserImpl extends _User {
   @override
   @JsonKey(fromJson: TimestampConverter.timestampToDateTime, toJson: TimestampConverter.dateTimeToTimestamp)
   final DateTime? discountEntitlementDeadlineDate;
-  @override
-  @JsonKey()
-  final dynamic appliedShareRewardPremiumTrialCount;
 
   @override
   String toString() {
-    return 'User(id: $id, setting: $setting, userIDWhenCreateUser: $userIDWhenCreateUser, anonymousUserID: $anonymousUserID, userDocumentIDSets: $userDocumentIDSets, anonymousUserIDSets: $anonymousUserIDSets, firebaseCurrentUserIDSets: $firebaseCurrentUserIDSets, isPremium: $isPremium, shouldAskCancelReason: $shouldAskCancelReason, analyticsDebugIsEnabled: $analyticsDebugIsEnabled, beginTrialDate: $beginTrialDate, trialDeadlineDate: $trialDeadlineDate, discountEntitlementDeadlineDate: $discountEntitlementDeadlineDate, appliedShareRewardPremiumTrialCount: $appliedShareRewardPremiumTrialCount)';
+    return 'User(id: $id, setting: $setting, userIDWhenCreateUser: $userIDWhenCreateUser, anonymousUserID: $anonymousUserID, userDocumentIDSets: $userDocumentIDSets, anonymousUserIDSets: $anonymousUserIDSets, firebaseCurrentUserIDSets: $firebaseCurrentUserIDSets, isPremium: $isPremium, shouldAskCancelReason: $shouldAskCancelReason, analyticsDebugIsEnabled: $analyticsDebugIsEnabled, beginTrialDate: $beginTrialDate, trialDeadlineDate: $trialDeadlineDate, discountEntitlementDeadlineDate: $discountEntitlementDeadlineDate)';
   }
 
   @override
@@ -502,8 +488,7 @@ class _$UserImpl extends _User {
             (identical(other.beginTrialDate, beginTrialDate) || other.beginTrialDate == beginTrialDate) &&
             (identical(other.trialDeadlineDate, trialDeadlineDate) || other.trialDeadlineDate == trialDeadlineDate) &&
             (identical(other.discountEntitlementDeadlineDate, discountEntitlementDeadlineDate) ||
-                other.discountEntitlementDeadlineDate == discountEntitlementDeadlineDate) &&
-            const DeepCollectionEquality().equals(other.appliedShareRewardPremiumTrialCount, appliedShareRewardPremiumTrialCount));
+                other.discountEntitlementDeadlineDate == discountEntitlementDeadlineDate));
   }
 
   @JsonKey(ignore: true)
@@ -522,8 +507,7 @@ class _$UserImpl extends _User {
       analyticsDebugIsEnabled,
       beginTrialDate,
       trialDeadlineDate,
-      discountEntitlementDeadlineDate,
-      const DeepCollectionEquality().hash(appliedShareRewardPremiumTrialCount));
+      discountEntitlementDeadlineDate);
 
   @JsonKey(ignore: true)
   @override
@@ -553,8 +537,7 @@ abstract class _User extends User {
       @JsonKey(fromJson: TimestampConverter.timestampToDateTime, toJson: TimestampConverter.dateTimeToTimestamp) final DateTime? beginTrialDate,
       @JsonKey(fromJson: TimestampConverter.timestampToDateTime, toJson: TimestampConverter.dateTimeToTimestamp) final DateTime? trialDeadlineDate,
       @JsonKey(fromJson: TimestampConverter.timestampToDateTime, toJson: TimestampConverter.dateTimeToTimestamp)
-      final DateTime? discountEntitlementDeadlineDate,
-      final dynamic appliedShareRewardPremiumTrialCount}) = _$UserImpl;
+      final DateTime? discountEntitlementDeadlineDate}) = _$UserImpl;
   const _User._() : super._();
 
   factory _User.fromJson(Map<String, dynamic> json) = _$UserImpl.fromJson;
@@ -590,8 +573,6 @@ abstract class _User extends User {
   @JsonKey(fromJson: TimestampConverter.timestampToDateTime, toJson: TimestampConverter.dateTimeToTimestamp)
   DateTime? get discountEntitlementDeadlineDate;
   @override
-  dynamic get appliedShareRewardPremiumTrialCount;
-  @override
   @JsonKey(ignore: true)
   _$$UserImplCopyWith<_$UserImpl> get copyWith => throw _privateConstructorUsedError;
 }
diff --git a/lib/entity/user.codegen.g.dart b/lib/entity/user.codegen.g.dart
diff --git a/lib/features/record/components/announcement_bar/announcement_bar.dart b/lib/features/record/components/announcement_bar/announcement_bar.dart
@@ -2,7 +2,6 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:pilll/features/record/components/announcement_bar/components/admob.dart';
-import 'package:pilll/features/record/components/announcement_bar/components/share_reward_premium_trial.dart';
 import 'package:pilll/utils/analytics.dart';
 import 'package:pilll/provider/pill_sheet_group.dart';
 import 'package:pilll/provider/pilll_ads.dart';
@@ -17,8 +16,6 @@ import 'package:pilll/features/record/components/announcement_bar/components/res
 import 'package:pilll/provider/locale.dart';
 import 'package:pilll/provider/user.dart';
 import 'package:pilll/provider/auth.dart';
-import 'package:pilll/utils/datetime/date_add.dart';
-import 'package:pilll/utils/datetime/date_range.dart';
 import 'package:pilll/utils/datetime/day.dart';
 import 'package:pilll/utils/remote_config.dart';
 
@@ -102,21 +99,6 @@ class AnnouncementBar extends HookConsumerWidget {
           return PilllAdsAnnouncementBar(pilllAds: pilllAds, onClose: () => showPremiumIntroductionSheet(context));
         }
 
-        if (defaultTargetPlatform == TargetPlatform.iOS) {
-          final trialDeadlineDate = user.trialDeadlineDate;
-          if (trialDeadlineDate != null) {
-            if (user.appliedShareRewardPremiumTrialCount == 0) {
-              if (today().isAfter(trialDeadlineDate.addDays(90))) {
-                return ShareRewardPremiumTrialAnnoumcenetBar(user: user);
-              }
-            } else {
-              final range = DateRange(trialDeadlineDate.addDays(90), trialDeadlineDate.addDays(93));
-              if (range.inRange(today())) {
-                return ShareRewardPremiumTrialAnnoumcenetBar(user: user);
-              }
-            }
-          }
-        }
         return const AdMob();
       }
     } else {

diff --git a/lib/features/record/components/announcement_bar/components/share_reward_premium_trial.dart b/lib/features/record/components/announcement_bar/components/share_reward_premium_trial.dart
diff --git a/lib/provider/user.dart b/lib/provider/user.dart
@@ -263,21 +263,3 @@ class DisableShouldAskCancelReason {
     }, SetOptions(merge: true));
   }
 }
-
-class ApplyShareRewardPremiumTrial {
-  final DatabaseConnection databaseConnection;
-  ApplyShareRewardPremiumTrial(this.databaseConnection);
-
-  Future<void> call(User user) async {
-    await databaseConnection.userReference().set(
-          user.copyWith(
-            beginTrialDate: now(),
-            trialDeadlineDate: now().addDays(14).endOfDay(),
-            appliedShareRewardPremiumTrialCount: user.appliedShareRewardPremiumTrialCount + 1,
-          ),
-          SetOptions(merge: true),
-        );
-  }
-}
-
-final applyShareRewardPremiumTrialProvider = Provider((ref) => ApplyShareRewardPremiumTrial(ref.watch(databaseProvider)));