Fix admin panel auth, form title, commission data, and validation

- CRITICAL: Add auth token to ALL admin template fetch() calls (agreements,
agreement_edit, constants, bell_ringers, dropdowns, email_rules, users).
Previously only producer_emails had it, causing all admin saves to fail
with 401 Unauthorized.
- Add ?token= parameter to all admin navigation links so auth persists
when navigating between admin pages.
- Rename "Producer Intake Form" to "Commission Agreement Intake Form"
throughout (base.html, form.html, README.md).
- Move Department Code and Market Segment before Bell Ringer badge so
bell ringer auto-populates correctly.
- Add tooltip to Bell Ringer badge explaining it auto-populates.
- Fix Referral/Origination Fee tier label: "Year 1-2" -> "Year 1 & Year 2".
- Fix Life Origination Fee: "All Years" at 20% -> "Year 1" at 20%, "Year 2+" Ended.
- Add CCP + Bond Agreement incompatibility validation (client + server side).
- Add data migration in start.py to fix existing DB records on redeploy.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

README.md

@@ -1,5 +1,5 @@
 ---
-title: Producer Intake Form
+title: Commission Agreement Intake Form
 emoji: 📋
 colorFrom: blue
 colorTo: gray
@@ -7,5 +7,5 @@ sdk: docker
 pinned: false
 ---
 
-# Producer Intake Form
+# Commission Agreement Intake Form
 

app/rules_engine.py

@@ -245,6 +245,15 @@ def compute_summary(db: Session, form_data: dict) -> dict:
         warnings.append("An Originating Producer/Employee is selected — "
                          "the agreement must be Referral / Origination Fee Agreement.")
 
+    # CCP is not eligible for Bond Agreement
+    is_bond = "bond" in R["name"].lower()
+    if has_cc and is_bond:
+        warnings.append("Complex Claims Practice (CCP) is not eligible for Bond Agreement.")
+
+    # Validate CE is selected if checkbox was intended
+    if cepfx and not is_ce and not cename:
+        warnings.append("Client Executive is selected but no name found — verify selection.")
+
     # ── Build rows ────────────────────────────────────────────
 
     # ROW: Producer 1

app/seed_db.py

@@ -73,10 +73,10 @@ def seed(session, reset=False):
         {
             "name": "Referral / Origination Fee Agreement", "p1_suffix": 1, "p2_suffix": 2,
             "tiers": [
-                {"role": "P1", "years": "Year 1-2", "comm": 20, "credit": 100, "agr": "Referral Agreement"},
+                {"role": "P1", "years": "Year 1 & Year 2", "comm": 20, "credit": 100, "agr": "Referral Agreement"},
                 {"role": "P1", "years": "Year 3+",  "comm": 30, "credit": 100, "agr": "Standard Agreement",
                  "note": "Transitions to Standard Agreement"},
-                {"role": "P2", "years": "Year 1-2", "comm": 10, "credit": 0,   "agr": "Origination Fee Agreement"},
+                {"role": "P2", "years": "Year 1 & Year 2", "comm": 10, "credit": 0,   "agr": "Origination Fee Agreement"},
                 {"role": "P2", "years": "Year 3+",  "comm": None, "credit": None, "agr": "Ended"},
             ]
         },
