@govish/shared-services 1.1.0 → 1.2.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## Version 1.2.0
+
+### Added
+- **StationDutyBlockCacheService**: Read-only cache for station-duty blocks and sectors
+  - Keys: `station_duty_blocks:${stationDutyId}`, `station_duty_block:${blockId}`, `block_sectors:${blockId}`, `block_sector:${sectorId}`
+  - `getBlocks(stationDutyId)`, `getBlock(blockId, stationDutyId?)`, `getSectors(blockId)`, `getSector(sectorId, blockId?)`
+- **RankLeaveDaysCacheService**: Read-only cache for rank leave days
+  - Keys: `rank_leave_days:${rankId}`, `rank_leave_day:${leaveDayId}`
+  - `getLeaveDays(rankId)`, `getLeaveDay(leaveDayId, rankId?)`
+
+---
+
 ## Version 1.1.0
 
 ### Added

package/README.md

@@ -29,6 +29,8 @@ const authenticateDeviceOrOfficer = createAuthenticateDeviceOrOfficer(dependenci
 - **PenalCodeCacheService**: Redis-based caching service for penal codes
 - **DeviceCacheService**: Redis-based caching service for devices with indexing
 - **StationCacheService**: Redis-based caching service for police stations (JSON list, set of IDs, and per-station hashes)
+- **StationDutyBlockCacheService**: Read-only cache for station-duty blocks and sectors (`getBlocks`, `getBlock`, `getSectors`, `getSector`)
+- **RankLeaveDaysCacheService**: Read-only cache for rank leave days (`getLeaveDays`, `getLeaveDay`)
 - **ApiKeyService**: Service for managing and validating API keys with Redis caching
 - **AuditService**: Service for logging audit events to Kafka with comprehensive event tracking
 - **authenticateDeviceOrOfficer**: Express middleware for authenticating devices, officers, or microservices via API keys

package/dist/index.d.ts

@@ -4,6 +4,8 @@ export { PenalCodeCacheService } from './services/penalCodeCacheService';
 export { DeviceCacheService } from './services/deviceCacheService';
 export { DeviceService } from './services/deviceService';
 export { StationCacheService } from './services/stationCacheService';
+export { StationDutyBlockCacheService } from './services/stationDutyBlockCacheService';
+export { RankLeaveDaysCacheService } from './services/rankLeaveDaysCacheService';
 export { ApiKeyService } from './services/apiKeyService';
 export type { ApiKeyData } from './services/apiKeyService';
 export { AuditService } from './services/auditService';

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.devDebug = exports.devWarn = exports.devError = exports.devLog = exports.isProductionMode = exports.isDevelopmentMode = exports.getEnvironmentMode = exports.createSafeRedisUtils = exports.createSafeRedisSet = exports.createSafeRedisGet = exports.createAuthenticateDeviceOrOfficer = exports.AuditEventType = exports.AuditService = exports.ApiKeyService = exports.StationCacheService = exports.DeviceService = exports.DeviceCacheService = exports.PenalCodeCacheService = exports.OfficerService = exports.OfficerCacheService = void 0;
+exports.devDebug = exports.devWarn = exports.devError = exports.devLog = exports.isProductionMode = exports.isDevelopmentMode = exports.getEnvironmentMode = exports.createSafeRedisUtils = exports.createSafeRedisSet = exports.createSafeRedisGet = exports.createAuthenticateDeviceOrOfficer = exports.AuditEventType = exports.AuditService = exports.ApiKeyService = exports.RankLeaveDaysCacheService = exports.StationDutyBlockCacheService = exports.StationCacheService = exports.DeviceService = exports.DeviceCacheService = exports.PenalCodeCacheService = exports.OfficerService = exports.OfficerCacheService = void 0;
 // Export services
 var officerCacheService_1 = require("./services/officerCacheService");
 Object.defineProperty(exports, "OfficerCacheService", { enumerable: true, get: function () { return officerCacheService_1.OfficerCacheService; } });
@@ -14,6 +14,10 @@ var deviceService_1 = require("./services/deviceService");
 Object.defineProperty(exports, "DeviceService", { enumerable: true, get: function () { return deviceService_1.DeviceService; } });
 var stationCacheService_1 = require("./services/stationCacheService");
 Object.defineProperty(exports, "StationCacheService", { enumerable: true, get: function () { return stationCacheService_1.StationCacheService; } });
+var stationDutyBlockCacheService_1 = require("./services/stationDutyBlockCacheService");
+Object.defineProperty(exports, "StationDutyBlockCacheService", { enumerable: true, get: function () { return stationDutyBlockCacheService_1.StationDutyBlockCacheService; } });
+var rankLeaveDaysCacheService_1 = require("./services/rankLeaveDaysCacheService");
+Object.defineProperty(exports, "RankLeaveDaysCacheService", { enumerable: true, get: function () { return rankLeaveDaysCacheService_1.RankLeaveDaysCacheService; } });
 var apiKeyService_1 = require("./services/apiKeyService");
 Object.defineProperty(exports, "ApiKeyService", { enumerable: true, get: function () { return apiKeyService_1.ApiKeyService; } });
 var auditService_1 = require("./services/auditService");

package/dist/services/rankLeaveDaysCacheService.d.ts

@@ -0,0 +1,19 @@
+import { SharedServicesDependencies } from '../types/dependencies';
+/**
+ * Read-only cache service for rank leave days.
+ * Only provides get-from-cache; the app is responsible for storing and invalidating.
+ */
+export declare class RankLeaveDaysCacheService {
+    private redisClient;
+    private logger;
+    constructor(deps: SharedServicesDependencies);
+    /**
+     * Get leave days for a rank from cache. Returns empty array on miss.
+     */
+    getLeaveDays(rankId: number): Promise<Array<Record<string, unknown>>>;
+    /**
+     * Get one leave day by ID from cache. Returns null on miss.
+     * If rankId is provided, returns null when cached leave day's rank_id does not match.
+     */
+    getLeaveDay(leaveDayId: number, rankId?: number): Promise<Record<string, unknown> | null>;
+}

package/dist/services/rankLeaveDaysCacheService.js

@@ -0,0 +1,89 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RankLeaveDaysCacheService = void 0;
+/** Redis keys (must match app that writes: rank_leave_days, rank_leave_day) */
+const RANK_LEAVE_DAYS_KEY = (rankId) => `rank_leave_days:${rankId}`;
+const RANK_LEAVE_DAY_KEY = (leaveDayId) => `rank_leave_day:${leaveDayId}`;
+function safeJsonParse(value, fallback, logger) {
+    if (!value || value === '' || value === 'null')
+        return fallback;
+    try {
+        return JSON.parse(value);
+    }
+    catch (e) {
+        logger.warn('Failed to parse rank leave days cache JSON', {
+            error: e instanceof Error ? e.message : String(e),
+        });
+        return fallback;
+    }
+}
+/**
+ * Read-only cache service for rank leave days.
+ * Only provides get-from-cache; the app is responsible for storing and invalidating.
+ */
+class RankLeaveDaysCacheService {
+    constructor(deps) {
+        this.redisClient = deps.redisClient;
+        this.logger = deps.logger;
+    }
+    /**
+     * Get leave days for a rank from cache. Returns empty array on miss.
+     */
+    getLeaveDays(rankId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            try {
+                const key = RANK_LEAVE_DAYS_KEY(rankId);
+                const cached = yield this.redisClient.get(key);
+                if (!cached)
+                    return [];
+                return (_a = safeJsonParse(cached, [], this.logger)) !== null && _a !== void 0 ? _a : [];
+            }
+            catch (error) {
+                this.logger.error('Error getting rank leave days from cache', {
+                    error: error instanceof Error ? error.message : String(error),
+                    rankId,
+                });
+                return [];
+            }
+        });
+    }
+    /**
+     * Get one leave day by ID from cache. Returns null on miss.
+     * If rankId is provided, returns null when cached leave day's rank_id does not match.
+     */
+    getLeaveDay(leaveDayId, rankId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const key = RANK_LEAVE_DAY_KEY(leaveDayId);
+                const cached = yield this.redisClient.get(key);
+                if (!cached)
+                    return null;
+                const parsed = safeJsonParse(cached, null, this.logger);
+                if (!parsed)
+                    return null;
+                if (rankId !== undefined && Number(parsed.rank_id) !== rankId)
+                    return null;
+                return parsed;
+            }
+            catch (error) {
+                this.logger.error('Error getting rank leave day from cache', {
+                    error: error instanceof Error ? error.message : String(error),
+                    leaveDayId,
+                    rankId,
+                });
+                return null;
+            }
+        });
+    }
+}
+exports.RankLeaveDaysCacheService = RankLeaveDaysCacheService;

