wbportfolio 1.51.0__tar.gz → 1.51.1__tar.gz

{wbportfolio-1.51.0 → wbportfolio-1.51.1}/PKG-INFO

@@ -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 → wbportfolio-1.51.1}/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-1.51.0 → wbportfolio-1.51.1}/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-1.51.0 → wbportfolio-1.51.1}/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)
     ),