wbportfolio 1.51.0__py2.py3-none-any.whl → 1.51.1__py2.py3-none-any.whl

wbportfolio/analysis/claims.py

@@ -57,15 +57,15 @@ class ConsolidatedTradeSummary:
         self.pivot = pivot
         self.pivot_label = pivot_label
         self.queryset = self.queryset.annotate(
-            net_value=InstrumentPrice.subquery_closest_value(
-                "net_value", date_name="date", instrument_pk_name="product__pk", date_lookup="exact"
-            ),
-            fx_rate=CurrencyFXRates.get_fx_rates_subquery("date", lookup_expr="exact"),
-            aum=ExpressionWrapper(F("fx_rate") * F("net_value") * F("shares"), output_field=DecimalField()),
             internal_trade=F("trade__marked_as_internal"),
             date_considered=ExpressionWrapper(
                 Greatest("trade__transaction_date", "date") + 1, output_field=DateField()
             ),
+            net_value=InstrumentPrice.subquery_closest_value(
+                "net_value", date_name="date_considered", instrument_pk_name="product__pk", date_lookup="exact"
+            ),
+            fx_rate=CurrencyFXRates.get_fx_rates_subquery("date_considered", lookup_expr="exact"),
+            aum=ExpressionWrapper(F("fx_rate") * F("net_value") * F("shares"), output_field=DecimalField()),
         )
         self.queryset = Account.annotate_root_account_info(self.queryset)
 
@@ -154,7 +154,7 @@ class ConsolidatedTradeSummary:
     def get_aum_df(self) -> pd.DataFrame:
         df = self.df.copy().drop(columns=["internal_trade"])
         df.loc[df.date <= self.start_date, "sum_shares_start"] = df.shares
-        df.loc[df.date <= self.end_date, "sum_shares_end"] = df.shares
+        df.loc[df.date < self.end_date, "sum_shares_end"] = df.shares
         df = df.fillna(0)
         # Prepare dataframe
         df["sum_aum_start"] = df.sum_shares_start * df.price_start
@@ -190,7 +190,7 @@ class ConsolidatedTradeSummary:
             df.loc[df["aum"] < 0, "aum"] = 0
         elif only_negative:
             df.loc[df["aum"] > 0, "aum"] = 0
-        df = df[(df["date"] < self.end_date) & (df["date"] >= self.start_date)]
+        df = df[((df["date"] > self.start_date) & (df["date"] <= self.end_date))]
         df["date"] = pd.to_datetime(df["date"])
         df["period"] = "sum_nnm_" + df.date.dt.year.astype(str) + "-" + df.date.dt.month.map("{:02}".format)
         df = df[["id", "period", "aum"]].groupby(["id", "period"]).sum().reset_index()
@@ -228,12 +228,8 @@ class ConsolidatedTradeSummary:
                 ),
                 fill_value=0,
             )
-            df = df.reset_index().dropna()[["id", "date", "aum_sparkline"]]
-            return (
-                df.groupby("id")
-                .apply(lambda o: list(zip(o["date"].dt.strftime("%Y-%m-%d"), o["aum_sparkline"])))
-                .rename("aum_sparkline")
-            )
+            df = df.reset_index(level=1)[["date", "aum_sparkline"]].apply(tuple, axis=1).rename("aum_sparkline")
+            return df.groupby("id").apply(list)
         return pd.DataFrame()
 
     def get_initial_investment_date_df(self) -> pd.DataFrame:

wbportfolio/serializers/signals.py

