Merge pull request #5449 from SDU-eScience/feature-key-metrics

Feature key metrics

Author: DanThrane

core2/pkg/accounting/accounting.go

@@ -369,8 +369,9 @@ func WalletsBrowse(actor rpc.Actor, request accapi.WalletsBrowseRequest) fndapi.
 		reference = string(actor.Project.Value)
 	}
 	allWallets := internalRetrieveWallets(time.Now(), reference, walletFilter{
-		RequireActive:   false,
-		IncludeChildren: request.IncludeChildren,
+		RequireActive:                  false,
+		IncludeChildren:                request.IncludeChildren,
+		FilterChildrenByIdleTimeInDays: request.FilterChildrenByIdleTimeInDays,
 	})
 
 	result := fndapi.PageV2[accapi.WalletV2]{}

core2/pkg/accounting/accounting_internal.go

@@ -1432,7 +1432,7 @@ func internalRetrieveWallet(
 
 		ownerId := w.OwnedBy
 		owner := accGlobals.OwnersById[ownerId].WalletOwner()
-		apiWallet := lInternalWalletToApi(now, b, w, owner, includeChildren)
+		apiWallet := lInternalWalletToApi(now, b, w, owner, includeChildren, util.OptNone[int]())
 
 		b.Mu.RUnlock()
 		accGlobals.Mu.RUnlock()
@@ -1447,6 +1447,7 @@ func lInternalWalletToApi(
 	w *internalWallet,
 	owner accapi.WalletOwner,
 	includeChildren bool,
+	filterChildrenByIdleTimeInDays util.Option[int],
 ) accapi.WalletV2 {
 	groups := w.AllocationsByParent
 	apiWallet := accapi.WalletV2{
@@ -1559,7 +1560,19 @@ func lInternalWalletToApi(
 	}
 
 	if includeChildren {
+		activeChildren := map[AccWalletId]util.Empty{}
+		if filterChildrenByIdleTimeInDays.Present && filterChildrenByIdleTimeInDays.Value > 0 {
+			from := now.AddDate(0, 0, -filterChildrenByIdleTimeInDays.Value)
+			activeChildren = lUsageActiveChildrenInWindow(from, now, w.Id)
+		}
+
 		for childId, _ := range w.ChildrenUsage {
+			if len(activeChildren) > 0 {
+				if _, isActive := activeChildren[childId]; isActive {
+					continue
+				}
+			}
+
 			childWallet := b.WalletsById[childId]
 			childOwner := accGlobals.OwnersById[childWallet.OwnedBy]
 			g := childWallet.AllocationsByParent[w.Id]
@@ -1598,7 +1611,7 @@ func internalRetrieveWalletByAllocationId(
 			if iWallet != nil {
 				owner := accGlobals.OwnersById[iWallet.OwnedBy]
 				if owner != nil {
-					wallet = lInternalWalletToApi(now, bucket, iWallet, owner.WalletOwner(), false)
+					wallet = lInternalWalletToApi(now, bucket, iWallet, owner.WalletOwner(), false, util.OptNone[int]())
 					wId = walletId
 					found = true
 					bucket.Mu.RUnlock()
@@ -1620,6 +1633,23 @@ type walletFilter struct {
 
 	IncludeChildren bool
 	RequireActive   bool
+
+	FilterChildrenByIdleTimeInDays util.Option[int]
+}
+
+func lUsageActiveChildrenInWindow(from time.Time, until time.Time, parentWallet AccWalletId) map[AccWalletId]util.Empty {
+	result := map[AccWalletId]util.Empty{}
+
+	reports := usageRetrieveHistoricReports(from, until, parentWallet)
+	for _, report := range reports {
+		for _, item := range report.UsageOverTime.Delta {
+			if item.Child.Present && item.Change != 0 {
+				result[item.Child.Value] = util.Empty{}
+			}
+		}
+	}
+
+	return result
 }
 
 func internalRetrieveWallets(
@@ -1669,7 +1699,14 @@ func internalRetrieveWallets(
 		}
 
 		if shouldInclude {
-			apiWallet := lInternalWalletToApi(now, b, w, owner.WalletOwner(), filter.IncludeChildren)
+			apiWallet := lInternalWalletToApi(
+				now,
+				b,
+				w,
+				owner.WalletOwner(),
+				filter.IncludeChildren,
+				filter.FilterChildrenByIdleTimeInDays,
+			)
 			wallets = append(wallets, apiWallet)
 		}
 
@@ -1730,7 +1767,7 @@ func lRetrieveAncestorWallets(bucket *internalBucket, now time.Time, root AccWal
 	var wallets []accapi.WalletV2
 	for _, w := range relevantWallets {
 		owner := accGlobals.OwnersById[w.OwnedBy].WalletOwner()
-		wallets = append(wallets, lInternalWalletToApi(now, bucket, w, owner, false))
+		wallets = append(wallets, lInternalWalletToApi(now, bucket, w, owner, false, util.OptNone[int]()))
 	}
 
 	return wallets

core2/pkg/accounting/accounting_usage_generator_real.go

@@ -5,6 +5,7 @@ import (
 	"net/http"
 	"strings"
 	"time"
+
 	accapi "ucloud.dk/shared/pkg/accounting"
 	fndapi "ucloud.dk/shared/pkg/foundation"
 	"ucloud.dk/shared/pkg/log"
@@ -89,8 +90,8 @@ func initUsageGenerator() {
 }
 
 func usageGenReal(actor rpc.Actor, request accapi.UsageGenConfig) *util.HttpError {
-	timeStart := util.StartOfDayUTC(time.Now()).AddDate(0, 0, -request.Days)
-	timeEnd := util.StartOfDayUTC(time.Now()).AddDate(0, 0, request.Days+1)
+	timeStart := util.StartOfDayUTC(time.Now()).AddDate(0, -6, 0)
+	timeEnd := util.StartOfDayUTC(time.Now()).AddDate(0, 1, 0)
 
 	titleBase := fmt.Sprintf("usegen_%v", time.Now().Format(time.DateTime))
 
@@ -155,6 +156,9 @@ func usageGenReal(actor rpc.Actor, request accapi.UsageGenConfig) *util.HttpErro
 			nowTime := tm(now)
 			startTime := tm(start)
 			endTime := tm(end)
+			if !request.Expiration {
+				endTime = timeEnd
+			}
 
 			// Create sub-project
 			// ---------------------------------------------------------------------------------------------------------