refactor: standardize design

Signed-off-by: Sebastian Krupinski <krupinski01@gmail.com>
This commit is contained in:
2026-02-25 15:34:19 -05:00
parent dce16eff59
commit 80434e5476
14 changed files with 622 additions and 1595 deletions

View File

@@ -7,18 +7,17 @@ declare(strict_types=1);
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
namespace KTXM\PeopleProviderLocal\Providers;
namespace KTXM\ProviderLocalPeople\Providers;
use Psr\Container\ContainerInterface;
use KTXF\People\Provider\IProviderBase;
use KTXF\People\Service\IServiceBase;
use KTXF\Resource\Provider\ProviderInterface;
use KTXM\PeopleProviderLocal\Providers\Personal\PersonalService;
use KTXM\PeopleProviderLocal\Providers\Shared\SharedService;
use KTXF\People\Provider\ProviderBaseInterface;
use KTXF\People\Service\ServiceBaseInterface;
use KTXM\ProviderLocalPeople\Providers\Personal\PersonalService;
class Provider implements IProviderBase, ProviderInterface {
class Provider implements ProviderBaseInterface {
protected const PROVIDER_ID = 'default';
public const JSON_TYPE = ProviderBaseInterface::JSON_TYPE;
protected const PROVIDER_IDENTIFIER = 'default';
protected const PROVIDER_LABEL = 'Default People Provider';
protected const PROVIDER_DESCRIPTION = 'Provides local people storage';
protected const PROVIDER_ICON = 'user';
@@ -34,21 +33,21 @@ class Provider implements IProviderBase, ProviderInterface {
private readonly ContainerInterface $container,
) {}
public function jsonSerialize(): mixed
{
return $this->toJson();
}
public function toJson(): array
public function jsonSerialize(): array
{
return [
self::JSON_PROPERTY_TYPE => self::JSON_TYPE,
self::JSON_PROPERTY_ID => self::PROVIDER_ID,
self::JSON_PROPERTY_LABEL => self::PROVIDER_LABEL,
self::JSON_PROPERTY_CAPABILITIES => $this->providerAbilities,
];
self::JSON_PROPERTY_TYPE => self::JSON_TYPE,
self::JSON_PROPERTY_IDENTIFIER => self::PROVIDER_IDENTIFIER,
self::JSON_PROPERTY_LABEL => self::PROVIDER_LABEL,
self::JSON_PROPERTY_CAPABILITIES => $this->providerAbilities,
];
}
public function jsonDeserialize(array|string $data): static
{
return $this;
}
public function type(): string
{
return self::TYPE_PEOPLE;
@@ -56,7 +55,7 @@ class Provider implements IProviderBase, ProviderInterface {
public function identifier(): string
{
return self::PROVIDER_ID;
return self::PROVIDER_IDENTIFIER;
}
public function label(): string {
@@ -83,83 +82,28 @@ class Provider implements IProviderBase, ProviderInterface {
return $this->providerAbilities;
}
public function id(): string
{
return self::PROVIDER_ID;
protected function serviceInstancePersonal(string $tenantId, string $userId): PersonalService {
$service = $this->container->get(PersonalService::class);
$service->initialize($tenantId, $userId);
return $service;
}
public function serviceList(string $tenantId, string $userId, array $filter = []): array
{
// if no filter is provided, return all services
if ($filter === []) {
$filter = ['personal', 'shared'];
$filter = ['personal'];
}
// check if services are cached
if (in_array('personal', $filter, true) && !isset($this->servicesCache[$userId]['personal'])) {
$this->servicesCache[$userId]['personal'] = $this->serviceInstancePersonal($tenantId, $userId);
}
/*
if (in_array('shared', $filter, true) && !isset($this->servicesCache[$userId]['shared'])) {
$this->servicesCache[$userId]['shared'] = $this->serviceInstanceShared($tenantId, $userId);
}
*/
// return requested services
return array_intersect_key($this->servicesCache[$userId],array_flip($filter));
}
/**
* construct service object instance
*
* @since 1.0.0
*
* @return PersonalService blank service instance
*/
protected function serviceInstancePersonal(string $tenantId, string $userId): PersonalService {
$service = $this->container->get(PersonalService::class);
$service->init($tenantId, $userId);
return $service;
}
/**
* construct service object instance
*
* @since 1.0.0
*
* @return SharedService blank service instance
*/
protected function serviceInstanceShared(string $tenantId, string $userId): SharedService {
$service = $this->container->get(SharedService::class);
$service->init($tenantId, $userId);
return $service;
}
/**
* Determine if any services are configured for a specific user
*
* @since 1.0.0
*
* @inheritdoc
*/
public function serviceExtant(string $tenantId, string $userId, int|string ...$identifiers): array {
$data = [];
foreach ($identifiers as $id) {
$data[$id] = match ($id) {
'personal' => true,
//'shared' => true,
default => false,
};
}
return $data;
}
/**
* Retrieve a service with a specific identifier
*
* @since 1.0.0
*
* @inheritdoc
*/
public function serviceFetch(string $tenantId, string $userId, string|int $identifier): ?IServiceBase {
public function serviceFetch(string $tenantId, string $userId, string|int $identifier): ?ServiceBaseInterface {
// check if services are cached
if (isset($this->servicesCache[$userId][$identifier])) {
@@ -169,14 +113,20 @@ class Provider implements IProviderBase, ProviderInterface {
if ($identifier === 'personal') {
$this->servicesCache[$userId][$identifier] = $this->serviceInstancePersonal($tenantId, $userId);
}
/*
if ($identifier === 'shared') {
$this->servicesCache[$userId][$identifier] = $this->serviceInstanceShared($tenantId, $userId);
}
*/
return $this->servicesCache[$userId][$identifier];
}
public function serviceExtant(string $tenantId, string $userId, int|string ...$identifiers): array {
$data = [];
foreach ($identifiers as $id) {
$data[$id] = match ($id) {
'personal' => true,
default => false,
};
}
return $data;
}
}