feat: Add user resources query enhancements - time range filter and total price aggregation

.gitignore

@@ -33,6 +33,8 @@ cmd/csghub-server/__debug_*
 run_dataviewer_local.sh
 run_notification_local.sh
 run_temporal_worker.sh
+run_logcollector_local.sh
+
 local.toml
 loki-config.yml
 

api/handler/user.go

@@ -825,16 +825,19 @@ func (h *UserHandler) GetUserResource(ctx *gin.Context) {
 	req.CurrentUser = currentUser
 	req.Page = page
 	req.PageSize = per
-	ds, total, err := h.user.GetUserResource(ctx.Request.Context(), req)
+	req.StartTime = ctx.Query("start_time")
+	req.EndTime = ctx.Query("end_time")
+	ds, total, totalPrice, err := h.user.GetUserResource(ctx.Request.Context(), req)
 	if err != nil {
 		slog.ErrorContext(ctx.Request.Context(), "failed to get user's resource", slog.Any("error", err), slog.Any("username", username))
 		httpbase.ServerError(ctx, err)
 		return
 	}
 	respData := gin.H{
-		"message": "OK",
-		"data":    ds,
-		"total":   total,
+		"message":     "OK",
+		"data":        ds,
+		"total":       total,
+		"total_price": totalPrice,
 	}
 	ctx.JSON(http.StatusOK, respData)
 }

api/handler/user_test.go

@@ -455,13 +455,14 @@ func TestUserHandler_GetUserResource(t *testing.T) {
 			Page:     1,
 			PageSize: 10,
 		},
-	}).Return([]types.UserResourcesResp{{ID: 123}}, 100, nil)
+	}).Return([]types.UserResourcesResp{{ID: 123}}, 100, 50.0, nil)
 	tester.WithParam("username", "u").AddPagination(1, 10).Execute()
 
 	tester.ResponseEqSimple(t, 200, gin.H{
-		"message": "OK",
-		"data":    []types.UserResourcesResp{{ID: 123}},
-		"total":   100,
+		"message":     "OK",
+		"data":        []types.UserResourcesResp{{ID: 123}},
+		"total":       100,
+		"total_price": 50.0,
 	})
 }
 

builder/accounting/client.go

@@ -36,6 +36,7 @@ type AccountingClient interface {
 	ListRecharges(req types.RechargesIndexReq) (any, error)
 	StatementsIndex(req types.ActStatementsReq) (any, error)
 	ListPresents(req types.PresentsIndexReq) (any, error)
+	GetOrderDetailByID(currentUser string, id int64) (any, error)
 }
 type accountingClientImpl struct {
 	remote    *url.URL

builder/accounting/client_ce.go

@@ -93,3 +93,7 @@ func (ac *accountingClientImpl) StatementsIndex(req types.ActStatementsReq) (any
 func (ac *accountingClientImpl) ListPresents(req types.PresentsIndexReq) (any, error) {
 	return nil, nil
 }
+
+func (ac *accountingClientImpl) GetOrderDetailByID(currentUser string, id int64) (any, error) {
+	return nil, nil
+}