Merge pull request #13 from Ulas-Scan/development

feat: filter hstory by product name
Ulas-Scan · Jun 15, 2024 · 071e677 · 071e677
2 parents 54a1add + a0b7454
commit 071e677
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/controller/history.go b/controller/history.go
@@ -45,9 +45,12 @@ func (c *historyController) GetHistories(ctx *gin.Context) {
 		return
 	}
 
+	productName := ctx.Query("product_name")
+
 	req := dto.HistoriesGetRequest{
-		Page:  page,
-		Limit: limit,
+		Page:        page,
+		Limit:       limit,
+		ProductName: productName,
 	}
 
 	result, err := c.historyService.GetHistories(ctx.Request.Context(), req, userId)

diff --git a/dto/history.go b/dto/history.go
@@ -28,8 +28,9 @@ var (
 
 type (
 	HistoriesGetRequest struct {
-		Page  int `json:"page"`
-		Limit int `json:"limit"`
+		Page        int    `json:"page"`
+		Limit       int    `json:"limit"`
+		ProductName string `json:"product_name"`
 	}
 
 	HistoriesResponse struct {

diff --git a/repository/history.go b/repository/history.go
@@ -62,8 +62,13 @@ func (r *historyRepository) GetHistories(ctx context.Context, tx *gorm.DB, dto d
 		return []entity.History{}, 0, err
 	}
 
+	scope := tx.WithContext(ctx)
+	if dto.ProductName != "" {
+		scope = scope.Where("product_name = ?", dto.ProductName)
+	}
+
 	// Query the paginated records
-	err = tx.WithContext(ctx).
+	err = scope.
 		Where("user_id = ?", userId).
 		Limit(limit).Offset(offset).
 		Find(&histories).Error