Skip to content
Merged
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
5 changes: 5 additions & 0 deletions stapi-fastapi/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

- Add constants for route names to be used in link href generation

## Changed

- stapi-fastapi is now using stapi-pydantic models, deduplicating code
- Product in stapi-fastapi is now subclass of Product from stapi-pydantic

## [v0.6.0] - 2025-02-11

### Added
Expand Down
6 changes: 3 additions & 3 deletions stapi-fastapi/src/stapi_fastapi/backends/product_backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
from fastapi import Request
from returns.maybe import Maybe
from returns.result import ResultE

from stapi_fastapi.models.opportunity import (
from stapi_pydantic.opportunity import (
Opportunity,
OpportunityCollection,
OpportunityPayload,
OpportunitySearchRecord,
)
from stapi_fastapi.models.order import Order, OrderPayload
from stapi_pydantic.order import Order, OrderPayload

from stapi_fastapi.routers.product_router import ProductRouter

SearchOpportunities = Callable[
Expand Down
9 changes: 4 additions & 5 deletions stapi-fastapi/src/stapi_fastapi/backends/root_backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,15 @@
from fastapi import Request
from returns.maybe import Maybe
from returns.result import ResultE

from stapi_fastapi.models.opportunity import OpportunitySearchRecord
from stapi_fastapi.models.order import (
from stapi_pydantic.opportunity import OpportunitySearchRecord
from stapi_pydantic.order import (
Order,
OrderStatus,
)

GetOrders = Callable[
[str | None, int, Request],
Coroutine[Any, Any, ResultE[tuple[list[Order], Maybe[str]]]],
Coroutine[Any, Any, ResultE[tuple[list[Order[OrderStatus]], Maybe[str]]]],
]
"""
Type alias for an async function that returns a list of existing Orders.
Expand All @@ -33,7 +32,7 @@
- Returning returns.result.Failure[Exception] will result in a 500.
"""

GetOrder = Callable[[str, Request], Coroutine[Any, Any, ResultE[Maybe[Order]]]]
GetOrder = Callable[[str, Request], Coroutine[Any, Any, ResultE[Maybe[Order[OrderStatus]]]]]
"""
Type alias for an async function that gets details for the order with `order_id`.

Expand Down
8 changes: 5 additions & 3 deletions stapi-fastapi/src/stapi_fastapi/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
from .opportunity import OpportunityProperties
from .product import Product, Provider, ProviderRole
from .shared import Link
from stapi_pydantic.opportunity import OpportunityProperties
from stapi_pydantic.product import Provider, ProviderRole
from stapi_pydantic.shared import Link

from .product import Product

__all__ = [
"Link",
Expand Down
9 changes: 0 additions & 9 deletions stapi-fastapi/src/stapi_fastapi/models/conformance.py

This file was deleted.

5 changes: 0 additions & 5 deletions stapi-fastapi/src/stapi_fastapi/models/constraints.py

This file was deleted.

83 changes: 0 additions & 83 deletions stapi-fastapi/src/stapi_fastapi/models/opportunity.py

This file was deleted.

131 changes: 0 additions & 131 deletions stapi-fastapi/src/stapi_fastapi/models/order.py

This file was deleted.

Loading