Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

[server] Skip family users in the family nudge email (#13745)

Yugendhrab1449a421845
diff --git a/server/pkg/repo/user.go b/server/pkg/repo/user.go
index 3037134fa4..bced64823b 100644
--- a/server/pkg/repo/user.go
+++ b/server/pkg/repo/user.go
@@ -474,7 +474,7 @@ func (repo *UserRepository) GetUsersWithIndividualPlanWhoHaveExceededStorageQuot
func (repo *UserRepository) GetUsersWhoUpgradedNDaysAgo(days int) ([]ente.User, error) {
rows, err := repo.DB.Query(`
- SELECT u.user_id, u.encrypted_email, u.email_decryption_nonce, u.email_hash, u.creation_time
+ SELECT u.user_id, u.encrypted_email, u.email_decryption_nonce, u.email_hash, u.creation_time, u.family_admin_id
FROM users u
INNER JOIN subscriptions s ON u.user_id = s.user_id
WHERE s.upgraded_at >= $1 AND s.upgraded_at < $2 AND u.encrypted_email IS NOT NULL`,
@@ -487,7 +487,7 @@ func (repo *UserRepository) GetUsersWhoUpgradedNDaysAgo(days int) ([]ente.User,
for rows.Next() {
var user ente.User
var encryptedEmail, nonce []byte
- err := rows.Scan(&user.ID, &encryptedEmail, &nonce, &user.Hash, &user.CreationTime)
+ err := rows.Scan(&user.ID, &encryptedEmail, &nonce, &user.Hash, &user.CreationTime, &user.FamilyAdminID)
if err != nil {
return nil, stacktrace.Propagate(err, "")
}
diff --git a/server/pkg/repo/user_test.go b/server/pkg/repo/user_test.go
new file mode 100644
index 0000000000..1b63439c94
--- /dev/null
+++ b/server/pkg/repo/user_test.go
@@ -0,0 +1,36 @@
+package repo
+
+import (
+ "testing"
+
+ "github.com/ente/museum/internal/testutil"
+ "github.com/stretchr/testify/require"
+)
+
+func TestGetUsersWhoUpgradedNDaysAgoIncludesFamilyAdminID(t *testing.T) {
+ db := testutil.RequireTestDB(t)
+ testutil.ResetTables(t, db)
+ t.Cleanup(func() { testutil.ResetTables(t, db) })
+
+ soloUserID := testutil.InsertUser(t, db, testutil.UserFixture{UserID: 1, Email: "[email protected]", CreationTime: 1})
+ familyAdminID := int64(2)
+ testutil.InsertUser(t, db, testutil.UserFixture{UserID: familyAdminID, Email: "[email protected]", CreationTime: 1, FamilyAdminID: &familyAdminID})
+ for _, userID := range []int64{soloUserID, familyAdminID} {
+ testutil.InsertSubscription(t, db, testutil.SubscriptionFixture{UserID: userID, Storage: 1})
+ }
+ _, err := db.Exec(`UPDATE subscriptions SET upgraded_at = now_utc_micro_seconds() - 721::BIGINT * 60 * 60 * 1000 * 1000`)
+ require.NoError(t, err)
+
+ userRepo := &UserRepository{DB: db, SecretEncryptionKey: testutil.SecretEncryptionKey()}
+ users, err := userRepo.GetUsersWhoUpgradedNDaysAgo(30)
+ require.NoError(t, err)
+
+ familyAdminIDs := make(map[int64]*int64)
+ for _, user := range users {
+ familyAdminIDs[user.ID] = user.FamilyAdminID
+ }
+ require.Len(t, familyAdminIDs, 2)
+ require.Nil(t, familyAdminIDs[soloUserID])
+ require.NotNil(t, familyAdminIDs[familyAdminID])
+ require.Equal(t, familyAdminID, *familyAdminIDs[familyAdminID])
+}