diff --git a/app/Console/Commands/MaryKerApiToken.php b/app/Console/Commands/MaryKerApiToken.php new file mode 100644 index 0000000..d8aee18 --- /dev/null +++ b/app/Console/Commands/MaryKerApiToken.php @@ -0,0 +1,59 @@ +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; + } +} diff --git a/app/Http/Controllers/api/v1/MaryKerOrderController.php b/app/Http/Controllers/api/v1/MaryKerOrderController.php new file mode 100644 index 0000000..1371c22 --- /dev/null +++ b/app/Http/Controllers/api/v1/MaryKerOrderController.php @@ -0,0 +1,150 @@ +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 $orderIds + * @return array + */ + 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); + } +} diff --git a/bootstrap/app.php b/bootstrap/app.php index 43c46a5..80d0171 100644 --- a/bootstrap/app.php +++ b/bootstrap/app.php @@ -1,5 +1,6 @@ withMiddleware(function (Middleware $middleware): void { $middleware->trustProxies(at: '*'); + $middleware->alias([ + 'abilities' => \Laravel\Sanctum\Http\Middleware\CheckAbilities::class, + 'ability' => \Laravel\Sanctum\Http\Middleware\CheckForAnyAbility::class, + ]); }) ->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 - $exceptions->renderable(function (Throwable $e, Request $request) { - if ($request->ajax() || $request->wantsJson()) { + $exceptions->renderable(function (Throwable $e, Request $request) use ($maryKerApi) { + if ($e instanceof AuthenticationException && $maryKerApi($request)) { + return null; + } + + if ($request->ajax() || $request->wantsJson() || $maryKerApi($request)) { // Validációs hibákat nem piszkáljuk – azokat a Laravel alapból kezeli if ($e instanceof ValidationException) { return null; diff --git a/config/maryker.php b/config/maryker.php new file mode 100644 index 0000000..558fe46 --- /dev/null +++ b/config/maryker.php @@ -0,0 +1,26 @@ + 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), + +]; diff --git a/routes/api.php b/routes/api.php index 81a378d..b6e7caa 100644 --- a/routes/api.php +++ b/routes/api.php @@ -1,5 +1,6 @@ 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'); + }); diff --git a/tests/Feature/MaryKerApiTest.php b/tests/Feature/MaryKerApiTest.php new file mode 100644 index 0000000..70547f3 --- /dev/null +++ b/tests/Feature/MaryKerApiTest.php @@ -0,0 +1,312 @@ +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); + }); +});