@@ -119,7 +119,9 @@ def seed(session, reset=False):
         {
             "name": "Life Origination Fee Agreement", "p1_suffix": 2, "p2_suffix": None,
             "tiers": [
-                {"role": "P1", "years": "All Years", "comm": 20, "credit": 100, "agr": "Life Origination Fee Agreement"},
+                {"role": "P1", "years": "Year 1", "comm": 20, "credit": 100, "agr": "Life Origination Fee Agreement"},
+                {"role": "P1", "years": "Year 2+", "comm": None, "credit": None, "agr": "Ended",
+                 "note": "Life Referral is 20% Year 1 only. Year 2 it is removed."},
             ]
         },
         {

app/templates/admin/agreement_edit.html

@@ -4,7 +4,7 @@
 <div class="space-y-4">
     <div class="flex items-center justify-between">
         <div>
-            <a href="/admin/agreements" class="text-sm text-gray-400 hover:text-gray-600">← Back to Agreements</a>
+            <a href="/admin/agreements?token={{ token }}" class="text-sm text-gray-400 hover:text-gray-600">← Back to Agreements</a>
             <h1 class="text-2xl font-bold sw-blue-text mt-1">{{ agreement.name }}</h1>
         </div>
         <button onclick="saveTiers()" class="bg-green-600 text-white px-6 py-2 rounded-md text-sm font-semibold hover:bg-green-700">
@@ -111,6 +111,9 @@
 </div>
 
 <script>
+const authToken = '{{ token }}';
+const authHeaders = {'Content-Type': 'application/json', 'Authorization': 'Bearer ' + authToken};
+
 function addTier() {
     const html = `
     <div class="tier-row border border-gray-200 rounded-lg p-4 bg-blue-50">
@@ -182,7 +185,7 @@ async function saveTiers() {
     };
 
     const resp = await fetch('/admin/api/agreements/{{ agreement.id }}/tiers', {
-        method: 'POST', headers: {'Content-Type': 'application/json'},
+        method: 'POST', headers: authHeaders,
         body: JSON.stringify(body),
     });
     const data = await resp.json();

app/templates/admin/agreements.html

@@ -40,7 +40,7 @@
                         </button>
                     </td>
                     <td class="px-4 py-3 text-center">
-                        <a href="/admin/agreements/{{ agr.id }}" class="text-blue-600 hover:underline text-sm">Edit →</a>
+                        <a href="/admin/agreements/{{ agr.id }}?token={{ token }}" class="text-blue-600 hover:underline text-sm">Edit →</a>
                     </td>
                 </tr>
                 {% endfor %}
@@ -87,6 +87,9 @@
 </div>
 
 <script>
+const authToken = '{{ token }}';
+const authHeaders = {'Content-Type': 'application/json', 'Authorization': 'Bearer ' + authToken};
+
 function showNewModal() { document.getElementById('newModal').classList.remove('hidden'); }
 function closeNewModal() { document.getElementById('newModal').classList.add('hidden'); }
 
@@ -99,19 +102,19 @@ async function createAgreement() {
         tiers: [],
     };
     const resp = await fetch('/admin/api/agreements/new', {
-        method: 'POST', headers: {'Content-Type': 'application/json'},
+        method: 'POST', headers: authHeaders,
         body: JSON.stringify(body),
     });
     const data = await resp.json();
     if (data.success) {
-        window.location.href = '/admin/agreements/' + data.id;
+        window.location.href = '/admin/agreements/' + data.id + '?token=' + authToken;
     } else {
         alert(data.error || 'Failed to create agreement');
     }
 }
 
 async function toggleAgreement(id) {
-    await fetch('/admin/api/agreements/' + id + '/toggle', { method: 'POST' });
+    await fetch('/admin/api/agreements/' + id + '/toggle', { method: 'POST', headers: {'Authorization': 'Bearer ' + authToken} });
     location.reload();
 }
 </script>

app/templates/admin/bell_ringers.html

@@ -2,7 +2,7 @@
 {% block title %}Bell Ringer Thresholds — Admin{% endblock %}
 {% block content %}
 <div class="space-y-4">
-    <a href="/admin/" class="text-sm text-gray-400 hover:text-gray-600">← Admin Panel</a>
+    <a href="/admin/?token={{ token }}" class="text-sm text-gray-400 hover:text-gray-600">← Admin Panel</a>
     <div class="flex items-center justify-between">
         <h1 class="text-2xl font-bold sw-blue-text">Bell Ringer Thresholds</h1>
         <button onclick="document.getElementById('addRow').classList.toggle('hidden')"
@@ -56,10 +56,13 @@
     </div>
 </div>
 <script>
+const authToken = '{{ token }}';
+const authHeaders = {'Content-Type': 'application/json', 'Authorization': 'Bearer ' + authToken};
+
 async function saveBR(id) {
     const val = parseFloat(document.getElementById('br_' + id).value);
     await fetch('/admin/api/bell-ringers/' + id, {
-        method: 'POST', headers: {'Content-Type': 'application/json'},
+        method: 'POST', headers: authHeaders,
         body: JSON.stringify({ threshold: val }),
     });
     document.getElementById('br_' + id).style.backgroundColor = '#d4edda';
@@ -67,12 +70,12 @@ async function saveBR(id) {
 }
 async function deleteBR(id) {
     if (!confirm('Delete this threshold?')) return;
-    await fetch('/admin/api/bell-ringers/' + id, { method: 'DELETE' });
+    await fetch('/admin/api/bell-ringers/' + id, { method: 'DELETE', headers: {'Authorization': 'Bearer ' + authToken} });
     location.reload();
 }
 async function addBR() {
     await fetch('/admin/api/bell-ringers/new', {
-        method: 'POST', headers: {'Content-Type': 'application/json'},
+        method: 'POST', headers: authHeaders,
         body: JSON.stringify({
             market_segment: document.getElementById('new_seg').value,
             dept_code: document.getElementById('new_dept').value,

app/templates/admin/constants.html

@@ -2,7 +2,7 @@
 {% block title %}Fixed Constants — Admin{% endblock %}
 {% block content %}
 <div class="space-y-4">
-    <a href="/admin/" class="text-sm text-gray-400 hover:text-gray-600">← Admin Panel</a>
+    <a href="/admin/?token={{ token }}" class="text-sm text-gray-400 hover:text-gray-600">← Admin Panel</a>
     <h1 class="text-2xl font-bold sw-blue-text">Fixed Constants</h1>
     <p class="text-gray-500 text-sm">Edit the percentages used for Client Executive and Complex Claims rows.</p>
 
@@ -33,10 +33,13 @@
     </div>
 </div>
 <script>
+const authToken = '{{ token }}';
+const authHeaders = {'Content-Type': 'application/json', 'Authorization': 'Bearer ' + authToken};
+
 async function saveConst(id) {
     const val = parseFloat(document.getElementById('const_' + id).value);
     await fetch('/admin/api/constants/' + id, {
-        method: 'POST', headers: {'Content-Type': 'application/json'},
+        method: 'POST', headers: authHeaders,
         body: JSON.stringify({ value: val }),
     });
     // Brief flash to confirm

app/templates/admin/dashboard.html

@@ -6,7 +6,7 @@
     <p class="text-gray-500 text-sm">Manage all configurable rules, dropdowns, and users without code changes.</p>
 
     <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
-        <a href="/admin/agreements" class="bg-white rounded-lg shadow p-5 hover:shadow-md transition group">
+        <a href="/admin/agreements?token={{ token }}" class="bg-white rounded-lg shadow p-5 hover:shadow-md transition group">
             <div class="flex items-center justify-between">
                 <div>
                     <h3 class="font-semibold sw-blue-text group-hover:underline">Commission Agreements</h3>
@@ -16,7 +16,7 @@
             </div>
         </a>
 
-        <a href="/admin/constants" class="bg-white rounded-lg shadow p-5 hover:shadow-md transition group">
+        <a href="/admin/constants?token={{ token }}" class="bg-white rounded-lg shadow p-5 hover:shadow-md transition group">
             <div class="flex items-center justify-between">
                 <div>
                     <h3 class="font-semibold sw-blue-text group-hover:underline">Fixed Constants</h3>
@@ -26,7 +26,7 @@
             </div>
         </a>
 
-        <a href="/admin/bell-ringers" class="bg-white rounded-lg shadow p-5 hover:shadow-md transition group">
+        <a href="/admin/bell-ringers?token={{ token }}" class="bg-white rounded-lg shadow p-5 hover:shadow-md transition group">
             <div class="flex items-center justify-between">
                 <div>
                     <h3 class="font-semibold sw-blue-text group-hover:underline">Bell Ringer Thresholds</h3>
@@ -36,7 +36,7 @@
             </div>
         </a>
 
-        <a href="/admin/dropdowns" class="bg-white rounded-lg shadow p-5 hover:shadow-md transition group">
+        <a href="/admin/dropdowns?token={{ token }}" class="bg-white rounded-lg shadow p-5 hover:shadow-md transition group">
             <div class="flex items-center justify-between">
                 <div>
                     <h3 class="font-semibold sw-blue-text group-hover:underline">Dropdown Options</h3>
@@ -46,7 +46,7 @@
             </div>
         </a>
 
-        <a href="/admin/email-rules" class="bg-white rounded-lg shadow p-5 hover:shadow-md transition group">
+        <a href="/admin/email-rules?token={{ token }}" class="bg-white rounded-lg shadow p-5 hover:shadow-md transition group">
             <div class="flex items-center justify-between">
                 <div>
                     <h3 class="font-semibold sw-blue-text group-hover:underline">Email Routing Rules</h3>
@@ -67,7 +67,7 @@
             </div>
         </a>
       
-        <a href="/admin/users" class="bg-white rounded-lg shadow p-5 hover:shadow-md transition group">
+        <a href="/admin/users?token={{ token }}" class="bg-white rounded-lg shadow p-5 hover:shadow-md transition group">
             <div class="flex items-center justify-between">
                 <div>
                     <h3 class="font-semibold sw-blue-text group-hover:underline">User Management</h3>

app/templates/admin/dropdowns.html

@@ -2,7 +2,7 @@
 {% block title %}Dropdown Options — Admin{% endblock %}
 {% block content %}
 <div class="space-y-4">
-    <a href="/admin/" class="text-sm text-gray-400 hover:text-gray-600">← Admin Panel</a>
+    <a href="/admin/?token={{ token }}" class="text-sm text-gray-400 hover:text-gray-600">← Admin Panel</a>
     <h1 class="text-2xl font-bold sw-blue-text">Dropdown Options</h1>
     <p class="text-gray-500 text-sm">Manage the options shown in form dropdowns. Changes take effect immediately.</p>
 
@@ -35,23 +35,26 @@
     {% endfor %}
 </div>
 <script>
+const authToken = '{{ token }}';
+const authHeaders = {'Content-Type': 'application/json', 'Authorization': 'Bearer ' + authToken};
+
 async function addOption(category) {
     const label = prompt('Enter the display label for the new ' + category.replace('_',' ') + ' option:');
     if (!label) return;
     const value = prompt('Internal value (leave blank to use label):', label);
     await fetch('/admin/api/dropdowns/new', {
-        method: 'POST', headers: {'Content-Type': 'application/json'},
+        method: 'POST', headers: authHeaders,
         body: JSON.stringify({ category, label, value: value || label }),
     });
     location.reload();
 }
 async function toggleOption(id) {
-    await fetch('/admin/api/dropdowns/' + id + '/toggle', { method: 'POST' });
+    await fetch('/admin/api/dropdowns/' + id + '/toggle', { method: 'POST', headers: {'Authorization': 'Bearer ' + authToken} });
     location.reload();
 }
 async function deleteOption(id) {
     if (!confirm('Delete this option permanently?')) return;
-    await fetch('/admin/api/dropdowns/' + id, { method: 'DELETE' });
+    await fetch('/admin/api/dropdowns/' + id, { method: 'DELETE', headers: {'Authorization': 'Bearer ' + authToken} });
     location.reload();
 }
 </script>

app/templates/admin/email_rules.html

@@ -2,7 +2,7 @@
 {% block title %}Email Routing — Admin{% endblock %}
 {% block content %}
 <div class="space-y-4">
-    <a href="/admin/" class="text-sm text-gray-400 hover:text-gray-600">← Admin Panel</a>
+    <a href="/admin/?token={{ token }}" class="text-sm text-gray-400 hover:text-gray-600">← Admin Panel</a>
     <div class="flex items-center justify-between">
         <h1 class="text-2xl font-bold sw-blue-text">Email Routing Rules</h1>
         <button onclick="addRule()" class="bg-green-600 text-white px-4 py-2 rounded-md text-sm font-semibold hover:bg-green-700">+ Add Rule</button>
@@ -47,9 +47,12 @@
     </div>
 </div>
 <script>
+const authToken = '{{ token }}';
+const authHeaders = {'Content-Type': 'application/json', 'Authorization': 'Bearer ' + authToken};
+
 async function saveRule(id) {
     await fetch('/admin/api/email-rules/' + id, {
-        method: 'POST', headers: {'Content-Type': 'application/json'},
+        method: 'POST', headers: authHeaders,
         body: JSON.stringify({
             condition: document.getElementById('cond_' + id).value,
             email: document.getElementById('email_' + id).value,
@@ -62,7 +65,7 @@ async function saveRule(id) {
 }
 async function addRule() {
     await fetch('/admin/api/email-rules/new', {
-        method: 'POST', headers: {'Content-Type': 'application/json'},
+        method: 'POST', headers: authHeaders,
         body: JSON.stringify({ condition: 'always', email: '', description: 'New rule' }),
     });
     location.reload();

app/templates/admin/users.html

@@ -2,7 +2,7 @@
 {% block title %}User Management — Admin{% endblock %}
 {% block content %}
 <div class="space-y-4">
-    <a href="/admin/" class="text-sm text-gray-400 hover:text-gray-600">← Admin Panel</a>
+    <a href="/admin/?token={{ token }}" class="text-sm text-gray-400 hover:text-gray-600">← Admin Panel</a>
     <div class="flex items-center justify-between">
         <h1 class="text-2xl font-bold sw-blue-text">User Management</h1>
         <button onclick="document.getElementById('addUser').classList.toggle('hidden')"
@@ -77,9 +77,12 @@
     </div>
 </div>
 <script>
+const authToken = '{{ token }}';
+const authHeaders = {'Content-Type': 'application/json', 'Authorization': 'Bearer ' + authToken};
+
 async function addUser() {
     const resp = await fetch('/admin/api/users/new', {
-        method: 'POST', headers: {'Content-Type': 'application/json'},
+        method: 'POST', headers: authHeaders,
         body: JSON.stringify({
             full_name: document.getElementById('new_name').value,
             email: document.getElementById('new_email').value,
@@ -92,7 +95,7 @@ async function addUser() {
     else alert(data.error || 'Failed');
 }
 async function toggleUser(id) {
-    await fetch('/admin/api/users/' + id + '/toggle', { method: 'POST' });
+    await fetch('/admin/api/users/' + id + '/toggle', { method: 'POST', headers: {'Authorization': 'Bearer ' + authToken} });
     location.reload();
 }
 </script>

app/templates/base.html

@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>{% block title %}Producer Intake Form{% endblock %}</title>
+    <title>{% block title %}Commission Agreement Intake Form{% endblock %}</title>
     <script src="https://cdn.tailwindcss.com"></script>
     <style>
         body { font-family: 'Segoe UI', system-ui, -apple-system, sans-serif; }
@@ -21,7 +21,7 @@
     <nav class="sw-blue text-white shadow-lg">
         <div class="max-w-7xl mx-auto px-4 py-3 flex items-center justify-between">
             <div class="flex items-center space-x-6">
-                <span class="text-lg font-bold tracking-tight">SW Producer Intake</span>
+                <span class="text-lg font-bold tracking-tight">SW Commission Intake</span>
                 <a href="/form?token={{ token }}" class="text-sm text-gray-200 hover:text-white transition">Form</a>
                 {% if user.role in ('admin', 'superadmin') %}
                 <a href="/admin/?token={{ token }}" class="text-sm text-gray-200 hover:text-white transition">Admin Panel</a>

app/templates/form.html

@@ -1,16 +1,16 @@
 {% extends "base.html" %}
-{% block title %}Producer Intake Form{% endblock %}
+{% block title %}Commission Agreement Intake Form{% endblock %}
 
 {% block content %}
 <div class="space-y-6">
-    <div
-        <h1 class="text-2xl font-bold sw-blue-text">Producer Intake Form</h1>
+    <div>
+        <h1 class="text-2xl font-bold sw-blue-text">Commission Agreement Intake Form</h1>
         <p class="text-gray-500 text-sm mt-1">Complete all fields. The summary table updates <strong>live</strong>.</p>
     </div>
 
     <!-- ── Section 1: Client Information ──────────────────── -->
     <div class="bg-white rounded-lg shadow overflow-hidden">
-        <div class="sw-blue text-white px-5 py-3 font-semibold">📋 Client Information</div>
+        <div class="sw-blue text-white px-5 py-3 font-semibold">Servicing Information</div>
         <div class="px-5 py-4 space-y-3">
             <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
                 <div>
@@ -43,24 +43,7 @@
                 </div>
             </div>
 
-            <!-- Bell Ringer Badge -->
-            <div id="bell_badge" class="bell-idle text-sm">🔔 Bell Ringer: --</div>
-
             <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-                <div>
-                    <label class="block text-sm font-medium text-gray-700 mb-1">Policy Effective Date</label>
-                    <input type="date" id="effective_date"
-                           class="w-full border border-gray-300 rounded-md px-3 py-2 text-sm">
-                </div>
-                <div>
-                    <label class="block text-sm font-medium text-gray-700 mb-1">Association</label>
-                    <select id="association" class="w-full border border-gray-300 rounded-md px-3 py-2 text-sm">
-                        <option value="">-- Select --</option>
-                        {% for a in associations %}
-                        <option value="{{ a.value }}">{{ a.label }}</option>
-                        {% endfor %}
-                    </select>
-                </div>
                 <div>
                     <label class="block text-sm font-medium text-gray-700 mb-1">Department Code</label>
                     <select id="dept_code" class="w-full border border-gray-300 rounded-md px-3 py-2 text-sm">
@@ -79,6 +62,26 @@
                     </select>
                 </div>
             </div>
+
+            <!-- Bell Ringer Badge (auto-populates based on revenue + department) -->
+            <div id="bell_badge" class="bell-idle text-sm cursor-default" title="Auto-populates based on estimated revenue and department code. Cannot be manually selected.">🔔 Bell Ringer: Select department code and enter revenue</div>
+
+            <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+                <div>
+                    <label class="block text-sm font-medium text-gray-700 mb-1">Policy Effective Date</label>
+                    <input type="date" id="effective_date"
+                           class="w-full border border-gray-300 rounded-md px-3 py-2 text-sm">
+                </div>
+                <div>
+                    <label class="block text-sm font-medium text-gray-700 mb-1">Association</label>
+                    <select id="association" class="w-full border border-gray-300 rounded-md px-3 py-2 text-sm">
+                        <option value="">-- Select --</option>
+                        {% for a in associations %}
+                        <option value="{{ a.value }}">{{ a.label }}</option>
+                        {% endfor %}
+                    </select>
+                </div>
+            </div>
         </div>
     </div>
 
@@ -313,15 +316,27 @@ async function refreshSummary() {
     if (!formData.agreement_id) {
         document.getElementById('summary_area').innerHTML =
             '<div class="bg-red-50 border border-red-200 text-red-700 px-4 py-3 rounded text-sm">' +
-            '⚠️ Select a <strong>Commission Agreement</strong> to generate the summary.</div>';
+            'Select a <strong>Commission Agreement</strong> to generate the summary.</div>';
         document.getElementById('warnings').innerHTML = '';
         document.getElementById('submit_btn').disabled = true;
         return;
     }
 
+    // ── Client-side validation: CCP + Bond incompatibility ──
+    const agrSelect = document.getElementById('agreement');
+    const agrName = agrSelect.options[agrSelect.selectedIndex]?.text || '';
+    const ccpVal = document.getElementById('complex_claims').value;
+    if (ccpVal && agrName.toLowerCase().includes('bond')) {
+        document.getElementById('warnings').innerHTML =
+            '<div class="bg-red-50 border border-red-300 text-red-800 px-4 py-2 rounded text-sm mb-2">Complex Claims Practice (CCP) is not eligible for Bond Agreement.</div>';
+        document.getElementById('summary_area').innerHTML = '';
+        document.getElementById('submit_btn').disabled = true;
+        return;
+    }
+
     try {
         const resp = await fetch('/api/compute-summary', {
-            method: 'POST', 
+            method: 'POST',
           headers: {'Content-Type': 'application/json', 'Authorization': 'Bearer ' + authToken},
             body: JSON.stringify(formData),
         });
@@ -330,7 +345,7 @@ async function refreshSummary() {
         // Warnings
         let warnHtml = '';
         (data.warnings || []).forEach(w => {
-            warnHtml += `<div class="bg-amber-50 border border-amber-300 text-amber-800 px-4 py-2 rounded text-sm mb-2">⚠️ ${w}</div>`;
+            warnHtml += `<div class="bg-amber-50 border border-amber-300 text-amber-800 px-4 py-2 rounded text-sm mb-2">${w}</div>`;
         });
         document.getElementById('warnings').innerHTML = warnHtml;
 

start.py

@@ -49,6 +49,51 @@ if not s.query(User).first():
 else:
     print("Database exists.")
 
+# ── Data migration: fix commission tier labels ───────────
+from app.models import CommissionAgreement, CommissionTier
+print("Checking commission data migrations...")
+
+# Fix Referral/Origination Fee: "Year 1-2" → "Year 1 & Year 2"
+ref_agr = s.query(CommissionAgreement).filter(
+    CommissionAgreement.name == "Referral / Origination Fee Agreement"
+).first()
+if ref_agr:
+    updated = 0
+    for tier in ref_agr.tiers:
+        if tier.years_label == "Year 1-2":
+            tier.years_label = "Year 1 & Year 2"
+            updated += 1
+    if updated:
+        s.commit()
+        print(f"  Fixed Referral/Origination Fee: {updated} tier labels updated to 'Year 1 & Year 2'")
+
+# Fix Life Origination Fee: "All Years" at 20% → "Year 1" at 20% + "Year 2+" Ended
+life_agr = s.query(CommissionAgreement).filter(
+    CommissionAgreement.name == "Life Origination Fee Agreement"
+).first()
+if life_agr:
+    all_years_tiers = [t for t in life_agr.tiers if t.years_label == "All Years"]
+    if all_years_tiers:
+        # Update existing tier to Year 1
+        all_years_tiers[0].years_label = "Year 1"
+        # Add Year 2+ Ended tier
+        max_sort = max((t.sort_order for t in life_agr.tiers), default=0)
+        ended_tier = CommissionTier(
+            agreement_id=life_agr.id,
+            producer_role="P1",
+            years_label="Year 2+",
+            commission=None,
+            credit=None,
+            agreement_label="Ended",
+            note="Life Referral is 20% Year 1 only. Year 2 it is removed.",
+            sort_order=max_sort + 1,
+        )
+        s.add(ended_tier)
+        s.commit()
+        print("  Fixed Life Origination Fee: Year 1 at 20%, Year 2+ Ended")
+
+print("Commission data migrations complete.")
+
 # Import refresh data if present (uploaded by Colab daily refresh)
 REFRESH_FILE = "refresh_data.json"
 if os.path.exists(REFRESH_FILE):