A free open source IT asset/license management system
Update comments
Marcus Moore82c4619da57b
diff --git a/app/Actions/Acceptances/RegenerateAcceptancesAction.php b/app/Actions/Acceptances/RegenerateAcceptancesAction.phpindex a6b89b930a..ec1238fbbc 100644--- a/app/Actions/Acceptances/RegenerateAcceptancesAction.php+++ b/app/Actions/Acceptances/RegenerateAcceptancesAction.php@@ -111,7 +111,7 @@ class RegenerateAcceptancesAction** `license_seats.assigned_to` is denormalised and unreliable in both directions:* the API asset-checkout path attaches a seat without ever stamping the holder, and- * five checkin paths clear it while deliberately leaving `asset_id` set. So a seat+ * several checkin paths clear it while deliberately leaving `asset_id` set. So a seat* with an `asset_id` takes its holder from that asset's *current* assignment, and* only a seat with no asset falls back to `assigned_to`. Either way a seat yields at* most one pair, so seats carrying both columns cannot double-count.@@ -561,8 +561,10 @@ class RegenerateAcceptancesAction* CheckoutableListener::resolveAcceptanceTarget(). A user holds their own items;* an asset's items are held by whoever that asset is assigned to. Anything else* — a location, an unassigned asset — has no holder. Soft-deleted users are not- * holders either: every relation this walks is declared withTrashed(), so a deleted- * user would otherwise come back and be re-asked to accept.+ * holders either: the relations this walks are declared withTrashed(), so a deleted+ * user would otherwise come back and be re-asked to accept. The consumable builder+ * reaches its holders without coming through here, so a deleted user holding only+ * consumables — the one case `DeleteUserRequest` allows — is not filtered out.*/private static function resolveHolder(?Model $target): ?User{diff --git a/app/Console/Commands/RegenerateAcceptances.php b/app/Console/Commands/RegenerateAcceptances.phpindex 2897322fb2..70e9f651f0 100644--- a/app/Console/Commands/RegenerateAcceptances.php+++ b/app/Console/Commands/RegenerateAcceptances.php@@ -316,11 +316,11 @@ class RegenerateAcceptances extends Command* by the pairs it passed over and why.** The declined line runs below the table it qualifies, and only on a run that is- * re-asking decliners: it names the flag that would stop that, because including- * them is decision 5's default and the one judgment on the report an operator might- * want to reverse. Under `--exclude-declined` it is left out rather than reworded —- * every declined pair is excluded under that flag, so the count would be identical- * to the one heading the excluded table and would read as a second population.+ * re-asking decliners: re-asking them is the default, and the one judgment on the+ * report an operator might want to reverse. Under `--exclude-declined` it is left+ * out rather than reworded — every declined pair is excluded under that flag, so the+ * count would be identical to the one heading the excluded table and would read as a+ * second population.** The closing tally is held back when a confirmation prompt is about to follow. The* wizard's preview is a real dry run, so it would otherwise sign off with "Nothing@@ -331,9 +331,9 @@ class RegenerateAcceptances extends Command** A run that created rows without `--notify` closes by naming* `snipeit:acceptance-reminder`, because the rows it just wrote are silent until- * somebody emails them. The pointer says that command's scope is every pending- * request rather than this run's, since a `--category`-scoped run does not narrow it.- * `created` is only incremented off a dry run, so it carries the dry-run case too.+ * somebody emails them. That command emails every user with a pending request, so+ * its reach is wider than a `--category`-scoped run of this one. `created` is only+ * incremented off a dry run, so it carries the dry-run case too.** @param bool $awaitingConfirmation whether the operator is about to be asked to go ahead*/diff --git a/tests/Feature/Console/RegenerateAcceptancesTest.php b/tests/Feature/Console/RegenerateAcceptancesTest.phpindex 1a6246b65a..23fce0053a 100644--- a/tests/Feature/Console/RegenerateAcceptancesTest.php+++ b/tests/Feature/Console/RegenerateAcceptancesTest.php@@ -1133,7 +1133,7 @@ class RegenerateAcceptancesTest extends TestCase$this->artisan('snipeit:regenerate-acceptances', ['--no-interaction' => true, '--notify' => true])->expectsOutput('Notified: 1.')- ->doesntExpectOutput('The following users do not have an email address:')+ ->doesntExpectOutput('The following users were not emailed because they do not have an email address:')->assertExitCode(0);}@@ -1262,7 +1262,7 @@ class RegenerateAcceptancesTest extends TestCase}/**- * Decision 16's announce-and-skip: a flag answers its step, and the step is not asked.+ * A flag answers its step, and the wizard announces it rather than asking it.** Every prompt the wizard could reach is left unanswered here except the final* confirm. If a skipped step were actually asked, it would reach the mocked question@@ -1309,7 +1309,7 @@ class RegenerateAcceptancesTest extends TestCase}/**- * Decision C parity: a --no-interaction run is slice 3's run, unchanged.+ * A `--no-interaction` run is unchanged by the wizard existing.** The wizard never starts, so no prompt is pre-answered here; reaching one would* throw. The flag defaults are the ones that applied before the wizard existed.