feat: impl app run time

Author: MuZhou233

go.mod

@@ -36,7 +36,7 @@ require (
 	github.com/samber/lo v1.49.1
 	github.com/sony/sonyflake v1.2.0
 	github.com/spf13/afero v1.2.1
-	github.com/tuihub/protos v0.5.0
+	github.com/tuihub/protos v0.5.2
 	go.opentelemetry.io/otel v1.34.0
 	go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.10.0
 	go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.10.0

go.sum

@@ -703,8 +703,8 @@ github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ
 github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=
 github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
-github.com/tuihub/protos v0.5.0 h1:j53mBoPlMd0BSx0G9J3RFe+4aWKzmzEqlQid9tcfDYM=
-github.com/tuihub/protos v0.5.0/go.mod h1:NzgjndKsJmA1tPevx2MTFbBLeIVC+ykrW87YpTp/ibA=
+github.com/tuihub/protos v0.5.2 h1:9FrBH3iz1OCMgHD7rVbcLaylU3Z7Ml9+Tqx0a/cWQJw=
+github.com/tuihub/protos v0.5.2/go.mod h1:NzgjndKsJmA1tPevx2MTFbBLeIVC+ykrW87YpTp/ibA=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
 github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=

internal/biz/bizgebura/run_time.go

@@ -7,51 +7,97 @@ import (
 	"github.com/tuihub/librarian/internal/biz/bizutils"
 	"github.com/tuihub/librarian/internal/lib/libauth"
 	"github.com/tuihub/librarian/internal/model"
+	"github.com/tuihub/librarian/internal/model/modelgebura"
 	pb "github.com/tuihub/protos/pkg/librarian/sephirah/v1"
 
 	"github.com/go-kratos/kratos/v2/errors"
 )
 
-func (g *Gebura) AddAppRunTime(
+func (g *Gebura) BatchCreateAppRunTime(
 	ctx context.Context,
-	instID model.InternalID,
-	timeRange *model.TimeRange,
+	runTimes []*modelgebura.AppRunTime,
 ) *errors.Error {
 	claims := libauth.FromContextAssertUserType(ctx)
 	if claims == nil {
 		return bizutils.NoPermissionError()
 	}
-	if timeRange == nil {
-		return pb.ErrorErrorReasonBadRequest("empty time range")
+	for _, runTime := range runTimes {
+		if runTime == nil || runTime.RunTime == nil {
+			return pb.ErrorErrorReasonBadRequest("empty time range")
+		}
+		if runTime.RunTime.Duration <= 0 {
+			return pb.ErrorErrorReasonBadRequest("invalid time range")
+		}
 	}
-	if timeRange.Duration <= 0 {
-		return pb.ErrorErrorReasonBadRequest("invalid time range")
+	ids, err := g.id.BatchNew(len(runTimes))
+	if err != nil {
+		return pb.ErrorErrorReasonUnspecified("%s", err)
 	}
-	err := g.repo.AddAppRunTime(ctx, claims.UserID, instID, timeRange)
+	for i, runTime := range runTimes {
+		runTime.ID = ids[i]
+	}
+	err = g.repo.BatchCreateAppRunTime(ctx, claims.UserID, runTimes)
 	if err != nil {
 		return pb.ErrorErrorReasonUnspecified("%s", err.Error())
 	}
 	return nil
 }
 
-func (g *Gebura) SumAppInstRunTime(
+func (g *Gebura) SumAppRunTime(
+	ctx context.Context,
+	appIDs []model.InternalID,
+	deviceIDs []model.InternalID,
+	timeRange *model.TimeRange,
+) (*time.Duration, error) {
+	claims := libauth.FromContextAssertUserType(ctx)
+	if claims == nil {
+		return nil, bizutils.NoPermissionError()
+	}
+	if timeRange == nil {
+		return nil, pb.ErrorErrorReasonBadRequest("empty time range")
+	}
+	if timeRange.Duration <= 0 {
+		return nil, pb.ErrorErrorReasonBadRequest("invalid time range")
+	}
+	res, err := g.repo.SumAppRunTime(ctx, claims.UserID, appIDs, deviceIDs, timeRange)
+	if err != nil {
+		return nil, pb.ErrorErrorReasonUnspecified("%s", err.Error())
+	}
+	return &res, nil
+}
+
+func (g *Gebura) ListAppRunTimes(
 	ctx context.Context,
-	instID model.InternalID,
+	paging model.Paging,
+	appIDs []model.InternalID,
+	deviceIDs []model.InternalID,
 	timeRange *model.TimeRange,
-) (time.Duration, error) {
+) ([]*modelgebura.AppRunTime, int, error) {
 	claims := libauth.FromContextAssertUserType(ctx)
 	if claims == nil {
-		return time.Duration(0), bizutils.NoPermissionError()
+		return nil, 0, bizutils.NoPermissionError()
 	}
 	if timeRange == nil {
-		return time.Duration(0), pb.ErrorErrorReasonBadRequest("empty time range")
+		return nil, 0, pb.ErrorErrorReasonBadRequest("empty time range")
 	}
 	if timeRange.Duration <= 0 {
-		return time.Duration(0), pb.ErrorErrorReasonBadRequest("invalid time range")
+		return nil, 0, pb.ErrorErrorReasonBadRequest("invalid time range")
+	}
+	res, total, err := g.repo.ListAppRunTimes(ctx, claims.UserID, paging, appIDs, deviceIDs, timeRange)
+	if err != nil {
+		return nil, 0, pb.ErrorErrorReasonUnspecified("%s", err.Error())
+	}
+	return res, total, nil
+}
+
+func (g *Gebura) DeleteAppRunTime(ctx context.Context, id model.InternalID) error {
+	claims := libauth.FromContextAssertUserType(ctx)
+	if claims == nil {
+		return bizutils.NoPermissionError()
 	}
-	res, err := g.repo.SumAppRunTime(ctx, claims.UserID, instID, timeRange)
+	err := g.repo.DeleteAppRunTime(ctx, claims.UserID, id)
 	if err != nil {
-		return time.Duration(0), pb.ErrorErrorReasonUnspecified("%s", err.Error())
+		return pb.ErrorErrorReasonUnspecified("%s", err.Error())
 	}
-	return res, nil
+	return nil
 }

internal/data/gebura.go

@@ -428,39 +428,49 @@ func (g *GeburaRepo) ListApps(
 //		Strings(ctx)
 //}
 
-func (g *GeburaRepo) AddAppRunTime(
+func (g *GeburaRepo) BatchCreateAppRunTime(
 	ctx context.Context,
 	userID model.InternalID,
-	instID model.InternalID,
-	timeRange *model.TimeRange,
+	runTimes []*modelgebura.AppRunTime,
 ) error {
-	return g.data.db.AppRunTime.Create().
-		SetUserID(userID).
-		SetAppID(instID).
-		SetStartTime(timeRange.StartTime).
-		SetRunDuration(timeRange.Duration).
-		Exec(ctx)
+	rt := make([]*ent.AppRunTimeCreate, 0, len(runTimes))
+	for _, runTime := range runTimes {
+		rt = append(rt, g.data.db.AppRunTime.Create().
+			SetID(runTime.ID).
+			SetUserID(userID).
+			SetAppID(runTime.AppID).
+			SetStartTime(runTime.RunTime.StartTime).
+			SetDuration(runTime.RunTime.Duration),
+		)
+	}
+	return g.data.db.AppRunTime.CreateBulk(rt...).Exec(ctx)
 }
 
 func (g *GeburaRepo) SumAppRunTime(
 	ctx context.Context,
 	userID model.InternalID,
-	instID model.InternalID,
+	appIDs []model.InternalID,
+	deviceIDs []model.InternalID,
 	timeRange *model.TimeRange,
 ) (time.Duration, error) {
 	var v []struct {
 		Sum time.Duration
 	}
-	err := g.data.db.AppRunTime.Query().Where(
-		appruntime.UserIDEQ(userID),
-		appruntime.AppIDEQ(instID),
-		appruntime.And(
-			appruntime.StartTimeGTE(timeRange.StartTime),
-			appruntime.StartTimeLTE(timeRange.StartTime.Add(timeRange.Duration)),
-		),
-	).Aggregate(
-		ent.Sum(appruntime.FieldRunDuration),
-	).Scan(ctx, &v)
+	q := g.data.db.AppRunTime.Query().Where(
+		appruntime.UserIDEQ(userID))
+	if len(appIDs) > 0 {
+		q.Where(appruntime.AppIDIn(appIDs...))
+	}
+	if len(deviceIDs) > 0 {
+		q.Where(appruntime.DeviceIDIn(deviceIDs...))
+	}
+	err := q.Where(appruntime.And(
+		appruntime.StartTimeGTE(timeRange.StartTime),
+		appruntime.StartTimeLTE(timeRange.StartTime.Add(timeRange.Duration)),
+	)).
+		Aggregate(
+			ent.Sum(appruntime.FieldDuration),
+		).Scan(ctx, &v)
 	if err != nil {
 		return time.Duration(0), err
 	}
@@ -470,3 +480,44 @@ func (g *GeburaRepo) SumAppRunTime(
 	}
 	return res, nil
 }
+
+func (g *GeburaRepo) ListAppRunTimes(
+	ctx context.Context,
+	userID model.InternalID,
+	paging model.Paging,
+	appIDs []model.InternalID,
+	deviceIDs []model.InternalID,
+	timeRange *model.TimeRange,
+) ([]*modelgebura.AppRunTime, int, error) {
+	q := g.data.db.AppRunTime.Query().Where(
+		appruntime.UserIDEQ(userID),
+	)
+	if len(appIDs) > 0 {
+		q.Where(appruntime.AppIDIn(appIDs...))
+	}
+	if len(deviceIDs) > 0 {
+		q.Where(appruntime.DeviceIDIn(deviceIDs...))
+	}
+	if timeRange != nil {
+		q.Where(appruntime.And(
+			appruntime.StartTimeGTE(timeRange.StartTime),
+			appruntime.StartTimeLTE(timeRange.StartTime.Add(timeRange.Duration)),
+		))
+	}
+	total, err := q.Count(ctx)
+	if err != nil {
+		return nil, 0, err
+	}
+	res, err := q.
+		Limit(paging.ToLimit()).
+		Offset(paging.ToOffset()).
+		All(ctx)
+	if err != nil {
+		return nil, 0, err
+	}
+	return converter.ToBizAppRunTimeList(res), total, nil
+}
+
+func (g *GeburaRepo) DeleteAppRunTime(ctx context.Context, userID model.InternalID, id model.InternalID) error {
+	return g.data.db.AppRunTime.DeleteOneID(id).Exec(ctx)
+}

internal/data/internal/converter/ent_to_biz.go

@@ -95,6 +95,9 @@ type toBizConverter interface { //nolint:unused // used by generator
 	// goverter:enum:map TypeUnknown AppTypeUnspecified
 	// goverter:enum:map TypeGame AppTypeGame
 	ToBizAppType(app.Type) modelgebura.AppType
+	// goverter:map . RunTime
+	ToBizAppRunTime(*ent.AppRunTime) *modelgebura.AppRunTime
+	ToBizAppRunTimeList([]*ent.AppRunTime) []*modelgebura.AppRunTime
 	ToBizAppBinary(ent.StoreAppBinary) modelgebura.AppBinary
 
 	// goverter:map LatestPullAt LatestPullTime