Merge branch 'main' into PLAT-1907

Author: paktusov

.github/workflows/other.yml

@@ -4,6 +4,9 @@ on:
   pull_request:
     branches:
       - main
+  pull_request:
+    branches:
+      - main
 
 jobs:
   lint:

.gitignore

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

poms/api/serializers.py

@@ -125,7 +125,7 @@ def get_help_raw(self, obj):
 class SplitDateRangeSerializer(serializers.Serializer):
     start_date = serializers.DateField(required=True, format=API_DATE_FORMAT)
     end_date = serializers.DateField(required=True, format=API_DATE_FORMAT)
-    frequency = serializers.CharField(required=True, max_length=1, help_text="D (dayly), W, M, Q, Y, C")
+    frequency = serializers.CharField(required=True, max_length=1, help_text=f"{', '.join(VALID_FREQUENCY)}")
     is_only_bday = serializers.BooleanField(required=True)
 
     def validate(self, data):
@@ -134,7 +134,7 @@ def validate(self, data):
         frequency = data.get("frequency")
 
         if start_date > end_date:
-            raise serializers.ValidationError("Start date cannot be after end date.")
+            raise serializers.ValidationError("start_date can't be after end_date.")
 
         if frequency not in VALID_FREQUENCY:
             raise serializers.ValidationError(
@@ -150,7 +150,7 @@ class PickDatesFromRangeSerializer(SplitDateRangeSerializer):
 
 class CalcPeriodDateSerializer(serializers.Serializer):
     date = serializers.DateField(required=True, format=API_DATE_FORMAT)
-    frequency = serializers.CharField(required=True, max_length=1, help_text="D (dayly), W, M, Q, Y, C")
+    frequency = serializers.CharField(required=True, max_length=1, help_text=f"{', '.join(VALID_FREQUENCY)}")
     is_only_bday = serializers.BooleanField(required=True)
     shift = serializers.IntegerField(required=True)
     start = serializers.BooleanField(required=True)

poms/api/views.py

@@ -1448,12 +1448,12 @@ def create(self, request, *args, **kwargs):
         serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
 
-        date = serializer.validated_data["date"]
+        input_date = serializer.validated_data["date"]
         frequency = serializer.validated_data["frequency"]
         shift = serializer.validated_data["shift"]
         is_only_bday = serializer.validated_data["is_only_bday"]
         start = serializer.validated_data["start"]
-        dates = calculate_period_date(date, frequency, shift, is_only_bday, start)
+        dates = calculate_period_date(input_date, frequency, shift, is_only_bday, start)
 
         return Response({"result": dates}, status=status.HTTP_200_OK)
 
@@ -1481,10 +1481,10 @@ class LastBusinessDayViewSet(AbstractViewSet):
     def create(self, request, *args, **kwargs):
         serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
-        date = serializer.validated_data["date"]
-        date = get_last_business_day(date, True)
+        input_date = serializer.validated_data["date"]
+        input_date = get_last_business_day(input_date, True)
 
-        return Response({"result": date}, status=status.HTTP_200_OK)
+        return Response({"result": input_date}, status=status.HTTP_200_OK)
 
 
 class IsBusinessDayViewSet(AbstractViewSet):
@@ -1493,9 +1493,9 @@ class IsBusinessDayViewSet(AbstractViewSet):
     def create(self, request, *args, **kwargs):
         serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
-        date = serializer.validated_data["date"]
+        input_date = serializer.validated_data["date"]
 
-        return Response({"result": is_business_day(date)}, status=status.HTTP_200_OK)
+        return Response({"result": is_business_day(input_date)}, status=status.HTTP_200_OK)
 
 
 class LastDayOfMonthViewSet(AbstractViewSet):
@@ -1504,7 +1504,7 @@ class LastDayOfMonthViewSet(AbstractViewSet):
     def create(self, request, *args, **kwargs):
         serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
-        date = serializer.validated_data["date"]
-        date = last_day_of_month(date)
+        input_date = serializer.validated_data["date"]
+        input_date = last_day_of_month(input_date)
 
-        return Response({"result": date}, status=status.HTTP_200_OK)
+        return Response({"result": input_date}, status=status.HTTP_200_OK)

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