[usage] Remove old controller & report generator

Author: easyCZ

components/usage/pkg/apiv1/report-generator.go

@@ -6,17 +6,13 @@ package apiv1
 
 import (
 	"context"
-	"database/sql"
 	"errors"
-	"fmt"
 	"math"
 	"time"
 
 	"github.com/google/uuid"
 
 	"github.com/gitpod-io/gitpod/common-go/log"
-	"github.com/gitpod-io/gitpod/usage/pkg/contentservice"
-
 	v1 "github.com/gitpod-io/gitpod/usage-api/v1"
 	"github.com/gitpod-io/gitpod/usage/pkg/db"
 	"google.golang.org/grpc/codes"
@@ -32,96 +28,11 @@ type UsageService struct {
 	nowFunc func() time.Time
 	pricer  *WorkspacePricer
 
-	contentService contentservice.Interface
-
-	reportGenerator *ReportGenerator
-
 	v1.UnimplementedUsageServiceServer
 }
 
 const maxQuerySize = 31 * 24 * time.Hour
 
-func (s *UsageService) ListBilledUsage(ctx context.Context, in *v1.ListBilledUsageRequest) (*v1.ListBilledUsageResponse, error) {
-	to := time.Now()
-	if in.To != nil {
-		to = in.To.AsTime()
-	}
-	from := to.Add(-maxQuerySize)
-	if in.From != nil {
-		from = in.From.AsTime()
-	}
-
-	if from.After(to) {
-		return nil, status.Errorf(codes.InvalidArgument, "Specified From timestamp is after To. Please ensure From is always before To")
-	}
-
-	if to.Sub(from) > maxQuerySize {
-		return nil, status.Errorf(codes.InvalidArgument, "Maximum range exceeded. Range specified can be at most %s", maxQuerySize.String())
-	}
-
-	var order db.Order = db.DescendingOrder
-	if in.Order == v1.ListBilledUsageRequest_ORDERING_ASCENDING {
-		order = db.AscendingOrder
-	}
-
-	var limit int64 = 1000
-	var page int64 = 0
-	var offset int64 = 0
-	if in.Pagination != nil {
-		limit = in.Pagination.PerPage
-		page = in.Pagination.Page
-		offset = limit * (int64(math.Max(0, float64(page-1))))
-	}
-
-	listUsageResult, err := db.ListUsage(ctx, s.conn, db.AttributionID(in.GetAttributionId()), from, to, order, offset, limit)
-	if err != nil {
-		log.Log.
-			WithField("attribution_id", in.AttributionId).
-			WithField("perPage", limit).
-			WithField("page", page).
-			WithField("from", from).
-			WithField("to", to).
-			WithError(err).Error("Failed to list usage.")
-		return nil, status.Error(codes.Internal, "unable to retrieve billed usage")
-	}
-
-	var billedSessions []*v1.BilledSession
-	for _, usageRecord := range listUsageResult.UsageRecords {
-		var endTime *timestamppb.Timestamp
-		if usageRecord.StoppedAt.Valid {
-			endTime = timestamppb.New(usageRecord.StoppedAt.Time)
-		}
-		billedSession := &v1.BilledSession{
-			AttributionId:  string(usageRecord.AttributionID),
-			UserId:         usageRecord.UserID.String(),
-			WorkspaceId:    usageRecord.WorkspaceID,
-			WorkspaceType:  string(usageRecord.WorkspaceType),
-			ProjectId:      usageRecord.ProjectID,
-			InstanceId:     usageRecord.InstanceID.String(),
-			WorkspaceClass: usageRecord.WorkspaceClass,
-			StartTime:      timestamppb.New(usageRecord.StartedAt),
-			EndTime:        endTime,
-			Credits:        usageRecord.CreditsUsed,
-		}
-		billedSessions = append(billedSessions, billedSession)
-	}
-
-	var totalPages = int64(math.Ceil(float64(listUsageResult.Count) / float64(limit)))
-
-	var pagination = v1.PaginatedResponse{
-		PerPage:    limit,
-		Page:       page,
-		TotalPages: totalPages,
-		Total:      listUsageResult.Count,
-	}
-
-	return &v1.ListBilledUsageResponse{
-		Sessions:         billedSessions,
-		TotalCreditsUsed: listUsageResult.TotalCreditsUsed,
-		Pagination:       &pagination,
-	}, nil
-}
-
 func (s *UsageService) ListUsage(ctx context.Context, in *v1.ListUsageRequest) (*v1.ListUsageResponse, error) {
 	to := time.Now()
 	if in.To != nil {
@@ -232,39 +143,6 @@ func (s *UsageService) ListUsage(ctx context.Context, in *v1.ListUsageRequest) (
 	}, nil
 }
 
-func (s *UsageService) ReconcileUsage(ctx context.Context, req *v1.ReconcileUsageRequest) (*v1.ReconcileUsageResponse, error) {
-	from := req.GetStartTime().AsTime()
-	to := req.GetEndTime().AsTime()
-
-	if to.Before(from) {
-		return nil, status.Errorf(codes.InvalidArgument, "End time must be after start time")
-	}
-
-	report, err := s.reportGenerator.GenerateUsageReport(ctx, from, to)
-	if err != nil {
-		log.Log.WithError(err).Error("Failed to reconcile time range.")
-		return nil, status.Error(codes.Internal, "failed to reconcile time range")
-	}
-
-	err = db.CreateUsageRecords(ctx, s.conn, report.UsageRecords)
-	if err != nil {
-		log.Log.WithError(err).Error("Failed to persist usage records.")
-		return nil, status.Error(codes.Internal, "failed to persist usage records")
-	}
-
-	filename := fmt.Sprintf("%s.gz", time.Now().Format(time.RFC3339))
-	err = s.contentService.UploadUsageReport(ctx, filename, report)
-	if err != nil {
-		log.Log.WithError(err).Error("Failed to persist usage report to content service.")
-		return nil, status.Error(codes.Internal, "failed to persist usage report to content service")
-	}
-
-	return &v1.ReconcileUsageResponse{
-		ReportId: filename,
-	}, nil
-
-}
-
 func (s *UsageService) GetCostCenter(ctx context.Context, in *v1.GetCostCenterRequest) (*v1.GetCostCenterResponse, error) {
 	var attributionIdReq string
 
@@ -475,46 +353,12 @@ func dedupeWorkspaceInstancesForUsage(instances []db.WorkspaceInstanceForUsage)
 	return set
 }
 
-func NewUsageService(conn *gorm.DB, reportGenerator *ReportGenerator, contentSvc contentservice.Interface, pricer *WorkspacePricer) *UsageService {
+func NewUsageService(conn *gorm.DB, pricer *WorkspacePricer) *UsageService {
 	return &UsageService{
 		conn: conn,
 		nowFunc: func() time.Time {
 			return time.Now().UTC()
 		},
-		pricer:          pricer,
-		reportGenerator: reportGenerator,
-		contentService:  contentSvc,
+		pricer: pricer,
 	}
 }
-
-func instancesToUsageRecords(instances []db.WorkspaceInstanceForUsage, pricer *WorkspacePricer, now time.Time) []db.WorkspaceInstanceUsage {
-	var usageRecords []db.WorkspaceInstanceUsage
-
-	for _, instance := range instances {
-		var stoppedAt sql.NullTime
-		if instance.StoppingTime.IsSet() {
-			stoppedAt = sql.NullTime{Time: instance.StoppingTime.Time(), Valid: true}
-		}
-
-		projectID := ""
-		if instance.ProjectID.Valid {
-			projectID = instance.ProjectID.String
-		}
-
-		usageRecords = append(usageRecords, db.WorkspaceInstanceUsage{
-			InstanceID:     instance.ID,
-			AttributionID:  instance.UsageAttributionID,
-			WorkspaceID:    instance.WorkspaceID,
-			ProjectID:      projectID,
-			UserID:         instance.OwnerID,
-			WorkspaceType:  instance.Type,
-			WorkspaceClass: instance.WorkspaceClass,
-			StartedAt:      instance.StartedTime.Time(),
-			StoppedAt:      stoppedAt,
-			CreditsUsed:    pricer.CreditsUsedByInstance(&instance, now),
-			GenerationID:   0,
-		})
-	}
-
-	return usageRecords
-}