Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions clients/packages/client/src/v1.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions server/polar/product/endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ async def list(
organization_id=filters.organization_id,
query=filters.query,
is_archived=filters.is_archived,
is_current=filters.is_current,
is_recurring=filters.is_recurring,
visibility=filters.visibility,
benefit_id=filters.benefit_id,
Expand Down
8 changes: 8 additions & 0 deletions server/polar/product/schemas.py
Original file line number Diff line number Diff line change
Expand Up @@ -1250,6 +1250,14 @@ class ProductListParams(QuerySchema):
)
query: str | None = Field(None, description="Filter by product name.")
is_archived: bool | None = Field(None, description="Filter on archived products.")
is_current: Annotated[bool | None, Version(starting_from=V2027_01)] = Field(
None,
description=(
"Filter on current product versions. "
"If `false`, only previous versions are returned. "
"Defaults to current versions only, unless filtering by `id`."
),
)
is_recurring: bool | None = Field(
None,
description="Filter on recurring products. If `true`, only subscriptions tiers are returned. If `false`, only one-time purchase products are returned. ",
Expand Down
6 changes: 5 additions & 1 deletion server/polar/product/service.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ async def list(
organization_id: Sequence[uuid.UUID] | None = None,
query: str | None = None,
is_archived: bool | None = None,
is_current: bool | None = None,
is_recurring: bool | None = None,
visibility: Sequence[ProductVisibility] | None = None,
benefit_id: Sequence[uuid.UUID] | None = None,
Expand Down Expand Up @@ -139,7 +140,10 @@ async def list(

if id is not None:
statement = statement.where(Product.id.in_(id))
else:

if is_current is not None:
statement = statement.where(Product.is_current.is_(is_current))
elif id is None:
statement = statement.where(Product.is_current)

if external_id is not None:
Expand Down
54 changes: 54 additions & 0 deletions server/tests/product/test_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,60 @@ async def test_filter_is_archived(
assert len(results) == 1
assert results[0].id == archived_product.id

@pytest.mark.auth
async def test_filter_is_current(
self,
auth_subject: AuthSubject[User],
session: AsyncSession,
save_fixture: SaveFixture,
organization: Organization,
user_organization: UserOrganization,
) -> None:
previous_version = await create_product(
save_fixture, organization=organization, recurring_interval=None
)
previous_version.is_current = False
await save_fixture(previous_version)
current_version = await create_product(
save_fixture, organization=organization, recurring_interval=None
)

session.expunge_all()

results, _ = await product_service.list(
session,
auth_subject,
organization_id=[organization.id],
pagination=PaginationParams(1, 10),
)
assert [result.id for result in results] == [current_version.id]

results, _ = await product_service.list(
session,
auth_subject,
organization_id=[organization.id],
is_current=False,
pagination=PaginationParams(1, 10),
)
assert [result.id for result in results] == [previous_version.id]

results, _ = await product_service.list(
session,
auth_subject,
id=[previous_version.id],
pagination=PaginationParams(1, 10),
)
assert [result.id for result in results] == [previous_version.id]

results, _ = await product_service.list(
session,
auth_subject,
id=[previous_version.id],
is_current=True,
pagination=PaginationParams(1, 10),
)
assert results == []

@pytest.mark.auth
async def test_filter_benefit_id(
self,
Expand Down
Loading