Операции с валютой

index.php

@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 use Oliver\{Application,Logger};
-use Oliver\Reply\{Stocks,Orders,MarketOrderBuyStock,MarketOrderSellStock,Ping,ICanDo,Introduction,Repeat};
+use Oliver\Reply\{Stocks,Orders,MarketOrderBuyStock,MarketOrderSellStock,Ping,ICanDo,Introduction,Repeat,Order};
 use jamesRUS52\TinkoffInvest\{TIClient,TISiteEnum,TIException};
 use Symfony\Component\DependencyInjection\{ContainerBuilder,Reference};
 
@@ -42,6 +42,11 @@ function main($event, $context): array
         ->register(Orders::class, Orders::class)
         ->addArgument(new Reference(TIClient::class))
     ;
+    $containerBuilder
+        ->register(Order::class, Order::class)
+        ->addArgument(new Reference(TIClient::class))
+        ->addArgument(new Reference(Logger::class))
+    ;
     $containerBuilder
         ->register(MarketOrderBuyStock::class, MarketOrderBuyStock::class)
         ->addArgument(new Reference(TIClient::class))
@@ -61,6 +66,7 @@ function main($event, $context): array
         new Repeat(),
         $containerBuilder->get(Stocks::class),
         $containerBuilder->get(Orders::class),
+        $containerBuilder->get(Order::class),
         $containerBuilder->get(MarketOrderBuyStock::class),
         $containerBuilder->get(MarketOrderSellStock::class),
     );

intents/entities

@@ -15,6 +15,8 @@ entity OperationUnit:
             мотор
             вот
             лофт
+            лоза
+            lot
         share:
             %lemma
             акция
@@ -68,6 +70,27 @@ entity OperationType:
 # чтобы различать тикеры
 entity FIGI:
     values:
+        # валюты
+        BBG0013HGFT4:
+            %exact
+            USD000UTSTOM
+            USDRUB
+            USD
+            %lemma
+            американская валюта
+            американский доллар
+            доллар сша?
+            бакс
+        BBG0013HJJ31:
+            %exact
+            EUR_RUB__TOM
+            EURRUB
+            EUR
+            %lemma
+            европейская валюта
+            евровалюта
+            евро
+        # акции
         BBG005DXJS36:
             %exact
             TCS

intents/order/intent

@@ -0,0 +1,42 @@
+# описание интента order для операций с ценными бумагами
+# эта грамматика позволит распознать намерение пользователя
+# купить или продать ценные бумаги
+
+root:
+    [$Action $Measure? $What? $Price?]
+slots:
+    operation:
+        source: $Operation
+        type: OperationType
+    amount:
+        source: $Amount
+        type: YANDEX.NUMBER
+    unit:
+        source: $Unit
+        type: OperationUnit
+    figi:
+        source: $Figi
+        type: FIGI
+filler:
+    %lemma
+    пожалуйста | алиса | оливер
+
+$Action:
+    $Operation
+$Measure:
+    $Amount? $Unit?
+$What:
+    $Figi
+$Price:
+    $MarketPrice
+$Operation:
+    $OperationType
+$Amount:
+    $YANDEX.NUMBER
+$Unit:
+    $OperationUnit
+$Figi:
+    $FIGI
+$MarketPrice:
+    %lemma
+    по рынку | по рыночной цене

phpunit.xml

@@ -8,6 +8,7 @@
       <file>tests/Reply/MarketOrderBuyStockTest.php</file>
       <file>tests/Reply/MarketOrderSellStockTest.php</file>
       <file>tests/Reply/ICanDoTest.php</file>
+      <file>tests/Reply/OrderTest.php</file>
     </testsuite>
     <testsuite name="utils">
       <file>tests/DeclensionTest.php</file>

src/Reply/MarketOrderBuyStock.php

@@ -11,6 +11,9 @@
 use jamesRUS52\TinkoffInvest\TIOrder;
 use Psr\Log\LoggerInterface;
 
