TerribleDev/ente
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[server] Refactor

Browse Source
This commit is contained in:
Neeraj Gupta
2024-08-27 11:20:27 +05:30
parent 9334540e1e
commit e0eda79a91
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/pkg/api/admin.go
View File

@@ -10,6 +10,7 @@ import (
"github.com/ente-io/museum/pkg/controller/family"
bonusEntity "github.com/ente-io/museum/ente/storagebonus"
"github.com/ente-io/museum/pkg/repo/storagebonus"
gTime "time"
@@ -473,11 +474,11 @@ func (h *AdminHandler) UpdateBFDeal(c *gin.Context) {
var err error
switch r.Action {
case ente.ADD:
err = h.StorageBonusRepo.InsertAddOnBonus(c, r.UserID, validTill, storage)
err = h.StorageBonusRepo.InsertAddOnBonus(c, bonusEntity.AddOnBf2023, r.UserID, validTill, storage)
case ente.UPDATE:
err = h.StorageBonusRepo.UpdateAddOnBonus(c, r.UserID, validTill, storage)
err = h.StorageBonusRepo.UpdateAddOnBonus(c, bonusEntity.AddOnBf2023, r.UserID, validTill, storage)
case ente.REMOVE:
_, err = h.StorageBonusRepo.RemoveAddOnBonus(c, r.UserID)
_, err = h.StorageBonusRepo.RemoveAddOnBonus(c, bonusEntity.AddOnBf2023, r.UserID)
}
if err != nil {
handler.Error(c, stacktrace.Propagate(err, ""))

3
server/pkg/controller/offer/offer.go
View File

@@ -10,6 +10,7 @@ import (
"github.com/ente-io/museum/pkg/controller/usercache"
"github.com/ente-io/museum/ente"
storeageBonusEntity "github.com/ente-io/museum/ente/storagebonus"
"github.com/ente-io/museum/pkg/controller/discord"
"github.com/ente-io/museum/pkg/repo"
"github.com/ente-io/museum/pkg/repo/storagebonus"
@@ -105,7 +106,7 @@ func (c *OfferController) ApplyOffer(email string, productID string) error {
}
}
err = c.StorageBonusRepo.InsertAddOnBonus(context.Background(), userID, validTill, offerToBeApplied.Storage)
err = c.StorageBonusRepo.InsertAddOnBonus(context.Background(), storeageBonusEntity.AddOnBf2023, userID, validTill, offerToBeApplied.Storage)
if err != nil {
c.DiscordController.Notify("Error inserting bonus")
return stacktrace.Propagate(err, "")

12
server/pkg/repo/storagebonus/bf_addon.go
View File

@@ -6,8 +6,8 @@ import (
"github.com/ente-io/museum/ente/storagebonus"
)
func (r *Repository) InsertAddOnBonus(ctx context.Context, userID int64, validTill int64, storage int64) error {
bonusID := fmt.Sprintf("%s-%d", storagebonus.AddOnBf2023, userID)
func (r *Repository) InsertAddOnBonus(ctx context.Context, bonusType storagebonus.BonusType, userID int64, validTill int64, storage int64) error {
bonusID := fmt.Sprintf("%s-%d", bonusType, userID)
_, err := r.DB.ExecContext(ctx, "INSERT INTO storage_bonus (bonus_id, user_id, storage, type, valid_till) VALUES ($1, $2, $3, $4, $5)", bonusID, userID, storage, storagebonus.AddOnBf2023, validTill)
if err != nil {
return err
@@ -15,8 +15,8 @@ func (r *Repository) InsertAddOnBonus(ctx context.Context, userID int64, validTi
return nil
}
func (r *Repository) RemoveAddOnBonus(ctx context.Context, userID int64) (int64, error) {
bonusID := fmt.Sprintf("%s-%d", storagebonus.AddOnBf2023, userID)
func (r *Repository) RemoveAddOnBonus(ctx context.Context, bonusType storagebonus.BonusType, userID int64) (int64, error) {
bonusID := fmt.Sprintf("%s-%d", bonusType, userID)
res, err := r.DB.ExecContext(ctx, "DELETE FROM storage_bonus WHERE bonus_id = $1", bonusID)
if err != nil {
return 0, err
@@ -24,8 +24,8 @@ func (r *Repository) RemoveAddOnBonus(ctx context.Context, userID int64) (int64,
return res.RowsAffected()
}
func (r *Repository) UpdateAddOnBonus(ctx context.Context, userID int64, validTill int64, storage int64) error {
bonusID := fmt.Sprintf("%s-%d", storagebonus.AddOnBf2023, userID)
func (r *Repository) UpdateAddOnBonus(ctx context.Context, bonusType storagebonus.BonusType, userID int64, validTill int64, storage int64) error {
bonusID := fmt.Sprintf("%s-%d", bonusType, userID)
_, err := r.DB.ExecContext(ctx, "UPDATE storage_bonus SET storage = $1, valid_till = $2 WHERE bonus_id = $3", storage, validTill, bonusID)
if err != nil {
return err