Fixed accessories and consumables not being logged correctly during bulk check-in #15221
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # app/Http/Controllers/Users/BulkUsersController.php
PR Summary
|
# Conflicts: # app/Http/Controllers/Users/BulkUsersController.php
marcusmoore
commented
Aug 7, 2024
Comment on lines
+288
to
+314
| private function logAccessoriesCheckin(Collection $accessoryUserRows): void | ||
| { | ||
| foreach ($accessoryUserRows as $accessoryUserRow) { | ||
| $logAction = new Actionlog(); | ||
| $logAction->item_id = $accessoryUserRow->accessory_id; | ||
| $logAction->item_type = Accessory::class; | ||
| $logAction->target_id = $accessoryUserRow->assigned_to; | ||
| $logAction->target_type = User::class; | ||
| $logAction->user_id = Auth::id(); | ||
| $logAction->note = 'Bulk checkin items'; | ||
| $logAction->logaction('checkin from'); | ||
| } | ||
| } | ||
|
|
||
| private function logConsumablesCheckin(Collection $consumableUserRows): void | ||
| { | ||
| foreach ($consumableUserRows as $consumableUserRow) { | ||
| $logAction = new Actionlog(); | ||
| $logAction->item_id = $consumableUserRow->consumable_id; | ||
| $logAction->item_type = Consumable::class; | ||
| $logAction->target_id = $consumableUserRow->assigned_to; | ||
| $logAction->target_type = User::class; | ||
| $logAction->user_id = Auth::id(); | ||
| $logAction->note = 'Bulk checkin items'; | ||
| $logAction->logaction('checkin from'); | ||
| } | ||
| } |
There was a problem hiding this comment.
Not loving the duplication but there is enough difference that using explicit method names instead of passing a handful of parameters is cleaner I think
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR fixes an issue where accessories and consumables being bulk checked in were not being logged correctly. See this comment for more details.
In the process the PR adds tests around the
destroymethod inBulkUsersController.Fixes #15109
Type of change