From 23a8835758c8d7c687822e42f7967f90d9c00583 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 11 Dec 2022 10:32:25 +0100 Subject: [PATCH] Add some debug info --- .../Integrity/UpdateGroupInformation.php | 6 ++++ app/Models/AuditLogEntry.php | 10 +++++++ app/Models/CurrencyExchangeRate.php | 28 +++++++++++++++++++ app/Models/InvitedUser.php | 6 ++++ 4 files changed, 50 insertions(+) diff --git a/app/Console/Commands/Integrity/UpdateGroupInformation.php b/app/Console/Commands/Integrity/UpdateGroupInformation.php index 30ebd19755..0247fa0fe0 100644 --- a/app/Console/Commands/Integrity/UpdateGroupInformation.php +++ b/app/Console/Commands/Integrity/UpdateGroupInformation.php @@ -41,6 +41,7 @@ use FireflyIII\Models\UserGroup; use FireflyIII\Models\Webhook; use FireflyIII\User; use Illuminate\Console\Command; +use Illuminate\Database\QueryException; /** * Class UpdateGroupInformation @@ -115,7 +116,12 @@ class UpdateGroupInformation extends Command */ private function updateGroupInfoForObject(User $user, UserGroup $group, string $className): void { + try { $result = $className::where('user_id', $user->id)->where('user_group_id', null)->update(['user_group_id' => $group->id]); + } catch(QueryException $e) { + $this->error(sprintf('Could not update group information for "%s" because of error "%s"', $className, $e->getMessage())); + return; + } if (0 !== $result) { $this->line(sprintf('Moved %d %s objects to the correct group.', $result, str_replace('FireflyIII\\Models\\', '', $className))); } diff --git a/app/Models/AuditLogEntry.php b/app/Models/AuditLogEntry.php index afde6370fb..2df014d179 100644 --- a/app/Models/AuditLogEntry.php +++ b/app/Models/AuditLogEntry.php @@ -30,6 +30,16 @@ use Illuminate\Database\Eloquent\SoftDeletes; /** * Class AuditLogEntry + * + * @property-read Model|\Eloquent $auditable + * @property-read Model|\Eloquent $changer + * @method static \Illuminate\Database\Eloquent\Builder|AuditLogEntry newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|AuditLogEntry newQuery() + * @method static \Illuminate\Database\Query\Builder|AuditLogEntry onlyTrashed() + * @method static \Illuminate\Database\Eloquent\Builder|AuditLogEntry query() + * @method static \Illuminate\Database\Query\Builder|AuditLogEntry withTrashed() + * @method static \Illuminate\Database\Query\Builder|AuditLogEntry withoutTrashed() + * @mixin \Eloquent */ class AuditLogEntry extends Model { diff --git a/app/Models/CurrencyExchangeRate.php b/app/Models/CurrencyExchangeRate.php index 6a8270b19e..7605110b26 100644 --- a/app/Models/CurrencyExchangeRate.php +++ b/app/Models/CurrencyExchangeRate.php @@ -29,6 +29,34 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; /** * Class CurrencyExchangeRate + * + * @property int $id + * @property \Illuminate\Support\Carbon|null $created_at + * @property \Illuminate\Support\Carbon|null $updated_at + * @property string|null $deleted_at + * @property int $user_id + * @property int $from_currency_id + * @property int $to_currency_id + * @property \Illuminate\Support\Carbon $date + * @property string $rate + * @property string|null $user_rate + * @property-read \FireflyIII\Models\TransactionCurrency $fromCurrency + * @property-read \FireflyIII\Models\TransactionCurrency $toCurrency + * @property-read User $user + * @method static \Illuminate\Database\Eloquent\Builder|CurrencyExchangeRate newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|CurrencyExchangeRate newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|CurrencyExchangeRate query() + * @method static \Illuminate\Database\Eloquent\Builder|CurrencyExchangeRate whereCreatedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|CurrencyExchangeRate whereDate($value) + * @method static \Illuminate\Database\Eloquent\Builder|CurrencyExchangeRate whereDeletedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|CurrencyExchangeRate whereFromCurrencyId($value) + * @method static \Illuminate\Database\Eloquent\Builder|CurrencyExchangeRate whereId($value) + * @method static \Illuminate\Database\Eloquent\Builder|CurrencyExchangeRate whereRate($value) + * @method static \Illuminate\Database\Eloquent\Builder|CurrencyExchangeRate whereToCurrencyId($value) + * @method static \Illuminate\Database\Eloquent\Builder|CurrencyExchangeRate whereUpdatedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|CurrencyExchangeRate whereUserId($value) + * @method static \Illuminate\Database\Eloquent\Builder|CurrencyExchangeRate whereUserRate($value) + * @mixin Eloquent */ class CurrencyExchangeRate extends Model { diff --git a/app/Models/InvitedUser.php b/app/Models/InvitedUser.php index 907bd1b3d8..20b4f8cdfd 100644 --- a/app/Models/InvitedUser.php +++ b/app/Models/InvitedUser.php @@ -30,6 +30,12 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; /** * Class InvitedUser + * + * @property-read User $user + * @method static \Illuminate\Database\Eloquent\Builder|InvitedUser newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|InvitedUser newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|InvitedUser query() + * @mixin \Eloquent */ class InvitedUser extends Model {