diff --git a/custom_objects/rollup_engine.py b/custom_objects/rollup_engine.py new file mode 100644 index 0000000..18278e6 --- /dev/null +++ b/custom_objects/rollup_engine.py @@ -0,0 +1,158 @@ +from decimal import Decimal +from django.db.models import Sum, Count, Min, Max, Avg +from django.core.exceptions import ValidationError +from custom_objects.models import CustomFieldDefinition, CustomRecord + +STANDARD_REVERSE_RELATIONS = { + 'Account': { + 'Opportunity': {'fk_field': 'account', 'related_name': 'opportunities'}, + 'Contact': {'fk_field': 'account', 'related_name': 'contacts'}, + 'Activity': {'fk_field': 'account', 'related_name': 'activities'}, + }, + 'Contact': { + 'Opportunity': {'fk_field': 'primary_contact', 'related_name': 'opportunities'}, + 'Activity': {'fk_field': 'contact', 'related_name': 'activities'}, + }, + 'Lead': { + 'Activity': {'fk_field': 'lead', 'related_name': 'activities'}, + }, + 'Opportunity': { + 'Activity': {'fk_field': 'opportunity', 'related_name': 'activities'}, + } +} + + +def recalculate_rollups_for_record(parent_entity_or_object, parent_id): + """ + Recalculates all roll-up summary fields defined on the parent record. + parent_entity_or_object: Model class name (e.g. 'Account') or CustomObjectDefinition instance / name. + parent_id: Primary key of parent record. + """ + if not parent_id: + return + + # Check for standard model vs custom object + if isinstance(parent_entity_or_object, str): + # Could be standard entity name or custom object api_name + from crm_core.models import Account, Contact, Lead, Opportunity, Activity + from outreach.models import Campaign + model_map = { + 'Account': Account, + 'Contact': Contact, + 'Lead': Lead, + 'Opportunity': Opportunity, + 'Activity': Activity, + 'Campaign': Campaign, + } + parent_model = model_map.get(parent_entity_or_object) + if parent_model: + rollup_fields = CustomFieldDefinition.objects.filter( + entity_name=parent_entity_or_object, + field_type='rollup' + ) + try: + parent_instance = parent_model.objects.get(pk=parent_id) + except parent_model.DoesNotExist: + return + + if not rollup_fields.exists(): + return + + if parent_instance.custom_fields is None: + parent_instance.custom_fields = {} + + modified = False + for rf in rollup_fields: + val = compute_rollup_value(parent_instance, rf) + parent_instance.custom_fields[rf.name] = val + modified = True + + if modified: + parent_instance.save(update_fields=['custom_fields']) + return + + # Custom object records rollup + # If parent is custom object + rollup_fields = CustomFieldDefinition.objects.filter( + custom_object__name=str(parent_entity_or_object), + field_type='rollup' + ) + if not rollup_fields.exists(): + return + try: + parent_record = CustomRecord.objects.get(pk=parent_id) + except CustomRecord.DoesNotExist: + return + + if parent_record.data is None: + parent_record.data = {} + + modified = False + for rf in rollup_fields: + val = compute_rollup_value(parent_record, rf) + parent_record.data[rf.name] = val + modified = True + + if modified: + parent_record.save(update_fields=['data']) + + +def compute_rollup_value(parent_instance, rollup_field_def): + """ + Computes aggregation for a given rollup field definition against parent instance. + rollup_field_def: CustomFieldDefinition with rollup attributes: + - rollup_summary_object (e.g. 'Opportunity' or 'invoice_item__c') + - rollup_type ('COUNT', 'SUM', 'MIN', 'MAX', 'AVG') + - rollup_field (e.g. 'amount') + - rollup_filter (dict or None) + """ + from crm_core.models import Account, Contact, Lead, Opportunity, Activity + from outreach.models import Campaign + model_map = { + 'Account': Account, + 'Contact': Contact, + 'Lead': Lead, + 'Opportunity': Opportunity, + 'Activity': Activity, + 'Campaign': Campaign, + } + + child_entity = rollup_field_def.rollup_summary_object + rollup_type = (rollup_field_def.rollup_type or 'COUNT').upper() + target_field = rollup_field_def.rollup_field + filter_criteria = rollup_field_def.rollup_filter or {} + + # Check standard child models + if child_entity in model_map: + child_model = model_map[child_entity] + parent_class_name = parent_instance.__class__.__name__ + + # Resolve foreign key lookup from child to parent + rel_info = STANDARD_REVERSE_RELATIONS.get(parent_class_name, {}).get(child_entity) + if rel_info: + filter_kwargs = {f"{rel_info['fk_field']}_id": parent_instance.id} + else: + filter_kwargs = {f"{parent_class_name.lower()}_id": parent_instance.id} + + # Apply additional filter criteria if present + for k, v in filter_criteria.items(): + filter_kwargs[k] = v + + qs = child_model.objects.filter(**filter_kwargs) + + if rollup_type == 'COUNT': + return qs.count() + elif rollup_type == 'SUM': + res = qs.aggregate(val=Sum(target_field))['val'] + return float(res) if isinstance(res, (int, float, Decimal)) else 0.0 + elif rollup_type == 'MIN': + res = qs.aggregate(val=Min(target_field))['val'] + return float(res) if isinstance(res, (int, float, Decimal)) else (res or 0) + elif rollup_type == 'MAX': + res = qs.aggregate(val=Max(target_field))['val'] + return float(res) if isinstance(res, (int, float, Decimal)) else (res or 0) + elif rollup_type == 'AVG': + res = qs.aggregate(val=Avg(target_field))['val'] + return float(res) if isinstance(res, (int, float, Decimal)) else 0.0 + + return 0 diff --git a/custom_objects/signals.py b/custom_objects/signals.py index c329300..f4eeb3f 100644 --- a/custom_objects/signals.py +++ b/custom_objects/signals.py @@ -1,9 +1,10 @@ -from django.db.models.signals import pre_save +from django.db.models.signals import pre_save, post_save, post_delete from django.dispatch import receiver from custom_objects.models import CustomRecord from crm_core.models import Account, Contact, Lead, Opportunity, Activity from outreach.models import Campaign from custom_objects.formula_engine import evaluate_all_formulas_for_instance +from custom_objects.rollup_engine import recalculate_rollups_for_record @receiver(pre_save, sender=Account) @@ -15,3 +16,36 @@ from custom_objects.formula_engine import evaluate_all_formulas_for_instance @receiver(pre_save, sender=CustomRecord) def evaluate_record_formulas(sender, instance, **kwargs): evaluate_all_formulas_for_instance(instance) + + +# Roll-up summary triggers on child objects +@receiver(post_save, sender=Opportunity) +@receiver(post_delete, sender=Opportunity) +def trigger_opportunity_rollup(sender, instance, **kwargs): + if instance.account_id: + recalculate_rollups_for_record('Account', instance.account_id) + if instance.primary_contact_id: + recalculate_rollups_for_record('Contact', instance.primary_contact_id) + + +@receiver(post_save, sender=Contact) +@receiver(post_delete, sender=Contact) +def trigger_contact_rollup(sender, instance, **kwargs): + if instance.account_id: + recalculate_rollups_for_record('Account', instance.account_id) + + +@receiver(post_save, sender=Activity) +@receiver(post_delete, sender=Activity) +def trigger_activity_rollup(sender, instance, **kwargs): + if hasattr(instance, 'content_type') and instance.content_type: + model_name = instance.content_type.model.capitalize() + recalculate_rollups_for_record(model_name, instance.object_id) + if getattr(instance, 'account_id', None): + recalculate_rollups_for_record('Account', instance.account_id) + if getattr(instance, 'contact_id', None): + recalculate_rollups_for_record('Contact', instance.contact_id) + if getattr(instance, 'opportunity_id', None): + recalculate_rollups_for_record('Opportunity', instance.opportunity_id) + if getattr(instance, 'lead_id', None): + recalculate_rollups_for_record('Lead', instance.lead_id) diff --git a/frontend/src/stores/crm.js b/frontend/src/stores/crm.js index c3a865e..46478a2 100644 --- a/frontend/src/stores/crm.js +++ b/frontend/src/stores/crm.js @@ -159,20 +159,37 @@ export const useCrmStore = defineStore('crm', { ] } - const normalizedCustom = (custom || []).map(f => ({ - name: f.name, - label: f.label || f.name, - data_type: (f.field_type || 'Text').charAt(0).toUpperCase() + (f.field_type || 'Text').slice(1), - is_custom: true, - is_required: !!f.is_required, - is_unique: !!f.is_unique, - is_indexed: !!f.is_unique, - choices: f.options || f.choices || [], - origin: 'Custom', - editable: true, - id: f.id, - raw: f - })) + const normalizedCustom = (custom || []).map(f => { + let displayType = (f.field_type || 'Text').charAt(0).toUpperCase() + (f.field_type || 'Text').slice(1) + if (f.field_type === 'formula') { + displayType = `Formula (${(f.formula_return_type || 'Text').charAt(0).toUpperCase() + (f.formula_return_type || 'Text').slice(1)})` + } else if (f.field_type === 'rollup_summary') { + displayType = `Roll-Up Summary (${(f.rollup_type || 'COUNT').toUpperCase()})` + } + return { + name: f.name, + label: f.label || f.name, + data_type: displayType, + field_type: f.field_type, + formula_expression: f.formula_expression, + formula_return_type: f.formula_return_type, + rollup_summary_object: f.rollup_summary_object, + rollup_field: f.rollup_field, + rollup_type: f.rollup_type, + rollup_filter: f.rollup_filter, + is_custom: true, + is_formula: f.field_type === 'formula', + is_rollup: f.field_type === 'rollup_summary', + is_required: !!f.is_required, + is_unique: !!f.is_unique, + is_indexed: !!f.is_unique, + choices: f.options || f.choices || [], + origin: f.field_type === 'formula' ? 'Custom (Formula)' : (f.field_type === 'rollup_summary' ? 'Custom (Roll-Up)' : 'Custom'), + editable: true, + id: f.id, + raw: f + } + }) this.allObjectFields = [...standard, ...normalizedCustom] return this.allObjectFields @@ -187,6 +204,10 @@ export const useCrmStore = defineStore('crm', { await this.fetchCustomObjects() return res.data }, + async validateFormula(expression) { + const res = await api.post('/custom-fields/validate-formula/', { expression }) + return res.data + }, async fetchCustomRecords(objectName) { try { const res = await api.get(`/custom/${objectName}/`) diff --git a/frontend/src/views/CustomObjectsView.vue b/frontend/src/views/CustomObjectsView.vue index 06b8505..6615cd2 100644 --- a/frontend/src/views/CustomObjectsView.vue +++ b/frontend/src/views/CustomObjectsView.vue @@ -113,6 +113,8 @@ field.data_type === 'Picklist' ? 'bg-blue-50 text-blue-700 border border-blue-200' : field.data_type === 'Checkbox' ? 'bg-amber-50 text-amber-700 border border-amber-200' : field.data_type === 'AutoNumber' ? 'bg-slate-200 text-slate-700 font-bold' : + field.is_formula ? 'bg-indigo-50 text-indigo-700 border border-indigo-200 font-semibold' : + field.is_rollup ? 'bg-cyan-50 text-cyan-700 border border-cyan-200 font-semibold' : 'bg-slate-100 text-slate-600' ]"> {{ field.data_type }} @@ -120,7 +122,9 @@ - Custom + Custom (Formula) + Custom (Roll-Up) + Custom Standard @@ -228,8 +232,115 @@ + + + + +
+
+ + Salesforce AST Sandboxed +
+ + +
+ Insert: + + + + + + + + + +
+ + +
+ Insert Field: + +
+ + + +
+
+ + +
+ +
+ + +
+ {{ formulaSyntaxResult.valid ? '✓ Syntax Valid' : '✕ Syntax Error' }}: + {{ formulaSyntaxResult.valid ? `Identifiers referenced: ${formulaSyntaxResult.identifiers.join(', ') || 'None'}` : formulaSyntaxResult.error }} +
+
+ + +
+
+ + Child Aggregation +
+ +
+
+ + +
+
+ + +
+
+ +
+ + +
+ +
+ + + Optional key-value JSON filter to match only specific child records. +
+
@@ -330,10 +441,64 @@ const showFieldModal = ref(false) const showRecordModal = ref(false) const newObj = ref({ label: '', plural_label: '', api_name: '', description: '' }) -const newField = ref({ label: '', name: '', field_type: 'text', is_required: false }) +const newField = ref({ + label: '', + name: '', + field_type: 'text', + is_required: false, + formula_expression: '', + formula_return_type: 'number', + rollup_summary_object: '', + rollup_field: '', + rollup_type: 'COUNT', + rollup_filter_raw: '' +}) const newRecordName = ref('') const newRecordData = ref({}) +const isValidatingFormula = ref(false) +const formulaSyntaxResult = ref(null) + +function insertFormulaHelper(helperText) { + if (!newField.value.formula_expression) { + newField.value.formula_expression = helperText + } else { + newField.value.formula_expression += helperText + } +} + +function insertSelectedField(event) { + const val = event.target.value + if (!val) return + if (!newField.value.formula_expression) { + newField.value.formula_expression = val + } else { + newField.value.formula_expression += ` ${val}` + } + event.target.value = '' +} + +async function checkFormulaSyntax() { + if (!newField.value.formula_expression) return + isValidatingFormula.value = true + formulaSyntaxResult.value = null + try { + const res = await crmStore.validateFormula(newField.value.formula_expression) + formulaSyntaxResult.value = { + valid: true, + identifiers: res.identifiers || [] + } + } catch (err) { + const errMsg = err.response?.data?.error || err.message || 'Syntax validation failed' + formulaSyntaxResult.value = { + valid: false, + error: errMsg + } + } finally { + isValidatingFormula.value = false + } +} + function syncFieldName() { if (newField.value.label && !newField.value.name.endsWith('__c')) { const slug = newField.value.label.toLowerCase().replace(/[^a-z0-9]/g, '_') @@ -370,6 +535,22 @@ async function createCustomField() { is_required: newField.value.is_required, } + if (newField.value.field_type === 'formula') { + payload.formula_expression = newField.value.formula_expression + payload.formula_return_type = newField.value.formula_return_type + } else if (newField.value.field_type === 'rollup_summary') { + payload.rollup_summary_object = newField.value.rollup_summary_object + payload.rollup_field = newField.value.rollup_field + payload.rollup_type = newField.value.rollup_type + if (newField.value.rollup_filter_raw) { + try { + payload.rollup_filter = JSON.parse(newField.value.rollup_filter_raw) + } catch (e) { + payload.rollup_filter = null + } + } + } + if (selectedObj.value.is_standard) { payload.entity_name = selectedObj.value.id } else { @@ -378,7 +559,19 @@ async function createCustomField() { await crmStore.createCustomField(payload) showFieldModal.value = false - newField.value = { label: '', name: '', field_type: 'text', is_required: false } + formulaSyntaxResult.value = null + newField.value = { + label: '', + name: '', + field_type: 'text', + is_required: false, + formula_expression: '', + formula_return_type: 'number', + rollup_summary_object: '', + rollup_field: '', + rollup_type: 'COUNT', + rollup_filter_raw: '' + } if (selectedObj.value.is_standard) { await crmStore.fetchObjectSchema(selectedObj.value.id, true) diff --git a/tests/test_rollup_engine.py b/tests/test_rollup_engine.py new file mode 100644 index 0000000..8b837f2 --- /dev/null +++ b/tests/test_rollup_engine.py @@ -0,0 +1,84 @@ +import pytest +from django.contrib.auth import get_user_model +from crm_core.models import Account, Opportunity, Contact, Activity +from custom_objects.models import CustomFieldDefinition + +User = get_user_model() + + +@pytest.mark.django_db +class TestRollupEngine: + def test_account_opportunity_rollups(self): + u = User.objects.create_user('rollup_user', 'ru@example.com', 'pass') + acc = Account.objects.create(name='Acme Corp', owner=u) + + # Create Roll-Up: Total Opportunity Amount (SUM) + CustomFieldDefinition.objects.create( + entity_name='Account', + name='total_opp_amount__c', + label='Total Opp Amount', + field_type='rollup', + rollup_summary_object='Opportunity', + rollup_type='SUM', + rollup_field='amount' + ) + + # Create Roll-Up: Opportunity Count (COUNT) + CustomFieldDefinition.objects.create( + entity_name='Account', + name='opp_count__c', + label='Opportunity Count', + field_type='rollup', + rollup_summary_object='Opportunity', + rollup_type='COUNT' + ) + + # Create child opportunities + opp1 = Opportunity.objects.create(name='Opp 1', account=acc, amount=10000, stage='Prospecting', close_date='2026-12-31', owner=u) + acc.refresh_from_db() + + assert acc.custom_fields.get('opp_count__c') == 1 + assert float(acc.custom_fields.get('total_opp_amount__c')) == 10000.0 + + # Add second opportunity + opp2 = Opportunity.objects.create(name='Opp 2', account=acc, amount=25000, stage='Qualification', close_date='2026-12-31', owner=u) + acc.refresh_from_db() + + assert acc.custom_fields.get('opp_count__c') == 2 + assert float(acc.custom_fields.get('total_opp_amount__c')) == 35000.0 + + # Delete an opportunity + opp1.delete() + acc.refresh_from_db() + + assert acc.custom_fields.get('opp_count__c') == 1 + assert float(acc.custom_fields.get('total_opp_amount__c')) == 25000.0 + + def test_contact_opportunity_rollups(self): + u = User.objects.create_user('rollup_user2', 'ru2@example.com', 'pass') + acc = Account.objects.create(name='Acme Corp 2', owner=u) + contact = Contact.objects.create(first_name='John', last_name='Doe', email='john@example.com', account=acc, owner=u) + + # Create Roll-Up: Total Opportunity Amount on Account with stage filter + CustomFieldDefinition.objects.create( + entity_name='Account', + name='won_opp_amount__c', + label='Won Opp Amount', + field_type='rollup', + rollup_summary_object='Opportunity', + rollup_type='SUM', + rollup_field='amount', + rollup_filter={'stage': 'Closed Won'} + ) + + opp1 = Opportunity.objects.create(name='Opp Won', account=acc, amount=5000, stage='Closed Won', close_date='2026-12-31', owner=u) + opp2 = Opportunity.objects.create(name='Opp Lost', account=acc, amount=3000, stage='Closed Lost', close_date='2026-12-31', owner=u) + acc.refresh_from_db() + + assert float(acc.custom_fields.get('won_opp_amount__c')) == 5000.0 + + # Update opp2 to Closed Won + opp2.stage = 'Closed Won' + opp2.save() + acc.refresh_from_db() + assert float(acc.custom_fields.get('won_opp_amount__c')) == 8000.0