Merge pull request #124 from finmars-platform/new-ttype-input

New ttype input

Author: falendary

.gitignore

@@ -168,4 +168,6 @@ postgres_data/
 rabbitmq_data/
 redis_data/
 
+finmars-core.iml
+
 *.sql

poms/clients/fields.py

@@ -0,0 +1,6 @@
+from poms.clients.models import Client
+from poms.common.fields import PrimaryKeyRelatedFilteredField
+
+
+class ClientField(PrimaryKeyRelatedFilteredField):
+    queryset = Client.objects

poms/clients/serializers.py

@@ -16,7 +16,7 @@
 )
 
 
-class ClientsSerializer(ModelWithUserCodeSerializer):
+class ClientSerializer(ModelWithUserCodeSerializer):
     master_user = MasterUserField()
 
     portfolios = serializers.PrimaryKeyRelatedField(queryset=Portfolio.objects.all(), many=True, required=False)
@@ -180,7 +180,7 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields["user_code"] = UserCodeField()
         self.fields["deleted_user_code"] = UserCodeField(read_only=True)
-        self.fields["client_object"] = ClientsSerializer(source="client", many=False, read_only=True)
+        self.fields["client_object"] = ClientSerializer(source="client", many=False, read_only=True)
 
     def create(self, validated_data):
         instance = super().create(validated_data)

poms/clients/views.py

@@ -2,7 +2,7 @@
 
 from poms.clients.filters import ClientSecretFilterSet, ClientsFilterSet
 from poms.clients.models import Client, ClientSecret
-from poms.clients.serializers import ClientSecretSerializer, ClientsSerializer
+from poms.clients.serializers import ClientSecretSerializer, ClientSerializer
 from poms.common.views import AbstractModelViewSet
 from poms.users.filters import OwnerByMasterUserFilter
 
@@ -15,7 +15,7 @@ class ClientsViewSet(AbstractModelViewSet):
         OwnerByMasterUserFilter,
     ]
     filterset_class = ClientsFilterSet
-    serializer_class = ClientsSerializer
+    serializer_class = ClientSerializer
     ordering_fields = [
         "user_code",
         "name",
@@ -27,7 +27,7 @@ class ClientsViewSet(AbstractModelViewSet):
         detail=False,
         methods=["get"],
         url_path="light",
-        serializer_class=ClientsSerializer,
+        serializer_class=ClientSerializer,
     )
     def list_light(self, request, *args, **kwargs):
         queryset = self.filter_queryset(self.get_queryset())

poms/common/authentication.py

@@ -111,7 +111,7 @@ def authenticate_credentials(self, key, request=None):
         #     raise exceptions.AuthenticationFailed(msg)
         try:
             userinfo = self.keycloak.userinfo(key)
-        except Exception:
+        except Exception as e:
             msg = _("Invalid or expired token.")
             raise exceptions.AuthenticationFailed(msg) from e  # noqa: F821
 

poms/expressions_engine/formula.py

@@ -761,6 +761,8 @@ def _get_supported_models_serializer_class():
         AccountEvalSerializer,
         AccountTypeEvalSerializer,
     )
+    from poms.clients.models import Client
+    from poms.clients.serializers import ClientSerializer
     from poms.counterparties.models import Counterparty, Responsible
     from poms.counterparties.serializers import (
         CounterpartyEvalSerializer,
@@ -807,6 +809,8 @@ def _get_supported_models_serializer_class():
     )
     from poms.users.models import Member
     from poms.users.serializers import MemberSerializer
+    from poms.vault.models import VaultRecord
+    from poms.vault.serializers import VaultRecordSerializer
 
     return {
         Account: AccountEvalSerializer,
@@ -833,6 +837,8 @@ def _get_supported_models_serializer_class():
         Member: MemberSerializer,
         Country: CountrySerializer,
         AccrualCalculationSchedule: AccrualCalculationScheduleSerializer,
+        Client: ClientSerializer,
+        VaultRecord: VaultRecordSerializer,
     }
 
 

poms/portfolios/serializers.py

@@ -223,7 +223,7 @@ def get_first_transaction(self, instance: Portfolio) -> dict:
 
     def __init__(self, *args, **kwargs):
         from poms.accounts.serializers import AccountViewSerializer
