Skip to content

Commit 8da4ff7

Browse files
authored
Merge pull request #145 from finmars-platform/graphql2
Graphql2
2 parents 0c716f6 + b623857 commit 8da4ff7

File tree

2 files changed

+656
-9
lines changed

2 files changed

+656
-9
lines changed

poms/graphql/filters.py

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
from poms.instruments.models import Instrument as InstrumentModel
1414
from poms.instruments.models import InstrumentType as InstrumentTypeModel
1515
from poms.instruments.models import PriceHistory as PriceHistoryModel
16+
from poms.instruments.models import PricingPolicy as PricingPolicyModel
1617
from poms.portfolios.models import Portfolio as PortfolioModel
18+
from poms.portfolios.models import PortfolioHistory as PortfolioHistoryModel
1719
from poms.strategies.models import Strategy1 as Strategy1Model
1820
from poms.strategies.models import Strategy2 as Strategy2Model
1921
from poms.strategies.models import Strategy3 as Strategy3Model
@@ -72,13 +74,32 @@ class TransactionClassFilter:
7274
AccountTypeFilter = make_filter(AccountTypeModel)
7375
AccountFilter = make_filter(AccountModel, extra_fields={"type": AccountTypeFilter})
7476

77+
PricingPolicyFilter = make_filter(PricingPolicyModel)
7578

7679
CurrencyFilter = make_filter(CurrencyModel, extra_fields={"country": CountryFilter | None})
7780
CurrencyHistoryFilter = make_filter(
78-
CurrencyHistoryModel, extra_fields={"date": FilterLookup[date] | None, "currency": CurrencyFilter | None}
81+
CurrencyHistoryModel,
82+
extra_fields={
83+
"date": FilterLookup[date] | None,
84+
"currency": CurrencyFilter | None,
85+
"pricing_policy": PricingPolicyFilter | None,
86+
},
7987
)
8088

8189
PortfolioFilter = make_filter(PortfolioModel)
90+
91+
PortfolioHistoryFilter = make_filter(
92+
PortfolioHistoryModel,
93+
extra_fields={
94+
"date": FilterLookup[date] | None,
95+
"period_type": FilterLookup[str] | None,
96+
"status": FilterLookup[str] | None,
97+
"portfolio": PortfolioFilter | None,
98+
"currency": CurrencyFilter | None,
99+
"pricing_policy": PricingPolicyFilter | None,
100+
},
101+
)
102+
82103
InstrumentTypeFilter = make_filter(InstrumentTypeModel)
83104
InstrumentFilter = make_filter(
84105
InstrumentModel,
@@ -92,7 +113,12 @@ class TransactionClassFilter:
92113
)
93114

94115
PriceHistoryFilter = make_filter(
95-
PriceHistoryModel, extra_fields={"date": FilterLookup[date] | None, "instrument": InstrumentFilter | None}
116+
PriceHistoryModel,
117+
extra_fields={
118+
"date": FilterLookup[date] | None,
119+
"instrument": InstrumentFilter | None,
120+
"pricing_policy": PricingPolicyFilter | None,
121+
},
96122
)
97123

98124
ResponsibleFilter = make_filter(ResponsibleModel)

0 commit comments

Comments
 (0)