remove Dependency injection and functionality for DeleteLastNotificationTime

Author: mngshm

server/pkg/controller/appstore.go

@@ -29,7 +29,6 @@ type AppStoreController struct {
 	UserRepo               *repo.UserRepository
 	BillingPlansPerCountry ente.BillingPlansPerCountry
 	CommonBillCtrl         *commonbilling.Controller
-	NotificationCtrl       *repo.NotificationHistoryRepository
 	// appStoreSharedPassword is the password to be used to access AppStore APIs
 	appStoreSharedPassword string
 }
@@ -41,7 +40,6 @@ func NewAppStoreController(
 	fileRepo *repo.FileRepository,
 	userRepo *repo.UserRepository,
 	commonBillCtrl *commonbilling.Controller,
-	notificationCtrl *repo.NotificationHistoryRepository,
 ) *AppStoreController {
 	appleSharedSecret := viper.GetString("apple.shared-secret")
 	return &AppStoreController{
@@ -52,7 +50,6 @@ func NewAppStoreController(
 		BillingPlansPerCountry: plans,
 		appStoreSharedPassword: appleSharedSecret,
 		CommonBillCtrl:         commonBillCtrl,
-		NotificationCtrl:       notificationCtrl,
 	}
 }
 
@@ -121,10 +118,6 @@ func (c *AppStoreController) HandleNotification(ctx *gin.Context, notification a
 			if err != nil {
 				return stacktrace.Propagate(err, "")
 			}
-			err = c.NotificationCtrl.DeleteLastNotificationTime(subscription.UserID, "90_percent_consumed")
-			if err != nil {
-				return stacktrace.Propagate(err, "")
-			}
 
 		} else {
 			if notification.NotificationType == appstore.NotificationTypeDidChangeRenewalStatus {

server/pkg/controller/billing.go

@@ -39,7 +39,6 @@ type BillingController struct {
 	DiscordController      *discord.DiscordController
 	EmailNotificationCtrl  *email.EmailNotificationController
 	CommonBillCtrl         *commonbilling.Controller
-	NotificationHistory    *repo.NotificationHistoryRepository
 }
 
 // Return a new instance of BillingController
@@ -55,7 +54,7 @@ func NewBillingController(
 	usageRepo *repo.UsageRepository,
 	storageBonusRepo *storagebonus.Repository,
 	commonBillCtrl *commonbilling.Controller,
-	notificationHistory *repo.NotificationHistoryRepository,
+	notificationHistoryRepo *repo.NotificationHistoryRepository,
 ) *BillingController {
 	return &BillingController{
 		BillingPlansPerAccount: plans,
@@ -69,7 +68,6 @@ func NewBillingController(
 		EmailNotificationCtrl:  emailNotificationCtrl,
 		StorageBonusRepo:       storageBonusRepo,
 		CommonBillCtrl:         commonBillCtrl,
-		NotificationHistory:    notificationHistory,
 	}
 }
 
@@ -296,10 +294,7 @@ func (c *BillingController) VerifySubscription(
 	if err != nil {
 		return ente.Subscription{}, stacktrace.Propagate(err, "")
 	}
-	err = c.NotificationHistory.DeleteLastNotificationTime(currentSubscription.UserID, "90_percent_consumed")
-	if err != nil {
-		return ente.Subscription{}, stacktrace.Propagate(err, "")
-	}
+
 	log.Info("Replaced subscription")
 	newSubscription.ID = currentSubscription.ID
 	if paymentProvider == ente.PlayStore &&
@@ -374,13 +369,6 @@ func (c *BillingController) UpdateSubscription(r ente.UpdateSubscriptionRequest)
 	if err != nil {
 		return stacktrace.Propagate(err, "")
 	}
-
-	// Delete users entry from notification_history table on subscription update
-	err = c.NotificationHistory.DeleteLastNotificationTime(r.UserID, "90_percent_consumed")
-	if err != nil {
-		return stacktrace.Propagate(err, "")
-	}
-
 	err = c.BillingRepo.LogAdminTriggeredSubscriptionUpdate(r)
 	return stacktrace.Propagate(err, "")
 }

server/pkg/controller/playstore.go

@@ -29,7 +29,6 @@ type PlayStoreController struct {
 	StorageBonusRepo       *storagebonus.Repository
 	BillingPlansPerCountry ente.BillingPlansPerCountry
 	CommonBillCtrl         *commonbilling.Controller
-	NotificationCtrl       *repo.NotificationHistoryRepository
 }
 
 // PlayStorePackageName is the package name of the PlayStore item
@@ -43,7 +42,6 @@ func NewPlayStoreController(
 	userRepo *repo.UserRepository,
 	storageBonusRepo *storagebonus.Repository,
 	commonBillCtrl *commonbilling.Controller,
-	notificationCtrl *repo.NotificationHistoryRepository,
 ) *PlayStoreController {
 	playStoreClient, err := newPlayStoreClient()
 	if err != nil {
@@ -61,7 +59,6 @@ func NewPlayStoreController(
 		BillingPlansPerCountry: plans,
 		StorageBonusRepo:       storageBonusRepo,
 		CommonBillCtrl:         commonBillCtrl,
-		NotificationCtrl:       notificationCtrl,
 	}
 }
 
@@ -187,10 +184,6 @@ func (c *PlayStoreController) HandleNotification(notification playstore.Develope
 		if err != nil {
 			return stacktrace.Propagate(err, "")
 		}
-		err = c.NotificationCtrl.DeleteLastNotificationTime(subscription.UserID, "90_percent_consumed")
-		if err != nil {
-			return stacktrace.Propagate(err, "")
-		}
 		err = c.AcknowledgeSubscription(productID, transactionID)
 		if err != nil {
 			return stacktrace.Propagate(err, "")

server/pkg/controller/stripe.go

@@ -41,7 +41,6 @@ type StripeController struct {
 	EmailNotificationCtrl  *emailCtrl.EmailNotificationController
 	OfferController        *offer.OfferController
 	CommonBillCtrl         *commonbilling.Controller
-	NotificationCtrl       *repo.NotificationHistoryRepository
 }
 
 const BufferPeriodOnPaymentFailureInDays = 7
@@ -58,7 +57,6 @@ func NewStripeController(
 	emailNotificationController *emailCtrl.EmailNotificationController,
 	offerController *offer.OfferController,
 	commonBillCtrl *commonbilling.Controller,
-	notificationCtrl *repo.NotificationHistoryRepository,
 ) *StripeController {
 	return &StripeController{
 		StripeClients:          stripeClients,
@@ -71,7 +69,6 @@ func NewStripeController(
 		EmailNotificationCtrl:  emailNotificationController,
 		OfferController:        offerController,
 		CommonBillCtrl:         commonBillCtrl,
-		NotificationCtrl:       notificationCtrl,
 	}
 }
 
@@ -265,12 +262,8 @@ func (c *StripeController) handleCheckoutSessionCompleted(event stripe.Event, co
 		if err != nil {
 			return ente.StripeEventLog{UserID: userID, StripeSubscription: stripeSubscription, Event: event}, stacktrace.Propagate(err, "Failed to change subscription")
 		}
-		
+
 		// Execute DeleteLastNotificationTime entry after successful execution of ReplaceSubscription
-		err = c.NotificationCtrl.DeleteLastNotificationTime(newSubscription.UserID, "90_percent_consumed")
-		if err != nil {
-			return ente.StripeEventLog{}, stacktrace.Propagate(err, "")
-		} 
 		return ente.StripeEventLog{UserID: userID, StripeSubscription: stripeSubscription, Event: event}, nil
 	} else {
 		priceID, err := c.getPriceIDFromSession(session.ID)
@@ -313,10 +306,7 @@ func (c *StripeController) handleCustomerSubscriptionUpdated(event stripe.Event,
 	// events to update the state
 	if currentSubscription.ProductID != newSubscription.ProductID {
 		c.BillingRepo.ReplaceSubscription(currentSubscription.ID, newSubscription)
-		err := c.NotificationCtrl.DeleteLastNotificationTime(currentSubscription.UserID, "90_percent_consumed")
-		if err != nil {
-			return ente.StripeEventLog{}, stacktrace.Propagate(err, "")
-		}
+
 	}
 
 	fullStripeSub, err := c.getStripeSubscriptionWithPaymentMethod(currentSubscription)