From dfed117d90c6f071786e34c4ea20ed6ba5f6b3d5 Mon Sep 17 00:00:00 2001
From: "aditya.siregar" <aditya.siregar@gopay.id>
Date: Fri, 26 Jul 2024 22:47:37 +0700
Subject: [PATCH] Update

---
 internal/handlers/http/order/order.go | 3 +--
 internal/repository/orders/order.go   | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/internal/handlers/http/order/order.go b/internal/handlers/http/order/order.go
index ca3d386..63c4f51 100644
--- a/internal/handlers/http/order/order.go
+++ b/internal/handlers/http/order/order.go
@@ -2,7 +2,6 @@ package order
 
 import (
 	"furtuna-be/internal/common/errors"
-	"furtuna-be/internal/common/mycontext"
 	"furtuna-be/internal/entity"
 	"furtuna-be/internal/handlers/request"
 	"furtuna-be/internal/handlers/response"
@@ -177,7 +176,7 @@ func (h *Handler) GetAllHistoryOrders(c *gin.Context) {
 		return
 	}
 
-	ctx := mycontext.NewContext(c.Request.Context())
+	ctx := request.GetMyContext(c)
 	orders, total, err := h.service.GetAllHistoryOrders(ctx, req.ToEntity(ctx))
 	if err != nil {
 		response.ErrorWrapper(c, err)
diff --git a/internal/repository/orders/order.go b/internal/repository/orders/order.go
index 307c88b..d58c206 100644
--- a/internal/repository/orders/order.go
+++ b/internal/repository/orders/order.go
@@ -105,8 +105,10 @@ func (b *OrderRepository) GetAllHystoryOrders(ctx context.Context, req entity.Hi
 		return nil, 0, err
 	}
 
+	page := (req.Offset - 1) * req.Limit
+
 	if req.Offset > 0 {
-		query = query.Offset(req.Offset)
+		query = query.Offset(page)
 	}
 
 	if req.Limit > 0 {