diff --git a/src/app/action/controllers/ShippingTrait.php b/src/app/action/controllers/ShippingTrait.php
index 34847ee2b4cb3da3511342ba4ba2da03873a8f2a..3562bb8276ce14283a56556f9a40200923afb68a 100644
--- a/src/app/action/controllers/ShippingTrait.php
+++ b/src/app/action/controllers/ShippingTrait.php
@@ -56,8 +56,8 @@ trait ShippingTrait
$attachments = AttachmentModel::getOnView([
'select' => ['res_id', 'res_id_version', 'title', 'dest_address_id', 'external_id'],
- 'where' => ['res_id_master = ?', 'in_send_attach = ?'],
- 'data' => [$args['resId'], true]
+ 'where' => ['res_id_master = ?', 'in_send_attach = ?', 'status not in (?)'],
+ 'data' => [$args['resId'], true, ['OBS', 'DEL']]
]);
if (empty($attachments)) {
return true;
diff --git a/test/unitTests/app/resource/ExportControllerTest.php b/test/unitTests/app/resource/ExportControllerTest.php
index 441c1932b71f122bc1a6cfaf73c052576d62780d..faf9b255df541b8fd0392a3f997a216259787b9b 100644
--- a/test/unitTests/app/resource/ExportControllerTest.php
+++ b/test/unitTests/app/resource/ExportControllerTest.php
@@ -31,6 +31,7 @@ class ExportControllerTest extends TestCase
{
$GLOBALS['userId'] = 'bbain';
+ $myBasket = \Basket\models\BasketModel::getByBasketId(['basketId' => 'MyBasket', 'select' => ['id']]);
$ExportController = new \Resource\controllers\ExportController();
// PUT
@@ -98,7 +99,7 @@ class ExportControllerTest extends TestCase
//PDF
$fullRequest = \httpRequestCustom::addContentInBody($aArgs, $request);
- $response = $ExportController->updateExport($fullRequest, new \Slim\Http\Response(), ['userId' => 19, 'groupId' => 2, 'basketId' => 10]);
+ $response = $ExportController->updateExport($fullRequest, new \Slim\Http\Response(), ['userId' => 19, 'groupId' => 2, 'basketId' => $myBasket['id']]);
$responseBody = json_decode((string)$response->getBody());
$this->assertSame(null, $responseBody);
@@ -120,7 +121,7 @@ class ExportControllerTest extends TestCase
$aArgs['format'] = 'csv';
$fullRequest = \httpRequestCustom::addContentInBody($aArgs, $request);
- $response = $ExportController->updateExport($fullRequest, new \Slim\Http\Response(), ['userId' => 19, 'groupId' => 2, 'basketId' => 10]);
+ $response = $ExportController->updateExport($fullRequest, new \Slim\Http\Response(), ['userId' => 19, 'groupId' => 2, 'basketId' => $myBasket['id']]);
$responseBody = json_decode((string)$response->getBody());
$this->assertSame(null, $responseBody);
@@ -146,25 +147,25 @@ class ExportControllerTest extends TestCase
unset($aArgs['data'][2]['label']);
$fullRequest = \httpRequestCustom::addContentInBody($aArgs, $request);
- $response = $ExportController->updateExport($fullRequest, new \Slim\Http\Response(), ['userId' => 19, 'groupId' => 2, 'basketId' => 10]);
+ $response = $ExportController->updateExport($fullRequest, new \Slim\Http\Response(), ['userId' => 19, 'groupId' => 2, 'basketId' => $myBasket['id']]);
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('One data is not set well', $responseBody->errors);
unset($aArgs['data']);
$fullRequest = \httpRequestCustom::addContentInBody($aArgs, $request);
- $response = $ExportController->updateExport($fullRequest, new \Slim\Http\Response(), ['userId' => 19, 'groupId' => 2, 'basketId' => 10]);
+ $response = $ExportController->updateExport($fullRequest, new \Slim\Http\Response(), ['userId' => 19, 'groupId' => 2, 'basketId' => $myBasket['id']]);
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('Data data is empty or not an array', $responseBody->errors);
$aArgs['delimiter'] = 't';
$fullRequest = \httpRequestCustom::addContentInBody($aArgs, $request);
- $response = $ExportController->updateExport($fullRequest, new \Slim\Http\Response(), ['userId' => 19, 'groupId' => 2, 'basketId' => 10]);
+ $response = $ExportController->updateExport($fullRequest, new \Slim\Http\Response(), ['userId' => 19, 'groupId' => 2, 'basketId' => $myBasket['id']]);
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('Delimiter is empty or not a string between [\',\', \';\', \'TAB\']', $responseBody->errors);
$aArgs['format'] = 'pd';
$fullRequest = \httpRequestCustom::addContentInBody($aArgs, $request);
- $response = $ExportController->updateExport($fullRequest, new \Slim\Http\Response(), ['userId' => 19, 'groupId' => 2, 'basketId' => 10]);
+ $response = $ExportController->updateExport($fullRequest, new \Slim\Http\Response(), ['userId' => 19, 'groupId' => 2, 'basketId' => $myBasket['id']]);
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('Data format is empty or not a string between [\'pdf\', \'csv\']', $responseBody->errors);
diff --git a/test/unitTests/app/resource/ResourceListControllerTest.php b/test/unitTests/app/resource/ResourceListControllerTest.php
index 77585c3529777808788b5c5e957d5f72c9ac1e8b..2f76154cdf49bbd105bd972df7e49f34b612af71 100644
--- a/test/unitTests/app/resource/ResourceListControllerTest.php
+++ b/test/unitTests/app/resource/ResourceListControllerTest.php
@@ -14,6 +14,7 @@ class ResourceListControllerTest extends TestCase
public function testGet()
{
$GLOBALS['userId'] = 'bbain';
+ $myBasket = \Basket\models\BasketModel::getByBasketId(['basketId' => 'MyBasket', 'select' => ['id']]);
$resListController = new \Resource\controllers\ResourceListController();
@@ -25,7 +26,7 @@ class ResourceListControllerTest extends TestCase
];
$fullRequest = $request->withQueryParams($aArgs);
- $response = $resListController->get($fullRequest, new \Slim\Http\Response(), ['userId' => 19, 'groupId' => 2, 'basketId' => 10]);
+ $response = $resListController->get($fullRequest, new \Slim\Http\Response(), ['userId' => 19, 'groupId' => 2, 'basketId' => $myBasket['id']]);
$responseBody = json_decode((string)$response->getBody());
$this->assertInternalType('int', $responseBody->count);
@@ -42,7 +43,7 @@ class ResourceListControllerTest extends TestCase
];
$fullRequest = $request->withQueryParams($aArgs);
- $response = $resListController->get($fullRequest, new \Slim\Http\Response(), ['userId' => 19, 'groupId' => 2, 'basketId' => 10]);
+ $response = $resListController->get($fullRequest, new \Slim\Http\Response(), ['userId' => 19, 'groupId' => 2, 'basketId' => $myBasket['id']]);
$responseBody = json_decode((string)$response->getBody());
$this->assertSame(2, count($responseBody->resources));
@@ -61,7 +62,7 @@ class ResourceListControllerTest extends TestCase
];
$fullRequest = $request->withQueryParams($aArgs);
- $response = $resListController->get($fullRequest, new \Slim\Http\Response(), ['userId' => 19, 'groupId' => 2, 'basketId' => 10]);
+ $response = $resListController->get($fullRequest, new \Slim\Http\Response(), ['userId' => 19, 'groupId' => 2, 'basketId' => $myBasket['id']]);
$responseBody = json_decode((string)$response->getBody());
$this->assertGreaterThanOrEqual(1, count($responseBody->resources));
@@ -85,13 +86,13 @@ class ResourceListControllerTest extends TestCase
];
$fullRequest = $request->withQueryParams($aArgs);
- $response = $resListController->get($fullRequest, new \Slim\Http\Response(), ['userId' => 19, 'groupId' => 2, 'basketId' => 10]);
+ $response = $resListController->get($fullRequest, new \Slim\Http\Response(), ['userId' => 19, 'groupId' => 2, 'basketId' => $myBasket['id']]);
$responseBody = json_decode((string)$response->getBody());
$this->assertGreaterThanOrEqual(1, count($responseBody->resources));
// ERRORS
- $response = $resListController->get($request, new \Slim\Http\Response(), ['userId' => 19, 'groupId' => 777, 'basketId' => 10]);
+ $response = $resListController->get($request, new \Slim\Http\Response(), ['userId' => 19, 'groupId' => 777, 'basketId' => $myBasket['id']]);
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('Group or basket does not exist', $responseBody->errors);
@@ -99,7 +100,7 @@ class ResourceListControllerTest extends TestCase
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('Group or basket does not exist', $responseBody->errors);
- $response = $resListController->get($request, new \Slim\Http\Response(), ['userId' => 777, 'groupId' => 2, 'basketId' => 10]);
+ $response = $resListController->get($request, new \Slim\Http\Response(), ['userId' => 777, 'groupId' => 2, 'basketId' => $myBasket['id']]);
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('Basket out of perimeter', $responseBody->errors);
@@ -109,6 +110,8 @@ class ResourceListControllerTest extends TestCase
public function testGetFilters()
{
$GLOBALS['userId'] = 'bbain';
+ $myBasket = \Basket\models\BasketModel::getByBasketId(['basketId' => 'MyBasket', 'select' => ['id']]);
+
$resListController = new \Resource\controllers\ResourceListController();
// GET
@@ -119,7 +122,7 @@ class ResourceListControllerTest extends TestCase
];
$fullRequest = $request->withQueryParams($aArgs);
- $response = $resListController->getFilters($fullRequest, new \Slim\Http\Response(), ['userId' => 19, 'groupId' => 2, 'basketId' => 10]);
+ $response = $resListController->getFilters($fullRequest, new \Slim\Http\Response(), ['userId' => 19, 'groupId' => 2, 'basketId' => $myBasket['id']]);
$responseBody = json_decode((string)$response->getBody());
$this->assertInternalType('array', $responseBody->entities);
@@ -138,7 +141,7 @@ class ResourceListControllerTest extends TestCase
];
$fullRequest = $request->withQueryParams($aArgs);
- $response = $resListController->getFilters($fullRequest, new \Slim\Http\Response(), ['userId' => 19, 'groupId' => 2, 'basketId' => 10]);
+ $response = $resListController->getFilters($fullRequest, new \Slim\Http\Response(), ['userId' => 19, 'groupId' => 2, 'basketId' => $myBasket['id']]);
$responseBody = json_decode((string)$response->getBody());
$this->assertGreaterThanOrEqual(2, count($responseBody->priorities));
@@ -163,7 +166,7 @@ class ResourceListControllerTest extends TestCase
];
$fullRequest = $request->withQueryParams($aArgs);
- $response = $resListController->getFilters($fullRequest, new \Slim\Http\Response(), ['userId' => 19, 'groupId' => 2, 'basketId' => 10]);
+ $response = $resListController->getFilters($fullRequest, new \Slim\Http\Response(), ['userId' => 19, 'groupId' => 2, 'basketId' => $myBasket['id']]);
$responseBody = json_decode((string)$response->getBody());
$this->assertInternalType('array', $responseBody->entities);
@@ -178,6 +181,7 @@ class ResourceListControllerTest extends TestCase
public function testGetActions()
{
$GLOBALS['userId'] = 'bbain';
+ $myBasket = \Basket\models\BasketModel::getByBasketId(['basketId' => 'MyBasket', 'select' => ['id']]);
$resListController = new \Resource\controllers\ResourceListController();
@@ -185,7 +189,7 @@ class ResourceListControllerTest extends TestCase
$environment = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'GET']);
$request = \Slim\Http\Request::createFromEnvironment($environment);
- $response = $resListController->getActions($request, new \Slim\Http\Response(), ['userId' => 19, 'groupId' => 2, 'basketId' => 10]);
+ $response = $resListController->getActions($request, new \Slim\Http\Response(), ['userId' => 19, 'groupId' => 2, 'basketId' => $myBasket['id']]);
$responseBody = json_decode((string)$response->getBody());
$this->assertInternalType('array', $responseBody->actions);
diff --git a/test/unitTests/app/resource/SummarySheetControllerTest.php b/test/unitTests/app/resource/SummarySheetControllerTest.php
index 0b147ba7e34811d7063a9632c0ab8298a0fdc523..97eae3b604302ef6118acedb12cffb6f054cfb59 100644
--- a/test/unitTests/app/resource/SummarySheetControllerTest.php
+++ b/test/unitTests/app/resource/SummarySheetControllerTest.php
@@ -14,6 +14,7 @@ class SummarySheetControllerTest extends TestCase
public function testCreateList()
{
$GLOBALS['userId'] = 'bbain';
+ $myBasket = \Basket\models\BasketModel::getByBasketId(['basketId' => 'MyBasket', 'select' => ['id']]);
$summarySheetController = new \Resource\controllers\SummarySheetController();
@@ -37,7 +38,7 @@ class SummarySheetControllerTest extends TestCase
];
$fullRequest = \httpRequestCustom::addContentInBody($aArgs, $request);
- $response = $summarySheetController->createList($fullRequest, new \Slim\Http\Response(), ['userId' => 19, 'groupId' => 2, 'basketId' => 10]);
+ $response = $summarySheetController->createList($fullRequest, new \Slim\Http\Response(), ['userId' => 19, 'groupId' => 2, 'basketId' => $myBasket['id']]);
$responseBody = json_decode((string)$response->getBody());
$this->assertSame(null, $responseBody);
@@ -49,7 +50,7 @@ class SummarySheetControllerTest extends TestCase
unset($aArgs['resources']);
$fullRequest = \httpRequestCustom::addContentInBody($aArgs, $request);
- $response = $summarySheetController->createList($fullRequest, new \Slim\Http\Response(), ['userId' => 19, 'groupId' => 2, 'basketId' => 10]);
+ $response = $summarySheetController->createList($fullRequest, new \Slim\Http\Response(), ['userId' => 19, 'groupId' => 2, 'basketId' => $myBasket['id']]);
$responseBody = json_decode((string)$response->getBody());
$this->assertSame('Resources is not set or empty', $responseBody->errors);