Complete overhaul of the valueset system to use human-readable names
instead of numeric IDs for improved maintainability and API consistency.
- PatientController: Renamed 'Gender' field to 'Sex' in validation rules
- ValuesetController: Changed API endpoints from ID-based (/:num) to name-based (/:any)
- TestsController: Refactored to use ValueSet library instead of direct valueset queries
- Added ValueSet library (app/Libraries/ValueSet.php) with static lookup methods:
- getOptions() - returns dropdown format [{value, label}]
- getLabel(, ) - returns label for a value
- transformLabels(, ) - batch transform records
- get() and getRaw() for Lookups compatibility
- Added ValueSetApiController for public valueset API endpoints
- Added ValueSet refresh endpoint (POST /api/valueset/refresh)
- Added DemoOrderController for testing order creation without auth
- 2026-01-12-000001: Convert valueset references from VID to VValue
- 2026-01-12-000002: Rename patient.Gender column to Sex
- OrderTestController: Now uses OrderTestModel with proper model pattern
- TestsController: Uses ValueSet library for all lookup operations
- ValueSetController: Simplified to use name-based lookups
- Updated all organization (account/site/workstation) dialogs and index views
- Updated specimen container dialogs and index views
- Updated tests_index.php with ValueSet integration
- Updated patient dialog form and index views
- Removed .factory/config.json and CLAUDE.md (replaced by AGENTS.md)
- Consolidated lookups in Lookups.php (removed inline valueset constants)
- Updated all test files to match new field names
- 32 modified files, 17 new files, 2 deleted files
- Net: +661 insertions, -1443 deletions (significant cleanup)
109 lines
3.3 KiB
PHP
109 lines
3.3 KiB
PHP
<?php
|
|
namespace App\Libraries;
|
|
|
|
use CodeIgniter\Cache\CacheFactory;
|
|
use CodeIgniter\Config\BaseConfig;
|
|
|
|
class ValueSet {
|
|
private static $cache = null;
|
|
private static string $dataPath = APPPATH . 'Libraries/Data/valuesets/';
|
|
private static string $cacheKey = 'valueset_all';
|
|
|
|
private static function getCacheHandler() {
|
|
if (self::$cache === null) {
|
|
$config = config('Cache');
|
|
self::$cache = CacheFactory::getHandler($config);
|
|
}
|
|
return self::$cache;
|
|
}
|
|
|
|
public static function get(string $name): ?array {
|
|
$all = self::getAll();
|
|
$values = $all[$name]['values'] ?? null;
|
|
if ($values === null) return null;
|
|
return self::format($values);
|
|
}
|
|
|
|
public static function getRaw(string $name): ?array {
|
|
$all = self::getAll();
|
|
return $all[$name]['values'] ?? null;
|
|
}
|
|
|
|
public static function getAll(): array {
|
|
$handler = self::getCacheHandler();
|
|
$data = $handler->get(self::$cacheKey);
|
|
|
|
if ($data !== null) {
|
|
return $data;
|
|
}
|
|
|
|
$data = self::bundleAll();
|
|
$handler->save(self::$cacheKey, $data, 0);
|
|
return $data;
|
|
}
|
|
|
|
public static function getLabel(string $lookupName, string $key): ?string {
|
|
$raw = self::getRaw($lookupName);
|
|
if ($raw === null) return null;
|
|
foreach ($raw as $item) {
|
|
if (($item['key'] ?? $item['value'] ?? null) === $key) {
|
|
return $item['value'] ?? $item['label'] ?? null;
|
|
}
|
|
}
|
|
return null;
|
|
}
|
|
|
|
public static function getOptions(string $lookupName): array {
|
|
$raw = self::getRaw($lookupName);
|
|
if ($raw === null) return [];
|
|
return array_map(function ($item) {
|
|
return [
|
|
'key' => $item['key'] ?? '',
|
|
'value' => $item['value'] ?? $item['label'] ?? '',
|
|
];
|
|
}, $raw);
|
|
}
|
|
|
|
public static function transformLabels(array $data, array $fieldMappings): array {
|
|
foreach ($data as &$row) {
|
|
foreach ($fieldMappings as $field => $lookupName) {
|
|
if (isset($row[$field]) && $row[$field] !== null) {
|
|
$row[$field . 'Text'] = self::getLabel($lookupName, $row[$field]) ?? '';
|
|
}
|
|
}
|
|
}
|
|
return $data;
|
|
}
|
|
|
|
public static function clearCache(): bool {
|
|
$handler = self::getCacheHandler();
|
|
return $handler->delete(self::$cacheKey);
|
|
}
|
|
|
|
private static function bundleAll(): array {
|
|
$result = [];
|
|
foreach (glob(self::$dataPath . '*.json') as $file) {
|
|
$name = pathinfo($file, PATHINFO_FILENAME);
|
|
if ($name[0] === '_') continue;
|
|
$data = self::loadFile($file);
|
|
if ($data) {
|
|
$result[$name] = $data;
|
|
}
|
|
}
|
|
return $result;
|
|
}
|
|
|
|
private static function loadFile(string $path): ?array {
|
|
if (!is_file($path)) return null;
|
|
$content = file_get_contents($path);
|
|
return json_decode($content, true);
|
|
}
|
|
|
|
private static function format(array $values): array {
|
|
return array_map(fn($v) => [
|
|
'value' => (string) ($v['key'] ?? ''),
|
|
'label' => (string) ($v['value'] ?? $v['label'] ?? '')
|
|
], $values);
|
|
}
|
|
}
|