+/**
+ * @deprecated use Reply\Order instead
+ */
 class MarketOrderBuyStock implements ReplyInterface
 {
    /**

src/Reply/MarketOrderSellStock.php

@@ -11,6 +11,9 @@
 use jamesRUS52\TinkoffInvest\TIOrder;
 use Psr\Log\LoggerInterface;
 
+/**
+ * @deprecated use Reply\Order instead
+ */
 // @todo: refactor,create abstract class with common methods
 // MarketOrderSellStock and MarketOrderBuyStock
 class MarketOrderSellStock implements ReplyInterface

src/Reply/Message/Amount.php

@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Oliver\Reply\Message;
+
+/**
+ * Add ammount.
+ * @todo tweak digits for better sounding
+ */
+final class Amount extends Decorator
+{
+    public const SHARE = 'share';
+    public const LOT = 'lot';
+
+    private int $amount;
+    private string $unit;
+
+    public function __construct(Message $message, int $amount, string $unit)
+    {
+        $unit = strtolower($unit);
+        if (in_array($unit, [self::SHARE, self::LOT])) {
+            $this->unit = $unit;
+        } else {
+            throw new ConfirmException(); // @todo: add unique code
+        }
+        $this->amount = $amount;
+        parent::__construct($message);
+    }
+
+    public function text(): string
+    {
+        if ($this->unit === self::SHARE) {
+            return $this->message->text() . ' количество акций: ' . $this->amount;
+        }
+        if ($this->unit === self::LOT) {
+            return $this->message->text() . ' количество лотов: ' . $this->amount;
+        }
+        throw new ConfirmException();
+    }
+}

src/Reply/Message/Confirm.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Oliver\Reply\Message;
+
+/**
+ * Add a call to action.
+ */
+final class Confirm extends Decorator
+{
+    public function text(): string
+    {
+        return $this->message->text() . ' для подтверждения скажите да, для отмены скажите нет';
+    }
+}

src/Reply/Message/ConfirmationException.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Oliver\Reply\Message;
+
+use Exception;
+
+class ConfirmException extends Exception
+{
+}

src/Reply/Message/Declined.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Oliver\Reply\Message;
+
+/**
+ * Operation is declined message, can be extended with decorators.
+ */
+final class Declined extends Message
+{
+    public function text(): string
+    {
+        return 'операция отклонена';
+    }
+}

src/Reply/Message/Decorator.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Oliver\Reply\Message;
+
+/**
+ * Base class for Confirm messages.
+ *
+ * Abstract component in terms of decorator pattern.
+ */
+abstract class Decorator extends Message
+{
+    protected Message $message;
+
+    public function __construct(Message $message)
+    {
+        $this->message = $message;
+    }
+
+    abstract public function text(): string;
+}

src/Reply/Message/Instrument.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Oliver\Reply\Message;
+
+/**
+ * Add instrument name.
+ *
+ * */
+final class Instrument extends Decorator
+{
+    private string $name;
+
+    public function __construct(Message $message, string $name)
+    {
+        $this->name = $name;
+        parent::__construct($message);
+    }
+
+    // @todo tweak names for better sounding if necessary
+    protected function getName()
+    {
+        return $this->name;
+    }
+
+    public function text(): string
+    {
+        return $this->message->text() . ' ' . $this->getName();
+    }
+}

src/Reply/Message/Message.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Oliver\Reply\Message;
+
+/**
+ * Base class for Confirm messages.
+ */
+abstract class Message
+{
+    /**
+     * Return response' text
+     */
+    abstract public function text(): string;
+
+    /**
+     * Return response' tts
+     *
+     * Note, text and tts are the same for quickstart. This can be overwritten.
+     */
+    public function tts(): string
+    {
+        return $this->text();
+    }
+}

src/Reply/Message/Order.php

@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Oliver\Reply\Message;
+
+/**
+ * A new order operation message, can be extended with decorators.
+ */
+final class Order extends Message
+{
+    public const BUY = 'buy';
+    public const SELL = 'sell';
+
+    private string $operation;
+
+    /**
+     * @throws ConfirmException
+     */
+    public function __construct(string $operation)
+    {
+        $operation = strtolower($operation);
+        if (in_array($operation, [self::BUY, self::SELL])) {
+            $this->operation = $operation;
+        } else {
+            throw new ConfirmException();
+        }
+    }
+
+    /**
+     * @throws ConfirmException
+     */
+    public function text(): string
+    {
+        if ($this->operation === self::BUY) {
+            return 'Заявка на покупку';
+        }
+        if ($this->operation === self::SELL) {
+            return 'Заявка на продажу';
+        }
+        throw new ConfirmException();
+    }
+}

src/Reply/Message/Price.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Oliver\Reply\Message;
+
+/**
+ * Add price.
+ * @todo add limit orders price orders
+ */
+final class Price extends Decorator
+{
+    public function text(): string
+    {
+        return $this->message->text() . ' по рыночной цене';
+    }
+}

src/Reply/Message/Ticker.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Oliver\Reply\Message;
+
+/**
+ * Add instrument ticker.
+ * @todo tweak tickers for better sounding
+ */
+final class Ticker extends Decorator
+{
+    private string $ticker;
+
+    public function __construct(Message $message, string $ticker)
+    {
+        $this->ticker = $ticker;
+        parent::__construct($message);
+    }
+    public function text(): string
+    {
+        return $this->message->text() . ' ' . $this->ticker;
+    }
+}