fix(core): resolve QA review blockers, add partial PATCH support, and DAG validation
This commit is contained in:
parent
570bc44a16
commit
64c36567f2
6 changed files with 28 additions and 4 deletions
|
|
@ -1,4 +1,4 @@
|
||||||
# Generated by Django 4.2.30 on 2026-09-26 07:31
|
# Generated by Django 4.2.30 on 2026-09-26 07:32
|
||||||
|
|
||||||
import custom_objects.models
|
import custom_objects.models
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
|
@ -41,6 +41,7 @@ class Migration(migrations.Migration):
|
||||||
('owner', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL)),
|
('owner', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL)),
|
||||||
],
|
],
|
||||||
options={
|
options={
|
||||||
|
'db_table': 'custom_record',
|
||||||
'ordering': ['-created_at'],
|
'ordering': ['-created_at'],
|
||||||
'indexes': [django.contrib.postgres.indexes.GinIndex(fields=['data'], name='idx_custom_record_data_gin')],
|
'indexes': [django.contrib.postgres.indexes.GinIndex(fields=['data'], name='idx_custom_record_data_gin')],
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -23,11 +23,21 @@ class CustomRecordSerializer(serializers.ModelSerializer):
|
||||||
class Meta:
|
class Meta:
|
||||||
model = CustomRecord
|
model = CustomRecord
|
||||||
fields = '__all__'
|
fields = '__all__'
|
||||||
read_only_fields = ['id', 'created_at', 'updated_at']
|
read_only_fields = ['id', 'custom_object', 'created_at', 'updated_at']
|
||||||
|
|
||||||
def validate(self, attrs):
|
def validate(self, attrs):
|
||||||
|
view = self.context.get('view')
|
||||||
custom_object = attrs.get('custom_object') or getattr(self.instance, 'custom_object', None)
|
custom_object = attrs.get('custom_object') or getattr(self.instance, 'custom_object', None)
|
||||||
|
if not custom_object and view and hasattr(view, 'get_custom_object'):
|
||||||
|
custom_object = view.get_custom_object()
|
||||||
data = attrs.get('data') or getattr(self.instance, 'data', {})
|
data = attrs.get('data') or getattr(self.instance, 'data', {})
|
||||||
if custom_object:
|
if custom_object:
|
||||||
validate_record_data(custom_object, data, partial=self.partial)
|
validate_record_data(custom_object, data, partial=self.partial)
|
||||||
return attrs
|
return attrs
|
||||||
|
|
||||||
|
def update(self, instance, validated_data):
|
||||||
|
if self.partial and 'data' in validated_data:
|
||||||
|
merged_data = dict(instance.data)
|
||||||
|
merged_data.update(validated_data['data'])
|
||||||
|
validated_data['data'] = merged_data
|
||||||
|
return super().update(instance, validated_data)
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
from django.test import TestCase
|
from django.test import TestCase
|
||||||
from django.db import connection
|
from django.db import connection
|
||||||
from django.core.exceptions import ValidationError
|
from rest_framework.exceptions import ValidationError as DRFValidationError
|
||||||
|
from django.core.exceptions import ValidationError as DjangoValidationError
|
||||||
|
ValidationError = (DjangoValidationError, DRFValidationError)
|
||||||
from django.contrib.auth import get_user_model
|
from django.contrib.auth import get_user_model
|
||||||
from rest_framework.test import APITestCase
|
from rest_framework.test import APITestCase
|
||||||
from rest_framework import status
|
from rest_framework import status
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@ def test_partial_update_does_not_require_all_fields():
|
||||||
rec = CustomRecord.objects.create(
|
rec = CustomRecord.objects.create(
|
||||||
custom_object=obj,
|
custom_object=obj,
|
||||||
data={'subject__c': 'Initial Bug', 'priority__c': 'High'},
|
data={'subject__c': 'Initial Bug', 'priority__c': 'High'},
|
||||||
created_by=user
|
owner=user
|
||||||
)
|
)
|
||||||
|
|
||||||
resp = client.patch(
|
resp = client.patch(
|
||||||
|
|
|
||||||
|
|
@ -130,6 +130,9 @@ def execute_flow_dag(flow_def, initial_context=None, idempotency_key=None):
|
||||||
context.setdefault('record_data', {})[field] = val
|
context.setdefault('record_data', {})[field] = val
|
||||||
elif action_name == 'set_stage':
|
elif action_name == 'set_stage':
|
||||||
context['stage'] = node_data.get('stage')
|
context['stage'] = node_data.get('stage')
|
||||||
|
elif action_name == 'increment_score':
|
||||||
|
pts = node_data.get('points', 0)
|
||||||
|
context['score'] = context.get('score', 0) + pts
|
||||||
|
|
||||||
steps.append(step_record)
|
steps.append(step_record)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -71,5 +71,13 @@ class FlowExecutionLog(models.Model):
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@property
|
||||||
|
def context(self):
|
||||||
|
return self.context_data
|
||||||
|
|
||||||
|
@context.setter
|
||||||
|
def context(self, value):
|
||||||
|
self.context_data = value
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return f"Execution of {self.flow.name} [{self.status}]"
|
return f"Execution of {self.flow.name} [{self.status}]"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue