nodejs-quickstart-structure 1.18.1 → 1.19.1

package/templates/common/caching/js/redisClient.spec.js.ejs

@@ -1,147 +1,147 @@
-jest.mock('ioredis', () => {
-  const mRedis = jest.fn(() => ({
-    on: jest.fn(),
-    get: jest.fn(),
-    set: jest.fn(),
-    del: jest.fn(),
-    quit: jest.fn().mockResolvedValue('OK'),
-  }));
-  return mRedis;
-});
-
-jest.mock('dotenv', () => ({
-    config: jest.fn()
-}));
-
-const mockLogger = {
-    info: jest.fn(),
-    error: jest.fn(),
-};
-
-jest.mock('<%- loggerPath %>', () => mockLogger);
-
-describe('Redis Service', () => {
-    let RedisService;
-    let logger;
-
-    beforeEach(() => {
-        jest.clearAllMocks();
-        jest.resetModules();
-        
-        // Clean environment
-        const envVars = ['REDIS_HOST', 'REDIS_PORT', 'REDIS_PASSWORD'];
-        envVars.forEach(v => delete process.env[v]);
-        
-        logger = require('<%- loggerPath %>');
-        RedisService = require('<%= redisClientPath %>');
-    });
-
-    it('should handle redis events', () => {
-        // Find the event handlers
-        const handlers = {};
-        RedisService.client.on.mock.calls.forEach(([event, handler]) => {
-            handlers[event] = handler;
-        });
-
-        if (handlers['connect']) {
-            handlers['connect']();
-            expect(logger.info).toHaveBeenCalledWith('Redis connected');
-        }
-
-        if (handlers['error']) {
-            handlers['error'](new Error('Test Error'));
-            expect(logger.error).toHaveBeenCalledWith('Redis error:', expect.any(Error));
-        }
-    });
-
-    it('should get data from redis', async () => {
-        const mockData = { test: 'data' };
-        RedisService.client.get.mockResolvedValue(JSON.stringify(mockData));
-        
-        const data = await RedisService.get('test-key');
-        expect(data).toEqual(mockData);
-        expect(RedisService.client.get).toHaveBeenCalledWith('test-key');
-    });
-
-    it('should return null when key not found in redis', async () => {
-        RedisService.client.get.mockResolvedValue(null);
-        const data = await RedisService.get('non-existent');
-        expect(data).toBeNull();
-    });
-
-    it('should handle errors in get', async () => {
-        RedisService.client.get.mockRejectedValue(new Error('Redis Error'));
-        const result = await RedisService.get('test-key');
-        expect(result).toBeNull();
-        expect(logger.error).toHaveBeenCalled();
-    });
-
-    it('should set data to redis without TTL', async () => {
-        const mockData = { test: 'data' };
-        await RedisService.set('test-key', mockData);
-        expect(RedisService.client.set).toHaveBeenCalledWith('test-key', JSON.stringify(mockData));
-    });
-
-    it('should set data to redis with TTL', async () => {
-        const mockData = { test: 'data' };
-        await RedisService.set('test-key', mockData, 3600);
-        expect(RedisService.client.set).toHaveBeenCalledWith('test-key', JSON.stringify(mockData), 'EX', 3600);
-    });
-
-    it('should handle errors in set', async () => {
-        RedisService.client.set.mockRejectedValue(new Error('Redis Error'));
-        await RedisService.set('test-key', 'value');
-        expect(logger.error).toHaveBeenCalled();
-    });
-
-    it('should delete data from redis', async () => {
-        await RedisService.del('test-key');
-        expect(RedisService.client.del).toHaveBeenCalledWith('test-key');
-    });
-
-    it('should handle errors in del', async () => {
-        RedisService.client.del.mockRejectedValue(new Error('Redis Error'));
-        await RedisService.del('test-key');
-        expect(logger.error).toHaveBeenCalled();
-    });
-
-    it('should use getOrSet and call fetcher if not cached', async () => {
-        RedisService.get = jest.fn().mockResolvedValue(null);
-        RedisService.set = jest.fn();
-        const fetcher = jest.fn().mockResolvedValue({ new: 'data' });
-
-        const result = await RedisService.getOrSet('new-key', fetcher);
-        
-        expect(result).toEqual({ new: 'data' });
-        expect(fetcher).toHaveBeenCalled();
-        expect(RedisService.set).toHaveBeenCalledWith('new-key', { new: 'data' }, 3600);
-    });
-
-    it('should use getOrSet and return cached data', async () => {
-        const cachedData = { cached: 'data' };
-        RedisService.get = jest.fn().mockResolvedValue(cachedData);
-        const fetcher = jest.fn();
-
-        const result = await RedisService.getOrSet('cached-key', fetcher);
-        
-        expect(result).toEqual(cachedData);
-        expect(fetcher).not.toHaveBeenCalled();
-    });
-
-    it('should handle falsy data from fetcher in getOrSet', async () => {
-        RedisService.get = jest.fn().mockResolvedValue(null);
-        RedisService.set = jest.fn();
-        const fetcher = jest.fn().mockResolvedValue(null);
-
-        const result = await RedisService.getOrSet('empty-key', fetcher);
-        
-        expect(result).toBeNull();
-        expect(RedisService.set).not.toHaveBeenCalled();
-    });
-
-    it('should quit the redis client', async () => {
-        const result = await RedisService.quit();
-        expect(result).toBe('OK');
-        expect(RedisService.client.quit).toHaveBeenCalled();
-    });
-});
+jest.mock('ioredis', () => {
+  const mRedis = jest.fn(() => ({
+    on: jest.fn(),
+    get: jest.fn(),
+    set: jest.fn(),
+    del: jest.fn(),
+    quit: jest.fn().mockResolvedValue('OK'),
+  }));
+  return mRedis;
+});
+
+jest.mock('dotenv', () => ({
+    config: jest.fn()
+}));
+
+const mockLogger = {
+    info: jest.fn(),
+    error: jest.fn(),
+};
+
+jest.mock('<%- loggerPath %>', () => mockLogger);
+
+describe('Redis Service', () => {
+    let RedisService;
+    let logger;
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.resetModules();
+        
+        // Clean environment
+        const envVars = ['REDIS_HOST', 'REDIS_PORT', 'REDIS_PASSWORD'];
+        envVars.forEach(v => delete process.env[v]);
+        
+        logger = require('<%- loggerPath %>');
+        RedisService = require('<%= redisClientPath %>');
+    });
+
+    it('should handle redis events', () => {
+        // Find the event handlers
+        const handlers = {};
+        RedisService.client.on.mock.calls.forEach(([event, handler]) => {
+            handlers[event] = handler;
+        });
+
+        if (handlers['connect']) {
+            handlers['connect']();
+            expect(logger.info).toHaveBeenCalledWith('Redis connected');
+        }
+
+        if (handlers['error']) {
+            handlers['error'](new Error('Test Error'));
+            expect(logger.error).toHaveBeenCalledWith('Redis error:', expect.any(Error));
+        }
+    });
+
+    it('should get data from redis', async () => {
+        const mockData = { test: 'data' };
+        RedisService.client.get.mockResolvedValue(JSON.stringify(mockData));
+        
+        const data = await RedisService.get('test-key');
+        expect(data).toEqual(mockData);
+        expect(RedisService.client.get).toHaveBeenCalledWith('test-key');
+    });
+
+    it('should return null when key not found in redis', async () => {
+        RedisService.client.get.mockResolvedValue(null);
+        const data = await RedisService.get('non-existent');
+        expect(data).toBeNull();
+    });
+
+    it('should handle errors in get', async () => {
+        RedisService.client.get.mockRejectedValue(new Error('Redis Error'));
+        const result = await RedisService.get('test-key');
+        expect(result).toBeNull();
+        expect(logger.error).toHaveBeenCalled();
+    });
+
+    it('should set data to redis without TTL', async () => {
+        const mockData = { test: 'data' };
+        await RedisService.set('test-key', mockData);
+        expect(RedisService.client.set).toHaveBeenCalledWith('test-key', JSON.stringify(mockData));
+    });
+
+    it('should set data to redis with TTL', async () => {
+        const mockData = { test: 'data' };
+        await RedisService.set('test-key', mockData, 3600);
+        expect(RedisService.client.set).toHaveBeenCalledWith('test-key', JSON.stringify(mockData), 'EX', 3600);
+    });
+
+    it('should handle errors in set', async () => {
+        RedisService.client.set.mockRejectedValue(new Error('Redis Error'));
+        await RedisService.set('test-key', 'value');
+        expect(logger.error).toHaveBeenCalled();
+    });
+
+    it('should delete data from redis', async () => {
+        await RedisService.del('test-key');
+        expect(RedisService.client.del).toHaveBeenCalledWith('test-key');
+    });
+
+    it('should handle errors in del', async () => {
+        RedisService.client.del.mockRejectedValue(new Error('Redis Error'));
+        await RedisService.del('test-key');
+        expect(logger.error).toHaveBeenCalled();
+    });
+
+    it('should use getOrSet and call fetcher if not cached', async () => {
+        RedisService.get = jest.fn().mockResolvedValue(null);
+        RedisService.set = jest.fn();
+        const fetcher = jest.fn().mockResolvedValue({ new: 'data' });
+
+        const result = await RedisService.getOrSet('new-key', fetcher);
+        
+        expect(result).toEqual({ new: 'data' });
+        expect(fetcher).toHaveBeenCalled();
+        expect(RedisService.set).toHaveBeenCalledWith('new-key', { new: 'data' }, 3600);
+    });
+
+    it('should use getOrSet and return cached data', async () => {
+        const cachedData = { cached: 'data' };
+        RedisService.get = jest.fn().mockResolvedValue(cachedData);
+        const fetcher = jest.fn();
+
+        const result = await RedisService.getOrSet('cached-key', fetcher);
+        
+        expect(result).toEqual(cachedData);
+        expect(fetcher).not.toHaveBeenCalled();
+    });
+
+    it('should handle falsy data from fetcher in getOrSet', async () => {
+        RedisService.get = jest.fn().mockResolvedValue(null);
+        RedisService.set = jest.fn();
+        const fetcher = jest.fn().mockResolvedValue(null);
+
+        const result = await RedisService.getOrSet('empty-key', fetcher);
+        
+        expect(result).toBeNull();
+        expect(RedisService.set).not.toHaveBeenCalled();
+    });
+
+    it('should quit the redis client', async () => {
+        const result = await RedisService.quit();
+        expect(result).toBe('OK');
+        expect(RedisService.client.quit).toHaveBeenCalled();
+    });
+});

