From dcaf93057002668226f19e5a36b9c41afb30b618 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Sun, 28 Apr 2024 19:44:13 +0300
Subject: [PATCH] Apply restore_order after synthesis

---
 rsconcept/backend/apps/rsform/tests/s_views/t_operations.py | 2 ++
 rsconcept/backend/apps/rsform/views/operations.py           | 1 +
 2 files changed, 3 insertions(+)

diff --git a/rsconcept/backend/apps/rsform/tests/s_views/t_operations.py b/rsconcept/backend/apps/rsform/tests/s_views/t_operations.py
index 3bd8facd..092c20cb 100644
--- a/rsconcept/backend/apps/rsform/tests/s_views/t_operations.py
+++ b/rsconcept/backend/apps/rsform/tests/s_views/t_operations.py
@@ -78,7 +78,9 @@ class TestInlineSynthesis(EndpointTester):
         result = {item['alias']: item for item in response.data['items']}
         self.assertEqual(len(result), 6)
         self.assertEqual(result['X2']['term_raw'], ks1_x2.term_raw)
+        self.assertEqual(result['X2']['order'], 1)
         self.assertEqual(result['X4']['term_raw'], ks2_x2.term_raw)
+        self.assertEqual(result['X4']['order'], 2)
         self.assertEqual(result['S1']['term_raw'], ks2_x1.term_raw)
         self.assertEqual(result['S2']['term_raw'], ks2_s1.term_raw)
         self.assertEqual(result['S1']['definition_formal'], 'X2')
diff --git a/rsconcept/backend/apps/rsform/views/operations.py b/rsconcept/backend/apps/rsform/views/operations.py
index 74db122a..df93babd 100644
--- a/rsconcept/backend/apps/rsform/views/operations.py
+++ b/rsconcept/backend/apps/rsform/views/operations.py
@@ -40,6 +40,7 @@ def inline_synthesis(request: Request):
             index = next(i for (i, cst) in enumerate(items) if cst == replacement)
             replacement = new_items[index]
         schema.substitute(original, replacement, substitution['transfer_term'])
+    schema.restore_order()
     return Response(
         status=c.HTTP_200_OK,
         data=s.RSFormParseSerializer(schema.item).data