ConceptProd/ConceptPortal-public
1
0
Fork 0
mirror of https://github.com/IRBorisov/ConceptPortal.git synced 2025-11-15 17:21:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

R: Rename association -> attributions

Browse Source
This commit is contained in:
Ivan 2025-11-07 00:09:42 +03:00
parent e9f31c0e7a
commit f43916a483
9 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rsconcept/backend/apps/oss/models/OperationSchemaCached.py
View File

@ -318,16 +318,16 @@ class OperationSchemaCached:
mapping={}
)
def after_create_attribution(self, schemaID: int, associations: list[Attribution],
def after_create_attribution(self, schemaID: int, attributions: list[Attribution],
exclude: Optional[list[int]] = None) -> None:
''' Trigger cascade resolutions when Attribution is created. '''
operation = self.cache.get_operation(schemaID)
self.engine.on_inherit_attribution(operation.pk, associations, exclude)
self.engine.on_inherit_attribution(operation.pk, attributions, exclude)
def before_delete_attribution(self, schemaID: int, associations: list[Attribution]) -> None:
def before_delete_attribution(self, schemaID: int, attributions: list[Attribution]) -> None:
''' Trigger cascade resolutions when Attribution is deleted. '''
operation = self.cache.get_operation(schemaID)
self.engine.on_delete_attribution(operation.pk, associations)
self.engine.on_delete_attribution(operation.pk, attributions)
def _on_add_substitutions(self, schema: Optional[RSFormCached], added: list[Substitution]) -> None:
''' Trigger cascade resolutions when Constituenta substitution is added. '''

6
rsconcept/backend/apps/oss/models/PropagationEngine.py
View File

@ -185,7 +185,7 @@ class PropagationEngine:
self.on_before_substitute(child_operation.pk, new_substitutions)
child_schema.substitute(new_substitutions)
def on_delete_attribution(self, operationID: int, associations: list[Attribution]) -> None:
def on_delete_attribution(self, operationID: int, attributions: list[Attribution]) -> None:
''' Trigger cascade resolutions when Attribution is deleted. '''
children = self.cache.extend_graph.outputs[operationID]
if not children:
@ -198,7 +198,7 @@ class PropagationEngine:
continue
deleted: list[Attribution] = []
for attr in associations:
for attr in attributions:
new_container = self.cache.get_inheritor(attr.container_id, child_id)
new_attribute = self.cache.get_inheritor(attr.attribute_id, child_id)
if new_container is None or new_attribute is None:
@ -211,7 +211,7 @@ class PropagationEngine:
deleted.append(deleted_assoc[0])
if deleted:
self.on_delete_attribution(child_id, deleted)
Attribution.objects.filter(pk__in=[assoc.pk for assoc in deleted]).delete()
Attribution.objects.filter(pk__in=[attrib.pk for attrib in deleted]).delete()
def on_delete_inherited(self, operation: int, target: list[int]) -> None:
''' Trigger cascade resolutions when Constituenta inheritance is deleted. '''

8
rsconcept/backend/apps/oss/models/PropagationFacade.py
View File

@ -82,20 +82,20 @@ class PropagationFacade:
OperationSchemaCached(host).before_delete_cst(item.pk, ids)
@staticmethod
def after_create_attribution(sourceID: int, associations: list[Attribution],
def after_create_attribution(sourceID: int, attributions: list[Attribution],
exclude: Optional[list[int]] = None) -> None:
''' Trigger cascade resolutions when Attribution is created. '''
hosts = _get_oss_hosts(sourceID)
for host in hosts:
if exclude is None or host.pk not in exclude:
OperationSchemaCached(host).after_create_attribution(sourceID, associations)
OperationSchemaCached(host).after_create_attribution(sourceID, attributions)
@staticmethod
def before_delete_attribution(sourceID: int,
associations: list[Attribution],
attributions: list[Attribution],
exclude: Optional[list[int]] = None) -> None:
''' Trigger cascade resolutions before Attribution is deleted. '''
hosts = _get_oss_hosts(sourceID)
for host in hosts:
if exclude is None or host.pk not in exclude:
OperationSchemaCached(host).before_delete_attribution(sourceID, associations)
OperationSchemaCached(host).before_delete_attribution(sourceID, attributions)

12
rsconcept/backend/apps/rsform/serializers/data_access.py
View File

@ -228,10 +228,10 @@ class RSFormSerializer(StrictModelSerializer):
'id': oss.pk,
'alias': oss.alias
})
for assoc in Attribution.objects.filter(container__schema=instance).only('container_id', 'attribute_id'):
for attrib in Attribution.objects.filter(container__schema=instance).only('container_id', 'attribute_id'):
result['attribution'].append({
'container': assoc.container_id,
'attribute': assoc.attribute_id
'container': attrib.container_id,
'attribute': attrib.attribute_id
})
return result
@ -304,9 +304,9 @@ class RSFormSerializer(StrictModelSerializer):
Attribution.objects.filter(container__schema=instance).delete()
attributions_to_create: list[Attribution] = []
for assoc in data.get('attribution', []):
old_container_id = assoc['container']
old_attribute_id = assoc['attribute']
for attrib in data.get('attribution', []):
old_container_id = attrib['container']
old_attribute_id = attrib['attribute']
container_id = id_map.get(old_container_id)
attribute_id = id_map.get(old_attribute_id)
if container_id and attribute_id:

