π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Handle repeat referral claims as conflicts
Neeraj Gupta41b811d0e680
diff --git a/server/internal/testutil/testutil.go b/server/internal/testutil/testutil.goindex ed4a9131a9..8e48fb38e0 100644--- a/server/internal/testutil/testutil.go+++ b/server/internal/testutil/testutil.go@@ -121,6 +121,7 @@ func ResetTables(t *testing.T, db *sql.DB) {events,task_lock,storage_bonus,+ referral_tracking,referral_codes,subscriptions,usage,diff --git a/server/pkg/repo/storagebonus/referral_tracking.go b/server/pkg/repo/storagebonus/referral_tracking.goindex cc06b958ee..c37653395e 100644--- a/server/pkg/repo/storagebonus/referral_tracking.go+++ b/server/pkg/repo/storagebonus/referral_tracking.go@@ -3,11 +3,13 @@ package storagebonusimport ("context""database/sql"+ "errors""fmt""github.com/ente/museum/ente""github.com/ente/museum/ente/storagebonus""github.com/ente/stacktrace"+ "github.com/lib/pq""github.com/sirupsen/logrus")@@ -27,6 +29,10 @@ func (r *Repository) TrackReferralAndInviteeBonus(ctx context.Context, invitee,}(tx)_, err = tx.ExecContext(ctx, "INSERT INTO referral_tracking (invitee_id, invitor_id, plan_type) VALUES ($1, $2, $3)", invitee, codeOwnerId, planType)if err != nil {+ var pqErr *pq.Error+ if errors.As(err, &pqErr) && pqErr.Code == "23505" && pqErr.Constraint == "referral_tracking_invitee_id_idx" {+ return stacktrace.Propagate(storagebonus.CodeAlreadyAppliedErr, "invitee %d has already applied a referral code", invitee)+ }return stacktrace.Propagate(err, "failed to insert storagebonus tracking entry for invitee %d, invitor %d and planType %s", invitee, codeOwnerId, planType)}bonusType := storagebonus.SignUpdiff --git a/server/pkg/repo/storagebonus/referral_tracking_test.go b/server/pkg/repo/storagebonus/referral_tracking_test.gonew file mode 100644index 0000000000..e05e64c8b2--- /dev/null+++ b/server/pkg/repo/storagebonus/referral_tracking_test.go@@ -0,0 +1,35 @@+package storagebonus++import (+ "net/http"+ "testing"++ "github.com/ente/museum/ente"+ entity "github.com/ente/museum/ente/storagebonus"+ "github.com/stretchr/testify/require"+)++func TestTrackReferralAndInviteeBonusAlreadyApplied(t *testing.T) {+ ctx := t.Context()+ repo := newStorageBonusTestRepository(t)+ invitee := int64(101)+ firstCodeOwner := int64(102)+ secondCodeOwner := int64(103)++ require.NoError(t, repo.TrackReferralAndInviteeBonus(ctx, invitee, firstCodeOwner, entity.TenGbOnUpgrade))++ err := repo.TrackReferralAndInviteeBonus(ctx, invitee, secondCodeOwner, entity.TenGbOnUpgrade)+ require.ErrorIs(t, err, entity.CodeAlreadyAppliedErr)+ var apiErr *ente.ApiError+ require.ErrorAs(t, err, &apiErr)+ require.Equal(t, http.StatusConflict, apiErr.HttpStatusCode)+ require.Equal(t, entity.CodeAlreadyAppliedErr.Code, apiErr.Code)++ var trackingCount int+ require.NoError(t, repo.DB.QueryRowContext(ctx, "SELECT COUNT(*) FROM referral_tracking WHERE invitee_id = $1", invitee).Scan(&trackingCount))+ require.Equal(t, 1, trackingCount)++ var bonusCount int+ require.NoError(t, repo.DB.QueryRowContext(ctx, "SELECT COUNT(*) FROM storage_bonus WHERE user_id = $1 AND type = $2", invitee, entity.SignUp).Scan(&bonusCount))+ require.Equal(t, 1, bonusCount)+}