diff --git a/cmd/satellite/main.go b/cmd/satellite/main.go index ec14e922b..acd268fa6 100644 --- a/cmd/satellite/main.go +++ b/cmd/satellite/main.go @@ -199,13 +199,6 @@ var ( Args: cobra.ExactArgs(1), RunE: cmdCreateCustomerInvoiceCoupons, } - createCustomerInvoiceCreditsCmd = &cobra.Command{ - Use: "create-invoice-credits [period]", - Short: "Adds credits to stripe invoices", - Long: "Creates stripe invoice line items for not consumed credits.", - Args: cobra.ExactArgs(1), - RunE: cmdCreateCustomerInvoiceCredits, - } createCustomerInvoicesCmd = &cobra.Command{ Use: "create-invoices [period]", Short: "Creates stripe invoices from pending invoice items", @@ -291,7 +284,6 @@ func init() { billingCmd.AddCommand(prepareCustomerInvoiceRecordsCmd) billingCmd.AddCommand(createCustomerInvoiceItemsCmd) billingCmd.AddCommand(createCustomerInvoiceCouponsCmd) - billingCmd.AddCommand(createCustomerInvoiceCreditsCmd) billingCmd.AddCommand(createCustomerInvoicesCmd) billingCmd.AddCommand(finalizeCustomerInvoicesCmd) billingCmd.AddCommand(stripeCustomerCmd) @@ -313,7 +305,6 @@ func init() { process.Bind(prepareCustomerInvoiceRecordsCmd, &runCfg, defaults, cfgstruct.ConfDir(confDir), cfgstruct.IdentityDir(identityDir)) process.Bind(createCustomerInvoiceItemsCmd, &runCfg, defaults, cfgstruct.ConfDir(confDir), cfgstruct.IdentityDir(identityDir)) process.Bind(createCustomerInvoiceCouponsCmd, &runCfg, defaults, cfgstruct.ConfDir(confDir), cfgstruct.IdentityDir(identityDir)) - process.Bind(createCustomerInvoiceCreditsCmd, &runCfg, defaults, cfgstruct.ConfDir(confDir), cfgstruct.IdentityDir(identityDir)) process.Bind(createCustomerInvoicesCmd, &runCfg, defaults, cfgstruct.ConfDir(confDir), cfgstruct.IdentityDir(identityDir)) process.Bind(finalizeCustomerInvoicesCmd, &runCfg, defaults, cfgstruct.ConfDir(confDir), cfgstruct.IdentityDir(identityDir)) process.Bind(stripeCustomerCmd, &runCfg, defaults, cfgstruct.ConfDir(confDir), cfgstruct.IdentityDir(identityDir)) @@ -675,19 +666,6 @@ func cmdCreateCustomerInvoiceCoupons(cmd *cobra.Command, args []string) (err err }) } -func cmdCreateCustomerInvoiceCredits(cmd *cobra.Command, args []string) (err error) { - ctx, _ := process.Ctx(cmd) - - period, err := parseBillingPeriod(args[0]) - if err != nil { - return errs.New("invalid period specified: %v", err) - } - - return runBillingCmd(func(payments *stripecoinpayments.Service, _ *dbx.DB) error { - return payments.InvoiceApplyCredits(ctx, period) - }) -} - func cmdCreateCustomerInvoices(cmd *cobra.Command, args []string) (err error) { ctx, _ := process.Ctx(cmd) diff --git a/satellite/payments/account.go b/satellite/payments/account.go index 8e175d6bb..d6b68b298 100644 --- a/satellite/payments/account.go +++ b/satellite/payments/account.go @@ -32,9 +32,6 @@ type Accounts interface { // Charges returns list of all credit card charges related to account. Charges(ctx context.Context, userID uuid.UUID) ([]Charge, error) - // Credits exposes all needed functionality to manage credits. - Credits() Credits - // CreditCards exposes all needed functionality to manage account credit cards. CreditCards() CreditCards diff --git a/satellite/payments/stripecoinpayments/accounts.go b/satellite/payments/stripecoinpayments/accounts.go index 28e411fbf..052132307 100644 --- a/satellite/payments/stripecoinpayments/accounts.go +++ b/satellite/payments/stripecoinpayments/accounts.go @@ -86,14 +86,9 @@ func (accounts *accounts) Balance(ctx context.Context, userID uuid.UUID) (_ paym couponsAmount += coupon.Amount - alreadyUsed } - creditBalance, err := accounts.service.db.Credits().Balance(ctx, userID) - if err != nil { - return payments.Balance{}, Error.Wrap(err) - } - accountBalance := payments.Balance{ FreeCredits: couponsAmount, - Coins: -c.Balance + creditBalance, + Coins: -c.Balance, } return accountBalance, nil @@ -189,12 +184,6 @@ func (accounts *accounts) Coupons() payments.Coupons { return &coupons{service: accounts.service} } -// Credits exposes all needed functionality to manage credits. -func (accounts *accounts) Credits() payments.Credits { - - return &credits{service: accounts.service} -} - // PaywallEnabled returns a true if a credit card or account // balance is required to create projects. func (accounts *accounts) PaywallEnabled(userID uuid.UUID) bool { diff --git a/satellite/payments/stripecoinpayments/credits.go b/satellite/payments/stripecoinpayments/credits.go deleted file mode 100644 index d7cc38268..000000000 --- a/satellite/payments/stripecoinpayments/credits.go +++ /dev/null @@ -1,95 +0,0 @@ -// Copyright (C) 2019 Storj Labs, Inc. -// See LICENSE for copying information. - -package stripecoinpayments - -import ( - "context" - "time" - - "storj.io/common/uuid" - "storj.io/storj/satellite/payments" - "storj.io/storj/satellite/payments/coinpayments" -) - -// CreditsDB is an interface for managing credits table. -// -// architecture: Database -type CreditsDB interface { - // InsertCredit inserts credit to user's credit balance into the database. - InsertCredit(ctx context.Context, credit payments.Credit) error - // GetCredit returns credit by transactionID. - GetCredit(ctx context.Context, transactionID coinpayments.TransactionID) (_ payments.Credit, err error) - // ListCredits returns all credits of specific user. - ListCredits(ctx context.Context, userID uuid.UUID) ([]payments.Credit, error) - // ListCreditsPaged returns all credits of specific user. - ListCreditsPaged(ctx context.Context, offset int64, limit int, before time.Time, userID uuid.UUID) (payments.CreditsPage, error) - - // InsertCreditsSpending inserts spending to user's spending list into the database. - InsertCreditsSpending(ctx context.Context, spending CreditsSpending) error - // ListCreditsSpendings returns spendings received for concrete deposit. - ListCreditsSpendings(ctx context.Context, userID uuid.UUID) ([]CreditsSpending, error) - // ListCreditsSpendingsPaged returns all spendings for specific period. - ListCreditsSpendingsPaged(ctx context.Context, status int, offset int64, limit int, period time.Time) (CreditsSpendingsPage, error) - // ApplyCreditsSpending updated spending's status. - ApplyCreditsSpending(ctx context.Context, spendingID uuid.UUID) (err error) - - // Balance returns difference between all credits and creditsSpendings of specific user. - Balance(ctx context.Context, userID uuid.UUID) (int64, error) -} - -// ensures that credits implements payments.Credits. -var _ payments.Credits = (*credits)(nil) - -// credits is an implementation of payments.Credits. -// -// architecture: Service -type credits struct { - service *Service -} - -// CreditsSpending is an entity that holds funds been used from Accounts bonus credit balance. -// Status shows if spending have been used to pay for invoice already or not. -type CreditsSpending struct { - ID uuid.UUID `json:"id"` - ProjectID uuid.UUID `json:"projectId"` - UserID uuid.UUID `json:"userId"` - Amount int64 `json:"amount"` - Status CreditsSpendingStatus `json:"status"` - Period time.Time `json:"period"` - Created time.Time `json:"created"` -} - -// CreditsSpendingsPage holds set of creditsSpendings and indicates if -// there are more creditsSpendings to fetch. -type CreditsSpendingsPage struct { - Spendings []CreditsSpending - Next bool - NextOffset int64 -} - -// CreditsSpendingStatus indicates the state of the creditsSpending. -type CreditsSpendingStatus int - -const ( - // CreditsSpendingStatusUnapplied is a default creditsSpending state. - CreditsSpendingStatusUnapplied CreditsSpendingStatus = 0 - // CreditsSpendingStatusApplied status indicates that spending was applied. - CreditsSpendingStatusApplied CreditsSpendingStatus = 1 -) - -// Create attaches a credit for payment account. -func (credits *credits) Create(ctx context.Context, credit payments.Credit) (err error) { - defer mon.Task()(&ctx, credit)(&err) - - return Error.Wrap(credits.service.db.Credits().InsertCredit(ctx, credit)) -} - -// ListByUserID return list of all credits of specified payment account. -func (credits *credits) ListByUserID(ctx context.Context, userID uuid.UUID) (_ []payments.Credit, err error) { - defer mon.Task()(&ctx, userID)(&err) - - creditsList, err := credits.service.db.Credits().ListCredits(ctx, userID) - - return creditsList, Error.Wrap(err) -} diff --git a/satellite/payments/stripecoinpayments/credits_test.go b/satellite/payments/stripecoinpayments/credits_test.go deleted file mode 100644 index 37b40c2a7..000000000 --- a/satellite/payments/stripecoinpayments/credits_test.go +++ /dev/null @@ -1,173 +0,0 @@ -// Copyright (C) 2019 Storj Labs, Inc. -// See LICENSE for copying information. - -package stripecoinpayments_test - -import ( - "strconv" - "testing" - "time" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "storj.io/common/testcontext" - "storj.io/common/testrand" - "storj.io/common/uuid" - "storj.io/storj/satellite" - "storj.io/storj/satellite/payments" - "storj.io/storj/satellite/payments/coinpayments" - "storj.io/storj/satellite/payments/stripecoinpayments" - "storj.io/storj/satellite/satellitedb/satellitedbtest" -) - -func TestCreditsRepository(t *testing.T) { - satellitedbtest.Run(t, func(ctx *testcontext.Context, t *testing.T, db satellite.DB) { - creditsRepo := db.StripeCoinPayments().Credits() - userID := testrand.UUID() - credit := payments.Credit{ - UserID: userID, - Amount: 10, - TransactionID: "transactionID", - } - - spending := stripecoinpayments.CreditsSpending{ - ProjectID: testrand.UUID(), - UserID: userID, - Amount: 5, - Status: stripecoinpayments.CreditsSpendingStatusUnapplied, - } - - t.Run("insert", func(t *testing.T) { - err := creditsRepo.InsertCredit(ctx, credit) - assert.NoError(t, err) - - credits, err := creditsRepo.ListCredits(ctx, userID) - assert.NoError(t, err) - assert.Equal(t, 1, len(credits)) - credit = credits[0] - - err = creditsRepo.InsertCreditsSpending(ctx, spending) - assert.NoError(t, err) - - spendings, err := creditsRepo.ListCreditsSpendings(ctx, userID) - assert.NoError(t, err) - assert.Equal(t, 1, len(spendings)) - spending.ID = spendings[0].ID - }) - - t.Run("get credit by transactionID", func(t *testing.T) { - crdt, err := creditsRepo.GetCredit(ctx, credit.TransactionID) - assert.NoError(t, err) - assert.Equal(t, int64(10), crdt.Amount) - }) - - t.Run("update spending", func(t *testing.T) { - err := creditsRepo.ApplyCreditsSpending(ctx, spending.ID) - assert.NoError(t, err) - - spendings, err := creditsRepo.ListCreditsSpendings(ctx, userID) - require.NoError(t, err) - require.Equal(t, stripecoinpayments.CreditsSpendingStatusApplied, spendings[0].Status) - spending = spendings[0] - }) - - t.Run("balance", func(t *testing.T) { - balance, err := creditsRepo.Balance(ctx, userID) - assert.NoError(t, err) - assert.Equal(t, 5, int(balance)) - }) - }) -} - -func TestCreditsRepositoryList(t *testing.T) { - satellitedbtest.Run(t, func(ctx *testcontext.Context, t *testing.T, db satellite.DB) { - utc := time.Now().UTC() - period := time.Date(utc.Year(), utc.Month(), 1, 0, 0, 0, 0, time.UTC) - - creditsDB := db.StripeCoinPayments().Credits() - - const spendLen = 5 - - for i := 0; i < spendLen*2+3; i++ { - userID, err := uuid.New() - require.NoError(t, err) - projectID, err := uuid.New() - require.NoError(t, err) - spendingID, err := uuid.New() - require.NoError(t, err) - - spending := stripecoinpayments.CreditsSpending{ - ID: spendingID, - ProjectID: projectID, - UserID: userID, - Amount: int64(5 + i), - Status: 0, - Period: period, - } - - err = creditsDB.InsertCreditsSpending(ctx, spending) - require.NoError(t, err) - } - - page, err := creditsDB.ListCreditsSpendingsPaged(ctx, 0, 0, spendLen, period) - require.NoError(t, err) - require.Equal(t, spendLen, len(page.Spendings)) - - assert.True(t, page.Next) - assert.Equal(t, int64(5), page.NextOffset) - - page, err = creditsDB.ListCreditsSpendingsPaged(ctx, 0, page.NextOffset, spendLen, period) - require.NoError(t, err) - require.Equal(t, spendLen, len(page.Spendings)) - - assert.True(t, page.Next) - assert.Equal(t, int64(10), page.NextOffset) - - page, err = creditsDB.ListCreditsSpendingsPaged(ctx, 0, page.NextOffset, spendLen, period) - require.NoError(t, err) - require.Equal(t, 3, len(page.Spendings)) - - assert.False(t, page.Next) - assert.Equal(t, int64(0), page.NextOffset) - - const credLen = 5 - - user2ID, err := uuid.New() - require.NoError(t, err) - - for i := 0; i < credLen*2+3; i++ { - transactionID := "transID" + strconv.Itoa(i) - - credit := payments.Credit{ - UserID: user2ID, - Amount: 5, - TransactionID: coinpayments.TransactionID(transactionID), - } - - err = creditsDB.InsertCredit(ctx, credit) - require.NoError(t, err) - } - - page2, err := creditsDB.ListCreditsPaged(ctx, 0, spendLen, time.Now(), user2ID) - require.NoError(t, err) - require.Equal(t, spendLen, len(page2.Credits)) - - assert.True(t, page2.Next) - assert.Equal(t, int64(5), page2.NextOffset) - - page2, err = creditsDB.ListCreditsPaged(ctx, page2.NextOffset, spendLen, time.Now(), user2ID) - require.NoError(t, err) - require.Equal(t, spendLen, len(page2.Credits)) - - assert.True(t, page2.Next) - assert.Equal(t, int64(10), page2.NextOffset) - - page2, err = creditsDB.ListCreditsPaged(ctx, page2.NextOffset, spendLen, time.Now(), user2ID) - require.NoError(t, err) - require.Equal(t, 3, len(page2.Credits)) - - assert.False(t, page2.Next) - assert.Equal(t, int64(0), page2.NextOffset) - }) -} diff --git a/satellite/payments/stripecoinpayments/db.go b/satellite/payments/stripecoinpayments/db.go index 82be9de5f..555a9dfa6 100644 --- a/satellite/payments/stripecoinpayments/db.go +++ b/satellite/payments/stripecoinpayments/db.go @@ -15,6 +15,4 @@ type DB interface { ProjectRecords() ProjectRecordsDB // Coupons is getter for coupons db. Coupons() CouponsDB - // Credits is getter for credits db. - Credits() CreditsDB } diff --git a/satellite/payments/stripecoinpayments/projectrecords.go b/satellite/payments/stripecoinpayments/projectrecords.go index c82d67c6f..56f852457 100644 --- a/satellite/payments/stripecoinpayments/projectrecords.go +++ b/satellite/payments/stripecoinpayments/projectrecords.go @@ -18,7 +18,7 @@ var ErrProjectRecordExists = Error.New("invoice project record already exists") // architecture: Database type ProjectRecordsDB interface { // Create creates new invoice project record with coupon usages and credits spendings in the DB. - Create(ctx context.Context, records []CreateProjectRecord, couponUsages []CouponUsage, creditsSpendings []CreditsSpending, start, end time.Time) error + Create(ctx context.Context, records []CreateProjectRecord, couponUsages []CouponUsage, start, end time.Time) error // Check checks if invoice project record for specified project and billing period exists. Check(ctx context.Context, projectID uuid.UUID, start, end time.Time) error // Get returns record for specified project and billing period. diff --git a/satellite/payments/stripecoinpayments/projectrecords_test.go b/satellite/payments/stripecoinpayments/projectrecords_test.go index de8a5321b..fc57c2876 100644 --- a/satellite/payments/stripecoinpayments/projectrecords_test.go +++ b/satellite/payments/stripecoinpayments/projectrecords_test.go @@ -40,7 +40,6 @@ func TestProjectRecords(t *testing.T) { }, }, []stripecoinpayments.CouponUsage{}, - []stripecoinpayments.CreditsSpending{}, start, end, ) require.NoError(t, err) @@ -94,7 +93,7 @@ func TestProjectRecordsList(t *testing.T) { ) } - err := projectRecordsDB.Create(ctx, createProjectRecords, []stripecoinpayments.CouponUsage{}, []stripecoinpayments.CreditsSpending{}, start, end) + err := projectRecordsDB.Create(ctx, createProjectRecords, []stripecoinpayments.CouponUsage{}, start, end) require.NoError(t, err) page, err := projectRecordsDB.ListUnapplied(ctx, 0, limit, start, end) diff --git a/satellite/payments/stripecoinpayments/service.go b/satellite/payments/stripecoinpayments/service.go index d91d53258..6bf9da887 100644 --- a/satellite/payments/stripecoinpayments/service.go +++ b/satellite/payments/stripecoinpayments/service.go @@ -20,7 +20,6 @@ import ( "go.uber.org/zap" "storj.io/common/memory" - "storj.io/common/uuid" "storj.io/storj/satellite/accounting" "storj.io/storj/satellite/console" "storj.io/storj/satellite/payments" @@ -467,7 +466,6 @@ func (service *Service) PrepareInvoiceProjectRecords(ctx context.Context, period func (service *Service) processCustomers(ctx context.Context, customers []Customer, start, end time.Time) (int, int, error) { var allRecords []CreateProjectRecord var usages []CouponUsage - var creditsSpendings []CreditsSpending for _, customer := range customers { projects, err := service.projectsDB.GetOwn(ctx, customer.UserID) if err != nil { @@ -531,41 +529,9 @@ func (service *Service) processCustomers(ctx context.Context, customers []Custom } } } - - if leftToCharge == 0 { - continue - } - - // Last, apply any credits from STORJ deposit bonuses on the remainder. - userBonuses, err := service.db.Credits().Balance(ctx, customer.UserID) - if err != nil { - return 0, 0, err - } - - if userBonuses > 0 { - amountChargedFromBonuses := leftToCharge - if amountChargedFromBonuses >= userBonuses { - amountChargedFromBonuses = userBonuses - } - - creditSpendingID, err := uuid.New() - if err != nil { - return 0, 0, err - } - - if amountChargedFromBonuses > 0 { - creditsSpendings = append(creditsSpendings, CreditsSpending{ - ID: creditSpendingID, - Amount: amountChargedFromBonuses, - UserID: customer.UserID, - Status: CreditsSpendingStatusUnapplied, - Period: start, - }) - } - } } - return len(allRecords), len(usages), service.db.ProjectRecords().Create(ctx, allRecords, usages, creditsSpendings, start, end) + return len(allRecords), len(usages), service.db.ProjectRecords().Create(ctx, allRecords, usages, start, end) } // createProjectRecords creates invoice project record if none exists. @@ -867,91 +833,6 @@ func (service *Service) createInvoiceCouponItems(ctx context.Context, coupon pay return err } -// InvoiceApplyCredits iterates through credits with status false of project and creates invoice line items -// for stripe customer. -func (service *Service) InvoiceApplyCredits(ctx context.Context, period time.Time) (err error) { - defer mon.Task()(&ctx)(&err) - - now := service.nowFn().UTC() - utc := period.UTC() - - start := time.Date(utc.Year(), utc.Month(), 1, 0, 0, 0, 0, time.UTC) - end := time.Date(utc.Year(), utc.Month()+1, 0, 0, 0, 0, 0, time.UTC) - - if end.After(now) { - return Error.New("allowed for past periods only") - } - - spendingsPage, err := service.db.Credits().ListCreditsSpendingsPaged(ctx, int(CreditsSpendingStatusUnapplied), 0, service.listingLimit, start) - if err != nil { - return Error.Wrap(err) - } - - if err = service.applySpendings(ctx, spendingsPage.Spendings); err != nil { - return Error.Wrap(err) - } - - for spendingsPage.Next { - if err = ctx.Err(); err != nil { - return Error.Wrap(err) - } - - // we are always starting from offset 0 because applySpendings is changing credits spendings state to applied - spendingsPage, err = service.db.Credits().ListCreditsSpendingsPaged(ctx, int(CreditsSpendingStatusUnapplied), 0, service.listingLimit, start) - if err != nil { - return Error.Wrap(err) - } - - if err = service.applySpendings(ctx, spendingsPage.Spendings); err != nil { - return Error.Wrap(err) - } - } - - return nil -} - -// applyCredits applies concrete spending as invoice line item. -func (service *Service) applySpendings(ctx context.Context, spendings []CreditsSpending) (err error) { - defer mon.Task()(&ctx)(&err) - - for _, spending := range spendings { - if err = ctx.Err(); err != nil { - return err - } - - if err = service.createInvoiceCreditItem(ctx, spending); err != nil { - return err - } - } - - return nil -} - -// createInvoiceCreditItem consumes invoice project record and creates invoice line items for stripe customer. -func (service *Service) createInvoiceCreditItem(ctx context.Context, spending CreditsSpending) (err error) { - defer mon.Task()(&ctx, spending)(&err) - - err = service.db.Credits().ApplyCreditsSpending(ctx, spending.ID) - if err != nil { - return err - } - customerID, err := service.db.Customers().GetCustomerID(ctx, spending.UserID) - - projectItem := &stripe.InvoiceItemParams{ - Amount: stripe.Int64(-spending.Amount), - Currency: stripe.String(string(stripe.CurrencyUSD)), - Customer: stripe.String(customerID), - Description: stripe.String("Credits from STORJ deposit bonus"), - } - - projectItem.AddMetadata("projectID", spending.ProjectID.String()) - projectItem.AddMetadata("userID", spending.UserID.String()) - - _, err = service.stripeClient.InvoiceItems().New(projectItem) - - return err -} - // CreateInvoices lists through all customers and creates invoices. func (service *Service) CreateInvoices(ctx context.Context, period time.Time) (err error) { defer mon.Task()(&ctx)(&err) diff --git a/satellite/payments/stripecoinpayments/service_test.go b/satellite/payments/stripecoinpayments/service_test.go index 7c54f1ee8..d0245c3f9 100644 --- a/satellite/payments/stripecoinpayments/service_test.go +++ b/satellite/payments/stripecoinpayments/service_test.go @@ -22,7 +22,6 @@ import ( "storj.io/storj/satellite/accounting" "storj.io/storj/satellite/console" "storj.io/storj/satellite/payments" - "storj.io/storj/satellite/payments/coinpayments" "storj.io/storj/satellite/payments/stripecoinpayments" ) @@ -51,14 +50,6 @@ func TestService_InvoiceElementsProcessing(t *testing.T) { project, err := satellite.AddProject(ctx, user.ID, "testproject-"+strconv.Itoa(i)) require.NoError(t, err) - credit := payments.Credit{ - UserID: user.ID, - Amount: 9, - TransactionID: coinpayments.TransactionID("transID" + strconv.Itoa(i)), - } - err = satellite.DB.StripeCoinPayments().Credits().InsertCredit(ctx, credit) - require.NoError(t, err) - err = satellite.DB.Orders().UpdateBucketBandwidthSettle(ctx, project.ID, []byte("testbucket"), pb.PieceAction_GET, int64(i+10)*memory.GiB.Int64(), period) require.NoError(t, err) @@ -83,11 +74,6 @@ func TestService_InvoiceElementsProcessing(t *testing.T) { require.NoError(t, err) require.Equal(t, numberOfProjects, len(couponsPage.Usages)) - // check if we have credits spendings for each project - spendingsPage, err := satellite.DB.StripeCoinPayments().Credits().ListCreditsSpendingsPaged(ctx, int(stripecoinpayments.CreditsSpendingStatusUnapplied), 0, 40, start) - require.NoError(t, err) - require.Equal(t, numberOfProjects, len(spendingsPage.Spendings)) - err = satellite.API.Payments.Service.InvoiceApplyProjectRecords(ctx, period) require.NoError(t, err) @@ -103,14 +89,6 @@ func TestService_InvoiceElementsProcessing(t *testing.T) { couponsPage, err = satellite.DB.StripeCoinPayments().Coupons().ListUnapplied(ctx, 0, 40, start) require.NoError(t, err) require.Equal(t, 0, len(couponsPage.Usages)) - - err = satellite.API.Payments.Service.InvoiceApplyCredits(ctx, period) - require.NoError(t, err) - - // verify that we applied all unapplied credits spendings - spendingsPage, err = satellite.DB.StripeCoinPayments().Credits().ListCreditsSpendingsPaged(ctx, int(stripecoinpayments.CreditsSpendingStatusUnapplied), 0, 40, start) - require.NoError(t, err) - require.Equal(t, 0, len(spendingsPage.Spendings)) }) } @@ -207,9 +185,6 @@ func TestService_InvoiceUserWithManyProjects(t *testing.T) { err = payments.Service.InvoiceApplyCoupons(ctx, period) require.NoError(t, err) - err = payments.Service.InvoiceApplyCredits(ctx, period) - require.NoError(t, err) - err = payments.Service.CreateInvoices(ctx, period) require.NoError(t, err) }) diff --git a/satellite/satellitedb/credits.go b/satellite/satellitedb/credits.go deleted file mode 100644 index 055a1cf91..000000000 --- a/satellite/satellitedb/credits.go +++ /dev/null @@ -1,286 +0,0 @@ -// Copyright (C) 2019 Storj Labs, Inc. -// See LICENSE for copying information. - -package satellitedb - -import ( - "context" - "time" - - "github.com/zeebo/errs" - - "storj.io/common/uuid" - "storj.io/storj/satellite/payments" - "storj.io/storj/satellite/payments/coinpayments" - "storj.io/storj/satellite/payments/stripecoinpayments" - "storj.io/storj/satellite/satellitedb/dbx" -) - -// ensures that credit implements payments.CreditsDB. -var _ stripecoinpayments.CreditsDB = (*credit)(nil) - -// credit is an implementation of payments.CreditsDB. -// -// architecture: Database -type credit struct { - db *satelliteDB -} - -// InsertCredit inserts credit into the database. -func (credits *credit) InsertCredit(ctx context.Context, credit payments.Credit) (err error) { - defer mon.Task()(&ctx, credit)(&err) - - _, err = credits.db.Create_Credit( - ctx, - dbx.Credit_UserId(credit.UserID[:]), - dbx.Credit_TransactionId(string(credit.TransactionID[:])), - dbx.Credit_Amount(credit.Amount), - ) - - return err -} - -// GetCredit returns credit by transactionID. -func (credits *credit) GetCredit(ctx context.Context, transactionID coinpayments.TransactionID) (_ payments.Credit, err error) { - defer mon.Task()(&ctx, transactionID)(&err) - - dbxCredit, err := credits.db.Get_Credit_By_TransactionId(ctx, dbx.Credit_TransactionId(string(transactionID))) - if err != nil { - return payments.Credit{}, err - } - - return fromDBXCredit(dbxCredit) -} - -// ListCredits returns all credits of specified user. -func (credits *credit) ListCredits(ctx context.Context, userID uuid.UUID) (_ []payments.Credit, err error) { - defer mon.Task()(&ctx, userID)(&err) - - dbxCredits, err := credits.db.All_Credit_By_UserId_OrderBy_Desc_CreatedAt( - ctx, - dbx.Credit_UserId(userID[:]), - ) - if err != nil { - return nil, err - } - - return creditsFromDbxSlice(dbxCredits) -} - -// ListCreditsPaged returns paginated list of user's credits. -func (credits *credit) ListCreditsPaged(ctx context.Context, offset int64, limit int, before time.Time, userID uuid.UUID) (_ payments.CreditsPage, err error) { - defer mon.Task()(&ctx)(&err) - - var page payments.CreditsPage - - dbxCredits, err := credits.db.Limited_Credit_By_UserId_And_CreatedAt_LessOrEqual_OrderBy_Desc_CreatedAt( - ctx, - dbx.Credit_UserId(userID[:]), - dbx.Credit_CreatedAt(before.UTC()), - limit+1, - offset, - ) - if err != nil { - return payments.CreditsPage{}, err - } - - if len(dbxCredits) == limit+1 { - page.Next = true - page.NextOffset = offset + int64(limit) - - dbxCredits = dbxCredits[:len(dbxCredits)-1] - } - - page.Credits, err = creditsFromDbxSlice(dbxCredits) - if err != nil { - return payments.CreditsPage{}, nil - } - - return page, nil -} - -// InsertCreditsSpending inserts spending into the database. -func (credits *credit) InsertCreditsSpending(ctx context.Context, spending stripecoinpayments.CreditsSpending) (err error) { - defer mon.Task()(&ctx, spending)(&err) - - id, err := uuid.New() - if err != nil { - return err - } - - _, err = credits.db.Create_CreditsSpending( - ctx, - dbx.CreditsSpending_Id(id[:]), - dbx.CreditsSpending_UserId(spending.UserID[:]), - dbx.CreditsSpending_ProjectId(spending.ProjectID[:]), - dbx.CreditsSpending_Amount(spending.Amount), - dbx.CreditsSpending_Status(int(spending.Status)), - dbx.CreditsSpending_Period(spending.Period), - ) - - return err -} - -// ListCreditsSpendings returns all spendings of specified user. -func (credits *credit) ListCreditsSpendings(ctx context.Context, userID uuid.UUID) (_ []stripecoinpayments.CreditsSpending, err error) { - defer mon.Task()(&ctx, userID)(&err) - - dbxSpendings, err := credits.db.All_CreditsSpending_By_UserId_OrderBy_Desc_CreatedAt( - ctx, - dbx.CreditsSpending_UserId(userID[:]), - ) - if err != nil { - return nil, err - } - - return creditsSpendingsFromDbxSlice(dbxSpendings) -} - -// ApplyCreditsSpending applies spending and updates its status. -func (credits *credit) ApplyCreditsSpending(ctx context.Context, spendingID uuid.UUID) (err error) { - defer mon.Task()(&ctx)(&err) - - _, err = credits.db.Update_CreditsSpending_By_Id( - ctx, - dbx.CreditsSpending_Id(spendingID[:]), - dbx.CreditsSpending_Update_Fields{Status: dbx.CreditsSpending_Status(int(stripecoinpayments.CreditsSpendingStatusApplied))}, - ) - - return err -} - -// ListCreditsSpendingsPaged returns paginated list of user's spendings. -func (credits *credit) ListCreditsSpendingsPaged(ctx context.Context, status int, offset int64, limit int, period time.Time) (_ stripecoinpayments.CreditsSpendingsPage, err error) { - defer mon.Task()(&ctx)(&err) - - var page stripecoinpayments.CreditsSpendingsPage - - dbxSpendings, err := credits.db.Limited_CreditsSpending_By_Period_And_Status( - ctx, - dbx.CreditsSpending_Period(period.UTC()), - dbx.CreditsSpending_Status(status), - limit+1, - offset, - ) - if err != nil { - return stripecoinpayments.CreditsSpendingsPage{}, err - } - - if len(dbxSpendings) == limit+1 { - page.Next = true - page.NextOffset = offset + int64(limit) - - dbxSpendings = dbxSpendings[:len(dbxSpendings)-1] - } - - page.Spendings, err = creditsSpendingsFromDbxSlice(dbxSpendings) - if err != nil { - return stripecoinpayments.CreditsSpendingsPage{}, nil - } - - return page, nil -} - -// Balance returns difference between earned for deposit and spent on invoices credits. -func (credits *credit) Balance(ctx context.Context, userID uuid.UUID) (balance int64, err error) { - defer mon.Task()(&ctx)(&err) - var creditsAmount, creditsSpendingsAmount int64 - - allCredits, err := credits.ListCredits(ctx, userID) - if err != nil { - return 0, err - } - - allSpendings, err := credits.ListCreditsSpendings(ctx, userID) - if err != nil { - return 0, err - } - - for i := range allCredits { - creditsAmount += allCredits[i].Amount - } - - for j := range allSpendings { - creditsSpendingsAmount += allSpendings[j].Amount - } - - balance = creditsAmount - creditsSpendingsAmount - return balance, nil -} - -// fromDBXCredit converts *dbx.Credit to *payments.Credit. -func fromDBXCredit(dbxCredit *dbx.Credit) (credit payments.Credit, err error) { - credit.TransactionID = coinpayments.TransactionID(dbxCredit.TransactionId) - credit.UserID, err = uuid.FromBytes(dbxCredit.UserId) - if err != nil { - return payments.Credit{}, err - } - - credit.Created = dbxCredit.CreatedAt - credit.Amount = dbxCredit.Amount - - return credit, nil -} - -// creditsFromDbxSlice is used for creating []payments.CreditsDB entities from autogenerated []dbx.CreditsDB struct. -func creditsFromDbxSlice(creditsDbx []*dbx.Credit) (_ []payments.Credit, err error) { - var credits = make([]payments.Credit, 0) - var errors []error - - // Generating []dbo from []dbx and collecting all errors - for _, creditDbx := range creditsDbx { - credit, err := fromDBXCredit(creditDbx) - if err != nil { - errors = append(errors, err) - continue - } - - credits = append(credits, credit) - } - - return credits, errs.Combine(errors...) -} - -// fromDBXCreditsSpending converts *dbx.Spending to *payments.Spending. -func fromDBXSpending(dbxSpending *dbx.CreditsSpending) (spending stripecoinpayments.CreditsSpending, err error) { - spending.UserID, err = uuid.FromBytes(dbxSpending.UserId) - if err != nil { - return stripecoinpayments.CreditsSpending{}, err - } - - spending.ProjectID, err = uuid.FromBytes(dbxSpending.ProjectId) - if err != nil { - return stripecoinpayments.CreditsSpending{}, err - } - - spending.Status = stripecoinpayments.CreditsSpendingStatus(dbxSpending.Status) - spending.Created = dbxSpending.CreatedAt - spending.Amount = dbxSpending.Amount - spendingID, err := uuid.FromBytes(dbxSpending.Id) - if err != nil { - return stripecoinpayments.CreditsSpending{}, err - } - - spending.ID = spendingID - - return spending, nil -} - -// creditsSpendingsFromDbxSlice is used for creating []payments.CreditSpendings entities from autogenerated []dbx.CreditsSpending struct. -func creditsSpendingsFromDbxSlice(spendingsDbx []*dbx.CreditsSpending) (_ []stripecoinpayments.CreditsSpending, err error) { - var spendings = make([]stripecoinpayments.CreditsSpending, 0) - var errors []error - - // Generating []dbo from []dbx and collecting all errors - for _, spendingDbx := range spendingsDbx { - spending, err := fromDBXSpending(spendingDbx) - if err != nil { - errors = append(errors, err) - continue - } - - spendings = append(spendings, spending) - } - - return spendings, errs.Combine(errors...) -} diff --git a/satellite/satellitedb/dbx/satellitedb.dbx b/satellite/satellitedb/dbx/satellitedb.dbx index 02f3dc14e..c9ab8efb9 100644 --- a/satellite/satellitedb/dbx/satellitedb.dbx +++ b/satellite/satellitedb/dbx/satellitedb.dbx @@ -1291,67 +1291,6 @@ update coupon_usage ( where coupon_usage.period = ? ) -model credit ( - key transaction_id - - field user_id blob - field transaction_id text - field amount int64 - - field created_at timestamp ( autoinsert ) -) - -create credit ( ) - -read one ( - select credit - where credit.transaction_id = ? -) - -read all ( - select credit - where credit.user_id = ? - orderby desc credit.created_at -) - -read limitoffset ( - select credit - where credit.user_id = ? - where credit.created_at <= ? - orderby desc credit.created_at -) - -model credits_spending ( - key id - - field id blob - field user_id blob - field project_id blob - field amount int64 - field status int ( updatable ) - field period timestamp - - field created_at timestamp ( autoinsert ) -) - -create credits_spending ( ) - -update credits_spending ( - where credits_spending.id = ? -) - -read all ( - select credits_spending - where credits_spending.user_id = ? - orderby desc credits_spending.created_at -) - -read limitoffset ( - select credits_spending - where credits_spending.period = ? - where credits_spending.status = ? -) - // -- node api version -- // model node_api_version ( diff --git a/satellite/satellitedb/dbx/satellitedb.dbx.go b/satellite/satellitedb/dbx/satellitedb.dbx.go index 5ff5ba338..1048842cc 100644 --- a/satellite/satellitedb/dbx/satellitedb.dbx.go +++ b/satellite/satellitedb/dbx/satellitedb.dbx.go @@ -23,7 +23,7 @@ import ( "storj.io/storj/private/tagsql" ) -// Prevent conditional imports from causing build failures. +// Prevent conditional imports from causing build failures var _ = strconv.Itoa var _ = strings.LastIndex var _ = fmt.Sprint @@ -354,23 +354,6 @@ CREATE TABLE coupon_usages ( period timestamp with time zone NOT NULL, PRIMARY KEY ( coupon_id, period ) ); -CREATE TABLE credits ( - user_id bytea NOT NULL, - transaction_id text NOT NULL, - amount bigint NOT NULL, - created_at timestamp with time zone NOT NULL, - PRIMARY KEY ( transaction_id ) -); -CREATE TABLE credits_spendings ( - id bytea NOT NULL, - user_id bytea NOT NULL, - project_id bytea NOT NULL, - amount bigint NOT NULL, - status integer NOT NULL, - period timestamp with time zone NOT NULL, - created_at timestamp with time zone NOT NULL, - PRIMARY KEY ( id ) -); CREATE TABLE graceful_exit_progress ( node_id bytea NOT NULL, bytes_transferred bigint NOT NULL, @@ -888,23 +871,6 @@ CREATE TABLE coupon_usages ( period timestamp with time zone NOT NULL, PRIMARY KEY ( coupon_id, period ) ); -CREATE TABLE credits ( - user_id bytea NOT NULL, - transaction_id text NOT NULL, - amount bigint NOT NULL, - created_at timestamp with time zone NOT NULL, - PRIMARY KEY ( transaction_id ) -); -CREATE TABLE credits_spendings ( - id bytea NOT NULL, - user_id bytea NOT NULL, - project_id bytea NOT NULL, - amount bigint NOT NULL, - status integer NOT NULL, - period timestamp with time zone NOT NULL, - created_at timestamp with time zone NOT NULL, - PRIMARY KEY ( id ) -); CREATE TABLE graceful_exit_progress ( node_id bytea NOT NULL, bytes_transferred bigint NOT NULL, @@ -2501,243 +2467,6 @@ func (f CouponUsage_Period_Field) value() interface{} { func (CouponUsage_Period_Field) _Column() string { return "period" } -type Credit struct { - UserId []byte - TransactionId string - Amount int64 - CreatedAt time.Time -} - -func (Credit) _Table() string { return "credits" } - -type Credit_Update_Fields struct { -} - -type Credit_UserId_Field struct { - _set bool - _null bool - _value []byte -} - -func Credit_UserId(v []byte) Credit_UserId_Field { - return Credit_UserId_Field{_set: true, _value: v} -} - -func (f Credit_UserId_Field) value() interface{} { - if !f._set || f._null { - return nil - } - return f._value -} - -func (Credit_UserId_Field) _Column() string { return "user_id" } - -type Credit_TransactionId_Field struct { - _set bool - _null bool - _value string -} - -func Credit_TransactionId(v string) Credit_TransactionId_Field { - return Credit_TransactionId_Field{_set: true, _value: v} -} - -func (f Credit_TransactionId_Field) value() interface{} { - if !f._set || f._null { - return nil - } - return f._value -} - -func (Credit_TransactionId_Field) _Column() string { return "transaction_id" } - -type Credit_Amount_Field struct { - _set bool - _null bool - _value int64 -} - -func Credit_Amount(v int64) Credit_Amount_Field { - return Credit_Amount_Field{_set: true, _value: v} -} - -func (f Credit_Amount_Field) value() interface{} { - if !f._set || f._null { - return nil - } - return f._value -} - -func (Credit_Amount_Field) _Column() string { return "amount" } - -type Credit_CreatedAt_Field struct { - _set bool - _null bool - _value time.Time -} - -func Credit_CreatedAt(v time.Time) Credit_CreatedAt_Field { - return Credit_CreatedAt_Field{_set: true, _value: v} -} - -func (f Credit_CreatedAt_Field) value() interface{} { - if !f._set || f._null { - return nil - } - return f._value -} - -func (Credit_CreatedAt_Field) _Column() string { return "created_at" } - -type CreditsSpending struct { - Id []byte - UserId []byte - ProjectId []byte - Amount int64 - Status int - Period time.Time - CreatedAt time.Time -} - -func (CreditsSpending) _Table() string { return "credits_spendings" } - -type CreditsSpending_Update_Fields struct { - Status CreditsSpending_Status_Field -} - -type CreditsSpending_Id_Field struct { - _set bool - _null bool - _value []byte -} - -func CreditsSpending_Id(v []byte) CreditsSpending_Id_Field { - return CreditsSpending_Id_Field{_set: true, _value: v} -} - -func (f CreditsSpending_Id_Field) value() interface{} { - if !f._set || f._null { - return nil - } - return f._value -} - -func (CreditsSpending_Id_Field) _Column() string { return "id" } - -type CreditsSpending_UserId_Field struct { - _set bool - _null bool - _value []byte -} - -func CreditsSpending_UserId(v []byte) CreditsSpending_UserId_Field { - return CreditsSpending_UserId_Field{_set: true, _value: v} -} - -func (f CreditsSpending_UserId_Field) value() interface{} { - if !f._set || f._null { - return nil - } - return f._value -} - -func (CreditsSpending_UserId_Field) _Column() string { return "user_id" } - -type CreditsSpending_ProjectId_Field struct { - _set bool - _null bool - _value []byte -} - -func CreditsSpending_ProjectId(v []byte) CreditsSpending_ProjectId_Field { - return CreditsSpending_ProjectId_Field{_set: true, _value: v} -} - -func (f CreditsSpending_ProjectId_Field) value() interface{} { - if !f._set || f._null { - return nil - } - return f._value -} - -func (CreditsSpending_ProjectId_Field) _Column() string { return "project_id" } - -type CreditsSpending_Amount_Field struct { - _set bool - _null bool - _value int64 -} - -func CreditsSpending_Amount(v int64) CreditsSpending_Amount_Field { - return CreditsSpending_Amount_Field{_set: true, _value: v} -} - -func (f CreditsSpending_Amount_Field) value() interface{} { - if !f._set || f._null { - return nil - } - return f._value -} - -func (CreditsSpending_Amount_Field) _Column() string { return "amount" } - -type CreditsSpending_Status_Field struct { - _set bool - _null bool - _value int -} - -func CreditsSpending_Status(v int) CreditsSpending_Status_Field { - return CreditsSpending_Status_Field{_set: true, _value: v} -} - -func (f CreditsSpending_Status_Field) value() interface{} { - if !f._set || f._null { - return nil - } - return f._value -} - -func (CreditsSpending_Status_Field) _Column() string { return "status" } - -type CreditsSpending_Period_Field struct { - _set bool - _null bool - _value time.Time -} - -func CreditsSpending_Period(v time.Time) CreditsSpending_Period_Field { - return CreditsSpending_Period_Field{_set: true, _value: v} -} - -func (f CreditsSpending_Period_Field) value() interface{} { - if !f._set || f._null { - return nil - } - return f._value -} - -func (CreditsSpending_Period_Field) _Column() string { return "period" } - -type CreditsSpending_CreatedAt_Field struct { - _set bool - _null bool - _value time.Time -} - -func CreditsSpending_CreatedAt(v time.Time) CreditsSpending_CreatedAt_Field { - return CreditsSpending_CreatedAt_Field{_set: true, _value: v} -} - -func (f CreditsSpending_CreatedAt_Field) value() interface{} { - if !f._set || f._null { - return nil - } - return f._value -} - -func (CreditsSpending_CreatedAt_Field) _Column() string { return "created_at" } - type GracefulExitProgress struct { NodeId []byte BytesTransferred int64 @@ -10580,72 +10309,6 @@ func (obj *pgxImpl) Create_CouponUsage(ctx context.Context, } -func (obj *pgxImpl) Create_Credit(ctx context.Context, - credit_user_id Credit_UserId_Field, - credit_transaction_id Credit_TransactionId_Field, - credit_amount Credit_Amount_Field) ( - credit *Credit, err error) { - defer mon.Task()(&ctx)(&err) - - __now := obj.db.Hooks.Now().UTC() - __user_id_val := credit_user_id.value() - __transaction_id_val := credit_transaction_id.value() - __amount_val := credit_amount.value() - __created_at_val := __now - - var __embed_stmt = __sqlbundle_Literal("INSERT INTO credits ( user_id, transaction_id, amount, created_at ) VALUES ( ?, ?, ?, ? ) RETURNING credits.user_id, credits.transaction_id, credits.amount, credits.created_at") - - var __values []interface{} - __values = append(__values, __user_id_val, __transaction_id_val, __amount_val, __created_at_val) - - var __stmt = __sqlbundle_Render(obj.dialect, __embed_stmt) - obj.logStmt(__stmt, __values...) - - credit = &Credit{} - err = obj.driver.QueryRowContext(ctx, __stmt, __values...).Scan(&credit.UserId, &credit.TransactionId, &credit.Amount, &credit.CreatedAt) - if err != nil { - return nil, obj.makeErr(err) - } - return credit, nil - -} - -func (obj *pgxImpl) Create_CreditsSpending(ctx context.Context, - credits_spending_id CreditsSpending_Id_Field, - credits_spending_user_id CreditsSpending_UserId_Field, - credits_spending_project_id CreditsSpending_ProjectId_Field, - credits_spending_amount CreditsSpending_Amount_Field, - credits_spending_status CreditsSpending_Status_Field, - credits_spending_period CreditsSpending_Period_Field) ( - credits_spending *CreditsSpending, err error) { - defer mon.Task()(&ctx)(&err) - - __now := obj.db.Hooks.Now().UTC() - __id_val := credits_spending_id.value() - __user_id_val := credits_spending_user_id.value() - __project_id_val := credits_spending_project_id.value() - __amount_val := credits_spending_amount.value() - __status_val := credits_spending_status.value() - __period_val := credits_spending_period.value() - __created_at_val := __now - - var __embed_stmt = __sqlbundle_Literal("INSERT INTO credits_spendings ( id, user_id, project_id, amount, status, period, created_at ) VALUES ( ?, ?, ?, ?, ?, ?, ? ) RETURNING credits_spendings.id, credits_spendings.user_id, credits_spendings.project_id, credits_spendings.amount, credits_spendings.status, credits_spendings.period, credits_spendings.created_at") - - var __values []interface{} - __values = append(__values, __id_val, __user_id_val, __project_id_val, __amount_val, __status_val, __period_val, __created_at_val) - - var __stmt = __sqlbundle_Render(obj.dialect, __embed_stmt) - obj.logStmt(__stmt, __values...) - - credits_spending = &CreditsSpending{} - err = obj.driver.QueryRowContext(ctx, __stmt, __values...).Scan(&credits_spending.Id, &credits_spending.UserId, &credits_spending.ProjectId, &credits_spending.Amount, &credits_spending.Status, &credits_spending.Period, &credits_spending.CreatedAt) - if err != nil { - return nil, obj.makeErr(err) - } - return credits_spending, nil - -} - func (obj *pgxImpl) ReplaceNoReturn_NodeApiVersion(ctx context.Context, node_api_version_id NodeApiVersion_Id_Field, node_api_version_api_version NodeApiVersion_ApiVersion_Field) ( @@ -13044,172 +12707,6 @@ func (obj *pgxImpl) Limited_CouponUsage_By_Period_And_Status_Equal_Number(ctx co } -func (obj *pgxImpl) Get_Credit_By_TransactionId(ctx context.Context, - credit_transaction_id Credit_TransactionId_Field) ( - credit *Credit, err error) { - defer mon.Task()(&ctx)(&err) - - var __embed_stmt = __sqlbundle_Literal("SELECT credits.user_id, credits.transaction_id, credits.amount, credits.created_at FROM credits WHERE credits.transaction_id = ?") - - var __values []interface{} - __values = append(__values, credit_transaction_id.value()) - - var __stmt = __sqlbundle_Render(obj.dialect, __embed_stmt) - obj.logStmt(__stmt, __values...) - - credit = &Credit{} - err = obj.driver.QueryRowContext(ctx, __stmt, __values...).Scan(&credit.UserId, &credit.TransactionId, &credit.Amount, &credit.CreatedAt) - if err != nil { - return (*Credit)(nil), obj.makeErr(err) - } - return credit, nil - -} - -func (obj *pgxImpl) All_Credit_By_UserId_OrderBy_Desc_CreatedAt(ctx context.Context, - credit_user_id Credit_UserId_Field) ( - rows []*Credit, err error) { - defer mon.Task()(&ctx)(&err) - - var __embed_stmt = __sqlbundle_Literal("SELECT credits.user_id, credits.transaction_id, credits.amount, credits.created_at FROM credits WHERE credits.user_id = ? ORDER BY credits.created_at DESC") - - var __values []interface{} - __values = append(__values, credit_user_id.value()) - - var __stmt = __sqlbundle_Render(obj.dialect, __embed_stmt) - obj.logStmt(__stmt, __values...) - - __rows, err := obj.driver.QueryContext(ctx, __stmt, __values...) - if err != nil { - return nil, obj.makeErr(err) - } - defer __rows.Close() - - for __rows.Next() { - credit := &Credit{} - err = __rows.Scan(&credit.UserId, &credit.TransactionId, &credit.Amount, &credit.CreatedAt) - if err != nil { - return nil, obj.makeErr(err) - } - rows = append(rows, credit) - } - if err := __rows.Err(); err != nil { - return nil, obj.makeErr(err) - } - return rows, nil - -} - -func (obj *pgxImpl) Limited_Credit_By_UserId_And_CreatedAt_LessOrEqual_OrderBy_Desc_CreatedAt(ctx context.Context, - credit_user_id Credit_UserId_Field, - credit_created_at_less_or_equal Credit_CreatedAt_Field, - limit int, offset int64) ( - rows []*Credit, err error) { - defer mon.Task()(&ctx)(&err) - - var __embed_stmt = __sqlbundle_Literal("SELECT credits.user_id, credits.transaction_id, credits.amount, credits.created_at FROM credits WHERE credits.user_id = ? AND credits.created_at <= ? ORDER BY credits.created_at DESC LIMIT ? OFFSET ?") - - var __values []interface{} - __values = append(__values, credit_user_id.value(), credit_created_at_less_or_equal.value()) - - __values = append(__values, limit, offset) - - var __stmt = __sqlbundle_Render(obj.dialect, __embed_stmt) - obj.logStmt(__stmt, __values...) - - __rows, err := obj.driver.QueryContext(ctx, __stmt, __values...) - if err != nil { - return nil, obj.makeErr(err) - } - defer __rows.Close() - - for __rows.Next() { - credit := &Credit{} - err = __rows.Scan(&credit.UserId, &credit.TransactionId, &credit.Amount, &credit.CreatedAt) - if err != nil { - return nil, obj.makeErr(err) - } - rows = append(rows, credit) - } - if err := __rows.Err(); err != nil { - return nil, obj.makeErr(err) - } - return rows, nil - -} - -func (obj *pgxImpl) All_CreditsSpending_By_UserId_OrderBy_Desc_CreatedAt(ctx context.Context, - credits_spending_user_id CreditsSpending_UserId_Field) ( - rows []*CreditsSpending, err error) { - defer mon.Task()(&ctx)(&err) - - var __embed_stmt = __sqlbundle_Literal("SELECT credits_spendings.id, credits_spendings.user_id, credits_spendings.project_id, credits_spendings.amount, credits_spendings.status, credits_spendings.period, credits_spendings.created_at FROM credits_spendings WHERE credits_spendings.user_id = ? ORDER BY credits_spendings.created_at DESC") - - var __values []interface{} - __values = append(__values, credits_spending_user_id.value()) - - var __stmt = __sqlbundle_Render(obj.dialect, __embed_stmt) - obj.logStmt(__stmt, __values...) - - __rows, err := obj.driver.QueryContext(ctx, __stmt, __values...) - if err != nil { - return nil, obj.makeErr(err) - } - defer __rows.Close() - - for __rows.Next() { - credits_spending := &CreditsSpending{} - err = __rows.Scan(&credits_spending.Id, &credits_spending.UserId, &credits_spending.ProjectId, &credits_spending.Amount, &credits_spending.Status, &credits_spending.Period, &credits_spending.CreatedAt) - if err != nil { - return nil, obj.makeErr(err) - } - rows = append(rows, credits_spending) - } - if err := __rows.Err(); err != nil { - return nil, obj.makeErr(err) - } - return rows, nil - -} - -func (obj *pgxImpl) Limited_CreditsSpending_By_Period_And_Status(ctx context.Context, - credits_spending_period CreditsSpending_Period_Field, - credits_spending_status CreditsSpending_Status_Field, - limit int, offset int64) ( - rows []*CreditsSpending, err error) { - defer mon.Task()(&ctx)(&err) - - var __embed_stmt = __sqlbundle_Literal("SELECT credits_spendings.id, credits_spendings.user_id, credits_spendings.project_id, credits_spendings.amount, credits_spendings.status, credits_spendings.period, credits_spendings.created_at FROM credits_spendings WHERE credits_spendings.period = ? AND credits_spendings.status = ? LIMIT ? OFFSET ?") - - var __values []interface{} - __values = append(__values, credits_spending_period.value(), credits_spending_status.value()) - - __values = append(__values, limit, offset) - - var __stmt = __sqlbundle_Render(obj.dialect, __embed_stmt) - obj.logStmt(__stmt, __values...) - - __rows, err := obj.driver.QueryContext(ctx, __stmt, __values...) - if err != nil { - return nil, obj.makeErr(err) - } - defer __rows.Close() - - for __rows.Next() { - credits_spending := &CreditsSpending{} - err = __rows.Scan(&credits_spending.Id, &credits_spending.UserId, &credits_spending.ProjectId, &credits_spending.Amount, &credits_spending.Status, &credits_spending.Period, &credits_spending.CreatedAt) - if err != nil { - return nil, obj.makeErr(err) - } - rows = append(rows, credits_spending) - } - if err := __rows.Err(); err != nil { - return nil, obj.makeErr(err) - } - return rows, nil - -} - func (obj *pgxImpl) Has_NodeApiVersion_By_Id_And_ApiVersion_GreaterOrEqual(ctx context.Context, node_api_version_id NodeApiVersion_Id_Field, node_api_version_api_version_greater_or_equal NodeApiVersion_ApiVersion_Field) ( @@ -14618,47 +14115,6 @@ func (obj *pgxImpl) Update_CouponUsage_By_CouponId_And_Period(ctx context.Contex return coupon_usage, nil } -func (obj *pgxImpl) Update_CreditsSpending_By_Id(ctx context.Context, - credits_spending_id CreditsSpending_Id_Field, - update CreditsSpending_Update_Fields) ( - credits_spending *CreditsSpending, err error) { - defer mon.Task()(&ctx)(&err) - var __sets = &__sqlbundle_Hole{} - - var __embed_stmt = __sqlbundle_Literals{Join: "", SQLs: []__sqlbundle_SQL{__sqlbundle_Literal("UPDATE credits_spendings SET "), __sets, __sqlbundle_Literal(" WHERE credits_spendings.id = ? RETURNING credits_spendings.id, credits_spendings.user_id, credits_spendings.project_id, credits_spendings.amount, credits_spendings.status, credits_spendings.period, credits_spendings.created_at")}} - - __sets_sql := __sqlbundle_Literals{Join: ", "} - var __values []interface{} - var __args []interface{} - - if update.Status._set { - __values = append(__values, update.Status.value()) - __sets_sql.SQLs = append(__sets_sql.SQLs, __sqlbundle_Literal("status = ?")) - } - - if len(__sets_sql.SQLs) == 0 { - return nil, emptyUpdate() - } - - __args = append(__args, credits_spending_id.value()) - - __values = append(__values, __args...) - __sets.SQL = __sets_sql - - var __stmt = __sqlbundle_Render(obj.dialect, __embed_stmt) - obj.logStmt(__stmt, __values...) - - credits_spending = &CreditsSpending{} - err = obj.driver.QueryRowContext(ctx, __stmt, __values...).Scan(&credits_spending.Id, &credits_spending.UserId, &credits_spending.ProjectId, &credits_spending.Amount, &credits_spending.Status, &credits_spending.Period, &credits_spending.CreatedAt) - if err == sql.ErrNoRows { - return nil, nil - } - if err != nil { - return nil, obj.makeErr(err) - } - return credits_spending, nil -} - func (obj *pgxImpl) UpdateNoReturn_NodeApiVersion_By_Id_And_ApiVersion_Less(ctx context.Context, node_api_version_id NodeApiVersion_Id_Field, node_api_version_api_version_less NodeApiVersion_ApiVersion_Field, @@ -15592,26 +15048,6 @@ func (obj *pgxImpl) deleteAll(ctx context.Context) (count int64, err error) { return 0, obj.makeErr(err) } - __count, err = __res.RowsAffected() - if err != nil { - return 0, obj.makeErr(err) - } - count += __count - __res, err = obj.driver.ExecContext(ctx, "DELETE FROM credits_spendings;") - if err != nil { - return 0, obj.makeErr(err) - } - - __count, err = __res.RowsAffected() - if err != nil { - return 0, obj.makeErr(err) - } - count += __count - __res, err = obj.driver.ExecContext(ctx, "DELETE FROM credits;") - if err != nil { - return 0, obj.makeErr(err) - } - __count, err = __res.RowsAffected() if err != nil { return 0, obj.makeErr(err) @@ -17217,72 +16653,6 @@ func (obj *pgxcockroachImpl) Create_CouponUsage(ctx context.Context, } -func (obj *pgxcockroachImpl) Create_Credit(ctx context.Context, - credit_user_id Credit_UserId_Field, - credit_transaction_id Credit_TransactionId_Field, - credit_amount Credit_Amount_Field) ( - credit *Credit, err error) { - defer mon.Task()(&ctx)(&err) - - __now := obj.db.Hooks.Now().UTC() - __user_id_val := credit_user_id.value() - __transaction_id_val := credit_transaction_id.value() - __amount_val := credit_amount.value() - __created_at_val := __now - - var __embed_stmt = __sqlbundle_Literal("INSERT INTO credits ( user_id, transaction_id, amount, created_at ) VALUES ( ?, ?, ?, ? ) RETURNING credits.user_id, credits.transaction_id, credits.amount, credits.created_at") - - var __values []interface{} - __values = append(__values, __user_id_val, __transaction_id_val, __amount_val, __created_at_val) - - var __stmt = __sqlbundle_Render(obj.dialect, __embed_stmt) - obj.logStmt(__stmt, __values...) - - credit = &Credit{} - err = obj.driver.QueryRowContext(ctx, __stmt, __values...).Scan(&credit.UserId, &credit.TransactionId, &credit.Amount, &credit.CreatedAt) - if err != nil { - return nil, obj.makeErr(err) - } - return credit, nil - -} - -func (obj *pgxcockroachImpl) Create_CreditsSpending(ctx context.Context, - credits_spending_id CreditsSpending_Id_Field, - credits_spending_user_id CreditsSpending_UserId_Field, - credits_spending_project_id CreditsSpending_ProjectId_Field, - credits_spending_amount CreditsSpending_Amount_Field, - credits_spending_status CreditsSpending_Status_Field, - credits_spending_period CreditsSpending_Period_Field) ( - credits_spending *CreditsSpending, err error) { - defer mon.Task()(&ctx)(&err) - - __now := obj.db.Hooks.Now().UTC() - __id_val := credits_spending_id.value() - __user_id_val := credits_spending_user_id.value() - __project_id_val := credits_spending_project_id.value() - __amount_val := credits_spending_amount.value() - __status_val := credits_spending_status.value() - __period_val := credits_spending_period.value() - __created_at_val := __now - - var __embed_stmt = __sqlbundle_Literal("INSERT INTO credits_spendings ( id, user_id, project_id, amount, status, period, created_at ) VALUES ( ?, ?, ?, ?, ?, ?, ? ) RETURNING credits_spendings.id, credits_spendings.user_id, credits_spendings.project_id, credits_spendings.amount, credits_spendings.status, credits_spendings.period, credits_spendings.created_at") - - var __values []interface{} - __values = append(__values, __id_val, __user_id_val, __project_id_val, __amount_val, __status_val, __period_val, __created_at_val) - - var __stmt = __sqlbundle_Render(obj.dialect, __embed_stmt) - obj.logStmt(__stmt, __values...) - - credits_spending = &CreditsSpending{} - err = obj.driver.QueryRowContext(ctx, __stmt, __values...).Scan(&credits_spending.Id, &credits_spending.UserId, &credits_spending.ProjectId, &credits_spending.Amount, &credits_spending.Status, &credits_spending.Period, &credits_spending.CreatedAt) - if err != nil { - return nil, obj.makeErr(err) - } - return credits_spending, nil - -} - func (obj *pgxcockroachImpl) ReplaceNoReturn_NodeApiVersion(ctx context.Context, node_api_version_id NodeApiVersion_Id_Field, node_api_version_api_version NodeApiVersion_ApiVersion_Field) ( @@ -19681,172 +19051,6 @@ func (obj *pgxcockroachImpl) Limited_CouponUsage_By_Period_And_Status_Equal_Numb } -func (obj *pgxcockroachImpl) Get_Credit_By_TransactionId(ctx context.Context, - credit_transaction_id Credit_TransactionId_Field) ( - credit *Credit, err error) { - defer mon.Task()(&ctx)(&err) - - var __embed_stmt = __sqlbundle_Literal("SELECT credits.user_id, credits.transaction_id, credits.amount, credits.created_at FROM credits WHERE credits.transaction_id = ?") - - var __values []interface{} - __values = append(__values, credit_transaction_id.value()) - - var __stmt = __sqlbundle_Render(obj.dialect, __embed_stmt) - obj.logStmt(__stmt, __values...) - - credit = &Credit{} - err = obj.driver.QueryRowContext(ctx, __stmt, __values...).Scan(&credit.UserId, &credit.TransactionId, &credit.Amount, &credit.CreatedAt) - if err != nil { - return (*Credit)(nil), obj.makeErr(err) - } - return credit, nil - -} - -func (obj *pgxcockroachImpl) All_Credit_By_UserId_OrderBy_Desc_CreatedAt(ctx context.Context, - credit_user_id Credit_UserId_Field) ( - rows []*Credit, err error) { - defer mon.Task()(&ctx)(&err) - - var __embed_stmt = __sqlbundle_Literal("SELECT credits.user_id, credits.transaction_id, credits.amount, credits.created_at FROM credits WHERE credits.user_id = ? ORDER BY credits.created_at DESC") - - var __values []interface{} - __values = append(__values, credit_user_id.value()) - - var __stmt = __sqlbundle_Render(obj.dialect, __embed_stmt) - obj.logStmt(__stmt, __values...) - - __rows, err := obj.driver.QueryContext(ctx, __stmt, __values...) - if err != nil { - return nil, obj.makeErr(err) - } - defer __rows.Close() - - for __rows.Next() { - credit := &Credit{} - err = __rows.Scan(&credit.UserId, &credit.TransactionId, &credit.Amount, &credit.CreatedAt) - if err != nil { - return nil, obj.makeErr(err) - } - rows = append(rows, credit) - } - if err := __rows.Err(); err != nil { - return nil, obj.makeErr(err) - } - return rows, nil - -} - -func (obj *pgxcockroachImpl) Limited_Credit_By_UserId_And_CreatedAt_LessOrEqual_OrderBy_Desc_CreatedAt(ctx context.Context, - credit_user_id Credit_UserId_Field, - credit_created_at_less_or_equal Credit_CreatedAt_Field, - limit int, offset int64) ( - rows []*Credit, err error) { - defer mon.Task()(&ctx)(&err) - - var __embed_stmt = __sqlbundle_Literal("SELECT credits.user_id, credits.transaction_id, credits.amount, credits.created_at FROM credits WHERE credits.user_id = ? AND credits.created_at <= ? ORDER BY credits.created_at DESC LIMIT ? OFFSET ?") - - var __values []interface{} - __values = append(__values, credit_user_id.value(), credit_created_at_less_or_equal.value()) - - __values = append(__values, limit, offset) - - var __stmt = __sqlbundle_Render(obj.dialect, __embed_stmt) - obj.logStmt(__stmt, __values...) - - __rows, err := obj.driver.QueryContext(ctx, __stmt, __values...) - if err != nil { - return nil, obj.makeErr(err) - } - defer __rows.Close() - - for __rows.Next() { - credit := &Credit{} - err = __rows.Scan(&credit.UserId, &credit.TransactionId, &credit.Amount, &credit.CreatedAt) - if err != nil { - return nil, obj.makeErr(err) - } - rows = append(rows, credit) - } - if err := __rows.Err(); err != nil { - return nil, obj.makeErr(err) - } - return rows, nil - -} - -func (obj *pgxcockroachImpl) All_CreditsSpending_By_UserId_OrderBy_Desc_CreatedAt(ctx context.Context, - credits_spending_user_id CreditsSpending_UserId_Field) ( - rows []*CreditsSpending, err error) { - defer mon.Task()(&ctx)(&err) - - var __embed_stmt = __sqlbundle_Literal("SELECT credits_spendings.id, credits_spendings.user_id, credits_spendings.project_id, credits_spendings.amount, credits_spendings.status, credits_spendings.period, credits_spendings.created_at FROM credits_spendings WHERE credits_spendings.user_id = ? ORDER BY credits_spendings.created_at DESC") - - var __values []interface{} - __values = append(__values, credits_spending_user_id.value()) - - var __stmt = __sqlbundle_Render(obj.dialect, __embed_stmt) - obj.logStmt(__stmt, __values...) - - __rows, err := obj.driver.QueryContext(ctx, __stmt, __values...) - if err != nil { - return nil, obj.makeErr(err) - } - defer __rows.Close() - - for __rows.Next() { - credits_spending := &CreditsSpending{} - err = __rows.Scan(&credits_spending.Id, &credits_spending.UserId, &credits_spending.ProjectId, &credits_spending.Amount, &credits_spending.Status, &credits_spending.Period, &credits_spending.CreatedAt) - if err != nil { - return nil, obj.makeErr(err) - } - rows = append(rows, credits_spending) - } - if err := __rows.Err(); err != nil { - return nil, obj.makeErr(err) - } - return rows, nil - -} - -func (obj *pgxcockroachImpl) Limited_CreditsSpending_By_Period_And_Status(ctx context.Context, - credits_spending_period CreditsSpending_Period_Field, - credits_spending_status CreditsSpending_Status_Field, - limit int, offset int64) ( - rows []*CreditsSpending, err error) { - defer mon.Task()(&ctx)(&err) - - var __embed_stmt = __sqlbundle_Literal("SELECT credits_spendings.id, credits_spendings.user_id, credits_spendings.project_id, credits_spendings.amount, credits_spendings.status, credits_spendings.period, credits_spendings.created_at FROM credits_spendings WHERE credits_spendings.period = ? AND credits_spendings.status = ? LIMIT ? OFFSET ?") - - var __values []interface{} - __values = append(__values, credits_spending_period.value(), credits_spending_status.value()) - - __values = append(__values, limit, offset) - - var __stmt = __sqlbundle_Render(obj.dialect, __embed_stmt) - obj.logStmt(__stmt, __values...) - - __rows, err := obj.driver.QueryContext(ctx, __stmt, __values...) - if err != nil { - return nil, obj.makeErr(err) - } - defer __rows.Close() - - for __rows.Next() { - credits_spending := &CreditsSpending{} - err = __rows.Scan(&credits_spending.Id, &credits_spending.UserId, &credits_spending.ProjectId, &credits_spending.Amount, &credits_spending.Status, &credits_spending.Period, &credits_spending.CreatedAt) - if err != nil { - return nil, obj.makeErr(err) - } - rows = append(rows, credits_spending) - } - if err := __rows.Err(); err != nil { - return nil, obj.makeErr(err) - } - return rows, nil - -} - func (obj *pgxcockroachImpl) Has_NodeApiVersion_By_Id_And_ApiVersion_GreaterOrEqual(ctx context.Context, node_api_version_id NodeApiVersion_Id_Field, node_api_version_api_version_greater_or_equal NodeApiVersion_ApiVersion_Field) ( @@ -21255,47 +20459,6 @@ func (obj *pgxcockroachImpl) Update_CouponUsage_By_CouponId_And_Period(ctx conte return coupon_usage, nil } -func (obj *pgxcockroachImpl) Update_CreditsSpending_By_Id(ctx context.Context, - credits_spending_id CreditsSpending_Id_Field, - update CreditsSpending_Update_Fields) ( - credits_spending *CreditsSpending, err error) { - defer mon.Task()(&ctx)(&err) - var __sets = &__sqlbundle_Hole{} - - var __embed_stmt = __sqlbundle_Literals{Join: "", SQLs: []__sqlbundle_SQL{__sqlbundle_Literal("UPDATE credits_spendings SET "), __sets, __sqlbundle_Literal(" WHERE credits_spendings.id = ? RETURNING credits_spendings.id, credits_spendings.user_id, credits_spendings.project_id, credits_spendings.amount, credits_spendings.status, credits_spendings.period, credits_spendings.created_at")}} - - __sets_sql := __sqlbundle_Literals{Join: ", "} - var __values []interface{} - var __args []interface{} - - if update.Status._set { - __values = append(__values, update.Status.value()) - __sets_sql.SQLs = append(__sets_sql.SQLs, __sqlbundle_Literal("status = ?")) - } - - if len(__sets_sql.SQLs) == 0 { - return nil, emptyUpdate() - } - - __args = append(__args, credits_spending_id.value()) - - __values = append(__values, __args...) - __sets.SQL = __sets_sql - - var __stmt = __sqlbundle_Render(obj.dialect, __embed_stmt) - obj.logStmt(__stmt, __values...) - - credits_spending = &CreditsSpending{} - err = obj.driver.QueryRowContext(ctx, __stmt, __values...).Scan(&credits_spending.Id, &credits_spending.UserId, &credits_spending.ProjectId, &credits_spending.Amount, &credits_spending.Status, &credits_spending.Period, &credits_spending.CreatedAt) - if err == sql.ErrNoRows { - return nil, nil - } - if err != nil { - return nil, obj.makeErr(err) - } - return credits_spending, nil -} - func (obj *pgxcockroachImpl) UpdateNoReturn_NodeApiVersion_By_Id_And_ApiVersion_Less(ctx context.Context, node_api_version_id NodeApiVersion_Id_Field, node_api_version_api_version_less NodeApiVersion_ApiVersion_Field, @@ -22229,26 +21392,6 @@ func (obj *pgxcockroachImpl) deleteAll(ctx context.Context) (count int64, err er return 0, obj.makeErr(err) } - __count, err = __res.RowsAffected() - if err != nil { - return 0, obj.makeErr(err) - } - count += __count - __res, err = obj.driver.ExecContext(ctx, "DELETE FROM credits_spendings;") - if err != nil { - return 0, obj.makeErr(err) - } - - __count, err = __res.RowsAffected() - if err != nil { - return 0, obj.makeErr(err) - } - count += __count - __res, err = obj.driver.ExecContext(ctx, "DELETE FROM credits;") - if err != nil { - return 0, obj.makeErr(err) - } - __count, err = __res.RowsAffected() if err != nil { return 0, obj.makeErr(err) @@ -22474,26 +21617,6 @@ func (rx *Rx) All_Coupon_By_UserId_OrderBy_Desc_CreatedAt(ctx context.Context, return tx.All_Coupon_By_UserId_OrderBy_Desc_CreatedAt(ctx, coupon_user_id) } -func (rx *Rx) All_Credit_By_UserId_OrderBy_Desc_CreatedAt(ctx context.Context, - credit_user_id Credit_UserId_Field) ( - rows []*Credit, err error) { - var tx *Tx - if tx, err = rx.getTx(ctx); err != nil { - return - } - return tx.All_Credit_By_UserId_OrderBy_Desc_CreatedAt(ctx, credit_user_id) -} - -func (rx *Rx) All_CreditsSpending_By_UserId_OrderBy_Desc_CreatedAt(ctx context.Context, - credits_spending_user_id CreditsSpending_UserId_Field) ( - rows []*CreditsSpending, err error) { - var tx *Tx - if tx, err = rx.getTx(ctx); err != nil { - return - } - return tx.All_CreditsSpending_By_UserId_OrderBy_Desc_CreatedAt(ctx, credits_spending_user_id) -} - func (rx *Rx) All_Node_Id(ctx context.Context) ( rows []*Id_Row, err error) { var tx *Tx @@ -22989,35 +22112,6 @@ func (rx *Rx) Create_CouponUsage(ctx context.Context, } -func (rx *Rx) Create_Credit(ctx context.Context, - credit_user_id Credit_UserId_Field, - credit_transaction_id Credit_TransactionId_Field, - credit_amount Credit_Amount_Field) ( - credit *Credit, err error) { - var tx *Tx - if tx, err = rx.getTx(ctx); err != nil { - return - } - return tx.Create_Credit(ctx, credit_user_id, credit_transaction_id, credit_amount) - -} - -func (rx *Rx) Create_CreditsSpending(ctx context.Context, - credits_spending_id CreditsSpending_Id_Field, - credits_spending_user_id CreditsSpending_UserId_Field, - credits_spending_project_id CreditsSpending_ProjectId_Field, - credits_spending_amount CreditsSpending_Amount_Field, - credits_spending_status CreditsSpending_Status_Field, - credits_spending_period CreditsSpending_Period_Field) ( - credits_spending *CreditsSpending, err error) { - var tx *Tx - if tx, err = rx.getTx(ctx); err != nil { - return - } - return tx.Create_CreditsSpending(ctx, credits_spending_id, credits_spending_user_id, credits_spending_project_id, credits_spending_amount, credits_spending_status, credits_spending_period) - -} - func (rx *Rx) Create_NodesOfflineTime(ctx context.Context, nodes_offline_time_node_id NodesOfflineTime_NodeId_Field, nodes_offline_time_tracked_at NodesOfflineTime_TrackedAt_Field, @@ -23604,16 +22698,6 @@ func (rx *Rx) Get_Coupon_By_Id(ctx context.Context, return tx.Get_Coupon_By_Id(ctx, coupon_id) } -func (rx *Rx) Get_Credit_By_TransactionId(ctx context.Context, - credit_transaction_id Credit_TransactionId_Field) ( - credit *Credit, err error) { - var tx *Tx - if tx, err = rx.getTx(ctx); err != nil { - return - } - return tx.Get_Credit_By_TransactionId(ctx, credit_transaction_id) -} - func (rx *Rx) Get_GracefulExitProgress_By_NodeId(ctx context.Context, graceful_exit_progress_node_id GracefulExitProgress_NodeId_Field) ( graceful_exit_progress *GracefulExitProgress, err error) { @@ -23951,30 +23035,6 @@ func (rx *Rx) Limited_Coupon_By_CreatedAt_LessOrEqual_And_Status_OrderBy_Desc_Cr return tx.Limited_Coupon_By_CreatedAt_LessOrEqual_And_Status_OrderBy_Desc_CreatedAt(ctx, coupon_created_at_less_or_equal, coupon_status, limit, offset) } -func (rx *Rx) Limited_Credit_By_UserId_And_CreatedAt_LessOrEqual_OrderBy_Desc_CreatedAt(ctx context.Context, - credit_user_id Credit_UserId_Field, - credit_created_at_less_or_equal Credit_CreatedAt_Field, - limit int, offset int64) ( - rows []*Credit, err error) { - var tx *Tx - if tx, err = rx.getTx(ctx); err != nil { - return - } - return tx.Limited_Credit_By_UserId_And_CreatedAt_LessOrEqual_OrderBy_Desc_CreatedAt(ctx, credit_user_id, credit_created_at_less_or_equal, limit, offset) -} - -func (rx *Rx) Limited_CreditsSpending_By_Period_And_Status(ctx context.Context, - credits_spending_period CreditsSpending_Period_Field, - credits_spending_status CreditsSpending_Status_Field, - limit int, offset int64) ( - rows []*CreditsSpending, err error) { - var tx *Tx - if tx, err = rx.getTx(ctx); err != nil { - return - } - return tx.Limited_CreditsSpending_By_Period_And_Status(ctx, credits_spending_period, credits_spending_status, limit, offset) -} - func (rx *Rx) Limited_Irreparabledb_By_Segmentpath_Greater_OrderBy_Asc_Segmentpath(ctx context.Context, irreparabledb_segmentpath_greater Irreparabledb_Segmentpath_Field, limit int, offset int64) ( @@ -24250,17 +23310,6 @@ func (rx *Rx) Update_Coupon_By_Id(ctx context.Context, return tx.Update_Coupon_By_Id(ctx, coupon_id, update) } -func (rx *Rx) Update_CreditsSpending_By_Id(ctx context.Context, - credits_spending_id CreditsSpending_Id_Field, - update CreditsSpending_Update_Fields) ( - credits_spending *CreditsSpending, err error) { - var tx *Tx - if tx, err = rx.getTx(ctx); err != nil { - return - } - return tx.Update_CreditsSpending_By_Id(ctx, credits_spending_id, update) -} - func (rx *Rx) Update_Node_By_Id(ctx context.Context, node_id Node_Id_Field, update Node_Update_Fields) ( @@ -24374,14 +23423,6 @@ type Methods interface { coupon_user_id Coupon_UserId_Field) ( rows []*Coupon, err error) - All_Credit_By_UserId_OrderBy_Desc_CreatedAt(ctx context.Context, - credit_user_id Credit_UserId_Field) ( - rows []*Credit, err error) - - All_CreditsSpending_By_UserId_OrderBy_Desc_CreatedAt(ctx context.Context, - credits_spending_user_id CreditsSpending_UserId_Field) ( - rows []*CreditsSpending, err error) - All_Node_Id(ctx context.Context) ( rows []*Id_Row, err error) @@ -24629,21 +23670,6 @@ type Methods interface { coupon_usage_period CouponUsage_Period_Field) ( coupon_usage *CouponUsage, err error) - Create_Credit(ctx context.Context, - credit_user_id Credit_UserId_Field, - credit_transaction_id Credit_TransactionId_Field, - credit_amount Credit_Amount_Field) ( - credit *Credit, err error) - - Create_CreditsSpending(ctx context.Context, - credits_spending_id CreditsSpending_Id_Field, - credits_spending_user_id CreditsSpending_UserId_Field, - credits_spending_project_id CreditsSpending_ProjectId_Field, - credits_spending_amount CreditsSpending_Amount_Field, - credits_spending_status CreditsSpending_Status_Field, - credits_spending_period CreditsSpending_Period_Field) ( - credits_spending *CreditsSpending, err error) - Create_NodesOfflineTime(ctx context.Context, nodes_offline_time_node_id NodesOfflineTime_NodeId_Field, nodes_offline_time_tracked_at NodesOfflineTime_TrackedAt_Field, @@ -24910,10 +23936,6 @@ type Methods interface { coupon_id Coupon_Id_Field) ( coupon *Coupon, err error) - Get_Credit_By_TransactionId(ctx context.Context, - credit_transaction_id Credit_TransactionId_Field) ( - credit *Credit, err error) - Get_GracefulExitProgress_By_NodeId(ctx context.Context, graceful_exit_progress_node_id GracefulExitProgress_NodeId_Field) ( graceful_exit_progress *GracefulExitProgress, err error) @@ -25059,18 +24081,6 @@ type Methods interface { limit int, offset int64) ( rows []*Coupon, err error) - Limited_Credit_By_UserId_And_CreatedAt_LessOrEqual_OrderBy_Desc_CreatedAt(ctx context.Context, - credit_user_id Credit_UserId_Field, - credit_created_at_less_or_equal Credit_CreatedAt_Field, - limit int, offset int64) ( - rows []*Credit, err error) - - Limited_CreditsSpending_By_Period_And_Status(ctx context.Context, - credits_spending_period CreditsSpending_Period_Field, - credits_spending_status CreditsSpending_Status_Field, - limit int, offset int64) ( - rows []*CreditsSpending, err error) - Limited_Irreparabledb_By_Segmentpath_Greater_OrderBy_Asc_Segmentpath(ctx context.Context, irreparabledb_segmentpath_greater Irreparabledb_Segmentpath_Field, limit int, offset int64) ( @@ -25200,11 +24210,6 @@ type Methods interface { update Coupon_Update_Fields) ( coupon *Coupon, err error) - Update_CreditsSpending_By_Id(ctx context.Context, - credits_spending_id CreditsSpending_Id_Field, - update CreditsSpending_Update_Fields) ( - credits_spending *CreditsSpending, err error) - Update_Node_By_Id(ctx context.Context, node_id Node_Id_Field, update Node_Update_Fields) ( diff --git a/satellite/satellitedb/dbx/satellitedb.dbx.pgx.sql b/satellite/satellitedb/dbx/satellitedb.dbx.pgx.sql index 5687bd830..4276c6e26 100644 --- a/satellite/satellitedb/dbx/satellitedb.dbx.pgx.sql +++ b/satellite/satellitedb/dbx/satellitedb.dbx.pgx.sql @@ -81,23 +81,6 @@ CREATE TABLE coupon_usages ( period timestamp with time zone NOT NULL, PRIMARY KEY ( coupon_id, period ) ); -CREATE TABLE credits ( - user_id bytea NOT NULL, - transaction_id text NOT NULL, - amount bigint NOT NULL, - created_at timestamp with time zone NOT NULL, - PRIMARY KEY ( transaction_id ) -); -CREATE TABLE credits_spendings ( - id bytea NOT NULL, - user_id bytea NOT NULL, - project_id bytea NOT NULL, - amount bigint NOT NULL, - status integer NOT NULL, - period timestamp with time zone NOT NULL, - created_at timestamp with time zone NOT NULL, - PRIMARY KEY ( id ) -); CREATE TABLE graceful_exit_progress ( node_id bytea NOT NULL, bytes_transferred bigint NOT NULL, diff --git a/satellite/satellitedb/dbx/satellitedb.dbx.pgxcockroach.sql b/satellite/satellitedb/dbx/satellitedb.dbx.pgxcockroach.sql index 5687bd830..4276c6e26 100644 --- a/satellite/satellitedb/dbx/satellitedb.dbx.pgxcockroach.sql +++ b/satellite/satellitedb/dbx/satellitedb.dbx.pgxcockroach.sql @@ -81,23 +81,6 @@ CREATE TABLE coupon_usages ( period timestamp with time zone NOT NULL, PRIMARY KEY ( coupon_id, period ) ); -CREATE TABLE credits ( - user_id bytea NOT NULL, - transaction_id text NOT NULL, - amount bigint NOT NULL, - created_at timestamp with time zone NOT NULL, - PRIMARY KEY ( transaction_id ) -); -CREATE TABLE credits_spendings ( - id bytea NOT NULL, - user_id bytea NOT NULL, - project_id bytea NOT NULL, - amount bigint NOT NULL, - status integer NOT NULL, - period timestamp with time zone NOT NULL, - created_at timestamp with time zone NOT NULL, - PRIMARY KEY ( id ) -); CREATE TABLE graceful_exit_progress ( node_id bytea NOT NULL, bytes_transferred bigint NOT NULL, diff --git a/satellite/satellitedb/invoiceprojectrecords.go b/satellite/satellitedb/invoiceprojectrecords.go index d6ce3cd39..d7a3f498d 100644 --- a/satellite/satellitedb/invoiceprojectrecords.go +++ b/satellite/satellitedb/invoiceprojectrecords.go @@ -42,7 +42,7 @@ type invoiceProjectRecords struct { } // Create creates new invoice project record in the DB. -func (db *invoiceProjectRecords) Create(ctx context.Context, records []stripecoinpayments.CreateProjectRecord, couponUsages []stripecoinpayments.CouponUsage, creditsSpendings []stripecoinpayments.CreditsSpending, start, end time.Time) (err error) { +func (db *invoiceProjectRecords) Create(ctx context.Context, records []stripecoinpayments.CreateProjectRecord, couponUsages []stripecoinpayments.CouponUsage, start, end time.Time) (err error) { defer mon.Task()(&ctx)(&err) return db.db.WithTx(ctx, func(ctx context.Context, tx *dbx.Tx) error { @@ -80,21 +80,6 @@ func (db *invoiceProjectRecords) Create(ctx context.Context, records []stripecoi } } - for _, creditsSpending := range creditsSpendings { - _, err = db.db.Create_CreditsSpending( - ctx, - dbx.CreditsSpending_Id(creditsSpending.ID[:]), - dbx.CreditsSpending_UserId(creditsSpending.UserID[:]), - dbx.CreditsSpending_ProjectId(creditsSpending.ProjectID[:]), - dbx.CreditsSpending_Amount(creditsSpending.Amount), - dbx.CreditsSpending_Status(int(creditsSpending.Status)), - dbx.CreditsSpending_Period(creditsSpending.Period), - ) - if err != nil { - return err - } - } - return nil }) } diff --git a/satellite/satellitedb/migrate.go b/satellite/satellitedb/migrate.go index bacd00129..744bd685c 100644 --- a/satellite/satellitedb/migrate.go +++ b/satellite/satellitedb/migrate.go @@ -1246,6 +1246,15 @@ func (db *satelliteDB) PostgresMigration() *migrate.Migration { `UPDATE users SET project_limit = registration_tokens.project_limit FROM registration_tokens WHERE users.id = registration_tokens.owner_id;`, }, }, + { + DB: db.DB, + Description: "drop tables related to credits (old deposit bonuses)", + Version: 121, + Action: migrate.SQL{ + `DROP TABLE credits;`, + `DROP TABLE credits_spendings;`, + }, + }, }, } } diff --git a/satellite/satellitedb/stripecoinpaymentsdb.go b/satellite/satellitedb/stripecoinpaymentsdb.go index 66edfec77..9eb1ca87c 100644 --- a/satellite/satellitedb/stripecoinpaymentsdb.go +++ b/satellite/satellitedb/stripecoinpaymentsdb.go @@ -36,8 +36,3 @@ func (db *stripeCoinPaymentsDB) ProjectRecords() stripecoinpayments.ProjectRecor func (db *stripeCoinPaymentsDB) Coupons() stripecoinpayments.CouponsDB { return &coupons{db: db.db} } - -//Credits is getter for credits db. -func (db *stripeCoinPaymentsDB) Credits() stripecoinpayments.CreditsDB { - return &credit{db: db.db} -} diff --git a/satellite/satellitedb/testdata/postgres.v121.sql b/satellite/satellitedb/testdata/postgres.v121.sql new file mode 100644 index 000000000..8f03be140 --- /dev/null +++ b/satellite/satellitedb/testdata/postgres.v121.sql @@ -0,0 +1,567 @@ +-- AUTOGENERATED BY storj.io/dbx +-- DO NOT EDIT +CREATE TABLE accounting_rollups ( + id bigserial NOT NULL, + node_id bytea NOT NULL, + start_time timestamp with time zone NOT NULL, + put_total bigint NOT NULL, + get_total bigint NOT NULL, + get_audit_total bigint NOT NULL, + get_repair_total bigint NOT NULL, + put_repair_total bigint NOT NULL, + at_rest_total double precision NOT NULL, + PRIMARY KEY ( id ) +); +CREATE TABLE accounting_timestamps ( + name text NOT NULL, + value timestamp with time zone NOT NULL, + PRIMARY KEY ( name ) +); +CREATE TABLE audit_histories ( + node_id bytea NOT NULL, + history bytea NOT NULL, + PRIMARY KEY ( node_id ) +); +CREATE TABLE bucket_bandwidth_rollups ( + bucket_name bytea NOT NULL, + project_id bytea NOT NULL, + interval_start timestamp with time zone NOT NULL, + interval_seconds integer NOT NULL, + action integer NOT NULL, + inline bigint NOT NULL, + allocated bigint NOT NULL, + settled bigint NOT NULL, + PRIMARY KEY ( bucket_name, project_id, interval_start, action ) +); +CREATE TABLE bucket_storage_tallies ( + bucket_name bytea NOT NULL, + project_id bytea NOT NULL, + interval_start timestamp with time zone NOT NULL, + inline bigint NOT NULL, + remote bigint NOT NULL, + remote_segments_count integer NOT NULL, + inline_segments_count integer NOT NULL, + object_count integer NOT NULL, + metadata_size bigint NOT NULL, + PRIMARY KEY ( bucket_name, project_id, interval_start ) +); +CREATE TABLE coinpayments_transactions ( + id text NOT NULL, + user_id bytea NOT NULL, + address text NOT NULL, + amount bytea NOT NULL, + received bytea NOT NULL, + status integer NOT NULL, + key text NOT NULL, + timeout integer NOT NULL, + created_at timestamp with time zone NOT NULL, + PRIMARY KEY ( id ) +); +CREATE TABLE consumed_serials ( + storage_node_id bytea NOT NULL, + serial_number bytea NOT NULL, + expires_at timestamp with time zone NOT NULL, + PRIMARY KEY ( storage_node_id, serial_number ) +); +CREATE TABLE coupons ( + id bytea NOT NULL, + user_id bytea NOT NULL, + amount bigint NOT NULL, + description text NOT NULL, + type integer NOT NULL, + status integer NOT NULL, + duration bigint NOT NULL, + created_at timestamp with time zone NOT NULL, + PRIMARY KEY ( id ) +); +CREATE TABLE coupon_usages ( + coupon_id bytea NOT NULL, + amount bigint NOT NULL, + status integer NOT NULL, + period timestamp with time zone NOT NULL, + PRIMARY KEY ( coupon_id, period ) +); +CREATE TABLE graceful_exit_progress ( + node_id bytea NOT NULL, + bytes_transferred bigint NOT NULL, + pieces_transferred bigint NOT NULL DEFAULT 0, + pieces_failed bigint NOT NULL DEFAULT 0, + updated_at timestamp with time zone NOT NULL, + PRIMARY KEY ( node_id ) +); +CREATE TABLE graceful_exit_transfer_queue ( + node_id bytea NOT NULL, + path bytea NOT NULL, + piece_num integer NOT NULL, + root_piece_id bytea, + durability_ratio double precision NOT NULL, + queued_at timestamp with time zone NOT NULL, + requested_at timestamp with time zone, + last_failed_at timestamp with time zone, + last_failed_code integer, + failed_count integer, + finished_at timestamp with time zone, + order_limit_send_count integer NOT NULL DEFAULT 0, + PRIMARY KEY ( node_id, path, piece_num ) +); +CREATE TABLE injuredsegments ( + path bytea NOT NULL, + data bytea NOT NULL, + attempted timestamp with time zone, + num_healthy_pieces integer NOT NULL DEFAULT 52, + PRIMARY KEY ( path ) +); +CREATE TABLE irreparabledbs ( + segmentpath bytea NOT NULL, + segmentdetail bytea NOT NULL, + pieces_lost_count bigint NOT NULL, + seg_damaged_unix_sec bigint NOT NULL, + repair_attempt_count bigint NOT NULL, + PRIMARY KEY ( segmentpath ) +); +CREATE TABLE nodes ( + id bytea NOT NULL, + address text NOT NULL DEFAULT '', + last_net text NOT NULL, + last_ip_port text, + protocol integer NOT NULL DEFAULT 0, + type integer NOT NULL DEFAULT 0, + email text NOT NULL, + wallet text NOT NULL, + free_disk bigint NOT NULL DEFAULT -1, + piece_count bigint NOT NULL DEFAULT 0, + major bigint NOT NULL DEFAULT 0, + minor bigint NOT NULL DEFAULT 0, + patch bigint NOT NULL DEFAULT 0, + hash text NOT NULL DEFAULT '', + timestamp timestamp with time zone NOT NULL DEFAULT '0001-01-01 00:00:00+00', + release boolean NOT NULL DEFAULT false, + latency_90 bigint NOT NULL DEFAULT 0, + audit_success_count bigint NOT NULL DEFAULT 0, + total_audit_count bigint NOT NULL DEFAULT 0, + vetted_at timestamp with time zone, + uptime_success_count bigint NOT NULL, + total_uptime_count bigint NOT NULL, + created_at timestamp with time zone NOT NULL DEFAULT current_timestamp, + updated_at timestamp with time zone NOT NULL DEFAULT current_timestamp, + last_contact_success timestamp with time zone NOT NULL DEFAULT 'epoch', + last_contact_failure timestamp with time zone NOT NULL DEFAULT 'epoch', + contained boolean NOT NULL DEFAULT false, + disqualified timestamp with time zone, + suspended timestamp with time zone, + unknown_audit_suspended timestamp with time zone, + offline_suspended timestamp with time zone, + under_review timestamp with time zone, + audit_reputation_alpha double precision NOT NULL DEFAULT 1, + audit_reputation_beta double precision NOT NULL DEFAULT 0, + unknown_audit_reputation_alpha double precision NOT NULL DEFAULT 1, + unknown_audit_reputation_beta double precision NOT NULL DEFAULT 0, + uptime_reputation_alpha double precision NOT NULL DEFAULT 1, + uptime_reputation_beta double precision NOT NULL DEFAULT 0, + exit_initiated_at timestamp with time zone, + exit_loop_completed_at timestamp with time zone, + exit_finished_at timestamp with time zone, + exit_success boolean NOT NULL DEFAULT false, + PRIMARY KEY ( id ) +); +CREATE TABLE node_api_versions ( + id bytea NOT NULL, + api_version integer NOT NULL, + created_at timestamp with time zone NOT NULL, + updated_at timestamp with time zone NOT NULL, + PRIMARY KEY ( id ) +); +CREATE TABLE nodes_offline_times ( + node_id bytea NOT NULL, + tracked_at timestamp with time zone NOT NULL, + seconds integer NOT NULL, + PRIMARY KEY ( node_id, tracked_at ) +); +CREATE TABLE offers ( + id serial NOT NULL, + name text NOT NULL, + description text NOT NULL, + award_credit_in_cents integer NOT NULL DEFAULT 0, + invitee_credit_in_cents integer NOT NULL DEFAULT 0, + award_credit_duration_days integer, + invitee_credit_duration_days integer, + redeemable_cap integer, + expires_at timestamp with time zone NOT NULL, + created_at timestamp with time zone NOT NULL, + status integer NOT NULL, + type integer NOT NULL, + PRIMARY KEY ( id ) +); +CREATE TABLE peer_identities ( + node_id bytea NOT NULL, + leaf_serial_number bytea NOT NULL, + chain bytea NOT NULL, + updated_at timestamp with time zone NOT NULL, + PRIMARY KEY ( node_id ) +); +CREATE TABLE pending_audits ( + node_id bytea NOT NULL, + piece_id bytea NOT NULL, + stripe_index bigint NOT NULL, + share_size bigint NOT NULL, + expected_share_hash bytea NOT NULL, + reverify_count bigint NOT NULL, + path bytea NOT NULL, + PRIMARY KEY ( node_id ) +); +CREATE TABLE pending_serial_queue ( + storage_node_id bytea NOT NULL, + bucket_id bytea NOT NULL, + serial_number bytea NOT NULL, + action integer NOT NULL, + settled bigint NOT NULL, + expires_at timestamp with time zone NOT NULL, + PRIMARY KEY ( storage_node_id, bucket_id, serial_number ) +); +CREATE TABLE projects ( + id bytea NOT NULL, + name text NOT NULL, + description text NOT NULL, + usage_limit bigint NOT NULL DEFAULT 0, + bandwidth_limit bigint NOT NULL DEFAULT 0, + rate_limit integer, + max_buckets integer NOT NULL DEFAULT 0, + partner_id bytea, + owner_id bytea NOT NULL, + created_at timestamp with time zone NOT NULL, + PRIMARY KEY ( id ) +); +CREATE TABLE project_bandwidth_rollups ( + project_id bytea NOT NULL, + interval_month date NOT NULL, + egress_allocated bigint NOT NULL, + PRIMARY KEY ( project_id, interval_month ) +); +CREATE TABLE registration_tokens ( + secret bytea NOT NULL, + owner_id bytea, + project_limit integer NOT NULL, + created_at timestamp with time zone NOT NULL, + PRIMARY KEY ( secret ), + UNIQUE ( owner_id ) +); +CREATE TABLE reported_serials ( + expires_at timestamp with time zone NOT NULL, + storage_node_id bytea NOT NULL, + bucket_id bytea NOT NULL, + action integer NOT NULL, + serial_number bytea NOT NULL, + settled bigint NOT NULL, + observed_at timestamp with time zone NOT NULL, + PRIMARY KEY ( expires_at, storage_node_id, bucket_id, action, serial_number ) +); +CREATE TABLE reset_password_tokens ( + secret bytea NOT NULL, + owner_id bytea NOT NULL, + created_at timestamp with time zone NOT NULL, + PRIMARY KEY ( secret ), + UNIQUE ( owner_id ) +); +CREATE TABLE revocations ( + revoked bytea NOT NULL, + api_key_id bytea NOT NULL, + PRIMARY KEY ( revoked ) +); +CREATE TABLE serial_numbers ( + id serial NOT NULL, + serial_number bytea NOT NULL, + bucket_id bytea NOT NULL, + expires_at timestamp with time zone NOT NULL, + PRIMARY KEY ( id ) +); +CREATE TABLE storagenode_bandwidth_rollups ( + storagenode_id bytea NOT NULL, + interval_start timestamp with time zone NOT NULL, + interval_seconds integer NOT NULL, + action integer NOT NULL, + allocated bigint DEFAULT 0, + settled bigint NOT NULL, + PRIMARY KEY ( storagenode_id, interval_start, action ) +); +CREATE TABLE storagenode_payments ( + id bigserial NOT NULL, + created_at timestamp with time zone NOT NULL, + node_id bytea NOT NULL, + period text NOT NULL, + amount bigint NOT NULL, + receipt text, + notes text, + PRIMARY KEY ( id ) +); +CREATE TABLE storagenode_paystubs ( + period text NOT NULL, + node_id bytea NOT NULL, + created_at timestamp with time zone NOT NULL, + codes text NOT NULL, + usage_at_rest double precision NOT NULL, + usage_get bigint NOT NULL, + usage_put bigint NOT NULL, + usage_get_repair bigint NOT NULL, + usage_put_repair bigint NOT NULL, + usage_get_audit bigint NOT NULL, + comp_at_rest bigint NOT NULL, + comp_get bigint NOT NULL, + comp_put bigint NOT NULL, + comp_get_repair bigint NOT NULL, + comp_put_repair bigint NOT NULL, + comp_get_audit bigint NOT NULL, + surge_percent bigint NOT NULL, + held bigint NOT NULL, + owed bigint NOT NULL, + disposed bigint NOT NULL, + paid bigint NOT NULL, + PRIMARY KEY ( period, node_id ) +); +CREATE TABLE storagenode_storage_tallies ( + node_id bytea NOT NULL, + interval_end_time timestamp with time zone NOT NULL, + data_total double precision NOT NULL, + PRIMARY KEY ( interval_end_time, node_id ) +); +CREATE TABLE stripe_customers ( + user_id bytea NOT NULL, + customer_id text NOT NULL, + created_at timestamp with time zone NOT NULL, + PRIMARY KEY ( user_id ), + UNIQUE ( customer_id ) +); +CREATE TABLE stripecoinpayments_invoice_project_records ( + id bytea NOT NULL, + project_id bytea NOT NULL, + storage double precision NOT NULL, + egress bigint NOT NULL, + objects bigint NOT NULL, + period_start timestamp with time zone NOT NULL, + period_end timestamp with time zone NOT NULL, + state integer NOT NULL, + created_at timestamp with time zone NOT NULL, + PRIMARY KEY ( id ), + UNIQUE ( project_id, period_start, period_end ) +); +CREATE TABLE stripecoinpayments_tx_conversion_rates ( + tx_id text NOT NULL, + rate bytea NOT NULL, + created_at timestamp with time zone NOT NULL, + PRIMARY KEY ( tx_id ) +); +CREATE TABLE users ( + id bytea NOT NULL, + email text NOT NULL, + normalized_email text NOT NULL, + full_name text NOT NULL, + short_name text, + password_hash bytea NOT NULL, + status integer NOT NULL, + partner_id bytea, + created_at timestamp with time zone NOT NULL, + project_limit integer NOT NULL DEFAULT 0, + PRIMARY KEY ( id ) +); +CREATE TABLE value_attributions ( + project_id bytea NOT NULL, + bucket_name bytea NOT NULL, + partner_id bytea NOT NULL, + last_updated timestamp with time zone NOT NULL, + PRIMARY KEY ( project_id, bucket_name ) +); +CREATE TABLE api_keys ( + id bytea NOT NULL, + project_id bytea NOT NULL REFERENCES projects( id ) ON DELETE CASCADE, + head bytea NOT NULL, + name text NOT NULL, + secret bytea NOT NULL, + partner_id bytea, + created_at timestamp with time zone NOT NULL, + PRIMARY KEY ( id ), + UNIQUE ( head ), + UNIQUE ( name, project_id ) +); +CREATE TABLE bucket_metainfos ( + id bytea NOT NULL, + project_id bytea NOT NULL REFERENCES projects( id ), + name bytea NOT NULL, + partner_id bytea, + path_cipher integer NOT NULL, + created_at timestamp with time zone NOT NULL, + default_segment_size integer NOT NULL, + default_encryption_cipher_suite integer NOT NULL, + default_encryption_block_size integer NOT NULL, + default_redundancy_algorithm integer NOT NULL, + default_redundancy_share_size integer NOT NULL, + default_redundancy_required_shares integer NOT NULL, + default_redundancy_repair_shares integer NOT NULL, + default_redundancy_optimal_shares integer NOT NULL, + default_redundancy_total_shares integer NOT NULL, + PRIMARY KEY ( id ), + UNIQUE ( name, project_id ), + UNIQUE ( project_id, name ) +); +CREATE TABLE project_invoice_stamps ( + project_id bytea NOT NULL REFERENCES projects( id ) ON DELETE CASCADE, + invoice_id bytea NOT NULL, + start_date timestamp with time zone NOT NULL, + end_date timestamp with time zone NOT NULL, + created_at timestamp with time zone NOT NULL, + PRIMARY KEY ( project_id, start_date, end_date ), + UNIQUE ( invoice_id ) +); +CREATE TABLE project_members ( + member_id bytea NOT NULL REFERENCES users( id ) ON DELETE CASCADE, + project_id bytea NOT NULL REFERENCES projects( id ) ON DELETE CASCADE, + created_at timestamp with time zone NOT NULL, + PRIMARY KEY ( member_id, project_id ) +); +CREATE TABLE stripecoinpayments_apply_balance_intents ( + tx_id text NOT NULL REFERENCES coinpayments_transactions( id ) ON DELETE CASCADE, + state integer NOT NULL, + created_at timestamp with time zone NOT NULL, + PRIMARY KEY ( tx_id ) +); +CREATE TABLE used_serials ( + serial_number_id integer NOT NULL REFERENCES serial_numbers( id ) ON DELETE CASCADE, + storage_node_id bytea NOT NULL, + PRIMARY KEY ( serial_number_id, storage_node_id ) +); +CREATE TABLE user_credits ( + id serial NOT NULL, + user_id bytea NOT NULL REFERENCES users( id ) ON DELETE CASCADE, + offer_id integer NOT NULL REFERENCES offers( id ), + referred_by bytea REFERENCES users( id ) ON DELETE SET NULL, + type text NOT NULL, + credits_earned_in_cents integer NOT NULL, + credits_used_in_cents integer NOT NULL, + expires_at timestamp with time zone NOT NULL, + created_at timestamp with time zone NOT NULL, + PRIMARY KEY ( id ), + UNIQUE ( id, offer_id ) +); +CREATE INDEX accounting_rollups_start_time_index ON accounting_rollups ( start_time ); +CREATE INDEX bucket_bandwidth_rollups_project_id_action_interval_index ON bucket_bandwidth_rollups ( project_id, action, interval_start ); +CREATE INDEX bucket_bandwidth_rollups_action_interval_project_id_index ON bucket_bandwidth_rollups ( action, interval_start, project_id ); +CREATE INDEX consumed_serials_expires_at_index ON consumed_serials ( expires_at ); +CREATE INDEX injuredsegments_attempted_index ON injuredsegments ( attempted ); +CREATE INDEX injuredsegments_num_healthy_pieces_index ON injuredsegments ( num_healthy_pieces ); +CREATE INDEX node_last_ip ON nodes ( last_net ); +CREATE INDEX nodes_offline_times_node_id_index ON nodes_offline_times ( node_id ); +CREATE UNIQUE INDEX serial_number_index ON serial_numbers ( serial_number ); +CREATE INDEX serial_numbers_expires_at_index ON serial_numbers ( expires_at ); +CREATE INDEX storagenode_payments_node_id_period_index ON storagenode_payments ( node_id, period ); +CREATE INDEX storagenode_paystubs_node_id_index ON storagenode_paystubs ( node_id ); +CREATE INDEX storagenode_storage_tallies_node_id_index ON storagenode_storage_tallies ( node_id ); +CREATE UNIQUE INDEX credits_earned_user_id_offer_id ON user_credits ( id, offer_id ); + +INSERT INTO "accounting_rollups"("id", "node_id", "start_time", "put_total", "get_total", "get_audit_total", "get_repair_total", "put_repair_total", "at_rest_total") VALUES (1, E'\\367M\\177\\251]t/\\022\\256\\214\\265\\025\\224\\204:\\217\\212\\0102<\\321\\374\\020&\\271Qc\\325\\261\\354\\246\\233'::bytea, '2019-02-09 00:00:00+00', 1000, 2000, 3000, 4000, 0, 5000); + +INSERT INTO "accounting_timestamps" VALUES ('LastAtRestTally', '0001-01-01 00:00:00+00'); +INSERT INTO "accounting_timestamps" VALUES ('LastRollup', '0001-01-01 00:00:00+00'); +INSERT INTO "accounting_timestamps" VALUES ('LastBandwidthTally', '0001-01-01 00:00:00+00'); + +INSERT INTO "nodes"("id", "address", "last_net", "protocol", "type", "email", "wallet", "free_disk", "piece_count", "major", "minor", "patch", "hash", "timestamp", "release","latency_90", "audit_success_count", "total_audit_count", "uptime_success_count", "total_uptime_count", "created_at", "updated_at", "last_contact_success", "last_contact_failure", "contained", "disqualified", "suspended", "audit_reputation_alpha", "audit_reputation_beta", "unknown_audit_reputation_alpha", "unknown_audit_reputation_beta", "uptime_reputation_alpha", "uptime_reputation_beta", "exit_success") VALUES (E'\\153\\313\\233\\074\\327\\177\\136\\070\\346\\001', '127.0.0.1:55516', '', 0, 4, '', '', -1, 0, 0, 1, 0, '', 'epoch', false, 0, 0, 5, 0, 5, '2019-02-14 08:07:31.028103+00', '2019-02-14 08:07:31.108963+00', 'epoch', 'epoch', false, NULL, NULL, 50, 0, 1, 0, 100, 5, false); +INSERT INTO "nodes"("id", "address", "last_net", "protocol", "type", "email", "wallet", "free_disk", "piece_count", "major", "minor", "patch", "hash", "timestamp", "release","latency_90", "audit_success_count", "total_audit_count", "uptime_success_count", "total_uptime_count", "created_at", "updated_at", "last_contact_success", "last_contact_failure", "contained", "disqualified", "suspended", "audit_reputation_alpha", "audit_reputation_beta", "unknown_audit_reputation_alpha", "unknown_audit_reputation_beta", "uptime_reputation_alpha", "uptime_reputation_beta", "exit_success") VALUES (E'\\006\\223\\250R\\221\\005\\365\\377v>0\\266\\365\\216\\255?\\347\\244\\371?2\\264\\262\\230\\007<\\001\\262\\263\\237\\247n', '127.0.0.1:55518', '', 0, 4, '', '', -1, 0, 0, 1, 0, '', 'epoch', false, 0, 0, 0, 3, 3, '2019-02-14 08:07:31.028103+00', '2019-02-14 08:07:31.108963+00', 'epoch', 'epoch', false, NULL, NULL, 50, 0, 1, 0, 100, 0, false); +INSERT INTO "nodes"("id", "address", "last_net", "protocol", "type", "email", "wallet", "free_disk", "piece_count", "major", "minor", "patch", "hash", "timestamp", "release","latency_90", "audit_success_count", "total_audit_count", "uptime_success_count", "total_uptime_count", "created_at", "updated_at", "last_contact_success", "last_contact_failure", "contained", "disqualified", "suspended", "audit_reputation_alpha", "audit_reputation_beta", "unknown_audit_reputation_alpha", "unknown_audit_reputation_beta", "uptime_reputation_alpha", "uptime_reputation_beta", "exit_success") VALUES (E'\\363\\342\\363\\371>+F\\256\\263\\300\\273|\\342N\\347\\014', '127.0.0.1:55517', '', 0, 4, '', '', -1, 0, 0, 1, 0, '', 'epoch', false, 0, 0, 0, 0, 0, '2019-02-14 08:07:31.028103+00', '2019-02-14 08:07:31.108963+00', 'epoch', 'epoch', false, NULL, NULL, 50, 0, 1, 0, 100, 0, false); +INSERT INTO "nodes"("id", "address", "last_net", "protocol", "type", "email", "wallet", "free_disk", "piece_count", "major", "minor", "patch", "hash", "timestamp", "release","latency_90", "audit_success_count", "total_audit_count", "uptime_success_count", "total_uptime_count", "created_at", "updated_at", "last_contact_success", "last_contact_failure", "contained", "disqualified", "suspended", "audit_reputation_alpha", "audit_reputation_beta", "unknown_audit_reputation_alpha", "unknown_audit_reputation_beta", "uptime_reputation_alpha", "uptime_reputation_beta", "exit_success") VALUES (E'\\363\\342\\363\\371>+F\\256\\263\\300\\273|\\342N\\347\\015', '127.0.0.1:55519', '', 0, 4, '', '', -1, 0, 0, 1, 0, '', 'epoch', false, 0, 1, 2, 1, 2, '2019-02-14 08:07:31.028103+00', '2019-02-14 08:07:31.108963+00', 'epoch', 'epoch', false, NULL, NULL, 50, 0, 1, 0, 100, 1, false); +INSERT INTO "nodes"("id", "address", "last_net", "protocol", "type", "email", "wallet", "free_disk", "piece_count", "major", "minor", "patch", "hash", "timestamp", "release","latency_90", "audit_success_count", "total_audit_count", "uptime_success_count", "total_uptime_count", "created_at", "updated_at", "last_contact_success", "last_contact_failure", "contained", "disqualified", "suspended", "audit_reputation_alpha", "audit_reputation_beta", "unknown_audit_reputation_alpha", "unknown_audit_reputation_beta", "uptime_reputation_alpha", "uptime_reputation_beta", "exit_success", "vetted_at") VALUES (E'\\363\\342\\363\\371>+F\\256\\263\\300\\273|\\342N\\347\\016', '127.0.0.1:55520', '', 0, 4, '', '', -1, 0, 0, 1, 0, '', 'epoch', false, 0, 300, 400, 300, 400, '2019-02-14 08:07:31.028103+00', '2019-02-14 08:07:31.108963+00', 'epoch', 'epoch', false, NULL, NULL, 300, 0, 1, 0, 300, 100, false, '2020-03-18 12:00:00.000000+00'); +INSERT INTO "nodes"("id", "address", "last_net", "protocol", "type", "email", "wallet", "free_disk", "piece_count", "major", "minor", "patch", "hash", "timestamp", "release","latency_90", "audit_success_count", "total_audit_count", "uptime_success_count", "total_uptime_count", "created_at", "updated_at", "last_contact_success", "last_contact_failure", "contained", "disqualified", "suspended", "audit_reputation_alpha", "audit_reputation_beta", "unknown_audit_reputation_alpha", "unknown_audit_reputation_beta", "uptime_reputation_alpha", "uptime_reputation_beta", "exit_success") VALUES (E'\\154\\313\\233\\074\\327\\177\\136\\070\\346\\001', '127.0.0.1:55516', '', 0, 4, '', '', -1, 0, 0, 1, 0, '', 'epoch', false, 0, 0, 5, 0, 5, '2019-02-14 08:07:31.028103+00', '2019-02-14 08:07:31.108963+00', 'epoch', 'epoch', false, NULL, NULL, 50, 0, 75, 25, 100, 5, false); +INSERT INTO "nodes"("id", "address", "last_net", "last_ip_port", "protocol", "type", "email", "wallet", "free_disk", "piece_count", "major", "minor", "patch", "hash", "timestamp", "release","latency_90", "audit_success_count", "total_audit_count", "uptime_success_count", "total_uptime_count", "created_at", "updated_at", "last_contact_success", "last_contact_failure", "contained", "disqualified", "suspended", "audit_reputation_alpha", "audit_reputation_beta", "unknown_audit_reputation_alpha", "unknown_audit_reputation_beta", "uptime_reputation_alpha", "uptime_reputation_beta", "exit_success") VALUES (E'\\154\\313\\233\\074\\327\\177\\136\\070\\346\\002', '127.0.0.1:55516', '127.0.0.0', '127.0.0.1:55516', 0, 4, '', '', -1, 0, 0, 1, 0, '', 'epoch', false, 0, 0, 5, 0, 5, '2019-02-14 08:07:31.028103+00', '2019-02-14 08:07:31.108963+00', 'epoch', 'epoch', false, NULL, NULL, 50, 0, 75, 25, 100, 5, false); + +INSERT INTO "users"("id", "full_name", "short_name", "email", "normalized_email", "password_hash", "status", "partner_id", "created_at") VALUES (E'\\363\\311\\033w\\222\\303Ci\\265\\343U\\303\\312\\204",'::bytea, 'Noahson', 'William', '1email1@mail.test', '1EMAIL1@MAIL.TEST', E'some_readable_hash'::bytea, 1, NULL, '2019-02-14 08:28:24.614594+00'); +INSERT INTO "projects"("id", "name", "description", "usage_limit", "partner_id", "owner_id", "created_at") VALUES (E'\\022\\217/\\014\\376!K\\023\\276\\031\\311}m\\236\\205\\300'::bytea, 'ProjectName', 'projects description', 0, NULL, E'\\363\\311\\033w\\222\\303Ci\\265\\343U\\303\\312\\204",'::bytea, '2019-02-14 08:28:24.254934+00'); + +INSERT INTO "projects"("id", "name", "description", "usage_limit", "partner_id", "owner_id", "created_at") VALUES (E'\\363\\342\\363\\371>+F\\256\\263\\300\\273|\\342N\\347\\014'::bytea, 'projName1', 'Test project 1', 0, NULL, E'\\363\\311\\033w\\222\\303Ci\\265\\343U\\303\\312\\204",'::bytea, '2019-02-14 08:28:24.636949+00'); +INSERT INTO "project_members"("member_id", "project_id", "created_at") VALUES (E'\\363\\311\\033w\\222\\303Ci\\265\\343U\\303\\312\\204",'::bytea, E'\\363\\342\\363\\371>+F\\256\\263\\300\\273|\\342N\\347\\014'::bytea, '2019-02-14 08:28:24.677953+00'); +INSERT INTO "project_members"("member_id", "project_id", "created_at") VALUES (E'\\363\\311\\033w\\222\\303Ci\\265\\343U\\303\\312\\204",'::bytea, E'\\022\\217/\\014\\376!K\\023\\276\\031\\311}m\\236\\205\\300'::bytea, '2019-02-13 08:28:24.677953+00'); + +INSERT INTO "irreparabledbs" ("segmentpath", "segmentdetail", "pieces_lost_count", "seg_damaged_unix_sec", "repair_attempt_count") VALUES ('\x49616d5365676d656e746b6579696e666f30', '\x49616d5365676d656e7464657461696c696e666f30', 10, 1550159554, 10); + +INSERT INTO "registration_tokens" ("secret", "owner_id", "project_limit", "created_at") VALUES (E'\\070\\127\\144\\013\\332\\344\\102\\376\\306\\056\\303\\130\\106\\132\\321\\276\\321\\274\\170\\264\\054\\333\\221\\116\\154\\221\\335\\070\\220\\146\\344\\216'::bytea, null, 1, '2019-02-14 08:28:24.677953+00'); + +INSERT INTO "serial_numbers" ("id", "serial_number", "bucket_id", "expires_at") VALUES (1, E'0123456701234567'::bytea, E'\\363\\342\\363\\371>+F\\256\\263\\300\\273|\\342N\\347\\014/testbucket'::bytea, '2019-03-06 08:28:24.677953+00'); +INSERT INTO "used_serials" ("serial_number_id", "storage_node_id") VALUES (1, E'\\006\\223\\250R\\221\\005\\365\\377v>0\\266\\365\\216\\255?\\347\\244\\371?2\\264\\262\\230\\007<\\001\\262\\263\\237\\247n'); + +INSERT INTO "storagenode_bandwidth_rollups" ("storagenode_id", "interval_start", "interval_seconds", "action", "allocated", "settled") VALUES (E'\\006\\223\\250R\\221\\005\\365\\377v>0\\266\\365\\216\\255?\\347\\244\\371?2\\264\\262\\230\\007<\\001\\262\\263\\237\\247n', '2019-03-06 08:00:00.000000' AT TIME ZONE current_setting('TIMEZONE'), 3600, 1, 1024, 2024); +INSERT INTO "storagenode_storage_tallies" VALUES (E'\\3510\\323\\225"~\\036<\\342\\330m\\0253Jhr\\246\\233K\\246#\\2303\\351\\256\\275j\\212UM\\362\\207', '2019-02-14 08:16:57.812849+00', 1000); + +INSERT INTO "bucket_bandwidth_rollups" ("bucket_name", "project_id", "interval_start", "interval_seconds", "action", "inline", "allocated", "settled") VALUES (E'testbucket'::bytea, E'\\363\\342\\363\\371>+F\\256\\263\\300\\273|\\342N\\347\\014'::bytea,'2019-03-06 08:00:00.000000' AT TIME ZONE current_setting('TIMEZONE'), 3600, 1, 1024, 2024, 3024); +INSERT INTO "bucket_storage_tallies" ("bucket_name", "project_id", "interval_start", "inline", "remote", "remote_segments_count", "inline_segments_count", "object_count", "metadata_size") VALUES (E'testbucket'::bytea, E'\\363\\342\\363\\371>+F\\256\\263\\300\\273|\\342N\\347\\014'::bytea,'2019-03-06 08:00:00.000000' AT TIME ZONE current_setting('TIMEZONE'), 4024, 5024, 0, 0, 0, 0); +INSERT INTO "bucket_bandwidth_rollups" ("bucket_name", "project_id", "interval_start", "interval_seconds", "action", "inline", "allocated", "settled") VALUES (E'testbucket'::bytea, E'\\170\\160\\157\\370\\274\\366\\113\\364\\272\\235\\301\\243\\321\\102\\321\\136'::bytea,'2019-03-06 08:00:00.000000' AT TIME ZONE current_setting('TIMEZONE'), 3600, 1, 1024, 2024, 3024); +INSERT INTO "bucket_storage_tallies" ("bucket_name", "project_id", "interval_start", "inline", "remote", "remote_segments_count", "inline_segments_count", "object_count", "metadata_size") VALUES (E'testbucket'::bytea, E'\\170\\160\\157\\370\\274\\366\\113\\364\\272\\235\\301\\243\\321\\102\\321\\136'::bytea,'2019-03-06 08:00:00.000000' AT TIME ZONE current_setting('TIMEZONE'), 4024, 5024, 0, 0, 0, 0); + +INSERT INTO "reset_password_tokens" ("secret", "owner_id", "created_at") VALUES (E'\\070\\127\\144\\013\\332\\344\\102\\376\\306\\056\\303\\130\\106\\132\\321\\276\\321\\274\\170\\264\\054\\333\\221\\116\\154\\221\\335\\070\\220\\146\\344\\216'::bytea, E'\\363\\311\\033w\\222\\303Ci\\265\\343U\\303\\312\\204",'::bytea, '2019-05-08 08:28:24.677953+00'); + +INSERT INTO "offers" ("id", "name", "description", "award_credit_in_cents", "invitee_credit_in_cents", "expires_at", "created_at", "status", "type", "award_credit_duration_days", "invitee_credit_duration_days") VALUES (1, 'Default referral offer', 'Is active when no other active referral offer', 300, 600, '2119-03-14 08:28:24.636949+00', '2019-07-14 08:28:24.636949+00', 1, 2, 365, 14); +INSERT INTO "offers" ("id", "name", "description", "award_credit_in_cents", "invitee_credit_in_cents", "expires_at", "created_at", "status", "type", "award_credit_duration_days", "invitee_credit_duration_days") VALUES (2, 'Default free credit offer', 'Is active when no active free credit offer', 0, 300, '2119-03-14 08:28:24.636949+00', '2019-07-14 08:28:24.636949+00', 1, 1, NULL, 14); + +INSERT INTO "api_keys" ("id", "project_id", "head", "name", "secret", "partner_id", "created_at") VALUES (E'\\334/\\302;\\225\\355O\\323\\276f\\247\\354/6\\241\\033'::bytea, E'\\022\\217/\\014\\376!K\\023\\276\\031\\311}m\\236\\205\\300'::bytea, E'\\111\\142\\147\\304\\132\\375\\070\\163\\270\\160\\251\\370\\126\\063\\351\\037\\257\\071\\143\\375\\351\\320\\253\\232\\220\\260\\075\\173\\306\\307\\115\\136'::bytea, 'key 2', E'\\254\\011\\315\\333\\273\\365\\001\\071\\024\\154\\253\\332\\301\\216\\361\\074\\221\\367\\251\\231\\274\\333\\300\\367\\001\\272\\327\\111\\315\\123\\042\\016'::bytea, NULL, '2019-02-14 08:28:24.267934+00'); + +INSERT INTO "project_invoice_stamps" ("project_id", "invoice_id", "start_date", "end_date", "created_at") VALUES (E'\\022\\217/\\014\\376!K\\023\\276\\031\\311}m\\236\\205\\300'::bytea, E'\\363\\311\\033w\\222\\303,'::bytea, '2019-06-01 08:28:24.267934+00', '2019-06-29 08:28:24.267934+00', '2019-06-01 08:28:24.267934+00'); + +INSERT INTO "value_attributions" ("project_id", "bucket_name", "partner_id", "last_updated") VALUES (E'\\363\\311\\033w\\222\\303Ci\\265\\343U\\303\\312\\204",'::bytea, E''::bytea, E'\\363\\342\\363\\371>+F\\256\\263\\300\\273|\\342N\\347\\014'::bytea,'2019-02-14 08:07:31.028103+00'); + +INSERT INTO "user_credits" ("id", "user_id", "offer_id", "referred_by", "credits_earned_in_cents", "credits_used_in_cents", "type", "expires_at", "created_at") VALUES (1, E'\\363\\311\\033w\\222\\303Ci\\265\\343U\\303\\312\\204",'::bytea, 1, E'\\363\\311\\033w\\222\\303Ci\\265\\343U\\303\\312\\204",'::bytea, 200, 0, 'invalid', '2019-10-01 08:28:24.267934+00', '2019-06-01 08:28:24.267934+00'); + +INSERT INTO "bucket_metainfos" ("id", "project_id", "name", "partner_id", "created_at", "path_cipher", "default_segment_size", "default_encryption_cipher_suite", "default_encryption_block_size", "default_redundancy_algorithm", "default_redundancy_share_size", "default_redundancy_required_shares", "default_redundancy_repair_shares", "default_redundancy_optimal_shares", "default_redundancy_total_shares") VALUES (E'\\334/\\302;\\225\\355O\\323\\276f\\247\\354/6\\241\\033'::bytea, E'\\022\\217/\\014\\376!K\\023\\276\\031\\311}m\\236\\205\\300'::bytea, E'testbucketuniquename'::bytea, NULL, '2019-06-14 08:28:24.677953+00', 1, 65536, 1, 8192, 1, 4096, 4, 6, 8, 10); + +INSERT INTO "pending_audits" ("node_id", "piece_id", "stripe_index", "share_size", "expected_share_hash", "reverify_count", "path") VALUES (E'\\153\\313\\233\\074\\327\\177\\136\\070\\346\\001'::bytea, E'\\363\\311\\033w\\222\\303Ci\\265\\343U\\303\\312\\204",'::bytea, 5, 1024, E'\\070\\127\\144\\013\\332\\344\\102\\376\\306\\056\\303\\130\\106\\132\\321\\276\\321\\274\\170\\264\\054\\333\\221\\116\\154\\221\\335\\070\\220\\146\\344\\216'::bytea, 1, 'not null'); + +INSERT INTO "peer_identities" VALUES (E'\\334/\\302;\\225\\355O\\323\\276f\\247\\354/6\\241\\033'::bytea, E'\\363\\342\\363\\371>+F\\256\\263\\300\\273|\\342N\\347\\014'::bytea, E'\\363\\311\\033w\\222\\303Ci\\265\\343U\\303\\312\\204",'::bytea, '2019-02-14 08:07:31.335028+00'); + +INSERT INTO "graceful_exit_progress" ("node_id", "bytes_transferred", "pieces_transferred", "pieces_failed", "updated_at") VALUES (E'\\363\\342\\363\\371>+F\\256\\263\\300\\273|\\342N\\347\\016', 1000000000000000, 0, 0, '2019-09-12 10:07:31.028103+00'); +INSERT INTO "graceful_exit_transfer_queue" ("node_id", "path", "piece_num", "durability_ratio", "queued_at", "requested_at", "last_failed_at", "last_failed_code", "failed_count", "finished_at", "order_limit_send_count") VALUES (E'\\363\\342\\363\\371>+F\\256\\263\\300\\273|\\342N\\347\\016', E'f8419768-5baa-4901-b3ba-62808013ec45/s0/test3/\\240\\243\\223n \\334~b}\\2624)\\250m\\201\\202\\235\\276\\361\\3304\\323\\352\\311\\361\\353;\\326\\311', 8, 1.0, '2019-09-12 10:07:31.028103+00', '2019-09-12 10:07:32.028103+00', null, null, 0, '2019-09-12 10:07:33.028103+00', 0); +INSERT INTO "graceful_exit_transfer_queue" ("node_id", "path", "piece_num", "durability_ratio", "queued_at", "requested_at", "last_failed_at", "last_failed_code", "failed_count", "finished_at", "order_limit_send_count") VALUES (E'\\363\\342\\363\\371>+F\\256\\263\\300\\273|\\342N\\347\\016', E'f8419768-5baa-4901-b3ba-62808013ec45/s0/test3/\\240\\243\\223n \\334~b}\\2624)\\250m\\201\\202\\235\\276\\361\\3304\\323\\352\\311\\361\\353;\\326\\312', 8, 1.0, '2019-09-12 10:07:31.028103+00', '2019-09-12 10:07:32.028103+00', null, null, 0, '2019-09-12 10:07:33.028103+00', 0); + +INSERT INTO "stripe_customers" ("user_id", "customer_id", "created_at") VALUES (E'\\363\\311\\033w\\222\\303Ci\\265\\343U\\303\\312\\204",'::bytea, 'stripe_id', '2019-06-01 08:28:24.267934+00'); + +INSERT INTO "graceful_exit_transfer_queue" ("node_id", "path", "piece_num", "durability_ratio", "queued_at", "requested_at", "last_failed_at", "last_failed_code", "failed_count", "finished_at", "order_limit_send_count") VALUES (E'\\363\\342\\363\\371>+F\\256\\263\\300\\273|\\342N\\347\\016', E'f8419768-5baa-4901-b3ba-62808013ec45/s0/test3/\\240\\243\\223n \\334~b}\\2624)\\250m\\201\\202\\235\\276\\361\\3304\\323\\352\\311\\361\\353;\\326\\311', 9, 1.0, '2019-09-12 10:07:31.028103+00', '2019-09-12 10:07:32.028103+00', null, null, 0, '2019-09-12 10:07:33.028103+00', 0); +INSERT INTO "graceful_exit_transfer_queue" ("node_id", "path", "piece_num", "durability_ratio", "queued_at", "requested_at", "last_failed_at", "last_failed_code", "failed_count", "finished_at", "order_limit_send_count") VALUES (E'\\363\\342\\363\\371>+F\\256\\263\\300\\273|\\342N\\347\\016', E'f8419768-5baa-4901-b3ba-62808013ec45/s0/test3/\\240\\243\\223n \\334~b}\\2624)\\250m\\201\\202\\235\\276\\361\\3304\\323\\352\\311\\361\\353;\\326\\312', 9, 1.0, '2019-09-12 10:07:31.028103+00', '2019-09-12 10:07:32.028103+00', null, null, 0, '2019-09-12 10:07:33.028103+00', 0); + +INSERT INTO "stripecoinpayments_invoice_project_records"("id", "project_id", "storage", "egress", "objects", "period_start", "period_end", "state", "created_at") VALUES (E'\\022\\217/\\014\\376!K\\023\\276\\031\\311}m\\236\\205\\300'::bytea, E'\\021\\217/\\014\\376!K\\023\\276\\031\\311}m\\236\\205\\300'::bytea, 0, 0, 0, '2019-06-01 08:28:24.267934+00', '2019-06-01 08:28:24.267934+00', 0, '2019-06-01 08:28:24.267934+00'); + +INSERT INTO "graceful_exit_transfer_queue" ("node_id", "path", "piece_num", "root_piece_id", "durability_ratio", "queued_at", "requested_at", "last_failed_at", "last_failed_code", "failed_count", "finished_at", "order_limit_send_count") VALUES (E'\\363\\342\\363\\371>+F\\256\\263\\300\\273|\\342N\\347\\016', E'f8419768-5baa-4901-b3ba-62808013ec45/s0/test3/\\240\\243\\223n \\334~b}\\2624)\\250m\\201\\202\\235\\276\\361\\3304\\323\\352\\311\\361\\353;\\326\\311', 10, E'\\363\\311\\033w\\222\\303Ci\\265\\343U\\303\\312\\204",'::bytea, 1.0, '2019-09-12 10:07:31.028103+00', '2019-09-12 10:07:32.028103+00', null, null, 0, '2019-09-12 10:07:33.028103+00', 0); + +INSERT INTO "stripecoinpayments_tx_conversion_rates" ("tx_id", "rate", "created_at") VALUES ('tx_id', E'\\363\\311\\033w\\222\\303Ci,'::bytea, '2019-06-01 08:28:24.267934+00'); + +INSERT INTO "coinpayments_transactions" ("id", "user_id", "address", "amount", "received", "status", "key", "timeout", "created_at") VALUES ('tx_id', E'\\363\\311\\033w\\222\\303Ci\\265\\343U\\303\\312\\204",'::bytea, 'address', E'\\363\\311\\033w'::bytea, E'\\363\\311\\033w'::bytea, 1, 'key', 60, '2019-06-01 08:28:24.267934+00'); + +INSERT INTO "nodes_offline_times" ("node_id", "tracked_at", "seconds") VALUES (E'\\153\\313\\233\\074\\327\\177\\136\\070\\346\\001'::bytea, '2019-06-01 09:28:24.267934+00', 3600); +INSERT INTO "nodes_offline_times" ("node_id", "tracked_at", "seconds") VALUES (E'\\153\\313\\233\\074\\327\\177\\136\\070\\346\\001'::bytea, '2017-06-01 09:28:24.267934+00', 100); +INSERT INTO "nodes_offline_times" ("node_id", "tracked_at", "seconds") VALUES (E'\\006\\223\\250R\\221\\005\\365\\377v>0\\266\\365\\216\\255?\\347\\244\\371?2\\264\\262\\230\\007<\\001\\262\\263\\237\\247n'::bytea, '2019-06-01 09:28:24.267934+00', 3600); + +INSERT INTO "storagenode_bandwidth_rollups" ("storagenode_id", "interval_start", "interval_seconds", "action", "settled") VALUES (E'\\006\\223\\250R\\221\\005\\365\\377v>0\\266\\365\\216\\255?\\347\\244\\371?2\\264\\262\\230\\007<\\001\\262\\263\\237\\247n', '2020-01-11 08:00:00.000000' AT TIME ZONE current_setting('TIMEZONE'), 3600, 1, 2024); + +INSERT INTO "coupons" ("id", "user_id", "amount", "description", "type", "status", "duration", "created_at") VALUES (E'\\362\\342\\363\\371>+F\\256\\263\\300\\273|\\342N\\347\\014'::bytea, E'\\363\\311\\033w\\222\\303Ci\\265\\343U\\303\\312\\204",'::bytea, 50, 'description', 0, 0, 2, '2019-06-01 08:28:24.267934+00'); +INSERT INTO "coupon_usages" ("coupon_id", "amount", "status", "period") VALUES (E'\\362\\342\\363\\371>+F\\256\\263\\300\\273|\\342N\\347\\014'::bytea, 22, 0, '2019-06-01 09:28:24.267934+00'); + +INSERT INTO "reported_serials" ("expires_at", "storage_node_id", "bucket_id", "action", "serial_number", "settled", "observed_at") VALUES ('2020-01-11 08:00:00.000000+00', E'\\006\\223\\250R\\221\\005\\365\\377v>0\\266\\365\\216\\255?\\347\\244\\371?2\\264\\262\\230\\007<\\001\\262\\263\\237\\247n', E'\\363\\342\\363\\371>+F\\256\\263\\300\\273|\\342N\\347\\014/testbucket'::bytea, 1, E'0123456701234567'::bytea, 100, '2020-01-11 08:00:00.000000+00'); + +INSERT INTO "stripecoinpayments_apply_balance_intents" ("tx_id", "state", "created_at") VALUES ('tx_id', 0, '2019-06-01 08:28:24.267934+00'); + +INSERT INTO "projects"("id", "name", "description", "usage_limit", "rate_limit", "partner_id", "owner_id", "created_at") VALUES (E'\\363\\342\\363\\371>+F\\256\\263\\300\\273|\\342N\\347\\347'::bytea, 'projName1', 'Test project 1', 0, 2000000, NULL, E'\\363\\311\\033w\\222\\303Ci\\265\\343U\\303\\312\\204",'::bytea, '2020-01-15 08:28:24.636949+00'); + +INSERT INTO "pending_serial_queue" ("storage_node_id", "bucket_id", "serial_number", "action", "settled", "expires_at") VALUES (E'\\006\\223\\250R\\221\\005\\365\\377v>0\\266\\365\\216\\255?\\347\\244\\371?2\\264\\262\\230\\007<\\001\\262\\263\\237\\247n', E'\\363\\342\\363\\371>+F\\256\\263\\300\\273|\\342N\\347\\014/testbucket'::bytea, E'5123456701234567'::bytea, 1, 100, '2020-01-11 08:00:00.000000+00'); + +INSERT INTO "consumed_serials" ("storage_node_id", "serial_number", "expires_at") VALUES (E'\\006\\223\\250R\\221\\005\\365\\377v>0\\266\\365\\216\\255?\\347\\244\\371?2\\264\\262\\230\\007<\\001\\262\\263\\237\\247n', E'1234567012345678'::bytea, '2020-01-12 08:00:00.000000+00'); + +INSERT INTO "injuredsegments" ("path", "data", "num_healthy_pieces") VALUES ('0', '\x0a0130120100', 52); +INSERT INTO "injuredsegments" ("path", "data", "num_healthy_pieces") VALUES ('here''s/a/great/path', '\x0a136865726527732f612f67726561742f70617468120a0102030405060708090a', 30); +INSERT INTO "injuredsegments" ("path", "data", "num_healthy_pieces") VALUES ('yet/another/cool/path', '\x0a157965742f616e6f746865722f636f6f6c2f70617468120a0102030405060708090a', 51); +INSERT INTO "injuredsegments" ("path", "data", "num_healthy_pieces") VALUES ('/this/is/a/new/path', '\x0a23736f2f6d616e792f69636f6e69632f70617468732f746f2f63686f6f73652f66726f6d120a0102030405060708090a', 40); + +INSERT INTO "project_bandwidth_rollups"("project_id", "interval_month", egress_allocated) VALUES (E'\\363\\342\\363\\371>+F\\256\\263\\300\\273|\\342N\\347\\347'::bytea, '2020-04-01', 10000); + +INSERT INTO "projects"("id", "name", "description", "usage_limit", "bandwidth_limit", "rate_limit", "partner_id", "owner_id", "created_at") VALUES (E'\\363\\342\\363\\371>+F\\256\\263\\300\\273|\\342N\\347\\345'::bytea, 'egress101', 'High Bandwidth Project', 0, 0, 2000000, NULL, E'\\363\\311\\033w\\222\\303Ci\\265\\343U\\303\\312\\204",'::bytea, '2020-05-15 08:46:24.000000+00'); + +INSERT INTO "storagenode_paystubs"("period", "node_id", "created_at", "codes", "usage_at_rest", "usage_get", "usage_put", "usage_get_repair", "usage_put_repair", "usage_get_audit", "comp_at_rest", "comp_get", "comp_put", "comp_get_repair", "comp_put_repair", "comp_get_audit", "surge_percent", "held", "owed", "disposed", "paid") VALUES ('2020-01', '\xf2a3b4c4dfdf7221310382fd5db5aa73e1d227d6df09734ec4e5305000000000', '2020-04-07T20:14:21.479141Z', '', 1327959864508416, 294054066688, 159031363328, 226751, 0, 836608, 2861984, 5881081, 0, 226751, 0, 8, 300, 0, 26909472, 0, 26909472); +INSERT INTO "nodes"("id", "address", "last_net", "protocol", "type", "email", "wallet", "free_disk", "piece_count", "major", "minor", "patch", "hash", "timestamp", "release","latency_90", "audit_success_count", "total_audit_count", "uptime_success_count", "total_uptime_count", "created_at", "updated_at", "last_contact_success", "last_contact_failure", "contained", "disqualified", "suspended", "audit_reputation_alpha", "audit_reputation_beta", "unknown_audit_reputation_alpha", "unknown_audit_reputation_beta", "uptime_reputation_alpha", "uptime_reputation_beta", "exit_success", "unknown_audit_suspended", "offline_suspended", "under_review") VALUES (E'\\153\\313\\233\\074\\327\\255\\136\\070\\346\\001', '127.0.0.1:55516', '', 0, 4, '', '', -1, 0, 0, 1, 0, '', 'epoch', false, 0, 0, 5, 0, 5, '2019-02-14 08:07:31.028103+00', '2019-02-14 08:07:31.108963+00', 'epoch', 'epoch', false, NULL, NULL, 50, 0, 1, 0, 100, 5, false, '2019-02-14 08:07:31.108963+00', '2019-02-14 08:07:31.108963+00', '2019-02-14 08:07:31.108963+00'); + +INSERT INTO "audit_histories" ("node_id", "history") VALUES (E'\\153\\313\\233\\074\\327\\177\\136\\070\\346\\001', '\x0a23736f2f6d616e792f69636f6e69632f70617468732f746f2f63686f6f73652f66726f6d120a0102030405060708090a'); + +INSERT INTO "node_api_versions"("id", "api_version", "created_at", "updated_at") VALUES (E'\\153\\313\\233\\074\\327\\177\\136\\070\\346\\001', 1, '2019-02-14 08:07:31.028103+00', '2019-02-14 08:07:31.108963+00'); +INSERT INTO "node_api_versions"("id", "api_version", "created_at", "updated_at") VALUES (E'\\006\\223\\250R\\221\\005\\365\\377v>0\\266\\365\\216\\255?\\347\\244\\371?2\\264\\262\\230\\007<\\001\\262\\263\\237\\247n', 2, '2019-02-14 08:07:31.028103+00', '2019-02-14 08:07:31.108963+00'); +INSERT INTO "node_api_versions"("id", "api_version", "created_at", "updated_at") VALUES (E'\\363\\342\\363\\371>+F\\256\\263\\300\\273|\\342N\\347\\014', 3, '2019-02-14 08:07:31.028103+00', '2019-02-14 08:07:31.108963+00'); + +INSERT INTO "projects"("id", "name", "description", "usage_limit", "bandwidth_limit", "rate_limit", "partner_id", "owner_id", "created_at", "max_buckets") VALUES (E'300\\273|\\342N\\347\\347\\363\\342\\363\\371>+F\\256\\263'::bytea, 'egress102', 'High Bandwidth Project 2', 0, 0, 2000000, NULL, E'265\\343U\\303\\312\\312\\363\\311\\033w\\222\\303Ci",'::bytea, '2020-05-15 08:46:24.000000+00', 1000); \ No newline at end of file diff --git a/scripts/test-billing.sh b/scripts/test-billing.sh index 17cbd7d26..980843ea8 100755 --- a/scripts/test-billing.sh +++ b/scripts/test-billing.sh @@ -5,6 +5,5 @@ PERIOD=$(date --date='-1 month' +%m/%Y) satellite --config-dir $SATELLITE_0_DIR billing prepare-invoice-records $PERIOD satellite --config-dir $SATELLITE_0_DIR billing create-invoice-items $PERIOD satellite --config-dir $SATELLITE_0_DIR billing create-invoice-coupons $PERIOD -satellite --config-dir $SATELLITE_0_DIR billing create-invoice-credits $PERIOD satellite --config-dir $SATELLITE_0_DIR billing create-invoices $PERIOD satellite --config-dir $SATELLITE_0_DIR billing finalize-invoices $PERIOD \ No newline at end of file