Skip to content

Commit 1100b03

Browse files
NoResponseMateNoResponseMate
committed
[Payment] Incorporate payment query into payment modification controllers
1 parent ecf560f commit 1100b03

File tree

8 files changed

+83
-48
lines changed

8 files changed

+83
-48
lines changed

‎src/Controller/CancelPayPalCheckoutPaymentAction.php‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,34 +15,31 @@
1515

1616
use Sylius\PayPalPlugin\Manager\PaymentStateManagerInterface;
1717
use Sylius\PayPalPlugin\Provider\PaymentProviderInterface;
18+
use Sylius\PayPalPlugin\Repository\Query\PaypalPaymentQueryInterface;
1819
use Symfony\Component\HttpFoundation\Request;
1920
use Symfony\Component\HttpFoundation\Response;
2021
use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
2122

2223
final class CancelPayPalCheckoutPaymentAction
2324
{
24-
private PaymentProviderInterface $paymentProvider;
25-
26-
private PaymentStateManagerInterface $paymentStateManager;
27-
2825
public function __construct(
29-
PaymentProviderInterface $paymentProvider,
30-
PaymentStateManagerInterface $paymentStateManager,
26+
private PaymentProviderInterface $paymentProvider,
27+
private PaymentStateManagerInterface $paymentStateManager,
28+
private ?PaypalPaymentQueryInterface $paypalPaymentQuery = null,
3129
) {
32-
$this->paymentProvider = $paymentProvider;
33-
$this->paymentStateManager = $paymentStateManager;
3430
}
3531

3632
public function __invoke(Request $request): Response
3733
{
38-
/**
39-
* @var string $content
40-
*/
34+
/** @var string $content */
4135
$content = $request->getContent();
42-
4336
$content = (array) json_decode($content, true);
4437

45-
$payment = $this->paymentProvider->getByPayPalOrderId((string) $content['payPalOrderId']);
38+
if (null !== $this->paypalPaymentQuery) {
39+
$payment = $this->paypalPaymentQuery->getForCancellationByOrderId((string) $content['payPalOrderId']);
40+
} else {
41+
$payment = $this->paymentProvider->getByPayPalOrderId((string) $content['payPalOrderId']);
42+
}
4643

4744
/** @var FlashBagInterface $flashBag */
4845
$flashBag = $request->getSession()->getBag('flashes');

‎src/Controller/CancelPayPalPaymentAction.php‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
use Sylius\Component\Payment\PaymentTransitions;
2323
use Sylius\PayPalPlugin\Provider\FlashBagProvider;
2424
use Sylius\PayPalPlugin\Provider\PaymentProviderInterface;
25+
use Sylius\PayPalPlugin\Repository\Query\PaypalPaymentQueryInterface;
2526
use Symfony\Component\HttpFoundation\Request;
2627
use Symfony\Component\HttpFoundation\RequestStack;
2728
use Symfony\Component\HttpFoundation\Response;
@@ -35,6 +36,7 @@ public function __construct(
3536
private readonly FlashBag|RequestStack $flashBagOrRequestStack,
3637
private readonly FactoryInterface|StateMachineInterface $stateMachineFactory,
3738
private readonly OrderProcessorInterface $orderPaymentProcessor,
39+
private readonly ?PaypalPaymentQueryInterface $paypalPaymentQuery = null,
3840
) {
3941
if ($flashBagOrRequestStack instanceof FlashBag) {
4042
trigger_deprecation('sylius/paypal-plugin', '1.5', sprintf('Passing an instance of %s as constructor argument for %s is deprecated as of PayPalPlugin 1.5 and will be removed in 2.0. Pass an instance of %s instead.', FlashBag::class, self::class, RequestStack::class));
@@ -55,13 +57,15 @@ public function __construct(
5557

5658
public function __invoke(Request $request): Response
5759
{
58-
/**
59-
* @var string $content
60-
*/
60+
/** @var string $content */
6161
$content = $request->getContent();
6262
$content = (array) json_decode($content, true);
6363

64-
$payment = $this->paymentProvider->getByPayPalOrderId((string) $content['payPalOrderId']);
64+
if (null !== $this->paypalPaymentQuery) {
65+
$payment = $this->paypalPaymentQuery->getForCancellationByOrderId((string) $content['payPalOrderId']);
66+
} else {
67+
$payment = $this->paymentProvider->getByPayPalOrderId((string) $content['payPalOrderId']);
68+
}
6569

6670
/** @var OrderInterface $order */
6771
$order = $payment->getOrder();

‎src/Controller/UpdatePayPalOrderAction.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
use Sylius\PayPalPlugin\Api\OrderDetailsApiInterface;
2424
use Sylius\PayPalPlugin\Api\UpdateOrderApiInterface;
2525
use Sylius\PayPalPlugin\Provider\PaymentProviderInterface;
26+
use Sylius\PayPalPlugin\Repository\Query\PaypalPaymentQueryInterface;
2627
use Symfony\Component\HttpFoundation\JsonResponse;
2728
use Symfony\Component\HttpFoundation\Request;
2829
use Symfony\Component\HttpFoundation\Response;
@@ -36,6 +37,7 @@ public function __construct(
3637
private readonly UpdateOrderApiInterface $updateOrderApi,
3738
private readonly AddressFactoryInterface $addressFactory,
3839
private readonly OrderProcessorInterface $orderProcessor,
40+
private readonly ?PaypalPaymentQueryInterface $paypalPaymentQuery = null,
3941
) {
4042
if (null !== $this->orderDetailsApi) {
4143
trigger_deprecation(
@@ -51,7 +53,11 @@ public function __construct(
5153

5254
public function __invoke(Request $request): Response
5355
{
54-
$payment = $this->paymentProvider->getByPayPalOrderId((string) $request->request->get('orderID'));
56+
if (null !== $this->paypalPaymentQuery) {
57+
$payment = $this->paypalPaymentQuery->getForUpdateByOrderId((string) $request->request->get('orderID'));
58+
} else {
59+
$payment = $this->paymentProvider->getByPayPalOrderId((string) $request->request->get('orderID'));
60+
}
5561
/** @var OrderInterface $order */
5662
$order = $payment->getOrder();
5763

‎src/Controller/Webhook/RefundOrderAction.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
use Sylius\PayPalPlugin\Exception\PayPalWrongDataException;
2323
use Sylius\PayPalPlugin\Provider\PaymentProviderInterface;
2424
use Sylius\PayPalPlugin\Provider\PayPalRefundDataProviderInterface;
25+
use Sylius\PayPalPlugin\Repository\Query\PaypalPaymentQueryInterface;
2526
use Symfony\Component\HttpFoundation\JsonResponse;
2627
use Symfony\Component\HttpFoundation\Request;
2728
use Symfony\Component\HttpFoundation\Response;
@@ -34,6 +35,7 @@ public function __construct(
3435
private readonly PaymentProviderInterface $paymentProvider,
3536
private readonly ObjectManager $paymentManager,
3637
private readonly PayPalRefundDataProviderInterface $payPalRefundDataProvider,
38+
private readonly ?PaypalPaymentQueryInterface $paypalPaymentQuery = null,
3739
) {
3840
if ($this->stateMachineFactory instanceof FactoryInterface) {
3941
trigger_deprecation(
@@ -53,7 +55,11 @@ public function __invoke(Request $request): Response
5355
$refundData = $this->payPalRefundDataProvider->provide($this->getPayPalPaymentUrl($request));
5456

5557
try {
56-
$payment = $this->paymentProvider->getByPayPalOrderId((string) $refundData['id']);
58+
if (null !== $this->paypalPaymentQuery) {
59+
$payment = $this->paypalPaymentQuery->getForRefundingByOrderId((string) $refundData['id']);
60+
} else {
61+
$payment = $this->paymentProvider->getByPayPalOrderId((string) $refundData['id']);
62+
}
5763
} catch (PaymentNotFoundException $exception) {
5864
return new JsonResponse(['error' => $exception->getMessage()], Response::HTTP_NOT_FOUND);
5965
}

‎src/Repository/Query/PaypalPaymentQuery.php‎

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,28 @@
1313

1414
namespace Sylius\PayPalPlugin\Repository\Query;
1515

16+
use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
1617
use Doctrine\ORM\EntityManagerInterface;
1718
use Doctrine\ORM\QueryBuilder;
1819
use Sylius\Component\Core\Model\PaymentInterface;
1920
use Sylius\Component\Core\Repository\PaymentRepositoryInterface;
2021
use Sylius\PayPalPlugin\DependencyInjection\SyliusPayPalExtension;
22+
use Sylius\PayPalPlugin\Exception\PaymentNotFoundException;
2123

2224
final class PaypalPaymentQuery implements PaypalPaymentQueryInterface
2325
{
2426
public function __construct(
25-
private EntityManagerInterface $entityManager,
26-
private PaymentRepositoryInterface $paymentRepository,
27-
private array $updatableStates = ['cart', 'new', 'processing'],
28-
private array $cancellableStates = ['cart', 'new', 'processing', 'completed'],
29-
private array $refundableStates = ['completed'],
27+
private readonly EntityManagerInterface $entityManager,
28+
private readonly PaymentRepositoryInterface $paymentRepository,
29+
private readonly array $updatableStates = ['cart', 'new', 'processing'],
30+
private readonly array $cancellableStates = ['cart', 'new', 'processing', 'completed'],
31+
private readonly array $refundableStates = ['completed'],
3032
) {
3133
}
3234

3335
public function getForUpdateByOrderId(string $paypalOrderId): ?PaymentInterface
3436
{
35-
$queryBuilder = $this->getPaypalPaymentQueryBuilder('o')
37+
$queryBuilder = $this->getPaypalPaymentQueryBuilder()
3638
->andWhere('o.state IN (:states)')
3739
->setParameter('states', $this->updatableStates)
3840
->addOrderBy('o.createdAt', 'DESC')
@@ -43,7 +45,7 @@ public function getForUpdateByOrderId(string $paypalOrderId): ?PaymentInterface
4345

4446
public function getForCancellationByOrderId(string $paypalOrderId): ?PaymentInterface
4547
{
46-
$queryBuilder = $this->getPaypalPaymentQueryBuilder('o')
48+
$queryBuilder = $this->getPaypalPaymentQueryBuilder()
4749
->andWhere('o.state IN (:states)')
4850
->setParameter('states', $this->cancellableStates)
4951
->addOrderBy('o.createdAt', 'DESC')
@@ -54,7 +56,7 @@ public function getForCancellationByOrderId(string $paypalOrderId): ?PaymentInte
5456

5557
public function getForRefundingByOrderId(string $paypalOrderId): ?PaymentInterface
5658
{
57-
$queryBuilder = $this->getPaypalPaymentQueryBuilder('o')
59+
$queryBuilder = $this->getPaypalPaymentQueryBuilder()
5860
->andWhere('o.state IN (:states)')
5961
->setParameter('states', $this->refundableStates)
6062
->addOrderBy('o.updatedAt', 'DESC')
@@ -66,13 +68,18 @@ public function getForRefundingByOrderId(string $paypalOrderId): ?PaymentInterfa
6668
private function doGetPayment(QueryBuilder $queryBuilder, string $paypalOrderId): ?PaymentInterface
6769
{
6870
if ($this->isCastAvailable()) {
69-
return $queryBuilder
71+
$payment = $queryBuilder
7072
->andWhere('CAST(o.details AS text) LIKE :orderId')
71-
->setParameter('orderId', '%"paypal_order_id":"' . $paypalOrderId . '"%')
73+
->setParameter('orderId', '%"' . $paypalOrderId . '"%')
7274
->setMaxResults(1)
7375
->getQuery()
7476
->getOneOrNullResult()
7577
;
78+
if (null !== $payment) {
79+
return $payment;
80+
}
81+
82+
throw new PaymentNotFoundException();
7683
}
7784

7885
$payments = $queryBuilder
@@ -87,14 +94,14 @@ private function doGetPayment(QueryBuilder $queryBuilder, string $paypalOrderId)
8794
}
8895
}
8996

90-
return null;
97+
throw new PaymentNotFoundException();
9198
}
9299

93-
private function getPaypalPaymentQueryBuilder(string $alias): QueryBuilder
100+
private function getPaypalPaymentQueryBuilder(): QueryBuilder
94101
{
95102
return $this->paymentRepository
96-
->createQueryBuilder($alias)
97-
->innerJoin($alias . '.method', 'method')
103+
->createQueryBuilder('o')
104+
->innerJoin('o.method', 'method')
98105
->innerJoin('method.gatewayConfig', 'gatewayConfig')
99106
->andWhere('gatewayConfig.factoryName = :factoryName')
100107
->setParameter('factoryName', SyliusPayPalExtension::PAYPAL_FACTORY_NAME)

‎src/Repository/Query/PaypalPaymentQueryInterface.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,16 @@
1414
namespace Sylius\PayPalPlugin\Repository\Query;
1515

1616
use Sylius\Component\Core\Model\PaymentInterface;
17+
use Sylius\PayPalPlugin\Exception\PaymentNotFoundException;
1718

1819
interface PaypalPaymentQueryInterface
1920
{
21+
/** @throws PaymentNotFoundException */
2022
public function getForUpdateByOrderId(string $paypalOrderId): ?PaymentInterface;
2123

24+
/** @throws PaymentNotFoundException */
2225
public function getForCancellationByOrderId(string $paypalOrderId): ?PaymentInterface;
2326

27+
/** @throws PaymentNotFoundException */
2428
public function getForRefundingByOrderId(string $paypalOrderId): ?PaymentInterface;
2529
}

‎src/Resources/config/services/controller.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<argument type="service" id="sylius_paypal.provider.payment" />
2525
<argument type="service" id="sylius.manager.payment" />
2626
<argument type="service" id="sylius_paypal.provider.paypal_refund_data" />
27+
<argument type="service" id="sylius_paypal.repository.query.paypal_payment" />
2728
</service>
2829
<service id="sylius_paypal.controller.webhook.refund_order" alias="Sylius\PayPalPlugin\Controller\Webhook\RefundOrderAction" />
2930

@@ -40,6 +41,7 @@
4041
<argument type="service" id="request_stack" />
4142
<argument type="service" id="sylius_abstraction.state_machine" />
4243
<argument type="service" id="sylius.order_processing.order_payment_processor.checkout" />
44+
<argument type="service" id="sylius_paypal.repository.query.paypal_payment" />
4345
</service>
4446
<service id="sylius_paypal.controller.cancel_paypal_payment" alias="Sylius\PayPalPlugin\Controller\CancelPayPalPaymentAction" />
4547

@@ -54,6 +56,7 @@
5456
<service id="Sylius\PayPalPlugin\Controller\CancelPayPalCheckoutPaymentAction">
5557
<argument type="service" id="sylius_paypal.provider.payment" />
5658
<argument type="service" id="sylius_paypal.manager.payment_state" />
59+
<argument type="service" id="sylius_paypal.repository.query.paypal_payment" />
5760
</service>
5861
<service id="sylius_paypal.controller.cancel_paypal_checkout_payment" alias="Sylius\PayPalPlugin\Controller\CancelPayPalCheckoutPaymentAction" />
5962

@@ -153,6 +156,7 @@
153156
<argument type="service" id="sylius_paypal.api.update_order" />
154157
<argument type="service" id="sylius.factory.address" />
155158
<argument type="service" id="sylius.order_processing.order_processor" />
159+
<argument type="service" id="sylius_paypal.repository.query.paypal_payment" />
156160
</service>
157161
<service id="sylius_paypal.controller.update_paypal_order" alias="Sylius\PayPalPlugin\Controller\UpdatePayPalOrderAction" />
158162

0 commit comments

Comments
 (0)