fix(gebura): tested app inst run time

app/sephirah/internal/biz/bizgebura/run_time.go

@@ -14,7 +14,7 @@ import (
 
 func (g *Gebura) AddAppInstRunTime(
 	ctx context.Context,
-	packageID model.InternalID,
+	instID model.InternalID,
 	timeRange *model.TimeRange,
 ) *errors.Error {
 	claims := libauth.FromContextAssertUserType(ctx)
@@ -24,7 +24,10 @@ func (g *Gebura) AddAppInstRunTime(
 	if timeRange == nil {
 		return pb.ErrorErrorReasonBadRequest("empty time range")
 	}
-	err := g.repo.AddAppInstRunTime(ctx, claims.UserID, packageID, timeRange)
+	if timeRange.Duration <= 0 {
+		return pb.ErrorErrorReasonBadRequest("invalid time range")
+	}
+	err := g.repo.AddAppInstRunTime(ctx, claims.UserID, instID, timeRange)
 	if err != nil {
 		return pb.ErrorErrorReasonUnspecified("%s", err.Error())
 	}
@@ -33,7 +36,7 @@ func (g *Gebura) AddAppInstRunTime(
 
 func (g *Gebura) SumAppInstRunTime(
 	ctx context.Context,
-	packageID model.InternalID,
+	instID model.InternalID,
 	timeRange *model.TimeRange,
 ) (time.Duration, error) {
 	claims := libauth.FromContextAssertUserType(ctx)
@@ -43,7 +46,10 @@ func (g *Gebura) SumAppInstRunTime(
 	if timeRange == nil {
 		return time.Duration(0), pb.ErrorErrorReasonBadRequest("empty time range")
 	}
-	res, err := g.repo.SumAppInstRunTime(ctx, claims.UserID, packageID, timeRange)
+	if timeRange.Duration <= 0 {
+		return time.Duration(0), pb.ErrorErrorReasonBadRequest("invalid time range")
+	}
+	res, err := g.repo.SumAppInstRunTime(ctx, claims.UserID, instID, timeRange)
 	if err != nil {
 		return time.Duration(0), pb.ErrorErrorReasonUnspecified("%s", err.Error())
 	}

app/sephirah/internal/data/gebura.go

@@ -504,29 +504,42 @@ func (g geburaRepo) ListAppInsts(
 func (g geburaRepo) AddAppInstRunTime(
 	ctx context.Context,
 	userID model.InternalID,
-	packageID model.InternalID,
+	instID model.InternalID,
 	timeRange *model.TimeRange,
 ) error {
 	return g.data.db.AppInstRunTime.Create().
 		SetUserID(userID).
-		SetAppID(packageID).
+		SetAppInstID(instID).
 		SetStartTime(timeRange.StartTime).
-		SetRunDuration(timeRange.Duration).Exec(ctx)
+		SetRunDuration(timeRange.Duration).
+		Exec(ctx)
 }
 
 func (g geburaRepo) SumAppInstRunTime(
 	ctx context.Context,
 	userID model.InternalID,
-	packageID model.InternalID,
+	instID model.InternalID,
 	timeRange *model.TimeRange,
 ) (time.Duration, error) {
-	res, err := g.data.db.AppInstRunTime.Query().Where(
+	var v []struct {
+		Sum time.Duration
+	}
+	err := g.data.db.AppInstRunTime.Query().Where(
 		appinstruntime.UserIDEQ(userID),
-		appinstruntime.AppIDEQ(packageID),
-		appinstruntime.StartTimeGTE(timeRange.StartTime),
-		appinstruntime.StartTimeLTE(timeRange.StartTime.Add(timeRange.Duration)),
+		appinstruntime.AppInstIDEQ(instID),
+		appinstruntime.And(
+			appinstruntime.StartTimeGTE(timeRange.StartTime),
+			appinstruntime.StartTimeLTE(timeRange.StartTime.Add(timeRange.Duration)),
+		),
 	).Aggregate(
 		ent.Sum(appinstruntime.FieldRunDuration),
-	).Only(ctx)
-	return res.RunDuration, err
+	).Scan(ctx, &v)
+	if err != nil {
+		return time.Duration(0), err
+	}
+	var res time.Duration
+	for _, rt := range v {
+		res += rt.Sum
+	}
+	return res, nil
 }