package/dist/services/stationDutyBlockCacheService.d.ts

@@ -0,0 +1,28 @@
+import { SharedServicesDependencies } from '../types/dependencies';
+/**
+ * Read-only cache service for station-duty blocks and sectors.
+ * Only provides get-from-cache; the app is responsible for storing and invalidating.
+ */
+export declare class StationDutyBlockCacheService {
+    private redisClient;
+    private logger;
+    constructor(deps: SharedServicesDependencies);
+    /**
+     * Get blocks for a station-duty from cache. Returns null on miss.
+     */
+    getBlocks(stationDutyId: number): Promise<Array<Record<string, unknown>> | null>;
+    /**
+     * Get one block by ID from cache. Returns null on miss.
+     * If stationDutyId is provided, returns null when cached block's station_duty_id does not match.
+     */
+    getBlock(blockId: number, stationDutyId?: number): Promise<Record<string, unknown> | null>;
+    /**
+     * Get sectors for a block from cache. Returns empty array on miss.
+     */
+    getSectors(blockId: number): Promise<Array<Record<string, unknown>>>;
+    /**
+     * Get one sector by ID from cache. Returns null on miss.
+     * If blockId is provided, returns null when cached sector's block_id does not match.
+     */
+    getSector(sectorId: number, blockId?: number): Promise<Record<string, unknown> | null>;
+}

