Differential D1702

Better structure for console commands, and unification of code/behavior
Needs RevisionPublic
Actions

Authored by vanmeeuwen on Oct 5 2020, 11:45 AM.

Details

Reviewers

machniak

Group Reviewers

Restricted Project

Summary

Merge branch 'master' into arcpatch-D1684

Standardize downloading a file

Demonstrate command restructuring with magic

Test Plan

./phpunit (tests not updated)

Diff Detail

Repository

rK kolab

Branch

arcpatch-D1702

Lint

No Linters Available

Unit

No Unit Test Coverage

Build Status

Buildable 31693
Build 12043: arc lint + arc unit

Event Timeline

vanmeeuwen requested review of this revision.Oct 5 2020, 11:45 AM

vanmeeuwen created this revision.

Harbormaster completed remote builds in B31120: Diff 4522.Oct 5 2020, 11:45 AM

Further reduce duplication

Harbormaster completed remote builds in B31123: Diff 4528.Oct 5 2020, 11:53 AM

show-case implementation of 'relations'

Harbormaster completed remote builds in B31129: Diff 4534.Oct 5 2020, 1:32 PM

Commentary and documentation
user:wallets translation to the new system
More magic

Harbormaster completed remote builds in B31135: Diff 4540.Oct 5 2020, 6:23 PM

And... another iteration to experiment with.

Harbormaster completed remote builds in B31141: Diff 4546.Oct 5 2020, 7:05 PM

Some create object logic

Harbormaster completed remote builds in B31171: Diff 4576.Oct 6 2020, 12:48 PM

vanmeeuwen mentioned this in D1684: Better structure for console commands, and unification of code/behavior.Nov 9 2020, 2:14 PM

Rebase on master

Some preliminary export commands
Add wallet:balances command
Merge branch 'master' into arcpatch-D1702
Move some commands to a scalpel namespace, add generic ObjectUpdateCommand

Harbormaster completed remote builds in B31690: Diff 5008.Nov 9 2020, 2:14 PM

Move some more commands around

Harbormaster completed remote builds in B31693: Diff 5014.Nov 9 2020, 2:50 PM

machniak requested changes to this revision.Wed, Dec 23, 11:35 AM

machniak added a subscriber: machniak.

machniak added inline comments.

src/app/Console/ObjectCreateCommand.php
76	This is redundant. `create()` method already returns the object on success.
src/app/Console/ObjectListCommand.php
42	You miss command prefix here.
src/app/Console/ObjectRelationListCommand.php
118	I think instead of ->each() you can use foreach for all above types and array. Also, `\Illuminate\Database\Eloquent\Relations\Relation` does not implement each() method itself, so I guess the check is not right. I'm not sure but mabe we could use `is_countable()` here as replacement for these three IFs.
src/app/Console/ObjectUpdateCommand.php
93	Should we have an error printed here?
src/app/Domain.php
435	I think $this->error() in here is not correct. Also the `TODO` above.

This revision now requires changes to proceed.Wed, Dec 23, 11:35 AM

Large Diff

This large diff affects 161 files. Files without inline comments have been collapsed. Expand All Files

Revision Contents
Changeset List

		Path
