From 1c7f7feb2eab80f8f25754181e62953a69135053 Mon Sep 17 00:00:00 2001
From: Aditya Siregar <aditya.siregar@gopay.co.id>
Date: Wed, 13 Aug 2025 21:21:32 +0700
Subject: [PATCH] Add list Paymenty method

---
 infra/development.yaml                     |  2 +-
 internal/handler/order_handler.go          |  4 ++++
 internal/handler/payment_method_handler.go | 10 +++-------
 internal/transformer/order_transformer.go  |  1 -
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/infra/development.yaml b/infra/development.yaml
index 788cb91..e4d1d63 100644
--- a/infra/development.yaml
+++ b/infra/development.yaml
@@ -5,7 +5,7 @@ server:
 
 jwt:
   token:
-    expires-ttl: 1440
+    expires-ttl: 144000
     secret: "5Lm25V3Qd7aut8dr4QUxm5PZUrSFs"
 
 postgresql:
diff --git a/internal/handler/order_handler.go b/internal/handler/order_handler.go
index 457e958..c7e99ec 100644
--- a/internal/handler/order_handler.go
+++ b/internal/handler/order_handler.go
@@ -122,6 +122,9 @@ func (h *OrderHandler) AddToOrder(c *gin.Context) {
 
 func (h *OrderHandler) ListOrders(c *gin.Context) {
 	var query contract.ListOrdersQuery
+	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
+
 	if err := c.ShouldBindQuery(&query); err != nil {
 		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("invalid_query_parameters", "OrderHandler::ListOrders", err.Error())}), "OrderHandler::ListOrders")
 		return
@@ -133,6 +136,7 @@ func (h *OrderHandler) ListOrders(c *gin.Context) {
 		return
 	}
 
+	modelReq.OrganizationID = &contextInfo.OrganizationID
 	response, err := h.orderService.ListOrders(c.Request.Context(), modelReq)
 	if err != nil {
 		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("internal_error", "OrderHandler::ListOrders", err.Error())}), "OrderHandler::ListOrders")
diff --git a/internal/handler/payment_method_handler.go b/internal/handler/payment_method_handler.go
index 0e24774..49a914a 100644
--- a/internal/handler/payment_method_handler.go
+++ b/internal/handler/payment_method_handler.go
@@ -51,7 +51,7 @@ func (h *PaymentMethodHandler) CreatePaymentMethod(c *gin.Context) {
 
 	req.OrganizationID = contextInfo.OrganizationID
 	req.OutletID = contextInfo.OutletID
-	
+
 	paymentMethodResponse := h.paymentMethodService.CreatePaymentMethod(ctx, contextInfo, &req)
 	if paymentMethodResponse.HasErrors() {
 		errorResp := paymentMethodResponse.GetErrors()[0]
@@ -84,13 +84,13 @@ func (h *PaymentMethodHandler) GetPaymentMethod(c *gin.Context) {
 
 func (h *PaymentMethodHandler) ListPaymentMethods(c *gin.Context) {
 	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
 
 	req := &contract.ListPaymentMethodsRequest{
 		Page:  1,
 		Limit: 10,
 	}
 
-	// Parse query parameters
 	if pageStr := c.Query("page"); pageStr != "" {
 		if page, err := strconv.Atoi(pageStr); err == nil {
 			req.Page = page
@@ -111,11 +111,7 @@ func (h *PaymentMethodHandler) ListPaymentMethods(c *gin.Context) {
 		req.Type = &paymentMethodType
 	}
 
-	if organizationIDStr := c.Query("organization_id"); organizationIDStr != "" {
-		if organizationID, err := uuid.Parse(organizationIDStr); err == nil {
-			req.OrganizationID = &organizationID
-		}
-	}
+	req.OrganizationID = &contextInfo.OrganizationID
 
 	if isActiveStr := c.Query("is_active"); isActiveStr != "" {
 		if isActive, err := strconv.ParseBool(isActiveStr); err == nil {
diff --git a/internal/transformer/order_transformer.go b/internal/transformer/order_transformer.go
index a7975c9..72abbe7 100644
--- a/internal/transformer/order_transformer.go
+++ b/internal/transformer/order_transformer.go
@@ -295,7 +295,6 @@ func ListOrdersModelToContract(resp *models.ListOrdersResponse) *contract.ListOr
 	}
 }
 
-// Payment-related transformers
 func CreatePaymentContractToModel(req *contract.CreatePaymentRequest) *models.CreatePaymentRequest {
 	paymentOrderItems := make([]models.CreatePaymentOrderItemRequest, len(req.PaymentOrderItems))
 	for i, item := range req.PaymentOrderItems {