package/templates/common/caching/ts/memoryCache.spec.ts.ejs

@@ -1,102 +1,102 @@
-jest.mock('node-cache', () => {
-    return jest.fn().mockImplementation(() => ({
-        get: jest.fn(),
-        set: jest.fn(),
-        del: jest.fn(),
-    }));
-});
-
-jest.mock('<%- loggerPath %>', () => ({
-    info: jest.fn(),
-    error: jest.fn(),
-}));
-
-describe('Memory Cache Client', () => {
-    let MemoryCacheService: any;
-
-    beforeEach(() => {
-        jest.clearAllMocks();
-        jest.resetModules();
-        MemoryCacheService = require('<% if (architecture === "MVC") { %>@/config/memoryCache<% } else { %>@/infrastructure/caching/memoryCache<% } %>').default;
-    });
-
-    it('should get data from memory cache', async () => {
-        const mockData = { test: 'data' };
-        MemoryCacheService.cache.get.mockReturnValue(JSON.stringify(mockData));
-        
-        const data = await MemoryCacheService.get('test-key');
-        expect(data).toEqual(mockData);
-        expect(MemoryCacheService.cache.get).toHaveBeenCalledWith('test-key');
-    });
-
-    it('should return null when key is not found', async () => {
-        MemoryCacheService.cache.get.mockReturnValue(undefined);
-        const data = await MemoryCacheService.get('non-existent');
-        expect(data).toBeNull();
-    });
-
-    it('should return data as is if not a string', async () => {
-        const mockData = { test: 'data' };
-        MemoryCacheService.cache.get.mockReturnValue(mockData);
-        const data = await MemoryCacheService.get('binary-key');
-        expect(data).toEqual(mockData);
-    });
-
-    it('should handle errors in get', async () => {
-        MemoryCacheService.cache.get.mockImplementation(() => { throw new Error('Cache Error'); });
-        const data = await MemoryCacheService.get('error-key');
-        expect(data).toBeNull();
-    });
-
-    it('should set data to memory cache without TTL', async () => {
-        const mockData = { test: 'data' };
-        await MemoryCacheService.set('test-key', mockData);
-        expect(MemoryCacheService.cache.set).toHaveBeenCalledWith('test-key', JSON.stringify(mockData));
-    });
-
-    it('should handle errors in set', async () => {
-        MemoryCacheService.cache.set.mockImplementation(() => { throw new Error('Cache Error'); });
-        await MemoryCacheService.set('test-key', 'value');
-        // Should not throw
-    });
-
-    it('should handle errors in del', async () => {
-        MemoryCacheService.cache.del.mockImplementation(() => { throw new Error('Cache Error'); });
-        await MemoryCacheService.del('test-key');
-        // Should not throw
-    });
-
-    it('should use getOrSet and call fetcher if not cached', async () => {
-        MemoryCacheService.get = jest.fn().mockResolvedValue(null);
-        MemoryCacheService.set = jest.fn();
-        const fetcher = jest.fn().mockResolvedValue({ new: 'data' });
-
-        const result = await MemoryCacheService.getOrSet('new-key', fetcher);
-        
-        expect(result).toEqual({ new: 'data' });
-        expect(fetcher).toHaveBeenCalled();
-        expect(MemoryCacheService.set).toHaveBeenCalledWith('new-key', { new: 'data' }, 3600);
-    });
-
-    it('should return cached data in getOrSet', async () => {
-        const cachedData = { cached: 'data' };
-        MemoryCacheService.get = jest.fn().mockResolvedValue(cachedData);
-        const fetcher = jest.fn();
-
-        const result = await MemoryCacheService.getOrSet('cached-key', fetcher);
-        
-        expect(result).toEqual(cachedData);
-        expect(fetcher).not.toHaveBeenCalled();
-    });
-
-    it('should handle falsy data from fetcher in getOrSet', async () => {
-        MemoryCacheService.get = jest.fn().mockResolvedValue(null);
-        MemoryCacheService.set = jest.fn();
-        const fetcher = jest.fn().mockResolvedValue(null);
-
-        const result = await MemoryCacheService.getOrSet('empty-key', fetcher);
-        
-        expect(result).toBeNull();
-        expect(MemoryCacheService.set).not.toHaveBeenCalled();
-    });
-});
+jest.mock('node-cache', () => {
+    return jest.fn().mockImplementation(() => ({
+        get: jest.fn(),
+        set: jest.fn(),
+        del: jest.fn(),
+    }));
+});
+
+jest.mock('<%- loggerPath %>', () => ({
+    info: jest.fn(),
+    error: jest.fn(),
+}));
+
+describe('Memory Cache Client', () => {
+    let MemoryCacheService: any;
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.resetModules();
+        MemoryCacheService = require('<% if (architecture === "MVC") { %>@/config/memoryCache<% } else { %>@/infrastructure/caching/memoryCache<% } %>').default;
+    });
+
+    it('should get data from memory cache', async () => {
+        const mockData = { test: 'data' };
+        MemoryCacheService.cache.get.mockReturnValue(JSON.stringify(mockData));
+        
+        const data = await MemoryCacheService.get('test-key');
+        expect(data).toEqual(mockData);
+        expect(MemoryCacheService.cache.get).toHaveBeenCalledWith('test-key');
+    });
+
+    it('should return null when key is not found', async () => {
+        MemoryCacheService.cache.get.mockReturnValue(undefined);
+        const data = await MemoryCacheService.get('non-existent');
+        expect(data).toBeNull();
+    });
+
+    it('should return data as is if not a string', async () => {
+        const mockData = { test: 'data' };
+        MemoryCacheService.cache.get.mockReturnValue(mockData);
+        const data = await MemoryCacheService.get('binary-key');
+        expect(data).toEqual(mockData);
+    });
+
+    it('should handle errors in get', async () => {
+        MemoryCacheService.cache.get.mockImplementation(() => { throw new Error('Cache Error'); });
+        const data = await MemoryCacheService.get('error-key');
+        expect(data).toBeNull();
+    });
+
+    it('should set data to memory cache without TTL', async () => {
+        const mockData = { test: 'data' };
+        await MemoryCacheService.set('test-key', mockData);
+        expect(MemoryCacheService.cache.set).toHaveBeenCalledWith('test-key', JSON.stringify(mockData));
+    });
+
+    it('should handle errors in set', async () => {
+        MemoryCacheService.cache.set.mockImplementation(() => { throw new Error('Cache Error'); });
+        await MemoryCacheService.set('test-key', 'value');
+        // Should not throw
+    });
+
+    it('should handle errors in del', async () => {
+        MemoryCacheService.cache.del.mockImplementation(() => { throw new Error('Cache Error'); });
+        await MemoryCacheService.del('test-key');
+        // Should not throw
+    });
+
+    it('should use getOrSet and call fetcher if not cached', async () => {
+        MemoryCacheService.get = jest.fn().mockResolvedValue(null);
+        MemoryCacheService.set = jest.fn();
+        const fetcher = jest.fn().mockResolvedValue({ new: 'data' });
+
+        const result = await MemoryCacheService.getOrSet('new-key', fetcher);
+        
+        expect(result).toEqual({ new: 'data' });
+        expect(fetcher).toHaveBeenCalled();
+        expect(MemoryCacheService.set).toHaveBeenCalledWith('new-key', { new: 'data' }, 3600);
+    });
+
+    it('should return cached data in getOrSet', async () => {
+        const cachedData = { cached: 'data' };
+        MemoryCacheService.get = jest.fn().mockResolvedValue(cachedData);
+        const fetcher = jest.fn();
+
+        const result = await MemoryCacheService.getOrSet('cached-key', fetcher);
+        
+        expect(result).toEqual(cachedData);
+        expect(fetcher).not.toHaveBeenCalled();
+    });
+
+    it('should handle falsy data from fetcher in getOrSet', async () => {
+        MemoryCacheService.get = jest.fn().mockResolvedValue(null);
+        MemoryCacheService.set = jest.fn();
+        const fetcher = jest.fn().mockResolvedValue(null);
+
+        const result = await MemoryCacheService.getOrSet('empty-key', fetcher);
+        
+        expect(result).toBeNull();
+        expect(MemoryCacheService.set).not.toHaveBeenCalled();
+    });
+});