M		src/app/Console/Command.php (12 lines)
V		src/app/Console/Commands/{DB/PingCommand.php ← DBPing.php} (16 lines)
V		src/app/Console/Commands/{DBPing.php → DB/PingCommand.php}
A	M	src/app/Console/Commands/Data/Export/BalanceCommand.php (55 lines)
A	M	src/app/Console/Commands/Data/Export/VATCommand.php (59 lines)
P		src/app/Console/Commands/Data/ExportCommand.php (23 lines) Copied from src/app/Console/Commands/Data/ImportCommand.php
P		src/app/Console/Commands/Data/ImportCommand.php (4 lines) Copied to src/app/Console/Commands/Data/ExportCommand.php
D	M	src/app/Console/Commands/DiscountList.php (61 lines)
A	M	src/app/Console/Commands/DiscountsCommand.php (12 lines)
V		src/app/Console/Commands/{Domain/Add.php ← DomainAdd.php} (6 lines)
V		src/app/Console/Commands/{Domain/Delete.php ← DomainDelete.php} (19 lines)
V		src/app/Console/Commands/{Domain/ListDomains.php ← DomainList.php} (16 lines)
V		src/app/Console/Commands/{Domain/SetStatus.php ← DomainSetStatus.php} (9 lines)
V		src/app/Console/Commands/{Domain/SetWallet.php ← DomainSetWallet.php} (8 lines)
V		src/app/Console/Commands/{Domain/Status.php ← DomainStatus.php} (25 lines)
V		src/app/Console/Commands/{Domain/Suspend.php ← DomainSuspend.php} (21 lines)
V		src/app/Console/Commands/{Domain/Unsuspend.php ← DomainUnsuspend.php} (21 lines)
A	M	src/app/Console/Commands/Domain/UsersCommand.php (13 lines)
V		src/app/Console/Commands/{DomainAdd.php → Domain/Add.php}
V		src/app/Console/Commands/{DomainDelete.php → Domain/Delete.php}
V		src/app/Console/Commands/{DomainList.php → Domain/ListDomains.php}
D	M	src/app/Console/Commands/DomainListUsers.php (83 lines)
V		src/app/Console/Commands/{DomainSetStatus.php → Domain/SetStatus.php}
V		src/app/Console/Commands/{DomainSetWallet.php → Domain/SetWallet.php}
V		src/app/Console/Commands/{DomainStatus.php → Domain/Status.php}
V		src/app/Console/Commands/{DomainSuspend.php → Domain/Suspend.php}
V		src/app/Console/Commands/{DomainUnsuspend.php → Domain/Unsuspend.php}
A	M	src/app/Console/Commands/DomainsCommand.php (12 lines)
A	M	src/app/Console/Commands/EntitlementsCommand.php (12 lines)
M		src/app/Console/Commands/Job/DomainCreate.php (6 lines)
M		src/app/Console/Commands/Job/DomainUpdate.php (6 lines)
M		src/app/Console/Commands/Job/UserCreate.php (6 lines)
M		src/app/Console/Commands/Job/UserUpdate.php (6 lines)
M		src/app/Console/Commands/Job/WalletCheck.php (3 lines)
M		src/app/Console/Commands/MollieInfo.php (8 lines)
A	M	src/app/Console/Commands/Package/SkusCommand.php (45 lines)
D	M	src/app/Console/Commands/PackageSkus.php (51 lines)
A	M	src/app/Console/Commands/PackagesCommand.php (12 lines)
M		src/app/Console/Commands/PlanPackages.php (12 lines)
A	M	src/app/Console/Commands/PlansCommand.php (12 lines)
A	M	src/app/Console/Commands/Scalpel/Discount/CreateCommand.php (13 lines)
A	M	src/app/Console/Commands/Scalpel/Discount/ReadCommand.php (13 lines)
A	M	src/app/Console/Commands/Scalpel/Domain/CreateCommand.php (13 lines)
A	M	src/app/Console/Commands/Scalpel/Domain/ReadCommand.php (13 lines)
A	M	src/app/Console/Commands/Scalpel/Domain/UpdateCommand.php (13 lines)
A	M	src/app/Console/Commands/Scalpel/Entitlement/CreateCommand.php (56 lines)
A	M	src/app/Console/Commands/Scalpel/Entitlement/ReadCommand.php (13 lines)
A	M	src/app/Console/Commands/Scalpel/Entitlement/UpdateCommand.php (13 lines)
A	M	src/app/Console/Commands/Scalpel/Package/ReadCommand.php (13 lines)
A	M	src/app/Console/Commands/Scalpel/Plan/ReadCommand.php (13 lines)
A	M	src/app/Console/Commands/Scalpel/Sku/ReadCommand.php (13 lines)
A	M	src/app/Console/Commands/Scalpel/Transaction/ReadCommand.php (13 lines)
A	M	src/app/Console/Commands/Scalpel/User/CreateCommand.php (13 lines)
A	M	src/app/Console/Commands/Scalpel/User/ReadCommand.php (13 lines)
A	M	src/app/Console/Commands/Scalpel/UserSetting/ReadCommand.php (13 lines)
A	M	src/app/Console/Commands/Scalpel/Wallet/ReadCommand.php (13 lines)
A	M	src/app/Console/Commands/Scalpel/WalletSetting/ReadCommand.php (13 lines)
M		src/app/Console/Commands/StripeInfo.php (7 lines)
A	M	src/app/Console/Commands/TransactionsCommand.php (12 lines)
V		src/app/Console/Commands/{User/AddAlias.php ← UserAddAlias.php} (19 lines)
A	M	src/app/Console/Commands/User/AliasesCommand.php (13 lines)
V		src/app/Console/Commands/{User/Delete.php ← UserDelete.php} (19 lines)
V		src/app/Console/Commands/{User/Discount.php ← UserDiscount.php} (22 lines)
A	M	src/app/Console/Commands/User/DomainsCommand.php (13 lines)
A	M	src/app/Console/Commands/User/EntitlementsCommand.php (13 lines)
V		src/app/Console/Commands/{User/ForceDelete.php ← UserForceDelete.php} (17 lines)
V		src/app/Console/Commands/{User/Status.php ← UserStatus.php} (21 lines)
V		src/app/Console/Commands/{User/Suspend.php ← UserSuspend.php} (21 lines)
V		src/app/Console/Commands/{User/Unsuspend.php ← UserUnsuspend.php} (21 lines)
V		src/app/Console/Commands/{User/Verify.php ← UserVerify.php} (21 lines)
A	M	src/app/Console/Commands/User/WalletCommand.php (13 lines)
A	M	src/app/Console/Commands/User/WalletsCommand.php (13 lines)
V		src/app/Console/Commands/{UserAddAlias.php → User/AddAlias.php}
V		src/app/Console/Commands/{UserDelete.php → User/Delete.php}
V		src/app/Console/Commands/{UserDiscount.php → User/Discount.php}
D	M	src/app/Console/Commands/UserDomains.php (53 lines)
D	M	src/app/Console/Commands/UserEntitlements.php (65 lines)
V		src/app/Console/Commands/{UserForceDelete.php → User/ForceDelete.php}
A	M	src/app/Console/Commands/UserSettingsCommand.php (12 lines)
V		src/app/Console/Commands/{UserStatus.php → User/Status.php}
V		src/app/Console/Commands/{UserSuspend.php → User/Suspend.php}
V		src/app/Console/Commands/{UserUnsuspend.php → User/Unsuspend.php}
V		src/app/Console/Commands/{UserVerify.php → User/Verify.php}
D	M	src/app/Console/Commands/UserWallets.php (50 lines)
A	M	src/app/Console/Commands/UsersCommand.php (12 lines)
V		src/app/Console/Commands/{Wallet/AddTransaction.php ← WalletAddTransaction.php} (17 lines)
V		src/app/Console/Commands/{Wallet/Balances.php ← WalletBalances.php} (16 lines)
V		src/app/Console/Commands/{Wallet/Charge.php ← WalletCharge.php} (17 lines)
A	M	src/app/Console/Commands/Wallet/ControllersCommand.php (13 lines)
A	M	src/app/Console/Commands/Wallet/EntitlementsCommand.php (13 lines)
V		src/app/Console/Commands/{Wallet/Expected.php ← WalletExpected.php} (20 lines)
V		src/app/Console/Commands/{Wallet/GetBalance.php ← WalletGetBalance.php} (17 lines)
V		src/app/Console/Commands/{Wallet/GetDiscount.php ← WalletGetDiscount.php} (17 lines)
V		src/app/Console/Commands/{Wallet/Mandate.php ← WalletMandate.php} (17 lines)
A	M	src/app/Console/Commands/Wallet/OwnerCommand.php (13 lines)
V		src/app/Console/Commands/{Wallet/SetBalance.php ← WalletSetBalance.php} (17 lines)
V		src/app/Console/Commands/{Wallet/SetDiscount.php ← WalletSetDiscount.php} (20 lines)
V		src/app/Console/Commands/{Wallet/Transactions.php ← WalletTransactions.php} (19 lines)
V		src/app/Console/Commands/{Wallet/Until.php ← WalletUntil.php} (17 lines)
V		src/app/Console/Commands/{WalletAddTransaction.php → Wallet/AddTransaction.php}
V		src/app/Console/Commands/{WalletBalances.php → Wallet/Balances.php}
V		src/app/Console/Commands/{WalletCharge.php → Wallet/Charge.php}
D	M	src/app/Console/Commands/WalletDiscount.php (62 lines)
V		src/app/Console/Commands/{WalletExpected.php → Wallet/Expected.php}
V		src/app/Console/Commands/{WalletGetBalance.php → Wallet/GetBalance.php}
V		src/app/Console/Commands/{WalletGetDiscount.php → Wallet/GetDiscount.php}
V		src/app/Console/Commands/{WalletMandate.php → Wallet/Mandate.php}
V		src/app/Console/Commands/{WalletSetBalance.php → Wallet/SetBalance.php}
V		src/app/Console/Commands/{WalletSetDiscount.php → Wallet/SetDiscount.php}
A	M	src/app/Console/Commands/WalletSettingsCommand.php (12 lines)
V		src/app/Console/Commands/{WalletTransactions.php → Wallet/Transactions.php}
V		src/app/Console/Commands/{WalletUntil.php → Wallet/Until.php}
A	M	src/app/Console/Commands/WalletsCommand.php (12 lines)
D	M	src/app/Console/Development/DomainStatus.php (87 lines)
D	M	src/app/Console/Development/UserStatus.php (86 lines)
A	M	src/app/Console/ObjectCreateCommand.php (86 lines)
A	M	src/app/Console/ObjectListCommand.php (75 lines)
A	M	src/app/Console/ObjectReadCommand.php (58 lines)
A	M	src/app/Console/ObjectRelationListCommand.php (125 lines)
A	M	src/app/Console/ObjectUpdateCommand.php (106 lines)
M		src/app/Domain.php (208 lines)
M		src/app/User.php (2 lines)
M		src/database/seeds/local/UserSeeder.php (2 lines)
P		src/tests/Feature/Console/Domain/AddTest.php (7 lines) Copied from src/tests/Feature/Console/UserDiscountTest.php
P		src/tests/Feature/Console/Domain/DeleteTest.php (7 lines) Copied from src/tests/Feature/Console/UserDiscountTest.php
A	M	src/tests/Feature/Console/Domain/ListDomainsTest.php (19 lines)
P		src/tests/Feature/Console/Domain/ListUsersTest.php (7 lines) Copied from src/tests/Feature/Console/UserDiscountTest.php
P		src/tests/Feature/Console/Domain/SetStatusTest.php (7 lines) Copied from src/tests/Feature/Console/UserDiscountTest.php
P		src/tests/Feature/Console/Domain/SetWalletTest.php (7 lines) Copied from src/tests/Feature/Console/UserDiscountTest.php
A	M	src/tests/Feature/Console/Domain/StatusTest.php (19 lines)
P		src/tests/Feature/Console/Domain/SuspendTest.php (7 lines) Copied from src/tests/Feature/Console/UserDiscountTest.php
P		src/tests/Feature/Console/Domain/UnsuspendTest.php (7 lines) Copied from src/tests/Feature/Console/UserDiscountTest.php
P		src/tests/Feature/Console/User/AddAliasTest.php (7 lines) Copied from src/tests/Feature/Console/UserDiscountTest.php
V		src/tests/Feature/Console/{User/DeleteTest.php ← WalletDiscountTest.php} (7 lines)
P		src/tests/Feature/Console/User/DiscountTest.php (7 lines) Copied from src/tests/Feature/Console/UserDiscountTest.php
V		src/tests/Feature/Console/{User/DomainsTest.php ← UserDomainsTest.php} (7 lines)
V		src/tests/Feature/Console/{User/EntitlementsTest.php ← UserEntitlementsTest.php} (7 lines)
V		src/tests/Feature/Console/{User/ForceDeleteTest.php ← UserForceDeleteTest.php} (4 lines)
A	M	src/tests/Feature/Console/User/StatusTest.php (19 lines)
P		src/tests/Feature/Console/User/SuspendTest.php (7 lines) Copied from src/tests/Feature/Console/UserDiscountTest.php
P		src/tests/Feature/Console/User/UnsuspendTest.php (7 lines) Copied from src/tests/Feature/Console/UserDiscountTest.php
P		src/tests/Feature/Console/User/VerifyTest.php (7 lines) Copied from src/tests/Feature/Console/UserDiscountTest.php
V		src/tests/Feature/Console/{User/WalletsTest.php ← UserWalletsTest.php} (7 lines)
P		src/tests/Feature/Console/UserDiscountTest.php Deleted after being copied to multiple locations: src/tests/Feature/Console/Domain/AddTest.php src/tests/Feature/Console/Domain/DeleteTest.php src/tests/Feature/Console/Domain/ListUsersTest.php src/tests/Feature/Console/Domain/SetStatusTest.php src/tests/Feature/Console/Domain/SetWalletTest.php src/tests/Feature/Console/Domain/SuspendTest.php src/tests/Feature/Console/Domain/UnsuspendTest.php src/tests/Feature/Console/User/AddAliasTest.php src/tests/Feature/Console/User/DiscountTest.php src/tests/Feature/Console/User/SuspendTest.php src/tests/Feature/Console/User/UnsuspendTest.php src/tests/Feature/Console/User/VerifyTest.php src/tests/Feature/Console/Wallet/MandateTest.php
V		src/tests/Feature/Console/{UserDomainsTest.php → User/DomainsTest.php}
V		src/tests/Feature/Console/{UserEntitlementsTest.php → User/EntitlementsTest.php}
V		src/tests/Feature/Console/{UserForceDeleteTest.php → User/ForceDeleteTest.php}
V		src/tests/Feature/Console/{UserWalletsTest.php → User/WalletsTest.php}
A	M	src/tests/Feature/Console/Wallet/AddTransactionTest.php (16 lines)
A	M	src/tests/Feature/Console/Wallet/BalancesTest.php (19 lines)
V		src/tests/Feature/Console/{Wallet/ChargeTest.php ← WalletChargeTest.php} (4 lines)
A	M	src/tests/Feature/Console/Wallet/ExpectedTest.php (19 lines)
A	M	src/tests/Feature/Console/Wallet/GetBalanceTest.php (16 lines)
A	M	src/tests/Feature/Console/Wallet/GetDiscountTest.php (16 lines)
V		src/tests/Feature/Console/{Wallet/MandateTest.php ← UserDiscountTest.php} (7 lines)
A	M	src/tests/Feature/Console/Wallet/SetBalanceTest.php (16 lines)
A	M	src/tests/Feature/Console/Wallet/SetDiscountTest.php (16 lines)
A	M	src/tests/Feature/Console/Wallet/TransactionsTest.php (16 lines)
A	M	src/tests/Feature/Console/Wallet/UntilTest.php (48 lines)
V		src/tests/Feature/Console/{WalletChargeTest.php → Wallet/ChargeTest.php}
V		src/tests/Feature/Console/{WalletDiscountTest.php → User/DeleteTest.php}

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	4522	7fb26db		Oct 5 2020, 11:45 AM	★	★
Diff 2	4528	7fb26db	- Further reduce duplication	Oct 5 2020, 11:52 AM	★	★
Diff 3	4534	7fb26db	- show-case implementation of 'relations'	Oct 5 2020, 1:32 PM	★	★
Diff 4	4540	7fb26db	- Commentary and documentation	Oct 5 2020, 6:23 PM	★	★
Diff 5	4546	7fb26db	- And... another iteration to experiment with.	Oct 5 2020, 7:05 PM	★	★
Diff 6	4576	7fb26db	- Some create object logic	Oct 6 2020, 12:48 PM	★	★
Diff 7	5008	dfbde4d	Rebase on master	Nov 9 2020, 2:13 PM	★	★
Diff 8	5014	dfbde4d	- Move some more commands around	Nov 9 2020, 2:50 PM	★	★

Commit	Tree	Parents	Author	Summary	Date
39b4d814f5de	8c50011bdebe	7d1f75eaba48	Jeroen van Meeuwen	Move some more commands around	Nov 9 2020, 2:50 PM
7d1f75eaba48	dbb00141e4c7	ebf632487857	Jeroen van Meeuwen	Move some commands to a scalpel namespace, add generic ObjectUpdateCommand	Nov 9 2020, 2:12 PM
ebf632487857	9ca3902c1f03	5d961d04c8c5 dfbde4d7b827	Jeroen van Meeuwen	Merge branch 'master' into arcpatch-D1702	Nov 9 2020, 11:47 AM
5d961d04c8c5	762051a994c9	c7b5c68561f4	Jeroen van Meeuwen	Add wallet:balances command	Nov 9 2020, 11:44 AM
c7b5c68561f4	12ee19df8d13	fcd5dee0fbe7	Jeroen van Meeuwen	Some preliminary export commands	Oct 6 2020, 5:08 PM
fcd5dee0fbe7	7627d0d0a502	7fb26dbf8cc0	Jeroen van Meeuwen	Better structure for console commands, and unification of code/behavior (Show More…)	Oct 6 2020, 4:35 PM