Update metrics/vintage_metrics.py

metrics/vintage_metrics.py

@@ -20,29 +20,65 @@ def calculate_vintage_dpd(
         df["mob"] == mob
     ].copy()
 
-    mob_df["bad_flag"] = np.where(
-        mob_df["dpd"] >= dpd_threshold,
-        1,
+    # -----------------------------------
+    # BAD FLAG
+    # -----------------------------------
+
+    mob_df["bad_flag"] = (
+        mob_df["dpd"] >= dpd_threshold
+    )
+
+    # -----------------------------------
+    # BAD BALANCE
+    # -----------------------------------
+
+    mob_df["bad_balance"] = np.where(
+        mob_df["bad_flag"],
+        mob_df["balance"],
         0
     )
 
+    # -----------------------------------
+    # GROUPING
+    # -----------------------------------
+
     group_columns = ["booking_vintage"]
 
     if group_col is not None:
         group_columns.append(group_col)
 
+    # -----------------------------------
+    # AGGREGATION
+    # -----------------------------------
+
     result = (
         mob_df.groupby(group_columns)
         .agg(
-            total_accounts=("account_id", "nunique"),
-            bad_accounts=("bad_flag", "sum")
+            total_accounts=(
+                "account_id",
+                "nunique"
+            ),
+
+            total_balance=(
+                "balance",
+                "sum"
+            ),
+
+            bad_balance=(
+                "bad_balance",
+                "sum"
+            )
         )
         .reset_index()
     )
 
+    # -----------------------------------
+    # DOLLAR RATE
+    # -----------------------------------
+
     result["dpd_rate"] = (
-        result["bad_accounts"]
-        / result["total_accounts"]
+        result["bad_balance"]
+        / result["total_balance"]
     ) * 100
 
     result["dpd_rate"] = (
@@ -74,8 +110,20 @@ def calculate_vintage_ncl(
     result = (
         mob_df.groupby(group_columns)
         .agg(
-            total_balance=("balance", "sum"),
-            total_ncl=("ncl_amount", "sum")
+            total_accounts=(
+                "account_id",
+                "nunique"
+            ),
+
+            total_balance=(
+                "balance",
+                "sum"
+            ),
+
+            total_ncl=(
+                "ncl_amount",
+                "sum"
+            )
         )
         .reset_index()
     )