@@ -140,7 +140,7 @@ def claim_adding_additional_resource(sender, serializer, instance, request, user
     start = current_quarter_date_start()
     return {
         "claims": reverse("wbportfolio:entry-claim-list", args=[instance.id], request=request),
-        "aum": f'{reverse("wbportfolio:aumtable-list", args=[], request=request)}?group_by=PRODUCT&account_owner={instance.id}&date_gte={start:%Y-%m-%d}&date_lte={date.today():%Y-%m-%d}',
+        "aum": f'{reverse("wbportfolio:aumtable-list", args=[], request=request)}?group_by=PRODUCT&account_owner={instance.id}&date={start:%Y-%m-%d},{date.today():%Y-%m-%d}',
     }
 
 

wbportfolio/viewsets/configs/menu/trades.py

@@ -11,7 +11,6 @@ TRADE_MENUITEM = MenuItem(
 SUBSCRIPTION_REDEMPTION_MENUITEM = MenuItem(
     label="Subscription/Redemption",
     endpoint="wbportfolio:subscriptionredemption-list",
-    # endpoint_get_parameters={'is_customer_trade': True},
     permission=ItemPermission(
         permissions=["wbportfolio.view_trade"], method=lambda request: is_internal_user(request.user)
     ),

{wbportfolio-1.51.0.dist-info → wbportfolio-1.51.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbportfolio
-Version: 1.51.0
+Version: 1.51.1
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 License-File: LICENSE
 Requires-Dist: cryptography==3.4.*

{wbportfolio-1.51.0.dist-info → wbportfolio-1.51.1.dist-info}/RECORD

@@ -25,7 +25,7 @@ wbportfolio/admin/transactions/rebalancing.py,sha256=FUMazUUxp7P2M9YhWpqKCS-Em4m
 wbportfolio/admin/transactions/trades.py,sha256=QCYMtP6ZBEEy6iMTdFKg3HjTe5DvXdPu5PqNmEwB0Cw,1708
 wbportfolio/admin/transactions/transactions.py,sha256=xxy9J8zO0gtqzVUP_Y2OjTXfkNGqrW9f4wWmITir7HQ,1275
 wbportfolio/analysis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wbportfolio/analysis/claims.py,sha256=hZm06BARTM2AVoojn7IwHB22aNHk5coqR61QYVNKGfM,10788
+wbportfolio/analysis/claims.py,sha256=islJVmHg6jKr6Q1b84Vt5Au2bzy9aDjWGEVGNtPFQd4,10688
 wbportfolio/contrib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbportfolio/contrib/company_portfolio/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbportfolio/contrib/company_portfolio/admin.py,sha256=roUsuOjYDWX0OGWVBjCcW3MAcwJHJYHnqZ_pLpwakmQ,549
@@ -339,7 +339,7 @@ wbportfolio/serializers/rebalancing.py,sha256=PloLwOcgDfsna3-LRGLFQ4eYJvlMbhI0rk
 wbportfolio/serializers/reconciliations.py,sha256=oFvGCAGioAOBK3xXjfwjMVYOXv3AbSyMg6YK6Olp6ow,7373
 wbportfolio/serializers/registers.py,sha256=zhdKH_mHEBE0VOhm6xpY54bTMtcSaY5BskEaJxtFd5Q,2737
 wbportfolio/serializers/roles.py,sha256=T-9NqTldpvaEMFy-Bib5MB6MeboygEOqcMP61mzzD3Q,2146
-wbportfolio/serializers/signals.py,sha256=WThxAFVHG-_UnOi2-iEKVj-VabgQF80wMmCvA1sBYAA,7290
+wbportfolio/serializers/signals.py,sha256=1rf3EPmDAPCuUUEmg9A2Z8d1nHSz_mw4EnuLYg8cqvA,7277
 wbportfolio/serializers/transactions/__init__.py,sha256=5ekvvAKnuEt8eBQfIhJ2ZXosWuHSEQvxEZWfDiPGbdw,896
 wbportfolio/serializers/transactions/claim.py,sha256=kC4E2RZRrpd9i8tGfoiV-gpWDk3ikR5F1Wf0v_IGIvw,11599
 wbportfolio/serializers/transactions/dividends.py,sha256=EULwKDumHBv4r2HsdEGZMZGFaye4dRUNNyXg6-wZXzc,520
@@ -494,7 +494,7 @@ wbportfolio/viewsets/configs/menu/products.py,sha256=EvxfcijRir1s4QPIPbseDbRNs53
 wbportfolio/viewsets/configs/menu/reconciliations.py,sha256=AkIu5h2nd5JGteAWTSQFTjP8egPES8fR1xlBKU3X8EM,277
 wbportfolio/viewsets/configs/menu/registers.py,sha256=s4TU9y5nTPWHf8ycWg-cu4mp7LvyXnUwk3PAOG7vyMw,349
 wbportfolio/viewsets/configs/menu/roles.py,sha256=rWS0SQdTgDJ2Hzyt8JdlrUCy1gjLVghzZRH61-mrP9U,642
-wbportfolio/viewsets/configs/menu/trades.py,sha256=niba68xOzOsxzoKd7OPdST6tqO8Q0uhtFWI0xFUQwyU,676
+wbportfolio/viewsets/configs/menu/trades.py,sha256=Hkvo6Eosk0NLL5V4xk7SLgDRmnjlkjMuoZXWatFARX4,617
 wbportfolio/viewsets/configs/menu/transactions.py,sha256=ErSoDRsyf6PTvOjY9VRvU0cviKNQsN-_adxYR0qwMhw,301
 wbportfolio/viewsets/configs/previews/__init__.py,sha256=hzKMMlZf9hJ-p4WpCN44CzjzNYp1gKiRrGfH181gm2I,47
 wbportfolio/viewsets/configs/previews/portfolios.py,sha256=uAQfvChGcBaVW-oNyXqByjGGMupvW288-2nxpkU41Kw,523
@@ -524,7 +524,7 @@ wbportfolio/viewsets/transactions/rebalancing.py,sha256=6rIrdK0rtKL1afJ-tYfAGdQV
 wbportfolio/viewsets/transactions/trade_proposals.py,sha256=Uk-K-x4MWKzsciRveALA5Fup6zBkin0z4bIedCIqolM,5988
 wbportfolio/viewsets/transactions/trades.py,sha256=-yJ4j8NJTu2VWyhCq5BXGNND_925Ietoxx9k07SLVh0,21634
 wbportfolio/viewsets/transactions/transactions.py,sha256=ixDp-nsNA8t_A06rBCT19hOMJHy0iRmdz1XKdV1OwAs,4450
-wbportfolio-1.51.0.dist-info/METADATA,sha256=axzUSsWaTl5s2gffvUFIEoAEmtuHQ5DQmdNT_u_ub8s,702
-wbportfolio-1.51.0.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbportfolio-1.51.0.dist-info/licenses/LICENSE,sha256=jvfVH0SY8_YMHlsJHKe_OajiscQDz4lpTlqT6x24sVw,172
-wbportfolio-1.51.0.dist-info/RECORD,,
+wbportfolio-1.51.1.dist-info/METADATA,sha256=4kMtnYfNmkkp0V3LGDW8Ci5GkUwDD8Ynb5n68U9jhiE,702
+wbportfolio-1.51.1.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbportfolio-1.51.1.dist-info/licenses/LICENSE,sha256=jvfVH0SY8_YMHlsJHKe_OajiscQDz4lpTlqT6x24sVw,172
+wbportfolio-1.51.1.dist-info/RECORD,,