nodejs-quickstart-structure 2.0.0 → 2.1.0

package/templates/clean-architecture/ts/src/interfaces/controllers/userController.spec.ts.ejs

@@ -2,7 +2,9 @@
 import { Request, Response, NextFunction } from 'express';
 import { HTTP_STATUS } from '@/utils/httpCodes';
 <% } -%>
+<% if (communication === 'GraphQL') { -%>
 import { ERROR_MESSAGES } from '@/utils/errorMessages';
+<% } -%>
 import { UserController } from '@/interfaces/controllers/userController';
 import CreateUser from '@/usecases/createUser';
 import GetAllUsers from '@/usecases/getAllUsers';
@@ -118,7 +120,7 @@ describe('UserController (Clean Architecture)', () => {
     describe('createUser', () => {
         it('should successfully create a new user (Happy Path)', async () => {
             // Arrange
-            const payload = { name: 'Alice', email: 'alice@example.com' };
+            const payload = { name: 'Alice', email: 'alice@example.com'<% if (auth.includes('JWT')) { %>, password: 'password123'<% } %> };
 <% if (communication === 'GraphQL') { -%>
             const dataArg = payload;
 <% } else { -%>
@@ -146,13 +148,31 @@ describe('UserController (Clean Architecture)', () => {
 
             expect(mockResponse.json).toHaveBeenCalledWith(expectedUser);
 <% } -%>
-            expect(mockCreateUserUseCase.execute).toHaveBeenCalledWith(payload.name, payload.email);
+<% if (auth.includes('JWT')) { -%>
+            expect(mockCreateUserUseCase.execute).toHaveBeenCalledWith(payload.name, payload.email, payload.password);
+<% } else { -%>
+            expect(mockCreateUserUseCase.execute).toHaveBeenCalledWith(payload.name, payload.email, undefined);
+<% } -%>
+        });
+
+<% if (auth.includes('JWT')) { %>
+        it('should fail to create a user when password is missing and JWT is enabled', async () => {
+            const payload = { name: 'Alice', email: 'alice@example.com' };
+<% if (communication === 'GraphQL') { -%>
+            await expect(userController.createUser(payload)).rejects.toThrow('Password is required');
+<% } else { -%>
+            mockRequest.body = payload;
+            await userController.createUser(mockRequest as Request, mockResponse as Response, mockNext);
+            expect(mockResponse.status).toHaveBeenCalledWith(HTTP_STATUS.BAD_REQUEST);
+            expect(mockResponse.json).toHaveBeenCalledWith({ error: 'Password is required' });
+<% } -%>
         });
+<% } %>
 
         it('should handle errors when creation fails (Error Handling)', async () => {
             // Arrange
             const error = new Error('Creation Error');
-            const payload = { name: 'Bob', email: 'bob@example.com' };
+            const payload = { name: 'Bob', email: 'bob@example.com'<% if (auth.includes('JWT')) { %>, password: 'password123'<% } %> };
 <% if (communication === 'GraphQL') { -%>
             const dataArg = payload;
 <% } else { -%>
@@ -173,7 +193,7 @@ describe('UserController (Clean Architecture)', () => {
         it('should handle non-Error objects in catch block when creation fails', async () => {
             // Arrange
             const error = 'Creation String Error';
-            const payload = { name: 'Bob', email: 'bob@example.com' };
+            const payload = { name: 'Bob', email: 'bob@example.com'<% if (auth.includes('JWT')) { %>, password: 'password123'<% } %> };
 <% if (communication === 'GraphQL') { -%>
             const dataArg = payload;
 <% } else { -%>
@@ -320,9 +340,9 @@ describe('UserController (Clean Architecture)', () => {
             const error = new Error('Database Error');
             mockCreateUserUseCase.execute.mockRejectedValue(error);
 <%_ if (communication === 'GraphQL') { -%>
-            await expect(userController.createUser({ name: 'Alice', email: 'alice@example.com' })).rejects.toThrow(error);
+            await expect(userController.createUser({ name: 'Alice', email: 'alice@example.com'<% if (auth.includes('JWT')) { %>, password: 'password123'<% } %> })).rejects.toThrow(error);
 <%_ } else { -%>
-            mockRequest.body = { name: 'Alice', email: 'alice@example.com' };
+            mockRequest.body = { name: 'Alice', email: 'alice@example.com'<% if (auth.includes('JWT')) { %>, password: 'password123'<% } %> };
             await userController.createUser(mockRequest as Request, mockResponse as Response, mockNext);
             expect(mockNext).toHaveBeenCalledWith(error);
 <%_ } -%>

package/templates/clean-architecture/ts/src/interfaces/controllers/userController.ts.ejs

@@ -6,17 +6,18 @@ import { HTTP_STATUS } from '@/utils/httpCodes';
 import { UserRepository } from '@/infrastructure/repositories/UserRepository';
 import CreateUser from '@/usecases/createUser';
 import GetAllUsers from '@/usecases/getAllUsers';
+import GetUserById from '@/usecases/getUserById';
 import UpdateUser from '@/usecases/updateUser';
 import DeleteUser from '@/usecases/deleteUser';
 import logger from '@/infrastructure/log/logger';
 <%_ if (communication === 'Kafka') { -%>
 import { kafkaService } from '@/infrastructure/messaging/kafkaClient';
 import { KAFKA_ACTIONS } from '@/utils/kafkaEvents';
-<%_ } -%>
-
+<%_ } %>
 export class UserController {
     private createUserUseCase: CreateUser;
     private getAllUsersUseCase: GetAllUsers;
+    private getUserByIdUseCase: GetUserById;
     private updateUserUseCase: UpdateUser;
     private deleteUserUseCase: DeleteUser;
 
@@ -24,24 +25,31 @@ export class UserController {
         const userRepository = new UserRepository();
         this.createUserUseCase = new CreateUser(userRepository);
         this.getAllUsersUseCase = new GetAllUsers(userRepository);
+        this.getUserByIdUseCase = new GetUserById(userRepository);
         this.updateUserUseCase = new UpdateUser(userRepository);
         this.deleteUserUseCase = new DeleteUser(userRepository);
     }
 
 <% if (communication === 'GraphQL') { -%>
-    async createUser(data: { name: string, email: string }) {
+    async createUser(data: { name: string, email: string, password?: string }) {
         try {
-            const { name, email } = data;
-            const user = await this.createUserUseCase.execute(name, email);
+            const { name, email, password } = data;
+            <% if (auth.includes('JWT')) { -%>
+            if (!password) {
+                throw new Error('Password is required');
+            }
+            <% } -%>
+            const user = await this.createUserUseCase.execute(name, email, password);
 <%_ if (communication === 'Kafka') { -%>
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            const userId = (user as any).id || (user as any)._id;
+            const rawUserForKafka = user as unknown as { id?: string | number; _id?: string | number; email: string };
+            const userId = rawUserForKafka.id || rawUserForKafka._id;
             await kafkaService.sendMessage('user-topic', JSON.stringify({
                 action: KAFKA_ACTIONS.USER_CREATED,
-                payload: { id: userId, email: user.email }
+                payload: { id: userId, email: rawUserForKafka.email }
             }), userId?.toString() || '');
 <%_ } -%>
-            return user;
+            const rawUser = user as unknown as { toJSON?: () => Record<string, unknown> };
+            return typeof rawUser.toJSON === 'function' ? rawUser.toJSON() : (user as unknown as Record<string, unknown>);
         } catch (error: unknown) {
             const message = error instanceof Error ? error.message : 'Unknown error';
             logger.error(`${ERROR_MESSAGES.CREATE_USER_ERROR}:`, message);
@@ -49,6 +57,18 @@ export class UserController {
         }
     }
 
+    async getUserById(id: string) {
+        try {
+            const user = await this.getUserByIdUseCase.execute(id);
+            if (!user) throw new Error(ERROR_MESSAGES.USER_NOT_FOUND);
+            return user;
+        } catch (error: unknown) {
+            const message = error instanceof Error ? error.message : 'Unknown error';
+            logger.error(`${ERROR_MESSAGES.FETCH_USER_ERROR}:`, message);
+            throw error;
+        }
+    }
+
     async getUsers() {
         try {
             const users = await this.getAllUsersUseCase.execute();
@@ -98,17 +118,24 @@ export class UserController {
 <% } else { -%>
     async createUser(req: Request, res: Response, next: NextFunction) {
         try {
-            const { name, email } = req.body || {};
-            const user = await this.createUserUseCase.execute(name, email);
+            const { name, email, password } = req.body || {};
+<% if (auth.includes('JWT')) { -%>
+            if (!password) {
+                return res.status(HTTP_STATUS.BAD_REQUEST).json({ error: 'Password is required' });
+            }
+<% } -%>
+            const user = await this.createUserUseCase.execute(name, email, password);
 <%_ if (communication === 'Kafka') { -%>
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            const userId = (user as any).id || (user as any)._id;
+            const rawUserForKafka = user as unknown as { id?: string | number; _id?: string | number; email: string };
+            const userId = rawUserForKafka.id || rawUserForKafka._id;
             await kafkaService.sendMessage('user-topic', JSON.stringify({
                 action: KAFKA_ACTIONS.USER_CREATED,
-                payload: { id: userId, email: user.email }
+                payload: { id: userId, email: rawUserForKafka.email }
             }), userId?.toString() || '');
 <%_ } -%>
-            res.status(HTTP_STATUS.CREATED).json(user);
+            const rawUser = user as unknown as { toJSON?: () => Record<string, unknown> };
+            const userJson = typeof rawUser.toJSON === 'function' ? rawUser.toJSON() : (user as unknown as Record<string, unknown>);
+            res.status(HTTP_STATUS.CREATED).json(userJson);
         } catch (error: unknown) {
             const message = error instanceof Error ? error.message : 'Unknown error';
             logger.error(`${ERROR_MESSAGES.CREATE_USER_ERROR}:`, message);
@@ -116,6 +143,21 @@ export class UserController {
         }
     }
 
+    async getUserById(req: Request, res: Response, next: NextFunction) {
+        try {
+            const { id } = req.params;
+            const user = await this.getUserByIdUseCase.execute(id);
+            if (!user) {
+                return res.status(HTTP_STATUS.NOT_FOUND).json({ error: ERROR_MESSAGES.USER_NOT_FOUND });
+            }
+            res.json(user);
+        } catch (error: unknown) {
+            const message = error instanceof Error ? error.message : 'Unknown error';
+            logger.error(`${ERROR_MESSAGES.FETCH_USER_ERROR}:`, message);
+            next(error);
+        }
+    }
+
     async getUsers(req: Request, res: Response, next: NextFunction) {
         try {
             const users = await this.getAllUsersUseCase.execute();

package/templates/clean-architecture/ts/src/interfaces/graphql/context.spec.ts.ejs

@@ -1,32 +1,47 @@
-import { gqlContext } from '@/interfaces/graphql/context';
 import { Request } from 'express';
-import { resolvers } from '@/interfaces/graphql/resolvers';
-import { typeDefs } from '@/interfaces/graphql/typeDefs';
+<% if (auth.includes('JWT')) { %>import { JwtService } from '@/infrastructure/auth/jwtService';
+jest.mock('@/infrastructure/auth/jwtService');<% } %>
+import { gqlContext } from '@/interfaces/graphql/context';
 
 jest.mock('@/infrastructure/repositories/UserRepository');
 
 describe('GraphQL Context', () => {
-  it('should exercise GraphQL index entry points', () => {
-    expect(resolvers).toBeDefined();
-    expect(typeDefs).toBeDefined();
-  });
-  it('should return context with token when authorization header is present', async () => {
-    const mockRequest = {
-      headers: {
-        authorization: 'Bearer token123',
-      },
-    } as Request;
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should return context with user when authorization header is present and valid', async () => {
+        <% if (auth.includes('JWT')) { %>
+        const mockUser = { id: '1', email: 'test@test.com' };
+        (JwtService.verifyToken as jest.Mock).mockReturnValue(mockUser);
+        const mockRequest = {
+            headers: {
+                authorization: 'Bearer valid-token',
+            },
+        } as Request;
 
-    const context = await gqlContext({ req: mockRequest });
-    expect(context.token).toBe('Bearer token123');
-  });
+        const context = await gqlContext({ req: mockRequest });
+        expect(context.user).toEqual(mockUser);
+        expect(JwtService.verifyToken).toHaveBeenCalledWith('valid-token');
+        <% } else { %>
+        const mockRequest = {
+            headers: {
+                authorization: 'Bearer token123',
+            },
+        } as Request;
+        const context = await gqlContext({ req: mockRequest });
+        expect(context.user).toBeUndefined();
+        <% } %>
+        expect(context.userRepository).toBeDefined();
+    });
 
-  it('should return context with empty token when authorization header is missing', async () => {
-    const mockRequest = {
-      headers: {},
-    } as Request;
+    it('should return context without user when authorization header is missing', async () => {
+        const mockRequest = {
+            headers: {},
+        } as Request;
 
-    const context = await gqlContext({ req: mockRequest });
-    expect(context.token).toBe('');
-  });
+        const context = await gqlContext({ req: mockRequest });
+        expect(context.user).toBeUndefined();
+        expect(context.userRepository).toBeDefined();
+    });
 });

package/templates/clean-architecture/ts/src/interfaces/graphql/context.ts.ejs

@@ -1,17 +1,23 @@
 import { Request } from 'express';
 import { UserRepository } from '@/infrastructure/repositories/UserRepository';
+<% if (auth.includes('JWT')) { %>import { JwtService } from '@/infrastructure/auth/jwtService';<% } %>
 
 export interface MyContext {
-  token?: string;
   userRepository: UserRepository;
+  user?: unknown;
 }
 
-export const gqlContext = async ({ req }: { req: Request }): Promise<MyContext> => {
-  const token = req.headers.authorization || '';
+export const gqlContext = async ({ req: <% if (auth.includes('JWT')) { %>req<% } else { %>_req<% } %> }: { req: Request }): Promise<MyContext> => {
   const userRepository = new UserRepository();
-  
-  return { 
-    token, 
-    userRepository 
-  };
+  const context: MyContext = { userRepository };
+  <% if (auth.includes('JWT')) { %>
+  const authHeader = req.headers.authorization || '';
+  if (authHeader.startsWith('Bearer ')) {
+    const token = authHeader.split(' ')[1];
+    const user = JwtService.verifyToken(token);
+    if (user) {
+      context.user = user;
+    }
+  }<% } %>
+  return context;
 };

package/templates/clean-architecture/ts/src/interfaces/graphql/resolvers/user.resolvers.spec.ts.ejs

@@ -15,40 +15,63 @@ jest.mock('@/interfaces/controllers/userController', () => {
 });
 
 describe('User Resolvers', () => {
+  const mockContext = { 
+    userRepository: {} as any,
+    <% if (auth.includes('JWT')) { %>user: { id: 'admin', email: 'admin@test.com' }<% } %>
+  };
+
   afterEach(() => {
     jest.clearAllMocks();
   });
 
   describe('Query.getAllUsers', () => {
-    it('should return all users', async () => {
-      const result = await userResolvers.Query.getAllUsers();
+    it('should return all users when authorized', async () => {
+      const result = await userResolvers.Query.getAllUsers(null, null, mockContext as any);
       expect(result).toEqual([{ id: '1', name: 'John Doe', email: 'john@example.com' }]);
       expect(mockGetUsers).toHaveBeenCalledTimes(1);
     });
+
+    <% if (auth.includes('JWT')) { %>
+    it('should throw error when unauthorized', async () => {
+      await expect(userResolvers.Query.getAllUsers(null, null, { userRepository: {} } as any)).rejects.toThrow('Unauthorized');
+    });
+    <% } %>
   });
 
   describe('Mutation.createUser', () => {
-    it('should create and return a new user', async () => {
-      const result = await userResolvers.Mutation.createUser(null, { name: 'Jane', email: 'jane@example.com' });
+    it('should create and return a new user (Public)', async () => {
+      const payload = { name: 'Jane', email: 'jane@example.com'<% if (auth.some(a => a !=='None')) { %>, password: 'password123'<% } %> };
+      const result = await userResolvers.Mutation.createUser(null, payload);
       expect(result).toEqual({ id: '1', name: 'Jane', email: 'jane@example.com' });
-      expect(mockCreateUser).toHaveBeenCalledWith({ name: 'Jane', email: 'jane@example.com' });
-      expect(mockCreateUser).toHaveBeenCalledTimes(1);
+      expect(mockCreateUser).toHaveBeenCalledWith(payload);
     });
   });
 
   describe('Mutation.updateUser', () => {
-    it('should update and return the user', async () => {
+    it('should update and return the user when authorized', async () => {
       const payload = { name: 'Updated' };
-      const result = await userResolvers.Mutation.updateUser(null, { id: '1', ...payload });
+      const result = await userResolvers.Mutation.updateUser(null, { id: '1', ...payload }, mockContext as any);
       expect(result).toMatchObject(payload);
     });
+
+    <% if (auth.includes('JWT')) { %>
+    it('should throw error when unauthorized', async () => {
+      await expect(userResolvers.Mutation.updateUser(null, { id: '1', name: 'N' }, { userRepository: {} } as any)).rejects.toThrow('Unauthorized');
+    });
+    <% } %>
   });
 
   describe('Mutation.deleteUser', () => {
-    it('should delete and return true', async () => {
-      const result = await userResolvers.Mutation.deleteUser(null, { id: '1' });
+    it('should delete and return true when authorized', async () => {
+      const result = await userResolvers.Mutation.deleteUser(null, { id: '1' }, mockContext as any);
       expect(result).toBe(true);
     });
+
+    <% if (auth.includes('JWT')) { %>
+    it('should throw error when unauthorized', async () => {
+      await expect(userResolvers.Mutation.deleteUser(null, { id: '1' }, { userRepository: {} } as any)).rejects.toThrow('Unauthorized');
+    });
+    <% } %>
   });
 <%_ if (database === 'MongoDB') { -%>
   describe('User.id', () => {

package/templates/clean-architecture/ts/src/interfaces/graphql/resolvers/user.resolvers.ts.ejs

@@ -1,24 +1,34 @@
 import { UserController } from '@/interfaces/controllers/userController';
+import { MyContext } from '@/interfaces/graphql/context';
 
 const userController = new UserController();
 
 export const userResolvers = {
   Query: {
-    getAllUsers: async () => {
+    getAllUsers: async (_: unknown, __: unknown, <% if (auth.includes('JWT')) { %>context<% } else { %>_context<% } %>: MyContext) => {
+      <%_ if (auth.includes('JWT')) { -%>
+      if (!context.user) throw new Error('Unauthorized');
+      <% } %>
       const users = await userController.getUsers();
       return users;
     }
   },
   Mutation: {
-    createUser: async (_: unknown, { name, email }: { name: string, email: string }) => {
-      const user = await userController.createUser({ name, email });
+    createUser: async (_: unknown, { name, email<% if (auth.some(a => a !=='None')) { %>, password<% } %> }: { name: string, email: string<% if (auth.some(a => a !=='None')) { %>, password: string<% } %> }) => {
+      const user = await userController.createUser({ name, email<% if (auth.some(a => a !=='None')) { %>, password<% } %> });
       return user;
     },
-    updateUser: async (_: unknown, { id, name, email }: { id: string, name?: string, email?: string }) => {
+    updateUser: async (_: unknown, { id, name, email }: { id: string, name?: string, email?: string }, <% if (auth.includes('JWT')) { %>context<% } else { %>_context<% } %>: MyContext) => {
+      <%_ if (auth.includes('JWT')) { -%>
+      if (!context.user) throw new Error('Unauthorized');
+      <% } %>
       const user = await userController.updateUser(id, { name, email });
       return user;
     },
-    deleteUser: async (_: unknown, { id }: { id: string }) => {
+    deleteUser: async (_: unknown, { id }: { id: string }, <% if (auth.includes('JWT')) { %>context<% } else { %>_context<% } %>: MyContext) => {
+      <%_ if (auth.includes('JWT')) { -%>
+      if (!context.user) throw new Error('Unauthorized');
+      <% } %>
       const result = await userController.deleteUser(id);
       return result;
     }

package/templates/clean-architecture/ts/src/interfaces/graphql/typeDefs/user.types.ts.ejs

@@ -10,7 +10,7 @@ export const userTypes = `#graphql
   }
 
   type Mutation {
-    createUser(name: String!, email: String!): User
+    createUser(name: String!, email: String!<%_ if (auth.some(a => a !=='None')) { _%>, password: String!<%_ } _%>): User
     updateUser(id: ID!, name: String, email: String): User
     deleteUser(id: ID!): Boolean
   }

package/templates/clean-architecture/ts/src/interfaces/routes/userRoutes.spec.ts.ejs

@@ -4,12 +4,20 @@ import router from '@/interfaces/routes/userRoutes';
 
 const mockGetUsers = jest.fn().mockImplementation((req, res) => res.status(200).json([{ id: '1', name: 'John Doe' }]));
 const mockCreateUser = jest.fn().mockImplementation((req, res) => res.status(201).json({ id: '1', name: 'Test' }));
+const mockGetUserById = jest.fn().mockImplementation((req, res) => res.status(200).json({ id: '1', name: 'Test' }));
+
+<% if (auth.includes('JWT')) { -%>
+jest.mock('@/infrastructure/webserver/middleware/authMiddleware', () => ({
+  authMiddleware: (req: any, res: any, next: any) => next()
+}));
+<% } -%>
 
 jest.mock('@/interfaces/controllers/userController', () => {
   return {
     UserController: jest.fn().mockImplementation(() => ({
       getUsers: (...args: unknown[]) => mockGetUsers(...args),
-      createUser: (...args: unknown[]) => mockCreateUser(...args)
+      createUser: (...args: unknown[]) => mockCreateUser(...args),
+      getUserById: (...args: unknown[]) => mockGetUserById(...args)
     }))
   };
 });

package/templates/clean-architecture/ts/src/interfaces/routes/userRoutes.ts.ejs

@@ -0,0 +1,16 @@
+import { Router, Request, Response, NextFunction } from 'express';
+import { UserController } from '@/interfaces/controllers/userController';
+<%_ if (auth.includes('JWT')) { _%>
+import { authMiddleware } from '@/infrastructure/webserver/middleware/authMiddleware';
+<%_ } _%>
+
+const router = Router();
+const userController = new UserController();
+
+router.post('/', (req: Request, res: Response, next: NextFunction) => userController.createUser(req, res, next));
+router.get('/', <% if (auth.includes('JWT')) { %>authMiddleware, <% } %>(req: Request, res: Response, next: NextFunction) => userController.getUsers(req, res, next));
+router.get('/:id', <% if (auth.includes('JWT')) { %>authMiddleware, <% } %>(req: Request, res: Response, next: NextFunction) => userController.getUserById(req, res, next));
+router.patch('/:id', <% if (auth.includes('JWT')) { %>authMiddleware, <% } %>(req: Request, res: Response, next: NextFunction) => userController.updateUser(req, res, next));
+router.delete('/:id', <% if (auth.includes('JWT')) { %>authMiddleware, <% } %>(req: Request, res: Response, next: NextFunction) => userController.deleteUser(req, res, next));
+
+export default router;

package/templates/clean-architecture/ts/src/usecases/createUser.spec.ts.ejs

@@ -26,11 +26,12 @@ describe('CreateUser UseCase', () => {
     it('should create and save a new user', async () => {
         const name = 'Test User';
         const email = 'test@example.com';
+        const password = 'password123';
         const expectedResult = { id: 1, name, email };
 
         mockUserRepository.save.mockResolvedValue(expectedResult as any);
 
-        const result = await createUser.execute(name, email);
+        const result = await createUser.execute(name, email, password);
 
         expect(mockUserRepository.save).toHaveBeenCalledTimes(1);
         const savedUser = mockUserRepository.save.mock.calls[0][0];
@@ -46,6 +47,6 @@ describe('CreateUser UseCase', () => {
         const error = new Error('Database error');
         mockUserRepository.save.mockRejectedValue(error);
 
-        await expect(createUser.execute('Test', 'test@test.com')).rejects.toThrow(error);
+        await expect(createUser.execute('Test', 'test@test.com', 'pwd')).rejects.toThrow(error);
     });
 });

package/templates/clean-architecture/ts/src/usecases/createUser.ts.ejs

@@ -0,0 +1,35 @@
+import { User } from '@/domain/user';
+import { UserRepository } from '@/infrastructure/repositories/UserRepository';
+<% if (auth.includes('JWT')) { -%>
+import bcrypt from 'bcryptjs';
+<% } -%>
+<% if (caching !== 'None') { -%>
+import cacheService from '<% if (caching === "Redis") { %>@/infrastructure/caching/redisClient<% } else { %>@/infrastructure/caching/memoryCache<% } %>';
+<% } -%>
+<% if (caching !== 'None') { -%>
+import logger from '@/infrastructure/log/logger';
+<% } -%>
+
+export default class CreateUser {
+    constructor(private userRepository: UserRepository) {}
+
+    async execute(name: string, email: string, password?: string) {
+        let finalPassword = password;
+<% if (auth.includes('JWT')) { -%>
+        if (password) {
+            finalPassword = await bcrypt.hash(password, 10);
+        }
+<% } -%>
+        const user = new User(null, name, email, finalPassword);
+        const savedUser = await this.userRepository.save(user);
+<% if (caching !== 'None') { -%>
+        try {
+            await cacheService.del('users:all');
+        } catch (error) {
+            logger.warn('Failed to clear cache after user creation:', error);
+        }
+<% } -%>
+
+        return savedUser;
+    }
+}

package/templates/clean-architecture/ts/src/usecases/deleteUser.spec.ts.ejs

@@ -35,6 +35,7 @@ describe('DeleteUser UseCase', () => {
         expect(result).toEqual(expectedResult);
 <%_ if (caching !== 'None') { -%>
         expect(cacheService.del).toHaveBeenCalledWith('users:all');
+        expect(cacheService.del).toHaveBeenCalledWith(`user:${id}`);
 <%_ } %>
     });
 

package/templates/clean-architecture/ts/src/usecases/deleteUser.ts.ejs

@@ -0,0 +1,24 @@
+import { UserRepository } from '@/infrastructure/repositories/UserRepository';
+<%_ if (caching !== 'None') { _%>
+import cacheService from '<% if (caching === "Redis") { %>@/infrastructure/caching/redisClient<% } else { %>@/infrastructure/caching/memoryCache<% } %>';
+import logger from '@/infrastructure/log/logger';
+<%_ } _%>
+
+export default class DeleteUser {
+    constructor(private userRepository: UserRepository) {}
+
+    async execute(id: number | string) {
+        const result = await this.userRepository.delete(id);
+        <%_ if (caching !== 'None') { -%>
+        if (result) {
+            try {
+                await cacheService.del('users:all');
+                await cacheService.del(`user:${id}`);
+            } catch (error) {
+                logger.warn('Failed to clear cache after user deletion:', error);
+            }
+        }<%_ } -%>
+        
+        return result;
+    }
+}

package/templates/clean-architecture/ts/src/usecases/getAllUsers.ts.ejs

@@ -0,0 +1,21 @@
+import { UserRepository } from '@/infrastructure/repositories/UserRepository';
+<%_ if (caching !== 'None') { _%>
+import cacheService from '<% if (caching === "Redis") { %>@/infrastructure/caching/redisClient<% } else { %>@/infrastructure/caching/memoryCache<% } %>';
+<%_ } _%>
+
+export default class GetAllUsers {
+    constructor(private userRepository: UserRepository) {}
+
+    async execute() {
+        <%_ if (caching !== 'None') { -%>
+        const cachedUsers = await cacheService.get('users:all');
+        if (cachedUsers) return cachedUsers;
+        <%_ } -%>
+        const users = await this.userRepository.getUsers();
+        <%_ if (caching !== 'None') { -%>
+        await cacheService.set('users:all', users, 3600); // Cache for 1 hour
+        <%_ } -%>
+
+        return users;
+    }
+}

package/templates/clean-architecture/ts/src/usecases/getUserById.spec.ts.ejs

@@ -0,0 +1,47 @@
+import GetUserById from '@/usecases/getUserById';
+import { UserRepository } from '@/infrastructure/repositories/UserRepository';
+
+jest.mock('@/infrastructure/repositories/UserRepository');
+
+<% if (caching === 'Redis') { -%>
+jest.mock('@/infrastructure/caching/redisClient', () => ({
+    get: jest.fn(),
+    set: jest.fn(),
+    del: jest.fn()
+}));
+<% } else if (caching === 'Memory Cache') { -%>
+jest.mock('@/infrastructure/caching/memoryCache', () => ({
+    get: jest.fn(),
+    set: jest.fn(),
+    del: jest.fn()
+}));
+<% } -%>
+
+describe('GetUserById Use Case', () => {
+    let getUserById: GetUserById;
+    let userRepository: jest.Mocked<UserRepository>;
+
+    beforeEach(() => {
+        userRepository = new UserRepository() as jest.Mocked<UserRepository>;
+        getUserById = new GetUserById(userRepository);
+    });
+
+    it('should return a user if found', async () => {
+        const mockUser = { id: '1', name: 'John Doe', email: 'john@example.com' };
+        userRepository.findById.mockResolvedValue(mockUser);
+
+        const result = await getUserById.execute('1');
+
+        expect(result).toEqual(mockUser);
+        expect(userRepository.findById).toHaveBeenCalledWith('1');
+    });
+
+    it('should return null if user is not found', async () => {
+        userRepository.findById.mockResolvedValue(null);
+
+        const result = await getUserById.execute('999');
+
+        expect(result).toBeNull();
+        expect(userRepository.findById).toHaveBeenCalledWith('999');
+    });
+});