-        from poms.clients.serializers import ClientsSerializer
+        from poms.clients.serializers import ClientSerializer
         from poms.counterparties.serializers import (
             CounterpartyViewSerializer,
             ResponsibleViewSerializer,
@@ -242,7 +242,7 @@ def __init__(self, *args, **kwargs):
         self.fields["transaction_types_object"] = TransactionTypeViewSerializer(
             source="transaction_types", many=True, read_only=True
         )
-        self.fields["client_object"] = ClientsSerializer(source="client", many=False, read_only=True)
+        self.fields["client_object"] = ClientSerializer(source="client", many=False, read_only=True)
 
     def create_register_if_not_exists(
         self, instance, register_currency=None, register_pricing_policy=None, register_instrument_type=None

poms/transactions/fields.py

@@ -1,7 +1,11 @@
+import json
+import logging
+
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ObjectDoesNotExist
 from django.utils.encoding import force_str
 from django.utils.translation import gettext_lazy as _
+from rest_framework import serializers
 from rest_framework.fields import ReadOnlyField
 from rest_framework.relations import RelatedField
 
@@ -17,6 +21,8 @@
 )
 from poms.users.filters import OwnerByMasterUserFilter
 
+_l = logging.getLogger("poms.transactions")
+
 
 class TransactionTypeGroupField(UserCodeOrPrimaryKeyRelatedField):
     queryset = TransactionTypeGroup.objects
@@ -112,3 +118,22 @@ def __init__(self, **kwargs):
 
     def to_representation(self, obj):
         return f"{obj.app_label}.{obj.model}"
+
+
+class CharOrJSONField(serializers.CharField):
+    def to_representation(self, value):
+        # Try to parse string to JSON
+        if isinstance(value, str):
+            try:
+                val = json.loads(value)
+                # _l.info("CharOrJSONField to_representation %s" % val)
+                return val
+            except json.JSONDecodeError:
+                pass
+        return value
+
+    def to_internal_value(self, data):
+        # Accept dicts and convert to JSON string
+        if isinstance(data, dict):
+            return json.dumps(data)
+        return super().to_internal_value(data)

poms/transactions/handlers.py

@@ -14,6 +14,7 @@
 from rest_framework.exceptions import ValidationError
 
 from poms.accounts.models import Account
+from poms.clients.models import Client
 from poms.common.utils import date_now, format_float, format_float_to_2
 from poms.counterparties.models import Counterparty, Responsible
 from poms.currencies.models import Currency
@@ -46,8 +47,9 @@
     TransactionType,
     TransactionTypeInput,
 )
-from poms.transactions.utils import generate_user_fields
+from poms.transactions.utils import _read_json_text, generate_user_fields
 from poms.users.models import EcosystemDefault
+from poms.vault.models import VaultRecord
 
 _l = logging.getLogger("poms.transactions")
 
