Manual review

2026-02-22 15:12:54 -05:00
parent f726cc768e
commit 35a54407a8
3 changed files with 99 additions and 99 deletions
--- a/user/store_sqlite.go
+++ b/user/store_sqlite.go
@@ -27,7 +27,7 @@ const (
 		LEFT JOIN tier t on t.id = u.tier_id
 		WHERE tk.token = ? AND (tk.expires = 0 OR tk.expires >= ?)
 	`
-	sqliteSelectUserByStripeIDQuery = `
+	sqliteSelectUserByStripeCustomerIDQuery = `
 		SELECT u.id, u.user, u.pass, u.role, u.prefs, u.sync_topic, u.provisioned, u.stats_messages, u.stats_emails, u.stats_calls, u.stripe_customer_id, u.stripe_subscription_id, u.stripe_subscription_status, u.stripe_subscription_interval, u.stripe_subscription_paid_until, u.stripe_subscription_cancel_at, deleted, t.id, t.code, t.name, t.messages_limit, t.messages_expiry_duration, t.emails_limit, t.calls_limit, t.reservations_limit, t.attachment_file_size_limit, t.attachment_total_size_limit, t.attachment_expiry_duration, t.attachment_bandwidth_limit, t.stripe_monthly_price_id, t.stripe_yearly_price_id
 		FROM user u
 		LEFT JOIN tier t on t.id = u.tier_id
@@ -138,7 +138,7 @@ const (
 		INSERT INTO user_token (user_id, token, label, last_access, last_origin, expires, provisioned)
 		VALUES (?, ?, ?, ?, ?, ?, ?)
 		ON CONFLICT (user_id, token)
-		DO UPDATE SET label = excluded.label, expires = excluded.expires, provisioned = excluded.provisioned;
+		DO UPDATE SET label = excluded.label, expires = excluded.expires, provisioned = excluded.provisioned
 	`
 	sqliteUpdateTokenLabelQuery       = `UPDATE user_token SET label = ? WHERE user_id = ? AND token = ?`
 	sqliteUpdateTokenExpiryQuery      = `UPDATE user_token SET expires = ? WHERE user_id = ? AND token = ?`
@@ -213,61 +213,61 @@ func NewSQLiteStore(filename, startupQueries string) (Store, error) {
 	return &commonStore{
 		db: db,
 		queries: storeQueries{
-			selectUserByID:              sqliteSelectUserByIDQuery,
-			selectUserByName:            sqliteSelectUserByNameQuery,
-			selectUserByToken:           sqliteSelectUserByTokenQuery,
-			selectUserByStripeID:        sqliteSelectUserByStripeIDQuery,
-			selectUsernames:             sqliteSelectUsernamesQuery,
-			selectUserCount:             sqliteSelectUserCountQuery,
-			selectUserIDFromUsername:    sqliteSelectUserIDFromUsernameQuery,
-			insertUser:                  sqliteInsertUserQuery,
-			updateUserPass:              sqliteUpdateUserPassQuery,
-			updateUserRole:              sqliteUpdateUserRoleQuery,
-			updateUserProvisioned:       sqliteUpdateUserProvisionedQuery,
-			updateUserPrefs:             sqliteUpdateUserPrefsQuery,
-			updateUserStats:             sqliteUpdateUserStatsQuery,
-			updateUserStatsResetAll:     sqliteUpdateUserStatsResetAllQuery,
-			updateUserTier:              sqliteUpdateUserTierQuery,
-			updateUserDeleted:           sqliteUpdateUserDeletedQuery,
-			deleteUser:                  sqliteDeleteUserQuery,
-			deleteUserTier:              sqliteDeleteUserTierQuery,
-			deleteUsersMarked:           sqliteDeleteUsersMarkedQuery,
-			selectTopicPerms:            sqliteSelectTopicPermsQuery,
-			selectUserAllAccess:         sqliteSelectUserAllAccessQuery,
-			selectUserAccess:            sqliteSelectUserAccessQuery,
-			selectUserReservations:      sqliteSelectUserReservationsQuery,
-			selectUserReservationsCount: sqliteSelectUserReservationsCountQuery,
-			selectUserReservationsOwner: sqliteSelectUserReservationsOwnerQuery,
-			selectUserHasReservation:    sqliteSelectUserHasReservationQuery,
-			selectOtherAccessCount:      sqliteSelectOtherAccessCountQuery,
-			upsertUserAccess:            sqliteUpsertUserAccessQuery,
-			deleteUserAccess:            sqliteDeleteUserAccessQuery,
-			deleteUserAccessProvisioned: sqliteDeleteUserAccessProvisionedQuery,
-			deleteTopicAccess:           sqliteDeleteTopicAccessQuery,
-			deleteAllAccess:             sqliteDeleteAllAccessQuery,
-			selectToken:                 sqliteSelectTokenQuery,
-			selectTokens:                sqliteSelectTokensQuery,
-			selectTokenCount:            sqliteSelectTokenCountQuery,
-			selectAllProvisionedTokens:  sqliteSelectAllProvisionedTokensQuery,
-			upsertToken:                 sqliteUpsertTokenQuery,
-			updateTokenLabel:            sqliteUpdateTokenLabelQuery,
-			updateTokenExpiry:           sqliteUpdateTokenExpiryQuery,
-			updateTokenLastAccess:       sqliteUpdateTokenLastAccessQuery,
-			deleteToken:                 sqliteDeleteTokenQuery,
-			deleteProvisionedToken:      sqliteDeleteProvisionedTokenQuery,
-			deleteAllToken:              sqliteDeleteAllTokenQuery,
-			deleteExpiredTokens:         sqliteDeleteExpiredTokensQuery,
-			deleteExcessTokens:          sqliteDeleteExcessTokensQuery,
-			insertTier:                  sqliteInsertTierQuery,
-			selectTiers:                 sqliteSelectTiersQuery,
-			selectTierByCode:            sqliteSelectTierByCodeQuery,
-			selectTierByPriceID:         sqliteSelectTierByPriceIDQuery,
-			updateTier:                  sqliteUpdateTierQuery,
-			deleteTier:                  sqliteDeleteTierQuery,
-			selectPhoneNumbers:          sqliteSelectPhoneNumbersQuery,
-			insertPhoneNumber:           sqliteInsertPhoneNumberQuery,
-			deletePhoneNumber:           sqliteDeletePhoneNumberQuery,
-			updateBilling:               sqliteUpdateBillingQuery,
+			selectUserByID:               sqliteSelectUserByIDQuery,
+			selectUserByName:             sqliteSelectUserByNameQuery,
+			selectUserByToken:            sqliteSelectUserByTokenQuery,
+			selectUserByStripeCustomerID: sqliteSelectUserByStripeCustomerIDQuery,
+			selectUsernames:              sqliteSelectUsernamesQuery,
+			selectUserCount:              sqliteSelectUserCountQuery,
+			selectUserIDFromUsername:     sqliteSelectUserIDFromUsernameQuery,
+			insertUser:                   sqliteInsertUserQuery,
+			updateUserPass:               sqliteUpdateUserPassQuery,
+			updateUserRole:               sqliteUpdateUserRoleQuery,
+			updateUserProvisioned:        sqliteUpdateUserProvisionedQuery,
+			updateUserPrefs:              sqliteUpdateUserPrefsQuery,
+			updateUserStats:              sqliteUpdateUserStatsQuery,
+			updateUserStatsResetAll:      sqliteUpdateUserStatsResetAllQuery,
+			updateUserTier:               sqliteUpdateUserTierQuery,
+			updateUserDeleted:            sqliteUpdateUserDeletedQuery,
+			deleteUser:                   sqliteDeleteUserQuery,
+			deleteUserTier:               sqliteDeleteUserTierQuery,
+			deleteUsersMarked:            sqliteDeleteUsersMarkedQuery,
+			selectTopicPerms:             sqliteSelectTopicPermsQuery,
+			selectUserAllAccess:          sqliteSelectUserAllAccessQuery,
+			selectUserAccess:             sqliteSelectUserAccessQuery,
+			selectUserReservations:       sqliteSelectUserReservationsQuery,
+			selectUserReservationsCount:  sqliteSelectUserReservationsCountQuery,
+			selectUserReservationsOwner:  sqliteSelectUserReservationsOwnerQuery,
+			selectUserHasReservation:     sqliteSelectUserHasReservationQuery,
+			selectOtherAccessCount:       sqliteSelectOtherAccessCountQuery,
+			upsertUserAccess:             sqliteUpsertUserAccessQuery,
+			deleteUserAccess:             sqliteDeleteUserAccessQuery,
+			deleteUserAccessProvisioned:  sqliteDeleteUserAccessProvisionedQuery,
+			deleteTopicAccess:            sqliteDeleteTopicAccessQuery,
+			deleteAllAccess:              sqliteDeleteAllAccessQuery,
+			selectToken:                  sqliteSelectTokenQuery,
+			selectTokens:                 sqliteSelectTokensQuery,
+			selectTokenCount:             sqliteSelectTokenCountQuery,
+			selectAllProvisionedTokens:   sqliteSelectAllProvisionedTokensQuery,
+			upsertToken:                  sqliteUpsertTokenQuery,
+			updateTokenLabel:             sqliteUpdateTokenLabelQuery,
+			updateTokenExpiry:            sqliteUpdateTokenExpiryQuery,
+			updateTokenLastAccess:        sqliteUpdateTokenLastAccessQuery,
+			deleteToken:                  sqliteDeleteTokenQuery,
+			deleteProvisionedToken:       sqliteDeleteProvisionedTokenQuery,
+			deleteAllToken:               sqliteDeleteAllTokenQuery,
+			deleteExpiredTokens:          sqliteDeleteExpiredTokensQuery,
+			deleteExcessTokens:           sqliteDeleteExcessTokensQuery,
+			insertTier:                   sqliteInsertTierQuery,
+			selectTiers:                  sqliteSelectTiersQuery,
+			selectTierByCode:             sqliteSelectTierByCodeQuery,
+			selectTierByPriceID:          sqliteSelectTierByPriceIDQuery,
+			updateTier:                   sqliteUpdateTierQuery,
+			deleteTier:                   sqliteDeleteTierQuery,
+			selectPhoneNumbers:           sqliteSelectPhoneNumbersQuery,
+			insertPhoneNumber:            sqliteInsertPhoneNumberQuery,
+			deletePhoneNumber:            sqliteDeletePhoneNumberQuery,
+			updateBilling:                sqliteUpdateBillingQuery,
 		},
 	}, nil
 }