feature/share-on-list (#9)

dphoria · cursoragent · swc.pub · web-flow · commit 52ca750d91fd · 2025-08-09T23:03:36.000-07:00
* Refactor distribute page to support per-person item distribution Co-authored-by: swc.pub <swc.pub@pm.me> * Refactor item share calculation using map and list comprehension Co-authored-by: swc.pub <swc.pub@pm.me> * feature/actions (#6) * feature/pull-request-actions (#3) * feat: Add GitHub Actions for pull request checks - Create feature/pull-request-actions branch - Add comprehensive CI workflow with tests, linting, and security checks - Add pull request workflow for basic quality checks - Add security workflow for vulnerability scanning - Update pyproject.toml with additional dev and security dependencies - Update README with development workflow documentation - Configure PDM for dependency management - Set up ruff, black, pytest, bandit, and safety checks * chore: Update lock file with security dependencies * refactor: Consolidate GitHub Actions into single comprehensive workflow - Remove redundant pull-request.yml and security.yml files - Consolidate all checks into single ci.yml workflow - Add conditional job execution for optimized performance - Quick checks for PRs, full suite for main branch - Update README to reflect simplified approach * simplify: Remove lint and security jobs from GitHub Actions - Remove lint job (ruff format, isort checks) - Remove security job (bandit, safety scans) - Keep only quick-checks and test jobs - Update README to reflect simplified workflow - Streamline local development instructions * feat: Make test job run only on manual triggers - Add conditional 'if: github.event_name == workflow_dispatch' to test job - Test job now only runs when manually triggered - Pull requests only run quick checks (Ruff + Black) - Update README to reflect new behavior * revert: Restore README.md to original state - Remove all GitHub Actions documentation - Remove development workflow instructions - Restore original README content * feat: Add pytest to quick-checks job - Add pytest step to quick-checks job for pull requests - Exclude test_receipt_analysis_with_chat test that calls OpenAI API - Use -k 'not test_receipt_analysis_with_chat' to skip the API test - All other tests (15/16) run successfully in quick checks * fix: Add ruff configuration to resolve CI failures - Add comprehensive ruff configuration to pyproject.toml - Use modern lint section syntax to avoid deprecation warnings - Ignore import sorting issues (I001) to focus on code quality - Ignore other style issues that don't affect functionality - Ensure consistent behavior between local and CI environments * fix: Simplify ruff configuration to resolve CI issues - Reduce ruff rules to only essential error checking (E, W, F) - Remove complex rules that might cause version compatibility issues - Keep only basic pycodestyle errors, warnings, and pyflakes - Ignore only line length issues (E501) which are handled by black * fix: Use pdm sync instead of pdm install in GitHub Actions - Change pdm install to pdm sync to ensure all dependencies are installed - pdm sync installs all groups including dev dependencies (ruff, black, pytest) - pdm install only installs main dependencies by default - This should resolve the 'ruff command not found' error in CI * fix: Add dev group to lockfile and update GitHub Actions - Add dev group to pdm.lock so dev dependencies can be installed - Update GitHub Actions to explicitly install dev group with --group dev - Add pdm list command for debugging to see what's installed - This should resolve the missing ruff and other dev tools in CI * test binary data --------- Co-authored-by: Cursor Agent <cursoragent@cursor.com> * feat: add manual lint-format-write GitHub Action workflow (#5) Co-authored-by: Cursor Agent <cursoragent@cursor.com> --------- Co-authored-by: Cursor Agent <cursoragent@cursor.com> * bugfix/action-commit (#7) * fix: add explicit permissions to lint-format workflow to resolve authentication issues * test fix --------- Co-authored-by: GitHub Action <action@github.com> * Simplify person items rendering and filtering logic Co-authored-by: swc.pub <swc.pub@pm.me> * Add method to get individual person's shares across all items Co-authored-by: swc.pub <swc.pub@pm.me> * Modify get_person_shares to return item-share tuples instead of just shares Co-authored-by: swc.pub <swc.pub@pm.me> * Refactor get_person_shares to use lazy evaluation with map Co-authored-by: swc.pub <swc.pub@pm.me> * Add distribute_item endpoint for splitting bill item among people Co-authored-by: swc.pub <swc.pub@pm.me> * Remove total_distributed calculation from item distribution response Co-authored-by: swc.pub <swc.pub@pm.me> * Add Calculator initialization with empty extras in distribute_item Co-authored-by: swc.pub <swc.pub@pm.me> * Refactor item distribution to use Calculator for precise share calculation Co-authored-by: swc.pub <swc.pub@pm.me> * Remove distribute_item function from payments page Co-authored-by: swc.pub <swc.pub@pm.me> * Add route to share/unshare payment items between persons Co-authored-by: swc.pub <swc.pub@pm.me> * Simplify share_item logic by removing redundant index check Co-authored-by: swc.pub <swc.pub@pm.me> * Add interactive item sharing with dynamic UI updates Co-authored-by: swc.pub <swc.pub@pm.me> * Remove unnecessary comments in payments UI code Co-authored-by: swc.pub <swc.pub@pm.me> * Simplify item sharing logic by removing redundant sharing flag Co-authored-by: swc.pub <swc.pub@pm.me> * Add person subtotal and total to share item response Co-authored-by: swc.pub <swc.pub@pm.me> * Refactor payments view to use new calculator method for person shares Co-authored-by: swc.pub <swc.pub@pm.me> * Add item management methods to Person class and simplify share_item logic Co-authored-by: swc.pub <swc.pub@pm.me> * Enhance docstrings for Person methods with detailed parameter descriptions Co-authored-by: swc.pub <swc.pub@pm.me> * Refactor item management methods to prevent duplicates and handle errors Co-authored-by: swc.pub <swc.pub@pm.me> * Add test for Person.update_item() method with toggle functionality Co-authored-by: swc.pub <swc.pub@pm.me> * Simplify test_person_update_item by removing redundant comments Co-authored-by: swc.pub <swc.pub@pm.me> * Revert distribute files to master branch state * Checkpoint before follow-up message Co-authored-by: swc.pub <swc.pub@pm.me> * Fix TypeScript compilation errors by renaming duplicate functions in payments.ts * Fix missing import: add save_persons_file to payments.py imports * Fix missing import: add Iterable to calculator.py imports * style: apply automatic formatting and linting fixes --------- Co-authored-by: Cursor Agent <cursoragent@cursor.com> Co-authored-by: swc.pub <swc.pub@pm.me> Co-authored-by: GitHub Action <action@github.com>
diff --git a/.github/workflows/lint-format-write.yml b/.github/workflows/lint-format-write.yml
@@ -11,17 +11,17 @@ on:
 
 jobs:
   lint-format-write:
-    # Only run on manual trigger, not on main/master branches
     if: github.event_name == 'workflow_dispatch' && github.ref != 'refs/heads/main' && github.ref != 'refs/heads/master'
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
     
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
       with:
-        # Need to fetch all history for git operations
         fetch-depth: 0
-        # Need write permissions to push commits
         token: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Set up Python
@@ -66,4 +66,10 @@ jobs:
       run: |
         git add -A
         git commit -m "${{ github.event.inputs.commit_message }}"
-        git push origin ${{ github.ref }}
+        git push origin ${{ github.ref }} || {
+          echo "Failed to push changes. This might be due to:"
+          echo "1. Insufficient permissions on the token"
+          echo "2. Branch protection rules"
+          echo "3. Repository settings"
+          exit 1
+        }
diff --git a/src/bill/calculator.py b/src/bill/calculator.py
@@ -1,5 +1,6 @@
 import csv
 from io import StringIO
+from typing import Iterable
 from bill.person import Person
 from bill.receipts import Items, Item
 
@@ -124,6 +125,24 @@ def get_person_total(self, person: Person) -> float:
         )
         return person_subtotal + sum(person_extras)
 
+    def get_person_shares(self, person: Person) -> "Iterable[tuple[Item, float]]":
+        """
+        Lazily compute a person's shares across all items, paired with items.
+
+        Parameters
+        ----------
+        person: Person
+            The person to calculate shares for
+
+        Returns
+        -------
+        Iterable[tuple[Item, float]]
+            A lazy iterable yielding (Item, share) tuples for each item in self.items.items.
+        """
+        return map(
+            lambda item: (item, self.get_person_share(item, person)), self.items.items
+        )
+
     def get_shares_csv(self):
         """
         Get a CSV string of shares for each person.
diff --git a/src/bill/person.py b/src/bill/person.py
@@ -5,3 +5,59 @@
 class Person(BaseModel):
     name: str
     items: List[int]
+
+    def insert_item(self, item_index: int) -> None:
+        """
+        Add an item to the person's items list if not already present.
+
+        Parameters
+        ----------
+        item_index : int
+            The index of the item to add to the person's items list.
+
+        Returns
+        -------
+        None
+            The items list is modified in place.
+        """
+        items_set = set(self.items)
+        items_set.add(item_index)
+        self.items = sorted(list(items_set))
+
+    def remove_item(self, item_index: int) -> None:
+        """
+        Remove an item from the person's items list if present.
+
+        Parameters
+        ----------
+        item_index : int
+            The index of the item to remove from the person's items list.
+
+        Returns
+        -------
+        None
+            The items list is modified in place.
+        """
+        try:
+            self.items.remove(item_index)
+        except ValueError:
+            pass
+
+    def update_item(self, item_index: int) -> None:
+        """
+        Toggle an item in the person's items list - add if not present, remove if present.
+
+        Parameters
+        ----------
+        item_index : int
+            The index of the item to toggle in the person's items list.
+
+        Returns
+        -------
+        None
+            The items list is modified in place.
+        """
+        if item_index not in self.items:
+            self.insert_item(item_index)
+        else:
+            self.remove_item(item_index)
diff --git a/src/ui/payments.py b/src/ui/payments.py
@@ -4,12 +4,13 @@
     Blueprint,
     request,
     Response,
+    jsonify,
 )
 from bill.calculator import Calculator
 from logging import getLogger
 from items import get_current_items
 from extras import get_current_extras
-from persons import get_current_persons
+from persons import get_current_persons, save_persons_file
 from datetime import datetime
 
 log = getLogger(__file__)
@@ -36,10 +37,9 @@ def payments_page_view():
         {
             "name": item.name,
             "price": item.price,
-            "share": calculator.get_person_share(item, person),
+            "share": share,
         }
-        for item_index, item in enumerate(items.items)
-        if item_index in person.items
+        for item, share in calculator.get_person_shares(person)
     ]
 
     person_extras = [
@@ -88,3 +88,38 @@ def download_csv():
         mimetype="text/csv",
         headers={"Content-Disposition": f"attachment; filename={filename}"},
     )
+
+
+@payments_page.route("/share_item", methods=["POST"])
+def share_item():
+    data = request.get_json()
+    item_index = data.get("item_index")
+    person_index = data.get("person_index")
+
+    persons = get_current_persons(session)
+    person = persons[person_index]
+    person.update_item(item_index)
+    save_persons_file(persons, session)
+
+    items = get_current_items(session)
+    extras = get_current_extras(session)
+    calculator = Calculator(persons=persons, items=items, extras=extras)
+    item = items.items[item_index]
+    share = calculator.get_person_share(item, person)
+
+    person_subtotal = calculator.get_person_subtotal(person)
+    person_total = calculator.get_person_total(person)
+
+    return (
+        jsonify(
+            {
+                "success": True,
+                "share": share,
+                "item_name": item.name,
+                "item_price": item.price,
+                "person_subtotal": person_subtotal,
+                "person_total": person_total,
+            }
+        ),
+        200,
+    )
diff --git a/src/ui/payments.ts b/src/ui/payments.ts
@@ -23,6 +23,7 @@ document.addEventListener("DOMContentLoaded", () => {
   downloadButton.addEventListener("click", handleDownload);
 
   initializePersonData();
+  setupItemClickedHandlers();
 
   document.addEventListener("keydown", (e) => {
     if (e.key === "Escape") {
@@ -70,3 +71,64 @@ function handleExtras(): void {
 function handleDownload(): void {
   window.location.href = "/payments/download";
 }
+
+function setupItemClickedHandlers(): void {
+  const itemElements = document.querySelectorAll(".item-box");
+  itemElements.forEach((itemElement) => {
+    itemElement.addEventListener("click", handleItemClick);
+  });
+}
+
+async function handleItemClick(e: Event): Promise<void> {
+  const itemElement = e.currentTarget as HTMLElement;
+  const itemIndex = parseInt(itemElement.getAttribute("data-item-index") || "0");
+  
+  try {
+    const response = await fetch("/share_item", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify({
+        item_index: itemIndex,
+        person_index: currentPersonIndex,
+      }),
+    });
+
+    if (response.ok) {
+      const result = await response.json();
+      updateItemInfoDisplay(itemElement, result);
+    }
+  } catch (error) {
+    console.error("Error sharing item:", error);
+  }
+}
+
+function updateItemInfoDisplay(itemElement: HTMLElement, data: any): void {
+  const shareElement = itemElement.querySelector(".text-blue-400.font-semibold") as HTMLElement;
+  const priceElement = itemElement.querySelector(".text-xs.text-slate-400") as HTMLElement;
+  
+  if (data.share !== undefined) {
+    shareElement.textContent = `$${data.share.toFixed(2)}`;
+  }
+  
+  if (data.share > 0) {
+    itemElement.classList.add("ring-4", "ring-green-400/40", "border-green-400");
+  } else {
+    itemElement.classList.remove("ring-4", "ring-green-400/40", "border-green-400");
+  }
+  
+  if (data.person_subtotal !== undefined) {
+    const subtotalElement = document.querySelector(".text-green-400") as HTMLElement;
+    if (subtotalElement) {
+      subtotalElement.textContent = `$${data.person_subtotal.toFixed(2)}`;
+    }
+  }
+  
+  if (data.person_total !== undefined) {
+    const totalElement = document.getElementById("person-total") as HTMLElement;
+    if (totalElement) {
+      totalElement.textContent = `$${data.person_total.toFixed(2)}`;
+    }
+  }
+}
diff --git a/src/ui/templates/payments.html b/src/ui/templates/payments.html
@@ -67,21 +67,15 @@ <h1 class="text-2xl font-bold">Bill</h1>
       <h3 class="text-lg font-semibold text-slate-200 mb-4">Items</h3>
       
       <div class="space-y-3 mb-6">
-        {% if person_items %}
-          {% for item in person_items %}
-          <div class="flex justify-between items-center p-3 bg-slate-800/50 rounded-lg border border-slate-700">
-            <span class="font-medium text-slate-100">{{ item.name }}</span>
-            <div class="text-right">
-              <div class="text-blue-400 font-semibold">${{ "%.2f"|format(item.share) }}</div>
-              <div class="text-xs text-slate-400">/ ${{ "%.2f"|format(item.price) }}</div>
-            </div>
-          </div>
-          {% endfor %}
-        {% else %}
-          <div class="text-center text-slate-400 py-4">
-            <p>No items</p>
+        {% for item in person_items %}
+        <div class="flex justify-between items-center p-3 bg-slate-800/50 rounded-lg border border-slate-700 cursor-pointer hover:bg-slate-800/70 transition-colors item-box" data-item-index="{{ loop.index0 }}">
+          <span class="font-medium text-slate-100">{{ item.name }}</span>
+          <div class="text-right">
+            <div class="text-blue-400 font-semibold">${{ "%.2f"|format(item.share) }}</div>
+            <div class="text-xs text-slate-400">/ ${{ "%.2f"|format(item.price) }}</div>
           </div>
-        {% endif %}
+        </div>
+        {% endfor %}
       </div>
 
       <!-- Items Subtotal -->
diff --git a/tests/test_calculator.py b/tests/test_calculator.py
@@ -194,3 +194,34 @@ def test_csv(calculator, sample_persons):
 
     total = subtotal + service_charge + tax
     assert f"Total,{total:.2f},99.72,118.62,200.09,{total:.2f}" in csv_output
+
+
+def test_person_update_item():
+    """
+    Test Person.update_item() method to ensure it correctly toggles items.
+    Tests both insert_item() and remove_item() scenarios.
+    """
+    person = Person(name="Test", items=[1, 3, 5])
+
+    person.update_item(7)
+    assert person.items == [
+        1,
+        3,
+        5,
+        7,
+    ], "Item 7 should be added and list should be sorted"
+
+    person.update_item(3)
+    assert person.items == [1, 3, 5, 7], "Item 3 should remain unchanged"
+
+    person.update_item(5)
+    assert person.items == [1, 3, 7], "Item 5 should be removed"
+
+    person.update_item(9)
+    assert person.items == [1, 3, 7], "Item 9 should not affect the list"
+
+    person.update_item(5)
+    assert person.items == [1, 3, 5, 7], "Item 5 should be added back"
+
+    person.update_item(5)
+    assert person.items == [1, 3, 7], "Item 5 should be removed again"