package/templates/common/caching/ts/memoryCache.ts.ejs

@@ -1,64 +1,73 @@
-import NodeCache from 'node-cache';
-import logger from '<%- loggerPath %>';
-
-class MemoryCacheService {
-    private cache: NodeCache;
-    private static instance: MemoryCacheService;
-
-    private constructor() {
-        // Default TTL of 0 (unlimited), check period of 120s
-        this.cache = new NodeCache({ stdTTL: 0, checkperiod: 120 });
-        logger.info('Memory Cache initialized');
-    }
-
-    public static getInstance(): MemoryCacheService {
-        if (!MemoryCacheService.instance) {
-            MemoryCacheService.instance = new MemoryCacheService();
-        }
-        return MemoryCacheService.instance;
-    }
-
-    public async get<T>(key: string): Promise<T | null> {
-        try {
-            const data = this.cache.get<T>(key);
-            // Simulating un-parsed data similar to Redis for consistency
-            if (data === undefined) return null;
-            return typeof data === 'string' ? JSON.parse(data) : data;
-        } catch (error) {
-            logger.error(`Memory Cache get error for key ${key}:`, error);
-            return null;
-        }
-    }
-
-    public async set(key: string, value: unknown, ttl?: number): Promise<void> {
-        try {
-            const data = JSON.stringify(value);
-            if (ttl) {
-                this.cache.set(key, data, ttl);
-            } else {
-                this.cache.set(key, data);
-            }
-        } catch (error) {
-            logger.error(`Memory Cache set error for key ${key}:`, error);
-        }
-    }
-
-    public async del(key: string): Promise<void> {
-        try {
-            this.cache.del(key);
-        } catch (error) {
-            logger.error(`Memory Cache del error for key ${key}:`, error);
-        }
-    }
-
-    public async getOrSet<T>(key: string, fetcher: () => Promise<T>, ttl: number = 3600): Promise<T> {
-        const cached = await this.get<T>(key);
-        if (cached) return cached;
-
-        const data = await fetcher();
-        if (data) await this.set(key, data, ttl);
-        return data;
-    }
-}
-
-export default MemoryCacheService.getInstance();
+import NodeCache from 'node-cache';
+import logger from '<%- loggerPath %>';
+
+class MemoryCacheService {
+    private cache: NodeCache;
+    private static instance: MemoryCacheService;
+
+    private constructor() {
+        // Default TTL of 0 (unlimited), check period of 120s
+        this.cache = new NodeCache({ stdTTL: 0, checkperiod: 120 });
+        logger.info('Memory Cache initialized');
+    }
+
+    public static getInstance(): MemoryCacheService {
+        if (!MemoryCacheService.instance) {
+            MemoryCacheService.instance = new MemoryCacheService();
+        }
+        return MemoryCacheService.instance;
+    }
+
+    public async get<T>(key: string): Promise<T | null> {
+        try {
+            const data = this.cache.get<T>(key);
+            // Simulating un-parsed data similar to Redis for consistency
+            if (data === undefined) return null;
+            return typeof data === 'string' ? JSON.parse(data) : data;
+        } catch (error) {
+            logger.error(`Memory Cache get error for key ${key}:`, error);
+            return null;
+        }
+    }
+
+    public async set(key: string, value: unknown, ttl?: number): Promise<void> {
+        try {
+            const data = JSON.stringify(value);
+            if (ttl) {
+                this.cache.set(key, data, ttl);
+            } else {
+                this.cache.set(key, data);
+            }
+        } catch (error) {
+            logger.error(`Memory Cache set error for key ${key}:`, error);
+        }
+    }
+
+    public async del(key: string): Promise<void> {
+        try {
+            this.cache.del(key);
+        } catch (error) {
+            logger.error(`Memory Cache del error for key ${key}:`, error);
+        }
+    }
+
+    public async flush(): Promise<void> {
+        try {
+            this.cache.flushAll();
+            logger.info('Memory Cache flushed');
+        } catch (error) {
+            logger.error('Memory Cache flush error:', error);
+        }
+    }
+
+    public async getOrSet<T>(key: string, fetcher: () => Promise<T>, ttl: number = 3600): Promise<T> {
+        const cached = await this.get<T>(key);
+        if (cached) return cached;
+
+        const data = await fetcher();
+        if (data) await this.set(key, data, ttl);
+        return data;
+    }
+}
+
+export default MemoryCacheService.getInstance();