From 5525ff3b2a6202f4a04d689efb0c5189f5d04ddc Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Fri, 7 Feb 2020 17:56:47 +0100
Subject: [PATCH] FEAT #12072 TIME 0:25 added query param to filter on emails
type
---
src/app/email/controllers/EmailController.php | 26 +++++++++++++++++--
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/app/email/controllers/EmailController.php b/src/app/email/controllers/EmailController.php
index 9265bcc5a9b..ed31811c6ad 100644
--- a/src/app/email/controllers/EmailController.php
+++ b/src/app/email/controllers/EmailController.php
@@ -314,10 +314,32 @@ class EmailController
$queryParams = $request->getQueryParams();
if (!empty($queryParams['limit']) && !Validator::intVal()->validate($queryParams['limit'])) {
- return $response->withStatus(403)->withJson(['errors' => 'Query limit is not an int val']);
+ return $response->withStatus(400)->withJson(['errors' => 'Query limit is not an int value']);
}
- $emails = EmailModel::get(['select' => ['*'], 'where' => ['document->>\'id\' = ?'], 'data' => [$args['resId']], 'limit' => (int)$queryParams['limit']]);
+ $where = ['document->>\'id\' = ?'];
+
+ if (!empty($queryParams['type'])) {
+ if (!Validator::stringType()->validate($queryParams['type'])) {
+ return $response->withStatus(400)->withJson(['errors' => 'Query type is not a string value']);
+ }
+
+ if ($queryParams['type'] == 'ar') {
+ $where[] = "object LIKE '[AR]%'";
+ } else if ($queryParams['type'] == 'm2m') {
+ $where[] = 'message_exchange_id is not null';
+ } else if ($queryParams['type'] == 'email') {
+ $where[] = "object NOT LIKE '[AR]%'";
+ $where[] = 'message_exchange_id is null';
+ }
+ }
+
+ $emails = EmailModel::get([
+ 'select' => ['*'],
+ 'where' => $where,
+ 'data' => [$args['resId']],
+ 'limit' => (int)$queryParams['limit']
+ ]);
foreach ($emails as $key => $email) {
$emails[$key]['sender'] = json_decode($emails[$key]['sender']);
--
GitLab