diff --git a/src/controllers/IssuesController.ts b/src/controllers/IssuesController.ts
index 7514d1b9..aeb849e5 100644
--- a/src/controllers/IssuesController.ts
+++ b/src/controllers/IssuesController.ts
@@ -16,6 +16,7 @@ import HttpStatusCode from "../interfaces/http-status";
 import { AppDataSource } from "../database/data-source";
 import { Issues, CreateIssueRequest, UpdateIssueRequest } from "../entities/Issues";
 import HttpSuccess from "../interfaces/http-success";
+import { RequestWithUser } from "../middlewares/user";
 
 @Route("api/v1/org/issues")
 @Tags("issues")
@@ -38,22 +39,33 @@ export class IssuesController extends Controller {
   }
 
   @Post("")
-  async createIssue(@Body() requestBody: CreateIssueRequest) {
+  async createIssue(@Body() requestBody: CreateIssueRequest, @Request() request: RequestWithUser) {
     let issue = this.issuesRepository.create(requestBody);
-
+    issue.createdUserId = request.user.sub;
+    issue.createdFullName = request.user.name;
+    issue.createdAt = new Date();
+    issue.lastUpdateUserId = "";
+    issue.lastUpdateFullName = "";
     await this.issuesRepository.save(issue);
 
     return new HttpSuccess(issue);
   }
 
   @Put("{id}")
-  async updateIssue(@Path("id") id: string, @Body() requestBody: Partial<UpdateIssueRequest>) {
+  async updateIssue(
+    @Path("id") id: string,
+    @Body() requestBody: Partial<UpdateIssueRequest>,
+    @Request() request: RequestWithUser,
+  ) {
     let issue = await this.issuesRepository.findOneBy({ id });
     if (!issue) {
       this.setStatus(HttpStatusCode.NOT_FOUND);
       return { message: "ไม่พบข้อมูลที่ต้องการแก้ไข" };
     }
     Object.assign(issue, requestBody);
+    issue.lastUpdateUserId = request.user.sub;
+    issue.lastUpdateFullName = request.user.name;
+    issue.lastUpdatedAt = new Date();
     await this.issuesRepository.save(issue);
     return new HttpSuccess(issue);
   }