From 58f60281312d13e17cbbc72e676e6cfbee21f4cb Mon Sep 17 00:00:00 2001
From: rivo <rivopelu12@gmail.com>
Date: Tue, 26 Nov 2024 06:50:43 +0800
Subject: [PATCH] FEAT:fixing

---
 src/main/java/com/pos/app/model/response/ResListProduct.java    | 2 ++
 .../java/com/pos/app/service/impl/MasterDataServiceImpl.java    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/main/java/com/pos/app/model/response/ResListProduct.java b/src/main/java/com/pos/app/model/response/ResListProduct.java
index 8d264a4..9ccfcd3 100644
--- a/src/main/java/com/pos/app/model/response/ResListProduct.java
+++ b/src/main/java/com/pos/app/model/response/ResListProduct.java
@@ -24,4 +24,6 @@ public class ResListProduct {
     private BigInteger price;
     private String categoryName;
     private String categoryId;
+    private String createdBy;
+    private Long createdDate;
 }
diff --git a/src/main/java/com/pos/app/service/impl/MasterDataServiceImpl.java b/src/main/java/com/pos/app/service/impl/MasterDataServiceImpl.java
index dbc66bd..558d34a 100644
--- a/src/main/java/com/pos/app/service/impl/MasterDataServiceImpl.java
+++ b/src/main/java/com/pos/app/service/impl/MasterDataServiceImpl.java
@@ -81,6 +81,8 @@ public List<ResListProduct> getAllProduct() {
                     .name(product.getName())
                     .id(product.getId())
                     .price(product.getPrice())
+                    .createdBy(accountService.getCurrentAccount(product.getCreatedBy()).getName())
+                    .createdDate(product.getCreatedDate())
                     .image(product.getImage())
                     .description(product.getDescription())
                     .categoryName(product.getCategory().getName())