Compare commits
No commits in common. "c35e86f633ca508fe9974c73d7af5d181b47e5c6" and "07481f75cee94f4a76fc1b70db679175c424553f" have entirely different histories.
c35e86f633
...
07481f75ce
@ -1,59 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Console\Commands;
|
|
||||||
|
|
||||||
use App\Models\Supplier;
|
|
||||||
use App\Models\User;
|
|
||||||
use Illuminate\Console\Command;
|
|
||||||
use Illuminate\Support\Facades\Hash;
|
|
||||||
use Illuminate\Support\Str;
|
|
||||||
|
|
||||||
class MaryKerApiToken extends Command
|
|
||||||
{
|
|
||||||
protected $signature = 'maryker:api-token
|
|
||||||
{--rotate : a korábbi tokenek visszavonása az új kiadása előtt}
|
|
||||||
{--name=maryker-api : a token neve}';
|
|
||||||
|
|
||||||
protected $description = 'Sanctum tokent ad ki a Mary-Ker API-hoz (EV3-461): szerepkör nélküli, a beszállítóhoz kötött felhasználóhoz';
|
|
||||||
|
|
||||||
public function handle(): int
|
|
||||||
{
|
|
||||||
$nameId = config('maryker.supplier_name_id');
|
|
||||||
$supplier = Supplier::where('nameId', $nameId)->first();
|
|
||||||
if (! $supplier) {
|
|
||||||
$this->error("Nincs ilyen betűkódú beszállító: {$nameId}");
|
|
||||||
|
|
||||||
return self::FAILURE;
|
|
||||||
}
|
|
||||||
|
|
||||||
$user = User::where('email', config('maryker.api_user_email'))->first();
|
|
||||||
if ($user && $user->supplier_id !== $supplier->id) {
|
|
||||||
$this->error("A(z) {$user->email} felhasználó nem a(z) {$nameId} beszállítóhoz van kötve (supplier_id: " . var_export($user->supplier_id, true) . '). Nem adok ki tokent.');
|
|
||||||
|
|
||||||
return self::FAILURE;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Szerepkört szándékosan nem kap: így a Filament-panelekbe (canAccessPanel) sem léphet be.
|
|
||||||
$user ??= User::create([
|
|
||||||
'name' => "{$supplier->name} API",
|
|
||||||
'email' => config('maryker.api_user_email'),
|
|
||||||
'password' => Hash::make(Str::random(64)),
|
|
||||||
'supplier_id' => $supplier->id,
|
|
||||||
]);
|
|
||||||
|
|
||||||
if ($this->option('rotate')) {
|
|
||||||
$revoked = $user->tokens()->delete();
|
|
||||||
$this->line(" {$revoked} korábbi token visszavonva.");
|
|
||||||
} elseif (($existing = $user->tokens()->count()) > 0) {
|
|
||||||
$this->warn(" Már van {$existing} érvényes token; az újjal együtt mind él (visszavonás: --rotate).");
|
|
||||||
}
|
|
||||||
|
|
||||||
$token = $user->createToken($this->option('name'), [config('maryker.ability')]);
|
|
||||||
|
|
||||||
$this->info("Token kiadva: {$supplier->name} ({$nameId}), felhasználó: {$user->email}");
|
|
||||||
$this->line('A token csak most látható, nem kérhető le újra:');
|
|
||||||
$this->line($token->plainTextToken);
|
|
||||||
|
|
||||||
return self::SUCCESS;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,182 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Console\Commands;
|
|
||||||
|
|
||||||
use App\Models\ProfitCenter;
|
|
||||||
use App\Models\Supplier;
|
|
||||||
use Illuminate\Console\Command;
|
|
||||||
use Illuminate\Support\Facades\DB;
|
|
||||||
use PhpOffice\PhpSpreadsheet\Cell\DataType;
|
|
||||||
use PhpOffice\PhpSpreadsheet\Spreadsheet;
|
|
||||||
use PhpOffice\PhpSpreadsheet\Style\Alignment;
|
|
||||||
use PhpOffice\PhpSpreadsheet\Style\Fill;
|
|
||||||
use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
|
|
||||||
|
|
||||||
class MaryKerDeliveryAddressReport extends Command
|
|
||||||
{
|
|
||||||
protected $signature = 'maryker:delivery-addresses
|
|
||||||
{--supplier=MARY : a beszállító betűkódja (nameId)}
|
|
||||||
{--path= : a kimeneti xlsx útvonala}';
|
|
||||||
|
|
||||||
protected $description = 'Excelt készít a beszállító telephelyeiről és szállítási címeiről (EV3-461, szállítási alegység-azonosító egyeztetéséhez)';
|
|
||||||
|
|
||||||
public const TYPE_BASE = 'alap cím';
|
|
||||||
|
|
||||||
public const TYPE_DELIVERY = 'szállítási cím';
|
|
||||||
|
|
||||||
private const HEADERS = [
|
|
||||||
'Profitcenter ID', 'Név', 'Hooreyca azonosító', 'Betűkód (nameId)', 'Beszállítói vevőkód',
|
|
||||||
'Cím típusa', 'Cím', 'Cím azonosító', 'Cím megnevezése', 'Apolló-kód (kitöltendő)', 'Megjegyzés',
|
|
||||||
];
|
|
||||||
|
|
||||||
public function handle(): int
|
|
||||||
{
|
|
||||||
$supplier = Supplier::where('nameId', $this->option('supplier'))->first();
|
|
||||||
if (! $supplier) {
|
|
||||||
$this->error('Nincs ilyen betűkódú beszállító: ' . $this->option('supplier'));
|
|
||||||
|
|
||||||
return self::FAILURE;
|
|
||||||
}
|
|
||||||
|
|
||||||
$rows = $this->rows($supplier);
|
|
||||||
|
|
||||||
$path = $this->option('path') ?: storage_path(
|
|
||||||
'app/private/' . strtolower($supplier->nameId) . '_szallitasi_cimek_' . now()->format('Y-m-d') . '.xlsx'
|
|
||||||
);
|
|
||||||
if (! is_dir(dirname($path))) {
|
|
||||||
mkdir(dirname($path), 0775, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
(new Xlsx($this->spreadsheet($supplier, $rows)))->save($path);
|
|
||||||
|
|
||||||
$profitCenters = count(array_unique(array_column($rows, 0)));
|
|
||||||
$deliveryRows = count(array_filter($rows, fn ($row) => $row[5] === self::TYPE_DELIVERY));
|
|
||||||
$warnings = count(array_filter($rows, fn ($row) => $row[10] !== ''));
|
|
||||||
|
|
||||||
$this->info('Elkészült: ' . $path);
|
|
||||||
$this->line(" {$profitCenters} profitcenter, " . count($rows) . " sor, ebből {$deliveryRows} szállítási cím");
|
|
||||||
if ($warnings > 0) {
|
|
||||||
$this->warn(" {$warnings} sorban van megjegyzés (adatrögzítési eltérés), nézd át.");
|
|
||||||
}
|
|
||||||
|
|
||||||
return self::SUCCESS;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Egy sor / profitcenter, vagy ha a profitcenter több szállítási címes, egy sor / cím.
|
|
||||||
* Ugyanazt a szabályt követi, mint a megrendelő felület (OrderController::createParameter):
|
|
||||||
* a "multiAddress" jelző dönt, nem a címrekordok száma.
|
|
||||||
*
|
|
||||||
* @return array<int, array<int, mixed>>
|
|
||||||
*/
|
|
||||||
public function rows(Supplier $supplier): array
|
|
||||||
{
|
|
||||||
$profitCenters = $supplier->profitCenter()
|
|
||||||
->with(['address' => fn ($query) => $query->orderBy('id'), 'supplierCustomerCodes'])
|
|
||||||
->orderBy('name')
|
|
||||||
->get();
|
|
||||||
|
|
||||||
$rows = [];
|
|
||||||
foreach ($profitCenters as $profitCenter) {
|
|
||||||
$head = [
|
|
||||||
$profitCenter->id,
|
|
||||||
$profitCenter->name,
|
|
||||||
(string) $profitCenter->hooreycaId,
|
|
||||||
(string) $profitCenter->nameId,
|
|
||||||
(string) $profitCenter->supplierCustomerCodes->firstWhere('supplier_id', $supplier->id)?->customerCode,
|
|
||||||
];
|
|
||||||
foreach ($this->addressRows($profitCenter) as $addressRow) {
|
|
||||||
$rows[] = array_merge($head, $addressRow);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return $rows;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return array<int, array{0: string, 1: string, 2: string, 3: string, 4: string, 5: string}>
|
|
||||||
* [típus, cím, cím azonosító, cím megnevezése, Apolló-kód, megjegyzés]
|
|
||||||
*/
|
|
||||||
private function addressRows(ProfitCenter $profitCenter): array
|
|
||||||
{
|
|
||||||
$addresses = $profitCenter->address;
|
|
||||||
|
|
||||||
if ((bool) $profitCenter->multiAddress) {
|
|
||||||
if ($addresses->isEmpty()) {
|
|
||||||
return [[self::TYPE_DELIVERY, '', '', '', '', 'A több szállítási cím be van kapcsolva, de nincs szállítási cím rögzítve.']];
|
|
||||||
}
|
|
||||||
|
|
||||||
return $addresses->map(fn ($address) => [
|
|
||||||
self::TYPE_DELIVERY, $address->fullAddress, (string) $address->id, (string) $address->name, '', '',
|
|
||||||
])->all();
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((bool) $profitCenter->addressEqual) {
|
|
||||||
$extra = $addresses->count();
|
|
||||||
|
|
||||||
return [[self::TYPE_BASE, $profitCenter->fullAddress, '', '', '', $extra > 0
|
|
||||||
? "A telephely címe az alap cím, de {$extra} további címrekord is van rögzítve - ezek a megrendelő felületen nem jelennek meg."
|
|
||||||
: '']];
|
|
||||||
}
|
|
||||||
|
|
||||||
$first = $addresses->first();
|
|
||||||
if (! $first) {
|
|
||||||
return [[self::TYPE_BASE, '', '', '', '', 'Az alap cím nem egyezik a telephely címével, de nincs címrekord rögzítve.']];
|
|
||||||
}
|
|
||||||
|
|
||||||
return [[self::TYPE_BASE, $first->fullAddress, (string) $first->id, (string) $first->name, '', $addresses->count() > 1
|
|
||||||
? 'Több címrekord van rögzítve, de a megrendelő felületen csak az első jelenik meg.'
|
|
||||||
: '']];
|
|
||||||
}
|
|
||||||
|
|
||||||
private function spreadsheet(Supplier $supplier, array $rows): Spreadsheet
|
|
||||||
{
|
|
||||||
$spreadsheet = new Spreadsheet();
|
|
||||||
$sheet = $spreadsheet->getActiveSheet();
|
|
||||||
$sheet->setTitle('Szállítási címek');
|
|
||||||
|
|
||||||
$sheet->setCellValue('A1', $supplier->name . ' - telephelyek és szállítási címek');
|
|
||||||
$sheet->getStyle('A1')->getFont()->setBold(true)->setSize(16);
|
|
||||||
$sheet->setCellValue('A2', 'EV3-461 · Adatforrás: ' . DB::connection()->getDatabaseName()
|
|
||||||
. ' adatbázis · Készült: ' . now()->format('Y-m-d H:i'));
|
|
||||||
$sheet->setCellValue('A3', 'Ahol a telephelynek több szállítási címe van, címenként egy sor szerepel. '
|
|
||||||
. 'A sárga "Apolló-kód" oszlopot a Multi.hu tölti ki a cím azonosítója mellé.');
|
|
||||||
|
|
||||||
$headerRow = 5;
|
|
||||||
foreach (self::HEADERS as $index => $text) {
|
|
||||||
$sheet->setCellValueByColumnAndRow($index + 1, $headerRow, $text);
|
|
||||||
}
|
|
||||||
$range = 'A' . $headerRow . ':K' . $headerRow;
|
|
||||||
$sheet->getStyle($range)->getFont()->setBold(true)->getColor()->setARGB('FFFFFFFF');
|
|
||||||
$sheet->getStyle($range)->getFill()->setFillType(Fill::FILL_SOLID)->getStartColor()->setARGB('FF44546A');
|
|
||||||
$sheet->getStyle($range)->getAlignment()->setWrapText(true)->setVertical(Alignment::VERTICAL_CENTER);
|
|
||||||
|
|
||||||
$row = $headerRow;
|
|
||||||
foreach ($rows as $values) {
|
|
||||||
$row++;
|
|
||||||
foreach ($values as $index => $value) {
|
|
||||||
// Szövegként írjuk (vevőkód, betűkód): az Excel ne vágja le a vezető nullákat.
|
|
||||||
$sheet->setCellValueExplicitByColumnAndRow(
|
|
||||||
$index + 1,
|
|
||||||
$row,
|
|
||||||
$value,
|
|
||||||
is_int($value) ? DataType::TYPE_NUMERIC : DataType::TYPE_STRING
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($row > $headerRow) {
|
|
||||||
$sheet->getStyle('J' . ($headerRow + 1) . ':J' . $row)->getFill()
|
|
||||||
->setFillType(Fill::FILL_SOLID)->getStartColor()->setARGB('FFFFF2CC');
|
|
||||||
$sheet->getStyle('K' . ($headerRow + 1) . ':K' . $row)->getFont()->getColor()->setARGB('FF9C5700');
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (['A' => 12, 'B' => 38, 'C' => 18, 'D' => 16, 'E' => 18, 'F' => 15, 'G' => 44, 'H' => 14, 'I' => 30, 'J' => 22, 'K' => 60] as $column => $width) {
|
|
||||||
$sheet->getColumnDimension($column)->setWidth($width);
|
|
||||||
}
|
|
||||||
$sheet->freezePane('A' . ($headerRow + 1));
|
|
||||||
$sheet->setAutoFilter($range);
|
|
||||||
|
|
||||||
return $spreadsheet;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,150 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Http\Controllers\api\v1;
|
|
||||||
|
|
||||||
use App\Http\Controllers\Controller;
|
|
||||||
use App\Models\OrderArchive;
|
|
||||||
use Carbon\Carbon;
|
|
||||||
use Illuminate\Http\JsonResponse;
|
|
||||||
use Illuminate\Http\Request;
|
|
||||||
use Illuminate\Support\Facades\Log;
|
|
||||||
use Illuminate\Support\Facades\Validator;
|
|
||||||
use Illuminate\Support\Str;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Mary-Ker (Apolló) rendeléslekérő és visszaigazoló API (EV3-461).
|
|
||||||
*
|
|
||||||
* A Hooreyca-mintától (OrderController) szándékosan elkülönített: saját útvonal, saját token. A szűrés
|
|
||||||
* a token tulajdonosának supplier_id-jából jön, így a token más beszállító rendeléséhez nem fér hozzá.
|
|
||||||
*
|
|
||||||
* Az order_archives írásai szándékosan toBase()-en mennek: nincs modell-esemény, így nem íródik át
|
|
||||||
* az updated_by / updated_at az API-felhasználóra, és nincs mit kiszivárogtatni a válaszba.
|
|
||||||
*/
|
|
||||||
class MaryKerOrderController extends Controller
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Feldolgozatlan rendelések (confirmed nem null, APIConfirmed null), régi elöl, lapozva.
|
|
||||||
*
|
|
||||||
* Idempotens a találati halmaz szempontjából: a lista csak az APIConfirmed-től függ, ezért ugyanazt
|
|
||||||
* adja, amíg a setProcessed meg nem történik. Az APICallBackId-t csak az első lekérésnél generálja,
|
|
||||||
* utána stabil. Az egyetlen mellékhatás az APILastGetting bélyeg.
|
|
||||||
*/
|
|
||||||
public function unProcessed(Request $request): JsonResponse
|
|
||||||
{
|
|
||||||
$updateDate = Carbon::now();
|
|
||||||
$header = $this->header($updateDate);
|
|
||||||
|
|
||||||
$supplierId = $request->user()?->supplier_id;
|
|
||||||
if (! $supplierId) {
|
|
||||||
return $this->forbidden($header);
|
|
||||||
}
|
|
||||||
|
|
||||||
$page = OrderArchive::query()
|
|
||||||
->select(['id', 'humanId', 'confirmed', 'sumPrice', 'deliveryDate', 'note'])
|
|
||||||
->where('supplier_id', $supplierId)
|
|
||||||
->whereNotNull('confirmed')
|
|
||||||
->whereNull('APIConfirmed')
|
|
||||||
->orderBy('id')
|
|
||||||
->paginate(max(1, (int) config('maryker.per_page')));
|
|
||||||
|
|
||||||
$ids = $page->getCollection()->pluck('id');
|
|
||||||
$callbackIds = $this->ensureCallbackIds($ids->all());
|
|
||||||
|
|
||||||
OrderArchive::query()->toBase()->whereIn('id', $ids)->update(['APILastGetting' => $updateDate]);
|
|
||||||
|
|
||||||
// TODO 1.2: profitCenter (sellerProfitCenterId, szállítási alegység, cím) és items (sellerItemNumber, sumPrice ...)
|
|
||||||
$page->setCollection($page->getCollection()->map(fn (OrderArchive $order) => [
|
|
||||||
'orderId' => $order->humanId,
|
|
||||||
'APICallBackId' => $callbackIds[$order->id],
|
|
||||||
'confirmedAt' => $order->confirmed,
|
|
||||||
'orderSum' => $order->sumPrice,
|
|
||||||
'orderDeliveryDate' => $order->deliveryDate,
|
|
||||||
'orderDescription' => (string) $order->note,
|
|
||||||
]));
|
|
||||||
|
|
||||||
Log::channel('api')->info('MaryKer unprocessed', [
|
|
||||||
'userId' => $request->user()->id, 'page' => $page->currentPage(), 'orderIds' => $ids->all(),
|
|
||||||
]);
|
|
||||||
|
|
||||||
return responder()->success($page)->respond(null, $header);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Visszaigazolás: az APICallBackId-k alapján beállítja az APIConfirmed-et.
|
|
||||||
* Kötelezően nem üres tömb; egy elem csak akkor "updated", ha a token beszállítójáé, lekért és még
|
|
||||||
* nem visszaigazolt rendeléshez tartozik.
|
|
||||||
*/
|
|
||||||
public function setProcessed(Request $request): JsonResponse
|
|
||||||
{
|
|
||||||
$updateDate = Carbon::now();
|
|
||||||
$header = $this->header($updateDate);
|
|
||||||
|
|
||||||
$supplierId = $request->user()?->supplier_id;
|
|
||||||
if (! $supplierId) {
|
|
||||||
return $this->forbidden($header);
|
|
||||||
}
|
|
||||||
|
|
||||||
// A kliens nem biztos, hogy JSON Content-Type-ot küld (a Hooreyca sem teszi), ezért a nyers törzset olvassuk.
|
|
||||||
$body = json_decode($request->getContent(), true);
|
|
||||||
$validator = Validator::make(is_array($body) ? $body : [], [
|
|
||||||
'APICallBackId' => ['required', 'array', 'min:1', 'max:' . (int) config('maryker.set_processed_max')],
|
|
||||||
'APICallBackId.*' => ['required', 'string', 'max:36', 'distinct'],
|
|
||||||
]);
|
|
||||||
if (! is_array($body) || $validator->fails()) {
|
|
||||||
$message = is_array($body) ? $validator->errors()->first() : 'A kérés törzse nem érvényes JSON objektum.';
|
|
||||||
Log::channel('api')->warning('MaryKer setProcessed invalid data', ['userId' => $request->user()->id, 'message' => $message]);
|
|
||||||
|
|
||||||
return responder()->error('invalid data', $message)->respond(422, $header);
|
|
||||||
}
|
|
||||||
|
|
||||||
$result = [];
|
|
||||||
foreach ($body['APICallBackId'] as $callbackId) {
|
|
||||||
$updated = OrderArchive::query()->toBase()
|
|
||||||
->where('supplier_id', $supplierId)
|
|
||||||
->where('APICallBackId', $callbackId)
|
|
||||||
->whereNotNull('confirmed')
|
|
||||||
->whereNotNull('APILastGetting')
|
|
||||||
->whereNull('APIConfirmed')
|
|
||||||
->update(['APIConfirmed' => $updateDate]);
|
|
||||||
|
|
||||||
$result[$callbackId] = $updated ? 'updated' : 'invalid Id';
|
|
||||||
}
|
|
||||||
|
|
||||||
Log::channel('api')->info('MaryKer setProcessed', ['userId' => $request->user()->id, 'result' => $result]);
|
|
||||||
|
|
||||||
return responder()->success($result)->respond(null, $header);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Az üres APICallBackId-kat feltölti (versenyhelyzet-biztosan: csak null-t ír felül), majd visszaadja
|
|
||||||
* az összes megadott rendelés azonosítóját id => uuid alakban.
|
|
||||||
*
|
|
||||||
* @param array<int, int> $orderIds
|
|
||||||
* @return array<int, string>
|
|
||||||
*/
|
|
||||||
private function ensureCallbackIds(array $orderIds): array
|
|
||||||
{
|
|
||||||
$missing = OrderArchive::query()->toBase()->whereIn('id', $orderIds)->whereNull('APICallBackId')->pluck('id');
|
|
||||||
|
|
||||||
foreach ($missing as $id) {
|
|
||||||
OrderArchive::query()->toBase()->where('id', $id)->whereNull('APICallBackId')
|
|
||||||
->update(['APICallBackId' => (string) Str::orderedUuid()]);
|
|
||||||
}
|
|
||||||
|
|
||||||
return OrderArchive::query()->toBase()->whereIn('id', $orderIds)->pluck('APICallBackId', 'id')->all();
|
|
||||||
}
|
|
||||||
|
|
||||||
/** @return array{apiVersion: string, processedTime: string} */
|
|
||||||
private function header(Carbon $time): array
|
|
||||||
{
|
|
||||||
$header = parseAPIVersionFromNamespace(__NAMESPACE__);
|
|
||||||
$header['processedTime'] = $time->format('Y.m.d. H:i:s.u');
|
|
||||||
|
|
||||||
return $header;
|
|
||||||
}
|
|
||||||
|
|
||||||
private function forbidden(array $header): JsonResponse
|
|
||||||
{
|
|
||||||
return responder()->error('forbidden', 'A tokenhez nem tartozik beszállító.')->respond(403, $header);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,6 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use Illuminate\Auth\AuthenticationException;
|
|
||||||
use Illuminate\Foundation\Application;
|
use Illuminate\Foundation\Application;
|
||||||
use Illuminate\Foundation\Configuration\Exceptions;
|
use Illuminate\Foundation\Configuration\Exceptions;
|
||||||
use Illuminate\Foundation\Configuration\Middleware;
|
use Illuminate\Foundation\Configuration\Middleware;
|
||||||
@ -16,24 +15,11 @@
|
|||||||
)
|
)
|
||||||
->withMiddleware(function (Middleware $middleware): void {
|
->withMiddleware(function (Middleware $middleware): void {
|
||||||
$middleware->trustProxies(at: '*');
|
$middleware->trustProxies(at: '*');
|
||||||
$middleware->alias([
|
|
||||||
'abilities' => \Laravel\Sanctum\Http\Middleware\CheckAbilities::class,
|
|
||||||
'ability' => \Laravel\Sanctum\Http\Middleware\CheckForAnyAbility::class,
|
|
||||||
]);
|
|
||||||
})
|
})
|
||||||
->withExceptions(function (Exceptions $exceptions): void {
|
->withExceptions(function (Exceptions $exceptions): void {
|
||||||
// Mary-Ker API (EV3-461): Accept fejléc nélkül is JSON hibaválasz, és a hitelesítési hiba 401 marad
|
|
||||||
// (a Hooreyca-útvonalakra ez szándékosan nem terjed ki, ld. a jegy backlogját).
|
|
||||||
$maryKerApi = fn (Request $request) => $request->is('api/v1/maryker/*');
|
|
||||||
$exceptions->shouldRenderJsonWhen(fn (Request $request, Throwable $e) => $maryKerApi($request) || $request->expectsJson());
|
|
||||||
|
|
||||||
// AJAX kérések esetén mindig JSON választ adunk, egyedi referencia kóddal
|
// AJAX kérések esetén mindig JSON választ adunk, egyedi referencia kóddal
|
||||||
$exceptions->renderable(function (Throwable $e, Request $request) use ($maryKerApi) {
|
$exceptions->renderable(function (Throwable $e, Request $request) {
|
||||||
if ($e instanceof AuthenticationException && $maryKerApi($request)) {
|
if ($request->ajax() || $request->wantsJson()) {
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($request->ajax() || $request->wantsJson() || $maryKerApi($request)) {
|
|
||||||
// Validációs hibákat nem piszkáljuk – azokat a Laravel alapból kezeli
|
// Validációs hibákat nem piszkáljuk – azokat a Laravel alapból kezeli
|
||||||
if ($e instanceof ValidationException) {
|
if ($e instanceof ValidationException) {
|
||||||
return null;
|
return null;
|
||||||
|
|||||||
@ -1,26 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Mary-Ker API-kapcsolat (EV3-461)
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
return [
|
|
||||||
|
|
||||||
// A beszállító betűkódja (suppliers.nameId), amihez az API-felhasználót köti a maryker:api-token parancs.
|
|
||||||
'supplier_name_id' => env('MARYKER_SUPPLIER_NAME_ID', 'MARY'),
|
|
||||||
|
|
||||||
// A Sanctum token ability-je; a /api/v1/maryker/* útvonalak csak ezzel érhetők el.
|
|
||||||
'ability' => 'maryker:orders',
|
|
||||||
|
|
||||||
// A tokent birtokló, szerepkör nélküli (panelekre nem belépő) API-felhasználó.
|
|
||||||
'api_user_email' => env('MARYKER_API_USER_EMAIL', 'maryker-api@api.invalid'),
|
|
||||||
|
|
||||||
// Rendelés / oldal az unprocessed válaszban.
|
|
||||||
'per_page' => (int) env('MARYKER_API_PER_PAGE', 50),
|
|
||||||
|
|
||||||
// Egy setProcessed kérésben visszaigazolható APICallBackId-k felső határa.
|
|
||||||
'set_processed_max' => (int) env('MARYKER_API_SET_PROCESSED_MAX', 500),
|
|
||||||
|
|
||||||
];
|
|
||||||
@ -1,6 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use App\Http\Controllers\api\v1\MaryKerOrderController;
|
|
||||||
use App\Http\Controllers\api\v1\OrderController;
|
use App\Http\Controllers\api\v1\OrderController;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Support\Facades\Route;
|
use Illuminate\Support\Facades\Route;
|
||||||
@ -48,11 +47,3 @@
|
|||||||
Route::match(['put', 'patch'], 'setProcessed', [OrderController::class, 'setProcessed'])->name('setProcessed');
|
Route::match(['put', 'patch'], 'setProcessed', [OrderController::class, 'setProcessed'])->name('setProcessed');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// Mary-Ker (EV3-461): saját végpont és saját, beszállítóhoz kötött token (ld. maryker:api-token).
|
|
||||||
Route::prefix('/v1/maryker/order')->name('maryker.order.')
|
|
||||||
->middleware(['auth:sanctum', 'abilities:'.config('maryker.ability')])
|
|
||||||
->group(function () {
|
|
||||||
Route::get('unprocessed', [MaryKerOrderController::class, 'unProcessed'])->name('unProcessed');
|
|
||||||
Route::patch('setProcessed', [MaryKerOrderController::class, 'setProcessed'])->name('setProcessed');
|
|
||||||
});
|
|
||||||
|
|||||||
@ -1,312 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
use App\Models\OrderArchive;
|
|
||||||
use App\Models\Supplier;
|
|
||||||
use App\Models\User;
|
|
||||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
||||||
use Laravel\Sanctum\Sanctum;
|
|
||||||
use Tests\TestCase;
|
|
||||||
|
|
||||||
uses(TestCase::class, RefreshDatabase::class);
|
|
||||||
|
|
||||||
const MARYKER_UNPROCESSED = '/api/v1/maryker/order/unprocessed';
|
|
||||||
const MARYKER_SET_PROCESSED = '/api/v1/maryker/order/setProcessed';
|
|
||||||
|
|
||||||
function maryKerUser(Supplier $supplier, array $abilities = ['maryker:orders']): User
|
|
||||||
{
|
|
||||||
$user = User::factory()->create(['supplier_id' => $supplier->id]);
|
|
||||||
Sanctum::actingAs($user, $abilities);
|
|
||||||
|
|
||||||
return $user;
|
|
||||||
}
|
|
||||||
|
|
||||||
function maryKerOrder(Supplier $supplier, array $attributes = []): OrderArchive
|
|
||||||
{
|
|
||||||
static $sequence = 0;
|
|
||||||
$sequence++;
|
|
||||||
|
|
||||||
return OrderArchive::create(array_merge([
|
|
||||||
'supplier_id' => $supplier->id,
|
|
||||||
'humanId' => sprintf('%s/AKG/26/%04d', $supplier->nameId, $sequence),
|
|
||||||
'confirmed' => '2026-10-20 10:15:00',
|
|
||||||
'deliveryDate' => '2026-10-22',
|
|
||||||
'sumPrice' => 1234.5,
|
|
||||||
'note' => 'megjegyzés',
|
|
||||||
], $attributes));
|
|
||||||
}
|
|
||||||
|
|
||||||
beforeEach(function () {
|
|
||||||
$this->mary = Supplier::factory()->create(['nameId' => 'MARY']);
|
|
||||||
$this->other = Supplier::factory()->create(['nameId' => 'IDEGEN']);
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('hitelesítés', function () {
|
|
||||||
it('401-et ad token nélkül, JSON Accept fejléccel és anélkül is', function () {
|
|
||||||
$this->getJson(MARYKER_UNPROCESSED)->assertUnauthorized();
|
|
||||||
$this->get(MARYKER_UNPROCESSED)->assertUnauthorized();
|
|
||||||
$this->patchJson(MARYKER_SET_PROCESSED, ['APICallBackId' => ['x']])->assertUnauthorized();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('403-at ad, ha a token nem a maryker:orders ability-t hordozza', function () {
|
|
||||||
maryKerUser($this->mary, ['api:read']);
|
|
||||||
|
|
||||||
$this->getJson(MARYKER_UNPROCESSED)->assertForbidden();
|
|
||||||
$this->patchJson(MARYKER_SET_PROCESSED, ['APICallBackId' => ['x']])->assertForbidden();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('403-at ad, ha a token tulajdonosa nincs beszállítóhoz kötve', function () {
|
|
||||||
Sanctum::actingAs(User::factory()->create(), ['maryker:orders']);
|
|
||||||
|
|
||||||
$this->getJson(MARYKER_UNPROCESSED)->assertForbidden();
|
|
||||||
$this->patchJson(MARYKER_SET_PROCESSED, ['APICallBackId' => ['x']])->assertForbidden();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('valódi bearer tokennel is működik', function () {
|
|
||||||
$user = User::factory()->create(['supplier_id' => $this->mary->id]);
|
|
||||||
$token = $user->createToken('teszt', ['maryker:orders'])->plainTextToken;
|
|
||||||
maryKerOrder($this->mary);
|
|
||||||
|
|
||||||
$this->withToken($token)->getJson(MARYKER_UNPROCESSED)->assertOk()->assertJsonCount(1, 'data');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('unprocessed', function () {
|
|
||||||
it('csak a Mary-Ker megerősített, még nem visszaigazolt rendeléseit adja', function () {
|
|
||||||
maryKerUser($this->mary);
|
|
||||||
$own = maryKerOrder($this->mary);
|
|
||||||
maryKerOrder($this->other);
|
|
||||||
maryKerOrder($this->mary, ['confirmed' => null]);
|
|
||||||
maryKerOrder($this->mary, ['APIConfirmed' => '2026-10-21 08:00:00']);
|
|
||||||
|
|
||||||
$response = $this->getJson(MARYKER_UNPROCESSED)->assertOk();
|
|
||||||
|
|
||||||
$response->assertJsonCount(1, 'data')
|
|
||||||
->assertJsonPath('data.0.orderId', $own->humanId)
|
|
||||||
->assertJsonPath('data.0.confirmedAt', '2026-10-20 10:15:00')
|
|
||||||
->assertJsonPath('data.0.orderSum', 1234.5)
|
|
||||||
->assertJsonPath('data.0.orderDeliveryDate', '2026-10-22')
|
|
||||||
->assertJsonPath('data.0.orderDescription', 'megjegyzés')
|
|
||||||
->assertJsonPath('status', 200)
|
|
||||||
->assertJsonPath('success', true)
|
|
||||||
->assertJsonPath('apiVersion', '1')
|
|
||||||
->assertJsonStructure(['processedTime', 'pagination' => ['count', 'total', 'perPage', 'currentPage', 'totalPages']]);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('a más beszállító rendelése egyáltalán nem látszik, akkor sem, ha nincs Mary-Ker rendelés', function () {
|
|
||||||
maryKerUser($this->mary);
|
|
||||||
maryKerOrder($this->other);
|
|
||||||
|
|
||||||
$this->getJson(MARYKER_UNPROCESSED)->assertOk()->assertJsonCount(0, 'data')->assertJsonPath('pagination.total', 0);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('a lapozás a konfigurált méretet követi, régi elöl', function () {
|
|
||||||
config(['maryker.per_page' => 2]);
|
|
||||||
maryKerUser($this->mary);
|
|
||||||
$orders = collect(range(1, 5))->map(fn () => maryKerOrder($this->mary));
|
|
||||||
|
|
||||||
$first = $this->getJson(MARYKER_UNPROCESSED)->assertOk();
|
|
||||||
$first->assertJsonCount(2, 'data')
|
|
||||||
->assertJsonPath('pagination.perPage', 2)
|
|
||||||
->assertJsonPath('pagination.total', 5)
|
|
||||||
->assertJsonPath('pagination.totalPages', 3)
|
|
||||||
->assertJsonPath('data.0.orderId', $orders[0]->humanId)
|
|
||||||
->assertJsonPath('data.1.orderId', $orders[1]->humanId);
|
|
||||||
|
|
||||||
$this->getJson(MARYKER_UNPROCESSED . '?page=3')->assertOk()
|
|
||||||
->assertJsonCount(1, 'data')
|
|
||||||
->assertJsonPath('data.0.orderId', $orders[4]->humanId);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('nem szivárogtat updated_by / updated_at mezőt, és nem módosítja a rendelés audit mezőit', function () {
|
|
||||||
$order = maryKerOrder($this->mary);
|
|
||||||
$updatedBy = $order->fresh()->updated_by;
|
|
||||||
$updatedAt = $order->fresh()->updated_at;
|
|
||||||
maryKerUser($this->mary);
|
|
||||||
|
|
||||||
$this->travel(5)->minutes();
|
|
||||||
$response = $this->getJson(MARYKER_UNPROCESSED)->assertOk();
|
|
||||||
|
|
||||||
expect(array_keys($response->json('data.0')))
|
|
||||||
->toBe(['orderId', 'APICallBackId', 'confirmedAt', 'orderSum', 'orderDeliveryDate', 'orderDescription'])
|
|
||||||
->and($response->getContent())->not->toContain('updated_by')->not->toContain('updated_at');
|
|
||||||
|
|
||||||
$fresh = $order->fresh();
|
|
||||||
expect($fresh->updated_by)->toBe($updatedBy)
|
|
||||||
->and($fresh->updated_at->equalTo($updatedAt))->toBeTrue();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('idempotens: ugyanazt adja, az APICallBackId stabil, az APILastGetting beáll', function () {
|
|
||||||
maryKerUser($this->mary);
|
|
||||||
$order = maryKerOrder($this->mary);
|
|
||||||
expect($order->fresh()->APILastGetting)->toBeNull();
|
|
||||||
|
|
||||||
$first = $this->getJson(MARYKER_UNPROCESSED)->assertOk()->json('data');
|
|
||||||
$second = $this->getJson(MARYKER_UNPROCESSED)->assertOk()->json('data');
|
|
||||||
|
|
||||||
expect($second)->toBe($first)
|
|
||||||
->and($first[0]['APICallBackId'])->toBeUuid()
|
|
||||||
->and($order->fresh()->APICallBackId)->toBe($first[0]['APICallBackId'])
|
|
||||||
->and($order->fresh()->APILastGetting)->not->toBeNull();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('nem nyúl a más beszállító rendeléseihez', function () {
|
|
||||||
maryKerUser($this->mary);
|
|
||||||
maryKerOrder($this->mary);
|
|
||||||
$foreign = maryKerOrder($this->other);
|
|
||||||
|
|
||||||
$this->getJson(MARYKER_UNPROCESSED)->assertOk();
|
|
||||||
|
|
||||||
expect($foreign->fresh()->APICallBackId)->toBeNull()->and($foreign->fresh()->APILastGetting)->toBeNull();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('setProcessed', function () {
|
|
||||||
function fetchCallbackId(): string
|
|
||||||
{
|
|
||||||
return test()->getJson(MARYKER_UNPROCESSED)->assertOk()->json('data.0.APICallBackId');
|
|
||||||
}
|
|
||||||
|
|
||||||
it('visszaigazolja a lekért rendelést, és utána nem szerepel a listán', function () {
|
|
||||||
maryKerUser($this->mary);
|
|
||||||
$order = maryKerOrder($this->mary);
|
|
||||||
$id = fetchCallbackId();
|
|
||||||
|
|
||||||
$this->patchJson(MARYKER_SET_PROCESSED, ['APICallBackId' => [$id]])
|
|
||||||
->assertOk()
|
|
||||||
->assertJsonPath('success', true)
|
|
||||||
->assertJsonPath("data.$id", 'updated');
|
|
||||||
|
|
||||||
expect($order->fresh()->APIConfirmed)->not->toBeNull();
|
|
||||||
$this->getJson(MARYKER_UNPROCESSED)->assertOk()->assertJsonCount(0, 'data');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('a másodszori visszaigazolás és az ismeretlen azonosító "invalid Id"', function () {
|
|
||||||
maryKerUser($this->mary);
|
|
||||||
maryKerOrder($this->mary);
|
|
||||||
$id = fetchCallbackId();
|
|
||||||
$unknown = '00000000-0000-0000-0000-000000000000';
|
|
||||||
|
|
||||||
$this->patchJson(MARYKER_SET_PROCESSED, ['APICallBackId' => [$id]])->assertOk();
|
|
||||||
$this->patchJson(MARYKER_SET_PROCESSED, ['APICallBackId' => [$id, $unknown]])->assertOk()
|
|
||||||
->assertJsonPath("data.$id", 'invalid Id')
|
|
||||||
->assertJsonPath("data.$unknown", 'invalid Id');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('más beszállító rendelését nem igazolja vissza', function () {
|
|
||||||
maryKerUser($this->mary);
|
|
||||||
$foreign = maryKerOrder($this->other, ['APICallBackId' => 'aaaaaaaa-0000-0000-0000-000000000001', 'APILastGetting' => now()]);
|
|
||||||
|
|
||||||
$this->patchJson(MARYKER_SET_PROCESSED, ['APICallBackId' => [$foreign->APICallBackId]])->assertOk()
|
|
||||||
->assertJsonPath("data.$foreign->APICallBackId", 'invalid Id');
|
|
||||||
|
|
||||||
expect($foreign->fresh()->APIConfirmed)->toBeNull();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('a még le nem kért rendelést nem lehet kézzel visszaigazolni', function () {
|
|
||||||
maryKerUser($this->mary);
|
|
||||||
$order = maryKerOrder($this->mary, ['APICallBackId' => 'bbbbbbbb-0000-0000-0000-000000000002']);
|
|
||||||
|
|
||||||
$this->patchJson(MARYKER_SET_PROCESSED, ['APICallBackId' => [$order->APICallBackId]])->assertOk()
|
|
||||||
->assertJsonPath("data.$order->APICallBackId", 'invalid Id');
|
|
||||||
|
|
||||||
expect($order->fresh()->APIConfirmed)->toBeNull();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('a megerősítetlen (confirmed null) rendelést sem igazolja vissza', function () {
|
|
||||||
maryKerUser($this->mary);
|
|
||||||
$order = maryKerOrder($this->mary, [
|
|
||||||
'confirmed' => null, 'APICallBackId' => 'cccccccc-0000-0000-0000-000000000003', 'APILastGetting' => now(),
|
|
||||||
]);
|
|
||||||
|
|
||||||
$this->patchJson(MARYKER_SET_PROCESSED, ['APICallBackId' => [$order->APICallBackId]])->assertOk()
|
|
||||||
->assertJsonPath("data.$order->APICallBackId", 'invalid Id');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('422-t ad, ha a bemenet nem érvényes tömb', function (mixed $payload) {
|
|
||||||
maryKerUser($this->mary);
|
|
||||||
$order = maryKerOrder($this->mary);
|
|
||||||
|
|
||||||
$this->patchJson(MARYKER_SET_PROCESSED, $payload)
|
|
||||||
->assertStatus(422)
|
|
||||||
->assertJsonPath('success', false)
|
|
||||||
->assertJsonPath('error.code', 'invalid data');
|
|
||||||
|
|
||||||
expect($order->fresh()->APIConfirmed)->toBeNull();
|
|
||||||
})->with([
|
|
||||||
'egyetlen string, nem tömb' => [['APICallBackId' => '987f3001-6364-4d7c-8b0c-daf29dbd38ec']],
|
|
||||||
'hiányzó kulcs' => [['orderIds' => ['x']]],
|
|
||||||
'üres tömb' => [['APICallBackId' => []]],
|
|
||||||
'beágyazott tömb' => [['APICallBackId' => [['x']]]],
|
|
||||||
'ismétlődő elem' => [['APICallBackId' => ['x', 'x']]],
|
|
||||||
'üres törzs' => [[]],
|
|
||||||
]);
|
|
||||||
|
|
||||||
it('422-t ad, ha a törzs nem JSON, vagy túl sok azonosítót tartalmaz', function () {
|
|
||||||
maryKerUser($this->mary);
|
|
||||||
|
|
||||||
$this->call('PATCH', MARYKER_SET_PROCESSED, [], [], [], ['HTTP_ACCEPT' => 'application/json'], 'nem json')->assertStatus(422);
|
|
||||||
|
|
||||||
config(['maryker.set_processed_max' => 2]);
|
|
||||||
$this->patchJson(MARYKER_SET_PROCESSED, ['APICallBackId' => ['a', 'b', 'c']])->assertStatus(422);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('JSON Content-Type nélkül küldött törzset is feldolgoz', function () {
|
|
||||||
maryKerUser($this->mary);
|
|
||||||
maryKerOrder($this->mary);
|
|
||||||
$id = fetchCallbackId();
|
|
||||||
|
|
||||||
$this->call('PATCH', MARYKER_SET_PROCESSED, [], [], [], ['HTTP_ACCEPT' => 'application/json'], json_encode(['APICallBackId' => [$id]]))
|
|
||||||
->assertOk()->assertJsonPath("data.$id", 'updated');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('maryker:api-token', function () {
|
|
||||||
it('beszállítóhoz kötött, szerepkör nélküli felhasználóhoz ad ki tokent, ami működik', function () {
|
|
||||||
maryKerOrder($this->mary);
|
|
||||||
|
|
||||||
$this->artisan('maryker:api-token')->assertSuccessful();
|
|
||||||
|
|
||||||
$user = User::where('email', config('maryker.api_user_email'))->first();
|
|
||||||
expect($user->supplier_id)->toBe($this->mary->id)
|
|
||||||
->and($user->roles)->toHaveCount(0)
|
|
||||||
->and($user->tokens)->toHaveCount(1)
|
|
||||||
->and($user->tokens->first()->abilities)->toBe(['maryker:orders']);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('a kiadott token a Mary-Ker rendeléseit látja, mást nem', function () {
|
|
||||||
maryKerOrder($this->mary);
|
|
||||||
maryKerOrder($this->other);
|
|
||||||
|
|
||||||
$this->artisan('maryker:api-token')->assertSuccessful();
|
|
||||||
$token = User::where('email', config('maryker.api_user_email'))->first()->tokens()->first();
|
|
||||||
// a nyers token csak a parancs kimenetében van meg, ezért újat adunk ki ugyanazzal a felhasználóval
|
|
||||||
$plain = $token->tokenable->createToken('teszt', ['maryker:orders'])->plainTextToken;
|
|
||||||
|
|
||||||
$this->withToken($plain)->getJson(MARYKER_UNPROCESSED)->assertOk()->assertJsonCount(1, 'data');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('--rotate visszavonja a régi tokeneket, nélküle nem', function () {
|
|
||||||
$this->artisan('maryker:api-token')->assertSuccessful();
|
|
||||||
$this->artisan('maryker:api-token')->assertSuccessful();
|
|
||||||
$user = User::where('email', config('maryker.api_user_email'))->first();
|
|
||||||
expect($user->tokens()->count())->toBe(2);
|
|
||||||
|
|
||||||
$this->artisan('maryker:api-token', ['--rotate' => true])->assertSuccessful();
|
|
||||||
expect($user->tokens()->count())->toBe(1);
|
|
||||||
expect(User::where('email', config('maryker.api_user_email'))->count())->toBe(1);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('hibával áll le, ha nincs ilyen beszállító', function () {
|
|
||||||
config(['maryker.supplier_name_id' => 'NINCS']);
|
|
||||||
|
|
||||||
$this->artisan('maryker:api-token')->assertFailed();
|
|
||||||
expect(User::where('email', config('maryker.api_user_email'))->exists())->toBeFalse();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('nem ad tokent olyan felhasználónak, aki más beszállítóhoz van kötve', function () {
|
|
||||||
User::factory()->create(['email' => config('maryker.api_user_email'), 'supplier_id' => $this->other->id]);
|
|
||||||
|
|
||||||
$this->artisan('maryker:api-token')->assertFailed();
|
|
||||||
expect(User::where('email', config('maryker.api_user_email'))->first()->tokens)->toHaveCount(0);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@ -1,117 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
use App\Console\Commands\MaryKerDeliveryAddressReport;
|
|
||||||
use App\Models\Address;
|
|
||||||
use App\Models\ProfitCenter;
|
|
||||||
use App\Models\ProfitCenterSupplierCode;
|
|
||||||
use App\Models\Supplier;
|
|
||||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
||||||
use PhpOffice\PhpSpreadsheet\IOFactory;
|
|
||||||
use Tests\TestCase;
|
|
||||||
|
|
||||||
uses(TestCase::class, RefreshDatabase::class);
|
|
||||||
|
|
||||||
function reportProfitCenter(Supplier $supplier, array $attributes = []): ProfitCenter
|
|
||||||
{
|
|
||||||
$profitCenter = ProfitCenter::factory()->create(array_merge(['hooreycaId' => 'AKG', 'nameId' => 'AKGB'], $attributes));
|
|
||||||
$supplier->profitCenter()->attach($profitCenter->id);
|
|
||||||
|
|
||||||
return $profitCenter;
|
|
||||||
}
|
|
||||||
|
|
||||||
function reportAddress(ProfitCenter $profitCenter, string $name, string $street): Address
|
|
||||||
{
|
|
||||||
return Address::create([
|
|
||||||
'name' => $name, 'postCode' => '7623', 'city' => 'Pécs', 'street' => $street,
|
|
||||||
'attachable_id' => $profitCenter->id, 'attachable_type' => ProfitCenter::class,
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
beforeEach(function () {
|
|
||||||
$this->supplier = Supplier::factory()->create(['nameId' => 'MARY']);
|
|
||||||
$this->command = app(MaryKerDeliveryAddressReport::class);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('egyetlen alap sort ad a telephelynek, ha nincs több szállítási cím', function () {
|
|
||||||
$profitCenter = reportProfitCenter($this->supplier, ['multiAddress' => '0', 'addressEqual' => '1']);
|
|
||||||
|
|
||||||
$rows = $this->command->rows($this->supplier);
|
|
||||||
|
|
||||||
expect($rows)->toHaveCount(1)
|
|
||||||
->and($rows[0][0])->toBe($profitCenter->id)
|
|
||||||
->and($rows[0][2])->toBe('AKG')
|
|
||||||
->and($rows[0][3])->toBe('AKGB')
|
|
||||||
->and($rows[0][5])->toBe(MaryKerDeliveryAddressReport::TYPE_BASE)
|
|
||||||
->and($rows[0][6])->toBe($profitCenter->fullAddress)
|
|
||||||
->and($rows[0][7])->toBe('')
|
|
||||||
->and($rows[0][10])->toBe('');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('szállítási címenként egy sort ad, a cím azonosítójával', function () {
|
|
||||||
$profitCenter = reportProfitCenter($this->supplier, ['multiAddress' => '1', 'addressEqual' => '0']);
|
|
||||||
$first = reportAddress($profitCenter, 'Kórház', 'Rákóczi út 2.');
|
|
||||||
$second = reportAddress($profitCenter, 'Kávézó', 'Ifjúság útja 13');
|
|
||||||
|
|
||||||
$rows = $this->command->rows($this->supplier);
|
|
||||||
|
|
||||||
expect($rows)->toHaveCount(2)
|
|
||||||
->and($rows[0][5])->toBe(MaryKerDeliveryAddressReport::TYPE_DELIVERY)
|
|
||||||
->and($rows[0][7])->toBe((string) $first->id)
|
|
||||||
->and($rows[0][8])->toBe('Kórház')
|
|
||||||
->and($rows[1][7])->toBe((string) $second->id)
|
|
||||||
->and($rows[1][8])->toBe('Kávézó');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('a jelzőt követi, nem a címrekordok számát, és figyelmeztet az eltérésre', function () {
|
|
||||||
$profitCenter = reportProfitCenter($this->supplier, ['multiAddress' => '0', 'addressEqual' => '1']);
|
|
||||||
reportAddress($profitCenter, 'Maradvány', 'Régi utca 1.');
|
|
||||||
|
|
||||||
$rows = $this->command->rows($this->supplier);
|
|
||||||
|
|
||||||
expect($rows)->toHaveCount(1)
|
|
||||||
->and($rows[0][5])->toBe(MaryKerDeliveryAddressReport::TYPE_BASE)
|
|
||||||
->and($rows[0][10])->toContain('1 további címrekord');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('jelzi, ha a több szállítási cím be van kapcsolva, de nincs cím rögzítve', function () {
|
|
||||||
reportProfitCenter($this->supplier, ['multiAddress' => '1']);
|
|
||||||
|
|
||||||
$rows = $this->command->rows($this->supplier);
|
|
||||||
|
|
||||||
expect($rows)->toHaveCount(1)->and($rows[0][10])->not->toBe('');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('a beszállítói vevőkódot szövegként, a vezető nullákkal adja vissza', function () {
|
|
||||||
$profitCenter = reportProfitCenter($this->supplier, ['multiAddress' => '0', 'addressEqual' => '1']);
|
|
||||||
ProfitCenterSupplierCode::create([
|
|
||||||
'profit_center_id' => $profitCenter->id, 'supplier_id' => $this->supplier->id, 'customerCode' => '002934',
|
|
||||||
]);
|
|
||||||
|
|
||||||
expect($this->command->rows($this->supplier)[0][4])->toBe('002934');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('csak az adott beszállító telephelyeit listázza', function () {
|
|
||||||
reportProfitCenter($this->supplier, ['multiAddress' => '0', 'addressEqual' => '1']);
|
|
||||||
ProfitCenter::factory()->create(['hooreycaId' => 'IDEGEN']);
|
|
||||||
|
|
||||||
expect($this->command->rows($this->supplier))->toHaveCount(1);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('xlsx fájlt készít a megadott útvonalra', function () {
|
|
||||||
reportProfitCenter($this->supplier, ['multiAddress' => '0', 'addressEqual' => '1']);
|
|
||||||
$path = sys_get_temp_dir() . '/maryker_cimek_' . uniqid() . '.xlsx';
|
|
||||||
|
|
||||||
$this->artisan('maryker:delivery-addresses', ['--path' => $path])->assertSuccessful();
|
|
||||||
|
|
||||||
$sheet = IOFactory::load($path)->getActiveSheet();
|
|
||||||
expect($sheet->getCell('A5')->getValue())->toBe('Profitcenter ID')
|
|
||||||
->and($sheet->getCell('C6')->getValue())->toBe('AKG')
|
|
||||||
->and($sheet->getCell('D6')->getValue())->toBe('AKGB')
|
|
||||||
->and($sheet->getCell('F6')->getValue())->toBe(MaryKerDeliveryAddressReport::TYPE_BASE);
|
|
||||||
|
|
||||||
unlink($path);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('hibával áll le, ha nincs ilyen betűkódú beszállító', function () {
|
|
||||||
$this->artisan('maryker:delivery-addresses', ['--supplier' => 'NINCS'])->assertFailed();
|
|
||||||
});
|
|
||||||
Loading…
Reference in New Issue
Block a user