-
Notifications
You must be signed in to change notification settings - Fork 13
release: dev → main (add campaign action endpoints, update bounce endpoints) #168
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Changes from 3 commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
df74fc7
Version: dev
tatevikg1 9bbad8b
Copy message + patch status endpoints
tatevikg1 9a574dc
CampaignActionController
tatevikg1 2aa4022
Configure request object normalizer
tatevikg1 890acdb
Datetime form at + test fix
tatevikg1 20507a9
Fix: message format options
tatevikg1 6264e47
Fix: manager configs
tatevikg1 bdeddeb
Add: testSendMessage endpoint
tatevikg1 6922cdf
Client docs workflow
tatevikg1 a238db4
Remove text_message from campaign request
tatevikg1 df18946
Remove html_formated from campaign request
tatevikg1 4467266
Add: validateNoClickTrackLinks
tatevikg1 c678b30
Filter campaigns by subject
tatevikg1 567ac65
Fix: double base64 encoding in TemplateImageNormalizer
tatevikg1 c5fd9c1
Add: update template endpoint
tatevikg1 93cc52e
Add: UniqueTemplateTitleValidator
tatevikg1 a90e6fc
Add: Default templates endpoints
tatevikg1 76fed4a
Bounce controller
tatevikg1 2d74fb8
Bounce controller: add status query parameter to get bounces
tatevikg1 13d81bb
Bounce controller: by campaign/subscriber endpoints
tatevikg1 869981e
BounceRegex controller: create/update rule
tatevikg1 2a58681
Fix test
tatevikg1 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,286 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace PhpList\RestBundle\Messaging\Controller; | ||
|
|
||
| use Doctrine\ORM\EntityManagerInterface; | ||
| use OpenApi\Attributes as OA; | ||
| use PhpList\Core\Domain\Messaging\Message\SyncCampaignProcessorMessage; | ||
| use PhpList\Core\Domain\Messaging\Model\Message; | ||
| use PhpList\Core\Domain\Messaging\Model\Message\MessageStatus; | ||
| use PhpList\Core\Domain\Messaging\Service\Manager\MessageManager; | ||
| use PhpList\Core\Security\Authentication; | ||
| use PhpList\RestBundle\Common\Controller\BaseController; | ||
| use PhpList\RestBundle\Common\Validator\RequestValidator; | ||
| use PhpList\RestBundle\Messaging\Request\Message\MessageMetadataRequest; | ||
| use PhpList\RestBundle\Messaging\Request\ResendMessageToListsRequest; | ||
| use PhpList\RestBundle\Messaging\Serializer\MessageNormalizer; | ||
| use PhpList\RestBundle\Messaging\Service\CampaignService; | ||
| use Symfony\Bridge\Doctrine\Attribute\MapEntity; | ||
| use Symfony\Component\HttpFoundation\JsonResponse; | ||
| use Symfony\Component\HttpFoundation\Request; | ||
| use Symfony\Component\HttpFoundation\Response; | ||
| use Symfony\Component\Messenger\MessageBusInterface; | ||
| use Symfony\Component\Routing\Attribute\Route; | ||
|
|
||
| /** | ||
| * This controller provides REST API to manage campaign actions. | ||
| * | ||
| * @author Tatevik Grigoryan <tatevik@phplist.com> | ||
| */ | ||
| #[Route('/campaigns', name: 'campaign_')] | ||
| class CampaignActionController extends BaseController | ||
| { | ||
| public function __construct( | ||
| Authentication $authentication, | ||
| RequestValidator $validator, | ||
| private readonly CampaignService $campaignService, | ||
| private readonly MessageBusInterface $messageBus, | ||
| private readonly EntityManagerInterface $entityManager, | ||
| private readonly MessageManager $messageManager, | ||
| private readonly MessageNormalizer $messageNormalizer | ||
| ) { | ||
| parent::__construct($authentication, $validator); | ||
| } | ||
|
|
||
| #[Route('/{messageId}/copy', name: 'copy_campaign', requirements: ['messageId' => '\d+'], methods: ['POST'])] | ||
| #[OA\Post( | ||
| path: '/api/v2/campaigns/{messageId}/copy', | ||
| description: '🚧 **Status: Beta** – This method is under development. Avoid using in production. ' . | ||
| 'Copies campaign/message by id into a draft message.', | ||
| summary: 'Copies campaign/message by id.', | ||
| tags: ['campaigns'], | ||
| parameters: [ | ||
| new OA\Parameter( | ||
| name: 'php-auth-pw', | ||
| description: 'Session key obtained from login', | ||
| in: 'header', | ||
| required: true, | ||
| schema: new OA\Schema(type: 'string') | ||
| ), | ||
| new OA\Parameter( | ||
| name: 'messageId', | ||
| description: 'message ID', | ||
| in: 'path', | ||
| required: true, | ||
| schema: new OA\Schema(type: 'string') | ||
| ) | ||
| ], | ||
| responses: [ | ||
| new OA\Response( | ||
| response: 201, | ||
| description: 'Success', | ||
| content: new OA\JsonContent(ref: '#/components/schemas/Message') | ||
| ), | ||
| new OA\Response( | ||
| response: 403, | ||
| description: 'Failure', | ||
| content: new OA\JsonContent(ref: '#/components/schemas/UnauthorizedResponse') | ||
| ) | ||
| ] | ||
| )] | ||
| public function copyMessage( | ||
| Request $request, | ||
| #[MapEntity(mapping: ['messageId' => 'id'])] ?Message $message = null | ||
| ): JsonResponse { | ||
| $authUser = $this->requireAuthentication($request); | ||
| if ($message === null) { | ||
| throw $this->createNotFoundException('Campaign not found.'); | ||
| } | ||
|
|
||
| $message = $this->messageManager->copyAsDraftMessage($message, $authUser); | ||
| $this->entityManager->flush(); | ||
|
|
||
| return $this->json($this->campaignService->getMessage($message), Response::HTTP_CREATED); | ||
| } | ||
|
|
||
| #[Route('/{messageId}/status', name: 'update_status', requirements: ['messageId' => '\d+'], methods: ['PATCH'])] | ||
| #[OA\Patch( | ||
| path: '/api/v2/campaigns/{messageId}/status', | ||
| description: '🚧 **Status: Beta** – This method is under development. Avoid using in production. ' . | ||
| 'Updates campaign/message status by id.', | ||
| summary: 'Update campaign status by id.', | ||
| requestBody: new OA\RequestBody( | ||
| description: 'Update message status.', | ||
| required: true, | ||
| content: new OA\JsonContent(ref: '#/components/schemas/MessageMetadataRequest') | ||
| ), | ||
| tags: ['campaigns'], | ||
| parameters: [ | ||
| new OA\Parameter( | ||
| name: 'php-auth-pw', | ||
| description: 'Session key obtained from login', | ||
| in: 'header', | ||
| required: true, | ||
| schema: new OA\Schema( | ||
| type: 'string' | ||
| ) | ||
| ), | ||
| new OA\Parameter( | ||
| name: 'messageId', | ||
| description: 'message ID', | ||
| in: 'path', | ||
| required: true, | ||
| schema: new OA\Schema(type: 'string') | ||
| ) | ||
| ], | ||
| responses: [ | ||
| new OA\Response( | ||
| response: 200, | ||
| description: 'Success', | ||
| content: new OA\JsonContent(ref: '#/components/schemas/Message') | ||
| ), | ||
| new OA\Response( | ||
| response: 403, | ||
| description: 'Failure', | ||
| content: new OA\JsonContent(ref: '#/components/schemas/UnauthorizedResponse') | ||
| ), | ||
| new OA\Response( | ||
| response: 404, | ||
| description: 'Failure', | ||
| content: new OA\JsonContent(ref: '#/components/schemas/NotFoundErrorResponse') | ||
| ), | ||
| new OA\Response( | ||
| response: 422, | ||
| description: 'Failure', | ||
| content: new OA\JsonContent(ref: '#/components/schemas/ValidationErrorResponse') | ||
| ), | ||
| ] | ||
| )] | ||
| public function updateMessageStatus( | ||
| Request $request, | ||
| #[MapEntity(mapping: ['messageId' => 'id'])] ?Message $message = null, | ||
| ): JsonResponse { | ||
| $this->requireAuthentication($request); | ||
| if ($message === null) { | ||
| throw $this->createNotFoundException('Message not found.'); | ||
| } | ||
|
|
||
| /** @var MessageMetadataRequest $messageMetadataRequest */ | ||
| $messageMetadataRequest = $this->validator->validate($request, MessageMetadataRequest::class); | ||
|
|
||
| $message = $this->messageManager->updateStatus( | ||
| $message, | ||
| MessageStatus::from($messageMetadataRequest->status), | ||
| ); | ||
| $this->entityManager->flush(); | ||
|
|
||
| return $this->json($this->messageNormalizer->normalize($message), Response::HTTP_OK); | ||
| } | ||
|
|
||
| #[Route('/{messageId}/send', name: 'send_campaign', requirements: ['messageId' => '\d+'], methods: ['POST'])] | ||
| #[OA\Post( | ||
| path: '/api/v2/campaigns/{messageId}/send', | ||
| description: '🚧 **Status: Beta** – This method is under development. Avoid using in production. ' . | ||
| 'Processes/sends campaign/message by id.', | ||
| summary: 'Processes/sends campaign/message by id.', | ||
| tags: ['campaigns'], | ||
| parameters: [ | ||
| new OA\Parameter( | ||
| name: 'php-auth-pw', | ||
| description: 'Session key obtained from login', | ||
| in: 'header', | ||
| required: true, | ||
| schema: new OA\Schema(type: 'string') | ||
| ), | ||
| new OA\Parameter( | ||
| name: 'messageId', | ||
| description: 'message ID', | ||
| in: 'path', | ||
| required: true, | ||
| schema: new OA\Schema(type: 'string') | ||
| ) | ||
| ], | ||
| responses: [ | ||
| new OA\Response( | ||
| response: 200, | ||
| description: 'Success', | ||
| content: new OA\JsonContent(ref: '#/components/schemas/Message') | ||
| ), | ||
| new OA\Response( | ||
| response: 403, | ||
| description: 'Failure', | ||
| content: new OA\JsonContent(ref: '#/components/schemas/UnauthorizedResponse') | ||
| ), | ||
| new OA\Response( | ||
| response: 404, | ||
| description: 'Failure', | ||
| content: new OA\JsonContent(ref: '#/components/schemas/NotFoundErrorResponse') | ||
| ), | ||
| ] | ||
|
coderabbitai[bot] marked this conversation as resolved.
|
||
| )] | ||
| public function sendMessage( | ||
| Request $request, | ||
| #[MapEntity(mapping: ['messageId' => 'id'])] ?Message $message = null | ||
| ): JsonResponse { | ||
| $this->requireAuthentication($request); | ||
| if ($message === null) { | ||
| throw $this->createNotFoundException('Campaign not found.'); | ||
| } | ||
|
|
||
| $this->messageBus->dispatch(new SyncCampaignProcessorMessage($message->getId())); | ||
|
|
||
| return $this->json($this->campaignService->getMessage($message), Response::HTTP_OK); | ||
| } | ||
|
|
||
| #[Route('/{messageId}/resend', name: 'resend_campaign', requirements: ['messageId' => '\d+'], methods: ['POST'])] | ||
| #[OA\Post( | ||
| path: '/api/v2/campaigns/{messageId}/resend', | ||
| description: '🚧 **Status: Beta** – This method is under development. Avoid using in production. ' . | ||
| 'Processes/sends campaign/message by id to specified mailing lists.', | ||
| summary: 'Processes/sends campaign/message by id to lists.', | ||
| requestBody: new OA\RequestBody( | ||
| description: 'List ids to send this campaign to.', | ||
| required: true, | ||
| content: new OA\JsonContent(ref: '#/components/schemas/ResendMessageToListsRequest') | ||
| ), | ||
|
coderabbitai[bot] marked this conversation as resolved.
|
||
| tags: ['campaigns'], | ||
| parameters: [ | ||
| new OA\Parameter( | ||
| name: 'php-auth-pw', | ||
| description: 'Session key obtained from login', | ||
| in: 'header', | ||
| required: true, | ||
| schema: new OA\Schema(type: 'string') | ||
| ), | ||
| new OA\Parameter( | ||
| name: 'messageId', | ||
| description: 'message ID', | ||
| in: 'path', | ||
| required: true, | ||
| schema: new OA\Schema(type: 'string') | ||
| ) | ||
| ], | ||
| responses: [ | ||
| new OA\Response( | ||
| response: 200, | ||
| description: 'Success', | ||
| content: new OA\JsonContent(ref: '#/components/schemas/Message') | ||
| ), | ||
| new OA\Response( | ||
| response: 403, | ||
| description: 'Failure', | ||
| content: new OA\JsonContent(ref: '#/components/schemas/UnauthorizedResponse') | ||
| ) | ||
| ] | ||
|
coderabbitai[bot] marked this conversation as resolved.
|
||
| )] | ||
| public function resendMessageToLists( | ||
| Request $request, | ||
| #[MapEntity(mapping: ['messageId' => 'id'])] ?Message $message = null | ||
| ): JsonResponse { | ||
| $this->requireAuthentication($request); | ||
| if ($message === null) { | ||
| throw $this->createNotFoundException('Campaign not found.'); | ||
| } | ||
|
|
||
| /** @var ResendMessageToListsRequest $resendToListsRequest */ | ||
| $resendToListsRequest = $this->validator->validate($request, ResendMessageToListsRequest::class); | ||
|
|
||
| $this->messageBus->dispatch( | ||
| new SyncCampaignProcessorMessage($message->getId(), $resendToListsRequest->listIds) | ||
| ); | ||
|
|
||
| return $this->json($this->campaignService->getMessage($message), Response::HTTP_OK); | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.