Project Tags

None

Referenced Files

	F121382370: D964.1777361453.diff
	Mon, Apr 27, 7:30 AM

	F121382361: D964.1777361443.diff
	Mon, Apr 27, 7:30 AM

	F121325686: D964.1777315213.diff
	Sun, Apr 26, 6:40 PM

	F121325613: D964.1777315152.diff
	Sun, Apr 26, 6:39 PM

	F121267024: D964.1777261994.diff
	Sun, Apr 26, 3:53 AM

	F121135966: D964.1777130763.diff
	Fri, Apr 24, 3:26 PM

	F120755825: D964.1776864111.diff
	Tue, Apr 21, 1:21 PM

	F120755820: D964.1776864100.diff
	Tue, Apr 21, 1:21 PM

View All 65 Files

Subscribers

machniak

Restricted Project

Details

Reviewers

machniak

Group Reviewers

Restricted Project

Commits

rKc6fe7764bfc6: Implement a changelog to further the debiting of wallet balances

Summary

This differential maintains a changelog entry for every modification to an entitlement, as it happens.

After a period of time (most notably, 13 days, 14 days, 15 days, 1 month, 2 months, etc.), the expected charges can be calculated from that changelog.

There's a number of TODOs left;

Pro rata temporis calculation
Actual charging of the wallet.
Prediction of the next charge (when, what and how much)
~~Collate the 'creating' and 'charging' queries to ->sum() the values of the columns.~~
Evaluate the number of duplicate 'cost' columns
subscription period for the sku (i.e. domain registered with us -> yearly)

Test Plan

$ vendor/bin/phpunit tests/Feature/BillingTest.php

Diff Detail

Repository

rK kolab

Branch

dev/billing-without-changelog

Lint

No Lint Coverage

Unit

No Test Coverage

Build Status

Buildable 28339
Build 10117: arc lint + arc unit

Event Timeline

vanmeeuwen requested review of this revision.Feb 25 2020, 8:08 AM

vanmeeuwen created this revision.

Harbormaster completed remote builds in B28252: Diff 2326.Feb 25 2020, 8:09 AM

This was pointless

Harbormaster completed remote builds in B28255: Diff 2329.Feb 25 2020, 8:11 AM

vanmeeuwen edited the summary of this revision. (Show Details)Feb 25 2020, 8:23 AM

Implement the pro rata temporis calculation

Harbormaster completed remote builds in B28261: Diff 2335.Feb 25 2020, 8:24 AM

Testing shows this fails, I'll have to redo with another approach.

work
Renew the basics for billing

Harbormaster completed remote builds in B28312: Diff 2386.Feb 27 2020, 8:45 AM

vanmeeuwen edited the summary of this revision. (Show Details)Feb 27 2020, 8:46 AM

Just use the relationship
The inverse of the same relationship
Do it without the changelogs table

Harbormaster completed remote builds in B28318: Diff 2392.Feb 27 2020, 11:18 AM

Superfluous log

Harbormaster completed remote builds in B28321: Diff 2395.Feb 27 2020, 11:20 AM

machniak subscribed.Feb 27 2020, 8:05 PM

machniak added inline comments.

src/tests/Feature/Jobs/UserVerifyTest.php
46	It fails for me too sometimes. Maybe $user->fresh()->isImapReady() would fix it.

machniak added inline comments.Feb 27 2020, 8:07 PM

src/tests/Feature/Jobs/UserVerifyTest.php
46	No, it does not make sense.

The test can be written "better", or at least in a way that is supposed to be more reliable.

Test userverify with a "guaranteed to be new" user, and a fake queue

Harbormaster completed remote builds in B28339: Diff 2407.Feb 28 2020, 10:18 AM

Looks good for now.

src/app/Observers/PackageSkuObserver.php
19	You calculated this a few lines above.
src/app/Wallet.php
89	I guess we should use db transactions here. Also, I'm thinking that we may anyway need a changelog table to have easy access to what/when was charged?

vanmeeuwen marked 2 inline comments as done.Mar 3 2020, 12:03 PM

vanmeeuwen added inline comments.

src/app/Observers/PackageSkuObserver.php
19	hihi, indeed, because of the superfluous debug ;-)
src/app/Wallet.php
89	This would be in some sort of transactions table, for sure -- I just don't want a future use of cashier (stripe/braintree) to have us need to redo whatever that transactions table is.

This was pointless
Implement the pro rata temporis calculation
work
Renew the basics for billing
Just use the relationship
The inverse of the same relationship
Do it without the changelogs table
Superfluous log
Test userverify with a "guaranteed to be new" user, and a fake queue
Remove superfluous debug statement and duplicate calculation

Harbormaster completed remote builds in B28405: Diff 2467.Mar 3 2020, 12:03 PM

I reviewed it again, I guess it's ready to be merged.

One note, at this project stage we anyway use migrate:refresh often (are we?), so I think that these database changes don't require a new migration file, they could be added to the file that creates the table.

This revision is now accepted and ready to land.Mar 6 2020, 8:52 AM

Closed by commit rKc6fe7764bfc6: Implement a changelog to further the debiting of wallet balances. · Explain WhyMar 7 2020, 9:32 AM

This revision was automatically updated to reflect the committed changes.

Implement a changelog to further the debiting of wallet balancesClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 2407

src/app/Console/Commands/WalletCharge.php

src/app/Console/Commands/WalletExpected.php

src/app/Domain.php

src/app/Entitlement.php

src/app/Handlers/Domain.php

src/app/Handlers/DomainHosting.php

src/app/Handlers/DomainRegistration.php

src/app/Handlers/Groupware.php

src/app/Handlers/Mailbox.php

src/app/Handlers/Resource.php

src/app/Handlers/SharedFolder.php

src/app/Handlers/Storage.php

src/app/Observers/EntitlementObserver.php

src/app/Observers/PackageSkuObserver.php

src/app/Package.php

src/app/PackageSku.php

src/app/Plan.php

src/app/Providers/AppServiceProvider.php

src/app/Sku.php

src/app/User.php

src/app/Wallet.php

src/database/migrations/2019_09_17_102628_create_sku_entitlements.php

src/database/migrations/2019_12_10_100355_create_package_skus_table.php

src/database/migrations/2020_02_11_110959_add_deleted_at.php

src/database/migrations/2020_02_11_110959_users_add_deleted_at.php

src/database/migrations/2020_02_11_110960_domains_add_deleted_at.php

src/database/migrations/2020_02_26_085835_entitlements_add_deleted_at.php

src/database/seeds/PackageSeeder.php

src/database/seeds/UserSeeder.php

src/phpstan.neon

src/tests/Feature/BillingTest.php

src/tests/Feature/Controller/SignupTest.php

src/tests/Feature/DomainTest.php

src/tests/Feature/EntitlementTest.php

src/tests/Feature/Jobs/UserVerifyTest.php

src/tests/Feature/SignupCodeTest.php

src/tests/Feature/SkuTest.php

src/tests/Feature/UserTest.php

src/tests/Feature/VerificationCodeTest.php

src/tests/Feature/WalletTest.php

src/tests/TestCase.php

Implement a changelog to further the debiting of wallet balances
ClosedPublic
Actions

Revision Contents
Changeset List