- Arcadia separate routes on v2
- fix optin v2 - customer validation password - full working v2 tests
This commit is contained in:
parent
ef2b81b500
commit
260d5fd259
13 changed files with 254 additions and 66 deletions
|
|
@ -7,7 +7,9 @@ use App\Enums\ArcadiaMailType;
|
|||
use App\Enums\ArcadiaOrderType;
|
||||
use App\Exceptions\Api\V2\ApiErrorException;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\Api\V2\SendArchadiaMailRequest;
|
||||
use App\Http\Requests\Api\V2\BaseApiRequest;
|
||||
use App\Http\Requests\Api\V2\SendArchadiaDefaultMailRequest;
|
||||
use App\Http\Requests\Api\V2\SendArchadiaGameMailRequest;
|
||||
use App\Mail\CourrierArcadiaError;
|
||||
use App\Models\Customer;
|
||||
use App\Models\CustomerInfo;
|
||||
|
|
@ -17,15 +19,41 @@ use Illuminate\Support\Facades\Log;
|
|||
use Illuminate\Support\Facades\Mail;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
|
||||
/**
|
||||
* TODO: séparer ça quand coté arcadia ils auront branché le cerveau
|
||||
* Ici c'est du sale à cause d'arcadia
|
||||
* Ils ont fait le choix de rajouter une fonctionnalité
|
||||
* sur un methode existant en rajoutant des conditions
|
||||
* sales
|
||||
*
|
||||
* Donc un séparation est faite sur les endpoints CRM et dans le client
|
||||
* pour éviter une confusion de noes utilisateurs
|
||||
*/
|
||||
class ArcadiaController extends Controller
|
||||
{
|
||||
public function outgoingMail(SendArchadiaMailRequest $request, Customer $customer, Service $service)
|
||||
public function outgoingMailDefault(SendArchadiaDefaultMailRequest $request, Customer $customer, Service $service)
|
||||
{
|
||||
$xml = 'none';
|
||||
return $this->handleArcadiaMail($request, ArcadiaMailType::default(), $customer, $service);
|
||||
}
|
||||
|
||||
public function outgoingMailGame(SendArchadiaGameMailRequest $request, Customer $customer, Service $service)
|
||||
{
|
||||
return $this->handleArcadiaMail($request, ArcadiaMailType::game(), $customer, $service);
|
||||
}
|
||||
|
||||
private function handleArcadiaMail(
|
||||
BaseApiRequest $request,
|
||||
ArcadiaMailType $type,
|
||||
Customer $customer,
|
||||
Service $service
|
||||
) {
|
||||
$request = $request->merge([
|
||||
'order_number' => str_pad(\intval($request->order_number), 9, '0', STR_PAD_LEFT)
|
||||
]);
|
||||
$xml = 'none';
|
||||
try {
|
||||
/** @var \App\Models\CustomerInfo $customerInfo */
|
||||
$customerInfo = $customer->info($service->brand)->firstOrFail();
|
||||
$type = ArcadiaMailType::make(intval($request->type));
|
||||
$orderType = ArcadiaOrderType::make(intval($request->state_order));
|
||||
$xml = $this->makeXml($request, $type, $orderType, $customer, $customerInfo);
|
||||
|
||||
|
|
@ -66,7 +94,7 @@ class ArcadiaController extends Controller
|
|||
* @return string
|
||||
*/
|
||||
private function makeXml(
|
||||
SendArchadiaMailRequest $request,
|
||||
BaseApiRequest $request,
|
||||
ArcadiaMailType $type,
|
||||
ArcadiaOrderType $orderType,
|
||||
Customer $customer,
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ use App\Http\Requests\Api\V2\UpdateCustomerRequest;
|
|||
use App\Http\Resources\Api\V2\CustomerResource;
|
||||
use App\Models\Customer;
|
||||
use App\Models\Service;
|
||||
use App\Models\SingleOptin;
|
||||
use Illuminate\Database\Eloquent\ModelNotFoundException;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Resources\Json\JsonResource;
|
||||
|
|
@ -35,6 +36,14 @@ class CustomerController extends Controller
|
|||
$customer->saveOrFail();
|
||||
$customer->setOptIn($service->brand, $data->opt_in);
|
||||
|
||||
// Delete Single optin if exists
|
||||
if (
|
||||
$singleOptin = SingleOptin::where('email', $data->email)
|
||||
->where('brand_id', $service->brand->id)->first()
|
||||
) {
|
||||
$singleOptin->delete();
|
||||
}
|
||||
|
||||
/** @var \App\Models\CustomerInfo */
|
||||
$customerInfo = $customer->info($service->brand)->firstOrNew();
|
||||
if ($customerInfo->id) {
|
||||
|
|
|
|||
|
|
@ -21,13 +21,14 @@ class OptinController extends Controller
|
|||
*/
|
||||
public function optin(SingleOptinRequest $request, Service $service)
|
||||
{
|
||||
if (CustomerInfo::getFromEmail($service->brand, $request->email)->exists()) {
|
||||
throw new ApiErrorException(ApiError::singleOptinCustomerExists());
|
||||
}
|
||||
|
||||
/** @var \App\Models\SingleOptin */
|
||||
$singleOptin = SingleOptin::where('email', $request->email)->firstOrNew();
|
||||
|
||||
if ($request->opt_in) {
|
||||
if (CustomerInfo::getFromEmail($service->brand, $request->email)->where('opt_in', true)->exists()) {
|
||||
throw new ApiErrorException(ApiError::singleOptinCustomerExists());
|
||||
}
|
||||
$singleOptin->fill($request->validated());
|
||||
$singleOptin->brand()->associate($service->brand);
|
||||
$singleOptin->saveOrFail();
|
||||
|
|
|
|||
|
|
@ -2,26 +2,23 @@
|
|||
|
||||
namespace App\Http\Requests\Api\V2;
|
||||
|
||||
use App\Enums\ArcadiaMailType;
|
||||
use App\Enums\ArcadiaOrderType;
|
||||
use ArondeParon\RequestSanitizer\Sanitizers\RemoveNonNumeric;
|
||||
use ArondeParon\RequestSanitizer\Sanitizers\Trim;
|
||||
use ArondeParon\RequestSanitizer\Traits\SanitizesInputs;
|
||||
use Kwaadpepper\Enum\Rules\EnumIsValidRule;
|
||||
|
||||
class SendArchadiaMailRequest extends BaseApiRequest
|
||||
class SendArchadiaDefaultMailRequest extends BaseApiRequest
|
||||
{
|
||||
use SanitizesInputs;
|
||||
|
||||
protected $sanitizers = [
|
||||
'type' => Trim::class,
|
||||
'state_order' => Trim::class,
|
||||
'label_type_support' => Trim::class,
|
||||
'operation' => Trim::class,
|
||||
'support_code' => Trim::class,
|
||||
'order_date' => Trim::class,
|
||||
'order_num' => RemoveNonNumeric::class,
|
||||
'package_unit_weight' => RemoveNonNumeric::class,
|
||||
'code_unique' => Trim::class
|
||||
'support_code' => Trim::class,
|
||||
];
|
||||
|
||||
/**
|
||||
|
|
@ -32,37 +29,16 @@ class SendArchadiaMailRequest extends BaseApiRequest
|
|||
public function rules(): array
|
||||
{
|
||||
return [
|
||||
'type' => [
|
||||
'required',
|
||||
new EnumIsValidRule(ArcadiaMailType::class)
|
||||
],
|
||||
'operation' => 'required|int',
|
||||
'support_code' => 'required|int',
|
||||
'label_type_support' => 'required|string',
|
||||
'operation' => 'required|int',
|
||||
'order_date' => 'required|date',
|
||||
// IF default
|
||||
'order_num' => [
|
||||
'required_if:type,' . ArcadiaMailType::default()->value,
|
||||
'numeric',
|
||||
'digits:9'
|
||||
],
|
||||
'order_num' => 'required|numeric',
|
||||
'package_unit_weight' => 'required|integer',
|
||||
'state_order' => [
|
||||
'required_if:type,' . ArcadiaMailType::default()->value,
|
||||
'required',
|
||||
new EnumIsValidRule(ArcadiaOrderType::class)
|
||||
],
|
||||
'package_unit_weight' => [
|
||||
'required_if:type,' . ArcadiaMailType::default()->value,
|
||||
'integer'
|
||||
],
|
||||
// IF game
|
||||
'code_unique' => [
|
||||
'required_if:type,' . ArcadiaMailType::game()->value,
|
||||
'string'
|
||||
],
|
||||
'code_on_pack' => [
|
||||
'sometimes',
|
||||
'string'
|
||||
]
|
||||
'support_code' => 'required|int',
|
||||
];
|
||||
}
|
||||
}
|
||||
38
app/Http/Requests/Api/V2/SendArchadiaGameMailRequest.php
Normal file
38
app/Http/Requests/Api/V2/SendArchadiaGameMailRequest.php
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Requests\Api\V2;
|
||||
|
||||
use ArondeParon\RequestSanitizer\Sanitizers\Trim;
|
||||
use ArondeParon\RequestSanitizer\Traits\SanitizesInputs;
|
||||
|
||||
class SendArchadiaGameMailRequest extends BaseApiRequest
|
||||
{
|
||||
use SanitizesInputs;
|
||||
|
||||
protected $sanitizers = [
|
||||
'code_on_pack' => Trim::class,
|
||||
'code_unique' => Trim::class,
|
||||
'label_type_support' => Trim::class,
|
||||
'operation' => Trim::class,
|
||||
'order_date' => Trim::class,
|
||||
'support_code' => Trim::class,
|
||||
'type' => Trim::class
|
||||
];
|
||||
|
||||
/**
|
||||
* Get the validation rules that apply to the request.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function rules(): array
|
||||
{
|
||||
return [
|
||||
'code_on_pack' => 'sometimes|string',
|
||||
'code_unique' => 'required|string',
|
||||
'label_type_support' => 'required|string',
|
||||
'operation' => 'required|int',
|
||||
'order_date' => 'required|date',
|
||||
'support_code' => 'required|int'
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
@ -3,6 +3,7 @@
|
|||
namespace App\Http\Requests\Api\V2;
|
||||
|
||||
use App\Enums\Country;
|
||||
use Illuminate\Validation\Rules\Password;
|
||||
|
||||
class StoreCustomerRequest extends BaseApiRequest
|
||||
{
|
||||
|
|
@ -30,11 +31,12 @@ class StoreCustomerRequest extends BaseApiRequest
|
|||
],
|
||||
'password' => [
|
||||
'required',
|
||||
'case_diff',
|
||||
'numbers',
|
||||
'letters',
|
||||
'symbols',
|
||||
'min:10'
|
||||
Password::min(10)
|
||||
->mixedCase()
|
||||
->letters()
|
||||
->numbers()
|
||||
->symbols()
|
||||
->uncompromised()
|
||||
],
|
||||
'birth_date' => [
|
||||
'required',
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
namespace App\Http\Requests\Api\V2;
|
||||
|
||||
use App\Enums\Country;
|
||||
use Illuminate\Validation\Rules\Password;
|
||||
|
||||
class UpdateCustomerRequest extends BaseApiRequest
|
||||
{
|
||||
|
|
@ -31,7 +32,14 @@ class UpdateCustomerRequest extends BaseApiRequest
|
|||
'firstname' => [$atLeast, 'string', 'min:2'],
|
||||
'lastname' => [$atLeast, 'string', 'min:2'],
|
||||
'email' => [$atLeast, 'email:rfc,dns,spoof,filter'],
|
||||
'password' => $atLeast,
|
||||
'password' => [
|
||||
$atLeast, Password::min(10)
|
||||
->mixedCase()
|
||||
->letters()
|
||||
->numbers()
|
||||
->symbols()
|
||||
->uncompromised()
|
||||
],
|
||||
'birth_date' => [$atLeast, 'date_format:Y-m-d'],
|
||||
'address' => [$atLeast, 'required_with:address2', 'string'],
|
||||
'address2' => ['sometimes', 'string'],
|
||||
|
|
|
|||
7
resources/lang/fr.json
Normal file
7
resources/lang/fr.json
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
{
|
||||
"The :attribute must contain at least one uppercase and one lowercase letter.": ":attribute doit contenir au moins une lettre majuscule et une lettre minuscule.",
|
||||
"The :attribute must contain at least one letter.": ":attribute doit contenir au moins une lettre.",
|
||||
"The :attribute must contain at least one symbol.": ":attribute doit contenir au moins un caractère spécial.",
|
||||
"The :attribute must contain at least one number.": ":attribute doit contenir au moins un nombre.",
|
||||
"The given :attribute has appeared in a data leak. Please choose a different :attribute.": ":attribute apparait dans une fuite de données sur le web. Merci de choisir un :attribute différent."
|
||||
}
|
||||
|
|
@ -51,8 +51,10 @@ Route::prefix('v2')->name('apiV2.')->group(function () {
|
|||
});
|
||||
});
|
||||
Route::prefix('arcadia')->name('arcadia.')->group(function () {
|
||||
Route::post('/outgoing-mail/{customer}', [V2ArcadiaController::class, 'outgoingMail'])
|
||||
->name('outgoingMail');
|
||||
Route::post('/outgoing-mail/{customer}/default', [V2ArcadiaController::class, 'outgoingMailDefault'])
|
||||
->name('outgoingMailDefault');
|
||||
Route::post('/outgoing-mail/{customer}/game', [V2ArcadiaController::class, 'outgoingMailGame'])
|
||||
->name('outgoingMailGame');
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@ class ArcadiaTest extends ApiBase
|
|||
{
|
||||
extract($this->getCustomer());
|
||||
$data = [
|
||||
'type' => ArcadiaMailType::default()->value,
|
||||
'operation' => 16,
|
||||
'label_type_support' => 'Send Departaimants',
|
||||
'order_date' => \date('Y/m/d H:i:s'),
|
||||
|
|
@ -29,11 +28,10 @@ class ArcadiaTest extends ApiBase
|
|||
'support_code' => 32,
|
||||
'label_type_support' => 'Fond carte Aimanté',
|
||||
'order_num' => str_pad('23', 9, '0', STR_PAD_LEFT),
|
||||
'qty' => 1,
|
||||
'package_unit_weight' => 200,
|
||||
];
|
||||
$response = $this->callApiWithToken($service, 'post', route(
|
||||
'apiV2.arcadia.outgoingMail',
|
||||
'apiV2.arcadia.outgoingMailDefault',
|
||||
compact('customer')
|
||||
), $data);
|
||||
$json = $response->decodeResponseJson();
|
||||
|
|
@ -45,7 +43,6 @@ class ArcadiaTest extends ApiBase
|
|||
{
|
||||
extract($this->getCustomer());
|
||||
$data = [
|
||||
'type' => ArcadiaMailType::game()->value,
|
||||
'operation' => 16,
|
||||
'order_date' => date('Y/m/d H:i:s'),
|
||||
'support_code' => 32,
|
||||
|
|
@ -54,7 +51,7 @@ class ArcadiaTest extends ApiBase
|
|||
'code_on_pack' => 'anystring'
|
||||
];
|
||||
$response = $this->callApiWithToken($service, 'post', route(
|
||||
'apiV2.arcadia.outgoingMail',
|
||||
'apiV2.arcadia.outgoingMailGame',
|
||||
compact('customer')
|
||||
), $data);
|
||||
$json = $response->decodeResponseJson();
|
||||
|
|
|
|||
45
tests/Unit/CrmClientV2ArcadiaTest.php
Normal file
45
tests/Unit/CrmClientV2ArcadiaTest.php
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
<?php
|
||||
|
||||
namespace Tests\Unit;
|
||||
|
||||
use Illuminate\Support\Str;
|
||||
use LDC\LDCCRM\CrmApiV2;
|
||||
use LDC\LDCCRM\Enums\ArcadiaOrderType;
|
||||
use LDC\LDCCRM\Models\ArcadiaMailDefault;
|
||||
use LDC\LDCCRM\Models\ArcadiaMailGame;
|
||||
|
||||
class CrmClientV2ArcadiaTest extends CrmClientTester
|
||||
{
|
||||
public function testArcadiaSendOrderDefault()
|
||||
{
|
||||
$api = new CrmApiV2();
|
||||
$customer = $api->getCustomerOrNew(static::$info->hashcode);
|
||||
|
||||
$arcadiaOrderMail = new ArcadiaMailDefault([
|
||||
'operation' => 16,
|
||||
'label_type_support' => 'Send Departaimants',
|
||||
'order_date' => \date('Y/m/d H:i:s'),
|
||||
'state_order' => ArcadiaOrderType::cb()->value,
|
||||
'support_code' => 32,
|
||||
'label_type_support' => 'Fond carte Aimanté',
|
||||
'order_num' => 23,
|
||||
'package_unit_weight' => 200,
|
||||
]);
|
||||
$this->assertTrue($arcadiaOrderMail->send($customer));
|
||||
}
|
||||
|
||||
public function testArcadiaSendOrderGame()
|
||||
{
|
||||
$api = new CrmApiV2();
|
||||
$customer = $api->getCustomerOrNew(static::$info->hashcode);
|
||||
$arcadiaOrderMail = new ArcadiaMailGame([
|
||||
'operation' => 16,
|
||||
'order_date' => date('Y/m/d H:i:s'),
|
||||
'support_code' => 32,
|
||||
'label_type_support' => 'Jeux Reghalal',
|
||||
'code_unique' => (string)Str::uuid(),
|
||||
'code_on_pack' => 'anystring'
|
||||
]);
|
||||
$this->assertTrue($arcadiaOrderMail->send($customer));
|
||||
}
|
||||
}
|
||||
|
|
@ -8,6 +8,7 @@ use LDC\LDCCRM\CrmApiV2;
|
|||
use LDC\LDCCRM\Enums\ApiError;
|
||||
use LDC\LDCCRM\Enums\Country;
|
||||
use LDC\LDCCRM\Exceptions\ApiErrorException;
|
||||
use LDC\LDCCRM\Exceptions\ValidationException;
|
||||
use LDC\LDCCRM\Models\Customer;
|
||||
use TypeError;
|
||||
|
||||
|
|
@ -205,21 +206,56 @@ class CrmClientV2CustomerTest extends CrmClientTester
|
|||
$this->assertTrue($customer->opt_in);
|
||||
}
|
||||
|
||||
// public function testCustomerStoreProps()
|
||||
// {
|
||||
// $api = new CrmApiV2();
|
||||
// $customer = $api->getCustomerOrNew(static::$info->hashcode);
|
||||
public function testCustomerStoreProps()
|
||||
{
|
||||
$customer = new Customer();
|
||||
|
||||
// $customer->firstname = 'toto';
|
||||
// $this->assertTrue($customer->save());
|
||||
$customer->firstname = 'toto';
|
||||
$customer->lastname = 'delarogerie';
|
||||
$customer->email = 'toto.delarogerie@gmail.com';
|
||||
$customer->password = 'Complic4tEd!P4assW0rd';
|
||||
$customer->birth_date = '1992-03-08';
|
||||
$customer->phone = '0673891160';
|
||||
$customer->address = 'rue des totos';
|
||||
$customer->city = 'Toto ville';
|
||||
$customer->postcode = '72160';
|
||||
$customer->country = Country::france();
|
||||
|
||||
// $customer = $api->getCustomerOrNew(static::$info->hashcode);
|
||||
// $this->assertEquals('toto', $customer->firstname);
|
||||
$this->assertTrue($customer->save());
|
||||
|
||||
// $customer->country = Country::angola();
|
||||
// $customer->save();
|
||||
$this->assertEquals('toto', $customer->firstname);
|
||||
$this->assertEquals(null, $customer->password);
|
||||
}
|
||||
|
||||
// $customer = $api->getCustomerOrNew(static::$info->hashcode);
|
||||
// $this->assertEquals(Country::angola(), $customer->country);
|
||||
// }
|
||||
public function testCustomerStorePropsFails()
|
||||
{
|
||||
$this->expectException(ValidationException::class);
|
||||
$customer = new Customer();
|
||||
|
||||
$customer->firstname = 'toto';
|
||||
$customer->lastname = 'delarogerie';
|
||||
$customer->email = 'toto.delarogerie@gmail.com';
|
||||
$customer->password = 'simplepassword';
|
||||
$customer->birth_date = '1992-03-08';
|
||||
$customer->phone = '0673891160';
|
||||
$customer->address = 'rue des totos';
|
||||
$customer->city = 'Toto ville';
|
||||
$customer->postcode = '72160';
|
||||
$customer->country = Country::france();
|
||||
|
||||
$this->assertTrue($customer->save());
|
||||
|
||||
$this->assertEquals('toto', $customer->firstname);
|
||||
}
|
||||
|
||||
public function testCustomerDelete()
|
||||
{
|
||||
$api = new CrmApiV2();
|
||||
$customer = $api->getCustomerOrNew(static::$info->hashcode);
|
||||
|
||||
$this->assertTrue($customer->delete());
|
||||
|
||||
$customer = $api->getCustomerOrNew(static::$info->hashcode);
|
||||
$this->assertEquals(null, $customer->hashcode);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
39
tests/Unit/CrmClientV2SingleOptinTest.php
Normal file
39
tests/Unit/CrmClientV2SingleOptinTest.php
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
<?php
|
||||
|
||||
namespace Tests\Unit;
|
||||
|
||||
use LDC\LDCCRM\Enums\ApiError;
|
||||
use LDC\LDCCRM\Enums\Country;
|
||||
use LDC\LDCCRM\Exceptions\ApiErrorException;
|
||||
use LDC\LDCCRM\Models\Customer;
|
||||
use LDC\LDCCRM\Models\SingleOptin;
|
||||
|
||||
class CrmClientV2SingleOptinTest extends CrmClientTester
|
||||
{
|
||||
|
||||
public function testCreateSingleOptin()
|
||||
{
|
||||
$this->assertTrue(SingleOptin::setStatus(static::$customer->email, true));
|
||||
}
|
||||
|
||||
public function testCreateSingleOptinShouldFailBecauseCustomerExists()
|
||||
{
|
||||
$this->expectException(ApiErrorException::class);
|
||||
$this->expectExceptionMessage(ApiError::singleOptinCustomerExists()->label);
|
||||
$customer = new Customer();
|
||||
|
||||
$customer->firstname = 'toto singleoptin';
|
||||
$customer->lastname = 'delarogerie';
|
||||
$customer->email = 'totosingleoptin.delarogerie@gmail.com';
|
||||
$customer->password = 'Complic4tEd!P4assW0rd';
|
||||
$customer->birth_date = '1992-03-08';
|
||||
$customer->phone = '0673891160';
|
||||
$customer->address = 'rue des totos';
|
||||
$customer->city = 'Toto ville';
|
||||
$customer->postcode = '72160';
|
||||
$customer->country = Country::france();
|
||||
|
||||
$this->assertTrue($customer->save());
|
||||
$this->assertFalse(SingleOptin::setStatus($customer->email, true));
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Reference in a new issue