package/dist/services/stationDutyBlockCacheService.js

@@ -0,0 +1,138 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StationDutyBlockCacheService = void 0;
+/** Redis keys (must match app that writes: station_duty_blocks, station_duty_block, block_sectors, block_sector) */
+const BLOCKS_KEY = (stationDutyId) => `station_duty_blocks:${stationDutyId}`;
+const BLOCK_KEY = (blockId) => `station_duty_block:${blockId}`;
+const SECTORS_KEY = (blockId) => `block_sectors:${blockId}`;
+const SECTOR_KEY = (sectorId) => `block_sector:${sectorId}`;
+function safeJsonParse(value, fallback, logger) {
+    if (!value || value === '' || value === 'null')
+        return fallback;
+    try {
+        return JSON.parse(value);
+    }
+    catch (e) {
+        logger.warn('Failed to parse cache JSON', { error: e instanceof Error ? e.message : String(e) });
+        return fallback;
+    }
+}
+/**
+ * Read-only cache service for station-duty blocks and sectors.
+ * Only provides get-from-cache; the app is responsible for storing and invalidating.
+ */
+class StationDutyBlockCacheService {
+    constructor(deps) {
+        this.redisClient = deps.redisClient;
+        this.logger = deps.logger;
+    }
+    /**
+     * Get blocks for a station-duty from cache. Returns null on miss.
+     */
+    getBlocks(stationDutyId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const key = BLOCKS_KEY(stationDutyId);
+                const cached = yield this.redisClient.get(key);
+                if (!cached)
+                    return null;
+                return safeJsonParse(cached, null, this.logger);
+            }
+            catch (error) {
+                this.logger.error('Error getting blocks from cache', {
+                    error: error instanceof Error ? error.message : String(error),
+                    stationDutyId,
+                });
+                return null;
+            }
+        });
+    }
+    /**
+     * Get one block by ID from cache. Returns null on miss.
+     * If stationDutyId is provided, returns null when cached block's station_duty_id does not match.
+     */
+    getBlock(blockId, stationDutyId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const key = BLOCK_KEY(blockId);
+                const cached = yield this.redisClient.get(key);
+                if (!cached)
+                    return null;
+                const parsed = safeJsonParse(cached, null, this.logger);
+                if (!parsed)
+                    return null;
+                if (stationDutyId !== undefined && Number(parsed.station_duty_id) !== stationDutyId)
+                    return null;
+                return parsed;
+            }
+            catch (error) {
+                this.logger.error('Error getting block from cache', {
+                    error: error instanceof Error ? error.message : String(error),
+                    blockId,
+                    stationDutyId,
+                });
+                return null;
+            }
+        });
+    }
+    /**
+     * Get sectors for a block from cache. Returns empty array on miss.
+     */
+    getSectors(blockId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            try {
+                const key = SECTORS_KEY(blockId);
+                const cached = yield this.redisClient.get(key);
+                if (!cached)
+                    return [];
+                return (_a = safeJsonParse(cached, [], this.logger)) !== null && _a !== void 0 ? _a : [];
+            }
+            catch (error) {
+                this.logger.error('Error getting sectors from cache', {
+                    error: error instanceof Error ? error.message : String(error),
+                    blockId,
+                });
+                return [];
+            }
+        });
+    }
+    /**
+     * Get one sector by ID from cache. Returns null on miss.
+     * If blockId is provided, returns null when cached sector's block_id does not match.
+     */
+    getSector(sectorId, blockId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const key = SECTOR_KEY(sectorId);
+                const cached = yield this.redisClient.get(key);
+                if (!cached)
+                    return null;
+                const parsed = safeJsonParse(cached, null, this.logger);
+                if (!parsed)
+                    return null;
+                if (blockId !== undefined && Number(parsed.block_id) !== blockId)
+                    return null;
+                return parsed;
+            }
+            catch (error) {
+                this.logger.error('Error getting sector from cache', {
+                    error: error instanceof Error ? error.message : String(error),
+                    sectorId,
+                    blockId,
+                });
+                return null;
+            }
+        });
+    }
+}
+exports.StationDutyBlockCacheService = StationDutyBlockCacheService;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@govish/shared-services",
-  "version": "1.1.0",
-  "description": "Govish shared services package - includes officer, device, station, and penal code cache services, API key service, audit logging, and authentication middleware",
+  "version": "1.2.0",
+  "description": "Govish shared services package - officer, device, station, penal code, station-duty block, and rank leave days cache services; API key service; audit logging; authentication middleware",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [