Skip to content

Save polarPriceId during subscription update AND select latest subscription #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Save polarPriceId during subscription update AND select latest subscription #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions convex/subscriptions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ export const checkUserSubscriptionStatus = query({
}
tokenIdentifier = identity.subject;
}

const user = await ctx.db
.query("users")
.withIndex("by_token", (q) => q.eq("tokenIdentifier", tokenIdentifier))
Expand All @@ -194,10 +194,11 @@ export const checkUserSubscriptionStatus = query({
if (!user) {
return { hasActiveSubscription: false };
}

const subscription = await ctx.db
.query("subscriptions")
.withIndex("userId", (q) => q.eq("userId", user.tokenIdentifier))
.order("desc") // Order by createdAt in descending order
.first();

const hasActiveSubscription = subscription?.status === "active";
Expand Down Expand Up @@ -234,6 +235,7 @@ export const checkUserSubscriptionStatusByClerkId = query({
const subscription = await ctx.db
.query("subscriptions")
.withIndex("userId", (q) => q.eq("userId", user.tokenIdentifier))
.order("desc") // Order by createdAt in descending order
.first();

const hasActiveSubscription = subscription?.status === "active";
Expand Down Expand Up @@ -261,6 +263,7 @@ export const fetchUserSubscription = query({
const subscription = await ctx.db
.query("subscriptions")
.withIndex("userId", (q) => q.eq("userId", user.tokenIdentifier))
.order("desc") // Order by createdAt in descending order
.first();

return subscription;
Expand Down Expand Up @@ -328,6 +331,7 @@ export const handleWebhookEvent = mutation({

if (existingSub) {
await ctx.db.patch(existingSub._id, {
polarPriceId: args.body.data.price_id,
amount: args.body.data.amount,
status: args.body.data.status,
currentPeriodStart: new Date(
Expand Down