More descriptive message when active proposal is not found (#325)

* Include most recent proposal end date and allocation status when no active proposal is found * get the first proposal instead of all recent ones and indexing * shorten up line lengths --------- Co-authored-by: Nickolas Comeau <[email protected]>
pitt-crc · Sep 15, 2023 · dd574c4 · dd574c4
1 parent 1bf9c9f
commit dd574c4
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/bank/account_logic.py b/bank/account_logic.py
@@ -631,6 +631,9 @@ def __init__(self, account_name: str) -> None:
             .where(Proposal.account_id.in_(subquery)) \
             .where(Proposal.is_active)
 
+        self._recent_proposals_query = select(Proposal) \
+            .where(Proposal.account_id.in_(subquery))
+
         self._active_investment_query = select(Investment) \
             .where(Investment.account_id.in_(subquery)) \
             .where(Investment.is_active)
@@ -680,7 +683,17 @@ def _build_usage_table(self) -> PrettyTable:
             investments = session.execute(self._active_investment_query).scalars().all()
 
             if not proposal:
-                raise MissingProposalError('Account has no proposal')
+                recent_proposal = session.execute(self._recent_proposals_query).scalars().first()
+                if not recent_proposal:
+                    raise MissingProposalError('This account has never had a proposal')
+                recent_proposal_end = recent_proposal.end_date.strftime(settings.date_format)
+                recent_proposal_alloc_status = (
+                [f'{alloc.cluster_name}:{alloc.service_units_used}/{alloc.service_units_total}' for alloc in
+                recent_proposal.allocations])
+                raise MissingProposalError('\nMost recent proposal end date:\n'
+                                           f'    {recent_proposal_end}\n'
+                                           'Most recent proposal allocation status:\n'
+                                           f'    {recent_proposal_alloc_status}')
 
             # Proposal End Date as first row
             output_table.add_row(['Proposal End Date:', proposal.end_date.strftime(settings.date_format), ""],
@@ -802,8 +815,8 @@ def info(self) -> None:
         try:
             print(self._build_usage_table())
 
-        except MissingProposalError:
-            print(f'Account {self._account_name} has no current proposal')
+        except MissingProposalError as e:
+            print(f'Account {self._account_name} has no active proposal: {str(e)}')
 
         try:
             print(self._build_investment_table())