16
rsconcept/backend/apps/rsform/tests/s_views/t_attribtuions.py
View File

@ -45,10 +45,10 @@ class TestAttributionsEndpoints(EndpointTester):
self.executeBadData(data, item=self.unowned_id)
response = self.executeCreated(data, item=self.owned_id)
associations = response.data['attribution']
self.assertEqual(len(associations), 1)
self.assertEqual(associations[0]['container'], self.n1.pk)
self.assertEqual(associations[0]['attribute'], self.x1.pk)
attributions = response.data['attribution']
self.assertEqual(len(attributions), 1)
self.assertEqual(attributions[0]['container'], self.n1.pk)
self.assertEqual(attributions[0]['attribute'], self.x1.pk)
@decl_endpoint('/api/rsforms/{item}/create-attribution', method='post')
@ -94,7 +94,7 @@ class TestAttributionsEndpoints(EndpointTester):
attribute=self.n1
)
response = self.executeOK(data, item=self.owned_id)
associations = response.data['attribution']
self.assertEqual(len(associations), 1)
self.assertEqual(associations[0]['container'], self.n2.pk)
self.assertEqual(associations[0]['attribute'], self.n1.pk)
attributions = response.data['attribution']
self.assertEqual(len(attributions), 1)
self.assertEqual(attributions[0]['container'], self.n2.pk)
self.assertEqual(attributions[0]['attribute'], self.n1.pk)

4
rsconcept/backend/apps/rsform/views/rsforms.py
View File

@ -346,7 +346,7 @@ class RSFormViewSet(viewsets.GenericViewSet, generics.ListAPIView, generics.Retr
})
PropagationFacade.before_delete_attribution(item.pk, target)
m.Attribution.objects.filter(pk__in=[assoc.pk for assoc in target]).delete()
m.Attribution.objects.filter(pk__in=[attrib.pk for attrib in target]).delete()
item.save(update_fields=['time_update'])
return Response(
@ -376,7 +376,7 @@ class RSFormViewSet(viewsets.GenericViewSet, generics.ListAPIView, generics.Retr
target = list(m.Attribution.objects.filter(container=serializer.validated_data['target']))
if target:
PropagationFacade.before_delete_attribution(item.pk, target)
m.Attribution.objects.filter(pk__in=[assoc.pk for assoc in target]).delete()
m.Attribution.objects.filter(pk__in=[attrib.pk for attrib in target]).delete()
item.save(update_fields=['time_update'])
return Response(

10
rsconcept/frontend/src/features/rsform/backend/rsform-loader.ts
View File

@ -110,11 +110,11 @@ export class RSFormLoader {
parent.spawn_alias.push(cst.alias);
}
});
this.schema.attribution.forEach(assoc => {
const container = this.cstByID.get(assoc.container)!;
container.attributes.push(assoc.attribute);
this.full_graph.addEdge(container.id, assoc.attribute);
this.association_graph.addEdge(container.id, assoc.attribute);
this.schema.attribution.forEach(attrib => {
const container = this.cstByID.get(attrib.container)!;
container.attributes.push(attrib.attribute);
this.full_graph.addEdge(container.id, attrib.attribute);
this.association_graph.addEdge(container.id, attrib.attribute);
});
}

2
rsconcept/frontend/src/features/rsform/backend/types.ts
View File

@ -97,7 +97,7 @@ export type ISubstitutionsDTO = z.infer<typeof schemaSubstitutions>;
/** Represents data for creating or deleting an Attribution. */
export type IAttribution = z.infer<typeof schemaAttribution>;
/** Represents data for clearing all associations for a target constituenta. */
/** Represents data for clearing all attributions for a target constituenta. */
export type IAttributionTargetDTO = z.infer<typeof schemaAttributionTarget>;
/** Represents Constituenta list. */

4
rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-constituenta/form-constituenta.tsx
View File

@ -112,7 +112,7 @@ export function FormConstituenta({ disabled, id, toggleReset, schema, activeCst,
[activeCst, localParse]
);
const associations = useMemo(
const attributions = useMemo(
() => activeCst.attributes.map(id => schema.cstByID.get(id)!),
[activeCst.attributes, schema.cstByID]
);
@ -291,7 +291,7 @@ export function FormConstituenta({ disabled, id, toggleReset, schema, activeCst,
<Label text='Атрибутирующие конституенты' />
<SelectMultiConstituenta
items={schema.items.filter(item => item.id !== activeCst.id)}
value={associations}
value={attributions}
onAdd={handleAddAttribution}
onClear={handleClearAttributions}
onRemove={handleRemoveAttribution}