@@ -164,6 +166,9 @@ def __init__(  # noqa: PLR0913, PLR0915
         if complex_transaction and not complex_transaction_status:
             self.complex_transaction_status = complex_transaction.status_id
 
+        if self.clear_execution_log:
+            self.complex_transaction.execution_log = ""
+
         self._context = context
         self._context["transaction_type"] = self.transaction_type
         self._id_seq = 0
@@ -178,9 +183,6 @@ def __init__(  # noqa: PLR0913, PLR0915
             for i in range(10):
                 self.values[f"phantom_instrument_{i}"] = None
 
-        if self.clear_execution_log:
-            self.complex_transaction.execution_log = ""
-
         self.complex_transaction.owner = self.member
         # self.complex_transaction.save()  # it will create empty transaction in db!
 
@@ -267,6 +269,10 @@ def _get_val_by_model_cls_for_transaction_type_input(master_user, value, model_c
                     return EventClass.objects.get(user_code=value)
                 elif issubclass(model_class, NotificationClass):
                     return NotificationClass.objects.get(user_code=value)
+                elif issubclass(model_class, Client):
+                    return Client.objects.get(user_code=value)
+                elif issubclass(model_class, VaultRecord):
+                    return VaultRecord.objects.get(user_code=value)
             except Exception:
                 _l.debug(f"Could not find default value relation {value}")
                 return None
@@ -305,6 +311,10 @@ def _get_val_by_model_cls_for_complex_transaction_input(master_user, obj, model_
                     return EventClass.objects.get(user_code=obj.value_relation)
                 elif issubclass(model_class, NotificationClass):
                     return NotificationClass.objects.get(user_code=obj.value_relation)
+                elif issubclass(model_class, Client):
+                    return Client.objects.get(user_code=obj.value_relation)
+                elif issubclass(model_class, VaultRecord):
+                    return VaultRecord.objects.get(user_code=obj.value_relation)
             except Exception:
                 _l.error(f"Could not find default value relation {obj.value_relation} ")
                 return None
@@ -340,6 +350,9 @@ def _get_val_by_model_cls_for_complex_transaction_input(master_user, obj, model_
                     TransactionTypeInput.SELECTOR,
                 ):
                     value = ci.value_string
+                elif i.value_type == TransactionTypeInput.JSON:
+                    value = _read_json_text(ci.value_string)
+                    _l.info("JSON read: %r type=%s", value, type(value).__name__ if value is not None else None)
                 elif i.value_type == TransactionTypeInput.NUMBER:
                     value = ci.value_float
                 elif i.value_type == TransactionTypeInput.DATE:
@@ -353,7 +366,7 @@ def _get_val_by_model_cls_for_complex_transaction_input(master_user, obj, model_
                 if value is not None:
                     self.values[i.name] = value
 
-        # _l.debug('self.inputs %s' % self.inputs)
+        # _l.debug('before self.values %s' % self.values)
 
         self.record_execution_progress("==== COMPLEX TRANSACTION VALUES ====", self.values)
 
@@ -416,6 +429,8 @@ def _get_val_by_model_cls_for_complex_transaction_input(master_user, obj, model_
 
         self.record_execution_progress("==== CALCULATED INPUTS ====")
 
+        # _l.info("check values %s" % self.values)
+
         for key, value in self.values.items():
             self.record_execution_progress(f"Key: {key}. Value: {value}. Type: {type(self.values[key]).__name__}")
 
@@ -2215,13 +2230,26 @@ def _save_inputs(self):
             ci.complex_transaction = self.complex_transaction
             ci.transaction_type_input = ti
 
-            if ti.value_type in (
-                TransactionTypeInput.STRING,
-                TransactionTypeInput.SELECTOR,
-            ):
+            if ti.value_type in (TransactionTypeInput.STRING, TransactionTypeInput.SELECTOR):
                 if val is None:
                     val = ""
                 ci.value_string = val
+            elif ti.value_type == TransactionTypeInput.JSON:
+                # val may be dict/list OR already a JSON string
+                if val is None:
+                    ci.value_string = ""
+                elif isinstance(val, dict):
+                    ci.value_string = json.dumps(val, ensure_ascii=False, separators=(",", ":"))
+                elif isinstance(val, str):
+                    # keep if it is valid JSON; else wrap it as JSON string
+                    try:
+                        json.loads(val)
+                        ci.value_string = val
+                    except json.JSONDecodeError:
+                        ci.value_string = json.dumps(val, ensure_ascii=False)
+                else:
+                    # numbers, bools, etc. -> store valid JSON
+                    ci.value_string = json.dumps(val, ensure_ascii=False)
             elif ti.value_type == TransactionTypeInput.NUMBER:
                 if val is None:
                     val = 0.0
@@ -2249,9 +2277,21 @@ def execute_user_fields_expressions(self):
             "transactions": trns,
         }
 
+        # do not remove, somehow json inputs are always strings, which leads to impossiblity to address by keys
+        for i in self.inputs:
+            if i.value_type == TransactionTypeInput.JSON:
+                val = self.values.get(i.name)
+                if isinstance(val, str):
+                    try:
+                        self.values[i.name] = json.loads(val)
+                    except json.JSONDecodeError:
+                        _l.error("execute_user_fields_expressions decode error")
+
         for key, value in self.values.items():
             names[key] = value
 
+        # _l.info('before names %s' % names)
+
         self.record_execution_progress("Calculating User Fields")
 
         _result_for_log = {}

poms/transactions/migrations/0039_alter_transactiontypeinput_value_type.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.22 on 2025-10-29 14:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('transactions', '0038_remove_complextransaction_created_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='transactiontypeinput',
+            name='value_type',
+            field=models.PositiveSmallIntegerField(choices=[(20, 'Number'), (10, 'String'), (40, 'Date'), (100, 'Relation'), (110, 'Selector'), (120, 'Button'), (130, 'JSON')], default=20, verbose_name='value type'),
+        ),
+    ]